From 44c565135cb466a9f98170113687eef6ac45f44a Mon Sep 17 00:00:00 2001 From: Sandrava Date: Wed, 17 Jul 2024 10:55:52 +0100 Subject: [PATCH] save document to collection --- peachjam/admin.py | 4 ++ peachjam/forms.py | 57 ++++++++++++++--- peachjam/models/collection.py | 4 +- .../peachjam/_document_detail_toolbar.html | 33 +++++++--- .../templates/peachjam/collections_list.html | 16 ++--- .../templates/peachjam/save_document.html | 35 +++++++++++ peachjam/urls.py | 4 +- peachjam/views/collection.py | 62 ++++++++++++++----- peachjam/views/generic_views.py | 14 ++++- 9 files changed, 181 insertions(+), 48 deletions(-) create mode 100644 peachjam/templates/peachjam/save_document.html diff --git a/peachjam/admin.py b/peachjam/admin.py index b6f51cdc4..30adc4569 100644 --- a/peachjam/admin.py +++ b/peachjam/admin.py @@ -42,6 +42,7 @@ CaseNumber, CitationLink, CitationProcessing, + Collection, CoreDocument, Court, CourtClass, @@ -69,6 +70,7 @@ PeachJamSettings, Predicate, Relationship, + SavedDocument, SourceFile, Taxonomy, UserProfile, @@ -1177,6 +1179,8 @@ class AttorneyAdmin(ImportExportMixin, admin.ModelAdmin): CourtClass, AttachedFileNature, CitationProcessing, + Collection, + SavedDocument, ] ) admin.site.register(PeachJamSettings, PeachJamSettingsAdmin) diff --git a/peachjam/forms.py b/peachjam/forms.py index 94c8404bd..be8be5dea 100644 --- a/peachjam/forms.py +++ b/peachjam/forms.py @@ -2,15 +2,21 @@ from django import forms from django.conf import settings -from django.contrib.auth.forms import UserCreationForm -from django.contrib.auth.models import User from django.core.files import File from django.core.mail import send_mail from django.http import QueryDict from django.template.loader import render_to_string from django.utils.translation import gettext as _ -from peachjam.models import AttachedFiles, CoreDocument, SourceFile, pj_settings +from peachjam.models import ( + AttachedFiles, + Collection, + CoreDocument, + SavedDocument, + SourceFile, + UserProfile, + pj_settings, +) from peachjam.plugins import plugins from peachjam.storage import clean_filename @@ -235,9 +241,46 @@ def send_email(self): ) -class SignUpForm(UserCreationForm): - email = forms.EmailField() +class SaveDocumentForm(forms.ModelForm): + collection = forms.ModelChoiceField(queryset=Collection.objects, required=False) + user_profile = forms.ModelChoiceField( + queryset=UserProfile.objects, widget=forms.HiddenInput() + ) + document = forms.ModelChoiceField( + queryset=CoreDocument.objects, widget=forms.HiddenInput() + ) class Meta: - model = User - fields = ["username", "email", "password1", "password2"] + model = SavedDocument + fields = "__all__" + + def __init__(self, *args, document=None, user_profile=None, **kwargs): + super().__init__(*args, **kwargs) + if document is not None and user_profile is not None: + self.document = document + self.user_profile = user_profile + self.fields["document"].initial = self.document + self.fields["user_profile"].initial = self.user_profile + + def save(self, commit=True): + return super().save() + + +class CollectionForm(forms.ModelForm): + name = forms.CharField(max_length=255, required=True) + user_profile = forms.ModelChoiceField( + queryset=UserProfile.objects, widget=forms.HiddenInput() + ) + + class Meta: + model = Collection + fields = "__all__" + + def __init__(self, *args, user_profile=None, **kwargs): + super().__init__(*args, **kwargs) + if user_profile is not None: + self.user_profile = user_profile + self.fields["user_profile"].initial = self.user_profile + + def save(self, commit=True): + return super().save() diff --git a/peachjam/models/collection.py b/peachjam/models/collection.py index 1d59e1c62..72ea6534d 100644 --- a/peachjam/models/collection.py +++ b/peachjam/models/collection.py @@ -41,9 +41,7 @@ class SavedDocument(models.Model): related_name="saved_documents", ) collection = models.ForeignKey( - Collection, - on_delete=models.CASCADE, - verbose_name=_("collection"), + Collection, on_delete=models.CASCADE, verbose_name=_("collection"), null=True ) class Meta: diff --git a/peachjam/templates/peachjam/_document_detail_toolbar.html b/peachjam/templates/peachjam/_document_detail_toolbar.html index eab9a4066..a785af486 100644 --- a/peachjam/templates/peachjam/_document_detail_toolbar.html +++ b/peachjam/templates/peachjam/_document_detail_toolbar.html @@ -9,14 +9,31 @@ {% endif %} {% endblock %} {% block download-btn %} - +
+ + + +
{% if document.source_file %}
- -
-
-
+ diff --git a/peachjam/templates/peachjam/save_document.html b/peachjam/templates/peachjam/save_document.html new file mode 100644 index 000000000..cb2a129a7 --- /dev/null +++ b/peachjam/templates/peachjam/save_document.html @@ -0,0 +1,35 @@ +
+ {% if new %} +

