From 67cc48e3cb2a9dadf060c86a22cdcb81982abd8f Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Fri, 3 Sep 2021 09:40:11 +0800
Subject: [PATCH 01/15] * Finish task #42144.

---
 .../execution/view/ajaxgetdropmenu.html.php   | 52 ++++++++++---------
 module/product/view/ajaxgetdropmenu.html.php  | 49 +++++++++--------
 module/project/view/ajaxgetdropmenu.html.php  | 48 +++++++++--------
 3 files changed, 80 insertions(+), 69 deletions(-)

diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index d8f5c1957b..c9077726f2 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -11,17 +11,17 @@
 #navTabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border: none;}
 
 #tabContent {margin-top: 10px; z-index: 900;}
-#tabContent ul {list-style: none; margin: 0}
-#tabContent .tab-pane>ul {padding-left: 7px;}
-#tabContent .tab-pane>ul>li>div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
-#tabContent .tab-pane>ul>li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
-#tabContent li a i.icon {font-size: 15px !important;}
-#tabContent li a i.icon:before {min-width: 16px !important;}
-#tabContent li .label {position: unset; margin-bottom: 0;}
-#tabContent li>a, #tabContent li>div>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
-#tabContent li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
-#tabContent .tree li>.list-toggle {line-height: 24px;}
-#tabContent .tree li.has-list.open:before {content: unset;}
+.executionTree ul {list-style: none; margin: 0}
+.executionTree .executions>ul {padding-left: 7px;}
+.executionTree .executions>ul>li>div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
+.executionTree .executions>ul>li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
+.executionTree li a i.icon {font-size: 15px !important;}
+.executionTree li a i.icon:before {min-width: 16px !important;}
+.executionTree li .label {position: unset; margin-bottom: 0;}
+.executionTree li>a, div.hide-in-search>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
+.executionTree li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
+.executionTree .tree li>.list-toggle {line-height: 24px;}
+.executionTree .tree li.has-list.open:before {content: unset;}
 
 #swapper li>div.hide-in-search>a:focus, #swapper li>div.hide-in-search>a:hover {color: #838a9d; cursor: default;}
 a.executionName:focus, a.executionName:hover {background: #0c64eb; color: #fff !important;}
@@ -29,12 +29,12 @@ a.executionName:focus, a.executionName:hover {background: #0c64eb; color: #fff !
 #swapper li > a {padding-top: 4px; padding-bottom: 4px;}
 #swapper li {padding-top: 0; padding-bottom: 0;}
 #swapper .tree li>.list-toggle {top: -1px;}
+
+.col-right {padding-top: 30px;}
 </style>
 <?php
 $executionCounts      = array();
 $executionNames       = array();
-$preFix               = '';
-$closedExecutionsHtml = '';
 $tabActive            = '';
 $myExecutions         = 0;
 $others               = 0;
@@ -44,19 +44,21 @@ foreach($executions as $projectID => $projectExecutions)
 {
     $executionCounts[$projectID]['myExecution'] = 0;
     $executionCounts[$projectID]['others']      = 0;
+    $executionCounts[$projectID]['closed']      = 0;
 
     foreach($projectExecutions as $execution)
     {
         if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $this->app->user->account or isset($execution->teams[$this->app->user->account]))) $executionCounts[$projectID]['myExecution'] ++;
         if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $this->app->user->account and !isset($execution->teams[$this->app->user->account])) $executionCounts[$projectID]['others'] ++;
-        if($execution->status == 'done' or $execution->status == 'closed') $dones ++;
+        if($execution->status == 'done' or $execution->status == 'closed') $executionCounts[$projectID]['closed'] ++;
         $executionNames[] = $execution->name;
     }
 }
 $executionsPinYin = common::convert2Pinyin($executionNames);
 
-$myExecutionsHtml     = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
-$normalExecutionsHtml = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
+$myExecutionsHtml     = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProject">';
+$normalExecutionsHtml = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProject">';
+$closedExecutionsHtml = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProject">';
 
 foreach($executions as $projectID => $projectExecutions)
 {
@@ -64,10 +66,10 @@ foreach($executions as $projectID => $projectExecutions)
     if($projectID and $config->systemMode == 'new')
     {
         $projectName = zget($projects, $projectID);
-        $preFix      = $projectName . ' / ';
 
         if($executionCounts[$projectID]['myExecution']) $myExecutionsHtml .= '<li><div class="hide-in-search"><a class="text-muted" title="' . $projectName . '">' . $projectName . '</a> <label class="label">' . $lang->project->common . '</label></div><ul>';
         if($executionCounts[$projectID]['others']) $normalExecutionsHtml  .= '<li><div class="hide-in-search"><a class="text-muted" title="' . $projectName . '">' . $projectName . '</a> <label class="label">' . $lang->project->common . '</label></div><ul>';
+        if($executionCounts[$projectID]['closed']) $closedExecutionsHtml  .= '<li><div class="hide-in-search"><a class="text-muted" title="' . $projectName . '">' . $projectName . '</a> <label class="label">' . $lang->project->common . '</label></div><ul>';
     }
 
     foreach($projectExecutions as $index => $execution)
@@ -91,7 +93,7 @@ foreach($executions as $projectID => $projectExecutions)
         }
         else if($execution->status == 'done' or $execution->status == 'closed')
         {
-            $closedExecutionsHtml .= html::a(sprintf($link, $execution->id), $preFix . $execution->name, '', "class='$selected' title='" . $preFix . $execution->name . "' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'");
+            $closedExecutionsHtml .= '<li>' . html::a(sprintf($link, $execution->id), $execution->name, '', "class='$selected' title='$execution->name' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . '</li>';
 
             if($selected == 'selected') $tabActive = 'closed';
         }
@@ -101,11 +103,13 @@ foreach($executions as $projectID => $projectExecutions)
         {
             if($executionCounts[$projectID]['myExecution']) $myExecutionsHtml     .= '</ul></li>';
             if($executionCounts[$projectID]['others'])      $normalExecutionsHtml .= '</ul></li>';
+            if($executionCounts[$projectID]['closed'])      $closedExecutionsHtml .= '</ul></li>';
         }
     }
 }
 $myExecutionsHtml     .= '</ul>';
 $normalExecutionsHtml .= '</ul>';
+$closedExecutionsHtml .= '</ul>';
 ?>
 <div class="table-row">
   <div class="table-col col-left">
@@ -117,11 +121,11 @@ $normalExecutionsHtml .= '</ul>';
         <li class="<?php if($tabActive == 'other') echo 'active';?>"><?php echo html::a('#other', $lang->project->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?><span class="label label-light label-badge"><?php echo $others;?></span><li>
       </ul>
       <?php endif;?>
-      <div class="tab-content" id="tabContent">
-        <div class="tab-pane <?php if($tabActive == 'myExecution') echo 'active';?>" id="myExecution">
+      <div class="tab-content executionTree" id="tabContent">
+        <div class="tab-pane executions <?php if($tabActive == 'myExecution') echo 'active';?>" id="myExecution">
           <?php echo $myExecutionsHtml;?>
         </div>
-        <div class="tab-pane <?php if($tabActive == 'other') echo 'active';?>" id="other">
+        <div class="tab-pane executions <?php if($tabActive == 'other') echo 'active';?>" id="other">
           <?php echo $normalExecutionsHtml;?>
         </div>
       </div>
@@ -130,8 +134,8 @@ $normalExecutionsHtml .= '</ul>';
       <a class='pull-right toggle-right-col not-list-item'><?php echo $lang->execution->doneExecutions;?><i class='icon icon-angle-right'></i></a>
     </div>
   </div>
-  <div class="table-col col-right">
-   <div class='list-group'><?php echo $closedExecutionsHtml;?></div>
+  <div class="table-col col-right executionTree">
+   <div class='list-group executions'><?php echo $closedExecutionsHtml;?></div>
   </div>
 </div>
 <script>scrollToSelected();</script>
@@ -147,7 +151,7 @@ $(function()
         $(this).parent().siblings('li').find('span').hide();
     })
 
