summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-09-13 19:05:19 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-09-13 19:05:19 +0200
commitd79a15455b230015f36af7d14a45b5f1fa77a855 (patch)
treeb6a24b1ac9784a45e5c84098a2040a9c618a795a
parentf31429494294d2f3bc2cb93e07f7c297b61db777 (diff)
downloadIshtar-d79a15455b230015f36af7d14a45b5f1fa77a855.tar.bz2
Ishtar-d79a15455b230015f36af7d14a45b5f1fa77a855.zip
Work on operation dashboard (closes #525)
- table by departments - table by towns - update french translation
-rw-r--r--ishtar/ishtar_base/models.py78
-rw-r--r--ishtar/locale/fr/LC_MESSAGES/django.po955
-rw-r--r--ishtar/templates/dashboard_operation.html211
3 files changed, 721 insertions, 523 deletions
diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py
index 8e456191e..52ad08587 100644
--- a/ishtar/ishtar_base/models.py
+++ b/ishtar/ishtar_base/models.py
@@ -859,19 +859,73 @@ class OperationDashboard:
years.append(0)
years.append(sum(years))
dct_res['by_dpt'].append((dpt_label, years))
+ dct_res['effective_by_dpt'] = []
+ for dpt_id, dpt_label in self.departments:
+ vals = OperationByDepartment.objects\
+ .filter(department__pk=dpt_id,
+ operation__in_charge__isnull=False,
+ operation__operation_type__txt_idx__in=ope_types)\
+ .values('department__pk', 'operation__year')\
+ .annotate(number=Count('operation'),
+ area=Sum('operation__surface'),
+ fnap=Sum('operation__fnap_financing'),
+ cost=Sum('operation__cost'))\
+ .order_by('operation__year')
+ dct_years = {}
+ for v in vals:
+ values = []
+ for value in (v['number'], v['area'], v['cost'], v['fnap']):
+ values.append(value if value else 0)
+ dct_years[v['operation__year']] = values
+ years = []
+ for y in self.years:
+ if y in dct_years:
+ years.append(dct_years[y])
+ else:
+ years.append((0, 0, 0, 0))
+ nbs, areas, costs, fnaps = zip(*years)
+ years.append((sum(nbs), sum(areas), sum(costs), sum(fnaps)))
+ dct_res['effective_by_dpt'].append((dpt_label, years))
+
+ OperationTown = Operation.towns.through
+ query = OperationTown.objects\
+ .filter(operation__in_charge__isnull=False,
+ operation__operation_type__txt_idx__in=ope_types)\
+ .values('town__name', 'town__departement__number')\
+ .annotate(nb=Count('operation'))\
+ .order_by('-nb', 'town__name')[:10]
+ dct_res['towns'] = []
+ for r in query:
+ dct_res['towns'].append((u"%s (%s)" % (r['town__name'],
+ r['town__departement__number']),
+ r['nb']))
-
-
-
-
-
-
-
-
-
-
-
-
+ if dct_res == self.survey:
+ query = OperationTown.objects\
+ .filter(operation__in_charge__isnull=False,
+ operation__operation_type__txt_idx__in=ope_types,
+ operation__surface__isnull=False)\
+ .values('town__name', 'town__departement__number')\
+ .annotate(nb=Sum('operation__surface'))\
+ .order_by('-nb', 'town__name')[:10]
+ dct_res['towns_surface'] = []
+ for r in query:
+ dct_res['towns_surface'].append((u"%s (%s)" % (
+ r['town__name'], r['town__departement__number']),
+ r['nb']))
+ else:
+ query = OperationTown.objects\
+ .filter(operation__in_charge__isnull=False,
+ operation__operation_type__txt_idx__in=ope_types,
+ operation__cost__isnull=False)\
+ .values('town__name', 'town__departement__number')\
+ .annotate(nb=Sum('operation__cost'))\
+ .order_by('-nb', 'town__name')[:10]
+ dct_res['towns_cost'] = []
+ for r in query:
+ dct_res['towns_cost'].append((u"%s (%s)" % (r['town__name'],
+ r['town__departement__number']),
+ r['nb']))
class Dashboard:
def __init__(self, model):
diff --git a/ishtar/locale/fr/LC_MESSAGES/django.po b/ishtar/locale/fr/LC_MESSAGES/django.po
index 9d5f98569..41fc13735 100644
--- a/ishtar/locale/fr/LC_MESSAGES/django.po
+++ b/ishtar/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-02 20:28+0200\n"
+"POT-Creation-Date: 2011-09-13 18:50+0200\n"
"PO-Revision-Date: 2010-12-09\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
@@ -49,19 +49,20 @@ msgid "New author"
msgstr "Nouvel auteur"
#: ishtar_base/context_processors.py:42 ishtar_base/menus.py:102
-#: ishtar_base/models.py:792
+#: ishtar_base/models.py:1235
msgid "Archaeological file"
msgstr "Dossier archéologique"
#: ishtar_base/context_processors.py:43 ishtar_base/menus.py:136
-#: ishtar_base/models.py:933 ishtar_base/models.py:1021
-#: ishtar_base/models.py:1031 ishtar_base/models.py:1138
-#: ishtar_base/models.py:1470 ishtar_base/models.py:1493
+#: ishtar_base/models.py:1376 ishtar_base/models.py:1469
+#: ishtar_base/models.py:1480 ishtar_base/models.py:1490
+#: ishtar_base/models.py:1597 ishtar_base/models.py:1929
+#: ishtar_base/models.py:1952
msgid "Operation"
msgstr "Opération"
#: ishtar_base/context_processors.py:44 ishtar_base/menus.py:178
-#: ishtar_base/models.py:1238 templates/sheet_contextrecord.html:104
+#: ishtar_base/models.py:1697 templates/sheet_contextrecord.html:104
#: templates/sheet_operation.html:150
msgid "Context record"
msgstr "Unité d'Enregistrement"
@@ -90,8 +91,8 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-#: ishtar_base/forms.py:731 ishtar_base/forms.py:732 ishtar_base/models.py:765
-#: ishtar_base/models.py:901
+#: ishtar_base/forms.py:731 ishtar_base/forms.py:732
+#: ishtar_base/models.py:1208 ishtar_base/models.py:1344
msgid "Closing date"
msgstr "Date de clotûre"
@@ -106,8 +107,12 @@ msgstr "Ajouter un nouvel élément"
#: ishtar_base/forms_common.py:43 ishtar_base/forms_common.py:94
#: ishtar_base/forms_common.py:98 ishtar_base/forms_common.py:131
#: ishtar_base/forms_common.py:135 ishtar_base/forms_common.py:379
-#: ishtar_base/forms_operations.py:323 ishtar_base/models.py:596
-#: ishtar_base/models.py:1034 ishtar_base/models.py:1575
+#: ishtar_base/forms_operations.py:323 ishtar_base/models.py:1039
+#: ishtar_base/models.py:1493 ishtar_base/models.py:2034
+#: templates/dashboard_operation.html:302
+#: templates/dashboard_operation.html:315
+#: templates/dashboard_operation.html:485
+#: templates/dashboard_operation.html:498
msgid "Town"
msgstr "Commune"
@@ -130,70 +135,70 @@ msgstr ""
"commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>"
#: ishtar_base/forms_common.py:57 ishtar_base/forms_common.py:161
-#: ishtar_base/forms_common.py:486 ishtar_base/forms_items.py:191
-#: ishtar_base/menus.py:89 ishtar_base/models.py:650 ishtar_base/models.py:675
-#: ishtar_base/models.py:687 ishtar_base/models.py:1599
-#: ishtar_base/models.py:1632
+#: ishtar_base/forms_common.py:486 ishtar_base/forms_items.py:194
+#: ishtar_base/menus.py:89 ishtar_base/models.py:1093
+#: ishtar_base/models.py:1118 ishtar_base/models.py:1130
+#: ishtar_base/models.py:2058 ishtar_base/models.py:2091
msgid "Person"
msgstr "Individu"
-#: ishtar_base/forms_common.py:69 ishtar_base/forms_items.py:233
-#: ishtar_base/models.py:1456 ishtar_base/models.py:1530
+#: ishtar_base/forms_common.py:69 ishtar_base/forms_items.py:236
+#: ishtar_base/models.py:1915 ishtar_base/models.py:1989
msgid "Warehouse"
msgstr "Dépôt"
#: ishtar_base/forms_common.py:77 ishtar_base/forms_common.py:121
-#: ishtar_base/forms_common.py:173 ishtar_base/models.py:613
-#: ishtar_base/models.py:643 ishtar_base/models.py:1448
-#: ishtar_base/models.py:1561
+#: ishtar_base/forms_common.py:173 ishtar_base/models.py:1056
+#: ishtar_base/models.py:1086 ishtar_base/models.py:1907
+#: ishtar_base/models.py:2020
msgid "Name"
msgstr "Nom"
-#: ishtar_base/forms_common.py:79 ishtar_base/models.py:1444
-#: ishtar_base/models.py:1450
+#: ishtar_base/forms_common.py:79 ishtar_base/models.py:1903
+#: ishtar_base/models.py:1909
msgid "Warehouse type"
msgstr "Type de dépôt"
#: ishtar_base/forms_common.py:81 ishtar_base/forms_files.py:131
-#: ishtar_base/forms_files.py:163 ishtar_base/models.py:756
-#: ishtar_base/models.py:1452
+#: ishtar_base/forms_files.py:163 ishtar_base/models.py:1199
+#: ishtar_base/models.py:1911
msgid "Person in charge"
msgstr "Responsable"
#: ishtar_base/forms_common.py:86 ishtar_base/forms_files.py:184
-#: ishtar_base/forms_items.py:238 ishtar_base/forms_operations.py:247
-#: ishtar_base/models.py:144 ishtar_base/models.py:788
-#: ishtar_base/models.py:929 ishtar_base/models.py:1453
-#: ishtar_base/models.py:1534
+#: ishtar_base/forms_items.py:241 ishtar_base/forms_operations.py:247
+#: ishtar_base/models.py:144 ishtar_base/models.py:1231
+#: ishtar_base/models.py:1372 ishtar_base/models.py:1912
+#: ishtar_base/models.py:1993
msgid "Comment"
msgstr "Commentaire"
#: ishtar_base/forms_common.py:88 ishtar_base/forms_common.py:125
-#: ishtar_base/forms_files.py:196 ishtar_base/models.py:591
+#: ishtar_base/forms_files.py:196 ishtar_base/models.py:1034
msgid "Address"
msgstr "Adresse"
#: ishtar_base/forms_common.py:90 ishtar_base/forms_common.py:127
-#: ishtar_base/models.py:592
+#: ishtar_base/models.py:1035
msgid "Address complement"
msgstr "Complément d'adresse"
#: ishtar_base/forms_common.py:92 ishtar_base/forms_common.py:129
-#: ishtar_base/models.py:594
+#: ishtar_base/models.py:1037
msgid "Postal code"
msgstr "Code postal"
#: ishtar_base/forms_common.py:95 ishtar_base/forms_common.py:132
-#: ishtar_base/models.py:597
+#: ishtar_base/models.py:1040
msgid "Country"
msgstr "Pays"
#: ishtar_base/forms_common.py:97 ishtar_base/forms_common.py:134
-#: ishtar_base/models.py:599
+#: ishtar_base/models.py:1042
msgid "Phone"
msgstr "Téléphone"
-#: ishtar_base/forms_common.py:123 ishtar_base/models.py:609
+#: ishtar_base/forms_common.py:123 ishtar_base/models.py:1052
msgid "Organization type"
msgstr "Type d'organisation"
@@ -206,22 +211,22 @@ msgid "Identity"
msgstr "Identité"
#: ishtar_base/forms_common.py:170 ishtar_base/forms_common.py:443
-#: ishtar_base/models.py:641 ishtar_base/models.py:703
+#: ishtar_base/models.py:1084 ishtar_base/models.py:1146
#: templates/sheet_contextrecord.html:82 templates/sheet_ope.html:104
#: templates/sheet_ope_modif.html:104 templates/sheet_operation.html:104
msgid "Title"
msgstr "Titre"
-#: ishtar_base/forms_common.py:171 ishtar_base/models.py:642
+#: ishtar_base/forms_common.py:171 ishtar_base/models.py:1085
msgid "Surname"
msgstr "Prénom"
#: ishtar_base/forms_common.py:175 ishtar_base/forms_common.py:304
-#: ishtar_base/models.py:644
+#: ishtar_base/models.py:1087
msgid "Email"
msgstr "Courriel"
-#: ishtar_base/forms_common.py:177 ishtar_base/models.py:632
+#: ishtar_base/forms_common.py:177 ishtar_base/models.py:1075
msgid "Person type"
msgstr "Type d'individu"
@@ -264,8 +269,8 @@ msgstr "Envoyer le nouveau mot de passe par courriel ?"
#: ishtar_base/forms_common.py:361 ishtar_base/forms_common.py:373
#: ishtar_base/forms_operations.py:321 ishtar_base/forms_operations.py:342
-#: ishtar_base/models.py:766 ishtar_base/models.py:912
-#: ishtar_base/models.py:1576
+#: ishtar_base/models.py:1209 ishtar_base/models.py:1355
+#: ishtar_base/models.py:2035
msgid "Towns"
msgstr "Communes"
@@ -275,26 +280,26 @@ msgstr "Il y a des communes identiques."
#: ishtar_base/forms_common.py:376 ishtar_base/forms_common.py:425
#: ishtar_base/forms_operations.py:345 ishtar_base/forms_operations.py:366
-#: ishtar_base/forms_operations.py:370 ishtar_base/models.py:1040
+#: ishtar_base/forms_operations.py:370 ishtar_base/models.py:1499
msgid "Parcels"
msgstr "Parcelles"
-#: ishtar_base/forms_common.py:381 ishtar_base/models.py:1035
+#: ishtar_base/forms_common.py:381 ishtar_base/models.py:1494
#: templates/sheet_ope.html:62 templates/sheet_ope_modif.html:62
#: templates/sheet_operation.html:63
msgid "Section"
msgstr "Section"
-#: ishtar_base/forms_common.py:383 ishtar_base/models.py:1036
+#: ishtar_base/forms_common.py:383 ishtar_base/models.py:1495
msgid "Parcel number"
msgstr "Numéro de parcelle"
-#: ishtar_base/forms_common.py:385 ishtar_base/forms_context_records.py:115
+#: ishtar_base/forms_common.py:385 ishtar_base/forms_context_records.py:116
#: ishtar_base/forms_files.py:136 ishtar_base/forms_files.py:168
#: ishtar_base/forms_files.py:188 ishtar_base/forms_items.py:142
#: ishtar_base/forms_operations.py:192 ishtar_base/forms_operations.py:243
-#: ishtar_base/models.py:516 ishtar_base/models.py:749
-#: ishtar_base/models.py:904 ishtar_base/models.py:1032
+#: ishtar_base/models.py:959 ishtar_base/models.py:1192
+#: ishtar_base/models.py:1347 ishtar_base/models.py:1491
#: templates/sheet_file.html:68 templates/sheet_file.html.py:88
#: templates/sheet_file.html:116 templates/sheet_ope.html:61
#: templates/sheet_ope.html.py:83 templates/sheet_ope_modif.html:61
@@ -316,25 +321,25 @@ msgid "Documentation informations"
msgstr "Information sur le document"
#: ishtar_base/forms_common.py:445 ishtar_base/forms_common.py:464
-#: ishtar_base/models.py:699
+#: ishtar_base/models.py:1142
msgid "Source type"
msgstr "Type de source"
-#: ishtar_base/forms_common.py:447 ishtar_base/models.py:707
+#: ishtar_base/forms_common.py:447 ishtar_base/models.py:1150
msgid "Numerical ressource (web address)"
msgstr "Ressource numérique (adresse web)"
-#: ishtar_base/forms_common.py:448 ishtar_base/models.py:709
+#: ishtar_base/forms_common.py:448 ishtar_base/models.py:1152
msgid "Receipt date"
msgstr "Date de réception"
#: ishtar_base/forms_common.py:450 ishtar_base/forms_files.py:176
-#: ishtar_base/models.py:711 ishtar_base/models.py:768
+#: ishtar_base/models.py:1154 ishtar_base/models.py:1211
msgid "Creation date"
msgstr "Date de création"
#: ishtar_base/forms_common.py:461 ishtar_base/forms_common.py:480
-#: ishtar_base/forms_common.py:510 ishtar_base/models.py:691
+#: ishtar_base/forms_common.py:510 ishtar_base/models.py:1134
msgid "Author"
msgstr "Auteur"
@@ -342,8 +347,8 @@ msgstr "Auteur"
msgid "Would you like to delete this documentation?"
msgstr "Voulez vous supprimer ce document ?"
-#: ishtar_base/forms_common.py:487 ishtar_base/models.py:683
-#: ishtar_base/models.py:688
+#: ishtar_base/forms_common.py:487 ishtar_base/models.py:1126
+#: ishtar_base/models.py:1131
msgid "Author type"
msgstr "Type d'auteur"
@@ -355,8 +360,8 @@ msgstr "Sélection d'auteur"
msgid "There are identical authors."
msgstr "Il y a des auteurs identiques."
-#: ishtar_base/forms_common.py:520 ishtar_base/models.py:692
-#: ishtar_base/models.py:705 templates/sheet_contextrecord.html:84
+#: ishtar_base/forms_common.py:520 ishtar_base/models.py:1135
+#: ishtar_base/models.py:1148 templates/sheet_contextrecord.html:84
#: templates/sheet_ope.html:106 templates/sheet_ope_modif.html:106
#: templates/sheet_operation.html:106
msgid "Authors"
@@ -366,36 +371,36 @@ msgstr "Auteurs"
msgid "Current operation: "
msgstr "Opération : "
-#: ishtar_base/forms_context_records.py:116
-#: ishtar_base/forms_context_records.py:212 ishtar_base/forms_items.py:117
+#: ishtar_base/forms_context_records.py:117
+#: ishtar_base/forms_context_records.py:213 ishtar_base/forms_items.py:117
#: ishtar_base/forms_items.py:145 ishtar_base/forms_operations.py:393
-#: ishtar_base/models.py:1080
+#: ishtar_base/models.py:1539
msgid "Period"
msgstr "Période"
-#: ishtar_base/forms_context_records.py:117
+#: ishtar_base/forms_context_records.py:118
msgid "Unit type"
msgstr "Type d'unité"
-#: ishtar_base/forms_context_records.py:128
-#: ishtar_base/forms_context_records.py:311
+#: ishtar_base/forms_context_records.py:129
+#: ishtar_base/forms_context_records.py:312
msgid "Context record search"
msgstr "Recherche d'Unité d'Enregistrement"
-#: ishtar_base/forms_context_records.py:140
+#: ishtar_base/forms_context_records.py:141
msgid "You should at least select one context record."
msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement."
-#: ishtar_base/forms_context_records.py:146 ishtar_base/forms_files.py:159
-#: ishtar_base/forms_operations.py:217 ishtar_base/forms_operations.py:694
+#: ishtar_base/forms_context_records.py:147 ishtar_base/forms_files.py:159
+#: ishtar_base/forms_operations.py:217 ishtar_base/forms_operations.py:697
#: templates/sheet_file.html:17 templates/sheet_ope.html:5
#: templates/sheet_ope_modif.html:5 templates/sheet_operation.html:5
msgid "General"
msgstr "Général"
-#: ishtar_base/forms_context_records.py:150
-#: ishtar_base/forms_operations.py:347 ishtar_base/models.py:1039
-#: ishtar_base/models.py:1136 ishtar_base/models.py:1431
+#: ishtar_base/forms_context_records.py:151
+#: ishtar_base/forms_operations.py:347 ishtar_base/models.py:1498
+#: ishtar_base/models.py:1595 ishtar_base/models.py:1890
#: templates/sheet_contextrecord.html:109 templates/sheet_ope.html:63
#: templates/sheet_ope.html.py:129 templates/sheet_ope_modif.html:63
#: templates/sheet_ope_modif.html.py:129 templates/sheet_ope_modif.html:157
@@ -404,18 +409,18 @@ msgstr "Général"
msgid "Parcel"
msgstr "Parcelle"
-#: ishtar_base/forms_context_records.py:151 ishtar_base/forms_items.py:99
-#: ishtar_base/forms_items.py:282 ishtar_base/models.py:1140
-#: ishtar_base/models.py:1250 ishtar_base/models.py:1323
+#: ishtar_base/forms_context_records.py:152 ishtar_base/forms_items.py:99
+#: ishtar_base/forms_items.py:285 ishtar_base/models.py:1599
+#: ishtar_base/models.py:1709 ishtar_base/models.py:1782
#: templates/sheet_ope.html:125 templates/sheet_ope_modif.html:125
#: templates/sheet_operation.html:124
msgid "ID"
msgstr "Identifiant"
-#: ishtar_base/forms_context_records.py:153 ishtar_base/forms_items.py:101
-#: ishtar_base/forms_items.py:148 ishtar_base/forms_items.py:200
-#: ishtar_base/models.py:1141 ishtar_base/models.py:1251
-#: ishtar_base/models.py:1324 ishtar_base/models.py:1594
+#: ishtar_base/forms_context_records.py:154 ishtar_base/forms_items.py:101
+#: ishtar_base/forms_items.py:148 ishtar_base/forms_items.py:203
+#: ishtar_base/models.py:1600 ishtar_base/models.py:1710
+#: ishtar_base/models.py:1783 ishtar_base/models.py:2053
#: templates/sheet_contextrecord.html:23
#: templates/sheet_contextrecord.html:106 templates/sheet_ope.html:128
#: templates/sheet_ope_modif.html:128 templates/sheet_ope_modif.html.py:154
@@ -423,151 +428,151 @@ msgstr "Identifiant"
msgid "Description"
msgstr "Description"
-#: ishtar_base/forms_context_records.py:155 ishtar_base/models.py:1142
+#: ishtar_base/forms_context_records.py:156 ishtar_base/models.py:1601
msgid "Length (cm)"
msgstr "Longueur (cm)"
-#: ishtar_base/forms_context_records.py:156 ishtar_base/models.py:1143
+#: ishtar_base/forms_context_records.py:157 ishtar_base/models.py:1602
msgid "Width (cm)"
msgstr "Largeur (cm)"
-#: ishtar_base/forms_context_records.py:157 ishtar_base/models.py:1144
+#: ishtar_base/forms_context_records.py:158 ishtar_base/models.py:1603
msgid "Thickness (cm)"
msgstr "Épaisseur (cm)"
-#: ishtar_base/forms_context_records.py:158 ishtar_base/models.py:1145
+#: ishtar_base/forms_context_records.py:159 ishtar_base/models.py:1604
msgid "Depth (cm)"
msgstr "Profondeur (cm)"
-#: ishtar_base/forms_context_records.py:159 ishtar_base/models.py:1150
+#: ishtar_base/forms_context_records.py:160 ishtar_base/models.py:1609
msgid "Unit"
msgstr "Unité"
-#: ishtar_base/forms_context_records.py:161 ishtar_base/forms_items.py:195
-#: ishtar_base/models.py:1146 ishtar_base/models.py:1597
+#: ishtar_base/forms_context_records.py:162 ishtar_base/forms_items.py:198
+#: ishtar_base/models.py:1605 ishtar_base/models.py:2056
msgid "Location"
msgstr "Lieu"
-#: ishtar_base/forms_context_records.py:202
+#: ishtar_base/forms_context_records.py:203
msgid "This ID already exist for this operation."
msgstr "Cet identifiant existe déjà pour cette opération."
-#: ishtar_base/forms_context_records.py:207
-#: ishtar_base/forms_context_records.py:229 ishtar_base/forms_items.py:112
-#: ishtar_base/models.py:1089 ishtar_base/models.py:1334
+#: ishtar_base/forms_context_records.py:208
+#: ishtar_base/forms_context_records.py:230 ishtar_base/forms_items.py:112
+#: ishtar_base/models.py:1548 ishtar_base/models.py:1793
msgid "Dating"
msgstr "Datation"
-#: ishtar_base/forms_context_records.py:214 ishtar_base/forms_items.py:119
-#: ishtar_base/forms_items.py:202 ishtar_base/forms_operations.py:235
-#: ishtar_base/models.py:898 ishtar_base/models.py:1057
-#: ishtar_base/models.py:1081 ishtar_base/models.py:1432
-#: ishtar_base/models.py:1601 ishtar_base/models.py:1633
+#: ishtar_base/forms_context_records.py:215 ishtar_base/forms_items.py:119
+#: ishtar_base/forms_items.py:205 ishtar_base/forms_operations.py:235
+#: ishtar_base/models.py:1341 ishtar_base/models.py:1516
+#: ishtar_base/models.py:1540 ishtar_base/models.py:1891
+#: ishtar_base/models.py:2060 ishtar_base/models.py:2092
#: templates/sheet_file.html:93
msgid "Start date"
msgstr "Date de début"
-#: ishtar_base/forms_context_records.py:215 ishtar_base/forms_items.py:121
-#: ishtar_base/forms_items.py:204 ishtar_base/models.py:1058
-#: ishtar_base/models.py:1082 ishtar_base/models.py:1433
-#: ishtar_base/models.py:1602 ishtar_base/models.py:1634
+#: ishtar_base/forms_context_records.py:216 ishtar_base/forms_items.py:121
+#: ishtar_base/forms_items.py:207 ishtar_base/models.py:1517
+#: ishtar_base/models.py:1541 ishtar_base/models.py:1892
+#: ishtar_base/models.py:2061 ishtar_base/models.py:2093
msgid "End date"
msgstr "Date de fin"
-#: ishtar_base/forms_context_records.py:216 ishtar_base/forms_items.py:122
-#: ishtar_base/models.py:1085
+#: ishtar_base/forms_context_records.py:217 ishtar_base/forms_items.py:122
+#: ishtar_base/models.py:1544
msgid "Quality"
msgstr "Qualité"
-#: ishtar_base/forms_context_records.py:218 ishtar_base/forms_items.py:124
-#: ishtar_base/models.py:1071 ishtar_base/models.py:1083
+#: ishtar_base/forms_context_records.py:219 ishtar_base/forms_items.py:124
+#: ishtar_base/models.py:1530 ishtar_base/models.py:1542
msgid "Dating type"
msgstr "Type de datation"
-#: ishtar_base/forms_context_records.py:232
-#: ishtar_base/forms_context_records.py:239 ishtar_base/models.py:1155
+#: ishtar_base/forms_context_records.py:233
+#: ishtar_base/forms_context_records.py:240 ishtar_base/models.py:1614
#: templates/sheet_contextrecord.html:32
msgid "Interpretation"
msgstr "Interpretation"
-#: ishtar_base/forms_context_records.py:235
+#: ishtar_base/forms_context_records.py:236
msgid "Has furniture?"
msgstr "A du matériel ?"
-#: ishtar_base/forms_context_records.py:237 ishtar_base/models.py:1154
+#: ishtar_base/forms_context_records.py:238 ishtar_base/models.py:1613
msgid "Filling"
msgstr "Remplissage"
-#: ishtar_base/forms_context_records.py:241 ishtar_base/models.py:1170
+#: ishtar_base/forms_context_records.py:242 ishtar_base/models.py:1629
msgid "Activity"
msgstr "Activité"
-#: ishtar_base/forms_context_records.py:243 ishtar_base/models.py:1168
+#: ishtar_base/forms_context_records.py:244 ishtar_base/models.py:1627
msgid "Identification"
msgstr "Identification"
-#: ishtar_base/forms_context_records.py:245 ishtar_base/models.py:1157
+#: ishtar_base/forms_context_records.py:246 ishtar_base/models.py:1616
msgid "TAQ"
msgstr "TAQ"
-#: ishtar_base/forms_context_records.py:246 ishtar_base/models.py:1160
+#: ishtar_base/forms_context_records.py:247 ishtar_base/models.py:1619
msgid "Estimated TAQ"
msgstr "TAQ estimé"
-#: ishtar_base/forms_context_records.py:248 ishtar_base/models.py:1162
+#: ishtar_base/forms_context_records.py:249 ishtar_base/models.py:1621
msgid "TPQ"
msgstr "TPQ"
-#: ishtar_base/forms_context_records.py:249 ishtar_base/models.py:1165
+#: ishtar_base/forms_context_records.py:250 ishtar_base/models.py:1624
msgid "Estimated TPQ"
msgstr "TPQ estimé"
-#: ishtar_base/forms_context_records.py:266
-#: ishtar_base/forms_operations.py:201 ishtar_base/forms_operations.py:575
+#: ishtar_base/forms_context_records.py:267
+#: ishtar_base/forms_operations.py:201 ishtar_base/forms_operations.py:578
msgid "Operation search"
msgstr "Recherche d'opérations"
-#: ishtar_base/forms_context_records.py:268
-#: ishtar_base/forms_operations.py:213 ishtar_base/forms_operations.py:577
+#: ishtar_base/forms_context_records.py:269
+#: ishtar_base/forms_operations.py:213 ishtar_base/forms_operations.py:580
msgid "You should select an operation."
msgstr "Vous devez sélectionner une opération."
-#: ishtar_base/forms_context_records.py:296
+#: ishtar_base/forms_context_records.py:297
msgid "Would you like to delete this context record?"
msgstr "Voulez vous supprimer cette Unité d'Enregistrement ?"
-#: ishtar_base/forms_context_records.py:313
+#: ishtar_base/forms_context_records.py:314
msgid "You should select a context record."
msgstr "Vous devez sélectionner une Unité d'Enregistrement."
-#: ishtar_base/forms_context_records.py:324
+#: ishtar_base/forms_context_records.py:325
msgid "Town of the operation"
msgstr "Commune de l'opération"
-#: ishtar_base/forms_context_records.py:326 ishtar_base/forms_items.py:425
+#: ishtar_base/forms_context_records.py:327 ishtar_base/forms_items.py:428
msgid "Year of the operation"
msgstr "Année de l'opération"
-#: ishtar_base/forms_context_records.py:328
+#: ishtar_base/forms_context_records.py:329
msgid "Period of the context record"
msgstr "Période de l'Unité d'Enregistrement"
-#: ishtar_base/forms_context_records.py:330
+#: ishtar_base/forms_context_records.py:331
msgid "Unit type of the context record"
msgstr "Type d'unité de l'Unité d'Enregistrement"
-#: ishtar_base/forms_context_records.py:343 ishtar_base/forms_items.py:447
-#: ishtar_base/forms_operations.py:601
+#: ishtar_base/forms_context_records.py:344 ishtar_base/forms_items.py:450
+#: ishtar_base/forms_operations.py:604
msgid "Documentation search"
msgstr "Recherche de document"
-#: ishtar_base/forms_context_records.py:345 ishtar_base/forms_items.py:449
-#: ishtar_base/forms_operations.py:603
+#: ishtar_base/forms_context_records.py:346 ishtar_base/forms_items.py:452
+#: ishtar_base/forms_operations.py:606
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
#: ishtar_base/forms_files.py:133 ishtar_base/forms_files.py:178
-#: ishtar_base/models.py:754
+#: ishtar_base/models.py:1197
msgid "File type"
msgstr "Type de dossier"
@@ -584,33 +589,33 @@ msgid "You should select a file."
msgstr "Vous devez sélectionner un dossier archéologique."
#: ishtar_base/forms_files.py:172 ishtar_base/forms_files.py:190
-#: ishtar_base/models.py:751
+#: ishtar_base/models.py:1194
msgid "Numeric reference"
msgstr "Référence numérique"
#: ishtar_base/forms_files.py:174 ishtar_base/forms_files.py:192
-#: ishtar_base/models.py:752
+#: ishtar_base/models.py:1195
msgid "Internal reference"
msgstr "Référence interne"
-#: ishtar_base/forms_files.py:180 ishtar_base/models.py:772
+#: ishtar_base/forms_files.py:180 ishtar_base/models.py:1215
msgid "Related file"
msgstr "Dossier en relation avec"
#: ishtar_base/forms_files.py:200 ishtar_base/forms_operations.py:240
-#: ishtar_base/models.py:779
+#: ishtar_base/models.py:1222 templates/dashboard_operation.html:315
msgid "Total surface (m²)"
msgstr "Surface totale (m²)"
-#: ishtar_base/forms_files.py:203 ishtar_base/models.py:783
+#: ishtar_base/forms_files.py:203 ishtar_base/models.py:1226
msgid "Main address"
msgstr "Adresse principale"
-#: ishtar_base/forms_files.py:204 ishtar_base/models.py:784
+#: ishtar_base/forms_files.py:204 ishtar_base/models.py:1227
msgid "Main address - complement"
msgstr "Adresse principale - complément"
-#: ishtar_base/forms_files.py:206 ishtar_base/models.py:786
+#: ishtar_base/forms_files.py:206 ishtar_base/models.py:1229
msgid "Main address - postal code"
msgstr "Adresse principale - code postal"
@@ -618,28 +623,28 @@ msgstr "Adresse principale - code postal"
msgid "Preventive informations"
msgstr "Information archéologie préventive"
-#: ishtar_base/forms_files.py:215 ishtar_base/models.py:758
+#: ishtar_base/forms_files.py:215 ishtar_base/models.py:1201
msgid "General contractor"
msgstr "Aménageur"
-#: ishtar_base/forms_files.py:222 ishtar_base/models.py:760
+#: ishtar_base/forms_files.py:222 ishtar_base/models.py:1203
msgid "Town planning service"
msgstr "Service instructeur"
-#: ishtar_base/forms_files.py:228 ishtar_base/models.py:736
-#: ishtar_base/models.py:761
+#: ishtar_base/forms_files.py:228 ishtar_base/models.py:1179
+#: ishtar_base/models.py:1204
msgid "Permit type"
msgstr "Type de permis"
-#: ishtar_base/forms_files.py:230 ishtar_base/models.py:763
+#: ishtar_base/forms_files.py:230 ishtar_base/models.py:1206
msgid "Permit reference"
msgstr "Référence du permis"
-#: ishtar_base/forms_files.py:233 ishtar_base/models.py:782
+#: ishtar_base/forms_files.py:233 ishtar_base/models.py:1225
msgid "Total developed surface (m²)"
msgstr "Surface totale aménagée (m²)"
-#: ishtar_base/forms_files.py:239 ishtar_base/models.py:770
+#: ishtar_base/forms_files.py:239 ishtar_base/models.py:1213
msgid "Reception date"
msgstr "Date de réception"
@@ -656,8 +661,8 @@ msgid "Would you like to delete this archaelogical file ?"
msgstr "Voulez vous supprimer ce dossier archéologique ?"
#: ishtar_base/forms_files.py:339 ishtar_base/forms_files.py:356
-#: ishtar_base/forms_operations.py:667 ishtar_base/forms_operations.py:697
-#: ishtar_base/models.py:1475 ishtar_base/models.py:1483
+#: ishtar_base/forms_operations.py:670 ishtar_base/forms_operations.py:700
+#: ishtar_base/models.py:1934 ishtar_base/models.py:1942
msgid "Act type"
msgstr "Type d'acte"
@@ -666,35 +671,35 @@ msgid "Current context record: "
msgstr "Unité d'Enregistrement : "
#: ishtar_base/forms_items.py:96 ishtar_base/menus.py:197
-#: ishtar_base/models.py:1392 ishtar_base/models.py:1426
-#: ishtar_base/models.py:1629
+#: ishtar_base/models.py:1851 ishtar_base/models.py:1885
+#: ishtar_base/models.py:2088
msgid "Item"
msgstr "Mobilier"
#: ishtar_base/forms_items.py:103 ishtar_base/forms_items.py:149
-#: ishtar_base/models.py:1254
+#: ishtar_base/models.py:1713
msgid "Is isolated?"
msgstr "Est isolé ?"
#: ishtar_base/forms_items.py:105 ishtar_base/forms_items.py:147
-#: ishtar_base/forms_items.py:286 ishtar_base/models.py:1246
-#: ishtar_base/models.py:1326 templates/sheet_contextrecord.html:103
+#: ishtar_base/forms_items.py:289 ishtar_base/models.py:1705
+#: ishtar_base/models.py:1785 templates/sheet_contextrecord.html:103
#: templates/sheet_operation.html:149
msgid "Material type"
msgstr "Type de matériau"
-#: ishtar_base/forms_items.py:107 ishtar_base/forms_items.py:288
-#: ishtar_base/models.py:1327 ishtar_base/models.py:1521
+#: ishtar_base/forms_items.py:107 ishtar_base/forms_items.py:291
+#: ishtar_base/models.py:1786 ishtar_base/models.py:1980
msgid "Volume (l)"
msgstr "Volume (l)"
-#: ishtar_base/forms_items.py:108 ishtar_base/forms_items.py:289
-#: ishtar_base/models.py:1328
+#: ishtar_base/forms_items.py:108 ishtar_base/forms_items.py:292
+#: ishtar_base/models.py:1787
msgid "Weight (g)"
msgstr "Poids (g)"
-#: ishtar_base/forms_items.py:109 ishtar_base/forms_items.py:290
-#: ishtar_base/models.py:1329
+#: ishtar_base/forms_items.py:109 ishtar_base/forms_items.py:293
+#: ishtar_base/models.py:1788
msgid "Item number"
msgstr "Nombre d'éléments"
@@ -706,108 +711,108 @@ msgstr "Code PATRIARCHE"
msgid "Item search"
msgstr "Recherche de mobilier"
-#: ishtar_base/forms_items.py:186
+#: ishtar_base/forms_items.py:189
msgid "Base treatment"
msgstr "Traitement de base"
-#: ishtar_base/forms_items.py:190 ishtar_base/models.py:1588
-#: ishtar_base/models.py:1596
+#: ishtar_base/forms_items.py:193 ishtar_base/models.py:2047
+#: ishtar_base/models.py:2055
msgid "Treatment type"
msgstr "Type de traitement"
-#: ishtar_base/forms_items.py:215
+#: ishtar_base/forms_items.py:218
msgid "Upstream items"
msgstr "Mobilier amont"
-#: ishtar_base/forms_items.py:217 ishtar_base/models.py:1393
+#: ishtar_base/forms_items.py:220 ishtar_base/models.py:1852
msgid "Items"
msgstr "Mobiliers"
-#: ishtar_base/forms_items.py:225
+#: ishtar_base/forms_items.py:228
msgid "You should at least select one archaeological item."
msgstr "Vous devez sélectionner du mobilier archéologique."
-#: ishtar_base/forms_items.py:230 ishtar_base/models.py:1335
-#: ishtar_base/models.py:1537 ishtar_base/models.py:1592
+#: ishtar_base/forms_items.py:233 ishtar_base/models.py:1794
+#: ishtar_base/models.py:1996 ishtar_base/models.py:2051
msgid "Container"
msgstr "Contenant"
-#: ishtar_base/forms_items.py:231 ishtar_base/forms_items.py:355
-#: ishtar_base/models.py:1522 ishtar_base/models.py:1533
+#: ishtar_base/forms_items.py:234 ishtar_base/forms_items.py:358
+#: ishtar_base/models.py:1981 ishtar_base/models.py:1992
#: templates/sheet_file.html:69 templates/sheet_file.html.py:89
#: templates/sheet_file.html:117 templates/sheet_ope.html:84
#: templates/sheet_ope_modif.html:84 templates/sheet_operation.html:84
msgid "Reference"
msgstr "Référence"
-#: ishtar_base/forms_items.py:232 ishtar_base/forms_items.py:354
-#: ishtar_base/models.py:1525 ishtar_base/models.py:1532
+#: ishtar_base/forms_items.py:235 ishtar_base/forms_items.py:357
+#: ishtar_base/models.py:1984 ishtar_base/models.py:1991
msgid "Container type"
msgstr "Type de contenant"
-#: ishtar_base/forms_items.py:280
+#: ishtar_base/forms_items.py:283
msgid "Resulting item"
msgstr "Mobilier résultant"
-#: ishtar_base/forms_items.py:284
+#: ishtar_base/forms_items.py:287
msgid "Precise description"
msgstr "Description précise"
-#: ishtar_base/forms_items.py:294
+#: ishtar_base/forms_items.py:297
msgid "Resulting items"
msgstr "Mobiliers résultants"
-#: ishtar_base/forms_items.py:297
+#: ishtar_base/forms_items.py:300
msgid "Upstream item"
msgstr "Mobilier amont"
-#: ishtar_base/forms_items.py:365
+#: ishtar_base/forms_items.py:368
msgid "Container search"
msgstr "Recherche de conteneur"
-#: ishtar_base/forms_items.py:367
+#: ishtar_base/forms_items.py:370
msgid "You should select a container."
msgstr "Vous devez sélectionner un conteneur."
-#: ishtar_base/forms_items.py:368
+#: ishtar_base/forms_items.py:371
msgid "Add a new container"
msgstr "Ajouter un nouveau conteneur."
-#: ishtar_base/forms_items.py:371 ishtar_base/menus.py:211
+#: ishtar_base/forms_items.py:374 ishtar_base/menus.py:211
msgid "Packaging"
msgstr "Conditionnement"
-#: ishtar_base/forms_items.py:376
+#: ishtar_base/forms_items.py:379
msgid "Packager"
msgstr "Personne assurant le conditionnement"
-#: ishtar_base/forms_items.py:380 templates/sheet_file.html:71
+#: ishtar_base/forms_items.py:383 templates/sheet_file.html:71
#: templates/sheet_file.html.py:119 templates/sheet_ope.html:86
#: templates/sheet_ope_modif.html:86 templates/sheet_operation.html:86
msgid "Date"
msgstr "Date"
-#: ishtar_base/forms_items.py:389
+#: ishtar_base/forms_items.py:392
msgid "Packaged items"
msgstr "Mobilier conditionné"
-#: ishtar_base/forms_items.py:412
+#: ishtar_base/forms_items.py:415
msgid "Archaelogical item search"
msgstr "Recherche de mobilier"
-#: ishtar_base/forms_items.py:414
+#: ishtar_base/forms_items.py:417
msgid "You should select an archaelogical item."
msgstr "Vous devez sélectionner du mobilier."
-#: ishtar_base/forms_items.py:427
+#: ishtar_base/forms_items.py:430
msgid "Period of the archaelogical item"
msgstr "Période du mobilier"
-#: ishtar_base/forms_items.py:430
+#: ishtar_base/forms_items.py:433
msgid "Material type of the archaelogical item"
msgstr "Type de matériau du mobilier"
-#: ishtar_base/forms_items.py:433
+#: ishtar_base/forms_items.py:436
msgid "Description of the archaelogical item"
msgstr "Description du mobilier"
@@ -820,12 +825,12 @@ msgstr ""
"oubli, définissez le à la première étape."
#: ishtar_base/forms_operations.py:188 ishtar_base/forms_operations.py:233
-#: ishtar_base/forms_operations.py:588 ishtar_base/models.py:878
-#: ishtar_base/models.py:909
+#: ishtar_base/forms_operations.py:591 ishtar_base/models.py:1321
+#: ishtar_base/models.py:1352
msgid "Operation type"
msgstr "Type d'opération"
-#: ishtar_base/forms_operations.py:190 ishtar_base/models.py:911
+#: ishtar_base/forms_operations.py:190 ishtar_base/models.py:1354
msgid "Remains"
msgstr "Vestiges"
@@ -833,16 +838,16 @@ msgstr "Vestiges"
msgid "Is open?"
msgstr "Est ouvert ?"
-#: ishtar_base/forms_operations.py:222 ishtar_base/models.py:1485
+#: ishtar_base/forms_operations.py:222 ishtar_base/models.py:1944
msgid "Person in charge of the operation"
msgstr "Responsable d'opération"
-#: ishtar_base/forms_operations.py:229 ishtar_base/models.py:1469
-#: ishtar_base/models.py:1495
+#: ishtar_base/forms_operations.py:229 ishtar_base/models.py:1928
+#: ishtar_base/models.py:1954
msgid "Archaelogical file"
msgstr "Dossier archéologique"
-#: ishtar_base/forms_operations.py:237 ishtar_base/models.py:899
+#: ishtar_base/forms_operations.py:237 ishtar_base/models.py:1342
#: templates/sheet_file.html:94
msgid "Excavation end date"
msgstr "Date de fin de chantier"
@@ -862,8 +867,8 @@ msgstr "La date de fin de chantier ne peut être avant la date de début."
msgid "References"
msgstr "Référence"
-#: ishtar_base/forms_operations.py:277 ishtar_base/models.py:905
-#: ishtar_base/models.py:963
+#: ishtar_base/forms_operations.py:277 ishtar_base/models.py:1348
+#: ishtar_base/models.py:1406
msgid "Operation code"
msgstr "Code de l'opération"
@@ -880,7 +885,8 @@ msgstr ""
msgid "Preventive informations - excavation"
msgstr "Information archéologie préventive - fouille"
-#: ishtar_base/forms_operations.py:303 ishtar_base/models.py:913
+#: ishtar_base/forms_operations.py:303 ishtar_base/models.py:1356
+#: templates/dashboard_operation.html:498
msgid "Cost (€)"
msgstr "Cout (€)"
@@ -888,24 +894,24 @@ msgstr "Cout (€)"
msgid "Preventive informations - diagnostic"
msgstr "Information archéologie préventive - diagnostic"
-#: ishtar_base/forms_operations.py:314 ishtar_base/models.py:924
+#: ishtar_base/forms_operations.py:314 ishtar_base/models.py:1367
msgid "Prescription on zoning"
msgstr "Prescription sur zonage"
-#: ishtar_base/forms_operations.py:316 ishtar_base/models.py:926
+#: ishtar_base/forms_operations.py:316 ishtar_base/models.py:1369
msgid "Prescription on large area"
msgstr "Prescription sur une vaste surface"
-#: ishtar_base/forms_operations.py:318 ishtar_base/models.py:928
+#: ishtar_base/forms_operations.py:318 ishtar_base/models.py:1371
msgid "Prescription on geoarchaeological context"
msgstr "Prescription sur un contexte géoarchéologique"
#: ishtar_base/forms_operations.py:373 ishtar_base/forms_operations.py:387
-#: ishtar_base/models.py:893
+#: ishtar_base/models.py:1336
msgid "Remain types"
msgstr "Types de vestige"
-#: ishtar_base/forms_operations.py:376 ishtar_base/models.py:892
+#: ishtar_base/forms_operations.py:376 ishtar_base/models.py:1335
msgid "Remain type"
msgstr "Type de vestige"
@@ -914,7 +920,7 @@ msgid "There are identical remain types"
msgstr "Il y a des types de vestige identiques."
#: ishtar_base/forms_operations.py:390 ishtar_base/forms_operations.py:404
-#: ishtar_base/models.py:914 templates/sheet_contextrecord.html:105
+#: ishtar_base/models.py:1357 templates/sheet_contextrecord.html:105
#: templates/sheet_ope_modif.html:153 templates/sheet_operation.html:151
msgid "Periods"
msgstr "Périodes"
@@ -923,19 +929,19 @@ msgstr "Périodes"
msgid "There are identical periods"
msgstr "Il y a des périodes identiques."
-#: ishtar_base/forms_operations.py:490
+#: ishtar_base/forms_operations.py:493
msgid "Would you like to close this operation?"
msgstr "Voulez vous clôturer cette opération ?"
-#: ishtar_base/forms_operations.py:504
+#: ishtar_base/forms_operations.py:507
msgid "Would you like to delete this operation?"
msgstr "Voulez vous supprimer cette opération ?"
-#: ishtar_base/forms_operations.py:546 ishtar_base/models.py:1023
+#: ishtar_base/forms_operations.py:549 ishtar_base/models.py:1482
msgid "Index"
msgstr "Index"
-#: ishtar_base/forms_operations.py:569
+#: ishtar_base/forms_operations.py:572
#, python-format
msgid ""
"Index already exist for operation: %(operation)s - use a value bigger than "
@@ -944,35 +950,35 @@ msgstr ""
"Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur "
"plus grande que %(last_val)d"
-#: ishtar_base/forms_operations.py:587
+#: ishtar_base/forms_operations.py:590
msgid "Operation's town"
msgstr "Commune de l'opération"
-#: ishtar_base/forms_operations.py:590
+#: ishtar_base/forms_operations.py:593
msgid "Operation's year"
msgstr "Année de l'opération"
-#: ishtar_base/forms_operations.py:677
+#: ishtar_base/forms_operations.py:680
msgid "Administrative act search"
msgstr "Recherche d'actes administratifs"
-#: ishtar_base/forms_operations.py:689
+#: ishtar_base/forms_operations.py:692
msgid "You should select an administrative act."
msgstr "Vous devez sélectionner un acte administratif."
-#: ishtar_base/forms_operations.py:698 ishtar_base/models.py:1491
+#: ishtar_base/forms_operations.py:701 ishtar_base/models.py:1950
msgid "Signatory"
msgstr "Signataire"
-#: ishtar_base/forms_operations.py:702 ishtar_base/models.py:1497
+#: ishtar_base/forms_operations.py:705 ishtar_base/models.py:1956
msgid "Object"
msgstr "Objet"
-#: ishtar_base/forms_operations.py:704 ishtar_base/models.py:1496
+#: ishtar_base/forms_operations.py:707 ishtar_base/models.py:1955
msgid "Signature date"
msgstr "Date de signature"
-#: ishtar_base/forms_operations.py:731
+#: ishtar_base/forms_operations.py:734
msgid "Would you like to delete this administrative act?"
msgstr "Voulez vous supprimer cet acte administratif ?"
@@ -1010,7 +1016,7 @@ msgid "Deletion"
msgstr "Suppression"
#: ishtar_base/menus.py:120 ishtar_base/menus.py:159
-#: ishtar_base/models.py:1503 ishtar_base/models.py:1631
+#: ishtar_base/models.py:1962 ishtar_base/models.py:2090
msgid "Administrative act"
msgstr "Acte administratif"
@@ -1048,11 +1054,16 @@ msgstr "Tableau de bord"
msgid "General informations"
msgstr "Informations générales"
-#: ishtar_base/menus.py:293 ishtar_base/models.py:793 ishtar_base/views.py:655
-#: templates/dashboard_file.html:9
+#: ishtar_base/menus.py:293 ishtar_base/models.py:1236
+#: ishtar_base/views.py:655 templates/dashboard_file.html:9
msgid "Archaeological files"
msgstr "Dossiers archéologiques"
+#: ishtar_base/menus.py:296 ishtar_base/models.py:1377
+#: ishtar_base/views.py:656 templates/dashboard_operation.html:9
+msgid "Operations"
+msgstr "Opérations"
+
#: ishtar_base/models.py:67
msgid "Not a valid item."
msgstr "Élément invalide."
@@ -1065,7 +1076,7 @@ msgstr "Un élément sélectionné n'est pas valide."
msgid "This item already exist."
msgstr "Cet élément existe déjà."
-#: ishtar_base/models.py:141 ishtar_base/models.py:579
+#: ishtar_base/models.py:141 ishtar_base/models.py:1022
msgid "Label"
msgstr "Libellé"
@@ -1081,286 +1092,321 @@ msgstr "Disponible"
msgid "Last editor"
msgstr "Dernier éditeur"
-#: ishtar_base/models.py:519 ishtar_base/models.py:580
-#: templates/dashboard_main.html:72
+#: ishtar_base/models.py:506
+msgid "Recorded"
+msgstr "Enregistré"
+
+#: ishtar_base/models.py:507
+msgid "Effective"
+msgstr "Effectif"
+
+#: ishtar_base/models.py:508
+msgid "Active"
+msgstr "Actif"
+
+#: ishtar_base/models.py:509
+msgid "Field"
+msgstr "Champs"
+
+#: ishtar_base/models.py:510
+msgid "Documented"
+msgstr "Documenté"
+
+#: ishtar_base/models.py:511
+msgid "Closed"
+msgstr "Fermé"
+
+#: ishtar_base/models.py:512
+msgid "Documented and closed"
+msgstr "Documenté et clôt"
+
+#: ishtar_base/models.py:962 ishtar_base/models.py:1023
+#: templates/dashboard_main.html:72 templates/dashboard_operation.html:17
+#: templates/dashboard_operation.html:113
+#: templates/dashboard_operation.html:302
+#: templates/dashboard_operation.html:334
+#: templates/dashboard_operation.html:485
msgid "Number"
msgstr "Nombre"
-#: ishtar_base/models.py:583
+#: ishtar_base/models.py:1026
msgid "Departement"
msgstr "Département"
-#: ishtar_base/models.py:584
+#: ishtar_base/models.py:1027
msgid "Departements"
msgstr "Départements"
-#: ishtar_base/models.py:600
+#: ishtar_base/models.py:1043
msgid "Mobile phone"
msgstr "Téléphone portable"
-#: ishtar_base/models.py:610
+#: ishtar_base/models.py:1053
msgid "Organization types"
msgstr "Types d'organisation"
-#: ishtar_base/models.py:615 ishtar_base/models.py:645
-#: ishtar_base/models.py:704 templates/sheet_contextrecord.html:83
-#: templates/sheet_file.html:70 templates/sheet_file.html.py:91
-#: templates/sheet_file.html:118 templates/sheet_ope.html:85
-#: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126
-#: templates/sheet_ope_modif.html:85 templates/sheet_ope_modif.html.py:105
-#: templates/sheet_ope_modif.html:126 templates/sheet_operation.html:85
-#: templates/sheet_operation.html.py:105 templates/sheet_operation.html:125
+#: ishtar_base/models.py:1058 ishtar_base/models.py:1088
+#: ishtar_base/models.py:1147 templates/dashboard_operation.html:82
+#: templates/sheet_contextrecord.html:83 templates/sheet_file.html:70
+#: templates/sheet_file.html.py:91 templates/sheet_file.html:118
+#: templates/sheet_ope.html:85 templates/sheet_ope.html.py:105
+#: templates/sheet_ope.html:126 templates/sheet_ope_modif.html:85
+#: templates/sheet_ope_modif.html.py:105 templates/sheet_ope_modif.html:126
+#: templates/sheet_operation.html:85 templates/sheet_operation.html.py:105
+#: templates/sheet_operation.html:125
msgid "Type"
msgstr "Type"
-#: ishtar_base/models.py:618
+#: ishtar_base/models.py:1061 templates/dashboard_operation.html:216
+#: templates/dashboard_operation.html:405
+#: templates/dashboard_operation.html:424
msgid "Organization"
msgstr "Organisation"
-#: ishtar_base/models.py:619
+#: ishtar_base/models.py:1062
msgid "Organizations"
msgstr "Organisations"
-#: ishtar_base/models.py:621
+#: ishtar_base/models.py:1064
msgid "Can view own Organization"
msgstr "Peut voir sa propre Organisation"
-#: ishtar_base/models.py:622
+#: ishtar_base/models.py:1065
msgid "Can add own Organization"
msgstr "Peut ajouter sa propre Organisation"
-#: ishtar_base/models.py:623
+#: ishtar_base/models.py:1066
msgid "Can change own Organization"
msgstr "Peut changer sa propre Organisation"
-#: ishtar_base/models.py:624
+#: ishtar_base/models.py:1067
msgid "Can delete own Organization"
msgstr "Peut supprimer sa propre Organisation"
-#: ishtar_base/models.py:633
+#: ishtar_base/models.py:1076
msgid "Person types"
msgstr "Types d'individu"
-#: ishtar_base/models.py:636
+#: ishtar_base/models.py:1079
msgid "Mr"
msgstr "M"
-#: ishtar_base/models.py:637
+#: ishtar_base/models.py:1080
msgid "Miss"
msgstr "Mlle"
-#: ishtar_base/models.py:638
+#: ishtar_base/models.py:1081
msgid "Mrs"
msgstr "Mme"
-#: ishtar_base/models.py:639
+#: ishtar_base/models.py:1082
msgid "Doctor"
msgstr "Dr"
-#: ishtar_base/models.py:647
+#: ishtar_base/models.py:1090
msgid "Is attached to"
msgstr "Est rattaché à"
-#: ishtar_base/models.py:651
+#: ishtar_base/models.py:1094
msgid "Persons"
msgstr "Individus"
-#: ishtar_base/models.py:653
+#: ishtar_base/models.py:1096
msgid "Can view Person"
msgstr "Peut voir les Personnes"
-#: ishtar_base/models.py:654
+#: ishtar_base/models.py:1097
msgid "Can view own Person"
msgstr "Peut voir sa propre Personne"
-#: ishtar_base/models.py:655
+#: ishtar_base/models.py:1098
msgid "Can add own Person"
msgstr "Peut ajouter sa propre Personne"
-#: ishtar_base/models.py:656
+#: ishtar_base/models.py:1099
msgid "Can change own Person"
msgstr "Peut changer sa propre Personne"
-#: ishtar_base/models.py:657
+#: ishtar_base/models.py:1100
msgid "Can delete own Person"
msgstr "Peut supprimer sa propre Personne"
-#: ishtar_base/models.py:678
+#: ishtar_base/models.py:1121
msgid "Ishtar user"
msgstr "Utilisateur d'Ishtar"
-#: ishtar_base/models.py:679
+#: ishtar_base/models.py:1122
msgid "Ishtar users"
msgstr "Utilisateurs d'Ishtar"
-#: ishtar_base/models.py:684
+#: ishtar_base/models.py:1127
msgid "Author types"
msgstr "Types d'auteur"
-#: ishtar_base/models.py:700
+#: ishtar_base/models.py:1143
msgid "Source types"
msgstr "Types de source"
-#: ishtar_base/models.py:722
+#: ishtar_base/models.py:1165
msgid "Archaeological file type"
msgstr "Type de dossier archéologique"
-#: ishtar_base/models.py:723
+#: ishtar_base/models.py:1166
msgid "Archaeological file types"
msgstr "Types de dossier archéologique"
-#: ishtar_base/models.py:737
+#: ishtar_base/models.py:1180
msgid "Permit types"
msgstr "Types de permis"
-#: ishtar_base/models.py:741
+#: ishtar_base/models.py:1184
msgid "Delay (in days)"
msgstr "Delai (en jours)"
-#: ishtar_base/models.py:777
+#: ishtar_base/models.py:1220
msgid "Reference number"
msgstr "Référence"
-#: ishtar_base/models.py:795
+#: ishtar_base/models.py:1238
msgid "Can view own Archaelogical file"
msgstr "Peut voir son propre Dossier archéologique"
-#: ishtar_base/models.py:796
+#: ishtar_base/models.py:1239
msgid "Can add own Archaelogical file"
msgstr "Peut ajouter son propre Dossier archéologique"
-#: ishtar_base/models.py:797
+#: ishtar_base/models.py:1240
msgid "Can change own Archaelogical file"
msgstr "Peut changer son propre Dossier archéologique"
-#: ishtar_base/models.py:798
+#: ishtar_base/models.py:1241
msgid "Can delete own Archaelogical file"
msgstr "Peut supprimer son propre Dossier archéologique"
-#: ishtar_base/models.py:816 ishtar_base/models.py:943
+#: ishtar_base/models.py:1259 ishtar_base/models.py:1386
msgid "Intercommunal"
msgstr "Intercommunal"
-#: ishtar_base/models.py:869 ishtar_base/models.py:907
-#: ishtar_base/models.py:1029
+#: ishtar_base/models.py:1312 ishtar_base/models.py:1350
+#: ishtar_base/models.py:1488
msgid "File"
msgstr "Dossier"
-#: ishtar_base/models.py:870
+#: ishtar_base/models.py:1313 ishtar_base/models.py:1470
+#: templates/dashboard_operation.html:273
+#: templates/dashboard_operation.html:286
+#: templates/dashboard_operation.html:456
+#: templates/dashboard_operation.html:469
msgid "Department"
msgstr "Département"
-#: ishtar_base/models.py:879
+#: ishtar_base/models.py:1322
msgid "Operation types"
msgstr "Types d'opération"
-#: ishtar_base/models.py:903 templates/sheet_file.html:92
+#: ishtar_base/models.py:1346 templates/sheet_file.html:92
msgid "In charge"
msgstr "Responsable"
-#: ishtar_base/models.py:910 ishtar_base/models.py:1562
+#: ishtar_base/models.py:1353 ishtar_base/models.py:2021
msgid "Surface (m²)"
msgstr "Area (m²)"
-#: ishtar_base/models.py:934 ishtar_base/views.py:656
-msgid "Operations"
-msgstr "Opérations"
-
-#: ishtar_base/models.py:936
+#: ishtar_base/models.py:1379
msgid "Can view own Operation"
msgstr "Peut voir sa propre Opération"
-#: ishtar_base/models.py:937
+#: ishtar_base/models.py:1380
msgid "Can add own Operation"
msgstr "Peut ajouter sa propre Opération"
-#: ishtar_base/models.py:938
+#: ishtar_base/models.py:1381
msgid "Can change own Operation"
msgstr "Peut changer sa propre Opération"
-#: ishtar_base/models.py:939
+#: ishtar_base/models.py:1382
msgid "Can delete own Operation"
msgstr "Peut supprimer sa propre Opération"
-#: ishtar_base/models.py:976
+#: ishtar_base/models.py:1419
msgid "This operation code already exists for this year"
msgstr "Cet code d'opération existe déjà pour cette année."
-#: ishtar_base/models.py:1019
+#: ishtar_base/models.py:1478
msgid "Operation documentation"
msgstr "Documentation d'une opération"
-#: ishtar_base/models.py:1020
+#: ishtar_base/models.py:1479
msgid "Operation documentations"
msgstr "Documentations des opérations"
-#: ishtar_base/models.py:1056 ishtar_base/models.py:1100
-#: ishtar_base/models.py:1112 ishtar_base/models.py:1122
-#: ishtar_base/models.py:1322
+#: ishtar_base/models.py:1515 ishtar_base/models.py:1559
+#: ishtar_base/models.py:1571 ishtar_base/models.py:1581
+#: ishtar_base/models.py:1781
msgid "Order"
msgstr "Ordre"
-#: ishtar_base/models.py:1059
+#: ishtar_base/models.py:1518
msgid "Parent period"
msgstr "Période parente"
-#: ishtar_base/models.py:1063
+#: ishtar_base/models.py:1522
msgid "Type Period"
msgstr "Type de période"
-#: ishtar_base/models.py:1064
+#: ishtar_base/models.py:1523
msgid "Types Period"
msgstr "Types de période"
-#: ishtar_base/models.py:1072
+#: ishtar_base/models.py:1531
msgid "Dating types"
msgstr "Types de datation"
-#: ishtar_base/models.py:1076
+#: ishtar_base/models.py:1535
msgid "Dating quality"
msgstr "Qualité de datation"
-#: ishtar_base/models.py:1077
+#: ishtar_base/models.py:1536
msgid "Dating qualities"
msgstr "Qualités de datation"
-#: ishtar_base/models.py:1090
+#: ishtar_base/models.py:1549
msgid "Datings"
msgstr "Datations"
-#: ishtar_base/models.py:1101
+#: ishtar_base/models.py:1560
msgid "Parent unit"
msgstr "Unité parente"
-#: ishtar_base/models.py:1105
+#: ishtar_base/models.py:1564
msgid "Type Unit"
msgstr "Type d'unité"
-#: ishtar_base/models.py:1106
+#: ishtar_base/models.py:1565
msgid "Types Unit"
msgstr "Types d'unité"
-#: ishtar_base/models.py:1115
+#: ishtar_base/models.py:1574
msgid "Type Activity"
msgstr "Type d'activité"
-#: ishtar_base/models.py:1116
+#: ishtar_base/models.py:1575
msgid "Types Activity"
msgstr "Types d'activités"
-#: ishtar_base/models.py:1124
+#: ishtar_base/models.py:1583
msgid "Type Identification"
msgstr "Type d'identification"
-#: ishtar_base/models.py:1125
+#: ishtar_base/models.py:1584
msgid "Types Identification"
msgstr "Types d'identification"
-#: ishtar_base/models.py:1148
+#: ishtar_base/models.py:1607
msgid "A short description of the location of the context record"
msgstr "Une courte description de la situation de l'Unité d'Enregistrement"
-#: ishtar_base/models.py:1158
+#: ishtar_base/models.py:1617
msgid ""
"\"Terminus Ante Quem\" the context record can't have been created after this "
"date"
@@ -1368,11 +1414,11 @@ msgstr ""
"« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été crée après "
"cette date"
-#: ishtar_base/models.py:1161
+#: ishtar_base/models.py:1620
msgid "Estimation of a \"Terminus Ante Quem\""
msgstr "Estimation d'un « Terminus Ante Quem »"
-#: ishtar_base/models.py:1163
+#: ishtar_base/models.py:1622
msgid ""
"\"Terminus Post Quem\" the context record can't have been created before "
"this date"
@@ -1380,258 +1426,258 @@ msgstr ""
"« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été crée avant "
"cette date"
-#: ishtar_base/models.py:1166
+#: ishtar_base/models.py:1625
msgid "Estimation of a \"Terminus Post Quem\""
msgstr "Estimation d'un « Terminus Post Quem »"
-#: ishtar_base/models.py:1174 ishtar_base/models.py:1175
-#: ishtar_base/models.py:1253 templates/sheet_contextrecord.html:6
+#: ishtar_base/models.py:1633 ishtar_base/models.py:1634
+#: ishtar_base/models.py:1712 templates/sheet_contextrecord.html:6
msgid "Context Record"
msgstr "Unité d'Enregistrement"
-#: ishtar_base/models.py:1177
+#: ishtar_base/models.py:1636
msgid "Can view own Context Record"
msgstr "Peut voir sa propre Unité d'Enregistrement"
-#: ishtar_base/models.py:1178
+#: ishtar_base/models.py:1637
msgid "Can add own Context Record"
msgstr "Peut ajouter sa propre Unité d'Enregistrement"
-#: ishtar_base/models.py:1179
+#: ishtar_base/models.py:1638
msgid "Can change own Context Record"
msgstr "Peut changer sa propre Unité d'Enregistrement"
-#: ishtar_base/models.py:1180
+#: ishtar_base/models.py:1639
msgid "Can delete own Context Record"
msgstr "Peut supprimer sa propre Unité d'Enregistrement"
-#: ishtar_base/models.py:1235
+#: ishtar_base/models.py:1694
msgid "Context record documentation"
msgstr "Documentation d'une Unité d'Enregistrement"
-#: ishtar_base/models.py:1236
+#: ishtar_base/models.py:1695
msgid "Context record documentations"
msgstr "Documentations des Unités d'Enregistrement"
-#: ishtar_base/models.py:1241
+#: ishtar_base/models.py:1700
msgid "Recommendation"
msgstr "Recommendation"
-#: ishtar_base/models.py:1243
+#: ishtar_base/models.py:1702
msgid "Parent material"
msgstr "Matériau parent"
-#: ishtar_base/models.py:1247
+#: ishtar_base/models.py:1706
msgid "Material types"
msgstr "Types de matériaux"
-#: ishtar_base/models.py:1261 ishtar_base/models.py:1320
+#: ishtar_base/models.py:1720 ishtar_base/models.py:1779
msgid "Base item"
msgstr "Mobilier de base"
-#: ishtar_base/models.py:1262
+#: ishtar_base/models.py:1721
msgid "Base items"
msgstr "Mobiliers de base"
-#: ishtar_base/models.py:1264
+#: ishtar_base/models.py:1723
msgid "Can view own Base item"
msgstr "Peut voir son propre Mobilier de base"
-#: ishtar_base/models.py:1265
+#: ishtar_base/models.py:1724
msgid "Can add own Base item"
msgstr "Peut ajouter son propre Mobilier de base"
-#: ishtar_base/models.py:1266
+#: ishtar_base/models.py:1725
msgid "Can change own Base item"
msgstr "Peut changer son propre Mobilier de base"
-#: ishtar_base/models.py:1267
+#: ishtar_base/models.py:1726
msgid "Can delete own Base item"
msgstr "Peut supprimer son propre Mobilier de base"
-#: ishtar_base/models.py:1331
+#: ishtar_base/models.py:1790
msgid "Upstream treatment"
msgstr "Traitement amont"
-#: ishtar_base/models.py:1333
+#: ishtar_base/models.py:1792
msgid "Downstream treatment"
msgstr "Traitement aval"
-#: ishtar_base/models.py:1395
+#: ishtar_base/models.py:1854
msgid "Can view own Item"
msgstr "Peut voir son propre Mobilier"
-#: ishtar_base/models.py:1396
+#: ishtar_base/models.py:1855
msgid "Can add own Item"
msgstr "Peut ajouter son propre Mobilier"
-#: ishtar_base/models.py:1397
+#: ishtar_base/models.py:1856
msgid "Can change own Item"
msgstr "Peut changer son propre Mobilier"
-#: ishtar_base/models.py:1398
+#: ishtar_base/models.py:1857
msgid "Can delete own Item"
msgstr "Peut supprimer son propre Mobilier"
-#: ishtar_base/models.py:1424
+#: ishtar_base/models.py:1883
msgid "Item documentation"
msgstr "Documentation du mobilier"
-#: ishtar_base/models.py:1425
+#: ishtar_base/models.py:1884
msgid "Item documentations"
msgstr "Documentations des mobiliers"
-#: ishtar_base/models.py:1430 templates/sheet_ope.html:64
+#: ishtar_base/models.py:1889 templates/sheet_ope.html:64
#: templates/sheet_ope_modif.html:64
msgid "Owner"
msgstr "Propriétaire"
-#: ishtar_base/models.py:1436
+#: ishtar_base/models.py:1895
msgid "Parcel owner"
msgstr "Propriétaire de parcelle"
-#: ishtar_base/models.py:1437
+#: ishtar_base/models.py:1896
msgid "Parcel owners"
msgstr "Propriétaires de parcelle"
-#: ishtar_base/models.py:1445
+#: ishtar_base/models.py:1904
msgid "Warehouse types"
msgstr "Types de dépôts"
-#: ishtar_base/models.py:1457
+#: ishtar_base/models.py:1916
msgid "Warehouses"
msgstr "Dépôts"
-#: ishtar_base/models.py:1459
+#: ishtar_base/models.py:1918
msgid "Can view own Warehouse"
msgstr "Peut voir son propre Dépôt"
-#: ishtar_base/models.py:1460
+#: ishtar_base/models.py:1919
msgid "Can add own Warehouse"
msgstr "Peut ajouter son propre Dépôt"
-#: ishtar_base/models.py:1461
+#: ishtar_base/models.py:1920
msgid "Can change own Warehouse"
msgstr "Peut changer son propre Dépôt"
-#: ishtar_base/models.py:1462
+#: ishtar_base/models.py:1921
msgid "Can delete own Warehouse"
msgstr "Peut supprimer son propre Dépôt"
-#: ishtar_base/models.py:1472
+#: ishtar_base/models.py:1931
msgid "Intended to"
msgstr "Destiné à"
-#: ishtar_base/models.py:1476
+#: ishtar_base/models.py:1935
msgid "Act types"
msgstr "Types d'acte"
-#: ishtar_base/models.py:1487
+#: ishtar_base/models.py:1946
msgid "Archaeological preventive operator"
msgstr "Opérateur d'archéologie préventive"
-#: ishtar_base/models.py:1489
+#: ishtar_base/models.py:1948
msgid "Person in charge of the scientific part"
msgstr "Responsable scientifique"
-#: ishtar_base/models.py:1504
+#: ishtar_base/models.py:1963
msgid "Administrative acts"
msgstr "Actes administratifs"
-#: ishtar_base/models.py:1506
+#: ishtar_base/models.py:1965
msgid "Can view own Administrative act"
msgstr "Peut voir son propre Acte administratif"
-#: ishtar_base/models.py:1507
+#: ishtar_base/models.py:1966
msgid "Can add own Administrative act"
msgstr "Peut ajouter son propre Acte administratif"
-#: ishtar_base/models.py:1508
+#: ishtar_base/models.py:1967
msgid "Can change own Administrative act"
msgstr "Peut changer son propre Acte administratif"
-#: ishtar_base/models.py:1509
+#: ishtar_base/models.py:1968
msgid "Can delete own Administrative act"
msgstr "Peut supprimer son propre Acte administratif"
-#: ishtar_base/models.py:1518
+#: ishtar_base/models.py:1977
msgid "Length (mm)"
msgstr "Longueur (mm) :"
-#: ishtar_base/models.py:1519
+#: ishtar_base/models.py:1978
msgid "Width (mm)"
msgstr "Largeur (mm) :"
-#: ishtar_base/models.py:1520
+#: ishtar_base/models.py:1979
msgid "Height (mm)"
msgstr "Hauteur (mm)"
-#: ishtar_base/models.py:1526
+#: ishtar_base/models.py:1985
msgid "Container types"
msgstr "Types de contenant"
-#: ishtar_base/models.py:1538
+#: ishtar_base/models.py:1997
msgid "Containers"
msgstr "Contenants"
-#: ishtar_base/models.py:1563 templates/sheet_contextrecord.html:71
+#: ishtar_base/models.py:2022 templates/sheet_contextrecord.html:71
#: templates/sheet_file.html:43 templates/sheet_ope.html:46
#: templates/sheet_ope.html.py:107 templates/sheet_ope_modif.html:46
#: templates/sheet_ope_modif.html.py:107 templates/sheet_operation.html:46
msgid "Localisation"
msgstr "Localisation"
-#: ishtar_base/models.py:1586
+#: ishtar_base/models.py:2045
msgid "Virtual"
msgstr "Virtuel"
-#: ishtar_base/models.py:1589
+#: ishtar_base/models.py:2048
msgid "Treatment types"
msgstr "Types de traitements"
-#: ishtar_base/models.py:1606 ishtar_base/models.py:1625
+#: ishtar_base/models.py:2065 ishtar_base/models.py:2084
msgid "Treatment"
msgstr "Traitement"
-#: ishtar_base/models.py:1607
+#: ishtar_base/models.py:2066
msgid "Treatments"
msgstr "Traitements"
-#: ishtar_base/models.py:1609
+#: ishtar_base/models.py:2068
msgid "Can view own Treatment"
msgstr "Peut voir son propre Traitement"
-#: ishtar_base/models.py:1610
+#: ishtar_base/models.py:2069
msgid "Can add own Treatment"
msgstr "Peut ajouter son propre Traitement"
-#: ishtar_base/models.py:1611
+#: ishtar_base/models.py:2070
msgid "Can change own Treatment"
msgstr "Peut changer son propre Traitement"
-#: ishtar_base/models.py:1612
+#: ishtar_base/models.py:2071
msgid "Can delete own Treatment"
msgstr "Peut supprimer son propre traitement"
-#: ishtar_base/models.py:1618 templates/sheet_contextrecord.html:65
+#: ishtar_base/models.py:2077 templates/sheet_contextrecord.html:65
#: templates/sheet_file.html:35 templates/sheet_ope.html:22
#: templates/sheet_ope_modif.html:22 templates/sheet_operation.html:22
msgid "by"
msgstr "par"
-#: ishtar_base/models.py:1623
+#: ishtar_base/models.py:2082
msgid "Treatment documentation"
msgstr "Documentation d'un traitement"
-#: ishtar_base/models.py:1624
+#: ishtar_base/models.py:2083
msgid "Treament documentations"
msgstr "Documentations des traitements"
-#: ishtar_base/models.py:1637
+#: ishtar_base/models.py:2096
msgid "Property"
msgstr "Propriété"
-#: ishtar_base/models.py:1638
+#: ishtar_base/models.py:2097
msgid "Properties"
msgstr "Propriétés"
@@ -1735,7 +1781,7 @@ msgstr "Voulez vous sauver ces informations ?"
msgid "Validate"
msgstr "Valider"
-#: templates/dashboard_file.html:11
+#: templates/dashboard_file.html:11 templates/dashboard_operation.html:11
msgid "Global informations"
msgstr "Informations générales"
@@ -1749,12 +1795,15 @@ msgid ":"
msgstr " :"
#: templates/dashboard_file.html:19 templates/dashboard_file.html.py:49
-#: templates/dashboard_file.html:128
+#: templates/dashboard_file.html:128 templates/dashboard_operation.html:54
+#: templates/dashboard_operation.html:124
+#: templates/dashboard_operation.html:345
msgid "By year"
msgstr "Par année"
#: templates/dashboard_file.html:31 templates/dashboard_file.html.py:61
-#: templates/dashboard_file.html:140
+#: templates/dashboard_file.html:140 templates/dashboard_operation.html:258
+#: templates/dashboard_operation.html:441
msgid "By month"
msgstr "Par mois"
@@ -1763,6 +1812,8 @@ msgid "Research archaeology"
msgstr "Archéologie programmée"
#: templates/dashboard_file.html:73 templates/dashboard_file.html.py:167
+#: templates/dashboard_operation.html:271
+#: templates/dashboard_operation.html:454
msgid "By department"
msgstr "Par département"
@@ -1798,7 +1849,8 @@ msgstr "Dossier archéologique associé au moins à une opération (%)"
msgid "Surface by department (m²)"
msgstr "Surface par département (m²)"
-#: templates/dashboard_file.html:191
+#: templates/dashboard_file.html:191 templates/dashboard_operation.html:300
+#: templates/dashboard_operation.html:483
msgid "Main towns by number"
msgstr "Principales communes en nombre"
@@ -1867,6 +1919,189 @@ msgstr "Utilisateurs"
msgid "User type"
msgstr "Type d'utilisateur"
+#: templates/dashboard_operation.html:15
+#: templates/dashboard_operation.html:111
+#: templates/dashboard_operation.html:332
+msgid "Total"
+msgstr "Total"
+
+#: templates/dashboard_operation.html:17 templates/dashboard_operation.html:30
+#: templates/dashboard_operation.html:113
+#: templates/dashboard_operation.html:152
+#: templates/dashboard_operation.html:184
+#: templates/dashboard_operation.html:334
+#: templates/dashboard_operation.html:373
+msgid "Status"
+msgstr "État"
+
+#: templates/dashboard_operation.html:28
+msgid "Area by type of operation"
+msgstr "Surface par type d'opération"
+
+#: templates/dashboard_operation.html:30
+msgid "Area (m²)"
+msgstr "Surface (m²)"
+
+#: templates/dashboard_operation.html:41
+msgid "By types"
+msgstr "Par types"
+
+#: templates/dashboard_operation.html:43 templates/dashboard_operation.html:56
+#: templates/dashboard_operation.html:69 templates/dashboard_operation.html:95
+#: templates/dashboard_operation.html:126
+#: templates/dashboard_operation.html:139
+#: templates/dashboard_operation.html:260
+#: templates/dashboard_operation.html:347
+#: templates/dashboard_operation.html:360
+#: templates/dashboard_operation.html:443
+msgid "State"
+msgstr "État"
+
+#: templates/dashboard_operation.html:67
+#: templates/dashboard_operation.html:137
+#: templates/dashboard_operation.html:358
+msgid "By realisation year"
+msgstr "Par année de réalisation"
+
+#: templates/dashboard_operation.html:80
+msgid "Effective operation by type and year"
+msgstr "Opération effective par type et année"
+
+#: templates/dashboard_operation.html:93
+msgid "By realisation month"
+msgstr "Par mois de réalisation"
+
+#: templates/dashboard_operation.html:107
+msgid "Survey informations"
+msgstr "Informations : diagnostics"
+
+#: templates/dashboard_operation.html:150
+msgid "Current year"
+msgstr "Année en cours"
+
+#: templates/dashboard_operation.html:155
+#: templates/dashboard_operation.html:171
+#: templates/dashboard_operation.html:187
+#: templates/dashboard_operation.html:203
+#: templates/dashboard_operation.html:289
+#: templates/dashboard_operation.html:376
+#: templates/dashboard_operation.html:392
+msgid "Area"
+msgstr "Surface"
+
+#: templates/dashboard_operation.html:158
+#: templates/dashboard_operation.html:171
+#: templates/dashboard_operation.html:190
+#: templates/dashboard_operation.html:203
+#: templates/dashboard_operation.html:379
+#: templates/dashboard_operation.html:392
+msgid "Man-day"
+msgstr "Jour-homme"
+
+#: templates/dashboard_operation.html:161
+#: templates/dashboard_operation.html:171
+#: templates/dashboard_operation.html:193
+#: templates/dashboard_operation.html:203
+#: templates/dashboard_operation.html:382
+#: templates/dashboard_operation.html:392
+msgid "Man-day/hectare"
+msgstr "Jour-homme/hectare"
+
+#: templates/dashboard_operation.html:165
+msgid "Man-day/hectare for effective operations (current year):"
+msgstr "Jour-homme/hectare pour les opération effectives (année en cours) :"
+
+#: templates/dashboard_operation.html:169
+msgid "Organizations (current year)"
+msgstr "Organisations (année en cours)"
+
+#: templates/dashboard_operation.html:182
+#: templates/dashboard_operation.html:371
+msgid "Current realisation year"
+msgstr "Année actuelle (réalisations)"
+
+#: templates/dashboard_operation.html:197
+#: templates/dashboard_operation.html:386
+msgid "Man-day/hectare for effective operations (current realisation year):"
+msgstr "Jour-homme/hectare pour les opération effectives (année de réalisation en cours) :"
+
+#: templates/dashboard_operation.html:201
+#: templates/dashboard_operation.html:390
+msgid "Organizations (current realisation year)"
+msgstr "Organisations (année de réalisation en cours)"
+
+#: templates/dashboard_operation.html:214
+#: templates/dashboard_operation.html:403
+msgid "Area by organization by year"
+msgstr "Surface par organisation et par année"
+
+#: templates/dashboard_operation.html:224
+#: templates/dashboard_operation.html:416
+#: templates/dashboard_operation.html:435
+msgid "Mean"
+msgstr "Moyenne"
+
+#: templates/dashboard_operation.html:230
+msgid "Effective operations areas (m²)"
+msgstr "Surface des opérations en cours (m²)"
+
+#: templates/dashboard_operation.html:235
+#: templates/dashboard_operation.html:273
+#: templates/dashboard_operation.html:286
+#: templates/dashboard_operation.html:413
+#: templates/dashboard_operation.html:432
+#: templates/dashboard_operation.html:456
+#: templates/dashboard_operation.html:469
+msgid "Sum"
+msgstr "Somme"
+
+#: templates/dashboard_operation.html:238
+#: templates/dashboard_operation.html:252
+msgid "Average"
+msgstr "Moyenne"
+
+#: templates/dashboard_operation.html:244
+msgid "Man-Days/hectare by Year"
+msgstr "Jours-homme/hectare par année"
+
+#: templates/dashboard_operation.html:249
+msgid "Man-Days/hectare"
+msgstr "Jours-homme/hectare"
+
+#: templates/dashboard_operation.html:284
+#: templates/dashboard_operation.html:467
+msgid "Effective operation by department"
+msgstr "Opérations effectives par départements"
+
+#: templates/dashboard_operation.html:289
+#: templates/dashboard_operation.html:472
+msgid "Nb."
+msgstr "Nb."
+
+#: templates/dashboard_operation.html:313
+msgid "Main towns by surface"
+msgstr "Principales communes en surface"
+
+#: templates/dashboard_operation.html:328
+msgid "Excavation informations"
+msgstr "Fouilles : informations"
+
+#: templates/dashboard_operation.html:422
+msgid "Area by organization by realisation year"
+msgstr "Surface par organisation et par année de réalisation"
+
+#: templates/dashboard_operation.html:472
+msgid "Cost"
+msgstr "Coût"
+
+#: templates/dashboard_operation.html:472
+msgid "FNAP cost"
+msgstr "Coût FNAP"
+
+#: templates/dashboard_operation.html:496
+msgid "Main towns by cost"
+msgstr "Principales communes par coût"
+
#: templates/default_wizard.html:29 templates/search.html:20
#: templates/towns_wizard.html:25
msgid "Add/Modify"
diff --git a/ishtar/templates/dashboard_operation.html b/ishtar/templates/dashboard_operation.html
index b1fb0e8d5..71d9563d2 100644
--- a/ishtar/templates/dashboard_operation.html
+++ b/ishtar/templates/dashboard_operation.html
@@ -279,6 +279,47 @@
{% endfor %}
</table></div>
+ <div class='table'>
+ <table>
+ <caption>{% trans "Effective operation by department" %}</caption>
+ <tr>
+ <th rowspan='2'>{% trans "Department" %}</th>{%for yr in dashboard.years %}<th colspan='2'>{{yr}}</th>{% endfor %}<th colspan='2'>{% trans "Sum" %}</th>
+ </tr>
+ <tr>
+ {%for yr in dashboard.years %}<th>{%trans "Nb."%}</th><th>{%trans "Area"%}</th>{% endfor %}<th>{%trans "Nb."%}</th><th>{%trans "Area"%}</th>
+ </tr>
+ {% for lbl, years in dashboard.survey.effective_by_dpt %}
+ <tr>
+ <th class='sub'>{{lbl}}</th>{%for nb, area, cost, fnap in years %}<td{%if forloop.last%} class='sub'{%endif%}>{{nb}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{area}}</td>{% endfor %}
+ </tr>
+ {% endfor %}
+ </table></div>
+
+ <div class='table'>
+ <table>
+ <caption>{% trans "Main towns by number" %}</caption>
+ <tr>
+ <th>{% trans "Town" %}</th><th>{% trans "Number" %}</th>
+ </tr>
+ {% for lbl, nb in dashboard.survey.towns %}
+ <tr>
+ <th class='sub'>{{lbl}}</th><td>{{nb}}</td>
+ </tr>
+ {% endfor %}
+ </table></div>
+
+ <div class='table'>
+ <table>
+ <caption>{% trans "Main towns by surface" %}</caption>
+ <tr>
+ <th>{% trans "Town" %}</th><th>{% trans "Total surface (m²)" %}</th>
+ </tr>
+ {% for lbl, nb in dashboard.survey.towns_surface %}
+ <tr>
+ <th class='sub'>{{lbl}}</th><td>{{nb}}</td>
+ </tr>
+ {% endfor %}
+ </table></div>
</div>
@@ -421,181 +462,49 @@
{% endfor %}
</table></div>
- </div>
-<!--
- <div>
-
- <h3>{% trans "Research archaeology" %}</h3>
-
- <p><strong>{% trans "Total:" %}</strong> {{dashboard.research.total_number}}</p>
- <div class='table'>
- <table>
- <caption>{% trans "By year"%}</caption>
- <tr>
- {% for year in dashboard.research.by_year %}<th>{{year.date.year}}</th>{% endfor %}
- </tr>
- <tr>
- {% for year in dashboard.research.by_year %}<td>{{year.number}}</td>{% endfor%}
- </tr>
- </table>
- </div>
-
- <div class='table'>
- <table>
- <caption>{% trans "By month"%}</caption>
- <tr>
- {% for month in dashboard.research.by_month %}<th>{{month.date|date:"F Y"|capfirst}}</th>{% endfor %}
- </tr>
- <tr>
- {% for month in dashboard.research.by_month %}<td>{{month.number}}</td>{% endfor%}
- </tr>
- </table>
- </div>
-
- <div class='table'>
- <table>
- <caption>{% trans "By department"%}</caption>
- <tr>
- {% for dpt in dashboard.research.by_dpt %}<th>{{dpt.department__label}}</th>{% endfor %}
- </tr>
- <tr>
- {% for dpt in dashboard.research.by_dpt %}<td>{{dpt.number}}</td>{% endfor%}
- </tr>
- </table>
- </div>
-
- <div class='table'>
- <table>
- <caption>{% trans "Main towns"%}</caption>
- <tr>
- {% for town in dashboard.research.towns %}<th>{{town.town__name}}</th>{% endfor %}
- </tr>
- <tr>
- {% for town in dashboard.research.towns %}<td>{{town.number}}</td>{% endfor%}
- </tr>
- </table>
- </div>
-
- </div>
- <div>
-
- <h3>{% trans "Rescue archaeology" %}</h3>
-
- <p><strong>{% trans "Total:" %}</strong> {{dashboard.rescue.total_number}}</p>
-
- <div class='table'>
- <table>
- <caption>{% trans "By saisine type"%}</caption>
- <tr>
- {% for saisine in dashboard.rescue.saisine %}<th>{{saisine.saisine_type__label}}</th>{% endfor %}
- </tr>
- <tr>
- {% for saisine in dashboard.rescue.saisine %}<td>{{saisine.number}}</td>{% endfor%}
- </tr>
- </table>
- </div>
-
- <div class='table'>
- <table>
- <caption>{% trans "By administrative act"%}</caption>
- <tr>
- {% for act in dashboard.rescue.administrative_act %}<th>{{act.act_type__label}}</th>{% endfor %}
- </tr>
- <tr>
- {% for act in dashboard.rescue.administrative_act %}<td>{{act.number}}</td>{% endfor%}
- </tr>
- </table>
- </div>
-
- <div class='table'>
- <table>
- <caption>{% trans "By year"%}</caption>
- <tr>
- {% for year in dashboard.rescue.by_year %}<th>{{year.date.year}}</th>{% endfor %}
- </tr>
- <tr>
- {% for year in dashboard.rescue.by_year %}<td>{{year.number}}</td>{% endfor%}
- </tr>
- </table>
- </div>
-
<div class='table'>
<table>
- <caption>{% trans "By month"%}</caption>
- <tr>
- {% for month in dashboard.rescue.by_month %}<th>{{month.date|date:"F Y"|capfirst}}</th>{% endfor %}
- </tr>
+ <caption>{% trans "Effective operation by department" %}</caption>
<tr>
- {% for month in dashboard.rescue.by_month %}<td>{{month.number}}</td>{% endfor%}
+ <th rowspan='2'>{% trans "Department" %}</th>{%for yr in dashboard.years %}<th colspan='3'>{{yr}}</th>{% endfor %}<th colspan='3'>{% trans "Sum" %}</th>
</tr>
- </table>
- </div>
-
- <p><strong>{% trans "Archaeological files linked to at least one operation:" %}</strong> {{dashboard.rescue.with_associated_operation}}</p>
- <p><strong>{% trans "Archaeological files linked to at least one operation (%):" %}</strong> {{dashboard.rescue.with_associated_operation_percent}}</p>
-
- <div class='table'>
- <table>
- <caption>{% trans "Archaeological files linked to at least one operation (%)"%}</caption>
<tr>
- {% for year in dashboard.rescue.operational_by_year %}<th>{{year.date.year}}</th>{% endfor %}
+ {%for yr in dashboard.years %}<th>{%trans "Nb."%}</th><th>{%trans "Cost"%}</th><th>{%trans "FNAP cost"%}</th>{% endfor %}<th>{%trans "Nb."%}</th><th>{%trans "Cost"%}</th><th>{%trans "FNAP cost"%}</th>
</tr>
+ {% for lbl, years in dashboard.survey.effective_by_dpt %}
<tr>
- {% for year in dashboard.rescue.operational_by_year %}<td>{{year.number}}</td>{% endfor%}
+ <th class='sub'>{{lbl}}</th>{%for nb, area, cost, fnap in years %}<td{%if forloop.last%} class='sub'{%endif%}>{{nb}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{cost}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{fnap}}</td>{% endfor %}
</tr>
- </table>
- </div>
-
- <div class='table'>
- <table>
- <caption>{% trans "By department"%}</caption>
- <tr>
- {% for dpt in dashboard.rescue.by_dpt %}<th>{{dpt.department__label}}</th>{% endfor %}
- </tr>
- <tr>
- {% for dpt in dashboard.rescue.by_dpt %}<td>{{dpt.number}}</td>{% endfor%}
- </tr>
- </table>
- </div>
+ {% endfor %}
+ </table></div>
<div class='table'>
<table>
- <caption>{% trans "Surface by department (m²)"%}</caption>
+ <caption>{% trans "Main towns by number" %}</caption>
<tr>
- {% for dpt in dashboard.rescue.surface_by_dpt %}<th>{{dpt.department__label}}</th>{% endfor %}
+ <th>{% trans "Town" %}</th><th>{% trans "Number" %}</th>
</tr>
+ {% for lbl, nb in dashboard.excavation.towns %}
<tr>
- {% for dpt in dashboard.rescue.surface_by_dpt %}<td>{{dpt.number}}</td>{% endfor%}
+ <th class='sub'>{{lbl}}</th><td>{{nb}}</td>
</tr>
- </table>
- </div>
+ {% endfor %}
+ </table></div>
<div class='table'>
<table>
- <caption>{% trans "Main towns by number"%}</caption>
+ <caption>{% trans "Main towns by cost" %}</caption>
<tr>
- {% for town in dashboard.rescue.towns %}<th>{{town.town__name}}</th>{% endfor %}
+ <th>{% trans "Town" %}</th><th>{% trans "Cost (€)" %}</th>
</tr>
+ {% for lbl, nb in dashboard.excavation.towns_cost %}
<tr>
- {% for town in dashboard.rescue.towns %}<td>{{town.number}}</td>{% endfor%}
+ <th class='sub'>{{lbl}}</th><td>{{nb}}</td>
</tr>
- </table>
- </div>
+ {% endfor %}
+ </table></div>
- <div class='table'>
- <table>
- <caption>{% trans "Main towns by surface (m²)"%}</caption>
- <tr>
- {% for town in dashboard.rescue.surface_by_town %}<th>{{town.town__name}}</th>{% endfor %}
- </tr>
- <tr>
- {% for town in dashboard.rescue.surface_by_town %}<td>{{town.number}}</td>{% endfor%}
- </tr>
- </table>
- </div>
</div>
-
-/-->
</div>
{% endblock %}