Allow slides drag-drop between sessions for groups meeting with multiple sessions. Fixes ietf-tools#2700. Commit ready to merge.

 - Legacy-Id: 17024

Author: rjsparks

ietf/externals/static/Sortable/Sortable.min.js

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
+# Copyright The IETF Trust 2007-2019, All Rights Reserved
 
 from django.conf.urls import include
 from django.views.generic import RedirectView
@@ -15,7 +15,9 @@
     url(r'^session/(?P<session_id>\d+)/agenda$', views.upload_session_agenda),
     url(r'^session/(?P<session_id>\d+)/propose_slides$', views.propose_session_slides),
     url(r'^session/(?P<session_id>\d+)/slides(?:/%(name)s)?$' % settings.URL_REGEXPS, views.upload_session_slides),
-    url(r'^session/(?P<session_id>\d+)/slides/%(name)s/order$' % settings.URL_REGEXPS, views.set_slide_order),
+    url(r'^session/(?P<session_id>\d+)/add_to_session$', views.ajax_add_slides_to_session),
+    url(r'^session/(?P<session_id>\d+)/remove_from_session$', views.ajax_remove_slides_from_session),
+    url(r'^session/(?P<session_id>\d+)/reorder_in_session$', views.ajax_reorder_slides_in_session),
     url(r'^session/(?P<session_id>\d+)/doc/%(name)s/remove$' % settings.URL_REGEXPS, views.remove_sessionpresentation),
     url(r'^session/(?P<session_id>\d+)\.ics$',    views.ical_agenda),
     url(r'^sessions/(?P<acronym>[-a-z0-9]+)\.ics$', views.ical_agenda),

ietf/meeting/tests_views.py

@@ -19,6 +19,7 @@
 from ietf.group.utils import can_manage_materials
 from ietf.person.models import Email
 from ietf.secr.proceedings.proc_utils import import_audio_files
+from ietf.utils.log import unreachable
 
 def group_sessions(sessions):
 
@@ -178,3 +179,15 @@ def sort_accept_tuple(accept):
             tup.append((keys[0], q))
         return sorted(tup, key = lambda x: float(x[1]), reverse = True)
     return tup
+
+
+
+def condition_slide_order(session):
+    qs = session.sessionpresentation_set.filter(document__type_id='slides').order_by('order')
+    order_list = qs.values_list('order',flat=True)
+    #assertion('list(order_list) == range(1,qs.count()+1)')
+    if list(order_list) != range(1,qs.count()+1):
+        for num, sp in enumerate(qs, start=1):
+            sp.order=num
+            sp.save()
+        unreachable('2019-11-15')

ietf/meeting/urls.py

@@ -34,7 +34,7 @@
 from django.core.exceptions import ValidationError
 from django.core.validators import URLValidator
 from django.urls import reverse,reverse_lazy
-from django.db.models import Min, Max, Q
+from django.db.models import Min, Max, Q, F
 from django.forms.models import modelform_factory, inlineformset_factory
 from django.template import TemplateDoesNotExist
 from django.template.loader import render_to_string
@@ -67,8 +67,7 @@
 from ietf.meeting.helpers import send_interim_cancellation_notice
 from ietf.meeting.helpers import send_interim_approval_request
 from ietf.meeting.helpers import send_interim_announcement_request
