diff options
Diffstat (limited to 'archaeological_finds/views.py')
| -rw-r--r-- | archaeological_finds/views.py | 134 | 
1 files changed, 72 insertions, 62 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 5f2e6cb4a..b52e86659 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -25,45 +25,48 @@ from wizards import *  from forms import *  import models -get_find = get_item(models.Find, -        'get_find', 'find', -        bool_fields = ['base_finds__is_isolated'], -        base_request={'downstream_treatment__isnull':True}, -      extra_request_keys={ -'base_finds__context_record__parcel__town': -                'base_finds__context_record__parcel__town', -'base_finds__context_record__operation__year': -                'base_finds__context_record__operation__year__contains', -'base_finds__context_record__operation__code_patriarche': -               'base_finds__context_record__operation__code_patriarche', -'dating__period':'dating__period__pk', -'base_finds__find__description':'base_finds__find__description__icontains', -'base_finds__is_isolated':'base_finds__is_isolated'}) -get_findsource = get_item(models.FindSource, -        'get_findsource', 'findsource', -      extra_request_keys={ -'find__context_record__operation__year':'find__context_record__operation__year', -'find__dating__period':'find__dating__period__pk', -'find__description':'find__description__icontains', -    }) +get_find = get_item(models.Find, 'get_find', 'find', +    bool_fields = ['base_finds__is_isolated'], +    base_request={'downstream_treatment__isnull':True}, +    extra_request_keys={ +        'base_finds__context_record__parcel__town': +            'base_finds__context_record__parcel__town', +        'base_finds__context_record__operation__year': +            'base_finds__context_record__operation__year__contains', +        'base_finds__context_record__operation__code_patriarche': +            'base_finds__context_record__operation__code_patriarche', +        'dating__period':'dating__period__pk', +        'base_finds__find__description': +            'base_finds__find__description__icontains', +        'base_finds__is_isolated':'base_finds__is_isolated'}) +get_findsource = get_item(models.FindSource, 'get_findsource', 'findsource', +    extra_request_keys={ +        'find__context_record__operation__year': +            'find__context_record__operation__year', +        'find__dating__period':'find__dating__period__pk', +        'find__description':'find__description__icontains', +})  find_creation_wizard = FindWizard.as_view([      ('selecrecord-find_creation', RecordFormSelection),      ('find-find_creation', FindForm),      ('dating-find_creation', DateForm),      ('final-find_creation', FinalForm)], -     url_name='find_creation',) +    label=_(u"New find"), +    url_name='find_creation',)  find_search_wizard = SearchWizard.as_view([ -                          ('general-find_search', FindFormSelection)], -                          url_name='find_search',) +    ('general-find_search', FindFormSelection)], +    label=_(u"Find search"), +    url_name='find_search',)  find_modification_wizard = FindModificationWizard.as_view([      ('selec-find_modification', FindFormSelection),      ('find-find_modification', FindForm),      ('dating-find_modification', DateForm),      ('final-find_modification', FinalForm)], -     url_name='find_modification',) +    label=_(u"Find modification"), +    url_name='find_modification',)  treatment_creation_wizard = TreatmentWizard.as_view([      ('basetreatment-treatment_creation', BaseTreatmentForm), @@ -73,49 +76,56 @@ treatment_creation_wizard = TreatmentWizard.as_view([      ('resultfind-treatment_creation', ResultFindForm),      ('resultfinds-treatment_creation', ResultFindFormSet),      ('final-treatment_creation', FinalForm)], -             condition_dict={ -'selecfind-treatment_creation': -    check_treatment('basetreatment-treatment_creation', 'treatment_type', -                    not_type_list=['physical_grouping', 'packaging']), -'multiselecfinds-treatment_creation': -    check_treatment('basetreatment-treatment_creation', 'treatment_type', -                    ['physical_grouping', 'packaging']), -'resultfinds-treatment_creation': -    check_treatment('basetreatment-treatment_creation', 'treatment_type', -                    ['split']), -'resultfind-treatment_creation': -    check_treatment('basetreatment-treatment_creation', 'treatment_type', -                    not_type_list=['split']), -'container-treatment_creation': -    check_treatment('basetreatment-treatment_creation', 'treatment_type', -                    ['packaging']), -                            }, -     url_name='treatment_creation',) +    condition_dict={ +        'selecfind-treatment_creation': +            check_treatment('basetreatment-treatment_creation', +                           'treatment_type', not_type_list=['physical_grouping', +                                                            'packaging']), +        'multiselecfinds-treatment_creation': +            check_treatment('basetreatment-treatment_creation', +                            'treatment_type', ['physical_grouping', +                                               'packaging']), +        'resultfinds-treatment_creation': +            check_treatment('basetreatment-treatment_creation', +                            'treatment_type', ['split']), +        'resultfind-treatment_creation': +            check_treatment('basetreatment-treatment_creation', +                            'treatment_type', not_type_list=['split']), +        'container-treatment_creation': +            check_treatment('basetreatment-treatment_creation', +                            'treatment_type', ['packaging']), +    }, +    label=_(u"New treatment"), +    url_name='treatment_creation',)  find_source_creation_wizard = FindSourceWizard.as_view([ -             ('selec-find_source_creation', SourceFindFormSelection), -             ('source-find_source_creation', SourceForm), -             ('authors-find_source_creation', AuthorFormset), -             ('final-find_source_creation', FinalForm)], -                  url_name='find_source_creation',) +    ('selec-find_source_creation', SourceFindFormSelection), +    ('source-find_source_creation', SourceForm), +    ('authors-find_source_creation', AuthorFormset), +    ('final-find_source_creation', FinalForm)], +    label=_(u"Find: new source"), +    url_name='find_source_creation',)  find_source_modification_wizard = FindSourceWizard.as_view([ -         ('selec-find_source_modification', FindSourceFormSelection), -         ('source-find_source_modification', SourceForm), -         ('authors-find_source_modification', AuthorFormset), -         ('final-find_source_modification', FinalForm)], -          url_name='find_source_modification',) +    ('selec-find_source_modification', FindSourceFormSelection), +    ('source-find_source_modification', SourceForm), +    ('authors-find_source_modification', AuthorFormset), +    ('final-find_source_modification', FinalForm)], +    label=_(u"Find: source modification"), +    url_name='find_source_modification',)  find_source_deletion_wizard = FindSourceDeletionWizard.as_view([ -         ('selec-find_source_deletion', FindSourceFormSelection), -         ('final-find_source_deletion', SourceDeletionForm)], -          url_name='find_source_deletion',) +    ('selec-find_source_deletion', FindSourceFormSelection), +    ('final-find_source_deletion', SourceDeletionForm)], +    label=_(u"Find: source deletion"), +    url_name='find_source_deletion',) +"""  treatment_source_creation_wizard = TreatmentSourceWizard.as_view([ -             ('selec-treatment_source_creation', SourceTreatmentFormSelection), -             ('source-treatment_source_creation', SourceForm), -             ('authors-treatment_source_creation', AuthorFormset), -             ('final-treatment_source_creation', FinalForm)], -                  url_name='treatment_source_creation',) - +    ('selec-treatment_source_creation', SourceTreatmentFormSelection), +    ('source-treatment_source_creation', SourceForm), +    ('authors-treatment_source_creation', AuthorFormset), +    ('final-treatment_source_creation', FinalForm)], +    url_name='treatment_source_creation',) +"""  | 
