TonyKang 5 år sedan
förälder
incheckning
cd7290acb9
2 ändrade filer med 9 tillägg och 0 borttagningar
  1. 2 0
      app/controller/report_controller.js
  2. 7 0
      app/reports/rpt_component/jpc_cross_tab.js

+ 2 - 0
app/controller/report_controller.js

@@ -643,6 +643,8 @@ async function getAllPagesCommon(ctx, rptTpl, params, option, outputType, baseDi
         // console.log(defProperties);
 
         // console.log('before assemble');
+
+        // fsUtil.writeObjToFile(rawDataObj, 'D:/GitHome/temp/JL_Assemble_RawDataDataBefore' + (new Date()).getTime() + '.js');
         const tplData = rptDataUtil.assembleData(ctx, rawDataObj, baseDir, printCom, customSelect);
         // console.log(tplData);
 

+ 7 - 0
app/reports/rpt_component/jpc_cross_tab.js

@@ -11,6 +11,7 @@ const JpcDiscreteHelper = require('./helper/jpc_helper_discrete');
 const JpcTextHelper = require('./helper/jpc_helper_text');
 const JpcCommonOutputHelper = require('./helper/jpc_helper_common_output');
 const JpcAreaHelper = require('./helper/jpc_helper_area');
+const $FS_UTIL = require('../../public/js/fsUtil');
 
 const JpcCrossTabSrv = function() {};
 
@@ -217,10 +218,16 @@ JpcCrossTabSrv.prototype.createNew = function() {
     JpcCrossTabResult.sorting = function(rptTpl, dataObj, dataSeq, $CURRENT_RPT) {
         const me = this;
         // IMPORTANT: the data should be sorted in SQL/NoSQL level!
+        // $FS_UTIL.writeObjToFile(dataSeq, 'D:/GitHome/temp/JL_cross_dataSeq' + (new Date()).getTime() + '.js');
         me.sortedRowSequence = private_SortAndOptimize(rptTpl, dataObj, dataSeq, JV.NODE_CROSS_ROW, me.row_fields_idx, $CURRENT_RPT);
         private_SortAndOptimize(rptTpl, dataObj, dataSeq, JV.NODE_CROSS_ROW_AD_HOC, me.row_fields_adhoc_idx, $CURRENT_RPT);
         me.sortedColSequence = private_SortAndOptimize(rptTpl, dataObj, dataSeq, JV.NODE_CROSS_COL, me.col_fields_idx, $CURRENT_RPT);
         me.sortedContentSequence = private_SortForDisplayContent(rptTpl, me.sortedRowSequence, me.sortedColSequence, me.content_fields_idx);
+
+        // $FS_UTIL.writeObjToFile(me.sortedRowSequence, 'D:/GitHome/temp/JL_cross_sortedRowSequence' + (new Date()).getTime() + '.js');
+        // $FS_UTIL.writeObjToFile(me.sortedColSequence, 'D:/GitHome/temp/JL_cross_sortedColSequence' + (new Date()).getTime() + '.js');
+        // $FS_UTIL.writeObjToFile(me.sortedContentSequence, 'D:/GitHome/temp/JL_cross_sortedContentSequence' + (new Date()).getTime() + '.js');
+
         JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_COL_SUM][JV.PROP_CROSS_FIELDS], null, me.col_sum_fields_idx);
         // pre-sum the data(for col sum display)
         const data_details = dataObj[JV.DATA_DETAIL_DATA];