diff options
Diffstat (limited to 'archaeological_finds/forms_treatments.py')
| -rw-r--r-- | archaeological_finds/forms_treatments.py | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index 4e5994ca9..6dfc028e6 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -37,10 +37,11 @@ from archaeological_operations.forms import AdministrativeActOpeForm, \ AdministrativeActOpeFormSelection, AdministrativeActModifForm from ishtar_common.forms import reverse_lazy, TableSelect, FinalForm, \ - ManageOldType, get_form_selection, CustomForm, FieldType + ManageOldType, get_form_selection, CustomForm, FieldType, IshtarForm from ishtar_common.forms_common import SourceSelect from ishtar_common import widgets +from bootstrap_datepicker.widgets import DatePicker logger = logging.getLogger(__name__) @@ -48,6 +49,7 @@ logger = logging.getLogger(__name__) class TreatmentSelect(TableSelect): + search_vector = forms.CharField(label=_(u"Full text search")) label = forms.CharField(label=_(u"Label")) other_reference = forms.CharField(label=_(u"Other ref.")) year = forms.IntegerField(label=_(u"Year")) @@ -64,18 +66,19 @@ class TreatmentSelect(TableSelect): class TreatmentFormSelection(forms.Form): + SEARCH_AND_SELECT = True form_label = _("Treatment search") associated_models = {'pk': models.Treatment} currents = {'pk': models.Treatment} pk = forms.IntegerField( label="", required=False, - widget=widgets.JQueryJqGrid( + widget=widgets.DataTable( reverse_lazy('get-treatment'), TreatmentSelect, models.Treatment), validators=[valid_id(models.Treatment)]) -class BaseTreatmentForm(CustomForm, ManageOldType, forms.Form): +class BaseTreatmentForm(CustomForm, ManageOldType): form_label = _(u"Base treatment") form_admin_name = _(u"Treatment - 020 - General") form_slug = "treatment-020-general" @@ -137,9 +140,9 @@ class BaseTreatmentForm(CustomForm, ManageOldType, forms.Form): comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea, required=False) start_date = forms.DateField(label=_(u"Start date"), required=False, - widget=widgets.JQueryDate) + widget=DatePicker) end_date = forms.DateField(label=_(u"Closing date"), required=False, - widget=widgets.JQueryDate) + widget=DatePicker) estimated_cost = forms.FloatField(label=_(u"Estimated cost ({currency})"), required=False) quoted_cost = forms.FloatField(label=_(u"Quoted cost ({currency})"), @@ -282,12 +285,12 @@ class TreatmentDeletionForm(FinalForm): u"lost!") confirm_end_msg = _(u"Would you like to delete this treatment?") -SLICING = (("month", _(u"months")), ('year', _(u"years")),) +SLICING = (("month", _(u"months")), ('year', _(u"years")),) DATE_SOURCE = (("start", _(u"Start date")), ("end", _(u"Closing date")),) -class DashboardForm(forms.Form): +class DashboardForm(IshtarForm): slicing = forms.ChoiceField(label=_("Slicing"), choices=SLICING, required=False) date_source = forms.ChoiceField( @@ -295,9 +298,9 @@ class DashboardForm(forms.Form): treatment_type = forms.ChoiceField(label=_("Treatment type"), choices=[], required=False) after = forms.DateField(label=_(u"Date after"), - widget=widgets.JQueryDate, required=False) + widget=DatePicker, required=False) before = forms.DateField(label=_(u"Date before"), - widget=widgets.JQueryDate, required=False) + widget=DatePicker, required=False) def __init__(self, *args, **kwargs): if 'prefix' not in kwargs: @@ -330,6 +333,7 @@ class DashboardForm(forms.Form): class AdministrativeActTreatmentSelect(TableSelect): + search_vector = forms.CharField(label=_(u"Full text search")) year = forms.IntegerField(label=_("Year")) index = forms.IntegerField(label=_("Index")) act_type = forms.ChoiceField(label=_("Act type"), choices=[]) @@ -338,9 +342,9 @@ class AdministrativeActTreatmentSelect(TableSelect): max_length=300) signature_date_after = forms.DateField( - label=_(u"Signature date after"), widget=widgets.JQueryDate) + label=_(u"Signature date after"), widget=DatePicker) signature_date_before = forms.DateField( - label=_(u"Signature date before"), widget=widgets.JQueryDate) + label=_(u"Signature date before"), widget=DatePicker) treatment__name = forms.CharField( label=_(u"Treatment name"), max_length=200) treatment__year = forms.IntegerField(label=_(u"Treatment year")) @@ -373,7 +377,7 @@ class AdministrativeActTreatmentFormSelection( AdministrativeActOpeFormSelection): pk = forms.IntegerField( label="", required=False, - widget=widgets.JQueryJqGrid( + widget=widgets.DataTable( reverse_lazy('get-administrativeacttreatment'), AdministrativeActTreatmentSelect, AdministrativeAct), validators=[valid_id(AdministrativeAct)]) @@ -399,6 +403,7 @@ class AdministrativeActTreatmentModifForm( class TreatmentFileSelect(TableSelect): + search_vector = forms.CharField(label=_(u"Full text search")) name = forms.CharField(label=_(u"Name")) internal_reference = forms.CharField(label=_(u"Internal ref.")) year = forms.IntegerField(label=_(u"Year")) @@ -430,18 +435,19 @@ class TreatmentFileSelect(TableSelect): class TreatmentFileFormSelection(forms.Form): + SEARCH_AND_SELECT = True form_label = _("Treatment request search") associated_models = {'pk': models.TreatmentFile} currents = {'pk': models.TreatmentFile} pk = forms.IntegerField( label="", required=False, - widget=widgets.JQueryJqGrid( + widget=widgets.DataTable( reverse_lazy('get-treatmentfile'), TreatmentFileSelect, models.TreatmentFile), validators=[valid_id(models.TreatmentFile)]) -class TreatmentFileForm(ManageOldType, forms.Form): +class TreatmentFileForm(ManageOldType): form_label = _(u"Treatment request") base_models = ['treatment_type_type'] associated_models = { @@ -482,13 +488,13 @@ class TreatmentFileForm(ManageOldType, forms.Form): comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea, required=False) creation_date = forms.DateField(label=_(u"Start date"), required=False, - widget=widgets.JQueryDate, + widget=DatePicker, initial=lambda: datetime.datetime.now()) reception_date = forms.DateField( - label=_(u"Reception date"), required=False, widget=widgets.JQueryDate, + label=_(u"Reception date"), required=False, widget=DatePicker, initial=lambda: datetime.datetime.now()) end_date = forms.DateField(label=_(u"Closing date"), required=False, - widget=widgets.JQueryDate) + widget=DatePicker) def __init__(self, *args, **kwargs): user = kwargs.pop('user') @@ -542,7 +548,7 @@ DATE_SOURCE_FILE = ( ("end", _(u"Closing date")),) -class DashboardTreatmentFileForm(forms.Form): +class DashboardTreatmentFileForm(IshtarForm): slicing = forms.ChoiceField(label=_("Slicing"), choices=SLICING, required=False) date_source = forms.ChoiceField( @@ -550,9 +556,9 @@ class DashboardTreatmentFileForm(forms.Form): treatmentfile_type = forms.ChoiceField(label=_("Treatment request type"), choices=[], required=False) after = forms.DateField(label=_(u"Date after"), - widget=widgets.JQueryDate, required=False) + widget=DatePicker, required=False) before = forms.DateField(label=_(u"Date before"), - widget=widgets.JQueryDate, required=False) + widget=DatePicker, required=False) def __init__(self, *args, **kwargs): if 'prefix' not in kwargs: @@ -583,6 +589,7 @@ class DashboardTreatmentFileForm(forms.Form): class AdministrativeActTreatmentFileSelect(TableSelect): + search_vector = forms.CharField(label=_(u"Full text search")) year = forms.IntegerField(label=_("Year")) index = forms.IntegerField(label=_("Index")) act_type = forms.ChoiceField(label=_("Act type"), choices=[]) @@ -591,9 +598,9 @@ class AdministrativeActTreatmentFileSelect(TableSelect): max_length=300) signature_date_after = forms.DateField( - label=_(u"Signature date after"), widget=widgets.JQueryDate) + label=_(u"Signature date after"), widget=DatePicker) signature_date_before = forms.DateField( - label=_(u"Signature date before"), widget=widgets.JQueryDate) + label=_(u"Signature date before"), widget=DatePicker) treatment_file__name = forms.CharField( label=_(u"Treatment request name"), max_length=200) treatment_file__year = forms.IntegerField( @@ -629,7 +636,7 @@ class AdministrativeActTreatmentFileFormSelection( AdministrativeActOpeFormSelection): pk = forms.IntegerField( label="", required=False, - widget=widgets.JQueryJqGrid( + widget=widgets.DataTable( reverse_lazy('get-administrativeacttreatmentfile'), AdministrativeActTreatmentFileSelect, AdministrativeAct), validators=[valid_id(AdministrativeAct)]) @@ -651,6 +658,7 @@ class AdministrativeActTreatmentFileModifForm( pk = forms.IntegerField(required=False, widget=forms.HiddenInput) index = forms.IntegerField(label=_("Index"), required=False) + SourceTreatmentFormSelection = get_form_selection( 'SourceTreatmentFormSelection', _(u"Treatment search"), 'treatment', models.Treatment, TreatmentSelect, 'get-treatment', |