mise au point creation rdf

This commit is contained in:
2019-03-25 14:20:10 +01:00
parent 22a0fd03fd
commit e408fcc9b0
11 changed files with 126 additions and 142 deletions

View File

@@ -170,11 +170,11 @@
<div class="panel panel-default" tal:condition="nodossier.startswith('PL')">
<div class="panel-heading">
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#panel-documents">
<a data-toggle="collapse" data-parent="#accordion" href="#panel-rdf">
<span class="glyphicon glyphicon-plus"></span>&nbsp;RECHERCHE DE FUITE</a>
</h4>
</div>
<div id="panel-documents" class="panel-collapse collapse">
<div id="panel-rdf" class="panel-collapse collapse">
<div class="panel-body">
<p>
<a class="btn btn-success" role="button" href="${request.route_url('rdf_edit', nodossier=nodossier, date_inter='new')}">

View File

@@ -16,7 +16,7 @@
<th>Client</th>
<th>No sinistre</th>
<th>Auteur</th>
<th>Numéro</th>
<th>Rapport</th>
</tr>
</thead>
</table>

View File

@@ -252,14 +252,18 @@
<br />
<h4 class="text-center text-primary">PHOTOS</h4>
<br />
<div tal:repeat="detail photos">
<img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}" align="center" />
</div>
<p tal:repeat="detail photos">
<img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}"
width="800" align="center" />
</p>
<br />
<h4 class="text-center text-primary">CONCLUSIONS</h4>
<div class="form-group">
<br />&nbsp;&nbsp;&nbsp;${rapport.conclusions}
</div>
<br />
<br/>
<br/>
</div> <!-- row -->
<table class="table table-condensed ">
@@ -267,7 +271,7 @@
<td width="40%">
<p>
<label>Date du rapport :</label>
<br />${rapport.modif_le.strftime('%d-%m-%Y')}
<br />${date_rapport}
<br />
<br />
<label>Etabli par :</label>
@@ -285,8 +289,7 @@
</tr>
</table>
<br />
<br/>
<br/>
<script type="text/javascript">
$(document).ready(function() {
//afficher signature

View File

@@ -253,25 +253,27 @@
<span class="glyphicon glyphicon-cloud-upload"></span>&nbsp;Ajouter une photo</a>
</p>
<br />
<div class="fotorama" data-nav="thumbs">
<div tal:repeat="detail photos">
<img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}"
data-caption="${detail.nomfichier}" align="center" />
</div>
</div>
<p tal:repeat="detail photos">
<img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}"
width="800" align="center" />
</p>
<br />
<h4 class="text-center text-primary">CONCLUSIONS</h4>
<div class="form-group">
<br />&nbsp;&nbsp;&nbsp;${rapport.conclusions}
</div>
<div class="col-sm-6">
<p>
Date du rapport : ${rapport.modif_le.strftime('%d-%m-%Y')}<br />
Etabli par ${rapport.auteur_nom}
</p>
<div class="col-sm-5">
<p>
<label>Date du rapport :</label>
<br />${date_rapport}
<br />
<br />
<label>Etabli par :</label>
<br />${rapport.auteur_nom}
</p>
</div>
<div class="col-sm-6">
<div class="col-sm-7">
<label>Signature du client :</label>
<div tal:condition="not rapport.signature_svg">
<div id="signature"></div>

View File

@@ -29,21 +29,16 @@
</div> <!-- row -->
<h3>Photos déjà téléchargées</h3>
<div class="fotorama" data-nav="thumbs">
<div tal:repeat="detail photos">
<img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}"
data-caption="${detail.nomfichier}" align="center" />
</div>
</div>
<p tal:repeat="detail photos">
<img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}"
width="800" align="center" />
</p>
<script type="text/javascript">
$('#uploadButton').on('click', function(){
$('i.gly-spin').removeClass('gly-spin');
$('i').addClass('gly-spin');
});
$(function () {
$('.fotorama').fotorama();
});
</script>
</div>

View File

@@ -42,9 +42,6 @@
<script src="${request.static_url('mondumas:static/dist/formvalidation/js/language/fr_FR.js')}" type="text/javascript"></script>
<!-- JSignature plugin -->
<script src="${request.static_url('mondumas:static/dist/jSignature/libs/jSignature.min.js')}"></script>
<!-- fotorama.css & fotorama.js. -->
<link href="http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.4/fotorama.css" rel="stylesheet"> <!-- 3 KB -->
<script src="http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.4/fotorama.js"></script> <!-- 16 KB -->
<!-- Less -->
<script src="//cdnjs.cloudflare.com/ajax/libs/less.js/2.5.3/less.min.js" type="text/javascript"></script>

View File

@@ -1,22 +0,0 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:metal="http://xml.zope.org/namespaces/metal"
xmlns:tal="http://xml.zope.org/namespaces/tal"
lang="fr">
<head>
<title>${page_title}</title>
</head>
<body>
<img src="http://www.caes.cnrs.fr/logo.jpg" class="caes-logo" alt="CAES du CNRS" title="CAES du CNRS" />
<div metal:define-slot="content" />
<div id="footer">
<div class="well">
Siège : <a href="http://www.caes.cnrs.fr">CAES du CNRS</a> - 2, Allée Georges Méliès - 94306 Vincennes CEDEX - France
</div>
</div>
</body>
</html>