correction modif user

mondumas/templates/agenda/rdv_edit.pt

@@ -32,25 +32,15 @@
             </div>
             
 			<div class="form-group">
-				<label class="control-label col-xs-2" for="COMMENT">Commentaire 1</label>
+				<label class="control-label col-xs-2" for="COMMENT">Commentaire</label>
-				<div class="col-xs-5">
+				<div class="col-xs-10">
 					<input class="form-control" type="text" id=".COMMENT" name="COMMENT" value="${rdv.COMMENT}"
-						placeholder="30 caractères maximum" 
+						placeholder="65 caractères maximum" 
 						data-fv-notempty="true"
 						data-fv-notempty-message="Un commentaire est obligatoire"
 						data-fv-stringlength="true"
-						data-fv-stringlength-max="30"
+						data-fv-stringlength-max="65"
-						data-fv-stringlength-message="30 caractères maximum" />
+						data-fv-stringlength-message="65 caractères maximum" />
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="control-label col-xs-2" for="COMMENTVI">Commentaire 2</label>
-				<div class="col-xs-5">
-					<input class="form-control" type="text" id="COMMENTVI" name="COMMENTVI" value="${rdv.COMMENTVI}"
-						placeholder="30 caractères maximum" 
-						data-fv-stringlength="true"
-						data-fv-stringlength-max="30"
-						data-fv-stringlength-message="30 caractères maximum" />
 				</div>
 			</div>
 

mondumas/templates/dossier/dossier_view.pt

@@ -144,11 +144,11 @@
                                     ${detail.DATE.strftime('%d-%m-%Y')}</a>
                             </td>
                             <td tal:condition="detail.COMMENT.startswith('!!')" class="text-danger">
-                                <b>${detail.COMMENT} ${detail.COMMENTVI}</b>
+                                <b>${detail.COMMENT}</b>
                             </td>
                             <td tal:condition="not detail.COMMENT.startswith('!!')">
-                                ${detail.COMMENT} ${detail.COMMENTVI}
+                                ${detail.COMMENT}
-                            </td>
+							</td>
                             <td>
                                 <span tal:condition="detail.rdv_debut==None"></span>
                                 <span tal:condition="detail.rdv_debut!=None">

mondumas/templates/dossier/suivi_edit.pt

@@ -11,25 +11,15 @@
 			data-fv-icon-validating="glyphicon glyphicon-refresh">
 
 			<div class="form-group">
-				<label class="control-label col-xs-2" for="comment">Commentaire 1</label>
+				<label class="control-label col-xs-2" for="comment">Commentaire</label>
-				<div class="col-xs-5">
+				<div class="col-xs-10">
 					<input class="form-control" type="text" id="COMMENT" name="COMMENT" value="${suivi.COMMENT}"
-						placeholder="30 caractères maximum" 
+						placeholder="65 caractères maximum" 
 						data-fv-notempty="true"
 						data-fv-notempty-message="Un commentaire est obligatoire"
 						data-fv-stringlength="true"
-						data-fv-stringlength-max="30"
+						data-fv-stringlength-max="65"
-						data-fv-stringlength-message="30 caractères maximum" />
+						data-fv-stringlength-message="65 caractères maximum" />
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="control-label col-xs-2" for="commentvi">Commentaire 2</label>
-				<div class="col-xs-5">
-					<input class="form-control" type="text" id="COMMENTVI" name="COMMENTVI" value="${suivi.COMMENTVI}"
-						placeholder="30 caractères maximum" 
-						data-fv-stringlength="true"
-						data-fv-stringlength-max="30"
-						data-fv-stringlength-message="30 caractères maximum" />
 				</div>
 			</div>
 

mondumas/templates/parametres/user_edit.pt

@@ -11,9 +11,9 @@
 			data-fv-icon-validating="glyphicon glyphicon-refresh">
 
 			<div class="form-group">
-				<label class="control-label col-xs-2" for="cd_uti">Identifiant</label>
+				<label class="control-label col-xs-2" for="CD_UTI">Identifiant</label>
 				<div class="col-xs-2">
-					<input class="form-control" type="text" id="cd_uti" name="cd_uti" value="${individu.CD_UTI}"
+					<input class="form-control" type="text" id="CD_UTI" name="CD_UTI" value="${individu.CD_UTI}"
 						placeholder="10 caractères maximum" 
 						data-fv-notempty="true"
 						data-fv-notempty-message="L'identifiant est obligatoire"
@@ -23,9 +23,9 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="control-label col-xs-2" for="intitule">Nom et prénom</label>
+				<label class="control-label col-xs-2" for="NOM">Nom et prénom</label>
 				<div class="col-xs-5">
-					<input class="form-control" type="text" id="intitule" name="nom" value="${individu.NOM}"
+					<input class="form-control" type="text" id="NOM" name="NOM" value="${individu.NOM}"
 						placeholder="30 caractères maximum" 
 						data-fv-notempty="true"
 						data-fv-notempty-message="Le nom est obligatoire"
@@ -37,8 +37,8 @@
 			<div class="form-group">
 				<label class="col-xs-2 control-label">Email</label>
 				<div class="col-xs-5">
-					<input class="form-control" type="text" name="email" 
+					<input class="form-control" type="text" name="email" value="${individu.email}"
-						value="${individu.email}" placeholder="55 caractères maximum" 
+						placeholder="55 caractères maximum" 
 						data-fv-emailaddress="true"
 						data-fv-emailaddress-message="L'adresse email n'est pas valide" />
 				</div>

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'

mondumas/views/parametres.py

@@ -78,8 +78,8 @@ def user_edit(request):
     if cd_uti == '0':
         # nouveau
         individu = {}
-        individu['cd_uti'] = '0'
+        individu['CD_UTI'] = '0'
-        individu['nom'] = ''
+        individu['NOM'] = ''
         individu['email'] = ''
         individu['access'] = '0 | Production'
         individu['actif'] = 1