Merge remote-tracking branch 'origin/master' into feature/improved-tag-stats

app/views/exercise_collections/_add_exercise_modal.slim

@@ -0,0 +1,8 @@
+- exercises = Exercise.order(:title)
+
+form#exercise-selection
+  .form-group
+    span.label = t('activerecord.attributes.exercise_collections.exercises')
+    = collection_select({}, :exercise_ids, exercises, :id, :title, {}, {id: 'add-exercise-list', class: 'form-control', multiple: true})
+
+button.btn.btn-primary#add-exercises = t('exercise_collections.form.add_exercises')

app/views/exercise_collections/_form.html.slim

@@ -1,7 +1,4 @@
-- exercises = Exercise.order(:title)
-- users = InternalUser.order(:name)
-
-= form_for(@exercise_collection, data: {exercises: exercises, users: users}, multipart: true) do |f|
+= form_for(@exercise_collection, multipart: true) do |f|
   = render('shared/form_errors', object: @exercise_collection)
   .form-group
     = f.label(t('activerecord.attributes.exercise_collections.name'))
@@ -11,8 +8,30 @@
     = f.check_box(:use_anomaly_detection, {class: 'form-control'})
   .form-group
     = f.label(t('activerecord.attributes.exercise_collections.user'))
-    = f.collection_select(:user_id, users, :id, :name, {}, {class: 'form-control'})
-  .form-group
-    = f.label(t('activerecord.attributes.exercise_collections.exercises'))
-    = f.collection_select(:exercise_ids, exercises, :id, :title, {}, {class: 'form-control', multiple: true})
+    = f.collection_select(:user_id, InternalUser.order(:name), :id, :name, {}, {class: 'form-control'})
+
+  .table-responsive#exercise-list
+    table.table
+      thead
+        tr
+          th
+          th = t('activerecord.attributes.exercise_collection_item.exercise')
+          th colspan=2 = t('shared.actions')
+      tbody#sortable
+        - @exercise_collection.items.order(:position).each do |item|
+          tr data-id=item.exercise.id
+            td
+              span.fa.fa-bars
+            td = item.exercise.title
+            td = link_to(t('shared.show'), item.exercise)
+            td
+              a.remove-exercise href='#' = t('shared.destroy')
+  .hidden
+    = f.collection_select(:exercise_ids, Exercise.all, :id, :title, {}, {id: 'exercise-select', class: 'form-control', multiple: true})
+  .exercise-actions
+    button.btn.btn-primary type='button' data-toggle='modal' data-target='#add-exercise-modal' = t('exercise_collections.form.add_exercises')
+    button.btn.btn-secondary#sort-button type='button' = t('exercise_collections.form.sort_by_title')
+
   .actions = render('shared/submit_button', f: f, object: @exercise_collection)
+
+= render('shared/modal', id: 'add-exercise-modal', title: t('.add_exercises'), template: 'exercise_collections/_add_exercise_modal')

app/views/exercise_collections/show.html.slim

@@ -8,20 +8,21 @@ h1
 = row(label: 'exercise_collections.updated_at', value: @exercise_collection.updated_at)
 
 h4 = t('activerecord.attributes.exercise_collections.exercises')
-.table-responsive
+.table-responsive#exercise-list
   table.table
     thead
       tr
+        th = '#'
         th = t('activerecord.attributes.exercise.title')
         th = t('activerecord.attributes.exercise.execution_environment')
         th = t('activerecord.attributes.exercise.user')
         th = t('shared.actions')
     tbody
-      - @exercises.sort_by{|c| c.title}.each do |exercise|
+      - @exercise_collection.items.sort_by{|item| item.position}.each do |exercise_collection_item|
+        - exercise = exercise_collection_item.exercise
         tr
+          td = exercise_collection_item.position
           td = link_to(exercise.title, exercise)
           td = link_to_if(exercise.execution_environment && policy(exercise.execution_environment).show?, exercise.execution_environment, exercise.execution_environment)
           td = exercise.user.name
           td = link_to(t('shared.statistics'), statistics_exercise_path(exercise))
-        
-= render('shared/pagination', collection: @exercises)

app/views/exercise_collections/statistics.html.slim

@@ -6,7 +6,7 @@ h1 = @exercise_collection
 = row(label: 'exercises.statistics.average_worktime', value: @exercise_collection.average_working_time.round(3).to_s + 's')
 
 #graph
-  #data.hidden(data-working-times=ActiveSupport::JSON.encode(@exercise_collection.exercise_working_times) data-average-working-time=@exercise_collection.average_working_time)
+  #data.hidden(data-working-times=ActiveSupport::JSON.encode(@exercise_collection.collection_statistics) data-average-working-time=@exercise_collection.average_working_time)
   #legend
     - {time: t('exercises.statistics.average_worktime'),
         min: 'min. anomaly threshold',