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

module/project/css/task.css

@@ -0,0 +1 @@
+td.delayed{background: #e84e0f!important; color: white;}

module/project/view/view.html.php

@@ -203,7 +203,7 @@
                   <tbody>
                     <tr>
                       <td colspan="2">
-                        <?php $progress = $project->totalHours ? round($project->totalConsumed / $project->totalHours, 3) * 100 : 0;?>
+                        <?php $progress = ($project->totalConsumed + $project->totalLeft) ? round($project->totalConsumed / ($project->totalConsumed + $project->totalLeft), 3) * 100 : 0;?>
                         <?php echo $lang->projectCommon . $lang->project->progress;?> <em><?php echo $progress . $lang->percent;?></em> &nbsp;
                         <div class="progress inline-block">
                           <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $progress . $lang->percent;?>"></div>
@@ -226,7 +226,7 @@
                       <th><?php echo $lang->project->totalDays;?></th>
                       <td><?php echo $project->days;?></td>
                       <th><?php echo $lang->project->totalLeft;?></th>
-                      <td><em><?php echo $project->totalLeft;?></em></td>
+                      <td><em><?php echo $project->totalLeft . $lang->project->workHour;?></em></td>
                     </tr>
                     <tr>
                       <th><?php echo $lang->project->totalHours;?></th>

module/story/view/review.html.php

@@ -32,7 +32,7 @@ var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : pri
           </tr>
           <tr>
             <th><?php echo $lang->story->reviewResult;?></th>
-            <td><?php echo html::select('result', $lang->story->reviewResultList, '', 'class=form-control onchange="switchShow(this.value)"');?></td><td></td>
+            <td class = 'required'><?php echo html::select('result', $lang->story->reviewResultList, '', 'class=form-control onchange="switchShow(this.value)"');?></td><td></td>
           </tr>
           <tr id='rejectedReasonBox' class='hide'>
             <th><?php echo $lang->story->rejectedReason;?></th>

module/task/js/common.js

@@ -0,0 +1,51 @@
+function adjustSortBtn()
+{
+    $('.btn-move-up:first').addClass('disabled').attr('disabled', 'disabled');
+    $('.btn-move-down:last').addClass('disabled').attr('disabled', 'disabled');
+}
+
+$('.btn-move-up, .btn-move-down').click(function()
+{
+    var $this = $(this);
+    if($this.hasClass('btn-move-up'))
+    {
+        $(this).parents('tr').prev().before($(this).parents('tr'));
+    }
+    else
+    {
+        $this.parents('tr').next().after($(this).parents('tr'));
+    }
+    $('.btn-move-up, .btn-move-down').removeClass('disabled').removeAttr('disabled');
+
+    adjustSortBtn();
+});
+
+function adjustSortBtn()
+{
+    $('.btn-move-up:first').addClass('disabled').attr('disabled', 'disabled');
+    $('.btn-move-down:last').addClass('disabled').attr('disabled', 'disabled');
+}
+
+$('#modalTeam .btn').click(function()
+{
+    var team = '';
+    var time = 0;
+    $('[name*=team]').each(function()
+    {
+        if($(this).find('option:selected').text() != '')
+        {
+            team += ' ' + $(this).find('option:selected').text();
+        }
+
+        estimate = parseFloat($(this).parents('td').next('td').find('[name*=teamEstimate]').val());
+        if(!isNaN(estimate))
+        {
+            time += estimate;
+        }
+
+        $('#teamMember').val(team);
+        $('#estimate').val(time);
+    })
+});
+
+//end 

module/task/view/view.html.php

@@ -222,7 +222,7 @@
                 <td>
                   <?php
                   $mailto = explode(',', str_replace(' ', '', $task->mailto));
-                  if(empty($mainto))
+                  if(empty($mailto))
                   {
                       echo $lang->noData;
                   }