diff --git a/module/execution/js/all.js b/module/execution/js/all.js index 09f2fd3767..221a3bdb1e 100644 --- a/module/execution/js/all.js +++ b/module/execution/js/all.js @@ -1,5 +1,17 @@ $(function() { + $("#" + status + "Tab").addClass('btn-active-text'); + $(document).on('click', '.plan-toggle', function(e) + { + var $toggle = $(this); + var id = $(this).data('id'); + var isCollapsed = $toggle.toggleClass('collapsed').hasClass('collapsed'); + $toggle.closest('[data-ride="table"]').find('tr.parent-' + id).toggle(!isCollapsed); + + e.stopPropagation(); + e.preventDefault(); + }); + $('#executionTableList').on('sort.sortable', function(e, data) { var list = ''; @@ -60,6 +72,7 @@ $(function() } }); + // Update table summary text $('#executionsForm').table( { statisticCreator: function(table) @@ -67,16 +80,25 @@ $(function() var $table = table.getTable(); var $checkedRows = $table.find(table.isDataTable ? '.datatable-row-left.checked' : 'tbody>tr.checked'); var $originTable = table.isDataTable ? table.$.find('.datatable-origin') : null; - var $rows = $table.find(table.isDataTable ? '.datatable-rows .datatable-row-left' : 'tbody>tr'); + var checkedTotal = $checkedRows.length; + var $rows = checkedTotal ? $checkedRows : $table.find(table.isDataTable ? '.datatable-rows .datatable-row-left' : 'tbody>tr'); - var taskIdList = []; + var checkedWait = 0; + var checkedDoing = 0; + var executionIDList = []; $rows.each(function() { var $row = $(this); - if($originTable) $row = $originTable.find('tbody>tr[data-id="' + $row.data('id') + '"]'); + if ($originTable) $row = $originTable.find('tbody>tr[data-id="' + $row.data('id') + '"]'); + var data = $row.data(); - taskIdList.push(data.id); + executionIDList.push(data.id); + + var status = data.status; + if(status === 'wait') checkedWait++; + if(status === 'doing') checkedDoing++; }); + return (checkedTotal ? checkedSummary : pageSummary).replace('%total%', $rows.length).replace('%wait%', checkedWait).replace('%doing%', checkedDoing); } }) diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 9c88536042..d118bed2b9 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -341,6 +341,8 @@ $lang->execution->stats = '%s Verfügbar, execution->taskSummary = "Aufgaben auf dieser Seite: %s Total, %s Wartend, %s In Arbeit;     Stunden : %s geplant., %s genutzt, %s Rest."; $lang->execution->pageSummary = "Aufgaben auf dieser Seite: %total%, %wait% Wartend, %doing% In Arbeit; Stunden: %estimate% geplant, %consumed% genutzt, %left% Rest."; $lang->execution->checkedSummary = " %total% Geprüft, %wait% Wartend, %doing% In Arbeit; Stunden: %estimate% geplant, %consumed% genutzt, %left% Rest."; +$lang->execution->pageExecSummary = "Total executions: %total%. Waiting: %wait%. Doing: %doing%."; +$lang->execution->checkedExecSummary = "Selected: %total%. Waiting: %wait%. Doing: %doing%."; $lang->execution->memberHoursAB = "%s hat %s Stunden"; $lang->execution->memberHours = '
%s Arbeitsstunden
%s
'; $lang->execution->countSummary = '
Aufgaben
%s
In Arbeit
%s
Wait
%s
'; @@ -415,7 +417,7 @@ $lang->execution->storyDragError = "The {$lang->SRCommon} is not ac $lang->execution->countTip = ' (%s member)'; $lang->execution->pleaseInput = "Enter"; $lang->execution->week = 'week'; -$lang->execution->checkedExecutions = 'Seleted %s items'; +$lang->execution->checkedExecutions = 'Seleted %s executions'; /* Statistics. */ $lang->execution->charts = new stdclass(); diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index e5cfcf3eeb..a43fa0bf45 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -341,6 +341,8 @@ $lang->execution->stats = 'Available: %s(h). Est $lang->execution->taskSummary = "Total tasks on this page:%s. Waiting: %s. Doing: %s.     Estimates: %s(h). Cost: %s(h). Left: %s(h)."; $lang->execution->pageSummary = "Total tasks: %total%. Waiting: %wait%. Doing: %doing%. Estimates: %estimate%(h). Cost: %consumed%(h). Left: %left%(h)."; $lang->execution->checkedSummary = "Selected: %total%. Waiting: %wait%. Doing: %doing%. Estimates: %estimate%(h). Cost: %consumed%(h). Left: %left%(h)."; +$lang->execution->pageExecSummary = "Total executions: %total%. Waiting: %wait%. Doing: %doing%."; +$lang->execution->checkedExecSummary = "Selected: %total%. Waiting: %wait%. Doing: %doing%."; $lang->execution->memberHoursAB = "%s has %s hours."; $lang->execution->memberHours = '
%s Available Hours
%s
'; $lang->execution->countSummary = '
Tasks
%s
Doing
%s
Waiting
%s
'; @@ -415,7 +417,7 @@ $lang->execution->storyDragError = "The {$lang->SRCommon} is not ac $lang->execution->countTip = ' (%s member)'; $lang->execution->pleaseInput = "Enter"; $lang->execution->week = 'week'; -$lang->execution->checkedExecutions = 'Seleted %s items'; +$lang->execution->checkedExecutions = 'Seleted %s executions'; /* Statistics. */ $lang->execution->charts = new stdclass(); diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 6764593377..258a2fb6fd 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -341,6 +341,8 @@ $lang->execution->stats = 'Disponible: %s(h). Es $lang->execution->taskSummary = "Total des tâches de cette page :%s. A Faire: %s. En cours: %s.     Estimé: %s(h). Coût: %s(h). Reste: %s(h)."; $lang->execution->pageSummary = "Total des tâches de cette page: %total%. A Faire: %wait%. En cours: %doing%.     Estimé: %estimate%(h). Coût: %consumed%(h). Reste: %left%(h)."; $lang->execution->checkedSummary = "Sélectionné: %total%. A Faire: %wait%. En cours: %doing%.     Estimé: %estimate%(h). Coût: %consumed%(h). Reste: %left%(h)."; +$lang->execution->pageExecSummary = "Total executions: %total%. Waiting: %wait%. Doing: %doing%."; +$lang->execution->checkedExecSummary = "Selected: %total%. Waiting: %wait%. Doing: %doing%."; $lang->execution->memberHoursAB = "%s a %s heures."; $lang->execution->memberHours = '
%s Heures Disponibles
%s
'; $lang->execution->countSummary = '
Tâches
%s
En Cours
%s
A Faire
%s
'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 5d3bd56de2..b1ad96cdde 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -341,6 +341,8 @@ $lang->execution->stats = '可用工时 %s 工 $lang->execution->taskSummary = "本页共 %s 个任务,未开始 %s,进行中 %s,总预计 %s 工时,已消耗 %s 工时,剩余 %s 工时。"; $lang->execution->pageSummary = "本页共 %total% 个任务,未开始 %wait%,进行中 %doing%,总预计 %estimate% 工时,已消耗 %consumed% 工时,剩余 %left% 工时。"; $lang->execution->checkedSummary = "选中 %total% 个任务,未开始 %wait%,进行中 %doing%,总预计 %estimate% 工时,已消耗 %consumed% 工时,剩余 %left% 工时。"; +$lang->execution->pageExecSummary = "本页共 %total% 个{$lang->execution->common},未开始 %wait%,进行中 %doing%。"; +$lang->execution->checkedExecSummary = "选中 %total% 个{$lang->execution->common},未开始 %wait%,进行中 %doing%。"; $lang->execution->memberHoursAB = "
%s有 %s 工时
"; $lang->execution->memberHours = '
%s可用工时
%s
'; $lang->execution->countSummary = '
总任务
%s
进行中
%s
未开始
%s
'; @@ -415,7 +417,7 @@ $lang->execution->storyDragError = "该{$lang->SRCommon}不是激 $lang->execution->countTip = '(%s人)'; $lang->execution->pleaseInput = "请输入"; $lang->execution->week = '周'; -$lang->execution->checkedExecutions = '已选择%s项'; +$lang->execution->checkedExecutions = "共选中%s个{$lang->execution->common}"; /* 统计。*/ $lang->execution->charts = new stdclass(); diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index 4b86eb16ac..b7ab001cdc 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -19,6 +19,8 @@ $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->data +execution->checkedExecSummary);?> +execution->pageExecSummary);?> execution->treeLevel['all']); @@ -74,7 +76,7 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN())

-
' > + '>
@@ -107,7 +109,7 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN()) - + $value) $this->execution->printCell($value, $execution, $users, $useDatatable ? 'datatable' : 'table', $isStage, $productID);?> children)):?> @@ -131,28 +133,15 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN())
execution->batchEdit, '', 'btn');?> -
+
show('right', 'pagerjs');?>
-