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

stats

Browse Source
This commit is contained in:
Phuoc
2021-02-16 14:35:26 +01:00
parent 3915b0e59b
commit 6212692b19
15 changed files with 250 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
development.ini
View File

@@ -23,7 +23,7 @@ sqlalchemy.url = mysql://phuoc:phuoc!@localhost/bddevfac?charset=utf8
# sqlalchemy.url = mysql://phuoc:phuoc!@192.168.0.31/bddevfac?charset=utf8 # sqlalchemy.url = mysql://phuoc:phuoc!@192.168.0.31/bddevfac?charset=utf8
mondumas.admin_email = cao.thien-phuoc@orange.fr mondumas.admin_email = cao.thien-phuoc@orange.fr
mondumas.devfac_url = mondumas:static/DEVFAC/ mondumas.devfac_url = mondumas:static/DEVFAC/DOCS_ATTACHES/
mondumas.devfac_dir = /DEVFAC14/DOCS_ATTACHES mondumas.devfac_dir = /DEVFAC14/DOCS_ATTACHES
# Mailer configuration # Mailer configuration

14
mondumas/models/dossier.py
View File

@@ -126,9 +126,9 @@ def get_docs_attaches(request, nodossier, norapport, origine, filename):
nochantier = int(nodossier[3:]) nochantier = int(nodossier[3:])
if filename == '': if filename == '':
query = "SELECT * FROM dossier_attaches WHERE nomrep = 'DOCS_ATTACHES' AND societe = :societe AND nochantier = :nochantier AND nodossier=0 AND origine = :origine ORDER BY cree_le;" query = "SELECT * FROM dossier_attaches WHERE societe = :societe AND nochantier = :nochantier AND nodossier=0 AND origine = :origine ORDER BY cree_le;"
else: else:
query = """SELECT * FROM dossier_attaches WHERE nomrep = 'DOCS_ATTACHES' AND societe = :societe AND nochantier = :nochantier query = """SELECT * FROM dossier_attaches WHERE societe = :societe AND nochantier = :nochantier
AND nodossier = :norapport AND origine = :origine AND nomfichier = :filename ORDER BY cree_le;""" AND nodossier = :norapport AND origine = :origine AND nomfichier = :filename ORDER BY cree_le;"""
results = request.dbsession.execute(query, {'societe': societe, 'nochantier': nochantier, results = request.dbsession.execute(query, {'societe': societe, 'nochantier': nochantier,
'norapport': norapport, 'origine': origine, 'filename': filename}).fetchall() 'norapport': norapport, 'origine': origine, 'filename': filename}).fetchall()
@@ -137,7 +137,7 @@ def get_docs_attaches(request, nodossier, norapport, origine, filename):
def get_photos(request, nodossier, norapport, origine): def get_photos(request, nodossier, norapport, origine):
societe = nodossier[0:2] societe = nodossier[0:2]
nochantier = int(nodossier[3:]) nochantier = int(nodossier[3:])
query = """SELECT * FROM dossier_attaches WHERE nomrep = 'DOCS_ATTACHES' AND societe = :societe AND nochantier = :nochantier query = """SELECT * FROM dossier_attaches WHERE societe = :societe AND nochantier = :nochantier
AND nodossier = :norapport AND origine = :origine AND UPPER(RIGHT(nomfichier,3)) <> 'PDF' ORDER BY cree_le;""" AND nodossier = :norapport AND origine = :origine AND UPPER(RIGHT(nomfichier,3)) <> 'PDF' ORDER BY cree_le;"""
results = request.dbsession.execute(query, {'societe': societe, 'nochantier': nochantier, 'norapport': norapport, 'origine': origine}).fetchall() results = request.dbsession.execute(query, {'societe': societe, 'nochantier': nochantier, 'norapport': norapport, 'origine': origine}).fetchall()
return results return results
@@ -153,7 +153,7 @@ def delete_photos(request, nodossier, norapport, origine, nomfic):
if os.path.exists(file_path): if os.path.exists(file_path):
os.remove(file_path) os.remove(file_path)
query = "DELETE FROM dossier_attaches WHERE nomrep='DOCS_ATTACHES' AND societe=:societe AND nochantier=:nochantier AND nodossier=:norapport AND origine=:origine AND nomfichier=:nomfic;" query = "DELETE FROM dossier_attaches WHERE societe=:societe AND nochantier=:nochantier AND nodossier=:norapport AND origine=:origine AND nomfichier=:nomfic;"
execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'norapport': norapport, 'origine': origine, 'nomfic': nomfic}) execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'norapport': norapport, 'origine': origine, 'nomfic': nomfic})
def rename_photos(request, nodossier, norapport, origine, nomfic, new_nomfic): def rename_photos(request, nodossier, norapport, origine, nomfic, new_nomfic):
@@ -162,7 +162,7 @@ def rename_photos(request, nodossier, norapport, origine, nomfic, new_nomfic):
query = """ query = """
UPDATE dossier_attaches SET nomfichier = :new_nomfic UPDATE dossier_attaches SET nomfichier = :new_nomfic
WHERE nomrep='DOCS_ATTACHES' AND societe=:societe AND nochantier=:nochantier AND nodossier=:norapport AND origine=:origine AND nomfichier=:nomfic; WHERE societe=:societe AND nochantier=:nochantier AND nodossier=:norapport AND origine=:origine AND nomfichier=:nomfic;
""" """
execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'norapport': norapport, execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'norapport': norapport,
'origine': origine, 'nomfic': nomfic, 'new_nomfic': new_nomfic}) 'origine': origine, 'nomfic': nomfic, 'new_nomfic': new_nomfic})
@@ -204,8 +204,8 @@ def insert_dossier_attaches(request, nodossier, norapport, origine, filename, fi
if item: if item:
return return
# enregistrer dans la table dossier_attaches # enregistrer dans la table dossier_attaches
query = """INSERT INTO dossier_attaches (nomrep, societe, nochantier, nodossier, origine, nomfichier, taillefichier, cree_le, usermaj) query = """INSERT INTO dossier_attaches (societe, nochantier, nodossier, origine, nomfichier, taillefichier, cree_le, usermaj)
VALUES('DOCS_ATTACHES',:societe,:nochantier,:norapport,:origine,:filename,:filesize,NOW(),:user);""" VALUES(:societe,:nochantier,:norapport,:origine,:filename,:filesize,NOW(),:user);"""
execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'norapport': norapport, execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'norapport': norapport,
'origine': origine, 'filename': filename, 'filesize': filesize, 'user': user}) 'origine': origine, 'filename': filename, 'filesize': filesize, 'user': user})

