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

color dossier according to society

Browse Source
This commit is contained in:
Phuoc
2018-12-04 18:21:25 +01:00
parent 1fd3016ed3
commit 132e9b118d
9 changed files with 73 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,3 +105,23 @@
.logo-small { .logo-small {
font-size: 50px; font-size: 50px;
} }
.bg-PE {
background-color: #ffffb3 !important;
color: black;
}
.bg-ME {
background-color: #ffe44d !important;
color: black;
}
.bg-PL {
background-color: #b3ff66 !important;
color: black;
}
.bg-PO {
background-color: #b1dae7 !important;
color: black;
}
.bg-CD {
background-color: #ffb3cc !important;
color: black;
}

1
mondumas/static/img/link2DEVFAC14.bat
View File

@@ -1 +0,0 @@
mklink /J DEVFAC14 C:\DEVFAC14

5
mondumas/static/img/link2DEVFAC14.txt Normal file
View File

@@ -0,0 +1,5 @@
-- Windows 10, lecteur local
mklink /J DEVFAC14 C:\DEVFAC14
-- Windows server, lecteur r<>seau
mklink /D DEVFAC14 \\SRVTSE\DEVFAC14

9
mondumas/templates/agenda/agenda.pt
View File

@@ -33,10 +33,11 @@
</div> </div>
<br /> <br />
<p align="center"> <p align="center">
<span class="label" style="background-color:LightYellow; color:black;">RDV Peinture</span>&nbsp; <span class="label bg-PE">RDV Peinture</span>&nbsp;
<span class="label" style="background-color:Gold; color:black;">RDV Menuiserie</span>&nbsp; <span class="label bg-ME">RDV Menuiserie</span>&nbsp;
<span class="label" style="background-color:LightGreen; color:black;">RDV Plomberie</span>&nbsp; <span class="label bg-PL">RDV Plomberie</span>&nbsp;
<span class="label" style="background-color:LightBlue; color:black;">RDV Plomberie</span>&nbsp; <span class="label bg-PO">RDV Polynet</span>&nbsp;
<span class="label bg-CD">RDV Couleurs & Déco</span>&nbsp;
</p> </p>
<br /> <br />
<!-- Modal : Confirmation CREATION --> <!-- Modal : Confirmation CREATION -->

9
mondumas/templates/agenda/planning.pt
View File

@@ -8,10 +8,11 @@
</div> </div>
<br /> <br />
<p align="center"> <p align="center">
<span class="label" style="background-color:LightYellow; color:black;">RDV Peinture</span>&nbsp; <span class="label bg-PE">RDV Peinture</span>&nbsp;
<span class="label" style="background-color:Gold; color:black;">RDV Menuiserie</span>&nbsp; <span class="label bg-ME">RDV Menuiserie</span>&nbsp;
<span class="label" style="background-color:LightGreen; color:black;">RDV Plomberie</span>&nbsp; <span class="label bg-PL">RDV Plomberie</span>&nbsp;
<span class="label" style="background-color:LightBlue; color:black;">RDV Plomberie</span>&nbsp; <span class="label bg-PO">RDV Polynet</span>&nbsp;
<span class="label bg-CD">RDV Couleurs & Déco</span>&nbsp;
</p> </p>
<br /> <br />
<br /> <br />

19
mondumas/templates/dossier/devis_view.pt
View File

@@ -55,7 +55,7 @@
</div> </div>
<!-- Mon compte --> <!-- Mon compte -->
<div class="col-md-6 well"> <div class="col-md-6 ${bg_color}">
<table class="table table-condensed "> <table class="table table-condensed ">
<tr> <tr>
<td><h4>CLIENT</h4></td> <td><h4>CLIENT</h4></td>
@@ -82,8 +82,23 @@
</div> </div>
<h4>Statut : ${dossier.STATUS}</h4> <h4>Statut : ${dossier.STATUS}</h4>
</div> <!-- row --> </div> <!-- row -->
<!-- ENTETE DEVIS -->
<table class="table table-bordered table-condensed"> <table class="table table-bordered table-condensed">
<tr>
<th class="text-right">Total HT</th>
<th class="text-right">Total TVA</th>
<th class="text-right">Total TTC</th>
<th class="text-right">TVA</th>
</tr>
<tr>
<td class="text-right">${layout.to_decz(dossier.TOTALHT)}</td>
<td class="text-right">${layout.to_euroz(dossier.TOTALTVA)}</td>
<td class="text-right">${layout.to_euroz(dossier.TOTALTTC)}</td>
<td class="text-right">${dossier.TAUXTVA} %</td>
</tr>
</table>
<table class="table table-bordered table-condensed">
<tr> <tr>
<th>Réf</th> <th>Réf</th>
<th>Désignation</th> <th>Désignation</th>

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

