Add changing document type

Marcel Kawski
1 parent a82b248a
Showing 7 changed files with 76 additions and 4 deletions
collector/storage/admin.py
collector/storage/forms.py
collector/storage/models.py
collector/storage/static/storage/js/document.js
collector/storage/templates/storage/annotation.html
collector/storage/urls.py
collector/storage/views.py
@@ -2,7 +2,7 @@ from django.contrib import admin
  
 from admin_numeric_filter.admin import RangeNumericFilter
  
-from storage.models import Chunk, Document, Keyword, Metadata, Participant, Annotation
+from storage.models import Chunk, Document, Keyword, Metadata, Participant, Annotation, DocumentType
  
  
 class ChunkInline(admin.StackedInline):
@@ -52,3 +52,4 @@ admin.site.register(Document, DocumentAdmin)
 admin.site.register(Keyword)
 admin.site.register(Participant)
 admin.site.register(Annotation, AnnotationAdmin)
+admin.site.register(DocumentType)
@@ -388,3 +388,27 @@ class ChunkSplitForm(Form):
         self.fields['text'].widget = Textarea(attrs={'class': 'formset-field',
                                                      'placeholder': 'Tekst akapitu',
                                                      'rows': 5})
+
+
+class DocTypeForm(ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        super(DocTypeForm, self).__init__(*args, **kwargs)
+        self.fields['doc_type'].label_from_instance = self.label_from_instance
+
+    def save(self, commit=True):
+        document = super(DocTypeForm, self).save(commit)
+        document.changed = True
+        document.save()
+        return document
+
+    @staticmethod
+    def label_from_instance(obj):
+        return obj.name
+
+    class Meta:
+        model = Document
+        fields = ['doc_type']
+        labels = {
+            'doc_type': 'Typ dokumentu'
+        }
@@ -12,6 +12,14 @@ from pipeline.models import Pipeline, ProcessingStatus
 User = get_user_model()
  
  
+class DocumentType(models.Model):
+    key = models.CharField(max_length=32, unique=True)
+    name = models.CharField(max_length=32, unique=True)
+
+    def __str__(self):
+        return self.key
+
+
 class Document(models.Model):
     name = models.TextField()
     source_id = models.CharField(max_length=32)
@@ -43,6 +51,8 @@ class Document(models.Model):
     unk_coverage = models.FloatField(default=0.0)
     parent = models.ForeignKey("self", null=True, default=None, on_delete=models.CASCADE)
     sequence = models.PositiveIntegerField(default=0)
+    doc_type = models.ForeignKey(DocumentType, null=True, blank=True, on_delete=models.CASCADE)
+
  
     def delete(self, *args, **kwargs):
         super().delete(*args, **kwargs)
@@ -72,6 +72,10 @@ $(function () {
       $(this).modalForm({formURL: $(this).data("id")});
     });
  
+    $(".change-doc-type").each(function () {
+      $(this).modalForm({formURL: $(this).data("id")});
+    });
+
     $(".add-keyword").each(function () {
       $(this).modalForm({formURL: $(this).data("id")});
     });
@@ -110,10 +110,19 @@
             <div class="modal-content"></div>
         </div>
     </div>
+
+    <div class="text-align-center">
+      <p>
+        Typ dokumentu: <strong>{{ document.doc_type.name|default_if_none:'nieokreślony' }}</strong>
+        <button class="change-doc-type btn btn-success" type="button" style="margin-left: 10px"
+                data-id="{% url 'change_doc_type' document.pk %}">Zmień
+        </button>
+      </p>
+    </div>
  
     {% if subdocuments %}
       <div class="info">
-          <p>Poddokumenty:</p>
+        <p>Poddokumenty:</p>
       </div>
  
       <table class="data-table doc-table" id="subdoc-list-table">
@@ -12,6 +12,7 @@ urlpatterns = [
     path('document/edit-details/<int:pk>', login_required(views.DocDetailsEditView.as_view()), name='edit_doc_details'),
     path('document/edit-subdoc-details/<int:pk>', login_required(views.SubDocDetailsEditView.as_view()),
          name='edit_subdoc_details'),
+    path('document/change-doc-type/<int:pk>', login_required(views.ChangeDocTypeView.as_view()), name='change_doc_type'),
     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'),
@@ -22,7 +22,7 @@ from sys import maxsize
 from functools import partial, wraps
  
 from .forms import ChunkForm, ParticipantForm, SubchunkForm, MetadataForm, DocDetailsForm, KeywordForm, DocSplitForm, \
-    ChunkMoveForm, SubDocDetailsForm, AuthorForm, ChunkMergeForm, ChunkSplitForm
+    ChunkMoveForm, SubDocDetailsForm, AuthorForm, ChunkMergeForm, ChunkSplitForm, DocTypeForm
 from .models import Chunk, Document, Participant, Metadata, Keyword, Annotation
 from projects.ppc.models import Utterance
 from pipeline.models import ProcessingStatus
@@ -638,12 +638,14 @@ class AnnotationView(View):
             chunks = doc.chunks.order_by('sequence')
             keywords = doc.keywords.all()
             authors = doc.participants.all()
+            doc_type_form = DocTypeForm()
             context = {'document': doc,
                        'subdocuments': subdocuments,
                        'metadata': metadata,
                        'chunks': chunks,
                        'keywords': keywords,
-                       'authors': authors}
+                       'authors': authors,
+                       'doc_type_form': doc_type_form}
         except Document.DoesNotExist:
             pass
  
@@ -1117,6 +1119,27 @@ class DraftListView(ListView):
         return context
  
  
+class ChangeDocTypeView(UpdateView):
+    model = Document
+    template_name = 'storage/edit.html'
+    form_class = DocTypeForm
+
+    def form_valid(self, form):
+        if not self.request.is_ajax():
+            form.save(commit=True)
+            return HttpResponseRedirect(self.get_success_url())
+        return render(self.request, self.template_name, {'form': form})
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['title'] = 'Edycja typu dokumentu'
+        context['submit_btn_text'] = 'Zmień'
+        return context
+
+    def get_success_url(self):
+        return reverse_lazy('annotation', kwargs={'doc_id': self.object.id})
+
+
 # ****************************** autocomplete ******************************