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

remplacer devis-en-attente par derniers-suivis

Browse Source
This commit is contained in:
Phuoc
2021-08-18 11:17:40 +02:00
parent 8efd6589bc
commit 52b30b5660
13 changed files with 218 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mondumas/templates/default/home.pt
View File

@@ -104,12 +104,12 @@
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/devis_en_att" tal:condition="access > 0">
<a href="${request.application_url}/dern_suivis" tal:condition="access > 0">
<div class="info-box bg-gest">
<span class="info-box-icon"><i class="glyphicon glyphicon-file"></i></span>
<div class="info-box-content">
<span class="info-box-number">DEVIS</span>
<span class="info-box-text">EN COURS </span>
<span class="info-box-number">CHANTIERS</span>
<span class="info-box-text">DERNIERS SUIVIS</span>
<span class="info-box-number"><span class="badge bg-PE">${nb_de_restants.nb_PE}</span>
<span class="badge bg-ME">${nb_de_restants.nb_ME}</span>
<span class="badge bg-PL">${nb_de_restants.nb_PL}</span></span>

108
mondumas/templates/devis/devis_en_att.pt
View File

@@ -1,108 +0,0 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<div class="row">
<form id="site-search-form" class="form-horizontal" role="form" action="${url}" method="post"
data-fv-framework="bootstrap"
data-fv-icon-valid="glyphicon glyphicon-ok"
data-fv-icon-invalid="glyphicon glyphicon-remove"
data-fv-icon-validating="glyphicon glyphicon-refresh">
<div class="form-group">
<label class="col-sm-4 control-label">Société</label>
<div class="col-xs-8">
<label class="radio-inline"><input type="radio" name="societe" value="PE"
tal:attributes="checked societe=='PE'">PE</label>
<label class="radio-inline"><input type="radio" name="societe" value="ME"
tal:attributes="checked societe=='ME'">ME</label>
<label class="radio-inline"><input type="radio" name="societe" value="PL"
tal:attributes="checked societe=='PL'">PL</label>
<label class="radio-inline"><input type="radio" name="societe" value="PO"
tal:attributes="checked societe=='PO'">PO</label>
<label class="radio-inline"><input type="radio" name="societe" value="CD"
tal:attributes="checked societe=='CD'">CD</label>
<button id="submitButton" class="btn btn-primary" type="submit" name="form.submitted">
<i class="glyphicon glyphicon-search"></i>&nbsp;Rechercher</button>
</div>
</div>
</form>
</div><!-- row -->
<br />
<div class="row">
<table id="dossiers_list" class="table table-bordered">
<thead>
<tr>
<th>Numéro</th>
<th>Date</th>
<th>Client</th>
<th>Chantier</th>
<th class="text-right">Montant</th>
<th>Sinistre</th>
<th class="text-center">Statut</th>
<th>Uti.</th>
</tr>
</thead>
</table>
</div>
<br />
<br />
<script type="text/javascript">
var dataSet = ${dt_data};
var goto_url = '${goto_url}';
var order_option = '${order_option}'
$(document).ready(function() {
$.fn.dataTable.moment('DD-MM-YYYY');
$('#dossiers_list').DataTable({
data: dataSet,
pageLength: 100,
bLengthChange: false,
language: {
url: 'https://cdn.datatables.net/plug-ins/1.10.16/i18n/French.json'
},
order: [[0, order_option]],
columnDefs: [
{ className: "text-right", "targets": [4] },
{ "targets": 0,
"render": function (data, type, full, meta) {
// ajouter un link vers le formulaire
return '<a href="' + goto_url + data + '">' + data + '</a>';
},
},
],
createdRow: function( row, data, dataIndex ){
if ( data[6] == "Humidité" ) {
$('td', row).eq(6).css('background-color', 'Crimson').css('color', 'white');
}
if ( data[6] == "Devis" || data[6] == "Commandé") {
$('td', row).eq(6).css('background-color', 'Orange');
}
if ( data[6] == "Facturé") {
$('td', row).eq(6).css('background-color', 'LightBlue');
}
if ( data[6] == "Réglée" || data[6] == "Régl part.") {
$('td', row).eq(6).css('background-color', 'LightGreen');
}
},
});
});
$('form input').on('keypress', function(e) {
var code = e.keyCode || e.which;
if (code === 13) {
e.preventDefault();
// simuler clic bouton submit
document.getElementById("submitButton").click();
}
});
</script>
</div><!-- content -->
</metal:block>

31
mondumas/templates/dossier/dern_suivis.pt Normal file
View File

@@ -0,0 +1,31 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<br />
<div class="row">
<table class="table table-bordered table-condensed">
<tr>
<th>Date</th>
<th>Dossier</th>
<th>Action - commentaire</th>
<th class="text-center">Par</th>
</tr>
<tr tal:repeat="item items">
<td>${item.DATE.strftime('%d-%m-%Y')}</td>
<td>
<a href="${request.route_url('dossier_view', nodossier=item.nodossier)}">
${item.nodossier} - ${item.C_NOM}</a>
</td>
<td>${item.COMMENT}</td>
<td class="text-center">${item.USERMAJ}</td>
</tr>
</table>
</div>
<br />
<br />
</div><!-- content -->
</metal:block>

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

