From f072b034f561dfdbd55ebcbbe4bc9de897646b83 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Tue, 15 Mar 2022 09:29:20 +0000
Subject: [PATCH] * Finish task#50669,50670

---
 module/mr/view/edit.html.php | 7 +++++++
 module/repo/model.php        | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/module/mr/view/edit.html.php b/module/mr/view/edit.html.php
index deeafe821f..84999c8b16 100644
--- a/module/mr/view/edit.html.php
+++ b/module/mr/view/edit.html.php
@@ -50,10 +50,17 @@
              <th style="white-space: nowrap;"><?php echo $lang->mr->targetProject;?></th>
              <td>
                <div class='input-group'>
+                 <?php if($MR->status == 'merged' or $MR->status == 'closed'):?>
+                 <span class='fix-border text-left'>
+                 <?php echo $this->loadModel('gitlab')->apiGetSingleProject($MR->gitlabID, $MR->targetProject)->name_with_namespace;?>:
+                 <?php echo $MR->targetBranch;?>
+                 </span>
+                 <?php else:?>
                  <span class='input-group-addon fix-border'>
                  <?php echo $this->loadModel('gitlab')->apiGetSingleProject($MR->gitlabID, $MR->targetProject)->name_with_namespace;?>
                  </span>
                  <?php echo html::select('targetBranch', $targetBranchList, $MR->targetBranch, "class='form-control chosen'");?>
+                 <?php endif;?>
                </div>
              </td>
           </tr>
diff --git a/module/repo/model.php b/module/repo/model.php
index 57ff40cb13..23a5c35fa4 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -1385,7 +1385,7 @@ class repoModel extends model
                 {
                     $tasks[$id] = $id;
                     $actions['task'][$id]['effort']['consumed'] = $matches[11][$i];
-                    $actions['task'][$id]['effort']['left']     = $matches[16][$i];
+                    $actions['task'][$id]['effort']['left']     = $matches[17][$i];
                 }
             }
         }
@@ -1506,8 +1506,8 @@ class repoModel extends model
         $storyReg = "(($storyModule) *(({$idMarks})[0-9]+(({$idSplits})[0-9]+)*))";
         $taskReg  = "(($taskModule) *(({$idMarks})[0-9]+(({$idSplits})[0-9]+)*))";
         $bugReg   = "(($bugModule) *(({$idMarks})[0-9]+(({$idSplits})[0-9]+)*))";
-        $costReg  = "($costs) *(($costMarks)([0-9]+)($costUnit))";
-        $leftReg  = "($lefts) *(($leftMarks)([0-9]+)($leftUnit))";
+        $costReg  = "($costs) *(($costMarks)([0-9]+(\.?[0-9]+)?)($costUnit))";
+        $leftReg  = "($lefts) *(($leftMarks)([0-9]+(\.?[0-9]+)?)($leftUnit))";
 
         $startTaskReg  = "({$startAction}) *{$taskReg}.*$costReg.*$leftReg";
         $effortTaskReg = "({$effortAction}) *{$taskReg}.*$costReg.*$leftReg";