Add Website and WebPage Document types.

Bartłomiej Nitoń
1 parent 9adac789
Showing 8 changed files with 220 additions and 58 deletions
collector/storage/admin.py
collector/storage/forms.py
collector/storage/models.py
collector/storage/templates/storage/annotation.html
collector/storage/templates/storage/review.html
collector/storage/urls.py
collector/storage/utils.py
collector/storage/views.py
@@ -3,7 +3,7 @@ from django.contrib import admin
 from admin_numeric_filter.admin import RangeNumericFilter
  
 from storage.models import Chunk, Document, Keyword, Metadata, Participant, Annotation, Magazine, \
-    Book, BookWithMultipleAuthors, Article, Chapter
+    Book, BookWithMultipleAuthors, Website, Article, Chapter, WebPage
  
  
 class ChunkInline(admin.StackedInline):
@@ -57,8 +57,10 @@ admin.site.register(Document, DocumentAdmin)
 admin.site.register(Magazine)
 admin.site.register(Book)
 admin.site.register(BookWithMultipleAuthors)
+admin.site.register(Website)
 admin.site.register(Article)
 admin.site.register(Chapter)
+admin.site.register(WebPage)
 admin.site.register(Keyword)
 admin.site.register(Participant, ParticipantAdmin)
 admin.site.register(Annotation, AnnotationAdmin)
@@ -3,7 +3,8 @@ import re
 from django.forms import ChoiceField, ModelChoiceField, ModelForm, Textarea, CharField, Form
 from django import forms
  
-from .models import Chunk, Document, Participant, Metadata, Keyword, Magazine, Book, BookWithMultipleAuthors
+from .models import Chunk, Document, Participant, Metadata, Keyword, Magazine, Book, BookWithMultipleAuthors, Website, \
+    WebPage
 from .utils import get_doc_with_type
 from projects.ppc.models import Utterance
 from collector import settings
@@ -306,6 +307,15 @@ DOC_TYPE_DETAILS_FIELDS = {
             'channel': 'Kanał',
             'original_lang': 'Język oryginału'
         }
+    },
+    Website: {
+        'fields': ['title', 'url', 'channel', 'original_lang'],
+        'labels': {
+            'title': 'Nazwa',
+            'url': 'Adres URL',
+            'channel': 'Kanał',
+            'original_lang': 'Język oryginału'
+        }
     }
 }
  
@@ -405,6 +415,28 @@ class BWMADetailsForm(ModelForm):
         }
  
  
+class WebsiteDetailsForm(ModelForm):
+    def __init__(self, *args, **kwargs):
+        super(WebsiteDetailsForm, self).__init__(*args, **kwargs)
+        self.fields['title'].widget = Textarea(attrs={'rows': 1})
+
+    def save(self, commit=True):
+        website = super(WebsiteDetailsForm, self).save(commit)
+        website.changed = True
+        website.save()
+        return website
+
+    class Meta:
+        model = Website
+        fields = ['title', 'url', 'channel', 'original_lang']
+        labels = {
+            'title': 'Nazwa',
+            'url': 'Adres URL',
+            'channel': 'Kanał',
+            'original_lang': 'Język oryginału'
+        }
+
+
 class SubDocDetailsForm(ModelForm):
  
     def __init__(self, *args, **kwargs):
@@ -426,6 +458,28 @@ class SubDocDetailsForm(ModelForm):
         }
  
  