-from ietf.meeting.utils import finalize
-from ietf.meeting.utils import sort_accept_tuple
+from ietf.meeting.utils import finalize, sort_accept_tuple, condition_slide_order
 from ietf.message.utils import infer_message
 from ietf.secr.proceedings.utils import handle_upload_file
 from ietf.secr.proceedings.proc_utils import (get_progress_stats, post_process, import_audio_files,
@@ -1663,31 +1662,119 @@ def remove_sessionpresentation(request, session_id, num, name):
 
     return render(request,'meeting/remove_sessionpresentation.html', {'sp': sp })
 
-def set_slide_order(request, session_id, num, name):
-    # num is redundant, but we're dragging it along an artifact of where we are in the current URL structure
+def ajax_add_slides_to_session(request, session_id, num):
     session = get_object_or_404(Session,pk=session_id)
-    if not Document.objects.filter(type_id='slides',name=name).exists():
-        raise Http404
+
     if not session.can_manage_materials(request.user):
         return HttpResponseForbidden("You don't have permission to upload slides for this session.")
     if session.is_material_submission_cutoff() and not has_role(request.user, "Secretariat"):
         return HttpResponseForbidden("The materials cutoff for this session has passed. Contact the secretariat for further action.")
 
     if request.method != 'POST' or not request.POST:
         return HttpResponse(json.dumps({ 'success' : False, 'error' : 'No data submitted or not POST' }),content_type='application/json')
-    order_str = request.POST.get('order', None)
+
+    order_str = request.POST.get('order', None)    
     try:
         order = int(order_str)
-    except ValueError:
+    except (ValueError, TypeError):
         return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied order is not valid' }),content_type='application/json')
-    if order <=0 or order > 32767 :
+    if order < 1 or order > session.sessionpresentation_set.filter(document__type_id='slides').count() + 1 :
         return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied order is not valid' }),content_type='application/json')
-    
-    sp = session.sessionpresentation_set.get(document__name = name)
-    sp.order = order
+
+    name = request.POST.get('name', None)
+    doc = Document.objects.filter(name=name).first()
+    if not doc:
+        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied name is not valid' }),content_type='application/json')
+
+    if not session.sessionpresentation_set.filter(document=doc).exists():
+        condition_slide_order(session)
+        session.sessionpresentation_set.filter(document__type_id='slides', order__gte=order).update(order=F('order')+1)
+        session.sessionpresentation_set.create(document=doc,rev=doc.rev,order=order)
+        DocEvent.objects.create(type="added_comment", doc=doc, rev=doc.rev, by=request.user.person, desc="Added to session: %s" % session)
+
+    return HttpResponse(json.dumps({'success':True}), content_type='application/json')
+
+
+def ajax_remove_slides_from_session(request, session_id, num):
+    session = get_object_or_404(Session,pk=session_id)
+
+    if not session.can_manage_materials(request.user):
+        return HttpResponseForbidden("You don't have permission to upload slides for this session.")
+    if session.is_material_submission_cutoff() and not has_role(request.user, "Secretariat"):
+        return HttpResponseForbidden("The materials cutoff for this session has passed. Contact the secretariat for further action.")
+
+    if request.method != 'POST' or not request.POST:
+        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'No data submitted or not POST' }),content_type='application/json')  
+
+    oldIndex_str = request.POST.get('oldIndex', None)
+    try:
+        oldIndex = int(oldIndex_str)
+    except (ValueError, TypeError):
+        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
+    if oldIndex < 1 or oldIndex > session.sessionpresentation_set.filter(document__type_id='slides').count() :
+        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
+
+    name = request.POST.get('name', None)
+    doc = Document.objects.filter(name=name).first()
+    if not doc:
+        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied name is not valid' }),content_type='application/json')
+
+    condition_slide_order(session)
+    affected_presentations = session.sessionpresentation_set.filter(document=doc).first()
+    if affected_presentations:
+        if affected_presentations.order == oldIndex:
+            affected_presentations.delete()
+            session.sessionpresentation_set.filter(document__type_id='slides', order__gt=oldIndex).update(order=F('order')-1)    
+            DocEvent.objects.create(type="added_comment", doc=doc, rev=doc.rev, by=request.user.person, desc="Removed from session: %s" % session)
+            return HttpResponse(json.dumps({'success':True}), content_type='application/json')
+        else:
+            return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Name does not match index' }),content_type='application/json')
+    else:
+        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'SessionPresentation not found' }),content_type='application/json')
+
+
+def ajax_reorder_slides_in_session(request, session_id, num):
+    session = get_object_or_404(Session,pk=session_id)
+
+    if not session.can_manage_materials(request.user):
+        return HttpResponseForbidden("You don't have permission to upload slides for this session.")
+    if session.is_material_submission_cutoff() and not has_role(request.user, "Secretariat"):
+        return HttpResponseForbidden("The materials cutoff for this session has passed. Contact the secretariat for further action.")
+
+    if request.method != 'POST' or not request.POST:
+        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'No data submitted or not POST' }),content_type='application/json')  
+
+    num_slides_in_session = session.sessionpresentation_set.filter(document__type_id='slides').count()
+    oldIndex_str = request.POST.get('oldIndex', None)
+    try:
+        oldIndex = int(oldIndex_str)
+    except (ValueError, TypeError):
+        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
+    if oldIndex < 1 or oldIndex > num_slides_in_session :
+        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
+
+    newIndex_str = request.POST.get('newIndex', None)
+    try:
+        newIndex = int(newIndex_str)
+    except (ValueError, TypeError):
+        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
+    if newIndex < 1 or newIndex > num_slides_in_session :
+        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
+
+    if newIndex == oldIndex:
+        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
+
+    condition_slide_order(session)
+    sp = session.sessionpresentation_set.get(order=oldIndex)
+    if oldIndex < newIndex:
+        session.sessionpresentation_set.filter(order__gt=oldIndex, order__lte=newIndex).update(order=F('order')-1)
+    else:
+        session.sessionpresentation_set.filter(order__gte=newIndex, order__lt=oldIndex).update(order=F('order')+1)
+    sp.order = newIndex
     sp.save()
 
