ajout module Default et suivi_edit.pt

mondumas/views/agenda.py

@@ -26,79 +26,69 @@ from ..models.default import *
 
 @view_config(route_name='rdv_edit', renderer='../templates/agenda/rdv_edit.pt', permission='view')
 def rdv_edit(request):
+
+    logged_in = request.authenticated_userid
     nodossier = request.matchdict['nodossier']
     nolig = request.matchdict['nolig']
     url = request.route_url("rdv_edit", nodossier=nodossier, nolig=nolig)
 
     message = ''
-    if nolig == '0':
-        # nouveau
-        comment = ''
-        commentvi = ''
-        date_rdv = datetime.now()
-        page_title= 'Nouveau rendez-vous'
-    else:
-        # lire le rendez-vous
-        rdv = get_dossier_rdv_by_no(request, nodossier, nolig)
-        if not rdv:
-            request.session.flash(u"Rendez-vous non trouvé : %s" % nodossier, 'warning')
-            return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
+    # lire le rendez-vous
+    rdv = get_dossier_rdv_by_no(request, nodossier, nolig)
+    if not rdv:
+        request.session.flash(u"Rendez-vous non trouvé : %s" % nodossier, 'warning')
+        return HTTPFound(location=request.route_url('agenda', date='today'))
 
-        comment = rdv.COMMENT
-        commentvi = rdv.COMMENTVI
-        date_rdv = rdv.rdv_debut
-        page_title= u"Modification du rdv du %s" % (rdv.rdv_debut.strftime('%d-%m-%Y %H:%M'))
+    page_title= u"Modification du rdv du %s" % (rdv.rdv_debut.strftime('%d-%m-%Y %H:%M'))
 
     if 'form.submitted' in request.params:
-        comment = request.params['comment']
-        commentvi = request.params['commentvi']
-        date_rdv = request.params['date_rdv']
+        new_values = {}
+        for param, db_value in rdv.items():
+            if param in request.params and request.params[param] != db_value:
+                new_values[param] = request.params[param]
 
-        update_rdv(request, nodossier, nolig, comment, commentvi, date_rdv)
-        request.session.flash(u"Le rendez-vous a été mis à jour avec succès.", 'success')
-        return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
+        if new_values:
+            new_values['USERMAJ'] = logged_in.upper()
+            
+            update_rdv(request, nodossier, nolig, new_values)
+            request.session.flash(u"Le rendez-vous a été mis à jour avec succès.", 'success')
+            
+        return HTTPFound(location=request.route_url('agenda', date=rdv.rdv_debut.strftime('%Y-%m-%d')))
 
     if 'form.deleted' in request.params:
         delete_rdv(request, nodossier, nolig)
         request.session.flash(u"Le rendez-vous a été supprimé avec succès.", 'success')
-        return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
+        return HTTPFound(location=request.route_url('agenda', date=rdv.rdv_debut.strftime('%Y-%m-%d')))
 
     return {
         'page_title': page_title,
         'url': url,
         'nodossier': nodossier,
         'nolig': nolig,
-        'comment': comment,
-        'commentvi': commentvi,
-        'date_rdv': date_rdv,
+        'rdv': rdv,
         'message': message,
     }
 
-@view_config(route_name='dossier_view', renderer='../templates/agenda/dossier_view.pt', permission='view')
-def dossier_view(request):
-    nodossier = request.matchdict['nodossier']
-    url = request.route_url("dossier_view", nodossier=nodossier)
-
-    dossier = get_dossier_by_no(request, nodossier)
-    if dossier is None:
-        request.session.flash(u"Le dossier no %s est introuvable" % (nodossier), 'danger')
-        return HTTPFound(location=request.route_url("chantier_lookup"))
-    # lire tous le suivi du dossier
-    details = get_dossier_rdv_by_no(request, nodossier, '0')
-    # lire toutes les dossiers du chantiers
-    documents = get_documents_byChantier(request, nodossier)
-    return {
-        'page_title': u"Dossier : %s" % (nodossier),
-        'nodossier': nodossier,
-        'dossier': dossier,
-        'details': details,
-        'documents': documents,
-    }
-
-
 @view_config(route_name='agenda', renderer='../templates/agenda/agenda.pt', permission='view')
 def agenda(request):
+
+    message = ''
+    # récupérer les paramètres de l'appel de la view 
+    datePlan = request.matchdict['date']
     logged_in = request.authenticated_userid
+
+    if datePlan == 'today':
+        datePlan = date.today().strftime('%Y-%m-%d')
+    url = request.route_url('planning', date=datePlan)   
+    url_select = request.route_url('dossier_select', date=datePlan)   
+    
+    # recall code et nom élève
+    if 'mem_nodossier' in request.session:
+        mem_nodossier = request.session['mem_nodossier']
+        mem_nomdossier = request.session['mem_nomdossier']
+    else:   
+        mem_nodossier = 'Aucun'
+        mem_nomdossier = u'dossier sélectionné'
     
     # liste des users avec agenda
     agendas = get_users_agenda(request)
@@ -132,12 +122,13 @@ def agenda(request):
                 
         json_event = {
             'title': row.c_nom,
+            'description': row.c_ville.capitalize(),
             '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,
             'textColor': 'Black',
-            'url': 'dossier_view/%s' % (row.nodossier),
+            'url': '/rdv_edit/%s/%s' % (row.nodossier, row.nolig),
             }
         events.append(json_event)
     
@@ -147,12 +138,15 @@ def agenda(request):
         'fullcalendar_events': json.dumps(events),
         'agendas': agendas,
         'agenda': agenda,
+        'message': message,
+        'mem_nodossier': mem_nodossier,
+        'mem_nomdossier': mem_nomdossier,
+        'url_select': url_select,
     }
 
 @view_config(route_name='planning', renderer='../templates/agenda/planning.pt', permission='view')
 def planning(request):
-    logged_in = request.authenticated_userid
-    
+        
     # construire la liste des ressources
     # {"id":"a","title":"Auditorium A"}
     ressources = []
@@ -169,10 +163,7 @@ def planning(request):
     events = []
     for user in users:
         rows = get_rendez_vous(request, user.CD_UTI)
-        for row in rows:
-            event_url = 'dossier_view/%s' % (row.nodossier)
-            event_title = row.c_nom
-    
+        for row in rows: 
             # déterminer la couleur de l'event selon la societe
             societe = row.nodossier[0:2]
             if societe == "PE":
@@ -186,14 +177,14 @@ def planning(request):
                     
             json_event = {
                 'resourceId': user.CD_UTI,
-                'title': event_title,
+                'title': row.c_nom,
                 'description': row.c_ville.capitalize(),
                 '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,
                 'textColor': 'Black',
-                'url': event_url,
+                'url': '/dossier_view/%s' % (row.nodossier),
                 }
             events.append(json_event)