From c5187c2328bba7fc038b082f507f0d44e794f0e3 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 4 Jul 2019 15:31:57 +0800
Subject: [PATCH]  * finish task #6051.

---
 module/task/view/edit.html.php   | 6 +++---
 module/task/view/finish.html.php | 6 +++---
 module/task/view/start.html.php  | 4 ++--
 module/task/view/view.html.php   | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index d05d366764..721e2729c2 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -235,11 +235,11 @@
                 <td>
                   <div class='input-group'>
                     <span class='input-group-addon'><?php echo $lang->task->estimate?></span>
-                    <?php echo html::input("teamEstimate[]", $member->estimate, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
+                    <?php echo html::input("teamEstimate[]", (float)$member->estimate, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
                     <span class='input-group-addon fix-border'><?php echo $lang->task->consumed?></span>
-                    <?php echo html::input("teamConsumed[]", $member->consumed, "class='form-control text-center' readonly placeholder='{$lang->task->hour}'")?>
+                    <?php echo html::input("teamConsumed[]", (float)$member->consumed, "class='form-control text-center' readonly placeholder='{$lang->task->hour}'")?>
                     <span class='input-group-addon fix-border'><?php echo $lang->task->left?></span>
-                    <?php echo html::input("teamLeft[]", $member->left, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
+                    <?php echo html::input("teamLeft[]", (float)$member->left, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
                   </div>
                 </td>
                 <td class='w-130px sort-handler'>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index b9786bff33..91ff0c36a5 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -43,7 +43,7 @@
         <?php if(!empty($task->team)):?>
         <tr>
           <th class='<?php echo $colWidth;?>'><?php echo $lang->task->hasConsumed;?></th>
-          <td class='w-p25-f'><?php echo $task->myConsumed;?> <?php echo $lang->workingHour;?></td><td></td>
+          <td class='w-p25-f'><?php echo (float)$task->myConsumed;?> <?php echo $lang->workingHour;?></td><td></td>
         </tr>
         <?php endif;?>
         <tr>
@@ -55,9 +55,9 @@
         <tr>
           <th><?php echo empty($task->team) ? $lang->task->consumed : $lang->task->myConsumed;?></th>
           <td>
-          <?php $consumed = empty($task->team) ? $task->consumed : $task->myConsumed;?>
+          <?php $consumed = empty($task->team) ? $task->consumed : (float)$task->myConsumed;?>
           <?php 
-          echo "<span id='totalConsumed'>" . $consumed . "</span>" . $lang->workingHour . html::hidden('consumed', $consumed);
+          echo "<span id='totalConsumed'>" . (float)$consumed . "</span> " . $lang->workingHour . html::hidden('consumed', $consumed);
           js::set('consumed', $consumed);
           ?>
           </td>
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index 2592877f61..96fc4d878a 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -47,7 +47,7 @@
           <th><?php echo $lang->task->consumed;?></th>
           <td>
             <div class='input-group'>
-              <?php $consumed = (!empty($task->team) && isset($task->team[$task->assignedTo])) ? $task->team[$task->assignedTo]->consumed : $task->consumed;?>
+              <?php $consumed = (!empty($task->team) && isset($task->team[$task->assignedTo])) ? (float)$task->team[$task->assignedTo]->consumed : $task->consumed;?>
               <?php echo html::input('consumed', $consumed, "class='form-control'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span>
             </div>
           </td>
@@ -56,7 +56,7 @@
           <th><?php echo $lang->task->left;?></th>
           <td>
             <div class='input-group'>
-              <?php $left = (!empty($task->team) && isset($task->team[$task->assignedTo])) ? $task->team[$task->assignedTo]->left : $task->left;?>
+              <?php $left = (!empty($task->team) && isset($task->team[$task->assignedTo])) ? (float)$task->team[$task->assignedTo]->left : $task->left;?>
               <?php echo html::input('left', $left, "class='form-control'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span>
             </div>
           </td>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 14d8a3eb5f..d3f4923d4e 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -152,7 +152,7 @@
         <?php if(!isonlybody()) echo "<div class='divider'></div>";?>
         <?php if(!$task->deleted):?>
         <?php
-                  if(empty($task->team) or empty($task->children)) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'button', 'treemap-alt', '', '', '', "title='{$lang->task->children}'", $lang->task->children);
+        if(empty($task->team) or empty($task->children)) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'button', 'treemap-alt', '', '', '', "title='{$lang->task->children}'", $lang->task->children);
         common::printIcon('task', 'assignTo',       "projectID=$task->project&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', empty($task->team) ? $lang->task->assignTo : $lang->task->transfer);
         common::printIcon('task', 'start',          "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
         common::printIcon('task', 'restart',        "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
@@ -326,9 +326,9 @@
                 <?php foreach($task->team as $member):?>
                 <tr class='text-center'>
                   <td class='text-left'><?php echo zget($users, $member->account)?></td>
-                  <td><?php echo $member->estimate?></td>
-                  <td><?php echo $member->consumed?></td>
-                  <td><?php echo $member->left?></td>
+                  <td><?php echo (float)$member->estimate?></td>
+                  <td><?php echo (float)$member->consumed?></td>
+                  <td><?php echo (float)$member->left?></td>
                 </tr>
                 <?php endforeach;?>
             </table>