Simplify the model (refs #13)

1 files changed, 19 insertions, 14 deletions

diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py
index e08785c0a..b6ee0bcd0 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -67,6 +67,18 @@ class Address(models.Model):
     class Meta:
         abstract = True
 
+class OrganizationType(GeneralType):
+    class Meta:
+        verbose_name = _(u"Organization type")
+        verbose_name_plural = _(u"Organization types")
+
+class Organization(models.Model):
+    name = models.CharField(_(u"Name"), max_length=60)
+    person_type = models.ForeignKey(OrganizationType, verbose_name=_(u"Type"))
+    class Meta:
+        verbose_name = _(u"Organization")
+        verbose_name_plural = _(u"Organizations")
+
 class PersonType(GeneralType):
     class Meta:
         verbose_name = _(u"Person type")
@@ -83,7 +95,8 @@ class Person(Address) :
     name = models.CharField(_(u"Name"), max_length=30)
     email = models.CharField(_(u"Email"), max_length=40)
     person_type = models.ForeignKey(PersonType, verbose_name=_(u"Type"))
-    attached_to = models.ForeignKey('Person', verbose_name=_(u"Is attached to"))
+    attached_to = models.ForeignKey('Organization',
+                                    verbose_name=_(u"Is attached to"))
     is_author = models.BooleanField(_(u"Is an author?"))
     in_charge_storage = models.BooleanField(_(u"In charge of a storage?"))
 
@@ -98,7 +111,6 @@ class IshtarUser(models.Model):
     user = models.ForeignKey(User, unique=True, related_name='profile',
                              verbose_name=_(u"User"))
     person = models.ForeignKey(Person, verbose_name=_(u"Person"))
-    # MULTIPASS = models.IntegerField() ?????
 
     class Meta:
         verbose_name = _(u"Ishtar user")
@@ -116,7 +128,7 @@ class File(models.Model) :
     is_active = models.BooleanField(_(u"Is active?"))
     reception_date = models.DateField(_(u'Reception date'))
     file_type = models.ForeignKey(FileType, verbose_name=_(u"File type"))
-    general_contractor = models.ForeignKey(Person, related_name='+',
+    general_contractor = models.ForeignKey(Organization, related_name='+',
                                            verbose_name=(u"General contractor"))
     last_modifier = models.ForeignKey(Person, related_name='+',
                                       verbose_name=(u"Last modifier"))
@@ -413,6 +425,10 @@ class Treatment(models.Model):
     container = models.ForeignKey(Container, verbose_name=_(u"Container"))
     treatment_type = models.ForeignKey(TreatmentType,
                                        verbose_name=_(u"Treatment type"))
+    location = models.ForeignKey(Warehouse, verbose_name=_(u"Location"))
+    person = models.ForeignKey(Person, verbose_name=_(u'Person'))
+    start_date = models.DateField(_(u"Start date"))
+    end_date = models.DateField(_(u"End date"))
 
     class Meta:
         verbose_name = _(u"Treatment")
@@ -421,17 +437,6 @@ class Treatment(models.Model):
     def __unicode__(self):
         return self.item
 
-class InCharge(models.Model):
-    treatment = models.ForeignKey(Treatment, verbose_name=_(u"Treatment"))
-    location = models.ForeignKey(Warehouse, verbose_name=_(u"Location"))
-    person = models.ForeignKey(Person, verbose_name=_(u'Person'))
-    start_date = models.DateField(_(u"Start date"))
-    end_date = models.DateField(_(u"End date"))
-
-    class Meta:
-        verbose_name = _(u"In charge")
-        verbose_name_plural = _(u"In charge")
-
 class AuthorType(GeneralType):
     class Meta:
         verbose_name = _(u"Author type")