summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerghei MIHAI <smihai@entrouvert.com>2014-09-29 13:45:08 (GMT)
committerMikaël Ates <mates@entrouvert.com>2014-10-03 07:12:45 (GMT)
commitc69fae347b474eac436ff5d6a6d0c9e08acee77e (patch)
tree8dfd79275e4bb45c0b255e4f64f955da11c5c202
parent02ce35550b3b5e3404c3a4dac696f83e35965c82 (diff)
downloadcalebasse-c69fae347b474eac436ff5d6a6d0c9e08acee77e.zip
calebasse-c69fae347b474eac436ff5d6a6d0c9e08acee77e.tar.gz
calebasse-c69fae347b474eac436ff5d6a6d0c9e08acee77e.tar.bz2
dossiers: next schedules print fix
Closes #5595 Signed-off-by: Mikaël Ates <mates@entrouvert.com>
-rw-r--r--calebasse/dossiers/templates/dossiers/patientrecord_tab5_actes_passes.html2
-rw-r--r--calebasse/dossiers/templates/dossiers/patientrecord_tab6_next_rdv.html2
-rw-r--r--calebasse/static/js/calebasse.dossiers.js2
3 files changed, 3 insertions, 3 deletions
diff --git a/calebasse/dossiers/templates/dossiers/patientrecord_tab5_actes_passes.html b/calebasse/dossiers/templates/dossiers/patientrecord_tab5_actes_passes.html
index 835425e..646bdee 100644
--- a/calebasse/dossiers/templates/dossiers/patientrecord_tab5_actes_passes.html
+++ b/calebasse/dossiers/templates/dossiers/patientrecord_tab5_actes_passes.html
@@ -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>
diff --git a/calebasse/dossiers/templates/dossiers/patientrecord_tab6_next_rdv.html b/calebasse/dossiers/templates/dossiers/patientrecord_tab6_next_rdv.html
index 73430b3..8e958a9 100644
--- a/calebasse/dossiers/templates/dossiers/patientrecord_tab6_next_rdv.html
+++ b/calebasse/dossiers/templates/dossiers/patientrecord_tab6_next_rdv.html
@@ -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>
diff --git a/calebasse/static/js/calebasse.dossiers.js b/calebasse/static/js/calebasse.dossiers.js
index 37e7776..c4523c2 100644
--- a/calebasse/static/js/calebasse.dossiers.js
+++ b/calebasse/static/js/calebasse.dossiers.js
@@ -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 {