From c3d78fb588769075d260e26086077785813e9448 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 11 Sep 2018 17:44:09 +0200 Subject: Generic QA form - QA find basket form --- archaeological_finds/forms.py | 26 +++++++- archaeological_finds/models_finds.py | 8 +-- .../templates/ishtar/forms/qa_find_basket.html | 69 ++++++++++++++++++++++ archaeological_finds/urls.py | 8 +-- archaeological_finds/views.py | 18 +++++- 5 files changed, 119 insertions(+), 10 deletions(-) create mode 100644 archaeological_finds/templates/ishtar/forms/qa_find_basket.html (limited to 'archaeological_finds') diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index e50172f1c..eb27c22cc 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -79,7 +79,7 @@ __all__ = [ 'check_treatment', 'ResultFindForm', 'ResultFindFormSet', 'FindDeletionForm', 'UpstreamFindFormSelection', 'NewFindBasketForm', 'SelectFindBasketForm', 'DeleteFindBasketForm', 'FindBasketAddItemForm', - 'QAFindFormSingle', 'QAFindFormMulti' + 'QAFindFormSingle', 'QAFindFormMulti', 'QAFindBasketForm' ] logger = logging.getLogger(__name__) @@ -442,6 +442,30 @@ class QAFindFormSingle(QAFindFormMulti): self.fields.pop('qa_seal_number') +class QAFindBasketForm(IshtarForm): + create_or_update = forms.ChoiceField( + choices=(('create', _(u"Create")), + ('update', _(u"Update"))), initial='create') + label = forms.CharField(label="", max_length=None, required=False) + basket = forms.ChoiceField(label=_(u"Basket"), required=True, choices=[]) + + def __init__(self, *args, **kwargs): + self.user = None + if 'user' in kwargs: + self.user = kwargs.pop('user') + if hasattr(self.user, 'ishtaruser'): + self.user = self.user.ishtaruser + self.items = kwargs.pop('items') + + super(QAFindBasketForm, self).__init__(*args, **kwargs) + if not self.user: + return + self.fields['basket'].choices = [('', '--')] + [ + (b.pk, unicode(b)) + for b in models.FindBasket.objects.filter(user=self.user) + ] + + class PreservationForm(CustomForm, ManageOldType): form_label = _("Preservation") form_admin_name = _(u"Find - 030 - Preservation") diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 0911317f2..3c44e0be4 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -885,15 +885,15 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, QUICK_ACTIONS = [ QA_EDIT, + QuickAction( + url="find-qa-basket", icon_class="fa fa-shopping-basket", + text=_(u"Basket"), target="many", + rights=['change_find', 'change_own_find']), QuickAction( url="find-qa-packaging", icon_class="fa fa-gift", text=_(u"Packaging"), target="many", rights=['change_warehouse'], module='warehouse' ), - QuickAction( - url="find-qa-basket", icon_class="fa fa-shopping-basket", - text=_(u"Basket"), target="many", - rights=['change_find', 'change_own_find']), ] # fields diff --git a/archaeological_finds/templates/ishtar/forms/qa_find_basket.html b/archaeological_finds/templates/ishtar/forms/qa_find_basket.html new file mode 100644 index 000000000..77fc2abcd --- /dev/null +++ b/archaeological_finds/templates/ishtar/forms/qa_find_basket.html @@ -0,0 +1,69 @@ +{% extends "ishtar/forms/qa_base.html" %} +{% load i18n inline_formset table_form %} + +{% block main_form %} + {% if form.non_field_errors %} + + {% endif %} + + {% for hidden in form.hidden_fields %} + {{hidden}} + {% if hidden.errors %}
+ {{ hidden.errors }} +
{% endif %} + {% endfor %} + + {% if form.basket %} +
+ +   +
+ {% else %} + + {% endif %} +
+
+ {% with form.label as field %} + {% include "blocks/bs_field_snippet.html" %} + {% endwith %} +
+
+ {% if form.basket %} +
+ +   +
+
+
+ {% with form.basket as field %} + {% include "blocks/bs_field_snippet.html" %} + {% endwith %} +
+
+ {% endif %} +{% endblock %} + +{% block js %} +var update_form_display = function(){ + if ($("#update-choice:checked").length){ + $("#new-basket").hide(); + $("#update-basket").show(); + } else { + $("#update-basket").hide(); + $("#new-basket").show(); + } +} + +$(document).ready(function(){ + $("#create-choice").click(update_form_display); + $("#update-choice").click(update_form_display); + update_form_display(); +}); + +{% endblock %} + + diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py index 3cbc99f17..85a395db2 100644 --- a/archaeological_finds/urls.py +++ b/archaeological_finds/urls.py @@ -79,15 +79,15 @@ urlpatterns = [ check_rights(['change_find', 'change_own_find'])( views.QAFindForm.as_view()), name='find-qa-bulk-update-confirm', kwargs={"confirm": True}), + url(r'^find-qa-basket/(?P[0-9-]+)?/$', + check_rights(['change_find', 'change_own_find'])( + views.QAFindBasketForm.as_view()), + name='find-qa-basket'), url(r'^find-qa-packaging/(?P[0-9-]+)?/$', check_rights(['change_warehouse'])( views.FindBasketAddItemView.as_view()), name='find-qa-packaging'), - url(r'^find-qa-basket/(?P[0-9-]+)?/$', - check_rights(['change_find', 'change_own_find'])( - views.FindBasketAddItemView.as_view()), - name='find-qa-basket'), url(r'^treatment_creation/(?P.+)?$', diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 850890894..94439fa82 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -35,7 +35,7 @@ from forms import * from ishtar_common.forms import FinalForm from ishtar_common.models import IshtarUser, get_current_profile from ishtar_common.views import get_autocomplete_generic, IshtarMixin, \ - LoginRequiredMixin, QAItemEditForm + LoginRequiredMixin, QAItemEditForm, QAItemForm from ishtar_common.views_item import display_item, get_item, show_item, \ revert_item, get_autocomplete_item from wizards import * @@ -599,3 +599,19 @@ def reset_wizards(request): class QAFindForm(QAItemEditForm): model = models.Find form_class = QAFindFormMulti + + +class QAFindBasketForm(QAItemForm): + template_name = 'ishtar/forms/qa_find_basket.html' + model = models.Find + form_class = QAFindBasketForm + page_name = _(u"Basket") + modal_size = "small" + + def get_quick_action(self): + return models.Find.QUICK_ACTIONS[1] + + def get_form_kwargs(self): + kwargs = super(QAFindBasketForm, self).get_form_kwargs() + kwargs['user'] = self.request.user + return kwargs -- cgit v1.2.3