diff options
Diffstat (limited to 'archaeological_files/views.py')
| -rw-r--r-- | archaeological_files/views.py | 238 | 
1 files changed, 121 insertions, 117 deletions
diff --git a/archaeological_files/views.py b/archaeological_files/views.py index 686578933..16aed2414 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -76,19 +76,21 @@ def autocomplete_file(request):                         for file in files])      return HttpResponse(data, mimetype='text/plain') -get_file = get_item(models.File, 'get_file', 'file', -    bool_fields = ['end_date__isnull'], +get_file = get_item( +    models.File, 'get_file', 'file', +    bool_fields=['end_date__isnull'],      extra_request_keys={ -        'parcel_0':('parcels__section', -                    'operations__parcels__section'), -        'parcel_1':('parcels__parcel_number', -                    'operations__parcels__parcel_number'), -        'end_date':'end_date__isnull', -        'name':'name__icontains', -        'permit_reference':'permit_reference__icontains', -        'general_contractor__attached_to':'general_contractor__attached_to__pk', -        'history_creator':'history_creator__ishtaruser__person__pk', -            },) +        'parcel_0': ('parcels__section', +                     'operations__parcels__section'), +        'parcel_1': ('parcels__parcel_number', +                     'operations__parcels__parcel_number'), +        'end_date': 'end_date__isnull', +        'name': 'name__icontains', +        'permit_reference': 'permit_reference__icontains', +        'general_contractor__attached_to': +            'general_contractor__attached_to__pk', +        'history_creator': 'history_creator__ishtaruser__person__pk', +    },)  revert_file = revert_item(models.File) @@ -101,25 +103,27 @@ def extra_file_dct(request, item):  show_file = show_item(models.File, 'file', extra_dct=extra_file_dct) -get_administrativeactfile = get_item(AdministrativeAct, -        'get_administrativeactfile', 'administrativeactfile', -      associated_models = [(models.File, 'associated_file'), -                           (Person, 'associated_file__general_contractor')], -      dated_fields = ['signature_date__lte', 'signature_date__gte'], -      extra_request_keys={ -              'year':'signature_date__year', -              'associated_file__towns':'associated_file__towns__pk', -              'history_creator':'history_creator__ishtaruser__person__pk', -              'operation__towns':'operation__towns__pk', -              'act_type__intented_to':'act_type__intented_to', -              'signature_date_before':'signature_date__lte', -              'signature_date_after':'signature_date__gte', -              'associated_file__general_contractor__attached_to':\ -                'associated_file__general_contractor__attached_to__pk', -              'associated_file__name':'associated_file__name__icontains', -              'associated_file__permit_reference':\ -                          'associated_file__permit_reference__icontains'}, -      relative_session_names={'file':'associated_file__pk'}) +get_administrativeactfile = get_item( +    AdministrativeAct, 'get_administrativeactfile', 'administrativeactfile', +    associated_models=[ +        (models.File, 'associated_file'), +        (Person, 'associated_file__general_contractor')], +    dated_fields=['signature_date__lte', 'signature_date__gte'], +    extra_request_keys={ +        'year': 'signature_date__year', +        'associated_file__towns': 'associated_file__towns__pk', +        'history_creator': 'history_creator__ishtaruser__person__pk', +        'operation__towns': 'operation__towns__pk', +        'act_type__intented_to': 'act_type__intented_to', +        'signature_date_before': 'signature_date__lte', +        'signature_date_after': 'signature_date__gte', +        'associated_file__general_contractor__attached_to': +            'associated_file__general_contractor__attached_to__pk', +        'associated_file__name': 'associated_file__name__icontains', +        'associated_file__permit_reference': +            'associated_file__permit_reference__icontains'}, +    relative_session_names={'file': 'associated_file__pk'}) +  def dashboard_file(request, *args, **kwargs):      """ @@ -130,100 +134,101 @@ def dashboard_file(request, *args, **kwargs):                                context_instance=RequestContext(request))  file_search_wizard = SearchWizard.as_view( -                            [('general-file_search', FileFormSelection)], -                            label=_(u"File search"), -                            url_name='file_search',) - -file_creation_wizard = FileWizard.as_view([ -                            ('general-file_creation', FileFormGeneral), -                            ('towns-file_creation', TownFormset), -                            ('parcels-file_creation', ParcelFormSet), -                            ('preventive-file_creation', FileFormPreventive), -                            ('research-file_creation', FileFormResearch), -                            ('final-file_creation', FinalForm)], -             label=_(u"New file"), -             condition_dict={ -        'preventive-file_creation':\ -            is_preventive( 'general-file_creation', models.FileType, +    [('general-file_search', FileFormSelection)], +    label=_(u"File search"), url_name='file_search',) + +file_creation_wizard = FileWizard.as_view( +    [('general-file_creation', FileFormGeneral), +     ('towns-file_creation', TownFormset), +     ('parcels-file_creation', ParcelFormSet), +     ('preventive-file_creation', FileFormPreventive), +     ('research-file_creation', FileFormResearch), +     ('final-file_creation', FinalForm)], +    label=_(u"New file"), +    condition_dict={ +        'preventive-file_creation': +            is_preventive('general-file_creation', models.FileType,                            type_key='file_type'), -        'research-file_creation':\ +        'research-file_creation':              is_not_preventive('general-file_creation', models.FileType,                                type_key='file_type'), -             }, -             url_name='file_creation',) - -file_modification_wizard = FileModificationWizard.as_view([ -                          ('selec-file_modification', FileFormSelection), -                          ('general-file_modification', FileFormGeneralRO), -                          ('towns-file_modification', TownFormset), -                          ('parcels-file_modification', ParcelFormSet), -                          ('preventive-file_modification', FileFormPreventive), -                          ('research-file_modification', FileFormResearch), -                          ('final-file_modification', FinalForm)], -             label=_(u"File modification"), -             condition_dict={ -                'preventive-file_modification':\ -                    is_preventive('general-file_modification', -                                  models.FileType, type_key='file_type'), -                'research-file_modification':\ -                    is_not_preventive('general-file_modification', -                                  models.FileType, type_key='file_type'), -                            }, -             url_name='file_modification',) +    }, +    url_name='file_creation',) + +file_modification_wizard = FileModificationWizard.as_view( +    [('selec-file_modification', FileFormSelection), +     ('general-file_modification', FileFormGeneralRO), +     ('towns-file_modification', TownFormset), +     ('parcels-file_modification', ParcelFormSet), +     ('preventive-file_modification', FileFormPreventive), +     ('research-file_modification', FileFormResearch), +     ('final-file_modification', FinalForm)], +    label=_(u"File modification"), +    condition_dict={ +        'preventive-file_modification': +            is_preventive('general-file_modification', +                          models.FileType, type_key='file_type'), +        'research-file_modification': +            is_not_preventive('general-file_modification', +                              models.FileType, type_key='file_type'), +    }, +    url_name='file_modification',) +  def file_modify(request, pk): -    view = file_modification_wizard(request) +    file_modification_wizard(request)      FileModificationWizard.session_set_value( -                    request, 'selec-file_modification', 'pk', pk, reset=True) +        request, 'selec-file_modification', 'pk', pk, reset=True)      return redirect(reverse('file_modification', -                            kwargs={'step':'general-file_modification'})) - -file_closing_wizard = FileClosingWizard.as_view([ -                     ('selec-file_closing', FileFormSelection), -                     ('date-file_closing', ClosingDateFormSelection), -                     ('final-file_closing', FinalFileClosingForm)], -                      label=_(u"File closing"), -                      url_name='file_closing',) - - -file_deletion_wizard = FileDeletionWizard.as_view([ -                     ('selec-file_deletion', FileFormSelection), -                     ('final-file_deletion', FinalFileDeleteForm)], -                      label=_(u"File deletion"), -                      url_name='file_deletion',) - -file_administrativeactfile_search_wizard = SearchWizard.as_view([ -       ('selec-file_administrativeactfile_search', -                                 AdministrativeActFileFormSelection)], -       label=_(u"File: search administrative act"), -       url_name='file_administrativeactfile_search',) - -file_administrativeactfile_wizard = FileAdministrativeActWizard.as_view([ -       ('selec-file_administrativeactfile', FileFormSelection), -       ('administrativeact-file_administrativeactfile', -                                            AdministrativeActFileForm), -       ('final-file_administrativeactfile', FinalForm)], -       label=_(u"File: new administrative act"), -       url_name='file_administrativeactfile',) +                    kwargs={'step': 'general-file_modification'})) + +file_closing_wizard = FileClosingWizard.as_view( +    [('selec-file_closing', FileFormSelection), +     ('date-file_closing', ClosingDateFormSelection), +     ('final-file_closing', FinalFileClosingForm)], +    label=_(u"File closing"), url_name='file_closing',) + +file_deletion_wizard = FileDeletionWizard.as_view( +    [('selec-file_deletion', FileFormSelection), +     ('final-file_deletion', FinalFileDeleteForm)], +    label=_(u"File deletion"), +    url_name='file_deletion',) + +file_administrativeactfile_search_wizard = \ +    SearchWizard.as_view([ +        ('selec-file_administrativeactfile_search', +         AdministrativeActFileFormSelection)], +        label=_(u"File: search administrative act"), +        url_name='file_administrativeactfile_search',) + +file_administrativeactfile_wizard = \ +    FileAdministrativeActWizard.as_view([ +        ('selec-file_administrativeactfile', FileFormSelection), +        ('administrativeact-file_administrativeactfile', +         AdministrativeActFileForm), +        ('final-file_administrativeactfile', FinalForm)], +        label=_(u"File: new administrative act"), +        url_name='file_administrativeactfile',)  file_administrativeactfile_modification_wizard = \ -                                      FileEditAdministrativeActWizard.as_view([ -       ('selec-file_administrativeactfile_modification', -                                    AdministrativeActFileModifyFormSelection), -       ('administrativeact-file_administrativeactfile_modification', -                                            AdministrativeActFileForm), -       ('final-file_administrativeactfile_modification', FinalForm)], -       label=_(u"File: administrative act modification"), -       url_name='file_administrativeactfile_modification',) +    FileEditAdministrativeActWizard.as_view([ +        ('selec-file_administrativeactfile_modification', +         AdministrativeActFileModifyFormSelection), +        ('administrativeact-file_administrativeactfile_modification', +         AdministrativeActFileForm), +        ('final-file_administrativeactfile_modification', FinalForm)], +        label=_(u"File: administrative act modification"), +        url_name='file_administrativeactfile_modification',)  file_administrativeactfile_deletion_wizard = \ -                                      AdministrativeActDeletionWizard.as_view([ -                     ('selec-file_administrativeactfile_deletion', -                                 AdministrativeActFileFormSelection), -                     ('final-file_administrativeactfile_deletion', -                                 FinalAdministrativeActDeleteForm)], -                      label=_(u"File: administrative act deletion"), -                      url_name='file_administrativeactfile_deletion',) +    AdministrativeActDeletionWizard.as_view([ +        ('selec-file_administrativeactfile_deletion', +         AdministrativeActFileFormSelection), +        ('final-file_administrativeactfile_deletion', +         FinalAdministrativeActDeleteForm)], +        label=_(u"File: administrative act deletion"), +        url_name='file_administrativeactfile_deletion',) +  def reset_wizards(request):      for wizard_class, url_name in ( @@ -233,8 +238,7 @@ def reset_wizards(request):              (FileDeletionWizard, 'file_deletion'),              (FileAdministrativeActWizard, 'file_administrativeactfile'),              (FileEditAdministrativeActWizard, -                        'file_administrativeactfile_modification_wizard'), +             'file_administrativeactfile_modification_wizard'),              (AdministrativeActDeletionWizard, -                        'file_administrativeactfile_deletion_wizard'), -        ): +             'file_administrativeactfile_deletion_wizard'),):          wizard_class.session_reset(request, url_name)  | 
