phuoc/dumas_gestion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correction modif user

Browse Source
This commit is contained in:
Phuoc
2018-12-14 09:51:39 +01:00
parent b4552076e5
commit a900a19536
6 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mondumas/templates/agenda/rdv_edit.pt
View File

@@ -32,25 +32,15 @@
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="COMMENT">Commentaire 1</label>
<div class="col-xs-5">
<label class="control-label col-xs-2" for="COMMENT">Commentaire</label>
<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-message="30 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" />
data-fv-stringlength-max="65"
data-fv-stringlength-message="65 caractères maximum" />
</div>
</div>

4
mondumas/templates/dossier/dossier_view.pt
View File

@@ -144,10 +144,10 @@
${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>
<span tal:condition="detail.rdv_debut==None"></span>

20
mondumas/templates/dossier/suivi_edit.pt
View File

@@ -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>
<div class="col-xs-5">
<label class="control-label col-xs-2" for="comment">Commentaire</label>
<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-message="30 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" />
data-fv-stringlength-max="65"
data-fv-stringlength-message="65 caractères maximum" />
</div>
</div>

12
mondumas/templates/parametres/user_edit.pt
View File

@@ -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"
value="${individu.email}" placeholder="55 caractères maximum"
<input class="form-control" type="text" name="email" value="${individu.email}"
placeholder="55 caractères maximum"
data-fv-emailaddress="true"
data-fv-emailaddress-message="L'adresse email n'est pas valide" />
</div>

1
mondumas/views/dossier.py
View File

@@ -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'

4
mondumas/views/parametres.py
View File

@@ -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