From eaa39c7f0fc91c3be5ebe4f4886f1e8d0039e64b Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Mon, 27 Jun 2022 09:14:37 +0000
Subject: [PATCH] * Finish task #58576 #58577.

---
 module/program/css/create.css       |  2 ++
 module/program/css/edit.css         |  2 ++
 module/program/model.php            | 12 ++++++------
 module/program/view/create.html.php |  4 ++--
 module/program/view/edit.html.php   |  4 ++--
 module/project/css/create.css       |  2 ++
 module/project/css/edit.css         |  2 ++
 module/project/model.php            | 12 ++++++------
 module/project/view/create.html.php |  4 ++--
 module/project/view/edit.html.php   |  4 ++--
 10 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/module/program/css/create.css b/module/program/css/create.css
index 191b12ce1d..12a38dc6f4 100644
--- a/module/program/css/create.css
+++ b/module/program/css/create.css
@@ -1,2 +1,4 @@
 #budget {border-right: 0px;}
 #budgetUnit {border-left: 0px;}
+#dateRange {vertical-align: top; padding-top: 13px;}
+#endList {vertical-align: top; padding-top: 13px;}
diff --git a/module/program/css/edit.css b/module/program/css/edit.css
index 191b12ce1d..12a38dc6f4 100644
--- a/module/program/css/edit.css
+++ b/module/program/css/edit.css
@@ -1,2 +1,4 @@
 #budget {border-right: 0px;}
 #budgetUnit {border-left: 0px;}
