From 3ade008ce6fdc5d7acb24a8e6b275ac80652db05 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Mon, 22 Feb 2021 13:59:12 +0800
Subject: [PATCH] * Finish task#36071.

---
 module/upgrade/control.php                  |  2 +-
 module/upgrade/js/mergeprogram.js           | 20 ++++++++++++++++++++
 module/upgrade/view/mergebyline.html.php    |  2 +-
 module/upgrade/view/mergebyproduct.html.php |  2 +-
 module/upgrade/view/mergebysprint.html.php  |  2 +-
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index f325685110..64043b3d83 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -221,7 +221,7 @@ class upgrade extends control
                 /* Create Program. */
                 list($programID, $projectID) = $this->upgrade->createProgram($linkedProducts, $linkedSprints);
                 if(dao::isError()) die(js::error(dao::getError()));
-                
+
                 /* Process merged products and projects. */
                 $this->upgrade->processMergedData($programID, $projectID, $linkedProducts, $linkedSprints);
 
diff --git a/module/upgrade/js/mergeprogram.js b/module/upgrade/js/mergeprogram.js
index 99afcd4b66..a10aeff2b6 100644
--- a/module/upgrade/js/mergeprogram.js
+++ b/module/upgrade/js/mergeprogram.js
@@ -8,6 +8,7 @@ $(function()
     PGMEnd   = $('.PGMParams #end').val();
     setPGMBegin(PGMBegin);
     setPGMEnd(PGMEnd);
+    setPRJPM();
 
     $('[name^=lines]').change(function()
     {
@@ -22,6 +23,7 @@ $(function()
         }
         setPGMBegin(PGMBegin);
         setPGMEnd(PGMEnd);
+        setPRJPM();
     })
 
     var PGMOriginEnd = $('#end').val();
@@ -71,6 +73,7 @@ $(function()
 
         setPGMBegin(PGMBegin);
         setPGMEnd(PGMEnd);
+        setPRJPM();
     })
 
     $('[name^=products]').change(function()
@@ -89,6 +92,7 @@ $(function()
         }
         setPGMBegin(PGMBegin);
         setPGMEnd(PGMEnd);
+        setPRJPM();
     })
 
     $('[name^=sprints]').change(function()
@@ -103,6 +107,7 @@ $(function()
         }
         setPGMBegin(PGMBegin);
         setPGMEnd(PGMEnd);
+        setPRJPM();
     })
 
     toggleProgram($('form #newProgram0'));
@@ -206,6 +211,21 @@ function setPGMEnd(PGMEnd)
     });
 }
 
+function setPRJPM()
+{
+    var PM = [];
+    $(':checkbox:checked[data-pm]').each(function()
+    {
+        var PMName = $(this).attr('data-pm');
+        PM[PMName] = PM[PMName] == undefined ? 0 : PM[PMName];
+        PM[PMName] = PM[PMName] + 1;
+    });
+    PM.sort(function(el1, el2){return el2 - el1;});
+    PMNameList = Object.keys(PM);
+    PMNameList = PMNameList.filter(Boolean);
+    $('#PM').val(PMNameList[0]).trigger("chosen:updated");
+}
+
 function convertStringToDate(dateString)
 {
     dateString = dateString.split('-');
diff --git a/module/upgrade/view/mergebyline.html.php b/module/upgrade/view/mergebyline.html.php
index c33b1ac2d7..d867454b22 100644
--- a/module/upgrade/view/mergebyline.html.php
+++ b/module/upgrade/view/mergebyline.html.php
@@ -44,7 +44,7 @@
               <div class='scroll-handle'>
               <?php if(isset($productGroups[$productID])):?>
               <?php foreach($productGroups[$productID] as $sprint):?>
-              <?php echo html::checkBox("sprints[$line->id][$productID]", array($sprint->id => "{$lang->upgrade->project} #{$sprint->id} {$sprint->name}"), $i == 0 ? $sprint->id : 0, "title='{$sprint->name}' data-product='{$product->id}' data-line='{$line->id}' data-begin='{$sprint->begin}' data-end='{$sprint->end}'");?>
+              <?php echo html::checkBox("sprints[$line->id][$productID]", array($sprint->id => "{$lang->upgrade->project} #{$sprint->id} {$sprint->name}"), $i == 0 ? $sprint->id : 0, "title='{$sprint->name}' data-product='{$product->id}' data-line='{$line->id}' data-begin='{$sprint->begin}' data-end='{$sprint->end}' data-pm='{$sprint->PM}'");?>
               <?php echo html::hidden("sprintIdList[$line->id][$productID][$sprint->id]", $sprint->id);?>
               <?php endforeach;?>
               <?php endif;?>
diff --git a/module/upgrade/view/mergebyproduct.html.php b/module/upgrade/view/mergebyproduct.html.php
index 72ae5d589c..ea92c400f1 100644
--- a/module/upgrade/view/mergebyproduct.html.php
+++ b/module/upgrade/view/mergebyproduct.html.php
@@ -26,7 +26,7 @@
             <div class='scroll-handle'>
             <?php if(isset($productGroups[$productID])):?>
             <?php foreach($productGroups[$productID] as $sprint):?>
-            <?php echo html::checkBox("sprints[$productID]", array($sprint->id => "{$sprint->name}"), $isChecked ? $sprint->id : '', "data-product='{$productID}' data-begin='{$sprint->begin}' data-end='{$sprint->end}'");?>
+            <?php echo html::checkBox("sprints[$productID]", array($sprint->id => "{$sprint->name}"), $isChecked ? $sprint->id : '', "data-product='{$productID}' data-begin='{$sprint->begin}' data-end='{$sprint->end}' data-pm='{$sprint->PM}'");?>
             <?php echo html::hidden("sprintIdList[$productID][$sprint->id]", $sprint->id);?>
             <?php endforeach;?>
             <?php endif;?>
diff --git a/module/upgrade/view/mergebysprint.html.php b/module/upgrade/view/mergebysprint.html.php
index 1916537af3..d3c1f2e32a 100644
--- a/module/upgrade/view/mergebysprint.html.php
+++ b/module/upgrade/view/mergebysprint.html.php
@@ -12,7 +12,7 @@
       </div>
       <div class='line-groups'>
         <?php foreach($noMergedSprints as $sprintID => $sprint):?>
-        <?php echo html::checkBox("sprints", array($sprint->id => "{$lang->upgrade->project} #{$sprint->id} {$sprint->name}"), $sprint->id, "data-begin='{$sprint->begin}' data-end='{$sprint->end}'");?>
+        <?php echo html::checkBox("sprints", array($sprint->id => "{$lang->upgrade->project} #{$sprint->id} {$sprint->name}"), $sprint->id, "data-begin='{$sprint->begin}' data-end='{$sprint->end}' data-pm='{$sprint->PM}'");?>
         <?php endforeach;?>
       </div>
     </div>