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

ajout module Default et suivi_edit.pt

Browse Source
This commit is contained in:
Phuoc
2018-11-27 17:33:50 +01:00
parent 4980349d26
commit 4bc65dae42
19 changed files with 398 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
mondumas/models/agenda.py
View File

@@ -26,39 +26,6 @@ def get_users_agenda(request):
results = request.dbsession.execute(query).fetchall() results = request.dbsession.execute(query).fetchall()
return results return results
def get_dossier_by_no(request,nodossier):
societe = nodossier[0:2]
no_id = nodossier[3:]
query = """
SELECT d.*, c.*, a.NOM as nom_cabinet, e.NOM as nom_expert FROM dem_devis d
INNER JOIN clients c ON d.societe = c.societe and d.cd_cli = c.cd_cli
INNER JOIN p_cabinet a ON d.cabinet = a.code
INNER JOIN p_experts e ON d.cabinet = e.code_cab and d.expert = e.code_exp
where d.societe = '%s' and d.no_id=%s;""" % (societe, no_id);
results = request.dbsession.execute(query).first()
return results
def get_dossier_rdv_by_no(request,nodossier, nolig):
societe = nodossier[0:2]
no_id = nodossier[3:]
if nolig == '0':
query = "SELECT * FROM dem_lig where societe = '%s' and no_id=%s;" % (societe, no_id)
results = request.dbsession.execute(query).fetchall()
else:
query = "SELECT * FROM dem_lig where societe = '%s' and no_id=%s and nolig=%s;" % (societe, no_id, nolig)
results = request.dbsession.execute(query).first()
return results
def get_documents_byChantier(request,nodossier):
societe = nodossier[0:2]
no_id = nodossier[3:]
query = "CALL spGET_DOSSIERS_byNumeo('%s',%s);" % (societe, no_id)
results = request.dbsession.execute(query).fetchall()
return results
def get_rendez_vous(request, itc): def get_rendez_vous(request, itc):
d = datetime.now() d = datetime.now()
d = d - dateutil.relativedelta.relativedelta(months=3) d = d - dateutil.relativedelta.relativedelta(months=3)
@@ -66,7 +33,7 @@ def get_rendez_vous(request, itc):
datedeb = d.strftime('%Y-%m-01') datedeb = d.strftime('%Y-%m-01')
# lire les rdv de l'ITC # lire les rdv de l'ITC
query = """SELECT CONCAT(l.societe,"-",l.no_id) as nodossier, l.rdv_debut, l.rdv_fin, e.c_nom, e.c_ville FROM dem_lig l query = """SELECT CONCAT(l.societe,"-",l.no_id) as nodossier, l.nolig, l.rdv_debut, l.rdv_fin, e.c_nom, e.c_ville FROM dem_lig l
INNER JOIN dem_devis e ON l.societe=e.societe AND l.no_id=e.no_id INNER JOIN dem_devis e ON l.societe=e.societe AND l.no_id=e.no_id
WHERE l.datevi >= :datedeb AND l.liste=:itc ORDER BY l.datevi, l.heurevi WHERE l.datevi >= :datedeb AND l.liste=:itc ORDER BY l.datevi, l.heurevi
""" """
@@ -80,20 +47,27 @@ def delete_rdv(request, nodossier, nolig):
query = "DELETE FROM dem_lig where societe = '%s' and no_id=%s and nolig=%s;" % (societe, no_id, nolig) query = "DELETE FROM dem_lig where societe = '%s' and no_id=%s and nolig=%s;" % (societe, no_id, nolig)
execute_query(request, query, {}) execute_query(request, query, {})
def update_rdv(request, nodossier, nolig, comment, commentvi, date_rdv): def update_rdv(request, nodossier, nolig, new_values):
societe = nodossier[0:2] societe = nodossier[0:2]
no_id = nodossier[3:] no_id = nodossier[3:]
# formater les champs # formater date et heure de visite
ddate = datetime.strptime(date_rdv, '%d-%m-%Y %H:%M') if new_values['rdv_debut']:
datevi = ddate.strftime("%Y-%m-%d") ddate = datetime.strptime(new_values['rdv_debut'], '%d-%m-%Y %H:%M')
heurevi = date_rdv[-5:] new_values['DATEVI'] = ddate.strftime("%Y-%m-%d")
auj = date.today().strftime("%Y-%m-%d") new_values['HEUREVI'] = ddate.strftime("%H:%M")
if nolig == '0': del new_values['rdv_debut']
query = "INSERT INTO dem_devis SET societe='%s',no_id=%s,date='%s',datevi='%s',heurevi='%s',comment='%s',commentvi='%s'" % (societe, no_id,auj,datevi, heurevi, comment, commentvi) s = ''
for param in new_values.keys():
if s:
s += ",%s=:%s" % (param, param)
else: else:
query = "UPDATE dem_ligs SET datevi='%s', heurevi='%s', comment='%s', commentvi='%s' where societe = '%s' and no_id=%s and nolig=%s;" % (datevi, heurevi, comment, commentvi, societe, no_id, nolig) s = "%s=:%s" % (param, param)
execute_query(request, query, {}) new_values['societe'] = societe
new_values['no_id'] = no_id
new_values['nolig'] = nolig
query = "UPDATE dem_lig SET %s WHERE societe = :societe AND NO_ID = :no_id AND NOLIG = :nolig ;" % s
execute_query(request, query, new_values)

