From 84e1f0295d51a03e75c6b6429a58e83eb7cec0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= Date: Sun, 9 Oct 2022 11:15:44 +0800 Subject: [PATCH 1/4] * Code for task #71876. --- module/execution/js/all.js | 30 ++++++++++++++++++++++++++---- module/execution/lang/de.php | 4 +++- module/execution/lang/en.php | 4 +++- module/execution/lang/fr.php | 2 ++ module/execution/lang/zh-cn.php | 4 +++- module/execution/view/all.html.php | 21 +++++---------------- 6 files changed, 42 insertions(+), 23 deletions(-) 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');?>
- From b30fc65dedf75409f091d407c0bdeacd5f1f2dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= Date: Sun, 9 Oct 2022 13:26:43 +0800 Subject: [PATCH 2/4] * Finish task #71876. --- module/execution/js/all.js | 9 +++--- module/execution/lang/de.php | 3 +- module/execution/lang/en.php | 3 +- module/execution/lang/fr.php | 3 +- module/execution/lang/zh-cn.php | 7 +++-- module/execution/model.php | 4 +-- module/execution/view/all.html.php | 4 ++- module/project/css/execution.css | 2 ++ module/project/js/execution.js | 41 +++++++++++++++++++++----- module/project/view/execution.html.php | 12 ++++---- 10 files changed, 62 insertions(+), 26 deletions(-) diff --git a/module/execution/js/all.js b/module/execution/js/all.js index 221a3bdb1e..4094a77307 100644 --- a/module/execution/js/all.js +++ b/module/execution/js/all.js @@ -6,7 +6,7 @@ $(function() 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); + $toggle.closest('#executionsForm').find('tr.parent-' + id).toggle(!isCollapsed); e.stopPropagation(); e.preventDefault(); @@ -94,10 +94,11 @@ $(function() var data = $row.data(); executionIDList.push(data.id); - var status = data.status; - if(status === 'wait') checkedWait++; - if(status === 'doing') checkedDoing++; + if(data.status === 'wait') checkedWait++; + if(data.status === 'doing') checkedDoing++; }); + + if(status != 'all') return (checkedTotal ? checkedExecutions : executionSummary).replace('%s', $rows.length); 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 d118bed2b9..67fcba50a1 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -341,6 +341,7 @@ $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->executionSummary = "Total executions: %s."; $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"; @@ -417,7 +418,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 executions'; +$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 a43fa0bf45..bcde019c16 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -341,6 +341,7 @@ $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->executionSummary = "Total executions: %s."; $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."; @@ -417,7 +418,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 executions'; +$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 258a2fb6fd..499b92a276 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -341,6 +341,7 @@ $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->executionSummary = "Total executions: %s."; $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."; @@ -417,7 +418,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 = "Pour s électionner l'élément%s"; +$lang->execution->checkedExecutions = "Pour s électionner l'élément%s."; /* Statistics. */ $lang->execution->charts = new stdclass(); diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index b1ad96cdde..e198d67ac0 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -341,8 +341,9 @@ $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->executionSummary = "本页共 %s 个{$lang->executionCommon}。"; +$lang->execution->pageExecSummary = "本页共 %total% 个{$lang->executionCommon}，未开始 %wait%，进行中 %doing%。"; +$lang->execution->checkedExecSummary = "选中 %total% 个{$lang->executionCommon}，未开始 %wait%，进行中 %doing%。"; $lang->execution->memberHoursAB = "
%s有 %s 工时
"; $lang->execution->memberHours = '
%s可用工时
%s
'; $lang->execution->countSummary = '
总任务
%s
进行中
%s
未开始
%s
'; @@ -417,7 +418,7 @@ $lang->execution->storyDragError = "该{$lang->SRCommon}不是激 $lang->execution->countTip = '（%s人）'; $lang->execution->pleaseInput = "请输入"; $lang->execution->week = '周'; -$lang->execution->checkedExecutions = "共选中%s个{$lang->execution->common}"; +$lang->execution->checkedExecutions = "共选中%s个{$lang->execution->common}。"; /* 统计。*/ $lang->execution->charts = new stdclass(); diff --git a/module/execution/model.php b/module/execution/model.php index c8eb61f0ed..7d001b7779 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -4582,12 +4582,12 @@ class executionModel extends model if(!$isChild) { $trClass = 'is-top-level table-nest-child-hide'; - $trAttrs = "data-id='$execution->id' data-order='$execution->order' data-nested='true'"; + $trAttrs = "data-id='$execution->id' data-order='$execution->order' data-nested='true' data-status={$execution->status}"; } else { $trClass = 'table-nest-hide'; - $trAttrs = "data-id={$execution->id} data-parent={$execution->parent}"; + $trAttrs = "data-id={$execution->id} data-parent={$execution->parent} data-status={$execution->status}"; $trAttrs .= " data-nest-parent='$execution->parent' data-order='$execution->order' data-nest-path=',$execution->parent,$execution->id,'"; } diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index b7ab001cdc..b072f3a78e 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -21,6 +21,8 @@ $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->data execution->checkedExecSummary);?> execution->pageExecSummary);?> +execution->executionSummary);?> +execution->checkedExecutions);?> execution->treeLevel['all']); @@ -135,7 +137,7 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN()) execution->batchEdit, '', 'btn');?> -
+
show('right', 'pagerjs');?> diff --git a/module/project/css/execution.css b/module/project/css/execution.css index 41848ea166..b28fcb4440 100644 --- a/module/project/css/execution.css +++ b/module/project/css/execution.css @@ -10,3 +10,5 @@ th.table-nest-title .check-all {position: absolute; left: 15px; top: 7px;} .c-date {text-align: center;} #executionTableList > tr:not(.has-nest-child) .table-nest-toggle {display: none;} #executionTableList > tr:not(.has-nest-child) .project-type-label {margin-left: 22px;} +.table-statistic {padding-left: 10px;} +#executionTableList .table-nest-icon {top: 6px;} diff --git a/module/project/js/execution.js b/module/project/js/execution.js index 9e037beeb9..5ebe1941b8 100644 --- a/module/project/js/execution.js +++ b/module/project/js/execution.js @@ -1,5 +1,7 @@ $(function() { + $("#" + status + "Tab").addClass('btn-active-text'); + $('input[name^="showTask"]').click(function() { var show = $(this).is(':checked') ? 1 : 0; @@ -38,14 +40,10 @@ $(function() } if(notCheckedLength > 0) $('#executionForm .checkAll').prop('checked', false); - var summary = checkedExecutions.replace('%s', checkedLength); - if(cilentLang == "en" && checkedLength < 2) summary = summary.replace('items', 'item'); - var statistic = "
" + summary + "
"; if(checkedLength > 0) { $('#executionSummary').addClass('hidden'); $('#executionsSummary').remove(); - $('.editCheckbox').after(statistic); } else { @@ -63,12 +61,8 @@ $(function() $("#executionForm .checkAll").prop('checked', true); $('#executionForm').addClass('has-row-checked'); var checkedLength = $(":checkbox[name^='executionIDList']:checked").length; - var summary = checkedExecutions.replace('%s', checkedLength); - if(cilentLang == "en" && checkedLength < 2) summary = summary.replace('items', 'item'); - var statistic = "
" + summary + "
"; $('#executionSummary').addClass('hidden'); $('#executionsSummary').remove(); - $('.editCheckbox').after(statistic); $(this).next('label').addClass('hover'); } else @@ -91,6 +85,37 @@ $(function() }); $('#executionsForm .checkAll').prop('checked', false); }, 10); + + // Update table summary text + $('#executionForm').table( + { + statisticCreator: function(table) + { + var $table = table.getTable(); + var $checkedRows = $table.find(table.isDataTable ? '.datatable-row-left.checked' : 'tbody>tr.checked'); + var $originTable = table.isDataTable ? table.$.find('.datatable-origin') : null; + var checkedTotal = $checkedRows.length; + var $rows = checkedTotal ? $checkedRows : $table.find(table.isDataTable ? '.datatable-rows .datatable-row-left' : 'tbody>tr'); + + 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') + '"]'); + + var data = $row.data(); + executionIDList.push(data.id); + + if(data.status === 'wait') checkedWait++; + if(data.status === 'doing') checkedDoing++; + }); + + if(status != 'all') return (checkedTotal ? checkedExecutions : executionSummary).replace('%s', $rows.length); + return (checkedTotal ? checkedSummary : pageSummary).replace('%total%', $rows.length).replace('%wait%', checkedWait).replace('%doing%', checkedDoing); + } + }) }) window.addEventListener('scroll', this.handleScroll) diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php index f63268a42f..a3c52ed861 100644 --- a/module/project/view/execution.html.php +++ b/module/project/view/execution.html.php @@ -8,6 +8,10 @@ project->disabledInputTip, $lang->edit . $lang->executionCommon));?> edit . $lang->executionCommon);?> project->disabledInputTip, $lang->programplan->stageCustom->task));?> +execution->checkedExecSummary);?> +execution->pageExecSummary);?> +execution->executionSummary);?> +execution->checkedExecutions);?>