Merge branch 'develop' into develop-bootstrap

2 files changed, 262 insertions, 52 deletions

diff --git a/ishtar_common/fixtures/initial_data-fr.json b/ishtar_common/fixtures/initial_data-fr.json
index d9026cf49..4045094d9 100644
--- a/ishtar_common/fixtures/initial_data-fr.json
+++ b/ishtar_common/fixtures/initial_data-fr.json
@@ -839,6 +839,9 @@
             ],
             [
                 "Documents op\u00e9ration : lecture"
+            ],
+            [
+                "Contenants : lecture"
             ]
         ]
     }
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index 4386b6de7..438a023e0 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -119,6 +119,13 @@
     }
 },
 {
+    "model": "ishtar_common.importermodel",
+    "fields": {
+        "name": "Relation entre Op\u00e9ration",
+        "klass": "archaeological_operations.models.RecordRelations"
+    }
+},
+{
     "model": "ishtar_common.importertype",
     "fields": {
         "name": "MCC - Op\u00e9rations",
@@ -129,6 +136,7 @@
         ],
         "is_template": true,
         "unicity_keys": "code_patriarche",
+        "available": true,
         "users": [],
         "created_models": []
     }
@@ -144,6 +152,7 @@
         ],
         "is_template": true,
         "unicity_keys": "external_id",
+        "available": true,
         "users": [],
         "created_models": []
     }
@@ -159,6 +168,7 @@
         ],
         "is_template": true,
         "unicity_keys": "",
+        "available": true,
         "users": [],
         "created_models": []
     }
@@ -174,6 +184,7 @@
         ],
         "is_template": true,
         "unicity_keys": "external_id",
+        "available": true,
         "users": [],
         "created_models": []
     }
@@ -189,6 +200,7 @@
         ],
         "is_template": true,
         "unicity_keys": "external_id",
+        "available": true,
         "users": [],
         "created_models": []
     }
@@ -204,6 +216,7 @@
         ],
         "is_template": true,
         "unicity_keys": "code_patriarche",
+        "available": true,
         "users": [],
         "created_models": [
             [
@@ -229,6 +242,7 @@
         ],
         "is_template": true,
         "unicity_keys": "external_id",
+        "available": true,
         "users": [],
         "created_models": [
             [
@@ -251,6 +265,7 @@
         ],
         "is_template": true,
         "unicity_keys": "external_id",
+        "available": true,
         "users": [],
         "created_models": []
     }
@@ -266,6 +281,7 @@
         ],
         "is_template": true,
         "unicity_keys": "external_id",
+        "available": true,
         "users": [],
         "created_models": []
     }
@@ -281,6 +297,7 @@
         ],
         "is_template": true,
         "unicity_keys": "",