54
mondumas/models/default.py
View File

@@ -87,3 +87,57 @@ def get_chantiers_byName(request, societe, name, tous):
results = request.dbsession.execute(query).fetchall() results = request.dbsession.execute(query).fetchall()
return results return results
def get_dossier_by_no(request,nodossier):
societe = nodossier[0:2]
no_id = nodossier[3:]
query = """
SELECT d.*, c.*, a.NOM as nom_cabinet, e.NOM as nom_expert FROM dem_devis d
INNER JOIN clients c ON d.societe = c.societe and d.cd_cli = c.cd_cli
INNER JOIN p_cabinet a ON d.cabinet = a.code
INNER JOIN p_experts e ON d.cabinet = e.code_cab and d.expert = e.code_exp
where d.societe = '%s' and d.no_id=%s;""" % (societe, no_id);
results = request.dbsession.execute(query).first()
return results
def get_dossier_rdv_by_no(request,nodossier, nolig):
societe = nodossier[0:2]
no_id = nodossier[3:]
if nolig == '0':
query = "SELECT * FROM dem_lig where societe = '%s' and no_id=%s;" % (societe, no_id)
results = request.dbsession.execute(query).fetchall()
else:
query = "SELECT * FROM dem_lig where societe = '%s' and no_id=%s and nolig=%s;" % (societe, no_id, nolig)
results = request.dbsession.execute(query).first()
return results
def get_documents_byChantier(request,nodossier):
societe = nodossier[0:2]
no_id = nodossier[3:]
query = "CALL spGET_DOSSIERS_byNumeo('%s',%s);" % (societe, no_id)
results = request.dbsession.execute(query).fetchall()
return results
def update_suivi(request, nodossier, nolig, new_values):
societe = nodossier[0:2]
no_id = nodossier[3:]
new_values['societe'] = societe
new_values['NO_ID'] = no_id
s = ''
for param in new_values.keys():
if s:
s += ",%s=:%s" % (param, param)
else:
s = "%s=:%s" % (param, param)
if nolig == '0':
query = "INSERT INTO dem_lig SET %s" % s
else:
new_values['nolig'] = nolig
query = "UPDATE dem_lig SET %s WHERE societe = :societe AND NO_ID = :no_id AND NOLIG = :nolig ;" % s
execute_query(request, query, new_values)

17
mondumas/routes.py
View File

@@ -1,16 +1,21 @@
def includeme(config): def includeme(config):
config.add_static_view('static', 'static', cache_max_age=3600) config.add_static_view('static', 'static', cache_max_age=3600)
config.add_route('home', '/') # agenda
config.add_route('agenda', '/agenda') config.add_route('agenda', '/agenda/{date}')
config.add_route('planning', '/planning') config.add_route('planning', '/planning/{date}')
config.add_route('chantier_lookup', '/chantier_lookup')
config.add_route('changer_mdp', '/changer_mdp')
config.add_route('dossier_view', '/dossier_view/{nodossier}')
config.add_route('rdv_edit','/rdv_edit/{nodossier}/{nolig}') config.add_route('rdv_edit','/rdv_edit/{nodossier}/{nolig}')
# default
config.add_route('home', '/')
config.add_route('changer_mdp', '/changer_mdp')
config.add_route('dossier_lookup', '/chantier_lookup')
config.add_route('dossier_select', '/dossier_select/{date}')
config.add_route('dossier_selected', '/dossier_selected/{goto}/{date}/{nodossier}')
config.add_route('dossier_view', '/dossier_view/{nodossier}')
config.add_route('envoyer_mdp', '/envoyer_mdp') config.add_route('envoyer_mdp', '/envoyer_mdp')
config.add_route('login', '/login') config.add_route('login', '/login')
config.add_route('logout', '/logout') config.add_route('logout', '/logout')
config.add_route('redefinir_mdp', '/redefinir_mdp/{lien}') config.add_route('redefinir_mdp', '/redefinir_mdp/{lien}')
config.add_route('suivi_edit','/suivi_edit/{nodossier}/{nolig}')
# parametres # parametres
config.add_route('parametres', '/parametres') config.add_route('parametres', '/parametres')
config.add_route('dashboard', '/dashboard') config.add_route('dashboard', '/dashboard')