+#dateRange {vertical-align: top; padding-top: 13px;}
+#endList {vertical-align: top; padding-top: 13px;}
diff --git a/module/program/model.php b/module/program/model.php
index 056adaa7a8..cb62e0f692 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -709,13 +709,13 @@ class programModel extends model
             if($parentProgram)
             {
                 /* Child program begin cannot less than parent. */
-                if($program->begin < $parentProgram->begin) dao::$errors['begin'] = sprintf($this->lang->program->beginLetterParent, $program->name, $parentProgram->name, $parentProgram->begin);
+                if(!empty($program->name) and $program->begin < $parentProgram->begin) dao::$errors['begin'] = sprintf($this->lang->program->beginLetterParent, $program->name, $parentProgram->name, $parentProgram->begin);
 
                 /* When parent set end then child program end cannot greater than parent. */
-                if($parentProgram->end != '0000-00-00' and $program->end > $parentProgram->end) dao::$errors['end'] = sprintf($this->lang->program->endGreaterParent, $program->name, $parentProgram->name, $parentProgram->end);
+                if(!empty($program->name) and$parentProgram->end != '0000-00-00' and $program->end > $parentProgram->end) dao::$errors['end'] = sprintf($this->lang->program->endGreaterParent, $program->name, $parentProgram->name, $parentProgram->end);
 
                 /* When parent set end then child program cannot set longTime. */
-                if(empty($program->end) and $this->post->delta == 999 and $parentProgram->end != '0000-00-00') dao::$errors['end'] = sprintf($this->lang->program->endGreaterParent, $program->name, $parentProgram->name, $parentProgram->end);
+                if(!empty($program->name) and empty($program->end) and $this->post->delta == 999 and $parentProgram->end != '0000-00-00') dao::$errors['end'] = sprintf($this->lang->program->endGreaterParent, $program->name, $parentProgram->name, $parentProgram->end);
 
                 /* The budget of a child program cannot beyond the remaining budget of the parent program. */
                 $program->budgetUnit = $parentProgram->budgetUnit;
@@ -818,9 +818,9 @@ class programModel extends model
             $parentProgram = $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($program->parent)->fetch();
             if($parentProgram)
             {
-                if($program->begin < $parentProgram->begin) dao::$errors['begin'] = sprintf($this->lang->program->beginLetterParent, $program->name, $parentProgram->name, $parentProgram->begin);
-                if($parentProgram->end != '0000-00-00' and $program->end > $parentProgram->end) dao::$errors['end'] = sprintf($this->lang->program->endGreaterParent, $program->name, $parentProgram->name, $parentProgram->end);
-                if(empty($program->end) and $this->post->delta == 999 and $parentProgram->end != '0000-00-00') dao::$errors['end'] = sprintf($this->lang->program->endGreaterParent, $program->name, $parentProgram->name, $parentProgram->end);
+                if(!empty($program->name) and $program->begin < $parentProgram->begin) dao::$errors['begin'] = sprintf($this->lang->program->beginLetterParent, $program->name, $parentProgram->name, $parentProgram->begin);
+                if(!empty($program->name) and $parentProgram->end != '0000-00-00' and $program->end > $parentProgram->end) dao::$errors['end'] = sprintf($this->lang->program->endGreaterParent, $program->name, $parentProgram->name, $parentProgram->end);
+                if(!empty($program->name) and empty($program->end) and $this->post->delta == 999 and $parentProgram->end != '0000-00-00') dao::$errors['end'] = sprintf($this->lang->program->endGreaterParent, $program->name, $parentProgram->name, $parentProgram->end);
             }
 
             /* The budget of a child program cannot beyond the remaining budget of the parent program. */
diff --git a/module/program/view/create.html.php b/module/program/view/create.html.php
index 28ff2ac3cb..c26d07fb7d 100644
--- a/module/program/view/create.html.php
+++ b/module/program/view/create.html.php
@@ -88,7 +88,7 @@
           </td>
         </tr>
         <tr>
-          <th><?php echo $lang->project->dateRange;?></th>
+          <th id="dateRange"><?php echo $lang->project->dateRange;?></th>
           <td>
             <div class='input-group'>
               <?php echo html::input('begin', date('Y-m-d'), "class='form-control form-date' onchange='computeWorkDays();' placeholder='" . $lang->project->begin . "' required");?>
@@ -96,7 +96,7 @@
               <?php echo html::input('end', '', "class='form-control form-date' placeholder='" . $lang->project->end . "' required");?>
             </div>
           </td>
-          <td colspan='2'><?php echo html::radio('delta', $lang->program->endList , '', "onclick='computeEndDate(this.value)'");?></td>
+          <td id="endList" colspan='2'><?php echo html::radio('delta', $lang->program->endList, '', "onclick='computeEndDate(this.value)'");?></td>
         </tr>
         <tr class='hide'>
           <th><?php echo $lang->project->status;?></th>
diff --git a/module/program/view/edit.html.php b/module/program/view/edit.html.php
index 39a281adbc..993f2a3ee3 100644
--- a/module/program/view/edit.html.php
+++ b/module/program/view/edit.html.php
@@ -69,7 +69,7 @@
           </td>
         </tr>
         <tr>
-          <th><?php echo $lang->project->dateRange;?></th>
+          <th id="dateRange"><?php echo $lang->project->dateRange;?></th>
           <td>
             <div class='input-group'>
               <?php echo html::input('begin', $program->begin, "class='form-control form-date' placeholder='" . $lang->project->begin . "' required");?>
@@ -81,7 +81,7 @@
             </div>
           </td>
           <?php $endValue = $program->end == LONG_TIME ? 999 : (strtotime($program->end) - strtotime($program->begin)) / 3600 / 24 + 1;?>
-          <td colspan='2'><?php echo html::radio('delta', $lang->program->endList , $endValue, "onclick='computeEndDate(this.value)'");?></td>
+          <td id="endList" colspan='2'><?php echo html::radio('delta', $lang->program->endList , $endValue, "onclick='computeEndDate(this.value)'");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->project->realBegan;?></th>
diff --git a/module/project/css/create.css b/module/project/css/create.css
index 840d2916b3..1443b99aa3 100644
--- a/module/project/css/create.css
+++ b/module/project/css/create.css
@@ -1,6 +1,8 @@
 .popover-sm .popover-content {padding: 8px 10px; max-width: 228px;}
 .c-future {width: 56px;}
 
+#dateRange {vertical-align: top; padding-top: 13px;}
+#endList {vertical-align: top; padding-top: 13px;}
 #copyProjectModal {padding: 0;}
 #copyProjectModal {padding: 0 2px;}
 #copyProjectModal > div {position: relative;}
diff --git a/module/project/css/edit.css b/module/project/css/edit.css
index 2ac86731bf..3a6df893c9 100644
--- a/module/project/css/edit.css
+++ b/module/project/css/edit.css
@@ -2,3 +2,5 @@
 #budgetUnit {border-left: 0px;}
 #plansBox .row {display: inline-table; width: 102%;}
 #plansBox .col-sm-4 {float: none; display: inline-block;}
+#dateRange {vertical-align: top; padding-top: 13px;}
+#endList {vertical-align: top; padding-top: 13px;}
diff --git a/module/project/model.php b/module/project/model.php
index 6e72c9d4d0..d8231ca877 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1085,10 +1085,10 @@ class projectModel extends model
             if($program)
             {
                 /* Child project begin cannot less than parent. */
-                if($project->begin < $program->begin) dao::$errors['begin'] = sprintf($this->lang->project->beginGreateChild, $project->name, $program->name, $program->begin);
+                if(!empty($project->name) and $project->begin < $program->begin) dao::$errors['begin'] = sprintf($this->lang->project->beginGreateChild, $project->name, $program->name, $program->begin);
 
                 /* When parent set end then child project end cannot greater than parent. */
-                if($program->end != '0000-00-00' and $project->end > $program->end) dao::$errors['end'] = sprintf($this->lang->project->endLetterChild, $project->name, $program->name, $program->end);
+                if(!empty($project->name) and $$program->end != '0000-00-00' and $project->end > $program->end) dao::$errors['end'] = sprintf($this->lang->project->endLetterChild, $project->name, $program->name, $program->end);
 
                 if(dao::isError()) return false;
             }
@@ -1349,10 +1349,10 @@ class projectModel extends model
             if($program)
             {
                 /* Child project begin cannot less than parent. */
-                if($project->begin < $program->begin) dao::$errors['begin'] = sprintf($this->lang->project->beginGreateChild, $project->name, $program->name, $program->begin);
+                if(!empty($project->name) and $project->begin < $program->begin) dao::$errors['begin'] = sprintf($this->lang->project->beginGreateChild, $project->name, $program->name, $program->begin);
 
                 /* When parent set end then child project end cannot greater than parent. */
-                if($program->end != '0000-00-00' and $project->end > $program->end) dao::$errors['end'] = sprintf($this->lang->project->endLetterChild, $project->name, $program->name, $program->end);
+                if(!empty($project->name) and $program->end != '0000-00-00' and $project->end > $program->end) dao::$errors['end'] = sprintf($this->lang->project->endLetterChild, $project->name, $program->name, $program->end);
 
                 if(dao::isError()) return false;
             }
@@ -1518,14 +1518,14 @@ class projectModel extends model
                 if($parentProject)
                 {
                     /* Child project begin cannot less than parent. */
-                    if($projects[$projectID]->begin < $parentProject->begin)
+                    if(!empty($projects[$projectID]->name) and $projects[$projectID]->begin < $parentProject->begin)
                     {
                         dao::$errors['begin'] = sprintf($this->lang->project->beginGreateChild, $projects[$projectID]->name, $parentProject->name, $parentProject->begin);
                         return false;
                     }
 
                     /* When parent set end then child project end cannot greater than parent. */
-                    if($parentProject->end != '0000-00-00' and $projects[$projectID]->end > $parentProject->end)
+                    if(!empty($projects[$projectID]->name) and $parentProject->end != '0000-00-00' and $projects[$projectID]->end > $parentProject->end)
                     {
                         dao::$errors['end'] =  sprintf($this->lang->project->endLetterChild, $projects[$projectID]->name, $parentProject->name, $parentProject->end);
                         return false;
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 21b48a5f4c..6a8febe208 100755
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -84,7 +84,7 @@
           </td>
         </tr>
         <tr>
-          <th><?php echo $lang->project->dateRange;?></th>
+          <th id="dateRange"><?php echo $lang->project->dateRange;?></th>
           <td>
             <div class='input-group'>
               <?php echo html::input('begin', date('Y-m-d'), "class='form-control form-date' onchange='computeWorkDays();' placeholder='" . $lang->project->begin . "' required");?>
@@ -92,7 +92,7 @@
               <?php echo html::input('end', '', "class='form-control form-date' onchange='computeWorkDays();' placeholder='" . $lang->project->end . "' required");?>
             </div>
           </td>
-          <td colspan='2'><?php echo html::radio('delta', $lang->project->endList , '', "onclick='computeEndDate(this.value)'");?></td>
+          <td id="endList" colspan='2'><?php echo html::radio('delta', $lang->project->endList , '', "onclick='computeEndDate(this.value)'");?></td>
         </tr>
         <tr id='daysBox'>
           <th><?php echo $lang->execution->days;?></th>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 194c086fe7..db110c8a34 100755
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -89,7 +89,7 @@
           </td>
         </tr>
         <tr>
-          <th><?php echo $lang->project->dateRange;?></th>
+          <th id="dateRange"><?php echo $lang->project->dateRange;?></th>
           <td>
             <div class='input-group'>
               <?php echo html::input('begin', $project->begin, "class='form-control form-date' onchange='computeWorkDays();' placeholder='" . $lang->project->begin . "' required");?>
@@ -101,7 +101,7 @@
             </div>
           </td>
           <?php $deltaValue = $project->end == LONG_TIME ? 999 : (strtotime($project->end) - strtotime($project->begin)) / 3600 / 24 + 1;?>
-          <td colspan='2'><?php echo html::radio('delta', $lang->project->endList , $deltaValue, "onclick='computeEndDate(this.value)'");?></td>
+          <td id="endList" colspan='2'><?php echo html::radio('delta', $lang->project->endList , $deltaValue, "onclick='computeEndDate(this.value)'");?></td>
         </tr>
         <tr id='daysBox' <?php if($project->end == LONG_TIME) echo "class='hidden'";?>>
           <th><?php echo $lang->project->days;?></th>