diff --git a/mondumas/templates/agenda/rdv_edit.pt b/mondumas/templates/agenda/rdv_edit.pt index ff8ada9..eda8b42 100644 --- a/mondumas/templates/agenda/rdv_edit.pt +++ b/mondumas/templates/agenda/rdv_edit.pt @@ -32,25 +32,15 @@
- -
+ +
-
-
-
- -
- + data-fv-stringlength-max="65" + data-fv-stringlength-message="65 caractères maximum" />
diff --git a/mondumas/templates/dossier/dossier_view.pt b/mondumas/templates/dossier/dossier_view.pt index 8ca39cb..4f9eeae 100644 --- a/mondumas/templates/dossier/dossier_view.pt +++ b/mondumas/templates/dossier/dossier_view.pt @@ -144,11 +144,11 @@ ${detail.DATE.strftime('%d-%m-%Y')} - ${detail.COMMENT} ${detail.COMMENTVI} + ${detail.COMMENT} - ${detail.COMMENT} ${detail.COMMENTVI} - + ${detail.COMMENT} + diff --git a/mondumas/templates/dossier/suivi_edit.pt b/mondumas/templates/dossier/suivi_edit.pt index 0eb2c70..7079c6f 100644 --- a/mondumas/templates/dossier/suivi_edit.pt +++ b/mondumas/templates/dossier/suivi_edit.pt @@ -11,25 +11,15 @@ data-fv-icon-validating="glyphicon glyphicon-refresh">
- -
+ +
-
-
-
- -
- + data-fv-stringlength-max="65" + data-fv-stringlength-message="65 caractères maximum" />
diff --git a/mondumas/templates/parametres/user_edit.pt b/mondumas/templates/parametres/user_edit.pt index f9a9c68..074c5ce 100644 --- a/mondumas/templates/parametres/user_edit.pt +++ b/mondumas/templates/parametres/user_edit.pt @@ -11,9 +11,9 @@ data-fv-icon-validating="glyphicon glyphicon-refresh">
- +
-
- +
-
-
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py index b5a4cd9..ad51044 100644 --- a/mondumas/views/dossier.py +++ b/mondumas/views/dossier.py @@ -176,7 +176,6 @@ def suivi_edit(request): # nouveau suivi = {} suivi['COMMENT'] = '' - suivi['COMMENTVI'] = '' suivi['USERMAJ'] = logged_in.upper() suivi['DATEMAJ'] = datetime.now() page_title= 'Nouveau suivi' diff --git a/mondumas/views/parametres.py b/mondumas/views/parametres.py index 06df6ba..91976fe 100644 --- a/mondumas/views/parametres.py +++ b/mondumas/views/parametres.py @@ -78,8 +78,8 @@ def user_edit(request): if cd_uti == '0': # nouveau individu = {} - individu['cd_uti'] = '0' - individu['nom'] = '' + individu['CD_UTI'] = '0' + individu['NOM'] = '' individu['email'] = '' individu['access'] = '0 | Production' individu['actif'] = 1 @@ -98,7 +98,7 @@ def user_edit(request): for param, db_value in individu.items(): if param in request.params and request.params[param] != db_value: new_values[param] = request.params[param] - + # actif coché ? if 'actif' in request.params: new_values['actif'] = 1