13
mondumas/models/parametres.py
View File

@@ -32,10 +32,17 @@ def get_rappels_rdv(request):
results = request.dbsession.execute(query, {}) results = request.dbsession.execute(query, {})
return results.fetchall() return results.fetchall()
def get_orphans_DE(request, societe): def get_stats_dd(request, societe):
query = "SELECT * FROM devis WHERE societe = '%s' AND nochantier = 0 ORDER BY date desc LIMIT 50 ;" % (societe) query = """SELECT societe, year(date) as Annee, COUNT(*) as Total,
results = request.dbsession.execute(query).first() SUM(IF(status = '', 1, 0)) AS Created,
SUM(IF(status = 'Devis', 1, 0)) AS Devis,
SUM(IF(status = 'Commandé', 1, 0)) AS Commande,
SUM(IF(status = 'Facturé', 1, 0)) AS Facture,
SUM(IF(status = 'Régl part.', 1, 0)) AS ReglePart,
SUM(IF(status = 'Réglée', 1, 0)) AS Regle
FROM dem_devis where societe=:societe group by societe, year(date);"""
results = request.dbsession.execute(query, {'societe': societe}).fetchall()
return results return results
def get_dossiers_byChantier(request, societe, name): def get_dossiers_byChantier(request, societe, name):

28
mondumas/models/utils.py
View File