-    return HttpResponse(json.dumps({'success':True}),content_type='application/json')
+    return HttpResponse(json.dumps({'success':True}), content_type='application/json')
+
 
 @role_required('Secretariat')
 def make_schedule_official(request, num, owner, name):

ietf/meeting/utils.py

@@ -61,16 +61,15 @@ <h1>{{ meeting }} : {{ acronym }}
 
 {% endblock %}
 
-{# TODO don't rely on secr/js version of jquery-ui #}
-{# Sorting based loosely on the original secr upload sorting and on http://www.avtex.com/blog/2015/01/27/drag-and-drop-sorting-of-table-rows-in-priority-order/ #}
 {% block js %}
 {% if can_manage_materials %}
   <script type="text/javascript" src="{% static 'jquery/jquery.min.js' %}"></script>
-  <script type="text/javascript" src="{% static 'secr/js/jquery-ui-1.11.4.custom.min.js' %}"></script>
   <script type="text/javascript" src="{% static 'jquery.cookie/jquery.cookie.js' %}"></script>
+  <script type="text/javascript" src={% static 'Sortable/Sortable.min.js' %}></script>
 
   <script type="text/javascript">
 
+
     $.ajaxSetup({
       crossDomain: false, 
       beforeSend: function(xhr, settings) {
@@ -80,33 +79,53 @@ <h1>{{ meeting }} : {{ acronym }}
       }
     });
 
-    $(document).ready(function() {
-      var rowWidthHelper = function (e, tr) {
-        var $originals = tr.children();
-        var $helper = tr.clone();
-        $helper.children().each(function(index)
-        {
-          $(this).width($originals.eq(index).width())
-        });
-        return $helper;
-      };
 
-      $(".slides tbody").sortable({
-        helper: rowWidthHelper,
-        stop: function(event,ui) {adjustDatabase(ui.item.parent())}
-      }).disableSelection();
-    });
+    var sortables=[];
+    var options = {
+      group: "slides",
+      animation: 150,
+      onAdd: function(event) {onAdd(event)},
+      onRemove: function(event) {onRemove(event)},
+      onEnd: function(event) {onEnd(event)}
+    };
+
+    function onAdd(event) {
+      var old_session = event.from.getAttribute("session");
+      var new_session = event.to.getAttribute("session");
+      $.post(event.to.getAttribute("addToSession"), {
+        'order': event.newIndex + 1,
+        'name': event.item.getAttribute("name")
+      });
+      $(event.item).find("td:eq(1)").find("a").each(function(){
+        $(this).attr("href", $(this).attr("href").replace(old_session,new_session) );
+      });
+    }
 
-    function adjustDatabase(tbody) {
-      tbody.find('tr').each(function() {
-        count = $(this).parent().children().index($(this)) + 1;
-        old_order = $(this).attr("data-order");
-        if ( count != old_order ) {
-          $(this).attr("data-order", count);
-          $.post($(this).attr("data-url"),{'order':count});
-        }
+    function onRemove(event) {
+      var old_session = event.from.getAttribute("session");
+      $.post(event.from.getAttribute("removeFromSession"),{
+        'oldIndex': event.oldIndex + 1,
+        'name': event.item.getAttribute("name")
       });
     }
+
+    function onEnd(event) {
+      if (event.to == event.from) {
+        $.post(event.from.getAttribute("reorderInSession"),{
+          'oldIndex': event.oldIndex + 1,
+          'newIndex': event.newIndex + 1
+        });
+      }
+    }
+
+    $(document).ready(function() {
+
+      $(".slides tbody").each(function() {
+        sortables.push(Sortable.create(this, options));
+      });
+
+    });
+
   </script>
 
 {% endif %}

ietf/meeting/views.py

@@ -66,9 +66,9 @@ <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1
       <div class="panel-heading" data-toggle="tooltip" title="Drag and drop to reorder slides">Slides</div>
       <div class="panel-body">
         <table class="table table-condensed table-striped slides" id="slides_{{session.pk}}">
-         <tbody>
+         <tbody session="{{session.pk}}" addToSession="{% url 'ietf.meeting.views.ajax_add_slides_to_session' session_id=session.pk num=session.meeting.number %}" removeFromSession="{% url 'ietf.meeting.views.ajax_remove_slides_from_session' session_id=session.pk num=session.meeting.number %}" reorderInSession="{% url 'ietf.meeting.views.ajax_reorder_slides_in_session' session_id=session.pk num=session.meeting.number %}">
           {% for pres in session.filtered_slides %}
-            <tr data-order="{{pres.order}}" data-url="{% url 'ietf.meeting.views.set_slide_order' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
+            <tr name="{{pres.document.name}}">
               {% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
               <td>
                 <a href="{{pres.document.href}}">{{pres.document.title}} </a>