diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-01-27 18:05:32 +0100 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-01-27 18:05:32 +0100 | 
| commit | 95fa295d7d93cdb65755e66c559a792edec4f17a (patch) | |
| tree | 0b45d6a11a650fbbf1a077cccf8e635305e56938 /ishtar/furnitures/models.py | |
| parent | 4910b41a5689e7af239edc8fff5d9aceef9e318e (diff) | |
| download | Ishtar-95fa295d7d93cdb65755e66c559a792edec4f17a.tar.bz2 Ishtar-95fa295d7d93cdb65755e66c559a792edec4f17a.zip | |
Town and departement import script from CSV file - insee data for France (refs #148)
Diffstat (limited to 'ishtar/furnitures/models.py')
| -rw-r--r-- | ishtar/furnitures/models.py | 16 | 
1 files changed, 12 insertions, 4 deletions
| diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index f7cc8288c..1a595f629 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -144,7 +144,7 @@ class LightHistorizedItem(BaseHistorizedItem):  class Departement(models.Model):      label = models.CharField(_(u"Label"), max_length=30) -    number = models.IntegerField(_(u"Number")) +    number = models.CharField(_(u"Number"), unique=True, max_length=3)      class Meta:          verbose_name = _(u"Departement") @@ -669,10 +669,14 @@ if settings.COUNTRY == 'fr':  class Town(models.Model):      name = models.CharField(_(u"Name"), max_length=100) -    surface = models.IntegerField(_(u"Surface")) -    center = models.PointField(_(u"Localisation"), srid=settings.SRID) +    surface = models.IntegerField(_(u"Surface"), blank=True, null=True) +    center = models.PointField(_(u"Localisation"), srid=settings.SRID, +                               blank=True, null=True)      if settings.COUNTRY == 'fr': -        numero_insee = models.CharField(u"Numéro INSEE", max_length=5) +        numero_insee = models.CharField(u"Numéro INSEE", max_length=6, +                                        unique=True) +        departement = models.ForeignKey(Departement, verbose_name=u"Département", +                                       null=True, blank=True)          canton = models.ForeignKey(Canton, verbose_name=u"Canton", null=True,                                     blank=True)      objects = models.GeoManager() @@ -680,8 +684,12 @@ class Town(models.Model):      class Meta:          verbose_name = _(u"Town")          verbose_name_plural = _(u"Towns") +        if settings.COUNTRY == 'fr': +            ordering = ['numero_insee']      def __unicode__(self): +        if settings.COUNTRY == "fr": +            return " - ".join((self.name, self.numero_insee))          return self.name  class TreatmentType(GeneralType): | 
