@@ -83,32 +93,77 @@
-
-
-
+
+
+
| - - |
|---|
| + + | '>$key) ? $value->$key : 'null';?> | + $key) ? $value->$key : 'null';?> +';?> - - |
|---|
diff --git a/module/pivot/control.php b/module/pivot/control.php
index d11a3d9d47..228ada1933 100644
--- a/module/pivot/control.php
+++ b/module/pivot/control.php
@@ -72,7 +72,14 @@ class pivot extends control
$processSqlData = $this->loadModel('chart')->getTables($sql);
$sql = $processSqlData['sql'];
- list($data, $configs) = $this->pivot->genSheet(json_decode(json_encode($pivot->fieldSettings), true), $pivot->settings, $sql, $filterFormat, json_decode($pivot->langs, true));
+ if(isset($pivot->settings['summary']) and $pivot->settings['summary'] =='notuse')
+ {
+ list($data, $configs) = $this->pivot->genOriginSheet(json_decode(json_encode($pivot->fieldSettings), true), $pivot->settings, $sql, $filterFormat, json_decode($pivot->langs, true));
+ }
+ else
+ {
+ list($data, $configs) = $this->pivot->genSheet(json_decode(json_encode($pivot->fieldSettings), true), $pivot->settings, $sql, $filterFormat, json_decode($pivot->langs, true));
+ }
$this->view->data = $data;
$this->view->configs = $configs;
}
@@ -298,7 +305,14 @@ class pivot extends control
$processSqlData = $this->loadModel('chart')->getTables($sql);
$sql = $processSqlData['sql'];
- list($data, $configs) = $this->pivot->genSheet($fields, $settings, $sql, $filterFormat, $langs);
+ if(isset($settings['summary']) and $settings['summary'] == 'notuse')
+ {
+ list($data, $configs) = $this->pivot->genOriginSheet($fields, $settings, $sql, $filterFormat, $langs);
+ }
+ else
+ {
+ list($data, $configs) = $this->pivot->genSheet($fields, $settings, $sql, $filterFormat, $langs);
+ }
$this->pivot->buildPivotTable($data, $configs, $fields, $sql);
}
diff --git a/module/pivot/css/preview.css b/module/pivot/css/preview.css
index ad70a4a69b..91d59bf0c1 100644
--- a/module/pivot/css/preview.css
+++ b/module/pivot/css/preview.css
@@ -5,10 +5,11 @@
.parent-position {padding-right: 160px;}
.datagrid {overflow: auto;}
.heading-padding, .datagrid-padding {padding-left: 6px; padding-right: 6px;}
+.datagrid-padding {padding-top: 2px;}
.filter-items > .table-row{display: table!important;}
.filter-items .filter-item:first-child {padding-left: 0!important;}
-.filterBox {display: flex; margin-bottom: 20px; margin-left: 6px; margin-right: 6px;}
+.filterBox {display: flex; margin-bottom: 5px; margin-left: 6px; margin-right: 6px; margin-top: 8px;}
.filter-items {display: flex; flex: 1; flex-wrap: wrap;}
.filter-item {padding: 0 16px 5px 0;}
.filter-item-grow {flex-grow: 1;}
@@ -17,3 +18,15 @@
#filterItems .picker-selections {overflow: hidden; text-overflow: clip; white-space: nowrap;}
#filterItems .picker .picker-selections {width: auto !important;}
+.content-border {padding-top: 16px; padding-bottom: 16px; border-bottom: 1px solid #F1F5F9;}
+.flex-between {display:flex; justify-content: space-between;}
+.flex-start {display:flex; justify-content: flex-start;}
+
+.query-after {padding-right: 8px; padding-top: 1px;}
+.query-pseudo {position: relative; padding-right: 24px; padding-top: 1px;}
+.query-pseudo::after {content: ""; position: absolute; top: 0; right: 0; bottom: 0; width: 1px; background-color: #F1F5F9;}
+
+#filterMargin {padding-top: 8px; padding-bottom: 5px;}
+.pivot-design {padding-left: 24px; padding-right: 12px;}
+.pivot-edit {padding-left: 12px; padding-right: 12px;}
+.pivot-delete {padding-left: 12px; padding-right: 8px;}
diff --git a/module/pivot/js/common.js b/module/pivot/js/common.js
index 484d42150a..c6b07cd6bf 100644
--- a/module/pivot/js/common.js
+++ b/module/pivot/js/common.js
@@ -139,10 +139,15 @@ function checkFormSetting()
*/
function validate(showError = false)
{
- var pivot = DataStorage.pivot;
+ var pivot = DataStorage.pivot;
var formSettings = pivot.settings;
- /* Code for temporary */
- var isReady = true;
+ var isReady = true;
+
+ if("summary" in formSettings && formSettings.summary == 'notuse')
+ {
+ if(isReady) $('#datagrid-tip').addClass('hidden');
+ return true;
+ }
/* check group settings. */
var exist = false;
diff --git a/module/pivot/js/preview.js b/module/pivot/js/preview.js
index 1a2f92d925..b4373f1e43 100644
--- a/module/pivot/js/preview.js
+++ b/module/pivot/js/preview.js
@@ -5,6 +5,7 @@ $(function()
expandTree();
renderFilters(pivot);
initQueryBtn();
+ initOriginQueryBtn();
$('body').resize(() => {calcPreviewGrowFilter();});
@@ -20,17 +21,14 @@ function expandTree()
tree.expand($('.pivot-' + pivotID).parents('li'));
}
-/*$('.btn-export').click(function()
-{
- if(typeof pivotID == 'undefined' || !pivotID) return;
- pivot = getQueryInfo();
-});
-*/
-
function getQueryInfo()
{
- var pivotInfo = pivot;
+ // if not use JSON.parse(JSON.stringify()), edit pivotInfo also affects pivot. If click btn-query-origin, pivot setting also have summary field.
+ var pivotInfo = JSON.parse(JSON.stringify(pivot));
pivotInfo.searchFilters = JSON.parse(JSON.stringify(pivotInfo.filters));
+ pivotInfo.step = 4;
+
+ if(!pivotInfo.searchFilters) return pivotInfo;
if(isQueryFilter(pivotInfo.filters))
{
@@ -70,7 +68,6 @@ function getQueryInfo()
});
}
- pivotInfo.step = 4;
return pivotInfo;
}
@@ -84,17 +81,55 @@ function initQueryBtn()
{
$('.btn-query').click(function()
{
- pivotInfo = getQueryInfo();
- $.post(createLink('pivot', 'ajaxGetPivot'), pivotInfo,function(resp)
- {
- var myDatagrid = $('#datagirdInfo');
- myDatagrid.find('.reportData').remove();
- myDatagrid.append(resp);
- });
-
+ var pivotInfo = getQueryInfo();
+ refreshPivot(pivotInfo);
});
}
+/**
+ * Init origin query button.
+ *
+ * @access public
+ * @return void
+ */
+function initOriginQueryBtn()
+{
+ $('.btn-query-origin').click(function()
+ {
+ var pivotInfo = getQueryInfo();
+ pivotInfo.settings['summary'] = 'notuse';
+ refreshPivot(pivotInfo, true);
+ });
+}
+
+function refreshPivot(pivotInfo, isOrigin = false)
+{
+ $.post(createLink('pivot', 'ajaxGetPivot'), pivotInfo,function(resp)
+ {
+ var myDatagrid = $('#datagirdInfo');
+ myDatagrid.find('.reportData').remove();
+ myDatagrid.append(resp);
+
+ if(isOrigin)
+ {
+ $('#filterItems').addClass('hidden');
+ $('#filterMargin').removeClass('hidden');
+
+ $('#pivot-query').removeClass('hidden');
+ $('#origin-query').addClass('hidden');
+ }
+ else
+ {
+ $('#filterItems').removeClass('hidden');
+ $('#filterMargin').addClass('hidden');
+
+ $('#pivot-query').addClass('hidden');
+ $('#origin-query').removeClass('hidden');
+ }
+ });
+}
+
+
function calcPreviewGrowFilter()
{
if(pivot.filters.length <= 0) return;
@@ -280,3 +315,9 @@ function isQueryFilter(filters)
{
return filters.length > 0 && filters[0].from == 'query';
}
+
+function locate(module, method, params)
+{
+ var link = createLink(module, method, params);
+ window.location.href = link;
+}
diff --git a/module/pivot/lang/de.php b/module/pivot/lang/de.php
index d3da4af322..19826e8b7b 100644
--- a/module/pivot/lang/de.php
+++ b/module/pivot/lang/de.php
@@ -20,6 +20,7 @@ $lang->pivot->design = 'Design pivot';
$lang->pivot->export = 'Export pivot';
$lang->pivot->query = 'Query';
$lang->pivot->browseAction = 'Design in Pivot Table';
+$lang->pivot->designAB = 'Design';
$lang->pivot->id = 'ID';
$lang->pivot->name = 'Name';
@@ -71,6 +72,8 @@ $lang->pivot->percent = '%';
$lang->pivot->undefined = 'Undefiniert';
$lang->pivot->project = $lang->projectCommon;
$lang->pivot->PO = 'PO';
+$lang->pivot->showPivot = 'Show Pivot';
+$lang->pivot->showOrigin = 'Show Origin Data';
$lang->pivot->colors[] = 'AFD8F8';
$lang->pivot->colors[] = 'AFD8F8';
@@ -261,7 +264,7 @@ $lang->pivot->noChartSelected = 'Please select one pivot.';
$lang->pivot->beginGtEnd = 'Begin time should not be >= end time.';
$lang->pivot->resetSettings = 'The configuration of the query data has been modified, requiring redesign of the pivot, whether to continue.';
$lang->pivot->clearSettings = 'The configuration of the query data has been modified, whether to clear the pivot and save.';
-$lang->pivot->draftSave = 'Released content is edited, will be overwritten, whether to continue?';
+$lang->pivot->draftSave = 'The pivot table has been published and will be in draft state. Do you want to continue?';
$lang->pivot->cannotAddQuery = 'Result filter has been added, query filter cannot be added.';
$lang->pivot->cannotAddResult = 'Query filter has been added, result filter cannot be added.';
@@ -332,6 +335,7 @@ $lang->pivot->typeOptions['dept'] = 'Dept';
$lang->pivot->step2 = new stdclass();
$lang->pivot->step2->group = 'Row Grouping';
+$lang->pivot->step2->summary = 'Summary Setting';
$lang->pivot->step2->column = 'Column Settings';
$lang->pivot->step2->groupTip = 'Select Field';
$lang->pivot->step2->groupNum = array('One', 'Two', 'Three');
@@ -344,6 +348,7 @@ $lang->pivot->step2->columnField = 'Field';
$lang->pivot->step2->calcMode = 'Calc Mode';
$lang->pivot->step2->moreThanOne = 'Select at least one group field.';
+$lang->pivot->step2->summaryTip = 'After this parameter is selected, you can configure Row Grouping, Column Settings, and Show column totals';
$lang->pivot->step2->groupsTip = 'By selecting a grouping field, the data of the SQL query is grouped and displayed hierarchically in the pivot table.';
$lang->pivot->step2->columnsTip = 'Add 1 column to the pivot table and set it.';
diff --git a/module/pivot/lang/en.php b/module/pivot/lang/en.php
index 85e68b46ca..04bb815b3c 100644
--- a/module/pivot/lang/en.php
+++ b/module/pivot/lang/en.php
@@ -20,6 +20,7 @@ $lang->pivot->design = 'Design pivot';
$lang->pivot->export = 'Export pivot';
$lang->pivot->query = 'Query';
$lang->pivot->browseAction = 'Design in Pivot Table';
+$lang->pivot->designAB = 'Design';
$lang->pivot->id = 'ID';
$lang->pivot->name = 'Name';
@@ -71,6 +72,8 @@ $lang->pivot->percent = '%';
$lang->pivot->undefined = 'Undefiniert';
$lang->pivot->project = $lang->projectCommon;
$lang->pivot->PO = 'PO';
+$lang->pivot->showPivot = 'Show Pivot';
+$lang->pivot->showOrigin = 'Show Origin Data';
$lang->pivot->colors[] = 'AFD8F8';
$lang->pivot->colors[] = 'AFD8F8';
@@ -261,7 +264,7 @@ $lang->pivot->noChartSelected = 'Please select one pivot.';
$lang->pivot->beginGtEnd = 'Begin time should not be >= end time.';
$lang->pivot->resetSettings = 'The configuration of the query data has been modified, requiring redesign of the pivot, whether to continue.';
$lang->pivot->clearSettings = 'The configuration of the query data has been modified, whether to clear the pivot and save.';
-$lang->pivot->draftSave = 'Released content is edited, will be overwritten, whether to continue?';
+$lang->pivot->draftSave = 'The pivot table has been published and will be in draft state. Do you want to continue?';
$lang->pivot->cannotAddQuery = 'Result filter has been added, query filter cannot be added.';
$lang->pivot->cannotAddResult = 'Query filter has been added, result filter cannot be added.';
@@ -332,6 +335,7 @@ $lang->pivot->typeOptions['dept'] = 'Dept';
$lang->pivot->step2 = new stdclass();
$lang->pivot->step2->group = 'Row Grouping';
+$lang->pivot->step2->summary = 'Summary Setting';
$lang->pivot->step2->column = 'Column Settings';
$lang->pivot->step2->groupTip = 'Select Field';
$lang->pivot->step2->groupNum = array('One', 'Two', 'Three');
@@ -344,6 +348,7 @@ $lang->pivot->step2->columnField = 'Field';
$lang->pivot->step2->calcMode = 'Calc Mode';
$lang->pivot->step2->moreThanOne = 'Select at least one group field.';
+$lang->pivot->step2->summaryTip = 'After this parameter is selected, you can configure Row Grouping, Column Settings, and Show column totals';
$lang->pivot->step2->groupsTip = 'By selecting a grouping field, the data of the SQL query is grouped and displayed hierarchically in the pivot table.';
$lang->pivot->step2->columnsTip = 'Add 1 column to the pivot table and set it.';
diff --git a/module/pivot/lang/fr.php b/module/pivot/lang/fr.php
index ad86ede4b4..38aeea7ead 100644
--- a/module/pivot/lang/fr.php
+++ b/module/pivot/lang/fr.php
@@ -20,6 +20,7 @@ $lang->pivot->design = 'Design pivot';
$lang->pivot->export = 'Export pivot';
$lang->pivot->query = 'Query';
$lang->pivot->browseAction = 'Design in Pivot Table';
+$lang->pivot->designAB = 'Design';
$lang->pivot->id = 'ID';
$lang->pivot->name = 'Name';
@@ -71,6 +72,8 @@ $lang->pivot->percent = '%';
$lang->pivot->undefined = 'Undefiniert';
$lang->pivot->project = $lang->projectCommon;
$lang->pivot->PO = 'PO';
+$lang->pivot->showPivot = 'Show Pivot';
+$lang->pivot->showOrigin = 'Show Origin Data';
$lang->pivot->colors[] = 'AFD8F8';
$lang->pivot->colors[] = 'AFD8F8';
@@ -261,7 +264,7 @@ $lang->pivot->noChartSelected = 'Please select one pivot.';
$lang->pivot->beginGtEnd = 'Begin time should not be >= end time.';
$lang->pivot->resetSettings = 'The configuration of the query data has been modified, requiring redesign of the pivot, whether to continue.';
$lang->pivot->clearSettings = 'The configuration of the query data has been modified, whether to clear the pivot and save.';
-$lang->pivot->draftSave = 'Released content is edited, will be overwritten, whether to continue?';
+$lang->pivot->draftSave = 'The pivot table has been published and will be in draft state. Do you want to continue?';
$lang->pivot->cannotAddQuery = 'Result filter has been added, query filter cannot be added.';
$lang->pivot->cannotAddResult = 'Query filter has been added, result filter cannot be added.';
@@ -332,6 +335,7 @@ $lang->pivot->typeOptions['dept'] = 'Dept';
$lang->pivot->step2 = new stdclass();
$lang->pivot->step2->group = 'Row Grouping';
+$lang->pivot->step2->summary = 'Summary Setting';
$lang->pivot->step2->column = 'Column Settings';
$lang->pivot->step2->groupTip = 'Select Field';
$lang->pivot->step2->groupNum = array('One', 'Two', 'Three');
@@ -344,6 +348,7 @@ $lang->pivot->step2->columnField = 'Field';
$lang->pivot->step2->calcMode = 'Calc Mode';
$lang->pivot->step2->moreThanOne = 'Select at least one group field.';
+$lang->pivot->step2->summaryTip = 'After this parameter is selected, you can configure Row Grouping, Column Settings, and Show column totals';
$lang->pivot->step2->groupsTip = 'By selecting a grouping field, the data of the SQL query is grouped and displayed hierarchically in the pivot table.';
$lang->pivot->step2->columnsTip = 'Add 1 column to the pivot table and set it.';
diff --git a/module/pivot/lang/vi.php b/module/pivot/lang/vi.php
index 1ca0c34fdd..509e12df66 100644
--- a/module/pivot/lang/vi.php
+++ b/module/pivot/lang/vi.php
@@ -10,6 +10,7 @@ $lang->pivot->design = 'Design pivot';
$lang->pivot->export = 'Export pivot';
$lang->pivot->query = 'Query';
$lang->pivot->browseAction = 'Design in Pivot Table';
+$lang->pivot->designAB = 'Design';
$lang->pivot->id = 'ID';
$lang->pivot->name = 'Name';
@@ -61,6 +62,8 @@ $lang->pivot->percent = '%';
$lang->pivot->undefined = 'Undefiniert';
$lang->pivot->project = $lang->projectCommon;
$lang->pivot->PO = 'PO';
+$lang->pivot->showPivot = 'Show Pivot';
+$lang->pivot->showOrigin = 'Show Origin Data';
$lang->pivot->colors[] = 'AFD8F8';
$lang->pivot->colors[] = 'AFD8F8';
@@ -251,7 +254,7 @@ $lang->pivot->noChartSelected = 'Please select one pivot.';
$lang->pivot->beginGtEnd = 'Begin time should not be >= end time.';
$lang->pivot->resetSettings = 'The configuration of the query data has been modified, requiring redesign of the pivot, whether to continue.';
$lang->pivot->clearSettings = 'The configuration of the query data has been modified, whether to clear the pivot and save.';
-$lang->pivot->draftSave = 'Released content is edited, will be overwritten, whether to continue?';
+$lang->pivot->draftSave = 'The pivot table has been published and will be in draft state. Do you want to continue?';
$lang->pivot->cannotAddQuery = 'Result filter has been added, query filter cannot be added.';
$lang->pivot->cannotAddResult = 'Query filter has been added, result filter cannot be added.';
@@ -322,6 +325,7 @@ $lang->pivot->typeOptions['dept'] = 'Dept';
$lang->pivot->step2 = new stdclass();
$lang->pivot->step2->group = 'Row Grouping';
+$lang->pivot->step2->summary = 'Summary Setting';
$lang->pivot->step2->column = 'Column Settings';
$lang->pivot->step2->groupTip = 'Select Field';
$lang->pivot->step2->groupNum = array('One', 'Two', 'Three');
@@ -334,6 +338,7 @@ $lang->pivot->step2->columnField = 'Field';
$lang->pivot->step2->calcMode = 'Calc Mode';
$lang->pivot->step2->moreThanOne = 'Select at least one group field.';
+$lang->pivot->step2->summaryTip = 'After this parameter is selected, you can configure Row Grouping, Column Settings, and Show column totals';
$lang->pivot->step2->groupsTip = 'By selecting a grouping field, the data of the SQL query is grouped and displayed hierarchically in the pivot table.';
$lang->pivot->step2->columnsTip = 'Add 1 column to the pivot table and set it.';
diff --git a/module/pivot/lang/zh-cn.php b/module/pivot/lang/zh-cn.php
index 4542f3dc2a..473d9d364a 100644
--- a/module/pivot/lang/zh-cn.php
+++ b/module/pivot/lang/zh-cn.php
@@ -20,6 +20,7 @@ $lang->pivot->design = '设计透视表';
$lang->pivot->export = '导出透视表';
$lang->pivot->query = '查询';
$lang->pivot->browseAction = '进入透视表设计';
+$lang->pivot->designAB = '设计';
$lang->pivot->id = 'ID';
$lang->pivot->name = '名称';
@@ -71,6 +72,8 @@ $lang->pivot->percent = '百分比';
$lang->pivot->undefined = '未设定';
$lang->pivot->project = $lang->projectCommon;
$lang->pivot->PO = 'PO';
+$lang->pivot->showPivot = '查看透视表';
+$lang->pivot->showOrigin = '查看原始数据';
$lang->pivot->colors[] = 'AFD8F8';
$lang->pivot->colors[] = 'F6BD0F';
@@ -261,7 +264,7 @@ $lang->pivot->noChartSelected = '请选择至少一个图表。';
$lang->pivot->beginGtEnd = '开始时间不得大于结束时间。';
$lang->pivot->resetSettings = '查询数据的配置已修改，是否清空透视表设计，并重新设计。';
$lang->pivot->clearSettings = '查询数据的配置已修改，是否清空透视表设计并保存。';
-$lang->pivot->draftSave = '已发布的内容被编辑，将覆盖，是否继续?';
+$lang->pivot->draftSave = '该透视表已发布，将变为草稿态，是否继续？';
$lang->pivot->cannotAddQuery = '已添加结果筛选器，无法添加查询筛选器';
$lang->pivot->cannotAddResult = '已添加查询筛选器，无法添加结果筛选器';
@@ -332,6 +335,7 @@ $lang->pivot->typeOptions['dept'] = '部门';
$lang->pivot->step2 = new stdclass();
$lang->pivot->step2->group = '行分组';
+$lang->pivot->step2->summary = '汇总设置';
$lang->pivot->step2->column = '列设置';
$lang->pivot->step2->groupTip = '选择字段';
$lang->pivot->step2->groupNum = array('一', '二', '三');
@@ -344,6 +348,7 @@ $lang->pivot->step2->columnField = '字段';
$lang->pivot->step2->calcMode = '计算方式';
$lang->pivot->step2->moreThanOne = '至少选择一个分组字段。';
+$lang->pivot->step2->summaryTip = '勾选后，可配置行分组、列设置、显示列的汇总。';
$lang->pivot->step2->groupsTip = '通过选择分组字段，对SQL查询的数据进行分组，并分层级显示在透视表中。';
$lang->pivot->step2->columnsTip = '在透视表中添加1列并对其进行设置。';
diff --git a/module/pivot/model.php b/module/pivot/model.php
index a953a0f60e..65384db443 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -2162,8 +2162,7 @@ class pivotModel extends model
*/
public function buildPivotTable($data, $configs, $fields = array(), $sql = '')
{
- $clientLang = $this->app->getClientLang();
- $width = 128;
+ $width = 128;
/* Init table. */
$table = "";
@@ -2259,6 +2258,77 @@ class pivotModel extends model
return $sql;
}
+ /**
+ * replace defined table names.
+ *
+ * @param string $sql
+ * @access public
+ * @return string
+ */
+ public function genOriginSheet($fields, $settings, $sql, $filters, $langs = array())
+ {
+ $sql = $this->initVarFilter($filters, $sql);
+
+ /* Create sql. */
+ $sql = str_replace(';', '', $sql);
+
+ if(preg_match_all("/[\$]+[a-zA-Z0-9]+/", $sql, $out))
+ {
+ foreach($out[0] as $match) $sql = str_replace($match, "''", $sql);
+ }
+
+ /* Process rows. */
+ $connectSQL = '';
+ if(!empty($filters) && !isset($filters[0]['from']))
+ {
+ $wheres = array();
+ foreach($filters as $field => $filter)
+ {
+ $wheres[] = "tt.`$field` {$filter['operator']} {$filter['value']}";
+ }
+
+ $whereStr = implode(' and ', $wheres);
+ $connectSQL .= " where $whereStr";
+ }
+
+ $columnSQL = "select * from ($sql) tt" . $connectSQL;
+ $rows = $this->dao->query($columnSQL)->fetchAll();
+
+ $cols = array();
+ $clientLang = $this->app->getClientLang();
+ /* Build cols. */
+ foreach($fields as $field)
+ {
+ $key = $field['field'];
+
+ $col = new stdclass();
+ $col->name = $key;
+ $col->isGroup = true;
+
+ $fieldObject = $field['object'];
+ $relatedField = $field['field'];
+
+ $colLabel = $key;
+ if($fieldObject)
+ {
+ $this->app->loadLang($fieldObject);
+ if(isset($this->lang->$fieldObject->$relatedField)) $colLabel = $this->lang->$fieldObject->$relatedField;
+ }
+
+ if(isset($langs[$key]) and !empty($langs[$key][$clientLang])) $colLabel = $langs[$key][$clientLang];
+ $col->label = $colLabel;
+
+ $cols[0][] = $col;
+ }
+
+ $data = new stdclass();
+ $data->cols = $cols;
+ $data->array = json_decode(json_encode($rows), true);
+
+ $configs = array_fill(0, count($rows), array_fill(0, count($fields), 1));
+
+ return array($data, $configs);
+ }
}
/**
diff --git a/module/pivot/view/show.html.php b/module/pivot/view/show.html.php
index 2d688e3073..7e6a7d34aa 100644
--- a/module/pivot/view/show.html.php
+++ b/module/pivot/view/show.html.php
@@ -17,6 +17,7 @@
pivot->widthDate);?>
bi->pickerHeight);?>
lang->datepicker->dpText);?>
+pivot->confirm->design);?>
";?>
@@ -30,21 +31,37 @@