diff options
Diffstat (limited to 'archaeological_operations/forms.py')
| -rw-r--r-- | archaeological_operations/forms.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 9bdb9ac77..dc9513977 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -185,6 +185,10 @@ ParcelFormSet = formset_factory(ParcelForm, can_delete=True, formset=ParcelFormSet) ParcelFormSet.form_label = _(u"Parcels") +SRA_AGENT, created =PersonType.objects.get_or_create(txt_idx='sra_agent') +HEAD_SCIENTIST, created = PersonType.objects.get_or_create( + txt_idx='head_scientist') + class OperationSelect(TableSelect): year = forms.IntegerField(label=_("Year")) operation_code = forms.IntegerField(label=_(u"Numeric reference")) @@ -198,8 +202,7 @@ class OperationSelect(TableSelect): scientist = forms.IntegerField( widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-person', args=["_".join( - [unicode(PersonType.objects.get(txt_idx='head_scientist').pk), - unicode(PersonType.objects.get(txt_idx='sra_agent').pk)])]), + [unicode(HEAD_SCIENTIST.pk), unicode(SRA_AGENT.pk)])]), associated_model=Person), label=_(u"Scientist in charge")) in_charge = forms.IntegerField( widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-person', @@ -284,6 +287,8 @@ class OperationFormFileChoice(forms.Form): associated_model=File), validators=[valid_id(File)], required=False) +OPERATOR, created = OrganizationType.objects.get_or_create(txt_idx='operator') + class OperationFormGeneral(forms.Form): form_label = _(u"General") base_model = 'archaeological_site' @@ -297,14 +302,12 @@ class OperationFormGeneral(forms.Form): scientist = forms.IntegerField(label=_("Head scientist"), widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-person', args=["_".join( - [unicode(PersonType.objects.get(txt_idx='head_scientist').pk), - unicode(PersonType.objects.get(txt_idx='sra_agent').pk)])]), + [unicode(HEAD_SCIENTIST.pk), unicode(SRA_AGENT.pk)])]), associated_model=Person, new=True), validators=[valid_id(Person)], required=False) operator = forms.IntegerField(label=_("Operator"), widget=widgets.JQueryAutoComplete(reverse_lazy( - 'autocomplete-organization', - args=[OrganizationType.objects.get(txt_idx='operator').pk]), + 'autocomplete-organization', args=[OPERATOR.pk]), associated_model=Organization, new=True), validators=[valid_id(Organization)], required=False) in_charge = forms.IntegerField(label=_("In charge"), @@ -732,6 +735,7 @@ class GenerateDocForm(forms.Form): [(choice.pk , unicode(choice)) for choice in choices] class AdministrativeActRegisterSelect(AdministrativeActOpeSelect): + indexed = forms.NullBooleanField(label=_(u"Indexed?")) def __init__(self, *args, **kwargs): super(AdministrativeActRegisterSelect, self).__init__(*args, **kwargs) |