41
mondumas/templates/agenda/agenda.pt
View File

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

29
mondumas/templates/agenda/planning.pt
View File

@@ -1,30 +1,21 @@
<metal:block use-macro="main_template"> <metal:block use-macro="main_template">
<div metal:fill-slot="content"> <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 /> <br />
<div class="container"> <div class="container">
<div id="calendar"></div> <div id="calendar"></div>
</div> </div>
<br /> <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 />
<br />
</div>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
@@ -32,7 +23,7 @@ $(document).ready(function() {
schedulerLicenseKey: 'GPL-My-Project-Is-Open-Source', schedulerLicenseKey: 'GPL-My-Project-Is-Open-Source',
defaultView: 'timelineDay', defaultView: 'timelineDay',
minTime: "07:00:00", minTime: "07:00:00",
maxTime: "21:00:00", maxTime: "20:00:00",
height: 'auto', height: 'auto',
locale: 'fr', locale: 'fr',
header: { header: {

24
mondumas/templates/agenda/rdv_edit.pt
View File

@@ -11,9 +11,9 @@
data-fv-icon-validating="glyphicon glyphicon-refresh"> data-fv-icon-validating="glyphicon glyphicon-refresh">
<div class="form-group"> <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"> <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="true"
data-fv-notempty-message="La date et l'heure sont obligatoires" data-fv-notempty-message="La date et l'heure sont obligatoires"
data-fv-date="true" data-fv-date="true"
@@ -26,9 +26,9 @@
</div> </div>
<div class="form-group"> <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"> <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" placeholder="30 caractères maximum"
data-fv-notempty="true" data-fv-notempty="true"
data-fv-notempty-message="Un commentaire est obligatoire" data-fv-notempty-message="Un commentaire est obligatoire"
@@ -38,9 +38,9 @@
</div> </div>
</div> </div>
<div class="form-group"> <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"> <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" placeholder="30 caractères maximum"
data-fv-stringlength="true" data-fv-stringlength="true"
data-fv-stringlength-max="30" data-fv-stringlength-max="30"
@@ -48,16 +48,24 @@
</div> </div>
</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="form-group">
<div class="col-xs-offset-2 col-xs-10"> <div class="col-xs-offset-2 col-xs-10">
<div class="form-group"> <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> <span class="glyphicon glyphicon-arrow-left"></span> Annuler</a>
<button class="btn btn-primary" type="submit" name="form.submitted"> <button class="btn btn-primary" type="submit" name="form.submitted">
<span class="glyphicon glyphicon-ok"></span> Enregistrer</button> <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'"> tal:condition="python: nolig != '0'">
<span class="glyphicon glyphicon-remove"></span> Supprimer</button> <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> </div>
</div> </div>

0
mondumas/templates/404.pt → mondumas/templates/default/404.pt
View File

0
mondumas/templates/changer_mdp.pt → mondumas/templates/default/changer_mdp.pt
View File

3
mondumas/templates/chantier_lookup.pt → mondumas/templates/default/dossier_lookup.pt
View File

@@ -73,6 +73,7 @@
<script type="text/javascript"> <script type="text/javascript">
var dataSet = ${dt_data}; var dataSet = ${dt_data};
var goto_url = '${goto_url}';
$(document).ready(function() { $(document).ready(function() {
$.fn.dataTable.moment('DD-MM-YYYY'); $.fn.dataTable.moment('DD-MM-YYYY');
@@ -87,7 +88,7 @@
{ "targets": 0, { "targets": 0,
"render": function (data, type, full, meta) { "render": function (data, type, full, meta) {
// ajouter un link vers le formulaire // ajouter un link vers le formulaire
return '<a href="/dossier_view/' + data + '">' + data + '</a>'; return '<a href="' + goto_url + data + '">' + data + '</a>';
}, },
}, },
] ]

17
mondumas/templates/agenda/dossier_view.pt → mondumas/templates/default/dossier_view.pt
View File

@@ -92,19 +92,23 @@
<span class="glyphicon glyphicon-arrow-down"></span>&nbsp;SUIVI</a> <span class="glyphicon glyphicon-arrow-down"></span>&nbsp;SUIVI</a>
</h4> </h4>
</div> </div>
<div id="panel-suivi" class="panel-collapse collapse"> <div id="panel-suivi" class="panel-collapse">
<div class="panel-body"> <div class="panel-body">
<p><a class="btn btn-success" role="button" href="${request.route_url('rdv_edit', nodossier=nodossier, nolig='0')}"> <p><a class="btn btn-success" role="button" href="${request.route_url('suivi_edit', nodossier=nodossier, nolig='0')}">
<span class="glyphicon glyphicon-plus"></span> Nouvelle ligne</a></p> <span class="glyphicon glyphicon-plus"></span> Nouvelle ligne</a></p>
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th>Date</th> <th>Date</th>
<th>Action</th> <th>Action</th>
<th>Rendez-vous</th> <th>Rendez-vous</th>
<th>Réf. lettre</th>
<th class="text-center">Par</th> <th class="text-center">Par</th>
</tr> </tr>
<tr tal:repeat="detail details"> <tr tal:repeat="detail details">
<td>${detail.DATE.strftime('%d/%m/%Y')}</td> <td>
<a href="${request.route_url('suivi_edit', nodossier=nodossier, nolig=detail.NOLIG)}">
${detail.DATE.strftime('%d-%m-%Y')}</a>
</td>
<td tal:condition="detail.COMMENT.startswith('!!')" class="text-danger"> <td tal:condition="detail.COMMENT.startswith('!!')" class="text-danger">
<b>${detail.COMMENT} ${detail.COMMENTVI}</b> <b>${detail.COMMENT} ${detail.COMMENTVI}</b>
</td> </td>
@@ -114,18 +118,17 @@
<td> <td>
<span tal:condition="detail.rdv_debut==None"></span> <span tal:condition="detail.rdv_debut==None"></span>
<span tal:condition="detail.rdv_debut!=None"> <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')} avec ${detail.LISTE}
${detail.rdv_debut.strftime('%d/%m/%Y %H:%M')}</a>
avec ${detail.LISTE}
</span> </span>
</td> </td>
<td class="text-center">${detail.REF_LET}</td>
<td class="text-center">${detail.USERMAJ}</td> <td class="text-center">${detail.USERMAJ}</td>
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
<!-- PANEL SUIVI --> <!-- PANEL DOCUMENTS -->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">

0
mondumas/templates/envoyer_mdp.pt → mondumas/templates/default/envoyer_mdp.pt
View File

4
mondumas/templates/home.pt → mondumas/templates/default/home.pt
View File

@@ -5,12 +5,12 @@
<br /> <br />
<div class="row"> <div class="row">
<div class="col-sm-3"> <div class="col-sm-3">
<a href="${request.application_url}/agenda"> <a href="${request.application_url}/agenda/today">
<span class="glyphicon glyphicon-calendar logo-small"></span><br /> <span class="glyphicon glyphicon-calendar logo-small"></span><br />
<h4>MON AGENDA</h4></a> <h4>MON AGENDA</h4></a>
</div> </div>
<div class="col-sm-3"> <div class="col-sm-3">
<a href="${request.application_url}/planning"> <a href="${request.application_url}/planning/today">
<span class="glyphicon glyphicon-calendar logo-small"></span><br /> <span class="glyphicon glyphicon-calendar logo-small"></span><br />
<h4>PLANNING</h4></a> <h4>PLANNING</h4></a>
</div> </div>

0
mondumas/templates/login.pt → mondumas/templates/default/login.pt
View File

0
mondumas/templates/redefinir_mdp.pt → mondumas/templates/default/redefinir_mdp.pt
View File

82
mondumas/templates/default/suivi_edit.pt Normal file
View File

@@ -0,0 +1,82 @@
<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="rdv_edit-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-xs-2" for="comment">Commentaire 1</label>
<div class="col-xs-5">
<input class="form-control" type="text" id="COMMENT" name="COMMENT" value="${suivi.COMMENT}"
placeholder="30 caractères maximum"
data-fv-notempty="true"
data-fv-notempty-message="Un commentaire est obligatoire"
data-fv-stringlength="true"
data-fv-stringlength-max="30"
data-fv-stringlength-message="30 caractères maximum" />
</div>
</div>
<div class="form-group">
<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="${suivi.COMMENTVI}"
placeholder="30 caractères maximum"
data-fv-stringlength="true"
data-fv-stringlength-max="30"
data-fv-stringlength-message="30 caractères maximum" />
</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">${suivi.DATEMAJ.strftime('%d-%m-%Y %H:%M')} par ${suivi.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)}">
<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"
tal:condition="python: nolig != '0'">
<span class="glyphicon glyphicon-remove"></span> Supprimer</button>
</div>
</div>
</div>
</form>
<br />
<br />
<br />
</div> <!-- row -->
<script>
$(document).ready(function() {
$('#rdv_edit-form').formValidation();
$('#date_rdv_picker').datetimepicker({
format: 'DD-MM-YYYY HH:mm',
showClear: true,
allowInputToggle: true,
stepping: 15,
})
.on('changeDate', function(e) {
// Revalidate the date field
$('#rdv_edit-form').formValidation('revalidateField', 'date_rdv');
});
$('form input').on('keypress', function(e) {
return e.which !== 13;
});
});
</script>
</div>
</metal:block>

11
mondumas/templates/security.py
View File

@@ -1,11 +0,0 @@
from .models.default import get_member_by_id
def groupfinder(userid, request):
member = get_member_by_id(request, userid)
if member:
# Roles administrateur ?
if member.access == 9:
return ['group:administrators']
else:
return [] # it means that userid is logged in (it returns None if userid isn't logged in)

89
mondumas/views/agenda.py
View File

@@ -26,80 +26,70 @@ from ..models.default import *
@view_config(route_name='rdv_edit', renderer='../templates/agenda/rdv_edit.pt', permission='view') @view_config(route_name='rdv_edit', renderer='../templates/agenda/rdv_edit.pt', permission='view')
def rdv_edit(request): def rdv_edit(request):
logged_in = request.authenticated_userid
nodossier = request.matchdict['nodossier'] nodossier = request.matchdict['nodossier']
nolig = request.matchdict['nolig'] nolig = request.matchdict['nolig']
url = request.route_url("rdv_edit", nodossier=nodossier, nolig=nolig) url = request.route_url("rdv_edit", nodossier=nodossier, nolig=nolig)
message = '' message = ''
if nolig == '0':
# nouveau
comment = ''
commentvi = ''
date_rdv = datetime.now()
page_title= 'Nouveau rendez-vous'
else:
# lire le rendez-vous # lire le rendez-vous
rdv = get_dossier_rdv_by_no(request, nodossier, nolig) rdv = get_dossier_rdv_by_no(request, nodossier, nolig)
if not rdv: if not rdv:
request.session.flash(u"Rendez-vous non trouvé : %s" % nodossier, 'warning') request.session.flash(u"Rendez-vous non trouvé : %s" % nodossier, 'warning')
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier)) return HTTPFound(location=request.route_url('agenda', date='today'))
comment = rdv.COMMENT
commentvi = rdv.COMMENTVI
date_rdv = rdv.rdv_debut
page_title= u"Modification du rdv du %s" % (rdv.rdv_debut.strftime('%d-%m-%Y %H:%M')) page_title= u"Modification du rdv du %s" % (rdv.rdv_debut.strftime('%d-%m-%Y %H:%M'))
if 'form.submitted' in request.params: if 'form.submitted' in request.params:
comment = request.params['comment'] new_values = {}
commentvi = request.params['commentvi'] for param, db_value in rdv.items():
date_rdv = request.params['date_rdv'] if param in request.params and request.params[param] != db_value:
new_values[param] = request.params[param]
update_rdv(request, nodossier, nolig, comment, commentvi, date_rdv) if new_values:
new_values['USERMAJ'] = logged_in.upper()
update_rdv(request, nodossier, nolig, new_values)
request.session.flash(u"Le rendez-vous a été mis à jour avec succès.", 'success') request.session.flash(u"Le rendez-vous a été mis à jour avec succès.", 'success')
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
return HTTPFound(location=request.route_url('agenda', date=rdv.rdv_debut.strftime('%Y-%m-%d')))
if 'form.deleted' in request.params: if 'form.deleted' in request.params:
delete_rdv(request, nodossier, nolig) delete_rdv(request, nodossier, nolig)
request.session.flash(u"Le rendez-vous a été supprimé avec succès.", 'success') request.session.flash(u"Le rendez-vous a été supprimé avec succès.", 'success')
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier)) return HTTPFound(location=request.route_url('agenda', date=rdv.rdv_debut.strftime('%Y-%m-%d')))
return { return {
'page_title': page_title, 'page_title': page_title,
'url': url, 'url': url,
'nodossier': nodossier, 'nodossier': nodossier,
'nolig': nolig, 'nolig': nolig,
'comment': comment, 'rdv': rdv,
'commentvi': commentvi,
'date_rdv': date_rdv,
'message': message, 'message': message,
} }
@view_config(route_name='dossier_view', renderer='../templates/agenda/dossier_view.pt', permission='view')
def dossier_view(request):
nodossier = request.matchdict['nodossier']
url = request.route_url("dossier_view", nodossier=nodossier)
dossier = get_dossier_by_no(request, nodossier)
if dossier is None:
request.session.flash(u"Le dossier no %s est introuvable" % (nodossier), 'danger')
return HTTPFound(location=request.route_url("chantier_lookup"))
# lire tous le suivi du dossier
details = get_dossier_rdv_by_no(request, nodossier, '0')
# lire toutes les dossiers du chantiers
documents = get_documents_byChantier(request, nodossier)
return {
'page_title': u"Dossier : %s" % (nodossier),
'nodossier': nodossier,
'dossier': dossier,
'details': details,
'documents': documents,
}
@view_config(route_name='agenda', renderer='../templates/agenda/agenda.pt', permission='view') @view_config(route_name='agenda', renderer='../templates/agenda/agenda.pt', permission='view')
def agenda(request): def agenda(request):
message = ''
# récupérer les paramètres de l'appel de la view
datePlan = request.matchdict['date']
logged_in = request.authenticated_userid logged_in = request.authenticated_userid
if datePlan == 'today':
datePlan = date.today().strftime('%Y-%m-%d')
url = request.route_url('planning', date=datePlan)
url_select = request.route_url('dossier_select', date=datePlan)
# recall code et nom élève
if 'mem_nodossier' in request.session:
mem_nodossier = request.session['mem_nodossier']
mem_nomdossier = request.session['mem_nomdossier']
else:
mem_nodossier = 'Aucun'
mem_nomdossier = u'dossier sélectionné'
# liste des users avec agenda # liste des users avec agenda
agendas = get_users_agenda(request) agendas = get_users_agenda(request)
@@ -132,12 +122,13 @@ def agenda(request):
json_event = { json_event = {
'title': row.c_nom, 'title': row.c_nom,
'description': row.c_ville.capitalize(),
'start': row.rdv_debut.strftime('%Y-%m-%d %H:%M:%S'), 'start': row.rdv_debut.strftime('%Y-%m-%d %H:%M:%S'),
'end': row.rdv_fin.strftime('%Y-%m-%d %H:%M:%S'), 'end': row.rdv_fin.strftime('%Y-%m-%d %H:%M:%S'),
'allDay': False, 'allDay': False,
'color': color, 'color': color,
'textColor': 'Black', 'textColor': 'Black',
'url': 'dossier_view/%s' % (row.nodossier), 'url': '/rdv_edit/%s/%s' % (row.nodossier, row.nolig),
} }
events.append(json_event) events.append(json_event)
@@ -147,11 +138,14 @@ def agenda(request):
'fullcalendar_events': json.dumps(events), 'fullcalendar_events': json.dumps(events),
'agendas': agendas, 'agendas': agendas,
'agenda': agenda, 'agenda': agenda,
'message': message,
'mem_nodossier': mem_nodossier,
'mem_nomdossier': mem_nomdossier,
'url_select': url_select,
} }
@view_config(route_name='planning', renderer='../templates/agenda/planning.pt', permission='view') @view_config(route_name='planning', renderer='../templates/agenda/planning.pt', permission='view')
def planning(request): def planning(request):
logged_in = request.authenticated_userid
# construire la liste des ressources # construire la liste des ressources
# {"id":"a","title":"Auditorium A"} # {"id":"a","title":"Auditorium A"}
@@ -170,9 +164,6 @@ def planning(request):
for user in users: for user in users:
rows = get_rendez_vous(request, user.CD_UTI) rows = get_rendez_vous(request, user.CD_UTI)
for row in rows: for row in rows:
event_url = 'dossier_view/%s' % (row.nodossier)
event_title = row.c_nom
# déterminer la couleur de l'event selon la societe # déterminer la couleur de l'event selon la societe
societe = row.nodossier[0:2] societe = row.nodossier[0:2]
if societe == "PE": if societe == "PE":
@@ -186,14 +177,14 @@ def planning(request):
json_event = { json_event = {
'resourceId': user.CD_UTI, 'resourceId': user.CD_UTI,
'title': event_title, 'title': row.c_nom,
'description': row.c_ville.capitalize(), 'description': row.c_ville.capitalize(),
'start': row.rdv_debut.strftime('%Y-%m-%d %H:%M:%S'), 'start': row.rdv_debut.strftime('%Y-%m-%d %H:%M:%S'),
'end': row.rdv_fin.strftime('%Y-%m-%d %H:%M:%S'), 'end': row.rdv_fin.strftime('%Y-%m-%d %H:%M:%S'),
'allDay': False, 'allDay': False,
'color': color, 'color': color,
'textColor': 'Black', 'textColor': 'Black',
'url': event_url, 'url': '/dossier_view/%s' % (row.nodossier),
} }
events.append(json_event) events.append(json_event)