-    $('#tabContent [data-ride="tree"]').tree('expand');
+    $('#swapper [data-ride="tree"]').tree('expand');
 
     $('#swapper #dropMenu .search-box').on('onSearchChange', function(event, value)
     {
diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 73e0f99c97..14ee1190b5 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -12,17 +12,17 @@
 #navTabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border: none;}
 
 #tabContent {margin-top: 10px; z-index: 900;}
-#tabContent ul {list-style: none; margin: 0}
-#tabContent .tab-pane>ul {padding-left: 7px;}
-#tabContent .tab-pane>ul>li>div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
-#tabContent .tab-pane>ul>li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
-#tabContent li a i.icon {font-size: 15px !important;}
-#tabContent li a i.icon:before {min-width: 16px !important;}
-#tabContent li .label {position: unset; margin-bottom: 0;}
-#tabContent li>a, #tabContent li>div>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
-#tabContent li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
-#tabContent .tree li>.list-toggle {line-height: 24px;}
-#tabContent .tree li.has-list.open:before {content: unset;}
+.productTree ul {list-style: none; margin: 0}
+.productTree .products>ul {padding-left: 7px;}
+.productTree .products>ul>li>div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
+.productTree .products>ul>li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
+.productTree li a i.icon {font-size: 15px !important;}
+.productTree li a i.icon:before {min-width: 16px !important;}
+.productTree li .label {position: unset; margin-bottom: 0;}
+.productTree li>a, div.hide-in-search>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
+.productTree li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
+.productTree .tree li>.list-toggle {line-height: 24px;}
+.productTree .tree li.has-list.open:before {content: unset;}
 
 #swapper li>div.hide-in-search>a:focus, #swapper li>div.hide-in-search>a:hover {color: #838a9d; cursor: default;}
 a.productName:focus, a.productName:hover {background: #0c64eb; color: #fff !important;}
@@ -30,12 +30,12 @@ a.productName:focus, a.productName:hover {background: #0c64eb; color: #fff !impo
 #swapper li > a {padding-top: 4px; padding-bottom: 4px;}
 #swapper li {padding-top: 0; padding-bottom: 0;}
 #swapper .tree li>.list-toggle {top: -1px;}
+
+.col-right {padding-top: 30px;}
 </style>
 <?php
 $productCounts      = array();
 $productNames       = array();
-$preFix             = '';
-$closedProductsHtml = '';
 $tabActive          = '';
 $myProducts         = 0;
 $others             = 0;
@@ -43,15 +43,15 @@ $closeds            = 0;
 
 foreach($products as $programID => $programProducts)
 {
-
     $productCounts[$programID]['myProduct'] = 0;
     $productCounts[$programID]['others']    = 0;
+    $productCounts[$programID]['closed']    = 0;
 
     foreach($programProducts as $product)
     {
         if($product->status == 'normal' and $product->PO == $this->app->user->account) $productCounts[$programID]['myProduct'] ++;
         if($product->status == 'normal' and !($product->PO == $this->app->user->account)) $productCounts[$programID]['others'] ++;
-        if($product->status == 'closed') $closeds ++;
+        if($product->status == 'closed') $productCounts[$programID]['closed'] ++;
         $productNames[] = $product->name;
     }
 }
@@ -59,6 +59,7 @@ $productsPinYin = common::convert2Pinyin($productNames);
 
 $myProductsHtml     = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
 $normalProductsHtml = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
+$closedProductsHtml = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
 
 foreach($products as $programID => $programProducts)
 {
@@ -66,10 +67,10 @@ foreach($products as $programID => $programProducts)
     if($programID and $config->systemMode == 'new')
     {
         $programName = zget($programs, $programID);
-        $preFix      = $programName . ' / ';
 
         if($productCounts[$programID]['myProduct']) $myProductsHtml  .= '<li><div class="hide-in-search"><a class="text-muted" title="' . $programName . '">' . $programName . '</a> <label class="label">' . $lang->program->common . '</label></div><ul>';
         if($productCounts[$programID]['others']) $normalProductsHtml .= '<li><div class="hide-in-search"><a class="text-muted" title="' . $programName . '">' . $programName . '</a> <label class="label">' . $lang->program->common . '</label></div><ul>';
+        if($productCounts[$programID]['closed']) $closedProductsHtml .= '<li><div class="hide-in-search"><a class="text-muted" title="' . $programName . '">' . $programName . '</a> <label class="label">' . $lang->program->common . '</label></div><ul>';
     }
 
     foreach($programProducts as $index => $product)
@@ -96,7 +97,7 @@ foreach($products as $programID => $programProducts)
         }
         else if($product->status == 'closed')
         {
-            $closedProductsHtml .= html::a($linkHtml, $preFix . $productName, '', "class='$selected' title='" . $preFix . $productName . "' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$app->tab'");
+            $closedProductsHtml .= '<li>' . html::a($linkHtml, $productName, '', "class='$selected' title='$productName' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$app->tab'") . '</li>';
 
             if($selected == 'selected') $tabActive = 'closed';
         }
@@ -106,11 +107,13 @@ foreach($products as $programID => $programProducts)
         {
             if($productCounts[$programID]['myProduct']) $myProductsHtml     .= '</ul></li>';
             if($productCounts[$programID]['others'])    $normalProductsHtml .= '</ul></li>';
+            if($productCounts[$programID]['closed'])    $closedProductsHtml .= '</ul></li>';
         }
     }
 }
 $myProductsHtml     .= '</ul>';
 $normalProductsHtml .= '</ul>';
+$closedProductsHtml .= '</ul>';
 ?>
 <div class="table-row">
   <div class="table-col col-left">
@@ -122,11 +125,11 @@ $normalProductsHtml .= '</ul>';
         <li class="<?php if($tabActive == 'other') echo 'active';?>"><?php echo html::a('#other', $lang->product->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?><span class="label label-light label-badge"><?php echo $others;?></span><li>
       </ul>
       <?php endif;?>
-      <div class="tab-content" id="tabContent">
-        <div class="tab-pane <?php if($tabActive == 'myProduct') echo 'active';?>" id="myProduct">
+      <div class="tab-content productTree" id="tabContent">
+        <div class="tab-pane products <?php if($tabActive == 'myProduct') echo 'active';?>" id="myProduct">
           <?php echo $myProductsHtml;?>
         </div>
-        <div class="tab-pane <?php if($tabActive == 'other') echo 'active';?>" id="other">
+        <div class="tab-pane products <?php if($tabActive == 'other') echo 'active';?>" id="other">
           <?php echo $normalProductsHtml;?>
         </div>
       </div>
@@ -137,8 +140,8 @@ $normalProductsHtml .= '</ul>';
       <a class='pull-right toggle-right-col not-list-item'><?php echo $lang->product->closed?><i class='icon icon-angle-right'></i></a>
     </div>
   </div>
-  <div class="table-col col-right">
-   <div class='list-group'><?php echo $closedProductsHtml;?></div>
+  <div class="table-col col-right productTree">
+   <div class='list-group products'><?php echo $closedProductsHtml;?></div>
   </div>
 </div>
 <script>scrollToSelected();</script>
@@ -154,7 +157,7 @@ $(function()
         $(this).parent().siblings('li').find('span').hide();
     })
 
-    $('#tabContent [data-ride="tree"]').tree('expand');
+    $('#swapper [data-ride="tree"]').tree('expand');
 
     $('#swapper #dropMenu .search-box').on('onSearchChange', function(event, value)
     {
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index c2272d0d37..62b26e9abd 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -11,17 +11,17 @@
 #navTabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border: none;}
 
 #tabContent {margin-top: 10px; z-index: 900;}
-#tabContent ul {list-style: none; margin: 0}
-#tabContent .tab-pane>ul {padding-left: 7px;}
-#tabContent .tab-pane>ul>li>div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
-#tabContent .tab-pane>ul>li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
-#tabContent li a i.icon {font-size: 15px !important;}
-#tabContent li a i.icon:before {min-width: 16px !important;}
-#tabContent li .label {position: unset; margin-bottom: 0;}
-#tabContent li>a, #tabContent li>div>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
-#tabContent li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
-#tabContent .tree li>.list-toggle {line-height: 24px;}
-#tabContent .tree li.has-list.open:before {content: unset;}
+.projectTree ul {list-style: none; margin: 0}
+.projectTree .projects>ul {padding-left: 7px;}
+.projectTree .projects>ul>li>div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
+.projectTree .projects>ul>li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
+.projectTree li a i.icon {font-size: 15px !important;}
+.projectTree li a i.icon:before {min-width: 16px !important;}
+.projectTree li .label {position: unset; margin-bottom: 0;}
+.projectTree li>a, div.hide-in-search>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
+.projectTree li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
+.projectTree .tree li>.list-toggle {line-height: 24px;}
+.projectTree .tree li.has-list.open:before {content: unset;}
 
 #swapper li>div.hide-in-search>a:focus, #swapper li>div.hide-in-search>a:hover {color: #838a9d; cursor: default;}
 a.projectName:focus, a.projectName:hover {background: #0c64eb; color: #fff !important;}
@@ -29,12 +29,12 @@ a.projectName:focus, a.projectName:hover {background: #0c64eb; color: #fff !impo
 #swapper li > a {padding-top: 4px; padding-bottom: 4px;}
 #swapper li {padding-top: 0; padding-bottom: 0;}
 #swapper .tree li>.list-toggle {top: -1px;}
+
+.col-right {padding-top: 30px;}
 </style>
 <?php
 $projectCounts      = array();
 $projectNames       = array();
-$preFix             = '';
-$closedProjectsHtml = '';
 $tabActive          = '';
 $myProjects         = 0;
 $others             = 0;
@@ -44,12 +44,13 @@ foreach($projects as $programID => $programProjects)
 {
     $projectCounts[$programID]['myProject'] = 0;
     $projectCounts[$programID]['others']    = 0;
+    $projectCounts[$programID]['closed']    = 0;
 
     foreach($programProjects as $project)
     {
         if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account) $projectCounts[$programID]['myProject'] ++;
         if($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account)) $projectCounts[$programID]['others'] ++;
-        if($project->status == 'done' or $project->status == 'closed') $dones ++;
+        if($project->status == 'done' or $project->status == 'closed') $projectCounts[$programID]['closed'] ++;
         $projectNames[] = $project->name;
     }
 }
@@ -57,6 +58,7 @@ $projectsPinYin = common::convert2Pinyin($projectNames);
 
 $myProjectsHtml     = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
 $normalProjectsHtml = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
+$closedProjectsHtml = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
 
 foreach($projects as $programID => $programProjects)
 {
@@ -64,10 +66,10 @@ foreach($projects as $programID => $programProjects)
     if(isset($programs[$programID]) and $config->systemMode == 'new')
     {
         $programName = zget($programs, $programID);
-        $preFix      = $programName . ' / ';
 
         if($projectCounts[$programID]['myProject']) $myProjectsHtml  .= '<li><div class="hide-in-search"><a class="text-muted" title="' . $programName . '">' . $programName . '</a> <label class="label">' . $lang->program->common . '</label></div><ul>';
         if($projectCounts[$programID]['others']) $normalProjectsHtml .= '<li><div class="hide-in-search"><a class="text-muted" title="' . $programName . '">' . $programName . '</a> <label class="label">' . $lang->program->common . '</label></div><ul>';
+        if($projectCounts[$programID]['closed']) $closedProjectsHtml .= '<li><div class="hide-in-search"><a class="text-muted" title="' . $programName . '">' . $programName . '</a> <label class="label">' . $lang->program->common . '</label></div><ul>';
     }
 
     foreach($programProjects as $index => $project)
@@ -97,7 +99,7 @@ foreach($projects as $programID => $programProjects)
         }
         else if($project->status == 'done' or $project->status == 'closed')
         {
-            $closedProjectsHtml .= html::a(sprintf($link, $project->id), $preFix . $project->name, '', "class='$selected' title='" . $preFix . $project->name . "' data-key='" . zget($projectsPinYin, $project->name, '') . "'");
+            $closedProjectsHtml .= '<li>' . html::a(sprintf($link, $project->id), $projectName, '', "class='$selected' title='$projectName' data-key='" . zget($projectsPinYin, $project->name, '') . "'") . '</li>';
 
             if($selected == 'selected') $tabActive = 'closed';
         }
@@ -107,11 +109,13 @@ foreach($projects as $programID => $programProjects)
         {
             if($projectCounts[$programID]['myProject']) $myProjectsHtml     .= '</ul></li>';
             if($projectCounts[$programID]['others'])    $normalProjectsHtml .= '</ul></li>';
+            if($projectCounts[$programID]['closed'])    $closedProjectsHtml .= '</ul></li>';
         }
     }
 }
 $myProjectsHtml     .= '</ul>';
 $normalProjectsHtml .= '</ul>';
+$closedProjectsHtml .= '</ul>';
 ?>
 
 <div class="table-row">
@@ -124,11 +128,11 @@ $normalProjectsHtml .= '</ul>';
         <li class="<?php if($tabActive == 'other') echo 'active';?>"><?php echo html::a('#other', $lang->project->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?><span class="label label-light label-badge"><?php echo $others;?></span><li>
       </ul>
       <?php endif;?>
-      <div class="tab-content" id="tabContent">
-        <div class="tab-pane <?php if($tabActive == 'myProject') echo 'active';?>" id="myProject">
+      <div class="tab-content projectTree" id="tabContent">
+        <div class="tab-pane projects <?php if($tabActive == 'myProject') echo 'active';?>" id="myProject">
           <?php echo $myProjectsHtml;?>
         </div>
-        <div class="tab-pane <?php if($tabActive == 'other') echo 'active';?>" id="other">
+        <div class="tab-pane projects <?php if($tabActive == 'other') echo 'active';?>" id="other">
           <?php echo $normalProjectsHtml;?>
         </div>
       </div>
@@ -138,8 +142,8 @@ $normalProjectsHtml .= '</ul>';
       <a class='pull-right toggle-right-col not-list-item'><?php echo $lang->project->doneProjects?><i class='icon icon-angle-right'></i></a>
     </div>
   </div>
-  <div class="table-col col-right">
-   <div class='list-group'><?php echo $closedProjectsHtml;?></div>
+  <div class="table-col col-right projectTree">
+   <div class='list-group projects'><?php echo $closedProjectsHtml;?></div>
   </div>
 </div>
 <script>scrollToSelected();</script>
@@ -155,7 +159,7 @@ $(function()
         $(this).parent().siblings('li').find('span').hide();
     })
 
-    $('#tabContent [data-ride="tree"]').tree('expand');
+    $('#swapper [data-ride="tree"]').tree('expand');
 
     $('#swapper #dropMenu .search-box').on('onSearchChange', function(event, value)
     {

From 2a68d2ac8328b4caf6b01495c9b5badc675b2e1a Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Fri, 3 Sep 2021 09:52:42 +0800
Subject: [PATCH 02/15] * Adjust the action for JIHU API.

---
 api/v1/entries/productissue.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/api/v1/entries/productissue.php b/api/v1/entries/productissue.php
index f6a92de5bb..5423673dc1 100644
--- a/api/v1/entries/productissue.php
+++ b/api/v1/entries/productissue.php
@@ -178,7 +178,14 @@ class productIssueEntry extends entry
         {
             $accountsList[] = $action->actor;
             ob_start();
-            $this->action->printAction($action);
+            if(method_exists($this->action, "printActionAPI"))
+            {
+                $this->action->printActionAPI($action);
+            }
+            else
+            {
+                $this->action->printAction($action);
+            }
             $action->title = ob_get_contents();
             ob_clean();
 
@@ -195,7 +202,7 @@ class productIssueEntry extends entry
             if(!empty($action->comment))
             {
                 $comment = strip_tags($action->comment) == $action->comment ? nl2br($action->comment) : $action->comment;
-                $action->body_html = "<div class='comment-content'>{$comment}</div>";
+                $action->body_html = "{$comment}";
             }
         }
 

From 97e6ea501a84d8a1643455e0a56916d4fb0216be Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Fri, 3 Sep 2021 09:57:12 +0800
Subject: [PATCH 03/15] * Fix bug#14578

---
 module/todo/model.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/module/todo/model.php b/module/todo/model.php
index 4bb1e8b8db..cb0822b320 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -75,6 +75,11 @@ class todoModel extends model
             {
                 unset($todo->config['week']);
                 unset($todo->config['month']);
+                if($todo->config['day'] and !validater::checkInt($todo->config['day']))
+                {
+                    dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->cycleDay);
+                    return false;
+                }
             }
             if($todo->config['type'] == 'week')
             {
@@ -88,6 +93,12 @@ class todoModel extends model
                 unset($todo->config['week']);
                 $todo->config['month'] = join(',', $todo->config['month']);
             }
+
+            if($todo->config['beforeDays'] and !validater::checkInt($todo->config['beforeDays']))
+            {
+                dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->cycleDay);
+                return false;
+            }
             $todo->config['beforeDays'] = (int)$todo->config['beforeDays'];
             $todo->config = json_encode($todo->config);
             $todo->type   = 'cycle';

From 7f58361b9530214ff535c608f4222bc6c40939e7 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 3 Sep 2021 10:16:56 +0800
Subject: [PATCH 04/15] * Finish task#42122.

---
 module/execution/css/executionkanban.css       | 4 ++--
 module/execution/view/executionkanban.html.php | 2 +-
 module/project/css/kanban.css                  | 4 ++--
 module/project/view/kanban.html.php            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/execution/css/executionkanban.css b/module/execution/css/executionkanban.css
index 1e6e659ae1..c9db91d626 100644
--- a/module/execution/css/executionkanban.css
+++ b/module/execution/css/executionkanban.css
@@ -14,8 +14,8 @@
 #kanban tbody > tr > td {background-color: #F5F5F5;}
 #kanban tbody > tr:not(:last-child) {border-bottom: 5px solid #fff !important;}
 
-.s-doing .table-row .table-col:last-child, .c-progress {width: 30px;}
-.table-row .table-col:first-child {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+.s-doing .table-row .table-col:last-child, .c-progress {width: 30px; padding-left: 3px; padding-top: 1px;}
+.table-row .table-col:first-child, .board-project {overflow: hidden; white-space: nowrap;}
 
 .table-grouped > tbody > tr,
 .table-grouped > tbody > tr:hover {background: #fff !important;}
diff --git a/module/execution/view/executionkanban.html.php b/module/execution/view/executionkanban.html.php
index a77eef6a01..6eb5ff45d1 100644
--- a/module/execution/view/executionkanban.html.php
+++ b/module/execution/view/executionkanban.html.php
@@ -32,7 +32,7 @@
       <tr>
         <td class='board-project'>
           <div data-id='<?php echo $projectID;?>'>
-            <div class='text-center text-ellipsis'>
+            <div class='text-center'>
               <?php $projectTitle = empty($projectID) ? $lang->execution->myExecutions : zget($projects, $projectID);?>
               <span class='group-title' title='<?php echo $projectTitle;?>'><?php echo $projectTitle;?></span>
             </div>
diff --git a/module/project/css/kanban.css b/module/project/css/kanban.css
index a9d8d5c0cc..555f60c248 100644
--- a/module/project/css/kanban.css
+++ b/module/project/css/kanban.css
@@ -14,8 +14,8 @@
 .board-doing .board-doing-execution:not(:last-child) {border-bottom: 2px solid #fff;}
 
 .board-doing-project .table-row .table-col:last-child,
-.board-doing-execution .table-row .table-col:last-child, .c-progress {width: 30px; padding-top: 2px}
-.table-row .table-col:first-child {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+.board-doing-execution .table-row .table-col:last-child, .c-progress {width: 30px; padding-top: 2px; padding-left: 3px;}
+.table-row .table-col:first-child, .board-project .board-item {overflow: hidden; white-space: nowrap;}
 
 table th, td {border: 2px solid #fff !important;}
 
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 8b96615e1e..ccc3390293 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -111,7 +111,7 @@
                 <div class='board-project'>
                   <?php if(isset($statusList[$status])):?>
                   <?php foreach($statusList[$status] as $project):?>
-                  <div class='board-item text-ellipsis' <?php echo "style='border-left: 3px solid " . $lang->execution->statusColorList[$status] . "'";?>>
+                  <div class='board-item' <?php echo "style='border-left: 3px solid " . $lang->execution->statusColorList[$status] . "'";?>>
                   <?php
                   if(common::hasPriv('project', 'index'))
                   {

From 2fb4d5842d8c5f06c54b753b1257854950050ffc Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Fri, 3 Sep 2021 10:16:50 +0800
Subject: [PATCH 05/15] * upgrade tablesorter to use option cssNoSort.

---
 module/common/view/tablesorter.html.php |  14 ++-
 www/js/jquery/tablesorter/metadata.js   | 140 ++++++++++++------------
 www/js/jquery/tablesorter/min.js        |   7 +-
 3 files changed, 80 insertions(+), 81 deletions(-)

diff --git a/module/common/view/tablesorter.html.php b/module/common/view/tablesorter.html.php
index b6883a2444..7e9fb9893a 100755
--- a/module/common/view/tablesorter.html.php
+++ b/module/common/view/tablesorter.html.php
@@ -6,11 +6,11 @@ js::import($jsRoot . 'jquery/tablesorter/metadata.js');
 <style>
 .tablesorter-header-inner {cursor: pointer;}
 .tablesorter-header-inner:hover {color: #000;font-weight:bold;}
-table.tablesorter tr.tablesorter-headerRow .header.tablesorter-headerUnSorted .tablesorter-header-inner:after {font-family: ZentaoIcon; font-weight: normal; content: "\f0dc"; font-size: 14px; color: #838a9c}
-table.tablesorter tr.tablesorter-headerRow .header.headerSortUp .tablesorter-header-inner{color: #000;font-weight:bold;}
-table.tablesorter tr.tablesorter-headerRow .header.headerSortUp .tablesorter-header-inner:after{font-family: ZentaoIcon; font-weight: normal; content: "\f0d8"; color: #000;}
-table.tablesorter tr.tablesorter-headerRow .header.headerSortDown .tablesorter-header-inner{color: #000;font-weight:bold;}
-table.tablesorter tr.tablesorter-headerRow .header.headerSortDown .tablesorter-header-inner:after{font-family: ZentaoIcon; font-weight: normal; content: "\f0d7"; color: #000;}
+table.tablesorter tr.tablesorter-headerRow .header .tablesorter-header-inner:after {font-family: ZentaoIcon; font-weight: normal; content: "\f0dc"; font-size: 14px; color: #838a9c}
+table.tablesorter tr.tablesorter-headerRow .header.tablesorter-headerAsc .tablesorter-header-inner{color: #000;font-weight:bold;}
+table.tablesorter tr.tablesorter-headerRow .header.tablesorter-headerAsc .tablesorter-header-inner:after{content: "\f0d8"; color: #000;}
+table.tablesorter tr.tablesorter-headerRow .header.tablesorter-headerDesc .tablesorter-header-inner{color: #000;font-weight:bold;}
+table.tablesorter tr.tablesorter-headerRow .header.tablesorter-headerDesc .tablesorter-header-inner:after{content: "\f0d7"; color: #000;}
 table.tablesorter tr.tablesorter-headerRow .header.sorter-false .tablesorter-header-inner:after{content:"";}
 table.tablesorter.table-borderless > thead > tr > th {border-bottom: 1px solid #e5e5e5;}
 </style>
@@ -22,7 +22,9 @@ function sortTable(selector, options)
     {
         saveSort: true,
         widgets: ['zebra', 'saveSort'],
-        widgetZebra: {css: ['odd', 'even'] }
+        widgetZebra: {css: ['odd', 'even'] },
+        ignoreChildRow: true,
+        cssHeader: 'header'
     }, $table.data(), options)).on('mouseenter', 'tbody tr', function()
     {
         $(this).addClass('hoover');
diff --git a/www/js/jquery/tablesorter/metadata.js b/www/js/jquery/tablesorter/metadata.js
index ad8bfba404..f5766cd8d8 100644
--- a/www/js/jquery/tablesorter/metadata.js
+++ b/www/js/jquery/tablesorter/metadata.js
@@ -1,14 +1,12 @@
 /*
  * Metadata - jQuery plugin for parsing metadata from elements
  *
- * Copyright (c) 2006 John Resig, Yehuda Katz, J�örn Zaefferer, Paul McLanahan
+ * Copyright (c) 2006 John Resig, Yehuda Katz, Jörn Zaefferer, Paul McLanahan
  *
  * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
  *
- * Revision: $Id: jquery.metadata.js 4187 2007-12-16 17:15:27Z joern.zaefferer $
- *
  */
 
 /**
@@ -18,34 +16,34 @@
  * There are three supported types of metadata storage:
  *
  *   attr:  Inside an attribute. The name parameter indicates *which* attribute.
- *          
+ *
  *   class: Inside the class attribute, wrapped in curly braces: { }
- *   
+ *
  *   elem:  Inside a child element (e.g. a script tag). The
  *          name parameter indicates *which* element.
- *          
+ *
  * The metadata for an element is loaded the first time the element is accessed via jQuery.
  *
  * As a result, you can define the metadata type, use $(expr) to load the metadata into the elements
  * matched by expr, then redefine the metadata type and run another $(expr) for other elements.
- * 
+ *
  * @name $.metadata.setType
  *
  * @example <p id="one" class="some_class {item_id: 1, item_label: 'Label'}">This is a p</p>
  * @before $.metadata.setType("class")
  * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
  * @desc Reads metadata from the class attribute
- * 
+ *
  * @example <p id="one" class="some_class" data="{item_id: 1, item_label: 'Label'}">This is a p</p>
  * @before $.metadata.setType("attr", "data")
  * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
  * @desc Reads metadata from a "data" attribute
- * 
+ *
  * @example <p id="one" class="some_class"><script>{item_id: 1, item_label: 'Label'}</script>This is a p</p>
  * @before $.metadata.setType("elem", "script")
  * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
  * @desc Reads metadata from a nested script element
- * 
+ *
  * @param String type The encoding type
  * @param String name The name of the attribute to be used to get metadata (optional)
  * @cat Plugins/Metadata
@@ -54,69 +52,69 @@
  * @see metadata()
  */
 
-(function($) {
+ (function($) {
 
-$.extend({
-	metadata : {
-		defaults : {
-			type: 'class',
-			name: 'metadata',
-			cre: /({.*})/,
-			single: 'metadata'
-		},
-		setType: function( type, name ){
-			this.defaults.type = type;
-			this.defaults.name = name;
-		},
-		get: function( elem, opts ){
-			var settings = $.extend({},this.defaults,opts);
-			// check for empty string in single property
-			if ( !settings.single.length ) settings.single = 'metadata';
-			
-			var data = $.data(elem, settings.single);
-			// returned cached data if it already exists
-			if ( data ) return data;
-			
-			data = "{}";
-			
-			if ( settings.type == "class" ) {
-				var m = settings.cre.exec( elem.className );
-				if ( m )
-					data = m[1];
-			} else if ( settings.type == "elem" ) {
-				if( !elem.getElementsByTagName )
-					return undefined;
-				var e = elem.getElementsByTagName(settings.name);
-				if ( e.length )
-					data = $.trim(e[0].innerHTML);
-			} else if ( elem.getAttribute != undefined ) {
-				var attr = elem.getAttribute( settings.name );
-				if ( attr )
-					data = attr;
+	$.extend({
+		metadata : {
+			defaults : {
+				type: 'class',
+				name: 'metadata',
+				cre: /({.*})/,
+				single: 'metadata'
+			},
+			setType: function( type, name ){
+				this.defaults.type = type;
+				this.defaults.name = name;
+			},
+			get: function( elem, opts ){
+				var settings = $.extend({},this.defaults,opts);
+				// check for empty string in single property
+				if ( !settings.single.length ) settings.single = 'metadata';
+
+				var data = $.data(elem, settings.single);
+				// returned cached data if it already exists
+				if ( data ) return data;
+
+				data = "{}";
+
+				if ( settings.type == "class" ) {
+					var m = settings.cre.exec( elem.className );
+					if ( m )
+						data = m[1];
+				} else if ( settings.type == "elem" ) {
+					if( !elem.getElementsByTagName )
+						return undefined;
+					var e = elem.getElementsByTagName(settings.name);
+					if ( e.length )
+						data = $.trim(e[0].innerHTML);
+				} else if ( elem.getAttribute != undefined ) {
+					var attr = elem.getAttribute( settings.name );
+					if ( attr )
+						data = attr;
+				}
+
+				if ( data.indexOf( '{' ) <0 )
+				data = "{" + data + "}";
+
+				data = eval("(" + data + ")");
+
+				$.data( elem, settings.single, data );
+				return data;
 			}
-			
-			if ( data.indexOf( '{' ) <0 )
-			data = "{" + data + "}";
-			
-			data = eval("(" + data + ")");
-			
-			$.data( elem, settings.single, data );
-			return data;
 		}
-	}
-});
+	});
 
-/**
- * Returns the metadata object for the first member of the jQuery object.
- *
- * @name metadata
- * @descr Returns element's metadata object
- * @param Object opts An object contianing settings to override the defaults
- * @type jQuery
- * @cat Plugins/Metadata
- */
-$.fn.metadata = function( opts ){
-	return $.metadata.get( this[0], opts );
-};
+	/**
+	 * Returns the metadata object for the first member of the jQuery object.
+	 *
+	 * @name metadata
+	 * @descr Returns element's metadata object
+	 * @param Object opts An object contianing settings to override the defaults
+	 * @type jQuery
+	 * @cat Plugins/Metadata
+	 */
+	$.fn.metadata = function( opts ){
+		return $.metadata.get( this[0], opts );
+	};
 
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/www/js/jquery/tablesorter/min.js b/www/js/jquery/tablesorter/min.js
index 7ec552e613..137511fd52 100644
--- a/www/js/jquery/tablesorter/min.js
+++ b/www/js/jquery/tablesorter/min.js
@@ -1,7 +1,6 @@
 /*!
-* TableSorter 2.17.5 min - Client-side table sorting with ease!
+* TableSorter 2.31.3 min - Client-side table sorting with ease!
 * Copyright (c) 2007 Christian Bach
 */
-!function(g){g.extend({tablesorter:new function(){function d(){var b=arguments[0],a=1<arguments.length?Array.prototype.slice.call(arguments):b;if("undefined"!==typeof console&&"undefined"!==typeof console.log)console[/error/i.test(b)?"error":/warn/i.test(b)?"warn":"log"](a);else alert(a)}function v(b,a){d(b+" ("+((new Date).getTime()-a.getTime())+"ms)")}function p(b){for(var a in b)return!1;return!0}function n(b,a,c){if(!a)return"";var h,e=b.config,r=e.textExtraction||"",k="",k="basic"===r?g(a).attr(e.textAttribute)|| a.textContent||a.innerText||g(a).text()||"":"function"===typeof r?r(a,b,c):"function"===typeof(h=f.getColumnData(b,r,c))?h(a,b,c):a.textContent||a.innerText||g(a).text()||"";return g.trim(k)}function t(b){var a=b.config,c=a.$tbodies=a.$table.children("tbody:not(."+a.cssInfoBlock+")"),h,e,r,k,l,m,g,u,p,q=0,s="",t=c.length;if(0===t)return a.debug?d("Warning: *Empty table!* Not building a parser cache"):"";a.debug&&(p=new Date,d("Detecting parsers for each column"));for(e=[];q<t;){h=c[q].rows;if(h[q])for(r= a.columns,k=0;k<r;k++){l=a.$headers.filter('[data-column="'+k+'"]:last');m=f.getColumnData(b,a.headers,k);u=f.getParserById(f.getData(l,m,"sorter"));g="false"===f.getData(l,m,"parser");a.empties[k]=f.getData(l,m,"empty")||a.emptyTo||(a.emptyToBottom?"bottom":"top");a.strings[k]=f.getData(l,m,"string")||a.stringTo||"max";g&&(u=f.getParserById("no-parser"));if(!u)a:{l=b;m=h;g=-1;u=k;for(var A=void 0,x=f.parsers.length,z=!1,F="",A=!0;""===F&&A;)g++,m[g]?(z=m[g].cells[u],F=n(l,z,u),l.config.debug&&d("Checking if value was empty on row "+ g+", column: "+u+': "'+F+'"')):A=!1;for(;0<=--x;)if((A=f.parsers[x])&&"text"!==A.id&&A.is&&A.is(F,l,z)){u=A;break a}u=f.getParserById("text")}a.debug&&(s+="column:"+k+"; parser:"+u.id+"; string:"+a.strings[k]+"; empty: "+a.empties[k]+"\n");e[k]=u}q+=e.length?t:1}a.debug&&(d(s?s:"No parsers detected"),v("Completed detecting parsers",p));a.parsers=e}function x(b){var a,c,h,e,r,k,l,m,y,u,p,q=b.config,s=q.$table.children("tbody"),t=q.parsers;q.cache={};q.totalRows=0;if(!t)return q.debug?d("Warning: *Empty table!* Not building a cache"): "";q.debug&&(m=new Date);q.showProcessing&&f.isProcessing(b,!0);for(r=0;r<s.length;r++)if(p=[],a=q.cache[r]={normalized:[]},!s.eq(r).hasClass(q.cssInfoBlock)){y=s[r]&&s[r].rows.length||0;for(h=0;h<y;++h)if(u={child:[]},k=g(s[r].rows[h]),l=[],k.hasClass(q.cssChildRow)&&0!==h)c=a.normalized.length-1,a.normalized[c][q.columns].$row=a.normalized[c][q.columns].$row.add(k),k.prev().hasClass(q.cssChildRow)||k.prev().addClass(f.css.cssHasChild),u.child[c]=g.trim(k[0].textContent||k[0].innerText||k.text()|| "");else{u.$row=k;u.order=h;for(e=0;e<q.columns;++e)"undefined"===typeof t[e]?q.debug&&d("No parser found for cell:",k[0].cells[e],"does it have a header?"):(c=n(b,k[0].cells[e],e),c="no-parser"===t[e].id?"":t[e].format(c,b,k[0].cells[e],e),l.push(c),"numeric"===(t[e].type||"").toLowerCase()&&(p[e]=Math.max(Math.abs(c)||0,p[e]||0)));l[q.columns]=u;a.normalized.push(l)}a.colMax=p;q.totalRows+=a.normalized.length}q.showProcessing&&f.isProcessing(b);q.debug&&v("Building cache for "+y+" rows",m)}function z(b, a){var c=b.config,h=c.widgetOptions,e=b.tBodies,r=[],k=c.cache,d,m,y,u,n,q;if(p(k))return c.appender?c.appender(b,r):b.isUpdating?c.$table.trigger("updateComplete",b):"";c.debug&&(q=new Date);for(n=0;n<e.length;n++)if(d=g(e[n]),d.length&&!d.hasClass(c.cssInfoBlock)){y=f.processTbody(b,d,!0);d=k[n].normalized;m=d.length;for(u=0;u<m;u++)r.push(d[u][c.columns].$row),c.appender&&(!c.pager||c.pager.removeRows&&h.pager_removeRows||c.pager.ajax)||y.append(d[u][c.columns].$row);f.processTbody(b,y,!1)}c.appender&& c.appender(b,r);c.debug&&v("Rebuilt table",q);a||c.appender||f.applyWidget(b);b.isUpdating&&c.$table.trigger("updateComplete",b)}function C(b){return/^d/i.test(b)||1===b}function D(b){var a,c,h,e,r,k,l,m=b.config;m.headerList=[];m.headerContent=[];m.debug&&(l=new Date);m.columns=f.computeColumnIndex(m.$table.children("thead, tfoot").children("tr"));e=m.cssIcon?'<i class="'+(m.cssIcon===f.css.icon?f.css.icon:m.cssIcon+" "+f.css.icon)+'"></i>':"";m.$headers.each(function(d){c=g(this);a=f.getColumnData(b, m.headers,d,!0);m.headerContent[d]=g(this).html();r=m.headerTemplate.replace(/\{content\}/g,g(this).html()).replace(/\{icon\}/g,e);m.onRenderTemplate&&(h=m.onRenderTemplate.apply(c,[d,r]))&&"string"===typeof h&&(r=h);g(this).html('<div class="'+f.css.headerIn+'">'+r+"</div>");m.onRenderHeader&&m.onRenderHeader.apply(c,[d]);this.column=parseInt(g(this).attr("data-column"),10);this.order=C(f.getData(c,a,"sortInitialOrder")||m.sortInitialOrder)?[1,0,2]:[0,1,2];this.count=-1;this.lockedOrder=!1;k=f.getData(c, a,"lockedOrder")||!1;"undefined"!==typeof k&&!1!==k&&(this.order=this.lockedOrder=C(k)?[1,1,1]:[0,0,0]);c.addClass(f.css.header+" "+m.cssHeader);m.headerList[d]=this;c.parent().addClass(f.css.headerRow+" "+m.cssHeaderRow).attr("role","row");m.tabIndex&&c.attr("tabindex",0)}).attr({scope:"col",role:"columnheader"});B(b);m.debug&&(v("Built headers:",l),d(m.$headers))}function E(b,a,c){var h=b.config;h.$table.find(h.selectorRemove).remove();t(b);x(b);H(h.$table,a,c)}function B(b){var a,c,h=b.config; h.$headers.each(function(e,r){c=g(r);a="false"===f.getData(r,f.getColumnData(b,h.headers,e,!0),"sorter");r.sortDisabled=a;c[a?"addClass":"removeClass"]("sorter-false").attr("aria-disabled",""+a);b.id&&(a?c.removeAttr("aria-controls"):c.attr("aria-controls",b.id))})}function G(b){var a,c,h=b.config,e=h.sortList,r=e.length,d=f.css.sortNone+" "+h.cssNone,l=[f.css.sortAsc+" "+h.cssAsc,f.css.sortDesc+" "+h.cssDesc],m=["ascending","descending"],y=g(b).find("tfoot tr").children().add(h.$extraHeaders).removeClass(l.join(" ")); h.$headers.removeClass(l.join(" ")).addClass(d).attr("aria-sort","none");for(a=0;a<r;a++)if(2!==e[a][1]&&(b=h.$headers.not(".sorter-false").filter('[data-column="'+e[a][0]+'"]'+(1===r?":last":"")),b.length)){for(c=0;c<b.length;c++)b[c].sortDisabled||b.eq(c).removeClass(d).addClass(l[e[a][1]]).attr("aria-sort",m[e[a][1]]);y.length&&y.filter('[data-column="'+e[a][0]+'"]').removeClass(d).addClass(l[e[a][1]])}h.$headers.not(".sorter-false").each(function(){var b=g(this),a=this.order[(this.count+1)%(h.sortReset? 3:2)],a=b.text()+": "+f.language[b.hasClass(f.css.sortAsc)?"sortAsc":b.hasClass(f.css.sortDesc)?"sortDesc":"sortNone"]+f.language[0===a?"nextAsc":1===a?"nextDesc":"nextNone"];b.attr("aria-label",a)})}function L(b){if(b.config.widthFixed&&0===g(b).find("colgroup").length){var a=g("<colgroup>"),c=g(b).width();g(b.tBodies[0]).find("tr:first").children("td:visible").each(function(){a.append(g("<col>").css("width",parseInt(g(this).width()/c*1E3,10)/10+"%"))});g(b).prepend(a)}}function M(b,a){var c,h,e, f,d,l=b.config,m=a||l.sortList;l.sortList=[];g.each(m,function(b,a){f=parseInt(a[0],10);if(e=l.$headers.filter('[data-column="'+f+'"]:last')[0]){h=(h=(""+a[1]).match(/^(1|d|s|o|n)/))?h[0]:"";switch(h){case "1":case "d":h=1;break;case "s":h=d||0;break;case "o":c=e.order[(d||0)%(l.sortReset?3:2)];h=0===c?1:1===c?0:2;break;case "n":e.count+=1;h=e.order[e.count%(l.sortReset?3:2)];break;default:h=0}d=0===b?h:d;c=[f,parseInt(h,10)||0];l.sortList.push(c);h=g.inArray(c[1],e.order);e.count=0<=h?h:c[1]%(l.sortReset? 3:2)}})}function N(b,a){return b&&b[a]?b[a].type||"":""}function O(b,a,c){var h,e,d,k=b.config,l=!c[k.sortMultiSortKey],m=k.$table;m.trigger("sortStart",b);a.count=c[k.sortResetKey]?2:(a.count+1)%(k.sortReset?3:2);k.sortRestart&&(e=a,k.$headers.each(function(){this===e||!l&&g(this).is("."+f.css.sortDesc+",."+f.css.sortAsc)||(this.count=-1)}));e=a.column;if(l){k.sortList=[];if(null!==k.sortForce)for(h=k.sortForce,c=0;c<h.length;c++)h[c][0]!==e&&k.sortList.push(h[c]);h=a.order[a.count];if(2>h&&(k.sortList.push([e, h]),1<a.colSpan))for(c=1;c<a.colSpan;c++)k.sortList.push([e+c,h])}else{if(k.sortAppend&&1<k.sortList.length)for(c=0;c<k.sortAppend.length;c++)d=f.isValueInArray(k.sortAppend[c][0],k.sortList),0<=d&&k.sortList.splice(d,1);if(0<=f.isValueInArray(e,k.sortList))for(c=0;c<k.sortList.length;c++)d=k.sortList[c],h=k.$headers.filter('[data-column="'+d[0]+'"]:last')[0],d[0]===e&&(d[1]=h.order[a.count],2===d[1]&&(k.sortList.splice(c,1),h.count=-1));else if(h=a.order[a.count],2>h&&(k.sortList.push([e,h]),1<a.colSpan))for(c= 1;c<a.colSpan;c++)k.sortList.push([e+c,h])}if(null!==k.sortAppend)for(h=k.sortAppend,c=0;c<h.length;c++)h[c][0]!==e&&k.sortList.push(h[c]);m.trigger("sortBegin",b);setTimeout(function(){G(b);I(b);z(b);m.trigger("sortEnd",b)},1)}function I(b){var a,c,h,e,d,k,g,m,y,n,t,q=0,s=b.config,w=s.textSorter||"",x=s.sortList,z=x.length,B=b.tBodies.length;if(!s.serverSideSorting&&!p(s.cache)){s.debug&&(d=new Date);for(c=0;c<B;c++)k=s.cache[c].colMax,g=s.cache[c].normalized,g.sort(function(c,d){for(a=0;a<z;a++){e= x[a][0];m=x[a][1];q=0===m;if(s.sortStable&&c[e]===d[e]&&1===z)break;(h=/n/i.test(N(s.parsers,e)))&&s.strings[e]?(h="boolean"===typeof s.string[s.strings[e]]?(q?1:-1)*(s.string[s.strings[e]]?-1:1):s.strings[e]?s.string[s.strings[e]]||0:0,y=s.numberSorter?s.numberSorter(c[e],d[e],q,k[e],b):f["sortNumeric"+(q?"Asc":"Desc")](c[e],d[e],h,k[e],e,b)):(n=q?c:d,t=q?d:c,y="function"===typeof w?w(n[e],t[e],q,e,b):"object"===typeof w&&w.hasOwnProperty(e)?w[e](n[e],t[e],q,e,b):f["sortNatural"+(q?"Asc":"Desc")](c[e], d[e],e,b,s));if(y)return y}return c[s.columns].order-d[s.columns].order});s.debug&&v("Sorting on "+x.toString()+" and dir "+m+" time",d)}}function J(b,a){b[0].isUpdating&&b.trigger("updateComplete");g.isFunction(a)&&a(b[0])}function H(b,a,c){var h=b[0].config.sortList;!1!==a&&!b[0].isProcessing&&h.length?b.trigger("sorton",[h,function(){J(b,c)},!0]):(J(b,c),f.applyWidget(b[0],!1))}function K(b){var a=b.config,c=a.$table;c.unbind("sortReset update updateRows updateCell updateAll addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave ".split(" ").join(a.namespace+ " ")).bind("sortReset"+a.namespace,function(c,e){c.stopPropagation();a.sortList=[];G(b);I(b);z(b);g.isFunction(e)&&e(b)}).bind("updateAll"+a.namespace,function(c,e,d){c.stopPropagation();b.isUpdating=!0;f.refreshWidgets(b,!0,!0);f.restoreHeaders(b);D(b);f.bindEvents(b,a.$headers,!0);K(b);E(b,e,d)}).bind("update"+a.namespace+" updateRows"+a.namespace,function(a,c,d){a.stopPropagation();b.isUpdating=!0;B(b);E(b,c,d)}).bind("updateCell"+a.namespace,function(h,e,d,f){h.stopPropagation();b.isUpdating= !0;c.find(a.selectorRemove).remove();var l,m;l=c.find("tbody");m=g(e);h=l.index(g.fn.closest?m.closest("tbody"):m.parents("tbody").filter(":first"));var p=g.fn.closest?m.closest("tr"):m.parents("tr").filter(":first");e=m[0];l.length&&0<=h&&(l=l.eq(h).find("tr").index(p),m=m.index(),a.cache[h].normalized[l][a.columns].$row=p,e=a.cache[h].normalized[l][m]="no-parser"===a.parsers[m].id?"":a.parsers[m].format(n(b,e,m),b,e,m),"numeric"===(a.parsers[m].type||"").toLowerCase()&&(a.cache[h].colMax[m]=Math.max(Math.abs(e)|| 0,a.cache[h].colMax[m]||0)),H(c,d,f))}).bind("addRows"+a.namespace,function(h,e,d,f){h.stopPropagation();b.isUpdating=!0;if(p(a.cache))B(b),E(b,d,f);else{e=g(e);var l,m,v,u,x=e.filter("tr").length,q=c.find("tbody").index(e.parents("tbody").filter(":first"));a.parsers&&a.parsers.length||t(b);for(h=0;h<x;h++){m=e[h].cells.length;u=[];v={child:[],$row:e.eq(h),order:a.cache[q].normalized.length};for(l=0;l<m;l++)u[l]="no-parser"===a.parsers[l].id?"":a.parsers[l].format(n(b,e[h].cells[l],l),b,e[h].cells[l], l),"numeric"===(a.parsers[l].type||"").toLowerCase()&&(a.cache[q].colMax[l]=Math.max(Math.abs(u[l])||0,a.cache[q].colMax[l]||0));u.push(v);a.cache[q].normalized.push(u)}H(c,d,f)}}).bind("updateComplete"+a.namespace,function(){b.isUpdating=!1}).bind("sorton"+a.namespace,function(a,e,d,k){var l=b.config;a.stopPropagation();c.trigger("sortStart",this);M(b,e);G(b);l.delayInit&&p(l.cache)&&x(b);c.trigger("sortBegin",this);I(b);z(b,k);c.trigger("sortEnd",this);f.applyWidget(b);g.isFunction(d)&&d(b)}).bind("appendCache"+ a.namespace,function(a,c,d){a.stopPropagation();z(b,d);g.isFunction(c)&&c(b)}).bind("updateCache"+a.namespace,function(c,e){a.parsers&&a.parsers.length||t(b);x(b);g.isFunction(e)&&e(b)}).bind("applyWidgetId"+a.namespace,function(c,e){c.stopPropagation();f.getWidgetById(e).format(b,a,a.widgetOptions)}).bind("applyWidgets"+a.namespace,function(a,c){a.stopPropagation();f.applyWidget(b,c)}).bind("refreshWidgets"+a.namespace,function(a,c,d){a.stopPropagation();f.refreshWidgets(b,c,d)}).bind("destroy"+ a.namespace,function(a,c,d){a.stopPropagation();f.destroy(b,c,d)}).bind("resetToLoadState"+a.namespace,function(){f.refreshWidgets(b,!0,!0);a=g.extend(!0,f.defaults,a.originalSettings);b.hasInitialized=!1;f.setup(b,a)})}var f=this;f.version="2.17.5";f.parsers=[];f.widgets=[];f.defaults={theme:"default",widthFixed:!1,showProcessing:!1,headerTemplate:"{content}",onRenderTemplate:null,onRenderHeader:null,cancelSelection:!0,tabIndex:!0,dateFormat:"mmddyyyy",sortMultiSortKey:"shiftKey",sortResetKey:"ctrlKey", usNumberFormat:!0,delayInit:!1,serverSideSorting:!1,headers:{},ignoreCase:!0,sortForce:null,sortList:[],sortAppend:null,sortStable:!1,sortInitialOrder:"asc",sortLocaleCompare:!1,sortReset:!1,sortRestart:!1,emptyTo:"bottom",stringTo:"max",textExtraction:"basic",textAttribute:"data-text",textSorter:null,numberSorter:null,widgets:[],widgetOptions:{zebra:["even","odd"]},initWidgets:!0,initialized:null,tableClass:"",cssAsc:"",cssDesc:"",cssNone:"",cssHeader:"",cssHeaderRow:"",cssProcessing:"",cssChildRow:"tablesorter-childRow", cssIcon:"tablesorter-icon",cssInfoBlock:"tablesorter-infoOnly",selectorHeaders:"> thead th, > thead td",selectorSort:"th, td",selectorRemove:".remove-me",debug:!1,headerList:[],empties:{},strings:{},parsers:[]};f.css={table:"tablesorter",cssHasChild:"tablesorter-hasChildRow",childRow:"tablesorter-childRow",header:"tablesorter-header",headerRow:"tablesorter-headerRow",headerIn:"tablesorter-header-inner",icon:"tablesorter-icon",info:"tablesorter-infoOnly",processing:"tablesorter-processing",sortAsc:"tablesorter-headerAsc", sortDesc:"tablesorter-headerDesc",sortNone:"tablesorter-headerUnSorted"};f.language={sortAsc:"Ascending sort applied, ",sortDesc:"Descending sort applied, ",sortNone:"No sort applied, ",nextAsc:"activate to apply an ascending sort",nextDesc:"activate to apply a descending sort",nextNone:"activate to remove the sort"};f.log=d;f.benchmark=v;f.construct=function(b){return this.each(function(){var a=g.extend(!0,{},f.defaults,b);a.originalSettings=b;!this.hasInitialized&&f.buildTable&&"TABLE"!==this.tagName? f.buildTable(this,a):f.setup(this,a)})};f.setup=function(b,a){if(!b||!b.tHead||0===b.tBodies.length||!0===b.hasInitialized)return a.debug?d("ERROR: stopping initialization! No table, thead, tbody or tablesorter has already been initialized"):"";var c="",h=g(b),e=g.metadata;b.hasInitialized=!1;b.isProcessing=!0;b.config=a;g.data(b,"tablesorter",a);a.debug&&g.data(b,"startoveralltimer",new Date);a.supportsDataObject=function(a){a[0]=parseInt(a[0],10);return 1<a[0]||1===a[0]&&4<=parseInt(a[1],10)}(g.fn.jquery.split(".")); a.string={max:1,min:-1,emptyMin:1,emptyMax:-1,zero:0,none:0,"null":0,top:!0,bottom:!1};/tablesorter\-/.test(h.attr("class"))||(c=""!==a.theme?" tablesorter-"+a.theme:"");a.table=b;a.$table=h.addClass(f.css.table+" "+a.tableClass+c).attr({role:"grid"});a.$headers=g(b).find(a.selectorHeaders);a.namespace=a.namespace?"."+a.namespace.replace(/\W/g,""):".tablesorter"+Math.random().toString(16).slice(2);a.$tbodies=h.children("tbody:not(."+a.cssInfoBlock+")").attr({"aria-live":"polite","aria-relevant":"all"}); a.$table.find("caption").length&&a.$table.attr("aria-labelledby","theCaption");a.widgetInit={};a.textExtraction=a.$table.attr("data-text-extraction")||a.textExtraction||"basic";D(b);L(b);t(b);a.totalRows=0;a.delayInit||x(b);f.bindEvents(b,a.$headers,!0);K(b);a.supportsDataObject&&"undefined"!==typeof h.data().sortlist?a.sortList=h.data().sortlist:e&&h.metadata()&&h.metadata().sortlist&&(a.sortList=h.metadata().sortlist);f.applyWidget(b,!0);0<a.sortList.length?h.trigger("sorton",[a.sortList,{},!a.initWidgets, !0]):(G(b),a.initWidgets&&f.applyWidget(b,!1));a.showProcessing&&h.unbind("sortBegin"+a.namespace+" sortEnd"+a.namespace).bind("sortBegin"+a.namespace+" sortEnd"+a.namespace,function(c){clearTimeout(a.processTimer);f.isProcessing(b);"sortBegin"===c.type&&(a.processTimer=setTimeout(function(){f.isProcessing(b,!0)},500))});b.hasInitialized=!0;b.isProcessing=!1;a.debug&&f.benchmark("Overall initialization time",g.data(b,"startoveralltimer"));h.trigger("tablesorter-initialized",b);"function"===typeof a.initialized&& a.initialized(b)};f.getColumnData=function(b,a,c,h){if("undefined"!==typeof a&&null!==a){b=g(b)[0];var e,d=b.config;if(a[c])return h?a[c]:a[d.$headers.index(d.$headers.filter('[data-column="'+c+'"]:last'))];for(e in a)if("string"===typeof e&&(b=h?d.$headers.eq(c).filter(e):d.$headers.filter('[data-column="'+c+'"]:last').filter(e),b.length))return a[e]}};f.computeColumnIndex=function(b){var a=[],c=0,h,e,d,f,l,m,p,v,n,q;for(h=0;h<b.length;h++)for(l=b[h].cells,e=0;e<l.length;e++){d=l[e];f=g(d);m=d.parentNode.rowIndex; f.index();p=d.rowSpan||1;v=d.colSpan||1;"undefined"===typeof a[m]&&(a[m]=[]);for(d=0;d<a[m].length+1;d++)if("undefined"===typeof a[m][d]){n=d;break}c=Math.max(n,c);f.attr({"data-column":n});for(d=m;d<m+p;d++)for("undefined"===typeof a[d]&&(a[d]=[]),q=a[d],f=n;f<n+v;f++)q[f]="x"}return c+1};f.isProcessing=function(b,a,c){b=g(b);var d=b[0].config,e=c||b.find("."+f.css.header);a?("undefined"!==typeof c&&0<d.sortList.length&&(e=e.filter(function(){return this.sortDisabled?!1:0<=f.isValueInArray(parseFloat(g(this).attr("data-column")), d.sortList)})),b.add(e).addClass(f.css.processing+" "+d.cssProcessing)):b.add(e).removeClass(f.css.processing+" "+d.cssProcessing)};f.processTbody=function(b,a,c){b=g(b)[0];if(c)return b.isProcessing=!0,a.before('<span class="tablesorter-savemyplace"/>'),c=g.fn.detach?a.detach():a.remove();c=g(b).find("span.tablesorter-savemyplace");a.insertAfter(c);c.remove();b.isProcessing=!1};f.clearTableBody=function(b){g(b)[0].config.$tbodies.children().detach()};f.bindEvents=function(b,a,c){b=g(b)[0];var d, e=b.config;!0!==c&&(e.$extraHeaders=e.$extraHeaders?e.$extraHeaders.add(a):a);a.find(e.selectorSort).add(a.filter(e.selectorSort)).unbind(["mousedown","mouseup","sort","keyup",""].join(e.namespace+" ")).bind(["mousedown","mouseup","sort","keyup",""].join(e.namespace+" "),function(c,f){var l;l=c.type;if(!(1!==(c.which||c.button)&&!/sort|keyup/.test(l)||"keyup"===l&&13!==c.which||"mouseup"===l&&!0!==f&&250<(new Date).getTime()-d)){if("mousedown"===l)return d=(new Date).getTime(),/(input|select|button|textarea)/i.test(c.target.tagName)? "":!e.cancelSelection;e.delayInit&&p(e.cache)&&x(b);l=g.fn.closest?g(this).closest("th, td")[0]:/TH|TD/.test(this.tagName)?this:g(this).parents("th, td")[0];l=e.$headers[a.index(l)];l.sortDisabled||O(b,l,c)}});e.cancelSelection&&a.attr("unselectable","on").bind("selectstart",!1).css({"user-select":"none",MozUserSelect:"none"})};f.restoreHeaders=function(b){var a=g(b)[0].config;a.$table.find(a.selectorHeaders).each(function(b){g(this).find("."+f.css.headerIn).length&&g(this).html(a.headerContent[b])})}; f.destroy=function(b,a,c){b=g(b)[0];if(b.hasInitialized){f.refreshWidgets(b,!0,!0);var d=g(b),e=b.config,r=d.find("thead:first"),k=r.find("tr."+f.css.headerRow).removeClass(f.css.headerRow+" "+e.cssHeaderRow),l=d.find("tfoot:first > tr").children("th, td");!1===a&&0<=g.inArray("uitheme",e.widgets)&&(d.trigger("applyWidgetId",["uitheme"]),d.trigger("applyWidgetId",["zebra"]));r.find("tr").not(k).remove();d.removeData("tablesorter").unbind("sortReset update updateAll updateRows updateCell addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd resetToLoadState ".split(" ").join(e.namespace+ " "));e.$headers.add(l).removeClass([f.css.header,e.cssHeader,e.cssAsc,e.cssDesc,f.css.sortAsc,f.css.sortDesc,f.css.sortNone].join(" ")).removeAttr("data-column").removeAttr("aria-label").attr("aria-disabled","true");k.find(e.selectorSort).unbind(["mousedown","mouseup","keypress",""].join(e.namespace+" "));f.restoreHeaders(b);d.toggleClass(f.css.table+" "+e.tableClass+" tablesorter-"+e.theme,!1===a);b.hasInitialized=!1;delete b.config.cache;"function"===typeof c&&c(b)}};f.regex={chunk:/(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi, chunks:/(^\\0|\\0$)/,hex:/^0x[0-9a-f]+$/i};f.sortNatural=function(b,a){if(b===a)return 0;var c,d,e,g,k,l;d=f.regex;if(d.hex.test(a)){c=parseInt(b.match(d.hex),16);e=parseInt(a.match(d.hex),16);if(c<e)return-1;if(c>e)return 1}c=b.replace(d.chunk,"\\0$1\\0").replace(d.chunks,"").split("\\0");d=a.replace(d.chunk,"\\0$1\\0").replace(d.chunks,"").split("\\0");l=Math.max(c.length,d.length);for(k=0;k<l;k++){e=isNaN(c[k])?c[k]||0:parseFloat(c[k])||0;g=isNaN(d[k])?d[k]||0:parseFloat(d[k])||0;if(isNaN(e)!== isNaN(g))return isNaN(e)?1:-1;typeof e!==typeof g&&(e+="",g+="");if(e<g)return-1;if(e>g)return 1}return 0};f.sortNaturalAsc=function(b,a,c,d,e){if(b===a)return 0;c=e.string[e.empties[c]||e.emptyTo];return""===b&&0!==c?"boolean"===typeof c?c?-1:1:-c||-1:""===a&&0!==c?"boolean"===typeof c?c?1:-1:c||1:f.sortNatural(b,a)};f.sortNaturalDesc=function(b,a,c,d,e){if(b===a)return 0;c=e.string[e.empties[c]||e.emptyTo];return""===b&&0!==c?"boolean"===typeof c?c?-1:1:c||1:""===a&&0!==c?"boolean"===typeof c?c? 1:-1:-c||-1:f.sortNatural(a,b)};f.sortText=function(b,a){return b>a?1:b<a?-1:0};f.getTextValue=function(b,a,c){if(c){var d=b?b.length:0,e=c+a;for(c=0;c<d;c++)e+=b.charCodeAt(c);return a*e}return 0};f.sortNumericAsc=function(b,a,c,d,e,g){if(b===a)return 0;g=g.config;e=g.string[g.empties[e]||g.emptyTo];if(""===b&&0!==e)return"boolean"===typeof e?e?-1:1:-e||-1;if(""===a&&0!==e)return"boolean"===typeof e?e?1:-1:e||1;isNaN(b)&&(b=f.getTextValue(b,c,d));isNaN(a)&&(a=f.getTextValue(a,c,d));return b-a};f.sortNumericDesc= function(b,a,c,d,e,g){if(b===a)return 0;g=g.config;e=g.string[g.empties[e]||g.emptyTo];if(""===b&&0!==e)return"boolean"===typeof e?e?-1:1:e||1;if(""===a&&0!==e)return"boolean"===typeof e?e?1:-1:-e||-1;isNaN(b)&&(b=f.getTextValue(b,c,d));isNaN(a)&&(a=f.getTextValue(a,c,d));return a-b};f.sortNumeric=function(b,a){return b-a};f.characterEquivalents={a:"\u00e1\u00e0\u00e2\u00e3\u00e4\u0105\u00e5",A:"\u00c1\u00c0\u00c2\u00c3\u00c4\u0104\u00c5",c:"\u00e7\u0107\u010d",C:"\u00c7\u0106\u010c",e:"\u00e9\u00e8\u00ea\u00eb\u011b\u0119", E:"\u00c9\u00c8\u00ca\u00cb\u011a\u0118",i:"\u00ed\u00ec\u0130\u00ee\u00ef\u0131",I:"\u00cd\u00cc\u0130\u00ce\u00cf",o:"\u00f3\u00f2\u00f4\u00f5\u00f6",O:"\u00d3\u00d2\u00d4\u00d5\u00d6",ss:"\u00df",SS:"\u1e9e",u:"\u00fa\u00f9\u00fb\u00fc\u016f",U:"\u00da\u00d9\u00db\u00dc\u016e"};f.replaceAccents=function(b){var a,c="[",d=f.characterEquivalents;if(!f.characterRegex){f.characterRegexArray={};for(a in d)"string"===typeof a&&(c+=d[a],f.characterRegexArray[a]=new RegExp("["+d[a]+"]","g"));f.characterRegex= new RegExp(c+"]")}if(f.characterRegex.test(b))for(a in d)"string"===typeof a&&(b=b.replace(f.characterRegexArray[a],a));return b};f.isValueInArray=function(b,a){var c,d=a.length;for(c=0;c<d;c++)if(a[c][0]===b)return c;return-1};f.addParser=function(b){var a,c=f.parsers.length,d=!0;for(a=0;a<c;a++)f.parsers[a].id.toLowerCase()===b.id.toLowerCase()&&(d=!1);d&&f.parsers.push(b)};f.getParserById=function(b){if("false"==b)return!1;var a,c=f.parsers.length;for(a=0;a<c;a++)if(f.parsers[a].id.toLowerCase()=== b.toString().toLowerCase())return f.parsers[a];return!1};f.addWidget=function(b){f.widgets.push(b)};f.hasWidget=function(b,a){b=g(b);return b.length&&b[0].config&&b[0].config.widgetInit[a]||!1};f.getWidgetById=function(b){var a,c,d=f.widgets.length;for(a=0;a<d;a++)if((c=f.widgets[a])&&c.hasOwnProperty("id")&&c.id.toLowerCase()===b.toLowerCase())return c};f.applyWidget=function(b,a){b=g(b)[0];var c=b.config,d=c.widgetOptions,e=[],p,k,l;!1!==a&&b.hasInitialized&&(b.isApplyingWidgets||b.isUpdating)|| (c.debug&&(p=new Date),c.widgets.length&&(b.isApplyingWidgets=!0,c.widgets=g.grep(c.widgets,function(a,b){return g.inArray(a,c.widgets)===b}),g.each(c.widgets||[],function(a,b){(l=f.getWidgetById(b))&&l.id&&(l.priority||(l.priority=10),e[a]=l)}),e.sort(function(a,b){return a.priority<b.priority?-1:a.priority===b.priority?0:1}),g.each(e,function(e,f){if(f){if(a||!c.widgetInit[f.id])c.widgetInit[f.id]=!0,f.hasOwnProperty("options")&&(d=b.config.widgetOptions=g.extend(!0,{},f.options,d)),f.hasOwnProperty("init")&& f.init(b,f,c,d);!a&&f.hasOwnProperty("format")&&f.format(b,c,d,!1)}})),setTimeout(function(){b.isApplyingWidgets=!1},0),c.debug&&(k=c.widgets.length,v("Completed "+(!0===a?"initializing ":"applying ")+k+" widget"+(1!==k?"s":""),p)))};f.refreshWidgets=function(b,a,c){b=g(b)[0];var h,e=b.config,p=e.widgets,k=f.widgets,l=k.length;for(h=0;h<l;h++)k[h]&&k[h].id&&(a||0>g.inArray(k[h].id,p))&&(e.debug&&d('Refeshing widgets: Removing "'+k[h].id+'"'),k[h].hasOwnProperty("remove")&&e.widgetInit[k[h].id]&&(k[h].remove(b, e,e.widgetOptions),e.widgetInit[k[h].id]=!1));!0!==c&&f.applyWidget(b,a)};f.getData=function(b,a,c){var d="";b=g(b);var e,f;if(!b.length)return"";e=g.metadata?b.metadata():!1;f=" "+(b.attr("class")||"");"undefined"!==typeof b.data(c)||"undefined"!==typeof b.data(c.toLowerCase())?d+=b.data(c)||b.data(c.toLowerCase()):e&&"undefined"!==typeof e[c]?d+=e[c]:a&&"undefined"!==typeof a[c]?d+=a[c]:" "!==f&&f.match(" "+c+"-")&&(d=f.match(new RegExp("\\s"+c+"-([\\w-]+)"))[1]||"");return g.trim(d)};f.formatFloat= function(b,a){if("string"!==typeof b||""===b)return b;var c;b=(a&&a.config?!1!==a.config.usNumberFormat:"undefined"!==typeof a?a:1)?b.replace(/,/g,""):b.replace(/[\s|\.]/g,"").replace(/,/g,".");/^\s*\([.\d]+\)/.test(b)&&(b=b.replace(/^\s*\(([.\d]+)\)/,"-$1"));c=parseFloat(b);return isNaN(c)?g.trim(b):c};f.isDigit=function(b){return isNaN(b)?/^[\-+(]?\d+[)]?$/.test(b.toString().replace(/[,.'"\s]/g,"")):!0}}});var n=g.tablesorter;g.fn.extend({tablesorter:n.construct});n.addParser({id:"no-parser",is:function(){return!1}, format:function(){return""},type:"text"});n.addParser({id:"text",is:function(){return!0},format:function(d,v){var p=v.config;d&&(d=g.trim(p.ignoreCase?d.toLocaleLowerCase():d),d=p.sortLocaleCompare?n.replaceAccents(d):d);return d},type:"text"});n.addParser({id:"digit",is:function(d){return n.isDigit(d)},format:function(d,v){var p=n.formatFloat((d||"").replace(/[^\w,. \-()]/g,""),v);return d&&"number"===typeof p?p:d?g.trim(d&&v.config.ignoreCase?d.toLocaleLowerCase():d):d},type:"numeric"});n.addParser({id:"currency", is:function(d){return/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/.test((d||"").replace(/[+\-,. ]/g,""))},format:function(d,v){var p=n.formatFloat((d||"").replace(/[^\w,. \-()]/g,""),v);return d&&"number"===typeof p?p:d?g.trim(d&&v.config.ignoreCase?d.toLocaleLowerCase():d):d},type:"numeric"});n.addParser({id:"ipAddress",is:function(d){return/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/.test(d)},format:function(d,g){var p,w=d?d.split("."):"",t="",x=w.length; for(p=0;p<x;p++)t+=("00"+w[p]).slice(-3);return d?n.formatFloat(t,g):d},type:"numeric"});n.addParser({id:"url",is:function(d){return/^(https?|ftp|file):\/\//.test(d)},format:function(d){return d?g.trim(d.replace(/(https?|ftp|file):\/\//,"")):d},type:"text"});n.addParser({id:"isoDate",is:function(d){return/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/.test(d)},format:function(d,g){return d?n.formatFloat(""!==d?(new Date(d.replace(/-/g,"/"))).getTime()||d:"",g):d},type:"numeric"});n.addParser({id:"percent",is:function(d){return/(\d\s*?%|%\s*?\d)/.test(d)&& 15>d.length},format:function(d,g){return d?n.formatFloat(d.replace(/%/g,""),g):d},type:"numeric"});n.addParser({id:"usLongDate",is:function(d){return/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i.test(d)||/^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i.test(d)},format:function(d,g){return d?n.formatFloat((new Date(d.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||d,g):d},type:"numeric"});n.addParser({id:"shortDate",is:function(d){return/(^\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4})|(^\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2})/.test((d|| "").replace(/\s+/g," ").replace(/[\-.,]/g,"/"))},format:function(d,g,p,w){if(d){p=g.config;var t=p.$headers.filter("[data-column="+w+"]:last");w=t.length&&t[0].dateFormat||n.getData(t,n.getColumnData(g,p.headers,w),"dateFormat")||p.dateFormat;d=d.replace(/\s+/g," ").replace(/[\-.,]/g,"/");"mmddyyyy"===w?d=d.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$1/$2"):"ddmmyyyy"===w?d=d.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$2/$1"):"yyyymmdd"===w&&(d=d.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/, "$1/$2/$3"))}return d?n.formatFloat((new Date(d)).getTime()||d,g):d},type:"numeric"});n.addParser({id:"time",is:function(d){return/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i.test(d)},format:function(d,g){return d?n.formatFloat((new Date("2000/01/01 "+d.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||d,g):d},type:"numeric"});n.addParser({id:"metadata",is:function(){return!1},format:function(d,n,p){d=n.config;d=d.parserMetadataName?d.parserMetadataName:"sortValue";return g(p).metadata()[d]}, type:"numeric"});n.addWidget({id:"zebra",priority:90,format:function(d,v,p){var w,t,x,z,C,D,E=new RegExp(v.cssChildRow,"i"),B=v.$tbodies;v.debug&&(C=new Date);for(d=0;d<B.length;d++)w=B.eq(d),D=w.children("tr").length,1<D&&(x=0,w=w.children("tr:visible").not(v.selectorRemove),w.each(function(){t=g(this);E.test(this.className)||x++;z=0===x%2;t.removeClass(p.zebra[z?1:0]).addClass(p.zebra[z?0:1])}));v.debug&&n.benchmark("Applying Zebra widget",C)},remove:function(d,n,p){var w;n=n.$tbodies;var t=(p.zebra|| ["even","odd"]).join(" ");for(p=0;p<n.length;p++)w=g.tablesorter.processTbody(d,n.eq(p),!0),w.children().removeClass(t),g.tablesorter.processTbody(d,w,!1)}})}(jQuery);
-
-!function(a){"use strict";var b=a.tablesorter=a.tablesorter||{};a.extend(b.css,{table:"tablesorter",header:"header",sortAsc:"headerSortUp",sortDesc:"headerSortDown"}),b.storage=function(b,c,d,e){b=a(b)[0];var f,g,h,i=!1,j={},k=b.config,l=a(b),m=e&&e.id||l.attr(e&&e.group||"data-table-group")||b.id||a(".tablesorter").index(l),n=e&&e.url||l.attr(e&&e.page||"data-table-page")||k&&k.fixedUrl||window.location.pathname;if("localStorage"in window)try{window.localStorage.setItem("_tmptest","temp"),i=!0,window.localStorage.removeItem("_tmptest")}catch(o){}return a.parseJSON&&(i?j=a.parseJSON(localStorage[c]||"{}"):(g=document.cookie.split(/[;\s|=]/),f=a.inArray(c,g)+1,j=0!==f?a.parseJSON(g[f]||"{}"):{})),(d||""===d)&&window.JSON&&JSON.hasOwnProperty("stringify")?(j[n]||(j[n]={}),j[n][m]=d,i?localStorage[c]=JSON.stringify(j):(h=new Date,h.setTime(h.getTime()+31536e6),document.cookie=c+"="+JSON.stringify(j).replace(/\"/g,'"')+"; expires="+h.toGMTString()+"; path=/"),void 0):j&&j[n]?j[n][m]:""},b.addWidget({id:"saveSort",priority:20,options:{saveSort:!0},init:function(a,b,c,d){b.format(a,c,d,!0)},format:function(c,d,e,f){var g,h,i=d.$table,j=e.saveSort!==!1,k={sortList:d.sortList};d.debug&&(h=new Date),i.hasClass("hasSaveSort")?j&&c.hasInitialized&&b.storage&&(b.storage(c,"tablesorter-savesort",k),d.debug&&b.benchmark("saveSort widget: Saving last sort: "+d.sortList,h)):(i.addClass("hasSaveSort"),k="",b.storage&&(g=b.storage(c,"tablesorter-savesort"),k=g&&g.hasOwnProperty("sortList")&&a.isArray(g.sortList)?g.sortList:"",d.debug&&b.benchmark('saveSort: Last sort loaded: "'+k+'"',h),i.bind("saveSortReset",function(a){a.stopPropagation(),b.storage(c,"tablesorter-savesort","")})),f&&k&&k.length>0?d.sortList=k:c.hasInitialized&&k&&k.length>0&&i.trigger("sorton",[k]))},remove:function(a){b.storage&&b.storage(a,"tablesorter-savesort","")}})}(jQuery);
+!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof module&&"object"==typeof module.exports?module.exports=e(require("jquery")):e(jQuery)}(function(e){"use strict";e.extend({tablesorter:new function(){function t(){var e=arguments[0],t=arguments.length>1?Array.prototype.slice.call(arguments):e;"undefined"!=typeof console&&"undefined"!=typeof console.log?console[/error/i.test(e)?"error":/warn/i.test(e)?"warn":"log"](t):alert(t)}function r(e,r){t(e+" ("+((new Date).getTime()-r.getTime())+"ms)")}function s(e){for(var t in e)return!1;return!0}function a(r,s,a,n){for(var o,i,d=r.config,c=v.parsers.length,l=!1,u="",p=!0;""===u&&p;)a++,s[a]?(l=s[a].cells[n],u=v.getElementText(d,l,n),i=e(l),r.config.debug&&t("Checking if value was empty on row "+a+", column: "+n+': "'+u+'"')):p=!1;for(;--c>=0;)if(o=v.parsers[c],o&&"text"!==o.id&&o.is&&o.is(u,r,l,i))return o;return v.getParserById("text")}function n(e){var s,n,o,i,d,c,l,u,p,g,f=e.config,m=f.$tbodies=f.$table.children("tbody:not(."+f.cssInfoBlock+")"),h=0,b="",y=m.length;if(0===y)return f.debug?t("Warning: *Empty table!* Not building a parser cache"):"";for(f.debug&&(g=new Date,t("Detecting parsers for each column")),n={extractors:[],parsers:[]};y>h;){if(s=m[h].rows,s.length)for(o=f.columns,i=0;o>i;i++)d=f.$headers.filter('[data-column="'+i+'"]:last'),c=v.getColumnData(e,f.headers,i),p=v.getParserById(v.getData(d,c,"extractor")),u=v.getParserById(v.getData(d,c,"sorter")),l="false"===v.getData(d,c,"parser"),f.empties[i]=(v.getData(d,c,"empty")||f.emptyTo||(f.emptyToBottom?"bottom":"top")).toLowerCase(),f.strings[i]=(v.getData(d,c,"string")||f.stringTo||"max").toLowerCase(),l&&(u=v.getParserById("no-parser")),p||(p=!1),u||(u=a(e,s,-1,i)),f.debug&&(b+="column:"+i+"; extractor:"+p.id+"; parser:"+u.id+"; string:"+f.strings[i]+"; empty: "+f.empties[i]+"\n"),n.parsers[i]=u,n.extractors[i]=p;h+=n.parsers.length?y:1}f.debug&&(t(b?b:"No parsers detected"),r("Completed detecting parsers",g)),f.parsers=n.parsers,f.extractors=n.extractors}function o(s){var a,n,o,i,d,c,l,u,p,g,f,m,h,b=s.config,y=b.$tbodies,w=b.extractors,x=b.parsers;if(b.cache={},b.totalRows=0,!x)return b.debug?t("Warning: *Empty table!* Not building a cache"):"";for(b.debug&&(g=new Date),b.showProcessing&&v.isProcessing(s,!0),l=0;l<y.length;l++){for(h=[],a=b.cache[l]={normalized:[]},f=y[l]&&y[l].rows.length||0,d=0;f>d;++d)if(m={child:[],raw:[]},u=e(y[l].rows[d]),p=[],u.hasClass(b.cssChildRow)&&0!==d)n=a.normalized.length-1,a.normalized[n][b.columns].$row=a.normalized[n][b.columns].$row.add(u),u.prev().hasClass(b.cssChildRow)||u.prev().addClass(v.css.cssHasChild),m.child[n]=e.trim(u[0].textContent||u.text()||"");else{for(m.$row=u,m.order=d,c=0;c<b.columns;++c)"undefined"!=typeof x[c]?(n=v.getElementText(b,u[0].cells[c],c),m.raw.push(n),o="undefined"==typeof w[c].id?n:w[c].format(n,s,u[0].cells[c],c),i="no-parser"===x[c].id?"":x[c].format(o,s,u[0].cells[c],c),p.push(b.ignoreCase&&"string"==typeof i?i.toLowerCase():i),"numeric"===(x[c].type||"").toLowerCase()&&(h[c]=Math.max(Math.abs(i)||0,h[c]||0))):b.debug&&t("No parser found for cell:",u[0].cells[c],"does it have a header?");p[b.columns]=m,a.normalized.push(p)}a.colMax=h,b.totalRows+=a.normalized.length}b.showProcessing&&v.isProcessing(s),b.debug&&r("Building cache for "+f+" rows",g)}function i(e,t){var a,n,o,i,d,c,l,u=e.config,p=u.widgetOptions,g=u.$tbodies,f=[],m=u.cache;if(s(m))return u.appender?u.appender(e,f):e.isUpdating?u.$table.trigger("updateComplete",e):"";for(u.debug&&(l=new Date),c=0;c<g.length;c++)if(o=g.eq(c),o.length){for(i=v.processTbody(e,o,!0),a=m[c].normalized,n=a.length,d=0;n>d;d++)f.push(a[d][u.columns].$row),u.appender&&(!u.pager||u.pager.removeRows&&p.pager_removeRows||u.pager.ajax)||i.append(a[d][u.columns].$row);v.processTbody(e,i,!1)}u.appender&&u.appender(e,f),u.debug&&r("Rebuilt table",l),t||u.appender||v.applyWidget(e),e.isUpdating&&u.$table.trigger("updateComplete",e)}function d(e){return/^d/i.test(e)||1===e}function c(s){var a,n,o,i,c,l,p,g=s.config;g.headerList=[],g.headerContent=[],g.debug&&(p=new Date),g.columns=v.computeColumnIndex(g.$table.children("thead, tfoot").children("tr")),i=g.cssIcon?'<i class="'+(g.cssIcon===v.css.icon?v.css.icon:g.cssIcon+" "+v.css.icon)+'"></i>':"",g.$headers=e(e.map(e(s).find(g.selectorHeaders),function(t,r){return n=e(t),n.parent().hasClass(g.cssIgnoreRow)?void 0:(a=v.getColumnData(s,g.headers,r,!0),g.headerContent[r]=n.html(),""===g.headerTemplate||n.find("."+v.css.headerIn).length||(c=g.headerTemplate.replace(/\{content\}/g,n.html()).replace(/\{icon\}/g,n.find("."+v.css.icon).length?"":i),g.onRenderTemplate&&(o=g.onRenderTemplate.apply(n,[r,c]),o&&"string"==typeof o&&(c=o)),n.html('<div class="'+v.css.headerIn+'">'+c+"</div>")),g.onRenderHeader&&g.onRenderHeader.apply(n,[r,g,g.$table]),t.column=parseInt(n.attr("data-column"),10),t.order=d(v.getData(n,a,"sortInitialOrder")||g.sortInitialOrder)?[1,0,2]:[0,1,2],t.count=-1,t.lockedOrder=!1,l=v.getData(n,a,"lockedOrder")||!1,"undefined"!=typeof l&&l!==!1&&(t.order=t.lockedOrder=d(l)?[1,1,1]:[0,0,0]),n.addClass(v.css.header+" "+g.cssHeader),g.headerList[r]=t,n.parent().addClass(v.css.headerRow+" "+g.cssHeaderRow).attr("role","row"),g.tabIndex&&n.attr("tabindex",0),t)})),e(s).find(g.selectorHeaders).attr({scope:"col",role:"columnheader"}),u(s),g.debug&&(r("Built headers:",p),t(g.$headers))}function l(e,t,r){var s=e.config;s.$table.find(s.selectorRemove).remove(),n(e),o(e),y(s,t,r)}function u(t){var r,s,a,n=t.config;n.$headers.each(function(o,i){s=e(i),a=v.getColumnData(t,n.headers,o,!0),r="false"===v.getData(i,a,"sorter")||"false"===v.getData(i,a,"parser"),i.sortDisabled=r,s[r?"addClass":"removeClass"]("sorter-false").attr("aria-disabled",""+r),t.id&&(r?s.removeAttr("aria-controls"):s.attr("aria-controls",t.id))})}function p(t){var r,s,a,n=t.config,o=n.sortList,i=o.length,d=v.css.sortNone+" "+n.cssNone,c=[v.css.sortAsc+" "+n.cssAsc,v.css.sortDesc+" "+n.cssDesc],l=[n.cssIconAsc,n.cssIconDesc,n.cssIconNone],u=["ascending","descending"],p=e(t).find("tfoot tr").children().add(n.$extraHeaders).removeClass(c.join(" "));for(n.$headers.removeClass(c.join(" ")).addClass(d).attr("aria-sort","none").find("."+n.cssIcon).removeClass(l.join(" ")).addClass(l[2]),s=0;i>s;s++)if(2!==o[s][1]&&(r=n.$headers.not(".sorter-false").filter('[data-column="'+o[s][0]+'"]'+(1===i?":last":"")),r.length)){for(a=0;a<r.length;a++)r[a].sortDisabled||r.eq(a).removeClass(d).addClass(c[o[s][1]]).attr("aria-sort",u[o[s][1]]).find("."+n.cssIcon).removeClass(l[2]).addClass(l[o[s][1]]);p.length&&p.filter('[data-column="'+o[s][0]+'"]').removeClass(d).addClass(c[o[s][1]])}n.$headers.not(".sorter-false").each(function(){var t=e(this),r=this.order[(this.count+1)%(n.sortReset?3:2)],s=e.trim(t.text())+": "+v.language[t.hasClass(v.css.sortAsc)?"sortAsc":t.hasClass(v.css.sortDesc)?"sortDesc":"sortNone"]+v.language[0===r?"nextAsc":1===r?"nextDesc":"nextNone"];t.attr("aria-label",s)})}function g(t,r){var s,a,n,o,i,d=t.config,c=r||d.sortList;d.sortList=[],e.each(c,function(t,r){if(o=parseInt(r[0],10),n=d.$headers.filter('[data-column="'+o+'"]:last')[0]){switch(a=(""+r[1]).match(/^(1|d|s|o|n)/),a=a?a[0]:""){case"1":case"d":a=1;break;case"s":a=i||0;break;case"o":s=n.order[(i||0)%(d.sortReset?3:2)],a=0===s?1:1===s?0:2;break;case"n":n.count=n.count+1,a=n.order[n.count%(d.sortReset?3:2)];break;default:a=0}i=0===t?a:i,s=[o,parseInt(a,10)||0],d.sortList.push(s),a=e.inArray(s[1],n.order),n.count=a>=0?a:s[1]%(d.sortReset?3:2)}})}function f(e,t){return e&&e[t]?e[t].type||"":""}function m(t,r,s){if(t.isUpdating)return setTimeout(function(){m(t,r,s)},50);var a,n,o,d,c,l=t.config,u=!s[l.sortMultiSortKey],g=l.$table;if(g.trigger("sortStart",t),r.count=s[l.sortResetKey]?2:(r.count+1)%(l.sortReset?3:2),l.sortRestart&&(n=r,l.$headers.each(function(){this===n||!u&&e(this).is("."+v.css.sortDesc+",."+v.css.sortAsc)||(this.count=-1)})),n=parseInt(e(r).attr("data-column"),10),u){if(l.sortList=[],null!==l.sortForce)for(a=l.sortForce,o=0;o<a.length;o++)a[o][0]!==n&&l.sortList.push(a[o]);if(d=r.order[r.count],2>d&&(l.sortList.push([n,d]),r.colSpan>1))for(o=1;o<r.colSpan;o++)l.sortList.push([n+o,d])}else{if(l.sortAppend&&l.sortList.length>1)for(o=0;o<l.sortAppend.length;o++)c=v.isValueInArray(l.sortAppend[o][0],l.sortList),c>=0&&l.sortList.splice(c,1);if(v.isValueInArray(n,l.sortList)>=0)for(o=0;o<l.sortList.length;o++)c=l.sortList[o],d=l.$headers.filter('[data-column="'+c[0]+'"]:last')[0],c[0]===n&&(c[1]=d.order[r.count],2===c[1]&&(l.sortList.splice(o,1),d.count=-1));else if(d=r.order[r.count],2>d&&(l.sortList.push([n,d]),r.colSpan>1))for(o=1;o<r.colSpan;o++)l.sortList.push([n+o,d])}if(null!==l.sortAppend)for(a=l.sortAppend,o=0;o<a.length;o++)a[o][0]!==n&&l.sortList.push(a[o]);g.trigger("sortBegin",t),setTimeout(function(){p(t),h(t),i(t),g.trigger("sortEnd",t)},1)}function h(e){var t,a,n,o,i,d,c,l,u,p,g,m=0,h=e.config,b=h.textSorter||"",y=h.sortList,w=y.length,x=h.$tbodies.length;if(!h.serverSideSorting&&!s(h.cache)){for(h.debug&&(i=new Date),a=0;x>a;a++)d=h.cache[a].colMax,c=h.cache[a].normalized,c.sort(function(r,s){for(t=0;w>t;t++){if(o=y[t][0],l=y[t][1],m=0===l,h.sortStable&&r[o]===s[o]&&1===w)return r[h.columns].order-s[h.columns].order;if(n=/n/i.test(f(h.parsers,o)),n&&h.strings[o]?(n="boolean"==typeof h.string[h.strings[o]]?(m?1:-1)*(h.string[h.strings[o]]?-1:1):h.strings[o]?h.string[h.strings[o]]||0:0,u=h.numberSorter?h.numberSorter(r[o],s[o],m,d[o],e):v["sortNumeric"+(m?"Asc":"Desc")](r[o],s[o],n,d[o],o,e)):(p=m?r:s,g=m?s:r,u="function"==typeof b?b(p[o],g[o],m,o,e):"object"==typeof b&&b.hasOwnProperty(o)?b[o](p[o],g[o],m,o,e):v["sortNatural"+(m?"Asc":"Desc")](r[o],s[o],o,e,h)),u)return u}return r[h.columns].order-s[h.columns].order});h.debug&&r("Sorting on "+y.toString()+" and dir "+l+" time",i)}}function b(t,r){t.table.isUpdating&&t.$table.trigger("updateComplete",t.table),e.isFunction(r)&&r(t.table)}function y(t,r,s){var a=e.isArray(r)?r:t.sortList,n="undefined"==typeof r?t.resort:r;n===!1||t.serverSideSorting||t.table.isProcessing?(b(t,s),v.applyWidget(t.table,!1)):a.length?t.$table.trigger("sorton",[a,function(){b(t,s)},!0]):t.$table.trigger("sortReset",[function(){b(t,s),v.applyWidget(t.table,!1)}])}function w(t){var r=t.config,a=r.$table,d="sortReset update updateRows updateCell updateAll addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave ".split(" ").join(r.namespace+" ");a.unbind(d.replace(/\s+/g," ")).bind("sortReset"+r.namespace,function(s,a){s.stopPropagation(),r.sortList=[],p(t),h(t),i(t),e.isFunction(a)&&a(t)}).bind("updateAll"+r.namespace,function(e,s,a){e.stopPropagation(),t.isUpdating=!0,v.refreshWidgets(t,!0,!0),c(t),v.bindEvents(t,r.$headers,!0),w(t),l(t,s,a)}).bind("update"+r.namespace+" updateRows"+r.namespace,function(e,r,s){e.stopPropagation(),t.isUpdating=!0,u(t),l(t,r,s)}).bind("updateCell"+r.namespace,function(s,n,o,i){s.stopPropagation(),t.isUpdating=!0,a.find(r.selectorRemove).remove();var d,c,l,u,p=r.$tbodies,g=e(n),f=p.index(e.fn.closest?g.closest("tbody"):g.parents("tbody").filter(":first")),m=e.fn.closest?g.closest("tr"):g.parents("tr").filter(":first");n=g[0],p.length&&f>=0&&(l=p.eq(f).find("tr").index(m),u=g.index(),r.cache[f].normalized[l][r.columns].$row=m,c="undefined"==typeof r.extractors[u].id?v.getElementText(r,n,u):r.extractors[u].format(v.getElementText(r,n,u),t,n,u),d="no-parser"===r.parsers[u].id?"":r.parsers[u].format(c,t,n,u),r.cache[f].normalized[l][u]=r.ignoreCase&&"string"==typeof d?d.toLowerCase():d,"numeric"===(r.parsers[u].type||"").toLowerCase()&&(r.cache[f].colMax[u]=Math.max(Math.abs(d)||0,r.cache[f].colMax[u]||0)),d="undefined"!==o?o:r.resort,d!==!1?y(r,d,i):(e.isFunction(i)&&i(t),r.$table.trigger("updateComplete",r.table)))}).bind("addRows"+r.namespace,function(a,o,i,d){if(a.stopPropagation(),t.isUpdating=!0,s(r.cache))u(t),l(t,i,d);else{o=e(o).attr("role","row");var c,p,g,f,m,h,b,w=o.filter("tr").length,x=r.$tbodies.index(o.parents("tbody").filter(":first"));for(r.parsers&&r.parsers.length||n(t),c=0;w>c;c++){for(g=o[c].cells.length,b=[],h={child:[],$row:o.eq(c),order:r.cache[x].normalized.length},p=0;g>p;p++)f="undefined"==typeof r.extractors[p].id?v.getElementText(r,o[c].cells[p],p):r.extractors[p].format(v.getElementText(r,o[c].cells[p],p),t,o[c].cells[p],p),m="no-parser"===r.parsers[p].id?"":r.parsers[p].format(f,t,o[c].cells[p],p),b[p]=r.ignoreCase&&"string"==typeof m?m.toLowerCase():m,"numeric"===(r.parsers[p].type||"").toLowerCase()&&(r.cache[x].colMax[p]=Math.max(Math.abs(b[p])||0,r.cache[x].colMax[p]||0));b.push(h),r.cache[x].normalized.push(b)}y(r,i,d)}}).bind("updateComplete"+r.namespace,function(){t.isUpdating=!1}).bind("sorton"+r.namespace,function(r,n,d,c){var l=t.config;r.stopPropagation(),a.trigger("sortStart",this),g(t,n),p(t),l.delayInit&&s(l.cache)&&o(t),a.trigger("sortBegin",this),h(t),i(t,c),a.trigger("sortEnd",this),v.applyWidget(t),e.isFunction(d)&&d(t)}).bind("appendCache"+r.namespace,function(r,s,a){r.stopPropagation(),i(t,a),e.isFunction(s)&&s(t)}).bind("updateCache"+r.namespace,function(s,a){r.parsers&&r.parsers.length||n(t),o(t),e.isFunction(a)&&a(t)}).bind("applyWidgetId"+r.namespace,function(e,s){e.stopPropagation(),v.getWidgetById(s).format(t,r,r.widgetOptions)}).bind("applyWidgets"+r.namespace,function(e,r){e.stopPropagation(),v.applyWidget(t,r)}).bind("refreshWidgets"+r.namespace,function(e,r,s){e.stopPropagation(),v.refreshWidgets(t,r,s)}).bind("destroy"+r.namespace,function(e,r,s){e.stopPropagation(),v.destroy(t,r,s)}).bind("resetToLoadState"+r.namespace,function(){v.removeWidget(t,!0,!1),r=e.extend(!0,v.defaults,r.originalSettings),t.hasInitialized=!1,v.setup(t,r)})}var v=this;v.version="{{version}}",v.parsers=[],v.widgets=[],v.defaults={theme:"default",widthFixed:!1,showProcessing:!1,headerTemplate:"{content}",onRenderTemplate:null,onRenderHeader:null,cancelSelection:!0,tabIndex:!0,dateFormat:"mmddyyyy",sortMultiSortKey:"shiftKey",sortResetKey:"ctrlKey",usNumberFormat:!0,delayInit:!1,serverSideSorting:!1,resort:!0,headers:{},ignoreCase:!0,sortForce:null,sortList:[],sortAppend:null,sortStable:!1,sortInitialOrder:"asc",sortLocaleCompare:!1,sortReset:!1,sortRestart:!1,emptyTo:"bottom",stringTo:"max",textExtraction:"basic",textAttribute:"data-text",textSorter:null,numberSorter:null,widgets:[],widgetOptions:{zebra:["even","odd"]},initWidgets:!0,widgetClass:"widget-{name}",initialized:null,tableClass:"",cssAsc:"",cssDesc:"",cssNone:"",cssHeader:"",cssHeaderRow:"",cssProcessing:"",cssChildRow:"tablesorter-childRow",cssIcon:"tablesorter-icon",cssIconNone:"",cssIconAsc:"",cssIconDesc:"",cssInfoBlock:"tablesorter-infoOnly",cssNoSort:"tablesorter-noSort",cssIgnoreRow:"tablesorter-ignoreRow",selectorHeaders:"> thead th, > thead td",selectorSort:"th, td",selectorRemove:".remove-me",debug:!1,headerList:[],empties:{},strings:{},parsers:[]},v.css={table:"tablesorter",cssHasChild:"tablesorter-hasChildRow",childRow:"tablesorter-childRow",colgroup:"tablesorter-colgroup",header:"tablesorter-header",headerRow:"tablesorter-headerRow",headerIn:"tablesorter-header-inner",icon:"tablesorter-icon",processing:"tablesorter-processing",sortAsc:"tablesorter-headerAsc",sortDesc:"tablesorter-headerDesc",sortNone:"tablesorter-headerUnSorted"},v.language={sortAsc:"Ascending sort applied, ",sortDesc:"Descending sort applied, ",sortNone:"No sort applied, ",nextAsc:"activate to apply an ascending sort",nextDesc:"activate to apply a descending sort",nextNone:"activate to remove the sort"},v.log=t,v.benchmark=r,v.getElementText=function(t,r,s){if(!r)return"";var a,n=t.textExtraction||"",o=r.jquery?r:e(r);return e.trim("string"==typeof n?("basic"===n?o.attr(t.textAttribute)||r.textContent:r.textContent)||o.text()||"":"function"==typeof n?n(o[0],t.table,s):"function"==typeof(a=v.getColumnData(t.table,n,s))?a(o[0],t.table,s):o[0].textContent||o.text()||"")},v.construct=function(t){return this.each(function(){var r=this,s=e.extend(!0,{},v.defaults,t);s.originalSettings=t,!r.hasInitialized&&v.buildTable&&"TABLE"!==this.tagName?v.buildTable(r,s):v.setup(r,s)})},v.setup=function(r,s){if(!r||!r.tHead||0===r.tBodies.length||r.hasInitialized===!0)return s.debug?t("ERROR: stopping initialization! No table, thead, tbody or tablesorter has already been initialized"):"";var a="",i=e(r),d=e.metadata;r.hasInitialized=!1,r.isProcessing=!0,r.config=s,e.data(r,"tablesorter",s),s.debug&&e.data(r,"startoveralltimer",new Date),s.supportsDataObject=function(e){return e[0]=parseInt(e[0],10),e[0]>1||1===e[0]&&parseInt(e[1],10)>=4}(e.fn.jquery.split(".")),s.string={max:1,min:-1,emptymin:1,emptymax:-1,zero:0,none:0,"null":0,top:!0,bottom:!1},s.emptyTo=s.emptyTo.toLowerCase(),s.stringTo=s.stringTo.toLowerCase(),/tablesorter\-/.test(i.attr("class"))||(a=""!==s.theme?" tablesorter-"+s.theme:""),s.table=r,s.$table=i.addClass(v.css.table+" "+s.tableClass+a).attr("role","grid"),s.$headers=i.find(s.selectorHeaders),s.namespace=s.namespace?"."+s.namespace.replace(/\W/g,""):".tablesorter"+Math.random().toString(16).slice(2),s.$table.children().children("tr").attr("role","row"),s.$tbodies=i.children("tbody:not(."+s.cssInfoBlock+")").attr({"aria-live":"polite","aria-relevant":"all"}),s.$table.children("caption").length&&(a=s.$table.children("caption")[0],a.id||(a.id=s.namespace.slice(1)+"caption"),s.$table.attr("aria-labelledby",a.id)),s.widgetInit={},s.textExtraction=s.$table.attr("data-text-extraction")||s.textExtraction||"basic",c(r),v.fixColumnWidth(r),n(r),s.totalRows=0,s.delayInit||o(r),v.bindEvents(r,s.$headers,!0),w(r),s.supportsDataObject&&"undefined"!=typeof i.data().sortlist?s.sortList=i.data().sortlist:d&&i.metadata()&&i.metadata().sortlist&&(s.sortList=i.metadata().sortlist),v.applyWidget(r,!0),s.sortList.length>0?i.trigger("sorton",[s.sortList,{},!s.initWidgets,!0]):(p(r),s.initWidgets&&v.applyWidget(r,!1)),s.showProcessing&&i.unbind("sortBegin"+s.namespace+" sortEnd"+s.namespace).bind("sortBegin"+s.namespace+" sortEnd"+s.namespace,function(e){clearTimeout(s.processTimer),v.isProcessing(r),"sortBegin"===e.type&&(s.processTimer=setTimeout(function(){v.isProcessing(r,!0)},500))}),r.hasInitialized=!0,r.isProcessing=!1,s.debug&&v.benchmark("Overall initialization time",e.data(r,"startoveralltimer")),i.trigger("tablesorter-initialized",r),"function"==typeof s.initialized&&s.initialized(r)},v.fixColumnWidth=function(t){t=e(t)[0];var r,s,a=t.config,n=a.$table.children("colgroup");n.length&&n.hasClass(v.css.colgroup)&&n.remove(),a.widthFixed&&0===a.$table.children("colgroup").length&&(n=e('<colgroup class="'+v.css.colgroup+'">'),r=a.$table.width(),a.$tbodies.find("tr:first").children(":visible").each(function(){s=parseInt(e(this).width()/r*1e3,10)/10+"%",n.append(e("<col>").css("width",s))}),a.$table.prepend(n))},v.getColumnData=function(t,r,s,a,n){if("undefined"!=typeof r&&null!==r){t=e(t)[0];var o,i,d=t.config,c=n||d.$headers;if(r[s])return a?r[s]:r[c.index(c.filter('[data-column="'+s+'"]:last'))];for(i in r)if("string"==typeof i&&(o=c.filter('[data-column="'+s+'"]:last').filter(i).add(c.filter('[data-column="'+s+'"]:last').find(i)),o.length))return r[i]}},v.computeColumnIndex=function(t){var r,s,a,n,o,i,d,c,l,u,p,g,f,m=[],h={},b=0;for(r=0;r<t.length;r++)for(d=t[r].cells,s=0;s<d.length;s++){for(i=d[s],o=e(i),c=i.parentNode.rowIndex,l=c+"-"+o.index(),u=i.rowSpan||1,p=i.colSpan||1,"undefined"==typeof m[c]&&(m[c]=[]),a=0;a<m[c].length+1;a++)if("undefined"==typeof m[c][a]){g=a;break}for(h[l]=g,b=Math.max(g,b),o.attr({"data-column":g}),a=c;c+u>a;a++)for("undefined"==typeof m[a]&&(m[a]=[]),f=m[a],n=g;g+p>n;n++)f[n]="x"}return b+1},v.isProcessing=function(t,r,s){t=e(t);var a=t[0].config,n=s||t.find("."+v.css.header);r?("undefined"!=typeof s&&a.sortList.length>0&&(n=n.filter(function(){return this.sortDisabled?!1:v.isValueInArray(parseFloat(e(this).attr("data-column")),a.sortList)>=0})),t.add(n).addClass(v.css.processing+" "+a.cssProcessing)):t.add(n).removeClass(v.css.processing+" "+a.cssProcessing)},v.processTbody=function(t,r,s){t=e(t)[0];var a;return s?(t.isProcessing=!0,r.before('<span class="tablesorter-savemyplace"/>'),a=e.fn.detach?r.detach():r.remove()):(a=e(t).find("span.tablesorter-savemyplace"),r.insertAfter(a),a.remove(),void(t.isProcessing=!1))},v.clearTableBody=function(t){e(t)[0].config.$tbodies.children().detach()},v.bindEvents=function(t,r,a){t=e(t)[0];var n,i=t.config;a!==!0&&(i.$extraHeaders=i.$extraHeaders?i.$extraHeaders.add(r):r),r.find(i.selectorSort).add(r.filter(i.selectorSort)).unbind("mousedown mouseup sort keyup ".split(" ").join(i.namespace+" ").replace(/\s+/g," ")).bind("mousedown mouseup sort keyup ".split(" ").join(i.namespace+" "),function(a,d){var c,l=e(a.target),u=a.type;if(!(1!==(a.which||a.button)&&!/sort|keyup/.test(u)||"keyup"===u&&13!==a.which||"mouseup"===u&&d!==!0&&(new Date).getTime()-n>250)){if("mousedown"===u)return void(n=(new Date).getTime());if(c=e.fn.closest?l.closest("td,th"):l.parents("td,th").filter(":first"),/(input|select|button|textarea)/i.test(a.target.tagName)||l.hasClass(i.cssNoSort)||l.parents("."+i.cssNoSort).length>0||l.parents("button").length>0)return!i.cancelSelection;i.delayInit&&s(i.cache)&&o(t),c=e.fn.closest?e(this).closest("th, td")[0]:/TH|TD/.test(this.tagName)?this:e(this).parents("th, td")[0],c=i.$headers[r.index(c)],c.sortDisabled||m(t,c,a)}}),i.cancelSelection&&r.attr("unselectable","on").bind("selectstart",!1).css({"user-select":"none",MozUserSelect:"none"})},v.restoreHeaders=function(t){var r,s=e(t)[0].config;s.$table.find(s.selectorHeaders).each(function(t){r=e(this),r.find("."+v.css.headerIn).length&&r.html(s.headerContent[t])})},v.destroy=function(t,r,s){if(t=e(t)[0],t.hasInitialized){v.removeWidget(t,!0,!1);var a,n=e(t),o=t.config,i=n.find("thead:first"),d=i.find("tr."+v.css.headerRow).removeClass(v.css.headerRow+" "+o.cssHeaderRow),c=n.find("tfoot:first > tr").children("th, td");r===!1&&e.inArray("uitheme",o.widgets)>=0&&(n.trigger("applyWidgetId",["uitheme"]),n.trigger("applyWidgetId",["zebra"])),i.find("tr").not(d).remove(),a="sortReset update updateAll updateRows updateCell addRows updateComplete sorton appendCache updateCache "+"applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd resetToLoadState ".split(" ").join(o.namespace+" "),n.removeData("tablesorter").unbind(a.replace(/\s+/g," ")),o.$headers.add(c).removeClass([v.css.header,o.cssHeader,o.cssAsc,o.cssDesc,v.css.sortAsc,v.css.sortDesc,v.css.sortNone].join(" ")).removeAttr("data-column").removeAttr("aria-label").attr("aria-disabled","true"),d.find(o.selectorSort).unbind("mousedown mouseup keypress ".split(" ").join(o.namespace+" ").replace(/\s+/g," ")),v.restoreHeaders(t),n.toggleClass(v.css.table+" "+o.tableClass+" tablesorter-"+o.theme,r===!1),t.hasInitialized=!1,delete t.config.cache,"function"==typeof s&&s(t)}},v.regex={chunk:/(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi,chunks:/(^\\0|\\0$)/,hex:/^0x[0-9a-f]+$/i},v.sortNatural=function(e,t){if(e===t)return 0;var r,s,a,n,o,i,d,c,l=v.regex;if(l.hex.test(t)){if(s=parseInt(e.match(l.hex),16),n=parseInt(t.match(l.hex),16),n>s)return-1;if(s>n)return 1}for(r=e.replace(l.chunk,"\\0$1\\0").replace(l.chunks,"").split("\\0"),a=t.replace(l.chunk,"\\0$1\\0").replace(l.chunks,"").split("\\0"),c=Math.max(r.length,a.length),d=0;c>d;d++){if(o=isNaN(r[d])?r[d]||0:parseFloat(r[d])||0,i=isNaN(a[d])?a[d]||0:parseFloat(a[d])||0,isNaN(o)!==isNaN(i))return isNaN(o)?1:-1;if(typeof o!=typeof i&&(o+="",i+=""),i>o)return-1;if(o>i)return 1}return 0},v.sortNaturalAsc=function(e,t,r,s,a){if(e===t)return 0;var n=a.string[a.empties[r]||a.emptyTo];return""===e&&0!==n?"boolean"==typeof n?n?-1:1:-n||-1:""===t&&0!==n?"boolean"==typeof n?n?1:-1:n||1:v.sortNatural(e,t)},v.sortNaturalDesc=function(e,t,r,s,a){if(e===t)return 0;var n=a.string[a.empties[r]||a.emptyTo];return""===e&&0!==n?"boolean"==typeof n?n?-1:1:n||1:""===t&&0!==n?"boolean"==typeof n?n?1:-1:-n||-1:v.sortNatural(t,e)},v.sortText=function(e,t){return e>t?1:t>e?-1:0},v.getTextValue=function(e,t,r){if(r){var s,a=e?e.length:0,n=r+t;for(s=0;a>s;s++)n+=e.charCodeAt(s);return t*n}return 0},v.sortNumericAsc=function(e,t,r,s,a,n){if(e===t)return 0;var o=n.config,i=o.string[o.empties[a]||o.emptyTo];return""===e&&0!==i?"boolean"==typeof i?i?-1:1:-i||-1:""===t&&0!==i?"boolean"==typeof i?i?1:-1:i||1:(isNaN(e)&&(e=v.getTextValue(e,r,s)),isNaN(t)&&(t=v.getTextValue(t,r,s)),e-t)},v.sortNumericDesc=function(e,t,r,s,a,n){if(e===t)return 0;var o=n.config,i=o.string[o.empties[a]||o.emptyTo];return""===e&&0!==i?"boolean"==typeof i?i?-1:1:i||1:""===t&&0!==i?"boolean"==typeof i?i?1:-1:-i||-1:(isNaN(e)&&(e=v.getTextValue(e,r,s)),isNaN(t)&&(t=v.getTextValue(t,r,s)),t-e)},v.sortNumeric=function(e,t){return e-t},v.characterEquivalents={a:"áàâãäąå",A:"ÁÀÂÃÄĄÅ",c:"çćč",C:"ÇĆČ",e:"éèêëěę",E:"ÉÈÊËĚĘ",i:"íìİîïı",I:"ÍÌİÎÏ",o:"óòôõö",O:"ÓÒÔÕÖ",ss:"ß",SS:"ẞ",u:"úùûüů",U:"ÚÙÛÜŮ"},v.replaceAccents=function(e){var t,r="[",s=v.characterEquivalents;if(!v.characterRegex){v.characterRegexArray={};for(t in s)"string"==typeof t&&(r+=s[t],v.characterRegexArray[t]=new RegExp("["+s[t]+"]","g"));v.characterRegex=new RegExp(r+"]")}if(v.characterRegex.test(e))for(t in s)"string"==typeof t&&(e=e.replace(v.characterRegexArray[t],t));return e},v.isValueInArray=function(e,t){var r,s=t.length;for(r=0;s>r;r++)if(t[r][0]===e)return r;return-1},v.addParser=function(e){var t,r=v.parsers.length,s=!0;for(t=0;r>t;t++)v.parsers[t].id.toLowerCase()===e.id.toLowerCase()&&(s=!1);s&&v.parsers.push(e)},v.getParserById=function(e){if("false"==e)return!1;var t,r=v.parsers.length;for(t=0;r>t;t++)if(v.parsers[t].id.toLowerCase()===e.toString().toLowerCase())return v.parsers[t];return!1},v.addWidget=function(e){v.widgets.push(e)},v.hasWidget=function(t,r){return t=e(t),t.length&&t[0].config&&t[0].config.widgetInit[r]||!1},v.getWidgetById=function(e){var t,r,s=v.widgets.length;for(t=0;s>t;t++)if(r=v.widgets[t],r&&r.hasOwnProperty("id")&&r.id.toLowerCase()===e.toLowerCase())return r},v.applyWidget=function(t,s,a){t=e(t)[0];var n,o,i,d,c=t.config,l=c.widgetOptions,u=" "+c.table.className+" ",p=[];s!==!1&&t.hasInitialized&&(t.isApplyingWidgets||t.isUpdating)||(c.debug&&(n=new Date),d=new RegExp("\\s"+c.widgetClass.replace(/\{name\}/i,"([\\w-]+)")+"\\s","g"),u.match(d)&&(i=u.match(d),i&&e.each(i,function(e,t){c.widgets.push(t.replace(d,"$1"))})),c.widgets.length&&(t.isApplyingWidgets=!0,c.widgets=e.grep(c.widgets,function(t,r){return e.inArray(t,c.widgets)===r}),e.each(c.widgets||[],function(e,t){d=v.getWidgetById(t),d&&d.id&&(d.priority||(d.priority=10),p[e]=d)}),p.sort(function(e,t){return e.priority<t.priority?-1:e.priority===t.priority?0:1}),e.each(p,function(r,a){a&&((s||!c.widgetInit[a.id])&&(c.widgetInit[a.id]=!0,a.hasOwnProperty("options")&&(l=t.config.widgetOptions=e.extend(!0,{},a.options,l)),a.hasOwnProperty("init")&&(c.debug&&(o=new Date),a.init(t,a,c,l),c.debug&&v.benchmark("Initializing "+a.id+" widget",o))),!s&&a.hasOwnProperty("format")&&(c.debug&&(o=new Date),a.format(t,c,l,!1),c.debug&&v.benchmark((s?"Initializing ":"Applying ")+a.id+" widget",o)))}),s||"function"!=typeof a||a(t)),setTimeout(function(){t.isApplyingWidgets=!1,e.data(t,"lastWidgetApplication",new Date)},0),c.debug&&(i=c.widgets.length,r("Completed "+(s===!0?"initializing ":"applying ")+i+" widget"+(1!==i?"s":""),n)))},v.removeWidget=function(r,s,a){r=e(r)[0],s===!0?(s=[],e.each(v.widgets,function(e,t){t&&t.id&&s.push(t.id)})):s=(e.isArray(s)?s.join(","):s||"").toLowerCase().split(/[\s,]+/);var n,o,i,d=r.config,c=s.length;for(n=0;c>n;n++)o=v.getWidgetById(s[n]),i=e.inArray(s[n],d.widgets),o&&"remove"in o&&(d.debug&&i>=0&&t('Removing "'+s[n]+'" widget'),o.remove(r,d,d.widgetOptions,a),d.widgetInit[s[n]]=!1),i>=0&&a!==!0&&d.widgets.splice(i,1)},v.refreshWidgets=function(t,r,s){t=e(t)[0];var a=t.config,n=a.widgets,o=[],i=function(t){e(t).trigger("refreshComplete")};e.each(v.widgets,function(t,s){s&&s.id&&(r||e.inArray(s.id,n)<0)&&o.push(s.id)}),v.removeWidget(t,o.join(","),!0),s!==!0?(v.applyWidget(t,r||!1,i),r&&v.applyWidget(t,!1,i)):i(t)},v.getData=function(t,r,s){var a,n,o="",i=e(t);return i.length?(a=e.metadata?i.metadata():!1,n=" "+(i.attr("class")||""),"undefined"!=typeof i.data(s)||"undefined"!=typeof i.data(s.toLowerCase())?o+=i.data(s)||i.data(s.toLowerCase()):a&&"undefined"!=typeof a[s]?o+=a[s]:r&&"undefined"!=typeof r[s]?o+=r[s]:" "!==n&&n.match(" "+s+"-")&&(o=n.match(new RegExp("\\s"+s+"-([\\w-]+)"))[1]||""),e.trim(o)):""},v.formatFloat=function(t,r){if("string"!=typeof t||""===t)return t;var s,a=r&&r.config?r.config.usNumberFormat!==!1:"undefined"!=typeof r?r:!0;return t=a?t.replace(/,/g,""):t.replace(/[\s|\.]/g,"").replace(/,/g,"."),/^\s*\([.\d]+\)/.test(t)&&(t=t.replace(/^\s*\(([.\d]+)\)/,"-$1")),s=parseFloat(t),isNaN(s)?e.trim(t):s},v.isDigit=function(e){return isNaN(e)?/^[\-+(]?\d+[)]?$/.test(e.toString().replace(/[,.'"\s]/g,"")):!0}}});var t=e.tablesorter;return e.fn.extend({tablesorter:t.construct}),t.addParser({id:"no-parser",is:function(){return!1},format:function(){return""},type:"text"}),t.addParser({id:"text",is:function(){return!0},format:function(r,s){var a=s.config;return r&&(r=e.trim(a.ignoreCase?r.toLocaleLowerCase():r),r=a.sortLocaleCompare?t.replaceAccents(r):r),r},type:"text"}),t.addParser({id:"digit",is:function(e){return t.isDigit(e)},format:function(r,s){var a=t.formatFloat((r||"").replace(/[^\w,. \-()]/g,""),s);return r&&"number"==typeof a?a:r?e.trim(r&&s.config.ignoreCase?r.toLocaleLowerCase():r):r},type:"numeric"}),t.addParser({id:"currency",is:function(e){return/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/.test((e||"").replace(/[+\-,. ]/g,""))},format:function(r,s){var a=t.formatFloat((r||"").replace(/[^\w,. \-()]/g,""),s);return r&&"number"==typeof a?a:r?e.trim(r&&s.config.ignoreCase?r.toLocaleLowerCase():r):r},type:"numeric"}),t.addParser({id:"url",is:function(e){return/^(https?|ftp|file):\/\//.test(e)},format:function(t){return t?e.trim(t.replace(/(https?|ftp|file):\/\//,"")):t},parsed:!0,type:"text"}),t.addParser({id:"isoDate",is:function(e){return/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/.test(e)},format:function(e){var t=e?new Date(e.replace(/-/g,"/")):e;return t instanceof Date&&isFinite(t)?t.getTime():e},type:"numeric"}),t.addParser({id:"percent",is:function(e){return/(\d\s*?%|%\s*?\d)/.test(e)&&e.length<15},format:function(e,r){return e?t.formatFloat(e.replace(/%/g,""),r):e},type:"numeric"}),t.addParser({id:"image",is:function(e,t,r,s){return s.find("img").length>0},format:function(t,r,s){return e(s).find("img").attr(r.config.imgAttr||"alt")||t},parsed:!0,type:"text"}),t.addParser({id:"usLongDate",is:function(e){return/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i.test(e)||/^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i.test(e)},format:function(e){var t=e?new Date(e.replace(/(\S)([AP]M)$/i,"$1 $2")):e;return t instanceof Date&&isFinite(t)?t.getTime():e},type:"numeric"}),t.addParser({id:"shortDate",is:function(e){return/(^\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4})|(^\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2})/.test((e||"").replace(/\s+/g," ").replace(/[\-.,]/g,"/"))},format:function(e,r,s,a){if(e){var n,o,i=r.config,d=i.$headers.filter('[data-column="'+a+'"]:last'),c=d.length&&d[0].dateFormat||t.getData(d,t.getColumnData(r,i.headers,a),"dateFormat")||i.dateFormat;return o=e.replace(/\s+/g," ").replace(/[\-.,]/g,"/"),"mmddyyyy"===c?o=o.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$1/$2"):"ddmmyyyy"===c?o=o.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$2/$1"):"yyyymmdd"===c&&(o=o.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/,"$1/$2/$3")),n=new Date(o),n instanceof Date&&isFinite(n)?n.getTime():e}return e},type:"numeric"}),t.addParser({id:"time",is:function(e){return/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i.test(e)},format:function(e){var t=e?new Date("2000/01/01 "+e.replace(/(\S)([AP]M)$/i,"$1 $2")):e;return t instanceof Date&&isFinite(t)?t.getTime():e},type:"numeric"}),t.addParser({id:"metadata",is:function(){return!1
+},format:function(t,r,s){var a=r.config,n=a.parserMetadataName?a.parserMetadataName:"sortValue";return e(s).metadata()[n]},type:"numeric"}),t.addWidget({id:"zebra",priority:90,format:function(t,r,s){var a,n,o,i,d,c,l,u=new RegExp(r.cssChildRow,"i"),p=r.$tbodies;for(r.debug&&(c=new Date),l=0;l<p.length;l++)i=0,a=p.eq(l),n=a.children("tr:visible").not(r.selectorRemove),n.each(function(){o=e(this),u.test(this.className)||i++,d=i%2===0,o.removeClass(s.zebra[d?1:0]).addClass(s.zebra[d?0:1])})},remove:function(e,r,s,a){if(!a){var n,o,i=r.$tbodies,d=(s.zebra||["even","odd"]).join(" ");for(n=0;n<i.length;n++)o=t.processTbody(e,i.eq(n),!0),o.children().removeClass(d),t.processTbody(e,o,!1)}}}),t});

From 2d485513cd6786b361c01361f19ae59ed7742f56 Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Fri, 3 Sep 2021 10:18:59 +0800
Subject: [PATCH 06/15] * use tablesorter-noSort  to ignore sort on click
 checkbox.

---
 module/execution/view/linkstory.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/view/linkstory.html.php b/module/execution/view/linkstory.html.php
index 18f5ccfd2e..67c336039f 100644
--- a/module/execution/view/linkstory.html.php
+++ b/module/execution/view/linkstory.html.php
@@ -33,7 +33,7 @@
         <tr>
           <th class='c-id'>
             <?php if($allStories):?>
-            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+            <div class="checkbox-primary check-all tablesorter-noSort" title="<?php echo $lang->selectAll?>">
               <label></label>
             </div>
             <?php endif;?>

From fbf6b37c236f387adab2751fbfa729b29a46eb3e Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 3 Sep 2021 10:48:17 +0800
Subject: [PATCH 07/15] * Finish task#42128.

---
 module/execution/lang/de.php                   | 2 +-
 module/execution/lang/en.php                   | 2 +-
 module/execution/lang/fr.php                   | 2 +-
 module/execution/lang/vi.php                   | 2 +-
 module/execution/lang/zh-cn.php                | 2 +-
 module/execution/lang/zh-tw.php                | 2 +-
 module/execution/view/executionkanban.html.php | 3 +++
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index f8298ba8bf..f975167302 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -430,4 +430,4 @@ $lang->execution->statusColorList['doing']     = '#0BD986';
 $lang->execution->statusColorList['suspended'] = '#fdc137';
 $lang->execution->statusColorList['closed']    = '#838A9D';
 
-$lang->execution->boardColorList = '#F1F3F5,#ECF4FD,#F6EDF7,#FFEDED,#FFF7EB,#FFF7E1';
+$lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 0993e0dfd9..828223956d 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -438,4 +438,4 @@ $lang->execution->statusColorList['doing']     = '#0BD986';
 $lang->execution->statusColorList['suspended'] = '#fdc137';
 $lang->execution->statusColorList['closed']    = '#838A9D';
 
-$lang->execution->boardColorList = '#F1F3F5,#ECF4FD,#F6EDF7,#FFEDED,#FFF7EB,#FFF7E1';
+$lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index 5c66827cc5..77feff7163 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -430,4 +430,4 @@ $lang->execution->statusColorList['doing']     = '#0BD986';
 $lang->execution->statusColorList['suspended'] = '#fdc137';
 $lang->execution->statusColorList['closed']    = '#838A9D';
 
-$lang->execution->boardColorList = '#F1F3F5,#ECF4FD,#F6EDF7,#FFEDED,#FFF7EB,#FFF7E1';
+$lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php
index 1adf0855ca..3353008328 100644
--- a/module/execution/lang/vi.php
+++ b/module/execution/lang/vi.php
@@ -431,4 +431,4 @@ $lang->execution->statusColorList['doing']     = '#0BD986';
 $lang->execution->statusColorList['suspended'] = '#fdc137';
 $lang->execution->statusColorList['closed']    = '#838A9D';
 
-$lang->execution->boardColorList = '#F1F3F5,#ECF4FD,#F6EDF7,#FFEDED,#FFF7EB,#FFF7E1';
+$lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 38c05d356a..3900945cf2 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -439,4 +439,4 @@ $lang->execution->statusColorList['doing']     = '#0BD986';
 $lang->execution->statusColorList['suspended'] = '#fdc137';
 $lang->execution->statusColorList['closed']    = '#838A9D';
 
-$lang->execution->boardColorList = '#F1F3F5,#ECF4FD,#F6EDF7,#FFEDED,#FFF7EB,#FFF7E1';
+$lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php
index 2265891409..3e11e2de71 100644
--- a/module/execution/lang/zh-tw.php
+++ b/module/execution/lang/zh-tw.php
@@ -438,4 +438,4 @@ $lang->execution->statusColorList['doing']     = '#0BD986';
 $lang->execution->statusColorList['suspended'] = '#fdc137';
 $lang->execution->statusColorList['closed']    = '#838A9D';
 
-$lang->execution->boardColorList = '#F1F3F5,#ECF4FD,#F6EDF7,#FFEDED,#FFF7EB,#FFF7E1';
+$lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
diff --git a/module/execution/view/executionkanban.html.php b/module/execution/view/executionkanban.html.php
index 6eb5ff45d1..e416e41112 100644
--- a/module/execution/view/executionkanban.html.php
+++ b/module/execution/view/executionkanban.html.php
@@ -20,6 +20,7 @@
   <table class="table no-margin table-grouped text-center">
     <thead>
       <tr>
+        <th style='width: 5px; padding: 0px; border-right: unset !important'></th>
         <th><?php echo $lang->execution->doingProject . ' (' . $projectCount . ')';?></th>
         <?php foreach($lang->execution->kanbanColType as $status => $colName):?>
         <th><?php echo $colName . ($status != 'closed' ? ' (' . $statusCount[$status] . ')' : '');?></th>
@@ -30,6 +31,7 @@
       <?php $rowIndex = 0;?>
       <?php foreach($kanbanGroup as $projectID => $executionList):?>
       <tr>
+        <td style="background: <?php echo $lang->execution->boardColorList[$rowIndex];?>;"></td>
         <td class='board-project'>
           <div data-id='<?php echo $projectID;?>'>
             <div class='text-center'>
@@ -81,6 +83,7 @@
         </td>
       </tr>
       <?php $rowIndex++; ?>
+      <?php if($rowIndex == 9) $rowIndex = 0;?>
       <?php endforeach;?>
     </tbody>
   </table>

From 1d87bcb08b74367609f14df33e9c85dead940b88 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 3 Sep 2021 10:50:31 +0800
Subject: [PATCH 08/15] * Fix bug #14890.

---
 module/build/view/linkbug.html.php            | 2 +-
 module/build/view/linkstory.html.php          | 2 +-
 module/productplan/view/linkbug.html.php      | 2 +-
 module/productplan/view/linkstory.html.php    | 2 +-
 module/projectrelease/view/linkbug.html.php   | 2 +-
 module/projectrelease/view/linkstory.html.php | 2 +-
 module/release/view/linkbug.html.php          | 2 +-
 module/release/view/linkstory.html.php        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php
index 0e7a705d9b..b4364e65d8 100644
--- a/module/build/view/linkbug.html.php
+++ b/module/build/view/linkbug.html.php
@@ -21,7 +21,7 @@
         <tr class='text-center'>
           <th class='c-id text-left'>
             <?php if($allBugs):?>
-            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+            <div class="checkbox-primary check-all tablesorter-noSort" title="<?php echo $lang->selectAll?>">
               <label></label>
             </div>
             <?php endif;?>
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index e389586553..3ce47e1e51 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -21,7 +21,7 @@
         <tr class='text-center'>
           <th class='c-id text-left'>
             <?php if($allStories):?>
-            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+            <div class="checkbox-primary check-all tablesorter-noSort" title="<?php echo $lang->selectAll?>">
               <label></label>
             </div>
             <?php endif;?>
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index 53737d54d0..2b235ca1f4 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -21,7 +21,7 @@
         <tr class='text-center'>
           <th class='c-id text-left'>
             <?php if($allBugs):?>
-            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+            <div class="checkbox-primary check-all tablesorter-noSort" title="<?php echo $lang->selectAll?>">
               <label></label>
             </div>
             <?php endif;?>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index 22a075efd9..704c820e86 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -21,7 +21,7 @@
         <tr>
           <th class='c-id text-left'>
             <?php if($allStories):?>
-            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+            <div class="checkbox-primary check-all tablesorter-noSort" title="<?php echo $lang->selectAll?>">
               <label></label>
             </div>
             <?php endif;?>
diff --git a/module/projectrelease/view/linkbug.html.php b/module/projectrelease/view/linkbug.html.php
index 6d0f2114d3..a5b8652488 100644
--- a/module/projectrelease/view/linkbug.html.php
+++ b/module/projectrelease/view/linkbug.html.php
@@ -25,7 +25,7 @@ $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
         <tr class='text-center'>
           <th class='c-id text-left'>
             <?php if($allBugs):?>
-            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+            <div class="checkbox-primary check-all tablesorter-noSort" title="<?php echo $lang->selectAll?>">
               <label></label>
             </div>
             <?php endif;?>
diff --git a/module/projectrelease/view/linkstory.html.php b/module/projectrelease/view/linkstory.html.php
index 572f466cf1..d2028313b6 100644
--- a/module/projectrelease/view/linkstory.html.php
+++ b/module/projectrelease/view/linkstory.html.php
@@ -21,7 +21,7 @@
         <tr>
           <th class='c-id text-left'>
             <?php if($allStories):?>
-            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+            <div class="checkbox-primary check-all tablesorter-noSort" title="<?php echo $lang->selectAll?>">
               <label></label>
             </div>
             <?php endif;?>
diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php
index e4b0c9eda0..874436fbd0 100644
--- a/module/release/view/linkbug.html.php
+++ b/module/release/view/linkbug.html.php
@@ -25,7 +25,7 @@ $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
         <tr class='text-center'>
           <th class='c-id text-left'>
             <?php if($allBugs):?>
-            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+            <div class="checkbox-primary check-all tablesorter-noSort" title="<?php echo $lang->selectAll?>">
               <label></label>
             </div>
             <?php endif;?>
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index addc8d1022..f8e8ef906d 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -21,7 +21,7 @@
         <tr>
           <th class='c-id text-left'>
             <?php if($allStories):?>
-            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+            <div class="checkbox-primary check-all tablesorter-noSort" title="<?php echo $lang->selectAll?>">
               <label></label>
             </div>
             <?php endif;?>

From dfbe7ad645ac654b13f02174e9f64caf285af13f Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Fri, 3 Sep 2021 10:56:04 +0800
Subject: [PATCH 09/15] * Fix bug#14557

---
 module/testtask/lang/de.php    | 21 +++++++++++----------
 module/testtask/lang/en.php    | 21 +++++++++++----------
 module/testtask/lang/fr.php    | 21 +++++++++++----------
 module/testtask/lang/vi.php    | 21 +++++++++++----------
 module/testtask/lang/zh-cn.php | 21 +++++++++++----------
 module/testtask/model.php      |  5 +++++
 6 files changed, 60 insertions(+), 50 deletions(-)

diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index 8eaf57b0d4..04b650001b 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -124,16 +124,17 @@ $lang->testtask->fail          = 'Fehlgeschlagen';
 $lang->testtask->showResult    = 'Ausführungen <span class="text-info">%s</span>';
 $lang->testtask->showFail      = 'Fehlgeschlagen <span class="text-danger">%s</span>';
 
-$lang->testtask->confirmDelete     = 'Möchten Sie dieses Build löschen?';
-$lang->testtask->confirmUnlinkCase = 'Möchten Sie die Verknüpfung zu dem Fall aufheben?';
-$lang->testtask->noticeNoOther     = 'Es existieren keine weiteren Testaufgaben für dieses Produkt';
-$lang->testtask->noTesttask        = 'Keine Testaufgaben. ';
-$lang->testtask->checkLinked       = "Please check whether the product that the test request is linked to has been linked to a {$lang->executionCommon}.";
-$lang->testtask->noImportData      = 'The imported XML does not parse the data.';
-$lang->testtask->unitXMLFormat     = 'Please select a file in JUnit XML format.';
-$lang->testtask->titleOfAuto       = "%s automated testing";
-$lang->testtask->cannotBeParsed    = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
-$lang->testtask->finishedDateError = 'Actual Finished Date cannot be <= Begin Date %s';
+$lang->testtask->confirmDelete      = 'Möchten Sie dieses Build löschen?';
+$lang->testtask->confirmUnlinkCase  = 'Möchten Sie die Verknüpfung zu dem Fall aufheben?';
+$lang->testtask->noticeNoOther      = 'Es existieren keine weiteren Testaufgaben für dieses Produkt';
+$lang->testtask->noTesttask         = 'Keine Testaufgaben. ';
+$lang->testtask->checkLinked        = "Please check whether the product that the test request is linked to has been linked to a {$lang->executionCommon}.";
+$lang->testtask->noImportData       = 'The imported XML does not parse the data.';
+$lang->testtask->unitXMLFormat      = 'Please select a file in JUnit XML format.';
+$lang->testtask->titleOfAuto        = "%s automated testing";
+$lang->testtask->cannotBeParsed     = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
+$lang->testtask->finishedDateError  = 'Actual Finished Date cannot be <= Begin Date %s';
+$lang->testtask->finishedDateError2 = 'Actual Finished Date cannot be > Today';
 
 $lang->testtask->assignedToMe  = 'Meine';
 $lang->testtask->allCases      = 'Alle Fälle';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 35c39caae2..986c3d97ed 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -127,16 +127,17 @@ $lang->testtask->fail          = 'Failed';
 $lang->testtask->showResult    = 'Run <span class="text-info">%s</span> times';
 $lang->testtask->showFail      = 'Failed <span class="text-danger">%s</span> times';
 
-$lang->testtask->confirmDelete     = 'Do you want to delete this build?';
-$lang->testtask->confirmUnlinkCase = 'Do you want to unlink this case?';
-$lang->testtask->noticeNoOther     = 'No test builds for this product.';
-$lang->testtask->noTesttask        = 'No requests. ';
-$lang->testtask->checkLinked       = "Please check whether the product that the test request is linked to has been linked to a {$lang->executionCommon}.";
-$lang->testtask->noImportData      = 'The imported XML does not parse the data.';
-$lang->testtask->unitXMLFormat     = 'Please select a file in JUnit XML format.';
-$lang->testtask->titleOfAuto       = "%s automated testing";
-$lang->testtask->cannotBeParsed    = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
-$lang->testtask->finishedDateError = 'Actual Finished Date cannot be <= Begin Date %s';
+$lang->testtask->confirmDelete      = 'Do you want to delete this build?';
+$lang->testtask->confirmUnlinkCase  = 'Do you want to unlink this case?';
+$lang->testtask->noticeNoOther      = 'No test builds for this product.';
+$lang->testtask->noTesttask         = 'No requests. ';
+$lang->testtask->checkLinked        = "Please check whether the product that the test request is linked to has been linked to a {$lang->executionCommon}.";
+$lang->testtask->noImportData       = 'The imported XML does not parse the data.';
+$lang->testtask->unitXMLFormat      = 'Please select a file in JUnit XML format.';
+$lang->testtask->titleOfAuto        = "%s automated testing";
+$lang->testtask->cannotBeParsed     = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
+$lang->testtask->finishedDateError  = 'Actual Finished Date cannot be <= Begin Date %s';
+$lang->testtask->finishedDateError2 = 'Actual Finished Date cannot be > Today';
 
 $lang->testtask->assignedToMe  = 'AssignedToMe';
 $lang->testtask->allCases      = 'All Cases';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 8abb1a5ba7..06ed17d1a4 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -124,16 +124,17 @@ $lang->testtask->fail          = 'Echec';
 $lang->testtask->showResult    = 'Jouée <span class="text-info">%s</span> fois';
 $lang->testtask->showFail      = 'Echouée <span class="text-danger">%s</span> fois';
 
-$lang->testtask->confirmDelete     = 'Voulez-vous supprimer ce build ?';
-$lang->testtask->confirmUnlinkCase = 'Voulez-vous détacher ce CasTest ?';
-$lang->testtask->noticeNoOther     = "Il n'y a pas de Campagnes de Recette pour ce product.";
-$lang->testtask->noTesttask        = 'Pas de campagne. ';
-$lang->testtask->checkLinked       = "Vérifiez si le product auquel la campagne de recette est associée est bien lié à un projet.";
-$lang->testtask->noImportData      = "Le XML importé ne parse pas les données.";
-$lang->testtask->unitXMLFormat     = 'Veuillez sélectionner un fichier au format XML JUnit.';
-$lang->testtask->titleOfAuto       = "%s tests automatisés";
-$lang->testtask->cannotBeParsed    = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
-$lang->testtask->finishedDateError = 'Actual Finished Date cannot be <= Begin Date %s';
+$lang->testtask->confirmDelete      = 'Voulez-vous supprimer ce build ?';
+$lang->testtask->confirmUnlinkCase  = 'Voulez-vous détacher ce CasTest ?';
+$lang->testtask->noticeNoOther      = "Il n'y a pas de Campagnes de Recette pour ce product.";
+$lang->testtask->noTesttask         = 'Pas de campagne. ';
+$lang->testtask->checkLinked        = "Vérifiez si le product auquel la campagne de recette est associée est bien lié à un projet.";
+$lang->testtask->noImportData       = "Le XML importé ne parse pas les données.";
+$lang->testtask->unitXMLFormat      = 'Veuillez sélectionner un fichier au format XML JUnit.';
+$lang->testtask->titleOfAuto        = "%s tests automatisés";
+$lang->testtask->cannotBeParsed     = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
+$lang->testtask->finishedDateError  = 'Actual Finished Date cannot be <= Begin Date %s';
+$lang->testtask->finishedDateError2 = 'Actual Finished Date cannot be > Today';
 
 $lang->testtask->assignedToMe  = 'Affecté à Moi';
 $lang->testtask->allCases      = 'Tous les CasTests';
diff --git a/module/testtask/lang/vi.php b/module/testtask/lang/vi.php
index d9fb36c564..2c5d58ab6c 100644
--- a/module/testtask/lang/vi.php
+++ b/module/testtask/lang/vi.php
@@ -124,16 +124,17 @@ $lang->testtask->fail          = 'Thất bại';
 $lang->testtask->showResult    = 'Chạy <span class="text-info">%s</span> lần';
 $lang->testtask->showFail      = 'Thất bại <span class="text-danger">%s</span> lần';
 
-$lang->testtask->confirmDelete     = 'Bạn có muốn xóa bản dựng này?';
-$lang->testtask->confirmUnlinkCase = 'Bạn có muốn hủy liên kết tình huống này?';
-$lang->testtask->noticeNoOther     = 'Không có test builds cho sản phẩm này.';
-$lang->testtask->noTesttask        = 'Không có yêu cầu. ';
-$lang->testtask->checkLinked       = "Vui lòng kiểm tra sản phẩm đó mà yêu cầu test này là liên kết tới một dự án.";
-$lang->testtask->noImportData      = 'The imported XML does not parse the data.';
-$lang->testtask->unitXMLFormat     = 'Please select a file in JUnit XML format.';
-$lang->testtask->titleOfAuto       = "%s automated testing";
-$lang->testtask->cannotBeParsed    = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
-$lang->testtask->finishedDateError = 'Actual Finished Date cannot be <= Begin Date %s';
+$lang->testtask->confirmDelete      = 'Bạn có muốn xóa bản dựng này?';
+$lang->testtask->confirmUnlinkCase  = 'Bạn có muốn hủy liên kết tình huống này?';
+$lang->testtask->noticeNoOther      = 'Không có test builds cho sản phẩm này.';
+$lang->testtask->noTesttask         = 'Không có yêu cầu. ';
+$lang->testtask->checkLinked        = "Vui lòng kiểm tra sản phẩm đó mà yêu cầu test này là liên kết tới một dự án.";
+$lang->testtask->noImportData       = 'The imported XML does not parse the data.';
+$lang->testtask->unitXMLFormat      = 'Please select a file in JUnit XML format.';
+$lang->testtask->titleOfAuto        = "%s automated testing";
+$lang->testtask->cannotBeParsed     = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
+$lang->testtask->finishedDateError  = 'Actual Finished Date cannot be <= Begin Date %s';
+$lang->testtask->finishedDateError2 = 'Actual Finished Date cannot be > Today';
 
 $lang->testtask->assignedToMe = 'Giao cho bạn';
 $lang->testtask->allCases     = 'Tất cả tình huống';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index f1bbbf12b3..6311af393b 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -127,16 +127,17 @@ $lang->testtask->fail          = '失败';
 $lang->testtask->showResult    = '共执行<span class="text-info">%s</span>次';
 $lang->testtask->showFail      = '失败<span class="text-danger">%s</span>次';
 
-$lang->testtask->confirmDelete     = '您确认要删除该测试单吗？';
-$lang->testtask->confirmUnlinkCase = '您确认要移除该用例吗？';
-$lang->testtask->noticeNoOther     = '该产品还没有其他测试单';
-$lang->testtask->noTesttask        = '暂时没有测试单。';
-$lang->testtask->checkLinked       = "请检查测试单的产品是否与{$lang->executionCommon}相关联";
-$lang->testtask->noImportData      = '导入的XML没有解析出数据。';
-$lang->testtask->unitXMLFormat     = '请选择Junit XML 格式的文件。';
-$lang->testtask->titleOfAuto       = "%s 自动化测试";
-$lang->testtask->cannotBeParsed    = '导入的XML文件内容格式错误，无法解析。';
-$lang->testtask->finishedDateError = '实际完成日期不能小于开始日期%s';
+$lang->testtask->confirmDelete      = '您确认要删除该测试单吗？';
+$lang->testtask->confirmUnlinkCase  = '您确认要移除该用例吗？';
+$lang->testtask->noticeNoOther      = '该产品还没有其他测试单';
+$lang->testtask->noTesttask         = '暂时没有测试单。';
+$lang->testtask->checkLinked        = "请检查测试单的产品是否与{$lang->executionCommon}相关联";
+$lang->testtask->noImportData       = '导入的XML没有解析出数据。';
+$lang->testtask->unitXMLFormat      = '请选择Junit XML 格式的文件。';
+$lang->testtask->titleOfAuto        = "%s 自动化测试";
+$lang->testtask->cannotBeParsed     = '导入的XML文件内容格式错误，无法解析。';
+$lang->testtask->finishedDateError  = '实际完成日期不能小于开始日期%s';
+$lang->testtask->finishedDateError2 = '实际完成日期不能大于今天';
 
 $lang->testtask->assignedToMe  = '指派给我';
 $lang->testtask->allCases      = '所有用例';
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 6bb15e59b9..6cffe05004 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -806,6 +806,11 @@ class testtaskModel extends model
             dao::$errors[] = sprintf($this->lang->testtask->finishedDateError, $oldTesttask->begin);
             return false;
         }
+        if($testtask->realFinishedDate > date("Y-m-d 00:00:00", strtotime("+1 day")))
+        {
+            dao::$errors[] = $this->lang->testtask->finishedDateError2;
+            return false;
+        }
 
         $testtask = $this->loadModel('file')->processImgURL($testtask, $this->config->testtask->editor->close['id'], $this->post->uid);
         $this->dao->update(TABLE_TESTTASK)->data($testtask)

From 4879d7e6b78ef41398cc42ba3e0bb2ff306af87d Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 3 Sep 2021 11:15:22 +0800
Subject: [PATCH 10/15] * Fix bug #14889.

---
 module/block/view/projectstatisticblock.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
index fc32d4098f..96203b1676 100644
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -62,7 +62,7 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
 
 .block-statistic .data {width: 40%; text-align: left; padding: 10px 0px; font-size: 14px; font-weight: 700;}
 .block-statistic .dataTitle {width: 60%; text-align: right; padding: 10px 0px; font-size: 14px;}
-.block-statistic .executionName {padding: 2px 10px; font-size: 14px; text-overflow: ellipsis; overflow: hidden;}
+.block-statistic .executionName {padding: 2px 10px; font-size: 14px; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;}
 .block-statistic .lastIteration {padding-top: 6px;}
 .block-statistic .progress-text-left {margin-right: 90px}
 .block-statistic .progress-text-left .progress-text {padding-top: 2px; font-size: 14px; padding-right:5px; left: -45px;}
@@ -186,7 +186,7 @@ $(function()
           <div class="table-row project-info">
             <div class="col-2 text-right"><h4><?php echo $lang->block->last;?></h4></div>
             <div class="table-row lastIteration">
-              <div class='col-5 text-center executionName'><?php echo html::a($this->createLink('execution', 'task', "executionID={$project->executions[0]->id}"), $project->executions[0]->name);?></div>
+              <div class='col-5 text-center executionName'><?php echo html::a($this->createLink('execution', 'task', "executionID={$project->executions[0]->id}"), $project->executions[0]->name, '', "title='{$project->executions[0]->name}'");?></div>
               <div class='col-7'>
                 <div class='progress progress-text-left'>
                   <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $project->executions[0]->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->executions[0]->hours->progress;?>%">

From a916b523e465f953716bea1dae57da28887688b7 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 3 Sep 2021 11:18:53 +0800
Subject: [PATCH 11/15] * Finish task#42117.

---
 module/common/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/common/model.php b/module/common/model.php
index daed8c99b0..71c6a6d1ad 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1364,7 +1364,7 @@ EOD;
 
         if(empty($executionPairs)) return;
 
-        $html  = "<li class='divider'></li><li class='dropdown dropdown-hover'><a href='javascript:;' data-toggle='dropdown'>{$lang->more}</a>";
+        $html  = "<li class='divider'></li><li class='dropdown dropdown-hover'><a href='javascript:;' data-toggle='dropdown'>{$lang->more}<span class='caret'></span></a>";
         $html .= "<ul class='dropdown-menu'>";
 
         $showCount = 0;

From fd1007b5e5f51abb5d89186553aed6be2551b36e Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Fri, 3 Sep 2021 13:10:20 +0800
Subject: [PATCH 12/15] * Fix bug#14145

---
 module/project/css/browse.css | 1 +
 module/project/model.php      | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/module/project/css/browse.css b/module/project/css/browse.css
index da23a432c8..2ab443d2bd 100644
--- a/module/project/css/browse.css
+++ b/module/project/css/browse.css
@@ -4,6 +4,7 @@
 
 th.c-budget {text-align: right;}
 td.c-actions {overflow: visible;}
+td.c-PM{white-space: nowrap;overflow: hidden;}
 .c-actions .btn {overflow: visible;}
 #programBox {float: left; margin-right: 10px; width: 170px !important;}
 #switchButton {background: #fff !important;}
diff --git a/module/project/model.php b/module/project/model.php
index 27ebda9435..d8cec09a5d 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1469,10 +1469,11 @@ class projectModel extends model
                     echo '</div>';
                     break;
                 case 'PM':
-                    $user   = $this->loadModel('user')->getByID($project->PM, 'account');
-                    $userID = !empty($user) ? $user->id : '';
-                    $PMLink = helper::createLink('user', 'profile', "userID=$userID", '', true);
-                    echo empty($project->PM) ? '' : html::a($PMLink, zget($users, $project->PM), '', "data-toggle='modal' data-type='iframe' data-width='600'");
+                    $user     = $this->loadModel('user')->getByID($project->PM, 'account');
+                    $userID   = !empty($user) ? $user->id : '';
+                    $PMLink   = helper::createLink('user', 'profile', "userID=$userID", '', true);
+                    $userName = zget($users, $project->PM);
+                    echo empty($project->PM) ? '' : html::a($PMLink, $userName, '', "title='{$userName}' data-toggle='modal' data-type='iframe' data-width='600'");
                     break;
                 case 'begin':
                     echo $project->begin;

From 297be7901c10b8467db38f302f7db2e215336da0 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 3 Sep 2021 13:10:38 +0800
Subject: [PATCH 13/15] * Fix bug #14918.

---
 module/block/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/block/control.php b/module/block/control.php
index 1e252476f6..a5bb233453 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1690,7 +1690,7 @@ class block extends control
         $params          = $this->get->param;
         $params          = json_decode(base64_decode($params));
         $count           = array();
-        $objectList      = array('todo' => 'todos', 'task' => 'tasks', 'bug' => 'bus', 'story' => 'stories');
+        $objectList      = array('todo' => 'todos', 'task' => 'tasks', 'bug' => 'bugs', 'story' => 'stories');
         $objectCountList = array('todo' => 'todoCount', 'task' => 'taskCount', 'bug' => 'bugCount', 'story' => 'storyCount');
         if(isset($this->config->maxVersion))
         {

From 179216b0c35e9a2eb4f21bf66eda7a3174dac2f8 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 3 Sep 2021 13:15:49 +0800
Subject: [PATCH 14/15] * Add title to the project name.

---
 module/block/view/projectstatisticblock.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
index 96203b1676..2fec19c385 100644
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -123,7 +123,7 @@ $(function()
         <?php $selected = key($projects);?>
         <?php foreach($projects as $project):?>
         <li <?php if($project->id == $selected) echo "class='active' id='activeProject'";?> projectID='<?php echo $project->id;?>'>
-          <a href="###" data-target="#tab3Content<?php echo $project->id;?>" data-toggle="tab"><?php echo $project->name;?></a>
+          <a href="###" title="<?php echo $project->name?>" data-target="#tab3Content<?php echo $project->id;?>" data-toggle="tab"><?php echo $project->name;?></a>
           <?php echo html::a(helper::createLink('project', 'index', "projectID=$project->id"), "<i class='icon-arrow-right text-primary'></i>", '', "class='btn-view' title={$lang->project->index}");?>
         </li>
         <?php endforeach;?>

From 6da546e2a4491b33160a880cf78a0bc9f14e9959 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 3 Sep 2021 13:24:30 +0800
Subject: [PATCH 15/15] * Load the language item of the bug.

---
 module/block/control.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/block/control.php b/module/block/control.php
index a5bb233453..6e77f100d0 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1738,7 +1738,8 @@ class block extends control
                 $this->app->loadLang('execution');
             }
 
-            if($objectType == 'risk') $this->app->loadLang('risk');
+            if($objectType == 'bug')   $this->app->loadLang('bug');
+            if($objectType == 'risk')  $this->app->loadLang('risk');
             if($objectType == 'issue') $this->app->loadLang('issue');
 
             $count[$objectType] = count($objects);