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

conversion new_home en home

Browse Source
This commit is contained in:
thienan
2021-07-07 12:06:37 +02:00
parent f742176c1e
commit 839b913b02
5 changed files with 162 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
development.ini
View File

@@ -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

3
mondumas/routes.py
View File

@@ -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')

216
mondumas/templates/default/home.pt
View File

@@ -1,60 +1,156 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<div class="container-fluid text-center">
<br />
<!-- row 1 : MENU GENERAL -->
<div class="row">
<div class="col-sm-3">
<a href="${request.application_url}/agenda/today">
<span class="glyphicon glyphicon-calendar logo-small"></span><br />
<h4>MON AGENDA</h4></a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/rdf_list">
<span class="glyphicon glyphicon-tint logo-success"></span>
<h4>RAPPORTS RDF</h4></a>
</div>
<div class="col-sm-3" tal:condition="logged_in=='CAO'">
<a href="${request.application_url}/devis_list">
<span class="glyphicon glyphicon-text-height logo-small"></span>
<h4>E-DEVIS</h4></a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/dossier_lookup">
<span class="glyphicon glyphicon-search logo-small"></span>
<h4>RECH. DOSSIER</h4></a>
</div>
</div>
<br />
<!-- row 2 : MENU GESTIONNAIRE -->
<div class="row" tal:condition="access >= 5">
<div class="col-sm-3">
<a href="${request.application_url}/planning/today">
<span class="glyphicon glyphicon-calendar logo-small"></span><br />
<h4>PLANNING</h4></a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/demandes" tal:condition="access > 0">
<span class="glyphicon glyphicon-download-alt logo-warning"></span>
<h4>EMAILS <span class="glyphicon glyphicon-arrow-right"></span> DOSSIERS</h4></a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/upload_om" tal:condition="access > 0">
<span class="glyphicon glyphicon-download-alt logo-warning"></span>
<h4>PDF <span class="glyphicon glyphicon-arrow-right"></span> DOSSIERS</h4></a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/stats" tal:condition="access > 6">
<span class="glyphicon glyphicon-stats logo-warning"></span>
<h4>STATISTIQUES</h4></a>
</div>
</div>
<br />
<br />
<br />
</div>
</div><!-- content -->
</metal:block>
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<div class="container-fluid">
<br />
<div class="row">
<div class="col-sm-3">
<a href="${request.application_url}/agenda/today">
<div class="info-box bg-prod">
<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">RDV DU JOUR : </span>
<span class="info-box-number"><span class="badge bg-red">${nb_rdv.nb_rdv}</span></span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/rdf_list">
<div class="info-box bg-green">
<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">À VALIDER </span>
<span class="info-box-number"><span class="badge bg-red">${nb_rdf.nb_rdf}</span></span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/devis_list">
<div class="info-box bg-prod">
<span class="info-box-icon"><i class="glyphicon glyphicon-text-height"></i></span>
<div class="info-box-content">
<span class="info-box-number">E-DEVIS</span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/dossier_lookup" tal:condition="access > 6">
<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: DOSSIER</span>
</div>
</div>
</a>
</div>
</div>
<br>
<div class="row" tal:condition="access >= 5">
<div class="col-sm-3">
<a href="${request.application_url}/planning/today">
<div class="info-box bg-gest">
<span class="info-box-icon"><i class="glyphicon glyphicon-calendar"></i></span>
<div class="info-box-content">
<span class="info-box-number">PLANNING</span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/demandes" tal:condition="access > 0">
<div class="info-box bg-gest">
<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">À IMPORTER : </span>
<span class="info-box-number"><span class="badge bg-purple">${nb_mails}</span></span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/upload_om" tal:condition="access > 0">
<div class="info-box bg-gest">
<span class="info-box-icon"><i class="glyphicon glyphicon-download-alt"></i></span>
<div class="info-box-content">
<span class="info-box-number">PDF <span class="glyphicon glyphicon-arrow-right"></span> DOSSIERS</span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
</div>
</div>
<br />
<div class="row">
<div class="col-sm-3">
<a href="${request.application_url}/dem_devis" tal:condition="access > 0">
<div class="info-box bg-gest">
<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">À 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>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/devis_en_att" tal:condition="access > 0">
<div class="info-box bg-gest">
<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">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>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/factures_en_att" tal:condition="access > 0">
<div class="info-box bg-gest">
<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">À 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>
</div>
</div>
</a>
</div>
</div>
<br />
<div class="row">
<div class="col-sm-3">
<a href="${request.application_url}/stats" tal:condition="access > 6">
<div class="info-box bg-compta">
<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>
</div>
</div>
<br />
<br />
<br />
</div>
</div><!-- content -->
</metal:block>

156
mondumas/templates/default/new_home.pt
View File

@@ -1,156 +0,0 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<div class="container-fluid">
<br />
<div class="row">
<div class="col-sm-3">
<a href="${request.application_url}/agenda/today">
<div class="info-box bg-prod">
<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">RDV DU JOUR : </span>
<span class="info-box-number"><span class="badge bg-red">${nb_rdv.nb_rdv}</span></span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/rdf_list">
<div class="info-box bg-green">
<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">À VALIDER </span>
<span class="info-box-number"><span class="badge bg-red">${nb_rdf.nb_rdf}</span></span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/devis_list">
<div class="info-box bg-prod">
<span class="info-box-icon"><i class="glyphicon glyphicon-text-height"></i></span>
<div class="info-box-content">
<span class="info-box-number">E-DEVIS</span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/dossier_lookup" tal:condition="access > 6">
<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: DOSSIER</span>
</div>
</div>
</a>
</div>
</div>
<br>
<div class="row" tal:condition="access >= 5">
<div class="col-sm-3">
<a href="${request.application_url}/planning/today">
<div class="info-box bg-gest">
<span class="info-box-icon"><i class="glyphicon glyphicon-calendar"></i></span>
<div class="info-box-content">
<span class="info-box-number">PLANNING</span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/demandes" tal:condition="access > 0">
<div class="info-box bg-gest">
<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">À IMPORTER : </span>
<span class="info-box-number"><span class="badge bg-purple">${nb_mails}</span></span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/upload_om" tal:condition="access > 0">
<div class="info-box bg-gest">
<span class="info-box-icon"><i class="glyphicon glyphicon-download-alt"></i></span>
<div class="info-box-content">
<span class="info-box-number">PDF <span class="glyphicon glyphicon-arrow-right"></span> DOSSIERS</span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
</div>
</div>
<br />
<div class="row">
<div class="col-sm-3">
<a href="${request.application_url}/dem_devis" tal:condition="access > 0">
<div class="info-box bg-gest">
<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">À 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>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/devis_en_att" tal:condition="access > 0">
<div class="info-box bg-gest">
<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">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>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/factures_en_att" tal:condition="access > 0">
<div class="info-box bg-gest">
<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">À 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>
</div>
</div>
</a>
</div>
</div>
<br />
<div class="row">
<div class="col-sm-3">
<a href="${request.application_url}/stats" tal:condition="access > 6">
<div class="info-box bg-compta">
<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>
</div>
</div>
<br />
<br />
<br />
</div>
</div><!-- content -->
</metal:block>

21
mondumas/views/default.py
View File

@@ -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