Add splitting chunks feature skeleton

Marcel Kawski
1 parent 2fd3e43d
Showing 6 changed files with 189 additions and 49 deletions
collector/storage/forms.py
collector/storage/static/storage/js/formset.js
collector/storage/templates/storage/chunk-split.html
collector/storage/templates/storage/edit.html
collector/storage/urls.py
collector/storage/views.py
 import re
  
-from django.forms import ChoiceField, ModelChoiceField, ModelForm, Textarea, CharField, Form, formset_factory
+from django.forms import ChoiceField, ModelChoiceField, ModelForm, Textarea, CharField, Form
 from django import forms
  
 from .models import Chunk, Document, Participant, Metadata, Keyword
@@ -42,14 +42,14 @@ class ChunkForm(ModelForm):
                 doc.chunks.get(sequence=new_chunk_seq)  # if the new sequence is the same as other chunk's sequence
                 if self.old_sequence > new_chunk_seq:
                     chunks_to_move = doc.chunks.filter(sequence__gte=new_chunk_seq,
-                                               sequence__lt=self.old_sequence)
+                                                       sequence__lt=self.old_sequence)
                     if chunks_to_move is not None:
                         for chunk in chunks_to_move:
                             chunk.sequence += 1
                             chunk.save()
                 elif self.old_sequence < new_chunk_seq:
                     chunks_to_move = doc.chunks.filter(sequence__gt=self.old_sequence,
-                                               sequence__lte=new_chunk_seq)
+                                                       sequence__lte=new_chunk_seq)
                     if chunks_to_move is not None:
                         for chunk in chunks_to_move:
                             chunk.sequence -= 1
@@ -336,20 +336,6 @@ 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):
@@ -390,3 +376,15 @@ class ChunkMergeForm(ModelForm):
     class Meta:
         model = Chunk
         fields = ['target_chunk']
+
+
+class ChunkSplitForm(ModelForm):
+
+    class Meta:
+        model = Chunk
+
+        fields = ['text']
+
+        labels = {
+            'text': 'Tekst nowej sekcji'
+        }
+function updateElementIndex(el, prefix, ndx) {
+    var id_regex = new RegExp('(' + prefix + '-\\d+-)');
+    var replacement = prefix + '-' + ndx + '-';
+    if ($(el).attr("for")) $(el).attr("for", $(el).attr("for").replace(id_regex,
+    replacement));
+    if (el.id) el.id = el.id.replace(id_regex, replacement);
+    if (el.name) el.name = el.name.replace(id_regex, replacement);
+}
+
+function addForm(btn, prefix) {
+    var formCount = parseInt($('#id_' + prefix + '-TOTAL_FORMS').val());
+    if (formCount < 1000) {
+        // Clone a form (without event handlers) from the first form
+        var row = $(".item:last").clone(false).get(0);
+
+        // Insert it after the last form
+        $(row).removeAttr('id').hide().insertAfter(".item:last").slideDown(300);
+
+        // Remove the bits we don't want in the new row/form
+        // e.g. error messages
+        $(".errorlist", row).remove();
+        $(row).children().removeClass("error");
+
+        // Relabel or rename all the relevant bits
+        $(row).find('.formset-field').each(function () {
+            updateElementIndex(this, prefix, formCount);
+            $(this).val('');
+            $(this).removeAttr('value');
+            $(this).prop('checked', false);
+        });
+
+        // Add an event handler for the delete item/form link
+        $(row).find(".delete").click(function () {
+            return deleteForm(this, prefix);
+        });
+        // Update the total form count
+        $("#id_" + prefix + "-TOTAL_FORMS").val(formCount + 1);
+
+    } // End if
+
+    return false;
+}
+
+
+function deleteForm(btn, prefix) {
+      var formCount = parseInt($('#id_' + prefix + '-TOTAL_FORMS').val());
+      if (formCount > 1) {
+          // Delete the item/form
+          var goto_id = $(btn).find('input').val();
+          if( goto_id ){
+            $.ajax({
+                url: "/" + window.location.pathname.split("/")[1] + "/formset-data-delete/"+ goto_id +"/?next="+ window.location.pathname,
+                error: function () {
+                  console.log("error");
+                },
+                success: function (data) {
+                  $(btn).parents('.item').remove();
+                },
+                type: 'GET'
+            });
+          }else{
+            $(btn).parents('.item').remove();
+          }
+
+          var forms = $('.item'); // Get all the forms
+          // Update the total number of forms (1 less than before)
+          $('#id_' + prefix + '-TOTAL_FORMS').val(forms.length);
+          var i = 0;
+          // Go through the forms and set their indices, names and IDs
+          for (formCount = forms.length; i < formCount; i++) {
+              $(forms.get(i)).find('.formset-field').each(function () {
+                  updateElementIndex(this, prefix, i);
+              });
+          }
+      } // End if
+
+      return false;
+  }
+
+  $("body").on('click', '.remove-form-row',function () {
+    deleteForm($(this), String($('.add-form-row').attr('id')));
+  });
+
+  $("body").on('click', '.add-form-row',function () {
+      return addForm($(this), String($(this).attr('id')));
+  });
 \ No newline at end of file
