ajout module Default et suivi_edit.pt

This commit is contained in:
2018-11-27 17:33:50 +01:00
parent 4980349d26
commit 4bc65dae42
19 changed files with 398 additions and 185 deletions

View File

@@ -1,14 +1,12 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<div class="container">
<div class="container">
<div class="form-group">
<div class="row">
<form method="POST" id="frm">
<div class="col-md-2">
<a class="btn btn-default" role="button" href="/">
<span class="glyphicon glyphicon-chevron-left"></span> Retour</a>
</div>
<div class="alert alert-warning" tal:condition="message" tal:content="message" />
<div class="row">
<form method="POST" id="frm" class="form-horizontal">
<div class="form-group">
<div class="col-md-4">
<select class="form-control" id="agenda" name="agenda" onChange="$('#frm').submit()">
<div tal:repeat="item agendas">
@@ -16,28 +14,36 @@
</div>
</select>
</div>
<label class="control-label col-md-2">Dossier en cours :</label>
<div class="col-md-6">
<p>
<span class="label" style="background-color:LightYellow; color:black;">RDV Peinture</span>&nbsp;
<span class="label" style="background-color:Gold; color:black;">RDV Menuiserie</span>&nbsp;
<span class="label" style="background-color:LightGreen; color:black;">RDV Plomberie</span>&nbsp;
<span class="label" style="background-color:LightBlue; color:black;">RDV Plomberie</span>&nbsp;
</p>
<div class="input-group">
<input class="form-control" type="text" name="dossier" value="${mem_nodossier} - ${mem_nomdossier}" readonly />
<div class="input-group-btn">
<a href="${url_select}" class="btn btn-primary">
<span class="glyphicon glyphicon-search"></span></a>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</form>
</div>
<br />
<div class="container">
<div id="calendar"></div>
</div>
<br />
<p align="center">
<span class="label" style="background-color:LightYellow; color:black;">RDV Peinture</span>&nbsp;
<span class="label" style="background-color:Gold; color:black;">RDV Menuiserie</span>&nbsp;
<span class="label" style="background-color:LightGreen; color:black;">RDV Plomberie</span>&nbsp;
<span class="label" style="background-color:LightBlue; color:black;">RDV Plomberie</span>&nbsp;
</p>
<br />
</div>
<script>
$(document).ready(function() {
$('#calendar').fullCalendar({
schedulerLicenseKey: 'GPL-My-Project-Is-Open-Source',
locale: 'fr',
header: {
left: 'agendaDay agendaWeek month listMonth',
@@ -50,6 +56,9 @@ $(document).ready(function() {
minTime: "07:00:00",
maxTime: "21:00:00",
events:${fullcalendar_events},
eventRender: function(event, element){
element.find('.fc-title').append("<br/>" + event.description);
}
});
});
</script>

View File

@@ -1,161 +0,0 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<br />
<!-- ENTETE -->
<div class="row">
<!-- CHANTIER -->
<div class="col-md-6">
<table class="table table-condensed ">
<tr>
<td><h4>CHANTIER</h4></td>
<td>
<h4>${dossier.C_QUALITE} ${dossier.C_NOM}</h4>
${dossier.C_ADR}<br />
<span tal:condition="dossier.C_ADR2">${dossier.C_ADR2}<br /></span>
${dossier.C_CP} ${dossier.C_VILLE}<br />
</td>
</tr>
<tr>
<td>
Etage - Code<br />
Tél. domicile - prof.<br />
Tél. mobile - fax
</td>
<td>
${dossier.C_ETAGE} - ${dossier.C_CODE}<br />
${dossier.C_TEL1} - ${dossier.C_TEL2}<br />
${dossier.C_TELP} - ${dossier.C_FAX}
</td>
</tr>
<tr>
<td>
Cabinet<br />
Expert<br />
Référence expert
</td>
<td>
${dossier.nom_cabinet}<br />
${dossier.nom_expert}<br />
${dossier.REF_EXPERT}<br />
</td>
</tr>
<tr>
<td>
Police<br />
Sinistre<br />
Votre référence<br />
</td>
<td>
${dossier.NOPOL}<br />
${dossier.NOSIN}<br />
${dossier.VREF}<br />
</td>
</tr>
</table>
</div>
<!-- Mon compte -->
<div class="col-md-6 well">
<table class="table table-condensed ">
<tr>
<td><h4>CLIENT</h4></td>
<td>
<h4>${dossier.QUALITE} ${dossier.NOM}</h4>
${dossier.ADRESSE}<br />
<span tal:condition="dossier.ADRESSE2">${dossier.ADRESSE2}<br /></span>
${dossier.CP} ${dossier.VILLE}<br />
</td>
</tr>
<tr>
<td>
Responsable<br />
Tél. 1 - 2<br />
Tél. mobile - fax
</td>
<td>
${dossier.NOMRESP}<br />
${dossier.TEL1} - ${dossier.TEL2}<br />
${dossier.TELP} - ${dossier.FAX}
</td>
</tr>
</table>
</div>
<h4>Statut : ${dossier.STATUS}</h4>
</div> <!-- row -->
<div class="panel-group" id="accordion">
<!-- PANEL SUIVI -->
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#panel-suivi">
<span class="glyphicon glyphicon-arrow-down"></span>&nbsp;SUIVI</a>
</h4>
</div>
<div id="panel-suivi" class="panel-collapse collapse">
<div class="panel-body">
<p><a class="btn btn-success" role="button" href="${request.route_url('rdv_edit', nodossier=nodossier, nolig='0')}">
<span class="glyphicon glyphicon-plus"></span> Nouvelle ligne</a></p>
<table class="table table-bordered">
<tr>
<th>Date</th>
<th>Action</th>
<th>Rendez-vous</th>
<th class="text-center">Par</th>
</tr>
<tr tal:repeat="detail details">
<td>${detail.DATE.strftime('%d/%m/%Y')}</td>
<td tal:condition="detail.COMMENT.startswith('!!')" class="text-danger">
<b>${detail.COMMENT} ${detail.COMMENTVI}</b>
</td>
<td tal:condition="not detail.COMMENT.startswith('!!')">
${detail.COMMENT} ${detail.COMMENTVI}
</td>
<td>
<span tal:condition="detail.rdv_debut==None"></span>
<span tal:condition="detail.rdv_debut!=None">
<a href="${request.route_url('rdv_edit', nodossier=nodossier, nolig=detail.NOLIG)}">
${detail.rdv_debut.strftime('%d/%m/%Y %H:%M')}</a>
avec ${detail.LISTE}
</span>
</td>
<td class="text-center">${detail.USERMAJ}</td>
</tr>
</table>
</div>
</div>
</div>
<!-- PANEL SUIVI -->
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#panel-documents">
<span class="glyphicon glyphicon-arrow-down"></span>&nbsp;DEVIS - FACTURES</a>
</h4>
</div>
<div id="panel-documents" class="panel-collapse collapse">
<div class="panel-body">
<table class="table table-bordered">
<tr>
<th>Numéro</th>
<th>Date</th>
<th>Client</th>
<th class="text-right">Montant</th>
<th class="text-center">Statut</th>
</tr>
<tr tal:repeat="detail documents">
<td>${detail.TYPE}-${detail.numero}</td>
<td>${detail.date.strftime('%d-%m/-%Y')}</td>
<td>${detail.nomcli}</td>
<td class="text-right">${layout.to_euro(detail.montant)}</td>
<td class="text-center">${detail.status}</td>
</tr>
</table>
</div>
</div>
</div>
</div>
</div>
</metal:block>

View File

@@ -1,38 +1,29 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<div class="container">
<div class="container">
<div class="form-group">
<div class="row">
<div class="col-md-2">
<a class="btn btn-primary" role="button" href="/">
<span class="glyphicon glyphicon-chevron-left"></span> Retour</a>
</div>
<div class="col-md-5">
<p>
<span class="label" style="background-color:LightYellow; color:black;">RDV Peinture</span>&nbsp;
<span class="label" style="background-color:Gold; color:black;">RDV Menuiserie</span>&nbsp;
<span class="label" style="background-color:LightGreen; color:black;">RDV Plomberie</span>&nbsp;
<span class="label" style="background-color:LightBlue; color:black;">RDV Plomberie</span>&nbsp;
</p>
</div>
</div>
</div>
</div>
<br />
<div class="container">
<div id="calendar"></div>
</div>
<br />
<p align="center">
<span class="label" style="background-color:LightYellow; color:black;">RDV Peinture</span>&nbsp;
<span class="label" style="background-color:Gold; color:black;">RDV Menuiserie</span>&nbsp;
<span class="label" style="background-color:LightGreen; color:black;">RDV Plomberie</span>&nbsp;
<span class="label" style="background-color:LightBlue; color:black;">RDV Plomberie</span>&nbsp;
</p>
<br />
<br />
</div>
<script>
$(document).ready(function() {
$('#calendar').fullCalendar({
schedulerLicenseKey: 'GPL-My-Project-Is-Open-Source',
defaultView: 'timelineDay',
minTime: "07:00:00",
maxTime: "21:00:00",
maxTime: "20:00:00",
height: 'auto',
locale: 'fr',
header: {

View File

@@ -11,9 +11,9 @@
data-fv-icon-validating="glyphicon glyphicon-refresh">
<div class="form-group">
<label class="col-xs-2 control-label" for="date_rdv">Date et heure</label>
<label class="control-label col-xs-2" for="date_rdv_picker">Date et heure</label>
<div class="col-xs-3 input-group date" id="date_rdv_picker">
<input class="form-control" type="text" name="date_rdv" value="${date_rdv.strftime('%d-%m-%Y %H:%M')}"
<input class="form-control" type="text" name="rdv_debut" value="${rdv.rdv_debut.strftime('%d-%m-%Y %H:%M')}"
data-fv-notempty="true"
data-fv-notempty-message="La date et l'heure sont obligatoires"
data-fv-date="true"
@@ -26,9 +26,9 @@
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="comment">Commentaire 1</label>
<label class="control-label col-xs-2" for="COMMENT">Commentaire 1</label>
<div class="col-xs-5">
<input class="form-control" type="text" id="comment" name="comment" value="${comment}"
<input class="form-control" type="text" id=".COMMENT" name="COMMENT" value="${rdv.COMMENT}"
placeholder="30 caractères maximum"
data-fv-notempty="true"
data-fv-notempty-message="Un commentaire est obligatoire"
@@ -38,9 +38,9 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="commentvi">Commentaire 2</label>
<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="${commentvi}"
<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"
@@ -48,16 +48,24 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2">Dern. modif le</label>
<div class="col-xs-9">
<p class="form-control-static">${rdv.DATEMAJ.strftime('%d-%m-%Y %H:%M')} par ${rdv.USERMAJ}</p>
</div>
</div>
<div class="form-group">
<div class="col-xs-offset-2 col-xs-10">
<div class="form-group">
<a class="btn btn-default" href="${request.route_url('dossier_view', nodossier=nodossier)}">
<a class="btn btn-default" href="/agenda/${rdv.rdv_debut.strftime('%Y-%m-%d')}">
<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>
<button class="btn btn-warning" type="submit" name="form.deleted"
<button class="btn btn-danger" type="submit" name="form.deleted"
tal:condition="python: nolig != '0'">
<span class="glyphicon glyphicon-remove"></span> Supprimer</button>
<a class="btn btn-warning" href="${request.route_url('dossier_view', nodossier=nodossier)}">
<span class="glyphicon glyphicon-folder-open"></span> Dossier</a>
</div>
</div>
</div>