@@ -61,3 +61,31 @@ def get_societes(request, societe):
query = "SELECT * FROM p_societe WHERE societe = :societe;" query = "SELECT * FROM p_societe WHERE societe = :societe;"
results = request.dbsession.execute(query, {'societe': societe}).first() results = request.dbsession.execute(query, {'societe': societe}).first()
return results return results
def chantierExiste(request,societe, no_id):
query = "SELECT no_id FROM dem_devis WHERE societe = :societe and no_id = :no_id;"
results = request.dbsession.execute(query, {'societe': societe, 'no_id': no_id}).first()
if results:
return len(results) > 0
else:
return False
def get_all_chantiers(request,societe):
query = "SELECT * FROM dem_devis WHERE societe = :societe;"
results = request.dbsession.execute(query, {'societe': societe}).fetchall()
return results
def get_last_facture(request, societe, nochantier):
query = "SELECT * FROM facture WHERE societe = :societe AND nochantier = :nochantier order by date DESC LIMIT 1;"
results = request.dbsession.execute(query, {'societe': societe, 'nochantier': nochantier}).first()
return results
def get_last_devis(request, societe, nochantier):
query = "SELECT * FROM devis WHERE societe = :societe AND nochantier = :nochantier order by date DESC LIMIT 1;"
results = request.dbsession.execute(query, {'societe': societe, 'nochantier': nochantier}).first()
return results
def update_chantier_status(request, societe, no_id, status):
query = "UPDATE dem_devis SET status = :status, DATEMAJ = DATEMAJ WHERE societe = :societe AND no_id = :no_id AND status <> :status;"
execute_query(request, query, {'societe': societe, 'no_id': no_id, 'status': status})

3
mondumas/routes.py
View File

@@ -58,7 +58,7 @@ def includeme(config):
config.add_route('emails_msg', '/emails_msg/{nolig}') config.add_route('emails_msg', '/emails_msg/{nolig}')
config.add_route('expert_edit', '/expert_edit/{code_cab}/{code_exp}') config.add_route('expert_edit', '/expert_edit/{code_cab}/{code_exp}')
config.add_route('infrastructure', '/infrastructure') config.add_route('infrastructure', '/infrastructure')
config.add_route('orphans_de', '/orphans_de/{societe}') config.add_route('stats_dd', '/stats_dd/{societe}')
config.add_route('rappels_rdv', '/rappels_rdv') config.add_route('rappels_rdv', '/rappels_rdv')
config.add_route('rdf_cause_edit', '/rdf_cause_edit/{code}') config.add_route('rdf_cause_edit', '/rdf_cause_edit/{code}')
config.add_route('rdf_causes', '/rdf_causes') config.add_route('rdf_causes', '/rdf_causes')
@@ -71,3 +71,4 @@ def includeme(config):
# utils # utils
config.add_route('batch_nuit', '/batch_nuit/{param}') config.add_route('batch_nuit', '/batch_nuit/{param}')
config.add_route('batch_test', '/batch_test/{param}')

9
mondumas/templates/dossier/dossier_lookup.pt
View File

