From 287ff9bebc95d5d5879a4c62169b1d54e09eec64 Mon Sep 17 00:00:00 2001 From: daitingting Date: Wed, 17 Jan 2024 08:38:18 +0000 Subject: [PATCH] * Move onDateChange in common. --- module/program/js/common.ui.js | 22 +++++++++++++++++++++- module/program/js/create.ui.js | 16 ---------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/module/program/js/common.ui.js b/module/program/js/common.ui.js index 4255d6207d..37bf81ce78 100644 --- a/module/program/js/common.ui.js +++ b/module/program/js/common.ui.js @@ -321,8 +321,28 @@ window.budgetOverrunTips = function(e) window.ignoreTip = function(obj) { var parentID = obj.parentNode.id; - $('#' + parentID).closest('.form-row').remove(); + + $('#' + parentID).addClass('hidden'); if(parentID == 'dateTip') window.ignoreTips['dateTip'] = true; if(parentID == 'beyondBudgetTip') window.ignoreTips['beyondBudgetTip'] = true; } + +window.onDateChange = () => +{ + if(window.ignoreTips['dateTip']) return; + + let programBegin = $('[name=begin]').val(); + let programEnd = $('[name=end]').val(); + const ignoreBtn = "" + ignore + ""; + + if(programBegin && parentBeginDate && new Date(parentBeginDate) > new Date(programBegin)) + { + $('#dateTip').html(beginLessThanParent + parentBeginDate + ignoreBtn).removeClass('hidden'); + } + + if(programEnd && parentEndDate && new Date(parentEndDate) < new Date(programEnd)) + { + $('#dateTip').html(endGreatThanParent + parentEndDate + ignoreBtn).removeClass('hidden'); + } +}; diff --git a/module/program/js/create.ui.js b/module/program/js/create.ui.js index 13c688b005..5e6635e609 100644 --- a/module/program/js/create.ui.js +++ b/module/program/js/create.ui.js @@ -16,19 +16,3 @@ window.onAclChange = () => { $('[data-name=whitelist]').toggleClass('hidden', $('#aclopen').prop('checked')); }; - -window.onDateChange = () => -{ - let programBegin = $('[name=begin]').val(); - let programEnd = $('[name=end]').val(); - - if(programBegin && parentBeginDate && new Date(parentBeginDate) > new Date(programBegin)) - { - $('#beginTip').text(beginLessThanParent + parentBeginDate).removeClass('hidden'); - } - - if(programEnd && parentEndDate && new Date(parentEndDate) < new Date(programEnd)) - { - $('#beginTip').text(endGreatThanParent + parentEndDate).removeClass('hidden'); - } -};