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 ++++- ishtar_common/static/js/ishtar.js | 14 ++++ ishtar_common/templates/ishtar/forms/qa_base.html | 77 ++++++++++++++++++++++ ishtar_common/templates/ishtar/forms/qa_form.html | 33 ++++++++++ ishtar_common/templates/ishtar/qa_form.html | 76 --------------------- ishtar_common/views.py | 50 +++++++++++--- 10 files changed, 283 insertions(+), 96 deletions(-) create mode 100644 archaeological_finds/templates/ishtar/forms/qa_find_basket.html create mode 100644 ishtar_common/templates/ishtar/forms/qa_base.html create mode 100644 ishtar_common/templates/ishtar/forms/qa_form.html delete mode 100644 ishtar_common/templates/ishtar/qa_form.html 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 diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 2750efcc2..9eae1b04d 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -833,3 +833,17 @@ var ajax_post = function(url, data, target, callback){ }); }; + +var qa_action_register = function(url) { + $('#qa-action').on('submit', function(event){ + event.preventDefault(); + $('#modal-dynamic-form').modal("hide"); + short_wait(); + ajax_post( + url, $(this).serialize(), "#modal-dynamic-form", + function(){ + $('#modal-dynamic-form').modal("show"); + } + ); + }); +}; diff --git a/ishtar_common/templates/ishtar/forms/qa_base.html b/ishtar_common/templates/ishtar/forms/qa_base.html new file mode 100644 index 000000000..ee4c242b7 --- /dev/null +++ b/ishtar_common/templates/ishtar/forms/qa_base.html @@ -0,0 +1,77 @@ +{% load i18n inline_formset table_form %} + +
+
+
+

{{page_name|safe}}

+ +
+
{% csrf_token %} +
+
+ {% block main_form %} + + {% for error in form.non_field_errors %} +

{{ error }}

+ {% endfor %} + {% bs_form form %} + + {% if confirm %} + +

{% trans "Modified items" %}

+
    {% for item in items %} +
  • {{item}}
    • {% endfor %} +
+

{% trans "Modification" %}

+ + {% for field in form %} + {% if field.value %} + + + + + {% endif %} + {% endfor %} +
{{field.label}}{% trans ":" %} {% if field.field.rendered_value %} + {{ field.field.rendered_value }} + {% else %} + {{ field.value }} + {% endif %} +
+ {% endif %} + + {% endblock %} +
+
+
+ {% block footer %} + + + {% endblock %} +
+
+
+
+ + + diff --git a/ishtar_common/templates/ishtar/forms/qa_form.html b/ishtar_common/templates/ishtar/forms/qa_form.html new file mode 100644 index 000000000..c843dbd2d --- /dev/null +++ b/ishtar_common/templates/ishtar/forms/qa_form.html @@ -0,0 +1,33 @@ +{% extends "ishtar/forms/qa_base.html" %} +{% load i18n inline_formset table_form %} + +{% block main_form %} + {% for error in form.non_field_errors %} +

{{ error }}

+ {% endfor %} + {% bs_form form %} + + {% if confirm %} + +

{% trans "Modified items" %}

+
    {% for item in items %} +
  • {{item}}
    • {% endfor %} +
+

{% trans "Modification" %}

+ + {% for field in form %} + {% if field.value %} + + + + + {% endif %} + {% endfor %} +
{{field.label}}{% trans ":" %} {% if field.field.rendered_value %} + {{ field.field.rendered_value }} + {% else %} + {{ field.value }} + {% endif %} +
+ {% endif %} +{% endblock %} diff --git a/ishtar_common/templates/ishtar/qa_form.html b/ishtar_common/templates/ishtar/qa_form.html deleted file mode 100644 index fe373ed57..000000000 --- a/ishtar_common/templates/ishtar/qa_form.html +++ /dev/null @@ -1,76 +0,0 @@ -{% load i18n inline_formset table_form %} - -
-
-
-

