From 49d654cabce2960a3939db4fc3bb8562ee82dd34 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Tue, 16 Aug 2022 05:37:22 +0000
Subject: [PATCH] * Finish task #64888.

---
 module/program/css/common.css          |  2 ++
 module/program/js/common.js            | 40 +++++++++++++++++++++-----
 module/program/lang/de.php             |  1 +
 module/program/lang/en.php             |  1 +
 module/program/lang/fr.php             |  1 +
 module/program/lang/zh-cn.php          |  1 +
 module/program/view/create.html.php    |  1 +
 module/program/view/edit.html.php      |  1 +
 module/project/css/common.css          |  2 ++
 module/project/js/common.js            | 33 ++++++++++++++++++---
 module/project/lang/de.php             |  1 +
 module/project/lang/en.php             |  3 +-
 module/project/lang/fr.php             |  1 +
 module/project/lang/zh-cn.php          |  1 +
 module/project/view/batchedit.html.php |  1 +
 module/project/view/create.html.php    |  3 +-
 module/project/view/edit.html.php      |  1 +
 17 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/module/program/css/common.css b/module/program/css/common.css
index c7dfdc44b7..d89c4f4a95 100644
--- a/module/program/css/common.css
+++ b/module/program/css/common.css
@@ -1,3 +1,5 @@
 .future {display: inline-block;}
 .c-number {overflow: hidden; text-align: right !important; text-overflow: ellipsis; white-space: nowrap;}
 .text-remind {color: #ffa34d;}
+.text-remind p{float: left; margin-right: 5px;}
+#ignore {text-decoration: underline; cursor: pointer; color: #ef7b0f;}
diff --git a/module/program/js/common.js b/module/program/js/common.js
index ea1e9fe0f1..dcbcc43b87 100644
--- a/module/program/js/common.js
+++ b/module/program/js/common.js
@@ -1,3 +1,8 @@
+window.ignoreTips = {
+    'beyondBudgetTip' : false,
+    'dateTip'         : false
+};
+
 /**
  * Access rights are equal to private, and the white list settings are displayed.
  *
@@ -331,6 +336,7 @@ function setBudgetTipsAndAclList(parentID)
  */
 function compareChildDate()
 {
+    if(window.ignoreTips['dateTip']) return;
     if(page == 'create') return;
 
     var end               = $('#end').val();
@@ -356,15 +362,15 @@ function compareChildDate()
             var dateTip = '';
             if(programBegin > childBegin && programEnd >= childEnd)
             {
-                dateTip = "<span id='dateTip' class='text-remind'>" + beginGreateChild + childInfo.minChildBegin + "</span>";
+                dateTip = "<span id='dateTip' class='text-remind'><p>" + beginGreateChild + childInfo.minChildBegin + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
             }
             else if(programEnd < childEnd && programBegin <= childBegin)
             {
-                dateTip = "<span id='dateTip' class='text-remind'>" + endLetterChild + childInfo.maxChildEnd + "</span>";
+                dateTip = "<span id='dateTip' class='text-remind'><p>" + endLetterChild + childInfo.maxChildEnd + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
             }
             else
             {
-                dateTip = "<span id='dateTip' class='text-remind'>" + dateExceedChild + childInfo.minChildBegin + "~" + childInfo.maxChildEnd + "</span>";
+                dateTip = "<span id='dateTip' class='text-remind'><p>" + dateExceedChild + childInfo.minChildBegin + "~" + childInfo.maxChildEnd + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
             }
 
             $('#dateBox').after(dateTip);
@@ -380,6 +386,8 @@ function compareChildDate()
  */
 function outOfDateTip()
 {
+    if(window.ignoreTips['dateTip']) return;
+
     var end   = $('#end').val();
     var begin = $('#begin').val();
     if($('#dateTip').length > 0) $('#dateTip').remove();
@@ -413,15 +421,15 @@ function outOfDateTip()
 
             if(programBegin < parentBegin && programEnd <= parentEnd && programEnd >= parentBegin)
             {
-                dateTip = "<span id='dateTip' class='text-remind'>" + beginLetterParent + data.selectedProgramBegin + "</span>";
+                dateTip = "<span id='dateTip' class='text-remind'><p>" + beginLetterParent + data.selectedProgramBegin + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
             }
             else if(programEnd > parentEnd && programBegin >= parentBegin && programBegin <= parentEnd)
             {
-                dateTip = "<span id='dateTip' class='text-remind'>" + endGreaterParent + data.selectedProgramEnd + "</span>";
+                dateTip = "<span id='dateTip' class='text-remind'><p>" + endGreaterParent + data.selectedProgramEnd + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
             }
             else
             {
-                dateTip = "<span id='dateTip' class='text-remind'>" + dateExceedParent + data.selectedProgramBegin + "~" + data.selectedProgramEnd + "</span>";
+                dateTip = "<span id='dateTip' class='text-remind'><p>" + dateExceedParent + data.selectedProgramBegin + "~" + data.selectedProgramEnd + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
             }
 
             $('#dateBox').after(dateTip);
@@ -437,6 +445,8 @@ function outOfDateTip()
  */
 function budgetOverrunTips()
 {
+    if(window.ignoreTips['beyondBudgetTip']) return;
+
     var selectedProgramID = $('#parent').val();
     var budget            = $('#budget').val();
     if(selectedProgramID == 0)
@@ -451,8 +461,24 @@ function budgetOverrunTips()
         var data = JSON.parse(data);
 
         var tip = "";
-        if(budget !=0 && budget !== null && budget > data.availableBudget) var tip = "<span id='beyondBudgetTip' class='text-remind'>" + budgetOverrun + currencySymbol[data.budgetUnit] + data.availableBudget + "</span>"
+        if(budget !=0 && budget !== null && budget > data.availableBudget) var tip = "<span id='beyondBudgetTip' class='text-remind'><p>" + budgetOverrun + currencySymbol[data.budgetUnit] + data.availableBudget + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>"
         if($('#beyondBudgetTip').length > 0) $('#beyondBudgetTip').remove();
         $('#budgetBox').after(tip);
     });
 }
+
+/**
+ * Make this prompt no longer appear.
+ *
+ * @param  string  $obj
+ * @access public
+ * @return void
+ */
+function ignoreTip(obj)
+{
+    var parentID = obj.parentNode.id;
+    $('#' + parentID).addClass('hidden');
+
+    if(parentID == 'dateTip') window.ignoreTips['dateTip'] = true;
+    if(parentID == 'beyondBudgetTip') window.ignoreTips['beyondBudgetTip'] = true;
+}
diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index 94d85eb7d9..88720f579e 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -48,6 +48,7 @@ $lang->program->openedVersion  = 'OpenedVersion';
 $lang->program->lastEditedBy   = 'LastEditedBy';
 $lang->program->lastEditedDate = 'LastEditedDate';
 $lang->program->childProgram   = 'Child Program';
+$lang->program->ignore         = 'Ignore';;;;
 
 /* Actions. */
 $lang->program->common                  = 'Program';
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index 15e15b8c3e..12a25f18f4 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -48,6 +48,7 @@ $lang->program->openedVersion  = 'OpenedVersion';
 $lang->program->lastEditedBy   = 'LastEditedBy';
 $lang->program->lastEditedDate = 'LastEditedDate';
 $lang->program->childProgram   = 'Child Program';
+$lang->program->ignore         = 'Ignore';
 
 /* Actions. */
 $lang->program->common                  = 'Program';
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index df0a364da8..395d896a50 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -48,6 +48,7 @@ $lang->program->openedVersion  = 'OpenedVersion';
 $lang->program->lastEditedBy   = 'LastEditedBy';
 $lang->program->lastEditedDate = 'LastEditedDate';
 $lang->program->childProgram   = 'sous-programme';
+$lang->program->ignore         = 'Ignorer';
 
 /* Actions. */
 $lang->program->common                  = 'Program';
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index 859aa72d23..1405fe4676 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -48,6 +48,7 @@ $lang->program->openedVersion  = '创建版本';
 $lang->program->lastEditedBy   = '最后编辑人';
 $lang->program->lastEditedDate = '最后编辑日期';
 $lang->program->childProgram   = '子项目集';
+$lang->program->ignore         = '忽略';
 
 /* Actions. */
 $lang->program->common                  = '项目集';
diff --git a/module/program/view/create.html.php b/module/program/view/create.html.php
index 7eaa5207de..9c85a3fee8 100644
--- a/module/program/view/create.html.php
+++ b/module/program/view/create.html.php
@@ -46,6 +46,7 @@
 <?php js::set('beginLetterParent', $lang->program->beginLetterParent);?>
 <?php js::set('endGreaterParent', $lang->program->endGreaterParent);?>
 <?php js::set('dateExceedParent', $lang->program->dateExceedParent);?>
+<?php js::set('ignore', $lang->program->ignore);?>
 <?php js::set('page', $this->app->getMethodName());?>
 <?php $aclList = $parentProgram ? $lang->program->subAclList : $lang->program->aclList;?>
 <?php $requiredFields = $config->program->create->requiredFields;?>
diff --git a/module/program/view/edit.html.php b/module/program/view/edit.html.php
index 6c4682ef19..9eacb7d67a 100644
--- a/module/program/view/edit.html.php
+++ b/module/program/view/edit.html.php
@@ -36,6 +36,7 @@
 <?php js::set('beginGreateChild', $lang->program->beginGreateChild);?>
 <?php js::set('endLetterChild', $lang->program->endLetterChild);?>
 <?php js::set('dateExceedChild', $lang->program->dateExceedChild);?>
+<?php js::set('ignore', $lang->program->ignore);?>
 <?php $aclList = $program->parent ? $lang->program->subAclList : $lang->program->aclList;?>
 <?php $requiredFields = $config->program->edit->requiredFields;?>
 <div id='mainContent' class='main-content'>
diff --git a/module/project/css/common.css b/module/project/css/common.css
index f94d5cf109..e49281ec10 100644
--- a/module/project/css/common.css
+++ b/module/project/css/common.css
@@ -1,4 +1,6 @@
 .future {display: inline-block;}
 .c-number {overflow: hidden; text-align: right !important;text-overflow: ellipsis; white-space: nowrap;}
 .text-remind {color: #ffa34d;}
+.text-remind p{float: left; margin-right: 5px;}
+#ignore {text-decoration: underline; cursor: pointer; color: #ef7b0f;}
 td.delayed {color: #fff; background: #e84e0f !important;}
diff --git a/module/project/js/common.js b/module/project/js/common.js
index a64000db6a..d1efb4d2f3 100644
--- a/module/project/js/common.js
+++ b/module/project/js/common.js
@@ -1,3 +1,8 @@
+window.ignoreTips = {
+    'beyondBudgetTip' : false,
+    'dateTip'         : false
+};
+
 /**
  * Access rights are equal to private, and the white list settings are displayed.
  *
@@ -328,6 +333,8 @@ $(document).on('change', "#plansBox select[name^='plans']", function()
  */
 function budgetOverrunTips()
 {
+    if(window.ignoreTips['beyondBudgetTip']) return;
+
     var selectedProgramID = $('#parent').val();
     var budget            = $('#budget').val();
 
@@ -344,7 +351,7 @@ function budgetOverrunTips()
         if(typeof(data.availableBudget) == 'undefined') return;
 
         var tip = "";
-        if(budget != 0 && budget !== null && budget > data.availableBudget) tip = "<span id='beyondBudgetTip' class='text-remind'>" + budgetOverrun + currencySymbol[data.budgetUnit] + data.availableBudget.toFixed(2) + "</span>"
+        if(budget != 0 && budget !== null && budget > data.availableBudget) tip = "<span id='beyondBudgetTip' class='text-remind'><p>" + budgetOverrun + currencySymbol[data.budgetUnit] + data.availableBudget.toFixed(2) + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>"
         if($('#beyondBudgetTip').length > 0) $('#beyondBudgetTip').remove();
         $('#budgetBox').after(tip);
 
@@ -363,6 +370,8 @@ function budgetOverrunTips()
  */
 function outOfDateTip()
 {
+    if(window.ignoreTips['dateTip']) return;
+
     var end   = $('#end').val();
     var begin = $('#begin').val();
     if($('#dateTip').length > 0) $('#dateTip').remove();
@@ -388,18 +397,34 @@ function outOfDateTip()
             var dateTip = "";
             if(projectBegin < parentBegin && projectEnd <= parentEnd && projectEnd >= parentBegin)
             {
-                dateTip = "<span id='dateTip' class='text-remind'>" + beginLetterParent + data.selectedProgramBegin + "</span>";
+                dateTip = "<span id='dateTip' class='text-remind'><p>" + beginLetterParent + data.selectedProgramBegin + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
             }
             else if(projectEnd > parentEnd && projectBegin >= parentBegin && projectBegin <= parentEnd)
             {
-                dateTip = "<span id='dateTip' class='text-remind'>" + endGreaterParent + data.selectedProgramEnd + "</span>";
+                dateTip = "<span id='dateTip' class='text-remind'><p>" + endGreaterParent + data.selectedProgramEnd + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
             }
             else
             {
-                dateTip = "<span id='dateTip' class='text-remind'>" + dateExceedParent + data.selectedProgramBegin + "~" + data.selectedProgramEnd + "</span>";
+                dateTip = "<span id='dateTip' class='text-remind'><p>" + dateExceedParent + data.selectedProgramBegin + "~" + data.selectedProgramEnd + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
             }
 
             $('#dateBox').after(dateTip);
         });
     }
 }
+
+/**
+ * Make this prompt no longer appear.
+ *
+ * @param  string  $obj
+ * @access public
+ * @return void
+ */
+function ignoreTip(obj)
+{
+    var parentID = obj.parentNode.id;
+    $('#' + parentID).addClass('hidden');
+
+    if(parentID == 'dateTip') window.ignoreTips['dateTip'] = true;
+    if(parentID == 'beyondBudgetTip') window.ignoreTips['beyondBudgetTip'] = true;
+}
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index 4000b8b4f4..7a9947e3c7 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -63,6 +63,7 @@ $lang->project->teamMembersCount   = ', there are %s team members.';
 $lang->project->budgetNumber       = '『Budget』must be numbers.';
 $lang->project->budgetGe0          = '『Budget』must be greater than or equal to 0.';
 $lang->project->allProjects        = 'All Projects';
+$lang->project->ignore             = 'Ignore';
 
 /* Fields. */
 $lang->project->common             = 'Project';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index e3e25bb1b4..9d3c36adec 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -63,6 +63,7 @@ $lang->project->teamMembersCount   = ', there are %s team members.';
 $lang->project->budgetNumber       = '『Budget』must be numbers.';
 $lang->project->budgetGe0          = '『Budget』must be greater than or equal to 0.';
 $lang->project->allProjects        = 'All Projects';
+$lang->project->ignore             = 'Ignore';
 
 /* Fields. */
 $lang->project->common             = 'Project';
@@ -332,4 +333,4 @@ $lang->project->childLongTime       = "There are long-term projects in the child
 $lang->project->confirmUnlinkMember = "Do you want to remove this user from project?";
 
 $lang->project->action = new stdclass();
-$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
\ No newline at end of file
+$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 369bc48a86..8b376b2bfc 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -63,6 +63,7 @@ $lang->project->teamMembersCount   = ', there are %s team members.';
 $lang->project->budgetNumber       = '『Budget』must be numbers.';
 $lang->project->budgetGe0          = '『Budget』must be greater than or equal to 0.';
 $lang->project->allProjects        = 'All Projects';
+$lang->project->ignore             = 'Ignorer';
 
 /* Fields. */
 $lang->project->common             = 'Projets';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index b8d05fdb7d..bbcc19b820 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -63,6 +63,7 @@ $lang->project->teamMembersCount   = '，团队成员共%s人。';
 $lang->project->budgetNumber       = '『预算』金额必须为数字。';
 $lang->project->budgetGe0          = '『预算』金额必须大于等于0。';
 $lang->project->allProjects        = '所有项目';
+$lang->project->ignore             = '忽略';
 
 /* Fields. */
 $lang->project->common             = '项目';
diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php
index da24f8b8ed..9c840275be 100644
--- a/module/project/view/batchedit.html.php
+++ b/module/project/view/batchedit.html.php
@@ -14,6 +14,7 @@
 <?php js::set('weekend', $config->execution->weekend);?>
 <?php js::set('linkedProjectsTip', $lang->project->linkedProjectsTip);?>
 <?php js::set('changeProgram', $lang->project->changeProgram);?>
+<?php js::set('ignore', $lang->project->ignore);?>
 <?php $requiredFields = $config->project->edit->requiredFields;?>
 <div id="mainContent" class="main-content">
   <div class="main-header">
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 2dbe674850..eb8e493abf 100755
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -33,6 +33,7 @@
 <?php js::set('beginLetterParent', $lang->project->beginLetterParent);?>
 <?php js::set('endGreaterParent', $lang->project->endGreaterParent);?>
 <?php js::set('dateExceedParent', $lang->project->dateExceedParent);?>
+<?php js::set('ignore', $lang->project->ignore);?>
 <?php $requiredFields = $config->project->create->requiredFields;?>
 <?php js::set('requiredFields', $requiredFields);?>
 <div id='mainContent' class='main-content'>
@@ -46,7 +47,7 @@
         <button type='button' class='btn btn-link' data-toggle='modal' data-target='#copyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->project->copy;?></button>
       <?php else: ?>
         <button type='button' class='btn btn-link open-btn' data-toggle='modal' data-target='#maxCopyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->project->copy;?></button>
-      <?php endif; ?> 
+      <?php endif; ?>
       </div>
       <?php endif; ?>
     </div>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 5d0aabb2e7..a6986fc716 100755
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -37,6 +37,7 @@
 <?php js::set('beginLetterParent', $lang->project->beginLetterParent);?>
 <?php js::set('endGreaterParent', $lang->project->endGreaterParent);?>
 <?php js::set('dateExceedParent', $lang->project->dateExceedParent);?>
+<?php js::set('ignore', $lang->project->ignore);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>