+<!doctype html>
+<html lang="en">
+{% load widget_tweaks %}
+{% load static %}
+<head>
+  <meta charset="utf-8">
+  <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+  <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
+  <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+  <link rel="stylesheet" href="{% static 'storage/css/document.css' %}">
+</head>
+
+<body>
+
+<div class="ui-widget">
+  <form method="post" action="">
+    {% csrf_token %}
+  
+    <div class="modal-header">
+      <h3 class="modal-title">{{ title }}</h3>
+      <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+      </button>
+    </div>
+    
+    <div class="modal-body">
+      <form method="POST">
+        {% csrf_token %}
+        {{ form.as_p}}
+          
+        {% for form in formset %}
+          <div class="item">
+            {% for field in form %}
+              {% render_field field class="form-control" placeholder=field.label %}</td>
+            {% endfor %}
+            <button type="button" class="btn btn-danger btn-sm remove-form-row"
+                    id="{{ formset.prefix }}">
+                Usuń
+            </button>
+            <br><br>
+          </div>
+        {% endfor %}
+  
+        <button type="button" class="btn btn-sm btn-success add-form-row" id="{{ formset.prefix }}">
+          Dodaj</button>
+
+        {{ formset.management_form }}
+        
+        <div class="modal-footer">
+          <button type="submit" class="submit-btn btn btn-primary">{{ submit_btn_text }}</button>
+        </div>
+        
+      </form>
+    </div>
+    
+  <script type="text/javascript" src="{% static 'storage/js/formset.js' %}"></script>
+
+</body>
+</html>
+
+
+
@@ -42,6 +42,7 @@
       {% for field in form %}
         <div class="form-group">
           <label for="{{ field.id_for_label }}">{{ field.label }}</label>
+          
           {% if field.id_for_label == "id_name" and all_md_names %}
             <div class="used-vals-info">
               <p>Zdefiniowane wcześniej nazwy metadanych:</p>
@@ -52,20 +53,26 @@
               </ul>
             </div>
           {% endif %}
+          
           {% if form.is_bound %}
             {% if field.errors %}
+          
               {% render_field field class="form-control is-invalid" placeholder=field.label %}
               <div class="invalid invalid-feedback">
                 {% for error in field.errors %}
                   <p>{{ error }}</p>
                 {% endfor %}
               </div>
+          
             {% else %}
               {% render_field field class="form-control is-valid" placeholder=field.label %}
+          
             {% endif %}
+          
           {% else %}
             {% render_field field class="form-control" placeholder=field.label %}
           {% endif %}
+          
         </div>
       {% endfor %}
     </div>
@@ -18,7 +18,7 @@ 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/split/<int:pk>', login_required(views.ChunkSplitView.as_view()), name='split_chunk'),
+    path('chunk/split/<int:pk>', login_required(views.split_chunk), 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'),
@@ -14,6 +14,7 @@ from django.contrib.auth.decorators import login_required
 from django.db.models.query import QuerySet
 from django.db.models import Q
 from django.template.loader import render_to_string
+from django.forms import modelformset_factory
  
 from keras import backend
 from sys import maxsize
@@ -75,6 +76,23 @@ def swap_subdocs(direction, subdoc, subdoc_seq, temp_seq, max_seq, parent_doc):
         neighbour.save()
  
  
+def split_chunk(request, pk):
+    context = {}
+    ChunksFormset = modelformset_factory(Chunk, form=ChunkSplitForm)
+    formset = ChunksFormset(request.POST or None, queryset=Chunk.objects.none(), prefix='chunks')
+    if request.method == "POST":
+        if formset.is_valid():
+            for f in formset:
+                # TODO
+                chunk = f.save(commit=False)
+                chunk.save()
+            return redirect('annotation')
+    context['formset'] = formset
+    context['title'] = 'Dzielenie sekcji'
+    context['submit_btn_text'] = 'Podziel'
+    return render(request, 'storage/chunk-split.html', context)
+
+
 class DocumentView(View):
     template_name = 'storage/document.html'
  
@@ -345,37 +363,6 @@ 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'