From 3a00d645ecc6d706ea27be11abbad8c37312093d Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 13 Nov 2020 11:34:08 +0800 Subject: [PATCH] * Merge code. --- module/program/control.php | 2 +- module/program/js/pgmcreate.js | 16 +++++++++++++++- module/program/js/pgmedit.js | 15 +++++++++++++++ module/program/js/prjcreate.js | 3 +-- module/program/lang/en.php | 5 +++++ module/program/lang/zh-cn.php | 5 +++++ module/program/model.php | 12 +++++++----- module/program/view/pgmbrowsebylist.html.php | 2 +- module/program/view/pgmcreate.html.php | 7 +++++++ module/program/view/pgmedit.html.php | 9 ++++++++- module/program/view/prjcreate.html.php | 2 +- 11 files changed, 66 insertions(+), 12 deletions(-) diff --git a/module/program/control.php b/module/program/control.php index 41b44648f8..e89532a492 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -59,7 +59,7 @@ class program extends control * @access public * @return void */ - public function PGMBrowse($status = 'all', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 50, $pageID = 1) + public function PGMBrowse($status = 'all', $orderBy = 'id_asc,order_desc', $recTotal = 0, $recPerPage = 50, $pageID = 1) { $this->lang->navGroup->program = 'program'; $this->lang->program->switcherMenu = $this->program->getPGMCommonAction(); diff --git a/module/program/js/pgmcreate.js b/module/program/js/pgmcreate.js index a9161ac955..bf20ef58cb 100644 --- a/module/program/js/pgmcreate.js +++ b/module/program/js/pgmcreate.js @@ -1,4 +1,18 @@ -$(function(){$('#parent').change();}) +$(function() +{ + $('#parent').change(); + $('#longTime').change(function() + { + if($(this).prop('checked')) + { + $('#end').attr('disabled', 'disabled'); + } + else + { + $('#end').removeAttr('disabled'); + } + }); +}) function setAclList(programID) { diff --git a/module/program/js/pgmedit.js b/module/program/js/pgmedit.js index 21de13d9eb..b8291dadaa 100644 --- a/module/program/js/pgmedit.js +++ b/module/program/js/pgmedit.js @@ -9,3 +9,18 @@ function setAclList(programID) $('.aclBox').html($('#PGMAcl').html()); } } + +$(function() +{ + $('#longTime').change(function() + { + if($(this).prop('checked')) + { + $('#end').attr('disabled', 'disabled'); + } + else + { + $('#end').removeAttr('disabled'); + } + }); +}) diff --git a/module/program/js/prjcreate.js b/module/program/js/prjcreate.js index 345f108677..57cb97a3b4 100644 --- a/module/program/js/prjcreate.js +++ b/module/program/js/prjcreate.js @@ -5,8 +5,7 @@ $(function() { if($(this).prop('checked')) { - $('#end').val('').attr('disabled', 'disabled'); - $('#days').val(''); + $('#end').attr('disabled', 'disabled'); } else { diff --git a/module/program/lang/en.php b/module/program/lang/en.php index 4b1864470e..7d12bf8c0a 100644 --- a/module/program/lang/en.php +++ b/module/program/lang/en.php @@ -115,6 +115,11 @@ $lang->program->statusList['doing'] = 'Doing'; $lang->program->statusList['suspended'] = 'Suspended'; $lang->program->statusList['closed'] = 'Closed'; +$lang->program->endList[31] = '一个月'; +$lang->program->endList[93] = '三个月'; +$lang->program->endList[186] = '半年'; +$lang->program->endList[365] = '一年'; + $lang->program->noPRJ = 'No project.'; $lang->program->accessDenied = 'Access denied!'; $lang->program->chooseProgramType = 'Select a method'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index 64a057b720..0d7b514c64 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -117,6 +117,11 @@ $lang->program->statusList['doing'] = '进行中'; $lang->program->statusList['suspended'] = '已挂起'; $lang->program->statusList['closed'] = '已关闭'; +$lang->program->endList[31] = '一个月'; +$lang->program->endList[93] = '三个月'; +$lang->program->endList[186] = '半年'; +$lang->program->endList[365] = '一年'; + $lang->program->noPRJ = '暂时没有项目'; $lang->program->accessDenied = '您无权访问该项目！'; $lang->program->chooseProgramType = '选择项目管理方式'; diff --git a/module/program/model.php b/module/program/model.php index f13de27fc0..68045172e7 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -201,7 +201,7 @@ class programModel extends model * @access public * @return array */ - public function getPGMList($status = 'all', $orderBy = 'id_desc', $pager = NULL) + public function getPGMList($status = 'all', $orderBy = 'id_asc', $pager = NULL) { return $this->dao->select('*')->from(TABLE_PROGRAM) ->where('type')->in('program,project') @@ -252,10 +252,12 @@ class programModel extends model ->setDefault('parent', 0) ->setDefault('openedDate', helper::now()) ->setIF($this->post->acl == 'open', 'whitelist', '') + ->setIF($this->post->longTime == 1, 'end', '2059-00-00') ->add('type', 'program') ->join('whitelist', ',') ->cleanInt('budget') ->stripTags($this->config->program->editor->pgmcreate['id'], $this->config->allowedTags) + ->remove('delta,longTime') ->get(); if($program->parent) @@ -276,7 +278,6 @@ class programModel extends model } } - $this->lang->project->name = $this->lang->program->PGMName; $this->lang->project->code = $this->lang->program->PGMCode; $program = $this->loadModel('file')->processImgURL($program, $this->config->program->editor->pgmcreate['id'], $this->post->uid); $this->dao->insert(TABLE_PROGRAM)->data($program) @@ -342,9 +343,10 @@ class programModel extends model ->setIF($this->post->begin == '0000-00-00', 'begin', '') ->setIF($this->post->end == '0000-00-00', 'end', '') ->setIF($this->post->acl == 'open', 'whitelist', '') + ->setIF($this->post->longTime == 1, 'end', '2059-00-00') ->join('whitelist', ',') ->stripTags($this->config->program->editor->pgmedit['id'], $this->config->allowedTags) - ->remove('uid') + ->remove('uid,delta,longTime') ->get(); $program = $this->loadModel('file')->processImgURL($program, $this->config->program->editor->pgmedit['id'], $this->post->uid); @@ -1114,7 +1116,7 @@ class programModel extends model ->join('whitelist', ',') ->cleanInt('budget') ->stripTags($this->config->program->editor->prjcreate['id'], $this->config->allowedTags) - ->remove('longTime,products,branch,plans') + ->remove('longTime,products,branch,plans,delta') ->get(); if($project->parent) @@ -1240,7 +1242,7 @@ class programModel extends model ->setIF($this->post->acl == 'open', 'whitelist', '') ->join('whitelist', ',') ->stripTags($this->config->program->editor->prjedit['id'], $this->config->allowedTags) - ->remove('longTime,products,branch,plans') + ->remove('longTime,products,branch,plans,delta') ->get(); if($project->parent) diff --git a/module/program/view/pgmbrowsebylist.html.php b/module/program/view/pgmbrowsebylist.html.php index a37944c05d..8d03187216 100644 --- a/module/program/view/pgmbrowsebylist.html.php +++ b/module/program/view/pgmbrowsebylist.html.php @@ -55,7 +55,7 @@ project->statusList, $program->status, '');?> begin;?> - end == '0000-00-00' ? '' : $program->end;?> + end == '2059-00-00' ? '' : $program->end;?> budget . ' ' . zget($lang->program->unitList, $program->budgetUnit);?> PM);?> diff --git a/module/program/view/pgmcreate.html.php b/module/program/view/pgmcreate.html.php index 6b3a1cf38f..3d81e1fd7f 100644 --- a/module/program/view/pgmcreate.html.php +++ b/module/program/view/pgmcreate.html.php @@ -81,8 +81,15 @@ program->begin . "' required");?> program->to;?> program->end . "' required");?> + +
+ + +
+ + program->endList , '', "onclick='computeEndDate(this.value)'");?> project->status;?> diff --git a/module/program/view/pgmedit.html.php b/module/program/view/pgmedit.html.php index 42165525f2..f2f45af74e 100644 --- a/module/program/view/pgmedit.html.php +++ b/module/program/view/pgmedit.html.php @@ -53,7 +53,14 @@
begin, "class='form-control form-date' placeholder='" . $lang->program->begin . "' required");?> program->to;?> - end == '0000-00-00' ? '' : $program->end, "class='form-control form-date' placeholder='" . $lang->program->end . "' required");?> + end == '2059-00-00' ? 'disabled' : '';?> + end == '2059-00-00' ? '' : $program->end, "class='form-control form-date' $disabledEnd placeholder='" . $lang->program->end . "' required");?> + +
+ end == '2059-00-00' ? 'checked' : '';?>> + +
+
diff --git a/module/program/view/prjcreate.html.php b/module/program/view/prjcreate.html.php index bc2df15ecb..18c1c16ad1 100644 --- a/module/program/view/prjcreate.html.php +++ b/module/program/view/prjcreate.html.php @@ -134,7 +134,7 @@ - + program->endList , '', "onclick='computeEndDate(this.value)'");?>