3 files changed, 124 insertions, 24 deletions
diff --git a/example_project/local_settings_nantes.py b/example_project/local_settings_nantes.py
index 4ade697b4..96d47a409 100644
--- a/example_project/local_settings_nantes.py
+++ b/example_project/local_settings_nantes.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+ISHTAR_DPTS = [44, 49, 53, 72, 85]
+
 # DB key: (txt_idx, (key, label))
 ISHTAR_OPE_TYPES = {
     (u'préventive', u'BAT'):(u'building_study',
@@ -93,30 +95,117 @@ ISHTAR_PERIODS = {
     u'':u'not_yet_documented',
 }
 
-# attrs, convert, relative col number
+ISHTAR_PERMIT_TYPES = {
+    '':(u"NP", 'Non précisé'),
+    u'permis de démolir':(u"PD", u"Permis de démolir"),
+    u"autorisation":(u"AUT", u"Autorisation"),
+    u"étude d'impact":(u"EI", u"Étude d'impact"),
+    u"certificat d'urbanisme":(u"CU", u"Certificat d'urbanisme"),
+    u'installation classée':(u"IC", u'Installation classée'),
+    u'permis de construire':(u"PC", u'Permis de construire'),
+    u'découverte fortuite':(u"DF", u"Découvert fortuite"),
+    u'autre':(u"O", u"Autre"),
+    u'autorisation de travaux':(u"AT", u"Autorisation de travaux"),
+    u'autorisation de lotir':(u"AL", u"Autorisation de lotir"),
+    u'étude préalable MH':(u"EMH", u"Étude préalable MH")
+}
+
+ISHTAR_DOC_TYPES = {
+    'RF':u"Rapport final",
+    'RI':u"Rapport intermédiaire"
+}
+
+# attrs, convert[, relative col number, multi]
 ISHTAR_OPE_COL_FORMAT = [
- [], # pass
- [], # pass
- (('year',), 'parse_year', []),
- (('towns',), 'parse_insee', []),
- (('common_name',), 'parse_multivalue', []), # TODO "INTITULE OPE / Faire concat avec NOM du SITE pour l'instant"
- [], # TODO "Adresse du SITE = Titre rapport SI VIDE prendre INTITULE / Attention multivaluée de Nom du site, lieu dit et Adresse";
- [], # prog/prev
- [], #(('in_charge', 'attached_to', 'name'), 'parse_orga', []),
- [], #(('in_charge', 'name'), 'parse_person', []),
- [], #(('in_charge' num
- (('in_charge',), 'parse_person', [8, 9]),
- (('operation_code',), 'parse_operation_code', []), # num ope non patriarche
- (('start_date__year',), int, []),
- (('excavation_end_date__year',), int, []),
- (('start_date__day',), int, []),
- (('excavation_end_date__day',), int, []),
- (('start_date__month',), int, []),
- (('excavation_end_date__month',), int, []),
- (('operation_type',), 'parse_operationtype', [6]),
- [],
- [],
- [],
- [('code_patriarche',), 'parse_patriarche', []]
+ [('code_patriarche',), 'parse_string'],
+ None, # pass
+ None, # pass
+ None, # pass
+ [('code_dracar',), 'parse_string'],
+ None, # pass
+ (('in_charge',), 'parse_name_surname'),
+ None, # organisation - valeur par défaut si pas precise en colonne "V"
+ (('common_name',), 'parse_ope_name'), # Nom générique
+ (('periods',), 'parse_period_name', None, True),
+ (('cira_rapporteur',), 'parse_name_surname'),
+ (('operation_type',), 'parse_patriarche_operationtype'),
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # commentaire adresse - géré en colonne S
+ None, # pass
+ (('comment',), 'parse_comment_addr_nature', [16]),
+ (('associated_file', 'permit_type'), 'parse_permittype'),
+ (('associated_file', 'internal_reference'), 'parse_fileref'),
+ (('in_charge__attached_to',), 'parse_orga', [7]),
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ (('start_date',), 'parse_date'),
+ None, # pass
+ None, # pass
+ (('negative_result',), 'parse_bool'),
+ None, # pass
+ (('associated_file', 'year'), 'parse_yearref'),
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ (('year',), 'parse_yearref'),
+ None, # pass
+ (('administrative_act', 'signature_date',), 'parse_date'),
+ (('cira_date',), 'parse_date'),
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ (('end_date',), 'parse_date'),
+ None, # pass
+ None, # pass
+ None, # act_type
+ (('administrative_act', 'act_type'), 'parse_admin_act_typ', [49]),
+ (('administrative_act', 'ref_sra'), 'parse_fileref'),
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ None, # pass
+ (('surface',), 'parse_ha'),
+ None, # pass
+ (('source', 'index'), 'parse_rapp_index'),
+ (('source', 'reference'), 'parse_string'),
+ None, # pass
+ None, # pass
+ (('source', 'internal_reference'), 'parse_string'),
+ (('source', 'receipt_date'), 'parse_date'),
+ None, # pass
+ None, # pass
+ (('source', 'source_type'), 'parse_doc_types'),
+ None, # pass
+ None, # pass
+ None, # pass
+ (('towns',), 'parse_insee'),
+ None, # pass
+ None, # (('parcels',), 'parse_parcels'),
+ None, # pass
+ None, # pass
+ None, # pass
+ (('eas_number',), 'parse_string'),
+ None, # pass
+ (('source', 'title'), 'parse_string'),
+ None, # pass
+ None, # pass
 ]
 
diff --git a/example_project/manage.py b/example_project/manage.py
index bcdd55e27..8a126f72d 100755
--- a/example_project/manage.py
+++ b/example_project/manage.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 from django.core.management import execute_manager
+import sys
+sys.path.append('/home/nim/Work/geo-django-fla/')
 try:
     import settings # Assumed to be in the same directory.
 except ImportError:
diff --git a/example_project/settings.py b/example_project/settings.py
index a9888375f..d856fcce5 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -102,6 +102,7 @@ INSTALLED_APPS = [
     'django.contrib.formtools',
     'south',
     'registration',
+    'geodjangofla',
     'ishtar_common',
     'archaeological_operations', # mandatory app to run ishtar
     #'django_extensions',
@@ -159,6 +160,10 @@ ISHTAR_OPE_COL_FORMAT = None
 ISHTAR_OPE_TYPES = {}
 # DB key: txt_idx
 ISHTAR_PERIODS = {}
+ISHTAR_PERMIT_TYPES = {}
+ISHTAR_DOC_TYPES = {}
+
+ISHTAR_DPTS = []
 
 EXTRA_APPS = []
 
@@ -187,3 +192,7 @@ DEBUG_TOOLBAR_PANELS = (
 )
 
 DEBUG_TOOLBAR_CONFIG = {'INTERCEPT_REDIRECTS':False}
+
+import sys
+if 'test' in sys.argv or 'test_coverage' in sys.argv:
+    DATABASES['default']['engine'] = 'sqlite3'