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

retouche home.pt et modif statut dossier

Browse Source
This commit is contained in:
Phuoc
2021-10-02 12:55:40 +02:00
parent e346440748
commit 7afcb9b8b1
6 changed files with 75 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mondumas/models/default.py
View File

@@ -161,4 +161,4 @@ def get_rdf_null(request):
# lire les RDF non validés depuis moins d'un an
query = """SELECT COUNT(*) AS nb_rdf FROM bddevfac.dem_rdf WHERE date_relu IS NULL;"""
results = request.dbsession.execute(query).first()
return results
return results.nb_rdf

28
mondumas/static/css/style.less
View File

@@ -287,3 +287,31 @@ color: black;
content: none !important;
}
}
.info-box {
display: block;
min-height: 70px;
background: #fff;
width: 100%;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
border-radius: 2px;
margin-bottom: 15px;
}
.info-box-icon {
border-top-left-radius: 2px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 2px;
display: block;
float: left;
height: 70px;
width: 70px;
text-align: center;
font-size: 40px;
line-height: 70px;
background: rgba(0, 0, 0, 0.2);
}
.info-box-content {
padding: 5px 5px;
margin-left: 80px;
}

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

@@ -4,46 +4,34 @@
<div class="container-fluid">
<br />
<div class="row">
<div class="col-sm-3">
<div class="col-xs-4">
<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" tal:condition="nb_rdv > 0"><span class="badge bg-red">${nb_rdv}</span></span>
<span class="info-box-text">RDV JOUR&nbsp;&nbsp;<span class="badge bg-red">${nb_rdv}</span></span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<div class="col-xs-4">
<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" tal:condition="nb_rdv > 0"><span class="badge bg-red">${nb_rdf.nb_rdf}</span></span>
<span class="info-box-text">À VALIDER&nbsp;&nbsp;<span class="badge bg-red">${nb_rdf}</span></span>
</div>
</div>
</div>s
</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">
<div class="col-xs-4">
<a href="${request.application_url}/dossier_lookup" tal:condition="access > 0">
<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>
<span class="info-box-number">RECHERCHE DOSSIER</span>
</div>
</div>
</a>
@@ -52,7 +40,7 @@
<br>
<div class="row" tal:condition="access >= 5">
<div class="col-sm-3">
<div class="col-xs-4">
<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>
@@ -62,7 +50,7 @@
</div>
</a>
</div>
<div class="col-sm-3">
<div class="col-xs-4">
<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>
@@ -74,7 +62,7 @@
</div>
</a>
</div>
<div class="col-sm-3">
<div class="col-xs-4">
<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>
@@ -84,12 +72,12 @@
</div>
</a>
</div>
<div class="col-sm-3">
<div class="col-xs-4">
</div>
</div>
<br />
<div class="row">
<div class="col-sm-3">
<div class="col-xs-4">
<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>
@@ -103,7 +91,7 @@
</div>
</a>
</div>
<div class="col-sm-3">
<div class="col-xs-4">
<a href="${request.application_url}/dern_suivis" tal:condition="access > 0">
<div class="info-box bg-gest">
<span class="info-box-icon"><i class="glyphicon glyphicon-file"></i></span>
@@ -117,7 +105,7 @@
</div>
</a>
</div>
<div class="col-sm-3">
<div class="col-xs-4">
<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>
@@ -134,7 +122,7 @@
</div>
<br />
<div class="row">
<div class="col-sm-3">
<div class="col-xs-4">
<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>
@@ -145,6 +133,16 @@
</div>
</a>
</div>
<div class="col-xs-4">
<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>
<br />
<br />

21
mondumas/templates/devis/devis_view.pt
View File

