From 2a28c13c7ed32bcddef12022f17be7e5b0f2b9fd Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Tue, 5 Jul 2022 07:39:55 +0000
Subject: [PATCH 1/6] sprint_59473

---
 module/execution/control.php          | 13 +++++++++-
 module/execution/css/create.css       |  2 ++
 module/execution/js/create.js         | 37 ++++++++++++++++++++++++++-
 module/execution/model.php            | 24 +++++++++++++++++
 module/execution/view/create.html.php |  6 +++++
 5 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index b509ca3f4f..33a4fe10bb 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1525,7 +1525,9 @@ class execution extends control
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
 
         $this->loadModel('product');
-        $allProducts = $this->config->systemMode == 'classic' ? $this->product->getPairs('noclosed') : $this->product->getProductPairsByProject($projectID, 'noclosed');
+        $allProducts   = $this->config->systemMode == 'classic' ? $this->product->getPairs('noclosed') : $this->product->getProductPairsByProject($projectID, 'noclosed');
+        $copyProjects  = $this->execution->getCopyProjectPairsByProgramAndModel(empty($project->parent) ? 0 : $project->parent, 'noclosed', 'order_asc', empty($project->model) ? '' : $project->model);
+        $copyProjectID = ($projectID == 0) ? key($copyProjects) : $projectID;
 
         $this->view->title               = (($this->app->tab == 'execution') and ($this->config->systemMode == 'new')) ? $this->lang->execution->createExec : $this->lang->execution->create;
         $this->view->position[]          = $this->view->title;
@@ -1540,6 +1542,8 @@ class execution extends control
         $this->view->team                = $team;
         $this->view->teams               = array(0 => '') + $this->execution->getCanCopyObjects((int)$projectID);
         $this->view->allProjects         = array(0 => '') + $this->project->getPairsByModel('all', 0, 'noclosed');
+        $this->view->copyProjects        = $copyProjects;
+        $this->view->copyExecutions      = array('' => '') + $this->execution->getList($copyProjectID);
         $this->view->executionID         = $executionID;
         $this->view->productID           = $productID;
         $this->view->projectID           = $projectID;
@@ -3973,4 +3977,11 @@ class execution extends control
             echo json_encode($date);
         }
     }
+
+    public function ajaxGetProjectExecutions($projectID = 0)
+    {
+        $executions = $this->execution->getList($projectID);
+        echo json_encode($executions);
+    }
+
 }
diff --git a/module/execution/css/create.css b/module/execution/css/create.css
index cb9f540c66..6b847c0677 100644
--- a/module/execution/css/create.css
+++ b/module/execution/css/create.css
@@ -30,3 +30,5 @@
 
 #dateRange {vertical-align: top; padding-top: 13px;}
 #dateRangeOption {vertical-align: top; padding-top: 13px;}
+#myModalLabel {width: 20%; display: inline-block;}
+.projectSelect {display: inline-block; margin: 0 auto; width:20%;}
diff --git a/module/execution/js/create.js b/module/execution/js/create.js
index 2cb6a485bb..fa932dfa54 100644
--- a/module/execution/js/create.js
+++ b/module/execution/js/create.js
@@ -8,7 +8,11 @@ $(function()
     var heightType = $("[name='heightType']:checked").val();
     setCardCount(heightType);
 
-    $('#copyProjects a').click(function(){setCopyProject($(this).data('id')); $('#copyProjectModal').modal('hide')});
+    $(document).on('click', '#copyProjects a', function()
+    {
+        setCopyProject($(this).data('id')); $('#copyProjectModal').modal('hide');
+    });
+
     $('#begin').on('change', function()
     {
        $("#end").val('');
@@ -168,3 +172,34 @@ function subString(title, stringLength)
 
     return title;
 }
+
+/**
+ * Load project executions.
+ *
+ * @param  int    $projectID
+ * @access public
+ * @return void
+ */
+function loadProjectExecutions(projectID)
+{
+    $.get(createLink('execution', 'ajaxGetProjectExecutions', 'projectID=' + projectID + '&$copyExecutionID' + copyExecutionID), function(data)
+    {
+        if(data != '[]')
+        {
+            $('.alert').replaceWith("<div id='copyProjects' class='row'>");
+            $("#copyProjects > div[data-id != '']").remove();
+            $(".model-body").remove();
+            var data = JSON.parse(data);
+            $.each(data, function(id, execution)
+            {
+                var type    = execution.type == 'stage' ? 'waterfall' : execution.type;
+                var active  = copyExecutionID == id ? ' active' : '';
+                $('#copyProjects').append("<div class='col-md-4 col-sm-6'><a href='javascript:;' data-id='" + id + "' class='nobr " + active + "'><i class='icon-" + type + " text-muted'></i>" + execution.name + "</a></div>");
+            });
+        }
+        else
+        {
+            $('#copyProjects').replaceWith("<div class='alert with-icon'><i class='icon-exclamation-sign'></i><div class='content'>" + copyNoExecution + "</div>")
+        }
+    });
+}
diff --git a/module/execution/model.php b/module/execution/model.php
index 124dd02c13..372c54a49a 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4322,4 +4322,28 @@ class executionModel extends model
             echo '</td>';
         }
     }
