htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow to order exercises in collection by title

Browse Source
This commit is contained in:
Maximilian Grundke
2018-07-20 11:39:00 +02:00
parent 43a220ddc8
commit 7f18d844db
5 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/assets/javascripts/exercise_collections.js.erb
View File

@@ -147,31 +147,47 @@ $(function() {
var addExercisesForm = $('#exercise-selection');
var addExercisesButton = $('#add-exercises');
var removeExerciseButtons = $('.remove-exercise');
var sortButton = $('#sort-button');
var collectContainedExercises = function () {
return exerciseList.find('tbody > tr').toArray().map(function (item) {return $(item).data('id')});
}
var sortExercises = function() {
var listitems = $('tr', list);
listitems.sort(function (a, b) {
return ($(a).find('td:nth-child(2)').text().toUpperCase() > $(b).find('td:nth-child(2)').text().toUpperCase()) ? 1 : -1;
});
list.append(listitems);
list.sortable('refresh');
updateExerciseList();
}
var addExercise = function (id, title) {
var exercise = {id: id, title: title}
var collectionExercises = collectContainedExercises();
if (collectionExercises.indexOf(exercise.id) === -1) {
// only add exercises that are not already contained in the collection
var template = '<tr data-id="' + exercise.id + '">' +
'<td><span class="fa fa-bars"></span></td>' +
'<td>' + exercise.title + '</td>' +
'<td><a href="/exercises/' + exercise.id + '"><%= I18n.t('shared.show') %></td>' +
'<td><a class="remove-exercise" href="#"><%= I18n.t('shared.destroy') %></td></tr>';
exerciseList.find('tbody').append(template);
$('#exercise-list').find('option[value="' + exercise.id + '"]').prop('selected', true);
}
}
addExercisesButton.on('click', function (e) {
e.preventDefault();
var collectionExercises = collectContainedExercises();
var selectedExercises = addExercisesForm.find('select')[0].selectedOptions;
for (var i = 0; i < selectedExercises.length; i++) {
var exercise = {id: selectedExercises[i].value, title: selectedExercises[i].label}
if (collectionExercises.indexOf(exercise.id) === -1) {
// only add exercises that are not already contained in the collection
var template = '<tr data-id="' + exercise.id + '">' +
'<td><span class="fa fa-bars"></span></td>' +
'<td>' + exercise.title + '</td>' +
'<td><a href="/exercises/' + exercise.id + '"><%= I18n.t('shared.show') %></td>' +
'<td><a class="remove-exercise" href="#"><%= I18n.t('shared.destroy') %></td></tr>';
exerciseList.find('tbody').append(template);
$('#exercise-list').find('option[value="' + exercise.id + '"]').prop('selected', true);
}
addExercise(selectedExercises[i].value, selectedExercises[i].label);
}
});
$('.remove-exercise').on('click', function (e) {
removeExerciseButtons.on('click', function (e) {
e.preventDefault();
var row = $(this).parent().parent();
@@ -179,6 +195,11 @@ $(function() {
$('#exercise-list').find('option[value="' + exerciseId + '"]').prop('selected', false);
row.remove()
});
sortButton.on('click', function (e) {
e.preventDefault();
sortExercises();
});
}
}
});

4
app/assets/stylesheets/exercise_collections.scss
View File

@@ -75,3 +75,7 @@ rect.value-bar {
#add-exercise-list {
min-height: 450px;
}
button {
margin-right: 10px;
}

1
app/views/exercise_collections/_form.html.slim
View File

@@ -27,6 +27,7 @@
td
a.remove-exercise href='#' = t('shared.destroy')
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')
.hidden
= f.collection_select(:exercise_ids, Exercise.all, :id, :title, {}, {id: 'exercise-select', class: 'form-control', multiple: true})