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

module/project/lang/de.php

@@ -227,6 +227,7 @@ $lang->project->end                 = 'Ende';
 $lang->project->lblStats            = 'Mannstunden Summe(h) : ';
 $lang->project->stats               = '<strong>%s</strong> Verfügbar, <strong>%s</strong> geplant, <strong>%s</strong> genutzt, <strong>%s</strong> Rest.';
 $lang->project->taskSummary         = "Aufgaben auf dieser Seite: <strong>%s</strong> Total, <strong>%s</strong> Wartend, <strong>%s</strong> In Arbeit;  &nbsp;&nbsp;&nbsp;  Stunden : <strong>%s</strong> geplant., <strong>%s</strong> genutzt, <strong>%s</strong> Rest.";
+$lang->project->pageSummary         = "Aufgaben auf dieser Seite:  <strong>%total%</strong>, <strong>%wait%</strong> Wartend, <strong>%doing%</strong> In Arbeit;    Stunden: <strong>%estimate%</strong>  geplant, <strong>%consumed%</strong> genutzt, <strong>%left%</strong> Rest.";
 $lang->project->checkedSummary      = " <strong>%total%</strong> Geprüft, <strong>%wait%</strong> Wartend, <strong>%doing%</strong> In Arbeit;    Stunden: <strong>%estimate%</strong>  geplant, <strong>%consumed%</strong> genutzt, <strong>%left%</strong> Rest.";
 $lang->project->memberHoursAB       = "%s hat <strong>%s</strong> Stunden";
 $lang->project->memberHours         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s Arbeitsstunden</div><div class="segment-value">%s</div></div></div></div>';

module/project/lang/en.php

@@ -227,6 +227,7 @@ $lang->project->end                 = 'End';
 $lang->project->lblStats            = 'Efforts';
 $lang->project->stats               = 'Available: <strong>%s</strong>(h). Estimates: <strong>%s</strong>(h). Cost: <strong>%s</strong>(h). Left: <strong>%s</strong>(h).';
 $lang->project->taskSummary         = "Total tasks on this page:<strong>%s</strong>. Waiting: <strong>%s</strong>. Doing: <strong>%s</strong>.  &nbsp;&nbsp;&nbsp;  Estimates: <strong>%s</strong>(h). Cost: <strong>%s</strong>(h). Left: <strong>%s</strong>(h).";
+$lang->project->pageSummary         = "Total tasks: <strong>%total%</strong>. Waiting: <strong>%wait%</strong>. Doing: <strong>%doing%</strong>.    Estimates: <strong>%estimate%</strong>(h). Cost: <strong>%consumed%</strong>(h). Left: <strong>%left%</strong>(h).";
 $lang->project->checkedSummary      = "Selected: <strong>%total%</strong>. Waiting: <strong>%wait%</strong>. Doing: <strong>%doing%</strong>.    Estimates: <strong>%estimate%</strong>(h). Cost: <strong>%consumed%</strong>(h). Left: <strong>%left%</strong>(h).";
 $lang->project->memberHoursAB       = "%s has <strong>%s</ strong> hours.";
 $lang->project->memberHours         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s Available Hours</div><div class="segment-value">%s</div></div></div></div>';

module/project/lang/fr.php

@@ -227,6 +227,7 @@ $lang->project->end                 = 'Fin';
 $lang->project->lblStats            = 'Efforts';
 $lang->project->stats               = 'Disponible: <strong>%s</strong>(h). Estimé: <strong>%s</strong>(h). Coût: <strong>%s</strong>(h). Reste: <strong>%s</strong>(h).';
 $lang->project->taskSummary         = "Total des tâches de cette page :<strong>%s</strong>. A Faire: <strong>%s</strong>. En cours: <strong>%s</strong>. &nbsp;&nbsp;&nbsp; Estimé: <strong>%s</strong>(h). Coût: <strong>%s</strong>(h). Reste: <strong>%s</strong>(h).";
