entrouvert
/
calebasse
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

dossiers: improve patient contact form

This commit is contained in:
Jérôme Schneider 2012-12-07 12:51:26 +01:00
parent 729480efb2
commit 2523f48f02
9 changed files with 82 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calebasse/agenda/views.py
View File

@ -326,3 +326,4 @@ class JoursNonVerrouillesView(TemplateView):
days_not_locked.append(current_day)
context['days_not_locked'] = days_not_locked
return context

29
calebasse/choices.py Normal file
View File

@ -0,0 +1,29 @@
# -*- coding: utf-8 -*-
LARGE_REGIME_CHOICES=(
('01', '01 REGIME GENERAL'),
('02', '02 REGIME AGRICOLE'),
('03', '03 ASSURANCE MALADIE DES PROFESSIONS INDEPENDANTES (AMPI)'),
('04', '04 S.N.C.F'),
('05', '05 R.A.T.P'),
('06', '06 ETABLISSEMENT NATIONAL DES INVALIDES DE LA MARINE (ENIM)'),
('07', '07 MINEURS ET ASSIMILES'),
('08', '08 MILITAIRES DE CARRIERE'),
('09', '09 PERSONNEL DE LA BANQUE DE FRANCE'),
('10', '10 CLERS ET EMPLOYES DE NOTAIRES'),
('12', "12 CHAMBRE DE COMMERCE ET D'INDUSTRIE DE PARIS"),
('14', '14 ASSEMBLEE NATIONALE'),
('15', '15 SENAT'),
('16', '16 PORT AUTONOME DE BORDEAUX'),
('17', "17 CAISSE DES FRANCAIS A L'ETRANGER"),
('80', '80 MINISTERE DES ANCIENS COMBATTANTS'),
('90', "90 CAISSE D'ASSURANCE VIEILLESSE, INVALIDITE ET MALADIE DES CULTES"),
('91', "91 MUTUELLE GENERALE DE L'EDUCATION NATIONALE - M.G.E.N -"),
('92', "92 MUTUELLE GENERALE - M.G - (ex PTT)"),
('93', "93 MUTUELLE GENERALE DE LA POLICE"),
('94', "94 MUTUELLES DES FONCTIONNAIRES - SLI -"),
('95', '95 M.N. HOSPITALIERS'),
('96', "96 MUTUELLE NATIONALE DE L'AVIATION ET DE LA MARINE"),
('99', '99 AUTRES MUTUELLES'),
)

4
calebasse/dossiers/forms.py
View File

@ -87,7 +87,7 @@ class PatientContactForm(ModelForm):
class Meta:
model = PatientContact
widgets = {
'contact_comment': forms.Textarea(attrs={'cols': 40, 'rows': 4}),
'contact_comment': forms.Textarea(attrs={'cols': 50, 'rows': 2}),
'key': forms.TextInput(attrs={'size': 4}),
'twinning_rank': forms.TextInput(attrs={'size': 4}),
}
@ -97,7 +97,7 @@ class PatientAddressForm(ModelForm):
class Meta:
model = PatientAddress
widgets = {
'comment': forms.Textarea(attrs={'cols': 40, 'rows': 3}),
'comment': forms.Textarea(attrs={'cols': 40, 'rows': 4}),
'zip_code': forms.TextInput(attrs={'size': 10}),
'number': forms.TextInput(attrs={'size': 10}),
}

6
calebasse/dossiers/models.py
View File