@@ -59,13 +59,12 @@
</table>
</div>
<div class="col-md-6">
<h4>Statut : ${entete.libelle}</h4>
<h4>
Statut : ${entete.libelle}&nbsp;&nbsp;&nbsp;
[ <a href="#" data-toggle="modal" data-target="#confirmStatut">Modifier le statut</a> ]
</h4>
<div tal:condition="type_doc=='DE'">
<p>Dernière modif. le <b>${entete.DATEMAJ.strftime('%d/%m/%Y à %H:%M')}</b> par <b>${entete.USERMAJ}</b></p>
<p>
<a class="btn btn-warning" role="button" href="#"
data-toggle="modal" data-target="#confirmCloture" tal:condition="access > 0"><span class="glyphicon glyphicon-check"></span> Modif. statut</a>
</p>
</div>
</div>
@@ -106,20 +105,21 @@
</table>
<!-- Modal : Confirmation CLOTURE -->
<div class="modal fade" id="confirmCloture" role="dialog" aria-labelledby="confirmClotureLabel" aria-hidden="true">
<div class="modal fade" id="confirmStatut" role="dialog" aria-labelledby="confirmStatutLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Clôturer le devis</h4>
<h4 class="modal-title">Modifier le statut du devis ou facture</h4>
</div>
<div class="modal-body">
<!-- The form is placed inside the body of modal -->
<form id="add_justif-form" class="form-horizontal" action="${url}" method="post">
<div class="form-group">
<p class="text-center"><b>Voulez-vous changer le status du devis ?</b></p>
<label class="control-label col-xs-4" for="status">Devis / Facture</label>
<p class="form-control-static col-xs-8"><b>${entete.societe}-${entete.NO_ID} - ${entete.C_QUALITE} ${entete.C_NOM}</b></p>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-xs-4" for="status">Sélectionner le statut :</label>
<div class="col-xs-8">
<select class="form-control" id="status" name="status">
@@ -129,8 +129,7 @@
</select>
</div>
</div>
<br>
<div class="row">
<div class="form-group">
<label class="control-label col-xs-4" for="motif">Motif :</label>
<div class="col-xs-8">
<select class="form-control" id="motif" name="motif">

18
mondumas/templates/dossier/dossier_view.pt
View File

@@ -100,7 +100,7 @@
<br />
<h4>
Statut : <span class="label label-warning">${dossier.libelle}</span>&nbsp;&nbsp;&nbsp;
[ <a href="#" data-toggle="modal" data-target="#confirmCloture">Modifier le statut</a> ]
[ <a href="#" data-toggle="modal" data-target="#confirmStatut">Modifier le statut</a> ]
</h4>
<p>Dernière modif. le <b>${dossier.DATEMAJ.strftime('%d/%m/%Y à %H:%M')}</b> par <b>${dossier.USERMAJ}</b></p>
@@ -332,21 +332,22 @@
</div>
<!-- Modal : Confirmation CLOTURE -->
<div class="modal fade" id="confirmCloture" role="dialog" aria-labelledby="confirmClotureLabel" aria-hidden="true">
<!-- Modal : Confirmation MODIF STATUT -->
<div class="modal fade" id="confirmStatut" role="dialog" aria-labelledby="confirmStatutLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Clôturer le dossier</h4>
<h4 class="modal-title">Modifier le statut du dossier</h4>
</div>
<div class="modal-body">
<!-- The form is placed inside the body of modal -->
<form id="add_justif-form" class="form-horizontal" action="${url}" method="post">
<div class="form-group">
<p class="text-center"><b>Voulez-vous clôturer le dossier ?</b></p>
<label class="control-label col-xs-4" for="status">Dossier</label>
<p class="form-control-static col-xs-8"><b>${nodossier} ${dossier.C_QUALITE} ${dossier.C_NOM}</b></p>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-xs-4" for="status">Sélectionner le statut :</label>
<div class="col-xs-8">
<select class="form-control" id="status" name="status">
@@ -356,8 +357,7 @@
</select>
</div>
</div>
<br>
<div class="row">
<div class="form-group">
<label class="control-label col-xs-4" for="motif">Motif :</label>
<div class="col-xs-8">
<select class="form-control" id="motif" name="motif">
@@ -371,7 +371,7 @@
<br>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button>
<button type="submit" class="btn btn-warning" name="form.close">Clôturer</button>
<button type="submit" class="btn btn-warning" name="form.close">Modifier</button>
</div>
</form>
</div>

5
mondumas/views/default.py
View File

@@ -103,7 +103,6 @@ def mailbox_connect(request, societe):
@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('home')
# lire la fiche de l'utilisateur
member = get_member_by_id(request, logged_in)
access = member.access
@@ -115,8 +114,8 @@ def home(request):
nb_de_restants = [] # get_de_restant(request)
nb_fa_restants = [] # get_fa_restant(request)
nb_rdv = 0 # get_rdv_by_date(request, datedeb, agenda)
nb_rdf = 0 # get_rdf_null(request)
nb_rdv = get_rdv_by_date(request, datedeb, agenda)
nb_rdf = get_rdf_null(request)
# Récupération le nombre de mails en attente
societes = ['PE','ME','PL','PO']