+
+    /**
+     * Get copy project pairs by program and model.
+     *
+     * @param int    $programID
+     * @param string $status
+     * @param string $orderBy
+     * @param string $model
+     * @access public
+     * @return array
+     */
+    public function getCopyProjectPairsByProgramAndModel($programID = 0, $status = 'all', $orderBy = 'order_asc', $model = '')
+    {
+        return $this->dao->select('id, name')->from(TABLE_PROJECT)
+            ->where('type')->eq('project')
+            ->andWhere('deleted')->eq(0)
+            ->andWhere('vision')->eq($this->config->vision)
+            ->beginIF($programID !== '')->andWhere('parent')->eq($programID)->fi()
+            ->beginIF($model)->andWhere('model')->eq($model)->fi()
+            ->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
+            ->orderBy($orderBy)
+            ->fetchPairs();
+    }
 }
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 3a671c7a24..03e94ccbfa 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -45,6 +45,8 @@
 <?php js::set('multiBranchProducts', $multiBranchProducts);?>
 <?php js::set('systemMode', $config->systemMode);?>
 <?php js::set('projectID', $projectID);?>
+<?php js::set('copyExecutionID', $copyExecutionID);?>
+<?php js::set('copyNoExecution', $lang->execution->copyNoExecution);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -266,6 +268,9 @@
     <div class='modal-header'>
       <button type='button' class='close' data-dismiss='modal'><i class="icon icon-close"></i></button>
       <h4 class='modal-title' id='myModalLabel'><?php echo $lang->execution->copyTitle;?></h4>
+      <?php if($this->config->systemMode == 'new'):?>
+      <div class='projectSelect'><?php echo html::select("project", $copyProjects, $projectID, "class='form-control chosen' required onchange='loadProjectExecutions(this.value)'");?></div>
+      <?php endif;?>
     </div>
     <div class='modal-body'>
       <?php if(count($executions) == 1):?>
@@ -275,6 +280,7 @@
       </div>
       <?php else:?>
       <div id='copyProjects' class='row'>
+      <?php if($projectID == 0) $executions = $copyExecutions;?>
       <?php foreach ($executions as $id => $execution):?>
       <?php if(empty($id)):?>
       <?php if($copyExecutionID != 0):?>

From 5b228a26041239528c1f6ca6cfc9c0f1f11056bf Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Tue, 5 Jul 2022 08:04:57 +0000
Subject: [PATCH 2/6] sprint_59473

---
 module/execution/view/create.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 03e94ccbfa..36b2ee8dec 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -280,7 +280,7 @@
       </div>
       <?php else:?>
       <div id='copyProjects' class='row'>
-      <?php if($projectID == 0) $executions = $copyExecutions;?>
+      <?php if($config->systemMode == 'new' and $projectID == 0) $executions = $copyExecutions;?>
       <?php foreach ($executions as $id => $execution):?>
       <?php if(empty($id)):?>
       <?php if($copyExecutionID != 0):?>

