diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-11-14 18:58:48 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:23:19 +0100 |
commit | 4746cd2938df3cf87ae338d22eb4f67f35bac960 (patch) | |
tree | 1b823f5e78e7214f84da3892e0729c0c2706ad6d /archaeological_finds | |
parent | 2fd7a306df69b723036a94346baa7ea17c9b7364 (diff) | |
download | Ishtar-4746cd2938df3cf87ae338d22eb4f67f35bac960.tar.bz2 Ishtar-4746cd2938df3cf87ae338d22eb4f67f35bac960.zip |
Remove dead code about dashboards
Diffstat (limited to 'archaeological_finds')
-rw-r--r-- | archaeological_finds/forms.py | 4 | ||||
-rw-r--r-- | archaeological_finds/forms_treatments.py | 90 |
2 files changed, 0 insertions, 94 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 5fa648962..0b3c842d4 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -58,9 +58,7 @@ from archaeological_finds.forms_treatments import ( AdministrativeActTreatmentFileForm, AdministrativeActTreatmentFileFormSelection, AdministrativeActTreatmentFileModifForm, - DashboardForm as DashboardTreatmentForm, N1TreatmentForm, - DashboardTreatmentFileForm, QAFindTreatmentForm, OneNTreatmentForm, ) @@ -126,8 +124,6 @@ __all__ = [ "AdministrativeActTreatmentFileFormSelection", "AdministrativeActTreatmentFormSelection", "AdministrativeActTreatmentFileModifForm", - "DashboardTreatmentForm", - "DashboardTreatmentFileForm", "RecordFormSelection", "FindForm", "SimpleFindForm", diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index 907ea17b4..0d87a5eea 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -551,50 +551,6 @@ class QAFindTreatmentForm(IshtarForm): find.history_modifier = user find.save() - -SLICING = (("month", _("months")), ('year', _("years")),) -DATE_SOURCE = (("start", _("Start date")), ("end", _("Closing date")),) - - -class DashboardForm(IshtarForm): - slicing = forms.ChoiceField(label=_("Slicing"), choices=SLICING, - required=False) - date_source = forms.ChoiceField( - label=_("Date get from"), choices=DATE_SOURCE, required=False) - treatment_type = forms.ChoiceField(label=_("Treatment type"), choices=[], - required=False) - after = forms.DateField(label=_("Date after"), - widget=DatePicker, required=False) - before = forms.DateField(label=_("Date before"), - widget=DatePicker, required=False) - - def __init__(self, *args, **kwargs): - if 'prefix' not in kwargs: - kwargs['prefix'] = 'treatments' - super(DashboardForm, self).__init__(*args, **kwargs) - self.fields['treatment_type'].choices = \ - models.TreatmentType.get_types() - - def get_date_source(self): - date_source = 'start' - if hasattr(self, 'cleaned_data') and \ - self.cleaned_data.get('date_source'): - date_source = self.cleaned_data['date_source'] - return date_source - - def get_filter(self): - if not hasattr(self, 'cleaned_data') or not self.cleaned_data: - return {} - fltr = {} - date_source = self.get_date_source() - if self.cleaned_data.get('treatment_type'): - fltr['treatment_types__pk'] = self.cleaned_data['treatment_type'] - if self.cleaned_data.get('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'] - return fltr - # administrative act treatment @@ -873,52 +829,6 @@ class TreatmentFileDeletionForm(FinalForm): confirm_end_msg = _("Would you like to delete this treatment request?") -DATE_SOURCE_FILE = ( - ("creation", _("Creation date")), - ("reception", _("Reception date")), - ("end", _("Closing date")),) - - -class DashboardTreatmentFileForm(IshtarForm): - slicing = forms.ChoiceField(label=_("Slicing"), choices=SLICING, - required=False) - date_source = forms.ChoiceField( - label=_("Date get from"), choices=DATE_SOURCE_FILE, required=False) - treatmentfile_type = forms.ChoiceField(label=_("Treatment request type"), - choices=[], required=False) - after = forms.DateField(label=_("Date after"), - widget=DatePicker, required=False) - before = forms.DateField(label=_("Date before"), - widget=DatePicker, required=False) - - def __init__(self, *args, **kwargs): - if 'prefix' not in kwargs: - kwargs['prefix'] = 'treatmentfiles' - super(DashboardTreatmentFileForm, self).__init__(*args, **kwargs) - self.fields['treatmentfile_type'].choices = \ - models.TreatmentFileType.get_types() - - def get_date_source(self): - date_source = 'creation' - if hasattr(self, 'cleaned_data') and \ - self.cleaned_data.get('date_source'): - date_source = self.cleaned_data['date_source'] - return date_source - - def get_filter(self): - if not hasattr(self, 'cleaned_data') or not self.cleaned_data: - return {} - fltr = {} - date_source = self.get_date_source() - if self.cleaned_data.get('treatmentfile_type'): - fltr['type__pk'] = self.cleaned_data['treatmentfile_type'] - if self.cleaned_data.get('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'] - return fltr - - class AdministrativeActTreatmentFileSelect(TableSelect): _model = AdministrativeAct |