From 40909f01956f918119c78586c243a59dea83997c Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 11 Aug 2022 01:28:21 +0000
Subject: [PATCH 1/4] * Fix bug.

---
 module/project/js/common.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/module/project/js/common.js b/module/project/js/common.js
index a64000db6a..192f88c439 100644
--- a/module/project/js/common.js
+++ b/module/project/js/common.js
@@ -89,13 +89,16 @@ function computeWorkDays(currentID)
     if(beginDate && endDate)
     {
         if(isBactchEdit)  $('#dayses\\[' + index + '\\]').val(computeDaysDelta(beginDate, endDate));
-        if(!isBactchEdit) $('#days').val(computeDaysDelta(beginDate, endDate));
+        if(!isBactchEdit)
+        {
+            $('#days').val(computeDaysDelta(beginDate, endDate));
+            outOfDateTip();
+        }
     }
     else if($('input[checked="true"]').val())
     {
         computeEndDate();
     }
-    outOfDateTip();
 }
 
 /**

From 04247b0533adfbe6b442fa810be8a58d9b0e2902 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 11 Aug 2022 07:00:06 +0000
Subject: [PATCH 2/4] * Finish task #63580.

---
 module/project/css/batchedit.css       |  1 +
 module/project/js/common.js            | 38 ++++++++++++++++----------
 module/project/view/batchedit.html.php | 11 ++++++--
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/module/project/css/batchedit.css b/module/project/css/batchedit.css
index d44eca5c0f..583cc42539 100644
--- a/module/project/css/batchedit.css
+++ b/module/project/css/batchedit.css
@@ -4,3 +4,4 @@
 .c-name {width: 180px;}
 .c-code {width: 160px;}
 .c-acl {width: 125px;}
+#dateTip {padding: 0 7px;}
diff --git a/module/project/js/common.js b/module/project/js/common.js
index 192f88c439..506b7fb99c 100644
--- a/module/project/js/common.js
+++ b/module/project/js/common.js
@@ -89,16 +89,13 @@ function computeWorkDays(currentID)
     if(beginDate && endDate)
     {
         if(isBactchEdit)  $('#dayses\\[' + index + '\\]').val(computeDaysDelta(beginDate, endDate));
-        if(!isBactchEdit)
-        {
-            $('#days').val(computeDaysDelta(beginDate, endDate));
-            outOfDateTip();
-        }
+        if(!isBactchEdit) $('#days').val(computeDaysDelta(beginDate, endDate));
     }
     else if($('input[checked="true"]').val())
     {
         computeEndDate();
     }
+    outOfDateTip(isBactchEdit ? index : 0);
 }
 
 /**
@@ -364,20 +361,22 @@ function budgetOverrunTips()
  * @access public
  * @return void
  */
-function outOfDateTip()
+function outOfDateTip(currentID = 0)
 {
-    var end   = $('#end').val();
-    var begin = $('#begin').val();
-    if($('#dateTip').length > 0) $('#dateTip').remove();
+    var end   = currentID ? $('#ends\\[' + currentID + '\\]').val() : $('#end').val();
+    var begin = currentID ? $('#begins\\[' + currentID + '\\]').val() : $('#begin').val();
+    if($('#dateTip.text-remind').length > 0) $('#dateTip').remove();
+    if(currentID) $('#dateTip\\[' + currentID + '\\]').remove();
 
     if(end == longTime) end = LONG_TIME;
     if(end.length > 0 && begin.length > 0)
     {
-        var selectedProgramID = $('#parent').val();
+        var selectedProgramID = currentID ? $("select[name='parents\[" + currentID + "\]']").val() : $('#parent').val();
 
         if(selectedProgramID == 0) return;
 
         if(typeof(projectID) == 'undefined') projectID = 0;
+        projectID = currentID ? $('#projectIdList\\['+ currentID + '\\]').val() : projectID;
         $.get(createLink('project', 'ajaxGetObjectInfo', 'objectType=project&objectID=' + projectID + '&selectedProgramID=' + selectedProgramID), function(data)
         {
             var data         = JSON.parse(data);
@@ -386,23 +385,34 @@ function outOfDateTip()
             var projectEnd   = new Date(end);
             var projectBegin = new Date(begin);
 
+            var beginLetterParentTip = beginLetterParent + data.selectedProgramBegin;
+            var endGreaterParentTip  = endGreaterParent + data.selectedProgramEnd;
+            var dateExceedParentTip  = dateExceedParent + data.selectedProgramBegin + "~" + data.selectedProgramEnd;
+
             if(projectBegin >= parentBegin && projectEnd <= parentEnd) return;
 
             var dateTip = "";
             if(projectBegin < parentBegin && projectEnd <= parentEnd && projectEnd >= parentBegin)
             {
-                dateTip = "<span id='dateTip' class='text-remind'>" + beginLetterParent + data.selectedProgramBegin + "</span>";
+                dateTip = currentID ? beginLetterParentTip + "'>" + beginLetterParentTip : beginLetterParentTip;
             }
             else if(projectEnd > parentEnd && projectBegin >= parentBegin && projectBegin <= parentEnd)
             {
-                dateTip = "<span id='dateTip' class='text-remind'>" + endGreaterParent + data.selectedProgramEnd + "</span>";
+                dateTip = currentID ? endGreaterParentTip + "'>" + endGreaterParentTip : endGreaterParentTip;
             }
             else
             {
-                dateTip = "<span id='dateTip' class='text-remind'>" + dateExceedParent + data.selectedProgramBegin + "~" + data.selectedProgramEnd + "</span>";
+                dateTip = currentID ? dateExceedParentTip + "'>" + dateExceedParentTip : dateExceedParentTip;
             }
 
-            $('#dateBox').after(dateTip);
+            if(currentID)
+            {
+                $("#projects\\[" + currentID + "\\]").after("<tr id='dateTip[" + currentID + "]'><td colspan='5'></td><td id='dateTip' class='c-name' colspan='3'><span class='text-remind' title='" + dateTip + "</span></td></tr>");
+            }
+            else
+            {
+                $('#dateBox').after("<span id='dateTip' class='text-remind'>" + dateTip + "</span>");
+            }
         });
     }
 }
diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php
index da24f8b8ed..9bbb27500d 100644
--- a/module/project/view/batchedit.html.php
+++ b/module/project/view/batchedit.html.php
@@ -14,6 +14,11 @@
 <?php js::set('weekend', $config->execution->weekend);?>
 <?php js::set('linkedProjectsTip', $lang->project->linkedProjectsTip);?>
 <?php js::set('changeProgram', $lang->project->changeProgram);?>
+<?php js::set('beginLetterParent', $lang->project->beginLetterParent);?>
+<?php js::set('endGreaterParent', $lang->project->endGreaterParent);?>
+<?php js::set('dateExceedParent', $lang->project->dateExceedParent);?>
+<?php js::set('LONG_TIME', LONG_TIME);?>
+<?php js::set('longTime', $lang->project->longTime);?>
 <?php $requiredFields = $config->project->edit->requiredFields;?>
 <div id="mainContent" class="main-content">
   <div class="main-header">
@@ -42,15 +47,15 @@
       <tbody>
         <?php foreach($projects as $projectID => $project):?>
         <?php $aclList = $project->parent ? $lang->program->subAcls : $lang->project->acls;?>
-        <tr>
+          <tr id="projects[<?php echo $projectID;?>]">
           <td><?php echo sprintf('%03d', $projectID) . html::hidden("projectIdList[$projectID]", $projectID);?></td>
           <?php if(isset($unauthorizedPrograms[$project->parent])):?>
           <td>
-            <?php echo html::select("parents[$projectID]", $unauthorizedPrograms, $project->parent, "class='form-control chosen' data-id='$projectID' data-name='{$project->name}' data-parent='{$project->parent}' disabled");?>
+            <?php echo html::select("parents[$projectID]", $unauthorizedPrograms, $project->parent, "class='form-control chosen' onchange='outOfDateTip($projectID)' data-id='$projectID' data-name='{$project->name}' data-parent='{$project->parent}' disabled");?>
             <?php echo html::hidden("parents[$projectID]", $project->parent);?>
           </td>
           <?php else:?>
-          <td><?php echo html::select("parents[$projectID]", $programs, $project->parent, "class='form-control chosen' data-id='$projectID' data-name='{$project->name}' data-parent='{$project->parent}'");?></td>
+          <td><?php echo html::select("parents[$projectID]", $programs, $project->parent, "class='form-control chosen' onchange='outOfDateTip($projectID)' data-id='$projectID' data-name='{$project->name}' data-parent='{$project->parent}'");?></td>
           <?php endif;?>
           <td title='<?php echo $project->name;?>'><?php echo html::input("names[$projectID]", $project->name, "class='form-control'");?></td>
           <?php if(!isset($config->setCode) or $config->setCode == 1):?>

From fc5f9013e55e36c7a662e8985466e2334ea3d7c2 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 11 Aug 2022 08:33:14 +0000
Subject: [PATCH 3/4] * Finish task #63580.

---
 module/project/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/control.php b/module/project/control.php
index 62cfb79383..96f41a566d 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -240,7 +240,7 @@ class project extends control
         {
             $object = $objectType == 'project' ? $this->project->getByID($objectID) : $this->loadModel('program')->getByID($objectID);
 
-            if(isset($availableBudget)) $availableBudget = $object->parent == $selectedProgramID ? $availableBudget + $object->budget : $availableBudget;
+            if(isset($availableBudget)) $availableBudget = $object->parent == $selectedProgramID ? $availableBudget + (int)$object->budget : $availableBudget;
 
             if($objectType == 'program')
             {

From 5c71d7d0b3fc9a6d7341ee16cd0114a0619ff0fc Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 17 Aug 2022 02:10:45 +0000
Subject: [PATCH 4/4] * Finish task #63580.

---
 module/project/js/common.js            | 1 +
 module/project/view/batchedit.html.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/project/js/common.js b/module/project/js/common.js
index 506b7fb99c..c6d85cccc9 100644
--- a/module/project/js/common.js
+++ b/module/project/js/common.js
@@ -358,6 +358,7 @@ function budgetOverrunTips()
 /**
  *The date is out of the range of the parent project set, and a prompt is given.
  *
+ * @param  int    $currentID
  * @access public
  * @return void
  */
diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php
index 9bbb27500d..b02d95ee64 100644
--- a/module/project/view/batchedit.html.php
+++ b/module/project/view/batchedit.html.php
@@ -47,7 +47,7 @@
       <tbody>
         <?php foreach($projects as $projectID => $project):?>
         <?php $aclList = $project->parent ? $lang->program->subAcls : $lang->project->acls;?>
-          <tr id="projects[<?php echo $projectID;?>]">
+        <tr id="projects[<?php echo $projectID;?>]">
           <td><?php echo sprintf('%03d', $projectID) . html::hidden("projectIdList[$projectID]", $projectID);?></td>
           <?php if(isset($unauthorizedPrograms[$project->parent])):?>
           <td>