@@ -55,7 +55,7 @@
</div> </div>
<!-- Mon compte --> <!-- Mon compte -->
<div class="col-md-6 well"> <div class="col-md-6 ${bg_color}">
<table class="table table-condensed "> <table class="table table-condensed ">
<tr> <tr>
<td><h4>CLIENT</h4></td> <td><h4>CLIENT</h4></td>

20
mondumas/views/agenda.py
View File

@@ -129,13 +129,15 @@ def agenda(request):
# déterminer la couleur de l'event selon la societe # déterminer la couleur de l'event selon la societe
societe = row.nodossier[0:2] societe = row.nodossier[0:2]
if societe == "PE": if societe == "PE":
color = "LightYellow" color = "#ffffb3"
elif societe == "ME":
color = "#ffe44d"
elif societe == "PL": elif societe == "PL":
color = "LightGreen" color = "#b3ff66"
elif societe == "PO": elif societe == "PO":
color = "LightBlue" color = "#b1dae7"
else: else:
color = "Gold" color = "#ffb3cc"
json_event = { json_event = {
'title': '%s %s' % (row.c_qualite, row.c_nom), 'title': '%s %s' % (row.c_qualite, row.c_nom),
@@ -188,13 +190,15 @@ def planning(request):
# déterminer la couleur de l'event selon la societe # déterminer la couleur de l'event selon la societe
societe = row.nodossier[0:2] societe = row.nodossier[0:2]
if societe == "PE": if societe == "PE":
color = "LightYellow" color = "#ffffb3"
elif societe == "ME":
color = "#ffe44d"
elif societe == "PL": elif societe == "PL":
color = "LightGreen" color = "#b3ff66"
elif societe == "PO": elif societe == "PO":
color = "LightBlue" color = "#b1dae7"
else: else:
color = "Gold" color = "#ffb3cc"
json_event = { json_event = {
'resourceId': user.CD_UTI, 'resourceId': user.CD_UTI,

7
mondumas/views/dossier.py
View File

@@ -99,6 +99,8 @@ def dossier_view(request):
similaires = get_similaires_byChantier(request, dossier.societe, dossier.C_NOM, dossier.C_ADR, dossier.C_CP, dossier.C_VILLE) similaires = get_similaires_byChantier(request, dossier.societe, dossier.C_NOM, dossier.C_ADR, dossier.C_CP, dossier.C_VILLE)
# lire tous les documents attachés # lire tous les documents attachés
docs_attaches = get_docs_attaches(request, 'DOCS_ATTACHES', nodossier) docs_attaches = get_docs_attaches(request, 'DOCS_ATTACHES', nodossier)
# select background color according to society
bg_color = "bg-%s" % societe
return { return {
'page_title': u"Dossier : %s" % (nodossier), 'page_title': u"Dossier : %s" % (nodossier),
@@ -109,11 +111,13 @@ def dossier_view(request):
'similaires': similaires, 'similaires': similaires,
'docs_attaches': docs_attaches, 'docs_attaches': docs_attaches,
'docs_url': request.static_url(request.registry.settings['mondumas.DEVFAC14']), 'docs_url': request.static_url(request.registry.settings['mondumas.DEVFAC14']),
'bg_color': bg_color,
} }
@view_config(route_name='devis_view', renderer='../templates/dossier/devis_view.pt', permission='view') @view_config(route_name='devis_view', renderer='../templates/dossier/devis_view.pt', permission='view')
def devis_view(request): def devis_view(request):
nodossier = request.matchdict['nodossier'] nodossier = request.matchdict['nodossier']
societe = nodossier[0:2]
url = request.route_url("devis_view", nodossier=nodossier) url = request.route_url("devis_view", nodossier=nodossier)
type_doc = nodossier[3:5] type_doc = nodossier[3:5]
@@ -130,12 +134,15 @@ def devis_view(request):
return HTTPFound(location=request.route_url("dossier_lookup")) return HTTPFound(location=request.route_url("dossier_lookup"))
# lire tous les lignes du devis # lire tous les lignes du devis
details = get_devis_lig_by_no(request, nodossier) details = get_devis_lig_by_no(request, nodossier)
# select background color according to society
bg_color = "bg-%s" % societe
return { return {
'page_title': page_title, 'page_title': page_title,
'nodossier': nodossier, 'nodossier': nodossier,
'dossier': dossier, 'dossier': dossier,
'details': details, 'details': details,
'bg_color': bg_color,
} }
@view_config(route_name='dossier_selected', permission='view') @view_config(route_name='dossier_selected', permission='view')