Révision a869df8f
Ajouté par Mikaël Ates (de retour le 29 avril) il y a plus de 9 ans
| calebasse/dossiers/forms.py | ||
|---|---|---|
| 173 | 173 |
model = PatientRecord |
| 174 | 174 |
fields = ('paper_id', )
|
| 175 | 175 |
|
| 176 |
class AddrCommentForm(ModelForm): |
|
| 177 |
class Meta: |
|
| 178 |
model = PatientRecord |
|
| 179 |
fields = ('addresses_contacts_comment', )
|
|
| 180 |
widgets = {
|
|
| 181 |
'addresses_contacts_comment': forms.Textarea(attrs={'cols': 50, 'rows': 2}),
|
|
| 182 |
} |
|
| 183 |
|
|
| 176 | 184 |
class PolicyHolderForm(ModelForm): |
| 177 | 185 |
class Meta: |
| 178 | 186 |
model = PatientRecord |
| 179 |
fields = ('policyholder', 'contact_comment')
|
|
| 180 |
widgets = {
|
|
| 187 |
fields = ('policyholder',)
|
|
| 188 |
widgets = {
|
|
| 181 | 189 |
'policyholder': forms.RadioSelect(), |
| 182 |
'contact_comment': forms.Textarea(attrs={'cols': 50, 'rows': 2}),
|
|
| 183 | 190 |
} |
| 184 | 191 |
|
| 185 | 192 |
class PatientContactForm(ModelForm): |
| calebasse/dossiers/templates/dossiers/generate_rtf_form.html | ||
|---|---|---|
| 24 | 24 |
</ul> |
| 25 | 25 |
|
| 26 | 26 |
<h3>Adresse</h3> |
| 27 |
<p><strong>Commentaire :</strong> <br /> |
|
| 28 |
{{ object.policyholder.contact_comment }}
|
|
| 29 |
</p> |
|
| 27 |
|
|
| 28 |
{% if object.addresses_contacts_comment %}<p>Commentaire : <strong>{{ object.addresses_contacts_comment }}</strong></p>{% endif %}
|
|
| 30 | 29 |
|
| 31 | 30 |
<ul class="addresses"> |
| 32 | 31 |
{% for address in object.addresses.all %}
|
| 33 | 32 |
<li> |
| 34 | 33 |
<span>{{ address.display_name }} {% if address.phone %}(Tél : {{ address.phone }}){% endif %}</span>
|
| 35 |
<pre>{{ address.comment }}</pre>
|
|
| 34 |
{% if address.comment %}<p><em>Commentaire : {{ address.comment }}</em></p>{% endif %}
|
|
| 36 | 35 |
<ul> |
| 37 | 36 |
{% if address.recipient %}
|
| 38 | 37 |
<li><input type="radio" name="contact" id="contact_{{ address.id }}_{{ contact.id }}"
|
| calebasse/dossiers/templates/dossiers/patientrecord_print.html | ||
|---|---|---|
| 56 | 56 |
{% else %}
|
| 57 | 57 |
<label class="highlight">Aucun lieu de vie d'indiqué</label> |
| 58 | 58 |
{% endif %}
|
| 59 |
{% if object.contact_comment %}
|
|
| 60 |
<p>{{ object.contact_comment }}</p>
|
|
| 61 |
{% endif %}
|
|
| 59 |
{% if object.addresses_contacts_comment %}<p>Commentaire : <strong>{{ object.addresses_contacts_comment }}</strong></p>{% endif %}
|
|
| 62 | 60 |
{% if object.addresses.all %}
|
| 63 | 61 |
<ul> |
| 64 | 62 |
{% for address in object.addresses.all %}
|
| calebasse/dossiers/templates/dossiers/patientrecord_tab1_general.html | ||
|---|---|---|
| 20 | 20 |
{% else %}
|
| 21 | 21 |
<label class="highlight">Aucun lieu de vie n'est indiqué.</label> |
| 22 | 22 |
{% endif %}
|
| 23 |
{% if object.contact_comment %}<p>{{ object.contact_comment|linebreaks }}</p>{% endif %}
|
|
| 23 |
{% if object.addresses_contacts_comment %}<p><strong>{{ object.addresses_contacts_comment }}</strong></p>{% endif %}
|
|
| 24 | 24 |
{% if object.addresses.all %}
|
| 25 | 25 |
<ul> |
| 26 | 26 |
{% for address in object.addresses.all %}
|
| calebasse/dossiers/templates/dossiers/patientrecord_tab3_adresses.html | ||
|---|---|---|
| 5 | 5 |
{% load dossiers %}
|
| 6 | 6 |
{% block content %}
|
| 7 | 7 |
<div id="tabs-3"> |
| 8 |
<form method="post" action="tab3" id="policyholder-form" class="patientrecordform">{% csrf_token %}
|
|
| 9 | 8 |
<p> |
| 10 | 9 |
{% if nb_place_of_lifes == 1 %}
|
| 11 | 10 |
<span>Un lieu de vie unique est indiqué</span> |
| ... | ... | |
| 15 | 14 |
<span class="highlight">Aucun lieu de vie n'est indiqué.</span> |
| 16 | 15 |
{% endif %}
|
| 17 | 16 |
</p> |
| 17 |
<form method="post" action="tab3" class="autosubmit-form patientrecordform">{% csrf_token %}
|
|
| 18 | 18 |
<p> |
| 19 | 19 |
<label>Commentaire <button class="save enable-on-change btn-maj">✔</button></label> |
| 20 |
{{ forms.policyholder.contact_comment }}
|
|
| 20 |
{{ forms.comment.addresses_contacts_comment }}
|
|
| 21 | 21 |
</p> |
| 22 |
</form> |
|
| 22 | 23 |
<p> |
| 23 | 24 |
<button type="button" id="new-address-btn" class="icon-home-space">Nouvelle adresse</button> |
| 24 | 25 |
<button type="button" id="new-contact-btn" class="icon-user-space">Nouveau contact</button> |
| 25 | 26 |
</p> |
| 26 | 27 |
|
| 28 |
<form method="post" action="tab3" class="autosubmit-form patientrecordform">{% csrf_token %}
|
|
| 29 |
|
|
| 27 | 30 |
<div class="contact patient"> |
| 28 | 31 |
<h4 class="icon-user-space">Patient</h4> |
| 29 | 32 |
<div class="right">Assuré |
| calebasse/dossiers/views.py | ||
|---|---|---|
| 334 | 334 |
model = PatientRecord |
| 335 | 335 |
forms_classes = {
|
| 336 | 336 |
'contact': forms.PatientContactForm, |
| 337 |
'policyholder': forms.PolicyHolderForm |
|
| 337 |
'policyholder': forms.PolicyHolderForm, |
|
| 338 |
'comment' : forms.AddrCommentForm, |
|
| 338 | 339 |
} |
| 339 | 340 |
template_name = 'dossiers/patientrecord_tab3_adresses.html' |
| 340 | 341 |
success_url = './view#tab=2' |
| calebasse/static/css/dossiers.css | ||
|---|---|---|
| 99 | 99 |
width: 85%; |
| 100 | 100 |
} |
| 101 | 101 |
|
| 102 |
#id_policyholder-contact_comment {
|
|
| 102 |
#id_comment-addresses_contacts_comment {
|
|
| 103 | 103 |
margin: 0; |
| 104 | 104 |
} |
| 105 | 105 |
|
| calebasse/static/js/calebasse.dossiers.js | ||
|---|---|---|
| 201 | 201 |
}); |
| 202 | 202 |
} |
| 203 | 203 |
$('.autosubmit').on('click', function() {
|
| 204 |
$('#policyholder-form').submit();
|
|
| 204 |
$('.autosubmit-form').submit();
|
|
| 205 | 205 |
}); |
| 206 | 206 |
$('#new-contact-btn').click(function() {
|
| 207 | 207 |
generic_ajaxform_dialog('contact/new', 'Ajouter un contact',
|
| ... | ... | |
| 475 | 475 |
}); |
| 476 | 476 |
|
| 477 | 477 |
})(window.jQuery) |
| 478 |
|
|
Formats disponibles : Unified diff
dossiers: use the new comment field for addresses and contacts (fixes #4372).