Merge branch 'master' of https://bitbucket.org/caotek/dumas_gestion

mondumas/views/default.py

@@ -410,6 +410,6 @@ def ajax_article(request):
     d['ref'] = items.ref
     d['libelle'] = items.libelle
     d['prixht'] = "%.2f" % items.prixht
+    d['unite'] = items.unite
     liste.append(d)
-
     return Response(json.dumps(liste))

mondumas/views/dossier.py

@@ -128,6 +128,10 @@ 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', '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"]
@@ -161,6 +165,9 @@ def dossier_view(request):
         'access': access,
         'status': status,
         'motifs': motifs,
+        'motif': '',
+        'dem_notes': dem_notes,
+        'dem_croquis': dem_croquis,
     }
 
 @view_config(route_name='dossier_selected', permission='view')
@@ -1578,4 +1585,49 @@ def dem_devis(request):
         'dt_data': json.dumps(liste),
         'societe': societe,
         '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']    
+    noligne = request.matchdict['noligne']    
+    url = request.route_url('note_edit', nodossier=nodossier, noligne=noligne)
+
+    message = ""
+    note = get_dem_notes(request, nodossier, noligne)
+
+    if 'form.submitted' in request.params:
+        notes = request.params["notes"]
+
+        update_dem_note(request, nodossier, noligne, notes)
+        request.session.flash("'%s' a été modifiée avec succès." % note.libelle, 'success')
+        return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
+
+    if 'form.deleted' in request.params:
+        delete_dem_note(request, nodossier, noligne)
+        request.session.flash("'%s' a été supprimée avec succès." % note.libelle, 'success')
+        return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
+
+    return {
+        'page_title': note.libelle,
+        'url': url,
+        'message': message,
+        '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',
+    }
+