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

ajout module Dossier et devis_view.pt + creer_rdv.pt

Browse Source
This commit is contained in:
Phuoc
2018-11-28 16:42:30 +01:00
parent 4bc65dae42
commit d8827bcba8
12 changed files with 572 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mondumas/models/agenda.py
View File

@@ -26,6 +26,12 @@ def get_users_agenda(request):
results = request.dbsession.execute(query).fetchall()
return results
def get_types_rdv(request):
""" lire la liste des types de rendez-vous"""
query = "SELECT * FROM p_types_rdv ORDER BY LIB;"
results = request.dbsession.execute(query).fetchall()
return results
def get_rendez_vous(request, itc):
d = datetime.now()
d = d - dateutil.relativedelta.relativedelta(months=3)
@@ -33,7 +39,7 @@ def get_rendez_vous(request, itc):
datedeb = d.strftime('%Y-%m-01')
# lire les rdv de l'ITC
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
query = """SELECT CONCAT(l.societe,"-",l.no_id) as nodossier, l.nolig, l.rdv_debut, l.rdv_fin, e.c_qualite, 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
WHERE l.datevi >= :datedeb AND l.liste=:itc ORDER BY l.datevi, l.heurevi
"""
@@ -71,3 +77,12 @@ def update_rdv(request, nodossier, nolig, new_values):
query = "UPDATE dem_lig SET %s WHERE societe = :societe AND NO_ID = :no_id AND NOLIG = :nolig ;" % s
execute_query(request, query, new_values)
def create_rdv(request, nodossier, dateRDV, heureRDV, type_rdv, agenda, logged_in):
societe = nodossier[0:2]
no_id = nodossier[3:]
query = """
INSERT INTO dem_lig (societe, NO_ID, DATE, COMMENT, DATEVI, HEUREVI, LISTE, USERMAJ) VALUES
(:societe, :no_id, CURRENT_DATE, :type_rdv, :dateRDV, :heureRDV, :agenda, :logged_in) ;"""
execute_query(request, query, {'societe': societe, 'no_id' :no_id, 'dateRDV': dateRDV, 'heureRDV': heureRDV, 'type_rdv': type_rdv, 'agenda': agenda, 'logged_in':logged_in})

60
mondumas/models/default.py
View File

@@ -81,63 +81,3 @@ def delete_membre(request, cd_uti):
query = "DELETE FROM p_users WHERE cd_uti = :cd_uti ;"
execute_query(request, query, {'cd_uti': cd_uti})
def get_chantiers_byName(request, societe, name, tous):
query = "CALL spGET_CHANTIERS_byName('%s','%s');" % (societe, name)
results = request.dbsession.execute(query).fetchall()
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)

83
mondumas/models/dossier.py Normal file
View File

