Better management of CSV files (refs #159) and grids

1 files changed, 7 insertions, 2 deletions

diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py
index 2b82fe6b4..c45f18c08 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -271,6 +271,8 @@ if settings.COUNTRY == 'fr':
             verbose_name_plural = u"Types Saisine"
 
 class File(BaseHistorizedItem, OwnPerms):
+    TABLE_COLS = ['numeric_reference', 'year', 'internal_reference',
+                  'file_type', 'saisine_type', 'towns', ]
     year = models.IntegerField(_(u"Year"),
                                default=lambda:datetime.datetime.now().year)
     numeric_reference = models.IntegerField(_(u"Numeric reference"))
@@ -288,7 +290,7 @@ class File(BaseHistorizedItem, OwnPerms):
     permit_reference = models.CharField(_(u"Permit reference"),
                                           max_length=60, blank=True, null=True)
     is_active = models.BooleanField(_(u"Is active?"), default=True)
-    towns = models.ManyToManyField("Town")
+    towns = models.ManyToManyField("Town", verbose_name=_(u"Towns"))
     creation_date = models.DateField(_(u"Creation date"),
                                      default=datetime.datetime.now)
     reception_date = models.DateField(_(u'Reception date'), blank=True,
@@ -347,6 +349,8 @@ class RemainType(GeneralType):
         verbose_name_plural = _(u"Remain types")
 
 class Operation(BaseHistorizedItem, OwnPerms):
+    TABLE_COLS = ['operation_code', 'year', 'operation_type',
+                  'remains', 'towns', 'associated_file']
     start_date = models.DateField(_(u"Start date"), null=True, blank=True)
     end_date = models.DateField(_(u"Closing date"), null=True, blank=True)
     in_charge = models.ForeignKey('Person', related_name='+', null=True,
@@ -364,6 +368,7 @@ class Operation(BaseHistorizedItem, OwnPerms):
                                               blank=True)
         code_dracar = models.CharField(u"Code DRACAR", max_length=10, null=True,
                                        blank=True)
+        TABLE_COLS += ["code_patriarche", "code_dracar"]
     comment = models.TextField(_(u"Comment"), null=True, blank=True)
     history = HistoricalRecords()
 
@@ -694,7 +699,7 @@ class Town(models.Model):
 
     def __unicode__(self):
         if settings.COUNTRY == "fr":
-            return " - ".join((self.name, self.numero_insee))
+            return u"%s (%s)" % (self.name, self.numero_insee)
         return self.name
 
 class TreatmentType(GeneralType):