diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-31 12:37:19 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-31 12:37:19 +0100 |
commit | efebfe2dbcd7b8984c630069fcde6611bacf36d5 (patch) | |
tree | 20a2715b1dd910c7fe891ffa26d90ce25e095312 | |
parent | 07eaa42445452db7942767b4ec2dea518d667be7 (diff) | |
download | Ishtar-efebfe2dbcd7b8984c630069fcde6611bacf36d5.tar.bz2 Ishtar-efebfe2dbcd7b8984c630069fcde6611bacf36d5.zip |
Update importer fixture
-rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 843 |
1 files changed, 433 insertions, 410 deletions
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index 90b6fa225..a8a7c8935 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -2533,7 +2533,7 @@ "description": "Index (num\u00e9ro par ann\u00e9e), le couple ann\u00e9e + index doit \u00eatre unique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Index (num\u00e9ro par ann\u00e9e)", "importer_type": 17 } }, @@ -2545,7 +2545,7 @@ "description": "Type d'op\u00e9ration (parmi une liste)", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Type d'op\u00e9ration", "importer_type": 17 } }, @@ -2569,7 +2569,7 @@ "description": "R\u00e9f\u00e9rence du dossier administratif associ\u00e9 \u00e0 l'op\u00e9ration sous la forme ANNEE-INDEX. Exemple : \"2002-4\".", "regexp_pre_filter": null, "required": false, - "label": "", + "label": "R\u00e9f\u00e9rence du dossier administratif", "importer_type": 17 } }, @@ -2581,7 +2581,7 @@ "description": "Identifiants des sites (entit\u00e9s arch\u00e9ologiques) concern\u00e9es par l'op\u00e9ration, s\u00e9par\u00e9es par \u00ab\u00a0&\u00a0\u00bb. \r\nExemple : \"44 125 0028 & 44 125 0029\"", "regexp_pre_filter": null, "required": false, - "label": "", + "label": "Identifiants des sites (EAs)", "importer_type": 17 } }, @@ -2593,7 +2593,7 @@ "description": "Types de vestiges (s\u00e9par\u00e9s par un \u00ab\u00a0&\u00a0\u00bb)\r\nExemple : \"four & fosses & villa\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Types de vestiges", "importer_type": 17 } }, @@ -2605,7 +2605,7 @@ "description": "P\u00e9riodes concern\u00e9es (s\u00e9par\u00e9es par un \u00ab\u00a0&\u00a0\u00bb). \r\nExemple : \"Gallo-romain & Fer & Med\".", "regexp_pre_filter": null, "required": false, - "label": "", + "label": "P\u00e9riodes", "importer_type": 17 } }, @@ -2614,10 +2614,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 11, - "description": "Titre (M., Mme), du responsable d'op\u00e9ration (RO)", + "description": "Titre (M., Mme, etc.) du responsable scientifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Titre du responsable scientifique", "importer_type": 17 } }, @@ -2626,10 +2626,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 12, - "description": "Pr\u00e9nom du Responsable scientifique (responsable d'op\u00e9ration)", + "description": "Pr\u00e9nom du responsable scientifique (responsable d'op\u00e9ration)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Pr\u00e9nom du responsable scientifique", "importer_type": 17 } }, @@ -2638,10 +2638,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 13, - "description": "Nom du Responsable scientifique (responsable d'op\u00e9ration)", + "description": "Nom du responsable scientifique (responsable d'op\u00e9ration)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nom du responsable scientifique", "importer_type": 17 } }, @@ -2650,10 +2650,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 14, - "description": "Rattachement du Responsable scientifique (responsable d'op\u00e9ration)\r\nExemple : \"INRAP\" ou plus pr\u00e9cis \"INRAP Direction interr\u00e9gionale Grand Ouest\" selon votre degr\u00e9 de pr\u00e9cision dans la gestion des rattachements et des organisations.", + "description": "Rattachement du responsable scientifique (responsable d'op\u00e9ration)\r\nExemple : \"INRAP\" ou plus pr\u00e9cis \"INRAP Direction interr\u00e9gionale Grand Ouest\" selon votre degr\u00e9 de pr\u00e9cision dans la gestion des rattachements et des organisations.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Rattachement du responsable scientifique", "importer_type": 17 } }, @@ -2665,7 +2665,7 @@ "description": "Nom de l'op\u00e9rateur (organisation). Peut \u00eatre diff\u00e9rent de l'organisation de rattachement du responsable d'op\u00e9ration.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nom de l'op\u00e9rateur", "importer_type": 17 } }, @@ -2677,7 +2677,7 @@ "description": "R\u00e9f\u00e9rence de l'op\u00e9rateur (code ou autre r\u00e9f\u00e9rence interne de l'op\u00e9rateur)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "R\u00e9f\u00e9rence de l'op\u00e9rateur", "importer_type": 17 } }, @@ -2686,10 +2686,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 17, - "description": "Titre (M., Mme), du responsable du suivi scientifique", + "description": "Titre (M., Mme, etc.) du responsable du suivi scientifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Titre du responsable du suivi scientifique", "importer_type": 17 } }, @@ -2701,7 +2701,7 @@ "description": "Pr\u00e9nom du responsable du suivi scientifique (ex\u00a0: resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Pr\u00e9nom du responsable du suivi scientifique", "importer_type": 17 } }, @@ -2713,7 +2713,7 @@ "description": "Nom du responsable du suivi scientifique (ex : resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nom du responsable du suivi scientifique", "importer_type": 17 } }, @@ -2725,7 +2725,7 @@ "description": "Rattachement du resp. du suivi scientifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Rattachement du responsable du suivi scientifique", "importer_type": 17 } }, @@ -2737,7 +2737,7 @@ "description": "Surface couverte par l'op\u00e9ration (m2)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Surface couverte par l'op\u00e9ration", "importer_type": 17 } }, @@ -2749,7 +2749,7 @@ "description": "Date de d\u00e9but de l'op\u00e9ration (d\u00e9but du terrain d'ordinaire mais vous pouvez utiliser autre chose)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de d\u00e9but de l'op\u00e9ration", "importer_type": 17 } }, @@ -2761,7 +2761,7 @@ "description": "Date de fin de l'op\u00e9ration (fin du terrain d'ordinaire mais vous pouvez utiliser autre chose)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de fin de l'op\u00e9ration", "importer_type": 17 } }, @@ -2773,7 +2773,7 @@ "description": "Date de cl\u00f4ture (peut-\u00eatre la date de rendu de la documentation, la fin de la recherche associ\u00e9e ou autre) d\u2019ordinaire cela repr\u00e9sente la date \u00e0 partir de laquelle la documentation issue de l'op\u00e9ration n'est plus du ressort du responsable d'op\u00e9ration, mais vous pouvez utiliser autre chose.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de cl\u00f4ture", "importer_type": 17 } }, @@ -2785,7 +2785,7 @@ "description": "Date d'avis (ex\u00a0: avis de CIRA ou autre selon votre usage)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date d'avis", "importer_type": 17 } }, @@ -2797,7 +2797,7 @@ "description": "R\u00e9sultats consid\u00e9r\u00e9s comme n\u00e9gatif (d\u2019ordinaire utilis\u00e9 pour les diagnostics n\u00e9gatifs)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "R\u00e9sultats consid\u00e9r\u00e9s comme n\u00e9gatif", "importer_type": 17 } }, @@ -2809,7 +2809,7 @@ "description": "Pr\u00e9nom du rapporteur (CIRA ou autre selon votre usage de la notion d'avis)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Pr\u00e9nom du rapporteur", "importer_type": 17 } }, @@ -2821,7 +2821,7 @@ "description": "Nom du rapporteur (CIRA ou autre selon votre usage de la notion d'avis)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nom du rapporteur", "importer_type": 17 } }, @@ -2833,7 +2833,7 @@ "description": "Rattachement rapporteur (organisation)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Rattachement du rapporteur", "importer_type": 17 } }, @@ -2845,7 +2845,7 @@ "description": "Date limite pr\u00e9vue pour le rendu de la documentation scientifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date limite pour le rendu de la documentation", "importer_type": 17 } }, @@ -2857,7 +2857,7 @@ "description": "Documentation re\u00e7ue", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Documentation re\u00e7ue", "importer_type": 17 } }, @@ -2869,7 +2869,7 @@ "description": "Date limite pr\u00e9vue pour le rendu du mobilier", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date limite rendu du mobilier", "importer_type": 17 } }, @@ -2881,7 +2881,7 @@ "description": "Mobilier re\u00e7u ou livr\u00e9 selon vos usages et proc\u00e9dures", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Mobilier re\u00e7u", "importer_type": 17 } }, @@ -2893,7 +2893,7 @@ "description": "Commentaire g\u00e9n\u00e9ral", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire g\u00e9n\u00e9ral", "importer_type": 17 } }, @@ -2905,7 +2905,7 @@ "description": "Date de livraison du rapport", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de livraison du rapport", "importer_type": 17 } }, @@ -2917,7 +2917,7 @@ "description": "\u00c9tat de traitement du rapport", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "\u00c9tat de traitement du rapport", "importer_type": 17 } }, @@ -2929,7 +2929,7 @@ "description": "Commentaire sur la documentation scientifique (y compris mobilier)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire sur la documentation", "importer_type": 17 } }, @@ -2941,7 +2941,7 @@ "description": "Nom du fichier image (jpg ou png), exemple \"IMG_5023.jpg\"\r\nLes fichiers images doivent \u00eatre joints \u00e0 l'import dans un fichier ZIP", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Image", "importer_type": 17 } }, @@ -2998,7 +2998,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 5, - "description": "Label / Identifiant (externe) de l'UE, ex: \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\" etc.\r\nDoit \u00eatre unique pour une parcelle donn\u00e9e", + "description": "Label / Identifiant (externe) de l'UE, ex: \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\" etc.\r\nDoit \u00eatre unique pour une parcelle donn\u00e9e. Maximum 200 caract\u00e8res.", "regexp_pre_filter": null, "required": true, "label": "Label UE", @@ -3022,7 +3022,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 7, - "description": "Description (texte, 1000 carac. max.)", + "description": "Description.", "regexp_pre_filter": null, "required": false, "label": "Description", @@ -3034,10 +3034,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 8, - "description": "Commentaire g\u00e9n\u00e9ral (1000 carac. max.)", + "description": "Commentaire g\u00e9n\u00e9ral.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire g\u00e9n\u00e9ral", "importer_type": 18 } }, @@ -3049,7 +3049,7 @@ "description": "Taille ou longueur (en m\u00e8tre), exemple \"1.2\", \"12\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Taille ou longueur", "importer_type": 18 } }, @@ -3061,7 +3061,7 @@ "description": "Largeur (en m\u00e8tre), exemple \"1.2\", \"12\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Largeur", "importer_type": 18 } }, @@ -3073,7 +3073,7 @@ "description": "\u00c9paisseur (en m\u00e8tre), exemple \"0.2\", \"2\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "\u00c9paisseur", "importer_type": 18 } }, @@ -3085,7 +3085,7 @@ "description": "Profondeur (en m\u00e8tre), exemple \"0.2\", \"2\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Profondeur", "importer_type": 18 } }, @@ -3097,7 +3097,7 @@ "description": "Lieu, description textuelle de la localisation exemple : \"Au pied de l'arbre du P\u00e8re Jahouen\", \"En limite nord de la parcelle\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Lieu, localisation", "importer_type": 18 } }, @@ -3109,7 +3109,7 @@ "description": "Contient ou non du mobilier (oui/non)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Contient du mobilier", "importer_type": 18 } }, @@ -3121,7 +3121,7 @@ "description": "Nom du fichier image (jpg ou png), exemple \"IMG_5023.jpg\".\r\nLes fichiers images doivent \u00eatre joints \u00e0 l'import dans un fichier ZIP", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Image", "importer_type": 18 } }, @@ -3142,10 +3142,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 17, - "description": "Commentaire sur les datations (texte 1000 carac. max.), exemple : \"IIe - IIIe s.\", \"fin XVe ou plus tard\", etc.", + "description": "Commentaire sur les datations, exemple : \"IIe - IIIe s.\", \"fin XVe ou plus tard\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire sur les datations", "importer_type": 18 } }, @@ -3154,10 +3154,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 18, - "description": "Description du remplissage, 1000 carac. max. exemple \"Limons argileux brun riche en charbons\"", + "description": "Description du remplissage. exemple \"Limons argileux brun riche en charbons\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Description du remplissage", "importer_type": 18 } }, @@ -3166,7 +3166,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 19, - "description": "Interpr\u00e9tation, texte 1000 carac. max., exemple \"Mur de cl\u00f4ture\", \"Sol couvert d'une mosa\u00efque, \"Pal\u00e9osol du d\u00e9but de l'Holoc\u00e8ne\", \"Four de r\u00e9duction de minerai de fer\", \"TP\", etc.", + "description": "Interpr\u00e9tation., exemple \"Mur de cl\u00f4ture\", \"Sol couvert d'une mosa\u00efque, \"Pal\u00e9osol du d\u00e9but de l'Holoc\u00e8ne\", \"Four de r\u00e9duction de minerai de fer\", \"TP\", etc.", "regexp_pre_filter": null, "required": false, "label": "Interpr\u00e9tation", @@ -3418,7 +3418,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 7, - "description": "R\u00e9f\u00e9rence du point topo, d'ordinaire un entier mais peut \u00eatre autre chose. Champ texte, max. 120 caract\u00e8res. Exemple : \"7220\", \"pt. 72\", etc.\r\n", + "description": "R\u00e9f\u00e9rence du point topo, d'ordinaire un entier mais peut \u00eatre autre chose. Champ texte, max. 120 caract\u00e8res. Exemple : \"7220\", \"pt. 72\", etc.", "regexp_pre_filter": null, "required": false, "label": "Ref. point topo", @@ -3442,7 +3442,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 9, - "description": "D\u00e9finit si on enregistre ici un objet seul (parfois appel\u00e9 Isolation) ou un lot d'objets. Exemple : \"lot\", \"objet\", \"Iso\", \"vrac\", etc.\r\nEst ici traduit en binaire : \"objet\" ou \"lot\".", + "description": "D\u00e9finit si on enregistre ici un objet seul (parfois appel\u00e9 Isolation) ou un lot d'objets. Exemple : \"lot\", \"objet\", \"Iso\", \"vrac\", etc.\r\nEst ici traduit en binaire (est seul ?) : \"objet\" (vrai) ou \"lot\" (faux).", "regexp_pre_filter": null, "required": false, "label": "Lot ou objet", @@ -3454,7 +3454,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 10, - "description": "D\u00e9finit si un objet est complet ou non. Exemple : \"complet\", \"est complet\", \"incomplet\".\r\nEst ici traduit en binaire : \"complet\" ou \"incomplet\". ", + "description": "D\u00e9finit si un objet est complet ou non. Exemple : \"complet\", \"est complet\", \"incomplet\".\r\nEst ici traduit en binaire : \"complet\" (vrai) ou \"incomplet\" (faux). ", "regexp_pre_filter": null, "required": false, "label": "Compl\u00e9tude", @@ -3502,7 +3502,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 14, - "description": "Type(s) d'objet(s), s\u00e9par\u00e9s par des \"&\". Exemple : \"tesson & charbon\", \"vase\", \"scapula\", \"fibule & bague\", \"lame & lamelle\", \"\u00e9clat & nucl\u00e9us\", etc.", + "description": "Type(s) d'objet(s), s\u00e9par\u00e9s par des \"&\". Exemple : \"tesson & charbon\", \"os & m\u00e9tal\", \"faune\", \"fibule & bague\", \"lame & lamelle\", \"\u00e9clat & nucl\u00e9us\", etc.", "regexp_pre_filter": null, "required": false, "label": "Type(s) d'objet(s)", @@ -3622,7 +3622,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 24, - "description": "Marquage visible sur le mobilier. Champ texte, max. 1000 caract\u00e8res. Exemple : \"id1234 la Roche aux F\u00e9es\", \"MTX-45\", etc.\r\nCeci reproduit d'ordinaire un marquage r\u00e9alis\u00e9 par un arch\u00e9ologue. Il ne s'agit pas ici de reproduire une \u00e9pigraphie ou tout autre inscription arch\u00e9ologique (graffito, d\u00e9dicaces, defixio, etc.) , mais vous pouvez l'utiliser pour cela si vous n'avez pas \u00e0 utiliser de marquage arch\u00e9ologique.", + "description": "Marquage visible sur le mobilier. Champ texte. Exemple : \"id1234 la Roche aux F\u00e9es\", \"MTX-45\", etc.\r\nCeci reproduit d'ordinaire un marquage r\u00e9alis\u00e9 par un arch\u00e9ologue. Il ne s'agit pas ici de reproduire une \u00e9pigraphie ou tout autre inscription arch\u00e9ologique (graffito, d\u00e9dicaces, defixio, etc.) , mais vous pouvez l'utiliser pour cela si vous n'avez pas \u00e0 utiliser de marquage arch\u00e9ologique.", "regexp_pre_filter": null, "required": false, "label": "Marque", @@ -3634,7 +3634,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 25, - "description": "Commentaire g\u00e9n\u00e9ral libre. Champ texte, max. 2000 caract\u00e8res. Exemple : \"habillage en nid d'abeille, poli g\u00e9n\u00e9ralis\u00e9, encoche emmanchement lat\u00e9ral ouvert sur la face sup\u00e9rieure\", \"1 bord + bec tubulaire\", \"fibule de Langton Down\", etc.", + "description": "Commentaire g\u00e9n\u00e9ral libre. Champ texte. Exemple : \"habillage en nid d'abeille, poli g\u00e9n\u00e9ralis\u00e9, encoche emmanchement lat\u00e9ral ouvert sur la face sup\u00e9rieure\", \"1 bord + bec tubulaire\", \"fibule de Langton Down\", etc.", "regexp_pre_filter": null, "required": false, "label": "Commentaire g\u00e9n\u00e9ral", @@ -3646,7 +3646,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 26, - "description": "Commentaire g\u00e9n\u00e9ral sur les datations, si besoin. Champ texte, max. 1000 caract\u00e8res. Exemple : \"plut\u00f4t fin IIe s. ou d\u00e9but IIIe s.\", \"Datation \u00e0 pr\u00e9ciser avant publication\", \" Datation rapide faite par M. Dupont\", etc.", + "description": "Commentaire g\u00e9n\u00e9ral sur les datations, si besoin. Champ texte. Exemple : \"plut\u00f4t fin IIe s. ou d\u00e9but IIIe s.\", \"Datation \u00e0 pr\u00e9ciser avant publication\", \" Datation rapide faite par M. Dupont\", etc.", "regexp_pre_filter": null, "required": false, "label": "Commentaire g\u00e9n\u00e9ral sur les datations", @@ -3730,7 +3730,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 33, - "description": "Code permettant de qualifi\u00e9 le mode de projection des donnes (SRS /EPSG). Exemple : \"EPSG:2154\" pour le Lambert 93", + "description": "Code permettant de qualifier le mode de projection des donnes (SRS /EPSG). Exemple : \"EPSG:2154\" pour le Lambert 93", "regexp_pre_filter": null, "required": false, "label": "Syst\u00e8me de r\u00e9f\u00e9rence spatiale", @@ -4536,48 +4536,6 @@ } }, { - "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": 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": 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": { @@ -4606,20 +4564,6 @@ } }, { - "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": { @@ -4746,20 +4690,6 @@ } }, { - "pk": 341, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "description", - "column": 316, - "formater_type": 16, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 344, "model": "ishtar_common.importtarget", "fields": { @@ -4774,20 +4704,6 @@ } }, { - "pk": 347, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "location", - "column": 322, - "formater_type": 16, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 349, "model": "ishtar_common.importtarget", "fields": { @@ -4802,20 +4718,6 @@ } }, { - "pk": 353, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "interpretation", - "column": 328, - "formater_type": 16, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 356, "model": "ishtar_common.importtarget", "fields": { @@ -4858,6 +4760,20 @@ } }, { + "pk": 368, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "is_isolated", + "column": 344, + "formater_type": 19, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { "pk": 371, "model": "ishtar_common.importtarget", "fields": { @@ -4928,28 +4844,42 @@ } }, { - "pk": 384, + "pk": 350, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__comment", - "column": 360, - "formater_type": 33, + "target": "datings__period", + "column": 325, + "formater_type": 6, "concat_str": "", "regexp_filter": null, "concat": false, + "force_new": true + } + }, + { + "pk": 335, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "parcel__external_id", + "column": 311, + "formater_type": 28, + "concat_str": "-", + "regexp_filter": null, + "concat": false, "force_new": false } }, { - "pk": 385, + "pk": 38, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__dating_comment", - "column": 361, - "formater_type": 16, - "concat_str": "", + "target": "label", + "column": 37, + "formater_type": 3, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false @@ -5026,20 +4956,6 @@ } }, { - "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": { @@ -5068,20 +4984,6 @@ } }, { - "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": { @@ -5166,34 +5068,6 @@ } }, { - "pk": 339, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "label", - "column": 314, - "formater_type": 3, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 342, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "comment", - "column": 317, - "formater_type": 16, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 345, "model": "ishtar_common.importtarget", "fields": { @@ -5278,13 +5152,13 @@ } }, { - "pk": 366, + "pk": 384, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__previous_id", - "column": 341, - "formater_type": 3, + "target": "find__comment", + "column": 360, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -5292,13 +5166,181 @@ } }, { - "pk": 372, + "pk": 385, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__conservatory_comment", - "column": 348, - "formater_type": 16, + "target": "find__dating_comment", + "column": 361, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 388, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "find__datings__period", + "column": 364, + "formater_type": 6, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": true + } + }, + { + "pk": 342, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "comment", + "column": 317, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 347, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "location", + "column": 322, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 353, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "interpretation", + "column": 328, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 341, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "description", + "column": 316, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 339, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "label", + "column": 314, + "formater_type": 30, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 302, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "operator__name", + "column": 278, + "formater_type": 10, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 305, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "in_charge__surname", + "column": 281, + "formater_type": 39, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 306, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "in_charge__name", + "column": 282, + "formater_type": 30, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 314, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "cira_rapporteur__surname", + "column": 290, + "formater_type": 39, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 315, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "cira_rapporteur__name", + "column": 291, + "formater_type": 30, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 366, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "find__previous_id", + "column": 341, + "formater_type": 3, "concat_str": "", "regexp_filter": null, "concat": false, @@ -5362,13 +5404,13 @@ } }, { - "pk": 383, + "pk": 386, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__mark", - "column": 359, - "formater_type": 16, + "target": "find__estimated_value", + "column": 362, + "formater_type": 21, "concat_str": "", "regexp_filter": null, "concat": false, @@ -5376,13 +5418,13 @@ } }, { - "pk": 386, + "pk": 297, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__estimated_value", - "column": 362, - "formater_type": 21, + "target": "archaeological_sites__reference", + "column": 271, + "formater_type": 45, "concat_str": "", "regexp_filter": null, "concat": false, @@ -5390,14 +5432,14 @@ } }, { - "pk": 297, + "pk": 336, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "archaeological_sites__reference", - "column": 271, - "formater_type": 45, - "concat_str": "", + "target": "parcel__external_id", + "column": 312, + "formater_type": 11, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false @@ -6062,76 +6104,6 @@ } }, { - "pk": 336, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "parcel__external_id", - "column": 312, - "formater_type": 11, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 335, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "parcel__external_id", - "column": 311, - "formater_type": 28, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 362, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "context_record__external_id", - "column": 337, - "formater_type": 28, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 363, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "context_record__external_id", - "column": 338, - "formater_type": 35, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 388, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__datings__period", - "column": 364, - "formater_type": 6, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": true - } - }, - { "pk": 99, "model": "ishtar_common.importtarget", "fields": { @@ -6748,6 +6720,34 @@ } }, { + "pk": 372, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "find__conservatory_comment", + "column": 348, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 383, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "find__mark", + "column": 359, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { "pk": 240, "model": "ishtar_common.importtarget", "fields": { @@ -7182,34 +7182,6 @@ } }, { - "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": 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": 310, "model": "ishtar_common.importtarget", "fields": { @@ -7392,13 +7364,13 @@ } }, { - "pk": 307, + "pk": 355, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "in_charge__attached_to__name", - "column": 283, - "formater_type": 3, + "target": "identification", + "column": 330, + "formater_type": 24, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7406,13 +7378,13 @@ } }, { - "pk": 316, + "pk": 358, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "cira_rapporteur__attached_to__name", - "column": 292, - "formater_type": 3, + "target": "taq_estimated", + "column": 333, + "formater_type": 1, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7420,13 +7392,13 @@ } }, { - "pk": 352, + "pk": 370, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "filling", - "column": 327, - "formater_type": 16, + "target": "find__material_types", + "column": 346, + "formater_type": 20, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7434,13 +7406,13 @@ } }, { - "pk": 355, + "pk": 373, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "identification", - "column": 330, - "formater_type": 24, + "target": "find__object_types", + "column": 349, + "formater_type": 26, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7448,13 +7420,13 @@ } }, { - "pk": 358, + "pk": 376, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "taq_estimated", - "column": 333, - "formater_type": 1, + "target": "find__remarkabilities", + "column": 352, + "formater_type": 44, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7462,13 +7434,13 @@ } }, { - "pk": 367, + "pk": 387, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__description", - "column": 342, - "formater_type": 16, + "target": "find__image", + "column": 363, + "formater_type": 27, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7476,42 +7448,42 @@ } }, { - "pk": 370, + "pk": 361, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__material_types", - "column": 346, - "formater_type": 20, - "concat_str": "", + "target": "context_record__external_id", + "column": 336, + "formater_type": 11, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 373, + "pk": 362, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__object_types", - "column": 349, - "formater_type": 26, - "concat_str": "", + "target": "context_record__external_id", + "column": 337, + "formater_type": 28, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 376, + "pk": 363, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__remarkabilities", - "column": 352, - "formater_type": 44, - "concat_str": "", + "target": "context_record__external_id", + "column": 338, + "formater_type": 35, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false @@ -7532,13 +7504,13 @@ } }, { - "pk": 381, + "pk": 389, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__dimensions_comment", - "column": 357, - "formater_type": 16, + "target": "topographic_localisation", + "column": 343, + "formater_type": 3, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7546,13 +7518,13 @@ } }, { - "pk": 387, + "pk": 367, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__image", - "column": 363, - "formater_type": 27, + "target": "find__description", + "column": 342, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7560,13 +7532,13 @@ } }, { - "pk": 389, + "pk": 381, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "topographic_localisation", - "column": 343, - "formater_type": 3, + "target": "find__dimensions_comment", + "column": 357, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7616,27 +7588,27 @@ } }, { - "pk": 350, + "pk": 393, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "datings__period", - "column": 325, - "formater_type": 6, + "target": "spatial_reference_system", + "column": 368, + "formater_type": 46, "concat_str": "", "regexp_filter": null, "concat": false, - "force_new": true + "force_new": false } }, { - "pk": 393, + "pk": 352, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "spatial_reference_system", - "column": 368, - "formater_type": 46, + "target": "filling", + "column": 327, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7644,14 +7616,56 @@ } }, { - "pk": 361, + "pk": 304, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "context_record__external_id", - "column": 336, - "formater_type": 11, - "concat_str": "-", + "target": "in_charge__title", + "column": 280, + "formater_type": 47, + "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": 47, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 307, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "in_charge__attached_to__name", + "column": 283, + "formater_type": 10, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 316, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "cira_rapporteur__attached_to__name", + "column": 292, + "formater_type": 10, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false @@ -7883,6 +7897,15 @@ } }, { + "pk": 47, + "model": "ishtar_common.formatertype", + "fields": { + "formater_type": "TypeFormater", + "many_split": "", + "options": "TitleType" + } + }, + { "pk": 35, "model": "ishtar_common.formatertype", "fields": { |