diff options
Diffstat (limited to 'archaeological_finds/forms_treatments.py')
| -rw-r--r-- | archaeological_finds/forms_treatments.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index ae6152951..11cfd3173 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -44,16 +44,19 @@ logger = logging.getLogger(__name__) class TreatmentSelect(TableSelect): + _model = models.Treatment + search_vector = forms.CharField( label=_(u"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")) treatment_types = forms.ChoiceField(label=_(u"Treatment type"), choices=[]) - image = forms.NullBooleanField(label=_(u"Has an image?")) + documents__image__isnull = forms.NullBooleanField(label=_(u"Has an image?")) def __init__(self, *args, **kwargs): super(TreatmentSelect, self).__init__(*args, **kwargs) @@ -324,6 +327,8 @@ class DashboardForm(IshtarForm): class AdministrativeActTreatmentSelect(TableSelect): + _model = AdministrativeAct + search_vector = forms.CharField( label=_(u"Full text search"), widget=widgets.SearchWidget( 'archaeological-operations', 'administrativeact' @@ -343,7 +348,7 @@ class AdministrativeActTreatmentSelect(TableSelect): label=_(u"Treatment name"), max_length=200) treatment__year = forms.IntegerField(label=_(u"Treatment year")) treatment__index = forms.IntegerField(label=_(u"Treatment index")) - treatment__internal_reference = forms.CharField( + treatment__other_reference = forms.CharField( max_length=200, label=_(u"Treatment internal reference")) treatment__treatment_types = forms.ChoiceField(label=_(u"Treatment type"), choices=[]) @@ -406,6 +411,7 @@ class TreatmentFileSelect(TableSelect): year = forms.IntegerField(label=_(u"Year")) index = forms.IntegerField(label=_(u"Index")) type = forms.ChoiceField(label=_(u"Type"), choices=[]) + in_charge = forms.IntegerField( label=_(u"In charge"), widget=widgets.JQueryAutoComplete( @@ -586,6 +592,8 @@ class DashboardTreatmentFileForm(IshtarForm): class AdministrativeActTreatmentFileSelect(TableSelect): + _model = AdministrativeAct + search_vector = forms.CharField( label=_(u"Full text search"), widget=widgets.SearchWidget( 'archaeological-operations', 'administrativeact' @@ -601,6 +609,7 @@ class AdministrativeActTreatmentFileSelect(TableSelect): label=_(u"Signature date after"), widget=DatePicker) signature_date_before = forms.DateField( 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( @@ -611,6 +620,7 @@ class AdministrativeActTreatmentFileSelect(TableSelect): max_length=200, label=_(u"Treatment request internal reference")) treatment_file__type = forms.ChoiceField( label=_(u"Treatment request type"), choices=[]) + history_modifier = forms.IntegerField( label=_(u"Modified by"), widget=widgets.JQueryAutoComplete( |