From 900b52a96bef9866a4117e5e16e084a36280e1d9 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Tue, 5 Jul 2022 08:24:41 +0000
Subject: [PATCH 3/6] sprint_59473

---
 module/execution/css/create.css       | 4 ++--
 module/execution/view/create.html.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/execution/css/create.css b/module/execution/css/create.css
index 6b847c0677..37a08c608b 100644
--- a/module/execution/css/create.css
+++ b/module/execution/css/create.css
@@ -30,5 +30,5 @@
 
 #dateRange {vertical-align: top; padding-top: 13px;}
 #dateRangeOption {vertical-align: top; padding-top: 13px;}
-#myModalLabel {width: 20%; display: inline-block;}
-.projectSelect {display: inline-block; margin: 0 auto; width:20%;}
+#copyProjectModal .projectSelect {display: inline-block; margin-left: 10px; width: 20%;}
+#copyProjectModal .titleBox{position: relative; bottom: 3px; display: inline-block;}
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 36b2ee8dec..9df87094ce 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -267,7 +267,7 @@
   <div class='modal-dialog mw-900px'>
     <div class='modal-header'>
       <button type='button' class='close' data-dismiss='modal'><i class="icon icon-close"></i></button>
-      <h4 class='modal-title' id='myModalLabel'><?php echo $lang->execution->copyTitle;?></h4>
+      <div class='titleBox'><h4 class='modal-title' id='myModalLabel'><?php echo $lang->execution->copyTitle;?></h4></div>
       <?php if($this->config->systemMode == 'new'):?>
       <div class='projectSelect'><?php echo html::select("project", $copyProjects, $projectID, "class='form-control chosen' required onchange='loadProjectExecutions(this.value)'");?></div>
       <?php endif;?>

From 84e078c1b291ce676453f0169009a3d7ab2a86c4 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Tue, 5 Jul 2022 14:35:33 +0000
Subject: [PATCH 4/6] sprint_59473

---
 module/execution/control.php          | 4 ++--
 module/execution/css/create.css       | 1 +
 module/execution/js/create.js         | 6 +++++-
 module/execution/model.php            | 2 +-
 module/execution/view/create.html.php | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 33a4fe10bb..59d2b9f19d 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1526,7 +1526,7 @@ class execution extends control
 
         $this->loadModel('product');
         $allProducts   = $this->config->systemMode == 'classic' ? $this->product->getPairs('noclosed') : $this->product->getProductPairsByProject($projectID, 'noclosed');
-        $copyProjects  = $this->execution->getCopyProjectPairsByProgramAndModel(empty($project->parent) ? 0 : $project->parent, 'noclosed', 'order_asc', empty($project->model) ? '' : $project->model);
+        $copyProjects  = $this->execution->getCopyProjectPairsByProgramAndModel(isset($project->parent) ? $project->parent : '', 'noclosed', 'order_asc', isset($project->model) ? $project->model : '');
         $copyProjectID = ($projectID == 0) ? key($copyProjects) : $projectID;
 
         $this->view->title               = (($this->app->tab == 'execution') and ($this->config->systemMode == 'new')) ? $this->lang->execution->createExec : $this->lang->execution->create;
@@ -3978,7 +3978,7 @@ class execution extends control
         }
     }
 
