diff --git a/mondumas/templates/agenda/agenda.pt b/mondumas/templates/agenda/agenda.pt
index 8f38cf0..ff577bc 100644
--- a/mondumas/templates/agenda/agenda.pt
+++ b/mondumas/templates/agenda/agenda.pt
@@ -45,6 +45,7 @@ $(document).ready(function() {
right: 'today'
},
defaultView: 'agendaWeek',
+ weekends: false,
height: 'auto',
minTime: "07:00:00",
maxTime: "21:00:00",
diff --git a/mondumas/templates/agenda/dossier_view.pt b/mondumas/templates/agenda/dossier_view.pt
index e99b352..5d90654 100644
--- a/mondumas/templates/agenda/dossier_view.pt
+++ b/mondumas/templates/agenda/dossier_view.pt
@@ -80,6 +80,7 @@
+
Statut : ${dossier.STATUS}
diff --git a/mondumas/templates/chantier_lookup.pt b/mondumas/templates/chantier_lookup.pt
index 5e412ea..8d08ef4 100644
--- a/mondumas/templates/chantier_lookup.pt
+++ b/mondumas/templates/chantier_lookup.pt
@@ -54,41 +54,51 @@
-
-
-
- | Numéro |
- Date |
- Client |
- Chantier |
- Montant |
- Sinistre |
- Statut |
-
-
- |
- ${societe}-${detail.numero}
- |
- ${detail.date.strftime('%d-%m/-%Y')} |
- ${detail.nomcli} |
- ${detail.chantier} |
- ${layout.to_euro(detail.montant)} |
- ${detail.nosin} |
- ${detail.status} |
-
-
-
+
+
+
+ | Numéro |
+ Date |
+ Client |
+ Chantier |
+ Montant |
+ Sinistre |
+ Statut |
+
+
+
-
diff --git a/mondumas/views/default.py b/mondumas/views/default.py
index 1f3b7b7..fe80283 100644
--- a/mondumas/views/default.py
+++ b/mondumas/views/default.py
@@ -313,7 +313,7 @@ def chantier_lookup(request):
message = u''
societes = ['PE','ME','PL','PO','CD']
societe = 'PE'
- chantiers = []
+ liste=[]
name = u''
cb_tous = "non"
if 'form.submitted' in request.params:
@@ -328,12 +328,17 @@ def chantier_lookup(request):
chantiers = get_chantiers_byName(request, societe, name, False)
if len(chantiers) == 0:
message = u"Chantier non trouvé : %s" % name
+ # construire la liste
+ for item in chantiers:
+ d = ('%s-%s' % (societe, item.numero),item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant),
+ item.nosin, item.status)
+ liste.append(d)
return {
'page_title': u"Rechercher un chantier",
'url': url,
'message': message,
- 'chantiers': chantiers,
+ 'dt_data': json.dumps(liste),
'societes': societes,
'societe': societe,
'name': name,