diff options
Diffstat (limited to 'archaeological_finds/forms_treatments.py')
| -rw-r--r-- | archaeological_finds/forms_treatments.py | 272 |
1 files changed, 137 insertions, 135 deletions
diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index ac4420ce8..7fc0d877c 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -45,24 +45,24 @@ logger = logging.getLogger(__name__) class TreatmentSelect(DocumentItemSelect): _model = models.Treatment - form_admin_name = _(u"Treatment - 001 - Search") + form_admin_name = _("Treatment - 001 - Search") form_slug = "treatment-001-search" search_vector = forms.CharField( - label=_(u"Full text search"), widget=widgets.SearchWidget( + label=_("Full text search"), widget=widgets.SearchWidget( 'archaeological-finds', 'treatment' )) - label = forms.CharField(label=_(u"Label")) - other_reference = forms.CharField(label=_(u"Other ref.")) - year = forms.IntegerField(label=_(u"Year")) - index = forms.IntegerField(label=_(u"Index")) + label = forms.CharField(label=_("Label")) + other_reference = forms.CharField(label=_("Other ref.")) + year = forms.IntegerField(label=_("Year")) + index = forms.IntegerField(label=_("Index")) scientific_monitoring_manager = forms.IntegerField( widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person-permissive'), associated_model=Person), - label=_(u"Scientific monitoring manager")) - treatment_types = forms.ChoiceField(label=_(u"Treatment type"), choices=[]) + label=_("Scientific monitoring manager")) + treatment_types = forms.ChoiceField(label=_("Treatment type"), choices=[]) def __init__(self, *args, **kwargs): super(TreatmentSelect, self).__init__(*args, **kwargs) @@ -123,8 +123,8 @@ class TreatmentStateSelect(forms.Select): class BaseTreatmentForm(CustomForm, ManageOldType): UPSTREAM_IS_MANY = False DOWNSTREAM_IS_MANY = False - form_label = _(u"Treatment") - form_admin_name = _(u"Treatment - 020 - General") + form_label = _("Treatment") + form_admin_name = _("Treatment - 020 - General") form_slug = "treatment-020-general" base_models = ['treatment_type'] extra_form_modals = ["container", "warehouse", "organization", "person"] @@ -140,16 +140,16 @@ class BaseTreatmentForm(CustomForm, ManageOldType): need_user_for_initialization = True treatment_type = widgets.Select2MultipleField( - label=_(u"Treatment type"), choices=[], + label=_("Treatment type"), choices=[], widget=widgets.CheckboxSelectMultiple) - treatment_state = forms.ChoiceField(label=_(u"State"), choices=[], + treatment_state = forms.ChoiceField(label=_("State"), choices=[], widget=TreatmentStateSelect) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) location = forms.IntegerField( - label=_(u"Location"), + label=_("Location"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-warehouse'), associated_model=Warehouse, new=True), @@ -161,47 +161,47 @@ class BaseTreatmentForm(CustomForm, ManageOldType): new=True), validators=[valid_id(Person)], required=False) person = forms.IntegerField( - label=_(u"Responsible"), + label=_("Responsible"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person'), associated_model=Person, new=True), validators=[valid_id(Person)], required=False) organization = forms.IntegerField( - label=_(u"Organization"), + label=_("Organization"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-organization'), associated_model=Organization, new=True), validators=[valid_id(Organization)], required=False) - label = forms.CharField(label=_(u"Label"), + label = forms.CharField(label=_("Label"), max_length=200, required=False) other_reference = forms.CharField( - label=_(u"Other ref."), max_length=200, required=False) + label=_("Other ref."), max_length=200, required=False) # external_id = forms.CharField( - # label=_(u"External ref."), max_length=200, required=False) - start_date = forms.DateField(label=_(u"Start date"), required=False, + # label=_("External ref."), max_length=200, required=False) + start_date = forms.DateField(label=_("Start date"), required=False, widget=DatePicker, initial=datetime.date.today) - end_date = forms.DateField(label=_(u"Closing date"), required=False, + end_date = forms.DateField(label=_("Closing date"), required=False, widget=DatePicker) container = forms.IntegerField( - label=_(u"Destination container (relevant for treatment that change " - u"location)"), + label=_("Destination container (relevant for treatment that change " + "location)"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-container'), associated_model=Container, new=True), validators=[valid_id(Container)], required=False) - goal = forms.CharField(label=_(u"Goal"), + goal = forms.CharField(label=_("Goal"), widget=forms.Textarea, required=False) - description = forms.CharField(label=_(u"Description"), + description = forms.CharField(label=_("Description"), widget=forms.Textarea, required=False) - comment = forms.CharField(label=_(u"Comment"), + comment = forms.CharField(label=_("Comment"), widget=forms.Textarea, required=False) - estimated_cost = forms.FloatField(label=_(u"Estimated cost ({currency})"), + estimated_cost = forms.FloatField(label=_("Estimated cost ({currency})"), required=False) - quoted_cost = forms.FloatField(label=_(u"Quoted cost ({currency})"), + quoted_cost = forms.FloatField(label=_("Quoted cost ({currency})"), required=False) - realized_cost = forms.FloatField(label=_(u"Realized cost ({currency})"), + realized_cost = forms.FloatField(label=_("Realized cost ({currency})"), required=False) - insurance_cost = forms.FloatField(label=_(u"Insurance cost ({currency})"), + insurance_cost = forms.FloatField(label=_("Insurance cost ({currency})"), required=False) executed = forms.BooleanField(required=False, disabled=True, widget=forms.HiddenInput) @@ -235,12 +235,12 @@ class BaseTreatmentForm(CustomForm, ManageOldType): person = q.all()[0] self.fields['scientific_monitoring_manager'].initial = person.pk # self.fields['target_is_basket'].widget.choices = \ - # ((False, _(u"Single find")), (True, _(u"Basket"))) + # ((False, _("Single find")), (True, _("Basket"))) # TODO """ self.fields['basket'].required = False self.fields['basket'].help_text = \ - _(u"Leave it blank if you want to select a single item") + _("Leave it blank if you want to select a single item") fields = OrderedDict() basket = self.fields.pop('basket') for key, value in self.fields.items(): @@ -261,7 +261,7 @@ class BaseTreatmentForm(CustomForm, ManageOldType): downstream_is_many=self.DOWNSTREAM_IS_MANY) for pk in data.get('treatment_type', [])] except models.TreatmentType.DoesNotExist: - raise forms.ValidationError(_(u"Unknow treatment type")) + raise forms.ValidationError(_("Unknow treatment type")) change_current_location = [ @@ -282,19 +282,19 @@ class BaseTreatmentForm(CustomForm, ManageOldType): if change_ref_location: raise forms.ValidationError( str( - _(u"{} is not compatible with {} " - u"treatment(s).")).format( - u' ; '.join(restore_reference_location), - u' ; '.join(change_ref_location), + _("{} is not compatible with {} " + "treatment(s).")).format( + ' ; '.join(restore_reference_location), + ' ; '.join(change_ref_location), ) ) else: raise forms.ValidationError( str( - _(u"{} is not compatible with {} " - u"treatment(s).")).format( - u' ; '.join(restore_reference_location), - u' ; '.join(change_current_location) + _("{} is not compatible with {} " + "treatment(s).")).format( + ' ; '.join(restore_reference_location), + ' ; '.join(change_current_location) ) ) @@ -302,22 +302,22 @@ class BaseTreatmentForm(CustomForm, ManageOldType): and not change_ref_location\ and not change_current_location: raise forms.ValidationError( - _(u"The container field is attached to the treatment but " - u"no treatment with container change is defined.")) + _("The container field is attached to the treatment but " + "no treatment with container change is defined.")) if not data.get('container', None) and ( change_ref_location or change_current_location): raise forms.ValidationError( - _(u"A treatment with location change is defined, the container " - u"field must be filled.")) + _("A treatment with location change is defined, the container " + "field must be filled.")) if not data.get('person', None) and not data.get('organization', None): raise forms.ValidationError( - _(u"A responsible or an organization must be defined.")) + _("A responsible or an organization must be defined.")) return data class N1TreatmentForm(BaseTreatmentForm): UPSTREAM_IS_MANY = True - form_admin_name = _(u"Treatment n-1 - 020 - General") + form_admin_name = _("Treatment n-1 - 020 - General") form_slug = "treatmentn1-020-general" TYPES = [ @@ -332,7 +332,7 @@ class N1TreatmentForm(BaseTreatmentForm): class OneNTreatmentForm(BaseTreatmentForm): DOWNSTREAM_IS_MANY = True - form_admin_name = _(u"Treatment 1-n - 020 - General") + form_admin_name = _("Treatment 1-n - 020 - General") form_slug = "treatment1n-020-general" TYPES = [ @@ -346,7 +346,7 @@ class OneNTreatmentForm(BaseTreatmentForm): class TreatmentModifyForm(BaseTreatmentForm): - index = forms.IntegerField(label=_(u"Index")) + index = forms.IntegerField(label=_("Index")) id = forms.IntegerField(label=' ', widget=forms.HiddenInput, required=False) def __init__(self, *args, **kwargs): @@ -370,19 +370,19 @@ class TreatmentModifyForm(BaseTreatmentForm): .filter(year=year, index=index).exclude(pk=pk) if index and q.count(): raise forms.ValidationError( - _(u"Another treatment with this index exists for {}." + _("Another treatment with this index exists for {}." ).format(year)) return cleaned_data class TreatmentFormFileChoice(CustomForm, forms.Form): - form_label = _(u"Associated request") - form_admin_name = _(u"Treatment - 010 - Request choice") + form_label = _("Associated request") + form_admin_name = _("Treatment - 010 - Request choice") form_slug = "treatment-010-requestchoice" associated_models = {'file': models.TreatmentFile, } currents = {'file': models.TreatmentFile} file = forms.IntegerField( - label=_(u"Treatment request"), + label=_("Treatment request"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-treatmentfile'), associated_model=models.TreatmentFile), @@ -391,10 +391,10 @@ class TreatmentFormFileChoice(CustomForm, forms.Form): class TreatmentDeletionForm(FinalForm): confirm_msg = _( - u"Are you sure you want to delete this treatment? All changes " - u"made to the associated finds since this treatment record will be " - u"lost!") - confirm_end_msg = _(u"Would you like to delete this treatment?") + "Are you sure you want to delete this treatment? All changes " + "made to the associated finds since this treatment record will be " + "lost!") + confirm_end_msg = _("Would you like to delete this treatment?") class QAFindTreatmentForm(IshtarForm): @@ -428,16 +428,16 @@ class QAFindTreatmentForm(IshtarForm): label=_("Year"), initial=lambda: datetime.datetime.now().year, validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)], required=False) - start_date = forms.DateField(label=_(u"Precise date"), required=False, + start_date = forms.DateField(label=_("Precise date"), required=False, widget=DatePicker) person = forms.IntegerField( - label=_(u"Responsible"), + label=_("Responsible"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person'), associated_model=Person, new=True), validators=[valid_id(Person)], required=False) organization = forms.IntegerField( - label=_(u"Organization"), + label=_("Organization"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-organization'), associated_model=Organization, new=True), @@ -456,19 +456,21 @@ class QAFindTreatmentForm(IshtarForm): models.TreatmentType.objects.filter( available=True, change_reference_location=True).all()) - self.treatment_type_ref_choices = u"".join([ - u"<option value='{}'>{}</option>".format(tt.pk, str(tt)) + self.treatment_type_ref_choices = "".join( + "<option value='{}'>{}</option>".format(tt.pk, str(tt)) for tt in tt_change_ref_loca - ]) + ) + tt_change_current_loca = list( models.TreatmentType.objects.filter( available=True, change_current_location=True).all()) - self.treatment_type_current_choices = u"".join([ - u"<option value='{}'>{}</option>".format(tt.pk, str(tt)) + self.treatment_type_current_choices = "".join( + "<option value='{}'>{}</option>".format(tt.pk, str(tt)) for tt in tt_change_current_loca - ]) + ) + self.treatment_type_all_choices = self.treatment_type_ref_choices + \ self.treatment_type_current_choices @@ -496,9 +498,9 @@ class QAFindTreatmentForm(IshtarForm): if self.cleaned_data['start_date']: self.cleaned_data['year'] = self.cleaned_data['start_date'].year else: - raise forms.ValidationError(_(u"At least a year is required.")) + raise forms.ValidationError(_("At least a year is required.")) if not self.cleaned_data.get('treatment_type', None): - raise forms.ValidationError(_(u"Treatment type is required.")) + raise forms.ValidationError(_("Treatment type is required.")) return self.cleaned_data @@ -511,7 +513,7 @@ class QAFindTreatmentForm(IshtarForm): treat_state, __ = models.TreatmentState.objects.get_or_create( txt_idx='completed', defaults={ - 'label': _(u"Completed"), 'executed': True, + 'label': _("Completed"), 'executed': True, 'available': True}) t = models.Treatment.objects.create( container=container, @@ -550,8 +552,8 @@ class QAFindTreatmentForm(IshtarForm): find.save() -SLICING = (("month", _(u"months")), ('year', _(u"years")),) -DATE_SOURCE = (("start", _(u"Start date")), ("end", _(u"Closing date")),) +SLICING = (("month", _("months")), ('year', _("years")),) +DATE_SOURCE = (("start", _("Start date")), ("end", _("Closing date")),) class DashboardForm(IshtarForm): @@ -561,9 +563,9 @@ class DashboardForm(IshtarForm): label=_("Date get from"), choices=DATE_SOURCE, required=False) treatment_type = forms.ChoiceField(label=_("Treatment type"), choices=[], required=False) - after = forms.DateField(label=_(u"Date after"), + after = forms.DateField(label=_("Date after"), widget=DatePicker, required=False) - before = forms.DateField(label=_(u"Date before"), + before = forms.DateField(label=_("Date before"), widget=DatePicker, required=False) def __init__(self, *args, **kwargs): @@ -600,31 +602,31 @@ class AdministrativeActTreatmentSelect(TableSelect): _model = AdministrativeAct search_vector = forms.CharField( - label=_(u"Full text search"), widget=widgets.SearchWidget( + label=_("Full text search"), widget=widgets.SearchWidget( 'archaeological-operations', 'administrativeact', 'administrativeacttreatment', )) year = forms.IntegerField(label=_("Year")) index = forms.IntegerField(label=_("Index")) act_type = forms.ChoiceField(label=_("Act type"), choices=[]) - indexed = forms.NullBooleanField(label=_(u"Indexed?")) - act_object = forms.CharField(label=_(u"Object"), + indexed = forms.NullBooleanField(label=_("Indexed?")) + act_object = forms.CharField(label=_("Object"), max_length=300) signature_date_after = forms.DateField( - label=_(u"Signature date after"), widget=DatePicker) + label=_("Signature date after"), widget=DatePicker) signature_date_before = forms.DateField( - label=_(u"Signature date before"), widget=DatePicker) + label=_("Signature date before"), widget=DatePicker) treatment__name = forms.CharField( - label=_(u"Treatment name"), max_length=200) - treatment__year = forms.IntegerField(label=_(u"Treatment year")) - treatment__index = forms.IntegerField(label=_(u"Treatment index")) + label=_("Treatment name"), max_length=200) + treatment__year = forms.IntegerField(label=_("Treatment year")) + treatment__index = forms.IntegerField(label=_("Treatment index")) treatment__other_reference = forms.CharField( - max_length=200, label=_(u"Treatment internal reference")) - treatment__treatment_types = forms.ChoiceField(label=_(u"Treatment type"), + max_length=200, label=_("Treatment internal reference")) + treatment__treatment_types = forms.ChoiceField(label=_("Treatment type"), choices=[]) history_modifier = forms.IntegerField( - label=_(u"Modified by"), + label=_("Modified by"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person', args=['0', 'user']), @@ -654,9 +656,9 @@ class AdministrativeActTreatmentFormSelection( class AdministrativeActTreatmentForm(AdministrativeActForm): - form_admin_name = _(u"Treatment - Administrative act - General") + form_admin_name = _("Treatment - Administrative act - General") form_slug = "treatment-adminact-general" - act_type = forms.ChoiceField(label=_(u"Act type"), choices=[]) + act_type = forms.ChoiceField(label=_("Act type"), choices=[]) TYPES = [ FieldType('act_type', ActType, @@ -674,51 +676,51 @@ class AdministrativeActTreatmentModifForm( class TreatmentFileSelect(DocumentItemSelect): _model = models.TreatmentFile - form_admin_name = _(u"Treatment file - 001 - Search") + form_admin_name = _("Treatment file - 001 - Search") form_slug = "treatmentfile-001-search" search_vector = forms.CharField( - label=_(u"Full text search"), widget=widgets.SearchWidget( + label=_("Full text search"), widget=widgets.SearchWidget( 'archaeological-finds', 'treatmentfile' )) - name = forms.CharField(label=_(u"Name")) - internal_reference = forms.CharField(label=_(u"Internal ref.")) - year = forms.IntegerField(label=_(u"Year")) - index = forms.IntegerField(label=_(u"Index")) - type = forms.ChoiceField(label=_(u"Type"), choices=[]) + name = forms.CharField(label=_("Name")) + internal_reference = forms.CharField(label=_("Internal ref.")) + year = forms.IntegerField(label=_("Year")) + index = forms.IntegerField(label=_("Index")) + type = forms.ChoiceField(label=_("Type"), choices=[]) in_charge = forms.IntegerField( - label=_(u"In charge"), + label=_("In charge"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person'), associated_model=Person), validators=[valid_id(Person)]) applicant = forms.IntegerField( - label=_(u"Applicant"), + label=_("Applicant"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person'), associated_model=Person), validators=[valid_id(Person)]) applicant_organisation = forms.IntegerField( - label=_(u"Applicant organisation"), + label=_("Applicant organisation"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-organization'), associated_model=Organization), validators=[valid_id(Organization)]) - end_date = forms.DateField(label=_(u"Closing date"), required=False, + end_date = forms.DateField(label=_("Closing date"), required=False, widget=DatePicker) exhibition_start_before = forms.DateField( - label=_(u"Exhibition started before"), widget=DatePicker + label=_("Exhibition started before"), widget=DatePicker ) exhibition_start_after = forms.DateField( - label=_(u"Exhibition started after"), widget=DatePicker + label=_("Exhibition started after"), widget=DatePicker ) exhibition_end_before = forms.DateField( - label=_(u"Exhibition ended before"), widget=DatePicker + label=_("Exhibition ended before"), widget=DatePicker ) exhibition_end_after = forms.DateField( - label=_(u"Exhibition ended after"), widget=DatePicker + label=_("Exhibition ended after"), widget=DatePicker ) def __init__(self, *args, **kwargs): @@ -754,7 +756,7 @@ class TreatmentFileFormSelectionMultiple(MultiSearchForm): class TreatmentFileForm(CustomForm, ManageOldType): - form_label = _(u"Treatment request") + form_label = _("Treatment request") base_models = ['treatment_type_type'] associated_models = { 'type': models.TreatmentFileType, 'in_charge': Person, @@ -764,38 +766,38 @@ class TreatmentFileForm(CustomForm, ManageOldType): extra_form_modals = ["person", "organization"] need_user_for_initialization = True - name = forms.CharField(label=_(u"Name"), + name = forms.CharField(label=_("Name"), max_length=1000, required=False) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) internal_reference = forms.CharField( - label=_(u"Internal ref."), max_length=60, required=False) + label=_("Internal ref."), max_length=60, required=False) external_id = forms.CharField( - label=_(u"External ref."), max_length=200, required=False) + label=_("External ref."), max_length=200, required=False) type = forms.ChoiceField( - label=_(u"Type"), choices=[]) + label=_("Type"), choices=[]) in_charge = forms.IntegerField( - label=_(u"Responsible"), + label=_("Responsible"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person'), associated_model=Person, new=True), validators=[valid_id(Person)]) applicant = forms.IntegerField( - label=_(u"Applicant"), + label=_("Applicant"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person'), associated_model=Person, new=True), validators=[valid_id(Person)], required=False) applicant_organisation = forms.IntegerField( - label=_(u"Applicant organisation"), + label=_("Applicant organisation"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-organization'), associated_model=Organization, new=True), validators=[valid_id(Organization)], required=False) associated_basket = forms.IntegerField( - label=_(u"Associated basket"), + label=_("Associated basket"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-findbasket'), associated_model=models.FindBasket), required=False) @@ -805,15 +807,15 @@ class TreatmentFileForm(CustomForm, ManageOldType): label=_("Exhibition start date"), required=False, widget=DatePicker) exhibition_end_date = forms.DateField( label=_("Exhibition end date"), required=False, widget=DatePicker) - comment = forms.CharField(label=_(u"Comment"), + comment = forms.CharField(label=_("Comment"), widget=forms.Textarea, required=False) reception_date = forms.DateField( - label=_(u"Reception date"), required=False, widget=DatePicker, + label=_("Reception date"), required=False, widget=DatePicker, initial=lambda: datetime.datetime.now()) - creation_date = forms.DateField(label=_(u"Start date"), required=False, + creation_date = forms.DateField(label=_("Start date"), required=False, widget=DatePicker, initial=lambda: datetime.datetime.now()) - end_date = forms.DateField(label=_(u"Closing date"), required=False, + end_date = forms.DateField(label=_("Closing date"), required=False, widget=DatePicker) TYPES = [ @@ -839,7 +841,7 @@ class TreatmentFileForm(CustomForm, ManageOldType): class TreatmentFileModifyForm(TreatmentFileForm): - index = forms.IntegerField(label=_(u"Index")) + index = forms.IntegerField(label=_("Index")) id = forms.IntegerField(label=' ', widget=forms.HiddenInput, required=False) def __init__(self, *args, **kwargs): @@ -862,20 +864,20 @@ class TreatmentFileModifyForm(TreatmentFileForm): .filter(year=year, index=index).exclude(pk=pk) if index and q.count(): raise forms.ValidationError( - _(u"Another treatment request with this index exists for {}." + _("Another treatment request with this index exists for {}." ).format(year)) return cleaned_data class TreatmentFileDeletionForm(FinalForm): - confirm_msg = _(u"Are you sure you want to delete this treatment request?") - confirm_end_msg = _(u"Would you like to delete this treatment request?") + confirm_msg = _("Are you sure you want to delete this treatment request?") + confirm_end_msg = _("Would you like to delete this treatment request?") DATE_SOURCE_FILE = ( - ("creation", _(u"Creation date")), - ("reception", _(u"Reception date")), - ("end", _(u"Closing date")),) + ("creation", _("Creation date")), + ("reception", _("Reception date")), + ("end", _("Closing date")),) class DashboardTreatmentFileForm(IshtarForm): @@ -885,9 +887,9 @@ class DashboardTreatmentFileForm(IshtarForm): 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=_(u"Date after"), + after = forms.DateField(label=_("Date after"), widget=DatePicker, required=False) - before = forms.DateField(label=_(u"Date before"), + before = forms.DateField(label=_("Date before"), widget=DatePicker, required=False) def __init__(self, *args, **kwargs): @@ -922,35 +924,35 @@ class AdministrativeActTreatmentFileSelect(TableSelect): _model = AdministrativeAct search_vector = forms.CharField( - label=_(u"Full text search"), widget=widgets.SearchWidget( + label=_("Full text search"), widget=widgets.SearchWidget( 'archaeological-operations', 'administrativeact', 'administrativeacttreatmentfile', )) year = forms.IntegerField(label=_("Year")) index = forms.IntegerField(label=_("Index")) act_type = forms.ChoiceField(label=_("Act type"), choices=[]) - indexed = forms.NullBooleanField(label=_(u"Indexed?")) - act_object = forms.CharField(label=_(u"Object"), + indexed = forms.NullBooleanField(label=_("Indexed?")) + act_object = forms.CharField(label=_("Object"), max_length=300) signature_date_after = forms.DateField( - label=_(u"Signature date after"), widget=DatePicker) + label=_("Signature date after"), widget=DatePicker) signature_date_before = forms.DateField( - label=_(u"Signature date before"), widget=DatePicker) + label=_("Signature date before"), widget=DatePicker) treatment_file__name = forms.CharField( - label=_(u"Treatment request name"), max_length=200) + label=_("Treatment request name"), max_length=200) treatment_file__year = forms.IntegerField( - label=_(u"Treatment request year")) + label=_("Treatment request year")) treatment_file__index = forms.IntegerField( - label=_(u"Treatment request index")) + label=_("Treatment request index")) treatment_file__internal_reference = forms.CharField( - max_length=200, label=_(u"Treatment request internal reference")) + max_length=200, label=_("Treatment request internal reference")) treatment_file__type = forms.ChoiceField( - label=_(u"Treatment request type"), choices=[]) + label=_("Treatment request type"), choices=[]) history_modifier = forms.IntegerField( - label=_(u"Modified by"), + label=_("Modified by"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person', args=['0', 'user']), @@ -981,9 +983,9 @@ class AdministrativeActTreatmentFileFormSelection( class AdministrativeActTreatmentFileForm(AdministrativeActForm): - form_admin_name = _(u"Treatment request - Administrative act - General") + form_admin_name = _("Treatment request - Administrative act - General") form_slug = "treatmentfile-adminact-general" - act_type = forms.ChoiceField(label=_(u"Act type"), choices=[]) + act_type = forms.ChoiceField(label=_("Act type"), choices=[]) TYPES = [ FieldType('act_type', ActType, |