Merge branch 'master' of https://github.com/easysoft/zentaopms

module/product/view/browse.html.php

@@ -109,7 +109,7 @@
     ?>
       <tfoot>
       <tr>
-        <td colspan='14'>
+        <td colspan='13'>
           <div class='table-actions clearfix'>
             <?php if(count($stories)):?>
             <?php echo html::selectButton();?>

module/project/control.php

@@ -387,7 +387,7 @@ class project extends control
             foreach($mails as $mail) $this->task->sendmail($mail->taskID, $mail->actionID);
 
             /* Locate the browser. */
-            die(js::locate($this->createLink('project', 'importBug', "projectID=$projectID"), 'parent'));
+            die(js::locate($this->createLink('project', 'task', "projectID=$projectID"), 'parent'));
         }
 
         /* Set browseType, productID, moduleID and queryID. */

module/project/view/importbug.html.php

@@ -49,7 +49,7 @@ var browseType = '<?php echo $browseType;?>';
       <td class='text-left nobr'><?php common::printLink('bug', 'view', "bugID=$bug->id", $bug->title, '', "class='preview'", true, true);?></td>
       <td class='bug-<?php echo $bug->status?>'><?php echo $lang->bug->statusList[$bug->status];?></td>
       <td class='td-has-control'><?php echo html::select("pri[$bug->id]", $lang->task->priList, 3, "class='input-sm form-control'");?></td>
-      <td class='td-has-control' class='text-left' style='overflow:visible'><?php echo html::select("assignedTo[$bug->id]", $users, zget($users, $bug->assignedTo, '', $bug->assignedTo), "class='input-sm form-control chosen'");?></td>
+      <td class='td-has-control text-left' style='overflow:visible'><?php echo html::select("assignedTo[$bug->id]", $users, zget($users, $bug->assignedTo, '', $bug->assignedTo), "class='input-sm form-control chosen'");?></td>
       <td class='td-has-control'><?php echo html::input("estimate[$bug->id]", '', 'size=4 class="input-sm form-control"');?></td>
     </tr>
     <?php endforeach;?>

module/story/config.php

@@ -47,7 +47,7 @@ $config->story->custom->batchCreateFields = 'module,plan,spec,pri,estimate,revie
 $config->story->custom->batchEditFields   = 'module,plan,estimate,pri,source,stage,closedBy,closedReason';
 
 $config->story->datatable = new stdclass();
-$config->story->datatable->defaultField = array('id', 'pri', 'title', 'plan', 'source', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'actions');
+$config->story->datatable->defaultField = array('id', 'pri', 'title', 'plan', 'source', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'taskCount', 'bugCount', 'caseCount', 'actions');
 
 $config->story->datatable->fieldList['id']['title']    = 'idAB';
 $config->story->datatable->fieldList['id']['fixed']    = 'left';

module/story/view/tasks.html.php

@@ -1,4 +1,7 @@
-<?php include '../../common/view/header.lite.html.php';?>
+<?php
+include '../../common/view/header.lite.html.php';
+include '../../common/view/chart.html.php';
+?>
 <div id='titlebar'>
   <div class='heading'>
     <span><?php echo html::icon($lang->icons['report']);?></span>
@@ -10,7 +13,7 @@
     <table class='table table-fixed'>
       <thead>
         <tr class='text-center'>
-          <th class='w-20px'>    <?php echo $lang->idAB;?></th>
+          <th class='w-40px'>    <?php echo $lang->idAB;?></th>
           <th class='w-p30'>   <?php echo $lang->task->name;?></th>
           <th class='w-pri'>   <?php echo $lang->priAB;?></th>
           <th class='w-status'><?php echo $lang->statusAB;?></th>
@@ -18,6 +21,7 @@
           <th class='w-40px'>  <?php echo $lang->task->estimateAB;?></th>
           <th class='w-40px'>  <?php echo $lang->task->consumedAB;?></th>
           <th class='w-40px'>  <?php echo $lang->task->leftAB;?></th>
+          <th class='w-40px'>  <?php echo $lang->task->progess;?></th>
         </tr>
       </thead>
       <tbody>
@@ -31,6 +35,7 @@
           <td><?php echo $task->estimate;?></td>
           <td><?php echo $task->consumed;?></td>
           <td><?php echo $task->left;?></td>
+          <td><div class='progress-pie' title="<?php echo $task->progess?>%" data-value='<?php echo $task->progess;?>'></div></td>
         </tr>
         <?php endforeach;?>
       </tbody>

module/task/model.php

@@ -989,12 +989,31 @@ class taskModel extends model
      */
     public function getStoryTasks($storyID, $projectID = 0)
     {
-        return $this->dao->select('id, name, assignedTo, pri, status, estimate, consumed, `left`')
+        $tasks = $this->dao->select('id, name, assignedTo, pri, status, estimate, consumed, `left`')
             ->from(TABLE_TASK)
             ->where('story')->eq((int)$storyID)
             ->andWhere('deleted')->eq(0)
             ->beginIF($projectID)->andWhere('project')->eq($projectID)->fi()
             ->fetchAll('id');
+
+        foreach($tasks as $task)
+        {
+            /* Compute task progess. */
+            if($task->consumed == 0 and $task->left == 0)
+            {
+                $task->progess = 0;
+            }
+            elseif($task->consumed != 0 and $task->left == 0)
+            {
+                $task->progess = 100;
+            }
+            else
+            {
+                $task->progess = round($task->consumed / ($task->consumed + $task->left), 2) * 100;
+            }
+        }
+
+        return $tasks;
     }
 
     /**

www/theme/default/style.css

@@ -117,7 +117,7 @@ hr.small {margin: 10px 0}
 
 .table caption {padding: 8px 20px; border: 1px solid #DDD; border-bottom: 0; background: #fafafa;}
 .table.table-condensed caption {padding: 6px 15px;}
-.table td.td-has-control {padding: 2px 4px;}
+.table td.td-has-control {padding: 2px 4px; background-color: white!important}
 
 /* Datepicker */
 .datepicker-wrapper {position: relative; cursor: pointer;}