From 8eb7358131bf2687172d0fd0368abee971e37eac Mon Sep 17 00:00:00 2001
From: z <wyd621@163.com>
Date: Wed, 26 Aug 2020 10:10:01 +0800
Subject: [PATCH]  * adjust for check begin and end.

---
 module/block/view/scrumroadmapblock.html.php |  3 +-
 module/common/lang/zh-cn.php                 |  2 +-
 module/program/control.php                   | 14 ++---
 module/program/css/create.css                |  1 +
 module/program/lang/zh-cn.php                |  6 ++
 module/program/model.php                     | 61 ++++++++++++++------
 module/program/view/create.html.php          | 16 +++--
 7 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/module/block/view/scrumroadmapblock.html.php b/module/block/view/scrumroadmapblock.html.php
index 98147b6d19..48f30c7a8b 100644
--- a/module/block/view/scrumroadmapblock.html.php
+++ b/module/block/view/scrumroadmapblock.html.php
@@ -13,6 +13,7 @@
 <style>
 .release-line>li:nth-child(even)>a{height:92px;}
 .release-line>li:nth-child(odd){padding-top: 87px;}
+.release-line>li>a .title {overflow: hidden; width:150%; text-overflow: ellipsis;}
 #dashboard .panel-move-handler{right:78px}
 #productList{width:28%; position: absolute; top: 6px; left: 96px;}
 #createPlan{position: absolute; top: 3px; right:0px;}
@@ -39,7 +40,7 @@
             <?php else:?>
             <li>
               <a href="<?php echo $this->createLink('release', 'view', "releaseID={$plan->id}");?>">
-                <span class="title" title="<?php echo $plan->name;?>"><?php echo $plan->name . "($plan->buildName)";?></span>
+                <span class="title" title="<?php echo $plan->name . " ($plan->buildName)";?>"><?php echo $plan->name . "($plan->buildName)";?></span>
                 <span class="date" title="<?php echo $plan->date;?>"><?php echo $plan->date;?></span>
                 <?php $estimate = empty($plan->stories) ? 0 : $this->block->getStorysEstimateHours(explode(',', $plan->stories));?>
                 <span class="date"><?php echo $lang->block->consumedHours;?> <?php echo empty($estimate) ? 0 : $estimate;?> h</span>
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 2056de9939..9e3a17b188 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -155,7 +155,7 @@ $lang->system->menu->custom      = array('link' => '自定义|custom|plan|');
 $lang->system->subMenu->setmodel->scrum  ='scrum|custom|setscrum|';
 $lang->system->dividerMenu = ',auditcl,subject,';
 
