ifl/iflrandevu
1
1
Fork 0
forked from mirrors/easyappointments
Code Issues 6 Pull requests Releases 3 Activity

Merge branch 'develop' of https://github.com/p0zi/easyappointments into p0zi-develop

Browse source
This commit is contained in:
alextselegidis 2016-10-23 21:44:57 +02:00
commit 2a775bcfb6
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/assets/js/working_plan.js
View file

@ -283,21 +283,25 @@
* Save the editable values and restore the table to its initial state. * Save the editable values and restore the table to its initial state.
* *
* @param {jQuery.Event} e * @param {jQuery.Event} e
*
* @todo: Prevent from adding interrelated breaks
*/ */
$(document).on('click', '.save-break', function(e) { $(document).on('click', '.save-break', function(e) {
// Break's start time must always be prior to break's end. // Break's start time must always be prior to break's end.
var element = e.target, var element = e.target,
start = Date.parse($(element).parent().parent().find('.break-start input').val()), $editedTr = $(element).closest('tr'),
end = Date.parse($(element).parent().parent().find('.break-end input').val()); start = Date.parse($editedTr.find('.break-start input').val()),
end = Date.parse($editedTr.find('.break-end input').val());
if (start > end) { if (start > end) {
$(element).parent().parent().find('.break-end input').val(start.addHours(1).toString('HH:mm')); $editedTr.find('.break-end input').val(start.addHours(1).toString('HH:mm'));
} }
this.enableSubmit = true; this.enableSubmit = true;
$(element).parent().parent().find('.editable .submit-editable').trigger('click'); $editedTr.find('.editable .submit-editable').trigger('click');
this.enableSubmit = false; this.enableSubmit = false;
$(element).parent().find('.save-break, .cancel-break').addClass('hidden'); $editedTr.find('.save-break, .cancel-break').addClass('hidden');
$(element).closest('table').find('.edit-break, .delete-break').removeClass('hidden'); $(element).closest('table').find('.edit-break, .delete-break').removeClass('hidden');
$('.add-break').prop('disabled', false); $('.add-break').prop('disabled', false);
}.bind(this)); }.bind(this));
@ -307,6 +311,8 @@
* Get the working plan settings. * Get the working plan settings.
* *
* @return {Object} Returns the working plan settings object. * @return {Object} Returns the working plan settings object.
*
* @todo: Add sorting by range within day breaks
*/ */
WorkingPlan.prototype.get = function() { WorkingPlan.prototype.get = function() {
var workingPlan = {}; var workingPlan = {};
@ -329,6 +335,11 @@
'end': end 'end': end
}); });
} }
workingPlan[id].breaks.sort(function(break1, break2) {
// We can do a direct string comparison since we have time based on 24 hours clock
return break1.start - break2.start;
});
}.bind(this)); }.bind(this));
} else { } else {
workingPlan[id] = null; workingPlan[id] = null;
@ -444,4 +455,4 @@
window.WorkingPlan = WorkingPlan; window.WorkingPlan = WorkingPlan;
})(); })();