dossiers: next schedules print fix

Closes #5595

Signed-off-by: Mikaël Ates <mates@entrouvert.com>
This commit is contained in:
Serghei Mihai 2014-09-29 15:45:08 +02:00 committed by Mikaël Ates
parent 02ce35550b
commit c69fae347b
3 changed files with 3 additions and 3 deletions

View File

@ -24,7 +24,7 @@
<tbody>
{% for act, state, missing_workers in last_rdvs %}
<tr>
<td><span class="date">{{ act.date|date:"SHORT_DATE_FORMAT" }}</span>
<td><span class="date" data-start-date='{{ act.date|date:"SHORT_DATE_FORMAT" }}'>{{ act.date|date:"SHORT_DATE_FORMAT" }}</span>
<span class="time">{{ act.time|date:"H:i" }}</span>{% if missing_workers %} <span title="Au moins un intervenant est absent" class="icon-warning-sign absent"></span>{% endif %}</td>
<td>{% if state %}{% if act.is_absent %}<strong>{% endif %}{% if state.state_name == 'ACT_DOUBLE' or state.state_name == 'ACT_LOST' %}Présent ({{ state }}){% else %}{{ state }}{% endif %}{% if act.is_absent %}</strong>{% endif %}{% else %}Non pointé.{% endif %}</td>
<td>{{ act.act_type }}</td>

View File

@ -19,7 +19,7 @@
<tbody>
{% for event, state, missing_participants, inactive_participants in next_rdvs %}
<tr>
<td><span class="date">{{ event.start_datetime|date:"DATE_FORMAT" }}</span>
<td><span class="date" data-start-date='{{ event.start_datetime|date:"SHORT_DATE_FORMAT"}}'>{{ event.start_datetime|date:"DATE_FORMAT" }}</span>
<span class="time">{% firstof event.start_datetime|date:"H:i"|title %}</span>{% if missing_participants or inactive_participants %} <span title="Au moins un intervenant est absent ou ne fait plus partie du service" class="icon-warning-sign absent"></span>{% endif %}</td>
<td>{% if state %}{% if state.state_name != 'VALIDE' %}<strong>{% endif %}{{ state }}{% if state.state_name != 'VALIDE' %}</strong>{% endif %}{% else %}Non pointé.{% endif %}</td>
<td>{{ event.act_type }}</td>

View File

@ -30,7 +30,7 @@ function filter_date_bounds(tab, container, selector) {
block.addClass('screen-only');
if ($(selector, $(this)).length) {
$.each($(selector, this), function() {
var current = $.datepicker.parseDate('d/m/yy', $(this).text());
var current = $.datepicker.parseDate('d/m/yy', $(this).data('start-date'));
if (current < from || (to && current >= to)) {
$(this).parent().parent().addClass('screen-only');
} else {