From 10712415567ee9291bf825157363760b2bd5fe2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= Date: Thu, 23 Feb 2023 16:15:14 +0800 Subject: [PATCH] * Fix report-preview menu. --- module/common/lang/menu.php | 2 ++ module/report/config.php | 7 +++++++ module/report/view/preview.html.php | 9 +++++++++ 3 files changed, 18 insertions(+) diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 677538c228..f82b321750 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -545,6 +545,7 @@ $lang->report->menu->pivotTable = array('link' => "{$lang->report->pivotTable}|r $lang->report->menuOrder[5] = 'screen'; $lang->report->menuOrder[10] = 'pivotTable'; +/* $lang->report->menu->pivotTable['subMenu'] = new stdclass(); $lang->report->menu->pivotTable['subMenu']->product = array('link' => "{$lang->product->common}|report|preview|dimension=&group=product"); $lang->report->menu->pivotTable['subMenu']->project = array('link' => "{$lang->project->common}|report|preview|dimension=&group=project"); @@ -555,6 +556,7 @@ $lang->report->menu->pivotTable['menuOrder'][5] = 'product'; $lang->report->menu->pivotTable['menuOrder'][10] = 'project'; $lang->report->menu->pivotTable['menuOrder'][15] = 'test'; $lang->report->menu->pivotTable['menuOrder'][20] = 'staff'; + */ /* Company menu.*/ $lang->company->menu = new stdclass(); diff --git a/module/report/config.php b/module/report/config.php index 2078f1261f..0bd2afa272 100644 --- a/module/report/config.php +++ b/module/report/config.php @@ -7,6 +7,13 @@ $config->report->dailyreminder->task = true; $config->report->dailyreminder->todo = true; $config->report->dailyreminder->testTask = true; +global $lang; +$config->report->pivotMenu = array(); +$config->report->pivotMenu['product'] = array('link' => "{$lang->product->common}|report|preview|dimension=&group=product"); +$config->report->pivotMenu['project'] = array('link' => "{$lang->project->common}|report|preview|dimension=&group=project"); +$config->report->pivotMenu['test'] = array('link' => "{$lang->qa->common}|report|preview|dimension=&group=test"); +$config->report->pivotMenu['staff'] = array('link' => "{$lang->system->common}|report|preview|dimension=&group=staff"); + $config->report->annualData['minMonth'] = 2; $config->report->annualData['colors'] = array('#0075A9', '#22AC38', '#CAAC32', '#2B4D6D', '#0071a4', '#00a0e9', '#7ecef4'); $config->report->annualData['itemMinWidth'] = array(1 => 3, 2 => 5, 3 => 7, 4 => 9, 5 => 11); diff --git a/module/report/view/preview.html.php b/module/report/view/preview.html.php index a8f6fdeb99..dac0a1999c 100644 --- a/module/report/view/preview.html.php +++ b/module/report/view/preview.html.php @@ -8,6 +8,15 @@ $('#subNavbar li').not('[data-id=]').removeClass('active'); +