* adjust for show linear effort.

module/task/lang/de.php

@@ -58,7 +58,7 @@ $lang->task->waitTask            = 'Waiting Task';
 $lang->task->allModule           = 'All Module';
 $lang->task->replace             = 'Replace';
 $lang->task->myEffort            = 'My Effort';
-$lang->task->allEffort           = 'All Effort';
+$lang->task->allEffort           = 'Team Effort';
 $lang->task->teamOrder           = 'Order';
 
 $lang->task->common            = 'Aufgabe';

module/task/lang/en.php

@@ -58,7 +58,7 @@ $lang->task->waitTask            = 'Waiting Task';
 $lang->task->allModule           = 'All Module';
 $lang->task->replace             = 'Replace';
 $lang->task->myEffort            = 'My Effort';
-$lang->task->allEffort           = 'All Effort';
+$lang->task->allEffort           = 'Team Effort';
 $lang->task->teamOrder           = 'Order';
 
 $lang->task->common            = 'Task';

module/task/lang/fr.php

@@ -58,7 +58,7 @@ $lang->task->waitTask            = 'Tâche en attente';
 $lang->task->allModule           = 'Tous Modules';
 $lang->task->replace             = 'Replace';
 $lang->task->myEffort            = 'My Effort';
-$lang->task->allEffort           = 'All Effort';
+$lang->task->allEffort           = 'Team Effort';
 $lang->task->teamOrder           = 'Order';
 
 $lang->task->common            = 'Tâche';

module/task/lang/zh-cn.php

@@ -58,7 +58,7 @@ $lang->task->waitTask            = '未开始的任务';
 $lang->task->allModule           = '所有模块';
 $lang->task->replace             = '替换';
 $lang->task->myEffort            = '我的日志';
-$lang->task->allEffort           = '所有日志';
+$lang->task->allEffort           = '团队日志';
 $lang->task->teamOrder           = '工序';
 
 $lang->task->common            = '任务';

module/task/view/lineareffort.html.php

@@ -18,7 +18,11 @@ foreach($efforts as $effort)
     $account = $effort->account;
     $allEfforts[$order][] = $effort;
     $recorders[$order][$account] = $account;
-    if($app->user->account == $account) $myOrders[$order] = $order;
+    if($app->user->account == $account)
+    {
+        if(!isset($myOrders[$order])) $myOrders[$order] = 0;
+        $myOrders[$order] += 1;
+    }
 }
 ?>
 <div id='linearefforts'>
@@ -30,26 +34,28 @@ foreach($efforts as $effort)
     </ul>
     <div class='tab-content'>
       <div class='tab-pane active' id='legendMyEffort'>
-        <?php foreach($myOrders as $order):?>
-        <div class='caption'>
-          <span class='label label-badge'><?php echo $order + 1;?></span>
-          <span class='account'><?php echo zget($users, $app->user->account);?></span>
-        </div>
         <table class='table table-bordered table-fixed table-recorded'>
           <thead>
             <tr class='text-center'>
+              <th class="w-60px"> <?php echo $lang->task->teamOrder;?></th>
               <th class="w-120px"><?php echo $lang->task->date;?></th>
               <th class="w-120px"><?php echo $lang->task->recordedBy;?></th>
-              <th><?php echo $lang->comment;?></th>
+              <th><?php echo $lang->task->work;?></th>
               <th class="thWidth"><?php echo $lang->task->consumed;?></th>
               <th class="thWidth"><?php echo $lang->task->left;?></th>
               <th class='c-actions-2'><?php echo $lang->actions;?></th>
             </tr>
           </thead>
           <tbody>
+            <?php foreach($myOrders as $order => $count):?>
+            <?php $showOrder = false;?>
             <?php foreach($allEfforts[$order] as $effort):?>
             <?php if($effort->account != $this->app->user->account) continue;?>
             <tr class="text-center">
+              <?php if(!$showOrder):?>
+              <td rowspan='<?php echo $count;?>'><?php echo $order + 1;?></td>
+              <?php $showOrder = true;?>
+              <?php endif;?>
               <td><?php echo $effort->date;?></td>
               <td><?php echo zget($users, $effort->account);?></td>
               <td class="text-left" title="<?php echo $effort->work;?>"><?php echo $effort->work;?></td>
@@ -64,20 +70,16 @@ foreach($efforts as $effort)
               </td>
             </tr>
             <?php endforeach;?>
+            <?php endforeach;?>
           </tbody>
         </table>
-        <?php endforeach;?>
       </div>
       <div class='tab-pane' id='legendAllEffort'>
   <?php endif;?>
-        <?php foreach($recorders as $order => $accounts):?>
-        <div class='caption'>
-          <span class='label label-badge'><?php echo $order + 1;?></span>
-          <span class='account'><?php foreach($accounts as $account) echo zget($users, $account) . ' ';?></span>
-        </div>
         <table class='table table-bordered table-fixed table-recorded'>
           <thead>
             <tr class='text-center'>
+              <th class="w-60px"> <?php echo $lang->task->teamOrder;?></th>
               <th class="w-120px"><?php echo $lang->task->date;?></th>
               <th class="w-120px"><?php echo $lang->task->recordedBy;?></th>
               <th><?php echo $lang->comment;?></th>
@@ -87,8 +89,14 @@ foreach($efforts as $effort)
             </tr>
           </thead>
           <tbody>
+            <?php foreach($recorders as $order => $accounts):?>
+            <?php $showOrder = false;?>
             <?php foreach($allEfforts[$order] as $effort):?>
             <tr class="text-center">
+              <?php if(!$showOrder):?>
+              <td rowspan='<?php echo count($allEfforts[$order]);?>'><?php echo $order + 1;?></td>
+              <?php $showOrder = true;?>
+              <?php endif;?>
               <td><?php echo $effort->date;?></td>
               <td><?php echo zget($users, $effort->account);?></td>
               <td class="text-left" title="<?php echo $effort->work;?>"><?php echo $effort->work;?></td>
@@ -103,9 +111,9 @@ foreach($efforts as $effort)
               </td>
             </tr>
             <?php endforeach;?>
+            <?php endforeach;?>
           </tbody>
         </table>
-        <?php endforeach;?>
   <?php if($myOrders):?>
       </div>
     </div>