+$lang->project->pageSummary         = "Total des tâches de cette page: <strong>%total%</strong>. A Faire: <strong>%wait%</strong>. En cours: <strong>%doing%</strong>. &nbsp;&nbsp;&nbsp; Estimé: <strong>%estimate%</strong>(h). Coût: <strong>%consumed%</strong>(h). Reste: <strong>%left%</strong>(h).";
 $lang->project->checkedSummary      = "Sélectionné: <strong>%total%</strong>. A Faire: <strong>%wait%</strong>. En cours: <strong>%doing%</strong>. &nbsp;&nbsp;&nbsp; Estimé: <strong>%estimate%</strong>(h). Coût: <strong>%consumed%</strong>(h). Reste: <strong>%left%</strong>(h).";
 $lang->project->memberHoursAB       = "%s a <strong>%s</ strong> heures.";
 $lang->project->memberHours         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s Heures Disponibles</div><div class="segment-value">%s</div></div></div></div>';

module/project/lang/vi.php

@@ -227,6 +227,7 @@ $lang->project->end                 = 'Kết thúc';
 $lang->project->lblStats            = 'Chấm công';
 $lang->project->stats               = 'Khả dụng: <strong>%s</strong>(giờ). Dự tính: <strong>%s</strong>(giờ). Đã làm: <strong>%s</strong>(giờ). Còn: <strong>%s</strong>(giờ).';
 $lang->project->taskSummary         = "Tổng nhiệm vụ:<strong>%s</strong>. Đang đợi: <strong>%s</strong>. Đang làm: <strong>%s</strong>.  &nbsp;&nbsp;&nbsp;  Dự tính: <strong>%s</strong>(giờ). Đã làm: <strong>%s</strong>(giờ). Còn: <strong>%s</strong>(giờ).";
+$lang->project->pageSummary         = "Tổng nhiệm vụ: <strong>%total%</strong>. Đang đợi: <strong>%wait%</strong>. Đang làm: <strong>%doing%</strong>. Dự tính: <strong>%estimate%</strong>(giờ). Đã làm: <strong>%consumed%</strong>(giờ). Còn: <strong>%left%</strong>(giờ).";
 $lang->project->checkedSummary      = "Đã chọn: <strong>%total%</strong>. Đang đợi: <strong>%wait%</strong>. Đang làm: <strong>%doing%</strong>. Dự tính: <strong>%estimate%</strong>(giờ). Đã làm: <strong>%consumed%</strong>(giờ). Còn: <strong>%left%</strong>(giờ).";
 $lang->project->memberHoursAB       = "%s có <strong>%s</ strong> giờ.";
 $lang->project->memberHours         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s Giờ khả dụng </div><div class="segment-value">%s</div></div></div></div>';

module/project/lang/zh-cn.php

@@ -227,6 +227,7 @@ $lang->project->end                 = '截止日期';
 $lang->project->lblStats            = '工时统计';
 $lang->project->stats               = '可用工时 <strong>%s</strong> 工时，总共预计 <strong>%s</strong> 工时，已经消耗 <strong>%s</strong> 工时，预计剩余 <strong>%s</strong> 工时';
 $lang->project->taskSummary         = "本页共 <strong>%s</strong> 个任务，未开始 <strong>%s</strong>，进行中 <strong>%s</strong>，总预计 <strong>%s</strong> 工时，已消耗 <strong>%s</strong> 工时，剩余 <strong>%s</strong> 工时。";
+$lang->project->pageSummary         = "本页共 <strong>%total%</strong> 个任务，未开始 <strong>%wait%</strong>，进行中 <strong>%doing%</strong>，总预计 <strong>%estimate%</strong> 工时，已消耗 <strong>%consumed%</strong> 工时，剩余 <strong>%left%</strong> 工时。";
 $lang->project->checkedSummary      = "选中 <strong>%total%</strong> 个任务，未开始 <strong>%wait%</strong>，进行中 <strong>%doing%</strong>，总预计 <strong>%estimate%</strong> 工时，已消耗 <strong>%consumed%</strong> 工时，剩余 <strong>%left%</strong> 工时。";
 $lang->project->memberHoursAB       = "<div>%s有 <strong>%s</strong> 工时</div>";
 $lang->project->memberHours         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s可用工时</div><div class="segment-value">%s</div></div></div></div>';

module/project/view/task.html.php

