diff --git a/development.ini b/development.ini index 42a6480..0549bb8 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/routes.py b/mondumas/routes.py index f627649..9704fe2 100644 --- a/mondumas/routes.py +++ b/mondumas/routes.py @@ -5,7 +5,7 @@ def includeme(config): config.add_route('planning', '/planning/{date}') config.add_route('rdv_edit','/rdv_edit/{nodossier}/{nolig}') # default - config.add_route('new_home', '/') + config.add_route('home', '/') config.add_route('affiche_message','/affiche_message/{login}') config.add_route('ajax_article', '/ajax_article') config.add_route('ajax_client', '/ajax_client') @@ -75,7 +75,6 @@ def includeme(config): config.add_route('user_edit', '/user_edit/{cd_uti}') config.add_route('users', '/users') config.add_route('users_ua', '/users_ua') - config.add_route('home', '/new_home') # stats config.add_route('stats', '/stats') diff --git a/mondumas/templates/default/home.pt b/mondumas/templates/default/home.pt index 461d306..d559397 100644 --- a/mondumas/templates/default/home.pt +++ b/mondumas/templates/default/home.pt @@ -1,60 +1,156 @@ - -
- -
-
- -
-
- -
-

MON AGENDA

 -
-
- - -

RAPPORTS RDF

 -
-
- - -

E-DEVIS

 -
-
- - -

RECH. DOSSIER

 -
-
-
- -
-
- -
-

PLANNING

 -
-
- - -

EMAILS DOSSIERS

 -
-
- - -

PDF DOSSIERS

 -
-
- - -

STATISTIQUES

 -
-
-
-
-
-
- -
- - + +
+ +
+
+
+
+ +
+ +
+ AGENDA + RDV DU JOUR : + ${nb_rdv.nb_rdv} +
+
+ +
+
+ +
+ +
+ RDF + À VALIDER + ${nb_rdf.nb_rdf} +
+
+ +
+
+ +
+ +
+ E-DEVIS +
+
+ +
+
+ +
+ +
+ RECHERCHE: DOSSIER +
+
+ +
+
+
+ +
+
+ +
+ +
+ PLANNING +
+
+ +
+
+ +
+ +
+ EMAILS + À IMPORTER : + ${nb_mails} +
+
+ +
+
+ +
+ +
+ PDF DOSSIERS +
+
+ +
+
+
+
+
+
+
+ +
+ +
+ DEM. DEVIS + À TRAITER + ${nb_dd_restants.nb_PE} + ${nb_dd_restants.nb_ME} + ${nb_dd_restants.nb_PL} +
+
+ +
+
+ +
+ +
+ DEVIS + EN ATTENTE + ${nb_de_restants.nb_PE} + ${nb_de_restants.nb_ME} + ${nb_de_restants.nb_PL} +
+
+ +
+
+ +
+ +
+ FACTURES + À RÉGLER + ${nb_fa_restants.nb_PE} + ${nb_fa_restants.nb_ME} + ${nb_fa_restants.nb_PL} +
+
+ +
+
+
+
+
+ +
+ +
+ STATS + DÉLAIS ET CA +
+
+ +
+
+
+
+
+
+ +
+ + diff --git a/mondumas/templates/default/new_home.pt b/mondumas/templates/default/new_home.pt deleted file mode 100644 index d559397..0000000 --- a/mondumas/templates/default/new_home.pt +++ /dev/null @@ -1,156 +0,0 @@ - -
- -
-
-
-
- -
- -
- AGENDA - RDV DU JOUR : - ${nb_rdv.nb_rdv} -
-
- -
-
- -
- -
- RDF - À VALIDER - ${nb_rdf.nb_rdf} -
-
- -
-
- -
- -
- E-DEVIS -
-
- -
-
- -
- -
- RECHERCHE: DOSSIER -
-
- -
-
-
- -
-
- -
- -
- PLANNING -
-
- -
-
- -
- -
- EMAILS - À IMPORTER : - ${nb_mails} -
-
- -
-
- -
- -
- PDF DOSSIERS -
-
- -
-
-
-
-
-
-
- -
- -
- DEM. DEVIS - À TRAITER - ${nb_dd_restants.nb_PE} - ${nb_dd_restants.nb_ME} - ${nb_dd_restants.nb_PL} -
-
- -
-
- -
- -
- DEVIS - EN ATTENTE - ${nb_de_restants.nb_PE} - ${nb_de_restants.nb_ME} - ${nb_de_restants.nb_PL} -
-
- -
-
- -
- -
- FACTURES - À RÉGLER - ${nb_fa_restants.nb_PE} - ${nb_fa_restants.nb_ME} - ${nb_fa_restants.nb_PL} -
-
- -
-
-
-
-
- -
- -
- STATS - DÉLAIS ET CA -
-
- -
-
-
-
-
-
- -
- - diff --git a/mondumas/views/default.py b/mondumas/views/default.py index 5cafbb2..fb5480e 100644 --- a/mondumas/views/default.py +++ b/mondumas/views/default.py @@ -72,21 +72,6 @@ def to_percent(x): """Takes a float and returns a string""" return ("%.2f " % x).replace('.', ',') + "%" - -@view_config(route_name='home', renderer='../templates/default/home.pt', permission='view') -def home(request): - logged_in = request.authenticated_userid.upper() - # lire la fiche de l'utilisateur - member = get_member_by_id(request, logged_in) - access = member.access - - return { - 'page_title': 'Bienvenue sur %s' % request.host, - 'project': 'mondumas', - 'access': access, - 'logged_in': logged_in, - } - def mailbox_connect(request, societe): # connecter au serveur IMAP de la societe if societe == 'PE': @@ -115,10 +100,10 @@ def mailbox_connect(request, societe): return conn -@view_config(route_name='new_home', renderer='../templates/default/new_home.pt', permission='view') -def new_home(request): +@view_config(route_name='home', renderer='../templates/default/home.pt', permission='view') +def home(request): logged_in = request.authenticated_userid.upper() - url = request.route_url('new_home') + url = request.route_url('home') # lire la fiche de l'utilisateur member = get_member_by_id(request, logged_in) access = member.access