-if($_COOKIE['systemModel'] == 'scrum')
+if(isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum')
 {
     $lang->system->menu = new stdclass();
     $lang->system->subMenu->setmodel = new stdclass();
diff --git a/module/program/control.php b/module/program/control.php
index 6316a754fd..7b2e1a7ee2 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -86,12 +86,12 @@ class program extends control
      * Create a program.
      *
      * @param  string $template
-     * @param  int    $programID
+     * @param  int    $parentProgramID
      * @param  int    $copyProgramID
      * @access public
      * @return void
      */
-    public function create($template = 'cmmi', $programID = 0, $copyProgramID = '')
+    public function create($template = 'cmmi', $parentProgramID = 0, $copyProgramID = '')
     {
         if($_POST)
         {
@@ -109,16 +109,16 @@ class program extends control
         $acl          = 'open';
         $privway      = 'extend';
 
-        if($programID)
+        if($parentProgramID)
         {
-            $program = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($programID)->fetch();
-            if($this->program->checkHasContent($programID))
+            $parentProgram = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($parentProgramID)->fetch();
+            if($this->program->checkHasContent($parentProgramID))
             {
                 echo js::alert($this->lang->program->cannotCreateChild);
                 die(js::locate('back'));
             }
 
-            if(empty($template)) $template = $program->template;
+            if(empty($template)) $template = $parentProgram->template;
         }
 
         if($copyProgramID)
@@ -145,7 +145,7 @@ class program extends control
         $this->view->acl           = $acl;
         $this->view->privway       = $privway;
         $this->view->whitelist     = $whitelist;
-        $this->view->programID     = $programID;
+        $this->view->parentProgram = $parentProgramID ? $parentProgram : '';
         $this->view->copyProgramID = $copyProgramID;
         $this->display();
     }
diff --git a/module/program/css/create.css b/module/program/css/create.css
index c6c42d376b..6400101703 100644
--- a/module/program/css/create.css
+++ b/module/program/css/create.css
@@ -7,3 +7,4 @@
 #copyProjectModal a.active {border-color: #00da88; color: #00da88; background-color: #E5FFE6}
 #copyProjectModal a.active:after {position: absolute; content: '\e92f'; font-family: ZentaoIcon; font-size: 20px; right: 25px;}
 #copyProjectModal a.cancel {color: #ff5d5d}
+#budget {border-right:0px;}
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index b6b9e9faa1..7bc8390074 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -114,3 +114,9 @@ $lang->program->confirmDelete      = "您确定删除项目[%s]吗？";
 $lang->program->emptyPM            = '暂无';
 $lang->program->cannotChangeToCat  = "该项目已经有实际的内容，无法修改为父项目";
 $lang->program->cannotCancelCat    = "该项目下已经有子项目，无法取消父项目标记";
+$lang->program->parentBeginEnd     = "父项目起止时间：%s ~ %s";
+$lang->program->parentBudget       = "父项目预算：%s";
+$lang->program->beginLetterParent  = "父项目的开始日期：%s，开始日期不能小于父项目的开始日期";
+$lang->program->endGreaterParent   = "父项目的完成日期：%s，完成日期不能大于父项目的完成日期";
+$lang->program->beginGreateChild   = "子项目的最小开始日期：%s，父项目的开始日期不能大于子项目的最小开始日期";
+$lang->program->endLetterChild     = "子项目的最大完成日期：%s，父项目的完成日期不能小于子项目的最大完成日期";
diff --git a/module/program/model.php b/module/program/model.php
index 8eb37c389f..473643285b 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -247,13 +247,21 @@ class programModel extends model
             ->setIF($this->post->acl != 'custom', 'whitelist', '')
             ->setDefault('openedBy', $this->app->user->account)
             ->setDefault('openedDate', helper::now())
-            ->setDefault('team', substr($this->post->name,0, 30))
+            ->setDefault('team', substr($this->post->name, 0, 30))
             ->join('whitelist', ',')
             ->cleanInt('budget')
             ->stripTags($this->config->program->editor->create['id'], $this->config->allowedTags)
             ->remove('products, workDays, delta, branch, uid, plans')
             ->get();
 
+        if($project->parent)
+        {
+            $parentProgram = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($project->parent)->fetch();
+            if($project->begin < $parentProgram->begin) dao::$errors['begin'] = sprintf($this->lang->program->beginLetterParent, $parentProgram->begin);
+            if($project->end > $parentProgram->end) dao::$errors['end'] = sprintf($this->lang->program->endGreaterParent, $parentProgram->end);
+            if(dao::isError()) return false;
+        }
+
         $project = $this->loadModel('file')->processImgURL($project, $this->config->program->editor->create['id'], $this->post->uid);
         $this->dao->insert(TABLE_PROJECT)->data($project)
             ->autoCheck()
@@ -347,8 +355,23 @@ class programModel extends model
 
         if(!empty($program->isCat) and $this->checkHasContent($programID))  dao::$errors['isCat'] = $this->lang->program->cannotChangeToCat;
         if(empty($program->isCat)  and $this->checkHasChildren($programID)) dao::$errors['isCat'] = $this->lang->program->cannotCancelCat;
-        if(dao::isError()) return false;
 
+        if($program->isCat)
+        {
+            $minChildBegin = $this->dao->select('min(begin) as minBegin')->from(TABLE_PROJECT)->where('id')->ne($programID)->andWhere('deleted')->eq(0)->andWhere('path')->like("%,{$programID},%")->fetch('minBegin');
+            $maxChildEnd   = $this->dao->select('max(end) as maxEnd')->from(TABLE_PROJECT)->where('id')->ne($programID)->andWhere('deleted')->eq(0)->andWhere('path')->like("%,{$programID},%")->fetch('maxEnd');
+
+            if($minChildBegin and $program->begin > $minChildBegin) dao::$errors['begin'] = sprintf($this->lang->program->beginGreateChild, $minChildBegin);
+            if($maxChildEnd   and $program->end   < $maxChildEnd)   dao::$errors['end']   = sprintf($this->lang->program->endLetterChild,   $maxChildEnd);
+        }
+
+        if($program->parent)
+        {
+            $parentProgram = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($program->parent)->fetch();
+            if($parentProgram and $program->begin < $parentProgram->begin) dao::$errors['begin'] = sprintf($this->lang->program->beginLetterParent, $parentProgram->begin);
+            if($parentProgram and $program->end   > $parentProgram->end)   dao::$errors['end']   = sprintf($this->lang->program->endGreaterParent,  $parentProgram->end);
+        }
+        if(dao::isError()) return false;
 
         $this->dao->update(TABLE_PROJECT)->data($program)
             ->autoCheck($skipFields = 'begin,end')
@@ -441,23 +464,23 @@ class programModel extends model
     public function checkHasContent($programID)
     {
         $count  = 0;
-        $count += $this->dao->select('count(*) as count')->from(TABLE_BUDGET)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_BUG)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_CASE)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_DESIGN)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_DOC)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_DURATIONESTIMATION)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_ISSUE)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_PROJECT)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_RELATION)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_RELEASE)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_REPO)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_RISK)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_STORY)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_TESTREPORT)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_TESTSUITE)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_TESTTASK)->where('program')->eq($programID)->fetch('count');
-        $count += $this->dao->select('count(*) as count')->from(TABLE_WORKESTIMATION)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_BUDGET)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_BUG)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_CASE)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_DESIGN)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_DOC)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_DURATIONESTIMATION)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_ISSUE)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_PROJECT)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_RELATION)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_RELEASE)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_REPO)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_RISK)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_STORY)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_TESTREPORT)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_TESTSUITE)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_TESTTASK)->where('program')->eq($programID)->fetch('count');
+        $count += (int)$this->dao->select('count(*) as count')->from(TABLE_WORKESTIMATION)->where('program')->eq($programID)->fetch('count');
 
         return $count > 0;
     }