@@ -158,7 +158,7 @@ js::set('foldAll',     $lang->project->treeLevel['root']);
       <?php
         $batchLink = $this->createLink('task', 'batchCreate', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''));
         echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i>" . $lang->task->batchCreate) . "</li>";
-      ?>  
+      ?>
       </li>
     </ul>
     <?php echo "</div>";?>
@@ -353,14 +353,16 @@ $(function()
 {
     // Update table summary text
     var checkedSummary = '<?php echo $lang->project->checkedSummary?>';
+    var pageSummary    = '<?php echo $lang->project->pageSummary?>';
     $('#projectTaskForm').table(
     {
         statisticCreator: function(table)
         {
-            var $checkedRows = table.getTable().find(table.isDataTable ? '.datatable-row-left.checked' : 'tbody>tr.checked');
+            var $table = table.getTable();
+            var $checkedRows = $table.find(table.isDataTable ? '.datatable-row-left.checked' : 'tbody>tr.checked');
             var $originTable = table.isDataTable ? table.$.find('.datatable-origin') : null;
             var checkedTotal = $checkedRows.length;
-            if(!checkedTotal) return;
+            var $rows = checkedTotal ? $checkedRows : $table.find(table.isDataTable ? '.datatable-rows .datatable-row-left' : 'tbody>tr');
 
             var checkedWait     = 0;
             var checkedDoing    = 0;
@@ -368,7 +370,7 @@ $(function()
             var checkedConsumed = 0;
             var checkedLeft     = 0;
             var taskIdList      = [];
-            $checkedRows.each(function()
+            $rows.each(function()
             {
                 var $row = $(this);
                 if ($originTable)
@@ -402,15 +404,12 @@ $(function()
 
                 if(canStatistics)
                 {
-                    if(status !== 'cancel')
-                    {
-                        checkedEstimate += Number(data.estimate);
-                        checkedConsumed += Number(data.consumed);
-                    }
+                    checkedEstimate += Number(data.estimate);
+                    checkedConsumed += Number(data.consumed);
                     if(status != 'cancel' && status != 'closed') checkedLeft += Number(data.left);
                 }
             });
-            return checkedSummary.replace('%total%', checkedTotal).replace('%wait%', checkedWait)
+            return (checkedTotal ? checkedSummary : pageSummary).replace('%total%', $rows.length).replace('%wait%', checkedWait)
               .replace('%doing%', checkedDoing)
               .replace('%estimate%', checkedEstimate.toFixed(1))
               .replace('%consumed%', checkedConsumed.toFixed(1))

module/testreport/model.php

@@ -95,7 +95,6 @@ class testreportModel extends model
             ->add('createdDate', helper::now())
             ->join('stories', ',')
             ->join('builds', ',')
-            ->join('bugs', ',')
             ->join('cases', ',')
             ->join('members', ',')
             ->remove('files,labels,uid')
@@ -135,7 +134,6 @@ class testreportModel extends model
             ->stripTags($this->config->testreport->editor->edit['id'], $this->config->allowedTags)
             ->join('stories', ',')
             ->join('builds', ',')
-            ->join('bugs', ',')
             ->join('cases', ',')
             ->join('members', ',')
             ->remove('files,labels,uid')

module/testtask/view/groupcase.html.php

@@ -15,7 +15,7 @@
 <?php include './caseheader.html.php';?>
 <?php js::set('browseType', $browseType);?>
 <?php js::set('confirmUnlink', $lang->testtask->confirmUnlinkCase)?>
-<div class="main-table" data-ride="table" data-checkable="false" data-group="true">
+<div class="main-table" data-ride="table" data-checkable="false" data-group="true" data-replace-id="treetable">
   <table class='table table-grouped text-center' id='treetable'>
     <thead>
       <tr class="divider">
@@ -56,8 +56,8 @@
           <div class='group-header'><?php echo html::a('###', "<i class='icon-caret-down'></i> $groupName", '', "class='text-primary'");?></div>
         </td>
         <?php endif;?>
-        <?php 
-        if(!isset($run->case)) 
+        <?php
+        if(!isset($run->case))
         {
             echo "<td colspan='13'></td></tr>";
             break;