@@ -65,6 +65,16 @@
data-fv-stringlength-message="20 caractères maximum" />
</div>
</div>
<div class="form-group">
<label class="col-xs-3 control-label">Observation</label>
<div class="col-xs-5">
<input class="form-control" type="text" name="C_OBS"
value="${dossier.C_OBS}" placeholder="40 caractères maximum"
data-fv-stringlength="true"
data-fv-stringlength-max="40"
data-fv-stringlength-message="40 caractères maximum" />
</div>
</div>
<h3 class="text-primary">EMAIL et TELEPHONES</h3>
<div class="form-group">

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

@@ -26,15 +26,17 @@
<td>
Etage - Code<br />
Ascenseur<br />
Observation<br />
Téléphone 1 et 2<br />
Portable 1 et 2
Portable 1 et 2<br />
</td>
<td>
${dossier.C_ETAGE} - ${dossier.C_CODE}<br />
<span tal:condition="dossier.c_ascenseur==0">NON<br /></span>
<span tal:condition="dossier.c_ascenseur!=0">OUI<br /></span>
${dossier.C_OBS}<br />
${dossier.C_TEL1} - ${dossier.C_TEL2}<br />
${dossier.C_TELP} - ${dossier.C_FAX}
${dossier.C_TELP} - ${dossier.C_FAX} <br />
</td>
</tr>
<tr>
@@ -54,14 +56,12 @@
Police<br />
Sinistre<br />
Votre référence<br />
Observation<br />
Travaux<br />
</td>
<td>
${dossier.NOPOL}<br />
${dossier.NOSIN}<br />
${dossier.VREF}<br />
${dossier.C_OBS}<br />
${dossier.TX_TRAV}<br />
</td>
</tr>
@@ -97,12 +97,12 @@
</table>
</div>
<div class="col-md-6">
<h4>Statut : ${dossier.libelle}</h4>
<br />
<h4>
Statut : <span class="label label-warning">${dossier.libelle}</span>&nbsp;&nbsp;&nbsp;
[ <a href="#" data-toggle="modal" data-target="#confirmCloture">Modifier le statut</a> ]
</h4>
<p>Dernière modif. le <b>${dossier.DATEMAJ.strftime('%d/%m/%Y à %H:%M')}</b> par <b>${dossier.USERMAJ}</b></p>
<p>
<a class="btn btn-warning" role="button" href="#"
data-toggle="modal" data-target="#confirmCloture"><span class="glyphicon glyphicon-check"></span> Modif. statut dossier</a>
</p>
</div>
</div> <!-- row -->

79
mondumas/templates/dossier/rdf_nochantier.pt Normal file
View File

@@ -0,0 +1,79 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<div tal:condition="message" tal:content="message" class="alert alert-danger" />
<br />
<div class="row">
<form id="rdf_nochantier-form" class="form-horizontal" action="${url}" method="post"
data-fv-framework="bootstrap"
data-fv-icon-valid="glyphicon glyphicon-ok"
data-fv-icon-invalid="glyphicon glyphicon-remove"
data-fv-icon-validating="glyphicon glyphicon-refresh">
<div class="form-group">
<label class="control-label col-sm-3">N° rapport</label>
<div class="col-sm-9">
<p class="form-control-static">${rapport.no_id}</p>
</div>
<label class="control-label col-sm-3">Date d'intervention</label>
<div class="col-sm-9">
<p class="form-control-static">${rapport.date_inter.strftime('%d-%m-%Y')}</p>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3">Nom du chantier actuel</label>
<div class="col-sm-9">
<p class="form-control-static text-danger">${rapport.C_QUALITE} ${rapport.C_NOM}</p>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3">No du chantier actuel</label>
<div class="col-sm-9">
<p class="form-control-static">${rapport.nochantier}</p>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Nouveau no de chantier</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="new_nochantier" name="new_nochantier"
placeholder="6 chiffres"
data-fv-numeric="true"
data-fv-numeric-message="Le numero de dossier est incorrect" />
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-sm-9">
<a class="btn btn-default" href="${request.route_url('rdf_view', no_id=norapport)}">
<span class="glyphicon glyphicon-arrow-left"></span> Annuler</a>
<button class="btn btn-primary" type="submit" name="form.submitted">
<span class="glyphicon glyphicon-ok"></span> Enregistrer</button>
</div>
</div>
</form>
</div> <!-- row -->
<br />
<br />
<br />
</div>
<div metal:fill-slot="additional_scripts">
<!-- autocomplete plugin -->
<link href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css" rel="stylesheet">
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script>
$(document).ready(function() {
$('#rdf_nochantier-form').formValidation({
framework: 'bootstrap',
excluded: ':disabled',
icon: {
valid: 'glyphicon glyphicon-ok',
invalid: 'glyphicon glyphicon-remove',
validating: 'glyphicon glyphicon-refresh'
},
});
});
</script>
</div>
</metal:block>

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

@@ -15,9 +15,13 @@
</div>
<div class="form-group">
<label class="control-label">N° dossier</label> : ${nodossier}<br />
<label class="control-label">N° rapport</label> : ${norapport}<br />
<label class="control-label">Date d'intervention</label> : ${rapport.date_inter.strftime('%d-%m-%Y')}<br />
<label class="control-label">N° dossier</label> : ${nodossier}<br />
<p tal:condition="pt_name != 'rdf_rapport'">
<a href="${request.route_url('rdf_nochantier', no_id=norapport)}"
tal:condition="access > 0">[ Changer le No dossier ]</a>
</p>
</div>
<h4 class="text-center text-primary">ADRESSE d'INTERVENTION</h4>