correction new_home + stats + dem_devis

mondumas/templates/default/new_home.pt

@@ -10,7 +10,7 @@
 					<span class="info-box-icon"><i class="glyphicon glyphicon-calendar"></i></span>
 					<div class="info-box-content">
 						<span class="info-box-number">AGENDA</span>
-						<span class="info-box-text">Rendez-vous : </span>
+						<span class="info-box-text">RDV DU JOUR : </span>
 						<span class="info-box-number"><span class="badge bg-red">${nb_rdv.nb_rdv}</span></span>
 					</div>
 				</div>
@@ -22,7 +22,7 @@
 					<span class="info-box-icon"><i class="glyphicon glyphicon-tint"></i></span>
 					<div class="info-box-content">
 						<span class="info-box-number">RDF</span>
-						<span class="info-box-text">A traiter : </span>
+						<span class="info-box-text">À VALIDER </span>
 						<span class="info-box-number"><span class="badge bg-red">${nb_rdf.nb_rdf}</span></span>
 					</div>
 				</div>
@@ -43,7 +43,7 @@
 				<div class="info-box bg-prod">
 					<span class="info-box-icon"><i class="glyphicon glyphicon-search"></i></span>
 					<div class="info-box-content">
-						<span class="info-box-number">RECHERCHE</span>
+						<span class="info-box-number">RECHERCHE: DOSSIER</span>
 					</div>
 				</div>
 			</a>
@@ -68,7 +68,7 @@
 					<span class="info-box-icon"><i class="glyphicon glyphicon-envelope"></i></span>
 					<div class="info-box-content">
 						<span class="info-box-number">EMAILS</span>
-						<span class="info-box-text">A traiter : </span>
+						<span class="info-box-text">À IMPORTER : </span>
 						<span class="info-box-number"><span class="badge bg-purple">${nb_mails}</span></span>
 					</div>
 				</div>
@@ -95,7 +95,7 @@
 					<span class="info-box-icon"><i class="glyphicon glyphicon-folder-open"></i></span>
 					<div class="info-box-content">
 						<span class="info-box-number">DEM. DEVIS</span>
-						<span class="info-box-text">A traiter (<2) </span>
+						<span class="info-box-text">À TRAITER </span>
 						<span class="info-box-number"><span class="badge bg-PE">${nb_dd_restants.nb_PE}</span>
 													<span class="badge bg-ME">${nb_dd_restants.nb_ME}</span>
 													<span class="badge bg-PL">${nb_dd_restants.nb_PL}</span></span>
@@ -109,7 +109,7 @@
 					<span class="info-box-icon"><i class="glyphicon glyphicon-file"></i></span>
 					<div class="info-box-content">
 						<span class="info-box-number">DEVIS</span>
-						<span class="info-box-text">A traiter : </span>
+						<span class="info-box-text">EN ATTENTE </span>
 						<span class="info-box-number"><span class="badge bg-PE">${nb_de_restants.nb_PE}</span>
 													<span class="badge bg-ME">${nb_de_restants.nb_ME}</span>
 													<span class="badge bg-PL">${nb_de_restants.nb_PL}</span></span>
@@ -123,7 +123,7 @@
 					<span class="info-box-icon"><i class="glyphicon glyphicon-inbox"></i></span>
 					<div class="info-box-content">
 						<span class="info-box-number">FACTURES</span>
-						<span class="info-box-text">A traiter : </span>
+						<span class="info-box-text">À RÉGLER </span>
 						<span class="info-box-number"><span class="badge bg-PE">${nb_fa_restants.nb_PE}</span>
 													<span class="badge bg-ME">${nb_fa_restants.nb_ME}</span>
 													<span class="badge bg-PL">${nb_fa_restants.nb_PL}</span></span>
@@ -140,6 +140,7 @@
 					<span class="info-box-icon"><i class="glyphicon glyphicon-stats"></i></span>
 					<div class="info-box-content">
 						<span class="info-box-number">STATS</span>
+						<span class="info-box-text">DÉLAIS ET CA</span>
 					</div>
 				</div>
 			</a>

mondumas/templates/dossier/dem_devis.pt

@@ -4,8 +4,16 @@
     <br />
 
     <table class="table table-condensed">
