Fix working plan exception breaks handling
This commit is contained in:
parent
1cb5a2288c
commit
08908e5ad6
1 changed files with 25 additions and 20 deletions
|
@ -48,7 +48,7 @@ App.Components.WorkingPlanExceptionsModal = (function () {
|
||||||
*/
|
*/
|
||||||
function renderNoBreaksRow() {
|
function renderNoBreaksRow() {
|
||||||
return $(`
|
return $(`
|
||||||
<tr>
|
<tr class="no-breaks-row">
|
||||||
<td colspan="3" class="text-center">
|
<td colspan="3" class="text-center">
|
||||||
${lang('no_breaks')}
|
${lang('no_breaks')}
|
||||||
</td>
|
</td>
|
||||||
|
@ -66,7 +66,7 @@ App.Components.WorkingPlanExceptionsModal = (function () {
|
||||||
$end.prop('disabled', isNonWorkingDay).toggleClass('text-decoration-line-through', isNonWorkingDay);
|
$end.prop('disabled', isNonWorkingDay).toggleClass('text-decoration-line-through', isNonWorkingDay);
|
||||||
$addBreak.prop('disabled', isNonWorkingDay);
|
$addBreak.prop('disabled', isNonWorkingDay);
|
||||||
$breaks.find('button').prop('disabled', isNonWorkingDay);
|
$breaks.find('button').prop('disabled', isNonWorkingDay);
|
||||||
$breaks.toggleClass('text-decoration-line-through', isNonWorkingDay)
|
$breaks.toggleClass('text-decoration-line-through', isNonWorkingDay);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -115,7 +115,10 @@ App.Components.WorkingPlanExceptionsModal = (function () {
|
||||||
function getBreaks() {
|
function getBreaks() {
|
||||||
const breaks = [];
|
const breaks = [];
|
||||||
|
|
||||||
$breaks.find('tbody tr').each((index, tr) => {
|
$breaks
|
||||||
|
.find('tbody tr')
|
||||||
|
.not('.no-breaks-row')
|
||||||
|
.each((index, tr) => {
|
||||||
const $tr = $(tr);
|
const $tr = $(tr);
|
||||||
|
|
||||||
if ($tr.find('input:text').length) {
|
if ($tr.find('input:text').length) {
|
||||||
|
@ -158,7 +161,9 @@ App.Components.WorkingPlanExceptionsModal = (function () {
|
||||||
|
|
||||||
const isNonWorkingDay = $isNonWorkingDay.prop('checked');
|
const isNonWorkingDay = $isNonWorkingDay.prop('checked');
|
||||||
|
|
||||||
const workingPlanException = isNonWorkingDay ? null : {
|
const workingPlanException = isNonWorkingDay
|
||||||
|
? null
|
||||||
|
: {
|
||||||
start: moment($start[0]._flatpickr.selectedDates[0]).format('HH:mm'),
|
start: moment($start[0]._flatpickr.selectedDates[0]).format('HH:mm'),
|
||||||
end: moment($end[0]._flatpickr.selectedDates[0]).format('HH:mm'),
|
end: moment($end[0]._flatpickr.selectedDates[0]).format('HH:mm'),
|
||||||
breaks: getBreaks()
|
breaks: getBreaks()
|
||||||
|
|
Loading…
Reference in a new issue