diff --git a/mondumas/routes.py b/mondumas/routes.py index 2e0ae12..3aae696 100644 --- a/mondumas/routes.py +++ b/mondumas/routes.py @@ -13,6 +13,7 @@ def includeme(config): config.add_route('redefinir_mdp', '/redefinir_mdp/{lien}') config.add_route('init_mdp', '/init_mdp/{user}/{lien}') # dossier + config.add_route('demandes','/demandes') config.add_route('devis_view', '/devis_view/{nodossier}') config.add_route('dossier_edit', '/dossier_edit/{nodossier}') config.add_route('dossier_lookup', '/dossier_lookup') diff --git a/mondumas/templates/default/home.pt b/mondumas/templates/default/home.pt index 3428be6..6db18f0 100644 --- a/mondumas/templates/default/home.pt +++ b/mondumas/templates/default/home.pt @@ -3,6 +3,7 @@

+
- -
+
+
+ +
+
+ + +

RAPPORTS RDF

+
+
+ + +

GENERER DOSSIERS

+
+



diff --git a/mondumas/templates/parametres/parametres.pt b/mondumas/templates/parametres/parametres.pt index 08d6f30..0a28279 100644 --- a/mondumas/templates/parametres/parametres.pt +++ b/mondumas/templates/parametres/parametres.pt @@ -14,14 +14,14 @@
-
- -

CONNEXIONS

-

TABLEAU de BORD

+
+ +

CONNEXIONS

+

DEVIS ORPHELINS

diff --git a/mondumas/views/default.py b/mondumas/views/default.py index 3c8c2c2..c409e98 100644 --- a/mondumas/views/default.py +++ b/mondumas/views/default.py @@ -70,9 +70,12 @@ def to_percent(x): @view_config(route_name='home', renderer='../templates/default/home.pt', permission='view') def home(request): + logged_in = request.authenticated_userid.upper() + return { 'page_title': 'Bienvenue', 'project': 'mondumas', + 'logged_in': logged_in, } @view_config(route_name='envoyer_mdp', renderer='../templates/default/envoyer_mdp.pt') diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py index 9f2ab78..16b8550 100644 --- a/mondumas/views/dossier.py +++ b/mondumas/views/dossier.py @@ -708,3 +708,29 @@ def rdf_bill(request): 'articles': articles, 'article' : article, } + +@view_config(route_name='demandes', renderer='../templates/dossier/demandes.pt', permission='view') +def rdf_list(request): + # lire les rapports de RDF + items = get_rapport_rdf(request) + + # construire la liste + liste=[] + for item in items: + if item.date_relu : + date_relu = item.date_relu.strftime('%d-%m-%Y') + else: + date_relu = '' + if item.date_rapport : + date_rapport = item.date_rapport.strftime('%d-%m-%Y') + else: + date_rapport = '' + + d = (item.no_id, item.date_inter.strftime('%d-%m-%Y'), date_relu, date_rapport, '%s - %s %s' % (item.nochantier, item.C_QUALITE, item.C_NOM), item.NOMCLI, item.NOSIN, + item.auteur_code) + liste.append(d) + + return { + 'page_title': u'Liste des rapports de RDF', + 'dt_data': json.dumps(liste), + }