diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/forms_common.py | 62 | ||||
| -rw-r--r-- | ishtar_common/urls.py | 8 | ||||
| -rw-r--r-- | ishtar_common/views.py | 34 |
3 files changed, 101 insertions, 3 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index c782bc03d..d0b1183be 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -1522,6 +1522,68 @@ class BiographicalNoteEditForm(BiographicalNoteForm, IshtarForm): self.fields[k].initial = value +class QualifiedBiographicalNoteForm(ManageOldType, NewItemForm): + form_label = _("Actor") + form_admin_name = _("Actor - 010 - General") + form_slug = "qualifiedbiographicalnote-general" + extra_form_modals = ["biographical_note"] + associated_models = { + "biographical_note": models.BiographicalNote, + "qualification_type": models.QualifiedBiographicalNoteType + } + biographical_note = forms.IntegerField( + label=_("Biographical note"), + widget=widgets.JQueryAutoComplete( + reverse_lazy("autocomplete-biographicalnote"), + associated_model=models.BiographicalNote, + new=True, + ), + validators=[models.valid_id(models.BiographicalNote)], + required=True, + ) + qualification_type = forms.ChoiceField(label=_("Qualification type"), choices=[], + required=True) + TYPES = [ + FieldType("qualification_type", models.QualifiedBiographicalNoteType), + ] + + def save(self, user, item=None): + dct = self.cleaned_data + dct["history_modifier"] = user + for key in self.associated_models.keys(): + if key in dct: + if not dct[key]: + dct.pop(key) + else: + model = self.associated_models[key] + try: + dct[key] = model.objects.get(pk=dct[key]) + except model.DoesNotExist: + dct.pop(key) + # get data + data = {} + for k in list(dct.keys()): + if k.startswith("data__"): + v = dct.pop(k) + keys = k.split("__")[1:] + dct = generate_dict_from_list(keys, v) + data = update_data(data, dct) + + if not item: + item = models.QualifiedBiographicalNote.objects.create(**dct) + else: + for k in dct: + setattr(item, k, dct[k]) + item.save() + + # set data + if item.data or data: + data = update_data(item.data, data) + item.data = data + item.save() + return item + + class AccountForm(IshtarForm): form_label = _("Account") associated_models = {"pk": models.Person} diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index 3d91d7493..78b185ac7 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -527,6 +527,11 @@ urlpatterns += [ name="new-biographicalnote", ), re_path( + r"new-qualifiedbiographicalnote/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$", + views.new_qualifiedbiographicalnote, + name="new-qualifiedbiographicalnote", + ), + re_path( r"^biographicalnote-qa-edit/(?P<pks>[0-9-]+)?/$", check_permissions( ["ishtar_common.change_biographicalnote", @@ -610,6 +615,9 @@ urlpatterns += [ views.autocomplete_biographical_note, name="autocomplete-biographicalnote" ), + re_path(r"autocomplete-qualifiedbiographicalnote/$", + views.autocomplete_qualified_biographical_note, + name="autocomplete-qualifiedbiographicalnote"), re_path(r"changelog/(?:(?P<page>\d+)/)?", views.ChangelogView.as_view(), name="changelog"), re_path(r"person-merge/(?:(?P<page>\d+)/)?$", views.person_merge, name="person_merge"), re_path( diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 545c4a413..4e8376dfc 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1171,7 +1171,7 @@ def autocomplete_author(request): def autocomplete_biographical_note(request): - query = get_autocomplete_query(request, "ishtar_common", "person") + query = get_autocomplete_query(request, "ishtar_common", "BiographicalNote") if query is None: return HttpResponse("[]", content_type="text/plain") q = request.GET.get("term", "") @@ -1187,8 +1187,31 @@ def autocomplete_biographical_note(request): | Q(denomination__unaccent__icontains=q) ) query = query & qu - users = models.BiographicalNote.objects.filter(query).distinct()[:limit] - data = json.dumps([{"id": user.pk, "value": str(user)} for user in users]) + items = models.BiographicalNote.objects.filter(query).distinct()[:limit] + data = json.dumps([{"id": item.pk, "value": str(item)} for item in items]) + return HttpResponse(data, content_type="text/plain") + + +def autocomplete_qualified_biographical_note(request): + query = get_autocomplete_query(request, "ishtar_common", "QualifiedBiographicalNote") + if query is None: + return HttpResponse("[]", content_type="text/plain") + q = request.GET.get("term", "") + limit = request.GET.get("limit", 20) + try: + limit = int(limit) + except ValueError: + return HttpResponseBadRequest() + for q in q.split(" "): + qu = ( + Q(biographical_note__last_name__unaccent__icontains=q) + | Q(biographical_note__first_name__unaccent__icontains=q) + | Q(biographical_note__denomination__unaccent__icontains=q) + | Q(qualification_type__label__unaccent__icontains=q) + ) + query = query & qu + items = models.QualifiedBiographicalNote.objects.filter(query).distinct()[:limit] + data = json.dumps([{"id": item.pk, "value": str(item)} for item in items]) return HttpResponse(data, content_type="text/plain") @@ -1220,6 +1243,11 @@ new_biographical_note = new_qa_item( models.BiographicalNote, forms.BiographicalNoteForm, page_name=_("New biographical note") ) +new_qualifiedbiographicalnote = new_qa_item( + models.QualifiedBiographicalNote, forms.QualifiedBiographicalNoteForm, + page_name=_("New actor") +) + get_person_for_account = get_item( models.Person, "get_person", |