" + beginGreateChild + childInfo.minChildBegin + "
" + ignore + "
"; } - else if(programEnd < childEnd && programBegin <= childBegin) + else if(programEnd < childEnd) { dateTip = "" + endLetterChild + childInfo.maxChildEnd + "
" + ignore + "
"; } - else - { - dateTip = "" + dateExceedChild + childInfo.minChildBegin + "~" + childInfo.maxChildEnd + "
" + ignore + "
"; - } $('#dateBox').after(dateTip); }); @@ -419,18 +415,14 @@ function outOfDateTip() return; } - if(programBegin < parentBegin && programEnd <= parentEnd && programEnd >= parentBegin) + if(programBegin < parentBegin) { dateTip = "" + beginLetterParent + data.selectedProgramBegin + "
" + ignore + "
"; } - else if(programEnd > parentEnd && programBegin >= parentBegin && programBegin <= parentEnd) + else if(programEnd > parentEnd) { dateTip = "" + endGreaterParent + data.selectedProgramEnd + "
" + ignore + "
"; } - else - { - dateTip = "" + dateExceedParent + data.selectedProgramBegin + "~" + data.selectedProgramEnd + "
" + ignore + "
"; - } $('#dateBox').after(dateTip); }); diff --git a/module/program/lang/de.php b/module/program/lang/de.php index 0abc8cd999..dfa5bc3c39 100644 --- a/module/program/lang/de.php +++ b/module/program/lang/de.php @@ -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'; diff --git a/module/program/lang/en.php b/module/program/lang/en.php index 12a25f18f4..9e0ee82a70 100644 --- a/module/program/lang/en.php +++ b/module/program/lang/en.php @@ -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'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index 1405fe4676..a7c9452f73 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -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] = '三个月'; diff --git a/module/project/js/common.js b/module/project/js/common.js index b488b1511c..7ce2365ef8 100644 --- a/module/project/js/common.js +++ b/module/project/js/common.js @@ -401,18 +401,14 @@ function outOfDateTip(currentID = 0) if(projectBegin >= parentBegin && projectEnd <= parentEnd) return; var dateTip = ""; - if(projectBegin < parentBegin && projectEnd <= parentEnd && projectEnd >= parentBegin) + if(projectBegin < parentBegin) { dateTip = currentID ? beginLetterParentTip + "'>" + beginLetterParentTip : beginLetterParentTip; } - else if(projectEnd > parentEnd && projectBegin >= parentBegin && projectBegin <= parentEnd) + else if(projectEnd > parentEnd) { dateTip = currentID ? endGreaterParentTip + "'>" + endGreaterParentTip : endGreaterParentTip; } - else - { - dateTip = currentID ? dateExceedParentTip + "'>" + dateExceedParentTip : dateExceedParentTip; - } if(currentID) { diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 7a9947e3c7..1c678d1312 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -197,7 +197,7 @@ $lang->project->unlinkExecutionMember = "The user participated in %s executions $lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this project. Do you want to remove them from the execution team too?"; $lang->project->productTip = 'After clicking New Product, the project will not be linked to the selected product.'; $lang->project->noDevStage = 'There is no R&D stage under this project, or you do not have access permissions. The creation of builds is not supported at the moment.'; -$lang->project->budgetOverrun = "The project's budget has exceeded the remaining budget of the parent program:"; +$lang->project->budgetOverrun = "The project's budget exceeds the remaining budget of the parent program:"; $lang->project->disabledInputTip = 'Please cancel %s first'; $lang->project->tenThousand = ''; @@ -322,8 +322,8 @@ $lang->project->cannotChangeToCat = "It is not empty, so you cannot change it $lang->project->cannotCancelCat = "It has child projects, so you cannot unmark the parent."; $lang->project->parentBeginEnd = "Parent begin&end date: %s ~ %s"; $lang->project->parentBudget = "The budget of the parent program: "; -$lang->project->beginLetterParent = "The start date of the project was < the minimum start date of the parent program:"; -$lang->project->endGreaterParent = "The finish date of the project was > the maximum finish date of the parent program:"; +$lang->project->beginLetterParent = "The start date of the project is < the start date of the parent program:"; +$lang->project->endGreaterParent = "The finish date of the project is > the finish date of the parent program:"; $lang->project->dateExceedParent = "The start and finish date of the project was > the start and finish date of the parent program:"; $lang->project->beginGreateChild = 'The start date of the project should be ≥ the start date of program: %s.'; $lang->project->endLetterChild = 'The finish date of the project should be ≤ the finish date of program: %s.'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 9d3c36adec..3a1a43017d 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -197,7 +197,7 @@ $lang->project->unlinkExecutionMember = "The user participated in %s executions $lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this project. Do you want to remove them from the execution team too?"; $lang->project->productTip = 'After clicking New Product, the project will not be linked to the selected product.'; $lang->project->noDevStage = 'There is no R&D stage under this project, or you do not have access permissions. The creation of builds is not supported at the moment.'; -$lang->project->budgetOverrun = "The project's budget has exceeded the remaining budget of the parent program:"; +$lang->project->budgetOverrun = "The project's budget exceeds the remaining budget of the parent program:"; $lang->project->disabledInputTip = 'Please cancel %s first'; $lang->project->tenThousand = 'Ten Thousand'; @@ -322,8 +322,8 @@ $lang->project->cannotChangeToCat = "The project has contents, so you cannot i $lang->project->cannotCancelCat = "There are child projects of this project. You cannot cancel the parent project mark."; $lang->project->parentBeginEnd = "The begin and end date of the parent project: %s ~ %s"; $lang->project->parentBudget = "The budget of the parent program: "; -$lang->project->beginLetterParent = "The start date of the project was < the minimum start date of the parent program:"; -$lang->project->endGreaterParent = "The finish date of the project was > the maximum finish date of the parent program:"; +$lang->project->beginLetterParent = "The start date of the project is < the start date of the parent program:"; +$lang->project->endGreaterParent = "The finish date of the project is > the finish date of the parent program:"; $lang->project->dateExceedParent = "The start and finish date of the project was > the start and finish date of the parent program:"; $lang->project->beginGreateChild = 'The start date of the project should be ≥ the start date of program: %s.'; $lang->project->endLetterChild = 'The finish date of the project should be ≤ the finish date of program: %s.'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index 8b376b2bfc..1d650086f8 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -322,8 +322,8 @@ $lang->project->cannotChangeToCat = "It is not empty, so you cannot change it $lang->project->cannotCancelCat = "It has child projects, so you cannot unmark the parent."; $lang->project->parentBeginEnd = "Parent begin&end date: %s ~ %s"; $lang->project->parentBudget = "The budget of the parent project: "; -$lang->project->beginLetterParent = "La date de début du projet était < à la date minimale de début du programme parent:"; -$lang->project->endGreaterParent = "La date de fin du projet était > à la date de fin maximale du programme parent:"; +$lang->project->beginLetterParent = "La date de début du projet était < à la date de début du programme parent:"; +$lang->project->endGreaterParent = "La date de fin du projet était > à la date de fin du programme parent:"; $lang->project->dateExceedParent = "La date de début et de fin du project était > à la date de début et de fin du programme parent:"; $lang->project->beginGreateChild = 'La date de début du projets "%s" doit être ≥ à la date de début du programme "%s" : %s.'; $lang->project->endLetterChild = 'La date de fin du projets doit être ≤ à la date de fin du programme: %s.'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index bbcc19b820..c86c8f00ea 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -197,7 +197,7 @@ $lang->project->unlinkExecutionMember = "该用户参与了%s%s%s个{$lang->exe $lang->project->unlinkExecutionMembers = "移除的团队成员还参与了项目下的执行,是否同步从执行团队中移除?"; $lang->project->productTip = '点击新建产品后,项目将不会关联已选中的产品。'; $lang->project->noDevStage = '该项目下没有研发类型的阶段,或者您没有权限访问,暂时不支持创建版本。'; -$lang->project->budgetOverrun = '项目的预算已超出父项目集的剩余预算:'; +$lang->project->budgetOverrun = '项目的预算超出了父项目集的剩余预算:'; $lang->project->disabledInputTip = '请先取消%s'; $lang->project->tenThousand = '万'; @@ -322,8 +322,8 @@ $lang->project->cannotChangeToCat = "该项目已经有实际的内容,无 $lang->project->cannotCancelCat = "该项目下已经有子项目,无法取消父项目标记"; $lang->project->parentBeginEnd = "父项目起止时间:%s ~ %s"; $lang->project->parentBudget = "父项目集预算:"; -$lang->project->beginLetterParent = "项目的开始日期已小于父项目集的最小开始日期:"; -$lang->project->endGreaterParent = "项目的完成日期已大于父项目集的最大完成日期:"; +$lang->project->beginLetterParent = "项目的开始日期小于了父项目集的开始日期:"; +$lang->project->endGreaterParent = "项目的完成日期大于了父项目集的完成日期:"; $lang->project->dateExceedParent = "项目的起止日期已超出父项目集的起止日期:"; $lang->project->beginGreateChild = '项目的开始日期应大于等于项目集的最小开始日期:%s'; $lang->project->endLetterChild = '项目的完成日期应小于等于项目集的最大完成日期:%s';