fusionner monagenda.pt avec planning.pt

mondumas/views/agenda.py

@@ -93,68 +93,25 @@ def dossier_view(request):
         'details': details,
     }
 
+
 @view_config(route_name='agenda', renderer='../templates/agenda/agenda.pt', permission='view')
 def agenda(request):
     logged_in = request.authenticated_userid
-    member = get_member_by_id(request, logged_in)
-    if not member:
-        request.session.flash(u"Identifiant %s introuvable" % (logged_in), 'danger')
-        return HTTPFound(location=request.route_url("/home"))
     
-    rows = get_rendez_vous(request, logged_in)
-    page_title = u"Agenda de %s" % member.NOM
-        
-    # construire la liste des events
-    events = []
-    for row in rows:
-        event_url = 'dossier_view/%s' % (row.nodossier)
-        event_title = row.c_nom
-
-        # déterminer la couleur de l'event selon la societe
-        societe = row.nodossier[0:2]
-        if societe == "PE":
-            color = "#d9534f"   # rouge danger
-        elif societe == "PL":
-            color = "#5cb85c" # vert success
-        elif societe == "PL":
-            color = "#5bc0de" # bleu info
-        else:
-            color = "#f0ad4e" # orange warning
-                
-        json_event = {
-            'title': event_title,
-            'start': row.rdv_debut.strftime('%Y-%m-%d %H:%M:%S'),
-            'end': row.rdv_fin.strftime('%Y-%m-%d %H:%M:%S'),
-            'allDay': False,
-            'color': color,
-            'url': event_url,
-            }
-        events.append(json_event)
-    
-    
-    return {
-        'page_title': page_title,
-        'fullcalendar_events': json.dumps(events),
-    }
-
-@view_config(route_name='planning', renderer='../templates/agenda/planning.pt', permission='view')
-def planning(request):
-    logged_in = request.authenticated_userid
-    member = get_member_by_id(request, logged_in)
-    if not member:
-        request.session.flash(u"Identifiant %s introuvable" % (logged_in), 'danger')
-        return HTTPFound(location=request.route_url("/home"))
-    
-    # determiner le rôle du user 
-    access = member.access
+    # liste des users avec agenda
     agendas = get_agendas(request)
-        
+    
+    # le user a-t-il un agenda ?
     agenda = 'JMD'
+    for item in agendas:
+        if item.CD_UTI == logged_in.upper():
+            agenda = item.CD_UTI
+
+    
     # prendre en compte les paramètres de saisie
     if 'agenda' in request.params:
         agenda = request.params["agenda"]
     
-    personne = get_member_by_id(request,agenda)
     rows = get_rendez_vous(request, agenda)
         
     # construire la liste des events
@@ -169,7 +126,7 @@ def planning(request):
             color = "#d9534f"   # rouge danger
         elif societe == "PL":
             color = "#5cb85c" # vert success
-        elif societe == "PL":
+        elif societe == "PO":
             color = "#5bc0de" # bleu info
         else:
             color = "#f0ad4e" # orange warning
@@ -190,6 +147,5 @@ def planning(request):
         'fullcalendar_events': json.dumps(events),
         'agendas': agendas,
         'agenda': agenda,
-        'access': access,
     }