diff options
Diffstat (limited to 'archaeological_finds/views.py')
| -rw-r--r-- | archaeological_finds/views.py | 103 |
1 files changed, 55 insertions, 48 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 8e90f901a..978afc759 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -251,7 +251,7 @@ get_find_basket_for_write = get_item( basket_search_wizard = wizards.FindBasketSearch.as_view( [('selec-find_basket_search', forms.FindBasketFormSelection)], - label=_(u"Basket search"), + label=_("Basket search"), url_name='find_basket_search', ) @@ -262,7 +262,7 @@ basket_modify_wizard = wizards.FindBasketEditWizard.as_view( ('basket-find_basket_modification', forms.FindBasketForm), ('final-find_basket_modification', FinalForm) ], - label=_(u"Basket modify"), + label=_("Basket modify"), url_name='find_basket_modification', ) @@ -287,7 +287,7 @@ findbasket_deletion_steps = [ basket_delete_wizard = wizards.FindBasketDeletionWizard.as_view( findbasket_deletion_steps, - label=_(u"Basket deletion"), + label=_("Basket deletion"), url_name='find_basket_deletion', ) @@ -318,7 +318,7 @@ find_creation_condition_dict = { find_creation_wizard = wizards.FindWizard.as_view( find_creation_steps, - label=_(u"New find"), + label=_("New find"), condition_dict=find_creation_condition_dict, url_name='find_creation',) @@ -330,7 +330,7 @@ find_search_condition_dict = { find_search_wizard = wizards.FindSearch.as_view([ ('general-find_search', forms.FindFormSelection), ('generalwarehouse-find_search', forms.FindFormSelectionWarehouseModule)], - label=_(u"Find search"), + label=_("Find search"), url_name='find_search', condition_dict=find_search_condition_dict ) @@ -370,7 +370,7 @@ find_modification_steps = [ find_modification_wizard = wizards.FindModificationWizard.as_view( find_modification_steps, condition_dict=find_modification_condition_dict, - label=_(u"Find modification"), + label=_("Find modification"), url_name='find_modification' ) @@ -407,7 +407,7 @@ find_deletion_steps = [ find_deletion_wizard = wizards.FindDeletionWizard.as_view( find_deletion_steps, condition_dict=find_deletion_condition_dict, - label=_(u"Find deletion"), + label=_("Find deletion"), url_name='find_deletion',) @@ -437,7 +437,7 @@ class NewFindBasketView(IshtarMixin, LoginRequiredMixin, CreateView): template_name = 'ishtar/form.html' model = models.FindBasket form_class = forms.NewFindBasketForm - page_name = _(u"New basket") + page_name = _("New basket") def get_form_kwargs(self): kwargs = super(NewFindBasketView, self).get_form_kwargs() @@ -466,7 +466,7 @@ class OwnBasket(object): class SelectBasketForManagement(IshtarMixin, LoginRequiredMixin, FormView): template_name = 'ishtar/form.html' form_class = forms.SelectFindBasketWriteForm - page_name = _(u"Manage items in basket") + page_name = _("Manage items in basket") def get_form_kwargs(self): kwargs = super(SelectBasketForManagement, self).get_form_kwargs() @@ -487,7 +487,7 @@ class SelectBasketForManagement(IshtarMixin, LoginRequiredMixin, FormView): class SelectItemsInBasket(OwnBasket, IshtarMixin, LoginRequiredMixin, TemplateView): template_name = 'ishtar/manage_basket.html' - page_name = _(u"Manage basket") + page_name = _("Manage basket") def get_context_data(self, *args, **kwargs): context = super(SelectItemsInBasket, self).get_context_data( @@ -587,12 +587,12 @@ treatment_wizard_steps = [ treatment_search_wizard = wizards.TreatmentSearch.as_view([ ('general-treatment_search', forms.TreatmentFormSelection)], - label=_(u"Treatment search"), + label=_("Treatment search"), url_name='treatment_search',) treatment_creation_wizard = wizards.TreatmentWizard.as_view( treatment_wizard_steps, - label=_(u"New treatment"), + label=_("New treatment"), url_name='treatment_creation',) treatment_n1_wizard_steps = [ @@ -605,7 +605,7 @@ treatment_n1_wizard_steps = [ treatment_creation_n1_wizard = wizards.TreatmentN1Wizard.as_view( treatment_n1_wizard_steps, - label=_(u"New treatment"), + label=_("New treatment"), url_name='treatment_creation_n1',) treatment_1n_wizard_steps = [ @@ -618,7 +618,7 @@ treatment_1n_wizard_steps = [ treatment_creation_1n_wizard = wizards.Treatment1NWizard.as_view( treatment_1n_wizard_steps, - label=_(u"New treatment"), + label=_("New treatment"), url_name='treatment_creation_1n',) treatment_modification_wizard = wizards.TreatmentModificationWizard.as_view( @@ -626,7 +626,7 @@ treatment_modification_wizard = wizards.TreatmentModificationWizard.as_view( ('file-treatment_modification', forms.TreatmentFormFileChoice), ('basetreatment-treatment_modification', forms.TreatmentModifyForm), ('final-treatment_modification', FinalForm)], - label=_(u"Treatment modification"), + label=_("Treatment modification"), url_name='treatment_modification', ) @@ -665,10 +665,13 @@ def treatment_add(request, pks, treatment_file=None): "person": in_charge.pk, } locas = list( - set([str(f.container.location.pk) - for f in treatment_file.associated_basket.items.all() - if f.container and f.container.location]) + { + str(f.container.location.pk) + for f in treatment_file.associated_basket.items.all() + if f.container and f.container.location + } ) + if len(locas) == 1: # one and only one location for all finds dct["location"] = locas[0] for k in dct: @@ -703,10 +706,13 @@ def divide_treatment_add(request, pks, treatment_file=None): "person": in_charge.pk, } locas = list( - set([str(f.container.location.pk) - for f in treatment_file.associated_basket.items.all() - if f.container and f.container.location]) + { + str(f.container.location.pk) + for f in treatment_file.associated_basket.items.all() + if f.container and f.container.location + } ) + if len(locas) == 1: # one and only one location for all finds dct["location"] = locas[0] for k in dct: @@ -734,8 +740,7 @@ def findbasket_treatment_add(request, pk, current_right=None): basket = models.FindBasket.objects.get(pk=pk) except models.FindBasket.DoesNotExist: raise Http404() - return treatment_add( - request, ",".join([str(f.pk) for f in basket.items.all()])) + return treatment_add(request, ",".join(str(f.pk) for f in basket.items.all())) def findbasket_treatmentfile_add(request, pk, current_right=None): @@ -751,8 +756,7 @@ def container_treatment_add(request, pk, current_right=None): basket = models.FindBasket.objects.get(pk=pk) except models.FindBasket.DoesNotExist: raise Http404() - return treatment_add(request, - ",".join([str(f.pk) for f in basket.items.all()])) + return treatment_add(request, ",".join(str(f.pk) for f in basket.items.all())) def treatmentfile_treatment_add(request, pk, current_right=None): @@ -764,15 +768,16 @@ def treatmentfile_treatment_add(request, pk, current_right=None): raise Http404() basket = tf.associated_basket return treatment_add( - request, ",".join([str(f.pk) for f in basket.items.all()]), - treatment_file=tf + request, + ",".join(str(f.pk) for f in basket.items.all()), + treatment_file=tf, ) treatment_deletion_wizard = wizards.TreatmentDeletionWizard.as_view([ ('selec-treatment_deletion', forms.TreatmentFormSelection), ('final-treatment_deletion', forms.TreatmentDeletionForm)], - label=_(u"Treatment deletion"), + label=_("Treatment deletion"), url_name='treatment_deletion',) @@ -791,7 +796,7 @@ treatment_administrativeact_search_wizard = \ wizards.SearchWizard.as_view([ ('selec-treatment_admacttreatment_search', forms.AdministrativeActTreatmentFormSelection)], - label=_(u"Treatment: search administrative act"), + label=_("Treatment: search administrative act"), url_name='treatment_admacttreatment_search',) treatment_administrativeact_wizard = \ @@ -800,7 +805,7 @@ treatment_administrativeact_wizard = \ ('administrativeact-treatment_admacttreatment', forms.AdministrativeActTreatmentForm), ('final-treatment_admacttreatment', FinalForm)], - label=_(u"Treatment: new administrative act"), + label=_("Treatment: new administrative act"), url_name='treatment_admacttreatment',) treatment_administrativeact_modification_wizard = \ @@ -810,7 +815,7 @@ treatment_administrativeact_modification_wizard = \ ('administrativeact-treatment_admacttreatment_modification', forms.AdministrativeActTreatmentModifForm), ('final-treatment_admacttreatment_modification', FinalForm)], - label=_(u"Treatment: administrative act modification"), + label=_("Treatment: administrative act modification"), url_name='treatment_admacttreatment_modification',) @@ -836,7 +841,7 @@ treatment_admacttreatment_deletion_wizard = \ forms.AdministrativeActTreatmentFormSelection), ('final-treatment_admacttreatment_deletion', FinalAdministrativeActDeleteForm)], - label=_(u"Treatment: administrative act deletion"), + label=_("Treatment: administrative act deletion"), url_name='treatment_admacttreatment_deletion',) @@ -869,7 +874,7 @@ def treatment_adminact_add(request, pk, current_right=None): treatmentfile_search_wizard = wizards.TreatmentFileSearch.as_view([ ('general-treatmentfile_search', forms.TreatmentFileFormSelection)], - label=_(u"Treatment request search"), + label=_("Treatment request search"), url_name='treatmentfile_search',) treatmentfile_wizard_steps = [ @@ -879,7 +884,7 @@ treatmentfile_wizard_steps = [ treatmentfile_creation_wizard = wizards.TreatmentFileWizard.as_view( treatmentfile_wizard_steps, - label=_(u"New treatment request"), + label=_("New treatment request"), url_name='treatmentfile_creation',) treatmentfile_modification_wizard = \ @@ -888,7 +893,7 @@ treatmentfile_modification_wizard = \ ('treatmentfile-treatmentfile_modification', forms.TreatmentFileModifyForm), ('final-treatmentfile_modification', FinalForm)], - label=_(u"Treatment request modification"), + label=_("Treatment request modification"), url_name='treatmentfile_modification', ) @@ -918,7 +923,7 @@ def treatmentfile_add(request, basket_pk=None): treatmentfile_deletion_wizard = wizards.TreatmentFileDeletionWizard.as_view([ ('selec-treatmentfile_deletion', forms.TreatmentFileFormSelectionMultiple), ('final-treatmentfile_deletion', forms.TreatmentFileDeletionForm)], - label=_(u"Treatment request deletion"), + label=_("Treatment request deletion"), url_name='treatmentfile_deletion',) @@ -937,7 +942,7 @@ treatmentfile_admacttreatmentfile_search_wizard = \ wizards.SearchWizard.as_view([ ('selec-treatmentfle_admacttreatmentfle_search', forms.AdministrativeActTreatmentFileFormSelection)], - label=_(u"Treatment request: search administrative act"), + label=_("Treatment request: search administrative act"), url_name='treatmentfle_admacttreatmentfle_search',) @@ -948,7 +953,7 @@ treatmentfile_admacttreatmentfile_wizard = \ ('admact-treatmentfle_admacttreatmentfle', forms.AdministrativeActTreatmentFileForm), ('final-treatmentfle_admacttreatmentfle', FinalForm)], - label=_(u"Treatment request: new administrative act"), + label=_("Treatment request: new administrative act"), url_name='treatmentfle_admacttreatmentfle',) treatmentfile_admacttreatmentfile_modification_wizard = \ @@ -958,7 +963,7 @@ treatmentfile_admacttreatmentfile_modification_wizard = \ ('admact-treatmentfle_admacttreatmentfle_modification', forms.AdministrativeActTreatmentFileModifForm), ('final-treatmentfle_admacttreatmentfle_modification', FinalForm)], - label=_(u"Treatment request: administrative act modification"), + label=_("Treatment request: administrative act modification"), url_name='treatmentfle_admacttreatmentfle_modification',) @@ -1000,7 +1005,7 @@ treatmentfile_admacttreatmentfile_deletion_wizard = \ forms.AdministrativeActTreatmentFileFormSelection), ('final-treatmentfle_admacttreatmentfle_deletion', FinalAdministrativeActDeleteForm)], - label=_(u"Treatment request: administrative act deletion"), + label=_("Treatment request: administrative act deletion"), url_name='treatmentfle_admacttreatmentfle_deletion',) @@ -1055,7 +1060,7 @@ class QAFindBasketFormView(QAItemForm): template_name = 'ishtar/forms/qa_find_basket.html' model = models.Find form_class = forms.QAFindBasketForm - page_name = _(u"Basket") + page_name = _("Basket") modal_size = "small" base_url = "find-qa-basket" @@ -1072,7 +1077,7 @@ class QAFindBasketFormView(QAItemForm): class QAFindDuplicateFormView(QAItemForm): template_name = 'ishtar/forms/qa_find_duplicate.html' model = models.Find - page_name = _(u"Duplicate") + page_name = _("Duplicate") form_class = forms.QAFindDuplicateForm base_url = "find-qa-duplicate" @@ -1088,7 +1093,7 @@ class QAFindDuplicateFormView(QAItemForm): def get_context_data(self, **kwargs): data = super(QAFindDuplicateFormView, self).get_context_data( **kwargs) - data['action_name'] = _(u"Duplicate") + data['action_name'] = _("Duplicate") bf = self.items[0].get_first_base_find() if bf: data['context_record'] = bf.context_record @@ -1100,7 +1105,7 @@ class QAFindTreatmentFormView(QAItemForm): template_name = 'ishtar/forms/qa_find_treatment.html' model = models.Find form_class = forms.QAFindTreatmentForm - page_name = _(u"Packaging") + page_name = _("Packaging") base_url = "find-qa-packaging" def dispatch(self, request, *args, **kwargs): @@ -1125,7 +1130,7 @@ class QAFindTreatmentFormView(QAItemForm): class QAFindbasketDuplicateFormView(QAItemForm): template_name = 'ishtar/forms/qa_findbasket_duplicate.html' model = models.FindBasket - page_name = _(u"Duplicate") + page_name = _("Duplicate") modal_size = "small" form_class = forms.QAFindbasketDuplicateForm base_url = "findbasket-qa-duplicate" @@ -1142,7 +1147,7 @@ class QAFindbasketDuplicateFormView(QAItemForm): def get_context_data(self, **kwargs): data = super(QAFindbasketDuplicateFormView, self).get_context_data( **kwargs) - data['action_name'] = _(u"Duplicate") + data['action_name'] = _("Duplicate") return data @@ -1168,8 +1173,10 @@ class PublicFindAPI(APIView): q = models.FindBasket.items.through.objects.filter( findbasket_id=basket.id).values("find_id").order_by("id") id_list = [bi["find_id"] for bi in q] - clauses = ' '.join(['WHEN id=%s THEN %s' % (pk, i) - for i, pk in enumerate(id_list)]) + clauses = ' '.join( + 'WHEN id=%s THEN %s' % (pk, i) for i, pk in enumerate(id_list) + ) + ordering = 'CASE {} END'.format(clauses) return models.Find.objects.filter(id__in=id_list).extra( select={'ordering': ordering}, order_by=('ordering',)) |