@@ -70,7 +70,7 @@
$.fn.dataTable.moment('DD-MM-YYYY'); $.fn.dataTable.moment('DD-MM-YYYY');
$('#dossiers_list').DataTable({ $('#dossiers_list').DataTable({
data: dataSet, data: dataSet,
pageLength: 50, pageLength: 100,
bLengthChange: false, bLengthChange: false,
language: { language: {
url: 'https://cdn.datatables.net/plug-ins/1.10.16/i18n/French.json' url: 'https://cdn.datatables.net/plug-ins/1.10.16/i18n/French.json'
@@ -89,10 +89,13 @@
if ( data[6] == "Humidité" ) { if ( data[6] == "Humidité" ) {
$('td', row).eq(6).css('background-color', 'Crimson').css('color', 'white'); $('td', row).eq(6).css('background-color', 'Crimson').css('color', 'white');
} }
if ( data[6] == "En-cours" ) { if ( data[6] == "Devis" || data[6] == "Commandé") {
$('td', row).eq(6).css('background-color', 'Orange'); $('td', row).eq(6).css('background-color', 'Orange');
} }
if ( data[6] == "Terminé" ) { 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'); $('td', row).eq(6).css('background-color', 'LightGreen');
} }
}, },

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

@@ -238,9 +238,9 @@
<span class="glyphicon glyphicon-picture" tal:condition="detail.nomfichier.lower()[-3:]=='jpg'"></span> <span class="glyphicon glyphicon-picture" tal:condition="detail.nomfichier.lower()[-3:]=='jpg'"></span>
</td> </td>
<td> <td>
<a href="${docs_url}${detail.nomrep}/${detail.societe}/${detail.nochantier}/${detail.nomfichier}" <a href="${docs_url}${detail.societe}/${detail.nochantier}/${detail.nomfichier}"
target="popup" target="popup"
onclick="window.open('${docs_url}${detail.nomrep}/${detail.societe}/${detail.nochantier}/${detail.nomfichier},'popup','width=900,height=768'); return false;"> onclick="window.open('${docs_url}${detail.societe}/${detail.nochantier}/${detail.nomfichier},'popup','width=900,height=768'); return false;">
${detail.nomfichier} ${detail.nomfichier}
</a> </a>
</td> </td>
@@ -271,9 +271,9 @@
<span class="glyphicon glyphicon-picture" tal:condition="detail.nomfichier.lower()[-3:]=='jpg'"></span> <span class="glyphicon glyphicon-picture" tal:condition="detail.nomfichier.lower()[-3:]=='jpg'"></span>
</td> </td>
<td> <td>
<a href="${docs_url}${detail.nomrep}/${detail.societe}/${detail.nochantier}/${detail.nomfichier}" <a href="${docs_url}${detail.societe}/${detail.nochantier}/${detail.nomfichier}"
target="popup" target="popup"
onclick="window.open('${docs_url}${detail.nomrep}/${detail.societe}/${detail.nochantier}/${detail.nomfichier},'popup','width=900,height=768'); return false;"> onclick="window.open('${docs_url}${detail.societe}/${detail.nochantier}/${detail.nomfichier},'popup','width=900,height=768'); return false;">
${detail.nomfichier} ${detail.nomfichier}
</a> </a>
</td> </td>

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

@@ -162,7 +162,7 @@
<br /> <br />
</div> </div>
<p class="new-page" align="center" tal:repeat="detail photos1"> <p class="new-page" align="center" tal:repeat="detail photos1">
<img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}" <img src="${docs_url}${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}"
width="660" /> width="660" />
</p> </p>
@@ -300,7 +300,7 @@
<br /> <br />
</div> </div>
<p class="new-page" align="center" tal:repeat="detail photos2"> <p class="new-page" align="center" tal:repeat="detail photos2">
<img src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}" <img src="${docs_url}${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}"
width="660" /> width="660" />
</p> </p>
<br /> <br />

4
mondumas/templates/dossier/upload_doc.pt
View File

@@ -31,9 +31,9 @@
<li> <li>
<span class="glyphicon glyphicon-file" tal:condition="detail.nomfichier[-3:]=='pdf'"></span> <span class="glyphicon glyphicon-file" tal:condition="detail.nomfichier[-3:]=='pdf'"></span>
<span class="glyphicon glyphicon-picture" tal:condition="detail.nomfichier[-3:]=='jpg'"></span> <span class="glyphicon glyphicon-picture" tal:condition="detail.nomfichier[-3:]=='jpg'"></span>
<a href="${docs_url}${detail.nomrep}/${detail.societe}/${detail.nochantier}/${detail.nomfichier}" <a href="${docs_url}${detail.societe}/${detail.nochantier}/${detail.nomfichier}"
target="popup" target="popup"
onclick="window.open('${docs_url}${detail.nomrep}/${detail.societe}/${detail.nochantier}/${detail.nomfichier},'popup','width=900,height=768'); return false;"> onclick="window.open('${docs_url}${detail.societe}/${detail.nochantier}/${detail.nomfichier},'popup','width=900,height=768'); return false;">
${detail.nomfichier} ${detail.nomfichier}
</a> </a>
&nbsp;-&nbsp;crée le ${detail.cree_le.strftime('%d-%m-%Y')}&nbsp;par&nbsp;${detail.usermaj} &nbsp;-&nbsp;crée le ${detail.cree_le.strftime('%d-%m-%Y')}&nbsp;par&nbsp;${detail.usermaj}

4
mondumas/templates/dossier/upload_img.pt
View File

@@ -48,9 +48,9 @@
<tr tal:repeat="detail photos"> <tr tal:repeat="detail photos">
<td width="400" align="center"> <td width="400" align="center">
<img tal:condition="norapport=='0'" width="350" <img tal:condition="norapport=='0'" width="350"
src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${detail.nomfichier}" /> src="${docs_url}${detail.societe}/${nochantier}/${detail.nomfichier}" />
<img tal:condition="norapport!='0'" width="350" <img tal:condition="norapport!='0'" width="350"
src="${docs_url}${detail.nomrep}/${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}" /> src="${docs_url}${detail.societe}/${nochantier}/${norapport}/${detail.nomfichier}" />
</td> </td>
<td> <td>
<p> <p>

156
mondumas/templates/parametres/orphans_de.pt
View File

@@ -1,156 +0,0 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<div class="alert alert-danger" tal:condition="message" tal:content="message" />
<form method="POST" id="frm" class="form-horizontal">
<div class="form-group">
<label class="control-label col-xs-3" for="societe">Societe</label>
<div class="col-xs-8">
<select class="form-control" id="societe" name="societe" onChange="$('#frm').submit()">
<div tal:repeat="item societes">
<option value="${item}" tal:attributes="selected societe==item and 'selected' or None">${item}</option>
</div>
</select>
</div>
</div>
</form>
<!-- ENTETE -->
<div class="row">
<!-- CHANTIER -->
<div class="col-md-6">
<table class="table table-condensed ">
<tr>
<td><h4>CHANTIER</h4></td>
<td>
<h4>${devis.C_QUALITE} ${devis.C_NOM}</h4>
${devis.C_ADR}<br />
<span tal:condition="devis.C_ADR2">${devis.C_ADR2}<br /></span>
${devis.C_CP} ${devis.C_VILLE}<br />
</td>
</tr>
<tr>
<td>
Police<br />
Sinistre<br />
</td>
<td>
${devis.NOPOL}<br />
${devis.NOSIN}<br />
</td>
</tr>
</table>
</div>
<div class="col-md-6">
<table class="table table-condensed ">
<tr>
<td>
<h4>CLIENT</h4>
NO DEVIS<br />
DATE<br />
</td>
<td>
<h4>${devis.NOMCLI}</h4>
${devis.NO_ID}<br />
${devis.DATE.strftime('%d-%m-%Y')}
</td>
</tr>
</table>
</div>
</div> <!-- row -->
<form id="frm-nochantier" action="${url}" method="POST" class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2" for="societe">No chantier</label>
<div class="col-sm-2">
<select class="form-control" id="nochantier" name="nochantier">
<div tal:repeat="item nochantiers">
<option value="${item}" tal:attributes="selected nochantier == item and 'selected' or None">${item}</option>
</div>
</select>
</div>
<div class="col-sm-8">
<button class="btn btn-primary" type="submit" name="form.nochantier">
<span class="glyphicon glyphicon-pencil"></span>&nbsp;MAJ No chantier</button>
&nbsp;&nbsp;(Veuillez cocher un ou plusieurs dossiers pour mettre à jour leur no de chantier)
</div>
</div>
</form>
<div class="row">
<table id="dossiers_list" class="table table-bordered">
<thead>
<tr>
<th></th>
<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">Ch.</th>
</tr>
</thead>
</table>
<br />
<br />
</div>
<script type="text/javascript">
var dataSet = ${dt_data};
$(document).ready(function() {
$.fn.dataTable.moment('DD-MM-YYYY');
var table = $('#dossiers_list').DataTable({
data: dataSet,
pageLength: 20,
bLengthChange: false,
searching: false,
language: {
url: 'https://cdn.datatables.net/plug-ins/1.10.16/i18n/French.json'
},
columnDefs: [
{ className: "text-center", "targets": [0] },
{ className: "text-right", "targets": [5] },
{ 'targets': 0,
'checkboxes': {
'selectRow': true
}
},
],
select: {
'style': 'multi'
},
order: [[2, 'asc']],
createdRow: function( row, data, dataIndex ) {
if ( data[0].slice(0,2) == "DD" ) {
$('td', row).eq(7).css('background-color', 'Orange');
}
},
});
// Handle form submission event
$('#frm-nochantier').on('submit', function(e){
var form = this;
var rows_selected = table.column(0).checkboxes.selected();
// Iterate over all selected checkboxes
$.each(rows_selected, function(index, rowId){
// alert("row selected :"+ index + "rowId "+ rowId);
// Create a hidden element
$(form).append(
$('<input>')
.attr('type', 'hidden')
.attr('name', 'id' + index)
.val(rowId)
);
});
});
});
</script>
</div>
</metal:block>

8
mondumas/templates/parametres/parametres.pt
View File

@@ -41,10 +41,12 @@
<a href="${request.application_url}/users_ua"><span class="glyphicon glyphicon-log-in logo-primary"></span></a> <a href="${request.application_url}/users_ua"><span class="glyphicon glyphicon-log-in logo-primary"></span></a>
<h4>CONNEXIONS</h4> <h4>CONNEXIONS</h4>
</div> </div>
<div class="col-sm-3" tal:condition="logged_in=='CAO'"> <div class="col-sm-3">
<a href="${request.application_url}/orphans_de/PE"><span class="glyphicon glyphicon-wrench logo-primary"></span></a> <a href="${request.application_url}/stats_dd/PE"><span class="glyphicon glyphicon-wrench logo-primary"></span></a>
<h4>DEVIS ORPHELINS</h4> <h4>STATS GLOBALES</h4>
</div> </div>
</div>
<div class="row text-center">
<div class="col-sm-3"> <div class="col-sm-3">
<a href="${request.application_url}/infrastructure"><span class="glyphicon glyphicon-cog logo-primary"></span></a> <a href="${request.application_url}/infrastructure"><span class="glyphicon glyphicon-cog logo-primary"></span></a>
<h4>INFRASTRUCTURE</h4> <h4>INFRASTRUCTURE</h4>

74
mondumas/templates/parametres/stats_dd.pt Normal file
View File

@@ -0,0 +1,74 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<div class="alert alert-danger" tal:condition="message" tal:content="message" />
<br />
<form method="POST" id="frm" class="form-horizontal">
<div class="form-group">
<label class="control-label col-xs-3" for="societe">Societe</label>
<div class="col-xs-8">
<select class="form-control" id="societe" name="societe" onChange="$('#frm').submit()">
<div tal:repeat="item societes">
<option value="${item}" tal:attributes="selected societe==item and 'selected' or None">${item}</option>
</div>
</select>
</div>
</div>
</form>
<div class="row">
<table id="dossiers_list" class="table table-bordered">
<thead>
<tr>
<th>Année</th>
<th class="text-right">A traiter</th>
<th class="text-right">Devis</th>
<th class="text-right">Commandé</th>
<th class="text-right">Facturé</th>
<th class="text-right">Régl part.</th>
<th class="text-right">Réglée</th>
<th class="text-right">Total</th>
</tr>
</thead>
</table>
<br />
<br />
</div>
<script type="text/javascript">
var dataSet = ${dt_data};
$(document).ready(function() {
$.fn.dataTable.moment('DD-MM-YYYY');
var table = $('#dossiers_list').DataTable({
data: dataSet,
pageLength: 20,
bLengthChange: false,
bFilter: false,
ordering: false,
bPaginate: false,
language: {
url: 'https://cdn.datatables.net/plug-ins/1.10.16/i18n/French.json'
},
columnDefs: [
{ className: "text-center", "targets": [0] },
{ className: "text-right", "targets": [1] },
{ className: "text-right", "targets": [2] },
{ className: "text-right", "targets": [3] },
{ className: "text-right", "targets": [4] },
{ className: "text-right", "targets": [5] },
{ className: "text-right", "targets": [6] },
{ className: "text-right", "targets": [7] },
],
order: [[0, 'asc']],
rowCallback: function( row, data ) {
$('td', row).eq(0).addClass('bg-success');
$('td', row).eq(7).addClass('bg-warning');
},
});
});
</script>
</div>
</metal:block>

50
mondumas/views/parametres.py
View File

@@ -27,7 +27,7 @@ from ..views.default import *
@view_config(route_name='parametres', renderer='../templates/parametres/parametres.pt', permission='manage') @view_config(route_name='parametres', renderer='../templates/parametres/parametres.pt', permission='manage')
def parametres(request): def parametres(request):
logged_in = request.authenticated_userid.lower() logged_in = request.authenticated_userid.upper()
return { return {
'page_title': "Paramètres", 'page_title': "Paramètres",
@@ -168,7 +168,7 @@ def user_edit(request):
@view_config(route_name='dashboard', renderer='../templates/parametres/dashboard.pt', permission='manage') @view_config(route_name='dashboard', renderer='../templates/parametres/dashboard.pt', permission='manage')
def dashboard(request): def dashboard(request):
# lire le log de nuit # lire le log de nuit
log_nuit = get_log_nuit(request) log_nuit = get_log_nuit(request)
@@ -216,60 +216,36 @@ def rappels_rdv(request):
'nbRappels': nbRappels, 'nbRappels': nbRappels,
} }
@view_config(route_name='orphans_de', renderer='../templates/parametres/orphans_de.pt', permission='manage') @view_config(route_name='stats_dd', renderer='../templates/parametres/stats_dd.pt', permission='view')
def orphans_de(request): def stats_dd(request):
societe = request.matchdict['societe'] societe = request.matchdict['societe']
url = request.route_url('orphans_de', societe=societe) url = request.route_url('stats_dd', societe=societe)
message = '' message = ''
societes = ['PE','ME','PL','PO','CD'] societes = ['PE','ME','PL','PO','CD']
nochantier = '0'
# prendre en compte les paramètres de saisie # prendre en compte les paramètres de saisie
if 'societe' in request.params: if 'societe' in request.params:
societe = request.params["societe"] societe = request.params["societe"]
url = request.route_url('orphans_de', societe=societe) url = request.route_url('stats_dd', societe=societe)
if 'form.nochantier' in request.params: # lire les stats globales des demandes de devis
message = '' stats_dd = get_stats_dd(request, societe)
nochantier = request.params['nochantier']
# oui, NestedMultiDict([('form.submitted', ''), ('id0', '271246'), ('id1', '370929')])
for param in request.params:
if param[:2] == 'id':
update_nochantier(request, societe, request.params[param], int(nochantier))
message = "Le numéro de chantier est mis à jour avec succès"
# lire le premier devis orphelin
devis = get_orphans_DE(request, societe)
# lire tous les dossiers de ce chantier
dossiers = get_dossiers_byChantier(request, societe, '%s;%s;%s' % (devis.C_NOM, devis.C_ADR, devis.C_VILLE))
liste=[] liste=[]
nochantiers=[]
# construire la liste # construire la liste
for item in dossiers: for item in stats_dd:
dossier_id = '%s-%s' % (item.TYPE, item.numero) d = (str(item.Annee), str(item.Created), str(item.Devis), str(item.Commande), str(item.Facture), str(item.ReglePart),
if item.nochantier != 0: str(item.Regle), str(item.Total))
nochantiers.append(item.nochantier)
nochantier = item.nochantier
d = (dossier_id, dossier_id, item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant),
item.nosin, item.nochantier)
liste.append(d) liste.append(d)
if len(nochantiers) == 0:
nochantiers.append(1)
return { return {
'page_title': "DEVIS orphelins", 'page_title': "Stats : Demandes de devis",
'url': url, 'url': url,
'message': message, 'message': message,
'devis': devis,
'dt_data': json.dumps(liste), 'dt_data': json.dumps(liste),
'societes': societes, 'societes': societes,
'societe': societe, 'societe': societe,
'nochantiers': nochantiers,
'nochantier': nochantier,
} }
@view_config(route_name='rdf_causes', renderer='../templates/parametres/rdf_causes.pt', permission='manage') @view_config(route_name='rdf_causes', renderer='../templates/parametres/rdf_causes.pt', permission='manage')