+        <tr>
+            <th>DATE DE MAJ</th>
+            <th>ID DOSSIER</th>
+            <th>NOM DU CLIENT</th>
+            <th>NOM</th>
+            <th>DERNIER UTILISATEUR</th>
+            <th>STATUT</th>
+        </tr>
         <tr tal:repeat="item dossiers_traites">
-          <td>${item.DATEMAJ.strftime('%d %b')}</td>
+          <td>${item.DATEMAJ.strftime('%d-%m-%Y')}</td>
            <td><a href="${request.application_url}/dossier_view/${item.societe}-${item.NO_ID}">${item.societe}-${item.NO_ID}</td>
           <td>${item.NOMCLI}</td>
           <td>${item.C_NOM}</td>

mondumas/templates/dossier/devis_en_att.pt

@@ -4,6 +4,14 @@
     <br />
 
     <table class="table table-condensed">
+        <tr>
+            <th>DATE DE MAJ</th>
+            <th>ID DEVIS</th>
+            <th>NOM DU CLIENT</th>
+            <th>NOM</th>
+            <th>DERNIER UTILISATEUR</th>
+            <th>STATUT</th>
+        </tr>
         <tr tal:repeat="item list_devis_en_att">
           <td>${item.DATEMAJ.strftime('%d %b')}</td>
            <td><a href="${request.application_url}/devis_view/${item.societe}-DE${item.NO_ID}">${item.societe}-DE${item.NO_ID}</td>

mondumas/templates/dossier/factures_en_att.pt

@@ -4,6 +4,14 @@
     <br />
 
     <table class="table table-condensed">
+        <tr>
+            <th>DATE DE MAJ</th>
+            <th>ID FACTURE</th>
+            <th>NOM DU CLIENT</th>
+            <th>NOM</th>
+            <th>DERNIER UTILISATEUR</th>
+            <th>STATUT</th>
+        </tr>
         <tr tal:repeat="item list_factures_en_att">
           <td>${item.DATEMAJ.strftime('%d %b')}</td>
            <td><a href="${request.application_url}/devis_view/${item.societe}-FA${item.NO_ID}">${item.societe}-FA${item.NO_ID}</td>

mondumas/templates/stats/ca_clients.pt

@@ -63,14 +63,17 @@
 	
 		var options_ca_3y_1 = {
 			title: '${title1}',
+			colors: ['0099c6', '990099', '109618', 'ff9900', '#dc3912', '3366cc'],
 		};
 
 		var options_ca_3y_2 = {
 			title: '${title2}',
+			colors: ['0099c6', '990099', '109618', 'ff9900', '#dc3912', '3366cc'],
 		};
 
 		var options_ca_3y_3 = {
 			title: '${title3}',
+			colors: ['0099c6', '990099', '109618', 'ff9900', '#dc3912', '3366cc'],
 		};
 
 		var chart_ca_12m = new google.visualization.ColumnChart(document.getElementById('chart_ca_12m'));

mondumas/templates/stats/ca_groupes.pt

@@ -58,19 +58,23 @@
 		var options_ca_12m = {
 			title: '${title}',
 			vAxis: {title: "Chiffre d'Affaires en €"},
+			colors: ['#dc3912', 'ff9900', 'green', 'purple', '3366cc'],
           	isStacked: true
 		};
 	
 		var options_ca_3y_1 = {
 			title: '${title1}',
+			colors: ['purple', 'ff9900', '#dc3912', '3366cc', 'green'],
 		};
 
 		var options_ca_3y_2 = {
 			title: '${title2}',
+			colors: ['purple', 'ff9900', '#dc3912', '3366cc', 'green'],
 		};
 
 		var options_ca_3y_3 = {
 			title: '${title3}',
+			colors: ['purple', 'ff9900', '#dc3912', '3366cc', 'green'],
 		};
 
 		var chart_ca_12m = new google.visualization.ColumnChart(document.getElementById('chart_ca_12m'));

mondumas/views/dossier.py

@@ -1551,7 +1551,7 @@ def dem_devis(request):
     dossiers_traites = get_dossiers_traites(request)
 
     return {
-        'page_title': 'Dossiers générés à traiter',
+        'page_title': 'Dossiers avec statut: "A TRAITER"',
         'url': url,
         'dossiers_traites':dossiers_traites,
     }

mondumas/views/stats.py

@@ -176,8 +176,7 @@ def ca_groupes(request):
     print(datedeb)
     chart_ca_12m = []
     # titre des colonnes
