ajout suppression des photos, bouton valider rapport

This commit is contained in:
2019-04-22 18:11:53 +02:00
parent e3c62af198
commit 18fb3c5ceb
9 changed files with 118 additions and 55 deletions

View File

@@ -289,8 +289,8 @@
<br />
<div tal:condition="pt_name=='rdf_view'">
<p>
<a href="${request.application_url}/upload_img/${norapport}" class="btn btn-success" role="button">
<span class="glyphicon glyphicon-cloud-upload"></span>&nbsp;Ajouter une photo</a>
<a href="${request.application_url}/upload_img/${norapport}" class="btn btn-primary" role="button">
<span class="glyphicon glyphicon-picture"></span>&nbsp;Gérer les photos</a>
</p>
<br />
</div>
@@ -308,7 +308,7 @@
<table class="table table-condensed ">
<tr>
<td>
<td width="40%">
<label>Date du rapport :</label>&nbsp;&nbsp;${date_rapport}
<br />
<br />
@@ -316,8 +316,11 @@
<br />${rapport.auteur_nom}
<br />
<br />
<label>Relu par le superviseur :</label>
<br />Jean-Marc PENEL
<div tal:condition="date_relu!=''">
<label>Relu par le superviseur :</label>
<br />Jean-Marc PENEL
<br />le ${date_relu}
</div>
</td>
<td>
<label>Signature du client :</label>
@@ -334,12 +337,17 @@
<span class="glyphicon glyphicon-arrow-left"></span> Retour Dossier</a>
<a class="btn btn-primary" href="/rdf_edit/${nodossier}/${rapport.date_inter.strftime('%Y-%m-%d')}">
<span class="glyphicon glyphicon-pencil"></span> Modifier</a>
<button class="btn btn-danger" type="submit" name="form.delete" tal:condition="not rapport.signature_svg and date_rapport==''">
<button class="btn btn-danger" type="submit" name="form.delete" tal:condition="not rapport.signature_svg and date_relu==''">
<span class="glyphicon glyphicon-remove"></span> Supprimer</button>
<a class="btn btn-default" href="/rdf_rapport/${rapport.no_id}">
<span class="glyphicon glyphicon-file"></span> Aperçu PDF</a>
<button class="btn btn-warning" type="submit" name="form.generate">
<span class="glyphicon glyphicon-file"></span> Générer PDF</button>
<button class="btn btn-success" type="submit" name="form.validate" tal:condition="(logged_in=='JMP' or logged_in=='CAO') and date_relu==''">
<span class="glyphicon glyphicon-remove"></span> Valider</button>
<div tal:condition="(logged_in=='MD' or logged_in=='CAO') and date_relu!=''">
<br />
<a class="btn btn-default" href="/rdf_rapport/${rapport.no_id}">
<span class="glyphicon glyphicon-file"></span> Aperçu PDF</a>
<button class="btn btn-warning" type="submit" name="form.generate">
<span class="glyphicon glyphicon-file"></span> Générer PDF</button>
</div>
</div>
</div>