ajout croquis_edit

mondumas/views/dossier.py

@@ -129,7 +129,9 @@ def dossier_view(request):
     status = get_status_by_id(request, '')
     motifs = get_motifs(request)
     # lire les notes du dossier
-    dem_notes = get_dem_notes(request, nodossier, '0')
+    dem_notes = get_dem_notes(request, nodossier, '0', 'NOTE')
+    # lire les croquis du dossier
+    dem_croquis = get_dem_notes(request, nodossier, '0', 'CROQUIS')
 
     if 'form.close' in request.params:
         status = request.params["status"]
@@ -146,13 +148,6 @@ def dossier_view(request):
         request.session.flash(u"Le dossier a été cloturé avec succès.", 'success')
         return HTTPFound(url)
 
-    if 'form.addNote' in request.params:
-        type_note = request.params["type_note"]
-        insert_dem_note(request, nodossier, type_note, logged_in)
-
-        request.session.flash(u"Le dossier a été cloturé avec succès.", 'success')
-        return HTTPFound(url)
-
     return {
         'page_title': "Dossier : %s" % (nodossier),
         'url': url,
@@ -172,6 +167,7 @@ def dossier_view(request):
         'motifs': motifs,
         'motif': '',
         'dem_notes': dem_notes,
+        'dem_croquis': dem_croquis,
     }
 
 @view_config(route_name='dossier_selected', permission='view')
@@ -1591,6 +1587,14 @@ def dem_devis(request):
         'order_option': order_option,
     }
 
+@view_config(route_name='note_add', permission='view')
+def note_add(request):
+    logged_in = request.authenticated_userid.upper()
+    nodossier = request.matchdict['nodossier']    
+    insert_dem_note(request, nodossier, 'NOTE', logged_in)
+
+    return HTTPFound(request.route_url('dossier_view', nodossier=nodossier))
+
 @view_config(route_name='note_edit', renderer='../templates/dossier/note_edit.pt', permission='view')
 def note_edit(request):
     nodossier = request.matchdict['nodossier']    
@@ -1619,3 +1623,11 @@ def note_edit(request):
         'nodossier': nodossier,
         'note': note,
     }
+
+@view_config(route_name='croquis_edit', renderer='../templates/dossier/croquis_edit.pt', permission='view')
+def croquis_edit(request):
+
+    return {
+        'page_title': 'NOUVEAU CROQUIS',
+    }
+