124
mondumas/views/default.py
View File

@@ -25,6 +25,7 @@ from ..security import groupfinder
import json import json
from ..models.default import * from ..models.default import *
from ..models.agenda import *
def to_decimal(x): def to_decimal(x):
import decimal import decimal
@@ -52,14 +53,14 @@ def to_percent(x):
return (u"%.2f " % x).replace('.', ',') + "%" return (u"%.2f " % x).replace('.', ',') + "%"
@view_config(route_name='home', renderer='../templates/home.pt', permission='view') @view_config(route_name='home', renderer='../templates/default/home.pt', permission='view')
def home(request): def home(request):
return { return {
'page_title': 'Bienvenue', 'page_title': 'Bienvenue',
'project': 'mondumas', 'project': 'mondumas',
} }
@view_config(route_name='envoyer_mdp', renderer='../templates/envoyer_mdp.pt') @view_config(route_name='envoyer_mdp', renderer='../templates/default/envoyer_mdp.pt')
def envoyer_mdp(request): def envoyer_mdp(request):
url = request.route_url('envoyer_mdp') url = request.route_url('envoyer_mdp')
message = u'' message = u''
@@ -92,7 +93,7 @@ Le lien suivant vous dirigera vers une page où vous pourrez ré-initialiser vot
'message': message, 'message': message,
} }
@view_config(route_name='changer_mdp', renderer='../templates/changer_mdp.pt', permission='view') @view_config(route_name='changer_mdp', renderer='../templates/default/changer_mdp.pt', permission='view')
def changer_mdp(request): def changer_mdp(request):
url = request.route_url('changer_mdp') url = request.route_url('changer_mdp')
logged_in = request.authenticated_userid logged_in = request.authenticated_userid
@@ -117,7 +118,7 @@ def changer_mdp(request):
'message': message, 'message': message,
} }
@view_config(route_name='redefinir_mdp', renderer='../templates/redefinir_mdp.pt') @view_config(route_name='redefinir_mdp', renderer='../templates/default/redefinir_mdp.pt')
def redefinir_mdp(request): def redefinir_mdp(request):
lien = request.matchdict["lien"] lien = request.matchdict["lien"]
url = request.route_url('redefinir_mdp', lien=lien) url = request.route_url('redefinir_mdp', lien=lien)
@@ -144,7 +145,7 @@ def redefinir_mdp(request):
} }
@view_config(route_name='login', renderer='../templates/login.pt', permission='view') @view_config(route_name='login', renderer='../templates/default/login.pt', permission='view')
@forbidden_view_config(renderer='../templates/login.pt') @forbidden_view_config(renderer='../templates/login.pt')
def login(request): def login(request):
@@ -213,11 +214,20 @@ gestion.entreprise-dumas.com
mailer.send_immediately(message) mailer.send_immediately(message)
@view_config(route_name='chantier_lookup', renderer='../templates/chantier_lookup.pt', permission='view') @view_config(route_name='dossier_lookup', renderer='../templates/default/dossier_lookup.pt', permission='view')
def chantier_lookup(request): @view_config(route_name='dossier_select', renderer='../templates/default/dossier_lookup.pt', permission='view')
def dossier_lookup(request):
# recherche chantier if 'dossier_select' in request.current_route_path() :
url = request.route_url('chantier_lookup') # récupérer les paramètres de l'appel de la view
datePlan = request.matchdict['date']
# sélectionner dossier -> goto planning
goto_url = '/dossier_selected/agenda/%s/' % datePlan
url = request.route_url('dossier_select', date=datePlan)
else:
# recherche dossier -> goto fiche dossier
goto_url = '/dossier_selected/dossier_view/%s/' % date.today().strftime('%Y-%m-%d')
url = request.route_url('dossier_lookup')
message = u'' message = u''
societes = ['PE','ME','PL','PO','CD'] societes = ['PE','ME','PL','PO','CD']
@@ -225,6 +235,7 @@ def chantier_lookup(request):
liste=[] liste=[]
name = u'' name = u''
cb_tous = "non" cb_tous = "non"
if 'form.submitted' in request.params: if 'form.submitted' in request.params:
name = request.params['name'] name = request.params['name']
societe = request.params['societe'] societe = request.params['societe']
@@ -246,6 +257,7 @@ def chantier_lookup(request):
return { return {
'page_title': u"Rechercher un chantier", 'page_title': u"Rechercher un chantier",
'url': url, 'url': url,
'goto_url': goto_url,
'message': message, 'message': message,
'dt_data': json.dumps(liste), 'dt_data': json.dumps(liste),
'societes': societes, 'societes': societes,
@@ -253,3 +265,97 @@ def chantier_lookup(request):
'name': name, 'name': name,
'cb_tous': cb_tous, 'cb_tous': cb_tous,
} }
@view_config(route_name='dossier_view', renderer='../templates/default/dossier_view.pt', permission='view')
def dossier_view(request):
nodossier = request.matchdict['nodossier']
url = request.route_url("dossier_view", nodossier=nodossier)
dossier = get_dossier_by_no(request, nodossier)
if dossier is None:
request.session.flash(u"Le dossier no %s est introuvable" % (nodossier), 'danger')
return HTTPFound(location=request.route_url("chantier_lookup"))
# lire tous le suivi du dossier
details = get_dossier_rdv_by_no(request, nodossier, '0')
# lire toutes les dossiers du chantiers
documents = get_documents_byChantier(request, nodossier)
return {
'page_title': u"Dossier : %s" % (nodossier),
'nodossier': nodossier,
'dossier': dossier,
'details': details,
'documents': documents,
}
@view_config(route_name='dossier_selected', permission='view')
def dossier_selected(request):
# récupérer les paramètres de l'appel de la view
goto = request.matchdict['goto']
datePlan = request.matchdict['date']
nodossier = request.matchdict['nodossier']
# fiche dossier
dossier = get_dossier_by_no(request, nodossier)
# memorize nodossier et nom dossier
request.session['mem_nodossier'] = nodossier
request.session['mem_nomdossier'] = dossier.C_NOM
if goto == 'dossier_view':
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
else:
return HTTPFound(location=request.route_url('agenda', date=datePlan))
@view_config(route_name='suivi_edit', renderer='../templates/default/suivi_edit.pt', permission='view')
def suivi_edit(request):
logged_in = request.authenticated_userid
nodossier = request.matchdict['nodossier']
nolig = request.matchdict['nolig']
url = request.route_url("suivi_edit", nodossier=nodossier, nolig=nolig)
message = ''
if nolig == '0':
# nouveau
suivi = {}
suivi['COMMENT'] = ''
suivi['COMMENTVI'] = ''
suivi['USERMAJ'] = logged_in.upper()
suivi['DATEMAJ'] = datetime.now()
page_title= 'Nouveau suivi'
else:
# lire le suivi
suivi = get_dossier_rdv_by_no(request, nodossier, nolig)
if not suivi:
request.session.flash(u"Suivi non trouvé : %s" % nodossier, 'warning')
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
page_title= u"Modification du suivi %s" % (nolig)
if 'form.submitted' in request.params:
new_values = {}
for param, db_value in suivi.items():
if param in request.params and request.params[param] != db_value:
new_values[param] = request.params[param]
if new_values:
new_values['USERMAJ'] = logged_in.upper()
new_values['DATE'] = date.today()
update_suivi(request, nodossier, nolig, new_values)
request.session.flash(u"Le suivi a été mis à jour avec succès.", 'success')
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
if 'form.deleted' in request.params:
delete_rdv(request, nodossier, nolig)
request.session.flash(u"Le suivi a été supprimé avec succès.", 'success')
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
return {
'page_title': page_title,
'url': url,
'nodossier': nodossier,
'nolig': nolig,
'suivi': suivi,
'message': message,
}

2
mondumas/views/notfound.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf8 -*- # -*- coding: utf8 -*-
from pyramid.view import notfound_view_config from pyramid.view import notfound_view_config
@notfound_view_config(renderer='../templates/404.pt') @notfound_view_config(renderer='../templates/default/404.pt')
def notfound_view(request): def notfound_view(request):
request.response.status = 404 request.response.status = 404
return { return {