diff options
Diffstat (limited to 'archaeological_operations/forms.py')
| -rw-r--r-- | archaeological_operations/forms.py | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 63b350f28..20379e588 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -530,7 +530,7 @@ class OperationSelect(TableSelect): abstract = forms.CharField(label=_(u"Abstract (full text search)")) scientific_documentation_comment = forms.CharField( label=_(u"Comment about scientific documentation")) - record_quality = forms.ChoiceField(label=_(u"Record quality")) + record_quality_type = forms.ChoiceField(label=_(u"Record quality")) report_processing = forms.ChoiceField(label=_(u"Report processing"), choices=[]) virtual_operation = forms.NullBooleanField(label=_(u"Virtual operation")) @@ -553,18 +553,27 @@ class OperationSelect(TableSelect): args=['0', 'user']), associated_model=Person), validators=[valid_id(Person)]) + documentation_received = forms.NullBooleanField( + label=_(u"Documentation received")) documentation_deadline_before = DateField( label=_(u"Documentation deadline before")) documentation_deadline_after = DateField( label=_(u"Documentation deadline after")) - documentation_received = forms.NullBooleanField( - label=_(u"Documentation received")) + finds_received = forms.NullBooleanField( + label=_(u"Finds received")) finds_deadline_before = DateField( label=_(u"Finds deadline before")) finds_deadline_after = DateField( label=_(u"Finds deadline after")) - finds_received = forms.NullBooleanField( - label=_(u"Finds received")) + + TYPES = [ + FieldType('operation_type', models.OperationType), + FieldType('report_processing', models.ReportState), + FieldType('remains', models.RemainType), + FieldType('periods', models.Period), + FieldType('record_quality_type', models.RecordQualityType), + FieldType('relation_types', models.RelationType), + ] def __init__(self, *args, **kwargs): super(OperationSelect, self).__init__(*args, **kwargs) @@ -575,25 +584,10 @@ class OperationSelect(TableSelect): self.fields.pop('finds_deadline_before') self.fields.pop('finds_deadline_after') self.fields.pop('finds_received') - self.fields['operation_type'].choices = \ - models.OperationType.get_types() - self.fields['operation_type'].help_text = \ - models.OperationType.get_help() - self.fields['report_processing'].choices = \ - models.ReportState.get_types() - self.fields['report_processing'].help_text = \ - models.ReportState.get_help() - self.fields['remains'].choices = models.RemainType.get_types() - self.fields['remains'].help_text = models.RemainType.get_help() - self.fields['periods'].choices = models.Period.get_types() - self.fields['periods'].help_text = models.Period.get_help() - self.fields['record_quality'].choices = \ - [('', '--')] + list(models.QUALITY) if settings.ISHTAR_DPTS: k = 'towns__numero_insee__startswith' self.fields[k].choices = [ ('', '--')] + list(settings.ISHTAR_DPTS) - self.fields['relation_types'].choices = models.RelationType.get_types() class OperationFormSelection(IshtarForm): |