Add handling subdocuments types

Marcel Kawski
1 parent b583b73d
Showing 4 changed files with 56 additions and 33 deletions
collector/storage/admin.py
collector/storage/models.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, \
-    BookWithMultipleAuthors
+    BookWithMultipleAuthors, Article, Chapter
  
  
 class ChunkInline(admin.StackedInline):
@@ -52,6 +52,8 @@ admin.site.register(Chunk, ChunkAdmin)
 admin.site.register(Document, DocumentAdmin)
 admin.site.register(Magazine)
 admin.site.register(BookWithMultipleAuthors)
+admin.site.register(Article)
+admin.site.register(Chapter)
 admin.site.register(Keyword)
 admin.site.register(Participant)
 admin.site.register(Annotation, AnnotationAdmin)
@@ -141,7 +141,7 @@ class Document(models.Model):
         return True
  
     @staticmethod
-    def get_doc_type():
+    def get_doc_type_display():
         return 'dokument'
  
     class Meta:
@@ -165,7 +165,7 @@ class Magazine(Document):
         return True
  
     @staticmethod
-    def get_doc_type():
+    def get_doc_type_display():
         return 'czasopismo'
  
  
@@ -179,10 +179,22 @@ class BookWithMultipleAuthors(Document):
         return True
  
     @staticmethod
-    def get_doc_type():
+    def get_doc_type_display():
         return 'książka o wielu autorach'
  
  
+class Article(Document):
+    @staticmethod
+    def get_doc_type_display():
+        return 'artykuł'
+
+
+class Chapter(Document):
+    @staticmethod
+    def get_doc_type_display():
+        return 'rozdział'
+
+
 class Chunk(models.Model):
     document = models.ForeignKey(Document, related_name='chunks', on_delete=models.CASCADE)
     sequence = models.PositiveIntegerField()
-from .models import Document, Magazine, BookWithMultipleAuthors
+from .models import Document, Magazine, BookWithMultipleAuthors, Article, Chapter
  
  
 DOCUMENT_TYPES_CLASSES = Document, Magazine, BookWithMultipleAuthors
  
+SUBDOCUMENT_TYPES = {  # first subdocument type in tuples are the default ones for this type of the document
+    Document: (Document, ),
+    Magazine: (Article, ),
+    BookWithMultipleAuthors: (Chapter, )
+}
  
-def get_doc_types_tuple():
+def get_remaining_doc_types_tuple(current_type):
     doc_types = []
     for doc_type_model in DOCUMENT_TYPES_CLASSES:
-        doc_types.append((doc_type_model.__name__, doc_type_model.get_doc_type()))
+        if doc_type_model is not current_type:
+            doc_types.append((doc_type_model.__name__, doc_type_model.get_doc_type_display()))
     return tuple(doc_types)
  
+
 def get_doc_with_type(doc_id):
-    try:
-        doc = Magazine.objects.get(id=doc_id)
-    except Magazine.DoesNotExist:
+    all_document_types = list(set(list(DOCUMENT_TYPES_CLASSES) + [dt for dt_list in SUBDOCUMENT_TYPES.values() for dt in dt_list]))
+    all_document_types.append(all_document_types.pop(all_document_types.index(Document)))  # Document at the end
+    for doc_type in all_document_types:
         try:
-            doc = BookWithMultipleAuthors.objects.get(id=doc_id)
-        except BookWithMultipleAuthors.DoesNotExist:
-            try:
-                doc = Document.objects.get(id=doc_id)
-            except Document.DoesNotExist:
-                return None # TODO
-    return doc
 \ No newline at end of file
+            doc = doc_type.objects.get(id=doc_id)
+            return doc
+        except doc_type.DoesNotExist:
+            continue
+    return None  # TODO
@@ -25,7 +25,7 @@ from .forms import ChunkForm, ParticipantForm, SubchunkForm, MetadataForm, Keywo
     SubDocDetailsForm, AuthorForm, ChunkMergeForm, ChunkSplitForm, DocTypeForm, DocDetailsForm, MagazineDetailsForm, \
     BWMADetailsForm
 from .models import Chunk, Document, Participant, Metadata, Keyword, Annotation, Magazine, BookWithMultipleAuthors
-from .utils import get_doc_types_tuple, get_doc_with_type
+from .utils import get_remaining_doc_types_tuple, get_doc_with_type, SUBDOCUMENT_TYPES
 from projects.ppc.models import Utterance
 from pipeline.models import ProcessingStatus
  
@@ -636,7 +636,7 @@ class AnnotationView(View):
         context = {'document': doc}
         doc = get_doc_with_type(doc_id)
         if doc is not None:
-            doc_type = doc.get_doc_type()
+            doc_type = doc.get_doc_type_display()
             subdocuments = Document.objects.filter(parent=doc).order_by('sequence')
             metadata = doc.metadata.order_by('sequence')
             chunks = doc.chunks.order_by('sequence')
@@ -948,17 +948,20 @@ class DocSplitView(UpdateView):
                 parent = self.object
             else:
                 parent = self.object.parent
-            new_document = Document.objects.create(name=parent.name,
-                                                   lang=parent.lang,
-                                                   original_lang=parent.original_lang,
-                                                   pipeline=parent.pipeline,
-                                                   publication_date=None,
-                                                   path=parent.path,
-                                                   type='',
-                                                   status='',
-                                                   parent=parent,
-                                                   processing_status=parent.processing_status,
-                                                   sequence=sequence + 1)
+            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,
+                                                            pipeline=parent.pipeline,
+                                                            publication_date=None,
+                                                            path=parent.path,
+                                                            type='',
+                                                            status='',
+                                                            parent=parent,
+                                                            processing_status=parent.processing_status,
+                                                            sequence=sequence + 1)
             new_document.chunks.set(chunks.filter(sequence__range=(chunk_beg, chunk_end)))
             new_document.save()
             self.object.chunks.set(chunks.filter(sequence__lt=chunk_beg) | chunks.filter(sequence__gt=chunk_end))
@@ -1194,13 +1197,14 @@ class DocTypeView(UpdateView):
         context = super().get_context_data(**kwargs)
         context['title'] = 'Zmiana typu dokumentu'
         context['submit_btn_text'] = 'Zmień'
-        messages.warning(self.request, 'Uwaga! Zmiana typu dokumentu może spowodować usunięcie danych typowych dla tego typu,'
-                                  ' np. numeru dla czasopisma.')
+        messages.warning(self.request, 'Uwaga! Zmiana typu dokumentu może spowodować usunięcie danych typowych dla '
+                                       'tego typu.')
         return context
  
     def get_form_kwargs(self):
         kwargs = super(DocTypeView, self).get_form_kwargs()
-        kwargs['doc_types'] = get_doc_types_tuple()
+        self.object = get_doc_with_type(self.object.id)
+        kwargs['doc_types'] = get_remaining_doc_types_tuple(type(self.object))
         return kwargs
  
     def get_success_url(self, new_doc):