+        "available": true,
         "users": [],
         "created_models": [
             [
@@ -300,6 +317,7 @@
         ],
         "is_template": true,
         "unicity_keys": "external_id",
+        "available": true,
         "users": [],
         "created_models": [
             [
@@ -325,6 +343,7 @@
         ],
         "is_template": true,
         "unicity_keys": "external_id",
+        "available": true,
         "users": [],
         "created_models": [
             [
@@ -343,6 +362,26 @@
     }
 },
 {
+    "model": "ishtar_common.importertype",
+    "fields": {
+        "name": "Ishtar - Relations entre op\u00e9rations",
+        "slug": "ishtar-operations-relations",
+        "description": null,
+        "associated_models": [
+            "archaeological_operations.models.RecordRelations"
+        ],
+        "is_template": true,
+        "unicity_keys": null,
+        "available": true,
+        "users": [],
+        "created_models": [
+            [
+                "archaeological_operations.models.RecordRelations"
+            ]
+        ]
+    }
+},
+{
     "model": "ishtar_common.regexp",
     "fields": {
         "name": "Num\u00e9ro INSEE",
@@ -2595,11 +2634,11 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 25,
+        "col_number": 26,
         "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,
-        "export_field_name": null
+        "export_field_name": ""
     }
 },
 {
@@ -2609,11 +2648,11 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 26,
+        "col_number": 27,
         "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,
-        "export_field_name": null
+        "export_field_name": ""
     }
 },
 {
@@ -2623,11 +2662,11 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 27,
+        "col_number": 28,
         "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,
-        "export_field_name": null
+        "export_field_name": ""
     }
 },
 {
@@ -2637,11 +2676,11 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 28,
+        "col_number": 29,
         "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,
-        "export_field_name": null
+        "export_field_name": ""
     }
 },
 {
@@ -2651,11 +2690,11 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 29,
+        "col_number": 30,
         "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,
-        "export_field_name": null
+        "export_field_name": ""
     }
 },
 {
@@ -2665,7 +2704,7 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 30,
+        "col_number": 31,
         "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,
@@ -2679,11 +2718,11 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 31,
+        "col_number": 32,
         "description": "Coordonn\u00e9e X pour cet objet.",
         "regexp_pre_filter": null,
         "required": false,
-        "export_field_name": null
+        "export_field_name": ""
     }
 },
 {
@@ -2693,11 +2732,11 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 32,
+        "col_number": 33,
         "description": "Coordonn\u00e9e Y pour cet objet.",
         "regexp_pre_filter": null,
         "required": false,
-        "export_field_name": null
+        "export_field_name": ""
     }
 },
 {
@@ -2707,11 +2746,11 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 33,
+        "col_number": 34,
         "description": "Coordonn\u00e9e Z pour cet objet (altitude NGF ou arbitraire).",
         "regexp_pre_filter": null,
         "required": false,
-        "export_field_name": null
+        "export_field_name": ""
     }
 },
 {
@@ -2721,11 +2760,11 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 34,
+        "col_number": 35,
         "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,
-        "export_field_name": null
+        "export_field_name": ""
     }
 },
 {
@@ -2791,7 +2830,7 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 36,
+        "col_number": 37,
         "description": "Identifiant textuel du d\u00e9p\u00f4t. Cet identifiant doit correspondre \u00e0 un d\u00e9p\u00f4t existant en base de donn\u00e9es.",
         "regexp_pre_filter": null,
         "required": false,
@@ -2805,7 +2844,7 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 37,
+        "col_number": 38,
         "description": "",
         "regexp_pre_filter": null,
         "required": false,
@@ -2819,7 +2858,7 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 38,
+        "col_number": 39,
         "description": "Champ n\u00e9cessaire si vous indiquez une caisse",
         "regexp_pre_filter": null,
         "required": false,
@@ -3169,7 +3208,7 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 35,
+        "col_number": 36,
         "description": "Date au format JJ/MM/AAAA ou AAAA-MM-JJ. Par exemple : 2017-07-31 ou 31/07/2017.",
         "regexp_pre_filter": null,
         "required": false,
@@ -3183,7 +3222,7 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 39,
+        "col_number": 40,
         "description": "Localisation dans le d\u00e9p\u00f4t : r\u00e9f\u00e9rence de la premi\u00e8re localisation. Par exemple si la premi\u00e8re localisation du d\u00e9p\u00f4t concern\u00e9 est \u00ab b\u00e2timent \u00bb mettre : \u00ab A \u00bb pour b\u00e2timent A.",
         "regexp_pre_filter": null,
         "required": false,
@@ -3197,7 +3236,7 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 40,
+        "col_number": 41,
         "description": "Localisation dans le d\u00e9p\u00f4t : r\u00e9f\u00e9rence de la seconde localisation.",
         "regexp_pre_filter": null,
         "required": false,
@@ -3211,7 +3250,7 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 41,
+        "col_number": 42,
         "description": "Localisation dans le d\u00e9p\u00f4t : r\u00e9f\u00e9rence de la troisi\u00e8me localisation.",
         "regexp_pre_filter": null,
         "required": false,
@@ -3225,7 +3264,7 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 42,
+        "col_number": 43,
         "description": "Localisation dans le d\u00e9p\u00f4t : r\u00e9f\u00e9rence de la quatri\u00e8me localisation.",
         "regexp_pre_filter": null,
         "required": false,
@@ -3239,7 +3278,7 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 43,
+        "col_number": 44,
         "description": "Localisation dans le d\u00e9p\u00f4t : r\u00e9f\u00e9rence de la cinqui\u00e8me localisation.",
         "regexp_pre_filter": null,
         "required": false,
@@ -3253,7 +3292,7 @@
         "importer_type": [
             "ishtar-finds"
         ],
-        "col_number": 44,
+        "col_number": 45,
         "description": "Localisation dans le d\u00e9p\u00f4t : r\u00e9f\u00e9rence de la sixi\u00e8me localisation. ",
         "regexp_pre_filter": null,
         "required": false,
@@ -3261,6 +3300,62 @@
     }
 },
 {
+    "model": "ishtar_common.importercolumn",
+    "fields": {
+        "label": "NMI",
+        "importer_type": [
+            "ishtar-finds"
+        ],
+        "col_number": 25,
+        "description": "Nombre minimum d'individu(s) li\u00e9(s) \u00e0 cet enregistrement (entier). Exemple : \"12\".",
+        "regexp_pre_filter": null,
+        "required": false,
+        "export_field_name": ""
+    }
+},
+{
+    "model": "ishtar_common.importercolumn",
+    "fields": {
+        "label": "Op\u00e9ration (identifiant externe) - membre de gauche",
+        "importer_type": [
+            "ishtar-operations-relations"
+        ],
+        "col_number": 1,
+        "description": "",
+        "regexp_pre_filter": null,
+        "required": true,
+        "export_field_name": null
+    }
+},
+{
+    "model": "ishtar_common.importercolumn",
+    "fields": {
+        "label": "Type de relation entre op\u00e9ration",
+        "importer_type": [
+            "ishtar-operations-relations"
+        ],
+        "col_number": 2,
+        "description": "",
+        "regexp_pre_filter": null,
+        "required": true,
+        "export_field_name": null
+    }
+},
+{
+    "model": "ishtar_common.importercolumn",
+    "fields": {
+        "label": "Op\u00e9ration (identifiant externe) - membre de droite",
+        "importer_type": [
+            "ishtar-operations-relations"
+        ],
+        "col_number": 3,
+        "description": "",
+        "regexp_pre_filter": null,
+        "required": true,
+        "export_field_name": null
+    }
+},
+{
     "model": "ishtar_common.formatertype",
     "fields": {
         "formater_type": "IntegerFormater",
@@ -3669,6 +3764,38 @@
     }
 },
 {
+    "model": "ishtar_common.formatertype",
+    "fields": {
+        "formater_type": "TypeFormater",
+        "options": "archaeological_operations.models.RelationType",
+        "many_split": null
+    }
+},
+{
+    "model": "ishtar_common.formatertype",
+    "fields": {
+        "formater_type": "TypeFormater",
+        "options": "archaeological_finds.models.AlterationType",
+        "many_split": "&"
+    }
+},
+{
+    "model": "ishtar_common.formatertype",
+    "fields": {
+        "formater_type": "TypeFormater",
+        "options": "archaeological_finds.models.AlterationCauseType",
+        "many_split": "&"
+    }
+},
+{
+    "model": "ishtar_common.formatertype",
+    "fields": {
+        "formater_type": "TypeFormater",
+        "options": "archaeological_finds.models.TreatmentEmergencyType",
+        "many_split": null
+    }
+},
+{
     "model": "ishtar_common.importerduplicatefield",
     "fields": {
         "column": [
@@ -4154,7 +4281,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            36
+            37
         ],
         "field_name": "container__location__external_id",
         "force_new": false,
@@ -4167,7 +4294,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            36
+            37
         ],
         "field_name": "container__external_id",
         "force_new": false,
@@ -4180,7 +4307,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            37
+            38
         ],
         "field_name": "container__external_id",
         "force_new": false,
