diff options
| -rw-r--r-- | archaeological_operations/models.py | 617 |
1 files changed, 326 insertions, 291 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 3011d8076..ae86a42ef 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -31,14 +31,16 @@ from django.utils.translation import ugettext_lazy as _, ugettext from ishtar_common.utils import cached_label_changed from ishtar_common.models import GeneralType, BaseHistorizedItem, \ - HistoricalRecords, LightHistorizedItem, OwnPerms, Department, Source,\ - Person, Organization, Town, Dashboard, IshtarUser, ValueGetter, \ - DocumentTemplate, ShortMenuItem, DashboardFormItem + HistoricalRecords, LightHistorizedItem, OwnPerms, Department, Source,\ + Person, Organization, Town, Dashboard, IshtarUser, ValueGetter, \ + DocumentTemplate, ShortMenuItem, DashboardFormItem FILES_AVAILABLE = 'archaeological_files' in settings.INSTALLED_APPS + class OperationType(GeneralType): order = models.IntegerField(_(u"Order"), default=1) preventive = models.BooleanField(_(u"Is preventive"), default=True) + class Meta: verbose_name = _(u"Operation type") verbose_name_plural = _(u"Operation types") @@ -46,7 +48,7 @@ class OperationType(GeneralType): @classmethod def get_types(cls, dct={}, instances=False, exclude=[], empty_first=True, - default=None): + default=None): tuples = [] dct['available'] = True if not instances and empty_first and not default: @@ -67,7 +69,7 @@ class OperationType(GeneralType): if not current_lst or item.preventive != current_preventive: if current_lst: tuples.append(current_lst) - current_lst = [_(u"Preventive") if item.preventive else\ + current_lst = [_(u"Preventive") if item.preventive else _(u"Research"), []] current_preventive = item.preventive current_lst[1].append((item.pk, _(unicode(item)))) @@ -85,13 +87,15 @@ class OperationType(GeneralType): return op_type.preventive return key == op_type.txt_idx + class RemainType(GeneralType): class Meta: verbose_name = _(u"Remain type") verbose_name_plural = _(u"Remain types") ordering = ('label',) -class Period(GeneralType) : + +class Period(GeneralType): order = models.IntegerField(_(u"Order")) start_date = models.IntegerField(_(u"Start date")) end_date = models.IntegerField(_(u"End date")) @@ -106,28 +110,30 @@ class Period(GeneralType) : def __unicode__(self): return self.label + class ArchaeologicalSite(BaseHistorizedItem): reference = models.CharField(_(u"Reference"), max_length=20, unique=True) name = models.CharField(_(u"Name"), max_length=200, null=True, blank=True) - periods = models.ManyToManyField(Period, verbose_name=_(u"Periods"), blank=True, - null=True) + periods = models.ManyToManyField(Period, verbose_name=_(u"Periods"), + blank=True, null=True) remains = models.ManyToManyField("RemainType", verbose_name=_(u'Remains'), blank=True, null=True) + class Meta: verbose_name = _(u"Archaeological site") verbose_name_plural = _(u"Archaeological sites") permissions = ( - ("view_archaeologicalsite", - ugettext(u"Can view all Archaeological site")), - ("view_own_archaeologicalsite", - ugettext(u"Can view own Archaeological site")), - ("add_own_archaeologicalsite", - ugettext(u"Can add own Archaeological site")), - ("change_own_archaeologicalsite", - ugettext(u"Can change own Archaeological site")), - ("delete_own_archaeologicalsite", - ugettext(u"Can delete own Archaeological site")), + ("view_archaeologicalsite", + ugettext(u"Can view all Archaeological site")), + ("view_own_archaeologicalsite", + ugettext(u"Can view own Archaeological site")), + ("add_own_archaeologicalsite", + ugettext(u"Can add own Archaeological site")), + ("change_own_archaeologicalsite", + ugettext(u"Can change own Archaeological site")), + ("delete_own_archaeologicalsite", + ugettext(u"Can delete own Archaeological site")), ) def __unicode__(self): @@ -136,25 +142,28 @@ class ArchaeologicalSite(BaseHistorizedItem): name += u" %s %s" % (settings.JOINT, self.name) return name + def get_values_town_related(item, prefix, values): - values[prefix+'parcellist'] = item.render_parcels() - values[prefix+'towns'] = '' - values[prefix+'departments'] = '' - values[prefix+'departments_number'] = '' - values[prefix+'towns_count'] = unicode(item.towns.count()) + values[prefix + 'parcellist'] = item.render_parcels() + values[prefix + 'towns'] = '' + values[prefix + 'departments'] = '' + values[prefix + 'departments_number'] = '' + values[prefix + 'towns_count'] = unicode(item.towns.count()) if item.towns.count(): - values[prefix+'towns'] = u", ".join([town.name - for town in item.towns.all().order_by('name')]) + values[prefix + 'towns'] = u", ".join([ + town.name for town in item.towns.all().order_by('name')]) if settings.COUNTRY == 'fr': - dpts_num = set([town.numero_insee[:2] for town in item.towns.all()]) - values[prefix+'departments_number'] = u", ".join( - list(sorted(dpts_num))) - values[prefix+'departments'] = u", ".join([ - Department.objects.get(number=dpt).label - for dpt in sorted(dpts_num) if Department.objects.filter( - number=dpt).count()]) + dpts_num = set( + [town.numero_insee[:2] for town in item.towns.all()]) + values[prefix + 'departments_number'] = u", ".join( + list(sorted(dpts_num))) + values[prefix + 'departments'] = u", ".join( + [Department.objects.get(number=dpt).label + for dpt in sorted(dpts_num) if Department.objects.filter( + number=dpt).count()]) return values + class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, DashboardFormItem): TABLE_COLS = ['year_index', 'operation_type', 'remains', 'towns', @@ -165,17 +174,17 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, default=datetime.date.today) end_date = models.DateField(_(u"Closing date"), null=True, blank=True) start_date = models.DateField(_(u"Start date"), null=True, blank=True) - excavation_end_date = models.DateField(_(u"Excavation end date"), null=True, - blank=True) + excavation_end_date = models.DateField( + _(u"Excavation end date"), null=True, blank=True) report_delivery_date = models.DateField(_(u"Report delivery date"), null=True, blank=True) - scientist = models.ForeignKey(Person, blank=True, null=True, - verbose_name=_(u"In charge scientist"), - on_delete=models.SET_NULL, - related_name='operation_scientist_responsability') - operator = models.ForeignKey(Organization, blank=True, null=True, - related_name='operator', - verbose_name=_(u"Operator"), on_delete=models.SET_NULL) + scientist = models.ForeignKey( + Person, blank=True, null=True, verbose_name=_(u"In charge scientist"), + on_delete=models.SET_NULL, + related_name='operation_scientist_responsability') + operator = models.ForeignKey( + Organization, blank=True, null=True, related_name='operator', + verbose_name=_(u"Operator"), on_delete=models.SET_NULL) in_charge = models.ForeignKey(Person, blank=True, null=True, verbose_name=_(u"In charge"), on_delete=models.SET_NULL, @@ -184,62 +193,68 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, operation_code = models.IntegerField(_(u"Operation code"), null=True, blank=True) if FILES_AVAILABLE: - associated_file = models.ForeignKey('archaeological_files.File', + associated_file = models.ForeignKey( + 'archaeological_files.File', related_name='operations', verbose_name=_(u"File"), blank=True, null=True) operation_type = models.ForeignKey(OperationType, related_name='+', verbose_name=_(u"Operation type")) surface = models.IntegerField(_(u"Surface (m²)"), blank=True, null=True) remains = models.ManyToManyField("RemainType", verbose_name=_(u'Remains'), - null=True, blank=True ) + null=True, blank=True) towns = models.ManyToManyField(Town, verbose_name=_(u"Towns")) cost = models.IntegerField(_(u"Cost (€)"), - blank=True, null=True) # preventive + blank=True, null=True) # preventive periods = models.ManyToManyField(Period, verbose_name=_(u"Periods"), null=True, blank=True) + # preventive scheduled_man_days = models.IntegerField(_(u"Scheduled man-days"), - blank=True, null=True) # preventive + blank=True, null=True) + # preventive optional_man_days = models.IntegerField(_(u"Optional man-days"), - blank=True, null=True) # preventive + blank=True, null=True) + # preventive effective_man_days = models.IntegerField(_(u"Effective man-days"), - blank=True, null=True) # preventive + blank=True, null=True) if settings.COUNTRY == 'fr': code_patriarche = models.IntegerField(u"Code PATRIARCHE", null=True, blank=True, unique=True) TABLE_COLS = ['full_code_patriarche'] + TABLE_COLS - code_dracar = models.CharField(u"Code DRACAR", max_length=10, null=True, - blank=True) + code_dracar = models.CharField(u"Code DRACAR", max_length=10, + null=True, blank=True) + # preventive fnap_financing = models.FloatField(u"Financement FNAP (%)", - blank=True, null=True) # preventive + blank=True, null=True) + # preventive fnap_cost = models.IntegerField(u"Financement FNAP (€)", - blank=True, null=True) # preventive + blank=True, null=True) + # preventive diag zoning_prescription = models.NullBooleanField( - _(u"Prescription on zoning"), - blank=True, null=True) # preventive diag + _(u"Prescription on zoning"), blank=True, null=True) + # preventive diag large_area_prescription = models.NullBooleanField( - _(u"Prescription on large area"), - blank=True, null=True) # preventive diag + _(u"Prescription on large area"), blank=True, null=True) geoarchaeological_context_prescription = models.NullBooleanField( - _(u"Prescription on geoarchaeological context"), - blank=True, null=True) # preventive diag - cira_rapporteur = models.ForeignKey(Person, - related_name='cira_rapporteur', null=True, - blank=True, on_delete=models.SET_NULL, - verbose_name=u"Rapporteur CIRA") + _(u"Prescription on geoarchaeological context"), blank=True, + null=True) # preventive diag + cira_rapporteur = models.ForeignKey( + Person, related_name='cira_rapporteur', null=True, blank=True, + on_delete=models.SET_NULL, verbose_name=u"Rapporteur CIRA") negative_result = models.NullBooleanField( - u"Résultat considéré comme négatif", blank=True, null=True) + u"Résultat considéré comme négatif", blank=True, null=True) cira_date = models.DateField(u"Date avis CIRA", null=True, blank=True) eas_number = models.CharField(u"Numéro de l'EA", max_length=20, null=True, blank=True) - operator_reference = models.CharField(_(u"Operator reference"), - max_length=20, null=True, blank=True) + operator_reference = models.CharField( + _(u"Operator reference"), max_length=20, null=True, blank=True) common_name = models.CharField(_(u"Generic name"), max_length=120, null=True, blank=True) comment = models.TextField(_(u"Comment"), null=True, blank=True) cached_label = models.CharField(_(u"Cached name"), max_length=500, null=True, blank=True) - archaeological_sites = models.ManyToManyField(ArchaeologicalSite, - verbose_name=_(u"Archaeological sites"), null=True, blank=True) + archaeological_sites = models.ManyToManyField( + ArchaeologicalSite, verbose_name=_(u"Archaeological sites"), + null=True, blank=True) history = HistoricalRecords() class Meta: @@ -258,9 +273,9 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, @classmethod def get_owns(cls, user): owns = super(Operation, cls).get_owns(user) - #owns = owns.annotate(null_count=Count('operation_code')) - #return owns.order_by("common_name", "-year", "operation_code") - return sorted(owns.all(), key=lambda x:x.cached_label) + # owns = owns.annotate(null_count=Count('operation_code')) + # return owns.order_by("common_name", "-year", "operation_code") + return sorted(owns.all(), key=lambda x: x.cached_label) def __unicode__(self): if self.cached_label: @@ -311,10 +326,9 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, @property def report_delivery_delay(self): return None - #q = self.source.filter(source_type__txt_idx__endswith='_report') - #if not self.report_delivery_date or not q.count(): - # return None - + # q = self.source.filter(source_type__txt_idx__endswith='_report') + # if not self.report_delivery_date or not q.count(): + # return None def _generate_cached_label(self): items = [self.get_town_label(), self.get_reference(full=True)] @@ -330,7 +344,6 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, return lbl def get_department(self): - q = self.towns if not self.towns.count(): return '00' return self.towns.all()[0].numero_insee[:2] @@ -344,14 +357,15 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, def context_record_docs_q(self): from archaeological_context_records.models import ContextRecordSource return ContextRecordSource.objects.filter( - context_record__operation=self) + context_record__operation=self) def find_docs_q(self): from archaeological_finds.models import FindSource return FindSource.objects.filter( - find__base_finds__context_record__operation=self) + find__base_finds__context_record__operation=self) associated_file_short_label_lbl = _(u"Archaeological file") + @property def associated_file_short_label(self): if not FILES_AVAILABLE or not self.associated_file: @@ -363,17 +377,19 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, if not year: year = datetime.date.today().year max_val = cls.objects.filter(year=year).aggregate( - Max('operation_code'))["operation_code__max"] + Max('operation_code'))["operation_code__max"] return (max_val + 1) if max_val else 1 year_index_lbl = _(u"Operation code") + @property def year_index(self): if not self.operation_code: return "" lbl = unicode(self.operation_code) year = self.year or 0 - lbl = settings.OP_PREFIX + u"%d-%s%s" % (year, (3-len(lbl))*"0", lbl) + lbl = settings.OP_PREFIX + u"%d-%s%s" % (year, (3 - len(lbl)) * "0", + lbl) return lbl @property @@ -385,8 +401,8 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, def clean(self): if not self.operation_code: return - objs = self.__class__.objects.filter(year=self.year, - operation_code=self.operation_code) + objs = self.__class__.objects.filter( + year=self.year, operation_code=self.operation_code) if self.pk: objs = objs.exclude(pk=self.pk) if objs.count(): @@ -399,25 +415,19 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, @property def surface_ha(self): if self.surface: - return self.surface/10000.0 - - @property - def cost_by_m2(self): - if not self.surface or not self.cost: - return - return round(float(self.cost)/self.surface, 2) + return self.surface / 10000.0 @property def cost_by_m2(self): if not self.surface or not self.cost: return - return round(float(self.cost)/self.surface, 2) + return round(float(self.cost) / self.surface, 2) @classmethod def get_query_owns(cls, user): - return Q(in_charge=user.ishtaruser.person)|\ - Q(scientist=user.ishtaruser.person)|\ - Q(history_creator=user) & Q(end_date__isnull=True) + return Q(in_charge=user.ishtaruser.person) |\ + Q(scientist=user.ishtaruser.person) |\ + Q(history_creator=user) & Q(end_date__isnull=True) def is_active(self): return not bool(self.end_date) @@ -428,8 +438,8 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, for item in self.history.all(): if not item.end_date: break - return {'date':item.history_date, - 'user':IshtarUser.objects.get(pk=item.history_modifier_id)} + return {'date': item.history_date, + 'user': IshtarUser.objects.get(pk=item.history_modifier_id)} def save(self, *args, **kwargs): # put a default year if start_date is defined @@ -439,17 +449,18 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, m2m_changed.connect(cached_label_changed, sender=Operation.towns.through) + def operation_post_save(sender, **kwargs): if not kwargs['instance']: return operation = kwargs['instance'] if operation.fnap_financing and operation.cost: - fnap_cost = int(float(operation.cost)/100*operation.fnap_financing) + fnap_cost = int(float(operation.cost) / 100 * operation.fnap_financing) if not operation.fnap_cost or operation.fnap_cost != fnap_cost: operation.fnap_cost = fnap_cost operation.save() elif operation.fnap_cost and operation.cost: - fnap_percent = float(operation.fnap_cost)*100/operation.cost + fnap_percent = float(operation.fnap_cost) * 100 / operation.cost operation.fnap_financing = fnap_percent operation.save() cached_label_changed(sender, **kwargs) @@ -461,6 +472,7 @@ def operation_post_save(sender, **kwargs): parcel.copy_to_file() post_save.connect(operation_post_save, sender=Operation) + class OperationByDepartment(models.Model): ''' Database view for dashboard @@ -468,10 +480,12 @@ class OperationByDepartment(models.Model): operation = models.ForeignKey(Operation, verbose_name=_(u"Operation")) department = models.ForeignKey(Department, verbose_name=_(u"Department"), blank=True, null=True) + class Meta: managed = False db_table = 'operation_department' + class OperationSource(Source): class Meta: verbose_name = _(u"Operation documentation") @@ -490,14 +504,16 @@ class OperationSource(Source): ) operation = models.ForeignKey(Operation, verbose_name=_(u"Operation"), related_name="source") - index = models.IntegerField(verbose_name=_(u"Index"), blank=True, null=True) + index = models.IntegerField(verbose_name=_(u"Index"), blank=True, + null=True) TABLE_COLS = ['operation.year', 'operation.operation_code'] + \ - Source.TABLE_COLS + Source.TABLE_COLS @property def owner(self): return self.operation + class ActType(GeneralType): TYPE = (('F', _(u'Archaeological file')), ('O', _(u'Operation')), @@ -505,10 +521,11 @@ class ActType(GeneralType): intented_to = models.CharField(_(u"Intended to"), max_length=1, choices=TYPE) code = models.CharField(_(u"Code"), max_length=10, blank=True, null=True) - associated_template = models.ManyToManyField(DocumentTemplate, blank=True, - null=True, verbose_name=_(u"Associated template"), - related_name='acttypes') + associated_template = models.ManyToManyField( + DocumentTemplate, blank=True, null=True, + verbose_name=_(u"Associated template"), related_name='acttypes') indexed = models.BooleanField(_(u"Indexed"), default=False) + class Meta: verbose_name = _(u"Act type") verbose_name_plural = _(u"Act types") @@ -519,30 +536,36 @@ if FILES_AVAILABLE: class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter): TABLE_COLS = ['full_ref', 'year', 'index', 'act_type', 'act_object', 'signature_date', 'associated_file', 'operation'] - TABLE_COLS_FILE = ['full_ref', 'year', 'index', 'act_type', 'act_object', - 'associated_file', 'associated_file.towns',] + TABLE_COLS_FILE = ['full_ref', 'year', 'index', 'act_type', + 'act_object', 'associated_file', + 'associated_file.towns', ] TABLE_COLS_OPE = ['full_ref', 'year', 'index', 'act_type', 'operation', 'act_object', 'operation.towns'] act_type = models.ForeignKey(ActType, verbose_name=_(u"Act type")) - in_charge = models.ForeignKey(Person, blank=True, null=True, + in_charge = models.ForeignKey( + Person, blank=True, null=True, related_name='adminact_operation_in_charge', verbose_name=_(u"Person in charge of the operation"), on_delete=models.SET_NULL,) - index = models.IntegerField(verbose_name=_(u"Index"), blank=True, null=True) - operator = models.ForeignKey(Organization, blank=True, null=True, - verbose_name=_(u"Archaeological preventive operator"), - related_name='adminact_operator', - on_delete=models.SET_NULL) - scientist = models.ForeignKey(Person, blank=True, null=True, - related_name='adminact_scientist', on_delete=models.SET_NULL, - verbose_name=_(u"Scientist in charge")) - signatory = models.ForeignKey(Person, blank=True, null=True, - related_name='signatory', verbose_name=_(u"Signatory"), - on_delete=models.SET_NULL,) - operation = models.ForeignKey(Operation, blank=True, null=True, - related_name='administrative_act', verbose_name=_(u"Operation")) + index = models.IntegerField(verbose_name=_(u"Index"), blank=True, + null=True) + operator = models.ForeignKey( + Organization, blank=True, null=True, + verbose_name=_(u"Archaeological preventive operator"), + related_name='adminact_operator', on_delete=models.SET_NULL) + scientist = models.ForeignKey( + Person, blank=True, null=True, + related_name='adminact_scientist', on_delete=models.SET_NULL, + verbose_name=_(u"Scientist in charge")) + signatory = models.ForeignKey( + Person, blank=True, null=True, related_name='signatory', + verbose_name=_(u"Signatory"), on_delete=models.SET_NULL,) + operation = models.ForeignKey( + Operation, blank=True, null=True, + related_name='administrative_act', verbose_name=_(u"Operation")) if FILES_AVAILABLE: - associated_file = models.ForeignKey('archaeological_files.File', + associated_file = models.ForeignKey( + 'archaeological_files.File', blank=True, null=True, related_name='administrative_act', verbose_name=_(u"Archaelogical file")) @@ -552,8 +575,8 @@ if FILES_AVAILABLE: act_object = models.TextField(_(u"Object"), max_length=300, blank=True, null=True) if settings.COUNTRY == 'fr': - ref_sra = models.CharField(u"Référence SRA", max_length=15, blank=True, - null=True) + ref_sra = models.CharField(u"Référence SRA", max_length=15, + blank=True, null=True) history = HistoricalRecords() _prefix = 'adminact_' @@ -575,18 +598,20 @@ if FILES_AVAILABLE: ) def __unicode__(self): - return settings.JOINT.join([unicode(item) - for item in [self.operation, self.associated_file, self.act_object] - if item]) + return settings.JOINT.join( + [unicode(item) for item in [ + self.operation, self.associated_file, self.act_object] + if item]) full_ref_lbl = _(u"Ref.") + @property def full_ref(self): lbl = [] if self.year: lbl.append(unicode(self.year)) if self.index: - lbl.append(u"n°%d" %self.index) + lbl.append(u"n°%d" % self.index) if settings.COUNTRY == 'fr' and self.ref_sra: lbl.append(u"[%s]" % self.ref_sra) return u" ".join(lbl) @@ -606,7 +631,7 @@ if FILES_AVAILABLE: def get_filename(self): filename = self.related_item.associated_filename - filename = u"-".join(filename.split('-')[:-1]) # remove date + filename = u"-".join(filename.split('-')[:-1]) # remove date if self.act_type.code: filename += u"-" + self.act_type.code if self.signature_date and self.index: @@ -631,15 +656,15 @@ if FILES_AVAILABLE: def _get_index(self): if not self.index: c_index = 1 - q = AdministrativeAct.objects.filter(act_type__indexed=True, - signature_date__year=self.year, - index__isnull=False).order_by("-index") + q = AdministrativeAct.objects.filter( + act_type__indexed=True, signature_date__year=self.year, + index__isnull=False).order_by("-index") if q.count(): c_index = q.all()[0].index + 1 self.index = c_index - conflict = AdministrativeAct.objects.filter(act_type__indexed=True, - signature_date__year=self.year, - index=self.index) + conflict = AdministrativeAct.objects.filter( + act_type__indexed=True, signature_date__year=self.year, + index=self.index) if self.pk: conflict = conflict.exclude(pk=self.pk) if conflict.count(): @@ -672,19 +697,23 @@ if FILES_AVAILABLE: self.associated_file.update_has_admin_act() self.associated_file.update_short_menu_class() + def strip_zero(value): for idx, nb in enumerate(value): if nb != '0': return value[idx:] return value + class Parcel(LightHistorizedItem): if FILES_AVAILABLE: - associated_file = models.ForeignKey('archaeological_files.File', + associated_file = models.ForeignKey( + 'archaeological_files.File', related_name='parcels', verbose_name=_(u"File"), blank=True, null=True) - operation = models.ForeignKey(Operation, related_name='parcels', blank=True, - null=True, verbose_name=_(u"Operation")) + operation = models.ForeignKey( + Operation, related_name='parcels', blank=True, null=True, + verbose_name=_(u"Operation")) year = models.IntegerField(_(u"Year"), blank=True, null=True) town = models.ForeignKey(Town, related_name='parcels', verbose_name=_(u"Town")) @@ -702,8 +731,9 @@ class Parcel(LightHistorizedItem): @property def short_label(self): - return settings.JOINT.join([unicode(item) for item in [self.section, - self.parcel_number] if item]) + return settings.JOINT.join( + [unicode(item) for item in [self.section, self.parcel_number] + if item]) def __unicode__(self): return self.short_label @@ -735,8 +765,8 @@ class Parcel(LightHistorizedItem): @classmethod def grouped_parcels(cls, parcels): - sortkeyfn = lambda s:(getattr(s, 'town_id'), - getattr(s, 'section'), getattr(s, 'year')) + sortkeyfn = lambda s: (getattr(s, 'town_id'), + getattr(s, 'section'), getattr(s, 'year')) parcels = sorted(parcels, key=sortkeyfn) grouped = [] for keys, parcel_grp in groupby(parcels, key=sortkeyfn): @@ -745,7 +775,8 @@ class Parcel(LightHistorizedItem): grouped.append(parcel) grouped[-1].parcel_numbers = [] grouped[-1].parcel_numbers.append( - u"0"*(12-len(parcel.parcel_number)) + parcel.parcel_number) + u"0" * (12 - len(parcel.parcel_number)) + + parcel.parcel_number) grouped[-1].parcel_numbers.sort() grouped[-1].parcel_numbers = [strip_zero(nb) for nb in grouped[-1].parcel_numbers] @@ -755,11 +786,11 @@ class Parcel(LightHistorizedItem): def render_parcels(cls, parcels): parcels = cls.grouped_parcels(parcels) res = '' - c_town, c_section, c_year = '', '', '' + c_town, c_section = '', '' for idx, parcels in enumerate(parcels): if c_town != unicode(parcels.town): c_town = unicode(parcels.town) - c_section, c_year = '', '' + c_section = '' if idx: res += " ; " res += unicode(parcels.town) + u' : ' @@ -774,10 +805,9 @@ class Parcel(LightHistorizedItem): def long_label(self): items = [unicode(self.operation) or - (FILES_AVAILABLE and unicode(self.associated_file)) or - ""] + (FILES_AVAILABLE and unicode(self.associated_file)) or ""] items += [unicode(item) for item in [self.section, self.parcel_number] - if item] + if item] return settings.JOINT.join(items) def copy_to_file(self): @@ -787,8 +817,8 @@ class Parcel(LightHistorizedItem): if not self.operation or not self.operation.associated_file: # not concerned return - keys = {'town':self.town, 'section':self.section, - 'parcel_number':self.parcel_number} + keys = {'town': self.town, 'section': self.section, + 'parcel_number': self.parcel_number} if self.operation.associated_file.parcels.filter(**keys).count(): # everything is OK return @@ -798,9 +828,9 @@ class Parcel(LightHistorizedItem): new_p = Parcel.objects.create(**keys) # also copy owning for owning in self.owners.all(): - ParcelOwner.objects.create(owner=owning.owner, - parcel=new_p, start_date=owning.start_date, - end_date=owning.end_date) + ParcelOwner.objects.create( + owner=owning.owner, parcel=new_p, + start_date=owning.start_date, end_date=owning.end_date) def copy_to_operation(self): """ @@ -810,29 +840,30 @@ class Parcel(LightHistorizedItem): if not (self.operation and self.associated_file): # everything is OK return - keys = {'town':self.town, 'section':self.section, - 'parcel_number':self.parcel_number, - 'operation':self.operation, - 'associated_file':None, - 'defaults':{'address':self.address, 'year':self.year} + keys = {'town': self.town, 'section': self.section, + 'parcel_number': self.parcel_number, + 'operation': self.operation, + 'associated_file': None, + 'defaults': {'address': self.address, 'year': self.year} } new_p, created = Parcel.objects.get_or_create(**keys) # copy owning only if created if created: for owning in self.owners.all(): - ParcelOwner.objects.create(owner=owning.owner, - parcel=new_p, start_date=owning.start_date, - end_date=owning.end_date) + ParcelOwner.objects.create( + owner=owning.owner, parcel=new_p, + start_date=owning.start_date, end_date=owning.end_date) self.operation = None self.save() + def parcel_post_save(sender, **kwargs): if not kwargs['instance']: return parcel = kwargs['instance'] if not parcel.external_id and (parcel.section or parcel.parcel_number): parcel.external_id = unicode(parcel.section or "") + \ - unicode(parcel.parcel_number or "") + unicode(parcel.parcel_number or "") parcel.save() return if parcel.operation and parcel.operation.pk and \ @@ -849,6 +880,7 @@ def parcel_post_save(sender, **kwargs): parcel.copy_to_operation() post_save.connect(parcel_post_save, sender=Parcel) + class ParcelOwner(LightHistorizedItem): owner = models.ForeignKey(Person, verbose_name=_(u"Owner"), related_name="parcel_owner") @@ -864,32 +896,34 @@ class ParcelOwner(LightHistorizedItem): def __unicode__(self): return self.owner + settings.JOINT + self.parcel + class OperationDashboard: def __init__(self): main_dashboard = Dashboard(Operation) self.total_number = main_dashboard.total_number - self.filters_keys = ['recorded', 'effective', 'active', 'field', + self.filters_keys = [ + 'recorded', 'effective', 'active', 'field', 'documented', 'closed', 'documented_closed'] filters = { - 'recorded':{}, - 'effective':{'scientist__isnull':False}, - 'active':{'scientist__isnull':False, 'end_date__isnull':True}, - 'field':{'excavation_end_date__isnull':True}, - 'documented':{'source__isnull':False}, - 'documented_closed':{'source__isnull':False, - 'end_date__isnull':False}, - 'closed':{'end_date__isnull':False} - } + 'recorded': {}, + 'effective': {'scientist__isnull': False}, + 'active': {'scientist__isnull': False, 'end_date__isnull': True}, + 'field': {'excavation_end_date__isnull': True}, + 'documented': {'source__isnull': False}, + 'documented_closed': {'source__isnull': False, + 'end_date__isnull': False}, + 'closed': {'end_date__isnull': False} + } filters_label = { - 'recorded':_(u"Recorded"), - 'effective':_(u"Effective"), - 'active':_(u"Active"), - 'field':_(u"Field completed"), - 'documented':_(u"Associated report"), - 'closed':_(u"Closed"), - 'documented_closed':_(u"Documented and closed"), + 'recorded': _(u"Recorded"), + 'effective': _(u"Effective"), + 'active': _(u"Active"), + 'field': _(u"Field completed"), + 'documented': _(u"Associated report"), + 'closed': _(u"Closed"), + 'documented_closed': _(u"Documented and closed"), } self.filters_label = [filters_label[k] for k in self.filters_keys] self.total = [] @@ -899,18 +933,18 @@ class OperationDashboard: self.total.append((lbl, nb)) self.surface_by_type = Operation.objects\ - .values('operation_type__label')\ - .annotate(number=Sum('surface'))\ - .order_by('-number','operation_type__label') + .values('operation_type__label')\ + .annotate(number=Sum('surface'))\ + .order_by('-number', 'operation_type__label') self.by_type = [] self.types = OperationType.objects.filter(available=True).all() for fltr_key in self.filters_keys: fltr, lbl = filters[fltr_key], filters_label[fltr_key] type_res = Operation.objects.filter(**fltr).\ - values('operation_type', 'operation_type__label').\ - annotate(number=Count('pk')).\ - order_by('operation_type') + values('operation_type', 'operation_type__label').\ + annotate(number=Count('pk')).\ + order_by('operation_type') types_dct = {} for typ in type_res.all(): types_dct[typ['operation_type']] = typ["number"] @@ -923,14 +957,14 @@ class OperationDashboard: self.by_type.append((lbl, types)) self.by_year = [] - self.years = [res['year'] for res in Operation.objects.values('year')\ - .order_by('-year').distinct()] + self.years = [res['year'] for res in Operation.objects.values('year') + .order_by('-year').distinct()] for fltr_key in self.filters_keys: fltr, lbl = filters[fltr_key], filters_label[fltr_key] - year_res = Operation.objects.filter(**fltr).\ - values('year').\ - annotate(number=Count('pk')).\ - order_by('year') + year_res = Operation.objects.filter(**fltr)\ + .values('year')\ + .annotate(number=Count('pk'))\ + .order_by('year') years_dct = {} for yr in year_res.all(): years_dct[yr['year']] = yr["number"] @@ -943,17 +977,17 @@ class OperationDashboard: self.by_year.append((lbl, years)) self.by_realisation_year = [] - self.realisation_years = [res['date'] for res in \ - Operation.objects.extra( - {'date':"date_trunc('year', start_date)"}).values('date')\ - .filter(start_date__isnull=False).order_by('-date').distinct()] + self.realisation_years = [ + res['date'] for res in Operation.objects.extra( + {'date': "date_trunc('year', start_date)"}).values('date') + .filter(start_date__isnull=False).order_by('-date').distinct()] for fltr_key in self.filters_keys: fltr, lbl = filters[fltr_key], filters_label[fltr_key] year_res = Operation.objects.filter(**fltr).extra( - {'date':"date_trunc('year', start_date)"}).values('date').\ - values('date').filter(start_date__isnull=False).\ - annotate(number=Count('pk')).\ - order_by('-date') + {'date': "date_trunc('year', start_date)"}).values('date')\ + .values('date').filter(start_date__isnull=False)\ + .annotate(number=Count('pk'))\ + .order_by('-date') years_dct = {} for yr in year_res.all(): years_dct[yr['date']] = yr["number"] @@ -967,11 +1001,11 @@ class OperationDashboard: self.effective = [] for typ in self.types: - year_res = Operation.objects.filter(**{'scientist__isnull':False, - 'operation_type':typ}).\ - values('year').\ - annotate(number=Count('pk')).\ - order_by('-year').distinct() + year_res = Operation.objects.filter(**{'scientist__isnull': False, + 'operation_type': typ})\ + .values('year')\ + .annotate(number=Count('pk'))\ + .order_by('-year').distinct() years_dct = {} for yr in year_res.all(): years_dct[yr['year']] = yr["number"] @@ -986,9 +1020,9 @@ class OperationDashboard: # TODO: by date now = datetime.date.today() limit = datetime.date(now.year, now.month, 1) - datetime.timedelta(365) - by_realisation_month = Operation.objects.filter(start_date__gt=limit, - start_date__isnull=False).extra( - {'date':"date_trunc('month', start_date)"}) + by_realisation_month = Operation.objects.filter( + start_date__gt=limit, start_date__isnull=False).extra( + {'date': "date_trunc('month', start_date)"}) self.last_months = [] date = datetime.datetime(now.year, now.month, 1) for mt_idx in xrange(12): @@ -1000,9 +1034,8 @@ class OperationDashboard: self.by_realisation_month = [] for fltr_key in self.filters_keys: fltr, lbl = filters[fltr_key], filters_label[fltr_key] - month_res = by_realisation_month.filter(**fltr).\ - annotate(number=Count('pk')).\ - order_by('-date') + month_res = by_realisation_month.filter(**fltr)\ + .annotate(number=Count('pk')).order_by('-date') month_dct = {} for mt in month_res.all(): month_dct[mt.date] = mt.number @@ -1021,7 +1054,7 @@ class OperationDashboard: (self.excavation, ('prev_excavation', 'prog_excavation'))): dct_res['total'] = [] - operation_type = {'operation_type__txt_idx__in':ope_types} + operation_type = {'operation_type__txt_idx__in': ope_types} for fltr_key in self.filters_keys: fltr, lbl = filters[fltr_key], filters_label[fltr_key] fltr.update(operation_type) @@ -1032,10 +1065,10 @@ class OperationDashboard: for fltr_key in self.filters_keys: fltr, lbl = filters[fltr_key], filters_label[fltr_key] fltr.update(operation_type) - year_res = Operation.objects.filter(**fltr).\ - values('year').\ - annotate(number=Count('pk')).\ - order_by('year') + year_res = Operation.objects.filter(**fltr)\ + .values('year')\ + .annotate(number=Count('pk'))\ + .order_by('year') years_dct = {} for yr in year_res.all(): years_dct[yr['year']] = yr["number"] @@ -1052,10 +1085,11 @@ class OperationDashboard: fltr, lbl = filters[fltr_key], filters_label[fltr_key] fltr.update(operation_type) year_res = Operation.objects.filter(**fltr).extra( - {'date':"date_trunc('year', start_date)"}).values('date').\ - filter(start_date__isnull=False).\ - annotate(number=Count('pk')).\ - order_by('-date') + {'date': "date_trunc('year', start_date)"})\ + .values('date')\ + .filter(start_date__isnull=False)\ + .annotate(number=Count('pk'))\ + .order_by('-date') years_dct = {} for yr in year_res.all(): years_dct[yr['date']] = yr["number"] @@ -1068,10 +1102,11 @@ class OperationDashboard: dct_res['by_realisation_year'].append((lbl, years)) current_year_ope = Operation.objects.filter(**operation_type)\ - .filter(year=datetime.date.today().year) + .filter( + year=datetime.date.today().year) current_realisation_year_ope = Operation.objects\ - .filter(**operation_type)\ - .filter(start_date__year=datetime.date.today().year) + .filter(**operation_type)\ + .filter(start_date__year=datetime.date.today().year) res_keys = [('area_realised', current_realisation_year_ope)] if dct_res == self.survey: res_keys.append(('area', @@ -1109,46 +1144,46 @@ class OperationDashboard: if dct_res == self.survey: dct_res['mandayhect_effective'] = '-' - res_keys = [('org_realised', current_realisation_year_ope)] if dct_res == self.survey: res_keys.append(('org', current_year_ope)) for res_key, base_ope in res_keys: org_res = base_ope.filter(scientist__attached_to__isnull=False)\ - .values('scientist__attached_to', - 'scientist__attached_to__name')\ - .annotate(area=Sum('surface'))\ - .order_by('scientist__attached_to__name').all() + .values('scientist__attached_to', + 'scientist__attached_to__name')\ + .annotate(area=Sum('surface'))\ + .order_by('scientist__attached_to__name').all() # TODO: man-days, man-days/hectare dct_res[res_key] = org_res - year_ope = Operation.objects.filter(**operation_type) res_keys = ['org_by_year'] if dct_res == self.survey: res_keys.append('org_by_year_realised') q = year_ope.values('scientist__attached_to', - 'scientist__attached_to__name').\ - filter(scientist__attached_to__isnull=False).\ - order_by('scientist__attached_to__name').distinct() + 'scientist__attached_to__name')\ + .filter(scientist__attached_to__isnull=False)\ + .order_by('scientist__attached_to__name').distinct() org_list = [(org['scientist__attached_to'], org['scientist__attached_to__name']) for org in q] - org_list_dct = dict(org_list) + # org_list_dct = dict(org_list) for res_key in res_keys: dct_res[res_key] = [] years = self.years if res_key == 'org_by_year_realised': years = self.realisation_years for org_id, org_label in org_list: - org_res = year_ope.filter(scientist__attached_to__pk=org_id) + org_res = year_ope.filter( + scientist__attached_to__pk=org_id) key_date = '' if res_key == 'org_by_year': org_res = org_res.values('year') key_date = 'year' else: - org_res = org_res.extra( - {'date':"date_trunc('year', start_date)"}).values('date').\ - filter(start_date__isnull=False) + org_res = org_res\ + .extra({'date': "date_trunc('year', start_date)"})\ + .values('date')\ + .filter(start_date__isnull=False) key_date = 'date' org_res = org_res.annotate(area=Sum('surface'), cost=Sum('cost')) @@ -1167,33 +1202,30 @@ class OperationDashboard: area_means, area_sums = [], [] cost_means, cost_sums = [], [] for idx, year in enumerate(years): - vals = [r_years[idx] for lbl, r_years in dct_res[res_key]] + vals = [r_yars[idx] for lb, r_yars in dct_res[res_key]] if not vals: continue sum_area = sum([a for a, c in vals]) sum_cost = sum([c for a, c in vals]) - area_means.append(sum_area/len(vals)) + area_means.append(sum_area / len(vals)) area_sums.append(sum_area) - cost_means.append(sum_cost/len(vals)) + cost_means.append(sum_cost / len(vals)) cost_sums.append(sum_cost) - dct_res[res_key+'_area_mean'] = area_means - dct_res[res_key+'_area_sum'] = area_sums - dct_res[res_key+'_cost_mean'] = cost_means - dct_res[res_key+'_cost_mean'] = cost_sums + dct_res[res_key + '_area_mean'] = area_means + dct_res[res_key + '_area_sum'] = area_sums + dct_res[res_key + '_cost_mean'] = cost_means + dct_res[res_key + '_cost_mean'] = cost_sums if dct_res == self.survey: self.survey['effective'] = [] for yr in self.years: - year_res = Operation.objects.filter( - scientist__isnull=False, - year=yr - ).annotate( - number=Sum('surface'), - mean=Avg('surface')) + year_res = Operation.objects\ + .filter(scientist__isnull=False, year=yr)\ + .annotate(number=Sum('surface'), mean=Avg('surface')) nb = year_res[0].number if year_res.count() else 0 nb = nb if nb else 0 mean = year_res[0].mean if year_res.count() else 0 - mean = mean if mean else 0 + mean = mean if mean else 0 self.survey['effective'].append((nb, mean)) # TODO:Man-Days/hectare by Year @@ -1203,9 +1235,10 @@ class OperationDashboard: for fltr_key in self.filters_keys: fltr, lbl = filters[fltr_key], filters_label[fltr_key] fltr.update(operation_type) - month_res = by_realisation_month.filter(**fltr).\ - annotate(number=Count('pk')).\ - order_by('-date') + month_res = by_realisation_month\ + .filter(**fltr)\ + .annotate(number=Count('pk'))\ + .order_by('-date') month_dct = {} for mt in month_res.all(): month_dct[mt.date] = mt.number @@ -1218,20 +1251,21 @@ class OperationDashboard: months.append(0) dct_res['by_month'].append((lbl, months)) - operation_type = {'operation_type__txt_idx__in':ope_types} - self.departments = [(fd['department__pk'], fd['department__label']) - for fd in OperationByDepartment.objects\ - .filter(department__isnull=False)\ - .values('department__label', 'department__pk')\ - .order_by('department__label').distinct()] + operation_type = {'operation_type__txt_idx__in': ope_types} + self.departments = [ + (fd['department__pk'], fd['department__label']) + for fd in OperationByDepartment + .objects.filter(department__isnull=False) + .values('department__label', 'department__pk') + .order_by('department__label').distinct()] dct_res['by_dpt'] = [] for dpt_id, dpt_label in self.departments: vals = OperationByDepartment.objects\ - .filter(department__pk=dpt_id, - operation__operation_type__txt_idx__in=ope_types)\ - .values('department__pk', 'operation__year')\ - .annotate(number=Count('operation'))\ - .order_by('operation__year') + .filter(department__pk=dpt_id, + operation__operation_type__txt_idx__in=ope_types)\ + .values('department__pk', 'operation__year')\ + .annotate(number=Count('operation'))\ + .order_by('operation__year') dct_years = {} for v in vals: dct_years[v['operation__year']] = v['number'] @@ -1246,19 +1280,20 @@ class OperationDashboard: dct_res['effective_by_dpt'] = [] for dpt_id, dpt_label in self.departments: vals = OperationByDepartment.objects\ - .filter(department__pk=dpt_id, - operation__scientist__isnull=False, - operation__operation_type__txt_idx__in=ope_types)\ - .values('department__pk', 'operation__year')\ - .annotate(number=Count('operation'), - area=Sum('operation__surface'), - fnap=Sum('operation__fnap_cost'), - cost=Sum('operation__cost'))\ - .order_by('operation__year') + .filter(department__pk=dpt_id, + operation__scientist__isnull=False, + operation__operation_type__txt_idx__in=ope_types)\ + .values('department__pk', 'operation__year')\ + .annotate(number=Count('operation'), + area=Sum('operation__surface'), + fnap=Sum('operation__fnap_cost'), + cost=Sum('operation__cost'))\ + .order_by('operation__year') dct_years = {} for v in vals: values = [] - for value in (v['number'], v['area'], v['cost'], v['fnap']): + for value in (v['number'], v['area'], v['cost'], + v['fnap']): values.append(value if value else 0) dct_years[v['operation__year']] = values years = [] @@ -1273,11 +1308,11 @@ class OperationDashboard: OperationTown = Operation.towns.through query = OperationTown.objects\ - .filter(operation__scientist__isnull=False, - operation__operation_type__txt_idx__in=ope_types)\ - .values('town__name', 'town__departement__number')\ - .annotate(nb=Count('operation'))\ - .order_by('-nb', 'town__name')[:10] + .filter(operation__scientist__isnull=False, + operation__operation_type__txt_idx__in=ope_types)\ + .values('town__name', 'town__departement__number')\ + .annotate(nb=Count('operation'))\ + .order_by('-nb', 'town__name')[:10] dct_res['towns'] = [] for r in query: dct_res['towns'].append((u"%s (%s)" % (r['town__name'], @@ -1286,27 +1321,27 @@ class OperationDashboard: if dct_res == self.survey: query = OperationTown.objects\ - .filter(operation__scientist__isnull=False, - operation__operation_type__txt_idx__in=ope_types, - operation__surface__isnull=False)\ - .values('town__name', 'town__departement__number')\ - .annotate(nb=Sum('operation__surface'))\ - .order_by('-nb', 'town__name')[:10] + .filter(operation__scientist__isnull=False, + operation__operation_type__txt_idx__in=ope_types, + operation__surface__isnull=False)\ + .values('town__name', 'town__departement__number')\ + .annotate(nb=Sum('operation__surface'))\ + .order_by('-nb', 'town__name')[:10] dct_res['towns_surface'] = [] for r in query: dct_res['towns_surface'].append((u"%s (%s)" % ( - r['town__name'], r['town__departement__number']), - r['nb'])) + r['town__name'], r['town__departement__number']), + r['nb'])) else: query = OperationTown.objects\ - .filter(operation__scientist__isnull=False, - operation__operation_type__txt_idx__in=ope_types, - operation__cost__isnull=False)\ - .values('town__name', 'town__departement__number')\ - .annotate(nb=Sum('operation__cost'))\ - .order_by('-nb', 'town__name')[:10] + .filter(operation__scientist__isnull=False, + operation__operation_type__txt_idx__in=ope_types, + operation__cost__isnull=False)\ + .values('town__name', 'town__departement__number')\ + .annotate(nb=Sum('operation__cost'))\ + .order_by('-nb', 'town__name')[:10] dct_res['towns_cost'] = [] for r in query: - dct_res['towns_cost'].append((u"%s (%s)" % (r['town__name'], - r['town__departement__number']), - r['nb'])) + dct_res['towns_cost'].append((u"%s (%s)" % ( + r['town__name'], r['town__departement__number']), + r['nb'])) |