diff options
Diffstat (limited to 'archaeological_operations/forms.py')
| -rw-r--r-- | archaeological_operations/forms.py | 43 |
1 files changed, 39 insertions, 4 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 7bac80b48..15db8be31 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -157,9 +157,8 @@ class ParcelForm(forms.Form): else: c_number = 0 values = [town, data.get('year') or '', data.get('section') or '', - c_number, str(data.get('parcel_number') or '') - + str(u"Public domain") if data.get('public_domain') - else u""] + c_number, unicode(_(u"public domain")) + if data.get('public_domain') else u""] if data.get('DELETE'): deleted.append(values) else: @@ -177,7 +176,8 @@ class ParcelForm(forms.Form): grouped = [] for keys, parcel_grp in groupby(parcels, key=sortkeyfn): keys = list(keys) - keys.append([gp[-1] for gp in parcel_grp]) + keys.append([u' '.join([unicode(gp[-2]), unicode(gp[-1])]) + for gp in parcel_grp]) grouped.append(keys) res = '' c_town, c_section = '', '' @@ -534,9 +534,28 @@ class OperationSelect(TableSelect): args=['0', 'user']), associated_model=Person), validators=[valid_id(Person)]) + documentation_deadline_before = forms.DateField( + label=_(u"Documentation deadline before"), widget=widgets.JQueryDate) + documentation_deadline_after = forms.DateField( + label=_(u"Documentation deadline after"), widget=widgets.JQueryDate) + documentation_received = forms.NullBooleanField( + label=_(u"Documentation received")) + finds_deadline_before = forms.DateField( + label=_(u"Finds deadline before"), widget=widgets.JQueryDate) + finds_deadline_after = forms.DateField( + label=_(u"Finds deadline after"), widget=widgets.JQueryDate) + finds_received = forms.NullBooleanField( + label=_(u"Finds received")) def __init__(self, *args, **kwargs): super(OperationSelect, self).__init__(*args, **kwargs) + if not get_current_profile().warehouse: + self.fields.pop('documentation_deadline_before') + self.fields.pop('documentation_deadline_after') + self.fields.pop('documentation_received') + 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 = \ @@ -797,6 +816,17 @@ class OperationFormGeneral(ManageOldType, forms.Form): limit={'person_types': [SRA_AGENT.pk, HEAD_SCIENTIST.pk]}, associated_model=Person, new=True), validators=[valid_id(Person)], required=False) + documentation_deadline = forms.DateField( + label=_(u"Deadline for submission of the documentation"), + required=False, widget=widgets.JQueryDate) + documentation_received = forms.NullBooleanField( + required=False, label=_(u"Documentation received")) + finds_deadline = forms.DateField( + label=_(u"Deadline for submission of the finds"), required=False, + widget=widgets.JQueryDate) + finds_received = forms.NullBooleanField( + required=False, label=_(u"Finds received")) + comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea, required=False) record_quality = forms.ChoiceField(label=_(u"Record quality"), @@ -813,6 +843,11 @@ class OperationFormGeneral(ManageOldType, forms.Form): def __init__(self, *args, **kwargs): super(OperationFormGeneral, self).__init__(*args, **kwargs) + if not get_current_profile().warehouse: + self.fields.pop('documentation_deadline') + self.fields.pop('documentation_received') + self.fields.pop('finds_deadline') + self.fields.pop('finds_received') self.fields['operation_type'].choices = \ models.OperationType.get_types( initial=self.init_data.get('operation_type')) |