From 72067746056969f2db9d141998649cab0ff23674 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Fri, 3 Feb 2017 20:22:25 +0100 Subject: Admin: Archaeological context records: modify display and label ordering for Unit and IdentificationType --- archaeological_context_records/admin.py | 16 +++++++++++++++- archaeological_context_records/models.py | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py index bd2579afb..55511a4d5 100644 --- a/archaeological_context_records/admin.py +++ b/archaeological_context_records/admin.py @@ -65,7 +65,21 @@ class RelationTypeAdmin(admin.ModelAdmin): admin.site.register(models.RelationType, RelationTypeAdmin) +class UnitAdmin(admin.ModelAdmin): + list_display = ['label', 'txt_idx', 'parent', 'available', 'order', 'comment'] + +admin.site.register(models.Unit, UnitAdmin) + + +class IdentificationTypeAdmin(admin.ModelAdmin): + list_display = ['label', 'txt_idx', 'available', 'order', 'comment'] + +admin.site.register(models.IdentificationType, IdentificationTypeAdmin) + + general_models = [models.DatingType, models.DatingQuality, - models.Unit, models.ActivityType, models.IdentificationType] + models.ActivityType] for model in general_models: admin.site.register(model, GeneralTypeAdmin) + + diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 75074c514..ad6c1a378 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -82,7 +82,7 @@ class Unit(GeneralType): class Meta: verbose_name = _(u"Unit Type") verbose_name_plural = _(u"Unit Types") - ordering = ('order',) + ordering = ('order', 'label') def __unicode__(self): return self.label -- cgit v1.2.3 From 127ce1a820558ba219138d32a41f13671fc99386 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Fri, 3 Feb 2017 20:29:45 +0100 Subject: Admin: Archaeological context records: modify display for RelationType --- archaeological_context_records/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py index 55511a4d5..353d75925 100644 --- a/archaeological_context_records/admin.py +++ b/archaeological_context_records/admin.py @@ -61,7 +61,7 @@ admin.site.register(models.RecordRelations, RecordRelationsAdmin) class RelationTypeAdmin(admin.ModelAdmin): list_display = ('label', 'txt_idx', 'tiny_label', 'available', - 'symmetrical', 'inverse_relation', 'comment') + 'symmetrical', 'inverse_relation', 'order', 'comment') admin.site.register(models.RelationType, RelationTypeAdmin) -- cgit v1.2.3 From e3aafbb55d746c2298a16347a32ecdc85ebe42ea Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Sat, 4 Feb 2017 13:12:15 +0100 Subject: Admin: Ishtar common: label ordering for Format --- ishtar_common/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 12f286c61..5bad7a63c 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2852,6 +2852,7 @@ class Format(GeneralType): class Meta: verbose_name = _(u"Format") verbose_name_plural = _(u"Formats") + ordering = ['label'] post_save.connect(post_save_cache, sender=Format) post_delete.connect(post_save_cache, sender=Format) -- cgit v1.2.3 From 6b641dc34045d0c97156effe33a64c4c6eb695f2 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 4 Feb 2017 12:15:57 +0100 Subject: Makefile: adapt fixtures --- Makefile.example | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile.example b/Makefile.example index 516daadc5..1acb9d10a 100644 --- a/Makefile.example +++ b/Makefile.example @@ -166,7 +166,7 @@ fixtures_auth: auth.group \ > '../fixtures/initial_data-auth-'$(default_data)'.json' -fixtures_common: fixtures_common_importers fixtures_common_towns fixtures_spatialrefsystem +fixtures_common: fixtures_common_importers fixtures_spatialrefsystem cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ ishtar_common.authortype \ ishtar_common.persontype \ @@ -223,10 +223,12 @@ fixtures_finds: cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ archaeological_finds.materialtype \ archaeological_finds.treatmenttype \ - archaeological_finds.ConservatoryState \ - archaeological_finds.PreservationType \ - archaeological_finds.ObjectType \ - archaeological_finds.IntegrityType \ + archaeological_finds.treatmentstate \ + archaeological_finds.conservatorystate \ + archaeological_finds.remarkabilitytype \ + archaeological_finds.preservationtype \ + archaeological_finds.objecttype \ + archaeological_finds.integritytype \ > '../archaeological_finds/fixtures/initial_data-'$(default_data)'.json' fixtures_warehouse: @@ -256,9 +258,11 @@ sdist: clean distribute_test: sdist twine upload -r pypitest dist/* + rm -rf ishtar.egg-info distribute_main: sdist twine upload -r pypi dist/* + rm -rf ishtar.egg-info deb: clean debuild -i -us -uc -b -- cgit v1.2.3 From c5237a01f8e411d7af0cde75d4dd4f4d6621c544 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 4 Feb 2017 13:50:04 +0100 Subject: Makefile: add format, title type and support type to common fixtures --- Makefile.example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.example b/Makefile.example index 1acb9d10a..a9aae44e8 100644 --- a/Makefile.example +++ b/Makefile.example @@ -174,6 +174,8 @@ fixtures_common: fixtures_common_importers fixtures_spatialrefsystem ishtar_common.sourcetype \ ishtar_common.operationtype \ ishtar_common.titletype \ + ishtar_common.supporttype \ + ishtar_common.format \ > '../ishtar_common/fixtures/initial_data-'$(default_data)'.json' fixtures_common_importers: -- cgit v1.2.3 From b13112672b25b18396abb809939cc4084f9e1657 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 4 Feb 2017 14:05:56 +0100 Subject: Fixtures: update all fixtures from reference --- .../fixtures/initial_data-fr.json | 320 +- archaeological_files/fixtures/initial_data-fr.json | 2 +- archaeological_finds/fixtures/initial_data-fr.json | 347 +- .../fixtures/initial_data-fr.json | 133 +- .../fixtures/initial_data-fr.json | 60 +- ishtar_common/fixtures/initial_data-fr.json | 755 +-- ishtar_common/fixtures/initial_importtypes-fr.json | 5841 +++++--------------- 7 files changed, 2065 insertions(+), 5393 deletions(-) diff --git a/archaeological_context_records/fixtures/initial_data-fr.json b/archaeological_context_records/fixtures/initial_data-fr.json index 019940ea3..22b96aa41 100644 --- a/archaeological_context_records/fixtures/initial_data-fr.json +++ b/archaeological_context_records/fixtures/initial_data-fr.json @@ -34,7 +34,7 @@ "pk": 2, "model": "archaeological_context_records.activitytype", "fields": { - "comment": "Unit\u00e9 \u00e9labor\u00e9e par l'homme, comme une mur ou un sol am\u00e9nag\u00e9 par exemple.", + "comment": "Unit\u00e9 \u00e9labor\u00e9e par l'homme, comme un mur ou un sol am\u00e9nag\u00e9 par exemple.", "available": true, "txt_idx": "construction", "order": 1100, @@ -42,25 +42,25 @@ } }, { - "pk": 3, + "pk": 4, "model": "archaeological_context_records.activitytype", "fields": { - "comment": "Unit\u00e9 r\u00e9sultant de l'arr\u00eat d'anthropisation.", + "comment": "Unit\u00e9 li\u00e9e \u00e0 l'anthropisation elle-m\u00eame.", "available": true, - "txt_idx": "desertion", - "order": 1200, - "label": "Abandon" + "txt_idx": "occupation", + "order": 1300, + "label": "Occupation" } }, { - "pk": 4, + "pk": 3, "model": "archaeological_context_records.activitytype", "fields": { - "comment": "Unit\u00e9 li\u00e9e \u00e0 l'anthropisation elle-m\u00eame.", + "comment": "Unit\u00e9 r\u00e9sultant de l'arr\u00eat d'anthropisation.", "available": true, - "txt_idx": "occupation", - "order": 1300, - "label": "Occupation" + "txt_idx": "desertion", + "order": 1500, + "label": "Abandon" } }, { @@ -70,223 +70,199 @@ "comment": "", "available": true, "txt_idx": "unknown", - "order": 100, + "order": 10, "label": "Ind\u00e9termin\u00e9" } }, { - "pk": 1, + "pk": 12, "model": "archaeological_context_records.identificationtype", "fields": { - "comment": "Niveau cultiv\u00e9 ou non, actuel.", + "comment": "", "available": true, - "txt_idx": "soil", + "txt_idx": "windthrow", "order": 1000, - "label": "Terre v\u00e9g\u00e9tale" + "label": "Chablis" } }, { - "pk": 2, + "pk": 11, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "masonry", - "order": 1100, - "label": "Ma\u00e7onnerie" + "txt_idx": "colluvial_unit", + "order": 1000, + "label": "Colluvions" } }, { - "pk": 3, + "pk": 13, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "wall", - "order": 1200, - "label": "Mur" + "txt_idx": "filling", + "order": 1000, + "label": "Comblement" } }, { - "pk": 4, + "pk": 10, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "occupation_level", - "order": 1300, - "label": "Niveau d'occupation" + "txt_idx": "digging", + "order": 1000, + "label": "Creusement" } }, { - "pk": 5, + "pk": 2, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "desertion_level", - "order": 1400, - "label": "Niveau d'abandon" + "txt_idx": "masonry", + "order": 1000, + "label": "Ma\u00e7onnerie" } }, { - "pk": 6, + "pk": 3, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "geological_level", - "order": 1400, - "label": "Niveau g\u00e9ologique" + "txt_idx": "wall", + "order": 1000, + "label": "Mur" } }, { - "pk": 7, + "pk": 5, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "embankment", - "order": 1500, - "label": "Remblai" + "txt_idx": "desertion_level", + "order": 1000, + "label": "Niveau d'abandon" } }, { - "pk": 8, + "pk": 4, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "archaeological_soil", - "order": 1600, - "label": "Sol arch\u00e9ologique" + "txt_idx": "occupation_level", + "order": 1000, + "label": "Niveau d'occupation" } }, { - "pk": 9, + "pk": 6, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "foundation_level", - "order": 1700, - "label": "Radier" + "txt_idx": "geological_level", + "order": 1000, + "label": "Niveau g\u00e9ologique" } }, { - "pk": 11, + "pk": 9, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "colluvial_unit", - "order": 1800, - "label": "Colluvions" + "txt_idx": "foundation_level", + "order": 1000, + "label": "Radier" } }, { - "pk": 10, + "pk": 7, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "digging", - "order": 1800, - "label": "Creusement" + "txt_idx": "embankment", + "order": 1000, + "label": "Remblai" } }, { - "pk": 12, + "pk": 8, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "windthrow", - "order": 1900, - "label": "Chablis" + "txt_idx": "archaeological_soil", + "order": 1000, + "label": "Sol arch\u00e9ologique" } }, { - "pk": 13, + "pk": 1, "model": "archaeological_context_records.identificationtype", "fields": { - "comment": "", + "comment": "Niveau cultiv\u00e9 ou non, actuel.", "available": true, - "txt_idx": "filling", - "order": 2000, - "label": "Comblement" + "txt_idx": "soil", + "order": 1000, + "label": "Terre v\u00e9g\u00e9tale" } }, { - "pk": 13, + "pk": 7, "model": "archaeological_context_records.unit", "fields": { "comment": "", "available": true, "parent": null, - "label": "Secteur", - "order": 1, - "txt_idx": "sector" - } - }, - { - "pk": 12, - "model": "archaeological_context_records.unit", - "fields": { - "comment": "Un truc impie", - "available": true, - "parent": null, - "label": "Structure", - "order": 1, - "txt_idx": "structure" + "label": "Alt\u00e9ration", + "order": 100, + "txt_idx": "alteration" } }, { - "pk": 9, + "pk": 10, "model": "archaeological_context_records.unit", "fields": { - "comment": "Unit\u00e9 g\u00e9n\u00e9rale (d'ordinaire virtuelle) pouvant regrouper du mobilier trouver en dehors d'un contexte spatialis\u00e9 : mobilier trouver lors d'un d\u00e9capage, sous une semelle d'un fouilleur, dans les d\u00e9blais, etc.", + "comment": "Unit\u00e9 repr\u00e9sentant une partie d'un niveau d\u00e9coup\u00e9 en carr\u00e9s r\u00e9f\u00e9renc\u00e9s.", "available": true, "parent": null, - "label": "Hors contexte", - "order": 1, - "txt_idx": "not_in_context" + "label": "Carr\u00e9", + "order": 100, + "txt_idx": "square" } }, { - "pk": 14, + "pk": 4, "model": "archaeological_context_records.unit", "fields": { "comment": "", "available": true, "parent": null, - "label": "Zone", - "order": 2, - "txt_idx": "zone" - } - }, - { - "pk": 10, - "model": "archaeological_context_records.unit", - "fields": { - "comment": "Unit\u00e9 repr\u00e9sentant une partie d'un niveau d\u00e9coup\u00e9 en carr\u00e9s r\u00e9f\u00e9renc\u00e9s.", - "available": true, - "parent": null, - "label": "Carr\u00e9", - "order": 10, - "txt_idx": "square" + "label": "Couche", + "order": 100, + "txt_idx": "layer" } }, { - "pk": 1, + "pk": 5, "model": "archaeological_context_records.unit", "fields": { - "comment": "Cette unit\u00e9 n'a pas de volume", + "comment": "", "available": true, - "parent": null, - "label": "N\u00e9gative", + "parent": 4, + "label": "Couche construite", "order": 100, - "txt_idx": "negative" + "txt_idx": "builded_layer" } }, { @@ -297,7 +273,7 @@ "available": true, "parent": 1, "label": "Creusement", - "order": 110, + "order": 100, "txt_idx": "digging" } }, @@ -309,32 +285,44 @@ "available": true, "parent": 1, "label": "D\u00e9rasement", - "order": 120, + "order": 100, "txt_idx": "partial_destruction" } }, { - "pk": 4, + "pk": 9, "model": "archaeological_context_records.unit", "fields": { - "comment": "", + "comment": "Unit\u00e9 g\u00e9n\u00e9rale (d'ordinaire virtuelle) pouvant regrouper du mobilier trouv\u00e9 en dehors d'un contexte spatialis\u00e9 : mobilier trouv\u00e9 lors d'un d\u00e9capage, sous une semelle d'un fouilleur, dans les d\u00e9blais, etc.", "available": true, "parent": null, - "label": "Couche", - "order": 200, - "txt_idx": "layer" + "label": "Hors contexte", + "order": 100, + "txt_idx": "not_in_context" } }, { - "pk": 5, + "pk": 8, "model": "archaeological_context_records.unit", "fields": { "comment": "", "available": true, - "parent": 4, - "label": "Couche construite", - "order": 210, - "txt_idx": "builded_layer" + "parent": 7, + "label": "Impact thermique", + "order": 100, + "txt_idx": "thermal_impact" + } + }, + { + "pk": 1, + "model": "archaeological_context_records.unit", + "fields": { + "comment": "Cette unit\u00e9 n'a pas de volume.", + "available": true, + "parent": null, + "label": "N\u00e9gative", + "order": 100, + "txt_idx": "negative" } }, { @@ -345,32 +333,32 @@ "available": true, "parent": 4, "label": "Remblai", - "order": 220, + "order": 100, "txt_idx": "embankment" } }, { - "pk": 7, + "pk": 13, "model": "archaeological_context_records.unit", "fields": { "comment": "", "available": true, "parent": null, - "label": "Alt\u00e9ration", - "order": 300, - "txt_idx": "alteration" + "label": "Secteur", + "order": 100, + "txt_idx": "sector" } }, { - "pk": 8, + "pk": 12, "model": "archaeological_context_records.unit", "fields": { "comment": "", "available": true, - "parent": 7, - "label": "Impact thermique", - "order": 310, - "txt_idx": "thermal_impact" + "parent": null, + "label": "Structure", + "order": 100, + "txt_idx": "structure" } }, { @@ -381,10 +369,22 @@ "available": true, "parent": null, "label": "Tranch\u00e9e", - "order": 500, + "order": 100, "txt_idx": "trench" } }, + { + "pk": 14, + "model": "archaeological_context_records.unit", + "fields": { + "comment": "", + "available": true, + "parent": null, + "label": "Zone", + "order": 100, + "txt_idx": "zone" + } + }, { "pk": 1, "model": "archaeological_context_records.datingtype", @@ -409,9 +409,9 @@ "pk": 2, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "Une UE en rempli une autre (qui doit \u00eatre vraisemblablement une US de creusement)", + "comment": "UE en remplissant une autre (qui doit \u00eatre vraisemblablement une US de creusement)", "available": true, - "tiny_label": null, + "tiny_label": "", "label": "Comble", "symmetrical": false, "inverse_relation": 10, @@ -419,6 +419,20 @@ "txt_idx": "filling" } }, + { + "pk": 1, + "model": "archaeological_context_records.relationtype", + "fields": { + "comment": "UE en coupant une autre", + "available": true, + "tiny_label": "", + "label": "Coupe", + "symmetrical": false, + "inverse_relation": 8, + "order": 1, + "txt_idx": "cutting" + } + }, { "pk": 8, "model": "archaeological_context_records.relationtype", @@ -451,9 +465,9 @@ "pk": 3, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "UE est situ\u00e9e au-dessus d'une autre", + "comment": "UE situ\u00e9e au-dessus d'une autre", "available": true, - "tiny_label": null, + "tiny_label": "", "label": "Est au-dessus de", "symmetrical": false, "inverse_relation": 7, @@ -465,10 +479,10 @@ "pk": 10, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "", + "comment": "UE remplie par une autre", "available": true, - "tiny_label": null, - "label": "Est-combl\u00e9 par", + "tiny_label": "", + "label": "Est combl\u00e9 par", "symmetrical": false, "inverse_relation": 2, "order": 1, @@ -479,9 +493,9 @@ "pk": 7, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "UE est situ\u00e9e en-dessous d'une autre", + "comment": "UE situ\u00e9e en-dessous d'une autre", "available": true, - "tiny_label": null, + "tiny_label": "", "label": "Est en-dessous de", "symmetrical": false, "inverse_relation": 3, @@ -493,9 +507,9 @@ "pk": 6, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "Cette unit\u00e9 d'enregistrement fait partie d'une autre", + "comment": "UE faisant partie d'une autre", "available": true, - "tiny_label": null, + "tiny_label": "", "label": "Est inclus dans", "symmetrical": false, "inverse_relation": 5, @@ -507,9 +521,9 @@ "pk": 5, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "Cette Unit\u00e9 d\u2019enregistrement en inclut (regroupe) d'autres (ex: tranch\u00e9e / structures ou entre structure / US, etc.)", + "comment": "UE en incluant (regroupant) d'autres (ex: tranch\u00e9e / structures ou entre structure / US, etc.)", "available": true, - "tiny_label": null, + "tiny_label": "", "label": "Inclut", "symmetrical": false, "inverse_relation": 6, @@ -517,27 +531,13 @@ "txt_idx": "include" } }, - { - "pk": 1, - "model": "archaeological_context_records.relationtype", - "fields": { - "comment": "UE recoupant une autre", - "available": true, - "tiny_label": null, - "label": "Recoupe", - "symmetrical": false, - "inverse_relation": 8, - "order": 1, - "txt_idx": "cutting" - } - }, { "pk": 4, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "A pr\u00e9ciser ", + "comment": "\u00c0 pr\u00e9ciser ", "available": true, - "tiny_label": null, + "tiny_label": "", "label": "Relation indirecte", "symmetrical": true, "inverse_relation": null, @@ -545,4 +545,4 @@ "txt_idx": "indirect_relation" } } -] +] \ No newline at end of file diff --git a/archaeological_files/fixtures/initial_data-fr.json b/archaeological_files/fixtures/initial_data-fr.json index 2d45ba017..fff42cfb7 100644 --- a/archaeological_files/fixtures/initial_data-fr.json +++ b/archaeological_files/fixtures/initial_data-fr.json @@ -62,7 +62,7 @@ "available": true, "txt_idx": "impact_study", "delay": 60, - "label": "Etude d'impact (EI)" + "label": "\u00c9tude d'impact (EI)" } }, { diff --git a/archaeological_finds/fixtures/initial_data-fr.json b/archaeological_finds/fixtures/initial_data-fr.json index 334c1113e..341b351f8 100644 --- a/archaeological_finds/fixtures/initial_data-fr.json +++ b/archaeological_finds/fixtures/initial_data-fr.json @@ -1,4 +1,17 @@ [ + { + "pk": 56, + "model": "archaeological_finds.materialtype", + "fields": { + "comment": "", + "available": true, + "code": "M.MT", + "parent": 27, + "label": "Alliage cuivreux", + "recommendation": "", + "txt_idx": "copper-alloy" + } + }, { "pk": 16, "model": "archaeological_finds.materialtype", @@ -8,7 +21,7 @@ "code": "M.AT", "parent": null, "label": "Autre", - "recommendation": "gaffe ?", + "recommendation": "", "txt_idx": "other" } }, @@ -42,12 +55,12 @@ "pk": 45, "model": "archaeological_finds.materialtype", "fields": { - "comment": "sqqddgsdg", + "comment": "", "available": true, "code": "BRZ", - "parent": 27, + "parent": 56, "label": "Bronze", - "recommendation": "sdgsqfsq", + "recommendation": "", "txt_idx": "brz" } }, @@ -60,7 +73,7 @@ "code": "M.TC", "parent": 13, "label": "C\u00e9ramique", - "recommendation": "ras", + "recommendation": "", "txt_idx": "ceramic" } }, @@ -112,7 +125,7 @@ "code": "M.EP", "parent": 32, "label": "Enduit peint", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "painted_plaster" } }, @@ -138,7 +151,7 @@ "code": "M.OS", "parent": 39, "label": "Faune", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "animal_bone" } }, @@ -203,7 +216,7 @@ "code": "M.ID", "parent": null, "label": "Ind\u00e9termin\u00e9", - "recommendation": "ras", + "recommendation": "", "txt_idx": "unknown" } }, @@ -216,7 +229,7 @@ "code": "M.LP", "parent": 11, "label": "Lapidaire", - "recommendation": "ras", + "recommendation": "", "txt_idx": "lapidary" } }, @@ -229,7 +242,7 @@ "code": "M.LT", "parent": 11, "label": "Lithique", - "recommendation": "ras", + "recommendation": "", "txt_idx": "lithic" } }, @@ -242,7 +255,7 @@ "code": "M.AT", "parent": 16, "label": "Mat\u00e9riaux de construction autre", - "recommendation": "ras ou ???", + "recommendation": "", "txt_idx": "constr_material" } }, @@ -255,7 +268,7 @@ "code": "M.MT", "parent": null, "label": "M\u00e9tal", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "metal" } }, @@ -268,7 +281,7 @@ "code": "M.MT", "parent": 14, "label": "M\u00e9tal ferreux", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "iron_metal" } }, @@ -281,7 +294,7 @@ "code": "M.MT", "parent": 14, "label": "M\u00e9tal non ferreux", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "not_iron_metal" } }, @@ -294,7 +307,7 @@ "code": "M.MI", "parent": null, "label": "Min\u00e9ral", - "recommendation": "ras", + "recommendation": "", "txt_idx": "mineral" } }, @@ -307,7 +320,7 @@ "code": "M.MT", "parent": 14, "label": "Mon\u00e9taire", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "monetary" } }, @@ -320,7 +333,7 @@ "code": "M.?", "parent": null, "label": "Non \u00e9tudi\u00e9", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "not_studied" } }, @@ -333,7 +346,7 @@ "code": "M.OG", "parent": null, "label": "Organique", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "organic" } }, @@ -346,7 +359,7 @@ "code": "M.OG", "parent": 12, "label": "Organique non travaill\u00e9", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "raw_organic" } }, @@ -359,7 +372,7 @@ "code": "M.OG", "parent": 12, "label": "Organique travaill\u00e9", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "organicwork" } }, @@ -372,7 +385,7 @@ "code": "M.OS", "parent": 39, "label": "Os humain", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "human_bone" } }, @@ -384,8 +397,8 @@ "available": true, "code": "M.OS", "parent": 23, - "label": "Os (non travaill\u00e9)", - "recommendation": "gaffe", + "label": "Os non travaill\u00e9", + "recommendation": "", "txt_idx": "unworked_bone" } }, @@ -398,7 +411,7 @@ "code": "M.OS", "parent": 22, "label": "Os travaill\u00e9", - "recommendation": "gaffe !", + "recommendation": "", "txt_idx": "bonework" } }, @@ -406,12 +419,12 @@ "pk": 21, "model": "archaeological_finds.materialtype", "fields": { - "comment": "Tout ce qui est ni de l'industrie lithique, ni de la pierre de construction : meule, vaisselle, objet manufactur\u00e9 \u2026", + "comment": "Tout ce qui n'est ni de l'industrie lithique, ni de la pierre de construction : meule, vaisselle, objet manufactur\u00e9 \u2026", "available": true, "code": "M.MI", "parent": 11, "label": "Pierre autre", - "recommendation": "ras", + "recommendation": "", "txt_idx": "other_stone" } }, @@ -436,8 +449,8 @@ "available": true, "code": "P.NT", "parent": 16, - "label": "Pr\u00e9l\u00e8vement trait\u00e9 et \u00e9tudi\u00e9", - "recommendation": "ras ?? + d\u00e9lai de traitement ?", + "label": "Pr\u00e9l\u00e8vement non trait\u00e9", + "recommendation": "", "txt_idx": "sampling_not_processed" } }, @@ -450,7 +463,7 @@ "code": "P.TE", "parent": 16, "label": "Pr\u00e9l\u00e8vement trait\u00e9 et \u00e9tudi\u00e9", - "recommendation": "ras ?", + "recommendation": "", "txt_idx": "sampling_processed_studied" } }, @@ -463,7 +476,7 @@ "code": "P.NE", "parent": 16, "label": "Pr\u00e9l\u00e8vement trait\u00e9 non \u00e9tudi\u00e9", - "recommendation": "ras ??", + "recommendation": "", "txt_idx": "sampling_processed_not_studied" } }, @@ -476,7 +489,7 @@ "code": "M.AT", "parent": 16, "label": "Synth\u00e9tique", - "recommendation": "???", + "recommendation": "", "txt_idx": "synthetic" } }, @@ -489,7 +502,7 @@ "code": "M.TC", "parent": null, "label": "Terre cuite", - "recommendation": "ras", + "recommendation": "", "txt_idx": "earthenware" } }, @@ -502,7 +515,7 @@ "code": "M.TC", "parent": 13, "label": "Terre cuite architecturale", - "recommendation": "ras", + "recommendation": "", "txt_idx": "architect_earthenwork" } }, @@ -515,7 +528,7 @@ "code": "M.TC", "parent": 13, "label": "Terre cuite autre", - "recommendation": "ras ou pas ???", + "recommendation": "", "txt_idx": "other_earthenwork" } }, @@ -528,7 +541,7 @@ "code": "M.VR", "parent": null, "label": "Verre", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "glass" } }, @@ -541,7 +554,7 @@ "code": "M.VR", "parent": 15, "label": "Verre autre", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "glass_other" } }, @@ -554,7 +567,7 @@ "code": "M.VR", "parent": 15, "label": "Verre construction", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "glass_constr" } }, @@ -564,23 +577,57 @@ "fields": { "comment": "Le fait de mettre du mobilier dans un contenant. Que cela soit le conditionnement initial ou un re-conditionnement. ", "available": true, + "downstream_is_many": false, + "parent": null, "virtual": false, "label": "Conditionnement", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "packaging" } }, + { + "pk": 16, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "", + "available": true, + "downstream_is_many": false, + "parent": null, + "virtual": false, + "label": "Conservation-restauration", + "upstream_is_many": false, + "order": 10, + "txt_idx": "conservation" + } + }, + { + "pk": 14, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "", + "available": true, + "downstream_is_many": false, + "parent": null, + "virtual": false, + "label": "Consultation sur place", + "upstream_is_many": false, + "order": 10, + "txt_idx": "local_consultation" + } + }, { "pk": 4, "model": "archaeological_finds.treatmenttype", "fields": { "comment": "D\u00e9placement de mobilier, entre deux d\u00e9p\u00f4ts : le mobilier ne peut pas \u00eatre stock\u00e9 ailleurs que dans un lieu consid\u00e9r\u00e9 comme un d\u00e9p\u00f4t.", "available": true, + "downstream_is_many": false, + "parent": null, "virtual": false, "label": "D\u00e9placement", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "moving" } }, @@ -590,10 +637,12 @@ "fields": { "comment": "Processus qui permet d'\u00e9liminer le sel qui impr\u00e8gne un objet arch\u00e9ologique ou un lot d'objets.", "available": true, + "downstream_is_many": false, + "parent": null, "virtual": false, "label": "D\u00e9salinisation", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "desalinisation" } }, @@ -603,10 +652,12 @@ "fields": { "comment": "Division d'un lot de mobilier en plusieurs lots.", "available": true, + "downstream_is_many": true, + "parent": null, "virtual": false, "label": "Division", "upstream_is_many": false, - "downstream_is_many": true, + "order": 10, "txt_idx": "split" } }, @@ -616,10 +667,12 @@ "fields": { "comment": "R\u00e9duction des oxydes d\u00e9velopp\u00e9s sur/dans un objet arch\u00e9ologique par l'usage de courant \u00e9lectrique.", "available": true, + "downstream_is_many": false, + "parent": null, "virtual": false, "label": "\u00c9lectrolyse", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "electrolysis" } }, @@ -629,10 +682,12 @@ "fields": { "comment": "R\u00e9union de plusieurs objets ou lots mobiliers en un seul. Ce type de traitement peut impliquer ou non un reconditionnement.\r\n\r\nExemple : Remontage d'une c\u00e9ramique \u00e0 partir de tessons d\u00e9j\u00e0 pr\u00e9sents dans un contenant (pas de reconditionnement), regroupement d'une partie de la faune (os) d'une op\u00e9ration et cr\u00e9ation d'une nouvelle caisse dans ce but (reconditionnement \u00e0 faire).", "available": true, + "downstream_is_many": false, + "parent": null, "virtual": false, "label": "Groupement", "upstream_is_many": true, - "downstream_is_many": false, + "order": 10, "txt_idx": "physical_grouping" } }, @@ -642,23 +697,72 @@ "fields": { "comment": "Regroupement d'un ensemble de mobilier. Exemple : ensemble des outils provenant d'une fouille, mobilier datant d'un site, tessonier virtuel, etc.", "available": true, + "downstream_is_many": false, + "parent": null, "virtual": true, "label": "Groupement virtuel", "upstream_is_many": true, - "downstream_is_many": false, + "order": 10, "txt_idx": "virtual_group" } }, + { + "pk": 13, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "Action de nettoyer le mobilier, d'ordinaire \u00e0 l'eau", + "available": true, + "downstream_is_many": false, + "parent": null, + "virtual": false, + "label": "Lavage", + "upstream_is_many": false, + "order": 10, + "txt_idx": "washing" + } + }, + { + "pk": 15, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "", + "available": true, + "downstream_is_many": false, + "parent": null, + "virtual": false, + "label": "Marquage", + "upstream_is_many": false, + "order": 10, + "txt_idx": "marking" + } + }, + { + "pk": 18, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "", + "available": true, + "downstream_is_many": false, + "parent": 17, + "virtual": false, + "label": "Photographie", + "upstream_is_many": false, + "order": 10, + "txt_idx": "photo" + } + }, { "pk": 9, "model": "archaeological_finds.treatmenttype", "fields": { "comment": "Photographie produisant un film (positif ou n\u00e9gatif).", "available": true, + "downstream_is_many": false, + "parent": 18, "virtual": false, "label": "Photographie argentique", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "regular_photography" } }, @@ -668,23 +772,57 @@ "fields": { "comment": "Prise de vue \u00e0 l'aide d'un appareil photo num\u00e9rique.", "available": true, + "downstream_is_many": false, + "parent": 18, "virtual": false, "label": "Photographie num\u00e9rique", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "digital_photography" } }, + { + "pk": 17, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "", + "available": true, + "downstream_is_many": false, + "parent": null, + "virtual": false, + "label": "Prises de vue", + "upstream_is_many": false, + "order": 10, + "txt_idx": "shooting" + } + }, + { + "pk": 19, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "", + "available": true, + "downstream_is_many": false, + "parent": 17, + "virtual": false, + "label": "Radiographie", + "upstream_is_many": false, + "order": 10, + "txt_idx": "radioX" + } + }, { "pk": 2, "model": "archaeological_finds.treatmenttype", "fields": { "comment": "Radiographie (rayon X) qui produit un ou des films radio.", "available": true, + "downstream_is_many": false, + "parent": 19, "virtual": false, "label": "Radiographie argentique", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "regular_x_ray" } }, @@ -694,18 +832,95 @@ "fields": { "comment": "Radiographie (rayon X) qui produit un ou des fichiers num\u00e9riques.", "available": true, + "downstream_is_many": false, + "parent": 19, "virtual": false, "label": "Radiographie num\u00e9rique", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "digital_x_ray" } }, + { + "pk": 12, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "Regroupement d\u2019\u00e9l\u00e9ments afin d'en remonter un. Ceci traduit le remontage physique des \u00e9l\u00e9ments. Ils constituent dor\u00e9navant un seul objet issu du remontage de plusieurs.", + "available": true, + "downstream_is_many": false, + "parent": null, + "virtual": false, + "label": "Remontage", + "upstream_is_many": true, + "order": 10, + "txt_idx": "reassembly" + } + }, + { + "pk": 6, + "model": "archaeological_finds.treatmentstate", + "fields": { + "comment": "", + "available": true, + "txt_idx": "cancelled", + "label": "Abandonn\u00e9" + } + }, + { + "pk": 3, + "model": "archaeological_finds.treatmentstate", + "fields": { + "comment": "", + "available": true, + "txt_idx": "completed", + "label": "Achev\u00e9" + } + }, + { + "pk": 5, + "model": "archaeological_finds.treatmentstate", + "fields": { + "comment": "", + "available": true, + "txt_idx": "to_be_confirmed", + "label": "\u00c0 confirmer" + } + }, + { + "pk": 2, + "model": "archaeological_finds.treatmentstate", + "fields": { + "comment": "", + "available": true, + "txt_idx": "In_progress", + "label": "En cours" + } + }, + { + "pk": 4, + "model": "archaeological_finds.treatmentstate", + "fields": { + "comment": "", + "available": true, + "txt_idx": "unknown", + "label": "Inconnu" + } + }, + { + "pk": 1, + "model": "archaeological_finds.treatmentstate", + "fields": { + "comment": "", + "available": true, + "txt_idx": "planned", + "label": "Pr\u00e9vu" + } + }, { "pk": 4, "model": "archaeological_finds.conservatorystate", "fields": { - "comment": "l\u2019\u00e9tat de l\u2019objet n\u00e9cessite un traitement pr\u00e9ventif et/ou curatif.", + "comment": "L\u2019\u00e9tat de l\u2019objet n\u00e9cessite un traitement pr\u00e9ventif et/ou curatif.", "available": true, "txt_idx": "critical", "parent": null, @@ -716,7 +931,7 @@ "pk": 1, "model": "archaeological_finds.conservatorystate", "fields": { - "comment": "\u00c9tat \u00e0 d\u00e9termin\u00e9", + "comment": "L\u2019\u00e9tat de l\u2019objet est \u00e0 d\u00e9terminer.", "available": true, "txt_idx": "unknown", "parent": null, @@ -727,7 +942,7 @@ "pk": 3, "model": "archaeological_finds.conservatorystate", "fields": { - "comment": "l\u2019\u00e9tat de l\u2019objet n\u00e9cessite un traitement pr\u00e9ventif.", + "comment": "L\u2019\u00e9tat de l\u2019objet n\u00e9cessite un traitement pr\u00e9ventif.", "available": true, "txt_idx": "unstable", "parent": null, @@ -738,13 +953,33 @@ "pk": 2, "model": "archaeological_finds.conservatorystate", "fields": { - "comment": "l\u2019\u00e9tat de l\u2019objet est stable.", + "comment": "L\u2019\u00e9tat de l\u2019objet est stable.", "available": true, "txt_idx": "stable", "parent": null, "label": "Stable" } }, + { + "pk": 1, + "model": "archaeological_finds.remarkabilitytype", + "fields": { + "comment": "", + "available": true, + "txt_idx": "museable", + "label": "Mus\u00e9able" + } + }, + { + "pk": 5, + "model": "archaeological_finds.preservationtype", + "fields": { + "comment": "", + "available": true, + "txt_idx": "to_wash", + "label": "\u00c0 laver" + } + }, { "pk": 2, "model": "archaeological_finds.preservationtype", @@ -5849,11 +6084,11 @@ "pk": 470, "model": "archaeological_finds.objecttype", "fields": { - "comment": null, + "comment": "", "available": true, - "txt_idx": "plaque-decorative-dharnachement", + "txt_idx": "plaque-decorative-de-harnachement", "parent": null, - "label": "plaque d\u00e9corative d'harnachement" + "label": "plaque d\u00e9corative de harnachement" } }, { @@ -7290,7 +7525,7 @@ "pk": 5, "model": "archaeological_finds.integritytype", "fields": { - "comment": "N'est plus pr\u00e9sent: perdu ?", + "comment": "N'est plus pr\u00e9sent : perdu ?", "available": true, "txt_idx": "not_there", "label": "Absent" diff --git a/archaeological_operations/fixtures/initial_data-fr.json b/archaeological_operations/fixtures/initial_data-fr.json index 9e9fd2bf7..9f514a097 100644 --- a/archaeological_operations/fixtures/initial_data-fr.json +++ b/archaeological_operations/fixtures/initial_data-fr.json @@ -13,6 +13,20 @@ "txt_idx": "a_receipt" } }, + { + "pk": 909, + "model": "archaeological_operations.acttype", + "fields": { + "comment": "", + "available": true, + "code": "AR_demande", + "intented_to": "TF", + "label": "AR : demande de pr\u00eat", + "indexed": false, + "associated_template": [], + "txt_idx": "loan_demand_receipt" + } + }, { "pk": 904, "model": "archaeological_operations.acttype", @@ -293,6 +307,20 @@ "txt_idx": "post_report_town" } }, + { + "pk": 910, + "model": "archaeological_operations.acttype", + "fields": { + "comment": "", + "available": true, + "code": "", + "intented_to": "T", + "label": "Constat d'\u00e9tat", + "indexed": false, + "associated_template": [], + "txt_idx": "observation_status" + } + }, { "pk": 899, "model": "archaeological_operations.acttype", @@ -708,7 +736,7 @@ "parent": 38, "end_date": 0, "order": 1, - "label": "Antiquit\u00e9 m\u00e9dit\u00e9rran\u00e9enne", + "label": "Antiquit\u00e9 m\u00e9diterran\u00e9enne", "start_date": 0, "txt_idx": "mediterranean_antiq" } @@ -890,7 +918,7 @@ "parent": null, "end_date": 1492, "order": 3000, - "label": "Moyen-\u00e2ge", + "label": "Moyen \u00c2ge", "start_date": 476, "txt_idx": "middle_age" } @@ -904,7 +932,7 @@ "parent": 27, "end_date": 1492, "order": 3700, - "label": "Bas moyen-\u00e2ge", + "label": "Bas Moyen \u00c2ge", "start_date": 1204, "txt_idx": "low_middle_age" } @@ -918,7 +946,7 @@ "parent": 27, "end_date": 1204, "order": 3800, - "label": "Moyen-\u00e2ge classique", + "label": "Moyen \u00c2ge classique", "start_date": 987, "txt_idx": "classic_middle_age" } @@ -932,7 +960,7 @@ "parent": 27, "end_date": 987, "order": 3900, - "label": "Haut moyen-\u00e2ge", + "label": "Haut Moyen \u00c2ge", "start_date": 476, "txt_idx": "high_middle_age" } @@ -960,7 +988,7 @@ "parent": 23, "end_date": 476, "order": 4700, - "label": "Bas-empire", + "label": "Bas Empire", "start_date": 192, "txt_idx": "low_empire" } @@ -974,7 +1002,7 @@ "parent": 23, "end_date": 192, "order": 4800, - "label": "Haut-empire", + "label": "Haut Empire", "start_date": -27, "txt_idx": "high-empire" } @@ -1942,22 +1970,22 @@ } }, { - "pk": 221, + "pk": 2, "model": "archaeological_operations.remaintype", "fields": { - "comment": null, + "comment": "", "available": true, - "txt_idx": "enclos", + "txt_idx": "enclosure", "label": "enclos" } }, { - "pk": 2, + "pk": 221, "model": "archaeological_operations.remaintype", "fields": { - "comment": "", + "comment": null, "available": true, - "txt_idx": "enclosure", + "txt_idx": "enclos", "label": "enclos" } }, @@ -2061,16 +2089,6 @@ "label": "fosse" } }, - { - "pk": 4, - "model": "archaeological_operations.remaintype", - "fields": { - "comment": "", - "available": true, - "txt_idx": "pit", - "label": "fosse" - } - }, { "pk": 6, "model": "archaeological_operations.remaintype", @@ -2101,16 +2119,6 @@ "label": "four" } }, - { - "pk": 8, - "model": "archaeological_operations.remaintype", - "fields": { - "comment": "", - "available": true, - "txt_idx": "burn", - "label": "foyer" - } - }, { "pk": 234, "model": "archaeological_operations.remaintype", @@ -2387,7 +2395,7 @@ "fields": { "comment": "", "available": true, - "txt_idx": "castral_thing", + "txt_idx": "motte-castrale", "label": "motte castrale" } }, @@ -2821,16 +2829,6 @@ "label": "trous de poteau (ensemble de)" } }, - { - "pk": 7, - "model": "archaeological_operations.remaintype", - "fields": { - "comment": "", - "available": true, - "txt_idx": "post_hole", - "label": "trous de poteaux" - } - }, { "pk": 304, "model": "archaeological_operations.remaintype", @@ -2921,8 +2919,8 @@ "fields": { "comment": "", "available": true, - "tiny_label": null, - "label": "en relation vague avec", + "tiny_label": "", + "label": "En relation diffuse avec", "symmetrical": true, "inverse_relation": null, "order": 1, @@ -2947,7 +2945,7 @@ "pk": 3, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Ce rapport n'a pas encore \u00e9t\u00e9 re\u00e7u", + "comment": "Ce rapport n'a pas encore \u00e9t\u00e9 re\u00e7u.", "available": true, "txt_idx": "not_received", "order": 1, @@ -2958,62 +2956,51 @@ "pk": 1, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Rapport re\u00e7u non d\u00e9pouill\u00e9", + "comment": "Le rapport a \u00e9t\u00e9 re\u00e7u mais n'est pas encore d\u00e9pouill\u00e9.", "available": true, "txt_idx": "received", "order": 2, "label": "Re\u00e7u et non d\u00e9pouill\u00e9" } }, - { - "pk": 2, - "model": "archaeological_operations.reportstate", - "fields": { - "comment": "", - "available": true, - "txt_idx": "no_report", - "order": 2, - "label": "Rapport inexistant" - } - }, { "pk": 7, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Plusieurs rapports re\u00e7us et non d\u00e9pouill\u00e9s", + "comment": "Plusieurs rapports ont \u00e9t\u00e9 re\u00e7us mais ne sont pas encore d\u00e9pouill\u00e9s.", "available": true, "txt_idx": "received__not_processed", "order": 3, - "label": "Re\u00e7us et NON d\u00e9pouill\u00e9s" + "label": "Re\u00e7us et non d\u00e9pouill\u00e9s" } }, { "pk": 10, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Les rapports ont \u00e9t\u00e9 re\u00e7us et d\u00e9pouill\u00e9s partiellement", + "comment": "Plusieurs rapports ont \u00e9t\u00e9 re\u00e7us mais ne sont que partiellement d\u00e9pouill\u00e9s.", "available": true, "txt_idx": "reports_received_partially_processed", "order": 4, - "label": "Re\u00e7us, un rapport d\u00e9pouill\u00e9, un autre non d\u00e9pouill\u00e9" + "label": "Re\u00e7us, partiellement d\u00e9pouill\u00e9s" } }, { - "pk": 4, + "pk": 9, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Il n'existe pas de rapport pour cette op\u00e9ration", + "comment": "Le rapport (unique) a \u00e9t\u00e9 re\u00e7u et d\u00e9pouill\u00e9.", "available": true, - "txt_idx": "no-report", + "txt_idx": "one_report_received_and_processed", "order": 4, - "label": "Rapport inexistant" + "label": "Re\u00e7u et d\u00e9pouill\u00e9" } }, { "pk": 8, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Tous les rapports ont \u00e9t\u00e9 re\u00e7us et n'ont pas \u00e9t\u00e9 encore d\u00e9pouill\u00e9s", + "comment": "Tous les rapports ont \u00e9t\u00e9 re\u00e7us mais n'ont pas \u00e9t\u00e9 encore d\u00e9pouill\u00e9s.", "available": true, "txt_idx": "received_and_processed", "order": 4, @@ -3021,14 +3008,14 @@ } }, { - "pk": 9, + "pk": 4, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Rapport unique re\u00e7u et d\u00e9pouill\u00e9", + "comment": "Il n'existe pas de rapport pour cette op\u00e9ration.", "available": true, - "txt_idx": "one_report_received_and_processed", + "txt_idx": "no-report", "order": 4, - "label": "Re\u00e7u et d\u00e9pouill\u00e9" + "label": "Rapport inexistant" } } -] +] \ No newline at end of file diff --git a/archaeological_warehouse/fixtures/initial_data-fr.json b/archaeological_warehouse/fixtures/initial_data-fr.json index 8a08bcb8c..a1b4f9254 100644 --- a/archaeological_warehouse/fixtures/initial_data-fr.json +++ b/archaeological_warehouse/fixtures/initial_data-fr.json @@ -1,4 +1,19 @@ [ + { + "pk": 8, + "model": "archaeological_warehouse.containertype", + "fields": { + "comment": "Bac norme Europe plein 20002 - 200X150X118", + "available": true, + "reference": "20002", + "label": "Bac norme Europe plein 20002", + "volume": 3.0, + "width": 150, + "length": 200, + "height": 118, + "txt_idx": "20002" + } + }, { "pk": 4, "model": "archaeological_warehouse.containertype", @@ -7,7 +22,7 @@ "available": true, "reference": "a pr\u00e9ciser", "label": "Caisse Alibert standard", - "volume": 0, + "volume": 0.0, "width": 0, "length": null, "height": 0, @@ -20,9 +35,9 @@ "fields": { "comment": "", "available": true, - "reference": "Curver UNIBOX 20 lL", + "reference": "Curver UNIBOX 20 L", "label": "Curver UNIBOX 20 L", - "volume": 25, + "volume": 25.0, "width": 350, "length": null, "height": 165, @@ -37,7 +52,7 @@ "available": true, "reference": "Curver UNIBOX 29 L", "label": "Curver UNIBOX 29 L", - "volume": 37, + "volume": 37.0, "width": 355, "length": null, "height": 245, @@ -52,18 +67,33 @@ "available": true, "reference": "Curver UNIBOX 48 L", "label": "Curver UNIBOX 48 L", - "volume": 63, + "volume": 63.0, "width": 432, "length": null, "height": 280, "txt_idx": "curver_unibox_48" } }, + { + "pk": 9, + "model": "archaeological_warehouse.containertype", + "fields": { + "comment": "Bo\u00eetes herm\u00e9tiques Miflex 8L", + "available": true, + "reference": "Miflex 8L", + "label": "Miflex 8L", + "volume": null, + "width": 21, + "length": 29, + "height": 15, + "txt_idx": "Miflex_8L" + } + }, { "pk": 6, "model": "archaeological_warehouse.warehousetype", "fields": { - "comment": "Pour le stockage de documents papier, rapports la plus part du temps.", + "comment": "Pour le stockage de documents papier, rapports la plupart du temps.", "available": true, "txt_idx": "library", "label": "Biblioth\u00e8que" @@ -73,7 +103,7 @@ "pk": 2, "model": "archaeological_warehouse.warehousetype", "fields": { - "comment": "Ce d\u00e9p\u00f4t est un centre de conservation et d'\u00e9tude. Il est d'ordinaire en convention avec l'\u00e9tat.", + "comment": "Ce d\u00e9p\u00f4t est un centre de conservation et d'\u00e9tude. Il est d'ordinaire en convention avec l'\u00c9tat.", "available": true, "txt_idx": "cce", "label": "CCE" @@ -93,7 +123,7 @@ "pk": 4, "model": "archaeological_warehouse.warehousetype", "fields": { - "comment": "Ce d\u00e9p\u00f4t poss\u00e8de une convention avec l'\u00e9tat pour conserver du mobilier qui est sous sa garde.", + "comment": "Ce d\u00e9p\u00f4t poss\u00e8de une convention avec l'\u00c9tat pour conserver du mobilier qui est sous sa garde.", "available": true, "txt_idx": "conventioned_warehouse", "label": "D\u00e9p\u00f4t conventionn\u00e9" @@ -103,10 +133,10 @@ "pk": 5, "model": "archaeological_warehouse.warehousetype", "fields": { - "comment": "Ce d\u00e9p\u00f4t est sous la responsabilit\u00e9 directe de l'Etat. Il peut en \u00eatre locataire ou propri\u00e9taire.", + "comment": "Ce d\u00e9p\u00f4t est sous la responsabilit\u00e9 directe de l'\u00c9tat. Il peut en \u00eatre locataire ou propri\u00e9taire.", "available": true, "txt_idx": "state_warehouse", - "label": "D\u00e9p\u00f4t de l'Etat" + "label": "D\u00e9p\u00f4t de l'\u00c9tat" } }, { @@ -128,5 +158,15 @@ "txt_idx": "restoration_laboratory", "label": "Laboratoire de restauration" } + }, + { + "pk": 8, + "model": "archaeological_warehouse.warehousetype", + "fields": { + "comment": "", + "available": true, + "txt_idx": "museum", + "label": "Mus\u00e9e" + } } ] \ No newline at end of file diff --git a/ishtar_common/fixtures/initial_data-fr.json b/ishtar_common/fixtures/initial_data-fr.json index 3c8aab20b..5f3205c74 100644 --- a/ishtar_common/fixtures/initial_data-fr.json +++ b/ishtar_common/fixtures/initial_data-fr.json @@ -1,22 +1,22 @@ [ { - "pk": 2, + "pk": 3, "model": "ishtar_common.authortype", "fields": { - "comment": "Il y a plusieurs \u00e0 une m\u00eame source. Au m\u00eame niveau de responsabilit\u00e9.", + "comment": "Cette personne est l'auteur principal de la source. Les autres auteurs sont des collaborateurs.", "available": true, - "txt_idx": "co_author", - "label": "Co-auteur " + "txt_idx": "main_author", + "label": "Auteur principal" } }, { - "pk": 3, + "pk": 2, "model": "ishtar_common.authortype", "fields": { - "comment": "Cette personne est l'auteur principal de la source. Les autres auteurs sont des collaborateurs.", + "comment": "Il y a plusieurs auteurs pour une m\u00eame source. Au m\u00eame niveau de responsabilit\u00e9.", "available": true, - "txt_idx": "main_author", - "label": "Auteur principal" + "txt_idx": "co_author", + "label": "Co-auteur " } }, { @@ -51,49 +51,6 @@ "label": "Administrateur" } }, - { - "pk": 3, - "model": "ishtar_common.persontype", - "fields": { - "comment": "Responsables de dossiers d'arch\u00e9ologie", - "available": true, - "txt_idx": "sra_agent", - "groups": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 13, - 14, - 15, - 16, - 17, - 18, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35 - ], - "label": "Agent SRA (prescripteur)" - } - }, { "pk": 6, "model": "ishtar_common.persontype", @@ -116,6 +73,28 @@ "label": "Chef de service instructeur" } }, + { + "pk": 9, + "model": "ishtar_common.persontype", + "fields": { + "comment": "Personnes pouvant intervenir sur les donn\u00e9es d'une op\u00e9ration sans en \u00eatre responsable", + "available": true, + "txt_idx": "collaborator", + "groups": [], + "label": "Collaborateur scientifique" + } + }, + { + "pk": 10, + "model": "ishtar_common.persontype", + "fields": { + "comment": "Personne demandant une action sur le mobilier (traitements)", + "available": true, + "txt_idx": "applicant", + "groups": [], + "label": "Demandeur" + } + }, { "pk": 5, "model": "ishtar_common.persontype", @@ -128,25 +107,53 @@ } }, { - "pk": 2, + "pk": 3, "model": "ishtar_common.persontype", "fields": { - "comment": "Article 13 D\u00e9cret 2004\r\n\r\nLe pr\u00e9fet de r\u00e9gion \u00e9dicte les prescriptions arch\u00e9ologiques, d\u00e9livre l'autorisation de fouille et d\u00e9signe le responsable scientifique de toute op\u00e9ration d'arch\u00e9ologie pr\u00e9ventive.\r\n\r\nLe responsable scientifique est l'interlocuteur du pr\u00e9fet de r\u00e9gion et le garant de la qualit\u00e9 scientifique de l'op\u00e9ration arch\u00e9ologique. A ce titre, il prend, dans le cadre de la mise en oeuvre du projet d'intervention de l'op\u00e9rateur, les d\u00e9cisions relatives \u00e0 la conduite scientifique de l'op\u00e9ration et \u00e0 l'\u00e9laboration du rapport dont il dirige la r\u00e9daction. Il peut \u00eatre diff\u00e9rent pour la r\u00e9alisation du diagnostic et pour la r\u00e9alisation de la fouille.", + "comment": "", "available": true, - "txt_idx": "head_scientist", + "txt_idx": "sra_agent", "groups": [ 30, + 31, 32, + 2, 1, 4, + 3, + 5, + 7, 6, + 8, + 9, + 10, + 13, + 14, 15, + 16, + 17, + 18, 21, + 22, + 23, + 24, 25, - 33, - 34, - 35 + 26, + 27, + 28, + 29 ], + "label": "Responsable de suivi scientifique" + } + }, + { + "pk": 2, + "model": "ishtar_common.persontype", + "fields": { + "comment": "Responsable d'op\u00e9ration arch\u00e9ologique", + "available": true, + "txt_idx": "head_scientist", + "groups": [], "label": "Responsable scientifique" } }, @@ -154,7 +161,7 @@ "pk": 4, "model": "ishtar_common.persontype", "fields": { - "comment": "Acc\u00e8s pour les secr\u00e9taires d'un SRA", + "comment": "", "available": true, "txt_idx": "secretarial_dept", "groups": [ @@ -178,14 +185,14 @@ 28, 29 ], - "label": "Secr\u00e9tariat SRA" + "label": "Secr\u00e9tariat" } - }, + }, { "pk": 5, "model": "ishtar_common.organizationtype", "fields": { - "comment": "Pour des entreprises, collectivit\u00e9s territoriales ou autres organisations", + "comment": "Pour des entreprises, collectivit\u00e9s territoriales ou autres organisations.", "available": true, "txt_idx": "general_contractor", "label": "Am\u00e9nageur" @@ -195,7 +202,7 @@ "pk": 7, "model": "ishtar_common.organizationtype", "fields": { - "comment": "Cette organisation et ses membres travaillent b\u00e9n\u00e9volement", + "comment": "Cette organisation et ses membres travaillent b\u00e9n\u00e9volement.", "available": true, "txt_idx": "volunteer", "label": "Association de b\u00e9n\u00e9voles" @@ -205,7 +212,7 @@ "pk": 6, "model": "ishtar_common.organizationtype", "fields": { - "comment": "Laboratoire de recherche du CNRS. Peut-\u00eatre une UMR et donc int\u00e9gr\u00e9 des chercheurs de l'universit\u00e9. n'inclus pas les \"laboratoires\" priv\u00e9s", + "comment": "Laboratoire de recherche public (CNRS). Peut \u00eatre une UMR et donc int\u00e9grer des chercheurs de l'universit\u00e9. ", "available": true, "txt_idx": "research_laboratory", "label": "Laboratoire de recherche" @@ -245,7 +252,7 @@ "pk": 2, "model": "ishtar_common.organizationtype", "fields": { - "comment": "D\u00e9cret 2004\r\n\r\n\"Op\u00e9rateurs\" les personnes qui r\u00e9alisent les op\u00e9rations arch\u00e9ologiques.", + "comment": "Selon le d\u00e9cret n\u00b0 2004-490 qui d\u00e9nomme \u00ab Op\u00e9rateurs \u00bb les personnes qui r\u00e9alisent les op\u00e9rations arch\u00e9ologiques.", "available": true, "txt_idx": "operator", "label": "Op\u00e9rateur d'arch\u00e9ologie pr\u00e9ventive" @@ -255,7 +262,7 @@ "pk": 8, "model": "ishtar_common.organizationtype", "fields": { - "comment": "les services qui d\u00e9livrent les autorisations requises pour les diff\u00e9rents projets (DDE, services\r\nurbanisme des collectivit\u00e9s, pr\u00e9fectures, Drire, etc.)", + "comment": "Les services qui d\u00e9livrent les autorisations requises pour les diff\u00e9rents projets (DDE, services\r\nurbanisme des collectivit\u00e9s, pr\u00e9fectures, Drire, etc.).", "available": true, "txt_idx": "planning_service", "label": "Service instructeur" @@ -275,70 +282,90 @@ "pk": 11, "model": "ishtar_common.organizationtype", "fields": { - "comment": "Par exmple une mairie portant un projet de fouille programm\u00e9e", + "comment": "Par exemple une mairie portant un projet de fouille programm\u00e9e.", "available": true, "txt_idx": "public_struct", "label": "Structure publique porteuse de projet programm\u00e9" } }, { - "pk": 11, + "pk": 18, "model": "ishtar_common.sourcetype", "fields": { - "comment": null, - "available": false, - "txt_idx": "RI", - "label": "Rapport interm\u00e9diaire" + "comment": "", + "available": true, + "txt_idx": "waterpaint", + "label": "Aquarelle" } }, { - "pk": 12, + "pk": 17, "model": "ishtar_common.sourcetype", "fields": { - "comment": null, - "available": false, - "txt_idx": "RF", - "label": "Rapport final" + "comment": "", + "available": true, + "txt_idx": "comics_book", + "label": "Bande dessin\u00e9e" } }, { - "pk": 3, + "pk": 14, "model": "ishtar_common.sourcetype", "fields": { - "comment": "Rapport li\u00e9 \u00e0 une autorisation de sondage.", + "comment": "", "available": true, - "txt_idx": "survey_report", - "label": "Rapport de sondage" + "txt_idx": "Mesh", + "label": "Mod\u00e8le 3D (mesh)" } }, { - "pk": 4, + "pk": 15, "model": "ishtar_common.sourcetype", "fields": { - "comment": "Rapport li\u00e9 \u00e0 un arr\u00eat\u00e9 de prescription de diagnostic arch\u00e9ologique.", + "comment": "", "available": true, - "txt_idx": "diagnostic_report", - "label": "Rapport de diagnostic" + "txt_idx": "point_cloud", + "label": "Mod\u00e8le 3D (nuage de points)" } }, { - "pk": 9, + "pk": 10, "model": "ishtar_common.sourcetype", "fields": { - "comment": "Rapport li\u00e9 \u00e0 une autorisation de prospection th\u00e9matique. Ce type de rapport passe d'ordinaire en CIRA.", + "comment": "", "available": true, - "txt_idx": "thematic_survey_report", - "label": "Rapport de prospection th\u00e9matique" + "txt_idx": "undefined", + "label": "Non pr\u00e9cis\u00e9" } }, { - "pk": 10, + "pk": 21, "model": "ishtar_common.sourcetype", "fields": { "comment": "", "available": true, - "txt_idx": "undefined", - "label": "Non pr\u00e9cis\u00e9" + "txt_idx": "photo_negative", + "label": "Photographie argentique (n\u00e9gatif)" + } + }, + { + "pk": 1, + "model": "ishtar_common.sourcetype", + "fields": { + "comment": "Tirage de photographie argentique.", + "available": true, + "txt_idx": "photo_print", + "label": "Photographie argentique (tirage)" + } + }, + { + "pk": 5, + "model": "ishtar_common.sourcetype", + "fields": { + "comment": "Source photographique num\u00e9rique.", + "available": true, + "txt_idx": "digital_photo", + "label": "Photographie num\u00e9rique" } }, { @@ -351,6 +378,46 @@ "label": "Radiographie argentique" } }, + { + "pk": 20, + "model": "ishtar_common.sourcetype", + "fields": { + "comment": "", + "available": true, + "txt_idx": "digital_x_ray", + "label": "Radiographie num\u00e9rique" + } + }, + { + "pk": 6, + "model": "ishtar_common.sourcetype", + "fields": { + "comment": "Rapport de laboratoire d'analyse.", + "available": true, + "txt_idx": "lab_report", + "label": "Rapport d'analyse" + } + }, + { + "pk": 4, + "model": "ishtar_common.sourcetype", + "fields": { + "comment": "Rapport li\u00e9 \u00e0 un arr\u00eat\u00e9 de prescription de diagnostic arch\u00e9ologique.", + "available": true, + "txt_idx": "diagnostic_report", + "label": "Rapport de diagnostic" + } + }, + { + "pk": 19, + "model": "ishtar_common.sourcetype", + "fields": { + "comment": "", + "available": true, + "txt_idx": "stange_report", + "label": "Rapport de nature ind\u00e9termin\u00e9e" + } + }, { "pk": 8, "model": "ishtar_common.sourcetype", @@ -362,33 +429,33 @@ } }, { - "pk": 7, + "pk": 9, "model": "ishtar_common.sourcetype", "fields": { - "comment": "Rapport li\u00e9 \u00e0 la restauration ou la stabilisation d'un lot de mobilier ou d'un objet isol\u00e9.", + "comment": "Rapport li\u00e9 \u00e0 une autorisation de prospection th\u00e9matique. Ce type de rapport passe d'ordinaire en CIRA.", "available": true, - "txt_idx": "restoration_report", - "label": "Rapport de restauration" + "txt_idx": "thematic_survey_report", + "label": "Rapport de prospection th\u00e9matique" } }, { - "pk": 6, + "pk": 7, "model": "ishtar_common.sourcetype", "fields": { - "comment": "Rapport de laboratoire d'analyse.", + "comment": "Rapport li\u00e9 \u00e0 la restauration ou la stabilisation d'un lot de mobilier ou d'un objet isol\u00e9.", "available": true, - "txt_idx": "lab_report", - "label": "Rapport d'analyse" + "txt_idx": "restoration_report", + "label": "Rapport de restauration" } }, { - "pk": 5, + "pk": 3, "model": "ishtar_common.sourcetype", "fields": { - "comment": "Source photographique num\u00e9rique.", + "comment": "Rapport li\u00e9 \u00e0 une autorisation de sondage.", "available": true, - "txt_idx": "digital_photo", - "label": "Photographie num\u00e9rique" + "txt_idx": "survey_report", + "label": "Rapport de sondage" } }, { @@ -401,16 +468,6 @@ "label": "Rapport final d'op\u00e9ration (fouille)" } }, - { - "pk": 1, - "model": "ishtar_common.sourcetype", - "fields": { - "comment": "Photographie argentique sous une forme imprim\u00e9e.", - "available": true, - "txt_idx": "photo_print", - "label": "\u00c9preuve de photographie argentique" - } - }, { "pk": 115, "model": "ishtar_common.operationtype", @@ -531,6 +588,18 @@ "txt_idx": "emergency_excavation" } }, + { + "pk": 133, + "model": "ishtar_common.operationtype", + "fields": { + "comment": "", + "available": true, + "label": "\u00c0 d\u00e9terminer", + "preventive": false, + "order": 1, + "txt_idx": "unknown" + } + }, { "pk": 118, "model": "ishtar_common.operationtype", @@ -555,6 +624,18 @@ "txt_idx": "AE" } }, + { + "pk": 132, + "model": "ishtar_common.operationtype", + "fields": { + "comment": null, + "available": true, + "label": "Diagnostic arch\u00e9ologique (programm\u00e9)", + "preventive": false, + "order": 1, + "txt_idx": "arch_diagnostic_research" + } + }, { "pk": 131, "model": "ishtar_common.operationtype", @@ -736,27 +817,27 @@ } }, { - "pk": 5, + "pk": 134, "model": "ishtar_common.operationtype", "fields": { - "comment": "Une campagne de prospection sur un th\u00e8me particulier", + "comment": "", "available": true, - "label": "Prospection th\u00e9matique", + "label": "Prospection sondage", "preventive": false, "order": 1, - "txt_idx": "thematic_survey" + "txt_idx": "survey_dig" } }, { - "pk": 116, + "pk": 5, "model": "ishtar_common.operationtype", "fields": { - "comment": "", - "available": false, + "comment": "Une campagne de prospection sur un th\u00e8me particulier", + "available": true, "label": "Prospection th\u00e9matique", "preventive": false, "order": 1, - "txt_idx": "thematic_prospection" + "txt_idx": "thematic_survey" } }, { @@ -794,451 +875,145 @@ "order": 1, "txt_idx": "sampling" } - }, + }, { - "pk": 115, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "Autre \u00e9tude", - "preventive": true, - "order": 1, - "txt_idx": "other_study" - } - }, - { - "pk": 1, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "Une op\u00e9ration arch\u00e9ologique visant \u00e0 qualifier et quantifier la pr\u00e9sence de vestiges sur une surface donn\u00e9e.", - "available": true, - "label": "Diagnostic arch\u00e9ologique", - "preventive": true, - "order": 1, - "txt_idx": "arch_diagnostic" - } - }, - { - "pk": 7, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "\u00c9tude de b\u00e2ti (pr\u00e9ventif)", - "preventive": true, - "order": 1, - "txt_idx": "building_study" - } - }, - { - "pk": 10, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "\u00c9tude documentaire (pr\u00e9ventif)", - "preventive": true, - "order": 1, - "txt_idx": "documents_study" - } - }, - { - "pk": 12, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "\u00c9valuation", - "preventive": true, - "order": 1, - "txt_idx": "evaluation" - } - }, - { - "pk": 113, - "model": "ishtar_common.operationtype", - "fields": { - "comment": null, - "available": true, - "label": "Fouille ancienne", - "preventive": true, - "order": 1, - "txt_idx": "ancient_excavation" - } - }, - { - "pk": 2, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "A pr\u00e9ciser", - "available": true, - "label": "Fouille arch\u00e9ologique pr\u00e9ventive", - "preventive": true, - "order": 1, - "txt_idx": "prev_excavation" - } - }, - { - "pk": 123, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": false, - "label": "Prospection inventaire (pr\u00e9ventif)", - "preventive": true, - "order": 1, - "txt_idx": "inventory_survey" - } - }, - { - "pk": 124, - "model": "ishtar_common.operationtype", - "fields": { - "comment": null, - "available": false, - "label": "Prospection (pr\u00e9ventif)", - "preventive": true, - "order": 1, - "txt_idx": "survey" - } - }, - { - "pk": 22, - "model": "ishtar_common.operationtype", + "pk": 5, + "model": "ishtar_common.titletype", "fields": { "comment": null, "available": true, - "label": "Sauvetage urgent", - "preventive": true, - "order": 1, - "txt_idx": "emergency_excavation" - } - }, - { - "pk": 118, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "Aide \u00e0 la pr\u00e9paration de publication", - "preventive": false, - "order": 1, - "txt_idx": "assistance_preparation_help" - } - }, - { - "pk": 130, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "Aide \u00e0 l'\u00e9dition", - "preventive": false, - "order": 1, - "txt_idx": "AE" + "txt_idx": "dr", + "label": "Dr." } }, { - "pk": 132, - "model": "ishtar_common.operationtype", + "pk": 1, + "model": "ishtar_common.titletype", "fields": { "comment": null, "available": true, - "label": "Diagnostic arch\u00e9ologique (programm\u00e9)", - "preventive": false, - "order": 1, - "txt_idx": "arch_diagnostic_research" - } - }, - { - "pk": 131, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "Diffusion (pour les colloques, expo, s\u00e9minaires...)", - "preventive": false, - "order": 1, - "txt_idx": "communication" - } - }, - { - "pk": 8, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "\u00c9tude de b\u00e2ti (programm\u00e9)", - "preventive": false, - "order": 1, - "txt_idx": "building_study_research" - } - }, - { - "pk": 11, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "\u00c9tude documentaire (programm\u00e9)", - "preventive": false, - "order": 1, - "txt_idx": "documents_study_research" + "txt_idx": "mr", + "label": "M." } }, { "pk": 3, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "Fouille arch\u00e9ologique programm\u00e9e", - "preventive": false, - "order": 1, - "txt_idx": "prog_excavation" - } - }, - { - "pk": 13, - "model": "ishtar_common.operationtype", + "model": "ishtar_common.titletype", "fields": { "comment": "", "available": true, - "label": "Fouille arch\u00e9ologique programm\u00e9e pluriannuelle", - "preventive": false, - "order": 1, - "txt_idx": "prog_excavation_multiyear" + "txt_idx": "mr-and-mrs", + "label": "M. et Mme" } }, { - "pk": 122, - "model": "ishtar_common.operationtype", + "pk": 2, + "model": "ishtar_common.titletype", "fields": { "comment": "", "available": true, - "label": "Programme d'analyses", - "preventive": false, - "order": 1, - "txt_idx": "analysis_program" + "txt_idx": "miss", + "label": "Mlle" } }, { - "pk": 16, - "model": "ishtar_common.operationtype", + "pk": 4, + "model": "ishtar_common.titletype", "fields": { "comment": "", "available": true, - "label": "Projet Collectif de Recherche", - "preventive": false, - "order": 1, - "txt_idx": "collective_research_project" + "txt_idx": "mrs", + "label": "Mme" } }, { - "pk": 14, - "model": "ishtar_common.operationtype", + "pk": 1, + "model": "ishtar_common.supporttype", "fields": { "comment": "", "available": true, - "label": "Prospection a\u00e9rienne", - "preventive": false, - "order": 1, - "txt_idx": "aerial_survey_research" + "txt_idx": "tracing-paper", + "label": "Papier calque" } }, { - "pk": 126, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": false, - "label": "Prospection a\u00e9rienne (pr\u00e9ventif)", - "preventive": false, - "order": 1, - "txt_idx": "aerial_survey" - } - }, - { - "pk": 117, - "model": "ishtar_common.operationtype", + "pk": 2, + "model": "ishtar_common.supporttype", "fields": { "comment": "", "available": true, - "label": "Prospection avec mat\u00e9riel sp\u00e9cialis\u00e9", - "preventive": false, - "order": 1, - "txt_idx": "specialized_eqp_prospection" + "txt_idx": "graph-paper", + "label": "Papier millim\u00e9tr\u00e9" } }, { - "pk": 20, - "model": "ishtar_common.operationtype", + "pk": 3, + "model": "ishtar_common.format", "fields": { - "comment": "", + "comment": "841 \u00d7 1189 mm", "available": true, - "label": "Prospection avec relev\u00e9 d'art rupestre", - "preventive": false, - "order": 1, - "txt_idx": "rock_art_survey" + "txt_idx": "a0", + "label": "A0" } }, { - "pk": 120, - "model": "ishtar_common.operationtype", + "pk": 4, + "model": "ishtar_common.format", "fields": { - "comment": null, + "comment": "594 \u00d7 841 mm", "available": true, - "label": "Prospection d\u00e9tecteur de m\u00e9taux", - "preventive": false, - "order": 1, - "txt_idx": "metal_detector_prospection" - } - }, - { - "pk": 114, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": false, - "label": "Prospection diachronique", - "preventive": false, - "order": 1, - "txt_idx": "diachronic_prospection" - } - }, - { - "pk": 17, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "Prospection inventaire", - "preventive": false, - "order": 1, - "txt_idx": "inventory_survey_research" - } - }, - { - "pk": 18, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": false, - "label": "Prospection (programm\u00e9)", - "preventive": false, - "order": 1, - "txt_idx": "survey_research" + "txt_idx": "a1", + "label": "A1" } }, { "pk": 5, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "Une campagne de prospection sur un th\u00e8me particulier", - "available": true, - "label": "Prospection th\u00e9matique", - "preventive": false, - "order": 1, - "txt_idx": "thematic_survey" - } - }, - { - "pk": 116, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": false, - "label": "Prospection th\u00e9matique", - "preventive": false, - "order": 1, - "txt_idx": "thematic_prospection" - } - }, - { - "pk": 121, - "model": "ishtar_common.operationtype", - "fields": { - "comment": null, - "available": true, - "label": "Relev\u00e9 d'art rupestre", - "preventive": false, - "order": 1, - "txt_idx": "cave_art_record" - } - }, - { - "pk": 21, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "Pas assez gros pour \u00eatre une fouille, mais porte n\u00e9anmoins atteinte au sous-sol.", - "available": false, - "label": "Sondage", - "preventive": false, - "order": 1, - "txt_idx": "sampling_research" - } - }, - { - "pk": 127, - "model": "ishtar_common.operationtype", + "model": "ishtar_common.format", "fields": { - "comment": "", + "comment": "420 \u00d7 594 mm", "available": true, - "label": "Sondage (programm\u00e9)", - "preventive": false, - "order": 1, - "txt_idx": "sampling" - } - }, - { - "pk": 25, - "model": "ishtar_common.titletype", - "fields": { - "comment": null, - "available": true, - "txt_idx": "dr", - "label": "Dr." + "txt_idx": "a2", + "label": "A2" } }, { - "pk": 21, - "model": "ishtar_common.titletype", + "pk": 2, + "model": "ishtar_common.format", "fields": { - "comment": null, + "comment": "297 \u00d7 420 mm", "available": true, - "txt_idx": "mr", - "label": "M." + "txt_idx": "a3", + "label": "A3" } }, { - "pk": 22, - "model": "ishtar_common.titletype", + "pk": 1, + "model": "ishtar_common.format", "fields": { - "comment": null, + "comment": "210 \u00d7 297 mm\r\n", "available": true, - "txt_idx": "ms", - "label": "Mlle" + "txt_idx": "a4", + "label": "A4" } }, { - "pk": 24, - "model": "ishtar_common.titletype", + "pk": 6, + "model": "ishtar_common.format", "fields": { - "comment": null, + "comment": "148 \u00d7 210 mm\r\n", "available": true, - "txt_idx": "md", - "label": "Mme" + "txt_idx": "a5", + "label": "A5" } }, { - "pk": 23, - "model": "ishtar_common.titletype", + "pk": 7, + "model": "ishtar_common.format", "fields": { - "comment": null, + "comment": "105 \u00d7 148 mm", "available": true, - "txt_idx": "mr and miss", - "label": "Mr and Mrs" + "txt_idx": "a6", + "label": "A6" } } -] +] \ No newline at end of file diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index a8a7c8935..f87a529a7 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -1,108 +1,4 @@ [ - { - "pk": 15, - "model": "ishtar_common.importertype", - "fields": { - "description": "Import depuis la base filemaker du SRA PdL", - "is_template": true, - "unicity_keys": "code_patriarche", - "users": [], - "slug": "operatio", - "associated_models": "archaeological_operations.models.Operation", - "name": "OPERATIO - Op\u00e9rations" - } - }, - { - "pk": 6, - "model": "ishtar_common.importertype", - "fields": { - "description": "Test d'import depuis le DBF simplifi\u00e9 de patrairche", - "is_template": true, - "unicity_keys": null, - "users": [], - "slug": null, - "associated_models": "archaeological_operations.models.Operation", - "name": "OPE PATRIARCHE DBF simplifi\u00e9 (TEST)" - } - }, - { - "pk": 7, - "model": "ishtar_common.importertype", - "fields": { - "description": "Import simple d'UE (pas de relations)", - "is_template": true, - "unicity_keys": null, - "users": [], - "slug": null, - "associated_models": "archaeological_context_records.models.ContextRecord", - "name": "SISPEO_UE" - } - }, - { - "pk": 8, - "model": "ishtar_common.importertype", - "fields": { - "description": "Import depuis csv issu de SISPEO", - "is_template": true, - "unicity_keys": null, - "users": [], - "slug": null, - "associated_models": "archaeological_finds.models.BaseFind", - "name": "SISPEO_mobilier" - } - }, - { - "pk": 9, - "model": "ishtar_common.importertype", - "fields": { - "description": "Import des parcelles depuis un export de base SISPEO", - "is_template": true, - "unicity_keys": null, - "users": [], - "slug": null, - "associated_models": "archaeological_operations.models.Parcel", - "name": "SISPEO_parcelles" - } - }, - { - "pk": 10, - "model": "ishtar_common.importertype", - "fields": { - "description": "Import depuis un export de la base File Maker Objet du SRA PdL", - "is_template": true, - "unicity_keys": null, - "users": [], - "slug": null, - "associated_models": "archaeological_finds.models.BaseFind", - "name": "FM_SRA_PdL_Mobilier" - } - }, - { - "pk": 14, - "model": "ishtar_common.importertype", - "fields": { - "description": "Exports dossiers SRA PdL : importeur Filemaker dossiers", - "is_template": false, - "unicity_keys": "external_id", - "users": [], - "slug": "sra-pdl-files", - "associated_models": "archaeological_files.models.File", - "name": "sra-pdl-files" - } - }, - { - "pk": 16, - "model": "ishtar_common.importertype", - "fields": { - "description": "Base contact du SRA Pays de la Loire", - "is_template": true, - "unicity_keys": "", - "users": [], - "slug": "pdl-contact", - "associated_models": "ishtar_common.models.Person", - "name": "PDL - Contact" - } - }, { "pk": 2, "model": "ishtar_common.importertype", @@ -229,38 +125,6 @@ "description": "" } }, - { - "pk": 16, - "model": "ishtar_common.importerdefault", - "fields": { - "importer_type": 14, - "target": "responsible_town_planning_service__attached_to" - } - }, - { - "pk": 17, - "model": "ishtar_common.importerdefault", - "fields": { - "importer_type": 14, - "target": "" - } - }, - { - "pk": 18, - "model": "ishtar_common.importerdefault", - "fields": { - "importer_type": 14, - "target": "in_charge" - } - }, - { - "pk": 19, - "model": "ishtar_common.importerdefault", - "fields": { - "importer_type": 14, - "target": "general_contractor__attached_to" - } - }, { "pk": 20, "model": "ishtar_common.importerdefault", @@ -269,22 +133,6 @@ "target": "authors" } }, - { - "pk": 21, - "model": "ishtar_common.importerdefault", - "fields": { - "importer_type": 15, - "target": "operator" - } - }, - { - "pk": 22, - "model": "ishtar_common.importerdefault", - "fields": { - "importer_type": 16, - "target": "attached_to" - } - }, { "pk": 1, "model": "ishtar_common.importerdefault", @@ -317,51 +165,6 @@ "target": "scientist__person_types" } }, - { - "pk": 21, - "model": "ishtar_common.importerdefaultvalues", - "fields": { - "default_target": 16, - "target": "organization_type", - "value": "planning_service" - } - }, - { - "pk": 22, - "model": "ishtar_common.importerdefaultvalues", - "fields": { - "default_target": 17, - "target": "file_type", - "value": "preventive" - } - }, - { - "pk": 23, - "model": "ishtar_common.importerdefaultvalues", - "fields": { - "default_target": 17, - "target": "creation_date", - "value": "2015-10-25 19:44:44.496129" - } - }, - { - "pk": 24, - "model": "ishtar_common.importerdefaultvalues", - "fields": { - "default_target": 18, - "target": "attached_to", - "value": "9" - } - }, - { - "pk": 25, - "model": "ishtar_common.importerdefaultvalues", - "fields": { - "default_target": 19, - "target": "organization_type", - "value": "general_contractor" - } - }, { "pk": 26, "model": "ishtar_common.importerdefaultvalues", @@ -371,24 +174,6 @@ "value": "main_author" } }, - { - "pk": 27, - "model": "ishtar_common.importerdefaultvalues", - "fields": { - "default_target": 21, - "target": "organization_type", - "value": "operator" - } - }, - { - "pk": 28, - "model": "ishtar_common.importerdefaultvalues", - "fields": { - "default_target": 22, - "target": "organization_type", - "value": "undefined" - } - }, { "pk": 1, "model": "ishtar_common.importerdefaultvalues", @@ -430,10 +215,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 1, - "description": "Code patriarche", + "description": "Code Patriarche", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Code Patriarche", "importer_type": 1 } }, @@ -442,10 +227,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 3, - "description": null, + "description": "", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Type d'op\u00e9ration", "importer_type": 1 } }, @@ -454,10 +239,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 4, - "description": null, + "description": "", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Nom de l'op\u00e9ration", "importer_type": 1 } }, @@ -466,10 +251,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 5, - "description": null, + "description": "", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Nom de l'op\u00e9rateur", "importer_type": 1 } }, @@ -478,10 +263,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 6, - "description": "Nom du responsable de l'op\u00e9ration. Nom et Pr\u00e9nom sont group\u00e9 et donc mis dans le NOM seul dans l'annuaire.", + "description": "Nom du responsable de l'op\u00e9ration. Nom et Pr\u00e9nom sont group\u00e9s et donc mis dans le NOM seul dans l'annuaire.", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Nom du responsable de l'op\u00e9ration", "importer_type": 1 } }, @@ -493,7 +278,7 @@ "description": "Date de d\u00e9but de l'op\u00e9ration avec le format ANN\u00c9E/MOIS/JOUR", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Date d\u00e9but", "importer_type": 1 } }, @@ -505,7 +290,7 @@ "description": "Date de fin de l'op\u00e9ration avec le format ANN\u00c9E/MOIS/JOUR", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Date fin", "importer_type": 1 } }, @@ -514,10 +299,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 9, - "description": null, + "description": "", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "P\u00e9riodes", "importer_type": 1 } }, @@ -526,10 +311,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 1, - "description": "Code patriarche de l'op\u00e9ration associ\u00e9e", + "description": "Code Patriarche de l'op\u00e9ration associ\u00e9e", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Code Patriarche", "importer_type": 2 } }, @@ -541,7 +326,7 @@ "description": "Commune (via num\u00e9ro INSEE)", "regexp_pre_filter": 2, "required": true, - "label": null, + "label": "Commune", "importer_type": 2 } }, @@ -553,7 +338,7 @@ "description": "Identifiant externe", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Identifiant externe", "importer_type": 2 } }, @@ -565,7 +350,7 @@ "description": "Num\u00e9ro", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Parcelle", "importer_type": 2 } }, @@ -577,7 +362,7 @@ "description": "Section", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Section cadastrale", "importer_type": 2 } }, @@ -589,7 +374,7 @@ "description": "Ann\u00e9e", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Ann\u00e9e cadastrale", "importer_type": 2 } }, @@ -601,7 +386,7 @@ "description": "Lieu dit / adresse", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Adresse", "importer_type": 2 } }, @@ -610,10 +395,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 1, - "description": "Code patriarche de l'op\u00e9ration associ\u00e9e", + "description": "Code Patriarche de l'op\u00e9ration associ\u00e9e", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Code Patriarche", "importer_type": 3 } }, @@ -622,10 +407,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 2, - "description": null, + "description": "", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Identifiant externe", "importer_type": 3 } }, @@ -634,10 +419,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 3, - "description": null, + "description": "", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Type de document", "importer_type": 3 } }, @@ -646,10 +431,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 4, - "description": null, + "description": "", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Type de support", "importer_type": 3 } }, @@ -658,10 +443,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 5, - "description": null, + "description": "", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Num\u00e9ro", "importer_type": 3 } }, @@ -670,10 +455,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 6, - "description": null, + "description": "", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nom de l'auteur", "importer_type": 3 } }, @@ -682,10 +467,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 7, - "description": null, + "description": "", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de cr\u00e9ation", "importer_type": 3 } }, @@ -694,10 +479,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 8, - "description": null, + "description": "", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Type de format", "importer_type": 3 } }, @@ -706,10 +491,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 9, - "description": null, + "description": "", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Description", "importer_type": 3 } }, @@ -718,10 +503,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 12, - "description": null, + "description": "", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire", "importer_type": 3 } }, @@ -730,10 +515,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 13, - "description": null, + "description": "", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "\u00c9chelle", "importer_type": 3 } }, @@ -742,10 +527,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 16, - "description": null, + "description": "", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Information suppl\u00e9mentaire", "importer_type": 3 } }, @@ -754,10 +539,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 1, - "description": "Code patriarche de l'op\u00e9ration associ\u00e9e", + "description": "Code Patriarche de l'op\u00e9ration associ\u00e9e", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Code Patriarche", "importer_type": 4 } }, @@ -769,7 +554,7 @@ "description": "Commune (via num\u00e9ro INSEE)", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Commune", "importer_type": 4 } }, @@ -781,7 +566,7 @@ "description": "Parcelle (identifiant externe)", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Parcelle", "importer_type": 4 } }, @@ -790,10 +575,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 4, - "description": "Label / Identifiant externe ", + "description": "Identifiant externe ", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Identifiant externe", "importer_type": 4 } }, @@ -805,7 +590,7 @@ "description": "Type", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Type", "importer_type": 4 } }, @@ -817,7 +602,7 @@ "description": "Description", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Description", "importer_type": 4 } }, @@ -829,7 +614,7 @@ "description": "Identification", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Identification", "importer_type": 4 } }, @@ -841,7 +626,7 @@ "description": "Date d'ouverture", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date d\u00e9but", "importer_type": 4 } }, @@ -853,7 +638,7 @@ "description": "Date de fermeture", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date fin", "importer_type": 4 } }, @@ -865,7 +650,7 @@ "description": "Commentaire", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire", "importer_type": 4 } }, @@ -877,7 +662,7 @@ "description": "Nature", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nature", "importer_type": 4 } }, @@ -889,7 +674,7 @@ "description": "Chronologie (plusieurs possibles s\u00e9par\u00e9es par &)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Chronologie", "importer_type": 4 } }, @@ -901,7 +686,7 @@ "description": "Code patriarche de l'op\u00e9ration associ\u00e9e", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Code Patriarche", "importer_type": 5 } }, @@ -913,7 +698,7 @@ "description": "Commune (via num\u00e9ro INSEE)", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Commune", "importer_type": 5 } }, @@ -925,7 +710,7 @@ "description": "Identifiant parcelle", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Parcelle", "importer_type": 5 } }, @@ -937,7 +722,7 @@ "description": "Identifiant UE", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "UE", "importer_type": 5 } }, @@ -949,7 +734,7 @@ "description": "Identifiant externe", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Identifiant externe", "importer_type": 5 } }, @@ -961,7 +746,7 @@ "description": "Sous classe de mat\u00e9riaux", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Mat\u00e9riau", "importer_type": 5 } }, @@ -973,7 +758,7 @@ "description": "Ref. du contenant / label temporaire utilis\u00e9 pour le mobilier = label libre = Label pour l'instant", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Libell\u00e9 contenant", "importer_type": 5 } }, @@ -985,7 +770,7 @@ "description": "Nombre d'\u00e9l\u00e9ments", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nombre d'\u00e9l\u00e9ments", "importer_type": 5 } }, @@ -997,7 +782,7 @@ "description": "Poids", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Poids", "importer_type": 5 } }, @@ -1009,7 +794,7 @@ "description": "Unit\u00e9 de poids", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Unit\u00e9 de poids", "importer_type": 5 } }, @@ -1021,7 +806,7 @@ "description": "Date de d\u00e9couverte", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de d\u00e9couverte", "importer_type": 5 } }, @@ -1033,7 +818,7 @@ "description": "\u00c9tat de conservation", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "\u00c9tat de conservation", "importer_type": 5 } }, @@ -1045,7 +830,7 @@ "description": "Mesure de conservation", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Mesure de conservation", "importer_type": 5 } }, @@ -1057,7 +842,7 @@ "description": "Commentaire", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire", "importer_type": 5 } }, @@ -1069,7 +854,7 @@ "description": "Datations s\u00e9par\u00e9es par des \"&\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Datation", "importer_type": 5 } }, @@ -1081,7 +866,7 @@ "description": "Localisation topographique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Localisation topographique", "importer_type": 5 } }, @@ -1093,7 +878,7 @@ "description": "Int\u00e9r\u00eat sp\u00e9cifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Int\u00e9r\u00eat sp\u00e9cifique", "importer_type": 5 } }, @@ -1105,4354 +890,1294 @@ "description": "Description", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Description", "importer_type": 5 } }, { - "pk": 55, + "pk": 265, "model": "ishtar_common.importercolumn", "fields": { "col_number": 1, - "description": "Type d'op\u00e9ration patriarche (ex: EV, AET, OPD, etc.)", + "description": "Code PATRIARCHE ou code num\u00e9rique (entier) UNIQUE pour une op\u00e9ration.", "regexp_pre_filter": null, "required": true, - "label": null, - "importer_type": 6 + "label": "Code op\u00e9ration", + "importer_type": 17 } }, { - "pk": 56, + "pk": 266, "model": "ishtar_common.importercolumn", "fields": { "col_number": 2, - "description": "Intitul\u00e9 de l'op\u00e9ration dans Patriarche", + "description": "Nom usuel de l'op\u00e9ration.", "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 6 + "required": true, + "label": "Nom", + "importer_type": 17 } }, { - "pk": 57, + "pk": 267, "model": "ishtar_common.importercolumn", "fields": { "col_number": 3, - "description": "Nom du responsable de l'op\u00e9ration", + "description": "Ann\u00e9e de r\u00e9f\u00e9rence (peut \u00eatre celle o\u00f9 le projet d'op\u00e9ration a \u00e9t\u00e9 cr\u00e9\u00e9 ou bien celle de la r\u00e9alisation selon votre usage).", "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 6 + "required": true, + "label": "Ann\u00e9e", + "importer_type": 17 } }, { - "pk": 58, + "pk": 268, "model": "ishtar_common.importercolumn", "fields": { "col_number": 4, - "description": "Pr\u00e9nom du responsable de l'op\u00e9ration", + "description": "Index (num\u00e9ro par ann\u00e9e), le couple ann\u00e9e + index doit \u00eatre unique.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 6 + "label": "Index (num\u00e9ro par ann\u00e9e)", + "importer_type": 17 } }, { - "pk": 59, + "pk": 269, "model": "ishtar_common.importercolumn", "fields": { "col_number": 5, - "description": "Chronologie dans PATRIARCHE, h\u00e9las une seule chronologie est enregistr\u00e9e", + "description": "Type d'op\u00e9ration (parmi une liste).", "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 6 + "required": true, + "label": "Type d'op\u00e9ration", + "importer_type": 17 } }, { - "pk": 60, + "pk": 335, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 8, - "description": "Date du d\u00e9but de l'op\u00e9ration au format jour/mois/ann\u00e9e", + "col_number": 6, + "description": "Ancien code unique de l'op\u00e9ration, peut \u00eatre la r\u00e9f\u00e9rence unique d'une op\u00e9ration pass\u00e9e comme un code DRACAR par exemple, 200 carac. max.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 6 + "label": "Ancien code", + "importer_type": 17 } }, { - "pk": 61, + "pk": 270, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 9, - "description": "Date du fin de l'op\u00e9ration au format jour/mois/ann\u00e9e", + "col_number": 7, + "description": "R\u00e9f\u00e9rence du dossier administratif associ\u00e9 \u00e0 l'op\u00e9ration sous la forme ANNEE-INDEX. Exemple : \"2002-4\".", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 6 + "label": "R\u00e9f\u00e9rence du dossier administratif", + "importer_type": 17 } }, { - "pk": 62, + "pk": 271, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 10, - "description": "Identification de l'op\u00e9ration, import\u00e9 en tant que commentaire", + "col_number": 8, + "description": "Identifiants des sites (entit\u00e9s arch\u00e9ologiques) concern\u00e9es par l'op\u00e9ration, s\u00e9par\u00e9es par \u00ab\u00a0&\u00a0\u00bb. Exemple : \"44 125 0028 & 44 125 0029\".", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 6 + "label": "Identifiants des sites (EAs)", + "importer_type": 17 } }, { - "pk": 63, + "pk": 272, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 11, - "description": "CODE Patriarche de l'op\u00e9ration, AVEC le code REGION", + "col_number": 9, + "description": "Types de vestiges (s\u00e9par\u00e9s par un \u00ab\u00a0&\u00a0\u00bb). Exemple : \"four & fosses & villa\".", "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 6 + "required": false, + "label": "Types de vestiges", + "importer_type": 17 } }, { - "pk": 64, + "pk": 273, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 12, - "description": "Surface en m2", + "col_number": 10, + "description": "P\u00e9riodes concern\u00e9es (s\u00e9par\u00e9es par un \u00ab\u00a0&\u00a0\u00bb). \r\nExemple : \"Gallo-romain & Fer & Med\".", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 6 + "label": "P\u00e9riodes", + "importer_type": 17 } }, { - "pk": 65, + "pk": 274, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 1, - "description": "Code OA avec le num\u00e9ro de r\u00e9gion (ex: 18 pour les PdL)", + "col_number": 11, + "description": "Titre (M., Mme, etc.) du responsable scientifique.", "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 7 + "required": false, + "label": "Titre du responsable scientifique", + "importer_type": 17 } }, { - "pk": 66, + "pk": 275, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 2, - "description": "Code de l'UE (peut \u00eatre la concat\u00e9nation de fait + US ou autre)", + "col_number": 12, + "description": "Pr\u00e9nom du responsable scientifique (responsable d'op\u00e9ration).", "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 7 + "required": false, + "label": "Pr\u00e9nom du responsable scientifique", + "importer_type": 17 } }, { - "pk": 67, + "pk": 276, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 3, - "description": "Parcelle (peut \u00eatre li\u00e9 \u00e0 une parcelle virtuelle, ex: XXX 0)", - "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 7 - } - }, - { - "pk": 68, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 4, - "description": "Commentaire", + "col_number": 13, + "description": "Nom du responsable scientifique (responsable d'op\u00e9ration).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 7 + "label": "Nom du responsable scientifique", + "importer_type": 17 } }, { - "pk": 94, + "pk": 277, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 5, - "description": "Type d'UE : identification", + "col_number": 14, + "description": "Rattachement du responsable scientifique (responsable d'op\u00e9ration). Exemple : \"INRAP\" ou plus pr\u00e9cis \"INRAP Direction interr\u00e9gionale Grand Ouest\" selon votre degr\u00e9 de pr\u00e9cision dans la gestion des rattachements et des organisations.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 7 + "label": "Rattachement du responsable scientifique", + "importer_type": 17 } }, { - "pk": 95, + "pk": 278, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 6, - "description": "Description de l'UE consid\u00e9r\u00e9e", + "col_number": 15, + "description": "Nom de l'op\u00e9rateur (organisation). Peut \u00eatre diff\u00e9rent de l'organisation de rattachement du responsable d'op\u00e9ration.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 7 + "label": "Nom de l'op\u00e9rateur", + "importer_type": 17 } }, { - "pk": 96, + "pk": 279, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 7, - "description": "Datation (p\u00e9riode) pour l'UE s\u00e9par\u00e9es par un &", + "col_number": 16, + "description": "R\u00e9f\u00e9rence de l'op\u00e9rateur (code ou autre r\u00e9f\u00e9rence interne de l'op\u00e9rateur).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 7 + "label": "R\u00e9f\u00e9rence de l'op\u00e9rateur", + "importer_type": 17 } }, { - "pk": 69, + "pk": 280, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 1, - "description": "Code patriarche de l'op\u00e9ration associ\u00e9e", + "col_number": 17, + "description": "Titre (M., Mme, etc.) du responsable du suivi scientifique.", "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 8 + "required": false, + "label": "Titre du responsable du suivi scientifique", + "importer_type": 17 } }, { - "pk": 70, + "pk": 281, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 2, - "description": "Code Document de SISPEO, soit l'identifiant complet (ancien du mobilier), ex: M.CE.0091_XXX.XX_0030", + "col_number": 18, + "description": "Pr\u00e9nom du responsable du suivi scientifique. Exemple\u00a0: resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci.", "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 8 + "required": false, + "label": "Pr\u00e9nom du responsable du suivi scientifique", + "importer_type": 17 } }, { - "pk": 72, + "pk": 282, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 3, - "description": "UE - a passer en majuscule dans l'export csv de SISPEO / bien v\u00e9rifier qu'il n'y a pas de doublons dans l'import des UE pr\u00e9c\u00e9dent", + "col_number": 19, + "description": "Nom du responsable du suivi scientifique. Exemple : resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci.", "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 8 + "required": false, + "label": "Nom du responsable du suivi scientifique", + "importer_type": 17 } }, { - "pk": 74, + "pk": 283, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 4, - "description": "Type de manti\u00e8re de mobilier, s\u00e9par\u00e9s par des \"&\"", + "col_number": 20, + "description": "Rattachement du responsable du suivi scientifique.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Rattachement du responsable du suivi scientifique", + "importer_type": 17 } }, { - "pk": 73, + "pk": 284, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 5, - "description": "\u00c9tat de conservation / lien avec une liste", + "col_number": 21, + "description": "Surface couverte par l'op\u00e9ration (m2).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Surface couverte par l'op\u00e9ration", + "importer_type": 17 } }, { - "pk": 77, + "pk": 285, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 6, - "description": "Commentaire", + "col_number": 22, + "description": "Date de d\u00e9but de l'op\u00e9ration (habituellement d\u00e9but du terrain mais vous pouvez utiliser autre chose).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Date de d\u00e9but de l'op\u00e9ration", + "importer_type": 17 } }, { - "pk": 122, + "pk": 286, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 7, - "description": "Identifiant pr\u00e9c\u00e9dent / label libre", + "col_number": 23, + "description": "Date de fin de l'op\u00e9ration (habituellement fin du terrain mais vous pouvez utiliser autre chose).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Date de fin de l'op\u00e9ration", + "importer_type": 17 } }, { - "pk": 75, + "pk": 287, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 8, - "description": "Contient des objets complets ou non (pb il peut aussi y en avoir des incomplets m\u00e9lang\u00e9s \u00e0 des complets non isol\u00e9s...)\r\nA Am\u00e9liorer", + "col_number": 24, + "description": "Date de cl\u00f4ture (peut \u00eatre la date de rendu de la documentation, la fin de la recherche associ\u00e9e ou autre). Habituellement cela repr\u00e9sente la date \u00e0 partir de laquelle la documentation issue de l'op\u00e9ration n'est plus du ressort du responsable d'op\u00e9ration, mais vous pouvez utiliser autre chose.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Date de cl\u00f4ture", + "importer_type": 17 } }, { - "pk": 78, + "pk": 288, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 9, - "description": "Datations s\u00e9par\u00e9es par des \"&\"", + "col_number": 25, + "description": "Date d'avis. Exemple\u00a0: avis de CIRA ou autre selon votre usage.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Date d'avis", + "importer_type": 17 } }, { - "pk": 124, + "pk": 289, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 10, - "description": "Description de l'objet ou du lot d'objet", + "col_number": 26, + "description": "R\u00e9sultats consid\u00e9r\u00e9s comme n\u00e9gatif (d\u2019ordinaire utilis\u00e9 pour les diagnostics n\u00e9gatifs).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "R\u00e9sultats consid\u00e9r\u00e9s comme n\u00e9gatif", + "importer_type": 17 } }, { - "pk": 79, + "pk": 290, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 11, - "description": "Nombre d'objets", + "col_number": 27, + "description": "Pr\u00e9nom du rapporteur (CIRA ou autre selon votre usage de la notion d'avis).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Pr\u00e9nom du rapporteur", + "importer_type": 17 } }, { - "pk": 80, + "pk": 291, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 12, - "description": "Poids (en g)", + "col_number": 28, + "description": "Nom du rapporteur (CIRA ou autre selon votre usage de la notion d'avis).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Nom du rapporteur", + "importer_type": 17 } }, { - "pk": 81, + "pk": 292, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 13, - "description": "Longueur en cm", + "col_number": 29, + "description": "Rattachement rapporteur (organisation).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Rattachement du rapporteur", + "importer_type": 17 } }, { - "pk": 125, + "pk": 293, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 14, - "description": "Largeur en cm", + "col_number": 30, + "description": "Date limite pr\u00e9vue pour le rendu de la documentation scientifique.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Date limite pour le rendu de la documentation", + "importer_type": 17 } }, { - "pk": 126, + "pk": 294, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 15, - "description": "Hauteur en cm", + "col_number": 31, + "description": "Documentation re\u00e7ue.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Documentation re\u00e7ue", + "importer_type": 17 } }, { - "pk": 127, + "pk": 295, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 16, - "description": "Diam\u00e8tre en cm", + "col_number": 32, + "description": "Date limite pr\u00e9vue pour le rendu du mobilier.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Date limite rendu du mobilier", + "importer_type": 17 } }, { - "pk": 128, + "pk": 296, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 18, - "description": "Datation pr\u00e9cise, champs txt libre", + "col_number": 33, + "description": "Mobilier re\u00e7u ou livr\u00e9 selon vos usages et proc\u00e9dures.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Mobilier re\u00e7u", + "importer_type": 17 } }, { - "pk": 82, + "pk": 297, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 19, - "description": "Types d'objets se r\u00e9f\u00e9ren\u00e7ant par rapport \u00e0 un th\u00e9saurus", + "col_number": 34, + "description": "Commentaire g\u00e9n\u00e9ral.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Commentaire g\u00e9n\u00e9ral", + "importer_type": 17 } }, { - "pk": 76, + "pk": 298, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 20, - "description": "Isolation ou lot d'objets", + "col_number": 35, + "description": "Date de livraison du rapport.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 8 + "label": "Date de livraison du rapport", + "importer_type": 17 } }, { - "pk": 83, + "pk": 299, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 1, - "description": "Code patriarche de l'op\u00e9ration associ\u00e9e", + "col_number": 36, + "description": "\u00c9tat de traitement du rapport.", "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 9 - } - }, - { - "pk": 84, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 2, - "description": "Commune (via num\u00e9ro INSEE)", - "regexp_pre_filter": 2, - "required": true, - "label": null, - "importer_type": 9 + "required": false, + "label": "\u00c9tat de traitement du rapport", + "importer_type": 17 } }, { - "pk": 85, + "pk": 300, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 4, - "description": "Section de la parcelle", + "col_number": 37, + "description": "Commentaire sur la documentation scientifique (y compris mobilier).", "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 9 + "required": false, + "label": "Commentaire sur la documentation", + "importer_type": 17 } }, { - "pk": 86, + "pk": 301, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 5, - "description": "Num\u00e9ro de la parcelle (ex: 125)", + "col_number": 38, + "description": "Nom du fichier image (jpg ou png. Exemple \"IMG_5023.jpg\". Les fichiers images doivent \u00eatre joints \u00e0 l'import dans un fichier ZIP.", "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 9 + "required": false, + "label": "Image", + "importer_type": 17 } }, { - "pk": 87, + "pk": 302, "model": "ishtar_common.importercolumn", "fields": { "col_number": 1, - "description": "Numero OA reference", + "description": "Code PATRIARCHE ou code UNIQUE de l'op\u00e9ration associ\u00e9e.", "regexp_pre_filter": null, "required": true, - "label": null, - "importer_type": 10 + "label": "Code op\u00e9ration", + "importer_type": 18 } }, { - "pk": 88, + "pk": 311, "model": "ishtar_common.importercolumn", "fields": { "col_number": 2, - "description": "Ref\u00e9rence pr\u00e9c\u00e9dente de l'objet (base ou inventaire pr\u00e9c\u00e9dent, fouille, sp\u00e9cialiste, etc;)", + "description": "Commune (via num\u00e9ro INSEE).", "regexp_pre_filter": null, "required": true, - "label": null, - "importer_type": 10 + "label": "INSEE", + "importer_type": 18 } }, { - "pk": 89, + "pk": 312, "model": "ishtar_common.importercolumn", "fields": { "col_number": 3, - "description": "UE li\u00e9e au mobilier", + "description": "Parcelle (identifiant externe), soit la section plus la parcelle sans espaces. Exemple : \"ZA253\".", "regexp_pre_filter": null, "required": true, - "label": null, - "importer_type": 10 + "label": "Parcelle", + "importer_type": 18 } }, { - "pk": 90, + "pk": 313, "model": "ishtar_common.importercolumn", "fields": { "col_number": 4, - "description": "Mati\u00e8res s\u00e9par\u00e9es par des \"&\"", + "description": "Ann\u00e9e de la r\u00e9f\u00e9rence cadastrale. Exemple : \"1980\".", "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 10 + "required": false, + "label": "Ann\u00e9e cadastre", + "importer_type": 18 } }, { - "pk": 91, + "pk": 314, "model": "ishtar_common.importercolumn", "fields": { "col_number": 5, - "description": "Etat de conservation", + "description": "Identifiant (externe) de l'UE. Exemple : \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\", etc. Doit \u00eatre unique pour une parcelle donn\u00e9e. Maximum 200 caract\u00e8res.", "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 10 + "required": true, + "label": "Identifiant UE", + "importer_type": 18 } }, { - "pk": 92, + "pk": 315, "model": "ishtar_common.importercolumn", "fields": { "col_number": 6, - "description": "Commentaires", + "description": "Type d'UE. Exemple : \"US\", \"Couche\", \"Tranch\u00e9e\", \"zone\", \"Secteur\", \"Log\", \"Carr\u00e9\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 10 + "label": "Type", + "importer_type": 18 } }, { - "pk": 93, + "pk": 316, "model": "ishtar_common.importercolumn", "fields": { "col_number": 7, - "description": "Label libre", + "description": "Description.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 10 + "label": "Description", + "importer_type": 18 } }, { - "pk": 192, + "pk": 317, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 2, - "description": null, + "col_number": 8, + "description": "Commentaire g\u00e9n\u00e9ral.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Commentaire g\u00e9n\u00e9ral", + "importer_type": 18 } }, { - "pk": 193, + "pk": 318, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 3, - "description": null, + "col_number": 9, + "description": "Taille ou longueur (en m\u00e8tre). Exemple : \"1.2\", \"12\".", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Taille ou longueur", + "importer_type": 18 } }, { - "pk": 194, + "pk": 319, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 5, - "description": null, + "col_number": 10, + "description": "Largeur (en m\u00e8tre). Exemple : \"1.2\", \"12\".", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Largeur", + "importer_type": 18 } }, { - "pk": 195, + "pk": 320, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 9, - "description": null, + "col_number": 11, + "description": "\u00c9paisseur (en m\u00e8tre). Exemple : \"0.2\", \"2\".", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "\u00c9paisseur", + "importer_type": 18 } }, { - "pk": 196, + "pk": 321, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 10, - "description": null, + "col_number": 12, + "description": "Profondeur (en m\u00e8tre). Exemple : \"0.2\", \"2\".", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Profondeur", + "importer_type": 18 } }, { - "pk": 197, + "pk": 322, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 12, - "description": null, + "col_number": 13, + "description": "Lieu, description textuelle de la localisation. Exemple : \"Au pied de l'arbre du P\u00e8re Jahouen\", \"En limite nord de la parcelle\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Lieu, localisation", + "importer_type": 18 } }, { - "pk": 198, + "pk": 323, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 13, - "description": null, + "col_number": 14, + "description": "Contient ou non du mobilier (oui/non).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Contient du mobilier", + "importer_type": 18 } }, { - "pk": 199, + "pk": 324, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 14, - "description": null, + "col_number": 15, + "description": "Nom du fichier image (jpg ou png). Exemple : \"IMG_5023.jpg\". Les fichiers images doivent \u00eatre joints \u00e0 l'import dans un fichier ZIP.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Image", + "importer_type": 18 } }, { - "pk": 200, + "pk": 325, "model": "ishtar_common.importercolumn", "fields": { "col_number": 16, - "description": null, + "description": "Chronologies associ\u00e9es (plusieurs possibles s\u00e9par\u00e9es par &). Exemple : \"Gallo-romain & M\u00e9di\u00e9val\", \"GR&MED\", \"M\u00e9solithique final & M\u00e9so moyen & Epipal\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "P\u00e9riodes", + "importer_type": 18 } }, { - "pk": 201, + "pk": 326, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 18, - "description": null, + "col_number": 17, + "description": "Commentaire sur les datations. Exemple : \"IIe - IIIe s.\", \"fin XVe ou plus tard\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Commentaire sur les datations", + "importer_type": 18 } }, { - "pk": 202, + "pk": 327, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 19, - "description": null, + "col_number": 18, + "description": "Description du remplissage. Exemple : \"Limons argileux brun riche en charbons\".", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Description du remplissage", + "importer_type": 18 } }, { - "pk": 203, + "pk": 328, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 20, - "description": null, + "col_number": 19, + "description": "Interpr\u00e9tation. Exemple : \"Mur de cl\u00f4ture\", \"Sol couvert d'une mosa\u00efque, \"Pal\u00e9osol du d\u00e9but de l'Holoc\u00e8ne\", \"Four de r\u00e9duction de minerai de fer\", \"TP\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Interpr\u00e9tation", + "importer_type": 18 } }, { - "pk": 204, + "pk": 329, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 35, - "description": null, + "col_number": 20, + "description": "Activit\u00e9, r\u00e9f\u00e9rence \u00e0 des types. Exemple : \"Naturelle\", \"Construction\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Type d'activit\u00e9", + "importer_type": 18 } }, { - "pk": 205, + "pk": 330, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 37, - "description": null, + "col_number": 21, + "description": "Identification (type). Exemple : \"Niveau d'occupation\", \"Mur\", \"Colluvions\", \"Chablis\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Identification (type)", + "importer_type": 18 } }, { - "pk": 206, + "pk": 331, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 38, - "description": null, + "col_number": 22, + "description": "Terminus ante quem, limite temporelle avant laquelle l'UE s'est form\u00e9e, ici sous la forme de valeurs enti\u00e8res. Exemple : \"322\", \"-45\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "TAQ", + "importer_type": 18 } }, { - "pk": 207, + "pk": 332, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 41, - "description": null, + "col_number": 23, + "description": "Terminus post quem, limite temporelle apr\u00e8s laquelle l'UE s'est form\u00e9e, ici sous la forme de valeurs enti\u00e8res. Exemple : \"322\", \"-45\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "TPQ", + "importer_type": 18 } }, { - "pk": 208, + "pk": 333, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 42, - "description": null, + "col_number": 24, + "description": "Terminus ante quem estim\u00e9, limite temporelle avant laquelle l'UE s'est form\u00e9e, ici sous la forme de valeurs enti\u00e8res. Exemple : \"322\", \"-45\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "TAQ estim\u00e9", + "importer_type": 18 } }, { - "pk": 209, + "pk": 334, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 47, - "description": null, + "col_number": 25, + "description": "Terminus post quem estim\u00e9, limite temporelle avant laquelle l'UE s'est form\u00e9e, ici sous la forme de valeurs enti\u00e8res. Exemple : \"322\", \"-45\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "TPQ estim\u00e9", + "importer_type": 18 } }, { - "pk": 210, + "pk": 303, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 49, - "description": null, + "col_number": 1, + "description": "Code PATRIARCHE ou code num\u00e9rique (entier) UNIQUE pour une op\u00e9ration.", "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 14 + "required": true, + "label": "Code op\u00e9ration", + "importer_type": 19 } }, { - "pk": 211, + "pk": 304, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 50, - "description": null, - "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 14 + "col_number": 2, + "description": "Commune (via num\u00e9ro INSEE).", + "regexp_pre_filter": 2, + "required": true, + "label": "Commune", + "importer_type": 19 } }, { - "pk": 212, + "pk": 305, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 53, - "description": null, + "col_number": 3, + "description": "Identifiant externe.", "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 14 + "required": true, + "label": "ID externe", + "importer_type": 19 } }, { - "pk": 213, + "pk": 306, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 54, - "description": null, + "col_number": 4, + "description": "Section. Exemple : \"ZA\". Maximum 4 caract\u00e8res.", "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 14 + "required": true, + "label": "Section", + "importer_type": 19 } }, { - "pk": 214, + "pk": 307, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 55, - "description": null, + "col_number": 5, + "description": "Num\u00e9ro de la parcelle. Exemple : \"253\". Peut accueillir une r\u00e9f\u00e9rence sous la forme de caract\u00e8res (maximum 6).", "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 14 + "required": true, + "label": "Parcelle", + "importer_type": 19 } }, { - "pk": 215, + "pk": 308, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 57, - "description": null, + "col_number": 6, + "description": "Ann\u00e9e de la r\u00e9f\u00e9rence cadastrale. Exemple : \"1980\".", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Ann\u00e9e cadastrale", + "importer_type": 19 } }, { - "pk": 216, + "pk": 309, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 58, - "description": null, + "col_number": 7, + "description": "Lieu-dit ou adresse associ\u00e9s \u00e0 la parcelle.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Adresse", + "importer_type": 19 } }, { - "pk": 217, + "pk": 310, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 72, - "description": null, + "col_number": 8, + "description": "Parcelle dans le domaine public ou non (oui/non).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Domaine public", + "importer_type": 19 } }, { - "pk": 218, + "pk": 336, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 75, - "description": null, + "col_number": 1, + "description": "Code PATRIARCHE ou code num\u00e9rique (entier) UNIQUE pour une op\u00e9ration.", "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 14 + "required": true, + "label": "Code op\u00e9ration", + "importer_type": 20 } }, { - "pk": 219, + "pk": 337, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 76, - "description": null, + "col_number": 2, + "description": "Commune (via num\u00e9ro INSEE).", "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 14 + "required": true, + "label": "INSEE", + "importer_type": 20 } }, { - "pk": 220, + "pk": 338, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 77, - "description": null, + "col_number": 3, + "description": "Parcelle (identifiant externe), soit la section plus la parcelle sans espaces. Exemple : \"ZA253\".", "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 14 + "required": true, + "label": "Parcelle", + "importer_type": 20 } }, { - "pk": 221, + "pk": 339, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 85, - "description": null, + "col_number": 4, + "description": "Label / Identifiant (externe) de l'UE. Exemple : \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\", etc. Doit \u00eatre unique pour une parcelle donn\u00e9e.", "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 14 + "required": true, + "label": "Label UE", + "importer_type": 20 } }, { - "pk": 222, + "pk": 340, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 87, - "description": null, + "col_number": 5, + "description": "Identifiant libre pour le mobilier. Exemple : \"12\", \"Lot 24\", \"Sac vert\", etc.\r\nDoit \u00eatre unique \u00e0 l'\u00e9chelle de l'UE associ\u00e9e.", "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 14 + "required": true, + "label": "Label mobilier", + "importer_type": 20 } }, { - "pk": 223, + "pk": 341, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 88, - "description": null, + "col_number": 6, + "description": "Identifiant pr\u00e9c\u00e9dent, li\u00e9 \u00e0 une base de donn\u00e9e ou un autre mode d'enregistrement. Exemple : \"400.01.05\", \"Beau biface\", \"inv. 4523\", \"Iso.4220\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Identifiant pr\u00e9c\u00e9dent", + "importer_type": 20 } }, { - "pk": 224, + "pk": 343, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 89, - "description": null, + "col_number": 7, + "description": "R\u00e9f\u00e9rence du point topo, d'ordinaire un entier mais peut \u00eatre autre chose. Champ texte, max. 120 caract\u00e8res. Exemple : \"7220\", \"pt. 72\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 14 + "label": "Ref. point topo", + "importer_type": 20 } }, { - "pk": 230, + "pk": 342, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 1, - "description": "Code Patriarche", + "col_number": 8, + "description": "Description du mobilier, objet ou lot. Exemple : \"Fibule aviforme\".", "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 15 + "required": false, + "label": "Description", + "importer_type": 20 } }, { - "pk": 231, + "pk": 344, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 3, - "description": "Type d'op\u00e9ration", + "col_number": 9, + "description": "D\u00e9finit si on enregistre ici un objet seul (parfois appel\u00e9 Isolation) ou un lot d'objets. Exemple : \"lot\", \"objet\", \"Iso\", \"vrac\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "Lot ou objet", + "importer_type": 20 } }, { - "pk": 232, + "pk": 345, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 4, - "description": "Nom de l'op\u00e9ration", + "col_number": 10, + "description": "D\u00e9finit si un objet est complet ou non. Exemple : \"complet\", \"est complet\", \"incomplet\".\r\nEst ici traduit en binaire : \"complet\" (vrai) ou \"incomplet\" (faux). ", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "Compl\u00e9tude", + "importer_type": 20 } }, { - "pk": 233, + "pk": 346, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 5, - "description": "Nom de l'op\u00e9rateur", + "col_number": 11, + "description": "Type(s) de mat\u00e9riau(x) s\u00e9par\u00e9s par des \"&\". Exemple : \"m\u00e9tal & os\", \"LT\", \"Min\u00e9ral\", \"Granito\u00efde & Basalte & Ardoise\".", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "Mat\u00e9riau(x)", + "importer_type": 20 } }, { - "pk": 234, + "pk": 347, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 6, - "description": "Nom du responsable de l'op\u00e9ration.", + "col_number": 12, + "description": "\u00c9tat de conservation. Exemple : \"Instable\", \"Stable\", \"Inconnu\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "\u00c9tat de conservation", + "importer_type": 20 } }, { - "pk": 235, + "pk": 348, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 7, - "description": "Pr\u00e9nom du responsable de l'op\u00e9ration.", + "col_number": 13, + "description": "Commentaire relatif \u00e0 la conservation. Exemple : \"Devrait \u00eatre conserv\u00e9 dans une chambre climatis\u00e9e\", \"Ne sera plus qu'une poudre, si on ne s'en occupe pas sous peu\", \" \u00e0 jeter\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "Commentaire conservation", + "importer_type": 20 } }, { - "pk": 236, + "pk": 349, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 8, - "description": "Date de d\u00e9but de l'op\u00e9ration avec le format ANN\u00c9E/MOIS/JOUR", + "col_number": 14, + "description": "Type(s) d'objet(s), s\u00e9par\u00e9s par des \"&\". Exemple : \"tesson & charbon\", \"os & m\u00e9tal\", \"faune\", \"fibule & bague\", \"lame & lamelle\", \"\u00e9clat & nucl\u00e9us\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "Type(s) d'objet(s)", + "importer_type": 20 } }, { - "pk": 237, + "pk": 350, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 9, - "description": "Date de fin de l'op\u00e9ration avec le format ANN\u00c9E/MOIS/JOUR", + "col_number": 15, + "description": "Type(s) d'actions de conservation \u00e0 mener, s\u00e9par\u00e9s par des \"&\". Exemple : \"\u00c0 restaurer\", \"reconditionnement\", \"\u00c0 reconditionner & \u00e0 stabiliser\"", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "Type(s) d'actions de conservation \u00e0 mener", + "importer_type": 20 } }, { - "pk": 238, + "pk": 351, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 10, - "description": "P\u00e9riodes chronologiques", + "col_number": 16, + "description": "Type(s) d'int\u00e9r\u00eat scientifique ou d'int\u00e9grit\u00e9, s\u00e9par\u00e9s par des \"&\". Exemple : \"Arch\u00e9ologiquement complet\", \"absent\", \"perdu\", etc.\r\nPeut \u00e9galement qualifier (selon votre usage) des qualit\u00e9s de fragmentation : \"proximal\", \"distal\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "Type(s) d'int\u00e9grit\u00e9(s) et/ou int\u00e9r\u00eat(s)", + "importer_type": 20 } }, { - "pk": 239, + "pk": 352, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 11, - "description": "Ann\u00e9e de r\u00e9f\u00e9rence administrative", + "col_number": 17, + "description": "Type(s) de remarquabilit\u00e9(s), s\u00e9par\u00e9s par des \"&\". Exemple : \"Mus\u00e9e\", \"Publication\", \"Tessonier & Publication\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "Type(s) de remarqualibit\u00e9(s)", + "importer_type": 20 } }, { - "pk": 240, + "pk": 353, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 12, - "description": "Num\u00e9ro de r\u00e9f\u00e9rence administrative de l'op\u00e9ration", + "col_number": 18, + "description": "Longueur en cm (nombre d\u00e9cimal).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "Longueur (cm)", + "importer_type": 20 } }, { - "pk": 241, + "pk": 354, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 13, - "description": "Ancienne ref type DRACAR", + "col_number": 19, + "description": "Largeur en cm (nombre d\u00e9cimal).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "Largeur (cm)", + "importer_type": 20 } }, { - "pk": 242, + "pk": 355, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 14, - "description": "Commentaires", + "col_number": 20, + "description": "Hauteur en cm (nombre d\u00e9cimal).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "Hauteur (cm)", + "importer_type": 20 } }, { - "pk": 243, + "pk": 356, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 15, - "description": "Date de rendu du rapport (du premier si il y en a plusieurs)", + "col_number": 21, + "description": "Diam\u00e8tre en cm (nombre d\u00e9cimal).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "Diam\u00e8tre (cm)", + "importer_type": 20 } }, { - "pk": 244, + "pk": 357, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 16, - "description": "\u00c9tat de traitement des rapports", + "col_number": 22, + "description": "Commentaire permettant de donner des pr\u00e9cisions (ou d'importer des donn\u00e9es mixtes). Exemple : \"18 x 12 x 5\", \"col de 43 mm\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 15 + "label": "Commentaire / Pr\u00e9cisions sur les dimensions ", + "importer_type": 20 } }, { - "pk": 245, + "pk": 358, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 1, - "description": "Adresse du domicile", + "col_number": 23, + "description": "Nombre d'objet(s) li\u00e9(s) \u00e0 cet enregistrement (entier). Exemple : \"12\".\r\nAttention, ce champ n'est pas contraint par l'information de type OBJET/LOT (colonne n\u00b09).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 16 + "label": "Nombre", + "importer_type": 20 } }, { - "pk": 246, + "pk": 359, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 2, - "description": "Courriel", + "col_number": 24, + "description": "Marquage visible sur le mobilier. Exemple : \"id1234 la Roche aux F\u00e9es\", \"MTX-45\", etc.\r\nCeci reproduit d'ordinaire un marquage r\u00e9alis\u00e9 par un arch\u00e9ologue. Il ne s'agit pas ici de reproduire une \u00e9pigraphie ou tout autre inscription arch\u00e9ologique (graffito, d\u00e9dicaces, defixio, etc.) , mais vous pouvez l'utiliser pour cela si vous n'avez pas \u00e0 utiliser de marquage arch\u00e9ologique.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 16 + "label": "Marque", + "importer_type": 20 } }, { - "pk": 247, + "pk": 360, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 3, - "description": "Adresse", + "col_number": 25, + "description": "Commentaire g\u00e9n\u00e9ral libre. Exemple : \"habillage en nid d'abeille, poli g\u00e9n\u00e9ralis\u00e9, encoche emmanchement lat\u00e9ral ouvert sur la face sup\u00e9rieure\", \"1 bord + bec tubulaire\", \"fibule de Langton Down\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 16 + "label": "Commentaire g\u00e9n\u00e9ral", + "importer_type": 20 } }, { - "pk": 251, + "pk": 361, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 4, - "description": "Commentaire : #AFEAF", + "col_number": 26, + "description": "Commentaire g\u00e9n\u00e9ral sur les datations, si besoin. Exemple : \"plut\u00f4t fin IIe s. ou d\u00e9but IIIe s.\", \"Datation \u00e0 pr\u00e9ciser avant publication\", \" Datation rapide faite par M. Dupont\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 16 + "label": "Commentaire g\u00e9n\u00e9ral sur les datations", + "importer_type": 20 } }, { - "pk": 252, + "pk": 362, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 7, - "description": "Commentaire : #BSR_CONTRI", + "col_number": 27, + "description": "Valeur estim\u00e9e (\u20ac), sous la forme d'un nombre d\u00e9cimal. Exemple : \"4500\", \"0.2\", etc.\r\nUtile essentiellement pour les probl\u00e8mes de partage, vente, assurance etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 16 + "label": "Valeur estim\u00e9e", + "importer_type": 20 } }, { - "pk": 248, + "pk": 363, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 10, - "description": "Code postal domicie", + "col_number": 28, + "description": "Nom exact du fichier image, sous la forme XXXXX.jpg.\r\nAttention au respect strict des caract\u00e8res et majuscules lors d'un import de ce type, \".JPG\" ou \"*.jpg\", etc.\r\nExemple : \"P1030831.JPG\", \"IMG_6485.JPG\", \"fibule.jpg\", etc.\r\nLors de l'import il faut ajouter ces images sous la forme d'un fichier zip (joint au csv import\u00e9) pour que les images soient automatiquement int\u00e9gr\u00e9es.\r\n", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 16 + "label": "Image", + "importer_type": 20 } }, { - "pk": 249, + "pk": 364, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 11, - "description": "Code postal", + "col_number": 29, + "description": "Chronologies associ\u00e9es (plusieurs possibles s\u00e9par\u00e9es par &). Exemple : \"Gallo-romain & M\u00e9di\u00e9val\", \"GR&MED\", \"M\u00e9solithique final & M\u00e9so moyen & Epipal\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 16 + "label": "P\u00e9riodes", + "importer_type": 20 } }, { - "pk": 250, + "pk": 365, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 17, - "description": "Quelle est l'adresse pr\u00e9f\u00e9r\u00e9e ? (pro/domicile)", + "col_number": 30, + "description": "Coordonn\u00e9e X pour cet objet.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 16 + "label": "Coordonn\u00e9e X", + "importer_type": 20 } }, { - "pk": 253, + "pk": 366, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 19, - "description": "Type de contact", + "col_number": 31, + "description": "Coordonn\u00e9e Y pour cet objet.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 16 + "label": "Coordonn\u00e9e Y", + "importer_type": 20 } }, { - "pk": 254, + "pk": 367, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 28, - "description": "Nom", + "col_number": 32, + "description": "Coordonn\u00e9e Z pour cet objet (altitude NGF ou arbitraire).", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 16 + "label": "Coordonn\u00e9e Z", + "importer_type": 20 } }, { - "pk": 255, + "pk": 368, "model": "ishtar_common.importercolumn", "fields": { - "col_number": 29, - "description": "Nom de la structure associ\u00e9e", + "col_number": 33, + "description": "Code permettant de qualifier le mode de projection des donn\u00e9es (SRS /EPSG). Exemple : \"2154\" pour le Lambert 93.", "regexp_pre_filter": null, "required": false, - "label": null, - "importer_type": 16 + "label": "Syst\u00e8me de r\u00e9f\u00e9rence spatiale", + "importer_type": 20 } }, { - "pk": 256, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 31, - "description": "Commentaire", - "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 16 - } - }, - { - "pk": 257, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 32, - "description": "T\u00e9l\u00e9phone champs brut", - "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 16 - } - }, - { - "pk": 258, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 33, - "description": "Pays du domicile", - "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 16 - } - }, - { - "pk": 259, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 34, - "description": "Pays", - "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 16 - } - }, - { - "pk": 260, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 36, - "description": "Pr\u00e9nom", - "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 16 - } - }, - { - "pk": 261, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 37, - "description": "Titre", - "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 16 - } - }, - { - "pk": 262, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 41, - "description": "Type de t\u00e9l\u00e9phone (\u00e0 retraiter)", - "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 16 - } - }, - { - "pk": 263, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 42, - "description": "Ville du domicile", - "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 16 - } - }, - { - "pk": 264, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 43, - "description": "Ville", - "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 16 - } - }, - { - "pk": 265, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 1, - "description": "Code PATRIARCHE\r\n ou\r\n code num\u00e9rique (entier) UNIQUE pour une op\u00e9ration", - "regexp_pre_filter": null, - "required": true, - "label": "CODE OPERATION", - "importer_type": 17 - } - }, - { - "pk": 266, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 2, - "description": "Nom usuel de l'op\u00e9ration", - "regexp_pre_filter": null, - "required": true, - "label": "Nom", - "importer_type": 17 - } - }, - { - "pk": 267, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 3, - "description": "Ann\u00e9e de r\u00e9f\u00e9rence (peut \u00eatre celle o\u00f9 le projet d'op\u00e9ration a \u00e9t\u00e9 cr\u00e9\u00e9 ou bien celle de la r\u00e9alisation selon votre usage) ", - "regexp_pre_filter": null, - "required": true, - "label": "Ann\u00e9e", - "importer_type": 17 - } - }, - { - "pk": 268, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 4, - "description": "Index (num\u00e9ro par ann\u00e9e), le couple ann\u00e9e + index doit \u00eatre unique", - "regexp_pre_filter": null, - "required": false, - "label": "Index (num\u00e9ro par ann\u00e9e)", - "importer_type": 17 - } - }, - { - "pk": 269, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 5, - "description": "Type d'op\u00e9ration (parmi une liste)", - "regexp_pre_filter": null, - "required": true, - "label": "Type d'op\u00e9ration", - "importer_type": 17 - } - }, - { - "pk": 335, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 6, - "description": "Ancien code unique de l'op\u00e9ration, peut \u00eatre la r\u00e9f\u00e9rence unique d'une op\u00e9ration pass\u00e9e comme un code DRACAR par exemple, 200 carac. max.", - "regexp_pre_filter": null, - "required": false, - "label": "Ancien code", - "importer_type": 17 - } - }, - { - "pk": 270, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 7, - "description": "R\u00e9f\u00e9rence du dossier administratif associ\u00e9 \u00e0 l'op\u00e9ration sous la forme ANNEE-INDEX. Exemple : \"2002-4\".", - "regexp_pre_filter": null, - "required": false, - "label": "R\u00e9f\u00e9rence du dossier administratif", - "importer_type": 17 - } - }, - { - "pk": 271, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 8, - "description": "Identifiants des sites (entit\u00e9s arch\u00e9ologiques) concern\u00e9es par l'op\u00e9ration, s\u00e9par\u00e9es par \u00ab\u00a0&\u00a0\u00bb. \r\nExemple : \"44 125 0028 & 44 125 0029\"", - "regexp_pre_filter": null, - "required": false, - "label": "Identifiants des sites (EAs)", - "importer_type": 17 - } - }, - { - "pk": 272, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 9, - "description": "Types de vestiges (s\u00e9par\u00e9s par un \u00ab\u00a0&\u00a0\u00bb)\r\nExemple : \"four & fosses & villa\"", - "regexp_pre_filter": null, - "required": false, - "label": "Types de vestiges", - "importer_type": 17 - } - }, - { - "pk": 273, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 10, - "description": "P\u00e9riodes concern\u00e9es (s\u00e9par\u00e9es par un \u00ab\u00a0&\u00a0\u00bb). \r\nExemple : \"Gallo-romain & Fer & Med\".", - "regexp_pre_filter": null, - "required": false, - "label": "P\u00e9riodes", - "importer_type": 17 - } - }, - { - "pk": 274, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 11, - "description": "Titre (M., Mme, etc.) du responsable scientifique", - "regexp_pre_filter": null, - "required": false, - "label": "Titre du responsable scientifique", - "importer_type": 17 - } - }, - { - "pk": 275, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 12, - "description": "Pr\u00e9nom du responsable scientifique (responsable d'op\u00e9ration)", - "regexp_pre_filter": null, - "required": false, - "label": "Pr\u00e9nom du responsable scientifique", - "importer_type": 17 - } - }, - { - "pk": 276, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 13, - "description": "Nom du responsable scientifique (responsable d'op\u00e9ration)", - "regexp_pre_filter": null, - "required": false, - "label": "Nom du responsable scientifique", - "importer_type": 17 - } - }, - { - "pk": 277, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 14, - "description": "Rattachement du responsable scientifique (responsable d'op\u00e9ration)\r\nExemple : \"INRAP\" ou plus pr\u00e9cis \"INRAP Direction interr\u00e9gionale Grand Ouest\" selon votre degr\u00e9 de pr\u00e9cision dans la gestion des rattachements et des organisations.", - "regexp_pre_filter": null, - "required": false, - "label": "Rattachement du responsable scientifique", - "importer_type": 17 - } - }, - { - "pk": 278, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 15, - "description": "Nom de l'op\u00e9rateur (organisation). Peut \u00eatre diff\u00e9rent de l'organisation de rattachement du responsable d'op\u00e9ration.", - "regexp_pre_filter": null, - "required": false, - "label": "Nom de l'op\u00e9rateur", - "importer_type": 17 - } - }, - { - "pk": 279, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 16, - "description": "R\u00e9f\u00e9rence de l'op\u00e9rateur (code ou autre r\u00e9f\u00e9rence interne de l'op\u00e9rateur)", - "regexp_pre_filter": null, - "required": false, - "label": "R\u00e9f\u00e9rence de l'op\u00e9rateur", - "importer_type": 17 - } - }, - { - "pk": 280, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 17, - "description": "Titre (M., Mme, etc.) du responsable du suivi scientifique", - "regexp_pre_filter": null, - "required": false, - "label": "Titre du responsable du suivi scientifique", - "importer_type": 17 - } - }, - { - "pk": 281, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 18, - "description": "Pr\u00e9nom du responsable du suivi scientifique (ex\u00a0: resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci)", - "regexp_pre_filter": null, - "required": false, - "label": "Pr\u00e9nom du responsable du suivi scientifique", - "importer_type": 17 - } - }, - { - "pk": 282, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 19, - "description": "Nom du responsable du suivi scientifique (ex : resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci)", - "regexp_pre_filter": null, - "required": false, - "label": "Nom du responsable du suivi scientifique", - "importer_type": 17 - } - }, - { - "pk": 283, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 20, - "description": "Rattachement du resp. du suivi scientifique", - "regexp_pre_filter": null, - "required": false, - "label": "Rattachement du responsable du suivi scientifique", - "importer_type": 17 - } - }, - { - "pk": 284, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 21, - "description": "Surface couverte par l'op\u00e9ration (m2)", - "regexp_pre_filter": null, - "required": false, - "label": "Surface couverte par l'op\u00e9ration", - "importer_type": 17 - } - }, - { - "pk": 285, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 22, - "description": "Date de d\u00e9but de l'op\u00e9ration (d\u00e9but du terrain d'ordinaire mais vous pouvez utiliser autre chose)", - "regexp_pre_filter": null, - "required": false, - "label": "Date de d\u00e9but de l'op\u00e9ration", - "importer_type": 17 - } - }, - { - "pk": 286, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 23, - "description": "Date de fin de l'op\u00e9ration (fin du terrain d'ordinaire mais vous pouvez utiliser autre chose)", - "regexp_pre_filter": null, - "required": false, - "label": "Date de fin de l'op\u00e9ration", - "importer_type": 17 - } - }, - { - "pk": 287, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 24, - "description": "Date de cl\u00f4ture (peut-\u00eatre la date de rendu de la documentation, la fin de la recherche associ\u00e9e ou autre) d\u2019ordinaire cela repr\u00e9sente la date \u00e0 partir de laquelle la documentation issue de l'op\u00e9ration n'est plus du ressort du responsable d'op\u00e9ration, mais vous pouvez utiliser autre chose.", - "regexp_pre_filter": null, - "required": false, - "label": "Date de cl\u00f4ture", - "importer_type": 17 - } - }, - { - "pk": 288, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 25, - "description": "Date d'avis (ex\u00a0: avis de CIRA ou autre selon votre usage)", - "regexp_pre_filter": null, - "required": false, - "label": "Date d'avis", - "importer_type": 17 - } - }, - { - "pk": 289, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 26, - "description": "R\u00e9sultats consid\u00e9r\u00e9s comme n\u00e9gatif (d\u2019ordinaire utilis\u00e9 pour les diagnostics n\u00e9gatifs)", - "regexp_pre_filter": null, - "required": false, - "label": "R\u00e9sultats consid\u00e9r\u00e9s comme n\u00e9gatif", - "importer_type": 17 - } - }, - { - "pk": 290, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 27, - "description": "Pr\u00e9nom du rapporteur (CIRA ou autre selon votre usage de la notion d'avis)", - "regexp_pre_filter": null, - "required": false, - "label": "Pr\u00e9nom du rapporteur", - "importer_type": 17 - } - }, - { - "pk": 291, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 28, - "description": "Nom du rapporteur (CIRA ou autre selon votre usage de la notion d'avis)", - "regexp_pre_filter": null, - "required": false, - "label": "Nom du rapporteur", - "importer_type": 17 - } - }, - { - "pk": 292, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 29, - "description": "Rattachement rapporteur (organisation)", - "regexp_pre_filter": null, - "required": false, - "label": "Rattachement du rapporteur", - "importer_type": 17 - } - }, - { - "pk": 293, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 30, - "description": "Date limite pr\u00e9vue pour le rendu de la documentation scientifique", - "regexp_pre_filter": null, - "required": false, - "label": "Date limite pour le rendu de la documentation", - "importer_type": 17 - } - }, - { - "pk": 294, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 31, - "description": "Documentation re\u00e7ue", - "regexp_pre_filter": null, - "required": false, - "label": "Documentation re\u00e7ue", - "importer_type": 17 - } - }, - { - "pk": 295, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 32, - "description": "Date limite pr\u00e9vue pour le rendu du mobilier", - "regexp_pre_filter": null, - "required": false, - "label": "Date limite rendu du mobilier", - "importer_type": 17 - } - }, - { - "pk": 296, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 33, - "description": "Mobilier re\u00e7u ou livr\u00e9 selon vos usages et proc\u00e9dures", - "regexp_pre_filter": null, - "required": false, - "label": "Mobilier re\u00e7u", - "importer_type": 17 - } - }, - { - "pk": 297, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 34, - "description": "Commentaire g\u00e9n\u00e9ral", - "regexp_pre_filter": null, - "required": false, - "label": "Commentaire g\u00e9n\u00e9ral", - "importer_type": 17 - } - }, - { - "pk": 298, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 35, - "description": "Date de livraison du rapport", - "regexp_pre_filter": null, - "required": false, - "label": "Date de livraison du rapport", - "importer_type": 17 - } - }, - { - "pk": 299, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 36, - "description": "\u00c9tat de traitement du rapport", - "regexp_pre_filter": null, - "required": false, - "label": "\u00c9tat de traitement du rapport", - "importer_type": 17 - } - }, - { - "pk": 300, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 37, - "description": "Commentaire sur la documentation scientifique (y compris mobilier)", - "regexp_pre_filter": null, - "required": false, - "label": "Commentaire sur la documentation", - "importer_type": 17 - } - }, - { - "pk": 301, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 38, - "description": "Nom du fichier image (jpg ou png), exemple \"IMG_5023.jpg\"\r\nLes fichiers images doivent \u00eatre joints \u00e0 l'import dans un fichier ZIP", - "regexp_pre_filter": null, - "required": false, - "label": "Image", - "importer_type": 17 - } - }, - { - "pk": 302, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 1, - "description": "Code PATRIARCHE ou code UNIQUE de l'op\u00e9ration associ\u00e9e", - "regexp_pre_filter": null, - "required": true, - "label": "CODE OPERATION", - "importer_type": 18 - } - }, - { - "pk": 311, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 2, - "description": "Commune (via num\u00e9ro INSEE)", - "regexp_pre_filter": null, - "required": true, - "label": "INSEE", - "importer_type": 18 - } - }, - { - "pk": 312, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 3, - "description": "Parcelle (identifiant externe), soit la section plus la parcelle sans espaces, par exemple \"ZA253\"", - "regexp_pre_filter": null, - "required": true, - "label": "Parcelle", - "importer_type": 18 - } - }, - { - "pk": 313, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 4, - "description": "Ann\u00e9e de la r\u00e9f\u00e9rence cadastrale (exemple : \"1980\")", - "regexp_pre_filter": null, - "required": false, - "label": "Ann\u00e9e cadastre", - "importer_type": 18 - } - }, - { - "pk": 314, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 5, - "description": "Label / Identifiant (externe) de l'UE, ex: \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\" etc.\r\nDoit \u00eatre unique pour une parcelle donn\u00e9e. Maximum 200 caract\u00e8res.", - "regexp_pre_filter": null, - "required": true, - "label": "Label UE", - "importer_type": 18 - } - }, - { - "pk": 315, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 6, - "description": "Type d'UE, exemple : \"US\", \"Couche\", \"Tranch\u00e9e\", \"zone\", \"Secteur\", \"Log\", \"Carr\u00e9\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Type", - "importer_type": 18 - } - }, - { - "pk": 316, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 7, - "description": "Description.", - "regexp_pre_filter": null, - "required": false, - "label": "Description", - "importer_type": 18 - } - }, - { - "pk": 317, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 8, - "description": "Commentaire g\u00e9n\u00e9ral.", - "regexp_pre_filter": null, - "required": false, - "label": "Commentaire g\u00e9n\u00e9ral", - "importer_type": 18 - } - }, - { - "pk": 318, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 9, - "description": "Taille ou longueur (en m\u00e8tre), exemple \"1.2\", \"12\"", - "regexp_pre_filter": null, - "required": false, - "label": "Taille ou longueur", - "importer_type": 18 - } - }, - { - "pk": 319, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 10, - "description": "Largeur (en m\u00e8tre), exemple \"1.2\", \"12\"", - "regexp_pre_filter": null, - "required": false, - "label": "Largeur", - "importer_type": 18 - } - }, - { - "pk": 320, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 11, - "description": "\u00c9paisseur (en m\u00e8tre), exemple \"0.2\", \"2\"", - "regexp_pre_filter": null, - "required": false, - "label": "\u00c9paisseur", - "importer_type": 18 - } - }, - { - "pk": 321, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 12, - "description": "Profondeur (en m\u00e8tre), exemple \"0.2\", \"2\"", - "regexp_pre_filter": null, - "required": false, - "label": "Profondeur", - "importer_type": 18 - } - }, - { - "pk": 322, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 13, - "description": "Lieu, description textuelle de la localisation exemple : \"Au pied de l'arbre du P\u00e8re Jahouen\", \"En limite nord de la parcelle\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Lieu, localisation", - "importer_type": 18 - } - }, - { - "pk": 323, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 14, - "description": "Contient ou non du mobilier (oui/non)", - "regexp_pre_filter": null, - "required": false, - "label": "Contient du mobilier", - "importer_type": 18 - } - }, - { - "pk": 324, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 15, - "description": "Nom du fichier image (jpg ou png), exemple \"IMG_5023.jpg\".\r\nLes fichiers images doivent \u00eatre joints \u00e0 l'import dans un fichier ZIP", - "regexp_pre_filter": null, - "required": false, - "label": "Image", - "importer_type": 18 - } - }, - { - "pk": 325, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 16, - "description": "Chronologies associ\u00e9es (plusieurs possibles s\u00e9par\u00e9es par &), exemple : \"Gallo-romain & M\u00e9di\u00e9val\", \"GR&MED\", \"M\u00e9solithique final & M\u00e9so moyen & Epipal\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Periodes", - "importer_type": 18 - } - }, - { - "pk": 326, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 17, - "description": "Commentaire sur les datations, exemple : \"IIe - IIIe s.\", \"fin XVe ou plus tard\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Commentaire sur les datations", - "importer_type": 18 - } - }, - { - "pk": 327, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 18, - "description": "Description du remplissage. exemple \"Limons argileux brun riche en charbons\"", - "regexp_pre_filter": null, - "required": false, - "label": "Description du remplissage", - "importer_type": 18 - } - }, - { - "pk": 328, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 19, - "description": "Interpr\u00e9tation., exemple \"Mur de cl\u00f4ture\", \"Sol couvert d'une mosa\u00efque, \"Pal\u00e9osol du d\u00e9but de l'Holoc\u00e8ne\", \"Four de r\u00e9duction de minerai de fer\", \"TP\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Interpr\u00e9tation", - "importer_type": 18 - } - }, - { - "pk": 329, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 20, - "description": "Activit\u00e9, r\u00e9f\u00e9rence \u00e0 des types, par exemple : \"Naturelle\", \"Construction\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Type d'activit\u00e9", - "importer_type": 18 - } - }, - { - "pk": 330, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 21, - "description": "Identification (type), par exemple \"Niveau d'occupation\", \"Mur\", \"Colluvions\", \"Chablis\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Identification (type)", - "importer_type": 18 - } - }, - { - "pk": 331, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 22, - "description": "Terminus ante quem, limite temporelle avant laquelle l'UE s'est form\u00e9e, ici sous la forme de valeurs enti\u00e8res, exemple : \"322\", \"-45\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "TAQ", - "importer_type": 18 - } - }, - { - "pk": 332, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 23, - "description": "Terminus post quem, limite temporelle apr\u00e8s laquelle l'UE s'est form\u00e9e, ici sous la forme de valeurs enti\u00e8res, exemple : \"322\", \"-45\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "TPQ", - "importer_type": 18 - } - }, - { - "pk": 333, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 24, - "description": "Terminus ante quem estim\u00e9e, limite temporelle avant laquelle l'UE s'est form\u00e9e, ici sous la forme de valeurs enti\u00e8res, exemple : \"322\", \"-45\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "TAQ estim\u00e9e", - "importer_type": 18 - } - }, - { - "pk": 334, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 25, - "description": "Terminus post quem estim\u00e9e, limite temporelle avant laquelle l'UE s'est form\u00e9e, ici sous la forme de valeurs enti\u00e8res, exemple : \"322\", \"-45\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "TPQ estim\u00e9e", - "importer_type": 18 - } - }, - { - "pk": 303, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 1, - "description": "Code PATRIARCHE\r\n ou\r\n code num\u00e9rique (entier) UNIQUE pour une op\u00e9ration", - "regexp_pre_filter": null, - "required": true, - "label": "CODE OPERATION", - "importer_type": 19 - } - }, - { - "pk": 304, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 2, - "description": "Commune (via num\u00e9ro INSEE)", - "regexp_pre_filter": 2, - "required": true, - "label": null, - "importer_type": 19 - } - }, - { - "pk": 305, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 3, - "description": "Identifiant externe", - "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 19 - } - }, - { - "pk": 306, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 4, - "description": "Section (ex : \"ZA\"), maximum 4 caract\u00e8res", - "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 19 - } - }, - { - "pk": 307, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 5, - "description": "Num\u00e9ro de la parcelle (ex: \"253\"), mais peut accueillir une r\u00e9f\u00e9rence sous la forme de caract\u00e8res (maximum 6)", - "regexp_pre_filter": null, - "required": true, - "label": null, - "importer_type": 19 - } - }, - { - "pk": 308, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 6, - "description": "Ann\u00e9e de la r\u00e9f\u00e9rence cadastrale (exemple : \"1980\")", - "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 19 - } - }, - { - "pk": 309, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 7, - "description": "Lieu dit ou adresse associ\u00e9s \u00e0 la parcelle", - "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 19 - } - }, - { - "pk": 310, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 8, - "description": "Parcelle dans le domaine public ou non (binaire, oui/non)", - "regexp_pre_filter": null, - "required": false, - "label": null, - "importer_type": 19 - } - }, - { - "pk": 336, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 1, - "description": "Code PATRIARCHE ou code num\u00e9rique (entier) UNIQUE pour une op\u00e9ration.", - "regexp_pre_filter": null, - "required": true, - "label": "CODE OPERATION", - "importer_type": 20 - } - }, - { - "pk": 337, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 2, - "description": "Commune (via num\u00e9ro INSEE).", - "regexp_pre_filter": null, - "required": true, - "label": "INSEE", - "importer_type": 20 - } - }, - { - "pk": 338, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 3, - "description": "Parcelle (identifiant externe), soit la section plus la parcelle sans espaces. Exemple : \"ZA253\".", - "regexp_pre_filter": null, - "required": true, - "label": "Parcelle", - "importer_type": 20 - } - }, - { - "pk": 339, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 4, - "description": "Label / Identifiant (externe) de l'UE. Exemple : \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\", etc. Doit \u00eatre unique pour une parcelle donn\u00e9e.", - "regexp_pre_filter": null, - "required": true, - "label": "Label UE", - "importer_type": 20 - } - }, - { - "pk": 340, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 5, - "description": "Identifiant libre pour le mobilier. Exemple : \"12\", \"Lot 24\", \"Sac vert\", etc.\r\nDoit \u00eatre unique \u00e0 l'\u00e9chelle de l'UE associ\u00e9e.", - "regexp_pre_filter": null, - "required": true, - "label": "Label mobilier", - "importer_type": 20 - } - }, - { - "pk": 341, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 6, - "description": "Identifiant pr\u00e9c\u00e9dent, li\u00e9 \u00e0 une base de donn\u00e9e ou un autre mode d'enregistrement. Exemple : \"400.01.05\", \"Beau biface\", \"inv. 4523\", \"Iso.4220\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Identifiant pr\u00e9c\u00e9dent", - "importer_type": 20 - } - }, - { - "pk": 343, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 7, - "description": "R\u00e9f\u00e9rence du point topo, d'ordinaire un entier mais peut \u00eatre autre chose. Champ texte, max. 120 caract\u00e8res. Exemple : \"7220\", \"pt. 72\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Ref. point topo", - "importer_type": 20 - } - }, - { - "pk": 342, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 8, - "description": "Description du mobilier, objet ou lot. Champ texte, max. 1000 caract\u00e8res. Exemple : \"Fibule aviforme \u00e0 roustade bipolaire\".", - "regexp_pre_filter": null, - "required": false, - "label": "Description", - "importer_type": 20 - } - }, - { - "pk": 344, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 9, - "description": "D\u00e9finit si on enregistre ici un objet seul (parfois appel\u00e9 Isolation) ou un lot d'objets. Exemple : \"lot\", \"objet\", \"Iso\", \"vrac\", etc.\r\nEst ici traduit en binaire (est seul ?) : \"objet\" (vrai) ou \"lot\" (faux).", - "regexp_pre_filter": null, - "required": false, - "label": "Lot ou objet", - "importer_type": 20 - } - }, - { - "pk": 345, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 10, - "description": "D\u00e9finit si un objet est complet ou non. Exemple : \"complet\", \"est complet\", \"incomplet\".\r\nEst ici traduit en binaire : \"complet\" (vrai) ou \"incomplet\" (faux). ", - "regexp_pre_filter": null, - "required": false, - "label": "Compl\u00e9tude", - "importer_type": 20 - } - }, - { - "pk": 346, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 11, - "description": "Type(s) de mat\u00e9riau(x) s\u00e9par\u00e9s par des \"&\". Exemple : \"m\u00e9tal & os\", \"LT\", \"Min\u00e9ral\", \"Granito\u00efde & Basalte & Ardoise\".", - "regexp_pre_filter": null, - "required": false, - "label": "Materiaux(x)", - "importer_type": 20 - } - }, - { - "pk": 347, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 12, - "description": "\u00c9tat de conservation. Exemple : \"Instable\", \"Stable\", \"Inconnu\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "\u00c9tat de conservation", - "importer_type": 20 - } - }, - { - "pk": 348, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 13, - "description": "Commentaire relatif \u00e0 la conservation. Champ texte, max. 1000 caract\u00e8res. Exemple : \"Devrait \u00eatre conserv\u00e9 dans une chambre climatis\u00e9e\", \"Ne sera plus qu'une poudre, si on ne s'en occupe pas sous peu\", \" \u00e0 jeter\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Commentaire conservation", - "importer_type": 20 - } - }, - { - "pk": 349, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 14, - "description": "Type(s) d'objet(s), s\u00e9par\u00e9s par des \"&\". Exemple : \"tesson & charbon\", \"os & m\u00e9tal\", \"faune\", \"fibule & bague\", \"lame & lamelle\", \"\u00e9clat & nucl\u00e9us\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Type(s) d'objet(s)", - "importer_type": 20 - } - }, - { - "pk": 350, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 15, - "description": "Type(s) d'actions de conservation \u00e0 mener, s\u00e9par\u00e9s par des \"&\". Exemple : \"\u00c0 restaurer\", \"reconditionnement\", \"\u00c0 reconditionner & \u00c0 stabiliser\"", - "regexp_pre_filter": null, - "required": false, - "label": "Type(s) d'actions de conservation \u00e0 mener", - "importer_type": 20 - } - }, - { - "pk": 351, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 16, - "description": "Type(s) d'int\u00e9r\u00eat scientifique ou d'int\u00e9grit\u00e9, s\u00e9par\u00e9s par des \"&\". Exemple : \"Arch\u00e9ologiquement complet\", \"absent\", \"perdu\", etc.\r\nPeut \u00e9galement qualifier (selon votre usage) des qualit\u00e9s de fragmentation : \"proximal\", \"distal\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Type(s) d'int\u00e9grit\u00e9(s) et/ou int\u00e9r\u00eat(s)", - "importer_type": 20 - } - }, - { - "pk": 352, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 17, - "description": "Type(s) de remarquabilit\u00e9(s), s\u00e9par\u00e9s par des \"&\". Exemple : \"Mus\u00e9e\", \"Publication\", \"Tessonier & Publication\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Type(s) de remarqualibit\u00e9(s)", - "importer_type": 20 - } - }, - { - "pk": 353, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 18, - "description": "Longueur en cm (nombre d\u00e9cimal).", - "regexp_pre_filter": null, - "required": false, - "label": "Longueur (cm)", - "importer_type": 20 - } - }, - { - "pk": 354, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 19, - "description": "Largeur en cm (nombre d\u00e9cimal).", - "regexp_pre_filter": null, - "required": false, - "label": "Largeur (cm)", - "importer_type": 20 - } - }, - { - "pk": 355, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 20, - "description": "Hauteur en cm (nombre d\u00e9cimal).", - "regexp_pre_filter": null, - "required": false, - "label": "Hauteur (cm)", - "importer_type": 20 - } - }, - { - "pk": 356, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 21, - "description": "Diam\u00e8tre en cm (nombre d\u00e9cimal).", - "regexp_pre_filter": null, - "required": false, - "label": "Diam\u00e8tre (cm)", - "importer_type": 20 - } - }, - { - "pk": 357, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 22, - "description": "Commentaire permettant de donner des pr\u00e9cisions (ou d'importer des donn\u00e9es mixtes). Champ texte, max. 1000 caract\u00e8res. Exemple : \"18 x 12 x 5\", \"col de 43 mm\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Commentaire / Pr\u00e9cisions sur les dimensions ", - "importer_type": 20 - } - }, - { - "pk": 358, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 23, - "description": "Nombre d'objet(s) li\u00e9(s) \u00e0 cet enregistrement (entier). Exemple : \"12\".\r\nAttention, ce champ n'est pas contraint par l'information de type OBJET/LOT (colonne n\u00b09).", - "regexp_pre_filter": null, - "required": false, - "label": "Nombre", - "importer_type": 20 - } - }, - { - "pk": 359, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 24, - "description": "Marquage visible sur le mobilier. Champ texte. Exemple : \"id1234 la Roche aux F\u00e9es\", \"MTX-45\", etc.\r\nCeci reproduit d'ordinaire un marquage r\u00e9alis\u00e9 par un arch\u00e9ologue. Il ne s'agit pas ici de reproduire une \u00e9pigraphie ou tout autre inscription arch\u00e9ologique (graffito, d\u00e9dicaces, defixio, etc.) , mais vous pouvez l'utiliser pour cela si vous n'avez pas \u00e0 utiliser de marquage arch\u00e9ologique.", - "regexp_pre_filter": null, - "required": false, - "label": "Marque", - "importer_type": 20 - } - }, - { - "pk": 360, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 25, - "description": "Commentaire g\u00e9n\u00e9ral libre. Champ texte. Exemple : \"habillage en nid d'abeille, poli g\u00e9n\u00e9ralis\u00e9, encoche emmanchement lat\u00e9ral ouvert sur la face sup\u00e9rieure\", \"1 bord + bec tubulaire\", \"fibule de Langton Down\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Commentaire g\u00e9n\u00e9ral", - "importer_type": 20 - } - }, - { - "pk": 361, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 26, - "description": "Commentaire g\u00e9n\u00e9ral sur les datations, si besoin. Champ texte. Exemple : \"plut\u00f4t fin IIe s. ou d\u00e9but IIIe s.\", \"Datation \u00e0 pr\u00e9ciser avant publication\", \" Datation rapide faite par M. Dupont\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Commentaire g\u00e9n\u00e9ral sur les datations", - "importer_type": 20 - } - }, - { - "pk": 362, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 27, - "description": "Valeur estim\u00e9e (\u20ac), sous la forme d'un nombre d\u00e9cimal. Exemple : \"4500\", \"0.2\", etc.\r\nUtile essentiellement pour les probl\u00e8mes de partage, vente, assurance etc.", - "regexp_pre_filter": null, - "required": false, - "label": "Valeur estim\u00e9e", - "importer_type": 20 - } - }, - { - "pk": 363, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 28, - "description": "Nom exact du fichier image, sous la forme XXXXX.jpg.\r\nAttention au respect strict des caract\u00e8res et majuscules lors d'un import de ce type, \".JPG\" ou \"*.jpg\", etc.\r\nExemple : \"P1030831.JPG\", \"IMG_6485.JPG\", \"fibule.jpg\", etc.\r\nLors de l'import il faut ajouter ces images sous la forme d'un fichier zip (joint au csv import\u00e9) pour que les images soient automatiquement int\u00e9gr\u00e9es.\r\n", - "regexp_pre_filter": null, - "required": false, - "label": "Image", - "importer_type": 20 - } - }, - { - "pk": 364, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 29, - "description": "Chronologies associ\u00e9es (plusieurs possibles s\u00e9par\u00e9es par &). Exemple : \"Gallo-romain & M\u00e9di\u00e9val\", \"GR&MED\", \"M\u00e9solithique final & M\u00e9so moyen & Epipal\", etc.", - "regexp_pre_filter": null, - "required": false, - "label": "P\u00e9riodes", - "importer_type": 20 - } - }, - { - "pk": 365, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 30, - "description": "Coordonn\u00e9e X pour cet objet", - "regexp_pre_filter": null, - "required": false, - "label": "Coordonn\u00e9e X", - "importer_type": 20 - } - }, - { - "pk": 366, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 31, - "description": "Coordonn\u00e9e Y pour cet objet", - "regexp_pre_filter": null, - "required": false, - "label": "Coordonn\u00e9e Y", - "importer_type": 20 - } - }, - { - "pk": 367, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 32, - "description": "Coordonn\u00e9e Z pour cet objet (altitude NGF ou arbitraire)", - "regexp_pre_filter": null, - "required": false, - "label": "Coordonn\u00e9e Z", - "importer_type": 20 - } - }, - { - "pk": 368, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 33, - "description": "Code permettant de qualifier le mode de projection des donnes (SRS /EPSG). Exemple : \"EPSG:2154\" pour le Lambert 93", - "regexp_pre_filter": null, - "required": false, - "label": "Syst\u00e8me de r\u00e9f\u00e9rence spatiale", - "importer_type": 20 - } - }, - { - "pk": 46, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "find__conservatory_state", - "column": 45, - "formater_type": 22, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 49, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "topographic_localisation", - "column": 48, - "formater_type": 3, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 50, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "special_interest", - "column": 49, - "formater_type": 3, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 51, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "description", - "column": 50, - "formater_type": 16, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 15, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "operation__code_patriarche", - "column": 14, - "formater_type": 1, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 28, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "label", - "column": 27, - "formater_type": 3, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 48, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "comment", - "column": 47, - "formater_type": 35, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 13, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "town__numero_insee", - "column": 12, - "formater_type": 11, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 2, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "operation_type", - "column": 2, - "formater_type": 2, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 4, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "operator__name", - "column": 4, - "formater_type": 3, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 6, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "start_date", - "column": 6, - "formater_type": 5, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 7, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "excavation_end_date", - "column": 7, - "formater_type": 5, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 8, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "periods", - "column": 8, - "formater_type": 6, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 14, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "address", - "column": 13, - "formater_type": 10, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 16, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "external_id", - "column": 15, - "formater_type": 11, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 17, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "source_type", - "column": 16, - "formater_type": 12, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 18, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "support_type", - "column": 17, - "formater_type": 13, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 40, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "find__material_types", - "column": 39, - "formater_type": 20, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 19, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "item_number", - "column": 18, - "formater_type": 1, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 20, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "authors__person__raw_name", - "column": 19, - "formater_type": 4, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 21, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "creation_date", - "column": 20, - "formater_type": 14, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 22, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "format_type", - "column": 21, - "formater_type": 15, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 23, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "description", - "column": 22, - "formater_type": 16, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 24, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "comment", - "column": 23, - "formater_type": 16, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 25, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "scale", - "column": 24, - "formater_type": 17, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 53, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "parcel_number", - "column": 51, - "formater_type": 8, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 54, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "section", - "column": 52, - "formater_type": 7, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 5, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "scientist__raw_name", - "column": 5, - "formater_type": 4, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 56, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "year", - "column": 11, - "formater_type": 14, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 35, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "comment", - "column": 34, - "formater_type": 16, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 31, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "identification", - "column": 30, - "formater_type": 24, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 57, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "interpretation", - "column": 54, - "formater_type": 16, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 26, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "additional_information", - "column": 25, - "formater_type": 16, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 29, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "unit", - "column": 28, - "formater_type": 18, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 30, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "description", - "column": 29, - "formater_type": 16, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 32, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "opening_date", - "column": 31, - "formater_type": 5, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 33, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "closing_date", - "column": 32, - "formater_type": 5, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 1, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "code_patriarche", - "column": 1, - "formater_type": 1, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 41, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "find__find_number", - "column": 40, - "formater_type": 1, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 42, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "find__weight", - "column": 41, - "formater_type": 21, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 43, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "find__weight_unit", - "column": 42, - "formater_type": 7, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 45, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "discovery_date", - "column": 44, - "formater_type": 5, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 36, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "datings__period", - "column": 35, - "formater_type": 6, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": true - } - }, - { - "pk": 253, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__datings__period", - "column": 228, - "formater_type": 6, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": true - } - }, - { - "pk": 55, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "external_id", - "column": 53, - "formater_type": 11, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 27, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "operation__code_patriarche", - "column": 26, - "formater_type": 1, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 250, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "parcel__external_id", - "column": 225, - "formater_type": 28, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 34, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "parcel__external_id", - "column": 33, - "formater_type": 11, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 37, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "context_record__external_id", - "column": 36, - "formater_type": 11, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 252, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "context_record__external_id", - "column": 227, - "formater_type": 28, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 44, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "context_record__external_id", - "column": 43, - "formater_type": 3, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 9, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "operation__code_patriarche", - "column": 9, - "formater_type": 1, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 251, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "context_record__external_id", - "column": 226, - "formater_type": 35, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 290, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "code_patriarche", - "column": 265, - "formater_type": 1, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 293, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "operation_code", - "column": 268, - "formater_type": 1, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 296, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "periods", - "column": 273, - "formater_type": 6, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 299, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "scientist__surname", - "column": 275, - "formater_type": 3, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 308, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "surface", - "column": 284, - "formater_type": 1, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 311, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "end_date", - "column": 287, - "formater_type": 25, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 317, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "documentation_deadline", - "column": 293, - "formater_type": 25, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 320, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "finds_received", - "column": 296, - "formater_type": 19, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 323, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "report_processing", - "column": 299, - "formater_type": 37, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 47, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__preservation_to_considers", - "column": 46, - "formater_type": 23, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 325, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "image", - "column": 301, - "formater_type": 27, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 328, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "town__numero_insee", - "column": 304, - "formater_type": 11, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 331, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "parcel_number", - "column": 307, - "formater_type": 8, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 334, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "public_domain", - "column": 310, - "formater_type": 19, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 338, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "remains", - "column": 272, - "formater_type": 41, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 344, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "width", - "column": 319, - "formater_type": 21, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 349, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "image", - "column": 324, - "formater_type": 27, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 356, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "taq", - "column": 331, - "formater_type": 1, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 359, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "tpq_estimated", - "column": 334, - "formater_type": 1, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 365, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "label", - "column": 340, - "formater_type": 3, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 368, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "is_isolated", - "column": 344, - "formater_type": 19, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 371, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__conservatory_state", - "column": 347, - "formater_type": 22, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 374, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__preservation_to_considers", - "column": 350, - "formater_type": 23, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 377, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__length", - "column": 353, - "formater_type": 21, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 379, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__height", - "column": 355, - "formater_type": 21, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 382, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__find_number", - "column": 358, - "formater_type": 1, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 350, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "datings__period", - "column": 325, - "formater_type": 6, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": true - } - }, - { - "pk": 335, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "parcel__external_id", - "column": 311, - "formater_type": 28, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 38, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "label", - "column": 37, - "formater_type": 3, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 3, - "model": "ishtar_common.importtarget", - "fields": { - "comment": null, - "target": "common_name", - "column": 3, - "formater_type": 3, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 291, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "common_name", - "column": 266, - "formater_type": 35, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 294, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "operation_type", - "column": 269, - "formater_type": 2, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 300, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "scientist__name", - "column": 276, - "formater_type": 30, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 303, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "operator_reference", - "column": 279, - "formater_type": 3, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 309, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "start_date", - "column": 285, - "formater_type": 25, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 312, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "cira_date", - "column": 288, - "formater_type": 25, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 318, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "documentation_received", - "column": 294, - "formater_type": 19, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 321, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "comment", - "column": 297, - "formater_type": 35, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 324, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "scientific_documentation_comment", - "column": 300, - "formater_type": 35, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 326, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "operation__code_patriarche", - "column": 302, - "formater_type": 1, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 329, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "external_id", - "column": 305, - "formater_type": 11, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 332, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "year", - "column": 308, - "formater_type": 14, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 345, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "thickness", - "column": 320, - "formater_type": 21, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 348, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "has_furniture", - "column": 323, - "formater_type": 19, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 351, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "datings_comment", - "column": 326, - "formater_type": 16, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 354, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "activity", - "column": 329, - "formater_type": 42, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 357, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "tpq", - "column": 332, - "formater_type": 1, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 360, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "old_code", - "column": 335, - "formater_type": 30, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 384, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__comment", - "column": 360, - "formater_type": 35, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 385, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__dating_comment", - "column": 361, - "formater_type": 35, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 388, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__datings__period", - "column": 364, - "formater_type": 6, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": true - } - }, - { - "pk": 342, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "comment", - "column": 317, - "formater_type": 35, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 347, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "location", - "column": 322, - "formater_type": 35, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 353, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "interpretation", - "column": 328, - "formater_type": 35, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 341, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "description", - "column": 316, - "formater_type": 35, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 339, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "label", - "column": 314, - "formater_type": 30, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 302, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "operator__name", - "column": 278, - "formater_type": 10, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 305, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "in_charge__surname", - "column": 281, - "formater_type": 39, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 306, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "in_charge__name", - "column": 282, - "formater_type": 30, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 314, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "cira_rapporteur__surname", - "column": 290, - "formater_type": 39, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 315, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "cira_rapporteur__name", - "column": 291, - "formater_type": 30, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 366, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__previous_id", - "column": 341, - "formater_type": 3, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 369, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__is_complete", - "column": 345, - "formater_type": 19, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 378, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__width", - "column": 354, - "formater_type": 21, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 375, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__integrities", - "column": 351, - "formater_type": 43, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 380, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__diameter", - "column": 356, - "formater_type": 21, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 386, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__estimated_value", - "column": 362, - "formater_type": 21, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 297, + "pk": 46, "model": "ishtar_common.importtarget", "fields": { - "comment": "", - "target": "archaeological_sites__reference", - "column": 271, - "formater_type": 45, - "concat_str": "", + "comment": null, + "target": "find__conservatory_state", + "column": 45, + "formater_type": 22, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 336, + "pk": 49, "model": "ishtar_common.importtarget", "fields": { - "comment": "", - "target": "parcel__external_id", - "column": 312, - "formater_type": 11, - "concat_str": "-", + "comment": null, + "target": "topographic_localisation", + "column": 48, + "formater_type": 3, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 61, + "pk": 50, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "scientist__surname", - "column": 58, - "formater_type": 4, + "target": "special_interest", + "column": 49, + "formater_type": 3, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5460,13 +2185,13 @@ } }, { - "pk": 70, + "pk": 51, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "parcel__external_id", - "column": 67, - "formater_type": 11, + "target": "description", + "column": 50, + "formater_type": 16, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5474,13 +2199,13 @@ } }, { - "pk": 71, + "pk": 15, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "comment", - "column": 68, - "formater_type": 16, + "target": "operation__code_patriarche", + "column": 14, + "formater_type": 1, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5488,13 +2213,13 @@ } }, { - "pk": 72, + "pk": 28, "model": "ishtar_common.importtarget", "fields": { - "comment": null, - "target": "context_record__operation__code_patriarche", - "column": 69, - "formater_type": 1, + "comment": "", + "target": "label", + "column": 27, + "formater_type": 3, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5502,13 +2227,13 @@ } }, { - "pk": 75, + "pk": 48, "model": "ishtar_common.importtarget", "fields": { - "comment": null, - "target": "context_record__external_id", - "column": 72, - "formater_type": 3, + "comment": "", + "target": "comment", + "column": 47, + "formater_type": 35, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5516,13 +2241,13 @@ } }, { - "pk": 73, + "pk": 13, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "external_id", - "column": 70, - "formater_type": 3, + "target": "town__numero_insee", + "column": 12, + "formater_type": 11, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5530,13 +2255,13 @@ } }, { - "pk": 76, + "pk": 2, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "find__conservatory_state", - "column": 73, - "formater_type": 22, + "target": "operation_type", + "column": 2, + "formater_type": 2, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5544,13 +2269,13 @@ } }, { - "pk": 77, + "pk": 4, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "find__material_types", - "column": 74, - "formater_type": 20, + "target": "operator__name", + "column": 4, + "formater_type": 3, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5558,69 +2283,69 @@ } }, { - "pk": 254, + "pk": 6, "model": "ishtar_common.importtarget", "fields": { - "comment": "", - "target": "find__label", - "column": 229, - "formater_type": 3, - "concat_str": "", + "comment": null, + "target": "start_date", + "column": 6, + "formater_type": 5, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 255, + "pk": 7, "model": "ishtar_common.importtarget", "fields": { - "comment": "", - "target": "code_patriarche", - "column": 230, - "formater_type": 1, - "concat_str": "", + "comment": null, + "target": "excavation_end_date", + "column": 7, + "formater_type": 5, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 257, + "pk": 8, "model": "ishtar_common.importtarget", "fields": { - "comment": "", - "target": "common_name", - "column": 232, - "formater_type": 35, - "concat_str": "", + "comment": null, + "target": "periods", + "column": 8, + "formater_type": 6, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 259, + "pk": 14, "model": "ishtar_common.importtarget", "fields": { - "comment": "", - "target": "scientist__raw_name", - "column": 234, - "formater_type": 30, - "concat_str": "", + "comment": null, + "target": "address", + "column": 13, + "formater_type": 10, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 78, + "pk": 16, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "find__is_complete", - "column": 75, - "formater_type": 19, + "target": "external_id", + "column": 15, + "formater_type": 11, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5628,55 +2353,55 @@ } }, { - "pk": 261, + "pk": 17, "model": "ishtar_common.importtarget", "fields": { - "comment": "", - "target": "start_date", - "column": 236, - "formater_type": 5, - "concat_str": "", + "comment": null, + "target": "source_type", + "column": 16, + "formater_type": 12, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 263, + "pk": 18, "model": "ishtar_common.importtarget", "fields": { - "comment": "", - "target": "periods", - "column": 238, - "formater_type": 6, - "concat_str": "", + "comment": null, + "target": "support_type", + "column": 17, + "formater_type": 13, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 265, + "pk": 40, "model": "ishtar_common.importtarget", "fields": { - "comment": "", - "target": "operation_code", - "column": 240, - "formater_type": 1, - "concat_str": "", + "comment": null, + "target": "find__material_types", + "column": 39, + "formater_type": 20, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 58, + "pk": 19, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "operation_type", - "column": 55, - "formater_type": 2, + "target": "item_number", + "column": 18, + "formater_type": 1, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5684,13 +2409,13 @@ } }, { - "pk": 59, + "pk": 20, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "common_name", - "column": 56, - "formater_type": 3, + "target": "authors__person__raw_name", + "column": 19, + "formater_type": 4, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5698,13 +2423,13 @@ } }, { - "pk": 60, + "pk": 21, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "scientist__raw_name", - "column": 57, - "formater_type": 4, + "target": "creation_date", + "column": 20, + "formater_type": 14, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5712,13 +2437,13 @@ } }, { - "pk": 62, + "pk": 22, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "periods", - "column": 59, - "formater_type": 6, + "target": "format_type", + "column": 21, + "formater_type": 15, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5726,13 +2451,13 @@ } }, { - "pk": 64, + "pk": 23, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "excavation_end_date", - "column": 61, - "formater_type": 25, + "target": "description", + "column": 22, + "formater_type": 16, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5740,13 +2465,13 @@ } }, { - "pk": 65, + "pk": 24, "model": "ishtar_common.importtarget", "fields": { "comment": null, "target": "comment", - "column": 62, - "formater_type": 4, + "column": 23, + "formater_type": 16, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5754,13 +2479,13 @@ } }, { - "pk": 66, + "pk": 25, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "code_patriarche", - "column": 63, - "formater_type": 1, + "target": "scale", + "column": 24, + "formater_type": 17, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5768,13 +2493,13 @@ } }, { - "pk": 67, + "pk": 53, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "surface", - "column": 64, - "formater_type": 1, + "target": "parcel_number", + "column": 51, + "formater_type": 8, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5782,13 +2507,13 @@ } }, { - "pk": 63, + "pk": 54, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "start_date", - "column": 60, - "formater_type": 25, + "target": "section", + "column": 52, + "formater_type": 7, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5796,13 +2521,13 @@ } }, { - "pk": 82, + "pk": 5, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "find__find_number", - "column": 79, - "formater_type": 1, + "target": "scientist__raw_name", + "column": 5, + "formater_type": 4, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5810,13 +2535,13 @@ } }, { - "pk": 85, + "pk": 56, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "find__object_types", - "column": 82, - "formater_type": 26, + "target": "year", + "column": 11, + "formater_type": 14, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5824,13 +2549,13 @@ } }, { - "pk": 79, + "pk": 35, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "is_isolated", - "column": 76, - "formater_type": 19, + "target": "comment", + "column": 34, + "formater_type": 16, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5838,13 +2563,13 @@ } }, { - "pk": 80, + "pk": 31, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "comment", - "column": 77, - "formater_type": 16, + "target": "identification", + "column": 30, + "formater_type": 24, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5852,13 +2577,13 @@ } }, { - "pk": 84, + "pk": 57, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "find__length", - "column": 81, - "formater_type": 1, + "target": "interpretation", + "column": 54, + "formater_type": 16, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5866,13 +2591,13 @@ } }, { - "pk": 86, + "pk": 26, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "operation__code_patriarche", - "column": 83, - "formater_type": 1, + "target": "additional_information", + "column": 25, + "formater_type": 16, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5880,13 +2605,13 @@ } }, { - "pk": 87, + "pk": 29, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "town__numero_insee", - "column": 84, - "formater_type": 11, + "target": "unit", + "column": 28, + "formater_type": 18, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5894,13 +2619,13 @@ } }, { - "pk": 88, + "pk": 30, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "section", - "column": 85, - "formater_type": 7, + "target": "description", + "column": 29, + "formater_type": 16, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5908,13 +2633,13 @@ } }, { - "pk": 89, + "pk": 32, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "parcel_number", - "column": 86, - "formater_type": 8, + "target": "opening_date", + "column": 31, + "formater_type": 5, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5922,13 +2647,13 @@ } }, { - "pk": 69, + "pk": 33, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "label", - "column": 66, - "formater_type": 3, + "target": "closing_date", + "column": 32, + "formater_type": 5, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5936,12 +2661,12 @@ } }, { - "pk": 68, + "pk": 1, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "operation__code_patriarche", - "column": 65, + "target": "code_patriarche", + "column": 1, "formater_type": 1, "concat_str": null, "regexp_filter": null, @@ -5950,12 +2675,12 @@ } }, { - "pk": 90, + "pk": 41, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "context_record__operation__code_patriarche", - "column": 87, + "target": "find__find_number", + "column": 40, "formater_type": 1, "concat_str": null, "regexp_filter": null, @@ -5964,13 +2689,13 @@ } }, { - "pk": 92, + "pk": 42, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "context_record__external_id", - "column": 89, - "formater_type": 3, + "target": "find__weight", + "column": 41, + "formater_type": 21, "concat_str": null, "regexp_filter": null, "concat": false, @@ -5978,265 +2703,265 @@ } }, { - "pk": 269, + "pk": 43, "model": "ishtar_common.importtarget", "fields": { - "comment": "", - "target": "report_processing", - "column": 244, - "formater_type": 37, - "concat_str": "", + "comment": null, + "target": "find__weight_unit", + "column": 42, + "formater_type": 7, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 267, + "pk": 45, "model": "ishtar_common.importtarget", "fields": { - "comment": "", - "target": "comment", - "column": 242, - "formater_type": 35, - "concat_str": "", + "comment": null, + "target": "discovery_date", + "column": 44, + "formater_type": 5, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 93, + "pk": 36, "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "find__material_types", - "column": 90, - "formater_type": 20, + "target": "datings__period", + "column": 35, + "formater_type": 6, "concat_str": null, "regexp_filter": null, "concat": false, - "force_new": false + "force_new": true } }, { - "pk": 91, + "pk": 253, "model": "ishtar_common.importtarget", "fields": { - "comment": null, - "target": "find__previous_id", - "column": 88, - "formater_type": 3, + "comment": "", + "target": "find__datings__period", + "column": 228, + "formater_type": 6, "concat_str": null, "regexp_filter": null, "concat": false, - "force_new": false + "force_new": true } }, { - "pk": 94, + "pk": 55, "model": "ishtar_common.importtarget", "fields": { - "comment": null, - "target": "find__conservatory_state", - "column": 91, - "formater_type": 22, - "concat_str": null, + "comment": "", + "target": "external_id", + "column": 53, + "formater_type": 11, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 95, + "pk": 27, "model": "ishtar_common.importtarget", "fields": { - "comment": null, - "target": "comment", - "column": 92, - "formater_type": 16, - "concat_str": null, + "comment": "", + "target": "operation__code_patriarche", + "column": 26, + "formater_type": 1, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 96, + "pk": 250, "model": "ishtar_common.importtarget", "fields": { - "comment": null, - "target": "find__label", - "column": 93, - "formater_type": 3, - "concat_str": null, + "comment": "", + "target": "parcel__external_id", + "column": 225, + "formater_type": 28, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 97, + "pk": 34, "model": "ishtar_common.importtarget", "fields": { - "comment": null, - "target": "identification", - "column": 94, - "formater_type": 24, - "concat_str": null, + "comment": "", + "target": "parcel__external_id", + "column": 33, + "formater_type": 11, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 98, + "pk": 37, "model": "ishtar_common.importtarget", "fields": { - "comment": null, - "target": "description", - "column": 95, - "formater_type": 16, - "concat_str": null, + "comment": "", + "target": "context_record__external_id", + "column": 36, + "formater_type": 11, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 99, + "pk": 252, "model": "ishtar_common.importtarget", "fields": { - "comment": null, - "target": "datings__period", - "column": 96, - "formater_type": 6, - "concat_str": null, + "comment": "", + "target": "context_record__external_id", + "column": 227, + "formater_type": 28, + "concat_str": "-", "regexp_filter": null, "concat": false, - "force_new": true + "force_new": false } }, { - "pk": 83, + "pk": 44, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__weight", - "column": 80, - "formater_type": 21, - "concat_str": null, + "target": "context_record__external_id", + "column": 43, + "formater_type": 3, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 132, + "pk": 9, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__previous_id", - "column": 122, - "formater_type": 3, - "concat_str": null, + "target": "operation__code_patriarche", + "column": 9, + "formater_type": 1, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 134, + "pk": 251, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__description", - "column": 124, - "formater_type": 16, - "concat_str": null, + "target": "context_record__external_id", + "column": 226, + "formater_type": 35, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 135, + "pk": 290, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__width", - "column": 125, - "formater_type": 21, - "concat_str": null, + "target": "code_patriarche", + "column": 265, + "formater_type": 1, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 136, + "pk": 293, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__height", - "column": 126, - "formater_type": 21, - "concat_str": null, + "target": "operation_code", + "column": 268, + "formater_type": 1, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 137, + "pk": 296, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__diameter", - "column": 127, - "formater_type": 21, - "concat_str": null, + "target": "periods", + "column": 273, + "formater_type": 6, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 138, + "pk": 299, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__dating_comment", - "column": 128, - "formater_type": 16, - "concat_str": null, + "target": "scientist__surname", + "column": 275, + "formater_type": 3, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 81, + "pk": 308, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__datings__period", - "column": 78, - "formater_type": 6, - "concat_str": null, + "target": "surface", + "column": 284, + "formater_type": 1, + "concat_str": "", "regexp_filter": null, "concat": false, - "force_new": true + "force_new": false } }, { - "pk": 256, + "pk": 311, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "operation_type", - "column": 231, - "formater_type": 2, + "target": "end_date", + "column": 287, + "formater_type": 25, "concat_str": "", "regexp_filter": null, "concat": false, @@ -6244,13 +2969,13 @@ } }, { - "pk": 258, + "pk": 317, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "operator__name", - "column": 233, - "formater_type": 3, + "target": "documentation_deadline", + "column": 293, + "formater_type": 25, "concat_str": "", "regexp_filter": null, "concat": false, @@ -6258,13 +2983,13 @@ } }, { - "pk": 260, + "pk": 320, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "scientist__surname", - "column": 235, - "formater_type": 4, + "target": "finds_received", + "column": 296, + "formater_type": 19, "concat_str": "", "regexp_filter": null, "concat": false, @@ -6272,13 +2997,13 @@ } }, { - "pk": 262, + "pk": 323, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "excavation_end_date", - "column": 237, - "formater_type": 5, + "target": "report_processing", + "column": 299, + "formater_type": 37, "concat_str": "", "regexp_filter": null, "concat": false, @@ -6286,13 +3011,13 @@ } }, { - "pk": 264, + "pk": 47, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "year", - "column": 239, - "formater_type": 1, + "target": "find__preservation_to_considers", + "column": 46, + "formater_type": 23, "concat_str": "", "regexp_filter": null, "concat": false, @@ -6300,13 +3025,13 @@ } }, { - "pk": 266, + "pk": 325, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "code_dracar", - "column": 241, - "formater_type": 16, + "target": "image", + "column": 301, + "formater_type": 27, "concat_str": "", "regexp_filter": null, "concat": false, @@ -6314,13 +3039,13 @@ } }, { - "pk": 268, + "pk": 328, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "report_delivery_date", - "column": 243, - "formater_type": 5, + "target": "town__numero_insee", + "column": 304, + "formater_type": 11, "concat_str": "", "regexp_filter": null, "concat": false, @@ -6328,223 +3053,223 @@ } }, { - "pk": 212, + "pk": 331, "model": "ishtar_common.importtarget", "fields": { - "comment": "Am\u00e9nageur - adresse", - "target": "general_contractor__attached_to__address", - "column": 192, - "formater_type": 10, - "concat_str": null, + "comment": "", + "target": "parcel_number", + "column": 307, + "formater_type": 8, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 213, + "pk": 334, "model": "ishtar_common.importtarget", "fields": { - "comment": "Am\u00e9nageur - adresse", - "target": "general_contractor__attached_to__postal_code", - "column": 192, - "formater_type": 28, - "concat_str": null, + "comment": "", + "target": "public_domain", + "column": 310, + "formater_type": 19, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 214, + "pk": 338, "model": "ishtar_common.importtarget", "fields": { - "comment": "Am\u00e9nageur - adresse", - "target": "general_contractor__attached_to__town", - "column": 192, - "formater_type": 31, - "concat_str": null, + "comment": "", + "target": "remains", + "column": 272, + "formater_type": 41, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 215, + "pk": 344, "model": "ishtar_common.importtarget", "fields": { - "comment": "Am\u00e9nageur - nom brut", - "target": "general_contractor__raw_name", - "column": 193, - "formater_type": 30, - "concat_str": null, + "comment": "", + "target": "width", + "column": 319, + "formater_type": 21, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 216, + "pk": 349, "model": "ishtar_common.importtarget", "fields": { - "comment": "Am\u00e9nageur - titre", - "target": "general_contractor__title", - "column": 194, - "formater_type": 29, - "concat_str": null, + "comment": "", + "target": "image", + "column": 324, + "formater_type": 27, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 217, + "pk": 356, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "parcels__year", - "column": 195, - "formater_type": 29, - "concat_str": null, + "target": "taq", + "column": 331, + "formater_type": 1, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 218, + "pk": 359, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "", - "column": 196, - "formater_type": 29, - "concat_str": null, + "target": "tpq_estimated", + "column": 334, + "formater_type": 1, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 219, + "pk": 365, "model": "ishtar_common.importtarget", "fields": { - "comment": "Commune (si non d\u00e9finie avant)", - "target": "['main_town', 'parcels__town']", - "column": 197, - "formater_type": 29, - "concat_str": null, + "comment": "", + "target": "label", + "column": 340, + "formater_type": 3, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 220, + "pk": 371, "model": "ishtar_common.importtarget", "fields": { - "comment": "Commune (si non d\u00e9finie avant)", - "target": "['main_town', 'parcels__town']", - "column": 198, - "formater_type": 29, - "concat_str": null, + "comment": "", + "target": "find__conservatory_state", + "column": 347, + "formater_type": 22, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 221, + "pk": 374, "model": "ishtar_common.importtarget", "fields": { - "comment": "Type de saisine", - "target": "saisine_type", - "column": 199, - "formater_type": 32, - "concat_str": null, + "comment": "", + "target": "find__preservation_to_considers", + "column": 350, + "formater_type": 23, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 222, + "pk": 377, "model": "ishtar_common.importtarget", "fields": { - "comment": "Nom du dossier", - "target": "name", - "column": 200, - "formater_type": 35, - "concat_str": null, + "comment": "", + "target": "find__length", + "column": 353, + "formater_type": 21, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 223, + "pk": 379, "model": "ishtar_common.importtarget", "fields": { - "comment": "Service instructeur - adresse", - "target": "responsible_town_planning_service__raw_name", - "column": 201, - "formater_type": 4, - "concat_str": null, + "comment": "", + "target": "find__height", + "column": 355, + "formater_type": 21, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 224, + "pk": 382, "model": "ishtar_common.importtarget", "fields": { - "comment": "Service instructeur - adresse", - "target": "responsible_town_planning_service__attached_to__address", - "column": 201, - "formater_type": 4, - "concat_str": null, + "comment": "", + "target": "find__find_number", + "column": 358, + "formater_type": 1, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 225, + "pk": 350, "model": "ishtar_common.importtarget", "fields": { - "comment": "Service instructeur - adresse", - "target": "responsible_town_planning_service__attached_to__postal_code", - "column": 201, - "formater_type": 28, - "concat_str": null, + "comment": "", + "target": "datings__period", + "column": 325, + "formater_type": 6, + "concat_str": "", "regexp_filter": null, "concat": false, - "force_new": false + "force_new": true } }, { - "pk": 226, + "pk": 335, "model": "ishtar_common.importtarget", "fields": { - "comment": "Service instructeur - adresse", - "target": "responsible_town_planning_service__attached_to__town", - "column": 201, - "formater_type": 31, - "concat_str": null, + "comment": "", + "target": "parcel__external_id", + "column": 311, + "formater_type": 28, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 227, + "pk": 38, "model": "ishtar_common.importtarget", "fields": { - "comment": "Commentaire", - "target": "comment", - "column": 202, - "formater_type": 35, + "comment": "", + "target": "label", + "column": 37, + "formater_type": 3, "concat_str": null, "regexp_filter": null, "concat": false, @@ -6552,13 +3277,13 @@ } }, { - "pk": 228, + "pk": 3, "model": "ishtar_common.importtarget", "fields": { - "comment": "Date de r\u00e9ception", - "target": "reception_date", - "column": 203, - "formater_type": 25, + "comment": null, + "target": "common_name", + "column": 3, + "formater_type": 3, "concat_str": null, "regexp_filter": null, "concat": false, @@ -6566,167 +3291,167 @@ } }, { - "pk": 229, + "pk": 291, "model": "ishtar_common.importtarget", "fields": { - "comment": "Date de cr\u00e9ation", - "target": "creation_date", - "column": 204, - "formater_type": 25, - "concat_str": null, + "comment": "", + "target": "common_name", + "column": 266, + "formater_type": 35, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 230, + "pk": 294, "model": "ishtar_common.importtarget", "fields": { - "comment": "Commentaire", - "target": "comment", - "column": 205, - "formater_type": 35, - "concat_str": null, + "comment": "", + "target": "operation_type", + "column": 269, + "formater_type": 2, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 231, + "pk": 300, "model": "ishtar_common.importtarget", "fields": { - "comment": "Autre r\u00e9f\u00e9rence", - "target": "internal_reference", - "column": 206, - "formater_type": 36, - "concat_str": null, + "comment": "", + "target": "scientist__name", + "column": 276, + "formater_type": 30, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 232, + "pk": 303, "model": "ishtar_common.importtarget", "fields": { - "comment": "Justificatif de prescription", - "target": "comment", - "column": 207, - "formater_type": 35, - "concat_str": null, + "comment": "", + "target": "operator_reference", + "column": 279, + "formater_type": 3, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 233, + "pk": 309, "model": "ishtar_common.importtarget", "fields": { - "comment": "Justificatif d'intervention", - "target": "comment", - "column": 208, - "formater_type": 35, - "concat_str": null, + "comment": "", + "target": "start_date", + "column": 285, + "formater_type": 25, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 234, + "pk": 312, "model": "ishtar_common.importtarget", "fields": { - "comment": "M\u00e9thodologie de l'op\u00e9ration", - "target": "comment", - "column": 209, - "formater_type": 35, - "concat_str": null, + "comment": "", + "target": "cira_date", + "column": 288, + "formater_type": 25, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 235, + "pk": 318, "model": "ishtar_common.importtarget", "fields": { - "comment": "R\u00e9f. du permis de construire", - "target": "permit_reference", - "column": 210, - "formater_type": 4, - "concat_str": null, + "comment": "", + "target": "documentation_received", + "column": 294, + "formater_type": 19, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 236, + "pk": 321, "model": "ishtar_common.importtarget", "fields": { - "comment": "R\u00e9f\u00e9rence de dossier am\u00e9nageur", + "comment": "", "target": "comment", - "column": 211, + "column": 297, "formater_type": 35, - "concat_str": null, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 237, + "pk": 324, "model": "ishtar_common.importtarget", "fields": { - "comment": "Num\u00e9ro d'arr\u00eat\u00e9 pr\u00e9fectoral", - "target": "comment", - "column": 212, + "comment": "", + "target": "scientific_documentation_comment", + "column": 300, "formater_type": 35, - "concat_str": null, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 238, + "pk": 326, "model": "ishtar_common.importtarget", "fields": { - "comment": "Num\u00e9ro d'arr\u00eat\u00e9 SRA", - "target": "comment", - "column": 213, - "formater_type": 35, - "concat_str": null, + "comment": "", + "target": "operation__code_patriarche", + "column": 302, + "formater_type": 1, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 239, + "pk": 329, "model": "ishtar_common.importtarget", "fields": { - "comment": "Num\u00e9ro d'arr\u00eat\u00e9 de post-diagnostic", - "target": "comment", - "column": 214, - "formater_type": 35, - "concat_str": null, + "comment": "", + "target": "external_id", + "column": 305, + "formater_type": 11, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 372, + "pk": 332, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__conservatory_comment", - "column": 348, - "formater_type": 35, + "target": "year", + "column": 308, + "formater_type": 14, "concat_str": "", "regexp_filter": null, "concat": false, @@ -6734,13 +3459,13 @@ } }, { - "pk": 383, + "pk": 345, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__mark", - "column": 359, - "formater_type": 35, + "target": "thickness", + "column": 320, + "formater_type": 21, "concat_str": "", "regexp_filter": null, "concat": false, @@ -6748,152 +3473,152 @@ } }, { - "pk": 240, + "pk": 348, "model": "ishtar_common.importtarget", "fields": { - "comment": "Commune (si non d\u00e9finie avant)", - "target": "['main_town', 'parcels__town']", - "column": 215, - "formater_type": 29, - "concat_str": null, + "comment": "", + "target": "has_furniture", + "column": 323, + "formater_type": 19, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 241, + "pk": 351, "model": "ishtar_common.importtarget", "fields": { - "comment": "Commentaire", - "target": "comment", - "column": 216, - "formater_type": 33, - "concat_str": null, + "comment": "", + "target": "datings_comment", + "column": 326, + "formater_type": 16, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 242, + "pk": 354, "model": "ishtar_common.importtarget", "fields": { - "comment": "Service instructeur - nom", - "target": "responsible_town_planning_service__attached_to__name", - "column": 217, - "formater_type": 4, - "concat_str": null, + "comment": "", + "target": "activity", + "column": 329, + "formater_type": 42, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 243, + "pk": 357, "model": "ishtar_common.importtarget", "fields": { - "comment": "Responsable - nom brut", - "target": "in_charge__raw_name", - "column": 218, - "formater_type": 30, - "concat_str": null, + "comment": "", + "target": "tpq", + "column": 332, + "formater_type": 1, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 244, + "pk": 360, "model": "ishtar_common.importtarget", "fields": { - "comment": "Surface totale", - "target": "total_surface", - "column": 219, - "formater_type": 29, - "concat_str": null, + "comment": "", + "target": "old_code", + "column": 335, + "formater_type": 30, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 245, + "pk": 384, "model": "ishtar_common.importtarget", "fields": { - "comment": "Surface totale am\u00e9nag\u00e9e", - "target": "total_developed_surface", - "column": 220, - "formater_type": 29, - "concat_str": null, + "comment": "", + "target": "find__comment", + "column": 360, + "formater_type": 35, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 246, + "pk": 385, "model": "ishtar_common.importtarget", "fields": { - "comment": "Type de permis", - "target": "permit_type", - "column": 221, - "formater_type": 34, - "concat_str": null, + "comment": "", + "target": "find__dating_comment", + "column": 361, + "formater_type": 35, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 247, + "pk": 388, "model": "ishtar_common.importtarget", "fields": { - "comment": "Ann\u00e9e du dossier", - "target": "year", - "column": 222, - "formater_type": 1, - "concat_str": null, + "comment": "", + "target": "find__datings__period", + "column": 364, + "formater_type": 6, + "concat_str": "", "regexp_filter": null, "concat": false, - "force_new": false + "force_new": true } }, { - "pk": 248, + "pk": 342, "model": "ishtar_common.importtarget", "fields": { - "comment": "Identifiant num\u00e9rique", - "target": "numeric_reference", - "column": 223, - "formater_type": 1, - "concat_str": null, + "comment": "", + "target": "comment", + "column": 317, + "formater_type": 35, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 249, + "pk": 347, "model": "ishtar_common.importtarget", "fields": { - "comment": "Identifiant externe", - "target": "external_id", - "column": 224, + "comment": "", + "target": "location", + "column": 322, "formater_type": 35, - "concat_str": null, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 270, + "pk": 353, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "alt_address", - "column": 245, + "target": "interpretation", + "column": 328, "formater_type": 35, "concat_str": "", "regexp_filter": null, @@ -6902,12 +3627,12 @@ } }, { - "pk": 272, + "pk": 341, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "address", - "column": 247, + "target": "description", + "column": 316, "formater_type": 35, "concat_str": "", "regexp_filter": null, @@ -6916,13 +3641,13 @@ } }, { - "pk": 273, + "pk": 339, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "alt_postal_code", - "column": 248, - "formater_type": 38, + "target": "label", + "column": 314, + "formater_type": 30, "concat_str": "", "regexp_filter": null, "concat": false, @@ -6930,13 +3655,13 @@ } }, { - "pk": 274, + "pk": 302, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "postal_code", - "column": 249, - "formater_type": 38, + "target": "operator__name", + "column": 278, + "formater_type": 10, "concat_str": "", "regexp_filter": null, "concat": false, @@ -6944,13 +3669,13 @@ } }, { - "pk": 275, + "pk": 305, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "alt_address_is_prefered", - "column": 250, - "formater_type": 19, + "target": "in_charge__surname", + "column": 281, + "formater_type": 39, "concat_str": "", "regexp_filter": null, "concat": false, @@ -6958,41 +3683,41 @@ } }, { - "pk": 276, + "pk": 306, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "comment", - "column": 251, - "formater_type": 35, + "target": "in_charge__name", + "column": 282, + "formater_type": 30, "concat_str": "", "regexp_filter": null, - "concat": true, + "concat": false, "force_new": false } }, { - "pk": 277, + "pk": 314, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "comment", - "column": 252, - "formater_type": 35, + "target": "cira_rapporteur__surname", + "column": 290, + "formater_type": 39, "concat_str": "", "regexp_filter": null, - "concat": true, + "concat": false, "force_new": false } }, { - "pk": 278, + "pk": 315, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "contact_type", - "column": 253, - "formater_type": 35, + "target": "cira_rapporteur__name", + "column": 291, + "formater_type": 30, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7000,13 +3725,13 @@ } }, { - "pk": 279, + "pk": 368, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "name", - "column": 254, - "formater_type": 30, + "target": "batch", + "column": 344, + "formater_type": 48, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7014,13 +3739,13 @@ } }, { - "pk": 281, + "pk": 366, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "comment", - "column": 256, - "formater_type": 35, + "target": "find__previous_id", + "column": 341, + "formater_type": 3, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7028,13 +3753,13 @@ } }, { - "pk": 282, + "pk": 369, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "raw_phone", - "column": 257, - "formater_type": 35, + "target": "find__is_complete", + "column": 345, + "formater_type": 19, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7042,13 +3767,13 @@ } }, { - "pk": 283, + "pk": 378, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "alt_country", - "column": 258, - "formater_type": 17, + "target": "find__width", + "column": 354, + "formater_type": 21, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7056,13 +3781,13 @@ } }, { - "pk": 284, + "pk": 375, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "country", - "column": 259, - "formater_type": 17, + "target": "find__integrities", + "column": 351, + "formater_type": 43, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7070,13 +3795,13 @@ } }, { - "pk": 285, + "pk": 380, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "surname", - "column": 260, - "formater_type": 39, + "target": "find__diameter", + "column": 356, + "formater_type": 21, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7084,13 +3809,13 @@ } }, { - "pk": 286, + "pk": 386, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "title", - "column": 261, - "formater_type": 31, + "target": "find__estimated_value", + "column": 362, + "formater_type": 21, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7098,13 +3823,13 @@ } }, { - "pk": 288, + "pk": 297, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "alt_town", - "column": 263, - "formater_type": 31, + "target": "archaeological_sites__reference", + "column": 271, + "formater_type": 45, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7112,27 +3837,27 @@ } }, { - "pk": 289, + "pk": 336, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "town", - "column": 264, - "formater_type": 31, - "concat_str": "", + "target": "parcel__external_id", + "column": 312, + "formater_type": 11, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 287, + "pk": 254, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "phone_desc", - "column": 262, - "formater_type": 4, + "target": "find__label", + "column": 229, + "formater_type": 3, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7140,13 +3865,13 @@ } }, { - "pk": 271, + "pk": 372, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "email", - "column": 246, - "formater_type": 4, + "target": "find__conservatory_comment", + "column": 348, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7154,13 +3879,13 @@ } }, { - "pk": 280, + "pk": 383, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "attached_to__name", - "column": 255, - "formater_type": 10, + "target": "find__mark", + "column": 359, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7770,6 +4495,15 @@ "options": "archaeological_files.models.SaisineType" } }, + { + "pk": 48, + "model": "ishtar_common.formatertype", + "fields": { + "formater_type": "TypeFormater", + "many_split": "", + "options": "archaeological_finds.models.BatchType" + } + }, { "pk": 22, "model": "ishtar_common.formatertype", @@ -8076,105 +4810,6 @@ "options": "%Y" } }, - { - "pk": 7, - "model": "ishtar_common.importerduplicatefield", - "fields": { - "column": 57, - "concat_str": null, - "field_name": "scientist__name", - "concat": false, - "force_new": false - } - }, - { - "pk": 8, - "model": "ishtar_common.importerduplicatefield", - "fields": { - "column": 58, - "concat_str": null, - "field_name": "scientist__surname", - "concat": false, - "force_new": false - } - }, - { - "pk": 10, - "model": "ishtar_common.importerduplicatefield", - "fields": { - "column": 70, - "concat_str": null, - "field_name": "find__external_id", - "concat": false, - "force_new": false - } - }, - { - "pk": 11, - "model": "ishtar_common.importerduplicatefield", - "fields": { - "column": 76, - "concat_str": null, - "field_name": "", - "concat": false, - "force_new": false - } - }, - { - "pk": 12, - "model": "ishtar_common.importerduplicatefield", - "fields": { - "column": 70, - "concat_str": null, - "field_name": "label", - "concat": false, - "force_new": false - } - }, - { - "pk": 13, - "model": "ishtar_common.importerduplicatefield", - "fields": { - "column": 70, - "concat_str": null, - "field_name": "find__label", - "concat": false, - "force_new": false - } - }, - { - "pk": 9, - "model": "ishtar_common.importerduplicatefield", - "fields": { - "column": 66, - "concat_str": null, - "field_name": "external_id", - "concat": false, - "force_new": false - } - }, - { - "pk": 14, - "model": "ishtar_common.importerduplicatefield", - "fields": { - "column": 77, - "concat_str": null, - "field_name": "find__comment", - "concat": false, - "force_new": false - } - }, - { - "pk": 30, - "model": "ishtar_common.importerduplicatefield", - "fields": { - "column": 234, - "concat_str": "", - "field_name": "scientist__name", - "concat": false, - "force_new": false - } - }, { "pk": 5, "model": "ishtar_common.importerduplicatefield", @@ -8582,4 +5217,4 @@ "force_new": false } } -] +] \ No newline at end of file -- cgit v1.2.3 From ba894cfb669ef0d0d22fd3efb432d639e63b4286 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 4 Feb 2017 14:16:21 +0100 Subject: Test - warehouse: explicit error on container creation form --- archaeological_warehouse/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archaeological_warehouse/tests.py b/archaeological_warehouse/tests.py index 850af8218..691275876 100644 --- a/archaeological_warehouse/tests.py +++ b/archaeological_warehouse/tests.py @@ -180,7 +180,7 @@ class ContainerTest(FindInit, TestCase): "container_type": models.ContainerType.objects.all()[0].pk } form = forms.ContainerForm(data=data) - self.assertTrue(form.is_valid()) + self.assertTrue(form.is_valid(), msg="{}".format(form.errors)) self.container_number = models.Container.objects.count() self.create_user() form.save(self.user) -- cgit v1.2.3 From b22c070cd149ebd0faa1b3ad8735f44434ea2310 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Sat, 4 Feb 2017 14:29:29 +0100 Subject: Update labels --- archaeological_context_records/models.py | 4 ++-- ishtar_common/models.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index ad6c1a378..9714673e6 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -44,8 +44,8 @@ post_delete.connect(post_save_cache, sender=DatingType) class DatingQuality(GeneralType): class Meta: - verbose_name = _(u"Dating quality") - verbose_name_plural = _(u"Dating qualities") + verbose_name = _(u"Dating quality type") + verbose_name_plural = _(u"Dating quality types") ordering = ('label',) post_save.connect(post_save_cache, sender=DatingQuality) post_delete.connect(post_save_cache, sender=DatingQuality) diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 5bad7a63c..15c8fe5da 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2850,8 +2850,8 @@ post_delete.connect(post_save_cache, sender=SupportType) class Format(GeneralType): class Meta: - verbose_name = _(u"Format") - verbose_name_plural = _(u"Formats") + verbose_name = _(u"Format type") + verbose_name_plural = _(u"Format types") ordering = ['label'] post_save.connect(post_save_cache, sender=Format) post_delete.connect(post_save_cache, sender=Format) -- cgit v1.2.3 From 29a7c801110121f51268df69fbe604b116d44472 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 4 Feb 2017 17:56:28 +0100 Subject: v0.99.10 --- CHANGES.md | 13 +++++++++++++ version.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 73754910d..ddb825759 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,19 @@ Ishtar changelog ================ +v0.99.10 (2017-02-04) +--------------------- + +### Features ### +- Admin: many changes on ordering, label and table columns +- Admin: add CSV export to general types +- Admin: add basic tests for general types +- Admin: add title types, formats and support types +- Fixtures: update all fixtures from reference +- Fixtures: add spatial ref system +- Makefile: add format, title type and support type to common fixtures, adapt fixtures +- Test - warehouse: explicit error on container creation form + 0.99.9 (2017-02-03) ------------------- diff --git a/version.py b/version.py index f9e9cf869..9bde12a00 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 99, 9) +VERSION = (0, 99, 10) def get_version(): -- cgit v1.2.3 From 0d70cfb9f162d58a8faa51b2f88b44ba9bf79dcc Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Sat, 4 Feb 2017 19:30:36 +0100 Subject: Admin: Ishtar common: add label search for GeneralType --- ishtar_common/admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 7b671caae..6b28c984e 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -201,6 +201,7 @@ admin.site.register(models.GlobalVar, GlobalVarAdmin) class GeneralTypeAdmin(admin.ModelAdmin): list_display = ['label', 'txt_idx', 'available', 'comment'] + search_fields = ('label',) actions = ['import_generic', export_as_csv_action()] import_generic = gen_import_generic -- cgit v1.2.3 From 804d5a65839300a3c0765b7be6d3e67af6901fe2 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Sat, 4 Feb 2017 21:31:00 +0100 Subject: Admin: Archaeological operations: add order for ReportState --- archaeological_operations/admin.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py index d8ce23662..3abf22eae 100644 --- a/archaeological_operations/admin.py +++ b/archaeological_operations/admin.py @@ -105,10 +105,16 @@ class ActTypeAdmin(GeneralTypeAdmin): list_filter = ('intented_to',) list_display = ['label', 'txt_idx', 'available', 'intented_to'] - admin.site.register(models.ActType, ActTypeAdmin) -general_models = [models.RemainType, models.ReportState] + +class ReportStateAdmin(GeneralTypeAdmin): + list_display = ['label', 'txt_idx', 'available', 'order', 'comment'] + +admin.site.register(models.ReportState, ReportStateAdmin) + + +general_models = [models.RemainType] for model in general_models: admin.site.register(model, GeneralTypeAdmin) -- cgit v1.2.3 From d5a7eab71905c426c86a14a0f2c33ad4c01d0e07 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 4 Feb 2017 21:29:26 +0100 Subject: Update french translation --- translations/fr/archaeological_context_records.po | 14 +++++++------- translations/fr/archaeological_warehouse.po | 6 +++--- translations/fr/ishtar_common.po | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index 633a55cec..3c3dc5169 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-02-02 10:17-0500\n" +"PO-Revision-Date: 2017-02-04 08:33-0500\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" @@ -364,24 +364,24 @@ msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -"« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été créée " -"après cette date" +"« Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée " +"après cette date." #: models.py:209 msgid "Estimation of a \"Terminus Ante Quem\"" -msgstr "Estimation d'un « Terminus Ante Quem »" +msgstr "Estimation d'un « Terminus Ante Quem »." #: models.py:212 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -"« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été créée " -"avant cette date" +"« Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée " +"avant cette date." #: models.py:216 msgid "Estimation of a \"Terminus Post Quem\"" -msgstr "Estimation d'un « Terminus Post Quem »" +msgstr "Estimation d'un « Terminus Post Quem »." #: models.py:224 msgid "Point" diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index 7071aec57..e7bdbe6f6 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -9,8 +9,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-02-02 10:17-0500\n" -"Last-Translator: Valérie-Emma Leroux \n" +"PO-Revision-Date: 2017-02-04 08:26-0500\n" +"Last-Translator: Copied by Zanata \n" "Language-Team: \n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=n>1;\n" @@ -176,7 +176,7 @@ msgstr "Contenants" #: models.py:37 msgid "Warehouse types" -msgstr "Types de dépôts" +msgstr "Types de dépôt" #: models.py:56 models.py:186 msgid "External ID" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index a5cd454fd..928754462 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -11,8 +11,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-02-03 04:25-0500\n" -"Last-Translator: Étienne Loks \n" +"PO-Revision-Date: 2017-02-04 04:55-0500\n" +"Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=n>1;\n" @@ -469,7 +469,7 @@ msgstr "Description" #: forms_common.py:796 models.py:2887 msgid "Additional information" -msgstr "Informations supplémentaires" +msgstr "Information supplémentaire" #: forms_common.py:798 forms_common.py:830 models.py:2889 msgid "Has a duplicate" @@ -495,7 +495,7 @@ msgstr "Auteur" #: forms_common.py:829 msgid "Additional informations" -msgstr "Informations complémentaires" +msgstr "Informations supplémentaires" #: forms_common.py:840 msgid "Would you like to delete this documentation?" -- cgit v1.2.3 From 0b0a146fbacde80528b7fb12bfe5719fdef40c85 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 4 Feb 2017 21:31:04 +0100 Subject: Update translation files --- archaeological_context_records/locale/django.pot | 6 +- archaeological_files/locale/django.pot | 1 + archaeological_finds/locale/django.pot | 1 - ishtar_common/locale/django.pot | 127 ++++++++++--------- translations/fr/archaeological_context_records.po | 14 ++- translations/fr/archaeological_files.po | 8 +- translations/fr/archaeological_files_pdl.po | 8 +- translations/fr/archaeological_finds.po | 14 +-- translations/fr/archaeological_operations.po | 11 +- translations/fr/archaeological_warehouse.po | 8 +- translations/fr/ishtar_common.po | 144 ++++++++++++---------- 11 files changed, 186 insertions(+), 156 deletions(-) diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index 75e6a2160..e42400f29 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -3,7 +3,7 @@ # This file is distributed under the same license as the Ishtar package. # Étienne Loks , 2010-2015. # Valérie-Emma Leroux , 2016. #zanata -# Étienne Loks , 2017. #zanata +# Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" @@ -253,11 +253,11 @@ msgid "Dating types" msgstr "" #: models.py:47 -msgid "Dating quality" +msgid "Dating quality type" msgstr "" #: models.py:48 -msgid "Dating qualities" +msgid "Dating quality types" msgstr "" #: models.py:62 diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot index 111ba45c4..3eecfc8cd 100644 --- a/archaeological_files/locale/django.pot +++ b/archaeological_files/locale/django.pot @@ -5,6 +5,7 @@ # Étienne Loks , 2015. #zanata # Valérie-Emma Leroux , 2016. #zanata # Étienne Loks , 2016. #zanata +# Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index 819cf38bf..b25eac027 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -4,7 +4,6 @@ # Étienne Loks , 2010-2015. # Valérie-Emma Leroux , 2016. #zanata # Valérie-Emma Leroux , 2017. #zanata -# Étienne Loks , 2017. #zanata msgid "" msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 458368a35..797aad587 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -6,7 +6,6 @@ # Valérie-Emma Leroux , 2016. #zanata # Étienne Loks , 2016. #zanata # Valérie-Emma Leroux , 2017. #zanata -# Étienne Loks , 2017. #zanata msgid "" msgstr "" @@ -22,6 +21,10 @@ msgstr "" msgid "Related item" msgstr "" +#: admin.py:79 +msgid "Export selected as CSV file" +msgstr "" + #: data_importer.py:182 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." @@ -162,7 +165,7 @@ msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:182 -#: forms_common.py:406 models.py:1539 models.py:2940 +#: forms_common.py:406 models.py:1539 models.py:2943 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -179,7 +182,7 @@ msgid "" msgstr "" #: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1712 -#: models.py:2567 models.py:2749 models.py:2810 +#: models.py:2567 models.py:2749 models.py:2811 #: templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -198,7 +201,7 @@ msgstr "" #: forms_common.py:173 forms_common.py:210 forms_common.py:322 #: forms_common.py:376 forms_common.py:446 models.py:1094 models.py:1472 -#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2926 +#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2929 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" @@ -247,7 +250,7 @@ msgid "Mobile phone" msgstr "" #: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2144 -#: models.py:2446 models.py:2861 templates/sheet_ope.html:85 +#: models.py:2446 models.py:2864 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:23 @@ -290,7 +293,7 @@ msgid "Identity" msgstr "" #: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2109 -#: models.py:2545 models.py:2547 models.py:2858 templates/sheet_ope.html:104 +#: models.py:2545 models.py:2547 models.py:2861 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" @@ -391,7 +394,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:628 forms_common.py:641 models.py:2941 +#: forms_common.py:628 forms_common.py:641 models.py:2944 msgid "Towns" msgstr "" @@ -407,7 +410,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2835 +#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2836 msgid "Source type" msgstr "" @@ -419,37 +422,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:783 models.py:2872 +#: forms_common.py:783 models.py:2875 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:784 models.py:2874 +#: forms_common.py:784 models.py:2877 msgid "Receipt date" msgstr "" -#: forms_common.py:786 models.py:2273 models.py:2876 +#: forms_common.py:786 models.py:2273 models.py:2879 msgid "Creation date" msgstr "" -#: forms_common.py:789 models.py:2879 +#: forms_common.py:789 models.py:2882 msgid "Receipt date in documentation" msgstr "" #: forms_common.py:791 forms_common.py:827 models.py:376 models.py:687 -#: models.py:2004 models.py:2559 models.py:2886 +#: models.py:2004 models.py:2559 models.py:2889 msgid "Comment" msgstr "" #: forms_common.py:793 forms_common.py:826 models.py:1096 models.py:1762 -#: models.py:1936 models.py:1978 models.py:2885 templates/sheet_ope.html:128 +#: models.py:1936 models.py:1978 models.py:2888 templates/sheet_ope.html:128 msgid "Description" msgstr "" -#: forms_common.py:796 models.py:2887 +#: forms_common.py:796 models.py:2890 msgid "Additional information" msgstr "" -#: forms_common.py:798 forms_common.py:830 models.py:2889 +#: forms_common.py:798 forms_common.py:830 models.py:2892 msgid "Has a duplicate" msgstr "" @@ -464,7 +467,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2815 +#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2816 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -477,7 +480,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2812 +#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2813 msgid "Author type" msgstr "" @@ -489,7 +492,7 @@ msgstr "" msgid "There are identical authors." msgstr "" -#: forms_common.py:893 models.py:2816 models.py:2868 +#: forms_common.py:893 models.py:2817 models.py:2871 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -507,7 +510,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1268 views.py:1548 +#: ishtar_menu.py:39 models.py:1268 views.py:1549 msgid "Global variables" msgstr "" @@ -539,15 +542,15 @@ msgstr "" msgid "Imports" msgstr "" -#: ishtar_menu.py:112 views.py:1556 +#: ishtar_menu.py:112 views.py:1557 msgid "New import" msgstr "" -#: ishtar_menu.py:116 views.py:1570 +#: ishtar_menu.py:116 views.py:1571 msgid "Current imports" msgstr "" -#: ishtar_menu.py:120 views.py:1606 +#: ishtar_menu.py:120 views.py:1607 msgid "Old imports" msgstr "" @@ -591,7 +594,7 @@ msgstr "" msgid "Creator" msgstr "" -#: models.py:956 models.py:2952 models.py:3008 +#: models.py:956 models.py:2955 models.py:3011 msgid "Order" msgstr "" @@ -886,11 +889,11 @@ msgstr "" msgid "Operation source" msgstr "" -#: models.py:1722 views.py:1364 views.py:1414 +#: models.py:1722 views.py:1365 views.py:1415 msgid "Archaeological files" msgstr "" -#: models.py:1724 views.py:1367 views.py:1422 +#: models.py:1724 views.py:1368 views.py:1423 msgid "Context records" msgstr "" @@ -1022,11 +1025,11 @@ msgstr "" msgid "Importer - Targets keys" msgstr "" -#: models.py:2112 models.py:2851 models.py:2864 +#: models.py:2112 models.py:2867 msgid "Format" msgstr "" -#: models.py:2113 models.py:2956 +#: models.py:2113 models.py:2959 msgid "Operation type" msgstr "" @@ -1090,11 +1093,11 @@ msgstr "" msgid "Context record relation type" msgstr "" -#: models.py:2132 models.py:3014 +#: models.py:2132 models.py:3017 msgid "Spatial reference system" msgstr "" -#: models.py:2133 models.py:2843 +#: models.py:2133 models.py:2845 msgid "Support type" msgstr "" @@ -1380,75 +1383,79 @@ msgstr "" msgid "Author types" msgstr "" -#: models.py:2836 +#: models.py:2837 msgid "Source types" msgstr "" -#: models.py:2844 +#: models.py:2846 msgid "Support types" msgstr "" -#: models.py:2852 -msgid "Formats" +#: models.py:2853 +msgid "Format type" msgstr "" -#: models.py:2859 -msgid "External ID" +#: models.py:2854 +msgid "Format types" msgstr "" #: models.py:2862 +msgid "External ID" +msgstr "" + +#: models.py:2865 msgid "Support" msgstr "" -#: models.py:2866 +#: models.py:2869 msgid "Scale" msgstr "" -#: models.py:2880 +#: models.py:2883 msgid "Item number" msgstr "" -#: models.py:2881 +#: models.py:2884 msgid "Ref." msgstr "" -#: models.py:2884 +#: models.py:2887 msgid "Internal ref." msgstr "" -#: models.py:2927 +#: models.py:2930 msgid "Surface (m2)" msgstr "" -#: models.py:2928 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2931 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "" -#: models.py:2953 +#: models.py:2956 msgid "Is preventive" msgstr "" -#: models.py:2957 +#: models.py:2960 msgid "Operation types" msgstr "" -#: models.py:2986 +#: models.py:2989 msgid "Preventive" msgstr "" -#: models.py:2987 +#: models.py:2990 msgid "Research" msgstr "" -#: models.py:3010 +#: models.py:3013 msgid "Authority name" msgstr "" -#: models.py:3011 +#: models.py:3014 msgid "Authority SRID" msgstr "" -#: models.py:3015 +#: models.py:3018 msgid "Spatial reference systems" msgstr "" @@ -1512,48 +1519,48 @@ msgstr "" msgid "Treatment" msgstr "" -#: views.py:1303 views.py:1346 +#: views.py:1304 views.py:1347 msgid "Operation not permitted." msgstr "" -#: views.py:1305 +#: views.py:1306 #, python-format msgid "New %s" msgstr "" -#: views.py:1365 views.py:1418 +#: views.py:1366 views.py:1419 msgid "Operations" msgstr "" -#: views.py:1369 views.py:1425 +#: views.py:1370 views.py:1426 msgid "Finds" msgstr "" -#: views.py:1618 templates/ishtar/import_list.html:43 +#: views.py:1619 templates/ishtar/import_list.html:43 msgid "Link unmatched items" msgstr "" -#: views.py:1633 +#: views.py:1634 msgid "Delete import" msgstr "" -#: views.py:1672 +#: views.py:1673 msgid "Merge persons" msgstr "" -#: views.py:1696 +#: views.py:1697 msgid "Select the main person" msgstr "" -#: views.py:1705 +#: views.py:1706 msgid "Merge organization" msgstr "" -#: views.py:1715 +#: views.py:1716 msgid "Select the main organization" msgstr "" -#: views.py:1755 views.py:1771 +#: views.py:1756 views.py:1772 msgid "Corporation manager" msgstr "" diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index 3c3dc5169..9de748717 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -6,13 +6,15 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" "PO-Revision-Date: 2017-02-04 08:33-0500\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -264,11 +266,13 @@ msgid "Dating types" msgstr "Types de datation" #: models.py:47 -msgid "Dating quality" +#, fuzzy +msgid "Dating quality type" msgstr "Qualité de datation" #: models.py:48 -msgid "Dating qualities" +#, fuzzy +msgid "Dating quality types" msgstr "Qualités de datation" #: models.py:62 diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po index 61dcf1376..8d6fffb7a 100644 --- a/translations/fr/archaeological_files.po +++ b/translations/fr/archaeological_files.po @@ -8,13 +8,15 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" "PO-Revision-Date: 2017-02-02 10:01-0500\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" diff --git a/translations/fr/archaeological_files_pdl.po b/translations/fr/archaeological_files_pdl.po index 949555adc..2d7bc969e 100644 --- a/translations/fr/archaeological_files_pdl.po +++ b/translations/fr/archaeological_files_pdl.po @@ -5,13 +5,15 @@ # Valérie-Emma Leroux , 2016. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" "PO-Revision-Date: 2016-11-14 05:33-0500\n" "Last-Translator: Copied by Zanata \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" "X-Generator: Zanata 3.9.6\n" diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po index 88e73087a..efdc8db6e 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -6,13 +6,15 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" "PO-Revision-Date: 2017-02-02 09:58-0500\n" "Last-Translator: Étienne Loks \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -188,15 +190,13 @@ msgstr "" "ratio est conservé).

" #: forms.py:278 -msgid "" -"You should at least provide X, Y and the spatial reference system used." +msgid "You should at least provide X, Y and the spatial reference system used." msgstr "" "Vous devez au minimum fournir X, Y et le système de référence spatiale " "utilisé." #: forms.py:287 -msgid "" -"Coordinates are not relevant for the spatial reference system used: {}." +msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" "Les coordonnées ne sont pas pertinentes pour le système de référence " "spatiale utilisé : {}." diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index df903a8ec..9ed814ced 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -8,13 +8,15 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" "PO-Revision-Date: 2017-02-02 10:02-0500\n" "Last-Translator: Copied by Zanata \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -390,8 +392,7 @@ msgstr "" #: forms.py:891 msgid "The excavation end date cannot be before the start date." -msgstr "" -"La date de fin de chantier ne peut être antérieure à la date de début." +msgstr "La date de fin de chantier ne peut être antérieure à la date de début." #: forms.py:919 #, python-format diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index e7bdbe6f6..1f0c213ab 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -6,13 +6,15 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" "PO-Revision-Date: 2017-02-04 08:26-0500\n" "Last-Translator: Copied by Zanata \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index 928754462..0c705f691 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -8,13 +8,15 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" "PO-Revision-Date: 2017-02-04 04:55-0500\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -30,6 +32,11 @@ msgstr "courriel" msgid "Related item" msgstr "Élément associé" +#: admin.py:79 +#, fuzzy +msgid "Export selected as CSV file" +msgstr "Export en CSV - complet" + #: data_importer.py:182 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." @@ -175,7 +182,7 @@ msgid "Template" msgstr "Patron" #: forms_common.py:41 forms_common.py:59 forms_common.py:182 -#: forms_common.py:406 models.py:1539 models.py:2940 +#: forms_common.py:406 models.py:1539 models.py:2943 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -199,7 +206,7 @@ msgstr "" "commune Saint-Denis dans le département français de Seine-Saint-Denis.

" #: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1712 -#: models.py:2567 models.py:2749 models.py:2810 +#: models.py:2567 models.py:2749 models.py:2811 #: templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "Personne" @@ -220,7 +227,7 @@ msgstr "Organisation" #: forms_common.py:173 forms_common.py:210 forms_common.py:322 #: forms_common.py:376 forms_common.py:446 models.py:1094 models.py:1472 -#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2926 +#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2929 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" @@ -269,7 +276,7 @@ msgid "Mobile phone" msgstr "Téléphone portable" #: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2144 -#: models.py:2446 models.py:2861 templates/sheet_ope.html:85 +#: models.py:2446 models.py:2864 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:23 @@ -312,7 +319,7 @@ msgid "Identity" msgstr "Identité" #: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2109 -#: models.py:2545 models.py:2547 models.py:2858 templates/sheet_ope.html:104 +#: models.py:2545 models.py:2547 models.py:2861 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "Titre" @@ -413,7 +420,7 @@ msgstr "Ce nom d'utilisateur existe déjà." msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: forms_common.py:628 forms_common.py:641 models.py:2941 +#: forms_common.py:628 forms_common.py:641 models.py:2944 msgid "Towns" msgstr "Communes" @@ -429,7 +436,7 @@ msgstr "Seul un choix peut être coché." msgid "Documentation informations" msgstr "Information sur le document" -#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2835 +#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2836 msgid "Source type" msgstr "Type de document" @@ -441,37 +448,37 @@ msgstr "Référence" msgid "Internal reference" msgstr "Référence interne" -#: forms_common.py:783 models.py:2872 +#: forms_common.py:783 models.py:2875 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: forms_common.py:784 models.py:2874 +#: forms_common.py:784 models.py:2877 msgid "Receipt date" msgstr "Date de réception" -#: forms_common.py:786 models.py:2273 models.py:2876 +#: forms_common.py:786 models.py:2273 models.py:2879 msgid "Creation date" msgstr "Date de création" -#: forms_common.py:789 models.py:2879 +#: forms_common.py:789 models.py:2882 msgid "Receipt date in documentation" msgstr "Date de réception en documentation" #: forms_common.py:791 forms_common.py:827 models.py:376 models.py:687 -#: models.py:2004 models.py:2559 models.py:2886 +#: models.py:2004 models.py:2559 models.py:2889 msgid "Comment" msgstr "Commentaire" #: forms_common.py:793 forms_common.py:826 models.py:1096 models.py:1762 -#: models.py:1936 models.py:1978 models.py:2885 templates/sheet_ope.html:128 +#: models.py:1936 models.py:1978 models.py:2888 templates/sheet_ope.html:128 msgid "Description" msgstr "Description" -#: forms_common.py:796 models.py:2887 +#: forms_common.py:796 models.py:2890 msgid "Additional information" msgstr "Information supplémentaire" -#: forms_common.py:798 forms_common.py:830 models.py:2889 +#: forms_common.py:798 forms_common.py:830 models.py:2892 msgid "Has a duplicate" msgstr "Existe en doublon" @@ -488,7 +495,7 @@ msgstr "" "

Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).

" -#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2815 +#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2816 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "Auteur" @@ -501,7 +508,7 @@ msgstr "Informations supplémentaires" msgid "Would you like to delete this documentation?" msgstr "Voulez-vous supprimer ce document ?" -#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2812 +#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2813 msgid "Author type" msgstr "Type d'auteur" @@ -513,7 +520,7 @@ msgstr "Sélection d'auteur" msgid "There are identical authors." msgstr "Il y a des auteurs identiques." -#: forms_common.py:893 models.py:2816 models.py:2868 +#: forms_common.py:893 models.py:2817 models.py:2871 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -531,7 +538,7 @@ msgstr "Ajout/modification" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:39 models.py:1268 views.py:1548 +#: ishtar_menu.py:39 models.py:1268 views.py:1549 msgid "Global variables" msgstr "Variables globales" @@ -563,15 +570,15 @@ msgstr "Fusion manuelle" msgid "Imports" msgstr "Imports" -#: ishtar_menu.py:112 views.py:1556 +#: ishtar_menu.py:112 views.py:1557 msgid "New import" msgstr "Nouvel import" -#: ishtar_menu.py:116 views.py:1570 +#: ishtar_menu.py:116 views.py:1571 msgid "Current imports" msgstr "Imports en cours" -#: ishtar_menu.py:120 views.py:1606 +#: ishtar_menu.py:120 views.py:1607 msgid "Old imports" msgstr "Anciens imports" @@ -615,7 +622,7 @@ msgstr "Dernier éditeur" msgid "Creator" msgstr "Créateur" -#: models.py:956 models.py:2952 models.py:3008 +#: models.py:956 models.py:2955 models.py:3011 msgid "Order" msgstr "Ordre" @@ -937,11 +944,11 @@ msgstr "Parcelles" msgid "Operation source" msgstr "Documentation de l'opération" -#: models.py:1722 views.py:1364 views.py:1414 +#: models.py:1722 views.py:1365 views.py:1415 msgid "Archaeological files" msgstr "Dossiers" -#: models.py:1724 views.py:1367 views.py:1422 +#: models.py:1724 views.py:1368 views.py:1423 msgid "Context records" msgstr "Unités d'Enregistrement" @@ -1073,11 +1080,11 @@ msgstr "Importeur - Clé de rapprochement" msgid "Importer - Targets keys" msgstr "Importeur - Clés de rapprochement" -#: models.py:2112 models.py:2851 models.py:2864 +#: models.py:2112 models.py:2867 msgid "Format" msgstr "Format" -#: models.py:2113 models.py:2956 +#: models.py:2113 models.py:2959 msgid "Operation type" msgstr "Type d'opération" @@ -1141,11 +1148,11 @@ msgstr "Type d'identification" msgid "Context record relation type" msgstr "Type de relations entre Unités d'Enregistrement" -#: models.py:2132 models.py:3014 +#: models.py:2132 models.py:3017 msgid "Spatial reference system" msgstr "Système de référence spatiale" -#: models.py:2133 models.py:2843 +#: models.py:2133 models.py:2845 msgid "Support type" msgstr "Type de support" @@ -1433,75 +1440,81 @@ msgstr "" msgid "Author types" msgstr "Types d'auteur" -#: models.py:2836 +#: models.py:2837 msgid "Source types" msgstr "Types de document" -#: models.py:2844 +#: models.py:2846 msgid "Support types" msgstr "Types de support" -#: models.py:2852 -msgid "Formats" +#: models.py:2853 +#, fuzzy +msgid "Format type" +msgstr "Format" + +#: models.py:2854 +#, fuzzy +msgid "Format types" msgstr "Formats" -#: models.py:2859 +#: models.py:2862 msgid "External ID" msgstr "Identifiant externe" -#: models.py:2862 +#: models.py:2865 msgid "Support" msgstr "Support" -#: models.py:2866 +#: models.py:2869 msgid "Scale" msgstr "Échelle" -#: models.py:2880 +#: models.py:2883 msgid "Item number" msgstr "Numéro d'élément" -#: models.py:2881 +#: models.py:2884 msgid "Ref." msgstr "Réf." -#: models.py:2884 +#: models.py:2887 msgid "Internal ref." msgstr "Réf. interne" -#: models.py:2927 +#: models.py:2930 msgid "Surface (m2)" msgstr "Surface (m2)" -#: models.py:2928 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2931 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Localisation" -#: models.py:2953 +#: models.py:2956 msgid "Is preventive" msgstr "Est du préventif" -#: models.py:2957 +#: models.py:2960 msgid "Operation types" msgstr "Types d'opération" -#: models.py:2986 +#: models.py:2989 msgid "Preventive" msgstr "Préventif" -#: models.py:2987 +#: models.py:2990 msgid "Research" msgstr "Programmé" -#: models.py:3010 +#: models.py:3013 msgid "Authority name" msgstr "Registre" -#: models.py:3011 +#: models.py:3014 msgid "Authority SRID" msgstr "SRID" -#: models.py:3015 +#: models.py:3018 msgid "Spatial reference systems" msgstr "Systèmes de référence spatiale" @@ -1565,48 +1578,48 @@ msgstr "Demande de traitement" msgid "Treatment" msgstr "Traitement" -#: views.py:1303 views.py:1346 +#: views.py:1304 views.py:1347 msgid "Operation not permitted." msgstr "Opération non permise." -#: views.py:1305 +#: views.py:1306 #, python-format msgid "New %s" msgstr "Nouveau %s" -#: views.py:1365 views.py:1418 +#: views.py:1366 views.py:1419 msgid "Operations" msgstr "Opérations" -#: views.py:1369 views.py:1425 +#: views.py:1370 views.py:1426 msgid "Finds" msgstr "Mobilier" -#: views.py:1618 templates/ishtar/import_list.html:43 +#: views.py:1619 templates/ishtar/import_list.html:43 msgid "Link unmatched items" msgstr "Associer les éléments non rapprochés" -#: views.py:1633 +#: views.py:1634 msgid "Delete import" msgstr "Supprimer un import" -#: views.py:1672 +#: views.py:1673 msgid "Merge persons" msgstr "Fusionner des personnes" -#: views.py:1696 +#: views.py:1697 msgid "Select the main person" msgstr "Choisir la personne principale" -#: views.py:1705 +#: views.py:1706 msgid "Merge organization" msgstr "Fusionner des organisations" -#: views.py:1715 +#: views.py:1716 msgid "Select the main organization" msgstr "Sélectionner l'organisation principale" -#: views.py:1755 views.py:1771 +#: views.py:1756 views.py:1772 msgid "Corporation manager" msgstr "Représentant de la personne morale" @@ -1675,8 +1688,7 @@ msgstr "L'équipe %(app_name)s" #: templates/base.html:41 msgid "Searches in the shortcut menu deal with all items." -msgstr "" -"Les recherches dans le menu de raccourci concernent tous les éléments." +msgstr "Les recherches dans le menu de raccourci concernent tous les éléments." #: templates/base.html:42 msgid "Searches in the shortcut menu deal with only your items." @@ -2349,8 +2361,8 @@ msgid "" "Powered by Ishtar v%(VERSION)s - " "a free software under AGPL v3 license." msgstr "" -"Propulsé par Ishtar v%(VERSION)s -" -" logiciel libre sous licence AGPL v3." +"Propulsé par Ishtar v%(VERSION)s " +"- logiciel libre sous licence AGPL v3." #: templates/ishtar/blocks/window_nav.html:6 msgid "Previous version" -- cgit v1.2.3