Document Saved

+ {% else %} +

Choose Collection

+ {% endif %} +

{{ saved_document }}

+ {{ save_document_form.document }} + {{ save_document_form.user_profile }} + + +
+
+ +
+ +
+
diff --git a/peachjam/urls.py b/peachjam/urls.py index 9408f167f..c8d2b5108 100644 --- a/peachjam/urls.py +++ b/peachjam/urls.py @@ -36,7 +36,6 @@ ArticleYearArchiveView, AuthorDetailView, BookListView, - CollectionListView, CourtClassDetailView, CourtClassMonthView, CourtClassYearView, @@ -66,6 +65,7 @@ PlaceDetailView, PocketLawResources, RobotsView, + SaveDocumentView, TaxonomyDetailView, TaxonomyFirstLevelView, TaxonomyListView, @@ -91,7 +91,7 @@ AboutPageView.as_view(), name="about", ), - path("collections/", CollectionListView.as_view(), name="collections"), + path("save-document/", SaveDocumentView.as_view(), name="save_document"), # listing views path( "authors//", diff --git a/peachjam/views/collection.py b/peachjam/views/collection.py index f22425969..2aac05b11 100644 --- a/peachjam/views/collection.py +++ b/peachjam/views/collection.py @@ -1,29 +1,57 @@ -from typing import Any - from django.contrib.auth import get_user_model -from django.db.models.query import QuerySet -from django.shortcuts import render -from django.views.generic import ListView +from django.http import HttpRequest +from django.shortcuts import get_object_or_404 +from django.views.generic import TemplateView -from peachjam.models import Collection +from peachjam.forms import CollectionForm, SaveDocumentForm +from peachjam.models import SavedDocument, UserProfile User = get_user_model() -class CollectionListView(ListView): - model = Collection +class CreateCollectionView(TemplateView): template_name = "peachjam/collections_list.html" - context_object_name = "collections" - navbar_link = "collections" - paginate_by = 10 - def get_queryset(self) -> QuerySet[Any]: - # print(super().get_queryset().filter(user=User(self.request.user.id))) - return super().get_queryset().filter(user=User(self.request.user.id)) + def post(self, request: HttpRequest): + post_data = request.POST + user_profile = get_object_or_404(UserProfile, user=self.request.user) + form = CollectionForm(post_data, user_profile=user_profile) + context = self.get_context_data() + if form.is_valid(): + instance = form.save() + return self.render_to_response( + { + "saved_document": instance, + "add_new_collection_form": form, + **context, + } + ) + + return self.render_to_response({"add_new_collection_form": form, **context}) + + +class SaveDocumentView(TemplateView): + template_name = "peachjam/save_document.html" def get_context_data(self, *args, **kwargs): - context = super().get_context_data(*args, **kwargs) + context = super().get_context_data(**kwargs) + user_profile = get_object_or_404(UserProfile, user=self.request.user) + collections = user_profile.collections.all() + context["collections"] = collections return context - def render_collections(self, request): - return render(request, "peachjam/collections_list.html") + def post(self, request: HttpRequest): + post_data = request.POST + instance = SavedDocument.objects.filter( + document=post_data.get("document"), + user_profile=post_data.get("user_profile"), + ).first() + form = SaveDocumentForm(post_data, instance=instance) + context = self.get_context_data() + if form.is_valid(): + instance = form.save() + return self.render_to_response( + {"saved_document": instance, "save_document_form": form, **context} + ) + + return self.render_to_response({"save_document_form": form, **context}) diff --git a/peachjam/views/generic_views.py b/peachjam/views/generic_views.py index f31873d88..186cd204a 100644 --- a/peachjam/views/generic_views.py +++ b/peachjam/views/generic_views.py @@ -6,7 +6,7 @@ from django.views.generic import DetailView, ListView, View from lxml import html -from peachjam.forms import BaseDocumentFilterForm +from peachjam.forms import BaseDocumentFilterForm, SaveDocumentForm from peachjam.helpers import add_slash, get_language, lowercase_alphabet from peachjam.models import ( Author, @@ -16,6 +16,8 @@ LegalInstrument, Predicate, Relationship, + SavedDocument, + UserProfile, ) from peachjam_api.serializers import ( CitationLinkSerializer, @@ -187,6 +189,16 @@ def get_context_data(self, **kwargs): context["documents_citing_current_doc"] = self.fetch_citation_docs( doc.work.works_citing_current_work() ) + user_profile = UserProfile.objects.filter(user=self.request.user).first() + instance = SavedDocument.objects.filter( + document=self.get_object(), user_profile=user_profile + ).first() + context["save_document_form"] = SaveDocumentForm( + instance=instance, + document=self.get_object(), + user_profile=user_profile, + initial={"document": self.get_object(), "user_profile": user_profile}, + ) return context