Correct handling subdocuments types

Marcel Kawski
1 parent c0d1dda5
Showing 5 changed files with 40 additions and 13 deletions
collector/storage/static/storage/css/document.css
collector/storage/templates/storage/annotation.html
collector/storage/templates/storage/edit.html
collector/storage/utils.py
collector/storage/views.py
@@ -421,3 +421,7 @@ ul.legend {
 .navbar-brand:hover, .nav-item:hover {
     color: #0a79df;
 }
+
+#change-doc-type-btn {
+    margin-left: 10px;
+}
@@ -102,8 +102,8 @@
     <div class="text-align-center">
       <p>
         Typ dokumentu: <strong>{{ doc_type }}</strong>
-        <button class="change-doc-type btn btn-primary" type="button" data-id="{% url 'change_doc_type' document.id %}">
-          Zmień
+        <button class="change-doc-type btn btn-primary" id="change-doc-type-btn" type="button"
+                data-id="{% url 'change_doc_type' document.id %}">Zmień
         </button>
       </p>
     </div>
@@ -34,10 +34,16 @@
     <div class="modal-body">
  
       {% for message in messages %}
-        <div class="alert alert-{{ message.tags }} text-center" role="alert">
-          {{ message }}
-        </div>
-    {% endfor %}
+        {% if message.tags == "error" %}
+          <div class="alert alert-danger text-center" role="alert">
+            {{ message }}
+          </div>
+        {% else %}
+          <div class="alert alert-{{ message.tags }} text-center" role="alert">
+            {{ message }}
+          </div>
+        {% endif %}
+      {% endfor %}
  
       <div class="{% if form.non_field_errors %}invalid{% endif %} mb-2">
         {% for error in form.non_field_errors %}
 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, )
+    Document: (Document,),
+    Magazine: (Article,),
+    BookWithMultipleAuthors: (Chapter,)
 }
  
+
 def get_remaining_doc_types_tuple(current_type):
     doc_types = []
     for doc_type_model in DOCUMENT_TYPES_CLASSES:
@@ -17,8 +17,17 @@ def get_remaining_doc_types_tuple(current_type):
     return tuple(doc_types)
  
  
+def get_remaining_subdoc_types_tuple(current_parent_type, current_type):
+    doc_types = []
+    for doc_type_model in SUBDOCUMENT_TYPES[current_parent_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):
-    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 = 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:
@@ -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_remaining_doc_types_tuple, get_doc_with_type, SUBDOCUMENT_TYPES
+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
  
@@ -1204,7 +1204,15 @@ class DocTypeView(UpdateView):
     def get_form_kwargs(self):
         kwargs = super(DocTypeView, self).get_form_kwargs()
         self.object = get_doc_with_type(self.object.id)
-        kwargs['doc_types'] = get_remaining_doc_types_tuple(type(self.object))
+        if self.object.parent is None:
+            doc_types = get_remaining_doc_types_tuple(type(self.object))
+        else:
+            doc_types = get_remaining_subdoc_types_tuple(type(get_doc_with_type(self.object.parent.id)),
+                                                                   type(self.object))
+        if not doc_types:
+            messages.error(self.request, 'Nie jest możliwa zmiana typu dokumentu. Dla tego typu dokumentu głównego nie '
+                                         'ma dostępnych innych typów dokumentów.')
+        kwargs['doc_types'] = doc_types
         return kwargs
  
     def get_success_url(self, new_doc):