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

améliorer gestion des photos dans RDF et dossier

Browse Source
This commit is contained in:
Phuoc
2020-01-26 21:51:37 +01:00
parent c079c9270f
commit 1faed4cb37
7 changed files with 163 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mondumas/templates/dossier/demandes.pt
View File

@@ -33,6 +33,17 @@
</form>
</div>
<div class="row">
<h2>Derniers traitements effectués</h2>
<table class="table table-condensed">
<tr tal:repeat="item log_creation">
<td>${item.date.strftime('%d %b, %H:%M')}</td>
<td>${item.proc}</td>
<td>${item.msg}</td>
</tr>
</table>
</div>
<br />
<br />

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

@@ -122,7 +122,7 @@
<li class="active"><a data-toggle="tab" href="#tab_suivi"><b>SUIVI du DOSSIER</b></a></li>
<li tal:condition="documents">
<a data-toggle="tab" href="#tab_documents"><b>DEVIS - FACTURES</b></a></li>
<li tal:condition="docs_attaches">
<li>
<a data-toggle="tab" href="#tab_attaches"><b>DOCUMENTS ATTACHES</b></a></li>
<li tal:condition="nodossier.startswith('PL')">
<a data-toggle="tab" href="#tab_rdf"><b>RAPPORTS DE RDF</b></a></li>
@@ -204,6 +204,8 @@
<p>
<a href="${request.application_url}/upload_doc/${nodossier}" class="btn btn-success" role="button">
<span class="glyphicon glyphicon-cloud-upload"></span>&nbsp;Ajouter un document</a>
<a href="${request.application_url}/upload_img/${nodossier}/0" class="btn btn-primary" role="button">
<span class="glyphicon glyphicon-picture"></span>&nbsp;Gérer les photos</a>
</p>
<table class="table table-bordered table-condensed">
<tr>

23
mondumas/templates/dossier/rdf_view.pt
View File

@@ -160,6 +160,17 @@
<label class="control-label" for="degats">Constatation des dégâts occasionnés :</label>
<br />&nbsp;&nbsp;&nbsp;${rapport.degats}
</div>
<div tal:condition="pt_name=='rdf_view'">
<p>
<a href="${request.application_url}/upload_img/${norapport}/1" class="btn btn-primary" role="button">
<span class="glyphicon glyphicon-picture"></span>&nbsp;Gérer les photos 1</a>
</p>
<br />
</div>
<p class="new-page" align="center" tal:repeat="detail photos1">
<img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}"
width="660" />
</p>
<br />
<h4 class="text-center text-primary">TRAVAUX relatifs à la DETECTION de la fuite</h4>
@@ -289,15 +300,15 @@
<br />
<div tal:condition="pt_name=='rdf_view'">
<p>
<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>
<a href="${request.application_url}/upload_img/${norapport}/2" class="btn btn-primary" role="button">
<span class="glyphicon glyphicon-picture"></span>&nbsp;Gérer les photos 2</a>
</p>
<br />
</div>
<p class="new-page" align="center" tal:repeat="detail photos">
<img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}"
width="660" />
</p>
<p class="new-page" align="center" tal:repeat="detail photos2">
<img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}"
width="660" />
</p>
<br />
<p class="new-page">.</p>

10
mondumas/templates/dossier/upload_img.pt
View File

@@ -20,7 +20,7 @@
<input id="uploadfile" name="filename" type="file" value="" required />
</div>
<div class="form-group">
<a class="btn btn-default" href="${request.route_url('rdf_view', no_id=norapport)}">
<a class="btn btn-default" href="${url_retour}">
<span class="glyphicon glyphicon-arrow-left"></span> Retour au rapport</a>
<button id="uploadButton" class="btn btn-primary" type="submit" name="form.submitted">
<i class="glyphicon glyphicon-refresh"></i> Télécharger</button>
@@ -45,9 +45,11 @@
<form id="upload_doc-form" action="${url}" method="post">
<ul tal:repeat="detail photos">
<li>
${detail.nomfichier} | ${detail.taillefichier} | <a href="/rdf_imgdel/${nochantier}/${norapport}/${detail.nomfichier}">[Suppimer cet image]</a><br />
<img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}"
width="350" align="center" />
${detail.nomfichier} | ${detail.taillefichier} | <a href="/delete_img/${nodossier}/${norapport}/${nosection}/${detail.nomfichier}">[Suppimer cet image]</a><br />
<img tal:condition="norapport=='0'" width="350" align="center"
src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${detail.nomfichier}" />
<img tal:condition="norapport!='0'" width="350" align="center"
src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}" />
</li>
</ul>
</form>