@@ -0,0 +1,83 @@
# -*- coding: utf8 -*-
from sqlalchemy import text
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import (
scoped_session,
sessionmaker,
)
from zope.sqlalchemy import (
ZopeTransactionExtension,
mark_changed
)
from datetime import *
import transaction
def execute_query(request, query, params):
"""Execute query and mark session as changed"""
request.dbsession.execute(query, params)
mark_changed(request.dbsession)
transaction.commit()
def get_chantiers_byName(request, societe, name, tous):
query = "CALL spGET_CHANTIERS_byName('%s','%s');" % (societe, name)
results = request.dbsession.execute(query).fetchall()
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 = :societe AND no_id = :no_id;"
results = request.dbsession.execute(query, {'societe': societe, 'no_id': no_id}).fetchall()
else:
query = """
SELECT l.*, d.C_QUALITE, d.C_NOM FROM dem_lig l INNER JOIN dem_devis d ON l.societe = d.societe and l.no_id = d.no_id
where l.societe = '%s' and l.no_id=%s and l.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)

8
mondumas/static/css/style.less
View File

@@ -46,6 +46,14 @@
color: #000000 !important;
}
.modal-dialog {
position: absolute;
margin-left: 200px;
height: 500px;
top: 80px;
}
#footer {
text-align: center;
color: #428BCA;

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

@@ -17,7 +17,7 @@
<label class="control-label col-md-2">Dossier en cours :</label>
<div class="col-md-6">
<div class="input-group">
<input class="form-control" type="text" name="dossier" value="${mem_nodossier} - ${mem_nomdossier}" readonly />
<input class="form-control" type="text" name="dossier" value="${mem_nodossier}&nbsp;&nbsp;|&nbsp;&nbsp;${mem_nomdossier}" readonly />
<div class="input-group-btn">
<a href="${url_select}" class="btn btn-primary">
<span class="glyphicon glyphicon-search"></span></a>
@@ -39,9 +39,61 @@
<span class="label" style="background-color:LightBlue; color:black;">RDV Plomberie</span>&nbsp;
</p>
<br />
<!-- Modal : Confirmation CREATION -->
<div class="modal fade" id="confirmCreate" role="dialog" aria-labelledby="confirmCreateLabel" aria-hidden="true" tal:condition="mem_nodossier != 'Aucun'">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Créer un rendez-vous pour ${agenda}</h4>
</div>
<div class="modal-body">
<!-- The form is placed inside the body of modal -->
<form id="create_rdv-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">
<p>
Voulez-vous créer un rendez-vous avec : <br />
</p>
<div class="form-group">
<div class="col-xs-offset-2 col-xs-8">
<p class="text-danger"><b>${mem_nodossier} - ${mem_nomdossier}</p>
<p>le <span id=dateheureRDV>date</p>
</div>
</div>
<input type="hidden" name="dateRDV" id=dateRDV value="date">
<input type="hidden" name="heureRDV" id=heureRDV value="heure">
<div class="form-group">
<div class="col-xs-offset-2 col-xs-8">
<label>Motif :</label>
<select class="form-control" id="type_rdv" name="type_rdv">
<div tal:repeat="item types_rdv">
<option value="${item.LIB}" tal:attributes="selected type_rdv==item.LIB and 'selected' or None">${item.LIB}</option>
</div>
</select>
</div>
</div>
<div class="form-group">
<div class="col-xs-5 col-xs-offset-4">
<button type="submit" class="btn btn-danger" name="form.submitted">Créer</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
<script>
$(document).ready(function() {
var datePlan = '${datePlan}';
$('#calendar').fullCalendar({
schedulerLicenseKey: 'GPL-My-Project-Is-Open-Source',
locale: 'fr',
@@ -50,7 +102,9 @@ $(document).ready(function() {
center: 'prev title next',
right: 'today'
},
allDaySlot: false,
defaultView: 'agendaWeek',
defaultDate: moment(datePlan),
weekends: false,
height: 'auto',
minTime: "07:00:00",
@@ -58,7 +112,22 @@ $(document).ready(function() {
events:${fullcalendar_events},
eventRender: function(event, element){
element.find('.fc-title').append("<br/>" + event.description);
}
},
dayClick: function(date, jsEvent, view) {
$('#dateheureRDV').html(moment(date).format('dddd DD MMMM à HH:mm'));
$('#dateRDV').attr('value', moment(date).format('YYYY-MM-DD'));
$('#heureRDV').attr('value', moment(date).format('HH:mm'));
$("#confirmCreate").modal("show");
}
});
$('#create_rdv-form').formValidation({
framework: 'bootstrap',
excluded: ':disabled',
icon: {
valid: 'glyphicon glyphicon-ok',
invalid: 'glyphicon glyphicon-remove',
validating: 'glyphicon glyphicon-refresh'
},
});
});
</script>

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

@@ -10,6 +10,12 @@
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">No dossier</label>
<div class="col-xs-9">
<span class="form-control-static text-danger">${nodossier}&nbsp;&nbsp;|&nbsp;&nbsp;${rdv.C_QUALITE} ${rdv.C_NOM}</span>
</div>
</div>
<div class="form-group">
<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">

164
mondumas/templates/dossier/devis_view.pt Normal file
View File

@@ -0,0 +1,164 @@
<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">
<div class="panel-body">
<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>
<table class="table table-bordered">
<tr>
<th>Date</th>
<th>Action</th>
<th>Rendez-vous</th>
<th>Réf. lettre</th>
<th class="text-center">Par</th>
</tr>
<tr tal:repeat="detail details">
<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">
<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">
${detail.rdv_debut.strftime('%d-%m-%Y %H:%M')} avec ${detail.LISTE}
</span>
</td>
<td class="text-center">${detail.REF_LET}</td>
<td class="text-center">${detail.USERMAJ}</td>
</tr>
</table>
</div>
</div>
</div>
<!-- PANEL DOCUMENTS -->
<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>

0
mondumas/templates/default/dossier_lookup.pt → mondumas/templates/dossier/dossier_lookup.pt
View File

6
mondumas/templates/default/dossier_view.pt → mondumas/templates/dossier/dossier_view.pt
View File

@@ -147,8 +147,10 @@
<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>
<a href="/devis_view/${detail.nodossier}">${detail.nodossier}</a>
</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>

28
mondumas/views/agenda.py
View File

@@ -21,7 +21,7 @@ from ..security import groupfinder
import json
from ..models.agenda import *
from ..models.default import *
from ..models.dossier import *
@view_config(route_name='rdv_edit', renderer='../templates/agenda/rdv_edit.pt', permission='view')
@@ -39,6 +39,9 @@ def rdv_edit(request):
request.session.flash(u"Rendez-vous non trouvé : %s" % nodossier, 'warning')
return HTTPFound(location=request.route_url('agenda', date='today'))
# memorize nodossier et nom dossier
request.session['mem_nodossier'] = nodossier
request.session['mem_nomdossier'] = '%s %s' % (rdv.C_QUALITE, rdv.C_NOM)
page_title= u"Modification du rdv du %s" % (rdv.rdv_debut.strftime('%d-%m-%Y %H:%M'))
if 'form.submitted' in request.params:
@@ -79,7 +82,7 @@ def agenda(request):
if datePlan == 'today':
datePlan = date.today().strftime('%Y-%m-%d')
url = request.route_url('planning', date=datePlan)
url = request.route_url('agenda', date=datePlan)
url_select = request.route_url('dossier_select', date=datePlan)
# recall code et nom élève
@@ -90,6 +93,10 @@ def agenda(request):
mem_nodossier = 'Aucun'
mem_nomdossier = u'dossier sélectionné'
# liste des types de rdv
types_rdv = get_types_rdv(request)
type_rdv = u'RDV DEVIS'
# liste des users avec agenda
agendas = get_users_agenda(request)
@@ -104,8 +111,17 @@ def agenda(request):
if 'agenda' in request.params:
agenda = request.params["agenda"]
rows = get_rendez_vous(request, agenda)
# -- CREER un rendez-vous
if 'form.submitted' in request.params and mem_nodossier != 'Aucun':
dateRDV = request.params['dateRDV']
heureRDV = request.params['heureRDV']
type_rdv = request.params['type_rdv']
create_rdv(request, mem_nodossier, dateRDV, heureRDV, type_rdv, agenda, logged_in.upper())
request.session.flash(u"Le rendez-vous a été CREE avec succès.", 'success')
rows = get_rendez_vous(request, agenda)
# construire la liste des events
events = []
for row in rows:
@@ -121,7 +137,7 @@ def agenda(request):
color = "Gold"
json_event = {
'title': row.c_nom,
'title': '%s %s' % (row.c_qualite, row.c_nom),
'description': row.c_ville.capitalize(),
'start': row.rdv_debut.strftime('%Y-%m-%d %H:%M:%S'),
'end': row.rdv_fin.strftime('%Y-%m-%d %H:%M:%S'),
@@ -138,10 +154,14 @@ def agenda(request):
'fullcalendar_events': json.dumps(events),
'agendas': agendas,
'agenda': agenda,
'types_rdv': types_rdv,
'type_rdv': type_rdv,
'message': message,
'mem_nodossier': mem_nodossier,
'mem_nomdossier': mem_nomdossier,
'url': url,
'url_select': url_select,
'datePlan': datePlan,
}
@view_config(route_name='planning', renderer='../templates/agenda/planning.pt', permission='view')

147
mondumas/views/default.py
View File

@@ -146,7 +146,7 @@ def redefinir_mdp(request):
@view_config(route_name='login', renderer='../templates/default/login.pt', permission='view')
@forbidden_view_config(renderer='../templates/login.pt')
@forbidden_view_config(renderer='../templates/default/login.pt')
def login(request):
current_route_path = request.current_route_path()
@@ -214,148 +214,3 @@ gestion.entreprise-dumas.com
mailer.send_immediately(message)
@view_config(route_name='dossier_lookup', renderer='../templates/default/dossier_lookup.pt', permission='view')
@view_config(route_name='dossier_select', renderer='../templates/default/dossier_lookup.pt', permission='view')
def dossier_lookup(request):
if 'dossier_select' in request.current_route_path() :
# 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''
societes = ['PE','ME','PL','PO','CD']
societe = 'PE'
liste=[]
name = u''
cb_tous = "non"
if 'form.submitted' in request.params:
name = request.params['name']
societe = request.params['societe']
# si afficher tous les fiches ?
if 'cb_tous' in request.params:
cb_tous = "oui"
chantiers = get_chantiers_byName(request, societe, name, True)
else:
cb_tous = "non"
chantiers = get_chantiers_byName(request, societe, name, False)
if len(chantiers) == 0:
message = u"Chantier non trouvé : %s" % name
# construire la liste
for item in chantiers:
d = ('%s-%s' % (societe, item.numero),item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant),
item.nosin, item.status)
liste.append(d)
return {
'page_title': u"Rechercher un chantier",
'url': url,
'goto_url': goto_url,
'message': message,
'dt_data': json.dumps(liste),
'societes': societes,
'societe': societe,
'name': name,
'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,
}

195
mondumas/views/dossier.py Normal file
View File

@@ -0,0 +1,195 @@
# -*- coding: utf8 -*-
from pyramid.response import Response
from pyramid.renderers import render, get_renderer
from pyramid.view import (
view_config,
forbidden_view_config,
)
from pyramid.security import (
remember,
forget,
)
from pyramid.httpexceptions import (
HTTPFound,
HTTPNotFound,
HTTPForbidden,
)
from pyramid_mailer import get_mailer
from pyramid_mailer.message import Message, Attachment
from datetime import *
import hashlib
from sqlalchemy.exc import DBAPIError
from ..security import groupfinder
import json
from ..models.default import *
from ..models.dossier import *
@view_config(route_name='dossier_lookup', renderer='../templates/dossier/dossier_lookup.pt', permission='view')
@view_config(route_name='dossier_select', renderer='../templates/dossier/dossier_lookup.pt', permission='view')
def dossier_lookup(request):
if 'dossier_select' in request.current_route_path() :
# 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''
societes = ['PE','ME','PL','PO','CD']
societe = 'PE'
liste=[]
name = u''
cb_tous = "non"
if 'form.submitted' in request.params:
name = request.params['name']
societe = request.params['societe']
# si afficher tous les fiches ?
if 'cb_tous' in request.params:
cb_tous = "oui"
chantiers = get_chantiers_byName(request, societe, name, True)
else:
cb_tous = "non"
chantiers = get_chantiers_byName(request, societe, name, False)
if len(chantiers) == 0:
message = u"Chantier non trouvé : %s" % name
# construire la liste
for item in chantiers:
d = ('%s-%s' % (societe, item.numero),item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant),
item.nosin, item.status)
liste.append(d)
return {
'page_title': u"Rechercher un chantier",
'url': url,
'goto_url': goto_url,
'message': message,
'dt_data': json.dumps(liste),
'societes': societes,
'societe': societe,
'name': name,
'cb_tous': cb_tous,
}
@view_config(route_name='dossier_view', renderer='../templates/dossier/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='devis_view', renderer='../templates/dossier/devis_view.pt', permission='view')
def devis_view(request):
nodossier = request.matchdict['nodossier']
url = request.route_url("devis_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'] = '%s %s' % (dossier.C_QUALITE, 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/dossier/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,
}