Projet

Général

Profil

« Précédent | Suivant » 

Révision c69fae34

Ajouté par Serghei Mihai il y a plus de 9 ans

dossiers: next schedules print fix

Closes #5595

Signed-off-by: Mikaël Ates <>

Voir les différences:

calebasse/dossiers/templates/dossiers/patientrecord_tab5_actes_passes.html
24 24 
      <tbody>
25 25 
      {% for act, state, missing_workers in last_rdvs %}
26 26 
      <tr>
27 
        <td><span class="date">{{ act.date|date:"SHORT_DATE_FORMAT" }}</span>
27 
        <td><span class="date" data-start-date='{{ act.date|date:"SHORT_DATE_FORMAT" }}'>{{ act.date|date:"SHORT_DATE_FORMAT" }}</span>
28 28 
          <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>
29 29 
        <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>
30 30 
        <td>{{ act.act_type }}</td>
calebasse/dossiers/templates/dossiers/patientrecord_tab6_next_rdv.html
19 19 
    <tbody>
20 20 
    {% for event, state, missing_participants, inactive_participants in next_rdvs %}
21 21 
    <tr>
22 
      <td><span class="date">{{ event.start_datetime|date:"DATE_FORMAT" }}</span>
22 
      <td><span class="date" data-start-date='{{ event.start_datetime|date:"SHORT_DATE_FORMAT"}}'>{{ event.start_datetime|date:"DATE_FORMAT" }}</span>
23 23 
          <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>
24 24 
      <td>{% if state %}{% if state.state_name != 'VALIDE' %}<strong>{% endif %}{{ state }}{% if state.state_name != 'VALIDE' %}</strong>{% endif %}{% else %}Non pointé.{% endif %}</td>
25 25 
      <td>{{ event.act_type }}</td>
calebasse/static/js/calebasse.dossiers.js
30 30 
        block.addClass('screen-only');
31 31 
        if ($(selector, $(this)).length) {
32 32 
            $.each($(selector, this), function() {
33 
                var current = $.datepicker.parseDate('d/m/yy', $(this).text());
33 
                var current = $.datepicker.parseDate('d/m/yy', $(this).data('start-date'));
34 34 
                if (current < from || (to && current >= to)) {
35 35 
                    $(this).parent().parent().addClass('screen-only');
36 36 
                } else {

Formats disponibles : Unified diff