Add splitting chunks

Marcel Kawski
1 parent db7bc5dd
Showing 6 changed files with 64 additions and 3 deletions
collector/storage/forms.py
collector/storage/static/storage/css/document.css
collector/storage/static/storage/js/document.js
collector/storage/templates/storage/annotation.html
collector/storage/urls.py
collector/storage/views.py
@@ -336,6 +336,20 @@ class DocSplitForm(ModelForm):
         fields = ['chunk_beg', 'chunk_end']
  
  
+class ChunkSplitForm(ModelForm):
+    new_chunk_text = CharField(widget=Textarea(attrs={'rows': 10}), label='Tekst nowej sekcji')
+
+    def __init__(self, *args, **kwargs):
+        super(ChunkSplitForm, self).__init__(*args, **kwargs)
+
+    class Meta:
+        model = Chunk
+        fields = ['text', 'new_chunk_text']
+        labels = {
+            'text': 'Tekst',
+        }
+
+
 class ChunkMoveForm(ModelForm):
  
     def __init__(self, *args, **kwargs):
@@ -159,6 +159,11 @@ a.nav-button:hover {
   color: #96ff5e;
 }
  
+.split:hover {
+  color: #c75eff;
+}
+
+
 .arrow:hover {
   color: #ff6600;
 }
@@ -28,6 +28,10 @@ $(function () {
       $(this).modalForm({formURL: $(this).data("id")});
     });
  
+    $(".split-chunk").each( function () {
+      $(this).modalForm({formURL: $(this).data("id")});
+    });
+
     $(".add-subchunk").each( function () {
       $(this).modalForm({formURL: $(this).data("id")});
     });
@@ -351,8 +351,11 @@
                     <th class="actions">
                     {% if user.is_authenticated %}
                       <i class="merge-chunk material-icons button merge"
-                         data-id="{% url 'merge_chunk' chunk.pk chunk.document.id %}"
+                         data-id="{% url 'merge_chunk' chunk.pk %}"
                          title="Połącz z inną sekcją">merge_type</i>
+                      <i class="split-chunk material-icons button split"
+                         data-id="{% url 'split_chunk' chunk.pk %}"
+                         title="Podziel sekcję">call_split</i>
                       <i class="move-chunk material-icons button redo" data-id="{% url 'move_chunk' chunk.pk %}"
                          title="Przenieś do innego dokumentu">redo</i>
                       {% if not chunk.utterances.exists %}
@@ -18,7 +18,8 @@ urlpatterns = [
     path('chunk/edit/<int:pk>', login_required(views.ChunkEditView.as_view()), name='edit_chunk'),
     path('chunk/delete/<int:pk>', login_required(views.ChunkDeleteView.as_view()), name='delete_chunk'),
     path('chunk/move/<int:pk>', login_required(views.ChunkMoveView.as_view()), name='move_chunk'),
-    path('chunk/merge/<int:pk>/<str:doc_id>', login_required(views.ChunkMergeView.as_view()), name='merge_chunk'),
+    path('chunk/split/<int:pk>', login_required(views.ChunkSplitView.as_view()), name='split_chunk'),
+    path('chunk/merge/<int:pk>', login_required(views.ChunkMergeView.as_view()), name='merge_chunk'),
     path('subchunk/add/<int:chunk_pk>', login_required(views.SubchunkAddView.as_view()), name='add_subchunk'),
     path('subchunk/edit/<int:pk>', login_required(views.SubchunkEditView.as_view()), name='edit_subchunk'),
     path('subchunk/delete/<int:pk>', login_required(views.SubchunkDeleteView.as_view()), name='delete_subchunk'),
@@ -19,7 +19,7 @@ from keras import backend
 from sys import maxsize
  
 from .forms import ChunkForm, ParticipantForm, SubchunkForm, MetadataForm, DocDetailsForm, KeywordForm, DocSplitForm, \
-    ChunkMoveForm, SubDocDetailsForm, AuthorForm, ChunkMergeForm
+    ChunkMoveForm, SubDocDetailsForm, AuthorForm, ChunkMergeForm, ChunkSplitForm
 from .models import Chunk, Document, Participant, Metadata, Keyword, Annotation
 from projects.ppc.models import Utterance
 from pipeline.models import ProcessingStatus
@@ -345,6 +345,37 @@ class ChunkMoveView(UpdateView):
         return '%s#chunk-%d' % (reverse_lazy('annotation', kwargs={'doc_id': self.object.document.id}), self.object.pk)
  
  
+class ChunkSplitView(UpdateView):
+    model = Chunk
+    template_name = 'storage/edit.html'
+    form_class = ChunkSplitForm
+
+    def form_valid(self, form):
+        if not self.request.is_ajax():
+            self.object.text = form.cleaned_data['text']
+            self.object.save()
+            next_chunks = Chunk.objects.filter(document=self.object.document,
+                                               sequence__gt=self.object.sequence).order_by('sequence')
+            if next_chunks.first().sequence == self.object.sequence + 1:
+                for chunk in next_chunks:
+                    chunk.sequence += 1
+                    chunk.save()
+            Chunk.objects.create(document=self.object.document,
+                                 text=form.cleaned_data['new_chunk_text'],
+                                 sequence=self.object.sequence + 1)
+            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'] = 'Podział sekcji'
+        context['submit_btn_text'] = 'Podziel'
+        return context
+
+    def get_success_url(self):
+        return reverse_lazy('annotation', kwargs={'doc_id': self.object.document.id})
+
+
 class ChunkMergeView(UpdateView):
     model = Chunk
     template_name = 'storage/edit.html'
@@ -1028,6 +1059,9 @@ class RetakeDocForAnnotationView(UserPassesTestMixin, RedirectView):
         return HttpResponse('Wymagana jest rola redaktora, aby uzyskać dostęp do tej strony.')
  
  
+# ****************************** autocomplete ******************************
+
+
 def md_name_autocomplete(request):
     mds = Metadata.objects.filter(name__istartswith=request.GET.get('term'))
     names = list(set([md.name for md in mds]))