summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-10-28 00:08:29 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2015-10-28 00:08:29 +0100
commit1b5207dc08323c2ecdbf131108f36947fcd11b59 (patch)
tree3e43a758bde4688e4055bb05ee15894791fe34a0 /ishtar_common
parente855590c4ee1b59f9402a07c55754afbb71b92a4 (diff)
downloadIshtar-1b5207dc08323c2ecdbf131108f36947fcd11b59.tar.bz2
Ishtar-1b5207dc08323c2ecdbf131108f36947fcd11b59.zip
Upgrade MCC imports fixtures
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/admin.py3
-rw-r--r--ishtar_common/fixtures/initial_importtypes-fr.json1421
-rw-r--r--ishtar_common/models.py9
3 files changed, 946 insertions, 487 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index c1dbb2238..0e23c69c2 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -180,7 +180,8 @@ class ImportTargetInline(admin.TabularInline):
class ImporterColumnAdmin(admin.ModelAdmin):
- list_display = ('importer_type', 'col_number', 'description', 'required')
+ list_display = ('importer_type', 'col_number', 'description',
+ 'targets_lbl', 'duplicate_fields_lbl', 'required')
list_filter = ('importer_type',)
inlines = (ImporterDuplicateFieldInline, ImportTargetInline)
admin.site.register(models.ImporterColumn, ImporterColumnAdmin)
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index 1c3db468a..dd39f0139 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -3,55 +3,65 @@
"pk": 1,
"model": "ishtar_common.importertype",
"fields": {
- "users": [],
+ "description": "",
"is_template": true,
- "name": "MCC - Op\u00e9rations",
+ "unicity_keys": null,
+ "users": [],
+ "slug": null,
"associated_models": "archaeological_operations.models.Operation",
- "description": ""
+ "name": "MCC - Op\u00e9rations"
}
},
{
"pk": 2,
"model": "ishtar_common.importertype",
"fields": {
- "users": [],
+ "description": "",
"is_template": true,
- "name": "MCC - Parcelles",
+ "unicity_keys": null,
+ "users": [],
+ "slug": null,
"associated_models": "archaeological_operations.models.Parcel",
- "description": ""
+ "name": "MCC - Parcelles"
}
},
{
"pk": 3,
"model": "ishtar_common.importertype",
"fields": {
- "users": [],
+ "description": "",
"is_template": true,
- "name": "MCC - Documentation",
+ "unicity_keys": null,
+ "users": [],
+ "slug": null,
"associated_models": "archaeological_operations.models.OperationSource",
- "description": ""
+ "name": "MCC - Documentation"
}
},
{
"pk": 4,
"model": "ishtar_common.importertype",
"fields": {
- "users": [],
+ "description": "",
"is_template": true,
- "name": "MCC - UE",
+ "unicity_keys": null,
+ "users": [],
+ "slug": null,
"associated_models": "archaeological_context_records.models.ContextRecord",
- "description": ""
+ "name": "MCC - UE"
}
},
{
"pk": 5,
"model": "ishtar_common.importertype",
"fields": {
- "users": [],
+ "description": "",
"is_template": true,
- "name": "MCC - Mobilier",
+ "unicity_keys": null,
+ "users": [],
+ "slug": null,
"associated_models": "archaeological_finds.models.BaseFind",
- "description": ""
+ "name": "MCC - Mobilier"
}
},
{
@@ -98,112 +108,90 @@
}
},
{
- "pk": 51,
- "model": "ishtar_common.importercolumn",
- "fields": {
- "col_number": 3,
- "required": false,
- "importer_type": 2,
- "description": "Num\u00e9ro",
- "regexp_pre_filter": null
- }
- },
- {
- "pk": 52,
- "model": "ishtar_common.importercolumn",
- "fields": {
- "col_number": 4,
- "required": false,
- "importer_type": 2,
- "description": "Section",
- "regexp_pre_filter": null
- }
- },
- {
- "pk": 53,
+ "pk": 1,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 2,
+ "col_number": 1,
"required": true,
- "importer_type": 2,
- "description": "Identifiant externe",
+ "importer_type": 1,
+ "description": "Code patriarche",
"regexp_pre_filter": null
}
},
{
- "pk": 44,
+ "pk": 2,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 14,
- "required": false,
- "importer_type": 5,
- "description": "Date de d\u00e9couverte",
+ "col_number": 3,
+ "required": true,
+ "importer_type": 1,
+ "description": null,
"regexp_pre_filter": null
}
},
{
- "pk": 45,
+ "pk": 3,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 16,
- "required": false,
- "importer_type": 5,
- "description": "\u00c9tat de conservation",
+ "col_number": 4,
+ "required": true,
+ "importer_type": 1,
+ "description": null,
"regexp_pre_filter": null
}
},
{
- "pk": 46,
+ "pk": 4,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 17,
- "required": false,
- "importer_type": 5,
- "description": "Mesure de conservation",
+ "col_number": 5,
+ "required": true,
+ "importer_type": 1,
+ "description": null,
"regexp_pre_filter": null
}
},
{
- "pk": 47,
+ "pk": 5,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 18,
- "required": false,
- "importer_type": 5,
- "description": "Commentaire",
+ "col_number": 6,
+ "required": true,
+ "importer_type": 1,
+ "description": "Nom du responsable de l'op\u00e9ration. Nom et Pr\u00e9nom sont group\u00e9 et donc mis dans le NOM seul dans l'annuaire.",
"regexp_pre_filter": null
}
},
{
- "pk": 48,
+ "pk": 6,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 20,
- "required": false,
- "importer_type": 5,
- "description": "Localisation topogaphique",
+ "col_number": 7,
+ "required": true,
+ "importer_type": 1,
+ "description": "Date de d\u00e9but de l'op\u00e9ration avec le format ANN\u00c9E/MOIS/JOUR",
"regexp_pre_filter": null
}
},
{
- "pk": 49,
+ "pk": 7,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 21,
- "required": false,
- "importer_type": 5,
- "description": "Int\u00e9r\u00eat sp\u00e9cifique",
+ "col_number": 8,
+ "required": true,
+ "importer_type": 1,
+ "description": "Date de fin de l'op\u00e9ration avec le format ANN\u00c9E/MOIS/JOUR",
"regexp_pre_filter": null
}
},
{
- "pk": 50,
+ "pk": 8,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 22,
+ "col_number": 9,
"required": false,
- "importer_type": 5,
- "description": "Description",
+ "importer_type": 1,
+ "description": null,
"regexp_pre_filter": null
}
},
@@ -219,46 +207,46 @@
}
},
{
- "pk": 36,
+ "pk": 12,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 1,
+ "col_number": 2,
"required": true,
- "importer_type": 5,
- "description": "Code patriarche de l'op\u00e9ration associ\u00e9e",
- "regexp_pre_filter": null
+ "importer_type": 2,
+ "description": "Commune (via num\u00e9ro INSEE)",
+ "regexp_pre_filter": 2
}
},
{
- "pk": 14,
+ "pk": 53,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 1,
+ "col_number": 3,
"required": true,
- "importer_type": 3,
- "description": "Code patriarche de l'op\u00e9ration associ\u00e9e",
+ "importer_type": 2,
+ "description": "Identifiant externe",
"regexp_pre_filter": null
}
},
{
- "pk": 1,
+ "pk": 51,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 1,
- "required": true,
- "importer_type": 1,
- "description": "Code patriarche",
+ "col_number": 4,
+ "required": false,
+ "importer_type": 2,
+ "description": "Num\u00e9ro",
"regexp_pre_filter": null
}
},
{
- "pk": 26,
+ "pk": 52,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 1,
- "required": true,
- "importer_type": 4,
- "description": "Code patriarche de l'op\u00e9ration associ\u00e9e",
+ "col_number": 5,
+ "required": false,
+ "importer_type": 2,
+ "description": "Section",
"regexp_pre_filter": null
}
},
@@ -266,7 +254,7 @@
"pk": 11,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 5,
+ "col_number": 6,
"required": false,
"importer_type": 2,
"description": "Ann\u00e9e",
@@ -285,332 +273,321 @@
}
},
{
- "pk": 27,
+ "pk": 14,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 2,
+ "col_number": 1,
"required": true,
- "importer_type": 4,
- "description": "Identifiant externe",
+ "importer_type": 3,
+ "description": "Code patriarche de l'op\u00e9ration associ\u00e9e",
"regexp_pre_filter": null
}
},
{
- "pk": 28,
+ "pk": 15,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 3,
- "required": false,
- "importer_type": 4,
- "description": "Type",
+ "col_number": 2,
+ "required": true,
+ "importer_type": 3,
+ "description": null,
"regexp_pre_filter": null
}
},
{
- "pk": 29,
+ "pk": 16,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 4,
- "required": false,
- "importer_type": 4,
- "description": "Description",
+ "col_number": 3,
+ "required": true,
+ "importer_type": 3,
+ "description": null,
"regexp_pre_filter": null
}
},
{
- "pk": 30,
+ "pk": 17,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 5,
+ "col_number": 4,
"required": false,
- "importer_type": 4,
- "description": "Interpr\u00e9tation",
+ "importer_type": 3,
+ "description": null,
"regexp_pre_filter": null
}
},
{
- "pk": 31,
+ "pk": 18,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 6,
+ "col_number": 5,
"required": false,
- "importer_type": 4,
- "description": "Date d'ouverture",
+ "importer_type": 3,
+ "description": null,
"regexp_pre_filter": null
}
},
{
- "pk": 32,
+ "pk": 19,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 7,
+ "col_number": 6,
"required": false,
- "importer_type": 4,
- "description": "Date de fermeture",
+ "importer_type": 3,
+ "description": null,
"regexp_pre_filter": null
}
},
{
- "pk": 12,
+ "pk": 20,
"model": "ishtar_common.importercolumn",
"fields": {
"col_number": 7,
"required": false,
- "importer_type": 2,
- "description": "Commune (via num\u00e9ro INSEE)",
- "regexp_pre_filter": 2
+ "importer_type": 3,
+ "description": null,
+ "regexp_pre_filter": null
}
},
{
- "pk": 33,
+ "pk": 21,
"model": "ishtar_common.importercolumn",
"fields": {
"col_number": 8,
"required": false,
- "importer_type": 4,
- "description": "Parcelle (identifiant externe)",
+ "importer_type": 3,
+ "description": null,
"regexp_pre_filter": null
}
},
{
- "pk": 35,
+ "pk": 22,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 11,
+ "col_number": 9,
"required": false,
- "importer_type": 4,
- "description": "Chronologie (plusieurs possibles s\u00e9par\u00e9es par &)",
+ "importer_type": 3,
+ "description": null,
"regexp_pre_filter": null
}
},
{
- "pk": 34,
+ "pk": 23,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 10,
+ "col_number": 12,
"required": false,
- "importer_type": 4,
- "description": "Commentaire",
- "regexp_pre_filter": null
- }
- },
- {
- "pk": 2,
- "model": "ishtar_common.importercolumn",
- "fields": {
- "col_number": 3,
- "required": true,
- "importer_type": 1,
+ "importer_type": 3,
"description": null,
"regexp_pre_filter": null
}
},
{
- "pk": 3,
+ "pk": 24,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 4,
- "required": true,
- "importer_type": 1,
+ "col_number": 13,
+ "required": false,
+ "importer_type": 3,
"description": null,
"regexp_pre_filter": null
}
},
{
- "pk": 8,
+ "pk": 25,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 9,
+ "col_number": 16,
"required": false,
- "importer_type": 1,
+ "importer_type": 3,
"description": null,
"regexp_pre_filter": null
}
},
{
- "pk": 4,
+ "pk": 26,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 5,
+ "col_number": 1,
"required": true,
- "importer_type": 1,
- "description": null,
+ "importer_type": 4,
+ "description": "Code patriarche de l'op\u00e9ration associ\u00e9e",
"regexp_pre_filter": null
}
},
{
- "pk": 6,
+ "pk": 225,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 7,
+ "col_number": 2,
"required": true,
- "importer_type": 1,
- "description": null,
+ "importer_type": 4,
+ "description": "Commune (via num\u00e9ro INSEE)",
"regexp_pre_filter": null
}
},
{
- "pk": 7,
+ "pk": 33,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 8,
+ "col_number": 3,
"required": true,
- "importer_type": 1,
- "description": null,
+ "importer_type": 4,
+ "description": "Parcelle (identifiant externe)",
"regexp_pre_filter": null
}
},
{
- "pk": 15,
+ "pk": 27,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 2,
+ "col_number": 4,
"required": true,
- "importer_type": 3,
- "description": null,
+ "importer_type": 4,
+ "description": "Label / Identifiant externe ",
"regexp_pre_filter": null
}
},
{
- "pk": 17,
+ "pk": 28,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 4,
+ "col_number": 5,
"required": false,
- "importer_type": 3,
- "description": null,
+ "importer_type": 4,
+ "description": "Type",
"regexp_pre_filter": null
}
},
{
- "pk": 18,
+ "pk": 29,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 5,
+ "col_number": 6,
"required": false,
- "importer_type": 3,
- "description": null,
+ "importer_type": 4,
+ "description": "Description",
"regexp_pre_filter": null
}
},
{
- "pk": 19,
+ "pk": 30,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 6,
+ "col_number": 7,
"required": false,
- "importer_type": 3,
- "description": null,
+ "importer_type": 4,
+ "description": "Identification",
"regexp_pre_filter": null
}
},
{
- "pk": 20,
+ "pk": 31,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 7,
+ "col_number": 8,
"required": false,
- "importer_type": 3,
- "description": null,
+ "importer_type": 4,
+ "description": "Date d'ouverture",
"regexp_pre_filter": null
}
},
{
- "pk": 21,
+ "pk": 32,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 8,
+ "col_number": 9,
"required": false,
- "importer_type": 3,
- "description": null,
+ "importer_type": 4,
+ "description": "Date de fermeture",
"regexp_pre_filter": null
}
},
{
- "pk": 22,
+ "pk": 34,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 9,
+ "col_number": 11,
"required": false,
- "importer_type": 3,
- "description": null,
+ "importer_type": 4,
+ "description": "Commentaire",
"regexp_pre_filter": null
}
},
{
- "pk": 23,
+ "pk": 54,
"model": "ishtar_common.importercolumn",
"fields": {
"col_number": 12,
"required": false,
- "importer_type": 3,
- "description": null,
+ "importer_type": 4,
+ "description": "Nature",
"regexp_pre_filter": null
}
},
{
- "pk": 24,
+ "pk": 35,
"model": "ishtar_common.importercolumn",
"fields": {
"col_number": 13,
"required": false,
- "importer_type": 3,
- "description": null,
+ "importer_type": 4,
+ "description": "Chronologie (plusieurs possibles s\u00e9par\u00e9es par &)",
"regexp_pre_filter": null
}
},
{
- "pk": 25,
+ "pk": 36,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 16,
- "required": false,
- "importer_type": 3,
- "description": null,
+ "col_number": 1,
+ "required": true,
+ "importer_type": 5,
+ "description": "Code patriarche de l'op\u00e9ration associ\u00e9e",
"regexp_pre_filter": null
}
},
{
- "pk": 16,
+ "pk": 227,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 3,
+ "col_number": 2,
"required": true,
- "importer_type": 3,
- "description": null,
+ "importer_type": 5,
+ "description": "Commune (via num\u00e9ro INSEE)",
"regexp_pre_filter": null
}
},
{
- "pk": 5,
+ "pk": 226,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 6,
+ "col_number": 3,
"required": true,
- "importer_type": 1,
- "description": null,
+ "importer_type": 5,
+ "description": "Identifiant parcelle",
"regexp_pre_filter": null
}
},
{
- "pk": 37,
+ "pk": 43,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 2,
+ "col_number": 4,
"required": true,
"importer_type": 5,
- "description": "identifiant externe",
+ "description": "Identifiant UE",
"regexp_pre_filter": null
}
},
{
- "pk": 38,
+ "pk": 37,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 3,
- "required": false,
+ "col_number": 5,
+ "required": true,
"importer_type": 5,
- "description": "Isol\u00e9 ou non",
+ "description": "Identifiant externe",
"regexp_pre_filter": null
}
},
@@ -618,7 +595,7 @@
"pk": 39,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 7,
+ "col_number": 9,
"required": false,
"importer_type": 5,
"description": "Sous classe de mat\u00e9riaux",
@@ -629,7 +606,7 @@
"pk": 40,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 10,
+ "col_number": 13,
"required": false,
"importer_type": 5,
"description": "Nombre d'\u00e9l\u00e9ments",
@@ -640,7 +617,7 @@
"pk": 41,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 11,
+ "col_number": 14,
"required": false,
"importer_type": 5,
"description": "Poids",
@@ -651,7 +628,7 @@
"pk": 42,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 12,
+ "col_number": 15,
"required": false,
"importer_type": 5,
"description": "Unit\u00e9 de poids",
@@ -659,534 +636,804 @@
}
},
{
- "pk": 43,
+ "pk": 44,
"model": "ishtar_common.importercolumn",
"fields": {
- "col_number": 13,
- "required": true,
+ "col_number": 16,
+ "required": false,
"importer_type": 5,
- "description": "Lien avec l'UE",
+ "description": "Date de d\u00e9couverte",
"regexp_pre_filter": null
}
},
{
- "pk": 26,
+ "pk": 45,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 17,
+ "required": false,
+ "importer_type": 5,
+ "description": "\u00c9tat de conservation",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 46,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 18,
+ "required": false,
+ "importer_type": 5,
+ "description": "Mesure de conservation",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 47,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 19,
+ "required": false,
+ "importer_type": 5,
+ "description": "Commentaire",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 48,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 21,
+ "required": false,
+ "importer_type": 5,
+ "description": "Localisation topographique",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 49,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 22,
+ "required": false,
+ "importer_type": 5,
+ "description": "Int\u00e9r\u00eat sp\u00e9cifique",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 50,
+ "model": "ishtar_common.importercolumn",
+ "fields": {
+ "col_number": 23,
+ "required": false,
+ "importer_type": 5,
+ "description": "Description",
+ "regexp_pre_filter": null
+ }
+ },
+ {
+ "pk": 46,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 25,
- "formater_type": 16,
- "target": "additional_information",
- "regexp_filter": null
+ "comment": null,
+ "target": "find__conservatory_state",
+ "column": 45,
+ "formater_type": 22,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 28,
+ "pk": 47,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 27,
- "formater_type": 3,
- "target": "external_id",
- "regexp_filter": null
+ "comment": null,
+ "target": "find__preservation_to_consider",
+ "column": 46,
+ "formater_type": 23,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 29,
+ "pk": 49,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 28,
- "formater_type": 18,
- "target": "unit",
- "regexp_filter": null
+ "comment": null,
+ "target": "topographic_localisation",
+ "column": 48,
+ "formater_type": 3,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 30,
+ "pk": 50,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 29,
- "formater_type": 16,
- "target": "description",
- "regexp_filter": null
+ "comment": null,
+ "target": "special_interest",
+ "column": 49,
+ "formater_type": 3,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 31,
+ "pk": 51,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 30,
+ "comment": null,
+ "target": "description",
+ "column": 50,
"formater_type": 16,
- "target": "interpretation",
- "regexp_filter": null
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 32,
+ "pk": 9,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 31,
- "formater_type": 5,
- "target": "opening_date",
- "regexp_filter": null
+ "comment": null,
+ "target": "operation__code_patriarche",
+ "column": 9,
+ "formater_type": 1,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 33,
+ "pk": 15,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 32,
- "formater_type": 5,
- "target": "closing_date",
- "regexp_filter": null
+ "comment": null,
+ "target": "operation__code_patriarche",
+ "column": 14,
+ "formater_type": 1,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 34,
+ "pk": 28,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 33,
- "formater_type": 11,
- "target": "parcel__external_id",
- "regexp_filter": null
+ "comment": "",
+ "target": "label",
+ "column": 27,
+ "formater_type": 3,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 35,
+ "pk": 48,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 34,
- "formater_type": 16,
+ "comment": "",
"target": "comment",
- "regexp_filter": null
+ "column": 47,
+ "formater_type": 35,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 36,
+ "pk": 27,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 35,
- "formater_type": 6,
- "target": "datings__period",
- "regexp_filter": null
+ "comment": null,
+ "target": "operation__code_patriarche",
+ "column": 26,
+ "formater_type": 1,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 1,
+ "pk": 13,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 1,
- "formater_type": 1,
- "target": "code_patriarche",
- "regexp_filter": null
+ "comment": null,
+ "target": "town__numero_insee",
+ "column": 12,
+ "formater_type": 11,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 37,
+ "pk": 2,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 36,
- "formater_type": 1,
- "target": "context_record__operation__code_patriarche",
- "regexp_filter": null
+ "comment": null,
+ "target": "operation_type",
+ "column": 2,
+ "formater_type": 2,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
"pk": 38,
"model": "ishtar_common.importtarget",
"fields": {
+ "comment": "",
+ "target": "label",
"column": 37,
"formater_type": 3,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 55,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
"target": "external_id",
- "regexp_filter": null
+ "column": 53,
+ "formater_type": 11,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 39,
+ "pk": 251,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 38,
- "formater_type": 19,
- "target": "is_isolated",
- "regexp_filter": null
+ "comment": "",
+ "target": "context_record__external_id",
+ "column": 226,
+ "formater_type": 35,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 40,
+ "pk": 3,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 39,
- "formater_type": 20,
- "target": "find__material_types",
- "regexp_filter": null
+ "comment": null,
+ "target": "common_name",
+ "column": 3,
+ "formater_type": 3,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 41,
+ "pk": 4,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 40,
- "formater_type": 1,
- "target": "find__find_number",
- "regexp_filter": null
+ "comment": null,
+ "target": "operator__name",
+ "column": 4,
+ "formater_type": 3,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 42,
+ "pk": 6,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 41,
- "formater_type": 21,
- "target": "find__weight",
- "regexp_filter": null
+ "comment": null,
+ "target": "start_date",
+ "column": 6,
+ "formater_type": 5,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 43,
+ "pk": 7,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 42,
- "formater_type": 7,
- "target": "find__weight_unit",
- "regexp_filter": null
+ "comment": null,
+ "target": "excavation_end_date",
+ "column": 7,
+ "formater_type": 5,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 44,
+ "pk": 8,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 43,
- "formater_type": 3,
- "target": "context_record__external_id",
- "regexp_filter": null
+ "comment": null,
+ "target": "periods",
+ "column": 8,
+ "formater_type": 6,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 45,
+ "pk": 250,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 44,
- "formater_type": 5,
- "target": "discovery_date",
- "regexp_filter": null
+ "comment": "",
+ "target": "parcel__external_id",
+ "column": 225,
+ "formater_type": 28,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 46,
+ "pk": 14,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 45,
- "formater_type": 22,
- "target": "find__conservatory_state",
- "regexp_filter": null
+ "comment": null,
+ "target": "address",
+ "column": 13,
+ "formater_type": 10,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 47,
+ "pk": 16,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 46,
- "formater_type": 23,
- "target": "find__preservation_to_consider",
- "regexp_filter": null
+ "comment": null,
+ "target": "external_id",
+ "column": 15,
+ "formater_type": 11,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 48,
+ "pk": 17,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 47,
- "formater_type": 16,
- "target": "comment",
- "regexp_filter": null
+ "comment": null,
+ "target": "source_type",
+ "column": 16,
+ "formater_type": 12,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 49,
+ "pk": 18,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 48,
- "formater_type": 3,
- "target": "topographic_localisation",
- "regexp_filter": null
+ "comment": null,
+ "target": "support_type",
+ "column": 17,
+ "formater_type": 13,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 50,
+ "pk": 252,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 49,
- "formater_type": 3,
- "target": "special_interest",
- "regexp_filter": null
+ "comment": "",
+ "target": "context_record__external_id",
+ "column": 227,
+ "formater_type": 28,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 51,
+ "pk": 40,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 50,
- "formater_type": 16,
- "target": "description",
- "regexp_filter": null
+ "comment": null,
+ "target": "find__material_types",
+ "column": 39,
+ "formater_type": 20,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 9,
+ "pk": 19,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 9,
+ "comment": null,
+ "target": "item_number",
+ "column": 18,
"formater_type": 1,
- "target": "operation__code_patriarche",
- "regexp_filter": null
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 15,
+ "pk": 20,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 14,
- "formater_type": 1,
- "target": "operation__code_patriarche",
- "regexp_filter": null
+ "comment": null,
+ "target": "authors__person__raw_name",
+ "column": 19,
+ "formater_type": 4,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 27,
+ "pk": 21,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 26,
- "formater_type": 1,
- "target": "operation__code_patriarche",
- "regexp_filter": null
+ "comment": null,
+ "target": "creation_date",
+ "column": 20,
+ "formater_type": 14,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 13,
+ "pk": 22,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 12,
- "formater_type": 11,
- "target": "town__numero_insee",
- "regexp_filter": null
+ "comment": null,
+ "target": "format_type",
+ "column": 21,
+ "formater_type": 15,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 2,
+ "pk": 23,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 2,
- "formater_type": 2,
- "target": "operation_type",
- "regexp_filter": null
+ "comment": null,
+ "target": "description",
+ "column": 22,
+ "formater_type": 16,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 3,
+ "pk": 24,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 3,
- "formater_type": 3,
- "target": "common_name",
- "regexp_filter": null
+ "comment": null,
+ "target": "comment",
+ "column": 23,
+ "formater_type": 16,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 4,
+ "pk": 25,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 4,
- "formater_type": 3,
- "target": "operator__name",
- "regexp_filter": null
+ "comment": null,
+ "target": "scale",
+ "column": 24,
+ "formater_type": 17,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 53,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "parcel_number",
+ "column": 51,
+ "formater_type": 8,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
+ }
+ },
+ {
+ "pk": 54,
+ "model": "ishtar_common.importtarget",
+ "fields": {
+ "comment": null,
+ "target": "section",
+ "column": 52,
+ "formater_type": 7,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
"pk": 5,
"model": "ishtar_common.importtarget",
"fields": {
+ "comment": null,
+ "target": "scientist__raw_name",
"column": 5,
"formater_type": 4,
- "target": "in_charge__raw_name",
- "regexp_filter": null
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 6,
+ "pk": 56,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 6,
- "formater_type": 5,
- "target": "start_date",
- "regexp_filter": null
+ "comment": null,
+ "target": "year",
+ "column": 11,
+ "formater_type": 14,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 7,
+ "pk": 37,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 7,
- "formater_type": 5,
- "target": "excavation_end_date",
- "regexp_filter": null
+ "comment": "",
+ "target": "context_record__external_id",
+ "column": 36,
+ "formater_type": 11,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 8,
+ "pk": 35,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 8,
- "formater_type": 6,
- "target": "periods",
- "regexp_filter": null
+ "comment": null,
+ "target": "comment",
+ "column": 34,
+ "formater_type": 16,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 12,
+ "pk": 31,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 11,
- "formater_type": 9,
- "target": "year",
- "regexp_filter": null
+ "comment": null,
+ "target": "identification",
+ "column": 30,
+ "formater_type": 24,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 14,
+ "pk": 57,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 13,
- "formater_type": 10,
- "target": "address",
- "regexp_filter": null
+ "comment": null,
+ "target": "interpretation",
+ "column": 54,
+ "formater_type": 16,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 16,
+ "pk": 26,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 15,
- "formater_type": 11,
- "target": "external_id",
- "regexp_filter": null
+ "comment": null,
+ "target": "additional_information",
+ "column": 25,
+ "formater_type": 16,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 17,
+ "pk": 29,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 16,
- "formater_type": 12,
- "target": "source_type",
- "regexp_filter": null
+ "comment": null,
+ "target": "unit",
+ "column": 28,
+ "formater_type": 18,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 18,
+ "pk": 30,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 17,
- "formater_type": 13,
- "target": "support_type",
- "regexp_filter": null
+ "comment": null,
+ "target": "description",
+ "column": 29,
+ "formater_type": 16,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 19,
+ "pk": 32,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 18,
- "formater_type": 1,
- "target": "item_number",
- "regexp_filter": null
+ "comment": null,
+ "target": "opening_date",
+ "column": 31,
+ "formater_type": 5,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 20,
+ "pk": 33,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 19,
- "formater_type": 4,
- "target": "authors__person__raw_name",
- "regexp_filter": null
+ "comment": null,
+ "target": "closing_date",
+ "column": 32,
+ "formater_type": 5,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 21,
+ "pk": 34,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 20,
- "formater_type": 14,
- "target": "creation_date",
- "regexp_filter": null
+ "comment": null,
+ "target": "parcel__external_id",
+ "column": 33,
+ "formater_type": 11,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 22,
+ "pk": 1,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 21,
- "formater_type": 15,
- "target": "format_type",
- "regexp_filter": null
+ "comment": null,
+ "target": "code_patriarche",
+ "column": 1,
+ "formater_type": 1,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 23,
+ "pk": 41,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 22,
- "formater_type": 16,
- "target": "description",
- "regexp_filter": null
+ "comment": null,
+ "target": "find__find_number",
+ "column": 40,
+ "formater_type": 1,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 24,
+ "pk": 42,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 23,
- "formater_type": 16,
- "target": "comment",
- "regexp_filter": null
+ "comment": null,
+ "target": "find__weight",
+ "column": 41,
+ "formater_type": 21,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 25,
+ "pk": 43,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 24,
- "formater_type": 17,
- "target": "scale",
- "regexp_filter": null
+ "comment": null,
+ "target": "find__weight_unit",
+ "column": 42,
+ "formater_type": 7,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 53,
+ "pk": 44,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 51,
- "formater_type": 8,
- "target": "parcel_number",
- "regexp_filter": null
+ "comment": null,
+ "target": "context_record__external_id",
+ "column": 43,
+ "formater_type": 3,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 54,
+ "pk": 45,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 52,
- "formater_type": 7,
- "target": "section",
- "regexp_filter": null
+ "comment": null,
+ "target": "discovery_date",
+ "column": 44,
+ "formater_type": 5,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": false
}
},
{
- "pk": 55,
+ "pk": 36,
"model": "ishtar_common.importtarget",
"fields": {
- "column": 53,
- "formater_type": 11,
- "target": "external_id",
- "regexp_filter": null
+ "comment": null,
+ "target": "datings__period",
+ "column": 35,
+ "formater_type": 6,
+ "regexp_filter": null,
+ "concat": false,
+ "force_new": true
+ }
+ },
+ {
+ "pk": 25,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "DateFormater",
+ "many_split": "",
+ "options": "%d/%m/%Y"
}
},
{
@@ -1199,6 +1446,15 @@
}
},
{
+ "pk": 27,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "FileFormater",
+ "many_split": "",
+ "options": ""
+ }
+ },
+ {
"pk": 21,
"model": "ishtar_common.formatertype",
"fields": {
@@ -1226,6 +1482,15 @@
}
},
{
+ "pk": 24,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "TypeFormater",
+ "many_split": "",
+ "options": "archaeological_context_records.models.IdentificationType"
+ }
+ },
+ {
"pk": 18,
"model": "ishtar_common.formatertype",
"fields": {
@@ -1235,6 +1500,24 @@
}
},
{
+ "pk": 34,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "TypeFormater",
+ "many_split": "",
+ "options": "archaeological_files.models.PermitType"
+ }
+ },
+ {
+ "pk": 32,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "TypeFormater",
+ "many_split": "",
+ "options": "archaeological_files.models.SaisineType"
+ }
+ },
+ {
"pk": 22,
"model": "ishtar_common.formatertype",
"fields": {
@@ -1253,6 +1536,15 @@
}
},
{
+ "pk": 26,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "TypeFormater",
+ "many_split": "",
+ "options": "archaeological_finds.models.ObjectType"
+ }
+ },
+ {
"pk": 23,
"model": "ishtar_common.formatertype",
"fields": {
@@ -1334,6 +1626,24 @@
}
},
{
+ "pk": 30,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "UnicodeFormater",
+ "many_split": "",
+ "options": "200"
+ }
+ },
+ {
+ "pk": 33,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "UnicodeFormater",
+ "many_split": "",
+ "options": "2000"
+ }
+ },
+ {
"pk": 17,
"model": "ishtar_common.formatertype",
"fields": {
@@ -1361,6 +1671,15 @@
}
},
{
+ "pk": 28,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "UnicodeFormater",
+ "many_split": "",
+ "options": "5"
+ }
+ },
+ {
"pk": 10,
"model": "ishtar_common.formatertype",
"fields": {
@@ -1379,10 +1698,37 @@
}
},
{
- "pk": 9,
+ "pk": 36,
"model": "ishtar_common.formatertype",
"fields": {
- "formater_type": "YearFormater",
+ "formater_type": "UnicodeFormater",
+ "many_split": "",
+ "options": "60"
+ }
+ },
+ {
+ "pk": 31,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "UnicodeFormater",
+ "many_split": "",
+ "options": "70"
+ }
+ },
+ {
+ "pk": 35,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "UnicodeFormater",
+ "many_split": "",
+ "options": "None"
+ }
+ },
+ {
+ "pk": 29,
+ "model": "ishtar_common.formatertype",
+ "fields": {
+ "formater_type": "UnknowType",
"many_split": "",
"options": ""
}
@@ -1397,11 +1743,84 @@
}
},
{
+ "pk": 5,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 5,
+ "field_name": "scientist__name",
+ "force_new": false
+ }
+ },
+ {
+ "pk": 15,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 9,
+ "field_name": "external_id",
+ "force_new": false
+ }
+ },
+ {
+ "pk": 16,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 12,
+ "field_name": "external_id",
+ "force_new": false
+ }
+ },
+ {
+ "pk": 17,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 26,
+ "field_name": "parcel__external_id",
+ "force_new": false
+ }
+ },
+ {
+ "pk": 18,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 26,
+ "field_name": "external_id",
+ "force_new": false
+ }
+ },
+ {
+ "pk": 19,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 225,
+ "field_name": "external_id",
+ "force_new": false
+ }
+ },
+ {
+ "pk": 20,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 33,
+ "field_name": "external_id",
+ "force_new": false
+ }
+ },
+ {
+ "pk": 6,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 27,
+ "field_name": "external_id",
+ "force_new": false
+ }
+ },
+ {
"pk": 1,
"model": "ishtar_common.importerduplicatefield",
"fields": {
"column": 37,
- "field_name": "find__external_id"
+ "field_name": "find__label",
+ "force_new": false
}
},
{
@@ -1409,7 +1828,8 @@
"model": "ishtar_common.importerduplicatefield",
"fields": {
"column": 37,
- "field_name": "label"
+ "field_name": "context_record__external_id",
+ "force_new": false
}
},
{
@@ -1417,15 +1837,44 @@
"model": "ishtar_common.importerduplicatefield",
"fields": {
"column": 37,
- "field_name": "find__label"
+ "field_name": "external_id",
+ "force_new": false
}
},
{
- "pk": 4,
+ "pk": 21,
"model": "ishtar_common.importerduplicatefield",
"fields": {
- "column": 5,
- "field_name": "in_charge__name"
+ "column": 36,
+ "field_name": "external_id",
+ "force_new": false
+ }
+ },
+ {
+ "pk": 22,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 227,
+ "field_name": "external_id",
+ "force_new": false
+ }
+ },
+ {
+ "pk": 23,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 226,
+ "field_name": "external_id",
+ "force_new": false
+ }
+ },
+ {
+ "pk": 24,
+ "model": "ishtar_common.importerduplicatefield",
+ "fields": {
+ "column": 43,
+ "field_name": "external_id",
+ "force_new": false
}
}
-]
+] \ No newline at end of file
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index ddd1e5f9f..2f8bb49f9 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1319,10 +1319,19 @@ class ImporterColumn(models.Model):
class Meta:
verbose_name = _(u"Importer - Column")
verbose_name_plural = _(u"Importer - Columns")
+ ordering = ('importer_type', 'col_number')
+ unique_together = ('importer_type', 'col_number')
def __unicode__(self):
return u"{} - {}".format(self.importer_type, self.col_number)
+ def targets_lbl(self):
+ return u', '.join([target.target for target in self.targets.all()])
+
+ def duplicate_fields_lbl(self):
+ return u', '.join([dp.field_name
+ for dp in self.duplicate_fields.all()])
+
class ImporterDuplicateField(models.Model):
"""