-    public function ajaxGetProjectExecutions($projectID = 0)
+    public function ajaxGetCopyProjectExecutions($projectID = 0)
     {
         $executions = $this->execution->getList($projectID);
         echo json_encode($executions);
diff --git a/module/execution/css/create.css b/module/execution/css/create.css
index 37a08c608b..6a7e4ef15c 100644
--- a/module/execution/css/create.css
+++ b/module/execution/css/create.css
@@ -32,3 +32,4 @@
 #dateRangeOption {vertical-align: top; padding-top: 13px;}
 #copyProjectModal .projectSelect {display: inline-block; margin-left: 10px; width: 20%;}
 #copyProjectModal .titleBox{position: relative; bottom: 3px; display: inline-block;}
+a.chosen-single > div > b {top: -4px !important;}
diff --git a/module/execution/js/create.js b/module/execution/js/create.js
index fa932dfa54..bb5197128f 100644
--- a/module/execution/js/create.js
+++ b/module/execution/js/create.js
@@ -182,7 +182,7 @@ function subString(title, stringLength)
  */
 function loadProjectExecutions(projectID)
 {
-    $.get(createLink('execution', 'ajaxGetProjectExecutions', 'projectID=' + projectID + '&$copyExecutionID' + copyExecutionID), function(data)
+    $.get(createLink('execution', 'ajaxGetCopyProjectExecutions', 'projectID=' + projectID + '&$copyExecutionID' + copyExecutionID), function(data)
     {
         if(data != '[]')
         {
@@ -190,6 +190,10 @@ function loadProjectExecutions(projectID)
             $("#copyProjects > div[data-id != '']").remove();
             $(".model-body").remove();
             var data = JSON.parse(data);
+            if(copyExecutionID != 0 )
+            {
+                $('#copyProjects').append("<div class='col-md-4 col-sm-6'><a href='javascript:;' data-id='' class='cancel'><i class='icon-ban-circle'></i>" + cancelCopy + "</a></div>");
+            }
             $.each(data, function(id, execution)
             {
                 var type    = execution.type == 'stage' ? 'waterfall' : execution.type;
diff --git a/module/execution/model.php b/module/execution/model.php
index 372c54a49a..a05045279c 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4340,7 +4340,7 @@ class executionModel extends model
             ->andWhere('deleted')->eq(0)
             ->andWhere('vision')->eq($this->config->vision)
             ->beginIF($programID !== '')->andWhere('parent')->eq($programID)->fi()
-            ->beginIF($model)->andWhere('model')->eq($model)->fi()
+            ->beginIF($model !== '')->andWhere('model')->eq($model)->fi()
             ->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
             ->orderBy($orderBy)
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 9df87094ce..228b5bb9e0 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -46,7 +46,7 @@
 <?php js::set('systemMode', $config->systemMode);?>
 <?php js::set('projectID', $projectID);?>
 <?php js::set('copyExecutionID', $copyExecutionID);?>
-<?php js::set('copyNoExecution', $lang->execution->copyNoExecution);?>
+<?php js::set('cancelCopy', $lang->execution->cancelCopy);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>

From d34e8f8638d2491771cef25793b12a28574d886b Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 6 Jul 2022 00:29:14 +0000
Subject: [PATCH 5/6] sprint_59473

---
 module/execution/js/create.js         | 9 +++++++--
 module/execution/view/create.html.php | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/module/execution/js/create.js b/module/execution/js/create.js
index bb5197128f..6dcd9c0483 100644
--- a/module/execution/js/create.js
+++ b/module/execution/js/create.js
@@ -201,9 +201,14 @@ function loadProjectExecutions(projectID)
                 $('#copyProjects').append("<div class='col-md-4 col-sm-6'><a href='javascript:;' data-id='" + id + "' class='nobr " + active + "'><i class='icon-" + type + " text-muted'></i>" + execution.name + "</a></div>");
             });
         }
-        else
+        else if(data == '[]' && copyExecutionID == 0)
         {
-            $('#copyProjects').replaceWith("<div class='alert with-icon'><i class='icon-exclamation-sign'></i><div class='content'>" + copyNoExecution + "</div>")
+            $('#copyProjects').replaceWith("<div class='alert with-icon'><i class='icon-exclamation-sign'></i><div class='content'>" + copyNoExecution + "</div>");
+        }
+        else if(data == '[]' && copyExecutionID != 0)
+        {
+            $("#copyProjects > div[data-id != '']").remove();
+            $('#copyProjects').append("<div class='col-md-4 col-sm-6'><a href='javascript:;' data-id='' class='cancel'><i class='icon-ban-circle'></i>" + cancelCopy + "</a></div>");
         }
     });
 }
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 228b5bb9e0..b83a4d36e3 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -47,6 +47,7 @@
 <?php js::set('projectID', $projectID);?>
 <?php js::set('copyExecutionID', $copyExecutionID);?>
 <?php js::set('cancelCopy', $lang->execution->cancelCopy);?>
+<?php js::set('copyNoExecution', $lang->execution->copyNoExecution);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>

From e5ed8133b131ab106c2b39164cc6df402241cb44 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 6 Jul 2022 01:06:35 +0000
Subject: [PATCH 6/6] sprint_59473

---
 module/execution/control.php |  9 ++++++++-
 module/execution/model.php   | 24 ------------------------
 module/project/model.php     |  4 +++-
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 59d2b9f19d..6d4976ea9c 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1526,7 +1526,7 @@ class execution extends control
 
         $this->loadModel('product');
         $allProducts   = $this->config->systemMode == 'classic' ? $this->product->getPairs('noclosed') : $this->product->getProductPairsByProject($projectID, 'noclosed');
-        $copyProjects  = $this->execution->getCopyProjectPairsByProgramAndModel(isset($project->parent) ? $project->parent : '', 'noclosed', 'order_asc', isset($project->model) ? $project->model : '');
+        $copyProjects  = $this->loadModel('project')->getPairsByProgram(isset($project->parent) ? $project->parent : '', 'noclosed', '', 'order_asc', '', isset($project->model) ? $project->model : '');
         $copyProjectID = ($projectID == 0) ? key($copyProjects) : $projectID;
 
         $this->view->title               = (($this->app->tab == 'execution') and ($this->config->systemMode == 'new')) ? $this->lang->execution->createExec : $this->lang->execution->create;
@@ -3978,6 +3978,13 @@ class execution extends control
         }
     }
 