@@ -7466,7 +7593,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            25
+            26
         ],
         "target": "mark",
         "regexp_filter": null,
@@ -7486,7 +7613,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            26
+            27
         ],
         "target": "comment",
         "regexp_filter": null,
@@ -7506,7 +7633,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            27
+            28
         ],
         "target": "dating_comment",
         "regexp_filter": null,
@@ -7526,7 +7653,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            28
+            29
         ],
         "target": "estimated_value",
         "regexp_filter": null,
@@ -7546,7 +7673,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            29
+            30
         ],
         "target": "image",
         "regexp_filter": null,
@@ -7566,7 +7693,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            30
+            31
         ],
         "target": "datings__period",
         "regexp_filter": null,
@@ -7606,7 +7733,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            31
+            32
         ],
         "target": "base_finds__x",
         "regexp_filter": null,
@@ -7626,7 +7753,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            32
+            33
         ],
         "target": "base_finds__y",
         "regexp_filter": null,
@@ -7646,7 +7773,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            33
+            34
         ],
         "target": "base_finds__z",
         "regexp_filter": null,
@@ -7666,7 +7793,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            34
+            35
         ],
         "target": "base_finds__spatial_reference_system",
         "regexp_filter": null,
@@ -7766,7 +7893,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            36
+            37
         ],
         "target": "container__responsible__external_id",
         "regexp_filter": null,