diff --git a/module/program/view/create.html.php b/module/program/view/create.html.php
index 8e323842dd..7e067c6ff7 100644
--- a/module/program/view/create.html.php
+++ b/module/program/view/create.html.php
@@ -75,8 +75,14 @@
         </tr>
         <tr>
           <th><?php echo $lang->program->budget;?></th>
-          <td><?php echo html::input('budget', '', "class='form-control'");?></td>
-          <td style='float:left'><?php echo html::select('budgetUnit', $lang->program->unitList, 'yuan', "class='form-control'");?></td><td></td>
+          <td>
+            <div class='input-group'>
+              <?php echo html::input('budget', '', "class='form-control'");?>
+              <span class='input-group-addon'></span>
+              <?php echo html::select('budgetUnit', $lang->program->unitList, empty($parentProgram->budgetUnit) ? 'yuan' : $parentProgram->budgetUnit, "class='form-control'");?>
+            </div>
+          </td>
+          <td class='muted'><?php if($parentProgram) printf($lang->program->parentBudget, $parentProgram->budget . zget($lang->program->unitList, $parentProgram->budgetUnit, ''));?></td>
         </tr>
         <tr>
           <th><?php echo $lang->program->dateRange;?></th>
@@ -87,7 +93,7 @@
               <?php echo html::input('end', '', "class='form-control form-date' onchange='computeWorkDays();' placeholder='" . $lang->program->end . "' required");?>
             </div>
           </td>
-          <td colspan='2'></td>
+          <td class='muted'><?php if($parentProgram) printf($lang->program->parentBeginEnd, $parentProgram->begin, $parentProgram->end);?></td>
         </tr>
         <?php if($template == 'scrum'):?>
         <tr>
@@ -137,7 +143,7 @@
             <?php echo html::backButton();?>
             <?php
             echo html::hidden('template', $template);
-            echo html::hidden('parent', $programID);
+            echo html::hidden('parent', $parentProgram->id);
             ?>
           </td>
         </tr>
@@ -175,5 +181,5 @@
   </div>
 </div>
 <?php js::set('template', $template);?>
-<?php js::set('programID', $programID);?>
+<?php js::set('parentProgramID', $parentProgram->id);?>
 <?php include '../../common/view/footer.html.php';?>