diff --git a/module/program/js/common.ui.js b/module/program/js/common.ui.js index d7d57092e5..6a318624a1 100644 --- a/module/program/js/common.ui.js +++ b/module/program/js/common.ui.js @@ -332,15 +332,18 @@ window.onDateChange = () => let programBegin = $('[name=begin]').val(); let programEnd = $('[name=end]').val(); + let parentBegin = $('[data-name=parent]').data('parentBegin'); + let parentEnd = $('[data-name=parent]').data('parentEnd'); + const ignoreBtn = "" + ignore + ""; - if(programBegin && parentBeginDate && new Date(parentBeginDate) > new Date(programBegin)) + if(programBegin && parentBegin && new Date(parentBegin) > new Date(programBegin)) { - $('#dateTip').html(beginLessThanParent + parentBeginDate + ignoreBtn).removeClass('hidden'); + $('#dateTip').html(beginLessThanParent + parentBegin + ignoreBtn).removeClass('hidden'); } - if(programEnd && parentEndDate && new Date(parentEndDate) < new Date(programEnd)) + if(programEnd && parentEnd && new Date(parentEnd) < new Date(programEnd)) { - $('#dateTip').html(endGreatThanParent + parentEndDate + ignoreBtn).removeClass('hidden'); + $('#dateTip').html(endGreatThanParent + parentEnd + ignoreBtn).removeClass('hidden'); } }; diff --git a/module/program/ui/common.field.php b/module/program/ui/common.field.php index c5506b68b3..e0e3f76a0d 100644 --- a/module/program/ui/common.field.php +++ b/module/program/ui/common.field.php @@ -6,7 +6,9 @@ $fields = defineFieldList('program'); $fields->field('parent') ->items(data('parents')) - ->value(data('parentProgram.id')); + ->value(data('parentProgram.id')) + ->data('parentBegin', data('parentProgram.begin')) + ->data('parentEnd', data('parentProgram.end')); $fields->field('name') ->wrapBefore(true); diff --git a/module/program/ui/create.html.php b/module/program/ui/create.html.php index 300fb151bd..b9b073b5ea 100644 --- a/module/program/ui/create.html.php +++ b/module/program/ui/create.html.php @@ -14,8 +14,6 @@ jsVar('endGreatThanParent', $lang->program->endGreatThanParent); jsVar('ignore', $lang->program->ignore); jsVar('currencySymbol', $lang->project->currencySymbol); jsVar('budgetOverrun', $lang->project->budgetOverrun); -jsVar('parentBeginDate', $parentProgram ? $parentProgram->begin : ''); -jsVar('parentEndDate', $parentProgram ? $parentProgram->end : ''); jsVar('parentBudgetData', $parentProgram ? $parentProgram->budget : ''); $fields = useFields('program.create'); diff --git a/module/program/ui/edit.html.php b/module/program/ui/edit.html.php index dfe1a681ce..1342c0384b 100644 --- a/module/program/ui/edit.html.php +++ b/module/program/ui/edit.html.php @@ -15,8 +15,6 @@ jsVar('endGreatThanParent', $lang->program->endGreatThanParent); jsVar('ignore', $lang->program->ignore); jsVar('currencySymbol', $lang->project->currencySymbol); jsVar('budgetOverrun', $lang->project->budgetOverrun); -jsVar('parentBeginDate', zget($parentProgram, 'begin', '')); -jsVar('parentEndDate', zget($parentProgram, 'end', '')); jsVar('parentBudgetData', zget($parentProgram, 'budget', '')); $fields = useFields('program.edit');