+    /**
+     * Ajax get copy project executions.
+     *
+     * @param  int    $projectID
+     * @access public
+     * @return void
+     */
     public function ajaxGetCopyProjectExecutions($projectID = 0)
     {
         $executions = $this->execution->getList($projectID);
diff --git a/module/execution/model.php b/module/execution/model.php
index a05045279c..124dd02c13 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4322,28 +4322,4 @@ class executionModel extends model
             echo '</td>';
         }
     }
-
-    /**
-     * Get copy project pairs by program and model.
-     *
-     * @param int    $programID
-     * @param string $status
-     * @param string $orderBy
-     * @param string $model
-     * @access public
-     * @return array
-     */
-    public function getCopyProjectPairsByProgramAndModel($programID = 0, $status = 'all', $orderBy = 'order_asc', $model = '')
-    {
-        return $this->dao->select('id, name')->from(TABLE_PROJECT)
-            ->where('type')->eq('project')
-            ->andWhere('deleted')->eq(0)
-            ->andWhere('vision')->eq($this->config->vision)
-            ->beginIF($programID !== '')->andWhere('parent')->eq($programID)->fi()
-            ->beginIF($model !== '')->andWhere('model')->eq($model)->fi()
-            ->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
-            ->orderBy($orderBy)
-            ->fetchPairs();
-    }
 }
diff --git a/module/project/model.php b/module/project/model.php
index 8b3068a3d2..03147d7e1a 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -693,10 +693,11 @@ class projectModel extends model
      * @param  bool   $isQueryAll
      * @param  string $orderBy
      * @param  string $excludedModel
+     * @param  string $model
      * @access public
      * @return object
      */
-    public function getPairsByProgram($programID = '', $status = 'all', $isQueryAll = false, $orderBy = 'order_asc', $excludedModel = '')
+    public function getPairsByProgram($programID = '', $status = 'all', $isQueryAll = false, $orderBy = 'order_asc', $excludedModel = '', $model = '')
     {
         if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProjectPairs();
         return $this->dao->select('id, name')->from(TABLE_PROJECT)
@@ -706,6 +707,7 @@ class projectModel extends model
             ->beginIF($programID !== '')->andWhere('parent')->eq($programID)->fi()
             ->beginIF($status != 'all' and $status != 'noclosed')->andWhere('status')->eq($status)->fi()
             ->beginIF($excludedModel)->andWhere('model')->ne($excludedModel)->fi()
+            ->beginIF($model)->andWhere('model')->eq($model)->fi()
             ->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
             ->beginIF(!$this->app->user->admin and !$isQueryAll)->andWhere('id')->in($this->app->user->view->projects)->fi()
             ->orderBy($orderBy)