100
mondumas/views/utils.py
View File

@@ -31,8 +31,9 @@ def batch_nuit(request):
# ----- effacer le log # ----- effacer le log
truncate_log(request) truncate_log(request)
# ----- PURGE des dosiers obsolètes # ----- PURGE des données obsolètes
# todo delete_orphan_attached_files(request)
# ----- RAPPELS DES RENDEZ-VOUS # ----- RAPPELS DES RENDEZ-VOUS
update_rappels(request) update_rappels(request)
# attendre 5 secondes # attendre 5 secondes
@@ -55,14 +56,12 @@ def notifier_rappels(request):
rappels = get_email_rappels(request) rappels = get_email_rappels(request)
nbLus = 0 nbLus = 0
nbEmailVide = 0
nbEnvoyes = 0 nbEnvoyes = 0
for item in rappels: for item in rappels:
nbLus += 1 nbLus += 1
error = 0 error = 0
if len(item.c_email) == 0 : if len(item.c_email) == 0 :
nbEmailVide += 1
insert_log(request, 'RAPPELS', '--> email vide : %s-%s - %s %s' % (item.societe, item.nochantier, item.c_qualite, item.c_nom)) insert_log(request, 'RAPPELS', '--> email vide : %s-%s - %s %s' % (item.societe, item.nochantier, item.c_qualite, item.c_nom))
else: else:
# RDV ayant une heure # RDV ayant une heure
@@ -153,6 +152,95 @@ def send_mail(request, expediteur, destinataires, objet, corps):
else: else:
msg = e msg = e
# logguer l'erreur # logguer l'erreur
insert_log(request, 'RAPPELS', "- MAILER ERROR : %s TO %s - %s" % (expediteur, destinataires, msg)) insert_log(request, 'RAPPELS', "- MAILER ERROR : %s, TO : %s" % (msg, destinataires))
return len(msg) return len(msg)
@view_config(route_name='batch_test')
def batch_test(request):
"""
Traitement est lancé pour tester des traitements batch
URL = /batch_test/Sansa5tark
Par sécurité, ce view ne peut être appelé qu'avec un paramètre secret 'Sansa5tark'
"""
# contrôle : paramètre correct ? non, terminer
par = request.matchdict['param']
if par != 'Sansa5tark':
return Response('Erreur : paramètre incorrect')
update_chantiers_status(request)
return Response('Batch nuit terminé OK')
def delete_orphan_attached_files(request):
"""
Ce traitement parcourt le répertoire DOCS_ATTACHES de chacune des 5 sociétés
et controle que le dossier sur le filesystem existe dans la BD.
S'il n'existe plus, on supprime les fichiers du dossier
"""
import os
import shutil
societes = ['CD', 'ME', 'PE', 'PL', 'PO']
for ste in societes:
# Scan the directiory of attached files
# and get an iterator of os.DirEntry objets
path = request.registry.settings['mondumas.devfac_dir'] + '/' + ste
obj = os.scandir(path)
# List all diretories in the specified path
nbLus = 0
nbSupp = 0
for entry in obj :
if entry.is_dir():
nbLus += 1
# le chantier existe ?
if chantierExiste(request,ste, entry.name) == False :
# non, supprimer les docs attaches
shutil.rmtree(path+ '/' + entry.name)
nbSupp += 1
if nbLus > 0:
insert_log(request, 'DELETE', '%s : %d Répertoires lues, %d supprimées' % (ste, nbLus, nbSupp))
def update_chantiers_status(request):
"""
Ce traitement parcourt tous les chantiers de chacune des 5 sociétés
pour mettre à jour son STATUS selon l'avancement du chantier.
"""
societes = ['PE','ME','PL','PO','CD']
for ste in societes:
# lire tous les chantiers
chantiers = get_all_chantiers(request, ste)
for item in chantiers:
# si le chantier est annulé, ne rien faire
if item.STATUS != 'Annulé':
status = ''
# lire la dernière facture du chantier
facture = get_last_facture(request, ste, item.NO_ID)
if facture :
# remonte le status de la facture ('','Régl part.', 'Réglée')
status = facture.STATUS
if status == '':
status = 'Facturé'
else:
# lire le dernier devis du chantier ('','Commandé, 'Facturé')
devis = get_last_devis(request, ste, item.NO_ID)
if devis:
# remonte le status de la facture
status = devis.STATUS
if status == '' or status == '0':
status = 'Devis'
else:
if item.HUMIDITE != 0:
status = 'Humidité'
# maj le status du chantier
update_chantier_status(request, ste, item.NO_ID, status)