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 = "" + beginGreateChild + childInfo.minChildBegin + "";
+ dateTip = "" + beginGreateChild + childInfo.minChildBegin + "
" + ignore + "
";
}
else if(programEnd < childEnd && programBegin <= childBegin)
{
- dateTip = "" + endLetterChild + childInfo.maxChildEnd + "";
+ dateTip = "" + endLetterChild + childInfo.maxChildEnd + "
" + ignore + "
";
}
else
{
- dateTip = "" + dateExceedChild + childInfo.minChildBegin + "~" + childInfo.maxChildEnd + "";
+ dateTip = "" + dateExceedChild + childInfo.minChildBegin + "~" + childInfo.maxChildEnd + "
" + ignore + "
";
}
$('#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 = "" + beginLetterParent + data.selectedProgramBegin + "";
+ dateTip = "" + beginLetterParent + data.selectedProgramBegin + "
" + ignore + "
";
}
else if(programEnd > parentEnd && programBegin >= parentBegin && programBegin <= parentEnd)
{
- dateTip = "" + endGreaterParent + data.selectedProgramEnd + "";
+ dateTip = "" + endGreaterParent + data.selectedProgramEnd + "
" + ignore + "
";
}
else
{
- dateTip = "" + dateExceedParent + data.selectedProgramBegin + "~" + data.selectedProgramEnd + "";
+ dateTip = "" + dateExceedParent + data.selectedProgramBegin + "~" + data.selectedProgramEnd + "
" + ignore + "
";
}
$('#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 = "" + budgetOverrun + currencySymbol[data.budgetUnit] + data.availableBudget + ""
+ if(budget !=0 && budget !== null && budget > data.availableBudget) var tip = "" + budgetOverrun + currencySymbol[data.budgetUnit] + data.availableBudget + "
" + ignore + "
"
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 @@
program->beginLetterParent);?>
program->endGreaterParent);?>
program->dateExceedParent);?>
+program->ignore);?>
app->getMethodName());?>
program->subAclList : $lang->program->aclList;?>
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 @@
program->beginGreateChild);?>
program->endLetterChild);?>
program->dateExceedChild);?>
+program->ignore);?>
parent ? $lang->program->subAclList : $lang->program->aclList;?>
program->edit->requiredFields;?>
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 c6d85cccc9..b488b1511c 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 = "
" + budgetOverrun + currencySymbol[data.budgetUnit] + data.availableBudget.toFixed(2) + ""
+ if(budget != 0 && budget !== null && budget > data.availableBudget) tip = "
" + budgetOverrun + currencySymbol[data.budgetUnit] + data.availableBudget.toFixed(2) + "
" + ignore + "
"
if($('#beyondBudgetTip').length > 0) $('#beyondBudgetTip').remove();
$('#budgetBox').after(tip);
@@ -364,6 +371,7 @@ function budgetOverrunTips()
*/
function outOfDateTip(currentID = 0)
{
+ if(window.ignoreTips['dateTip']) return;
var end = currentID ? $('#ends\\[' + currentID + '\\]').val() : $('#end').val();
var begin = currentID ? $('#begins\\[' + currentID + '\\]').val() : $('#begin').val();
if($('#dateTip.text-remind').length > 0) $('#dateTip').remove();
@@ -412,8 +420,24 @@ function outOfDateTip(currentID = 0)
}
else
{
- $('#dateBox').after("
" + dateTip + "");
+ $('#dateBox').after("
" + dateTip + "
" + ignore + "
");
}
});
}
}
+
+/**
+ * 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
$actor. $extra' . "\n";
\ No newline at end of file
+$lang->project->action->managed = '$date, managed by
$actor. $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 b02d95ee64..822ae09405 100644
--- a/module/project/view/batchedit.html.php
+++ b/module/project/view/batchedit.html.php
@@ -19,6 +19,7 @@
project->dateExceedParent);?>
project->longTime);?>
+project->ignore);?>
project->edit->requiredFields;?>
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 @@
project->beginLetterParent);?>
project->endGreaterParent);?>
project->dateExceedParent);?>
+project->ignore);?>
project->create->requiredFields;?>
@@ -46,7 +47,7 @@
-
+
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 @@
project->beginLetterParent);?>
project->endGreaterParent);?>
project->dateExceedParent);?>
+project->ignore);?>