patient record id grayed on all pages in order to avoid confusion

Closes #3120

calebasse/actes/templates/actes/act_listing.html

@@ -109,7 +109,7 @@
       {% for act in object_list %}
       <tr data-id="{{ act.id }}" data-isbilled="{{ act.is_billed }}"
       {% if not act.is_billed %}class="non-factu"{% else %}{% if not act.invoice_set.all.0.number %}data-oldbilled="True"{% endif %}{% endif %}>
-        <td>{{ act.patient.paper_id }} ({{ act.patient.id }})
+        <td>{{ act.patient.paper_id|default_if_none:'' }} <span class="lightgray">({{ act.patient.id }})</span>
             {{ act.patient.first_name }}
             <span class="lastname">{{ act.patient.last_name }}</span>
         </td>

calebasse/agenda/templates/agenda/act-validation.html

@@ -38,7 +38,7 @@
     {% for acte, last_status, last_status_name in actes %}
     <div class="frame acte" id="acte-frame-{{ acte.id }}">
       <h3>{{ acte.time|time:"H:i" }} - <strong><span class="lastname">{{ acte.patient.last_name }}</span> {{ acte.patient.first_name }}</strong>
-          {% if acte.patient.paper_id %} {{ acte.patient.paper_id }} {% endif %}({{ acte.patient.id }}) -
+          {% if acte.patient.paper_id %} {{ acte.patient.paper_id }} {% endif %}
           <strong>{{ acte.act_type }}</strong>
           <p>{% if acte.doctors %}{% for doctor in acte.doctors.all %}<span class="lastname">{{ doctor.last_name }}</span> {{ doctor.first_name }} {% endfor %}{% endif %}</p>
           {% if acte.description %} <span title="Un commentaire existe" class="icon-comment"></span>{% endif%}

calebasse/dossiers/templates/dossiers/index.html

@@ -77,7 +77,7 @@
       {% for patient_record in patient_records %}
       <tr style="display: table-row;" class="pr-line {{ patient_record.state_class }}" data-link="{{ patient_record.object.id }}/view">
           <td>{{ patient_record.object.paper_id|default_if_none:"" }} </td>
-          <td>{{ patient_record.object.id }}</td>
+          <td class="lightgray">{{ patient_record.object.id }}</td>
           <td>{% if patient_record.object.confidential %}<span title="Dossier confidentiel" class="icon-lock" style="margin-right: 5px;"></span>{% endif %}<span class="lastname">{{ patient_record.object.last_name }}</span></td>
           <td>{{ patient_record.object.first_name }}</td>
           <td>{{ patient_record.object.birthdate|date:"d/m/Y" }}</td>

calebasse/dossiers/templates/dossiers/patientrecord_tab1_general.html

@@ -7,6 +7,7 @@
     <label>N° dossier papier :</label> {{ object.paper_id|default_if_none:"Non renseigné" }}
     <button id="update-paper-id-btn" type='button' class="icon-edit" title="Modifier"></button>
     </li>
+    <li><label>N° dossier informatique :</label> <span class="lightgray">{{ object.id }}</span></li>
     <li><label>Nom :</label> <span class="lastname">{{ object.last_name }}</span></li>
     <li><label>Prénom :</label> {{ object.first_name }}</li>
     <li><label>Genre :</label> {{ object.get_gender_display|default_if_none:"Non renseigné" }}</li>

calebasse/static/css/style.css

@@ -1402,4 +1402,8 @@ div.statistic {
 
 .clear {
     clear: both;
+}
+
+.lightgray {
+    color: #bbb;
 }

calebasse/statistics/statistics.py

@@ -672,22 +672,22 @@ def active_patients_by_state_only(statistic):
         active_states = ('SUIVI', )
     else:
         active_states = ('TRAITEMENT', )
-    patients = [(p.last_name, p.first_name, p.paper_id) \
+    patients = [(p.last_name, p.first_name, p.paper_id, p.pk) \
         for p in PatientRecord.objects.filter(service=statistic.in_service) \
             if p.get_state_at_day(statistic.in_start_date) and \
                 p.get_state_at_day(statistic.in_start_date).status.type in active_states]
     data_tables_set=[[[['En date du :', formats.date_format(statistic.in_start_date, "SHORT_DATE_FORMAT"), len(patients)]]]]
     data = []
-    data.append(['Nom', 'Prénom', 'N° Dossier'])
+    data.append(['Nom', 'Prénom', 'N° Dossier', 'N° dossier informatique'])
     p_list = []
-    for ln, fn, pid in patients:
+    for ln, fn, paper_id, pid in patients:
         ln = ln or ''
         if len(ln) > 1:
             ln = ln[0].upper() + ln[1:].lower()
         fn = fn or ''
         if len(fn) > 1:
             fn = fn[0].upper() + fn[1:].lower()
-        p_list.append((ln, fn, str(pid or '')))
+        p_list.append((ln, fn, str(paper_id or ''), {'data': pid, 'style': 'lightgray'}))
     data.append(sorted(p_list,
         key=lambda k: k[0]+k[1]))
     data_tables_set[0].append(data)
@@ -1746,6 +1746,7 @@ class Statistic(object):
         self.no_synthesis = inputs.get('no_synthesis')
 
     def get_data(self):
+        print self.name
         func = globals()[self.name]
         data = func(self)
         self.data = [[[["Date du jour", "Service", "Nom statistique"],

calebasse/statistics/templates/statistics/detail.html

@@ -28,9 +28,7 @@
         {% for values in data.1 %}
         <tr>
             {% for value in values %}
-                {% if not value|is_list %}
-                <td class="width-limited">{{ value }}</td>
-                {% else %}
+                {% if value|is_list %}
                 <td class="width-limited">
                     <ul>
                         {% for val in value %}
@@ -38,6 +36,10 @@
                         {% endfor %}
                     </ul>
                 </td>
+                {% elif value|is_dict %}
+                <td class="width-limited {{ value.style }}">{{ value.data }}</td>
+                {% else %}
+                <td class="width-limited">{{ value }}</td>
                 {% endif %}
             {% endfor %}
         </tr>

calebasse/statistics/templatetags/statistics_filters.py

@@ -6,3 +6,7 @@ register = template.Library()
 @register.filter
 def is_list(value):
     return isinstance(value, (list, tuple))
+
+@register.filter
+def is_dict(value):
+    return isinstance(value, dict)