This commit is contained in:
sunguangming
2024-01-03 15:56:51 +08:00
parent 950d3170d3
commit e0e37afce6
6 changed files with 12 additions and 3 deletions
+1
View File
@@ -252,6 +252,7 @@ $lang->project->error->budgetGe0 = '『Budget』must be greater than or e
$lang->project->error->budgetNumber = '『Budget』must be numbers.';
$lang->project->error->productNotEmpty = "Please link {$lang->productCommon}s or create {$lang->productCommon}s.";
$lang->project->error->emptyBranch = 'Branch can not be empty!';
$lang->project->error->endLessBegin = 'The end date must be greater than the start date.';
$lang->project->tenThousand = 'Ten Thousand';
$lang->project->hundredMillion = 'Hundred Million';
+1
View File
@@ -252,6 +252,7 @@ $lang->project->error->budgetGe0 = '『Budget』must be greater than or e
$lang->project->error->budgetNumber = '『Budget』must be numbers.';
$lang->project->error->productNotEmpty = "Please link {$lang->productCommon}s or create {$lang->productCommon}s.";
$lang->project->error->emptyBranch = 'Branch can not be empty!';
$lang->project->error->endLessBegin = 'The end date must be greater than the start date.';
$lang->project->tenThousand = 'Ten Thousand';
$lang->project->hundredMillion = 'Hundred Million';
+1
View File
@@ -252,6 +252,7 @@ $lang->project->error->budgetGe0 = '『Budget』must be greater than or e
$lang->project->error->budgetNumber = '『Budget』must be numbers.';
$lang->project->error->productNotEmpty = "Please link {$lang->productCommon}s or create {$lang->productCommon}s.";
$lang->project->error->emptyBranch = 'Branch can not be empty!';
$lang->project->error->endLessBegin = 'The end date must be greater than the start date.';
$lang->project->tenThousand = 'Ten Thousand';
$lang->project->hundredMillion = 'Hundred Million';
+1
View File
@@ -244,6 +244,7 @@ $lang->project->error->budgetGe0 = '『预算』金额必须大于等于0
$lang->project->error->budgetNumber = '『预算』金额必须为数字。';
$lang->project->error->productNotEmpty = "请关联{$lang->productCommon}或创建{$lang->productCommon}。";
$lang->project->error->emptyBranch = '分支不能为空!';
$lang->project->error->endLessBegin = '计划结束日期不能小于计划开始日期!';
$lang->project->tip = new stdclass();
$lang->project->tip->closed = '该项目已是关闭状态,无须关闭。';
+6
View File
@@ -1454,6 +1454,12 @@ class projectModel extends model
*/
public function activate(int $projectID, object $project) :array|false
{
if($project->begin > $project->end)
{
dao::$errors['end'] = $this->lang->project->error->endLessBegin;
return false;
}
$oldProject = $this->projectTao->fetchProjectInfo($projectID);
$daoSuccess = $this->projectTao->doActivate($projectID, $project);
+2 -3
View File
@@ -21,14 +21,13 @@ formPanel
set::label($lang->execution->beginAndEnd),
inputGroup
(
input
datePicker
(
set::control('date'),
set::name('begin'),
set::value($newBegin)
),
$lang->execution->to,
input
datePicker
(
set::control('date'),
set::name('end'),