{{page_name|safe}}

- -
-
{% csrf_token %} -
-
- {% for error in form.non_field_errors %} -

{{ error }}

- {% endfor %} - {% bs_form form %} - - {% if confirm %} - -

{% trans "Modified items" %}

-
    {% for item in items %} -
  • {{item}}
    • {% endfor %} -
-

{% trans "Modification" %}

- - {% for field in form %} - {% if field.value %} - - - - - {% endif %} - {% endfor %} -
{{field.label}}{% trans ":" %} {% if field.field.rendered_value %} - {{ field.field.rendered_value }} - {% else %} - {{ field.value }} - {% endif %} -
- {% endif %} -
-
-
- - -
-
-
-
- - - diff --git a/ishtar_common/views.py b/ishtar_common/views.py index aed24093f..9946a9dee 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1797,11 +1797,16 @@ class AlertList(JSONResponseMixin, LoginRequiredMixin, return {'alerts': alerts} -class QAItemEditForm(IshtarMixin, LoginRequiredMixin, FormView): - template_name = 'ishtar/qa_form.html' +class QAItemForm(IshtarMixin, LoginRequiredMixin, FormView): + template_name = 'ishtar/forms/qa_form.html' model = None form_class = None - form_class_multi = None + page_name = u"" + success_url = "/success/" + modal_size = None # large, small or None (medium) + + def get_quick_action(self): + raise NotImplementedError() def dispatch(self, request, *args, **kwargs): assert self.model @@ -1811,16 +1816,44 @@ class QAItemEditForm(IshtarMixin, LoginRequiredMixin, FormView): raise Http404() # check availability - if not self.model.QA_EDIT.is_available( + quick_action = self.get_quick_action() + if not quick_action.is_available( user=request.user, session=request.session): for item in self.items: - if not self.model.QA_EDIT.is_available( + if not quick_action.is_available( user=request.user, session=request.session, obj=item): raise Http404() - self.confirm = kwargs.get('confirm', False) and True self.url = request.get_full_path() - return super(QAItemEditForm, self).dispatch(request, *args, **kwargs) + return super(QAItemForm, self).dispatch(request, *args, **kwargs) + + def get_form_kwargs(self): + kwargs = super(QAItemForm, self).get_form_kwargs() + kwargs['items'] = self.items + return kwargs + + def get_context_data(self, **kwargs): + data = super(QAItemForm, self).get_context_data(**kwargs) + data['url'] = self.url + data['items'] = self.items + data['modal_size'] = self.modal_size + data['page_name'] = u"{} – {}".format( + self.model._meta.verbose_name, self.page_name) + return data + + +class QAItemEditForm(QAItemForm): + form_class_multi = None + modal_size = "large" + + def get_quick_action(self): + return self.model.QA_EDIT + + def dispatch(self, request, *args, **kwargs): + self.confirm = kwargs.get('confirm', False) and True + returned = super(QAItemEditForm, self).dispatch(request, *args, + **kwargs) + return returned def get_form_class(self): if len(self.items) > 1 and self.form_class_multi: @@ -1829,7 +1862,6 @@ class QAItemEditForm(IshtarMixin, LoginRequiredMixin, FormView): def get_form_kwargs(self): kwargs = super(QAItemEditForm, self).get_form_kwargs() - kwargs['items'] = self.items kwargs['confirm'] = self.confirm return kwargs @@ -1837,12 +1869,10 @@ class QAItemEditForm(IshtarMixin, LoginRequiredMixin, FormView): data = super(QAItemEditForm, self).get_context_data(**kwargs) data['page_name'] = u"{} – {}".format( self.model._meta.verbose_name, self.model.QA_EDIT.text) - data['url'] = self.url if self.confirm: if 'confirm' not in self.url: data['url'] = self.url.split('?')[0] + "confirm/" data['confirm'] = True - data['items'] = self.items return data def form_valid(self, form): -- cgit v1.2.3