diff options
Diffstat (limited to 'ishtar/furnitures/models.py')
| -rw-r--r-- | ishtar/furnitures/models.py | 48 |
1 files changed, 19 insertions, 29 deletions
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index 808a3a039..7e8f5205b 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -53,7 +53,7 @@ class Departement(models.Model): verbose_name_plural = _(u"Departements") def __unicode__(self): - return self.number + u" - " + self.label + return unicode(self.number) + u" - " + self.label class Address(models.Model): address = models.TextField(_(u"Address")) @@ -72,8 +72,6 @@ class PersonType(GeneralType): verbose_name = _(u"Person type") verbose_name_plural = _(u"Person types") - pass - class Person(Address) : TYPE = (('Mr', _(u'Mr')), ('Ms', _(u'Miss')), @@ -108,7 +106,9 @@ class IshtarUser(models.Model): class FileType(GeneralType): - pass + class Meta: + verbose_name = _(u"Archaeological file type") + verbose_name_plural = _(u"Archaeological file types") class File(models.Model) : year = models.IntegerField(_(u"Year")) @@ -141,12 +141,10 @@ class OperationType(GeneralType): verbose_name = _(u"Operation type") verbose_name_plural = _(u"Operation types") - pass - class Operation(models.Model): + name = models.CharField(_(u"Name"), max_length=120) start_date = models.DateField(_(u"Start date")) end_date = models.DateField(_(u"End date")) - name = models.CharField(_(u"Name"), max_length=120) in_charge = models.ForeignKey('Person', related_name='+', verbose_name=_(u"In charge")) operation_code = models.CharField(_(u"Operation code"), max_length=20) @@ -200,15 +198,11 @@ class DatingType(GeneralType): verbose_name = _(u"Dating type") verbose_name_plural = _(u"Dating types") - pass - class DatingQuality(GeneralType): class Meta: verbose_name = _(u"Dating quality") verbose_name_plural = _(u"Dating qualitys") - pass - class Dating(models.Model): period = models.ForeignKey(Period, verbose_name=_(u"Period")) start_date = models.IntegerField(_(u"Start date")) @@ -228,11 +222,11 @@ class RegistrationUnit(models.Model): lenght = models.IntegerField(_(u"Lenght")) width = models.IntegerField(_(u"Width")) thickness = models.IntegerField(_(u"Thickness")) + depth = models.IntegerField(_(u"Depth")) has_furniture = models.BooleanField(u"Has furniture?") interpretation = models.TextField(_(u"Interpretation")) - depth = models.IntegerField(_(u"Depth")) filling = models.TextField(_(u"Filling")) - datings = models.ManyToManyField(Dating) + datings = models.ManyToManyField(Dating) # dans Item ??? class Meta: verbose_name = _(u"Registration Unit") @@ -246,8 +240,6 @@ class SourceType(GeneralType): verbose_name = _(u"Source type") verbose_name_plural = _(u"Source types") - pass - class Source(models.Model) : title = models.CharField(_(u"Title"), max_length=200) source_type = models.ForeignKey(SourceType, verbose_name=_(u"Type")) @@ -279,7 +271,7 @@ class Item(models.Model): item_number = models.IntegerField(_("Item's number")) documentations = models.ManyToManyField(Source) treatments = models.ManyToManyField("Treatment") - datings = models.ForeignKey(Dating, verbose_name=_(u"Dating")) + dating = models.ForeignKey(Dating, verbose_name=_(u"Dating")) class Meta: verbose_name = _(u"Item") @@ -306,15 +298,13 @@ class WarehouseType(GeneralType): verbose_name = _(u"Warehouse type") verbose_name_plural = _(u"Warehouse types") - pass - class Warehouse(Address): + name = models.CharField(_(u"Name"), max_length=40) warehouse_type = models.ForeignKey(WarehouseType, verbose_name=_(u"Warehouse type")) person_in_charge = models.ForeignKey(Person, verbose_name=_(u"Person in charge")) comment = models.TextField(_(u"Comment")) - towns = models.ManyToManyField("Town") class Meta: verbose_name = _(u"Warehouse") @@ -328,14 +318,12 @@ class ActType(GeneralType): verbose_name = _(u"Act type") verbose_name_plural = _(u"Act types") - pass - class AdministrativeAct(models.Model): operation = models.ForeignKey(Operation, related_name='+', verbose_name=_(u"Operation")) signature_date = models.DateField(_(u"Signature date")) - fact_object = models.CharField(_(u"Object"), max_length=200) - fact_type = models.ForeignKey(ActType, verbose_name=_(u"Act type")) + act_object = models.CharField(_(u"Object"), max_length=200) + act_type = models.ForeignKey(ActType, verbose_name=_(u"Act type")) person = models.ForeignKey(Person, verbose_name=_(u"Person")) if settings.COUNTRY == 'fr': ref_sra = models.CharField(u"Référence SRA", max_length=15) @@ -359,6 +347,7 @@ class ContainerType(GeneralType): verbose_name_plural = _(u"Container types") class Container(models.Model): + reference = models.CharField(_(u"Reference"), max_length=15) location = models.ForeignKey(Warehouse, verbose_name=_(u"Location")) container_type = models.ForeignKey(ContainerType, verbose_name=_("Container type")) @@ -373,12 +362,15 @@ if settings.COUNTRY == 'fr': name = models.CharField(u"Nom", max_length=30) department = models.ForeignKey(Departement, verbose_name=u"Département") + def __unicode__(self): + return self.name + class Canton(models.Model): name = models.CharField(u"Nom", max_length=30) arrondissement = models.ForeignKey(Arrondissement, verbose_name=u"Arrondissement") - def __unicode__(self): - return self.label + def __unicode__(self): + return self.name class Town(models.Model): name = models.CharField(_(u"Name"), max_length=100) @@ -425,8 +417,6 @@ class AuthorType(GeneralType): verbose_name = _(u"Author type") verbose_name_plural = _(u"Author types") - pass - class Author(models.Model): person = models.ForeignKey(Person, verbose_name=_(u"Person")) source = models.ForeignKey(Source, verbose_name=_(u"Source")) @@ -441,7 +431,7 @@ class Author(models.Model): class Property(models.Model): item = models.ForeignKey(Item, verbose_name=_(u"Item")) - administrative_fact = models.ForeignKey(AdministrativeAct, + administrative_act = models.ForeignKey(AdministrativeAct, verbose_name=_(u"Administrative act")) person = models.ForeignKey(Person, verbose_name=_(u"Person")) start_date = models.DateField(_(u"Start date")) @@ -449,7 +439,7 @@ class Property(models.Model): class Meta: verbose_name = _(u"Property") - verbose_name_plural = _(u"Propertys") + verbose_name_plural = _(u"Properties") def __unicode__(self): return self.person + u" - " + self.item |