From c69fae347b474eac436ff5d6a6d0c9e08acee77e Mon Sep 17 00:00:00 2001 From: Serghei MIHAI Date: Mon, 29 Sep 2014 15:45:08 +0200 Subject: [PATCH] dossiers: next schedules print fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #5595 Signed-off-by: Mikaël Ates --- .../templates/dossiers/patientrecord_tab5_actes_passes.html | 2 +- .../templates/dossiers/patientrecord_tab6_next_rdv.html | 2 +- calebasse/static/js/calebasse.dossiers.js | 2 +- 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 835425ee..646bdeec 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 @@ {% for act, state, missing_workers in last_rdvs %} - {{ act.date|date:"SHORT_DATE_FORMAT" }} + {{ act.date|date:"SHORT_DATE_FORMAT" }} {{ act.time|date:"H:i" }}{% if missing_workers %} {% endif %} {% if state %}{% if act.is_absent %}{% endif %}{% if state.state_name == 'ACT_DOUBLE' or state.state_name == 'ACT_LOST' %}Présent ({{ state }}){% else %}{{ state }}{% endif %}{% if act.is_absent %}{% endif %}{% else %}Non pointé.{% endif %} {{ act.act_type }} diff --git a/calebasse/dossiers/templates/dossiers/patientrecord_tab6_next_rdv.html b/calebasse/dossiers/templates/dossiers/patientrecord_tab6_next_rdv.html index 73430b3b..8e958a93 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 @@ {% for event, state, missing_participants, inactive_participants in next_rdvs %} - {{ event.start_datetime|date:"DATE_FORMAT" }} + {{ event.start_datetime|date:"DATE_FORMAT" }} {% firstof event.start_datetime|date:"H:i"|title %}{% if missing_participants or inactive_participants %} {% endif %} {% if state %}{% if state.state_name != 'VALIDE' %}{% endif %}{{ state }}{% if state.state_name != 'VALIDE' %}{% endif %}{% else %}Non pointé.{% endif %} {{ event.act_type }} diff --git a/calebasse/static/js/calebasse.dossiers.js b/calebasse/static/js/calebasse.dossiers.js index 37e77763..c4523c21 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 {