Correct splitting chunks feature

Marcel Kawski
1 parent 699a3d93
Showing 5 changed files with 87 additions and 55 deletions
collector/storage/forms.py
collector/storage/static/storage/css/document.css
collector/storage/static/storage/js/formset.js
collector/storage/templates/storage/chunk-split.html
collector/storage/views.py
@@ -378,13 +378,12 @@ class ChunkMergeForm(ModelForm):
         fields = ['target_chunk']
  
  
-class ChunkSplitForm(ModelForm):
-
-    class Meta:
-        model = Chunk
-
-        fields = ['text']
-
-        labels = {
-            'text': 'Tekst nowej sekcji'
-        }
+class ChunkSplitForm(Form):
+    text = CharField(required=True)
+
+    def __init__(self, initial_text, *args, **kwargs):
+        super(ChunkSplitForm, self).__init__(*args, **kwargs)
+        self.fields['text'].initial = initial_text
+        self.fields['text'].widget = Textarea(attrs={'class': 'formset-field',
+                                                     'placeholder': 'Tekst sekcji',
+                                                     'rows': 5})
@@ -168,6 +168,15 @@ a.nav-button:hover {
   color: #ff6600;
 }
  
+i.remove-form-row {
+    color: red;
+    cursor: pointer;
+}
+
+i.remove-form-row:hover {
+    color: #870000;
+}
+
 .col-actions {
     width: 5%;
 }
@@ -212,6 +221,14 @@ a.nav-button:hover {
     width: 10%;
 }
  
+.col-remove {
+    width: 3%;
+}
+
+tr.item textarea {
+    width: 100%;
+}
+
 #doc-list-table {
     table-layout: fixed;
 }
 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).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
+    if (formCount < 3) {
         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;
 }
@@ -45,11 +32,11 @@ function addForm(btn, prefix) {
 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,
+                url: "/" + window.location.pathname.split("/")[1] + "/formset-data-delete/" + goto_id +
+                    "/?next=" + window.location.pathname,
                 error: function () {
                   console.log("error");
                 },
@@ -62,17 +49,15 @@ function deleteForm(btn, prefix) {
             $(btn).parents('.item').remove();
           }
  
-          var forms = $('.item'); // Get all the forms
-          // Update the total number of forms (1 less than before)
+          var forms = $('.item');
           $('#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;
   }
@@ -24,29 +24,39 @@
     </div>
  
     <div class="modal-body">
+      
+      <div class="alert alert-warning text-center" role="alert"><strong>Uwaga!</strong> Zamknięcie formularza nie spodowuje zapisania
+        zmian. W razie pomyłki lub nieumyślnego usunięcia sekcji zamknij to okno.</div>
+      
       <form method="POST">
         {% csrf_token %}
         {{ form.as_p}}
+        
+        <table class="table">
  
-        {% for form in formset %}
-          <div class="item">
-            {% for field in form %}
-              {% render_field field class="form-control" placeholder=field.label %}</td>
+          <tbody>
+            {% for form in formset %}
+              <tr class="item">
+                {% for field in form %}
+                  <td class="col-field">
+                    {{ field }}
+                  </td>
+                {% endfor %}
+                <td class="col-remove">
+                  <i class="remove-form-row material-icons" id="{{ formset.prefix }}" title="Usuń sekcję">clear</i>
+                </td>
+              </tr>
             {% 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>
+          </tbody>
+          
+        </table>
  
         {{ formset.management_form }}
  
         <div class="modal-footer">
+          <button type="button" class="btn btn-sm btn-success add-form-row mr-auto" id="{{ formset.prefix }}">
+            Dodaj sekcję <i class="material-icons def-col-button">add</i>
+          </button>
           <button type="submit" class="submit-btn btn btn-primary">{{ submit_btn_text }}</button>
         </div>
  
@@ -14,10 +14,12 @@ 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 django.forms import modelformset_factory, formset_factory
+from django.db import transaction, IntegrityError
  
 from keras import backend
 from sys import maxsize
+from functools import partial, wraps
  
 from .forms import ChunkForm, ParticipantForm, SubchunkForm, MetadataForm, DocDetailsForm, KeywordForm, DocSplitForm, \
     ChunkMoveForm, SubDocDetailsForm, AuthorForm, ChunkMergeForm, ChunkSplitForm
@@ -78,18 +80,37 @@ def swap_subdocs(direction, subdoc, subdoc_seq, temp_seq, max_seq, parent_doc):
  
 def split_chunk(request, pk):
     context = {}
-    ChunksFormset = modelformset_factory(Chunk, form=ChunkSplitForm)
-    formset = ChunksFormset(request.POST or None, queryset=Chunk.objects.none(), prefix='chunks')
+    chunk = Chunk.objects.get(pk=pk)
+    ChunksFormset = formset_factory(wraps(ChunkSplitForm)(partial(ChunkSplitForm, initial_text=chunk.text)))
+    formset = ChunksFormset(request.POST or 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')
+        chunk_document_id = chunk.document.id
+        formset_len = len(formset)
+        if formset_len > 1 and formset.is_valid() and not request.is_ajax():
+            next_chunks = Chunk.objects.filter(document=chunk.document,
+                                               sequence__gt=chunk.sequence).order_by('-sequence')
+            for ch in next_chunks:
+                ch.sequence += formset_len - 1
+                ch.save()
+            old_chunk = Chunk.objects.create(text=formset[0].data['chunks-0-text'],
+                                             document=chunk.document,
+                                             sequence=chunk.sequence)
+            old_chunk.save()
+            for num, f in enumerate(formset[1:]):
+                ch = Chunk.objects.create(text=f.cleaned_data['text'],
+                                          document=chunk.document,
+                                          sequence=chunk.sequence + num + 1)
+                ch.save()
+            chunk.delete()
+            return HttpResponseRedirect('%s#chunk-%d' % (
+                reverse_lazy('annotation', kwargs={'doc_id': chunk_document_id}), old_chunk.pk))
+        else:
+            messages.error(request, 'Błąd: Nieprawidłowy podział sekcji')
+            return HttpResponseRedirect(reverse('annotation', kwargs={'doc_id': chunk_document_id}))
     context['formset'] = formset
     context['title'] = 'Dzielenie sekcji'
     context['submit_btn_text'] = 'Podziel'
+    formset.data['chunks-TOTAL_FORMS'] = 0
     return render(request, 'storage/chunk-split.html', context)