* Fix bug #26612.
This commit is contained in:
zhouxudong
@@ -360,18 +360,14 @@ function compareChildDate()
|
||||
if(programBegin <= childBegin && programEnd >= childEnd) return;
|
||||
|
||||
var dateTip = '';
|
||||
if(programBegin > childBegin && programEnd >= childEnd)
|
||||
if(programBegin > childBegin)
|
||||
{
|
||||
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)
|
||||
else if(programEnd < childEnd)
|
||||
{
|
||||
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'><p>" + dateExceedChild + childInfo.minChildBegin + "~" + childInfo.maxChildEnd + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
|
||||
}
|
||||
|
||||
$('#dateBox').after(dateTip);
|
||||
});
|
||||
@@ -419,18 +415,14 @@ function outOfDateTip()
|
||||
return;
|
||||
}
|
||||
|
||||
if(programBegin < parentBegin && programEnd <= parentEnd && programEnd >= parentBegin)
|
||||
if(programBegin < parentBegin)
|
||||
{
|
||||
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)
|
||||
else if(programEnd > parentEnd)
|
||||
{
|
||||
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'><p>" + dateExceedParent + data.selectedProgramBegin + "~" + data.selectedProgramEnd + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
|
||||
}
|
||||
|
||||
$('#dateBox').after(dateTip);
|
||||
});
|
||||
|
||||
@@ -101,11 +101,11 @@ $lang->program->noProgram = 'No program.';
|
||||
$lang->program->showClosed = 'Closed programs.';
|
||||
$lang->program->tips = 'If a parent program is selected, the products under the parent program can be associated. If no program is selected for the project, a product with the same name as the project is created and associated with the project by default.';
|
||||
$lang->program->confirmBatchUnlink = "Do you want to batch unlink these stakeholders?";
|
||||
$lang->program->beginLetterParent = 'The start date of the program was < the start date of the parent program:';
|
||||
$lang->program->endGreaterParent = 'The finish date of the program was > the finish date of the parent program:';
|
||||
$lang->program->beginLetterParent = 'The start date of the program is < the start date of the parent program:';
|
||||
$lang->program->endGreaterParent = 'The finish date of the program is > the finish date of the parent program:';
|
||||
$lang->program->dateExceedParent = 'The start and finish date of the program was > the start and finish date of the parent program:';
|
||||
$lang->program->beginGreateChild = 'The start date of the program was > the minimum start date of the subprogram or project:';
|
||||
$lang->program->endLetterChild = 'The finish date of the program was < the maximum finish date of the subprogram or project:';
|
||||
$lang->program->beginGreateChild = 'The start date of the program is > the minimum start date of the subprogram or project:';
|
||||
$lang->program->endLetterChild = 'The finish date of the program is < the maximum finish date of the subprogram or project:';
|
||||
$lang->program->dateExceedChild = 'The start and finish date of the program no longer include the date scope of the subprogram or project:';
|
||||
$lang->program->closeErrorMessage = 'There are subprograms or projects that are not closed';
|
||||
$lang->program->hasChildren = 'It has child programs or projects. You cannot delete it.';
|
||||
@@ -116,7 +116,7 @@ $lang->program->readjustTime = 'Change the program begin&end date.';
|
||||
$lang->program->accessDenied = 'You have no access to the program.';
|
||||
$lang->program->beyondParentBudget = 'The remaining budget of the owned program has been exceeded.';
|
||||
$lang->program->checkedProjects = 'Seleted %s items';
|
||||
$lang->program->budgetOverrun = "The program's budget has exceeded the remaining budget of the parent program:";
|
||||
$lang->program->budgetOverrun = "The program's budget exceeds the remaining budget of the parent program:";
|
||||
|
||||
$lang->program->endList[31] = 'One month';
|
||||
$lang->program->endList[93] = 'Trimester';
|
||||
|
||||
@@ -101,11 +101,11 @@ $lang->program->noProgram = 'No program.';
|
||||
$lang->program->showClosed = 'Closed';
|
||||
$lang->program->tips = 'If a parent program is selected, the products under the parent program can be associated. If no program is selected for the project, a product with the same name as the project is created and associated with the project by default.';
|
||||
$lang->program->confirmBatchUnlink = "Do you want to batch unlink these stakeholders?";
|
||||
$lang->program->beginLetterParent = 'The start date of the program was < the start date of the parent program:';
|
||||
$lang->program->endGreaterParent = 'The finish date of the program was > the finish date of the parent program:';
|
||||
$lang->program->beginLetterParent = 'The start date of the program is < the start date of the parent program:';
|
||||
$lang->program->endGreaterParent = 'The finish date of the program is > the finish date of the parent program:';
|
||||
$lang->program->dateExceedParent = 'The start and finish date of the program was > the start and finish date of the parent program:';
|
||||
$lang->program->beginGreateChild = 'The start date of the program was > the minimum start date of the subprogram or project:';
|
||||
$lang->program->endLetterChild = 'The finish date of the program was < the maximum finish date of the subprogram or project:';
|
||||
$lang->program->beginGreateChild = 'The start date of the program is > the minimum start date of the subprogram or project:';
|
||||
$lang->program->endLetterChild = 'The finish date of the program is < the maximum finish date of the subprogram or project:';
|
||||
$lang->program->dateExceedChild = 'The start and finish date of the program no longer include the date scope of the subprogram or project:';
|
||||
$lang->program->closeErrorMessage = 'There are subprograms or projects that are not closed';
|
||||
$lang->program->hasChildren = 'The program has a child program or the project exists and can not be deleted.';
|
||||
@@ -116,7 +116,7 @@ $lang->program->readjustTime = 'Change the program begin&end date.';
|
||||
$lang->program->accessDenied = 'You have no access to the program.';
|
||||
$lang->program->beyondParentBudget = 'The remaining budget of the owned program has been exceeded.';
|
||||
$lang->program->checkedProjects = 'Seleted %s items';
|
||||
$lang->program->budgetOverrun = "The program's budget has exceeded the remaining budget of the parent program:";
|
||||
$lang->program->budgetOverrun = "The program's budget exceeds the remaining budget of the parent program:";
|
||||
|
||||
$lang->program->endList[31] = 'One month';
|
||||
$lang->program->endList[93] = 'Trimester';
|
||||
|
||||
@@ -101,11 +101,11 @@ $lang->program->noProgram = '暂时没有项目集';
|
||||
$lang->program->showClosed = '显示已关闭';
|
||||
$lang->program->tips = '选择了父项目集，则可关联该父项目集下的产品。如果项目未选择任何项目集，则系统会默认创建一个和该项目同名的产品并关联该项目。';
|
||||
$lang->program->confirmBatchUnlink = "您确定要批量移除这些干系人吗？";
|
||||
$lang->program->beginLetterParent = '项目集的开始日期已小于父项目集的开始日期：';
|
||||
$lang->program->endGreaterParent = '项目集的完成日期已大于父项目集的完成日期：';
|
||||
$lang->program->beginLetterParent = '项目集的开始日期小于了父项目集的开始日期：';
|
||||
$lang->program->endGreaterParent = '项目集的完成日期大于了父项目集的完成日期：';
|
||||
$lang->program->dateExceedParent = '项目集的起止日期已超出父项目集的起止日期';
|
||||
$lang->program->beginGreateChild = '项目集的开始日期已大于子项目集或项目的最小开始日期：';
|
||||
$lang->program->endLetterChild = '项目集的完成日期已小于子项目集或项目的最大完成日期：';
|
||||
$lang->program->beginGreateChild = '项目集的开始日期大于了子项目集或项目的最小开始日期：';
|
||||
$lang->program->endLetterChild = '项目集的完成日期小于了子项目集或项目的最大完成日期：';
|
||||
$lang->program->dateExceedChild = '项目集的起止日期已不包含子项目集或项目的日期范围';
|
||||
$lang->program->closeErrorMessage = '存在子项目集或项目为未关闭状态';
|
||||
$lang->program->hasChildren = '该项目集有子项目集或项目存在，不能删除。';
|
||||
@@ -116,7 +116,7 @@ $lang->program->readjustTime = '重新调整项目集起止时间';
|
||||
$lang->program->accessDenied = '你无权访问该项目集';
|
||||
$lang->program->beyondParentBudget = '已超出所属项目集的剩余预算';
|
||||
$lang->program->checkedProjects = '已选择%s项';
|
||||
$lang->program->budgetOverrun = '项目集的预算已超出父项目集的剩余预算：';
|
||||
$lang->program->budgetOverrun = '项目集的预算超出了父项目集的剩余预算：';
|
||||
|
||||
$lang->program->endList[31] = '一个月';
|
||||
$lang->program->endList[93] = '三个月';
|
||||
|
||||
Reference in New Issue
Block a user