diff --git a/development.ini b/development.ini index 7bbc137..552442e 100644 --- a/development.ini +++ b/development.ini @@ -19,8 +19,8 @@ pyramid.includes = pyramid_tm -sqlalchemy.url = mysql://phuoc:phuoc!@localhost/bddevfac?charset=utf8 -#sqlalchemy.url = mysql://phuoc:phuoc!@192.168.1.17/bddevfac?charset=utf8 +#sqlalchemy.url = mysql://phuoc:phuoc!@localhost/bddevfac?charset=utf8 +sqlalchemy.url = mysql://phuoc:phuoc!@192.168.1.17/bddevfac?charset=utf8 # sqlalchemy.url = mysql://phuoc:phuoc!@192.168.0.31/bddevfac?charset=utf8 mondumas.admin_email = cao.thien-phuoc@orange.fr diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py index 9fb857d..876a021 100644 --- a/mondumas/models/dossier.py +++ b/mondumas/models/dossier.py @@ -48,7 +48,7 @@ def get_dossier_by_sinistre(request,societe, nosin): return results def get_dossiers_traites(request): - query = "SELECT * FROM dem_devis WHERE usermaj='EMAIL' ORDER BY DATEMAJ"; + query = "SELECT d.*, s.libelle FROM dem_devis d JOIN p_statuts s ON d.STATUS = s.CODE WHERE d.usermaj='EMAIL' ORDER BY d.DATEMAJ"; results = request.dbsession.execute(query).fetchall() return results diff --git a/mondumas/routes.py b/mondumas/routes.py index b270264..6964c8d 100644 --- a/mondumas/routes.py +++ b/mondumas/routes.py @@ -47,6 +47,7 @@ def includeme(config): config.add_route('upload_doc', '/upload_doc/{nodossier}/{origine}') config.add_route('upload_img', '/upload_img/{norapport}/{origine}') config.add_route('upload_om', '/upload_om') + config.add_route('dem_devis','/dem_devis') # parametres config.add_route('parametres', '/parametres') config.add_route('article_edit', '/article_edit/{ref}') diff --git a/mondumas/static/css/style.less b/mondumas/static/css/style.less index b4195fa..b23ac15 100644 --- a/mondumas/static/css/style.less +++ b/mondumas/static/css/style.less @@ -192,6 +192,36 @@ color: white; color: white; } +.bg-0, .bg-1 { + background-color: khaki !important; + color: black; +} + +.bg-2, .bg-3 { + background-color: orange !important; +color: black; +} + +.bg-4, .bg-5 { + background-color: lightcoral !important; +color: black; +} + +.bg-6, .bg-7 { + background-color: CornflowerBlue !important; +color: black; +} + +.bg-8 { + background-color: LawnGreen !important; +color: black; +} + +.bg-10, .bg-11, .bg-12 { + background-color: gray !important; +color: black; +} + .new-page { page-break-before: always; } diff --git a/mondumas/templates/dossier/dem_devis.pt b/mondumas/templates/dossier/dem_devis.pt new file mode 100644 index 0000000..d1792d7 --- /dev/null +++ b/mondumas/templates/dossier/dem_devis.pt @@ -0,0 +1,30 @@ + +
+ +
+ + + + + + + + + + +
${item.DATEMAJ.strftime('%d %b')}${item.societe}-${item.NO_ID}${item.NOMCLI}${item.C_NOM}${item.USERMAJ}${item.libelle}
+ +
+
+ + + +
+ + + diff --git a/mondumas/templates/dossier/demandes.pt b/mondumas/templates/dossier/demandes.pt index d29c863..37707ec 100644 --- a/mondumas/templates/dossier/demandes.pt +++ b/mondumas/templates/dossier/demandes.pt @@ -1,59 +1,47 @@ - -
- -
-

- - Retour -

- - - - - - - - - - - - - - - - - - - - -
SocDateExpéditeurObjet
${item.email_societe}${item.email_societe}${item.email_societe}${item.email_societe}${item.email_date.strftime('%d %b, %H:%M')}${item.email_from}${item.email_subject} - -
- -
-

Dossiers générés à contrôler

- - - - - - - - -
${item.DATEMAJ.strftime('%d %b')}${item.societe}-${item.NO_ID}${item.NOMCLI}${item.C_NOM}${item.USERMAJ}
- -
-
- - - -
- - - + +
+ +
+

+ + Retour +

+ + + + + + + + + + + + + + + + + + + + +
SocDateExpéditeurObjet
${item.email_societe}${item.email_societe}${item.email_societe}${item.email_societe}${item.email_date.strftime('%d %b, %H:%M')}${item.email_from}${item.email_subject} + +
+ +
+
+ + + +
+ + + diff --git a/mondumas/templates/parametres/new_home.pt b/mondumas/templates/parametres/new_home.pt index 0e6490e..a93280c 100644 --- a/mondumas/templates/parametres/new_home.pt +++ b/mondumas/templates/parametres/new_home.pt @@ -90,16 +90,18 @@
-
- -
- DEM. DEVIS - A traiter : - ${nb_dd_restants.nb_PE} - ${nb_dd_restants.nb_ME} - ${nb_dd_restants.nb_PL} + +
+ +
+ DEM. DEVIS + A traiter : + ${nb_dd_restants.nb_PE} + ${nb_dd_restants.nb_ME} + ${nb_dd_restants.nb_PL} +
-
+
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py index c45a0c9..42a71c6 100644 --- a/mondumas/views/dossier.py +++ b/mondumas/views/dossier.py @@ -942,14 +942,11 @@ def demandes(request): # messages lus msglus = bool(emails) - - dossiers_traites = get_dossiers_traites(request) return { 'page_title': "Liste des emails de demandes d'intervention", 'url': url, 'emails': emails, - 'dossiers_traites': dossiers_traites, } @view_config(route_name='demandes_dl', permission='view') @@ -1574,3 +1571,15 @@ def upload_om(request): 'html_text': html_text, } +@view_config(route_name='dem_devis', renderer='../templates/dossier/dem_devis.pt', permission='view') +def upload_om(request): + logged_in = request.authenticated_userid.upper() + url = request.route_url('dem_devis') + + dossiers_traites = get_dossiers_traites(request) + + return { + 'page_title': 'Dossiers générés à traiter', + 'url': url, + 'dossiers_traites':dossiers_traites, + } \ No newline at end of file