-    chart_ca_12m.append(('Mois', 'AXA', { 'type':'string','role': 'tooltip'},'DOMUS', { 'type':'string','role': 'tooltip'},
+    chart_ca_12m.append(('Mois', 'MAIF', { 'type':'string','role': 'tooltip'}, 'MACIF', { 'type':'string','role': 'tooltip'}, 'GMF', { 'type':'string','role': 'tooltip'},'DOMUS', { 'type':'string','role': 'tooltip'}, 'AXA', { 'type':'string','role': 'tooltip'}))
-    'GMF', { 'type':'string','role': 'tooltip'},'MACIF', { 'type':'string','role': 'tooltip'}, 'MAIF', { 'type':'string','role': 'tooltip'}))
     title = 'CA sur 12 mois' 
     for item in items:
         date_aff = item.date[:3] + ' ' + item.date[-4:]
@@ -188,7 +187,7 @@ def ca_groupes(request):
         tooltipGMF = "GMF - " + date_aff + ' \nCA: '+str(item.GMF_ca) + ' €\nDossiers: '+str(round(item.GMF_nb))
         tooltipMACIF = "MACIF - " + date_aff + ' \nCA: '+str(item.MACIF_ca) + ' €\nDossiers: '+str(round(item.MACIF_nb))        
         # ('+str(item.population)+')/n'
-        d = (item.mois[:3], float(item.AXA_ca), tooltipAXA, float(item.DOMUS_ca), tooltipDOMUS, float(item.GMF_ca), tooltipGMF, float(item.MACIF_ca), tooltipMACIF, float(item.MAIF_ca), tooltipMAIF)
+        d = (item.mois[:3], float(item.MAIF_ca), tooltipMAIF, float(item.MACIF_ca), tooltipMACIF, float(item.GMF_ca), tooltipGMF, float(item.DOMUS_ca), tooltipDOMUS, float(item.AXA_ca), tooltipAXA)
         chart_ca_12m.append(d)
 
     # debut = aujourd'hui - 11 mois
@@ -254,9 +253,9 @@ def ca_clients(request):
     print(datedeb)
     chart_ca_12m = []
     # titre des colonnes
-    chart_ca_12m.append(('Mois', 'ASSURANCES', { 'type':'string','role': 'tooltip'}, 'EXPERTS', { 'type':'string','role': 'tooltip'}, 
+    chart_ca_12m.append(('Mois', 'SOCIETE', { 'type':'string','role': 'tooltip'}, 'REGIES', { 'type':'string','role': 'tooltip'}, 
-    'GROUPEMENT', { 'type':'string','role': 'tooltip'}, 'PARTICULIER', { 'type':'string','role': 'tooltip'}, 
+    'PARTICULIER', { 'type':'string','role': 'tooltip'}, 'GROUPEMENT', { 'type':'string','role': 'tooltip'}, 'EXPERTS', 
-    'REGIES', { 'type':'string','role': 'tooltip'}, 'SOCIETE', { 'type':'string','role': 'tooltip'}))
+    { 'type':'string','role': 'tooltip'}, 'ASSURANCES', { 'type':'string','role': 'tooltip'}))
     title = 'CA sur 12 mois' 
     for item in items:
         date_aff = item.date[:3] + ' ' + item.date[-4:]
@@ -268,8 +267,8 @@ def ca_clients(request):
         tooltipR = date_aff + ' \nCA: '+str(item.R_ca) + ' €\nDossiers: '+str(round(item.R_nb))
         tooltipS = date_aff + ' \nCA: '+str(item.S_ca) + ' €\nDossiers: '+str(round(item.S_nb))
         # ('+str(item.population)+')/n'
-        d = (item.mois[:3], float(item.A_ca), tooltipA, float(item.E_ca), tooltipE, float(item.G_ca), tooltipG, 
+        d = (item.mois[:3], float(item.S_ca), tooltipS, float(item.R_ca), tooltipR, float(item.P_ca), tooltipP, 
-        float(item.P_ca), tooltipP, float(item.R_ca), tooltipR, float(item.S_ca), tooltipS)
+        float(item.G_ca), tooltipG, float(item.E_ca), tooltipE, float(item.A_ca), tooltipA)
         chart_ca_12m.append(d)
 
     # debut = aujourd'hui - 11 mois