From 9693c53ded3e7651d8f80d783b6a92998e5aaedf Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Fri, 24 Apr 2020 14:29:29 +0200
Subject: [PATCH] =?UTF-8?q?autoriser=20les=20personnes=20autres=20que=20le?=
 =?UTF-8?q?s=20tech=20=C3=A0=20valider=20les=20RDF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                              | 4 ++--
 mondumas/models/default.py             | 7 +++++++
 mondumas/templates/agenda/agenda.pt    | 2 +-
 mondumas/templates/dossier/rdf_view.pt | 4 ++--
 mondumas/views/agenda.py               | 8 ++------
 mondumas/views/dossier.py              | 4 +++-
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index aac9ad1..41098f7 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@ Elle est développée avec les composants open source suivants :
 
 - [Python](https://www.python.org/downloads/) 3.7
 - [Pyramid web framework](https://trypyramid.com/) 1.10
-- [MySQL server](https://mysql.com/) 8.0
-- [Apache web server](https://apache.org/)
+- [MySQL server](https://mysql.com/) 5.7 sur Windows Server 2008 R2 Standard
+- [Apache web server](https://apache.org/) 2.4 sur Debian GNU/Linux 9 (stretch) 
 
 ## Frontend
 
diff --git a/mondumas/models/default.py b/mondumas/models/default.py
index 6ea9c4c..9d82133 100644
--- a/mondumas/models/default.py
+++ b/mondumas/models/default.py
@@ -19,6 +19,13 @@ def execute_query(request, query, params):
     mark_changed(request.dbsession)
     transaction.commit()
 
+def get_userAccess(request, logged_in):
+    member = get_member_by_id(request, logged_in)
+    if member:
+        return member.access 
+    else:
+        return 0 
+    
 def get_codespostaux(request, code):
     query = "SELECT * FROM p_codespostaux WHERE code_postal like :code;"
     results = request.dbsession.execute(query, {'code': code + "%"})
diff --git a/mondumas/templates/agenda/agenda.pt b/mondumas/templates/agenda/agenda.pt
index 1bbd977..befc729 100644
--- a/mondumas/templates/agenda/agenda.pt
+++ b/mondumas/templates/agenda/agenda.pt
@@ -8,7 +8,7 @@
 		<form method="POST" id="frm" class="form-horizontal">
 			<div class="form-group">
 				<div class="col-xs-4">
-					<select class="form-control" id="agenda" name="agenda" onChange="$('#frm').submit()" tal:condition="isCommercial==False">
+					<select class="form-control" id="agenda" name="agenda" onChange="$('#frm').submit()" tal:condition="access > 0">
 						<div tal:repeat="item agendas">
 							<option value="${item.CD_UTI}" tal:attributes="selected agenda==item.CD_UTI and 'selected' or None">${item.NOM}</option>
 						</div>
diff --git a/mondumas/templates/dossier/rdf_view.pt b/mondumas/templates/dossier/rdf_view.pt
index fcceb23..7ec4790 100644
--- a/mondumas/templates/dossier/rdf_view.pt
+++ b/mondumas/templates/dossier/rdf_view.pt
@@ -358,9 +358,9 @@
                         <span class="glyphicon glyphicon-pencil"></span> Modifier</a>
                     <button class="btn btn-danger" type="submit" name="form.delete" tal:condition="not rapport.signature_svg and date_relu==''">
                         <span class="glyphicon glyphicon-remove"></span> Supprimer</button>
-                    <button class="btn btn-success" type="submit" name="form.validate" tal:condition="(logged_in=='JMP' or logged_in=='CAO') and date_relu==''">
+                    <button class="btn btn-success" type="submit" name="form.validate" tal:condition="access > 0 and date_relu==''">
                         <span class="glyphicon glyphicon-ok"></span> Valider</button>
-                    <div tal:condition="(logged_in=='MD' or logged_in=='CAO') and date_relu!=''">
+                    <div tal:condition="access > 0 and date_relu!=''">
                         <br />
                         <a class="btn btn-default" href="/rdf_rapport/${rapport.no_id}">
                             <span class="glyphicon glyphicon-file"></span> Aperçu PDF</a>
diff --git a/mondumas/views/agenda.py b/mondumas/views/agenda.py
index 54e44ae..edf0b44 100644
--- a/mondumas/views/agenda.py
+++ b/mondumas/views/agenda.py
@@ -108,12 +108,8 @@ def agenda(request):
     # liste des users avec agenda
     agendas = get_users_agenda(request, '')
     
-    # le user est-il un commercial ?
     member = get_member_by_id(request, logged_in)
-    if member.access == 0:
-        isCommercial = True 
-    else:
-        isCommercial = False 
+    access = member.access 
     agenda = member.agenda
     
     # prendre en compte les paramètres de saisie
@@ -169,7 +165,7 @@ def agenda(request):
         'calendar_events': json.dumps(events),
         'agendas': agendas,
         'agenda': agenda,
-        'isCommercial': isCommercial,
+        'access': access,
         'types_rdv': types_rdv,
         'type_rdv': type_rdv,
         'message': message,
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index e08204c..fb7cce2 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -543,6 +543,8 @@ def rdf_list(request):
 @view_config(route_name='rdf_view', renderer='../templates/dossier/rdf_view.pt', permission='view')
 def rdf_view(request):
     logged_in = request.authenticated_userid.upper()
+    # lire code accès du user
+    access = get_userAccess(request, logged_in) 
     norapport = request.matchdict['no_id']
     url = request.route_url('rdf_view', no_id=norapport)
     
@@ -610,7 +612,7 @@ def rdf_view(request):
         'page_title': "Rapport no %s du %s" % (norapport, rapport.date_inter.strftime('%d-%m-%Y')),
         'url': url,
         'pt_name': 'rdf_view',
-        'logged_in': logged_in,
+        'access': access,
         'rapport': rapport,
         'nodossier': nodossier,
         'nochantier': rapport.nochantier,