summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/fixtures/initial_importtypes-fr.json4337
-rw-r--r--ishtar_common/forms_common.py2
-rw-r--r--ishtar_common/locale/django.pot554
-rw-r--r--ishtar_common/models.py40
-rw-r--r--ishtar_common/static/js/ishtar.js12
-rw-r--r--ishtar_common/static/media/style.css70
-rw-r--r--ishtar_common/templates/blocks/JQueryJqGrid.html7
-rw-r--r--ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html10
-rw-r--r--ishtar_common/templates/ishtar/blocks/shortcut_menu.html12
-rw-r--r--ishtar_common/urls.py2
-rw-r--r--ishtar_common/utils.py37
-rw-r--r--ishtar_common/views.py124
-rw-r--r--ishtar_common/widgets.py13
13 files changed, 4837 insertions, 383 deletions
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index aa5816fc5..98703c8c9 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -1,5 +1,109 @@
[
{
+ "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",
"fields": {
@@ -65,6 +169,19 @@
}
},
{
+ "pk": 17,
+ "model": "ishtar_common.importertype",
+ "fields": {
+ "description": "Import complet standard operations",
+ "is_template": true,
+ "unicity_keys": "code_patriarche",
+ "users": [],
+ "slug": "ishtar_operations",
+ "associated_models": "archaeological_operations.models.Operation",
+ "name": "ISHTAR-Operations"
+ }
+ },
+ {
"pk": 2,
"model": "ishtar_common.regexp",
"fields": {
@@ -74,6 +191,62 @@
}
},
{
+ "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",
+ "fields": {
+ "importer_type": 3,
+ "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",
"fields": {
@@ -90,6 +263,94 @@
}
},
{
+ "pk": 23,
+ "model": "ishtar_common.importerdefault",
+ "fields": {
+ "importer_type": 17,
+ "target": "operator"
+ }
+ },
+ {
+ "pk": 24,
+ "model": "ishtar_common.importerdefault",
+ "fields": {
+ "importer_type": 17,
+ "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",
+ "fields": {
+ "default_target": 20,
+ "target": "author_type",
+ "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",
"fields": {
@@ -108,6 +369,24 @@
}
},
{
+ "pk": 29,
+ "model": "ishtar_common.importerdefaultvalues",
+ "fields": {
+ "default_target": 23,
+ "target": "organization_type",
+ "value": "operator"
+ }
+ },
+ {
+ "pk": 30,
+ "model": "ishtar_common.importerdefaultvalues",
+ "fields": {
+ "default_target": 24,
+ "target": "txt_idx",
+ "value": "head_scientist"
+ }
+ },
+ {
"pk": 1,
"model": "ishtar_common.importercolumn",
"fields": {
@@ -603,6 +882,17 @@
}
},
{
+ "pk": 229,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 12,
+ "required": false,
+ "importer_type": 5,
+ "description": "Ref. du contenant / label temporaire utilis\u00e9 pour le mobilier = label libre = Label pour l'instant",
+ "regexp_pre_filter": null
+ }
+ },
+ {
"pk": 40,
"model": "ishtar_common.importercolumn",
"fields": {
@@ -724,6 +1014,1678 @@
}
},
{
+ "pk": 55,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 1,
+ "required": true,
+ "importer_type": 6,
+ "description": "Type d'op\u00e9ration patriarche (ex: EV, AET, OPD, etc.)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 56,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 2,
+ "required": false,
+ "importer_type": 6,
+ "description": "Intitul\u00e9 de l'op\u00e9ration dans Patriarche",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 57,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 3,
+ "required": false,
+ "importer_type": 6,
+ "description": "Nom du responsable de l'op\u00e9ration",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 58,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 4,
+ "required": false,
+ "importer_type": 6,
+ "description": "Pr\u00e9nom du responsable de l'op\u00e9ration",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 59,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 5,
+ "required": false,
+ "importer_type": 6,
+ "description": "Chronologie dans PATRIARCHE, h\u00e9las une seule chronologie est enregistr\u00e9e",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 60,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 8,
+ "required": false,
+ "importer_type": 6,
+ "description": "Date du d\u00e9but de l'op\u00e9ration au format jour/mois/ann\u00e9e",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 61,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 9,
+ "required": false,
+ "importer_type": 6,
+ "description": "Date du fin de l'op\u00e9ration au format jour/mois/ann\u00e9e",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 62,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 10,
+ "required": false,
+ "importer_type": 6,
+ "description": "Identification de l'op\u00e9ration, import\u00e9 en tant que commentaire",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 63,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 11,
+ "required": true,
+ "importer_type": 6,
+ "description": "CODE Patriarche de l'op\u00e9ration, AVEC le code REGION",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 64,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 12,
+ "required": false,
+ "importer_type": 6,
+ "description": "Surface en m2",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 65,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 1,
+ "required": true,
+ "importer_type": 7,
+ "description": "Code OA avec le num\u00e9ro de r\u00e9gion (ex: 18 pour les PdL)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 66,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 2,
+ "required": true,
+ "importer_type": 7,
+ "description": "Code de l'UE (peut \u00eatre la concat\u00e9nation de fait + US ou autre)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 67,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 3,
+ "required": true,
+ "importer_type": 7,
+ "description": "Parcelle (peut \u00eatre li\u00e9 \u00e0 une parcelle virtuelle, ex: XXX 0)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 68,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 4,
+ "required": false,
+ "importer_type": 7,
+ "description": "Commentaire",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 94,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 5,
+ "required": false,
+ "importer_type": 7,
+ "description": "Type d'UE : identification",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 95,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 6,
+ "required": false,
+ "importer_type": 7,
+ "description": "Description de l'UE consid\u00e9r\u00e9e",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 96,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 7,
+ "required": false,
+ "importer_type": 7,
+ "description": "Datation (p\u00e9riode) pour l'UE s\u00e9par\u00e9es par un &",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 69,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 1,
+ "required": true,
+ "importer_type": 8,
+ "description": "Code patriarche de l'op\u00e9ration associ\u00e9e",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 70,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 2,
+ "required": true,
+ "importer_type": 8,
+ "description": "Code Document de SISPEO, soit l'identifiant complet (ancien du mobilier), ex: M.CE.0091_XXX.XX_0030",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 72,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 3,
+ "required": true,
+ "importer_type": 8,
+ "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",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 74,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 4,
+ "required": false,
+ "importer_type": 8,
+ "description": "Type de manti\u00e8re de mobilier, s\u00e9par\u00e9s par des \"&\"",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 73,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 5,
+ "required": false,
+ "importer_type": 8,
+ "description": "\u00c9tat de conservation / lien avec une liste",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 77,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 6,
+ "required": false,
+ "importer_type": 8,
+ "description": "Commentaire",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 122,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 7,
+ "required": false,
+ "importer_type": 8,
+ "description": "Identifiant pr\u00e9c\u00e9dent / label libre",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 75,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 8,
+ "required": false,
+ "importer_type": 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",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 78,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 9,
+ "required": false,
+ "importer_type": 8,
+ "description": "Datations s\u00e9par\u00e9es par des \"&\"",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 124,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 10,
+ "required": false,
+ "importer_type": 8,
+ "description": "Description de l'objet ou du lot d'objet",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 79,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 11,
+ "required": false,
+ "importer_type": 8,
+ "description": "Nombre d'objets",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 80,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 12,
+ "required": false,
+ "importer_type": 8,
+ "description": "Poids (en g)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 81,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 13,
+ "required": false,
+ "importer_type": 8,
+ "description": "Longueur en cm",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 125,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 14,
+ "required": false,
+ "importer_type": 8,
+ "description": "Largeur en cm",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 126,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 15,
+ "required": false,
+ "importer_type": 8,
+ "description": "Hauteur en cm",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 127,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 16,
+ "required": false,
+ "importer_type": 8,
+ "description": "Diam\u00e8tre en cm",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 128,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 18,
+ "required": false,
+ "importer_type": 8,
+ "description": "Datation pr\u00e9cise, champs txt libre",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 82,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 19,
+ "required": false,
+ "importer_type": 8,
+ "description": "Types d'objets se r\u00e9f\u00e9ren\u00e7ant par rapport \u00e0 un th\u00e9saurus",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 76,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 20,
+ "required": false,
+ "importer_type": 8,
+ "description": "Isolation ou lot d'objets",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 83,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 1,
+ "required": true,
+ "importer_type": 9,
+ "description": "Code patriarche de l'op\u00e9ration associ\u00e9e",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 84,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 2,
+ "required": true,
+ "importer_type": 9,
+ "description": "Commune (via num\u00e9ro INSEE)",
+ "regexp_pre_filter": 2
+ }
+ },
+ {
+ "pk": 85,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 4,
+ "required": true,
+ "importer_type": 9,
+ "description": "Section de la parcelle",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 86,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 5,
+ "required": true,
+ "importer_type": 9,
+ "description": "Num\u00e9ro de la parcelle (ex: 125)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 87,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 1,
+ "required": true,
+ "importer_type": 10,
+ "description": "Numero OA reference",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 88,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 2,
+ "required": true,
+ "importer_type": 10,
+ "description": "Ref\u00e9rence pr\u00e9c\u00e9dente de l'objet (base ou inventaire pr\u00e9c\u00e9dent, fouille, sp\u00e9cialiste, etc;)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 89,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 3,
+ "required": true,
+ "importer_type": 10,
+ "description": "UE li\u00e9e au mobilier",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 90,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 4,
+ "required": true,
+ "importer_type": 10,
+ "description": "Mati\u00e8res s\u00e9par\u00e9es par des \"&\"",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 91,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 5,
+ "required": false,
+ "importer_type": 10,
+ "description": "Etat de conservation",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 92,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 6,
+ "required": false,
+ "importer_type": 10,
+ "description": "Commentaires",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 93,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 7,
+ "required": false,
+ "importer_type": 10,
+ "description": "Label libre",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 192,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 2,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 193,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 3,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 194,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 5,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 195,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 9,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 196,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 10,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 197,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 12,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 198,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 13,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 199,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 14,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 200,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 16,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 201,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 18,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 202,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 19,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 203,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 20,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 204,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 35,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 205,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 37,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 206,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 38,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 207,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 41,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 208,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 42,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 209,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 47,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 210,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 49,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 211,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 50,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 212,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 53,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 213,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 54,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 214,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 55,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 215,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 57,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 216,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 58,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 217,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 72,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 218,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 75,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 219,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 76,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 220,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 77,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 221,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 85,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 222,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 87,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 223,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 88,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 224,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 89,
+ "required": false,
+ "importer_type": 14,
+ "description": null,
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 230,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 1,
+ "required": true,
+ "importer_type": 15,
+ "description": "Code Patriarche",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 231,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 3,
+ "required": false,
+ "importer_type": 15,
+ "description": "Type d'op\u00e9ration",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 232,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 4,
+ "required": false,
+ "importer_type": 15,
+ "description": "Nom de l'op\u00e9ration",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 233,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 5,
+ "required": false,
+ "importer_type": 15,
+ "description": "Nom de l'op\u00e9rateur",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 234,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 6,
+ "required": false,
+ "importer_type": 15,
+ "description": "Nom du responsable de l'op\u00e9ration.",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 235,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 7,
+ "required": false,
+ "importer_type": 15,
+ "description": "Pr\u00e9nom du responsable de l'op\u00e9ration.",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 236,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 8,
+ "required": false,
+ "importer_type": 15,
+ "description": "Date de d\u00e9but de l'op\u00e9ration avec le format ANN\u00c9E/MOIS/JOUR",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 237,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 9,
+ "required": false,
+ "importer_type": 15,
+ "description": "Date de fin de l'op\u00e9ration avec le format ANN\u00c9E/MOIS/JOUR",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 238,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 10,
+ "required": false,
+ "importer_type": 15,
+ "description": "P\u00e9riodes chronologiques",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 239,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 11,
+ "required": false,
+ "importer_type": 15,
+ "description": "Ann\u00e9e de r\u00e9f\u00e9rence administrative",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 240,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 12,
+ "required": false,
+ "importer_type": 15,
+ "description": "Num\u00e9ro de r\u00e9f\u00e9rence administrative de l'op\u00e9ration",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 241,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 13,
+ "required": false,
+ "importer_type": 15,
+ "description": "Ancienne ref type DRACAR",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 242,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 14,
+ "required": false,
+ "importer_type": 15,
+ "description": "Commentaires",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 243,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 15,
+ "required": false,
+ "importer_type": 15,
+ "description": "Date de rendu du rapport (du premier si il y en a plusieurs)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 244,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 16,
+ "required": false,
+ "importer_type": 15,
+ "description": "\u00c9tat de traitement des rapports",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 245,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 1,
+ "required": false,
+ "importer_type": 16,
+ "description": "Adresse du domicile",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 246,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 2,
+ "required": false,
+ "importer_type": 16,
+ "description": "Courriel",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 247,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 3,
+ "required": false,
+ "importer_type": 16,
+ "description": "Adresse",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 251,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 4,
+ "required": false,
+ "importer_type": 16,
+ "description": "Commentaire : #AFEAF",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 252,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 7,
+ "required": false,
+ "importer_type": 16,
+ "description": "Commentaire : #BSR_CONTRI",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 248,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 10,
+ "required": false,
+ "importer_type": 16,
+ "description": "Code postal domicie",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 249,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 11,
+ "required": false,
+ "importer_type": 16,
+ "description": "Code postal",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 250,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 17,
+ "required": false,
+ "importer_type": 16,
+ "description": "Quelle est l'adresse pr\u00e9f\u00e9r\u00e9e ? (pro/domicile)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 253,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 19,
+ "required": false,
+ "importer_type": 16,
+ "description": "Type de contact",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 254,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 28,
+ "required": false,
+ "importer_type": 16,
+ "description": "Nom",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 255,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 29,
+ "required": false,
+ "importer_type": 16,
+ "description": "Nom de la structure associ\u00e9e",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 256,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 31,
+ "required": false,
+ "importer_type": 16,
+ "description": "Commentaire",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 257,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 32,
+ "required": false,
+ "importer_type": 16,
+ "description": "T\u00e9l\u00e9phone champs brut",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 258,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 33,
+ "required": false,
+ "importer_type": 16,
+ "description": "Pays du domicile",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 259,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 34,
+ "required": false,
+ "importer_type": 16,
+ "description": "Pays",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 260,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 36,
+ "required": false,
+ "importer_type": 16,
+ "description": "Pr\u00e9nom",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 261,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 37,
+ "required": false,
+ "importer_type": 16,
+ "description": "Titre",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 262,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 41,
+ "required": false,
+ "importer_type": 16,
+ "description": "Type de t\u00e9l\u00e9phone (\u00e0 retraiter)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 263,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 42,
+ "required": false,
+ "importer_type": 16,
+ "description": "Ville du domicile",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 264,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 43,
+ "required": false,
+ "importer_type": 16,
+ "description": "Ville",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 265,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 1,
+ "required": true,
+ "importer_type": 17,
+ "description": "Code patriarche ou code num\u00e9rique (entier) unique pour une op\u00e9ration",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 266,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 2,
+ "required": true,
+ "importer_type": 17,
+ "description": "Nom usuel de l'op\u00e9ration",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 267,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 3,
+ "required": true,
+ "importer_type": 17,
+ "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
+ }
+ },
+ {
+ "pk": 268,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 4,
+ "required": false,
+ "importer_type": 17,
+ "description": "Index (num\u00e9ro par ann\u00e9e), le couple ann\u00e9e + index doit \u00eatre unique",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 269,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 5,
+ "required": true,
+ "importer_type": 17,
+ "description": "Type d'op\u00e9ration (parmi une liste)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 270,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 7,
+ "required": false,
+ "importer_type": 17,
+ "description": "R\u00e9f\u00e9rence du dossier administratif associ\u00e9 \u00e0 l'op\u00e9ration sous la forme ANNEE-INDEX par exemple : \"2002-4\"",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 271,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 8,
+ "required": false,
+ "importer_type": 17,
+ "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
+ }
+ },
+ {
+ "pk": 272,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 9,
+ "required": false,
+ "importer_type": 17,
+ "description": "Types de vestiges (s\u00e9par\u00e9s par un \u00ab\u00a0&\u00a0\u00bb)\r\nExemple : \"four & fosses & villa\"",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 273,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 10,
+ "required": false,
+ "importer_type": 17,
+ "description": "P\u00e9riodes concern\u00e9es (s\u00e9par\u00e9es par un \u00ab\u00a0&\u00a0\u00bb)\r\nExemple : \"Gallo-romain & Fer & Med\"",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 274,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 11,
+ "required": false,
+ "importer_type": 17,
+ "description": "Titre (M., Mme), du responsable d'op\u00e9ration (RO)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 275,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 12,
+ "required": false,
+ "importer_type": 17,
+ "description": "Pr\u00e9nom du Responsable scientifique (responsable d'op\u00e9ration)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 276,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 13,
+ "required": false,
+ "importer_type": 17,
+ "description": "Nom du Responsable scientifique (responsable d'op\u00e9ration)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 277,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 14,
+ "required": false,
+ "importer_type": 17,
+ "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 organisation.",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 278,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 15,
+ "required": false,
+ "importer_type": 17,
+ "description": "Nom de l'op\u00e9rateur (organisation)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 279,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 16,
+ "required": false,
+ "importer_type": 17,
+ "description": "R\u00e9f\u00e9rence de l'op\u00e9rateur (code ou autre r\u00e9f\u00e9rence interne de l'op\u00e9rateur)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 280,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 17,
+ "required": false,
+ "importer_type": 17,
+ "description": "Titre (M., Mme), du responsable du suivi scientifique",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 281,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 18,
+ "required": false,
+ "importer_type": 17,
+ "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
+ }
+ },
+ {
+ "pk": 282,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 19,
+ "required": false,
+ "importer_type": 17,
+ "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
+ }
+ },
+ {
+ "pk": 283,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 20,
+ "required": false,
+ "importer_type": 17,
+ "description": "Rattachement du resp. du suivi scientifique",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 284,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 21,
+ "required": false,
+ "importer_type": 17,
+ "description": "Surface couverte par l'op\u00e9ration (m2)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 285,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 22,
+ "required": false,
+ "importer_type": 17,
+ "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
+ }
+ },
+ {
+ "pk": 286,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 23,
+ "required": false,
+ "importer_type": 17,
+ "description": "Date de fin de l'op\u00e9ration (fin du terrain d'ordinaire mais vous pouvez utiliser autre chose)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 287,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 24,
+ "required": false,
+ "importer_type": 17,
+ "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
+ }
+ },
+ {
+ "pk": 288,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 25,
+ "required": false,
+ "importer_type": 17,
+ "description": "Date d'avis (ex\u00a0: avis de CIRA ou autre selon votre usage)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 289,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 26,
+ "required": false,
+ "importer_type": 17,
+ "description": "R\u00e9sultats consid\u00e9r\u00e9s comme n\u00e9gatif (d\u2019ordinaire utilis\u00e9 pour les diagnostics n\u00e9gatifs)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 290,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 27,
+ "required": false,
+ "importer_type": 17,
+ "description": "Pr\u00e9nom du rapporteur (CIRA ou autre selon votre usage de la notion d'avis)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 291,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 28,
+ "required": false,
+ "importer_type": 17,
+ "description": "Nom du rapporteur (CIRA ou autre selon votre usage de la notion d'avis)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 292,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 29,
+ "required": false,
+ "importer_type": 17,
+ "description": "Rattachement rapporteur (organisation)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 293,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 30,
+ "required": false,
+ "importer_type": 17,
+ "description": "Date limite pr\u00e9vue pour le rendu de la documentation scientifique",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 294,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 31,
+ "required": false,
+ "importer_type": 17,
+ "description": "Documentation re\u00e7ue",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 295,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 32,
+ "required": false,
+ "importer_type": 17,
+ "description": "Date limite pr\u00e9vue pour le rendu du mobilier",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 296,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 33,
+ "required": false,
+ "importer_type": 17,
+ "description": "Mobilier re\u00e7u (ou livr\u00e9)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 297,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 34,
+ "required": false,
+ "importer_type": 17,
+ "description": "Commentaire g\u00e9n\u00e9ral",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 298,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 35,
+ "required": false,
+ "importer_type": 17,
+ "description": "Date de livraison du rapport",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 299,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 36,
+ "required": false,
+ "importer_type": 17,
+ "description": "\u00c9tat de traitement du rapport",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 300,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 37,
+ "required": false,
+ "importer_type": 17,
+ "description": "Commentaire sur la documentation scientifique (y compris mobilier)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 301,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 38,
+ "required": false,
+ "importer_type": 17,
+ "description": "Image (nom du fichier)",
+ "regexp_pre_filter": null
+ }
+ },
+ {
"pk": 46,
"model": "ishtar_common.importtarget",
"fields": {
@@ -864,34 +2826,6 @@
}
},
{
- "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": 4,
"model": "ishtar_common.importtarget",
"fields": {
@@ -1508,6 +3442,2218 @@
}
},
{
+ "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": 302,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "operator__name",
+ "column": 278,
+ "formater_type": 36,
+ "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": 31,
+ "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": 314,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "cira_rapporteur__surname",
+ "column": 290,
+ "formater_type": 36,
+ "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": 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": 297,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "archaeological_sites__reference",
+ "column": 271,
+ "formater_type": 40,
+ "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": 306,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "in_charge__name",
+ "column": 282,
+ "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": 315,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "cira_rapporteur__name",
+ "column": 291,
+ "formater_type": 3,
+ "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": 61,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "scientist__surname",
+ "column": 58,
+ "formater_type": 4,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 70,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "parcel__external_id",
+ "column": 67,
+ "formater_type": 11,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 71,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "comment",
+ "column": 68,
+ "formater_type": 16,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 72,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "context_record__operation__code_patriarche",
+ "column": 69,
+ "formater_type": 1,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 75,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "context_record__external_id",
+ "column": 72,
+ "formater_type": 3,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 73,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "external_id",
+ "column": 70,
+ "formater_type": 3,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 76,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "find__conservatory_state",
+ "column": 73,
+ "formater_type": 22,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 77,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "find__material_types",
+ "column": 74,
+ "formater_type": 20,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 254,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "find__label",
+ "column": 229,
+ "formater_type": 3,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 255,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "code_patriarche",
+ "column": 230,
+ "formater_type": 1,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 257,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "common_name",
+ "column": 232,
+ "formater_type": 35,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 259,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "scientist__raw_name",
+ "column": 234,
+ "formater_type": 30,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 78,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "find__is_complete",
+ "column": 75,
+ "formater_type": 19,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 261,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "start_date",
+ "column": 236,
+ "formater_type": 5,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 263,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "periods",
+ "column": 238,
+ "formater_type": 6,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 265,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "operation_code",
+ "column": 240,
+ "formater_type": 1,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 58,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "operation_type",
+ "column": 55,
+ "formater_type": 2,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 59,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "common_name",
+ "column": 56,
+ "formater_type": 3,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 60,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "scientist__raw_name",
+ "column": 57,
+ "formater_type": 4,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 62,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "periods",
+ "column": 59,
+ "formater_type": 6,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 64,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "excavation_end_date",
+ "column": 61,
+ "formater_type": 25,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 65,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "comment",
+ "column": 62,
+ "formater_type": 4,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 66,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "code_patriarche",
+ "column": 63,
+ "formater_type": 1,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 67,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "surface",
+ "column": 64,
+ "formater_type": 1,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 63,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "start_date",
+ "column": 60,
+ "formater_type": 25,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 82,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "find__find_number",
+ "column": 79,
+ "formater_type": 1,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 85,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "find__object_types",
+ "column": 82,
+ "formater_type": 26,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 79,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "is_isolated",
+ "column": 76,
+ "formater_type": 19,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 80,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "comment",
+ "column": 77,
+ "formater_type": 16,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 84,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "find__length",
+ "column": 81,
+ "formater_type": 1,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 86,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "operation__code_patriarche",
+ "column": 83,
+ "formater_type": 1,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 87,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "town__numero_insee",
+ "column": 84,
+ "formater_type": 11,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 88,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "section",
+ "column": 85,
+ "formater_type": 7,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 89,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "parcel_number",
+ "column": 86,
+ "formater_type": 8,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 69,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "label",
+ "column": 66,
+ "formater_type": 3,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 68,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "operation__code_patriarche",
+ "column": 65,
+ "formater_type": 1,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 90,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "context_record__operation__code_patriarche",
+ "column": 87,
+ "formater_type": 1,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 92,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "context_record__external_id",
+ "column": 89,
+ "formater_type": 3,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 269,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "report_processing",
+ "column": 244,
+ "formater_type": 37,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 267,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "comment",
+ "column": 242,
+ "formater_type": 35,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 93,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "find__material_types",
+ "column": 90,
+ "formater_type": 20,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 91,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "find__previous_id",
+ "column": 88,
+ "formater_type": 3,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 94,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "find__conservatory_state",
+ "column": 91,
+ "formater_type": 22,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 95,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "comment",
+ "column": 92,
+ "formater_type": 16,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 96,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "find__label",
+ "column": 93,
+ "formater_type": 3,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 97,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "identification",
+ "column": 94,
+ "formater_type": 24,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 98,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "description",
+ "column": 95,
+ "formater_type": 16,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 99,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "datings__period",
+ "column": 96,
+ "formater_type": 6,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": true
+ }
+ },
+ {
+ "pk": 83,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "find__weight",
+ "column": 80,
+ "formater_type": 21,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 132,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "find__previous_id",
+ "column": 122,
+ "formater_type": 3,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 134,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "find__description",
+ "column": 124,
+ "formater_type": 16,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 135,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "find__width",
+ "column": 125,
+ "formater_type": 21,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 136,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "find__height",
+ "column": 126,
+ "formater_type": 21,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 137,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "find__diameter",
+ "column": 127,
+ "formater_type": 21,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 138,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "find__dating_comment",
+ "column": 128,
+ "formater_type": 16,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 81,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "find__datings__period",
+ "column": 78,
+ "formater_type": 6,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": true
+ }
+ },
+ {
+ "pk": 256,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "operation_type",
+ "column": 231,
+ "formater_type": 2,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 258,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "operator__name",
+ "column": 233,
+ "formater_type": 3,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 260,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "scientist__surname",
+ "column": 235,
+ "formater_type": 4,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 262,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "excavation_end_date",
+ "column": 237,
+ "formater_type": 5,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 264,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "year",
+ "column": 239,
+ "formater_type": 1,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 266,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "code_dracar",
+ "column": 241,
+ "formater_type": 16,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 268,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "report_delivery_date",
+ "column": 243,
+ "formater_type": 5,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 212,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Am\u00e9nageur - adresse",
+ "target": "general_contractor__attached_to__address",
+ "column": 192,
+ "formater_type": 10,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 213,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Am\u00e9nageur - adresse",
+ "target": "general_contractor__attached_to__postal_code",
+ "column": 192,
+ "formater_type": 28,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 214,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Am\u00e9nageur - adresse",
+ "target": "general_contractor__attached_to__town",
+ "column": 192,
+ "formater_type": 31,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 215,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Am\u00e9nageur - nom brut",
+ "target": "general_contractor__raw_name",
+ "column": 193,
+ "formater_type": 30,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 216,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Am\u00e9nageur - titre",
+ "target": "general_contractor__title",
+ "column": 194,
+ "formater_type": 29,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 217,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "parcels__year",
+ "column": 195,
+ "formater_type": 29,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 218,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "",
+ "column": 196,
+ "formater_type": 29,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 219,
+ "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,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 220,
+ "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,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 221,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Type de saisine",
+ "target": "saisine_type",
+ "column": 199,
+ "formater_type": 32,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 222,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Nom du dossier",
+ "target": "name",
+ "column": 200,
+ "formater_type": 35,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 223,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Service instructeur - adresse",
+ "target": "responsible_town_planning_service__raw_name",
+ "column": 201,
+ "formater_type": 4,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 224,
+ "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,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 225,
+ "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,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 226,
+ "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,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 227,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Commentaire",
+ "target": "comment",
+ "column": 202,
+ "formater_type": 35,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 228,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Date de r\u00e9ception",
+ "target": "reception_date",
+ "column": 203,
+ "formater_type": 25,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 229,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Date de cr\u00e9ation",
+ "target": "creation_date",
+ "column": 204,
+ "formater_type": 25,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 230,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Commentaire",
+ "target": "comment",
+ "column": 205,
+ "formater_type": 35,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 231,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Autre r\u00e9f\u00e9rence",
+ "target": "internal_reference",
+ "column": 206,
+ "formater_type": 36,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 232,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Justificatif de prescription",
+ "target": "comment",
+ "column": 207,
+ "formater_type": 35,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 233,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Justificatif d'intervention",
+ "target": "comment",
+ "column": 208,
+ "formater_type": 35,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 234,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "M\u00e9thodologie de l'op\u00e9ration",
+ "target": "comment",
+ "column": 209,
+ "formater_type": 35,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 235,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "R\u00e9f. du permis de construire",
+ "target": "permit_reference",
+ "column": 210,
+ "formater_type": 4,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 236,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "R\u00e9f\u00e9rence de dossier am\u00e9nageur",
+ "target": "comment",
+ "column": 211,
+ "formater_type": 35,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 237,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Num\u00e9ro d'arr\u00eat\u00e9 pr\u00e9fectoral",
+ "target": "comment",
+ "column": 212,
+ "formater_type": 35,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 238,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Num\u00e9ro d'arr\u00eat\u00e9 SRA",
+ "target": "comment",
+ "column": 213,
+ "formater_type": 35,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 239,
+ "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,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 240,
+ "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,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 241,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Commentaire",
+ "target": "comment",
+ "column": 216,
+ "formater_type": 33,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 242,
+ "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,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 243,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Responsable - nom brut",
+ "target": "in_charge__raw_name",
+ "column": 218,
+ "formater_type": 30,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 244,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Surface totale",
+ "target": "total_surface",
+ "column": 219,
+ "formater_type": 29,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 245,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Surface totale am\u00e9nag\u00e9e",
+ "target": "total_developed_surface",
+ "column": 220,
+ "formater_type": 29,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 246,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Type de permis",
+ "target": "permit_type",
+ "column": 221,
+ "formater_type": 34,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 247,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Ann\u00e9e du dossier",
+ "target": "year",
+ "column": 222,
+ "formater_type": 1,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 248,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Identifiant num\u00e9rique",
+ "target": "numeric_reference",
+ "column": 223,
+ "formater_type": 1,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 249,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "Identifiant externe",
+ "target": "external_id",
+ "column": 224,
+ "formater_type": 35,
+ "concat_str": null,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 270,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "alt_address",
+ "column": 245,
+ "formater_type": 35,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 272,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "address",
+ "column": 247,
+ "formater_type": 35,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 273,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "alt_postal_code",
+ "column": 248,
+ "formater_type": 38,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 274,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "postal_code",
+ "column": 249,
+ "formater_type": 38,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 275,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "alt_address_is_prefered",
+ "column": 250,
+ "formater_type": 19,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 276,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "comment",
+ "column": 251,
+ "formater_type": 35,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": true,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 277,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "comment",
+ "column": 252,
+ "formater_type": 35,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": true,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 278,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "contact_type",
+ "column": 253,
+ "formater_type": 35,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 279,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "name",
+ "column": 254,
+ "formater_type": 30,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 281,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "comment",
+ "column": 256,
+ "formater_type": 35,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 282,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "raw_phone",
+ "column": 257,
+ "formater_type": 35,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 283,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "alt_country",
+ "column": 258,
+ "formater_type": 17,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 284,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "country",
+ "column": 259,
+ "formater_type": 17,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 285,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "surname",
+ "column": 260,
+ "formater_type": 39,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 286,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "title",
+ "column": 261,
+ "formater_type": 31,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 288,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "alt_town",
+ "column": 263,
+ "formater_type": 31,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 289,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "town",
+ "column": 264,
+ "formater_type": 31,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 287,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "phone_desc",
+ "column": 262,
+ "formater_type": 4,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 271,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "email",
+ "column": 246,
+ "formater_type": 4,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 280,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "attached_to__name",
+ "column": 255,
+ "formater_type": 10,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 292,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "year",
+ "column": 267,
+ "formater_type": 1,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 295,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "associated_file__external_id",
+ "column": 270,
+ "formater_type": 35,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 298,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "scientist__title",
+ "column": 274,
+ "formater_type": 11,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 301,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "scientist__organization__name",
+ "column": 277,
+ "formater_type": 30,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 304,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "in_charge__title",
+ "column": 280,
+ "formater_type": 11,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 307,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "in_charge__organization__name",
+ "column": 283,
+ "formater_type": 3,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 310,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "excavation_end_date",
+ "column": 286,
+ "formater_type": 25,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 313,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "negative_result",
+ "column": 289,
+ "formater_type": 19,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 316,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "cira_rapporteur__organization__name",
+ "column": 292,
+ "formater_type": 3,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 319,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "finds_deadline",
+ "column": 295,
+ "formater_type": 25,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 322,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": "",
+ "target": "report_delivery_date",
+ "column": 298,
+ "formater_type": 25,
+ "concat_str": "",
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
"pk": 25,
"model": "ishtar_common.formatertype",
"fields": {
@@ -1634,6 +5780,15 @@
}
},
{
+ "pk": 40,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "TypeFormater",
+ "many_split": "&",
+ "options": "archaeological_operations.models.archaeological_sites"
+ }
+ },
+ {
"pk": 2,
"model": "ishtar_common.formatertype",
"fields": {
@@ -1652,6 +5807,15 @@
}
},
{
+ "pk": 37,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "TypeFormater",
+ "many_split": "",
+ "options": "archaeological_operations.models.ReportState"
+ }
+ },
+ {
"pk": 15,
"model": "ishtar_common.formatertype",
"fields": {
@@ -1688,6 +5852,15 @@
}
},
{
+ "pk": 38,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "UnicodeFormater",
+ "many_split": "",
+ "options": "10"
+ }
+ },
+ {
"pk": 16,
"model": "ishtar_common.formatertype",
"fields": {
@@ -1769,6 +5942,15 @@
}
},
{
+ "pk": 39,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "UnicodeFormater",
+ "many_split": "",
+ "options": "50"
+ }
+ },
+ {
"pk": 10,
"model": "ishtar_common.formatertype",
"fields": {
@@ -1823,6 +6005,105 @@
}
},
{
+ "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",
"fields": {
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 77e9c8972..c15999721 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -803,7 +803,7 @@ class SourceForm(ManageOldType, forms.Form):
u"(ratio is preserved).</p>") % {
'width': settings.IMAGE_MAX_SIZE[0],
'height': settings.IMAGE_MAX_SIZE[1]}),
- required=False, widget=widgets.ImageFileInput())
+ max_length=255, required=False, widget=widgets.ImageFileInput())
def __init__(self, *args, **kwargs):
super(SourceForm, self).__init__(*args, **kwargs)
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index 4759a7e47..5110bca31 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -155,12 +155,12 @@ msgstr ""
msgid "Add a new item"
msgstr ""
-#: forms.py:245 models.py:1307
+#: forms.py:245 models.py:1310
msgid "Template"
msgstr ""
#: forms_common.py:41 forms_common.py:59 forms_common.py:182
-#: forms_common.py:406 models.py:1373 models.py:2722
+#: forms_common.py:406 models.py:1376 models.py:2758
#: templates/blocks/JQueryAdvancedTown.html:19
#: templates/ishtar/sheet_organization.html:13
msgid "Town"
@@ -176,8 +176,8 @@ msgid ""
"french town Saint-Denis in the Seine-Saint-Denis department.</p>"
msgstr ""
-#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1543
-#: models.py:2361 models.py:2530 models.py:2592
+#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1546
+#: models.py:2384 models.py:2566 models.py:2628
#: templates/ishtar/sheet_person.html:4
msgid "Person"
msgstr ""
@@ -189,63 +189,63 @@ msgid ""
msgstr ""
#: forms_common.py:170 forms_common.py:327 forms_common.py:451
-#: ishtar_menu.py:75 models.py:1544 models.py:2262
+#: ishtar_menu.py:75 models.py:1547 models.py:2273
#: templates/ishtar/sheet_organization.html:4
msgid "Organization"
msgstr ""
#: forms_common.py:173 forms_common.py:210 forms_common.py:322
-#: forms_common.py:376 forms_common.py:446 models.py:974 models.py:1306
-#: models.py:1589 models.py:1807 models.py:2256 models.py:2347 models.py:2708
+#: forms_common.py:376 forms_common.py:446 models.py:977 models.py:1309
+#: models.py:1592 models.py:1810 models.py:2267 models.py:2370 models.py:2744
#: templates/ishtar/sheet_organization.html:8
#: templates/ishtar/sheet_organization.html:21
msgid "Name"
msgstr ""
-#: forms_common.py:174 models.py:1528 models.py:1938
+#: forms_common.py:174 models.py:1531 models.py:1941
msgid "Organization type"
msgstr ""
-#: forms_common.py:176 forms_common.py:400 models.py:1368
+#: forms_common.py:176 forms_common.py:400 models.py:1371
#: templates/ishtar/sheet_organization.html:10
msgid "Address"
msgstr ""
-#: forms_common.py:178 forms_common.py:403 models.py:1369
+#: forms_common.py:178 forms_common.py:403 models.py:1372
#: templates/ishtar/sheet_organization.html:11
msgid "Address complement"
msgstr ""
-#: forms_common.py:180 forms_common.py:404 models.py:1371
+#: forms_common.py:180 forms_common.py:404 models.py:1374
#: templates/ishtar/sheet_organization.html:12
msgid "Postal code"
msgstr ""
-#: forms_common.py:183 forms_common.py:407 models.py:1374
+#: forms_common.py:183 forms_common.py:407 models.py:1377
msgid "Country"
msgstr ""
#: forms_common.py:185 forms_common.py:324 forms_common.py:380
-#: forms_common.py:448 forms_common.py:572 models.py:1401
+#: forms_common.py:448 forms_common.py:572 models.py:1404
msgid "Email"
msgstr ""
-#: forms_common.py:186 forms_common.py:383 models.py:1386
+#: forms_common.py:186 forms_common.py:383 models.py:1389
#: templates/ishtar/sheet_organization.html:14
#: templates/ishtar/sheet_person.html:19
#: templates/ishtar/wizard/wizard_person.html:17
msgid "Phone"
msgstr ""
-#: forms_common.py:187 forms_common.py:392 models.py:1398
+#: forms_common.py:187 forms_common.py:392 models.py:1401
#: templates/ishtar/sheet_organization.html:15
#: templates/ishtar/sheet_person.html:37
#: templates/ishtar/wizard/wizard_person.html:35
msgid "Mobile phone"
msgstr ""
-#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:1966
-#: models.py:2258 models.py:2643 templates/sheet_ope.html:85
+#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:1969
+#: models.py:2269 models.py:2679 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
@@ -269,7 +269,7 @@ msgstr ""
msgid "Organization to merge"
msgstr ""
-#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2345
+#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2368
#: templates/ishtar/sheet_organization.html:22
msgid "Surname"
msgstr ""
@@ -287,25 +287,25 @@ msgstr ""
msgid "Identity"
msgstr ""
-#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:1939
-#: models.py:2339 models.py:2341 models.py:2640 templates/sheet_ope.html:104
+#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:1942
+#: models.py:2362 models.py:2364 models.py:2676 templates/sheet_ope.html:104
#: templates/ishtar/blocks/window_tables/documents.html:7
msgid "Title"
msgstr ""
-#: forms_common.py:372 models.py:2343
+#: forms_common.py:372 models.py:2366
msgid "Salutation"
msgstr ""
-#: forms_common.py:378 models.py:2349
+#: forms_common.py:378 models.py:2372
msgid "Raw name"
msgstr ""
-#: forms_common.py:381 models.py:1387
+#: forms_common.py:381 models.py:1390
msgid "Phone description"
msgstr ""
-#: forms_common.py:384 models.py:1389 models.py:1391
+#: forms_common.py:384 models.py:1392 models.py:1394
msgid "Phone description 2"
msgstr ""
@@ -313,11 +313,11 @@ msgstr ""
msgid "Phone 2"
msgstr ""
-#: forms_common.py:388 models.py:1395
+#: forms_common.py:388 models.py:1398
msgid "Phone description 3"
msgstr ""
-#: forms_common.py:390 models.py:1393
+#: forms_common.py:390 models.py:1396
msgid "Phone 3"
msgstr ""
@@ -325,23 +325,23 @@ msgstr ""
msgid "Current organization"
msgstr ""
-#: forms_common.py:409 models.py:1376
+#: forms_common.py:409 models.py:1379
msgid "Other address: address"
msgstr ""
-#: forms_common.py:412 models.py:1379
+#: forms_common.py:412 models.py:1382
msgid "Other address: address complement"
msgstr ""
-#: forms_common.py:414 models.py:1380
+#: forms_common.py:414 models.py:1383
msgid "Other address: postal code"
msgstr ""
-#: forms_common.py:416 models.py:1382
+#: forms_common.py:416 models.py:1385
msgid "Other address: town"
msgstr ""
-#: forms_common.py:418 models.py:1384
+#: forms_common.py:418 models.py:1387
msgid "Other address: country"
msgstr ""
@@ -357,7 +357,7 @@ msgstr ""
msgid "Account search"
msgstr ""
-#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2310
+#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2321
msgid "Person type"
msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
msgid "Send the new password by email?"
msgstr ""
-#: forms_common.py:628 forms_common.py:641 models.py:2723
+#: forms_common.py:628 forms_common.py:641 models.py:2759
msgid "Towns"
msgstr ""
@@ -405,7 +405,7 @@ msgstr ""
msgid "Documentation informations"
msgstr ""
-#: forms_common.py:775 forms_common.py:823 models.py:1940 models.py:2617
+#: forms_common.py:775 forms_common.py:823 models.py:1943 models.py:2653
msgid "Source type"
msgstr ""
@@ -417,37 +417,37 @@ msgstr ""
msgid "Internal reference"
msgstr ""
-#: forms_common.py:783 models.py:2654
+#: forms_common.py:783 models.py:2690
msgid "Numerical ressource (web address)"
msgstr ""
-#: forms_common.py:784 models.py:2656
+#: forms_common.py:784 models.py:2692
msgid "Receipt date"
msgstr ""
-#: forms_common.py:786 models.py:2093 models.py:2658
+#: forms_common.py:786 models.py:2096 models.py:2694
msgid "Creation date"
msgstr ""
-#: forms_common.py:789 models.py:2661
+#: forms_common.py:789 models.py:2697
msgid "Receipt date in documentation"
msgstr ""
#: forms_common.py:791 forms_common.py:827 models.py:317 models.py:577
-#: models.py:1834 models.py:2353 models.py:2668
+#: models.py:1837 models.py:2376 models.py:2704
msgid "Comment"
msgstr ""
-#: forms_common.py:793 forms_common.py:826 models.py:976 models.py:1593
-#: models.py:1766 models.py:1808 models.py:2667 templates/sheet_ope.html:128
+#: forms_common.py:793 forms_common.py:826 models.py:979 models.py:1596
+#: models.py:1769 models.py:1811 models.py:2703 templates/sheet_ope.html:128
msgid "Description"
msgstr ""
-#: forms_common.py:796 models.py:2669
+#: forms_common.py:796 models.py:2705
msgid "Additional information"
msgstr ""
-#: forms_common.py:798 forms_common.py:830 models.py:2671
+#: forms_common.py:798 forms_common.py:830 models.py:2707
msgid "Has a duplicate"
msgstr ""
@@ -462,7 +462,7 @@ msgid ""
"p>"
msgstr ""
-#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2597
+#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2633
#: templates/ishtar/wizard/wizard_person_deletion.html:124
msgid "Author"
msgstr ""
@@ -475,7 +475,7 @@ msgstr ""
msgid "Would you like to delete this documentation?"
msgstr ""
-#: forms_common.py:856 models.py:1941 models.py:2585 models.py:2594
+#: forms_common.py:856 models.py:1944 models.py:2621 models.py:2630
msgid "Author type"
msgstr ""
@@ -487,7 +487,7 @@ msgstr ""
msgid "There are identical authors."
msgstr ""
-#: forms_common.py:893 models.py:2598 models.py:2650
+#: forms_common.py:893 models.py:2634 models.py:2686
#: templates/sheet_ope.html:106
#: templates/ishtar/blocks/window_tables/documents.html:9
msgid "Authors"
@@ -505,7 +505,7 @@ msgstr ""
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:39 models.py:1102 views.py:1450
+#: ishtar_menu.py:39 models.py:1105 views.py:1484
msgid "Global variables"
msgstr ""
@@ -533,20 +533,20 @@ msgstr ""
msgid "Manual merge"
msgstr ""
-#: ishtar_menu.py:70 ishtar_menu.py:101 models.py:2130 widgets.py:110
+#: ishtar_menu.py:70 ishtar_menu.py:101 models.py:2133 widgets.py:110
#: templates/ishtar/form_delete.html:11
msgid "Delete"
msgstr ""
-#: ishtar_menu.py:109 models.py:2104
+#: ishtar_menu.py:109 models.py:2107
msgid "Imports"
msgstr ""
-#: ishtar_menu.py:112 views.py:1458
+#: ishtar_menu.py:112 views.py:1492
msgid "New import"
msgstr ""
-#: ishtar_menu.py:116 views.py:1472
+#: ishtar_menu.py:116 views.py:1506
msgid "Current imports"
msgstr ""
@@ -566,7 +566,7 @@ msgstr ""
msgid "This item already exists."
msgstr ""
-#: models.py:313 models.py:576 models.py:1341 models.py:1353
+#: models.py:313 models.py:576 models.py:1344 models.py:1356
msgid "Label"
msgstr ""
@@ -574,11 +574,11 @@ msgstr ""
msgid "Textual ID"
msgstr ""
-#: models.py:318 models.py:579 models.py:1310
+#: models.py:318 models.py:579 models.py:1313
msgid "Available"
msgstr ""
-#: models.py:598 models.py:1880
+#: models.py:598 models.py:1883
msgid "Key"
msgstr ""
@@ -586,180 +586,180 @@ msgstr ""
msgid "Specific key to an import"
msgstr ""
-#: models.py:695
+#: models.py:696
msgid "Last editor"
msgstr ""
-#: models.py:698
+#: models.py:699
msgid "Creator"
msgstr ""
-#: models.py:838 models.py:2734
+#: models.py:841 models.py:2770
msgid "Order"
msgstr ""
-#: models.py:839
+#: models.py:842
msgid "Symmetrical"
msgstr ""
-#: models.py:840
+#: models.py:843
msgid "Tiny label"
msgstr ""
-#: models.py:854
+#: models.py:857
msgid "Cannot have symmetrical and an inverse_relation"
msgstr ""
-#: models.py:968
+#: models.py:971
msgid "Euro"
msgstr ""
-#: models.py:969
+#: models.py:972
msgid "US dollar"
msgstr ""
-#: models.py:975 models.py:1591
+#: models.py:978 models.py:1594
msgid "Slug"
msgstr ""
-#: models.py:977
+#: models.py:980
msgid "Files module"
msgstr ""
-#: models.py:978
+#: models.py:981
msgid "Context records module"
msgstr ""
-#: models.py:980
+#: models.py:983
msgid "Finds module"
msgstr ""
-#: models.py:981
+#: models.py:984
msgid "Need context records module"
msgstr ""
-#: models.py:983
+#: models.py:986
msgid "Warehouses module"
msgstr ""
-#: models.py:984
+#: models.py:987
msgid "Need finds module"
msgstr ""
-#: models.py:986
+#: models.py:989
msgid "Home page"
msgstr ""
-#: models.py:987
+#: models.py:990
#, python-brace-format
msgid ""
"Homepage of Ishtar - if not defined a default homepage will appear. Use the "
"markdown syntax. {random_image} can be used to display a random image."
msgstr ""
-#: models.py:991
+#: models.py:994
msgid "File external id"
msgstr ""
-#: models.py:993
+#: models.py:996
msgid ""
"Formula to manage file external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:998
+#: models.py:1001
msgid "Parcel external id"
msgstr ""
-#: models.py:1001
+#: models.py:1004
msgid ""
"Formula to manage parcel external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1006
+#: models.py:1009
msgid "Context record external id"
msgstr ""
-#: models.py:1008
+#: models.py:1011
msgid ""
"Formula to manage context record external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1013
+#: models.py:1016
msgid "Base find external id"
msgstr ""
-#: models.py:1015
+#: models.py:1018
msgid ""
"Formula to manage base find external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1020
+#: models.py:1023
msgid "Find external id"
msgstr ""
-#: models.py:1022
+#: models.py:1025
msgid ""
"Formula to manage find external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1027
+#: models.py:1030
msgid "Raw name for person"
msgstr ""
-#: models.py:1029
+#: models.py:1032
msgid ""
"Formula to manage person raw_name. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1033
+#: models.py:1036
msgid "Current active"
msgstr ""
-#: models.py:1034
+#: models.py:1037
msgid "Currency"
msgstr ""
-#: models.py:1038
+#: models.py:1041
msgid "Ishtar site profile"
msgstr ""
-#: models.py:1039
+#: models.py:1042
msgid "Ishtar site profiles"
msgstr ""
-#: models.py:1095
+#: models.py:1098
msgid "Variable name"
msgstr ""
-#: models.py:1096
+#: models.py:1099
msgid "Description of the variable"
msgstr ""
-#: models.py:1098 models.py:1881
+#: models.py:1101 models.py:1884
msgid "Value"
msgstr ""
-#: models.py:1101
+#: models.py:1104
msgid "Global variable"
msgstr ""
-#: models.py:1211 models.py:1241
+#: models.py:1214 models.py:1244
msgid "Total"
msgstr ""
-#: models.py:1218 models.py:1342 models.py:1354
+#: models.py:1221 models.py:1345 models.py:1357
#: templates/ishtar/sheet_person.html:22
#: templates/ishtar/dashboards/dashboard_main_detail.html:141
#: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
@@ -767,605 +767,605 @@ msgstr ""
msgid "Number"
msgstr ""
-#: models.py:1305
+#: models.py:1308
msgid "Administrative Act"
msgstr ""
-#: models.py:1309
+#: models.py:1312
msgid "Associated object"
msgstr ""
-#: models.py:1313
+#: models.py:1316
msgid "Document template"
msgstr ""
-#: models.py:1314
+#: models.py:1317
msgid "Document templates"
msgstr ""
-#: models.py:1345 models.py:1355 models.py:2088
+#: models.py:1348 models.py:1358 models.py:2091
msgid "State"
msgstr ""
-#: models.py:1359 templates/blocks/JQueryAdvancedTown.html:12
+#: models.py:1362 templates/blocks/JQueryAdvancedTown.html:12
msgid "Department"
msgstr ""
-#: models.py:1360
+#: models.py:1363
msgid "Departments"
msgstr ""
-#: models.py:1397
+#: models.py:1400
msgid "Raw phone"
msgstr ""
-#: models.py:1403
+#: models.py:1406
msgid "Alternative address is prefered"
msgstr ""
-#: models.py:1442
+#: models.py:1445
msgid "Tel: "
msgstr ""
-#: models.py:1446
+#: models.py:1449
msgid "Mobile: "
msgstr ""
-#: models.py:1450
+#: models.py:1453
msgid "Email: "
msgstr ""
-#: models.py:1455
+#: models.py:1458
msgid "Merge key"
msgstr ""
-#: models.py:1529
+#: models.py:1532
msgid "Organization types"
msgstr ""
-#: models.py:1545 views.py:234
+#: models.py:1548 views.py:234
msgid "Operation"
msgstr ""
-#: models.py:1547
+#: models.py:1550
msgid "Archaeological site"
msgstr ""
-#: models.py:1548
+#: models.py:1551
msgid "Parcels"
msgstr ""
-#: models.py:1550
+#: models.py:1553
msgid "Operation source"
msgstr ""
-#: models.py:1553 views.py:1265 views.py:1316
+#: models.py:1556 views.py:1299 views.py:1350
msgid "Archaeological files"
msgstr ""
-#: models.py:1555 views.py:1268 views.py:1324
+#: models.py:1558 views.py:1302 views.py:1358
msgid "Context records"
msgstr ""
-#: models.py:1557
+#: models.py:1560
msgid "Context record relations"
msgstr ""
-#: models.py:1559 views.py:1270 views.py:1327
+#: models.py:1562 views.py:1304 views.py:1361
msgid "Finds"
msgstr ""
-#: models.py:1595 templates/ishtar/dashboards/dashboard_main.html:25
+#: models.py:1598 templates/ishtar/dashboards/dashboard_main.html:25
msgid "Users"
msgstr ""
-#: models.py:1597
+#: models.py:1600
msgid "Associated model"
msgstr ""
-#: models.py:1600
+#: models.py:1603
msgid "Is template"
msgstr ""
-#: models.py:1601
+#: models.py:1604
msgid "Unicity keys (separator \";\")"
msgstr ""
-#: models.py:1605
+#: models.py:1608
msgid "Importer - Type"
msgstr ""
-#: models.py:1606
+#: models.py:1609
msgid "Importer - Types"
msgstr ""
-#: models.py:1696
+#: models.py:1699
msgid "Importer - Default"
msgstr ""
-#: models.py:1697
+#: models.py:1700
msgid "Importer - Defaults"
msgstr ""
-#: models.py:1732
+#: models.py:1735
msgid "Importer - Default value"
msgstr ""
-#: models.py:1733
+#: models.py:1736
msgid "Importer - Default values"
msgstr ""
-#: models.py:1765
+#: models.py:1768
msgid "Column number"
msgstr ""
-#: models.py:1768
+#: models.py:1771
msgid "Required"
msgstr ""
-#: models.py:1771
+#: models.py:1774
msgid "Importer - Column"
msgstr ""
-#: models.py:1772
+#: models.py:1775
msgid "Importer - Columns"
msgstr ""
-#: models.py:1792
+#: models.py:1795
msgid "Field name"
msgstr ""
-#: models.py:1794 models.py:1828
+#: models.py:1797 models.py:1831
msgid "Force creation of new items"
msgstr ""
-#: models.py:1796 models.py:1830
+#: models.py:1799 models.py:1833
msgid "Concatenate with existing"
msgstr ""
-#: models.py:1798 models.py:1832
+#: models.py:1801 models.py:1835
msgid "Concatenate character"
msgstr ""
-#: models.py:1802
+#: models.py:1805
msgid "Importer - Duplicate field"
msgstr ""
-#: models.py:1803
+#: models.py:1806
msgid "Importer - Duplicate fields"
msgstr ""
-#: models.py:1810
+#: models.py:1813
msgid "Regular expression"
msgstr ""
-#: models.py:1813
+#: models.py:1816
msgid "Importer - Regular expression"
msgstr ""
-#: models.py:1814
+#: models.py:1817
msgid "Importer - Regular expressions"
msgstr ""
-#: models.py:1837
+#: models.py:1840
msgid "Importer - Target"
msgstr ""
-#: models.py:1838
+#: models.py:1841
msgid "Importer - Targets"
msgstr ""
-#: models.py:1862 views.py:518
+#: models.py:1865 views.py:518
msgid "True"
msgstr ""
-#: models.py:1863 views.py:520
+#: models.py:1866 views.py:520
msgid "False"
msgstr ""
-#: models.py:1882
+#: models.py:1885
msgid "Is set"
msgstr ""
-#: models.py:1889
+#: models.py:1892
msgid "Importer - Target key"
msgstr ""
-#: models.py:1890
+#: models.py:1893
msgid "Importer - Targets keys"
msgstr ""
-#: models.py:1942 models.py:2633 models.py:2646
+#: models.py:1945 models.py:2669 models.py:2682
msgid "Format"
msgstr ""
-#: models.py:1943 models.py:2738
+#: models.py:1946 models.py:2774
msgid "Operation type"
msgstr ""
-#: models.py:1944
+#: models.py:1947
msgid "Period"
msgstr ""
-#: models.py:1945
+#: models.py:1948
msgid "Report state"
msgstr ""
-#: models.py:1946
+#: models.py:1949
msgid "Unit"
msgstr ""
-#: models.py:1947
+#: models.py:1950
msgid "Material"
msgstr ""
-#: models.py:1949
+#: models.py:1952
msgid "Conservatory state"
msgstr ""
-#: models.py:1950
+#: models.py:1953
msgid "Preservation type"
msgstr ""
-#: models.py:1951
+#: models.py:1954
msgid "Object type"
msgstr ""
-#: models.py:1953
+#: models.py:1956
msgid "Identification type"
msgstr ""
-#: models.py:1955
+#: models.py:1958
msgid "Context record relation type"
msgstr ""
-#: models.py:1956 models.py:2625
+#: models.py:1959 models.py:2661
msgid "Support type"
msgstr ""
-#: models.py:1962
+#: models.py:1965
msgid "Integer"
msgstr ""
-#: models.py:1963
+#: models.py:1966
msgid "Float"
msgstr ""
-#: models.py:1964
+#: models.py:1967
msgid "String"
msgstr ""
-#: models.py:1965 templates/sheet_ope.html:86
+#: models.py:1968 templates/sheet_ope.html:86
msgid "Date"
msgstr ""
-#: models.py:1967 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
+#: models.py:1970 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
#: templates/ishtar/dashboards/dashboard_main_detail.html:126
msgid "Year"
msgstr ""
-#: models.py:1968
+#: models.py:1971
msgid "String to boolean"
msgstr ""
-#: models.py:1969
+#: models.py:1972
msgctxt "filesystem"
msgid "File"
msgstr ""
-#: models.py:1970
+#: models.py:1973
msgid "Unknow type"
msgstr ""
-#: models.py:1986
+#: models.py:1989
msgid "4 digit year. e.g.: \"2015\""
msgstr ""
-#: models.py:1987
+#: models.py:1990
msgid "4 digit year/month/day. e.g.: \"2015/02/04\""
msgstr ""
-#: models.py:1988
+#: models.py:1991
msgid "Day/month/4 digit year. e.g.: \"04/02/2015\""
msgstr ""
-#: models.py:1998
+#: models.py:2001
msgid "Options"
msgstr ""
-#: models.py:2000
+#: models.py:2003
msgid "Split character(s)"
msgstr ""
-#: models.py:2004
+#: models.py:2007
msgid "Importer - Formater type"
msgstr ""
-#: models.py:2005
+#: models.py:2008
msgid "Importer - Formater types"
msgstr ""
-#: models.py:2052 templates/ishtar/dashboards/dashboard_main_detail.html:63
+#: models.py:2055 templates/ishtar/dashboards/dashboard_main_detail.html:63
msgid "Created"
msgstr ""
-#: models.py:2053
+#: models.py:2056
msgid "Analyse in progress"
msgstr ""
-#: models.py:2054
+#: models.py:2057
msgid "Analysed"
msgstr ""
-#: models.py:2055
+#: models.py:2058
msgid "Import pending"
msgstr ""
-#: models.py:2056
+#: models.py:2059
msgid "Import in progress"
msgstr ""
-#: models.py:2057
+#: models.py:2060
msgid "Finished with errors"
msgstr ""
-#: models.py:2058
+#: models.py:2061
msgid "Finished"
msgstr ""
-#: models.py:2059
+#: models.py:2062
msgid "Archived"
msgstr ""
-#: models.py:2071
+#: models.py:2074
msgid "Imported file"
msgstr ""
-#: models.py:2074
+#: models.py:2077
msgid "Associated images (zip file)"
msgstr ""
-#: models.py:2076
+#: models.py:2079
msgid "Encoding"
msgstr ""
-#: models.py:2078
+#: models.py:2081
msgid "Skip lines"
msgstr ""
-#: models.py:2079 templates/ishtar/import_list.html:47
+#: models.py:2082 templates/ishtar/import_list.html:47
msgid "Error file"
msgstr ""
-#: models.py:2082
+#: models.py:2085
msgid "Result file"
msgstr ""
-#: models.py:2085 templates/ishtar/import_list.html:53
+#: models.py:2088 templates/ishtar/import_list.html:53
msgid "Match file"
msgstr ""
-#: models.py:2091
+#: models.py:2094
msgid "Conservative import"
msgstr ""
-#: models.py:2096
+#: models.py:2099
msgid "End date"
msgstr ""
-#: models.py:2098
+#: models.py:2101
msgid "Remaining seconds"
msgstr ""
-#: models.py:2103
+#: models.py:2106
msgid "Import"
msgstr ""
-#: models.py:2120
+#: models.py:2123
msgid "Analyse"
msgstr ""
-#: models.py:2122 models.py:2125
+#: models.py:2125 models.py:2128
msgid "Re-analyse"
msgstr ""
-#: models.py:2123
+#: models.py:2126
msgid "Launch import"
msgstr ""
-#: models.py:2126
+#: models.py:2129
msgid "Re-import"
msgstr ""
-#: models.py:2127
+#: models.py:2130
msgid "Archive"
msgstr ""
-#: models.py:2129
+#: models.py:2132
msgid "Unarchive"
msgstr ""
-#: models.py:2263
+#: models.py:2274
msgid "Organizations"
msgstr ""
-#: models.py:2265
+#: models.py:2276
msgid "Can view all Organizations"
msgstr ""
-#: models.py:2266
+#: models.py:2277
msgid "Can view own Organization"
msgstr ""
-#: models.py:2267
+#: models.py:2278
msgid "Can add own Organization"
msgstr ""
-#: models.py:2269
+#: models.py:2280
msgid "Can change own Organization"
msgstr ""
-#: models.py:2271
+#: models.py:2282
msgid "Can delete own Organization"
msgstr ""
-#: models.py:2306
+#: models.py:2317
msgid "Groups"
msgstr ""
-#: models.py:2311
+#: models.py:2322
msgid "Person types"
msgstr ""
-#: models.py:2319
+#: models.py:2330
msgid "Title type"
msgstr ""
-#: models.py:2320
+#: models.py:2331
msgid "Title types"
msgstr ""
-#: models.py:2329
+#: models.py:2340
msgid "Mr"
msgstr ""
-#: models.py:2330
+#: models.py:2341
msgid "Miss"
msgstr ""
-#: models.py:2331
+#: models.py:2342
msgid "Mr and Mrs"
msgstr ""
-#: models.py:2332
+#: models.py:2343
msgid "Mrs"
msgstr ""
-#: models.py:2333
+#: models.py:2344
msgid "Doctor"
msgstr ""
-#: models.py:2351
+#: models.py:2374
msgid "Contact type"
msgstr ""
-#: models.py:2354 models.py:2418
+#: models.py:2377 models.py:2441
msgid "Types"
msgstr ""
-#: models.py:2357
+#: models.py:2380
msgid "Is attached to"
msgstr ""
-#: models.py:2362
+#: models.py:2385
msgid "Persons"
msgstr ""
-#: models.py:2364
+#: models.py:2387
msgid "Can view all Persons"
msgstr ""
-#: models.py:2365
+#: models.py:2388
msgid "Can view own Person"
msgstr ""
-#: models.py:2366
+#: models.py:2389
msgid "Can add own Person"
msgstr ""
-#: models.py:2367
+#: models.py:2390
msgid "Can change own Person"
msgstr ""
-#: models.py:2368
+#: models.py:2391
msgid "Can delete own Person"
msgstr ""
-#: models.py:2533
+#: models.py:2569
msgid "Advanced shortcut menu"
msgstr ""
-#: models.py:2536
+#: models.py:2572
msgid "Ishtar user"
msgstr ""
-#: models.py:2537
+#: models.py:2573
msgid "Ishtar users"
msgstr ""
-#: models.py:2580
+#: models.py:2616
msgid "To modify the password use the form in Auth > User"
msgstr ""
-#: models.py:2586
+#: models.py:2622
msgid "Author types"
msgstr ""
-#: models.py:2618
+#: models.py:2654
msgid "Source types"
msgstr ""
-#: models.py:2626
+#: models.py:2662
msgid "Support types"
msgstr ""
-#: models.py:2634
+#: models.py:2670
msgid "Formats"
msgstr ""
-#: models.py:2641
+#: models.py:2677
msgid "External ID"
msgstr ""
-#: models.py:2644
+#: models.py:2680
msgid "Support"
msgstr ""
-#: models.py:2648
+#: models.py:2684
msgid "Scale"
msgstr ""
-#: models.py:2662
+#: models.py:2698
msgid "Item number"
msgstr ""
-#: models.py:2663
+#: models.py:2699
msgid "Ref."
msgstr ""
-#: models.py:2666
+#: models.py:2702
msgid "Internal ref."
msgstr ""
-#: models.py:2709
+#: models.py:2745
msgid "Surface (m2)"
msgstr ""
-#: models.py:2710 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:2746 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
msgid "Localisation"
msgstr ""
-#: models.py:2735
+#: models.py:2771
msgid "Is preventive"
msgstr ""
-#: models.py:2739
+#: models.py:2775
msgid "Operation types"
msgstr ""
-#: models.py:2768
+#: models.py:2804
msgid "Preventive"
msgstr ""
-#: models.py:2769
+#: models.py:2805
msgid "Research"
msgstr ""
-#: utils.py:64
+#: utils.py:74
msgid " (...)"
msgstr ""
-#: utils.py:97
+#: utils.py:107
msgid "Load another random image?"
msgstr ""
@@ -1413,44 +1413,44 @@ msgstr ""
msgid "Find"
msgstr ""
-#: views.py:1178 views.py:1247
+#: views.py:1238 views.py:1281
msgid "Operation not permitted."
msgstr ""
-#: views.py:1180
+#: views.py:1240
#, python-format
msgid "New %s"
msgstr ""
-#: views.py:1266 views.py:1320
+#: views.py:1300 views.py:1354
msgid "Operations"
msgstr ""
-#: views.py:1519 templates/ishtar/import_list.html:43
+#: views.py:1553 templates/ishtar/import_list.html:43
msgid "Link unmatched items"
msgstr ""
-#: views.py:1534
+#: views.py:1568
msgid "Delete import"
msgstr ""
-#: views.py:1573
+#: views.py:1607
msgid "Merge persons"
msgstr ""
-#: views.py:1597
+#: views.py:1631
msgid "Select the main person"
msgstr ""
-#: views.py:1606
+#: views.py:1640
msgid "Merge organization"
msgstr ""
-#: views.py:1616
+#: views.py:1650
msgid "Select the main organization"
msgstr ""
-#: views.py:1656 views.py:1672
+#: views.py:1690 views.py:1706
msgid "Corporation manager"
msgstr ""
@@ -1458,15 +1458,15 @@ msgstr ""
msgid "Search..."
msgstr ""
-#: widgets.py:610 templatetags/window_tables.py:79
+#: widgets.py:623 templatetags/window_tables.py:79
msgid "No results"
msgstr ""
-#: widgets.py:611 templatetags/window_tables.py:80
+#: widgets.py:624 templatetags/window_tables.py:80
msgid "Loading..."
msgstr ""
-#: widgets.py:612
+#: widgets.py:625
msgid "Remove"
msgstr ""
@@ -1845,7 +1845,7 @@ msgstr ""
msgid "where the magic happens."
msgstr ""
-#: templates/window.html:40 templates/blocks/JQueryJqGrid.html:25
+#: templates/window.html:40 templates/blocks/JQueryJqGrid.html:28
#: templates/ishtar/manage_basket.html:9
msgid "Add"
msgstr ""
@@ -1867,13 +1867,13 @@ msgstr ""
msgid "Search and select an item"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:20
+#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:23
#: templates/ishtar/blocks/window_tables/dynamic_documents.html:9
#: templates/ishtar/blocks/window_tables/dynamic_documents.html:12
msgid "Export as CSV"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:20
+#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:23
#: templates/ishtar/blocks/window_tables/dynamic_documents.html:9
msgid "CSV"
msgstr ""
@@ -1888,7 +1888,11 @@ msgstr ""
msgid "CSV full"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:96
+#: templates/blocks/JQueryJqGrid.html:20
+msgid "Export as CSV - "
+msgstr ""
+
+#: templates/blocks/JQueryJqGrid.html:99
#: templates/ishtar/blocks/window_tables/dynamic_documents.html:41
msgid "An error as occured during search. Check your query fields."
msgstr ""
@@ -2124,50 +2128,50 @@ msgstr ""
msgid "Documents associated to finds"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:7
-#: templates/ishtar/blocks/shortcut_menu.html:7
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:15
+#: templates/ishtar/blocks/shortcut_menu.html:15
msgid ""
"Simple menu limited to your own items. Be careful only the last 100 items "
"are displayed."
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:7
-#: templates/ishtar/blocks/shortcut_menu.html:7
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:15
+#: templates/ishtar/blocks/shortcut_menu.html:15
msgid "simple"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:8
-#: templates/ishtar/blocks/shortcut_menu.html:8
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:16
+#: templates/ishtar/blocks/shortcut_menu.html:16
msgid "Advanced menu."
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:8
-#: templates/ishtar/blocks/shortcut_menu.html:8
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:16
+#: templates/ishtar/blocks/shortcut_menu.html:16
msgid "advanced"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:11
-#: templates/ishtar/blocks/shortcut_menu.html:10
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:19
+#: templates/ishtar/blocks/shortcut_menu.html:19
msgid ""
"Pin an item in order to constrain default searches with this item. By "
"default only your items are displayed. New created and modified items are "
"auto-pin."
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:13
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:21
msgid "Search within my items"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:14
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:22
msgid "Search within all items"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:17
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:25
msgid "Refresh menu"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:28
-#: templates/ishtar/blocks/shortcut_menu.html:22
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:36
+#: templates/ishtar/blocks/shortcut_menu.html:31
msgid "Unpin"
msgstr ""
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index ba3d51172..3453a53c5 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -608,9 +608,10 @@ class ItemKey(models.Model):
class ImageModel(models.Model):
- image = models.ImageField(upload_to="upload/", blank=True, null=True)
+ image = models.ImageField(upload_to="upload/", blank=True, null=True,
+ max_length=255)
thumbnail = models.ImageField(upload_to='upload/thumbs/', blank=True,
- null=True)
+ null=True, max_length=255)
IMAGE_MAX_SIZE = settings.IMAGE_MAX_SIZE
THUMB_MAX_SIZE = settings.THUMB_MAX_SIZE
IMAGE_PREFIX = '/'
@@ -794,6 +795,8 @@ class BaseHistorizedItem(Imported):
pk=new_item.history_modifier_id)
except User.ObjectDoesNotExist:
pass
+ # force label regeneration
+ self._cached_label_checked = False
self.save()
except:
raise HistoryError(u"The rollback has failed.")
@@ -2253,6 +2256,14 @@ pre_delete.connect(pre_delete_import, sender=Import)
class Organization(Address, Merge, OwnPerms, ValueGetter):
TABLE_COLS = ('name', 'organization_type', 'town')
SHOW_URL = 'show-organization'
+
+ # search parameters
+ EXTRA_REQUEST_KEYS = {
+ 'name': 'name__icontains',
+ 'organization_type': 'organization_type__pk__in',
+ }
+
+ # fields
name = models.CharField(_(u"Name"), max_length=500)
organization_type = models.ForeignKey(OrganizationType,
verbose_name=_(u"Type"))
@@ -2336,6 +2347,18 @@ class Person(Address, Merge, OwnPerms, ValueGetter):
'attached_to', 'town')
SHOW_URL = 'show-person'
MODIFY_URL = 'person_modify'
+
+ # search parameters
+ REVERSED_BOOL_FIELDS = ['ishtaruser__isnull']
+ EXTRA_REQUEST_KEYS = {
+ 'name': ['name__icontains', 'raw_name__icontains'],
+ 'surname': ['surname__icontains', 'raw_name__icontains'],
+ 'attached_to': 'attached_to__pk',
+ 'person_types': 'person_types__pk__in',
+ 'ishtaruser__isnull': 'ishtaruser__isnull'
+ }
+
+ # fields
old_title = models.CharField(_(u"Title"), max_length=100, choices=TYPE,
blank=True, null=True)
title = models.ForeignKey(TitleType, verbose_name=_(u"Title"),
@@ -2527,6 +2550,19 @@ class IshtarUser(User):
TABLE_COLS = ('username', 'person__name', 'person__surname',
'person__email', 'person__person_types_list',
'person__attached_to')
+
+ # search parameters
+ EXTRA_REQUEST_KEYS = {
+ 'username': ['username__icontains'],
+ 'name': ['person__name__icontains', 'person__raw_name__icontains'],
+ 'surname': ['person__surname__icontains',
+ 'person__raw_name__icontains'],
+ 'email': ['person__email'],
+ 'attached_to': 'person__attached_to__pk',
+ 'person_types': 'person__person_types__pk__in',
+ }
+
+ # fields
person = models.ForeignKey(Person, verbose_name=_(u"Person"), unique=True,
related_name='ishtaruser')
advanced_shortcut_menu = models.BooleanField(
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 6017aed64..8abf23289 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -63,6 +63,18 @@ function init_shortcut_menu(html){
load_shortcut_menu
);
});
+ $(".short-menu-close").click(function(){
+ $('#shortcut-menu div').hide();
+ $('#shortcut-menu table').hide();
+ $(".short-menu-close").hide();
+ $(".short-menu-open").show();
+ });
+ $(".short-menu-open").click(function(){
+ $('#shortcut-menu div').show();
+ $('#shortcut-menu table').show();
+ $(".short-menu-open").hide();
+ $(".short-menu-close").show();
+ });
}
function init_shortcut_fields(){
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 8aac9e2a2..00fed380d 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -22,6 +22,8 @@ div.form, ul.form {
/* color */
+.short-menu-open,
+.short-menu-close,
.pin-action,
#window hr,
#context_menu .red,
@@ -78,7 +80,7 @@ a.add-button,
a.add-button, a.remove,
#progress-content,
div.form {
- border:0 solid #CCC;
+ border:0 solid #EAEAEA;
}
#window hr{
@@ -347,10 +349,13 @@ div.nav-button{
}
div#header{
+ position: fixed;
+ top: 0;
+ z-index: 10;
width:100%;
text-align:left;
font-size: 0.9em;
- background-color: #CCC;
+ background-color: #EAEAEA;
margin-bottom:10px;
line-height:30px;
padding:0 20px;
@@ -434,6 +439,33 @@ div#language_form_div label{
margin-top: -20px;
}
+.short-menu-open:hover,
+.short-menu-close:hover{
+ cursor: pointer;
+}
+
+.short-menu-open{
+ display: none;
+}
+
+.short-menu-open,
+.short-menu-close{
+ position: absolute;
+ right: -5px;
+ top: -5px;
+ font-size: 0.8em;
+}
+
+.short-menu-open .fa-stack-2x,
+.short-menu-close .fa-stack-2x {
+ font-size: 1.7em;
+}
+
+.short-menu-open .fa-stack-1x,
+.short-menu-close .fa-stack-1x {
+ line-height: 1.7em;
+}
+
div#context_menu{
height:110px;
margin-right:10px;
@@ -444,11 +476,14 @@ div#context_menu{
div#context_menu fieldset{
margin-top: 8px;
- background-color:#f1f2f6;
- border:0 solid #CCC;
+ background-color: #E6E6E6;
+ border:0 solid #EAEAEA;
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
+ position: fixed;
+ top: 40px;
+ right: 10px;
}
div#action_current_items{
@@ -564,7 +599,7 @@ div#welcome{
div#content{
clear:both;
- margin-top:190px ;
+ margin-top:205px ;
margin-bottom: 70px;
margin-left: 200px;
margin-right: 150px;
@@ -627,14 +662,15 @@ ul#form_path li a:link, ul#form_path li a:visited {
#reminder{
padding:0.4em;
margin-right:10px;
- border:1px solid #CCC;
+ border:1px solid #EAEAEA;
-moz-border-radius:0;
-webkit-border-radius:0;
border-radius:0;
background-color:white;
- position: absolute;
+ position: fixed;
z-index:1000;
left: 200px;
+ top: 35px;
}
#reminder p{
@@ -703,6 +739,12 @@ ul.form-flex li li label {
width: 300px;
}
+.window-refs{
+ font-size: 1.1em;
+ font-weight: bold;
+ text-align: center;
+}
+
#window ul.form-flex label {
width: 150px;
}
@@ -809,7 +851,7 @@ ul.form .help_text{
.delete td{
text-align:center;
- border-bottom:1px solid #CCC;
+ border-bottom:1px solid #EAEAEA;
padding:6px;
}
@@ -865,7 +907,7 @@ table.confirm tr.spacer td:last-child{
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
background:none;
background-color: #F1F2F6;
- border: 1px solid #CCC;
+ border: 1px solid #EAEAEA;
border-radius-top: 4px;
}
@@ -875,13 +917,13 @@ table.confirm tr.spacer td:last-child{
}
.sheet{
- width:90%;
+ top: 35px;
+ bottom: 35px;
+ left: 15px;
+ right: 15px;
position:fixed;
- height:90%;
background: #FFF;
z-index: 2000;
- /*left: 50%;*/
- margin-left: 5%;
-webkit-box-shadow: 0px 0px 20px #444;
-moz-box-shadow: 0px 0px 20px #444;
text-align: left;
@@ -973,7 +1015,7 @@ a.photo{
background: #FFF;
text-align:left;
padding:10px;
- border:1px solid #CCC;
+ border:1px solid #EAEAEA;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index 5972208ee..faa2d9e93 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -13,9 +13,12 @@
<div id='foot_{{name}}' class='gridfooter'>
-{% if source_full %}
+{% if source_full or extra_sources %}
<a class='badge {{sname}}-csv' href='{{source}}csv' target='_blank' title="{% trans 'Export as CSV' %}">{% trans "CSV" %}</a>
-<a class='badge {{sname}}-csv-full' href='{{source_full}}csv' target='_blank' title="{% trans 'Export as CSV - full' %}">{% trans "CSV full" %}</a>
+{% if source_full %}<a class='badge {{sname}}-csv-full' href='{{source_full}}csv' target='_blank' title="{% trans 'Export as CSV - full' %}">{% trans "CSV full" %}</a>{% endif %}
+{% for slug, name, extra_source in extra_sources %}
+<a class='badge {{slug}}-csv-full' href='{{extra_source}}csv' target='_blank' title="{% trans 'Export as CSV - ' %}{{name}}">{{name}}</a>
+{% endfor %}
{% else %}
<a class='{{sname}}-csv' href="{{source}}csv" target="_blank" title="{% trans 'Export as CSV' %}">{% trans "CSV" %}</a>
{% endif %} {{encoding}}
diff --git a/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html
index 581381e82..2cf80da06 100644
--- a/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html
+++ b/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html
@@ -2,7 +2,15 @@
{% load url from future%}
{% if menu %}
<form method="post" action="{% url 'update-current-item' %}">
-<fieldset>
+<fieldset id='shortcut-menu'>
+<span class="fa-stack short-menu-close">
+ <i class="fa fa-circle fa-stack-2x"></i>
+ <i class="fa fa-times fa-stack-1x fa-inverse"></i>
+</span>
+<span class="fa-stack short-menu-open">
+ <i class="fa fa-circle fa-stack-2x"></i>
+ <i class="fa fa-plus fa-stack-1x fa-inverse"></i>
+</span>
<div class="short-menu-buttons btn-group" role="group">
<button type="button" class="btn" id='short-menu-simple' title="{% trans 'Simple menu limited to your own items. Be careful only the last 100 items are displayed.' %}">{% trans "simple" %}</button>
<button type="button" class="btn btn-selected" id='short-menu-advanced' title="{% trans 'Advanced menu.' %}">{% trans "advanced" %}</button>
diff --git a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
index 5a0463c30..05aaed6d8 100644
--- a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
+++ b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
@@ -2,11 +2,20 @@
{% load url from future%}
{% if current_menu %}
<form method="post" action="{% url 'update-current-item' %}">
-<fieldset>
+<fieldset id="shortcut-menu">
+<span class="fa-stack short-menu-close">
+ <i class="fa fa-circle fa-stack-2x"></i>
+ <i class="fa fa-times fa-stack-1x fa-inverse"></i>
+</span>
+<span class="fa-stack short-menu-open">
+ <i class="fa fa-circle fa-stack-2x"></i>
+ <i class="fa fa-plus fa-stack-1x fa-inverse"></i>
+</span>
<div class="short-menu-buttons btn-group" role="group">
<button type="button" class="btn btn-selected" id='short-menu-simple' title="{% trans 'Simple menu limited to your own items. Be careful only the last 100 items are displayed.' %}">{% trans "simple" %}</button>
<button type="button" class="btn" id='short-menu-advanced' title="{% trans 'Advanced menu.' %}">{% trans "advanced" %}</button>
</div>
+<div>
<i class="icon fa fa-thumb-tack fa-2x" aria-hidden="true" title="{% trans 'Pin an item in order to constrain default searches with this item. By default only your items are displayed. New created and modified items are auto-pin.' %}"></i>
<table id='current_items'>
{% for lbl, model_name, main_cls, items in current_menu %}
@@ -26,6 +35,7 @@
</tr>
{% endfor %}
</table>
+</div>
</fieldset>
</form>
<script type='text/javascript'>var advanced_menu = false;</script>
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index 22a09a052..edd1ebe75 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -135,6 +135,8 @@ urlpatterns += patterns(
url(r'pin/(?P<item_type>[a-z-]+)/(?P<pk>\d+)/$', 'update_current_item',
name='pin'),
url(r'unpin/(?P<item_type>[a-z-]+)/$', 'unpin', name='unpin'),
+ url(r'get-by-importer/(?P<slug>[a-z-]+)/(?P<type>[a-z-]+)?$',
+ 'get_by_importer', name='get-by-importer'),
url(r'new-person/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
'new_person', name='new-person'),
url(r'new-person-noorga/'
diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py
index 60c3ac7ef..44112bca3 100644
--- a/ishtar_common/utils.py
+++ b/ishtar_common/utils.py
@@ -56,10 +56,20 @@ def cached_label_changed(sender, **kwargs):
if not kwargs.get('instance'):
return
instance = kwargs.get('instance')
+ if hasattr(instance, '_cached_label_checked') \
+ and instance._cached_label_checked:
+ return
+ instance._cached_label_checked = True
lbl = instance._generate_cached_label()
if lbl != instance.cached_label:
+ if hasattr(instance, '_cascade_change') and instance._cascade_change:
+ instance.skip_history_when_saving = True
instance.cached_label = lbl
instance.save()
+ if hasattr(instance, '_get_associated_cached_labels'):
+ for item in instance._get_associated_cached_labels():
+ item._cascade_change = True
+ cached_label_changed(item.__class__, instance=item)
SHORTIFY_STR = ugettext(" (...)")
@@ -103,19 +113,22 @@ def get_random_item_image_link(request):
from archaeological_finds.models import Find
ope_image_nb, cr_image_nb, find_image_nb = 0, 0, 0
+ q_ope = Operation.objects.filter(
+ thumbnail__isnull=False).exclude(thumbnail='')
+ q_cr = ContextRecord.objects.filter(
+ thumbnail__isnull=False).exclude(thumbnail='')
+ q_find = Find.objects.filter(
+ thumbnail__isnull=False).exclude(thumbnail='')
if request.user.has_perm('archaeological_operations.view_operation',
Operation):
- ope_image_nb = Operation.objects.filter(
- thumbnail__isnull=False).count()
+ ope_image_nb = q_ope.count()
if request.user.has_perm(
'archaeological_context_records.view_contextrecord',
ContextRecord):
- cr_image_nb = ContextRecord.objects.filter(
- thumbnail__isnull=False).count()
+ cr_image_nb = q_cr.count()
if request.user.has_perm('archaeological_finds.view_find',
Find):
- find_image_nb = Find.objects.filter(
- thumbnail__isnull=False).count()
+ find_image_nb = q_find.count()
image_total = ope_image_nb + cr_image_nb + find_image_nb
if not image_total:
@@ -123,15 +136,11 @@ def get_random_item_image_link(request):
image_nb = random.randint(0, image_total - 1)
if image_nb >= 0 and image_nb < ope_image_nb:
- return _get_image_link(
- Operation.objects.filter(thumbnail__isnull=False).all()[image_nb])
+ return _get_image_link(q_ope.all()[image_nb])
if image_nb >= ope_image_nb and image_nb < (cr_image_nb + ope_image_nb):
- return _get_image_link(
- ContextRecord.objects.filter(thumbnail__isnull=False).all()[
- image_nb - ope_image_nb])
+ return _get_image_link(q_cr.all()[image_nb - ope_image_nb])
if image_nb >= (cr_image_nb + ope_image_nb):
- return _get_image_link(
- Find.objects.filter(thumbnail__isnull=False).all()[
- image_nb - ope_image_nb - cr_image_nb])
+ return _get_image_link(q_find.all()[
+ image_nb - ope_image_nb - cr_image_nb])
# should never happen except in case of deletion during the excution
return ''
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 3406cf7af..bc5e5ef1d 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -527,7 +527,7 @@ HIERARCHIC_FIELDS = ['periods', 'period', 'unit', 'material_types',
def get_item(model, func_name, default_name, extra_request_keys=[],
base_request={}, bool_fields=[], reversed_bool_fields=[],
- dated_fields=[], associated_models=[], relative_session_names={},
+ dated_fields=[], associated_models=[], relative_session_names=[],
specific_perms=[], own_table_cols=None, relation_types_prefix={}):
"""
Generic treatment of tables
@@ -569,6 +569,43 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
data_type = 'json'
if not allowed:
return HttpResponse(EMPTY, mimetype='text/plain')
+
+ # get defaults from model
+ if not extra_request_keys and hasattr(model, 'EXTRA_REQUEST_KEYS'):
+ my_extra_request_keys = copy(model.EXTRA_REQUEST_KEYS)
+ else:
+ my_extra_request_keys = copy(extra_request_keys)
+ if not base_request and hasattr(model, 'BASE_REQUEST'):
+ my_base_request = copy(model.BASE_REQUEST)
+ else:
+ my_base_request = copy(base_request)
+ if not bool_fields and hasattr(model, 'BOOL_FIELDS'):
+ my_bool_fields = model.BOOL_FIELDS[:]
+ else:
+ my_bool_fields = bool_fields[:]
+ if not reversed_bool_fields and hasattr(model, 'REVERSED_BOOL_FIELDS'):
+ my_reversed_bool_fields = model.REVERSED_BOOL_FIELDS[:]
+ else:
+ my_reversed_bool_fields = reversed_bool_fields[:]
+ if not dated_fields and hasattr(model, 'DATED_FIELDS'):
+ my_dated_fields = model.DATED_FIELDS[:]
+ else:
+ my_dated_fields = dated_fields[:]
+ if not associated_models and hasattr(model, 'ASSOCIATED_MODELS'):
+ my_associated_models = model.ASSOCIATED_MODELS[:]
+ else:
+ my_associated_models = associated_models[:]
+ if not relative_session_names and hasattr(model,
+ 'RELATIVE_SESSION_NAMES'):
+ my_relative_session_names = model.RELATIVE_SESSION_NAMES[:]
+ else:
+ my_relative_session_names = relative_session_names[:]
+ if not relation_types_prefix and hasattr(model,
+ 'RELATION_TYPES_PREFIX'):
+ my_relation_types_prefix = copy(model.RELATION_TYPES_PREFIX)
+ else:
+ my_relation_types_prefix = copy(relation_types_prefix)
+
fields = [model._meta.get_field_by_name(k)[0]
for k in model._meta.get_all_field_names()]
request_keys = dict([
@@ -576,7 +613,11 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
field.name + (hasattr(field, 'rel') and field.rel and '__pk'
or ''))
for field in fields])
- for associated_model, key in associated_models:
+ for associated_model, key in my_associated_models:
+ if type(associated_model) in (str, unicode):
+ if associated_model not in globals():
+ continue
+ associated_model = globals()[associated_model]
associated_fields = [
associated_model._meta.get_field_by_name(k)[0]
for k in associated_model._meta.get_all_field_names()]
@@ -585,10 +626,10 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
key + "__" + field.name +
(hasattr(field, 'rel') and field.rel and '__pk' or ''))
for field in associated_fields]))
- request_keys.update(extra_request_keys)
+ request_keys.update(my_extra_request_keys)
request_items = request.method == 'POST' and request.POST \
or request.GET
- dct = base_request.copy()
+ dct = my_base_request
if full == 'shortcut':
dct['cached_label__icontains'] = request.GET.get('term', None)
and_reqs, or_reqs = [], []
@@ -598,15 +639,14 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
return HttpResponse('[]', mimetype='text/plain')
# manage relations types
- my_rtypes_prefix = copy(relation_types_prefix)
- if 'relation_types' not in my_rtypes_prefix:
- my_rtypes_prefix['relation_types'] = ''
+ if 'relation_types' not in my_relation_types_prefix:
+ my_relation_types_prefix['relation_types'] = ''
relation_types = {}
- for rtype_key in my_rtypes_prefix:
- relation_types[my_rtypes_prefix[rtype_key]] = set()
+ for rtype_key in my_relation_types_prefix:
+ relation_types[my_relation_types_prefix[rtype_key]] = set()
for k in request_items:
if k.startswith(rtype_key):
- relation_types[my_rtypes_prefix[rtype_key]].add(
+ relation_types[my_relation_types_prefix[rtype_key]].add(
request_items[k])
continue
@@ -637,7 +677,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
dct = {"pk": request.session[default_name]}
elif dct == base_request:
# a parent item may be selected in the default menu
- for name, key in relative_session_names:
+ for name, key in my_relative_session_names:
if name in request.session and request.session[name]:
dct.update({key: request.session[name]})
break
@@ -646,13 +686,13 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
dct = request.session[func_name]
else:
request.session[func_name] = dct
- for k in (list(bool_fields) + list(reversed_bool_fields)):
+ for k in (list(my_bool_fields) + list(my_reversed_bool_fields)):
if k in dct:
if dct[k] == u"1":
dct.pop(k)
else:
dct[k] = dct[k] == u"2" and True or False
- if k in reversed_bool_fields:
+ if k in my_reversed_bool_fields:
dct[k] = not dct[k]
# check also for empty value with image field
field_name = k.split('__')[0]
@@ -668,7 +708,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
dct[k.split('__')[0] + '__regex'] = '.{1}.*'
except FieldDoesNotExist:
pass
- for k in dated_fields:
+ for k in my_dated_fields:
if k in dct:
if not dct[k]:
dct.pop(k)
@@ -1001,6 +1041,26 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
return func
+def get_by_importer(request, slug, data_type='json', full=False,
+ force_own=False, **dct):
+ q = models.ImporterType.objects.filter(slug=slug)
+ if not q.count():
+ res = ''
+ if data_type == "json":
+ res = '{}'
+ return HttpResponse(res, mimetype='text/plain')
+ imp = q.all()[0].get_importer_class()
+ cols = []
+ for formater in imp.LINE_FORMAT:
+ if not formater:
+ continue
+ cols.append(formater.field_name)
+ obj_name = imp.OBJECT_CLS.__name__.lower()
+ return get_item(
+ imp.OBJECT_CLS, 'get_' + obj_name, obj_name, own_table_cols=cols
+ )(request, data_type, full, force_own, **dct)
+
+
def show_item(model, name, extra_dct=None):
def func(request, pk, **dct):
try:
@@ -1203,40 +1263,14 @@ new_person = new_item(models.Person, forms.PersonForm)
new_person_noorga = new_item(models.Person, forms.NoOrgaPersonForm)
new_organization = new_item(models.Organization, forms.OrganizationForm)
show_organization = show_item(models.Organization, 'organization')
-get_organization = get_item(
- models.Organization,
- 'get_organization', 'organization',
- extra_request_keys={
- 'name': 'name__icontains',
- 'organization_type': 'organization_type__pk__in',
- })
+get_organization = get_item(models.Organization, 'get_organization',
+ 'organization')
new_author = new_item(models.Author, forms.AuthorForm)
show_person = show_item(models.Person, 'person')
-get_person = get_item(
- models.Person,
- 'get_person', 'person',
- reversed_bool_fields=['ishtaruser__isnull'],
- extra_request_keys={
- 'name': ['name__icontains', 'raw_name__icontains'],
- 'surname': ['surname__icontains', 'raw_name__icontains'],
- 'attached_to': 'attached_to__pk',
- 'person_types': 'person_types__pk__in',
- 'ishtaruser__isnull': 'ishtaruser__isnull'
- })
-
-get_ishtaruser = get_item(
- models.IshtarUser,
- 'get_ishtaruser', 'ishtaruser',
- extra_request_keys={
- 'username': ['username__icontains'],
- 'name': ['person__name__icontains', 'person__raw_name__icontains'],
- 'surname': ['person__surname__icontains',
- 'person__raw_name__icontains'],
- 'email': ['person__email'],
- 'attached_to': 'person__attached_to__pk',
- 'person_types': 'person__person_types__pk__in',
- })
+get_person = get_item(models.Person, 'get_person', 'person')
+
+get_ishtaruser = get_item(models.IshtarUser, 'get_ishtaruser', 'ishtaruser')
def action(request, action_slug, obj_id=None, *args, **kwargs):
diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py
index 48d1377fa..9e656311b 100644
--- a/ishtar_common/widgets.py
+++ b/ishtar_common/widgets.py
@@ -602,6 +602,19 @@ class JQueryJqGrid(forms.RadioSelect):
dct['source'] = unicode(self.source)
if unicode(self.source_full) and unicode(self.source_full) != 'None':
dct['source_full'] = unicode(self.source_full)
+
+ dct['extra_sources'] = []
+ if self.associated_model:
+ model_name = "{}.{}".format(
+ self.associated_model.__module__,
+ self.associated_model.__name__)
+ for imp in models.ImporterType.objects.filter(
+ slug__isnull=False, associated_models=model_name,
+ is_template=True).all():
+ dct['extra_sources'].append((
+ imp.slug, imp.name,
+ reverse('get-by-importer', args=[imp.slug])))
+
dct.update({'name': name,
'col_names': col_names,
'extra_cols': extra_cols,
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-21 18:27:32 +0000