diff options
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 91 | 
1 files changed, 46 insertions, 45 deletions
| diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 5fb77433e..1605c4d6a 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -319,79 +319,79 @@ class FindForm(CustomForm, ManageOldType):  class QAFindFormMulti(QAForm):      form_admin_name = _(u"Find - Quick action - Modify")      form_slug = "find-quickaction-modify" -    base_models = ['get_first_base_find', 'object_types', 'material_types', -                   'communicabilities'] +    base_models = ['get_first_base_find', 'qa_object_types', +                   'qa_material_types', 'qa_communicabilities']      associated_models = { -        'material_types': models.MaterialType, -        'object_types': models.ObjectType, -        'communicabilities': models.CommunicabilityType, -        'checked_type': models.CheckedType, +        'qa_material_types': models.MaterialType, +        'qa_object_types': models.ObjectType, +        'qa_communicabilities': models.CommunicabilityType, +        'qa_checked_type': models.CheckedType,      }      MULTI = True      REPLACE_FIELDS = [ -        'manufacturing_place', 'checked_type', 'check_date' +        'qa_manufacturing_place', 'qa_checked_type', 'qa_check_date'      ]      HEADERS = { -        'label': FormHeader(_(u"Identification")), -        'description': FormHeader(_(u"Description")), -        'checked_type': FormHeader(_(u"Sheet")) +        'qa_label': FormHeader(_(u"Identification")), +        'qa_description': FormHeader(_(u"Description")), +        'qa_checked_type': FormHeader(_(u"Sheet"))      }      SINGLE_FIELDS = [ -        'label', 'denomination', 'previous_id', -        'get_first_base_find__excavation_id', 'museum_id', 'seal_number', -        'mark' +        'qa_label', 'qa_denomination', 'qa_previous_id', +        'qa_get_first_base_find__excavation_id', 'qa_museum_id', +        'qa_seal_number', 'qa_mark'      ] -    label = forms.CharField( +    qa_label = forms.CharField(          label=_(u"Free ID"),          validators=[validators.MaxLengthValidator(60)]) -    denomination = forms.CharField(label=_(u"Denomination"), required=False) -    previous_id = forms.CharField(label=_("Previous ID"), required=False) -    get_first_base_find__excavation_id = forms.CharField( +    qa_denomination = forms.CharField(label=_(u"Denomination"), required=False) +    qa_previous_id = forms.CharField(label=_("Previous ID"), required=False) +    qa_get_first_base_find__excavation_id = forms.CharField(          label=_(u"Excavation ID"), required=False) -    museum_id = forms.CharField(label=_(u"Museum ID"), required=False) -    seal_number = forms.CharField(label=_(u"Seal number"), required=False) -    mark = forms.CharField(label=_(u"Mark"), required=False) +    qa_museum_id = forms.CharField(label=_(u"Museum ID"), required=False) +    qa_seal_number = forms.CharField(label=_(u"Seal number"), required=False) +    qa_mark = forms.CharField(label=_(u"Mark"), required=False) -    description = forms.CharField(label=_(u"Description"), +    qa_description = forms.CharField(label=_(u"Description"),                                    widget=forms.Textarea, required=False) -    material_types = widgets.Select2MultipleField( +    qa_material_types = widgets.Select2MultipleField(          label=_(u"Material types"), required=False      ) -    object_types = widgets.Select2MultipleField( +    qa_object_types = widgets.Select2MultipleField(          label=_(u"Object types"), required=False,      ) -    decoration = forms.CharField( +    qa_decoration = forms.CharField(          label=_(u"Decoration"), widget=forms.Textarea,          required=False) -    inscription = forms.CharField( +    qa_inscription = forms.CharField(          label=_(u"Inscription"), widget=forms.Textarea,          required=False) -    manufacturing_place = forms.CharField( +    qa_manufacturing_place = forms.CharField(          label=_(u"Manufacturing place"), required=False) -    communicabilities = widgets.Select2MultipleField( +    qa_communicabilities = widgets.Select2MultipleField(          label=_(u"Communicability"), required=False      ) -    comment = forms.CharField( +    qa_comment = forms.CharField(          label=_(u"Comment"), required=False,          widget=forms.Textarea) -    dating_comment = forms.CharField( +    qa_dating_comment = forms.CharField(          label=_(u"Comment on dating"), required=False,          widget=forms.Textarea) -    checked_type = forms.ChoiceField(label=_(u"Check"), required=False) -    check_date = forms.DateField( -        initial=get_now, label=_(u"Check date"), widget=DatePicker) +    qa_checked_type = forms.ChoiceField(label=_(u"Check"), required=False) +    qa_check_date = forms.DateField( +        label=_(u"Check date"), widget=DatePicker, required=False)      TYPES = [ -        FieldType('material_types', models.MaterialType, is_multiple=True), -        FieldType('object_types', models.ObjectType, is_multiple=True), -        FieldType('communicabilities', models.CommunicabilityType, +        FieldType('qa_material_types', models.MaterialType, is_multiple=True), +        FieldType('qa_object_types', models.ObjectType, is_multiple=True), +        FieldType('qa_communicabilities', models.CommunicabilityType,                    is_multiple=True), -        FieldType('checked_type', models.CheckedType, is_multiple=True), +        FieldType('qa_checked_type', models.CheckedType),      ] @@ -405,7 +405,7 @@ class QAFindFormSingle(QAFindFormMulti):          if not self.items or \                  not self.items[0].get_first_base_find(                  ).context_record.operation.operation_type.judiciary: -            self.fields.pop('seal_number') +            self.fields.pop('qa_seal_number')  class PreservationForm(CustomForm, ManageOldType): @@ -414,14 +414,15 @@ class PreservationForm(CustomForm, ManageOldType):      form_slug = "find-030-preservation"      base_models = ['alteration', 'alteration_cause',                     'preservation_to_consider', 'integritie', 'remarkabilitie'] -    associated_models = {'alteration': models.AlterationType, -                         'alteration_cause': models.AlterationCauseType, -                         'treatment_emergency': models.TreatmentEmergencyType, -                         'conservatory_state': models.ConservatoryState, -                         'preservation_to_consider': models.TreatmentType, -                         'remarkabilitie': models.RemarkabilityType, -                         'integritie': models.IntegrityType, -                         } +    associated_models = { +        'alteration': models.AlterationType, +        'alteration_cause': models.AlterationCauseType, +        'treatment_emergency': models.TreatmentEmergencyType, +        'conservatory_state': models.ConservatoryState, +        'preservation_to_consider': models.TreatmentType, +        'remarkabilitie': models.RemarkabilityType, +        'integritie': models.IntegrityType, +    }      integritie = forms.MultipleChoiceField(          label=_(u"Integrity / interest"), choices=[],          widget=widgets.Select2Multiple, required=False) | 
