summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikaël Ates <mates@entrouvert.com>2015-01-12 14:55:30 (GMT)
committerMikaël Ates <mates@entrouvert.com>2015-01-12 14:55:30 (GMT)
commit9a7addab24538360209149743faca3a4c749d211 (patch)
treec713339973ff0167ecc825f3eafea6c4d56b1d8c
parentb2f07b821ce915e12060b0f904d52aceff0e9398 (diff)
downloadcalebasse-9a7addab24538360209149743faca3a4c749d211.zip
calebasse-9a7addab24538360209149743faca3a4c749d211.tar.gz
calebasse-9a7addab24538360209149743faca3a4c749d211.tar.bz2
Fix filter and display of specific patient records in not cmpp services (fixes #6282 #3137)
-rw-r--r--calebasse/facturation/templates/facturation/detail.html12
-rw-r--r--calebasse/static/js/calebasse.facturation.js3
2 files changed, 5 insertions, 10 deletions
diff --git a/calebasse/facturation/templates/facturation/detail.html b/calebasse/facturation/templates/facturation/detail.html
index 6bdebc3..cc8a780 100644
--- a/calebasse/facturation/templates/facturation/detail.html
+++ b/calebasse/facturation/templates/facturation/detail.html
@@ -411,11 +411,7 @@
</p>
<div id="dossiers-concernes">
{% for patient, detail in patients_stats %}
- {% if patient.pause or "acts_paused" in detail.keys or patient in patients_missing_policy %}
- <div class="frame dossier facturable">
- {% else %}
- <div class="frame dossier">
- {% endif %}
+ <div class="frame dossier{% if patient.pause%} not_facturable pause{% endif %}{% if "acts_paused" in detail.keys %} not_facturable acts_paused{% endif %}{% if patient in patients_missing_policy %} not_facturable missing_policy{% endif %}">
<h3><span class="patient_pk">({{ patient.pk }})</span><a href="../../dossiers/{{ patient.pk }}/view" target="_blank">
{% if patient.paper_id %}{{ patient.paper_id }} {% endif %} <span class="lastname">{{ patient.last_name }}</span> {{ patient.first_name }}</a></h3>
<div class="info">
@@ -488,11 +484,7 @@
</p>
<div id="dossiers-concernes">
{% for patient, detail in patients_stats %}
- {% if patient.pause or "acts_paused" in detail.keys or patient in patients_missing_policy or patient in patients_missing_notif %}
- <div class="frame dossier facturable">
- {% else %}
- <div class="frame dossier">
- {% endif %}
+ <div class="frame dossier{% if patient.pause%} not_facturable pause{% endif %}{% if "acts_paused" in detail.keys %} not_facturable acts_paused{% endif %}{% if patient in patients_missing_policy %} not_facturable missing_policy{% endif %}{% if patient in patients_missing_notif %} not_facturable missing_notif{% endif %}">
<h3><span class="patient_pk">({{ patient.pk }})</span><a href="../../dossiers/{{ patient.pk }}/view" target="_blank">
{% if patient.paper_id %}{{ patient.paper_id }} {% endif %} <span class="lastname">{{ patient.last_name }}</span> {{ patient.first_name }}</a></h3>
<div class="info">
diff --git a/calebasse/static/js/calebasse.facturation.js b/calebasse/static/js/calebasse.facturation.js
index 46d0c42..569a010 100644
--- a/calebasse/static/js/calebasse.facturation.js
+++ b/calebasse/static/js/calebasse.facturation.js
@@ -78,6 +78,9 @@ function rebill_dialog(url, invoice_id) {
} else if (val == 'missing_policy') {
$('#dossiers-concernes div.dossier').show();
$('#dossiers-concernes div.dossier:not(.missing_policy)').hide();
+ } else if (val == 'missing_notif') {
+ $('#dossiers-concernes div.dossier').show();
+ $('#dossiers-concernes div.dossier:not(.missing_notif)').hide();
} else if (val == 'missing_birthdate') {
$('#dossiers-concernes div.dossier').show();
$('#dossiers-concernes div.dossier:not(.missing_birthdate)').hide();