+class WebPageDetailsForm(ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        super(WebPageDetailsForm, self).__init__(*args, **kwargs)
+        self.fields['title'].widget = Textarea(attrs={'rows': 1})
+
+    def save(self, commit=True):
+        webpage = super(WebPageDetailsForm, self).save(commit)
+        webpage.changed = True
+        webpage.save()
+        return webpage
+
+    class Meta:
+        model = WebPage
+        fields = ['title', 'url', 'original_lang']
+        labels = {
+            'title': 'Tytuł',
+            'url': 'Adres URL',
+            'original_lang': 'Język oryginału'
+        }
+
+
 class KeywordForm(Form):
     label = CharField(max_length=200, label='Etykieta')
  
@@ -197,6 +197,19 @@ class Book(Document):
         return 'książka'
  
  
+class Website(Document):
+    url = models.URLField(blank=True)
+
+    def check_details_filling(self):
+        if self.title == '' or self.original_lang == '' or self.url == '':
+            return False
+        return True
+
+    @staticmethod
+    def get_doc_type_display():
+        return 'serwis internetowy'
+
+
 class Article(Document):
     @staticmethod
     def get_doc_type_display():
@@ -209,6 +222,19 @@ class Chapter(Document):
         return 'rozdział'
  
  
+class WebPage(Document):
+    url = models.URLField(blank=True)
+
+    def check_details_filling(self):
+        if self.title == '' or self.original_lang == '' or self.url == '':
+            return False
+        return True
+
+    @staticmethod
+    def get_doc_type_display():
+        return 'strona internetowa'
+
+
 class Chunk(models.Model):
     document = models.ForeignKey(Document, related_name='chunks', on_delete=models.CASCADE)
     sequence = models.PositiveIntegerField()
@@ -174,11 +174,19 @@
         <thead>
           <tr id="doc-details">
             <th class="col-title">Tytuł</th>
+            {% if document|isinst:"storage.models.WebPage" %}
+              <th>Adres URL</th>
+            {% endif %}
             <th>Język oryginału</th>
             <th class="actions col-actions">
             {% if user.is_authenticated %}
-              <i class="edit-doc-details material-icons button edit" data-id="{% url 'edit_subdoc_details' document.pk %}"
-                 title="Edytuj">edit</i>
+              {% if document|isinst:"storage.models.WebPage" %}
+                <i class="edit-doc-details material-icons button edit" data-id="{% url 'edit_webpage_details' document.pk %}"
+                   title="Edytuj">edit</i>
+              {% else %}
+                <i class="edit-doc-details material-icons button edit" data-id="{% url 'edit_subdoc_details' document.pk %}"
+                   title="Edytuj">edit</i>
+              {% endif %}
             {% endif %}
             </th>
           </tr>
@@ -187,6 +195,9 @@
         <tbody>
           <tr>
             <td>{{ document.title }}</td>
+            {% if document|isinst:"storage.models.WebPage" %}
+              <td>{{ document.url }}</td>
+            {% endif %}
             <td>{{ document.original_lang }}</td>
           </tr>
           <tr>
@@ -200,9 +211,17 @@
       <table class="data-table doc-table">
         <thead>
           <tr id="doc-details">
-            <th class="col-title">Tytuł</th>
-            <th>Data publikacji</th>
-            <th>Miejsce publikacji</th>
+            {% if document|isinst:"storage.models.Website" %}
+              <th class="col-title">Nazwa</th>
+            {% else %}
+              <th class="col-title">Tytuł</th>
+            {% endif %}
+            {% if document|isinst:"storage.models.Website" %}
+              <th>Adres URL</th>
+            {% else %}
+              <th>Data publikacji</th>
+              <th>Miejsce publikacji</th>
+            {% endif %}
             {% if document|isinst:"storage.models.Magazine" %}
               <th>Numer</th>
             {% elif document|isinst:"storage.models.BookWithMultipleAuthors" %}
@@ -225,6 +244,9 @@
               {% elif document|isinst:"storage.models.Book" %}
                 <i class="edit-doc-details material-icons button edit" data-id="{% url 'edit_book_details' document.pk %}"
                    title="Edytuj">edit</i>
+              {% elif document|isinst:"storage.models.Website" %}
+                <i class="edit-doc-details material-icons button edit" data-id="{% url 'edit_website_details' document.pk %}"
+                   title="Edytuj">edit</i>
               {% elif document|isinst:"storage.models.Document" %}
                 <i class="edit-doc-details material-icons button edit" data-id="{% url 'edit_doc_details' document.pk %}"
                    title="Edytuj">edit</i>
@@ -237,8 +259,12 @@
         <tbody>
           <tr>
             <td>{{ document.title }}</td>
-            <td>{{ document.publication_date|default_if_none:'' }}</td>
-            <td>{{ document.publication_place }}</td>
+            {% if document|isinst:"storage.models.Website" %}
+              <td>{{ document.url|default_if_none:'' }}</td>
+            {% else %}
+              <td>{{ document.publication_date|default_if_none:'' }}</td>
+              <td>{{ document.publication_place }}</td>
+            {% endif %}
             {% if document|isinst:"storage.models.Magazine" %}
               <td>{{ document.number|default_if_none:'' }}</td>
             {% elif document|isinst:"storage.models.BookWithMultipleAuthors" %}
@@ -125,46 +125,83 @@
   <div class="info">
       <p>Szczegóły:</p>
   </div>
-  
-  <table class="data-table doc-table">
-    <thead>
-      <tr id="doc-details">
-        <th class="col-title">Tytuł</th>
-        <th>Data publikacji</th>
-        <th>Miejsce publikacji</th>
-        {% if document|isinst:Magazine %}
-          <th>Numer</th>
-        {% elif document|isinst:BookWithMultipleAuthors %}
-          <th>Wydawca</th>
-        {% elif document|isinst:Book %}
-          <th>Wydawca</th>
-        {% endif %}
-        <th>Kanał</th>
-        <th>Typ</th>
-        <th class="col-text-origin">Pochodzenie</th>
-        <th>Język oryginału</th>
-      </tr>
-    </thead>
-    
-    <tbody>
-      <tr>
-        <td>{{ document.title }}</td>
-        <td>{{ document.publication_date|default_if_none:'' }}</td>
-        <td>{{ document.publication_place }}</td>
-        {% if document|isinst:Magazine %}
-          <td>{{ document.number }}</td>
-        {% elif document|isinst:BookWithMultipleAuthors %}
-          <td>{{ document.publisher }}</td>
-        {% elif document|isinst:Book %}
-          <td>{{ document.publisher }}</td>
-        {% endif %}
-        <td>{{ document.channel }}</td>
-        <td>{{ document.type }}</td>
-        <td>{{ document.text_origin }}</td>
-        <td>{{ document.original_lang }}</td>
-      </tr>
-    </tbody>
-  </table>
+
+  {% if document.parent %}
+
+      <table class="data-table doc-table">
+        <thead>
+          <tr id="doc-details">
+            <th class="col-title">Tytuł</th>
+            {% if document|isinst:"storage.models.WebPage" %}
+              <th>Adres URL</th>
+            {% endif %}
+            <th>Język oryginału</th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <tr>
+            <td>{{ document.title }}</td>
+            {% if document|isinst:"storage.models.WebPage" %}
+              <td>{{ document.url }}</td>
+            {% endif %}
+            <td>{{ document.original_lang }}</td>
+          </tr>
+          <tr>
+            <td colspan="3"></td>
+          </tr>
+        </tbody>
+      </table>
+  {% else %}
+    <table class="data-table doc-table">
+      <thead>
+        <tr id="doc-details">
+          {% if document|isinst:"storage.models.Website" %}
+            <th class="col-title">Nazwa</th>
+            <th>Adres URL</th>
+          {% else %}
+            <th class="col-title">Tytuł</th>
+            <th>Data publikacji</th>
+            <th>Miejsce publikacji</th>
+          {% endif %}
+          {% if document|isinst:"storage.models.Magazine" %}
+            <th>Numer</th>
+          {% elif document|isinst:"storage.models.BookWithMultipleAuthors" %}
+            <th>Wydawca</th>
+          {% elif document|isinst:"storage.models.Book" %}
+            <th>Wydawca</th>
+          {% endif %}
+          <th>Kanał</th>
+          <th>Typ</th>
+          <th class="col-text-origin">Pochodzenie</th>
+          <th>Język oryginału</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr>
+          <td>{{ document.title }}</td>
+          {% if document|isinst:"storage.models.Website" %}
+            <td>{{ document.url|default_if_none:'' }}</td>
+          {% else %}
+            <td>{{ document.publication_date|default_if_none:'' }}</td>
+            <td>{{ document.publication_place }}</td>
+          {% endif %}
+          {% if document|isinst:"storage.models.Magazine" %}
+            <td>{{ document.number }}</td>
+          {% elif document|isinst:"storage.models.BookWithMultipleAuthors" %}
+            <td>{{ document.publisher }}</td>
+          {% elif document|isinst:"storage.models.Book" %}
+            <td>{{ document.publisher }}</td>
+          {% endif %}
+          <td>{{ document.channel }}</td>
+          <td>{{ document.type }}</td>
+          <td>{{ document.text_origin }}</td>
+          <td>{{ document.original_lang }}</td>
+        </tr>
+      </tbody>
+    </table>
+  {% endif %}
  
   <div class="info">
       <p>Autorzy, tłumacze i redaktorzy:</p>
@@ -16,8 +16,12 @@ urlpatterns = [
          name='edit_bwma_details'),
     path('document/edit-book-details/<int:pk>', login_required(views.BookDetailsEditView.as_view()),
          name='edit_book_details'),
+    path('document/edit-website-details/<int:pk>', login_required(views.WebsiteDetailsEditView.as_view()),
+         name='edit_website_details'),
     path('document/edit-subdoc-details/<int:pk>', login_required(views.SubDocDetailsEditView.as_view()),
          name='edit_subdoc_details'),
+    path('document/edit-webpage-details/<int:pk>', login_required(views.WebPageDetailsEditView.as_view()),
+         name='edit_webpage_details'),
     path('chunk/add/<str:doc_id>', login_required(views.ChunkAddBetweenView.as_view()), name='add_chunk_between'),
     path('chunk/add/<str:doc_id>/<int:pk>', login_required(views.ChunkAddBetweenView.as_view()),
          name='add_chunk_between'),
-from .models import Document, Magazine, Book, BookWithMultipleAuthors, Article, Chapter
+from .models import Document, Magazine, Book, BookWithMultipleAuthors, Website, Article, Chapter, WebPage
  
-DOCUMENT_TYPES_CLASSES = Document, Magazine, Book, BookWithMultipleAuthors
+DOCUMENT_TYPES_CLASSES = Document, Magazine, Book, BookWithMultipleAuthors, Website
  
 SUBDOCUMENT_TYPES = {  # first subdocument type in tuples are the default ones for this type of the document
     Document: (Document,),
     Magazine: (Article,),
     Book: (Chapter,),
-    BookWithMultipleAuthors: (Chapter,)
+    BookWithMultipleAuthors: (Chapter,),
+    Website: (WebPage,)
 }
  
  
@@ -22,9 +22,10 @@ from sys import maxsize, modules
 from functools import partial, wraps
  
 from .forms import ChunkForm, ParticipantForm, SubchunkForm, MetadataForm, KeywordForm, DocSplitForm, ChunkMoveForm, \
-    SubDocDetailsForm, AuthorForm, ChunkMergeForm, ChunkSplitForm, DocTypeForm, DocDetailsForm, MagazineDetailsForm, \
-    BookDetailsForm, BWMADetailsForm
-from .models import Chunk, Document, Participant, Metadata, Keyword, Annotation, Magazine, Book, BookWithMultipleAuthors
+    SubDocDetailsForm, WebPageDetailsForm, AuthorForm, ChunkMergeForm, ChunkSplitForm, DocTypeForm, DocDetailsForm, \
+    MagazineDetailsForm, BookDetailsForm, BWMADetailsForm, WebsiteDetailsForm
+from .models import Chunk, Document, Participant, Metadata, Keyword, Annotation, Magazine, Book, \
+    BookWithMultipleAuthors, Website, Article, Chapter, WebPage
 from .utils import get_remaining_doc_types_tuple, get_remaining_subdoc_types_tuple, get_doc_with_type, SUBDOCUMENT_TYPES
 from projects.ppc.models import Utterance
 from pipeline.models import ProcessingStatus
@@ -781,10 +782,20 @@ class BWMADetailsEditView(DocDetailsEditView):
     form_class = BWMADetailsForm
  
  
+class WebsiteDetailsEditView(DocDetailsEditView):
+    model = Website
+    form_class = WebsiteDetailsForm
+
+
 class SubDocDetailsEditView(DocDetailsEditView):
     form_class = SubDocDetailsForm
  
  
+class WebPageDetailsEditView(DocDetailsEditView):
+    model = WebPage
+    form_class = WebPageDetailsForm
+
+
 def add_keyword(request, doc_id):
     if request.method == 'POST':
         form = KeywordForm(request.POST)
@@ -905,6 +916,7 @@ class FinishAnnotationView(RedirectView):
             messages.error(request, 'Błąd: Dokument posiada tłumacza, ale posiada polski język oryginału.')
             return HttpResponseRedirect(reverse('annotation', kwargs={'doc_id': document.id}))
         for subdoc in subdocuments:
+            subdoc = get_doc_with_type(subdoc.id)
             if not subdoc.check_details_filling():
                 messages.error(request, f'Błąd: Nie wypełniono wszystkich szczegółów poddokumentu o ID "{subdoc.id}".')
                 return HttpResponseRedirect(reverse('annotation', kwargs={'doc_id': document.id}))
@@ -955,7 +967,6 @@ class DocSplitView(UpdateView):
                 parent = self.object.parent
             self.object = get_doc_with_type(self.object.id)
             subdocument_class = SUBDOCUMENT_TYPES[type(self.object)][0]
-            print('sd class: ', subdocument_class)
             new_document = subdocument_class.objects.create(name=parent.name,
                                                             lang=parent.lang,
                                                             original_lang=parent.original_lang,
@@ -1073,7 +1084,7 @@ class DocumentListView(ListView):
         else:
             docs = docs.order_by(order_by)
  
-        return docs
+        return docs.distinct()
  
  
 class RetakeDocForAnnoView(UserPassesTestMixin, RedirectView):
@@ -1163,7 +1174,8 @@ def change_doc_type(doc, target_type):
                                          processing_status=doc.processing_status,
                                          new=doc.new,
                                          unk_coverage=doc.unk_coverage,
-                                         sequence=1000000)
+                                         sequence=1000000,
+                                         parent=doc.parent)
     seq = doc.sequence
     new_doc.keywords.add(*doc.keywords.all())
     subdocs = Document.objects.filter(parent=doc)