@ -11,6 +11,7 @@ from django.contrib.auth.models import User
import reversion
from calebasse.choices import LARGE_REGIME_CHOICES
from calebasse.models import PhoneNumberField, ZipCodeField
from calebasse.personnes.models import People
from calebasse.ressources.models import (ServiceLinkedAbstractModel,
@ -199,8 +200,6 @@ class PatientContact(People):
social_security_id = models.CharField(max_length=13, verbose_name=u"NRI")
birthdate = models.DateField(verbose_name=u"Date de naissance",
null=True, blank=True)
key = models.IntegerField(verbose_name=u'Clé',
null=True, blank=True)
twinning_rank = models.IntegerField(verbose_name=u"Rang (gémellité)",
null=True, blank=True)
thirdparty_payer = models.BooleanField(verbose_name=u'Tiers-payant',
@ -209,6 +208,9 @@ class PatientContact(People):
null=True, blank=True)
end_rights = models.DateField(verbose_name=u"Fin de droits",
null=True, blank=True)
large_regime = models.CharField(verbose_name=u'Grand régime',
null=True, blank=True, max_length=2,
choices=LARGE_REGIME_CHOICES)
healt_fund = models.ForeignKey('ressources.HealthFund',
verbose_name=u"Caisse d'assurance maladie",
null=True, blank=True)

6
calebasse/dossiers/templates/dossiers/generic_form.html Normal file
View File

@ -0,0 +1,6 @@
{% load widget_tweaks %}
<form action="{{ request.get_full_path }}" method="post">
{% csrf_token %}
{{ form.as_p }}
</form>

44
calebasse/dossiers/templates/dossiers/patientcontact_new.html
View File

@ -24,6 +24,11 @@
</td>
</tr>
<tr>
<td>
{{ form.birthdate.label_tag }} :<br>
{{ form.birthdate }}
{{ form.birthdate.errors }}
</td>
<td>
{{ form.mobile.label_tag }} :<br>
{{ form.mobile }}
@ -36,23 +41,11 @@
</td>
</tr>
<tr>
<td>
{{ form.birthdate.label_tag }} :<br>
{{ form.birthdate }}
{{ form.birthdate.errors }}
</td>
<td>
{{ form.social_security_id.label_tag }} :<br>
{{ form.social_security_id }}
{{ form.social_security_id.errors }}
</td>
<td>
{{ form.key.label_tag }} :<br>
{{ form.key }}
{{ form.key.errors }}
</td>
</tr>
<tr>
<td>
{{ form.begin_rights.label_tag }} :<br>
{{ form.begin_rights }}
@ -63,11 +56,6 @@
{{ form.end_rights }}
{{ form.end_rights.errors }}
</td>
<td>
{{ form.twinning_rank.label_tag }} :<br>
{{ form.twinning_rank }}
{{ form.twinning_rank.errors }}
</td>
</tr>
<tr>
<td>
@ -80,14 +68,26 @@
{{ form.healt_center }}
{{ form.healt_center.errors }}
</td>
<td>
{{ form.large_regime.label_tag }} :<br>
{{ form.large_regime }}
{{ form.large_regime.errors }}
</td>
</tr>
<tr>
<td>
{{ form.twinning_rank.label_tag }} :<br>
{{ form.twinning_rank }}
{{ form.twinning_rank.errors }}
</td>
<td>
{{ form.addresses.label_tag }} :
{{ form.addresses }}
{{ form.addresses.errors }}
</td>
</tbody>
</table>
<p>
{{ form.addresses.label_tag }}
{{ form.addresses }}
{{ form.addresses.errors }}
</p>
<p>
{{ form.contact_comment.label_tag }}
{{ form.contact_comment }}
{{ form.contact_comment.errors }}

30
calebasse/fixtures/dossiers.json
View File

@ -357,7 +357,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": null
}
@ -376,7 +376,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": null
}
@ -397,7 +397,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": "jeanne.darc@gmail.com"
}
@ -418,7 +418,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": "john.doe@gmail.com"
}
@ -439,7 +439,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": "jean.dupond@gmail.com"
}
@ -458,7 +458,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": null
}
@ -479,7 +479,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": "guillaume.bouclier@yahoo.com"
}
@ -500,7 +500,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": "andre.hendrickx@toto.com"
}
@ -521,7 +521,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": "jack.itchan@hotmail.com"
}
@ -540,7 +540,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": null
}
@ -559,7 +559,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": null
}
@ -578,7 +578,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": null
}
@ -597,7 +597,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": null
}
@ -619,7 +619,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": "claudia.schiffer@yahoo.com"
}
@ -638,7 +638,7 @@
"end_rights": null,
"contact_comment": null,
"twinning_rank": null,
"key": null,
"large_regime": null,
"begin_rights": null,
"email": null
}

4
calebasse/static/css/style.css
View File

@ -1078,8 +1078,6 @@ table#schedules {
margin-left: 0px;
}
<<<<<<< HEAD
div.worker-agenda h3,
div.worker-agenda .remarque {
display: none;
@ -1127,3 +1125,5 @@ input#date-selector {
.ui-datepicker {
z-index: 9999 !important;
}
#id_large_regime { width: 240px; }

2
calebasse/static/js/calebasse.dossiers.js
View File

@ -108,7 +108,7 @@ function state_dialog(url, state_title, state_type) {
});
$('#new-contact-btn').click(function() {
generic_ajaxform_dialog('contact/new', 'Ajouter un contact',
'#new-contact-dlg', '750px', 'Ajouter');
'#new-contact-dlg', '800px', 'Ajouter');
});
$('.del-address').click(function() {