@@ -7786,7 +7913,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            37
+            38
         ],
         "target": "container__reference",
         "regexp_filter": null,
@@ -7806,7 +7933,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            38
+            39
         ],
         "target": "container__container_type",
         "regexp_filter": null,
@@ -8326,7 +8453,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            35
+            36
         ],
         "target": "base_finds__discovery_date",
         "regexp_filter": null,
@@ -8346,7 +8473,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            39
+            40
         ],
         "target": "set_localisation_1",
         "regexp_filter": null,
@@ -8366,7 +8493,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            40
+            41
         ],
         "target": "set_localisation_2",
         "regexp_filter": null,
@@ -8386,7 +8513,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            41
+            42
         ],
         "target": "set_localisation_3",
         "regexp_filter": null,
@@ -8406,7 +8533,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            42
+            43
         ],
         "target": "set_localisation_4",
         "regexp_filter": null,
@@ -8426,7 +8553,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            43
+            44
         ],
         "target": "set_localisation_5",
         "regexp_filter": null,
@@ -8446,7 +8573,7 @@
     "fields": {
         "column": [
             "ishtar-finds",
-            44
+            45
         ],
         "target": "set_localisation_6",
         "regexp_filter": null,
@@ -8460,5 +8587,85 @@
         "concat_str": "",
         "comment": ""
     }
+},
+{
+    "model": "ishtar_common.importtarget",
+    "fields": {
+        "column": [
+            "ishtar-finds",
+            25
+        ],
+        "target": "min_number_of_individuals",
+        "regexp_filter": null,
+        "formater_type": [
+            "IntegerFormater",
+            "",
+            ""
+        ],
+        "force_new": false,
+        "concat": false,
+        "concat_str": "",
+        "comment": ""
+    }
+},
+{
+    "model": "ishtar_common.importtarget",
+    "fields": {
+        "column": [
+            "ishtar-operations-relations",
+            1
+        ],
+        "target": "left_record__external_id",
+        "regexp_filter": null,
+        "formater_type": [
+            "UnicodeFormater",
+            "",
+            ""
+        ],
+        "force_new": false,
+        "concat": false,
+        "concat_str": null,
+        "comment": ""
+    }
+},
+{
+    "model": "ishtar_common.importtarget",
+    "fields": {
+        "column": [
+            "ishtar-operations-relations",
+            2
+        ],
+        "target": "relation_type",
+        "regexp_filter": null,
+        "formater_type": [
+            "TypeFormater",
+            "archaeological_operations.models.RelationType",
+            null
+        ],
+        "force_new": false,
+        "concat": false,
+        "concat_str": null,
+        "comment": ""
+    }
+},
+{
+    "model": "ishtar_common.importtarget",
+    "fields": {
+        "column": [
+            "ishtar-operations-relations",
+            3
+        ],
+        "target": "right_record__external_id",
+        "regexp_filter": null,
+        "formater_type": [
+            "UnicodeFormater",
+            "",
+            ""
+        ],
+        "force_new": false,
+        "concat": false,
+        "concat_str": null,
+        "comment": ""
+    }
 }
 ]