diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-08-28 12:11:01 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-08-28 12:11:01 +0200 |
| commit | b6178af0b0ffe1d8a93b8f117ab9802f097fcbb1 (patch) | |
| tree | a45322231185919090bfcb0faf34c17375205477 /archaeological_files | |
| parent | 55c871a5cb1e5739e280f2ad0ec80917b3b5f8fd (diff) | |
| download | Ishtar-b6178af0b0ffe1d8a93b8f117ab9802f097fcbb1.tar.bz2 Ishtar-b6178af0b0ffe1d8a93b8f117ab9802f097fcbb1.zip | |
flake8
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/forms.py | 6 | ||||
| -rw-r--r-- | archaeological_files/models.py | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index 4bde6f97e..b701bac49 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -170,9 +170,9 @@ class DashboardForm(forms.Form): if self.cleaned_data.get('file_type'): fltr['file_type_id'] = self.cleaned_data['file_type'] if self.cleaned_data.get('after'): - fltr[date_source+'_date__gte'] = self.cleaned_data['after'] + fltr[date_source + '_date__gte'] = self.cleaned_data['after'] if self.cleaned_data.get('before'): - fltr[date_source+'_date__lte'] = self.cleaned_data['before'] + fltr[date_source + '_date__lte'] = self.cleaned_data['before'] return fltr @@ -269,7 +269,7 @@ class FileFormPreventive(forms.Form): reverse_lazy( 'autocomplete-person', args=[PersonType.objects.get(txt_idx='general_contractor').pk] - ), + ), limit={'person_types': [ PersonType.objects.get(txt_idx='general_contractor').pk]}, associated_model=Person, new=True), diff --git a/archaeological_files/models.py b/archaeological_files/models.py index a7b23564d..a090e0290 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -245,7 +245,7 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, delta = datetime.date.today() - self.reception_date cls = 'red' if self.saisine_type and self.saisine_type.delay: - if delta.days <= (self.saisine_type.delay*2/3): + if delta.days <= (self.saisine_type.delay * 2 / 3): cls = 'green' elif delta.days <= self.saisine_type.delay: cls = 'orange' @@ -277,7 +277,7 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, @property def reference(self): - return settings.FILE_PREFIX+u"-".join( + return settings.FILE_PREFIX + u"-".join( (unicode(self.year), unicode(self.numeric_reference or '0'))) def _generate_cached_label(self): @@ -330,11 +330,11 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, def total_surface_ha(self): if self.total_surface: - return self.total_surface/10000.0 + return self.total_surface / 10000.0 def total_developed_surface_ha(self): if self.total_developed_surface: - return self.total_developed_surface/10000.0 + return self.total_developed_surface / 10000.0 def operation_acts(self): acts = [] @@ -524,7 +524,7 @@ class FileDashboard: if self.rescue['total_number']: self.rescue['with_associated_operation_percent'] = round( float(self.rescue['with_associated_operation']) - / self.rescue['total_number']*100, 2) + / self.rescue['total_number'] * 100, 2) by_year_operationnal = rescues.filter(operations__isnull=False)\ .extra({'date': 'date_trunc(\'year\', ' @@ -539,7 +539,7 @@ class FileDashboard: not dct['number']: continue val = round(float(by_year_operationnal[idx]['number']) / - dct['number']*100, 2) + dct['number'] * 100, 2) percents.append({'date': dct['date'], 'number': val}) self.rescue['operational_by_year'] = percents |