code revamp -> report

modules/reports/controllers/rpt_controller.js

@@ -2,14 +2,15 @@
  * Created by Tony on 2017/3/13.
  */
 
-var JV = require('../rpt_component/Jpc_ValueDefine');
+var JV = require('../rpt_component/jpc_value_define');
 var Template = require('../models/rpt_template');
-var TemplateData = require('../models/rpt_temp_data');
-var JpcEx = require('../rpt_component/JpcEx');
+var TemplateData = require('../models/rpt_tpl_data');
+var JpcEx = require('../rpt_component/jpc_ex');
 //var cache = require('../../../public/cache/cacheUtil');
 var rptUtil = require("../util/rpt_util");
 var rpt_xl_util = require('../util/rpt_excel_util');
 var fs = require('fs');
+var strUtil = require('../../../public/stringUtil');
 
 //统一回调函数
 var callback = function(req, res, err, data){
@@ -38,7 +39,7 @@ module.exports = {
             }
         }).then(function(tplData){
                 if (tplData) {
-                    var printCom = JpcEx.createInit();
+                    var printCom = JpcEx.createNew();
                     rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] = pageSize;
                     var defProperties = rptUtil.getReportDefaultCache();
                     printCom.initialize(rptTpl);
@@ -78,7 +79,7 @@ module.exports = {
                     if (pageRst) {
                         rpt_xl_util.exportExcel(pageRst, rptName, null, function(newName){
                             res.setHeader('Content-Type', 'application/vnd.openxmlformats');
-                            res.setHeader("Content-Disposition", "attachment; filename=" + rptName + ".xlsx");
+                            res.setHeader("Content-Disposition", "attachment; filename=" + strUtil.getPinYinCamelChars(rptName) + ".xlsx");
                             var filestream = fs.createReadStream(__dirname.slice(0, __dirname.length - 28) + '/tmp/' + newName + '.xlsx');
                             filestream.on('data', function(chunk) {
                                 res.write(chunk);

modules/reports/rpt_component/Jpc_Band.js

@@ -1,6 +1,6 @@
-var JV = require('./Jpc_ValueDefine');
-var JpcCommonHelper = require('./helper/Jpc_Helper_Common');
-var JpcBandHelper = require('./helper/Jpc_Helper_Band');
+var JV = require('./jpc_value_define');
+var JpcCommonHelper = require('./helper/jpc_helper_common');
+var JpcBandHelper = require('./helper/jpc_helper_band');
 
 var JpcBand = {
     createNew: function(rptTpl, defProperties) {

modules/reports/rpt_component/Jpc_Data.js

@@ -1,4 +1,4 @@
-var JV = require('./Jpc_ValueDefine');
+var JV = require('./jpc_value_define');
 var JpcData = {
     createNew: function() {
         var JpcDataRst = {};

modules/reports/rpt_component/Jpc_Field.js

@@ -1,4 +1,4 @@
-var JV = require('./Jpc_ValueDefine');
+var JV = require('./jpc_value_define');
 var JpcField = {
     createNew: function(rptTpl) {
         var JpcFieldResult = {};

modules/reports/rpt_component/Jpc_Function.js

@@ -1,4 +1,4 @@
-var JV = require('./Jpc_ValueDefine');
+var JV = require('./jpc_value_define');
 var JpcFunc = {
     createNew: function (rptTpl) {
         var me = this;

modules/reports/rpt_component/Jpc_Param.js

@@ -1,4 +1,4 @@
-var JV = require('./Jpc_ValueDefine');
+var JV = require('./jpc_value_define');
 var JpcParam = {
     createNew: function(rptTpl) {
         var JpcParamResult = {};

modules/reports/rpt_component/Jpc_RTE.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2016/12/28.
  */
 
-var JV = require('./Jpc_ValueDefine');
+var JV = require('./jpc_value_define');
 var JE = {
     F: function(fID, $CURRENT_RPT) {
         var rst = null;

modules/reports/rpt_component/helper/Jpc_Helper_Area.js

@@ -1,4 +1,4 @@
-var JV = require('../Jpc_ValueDefine');
+var JV = require('../jpc_value_define');
 
 var JpcAreaHelper = {
     outputArea: function(areaNode, band, unitFactor, rowAmount, rowIdx, colAmount, colIdx, multipleDispCol, multipleColIdx,syncHeight, syncWidth) {

modules/reports/rpt_component/helper/Jpc_Helper_Band.js

@@ -1,5 +1,5 @@
-var JV = require('../Jpc_ValueDefine');
-var JpcCommonHelper = require('./Jpc_Helper_Common');
+var JV = require('../jpc_value_define');
+var JpcCommonHelper = require('./jpc_helper_common');
 
 var JpcBandHelper = {
     getBandTypeValByString: function(bandType) {

modules/reports/rpt_component/helper/Jpc_Helper_Common.js

@@ -1,4 +1,4 @@
-var JV = require('../Jpc_ValueDefine');
+var JV = require('../jpc_value_define');
 
 var JpcCommonHelper = {
     commonConstant: {},

modules/reports/rpt_component/helper/Jpc_Helper_Discrete.js

@@ -1,8 +1,8 @@
-var JV = require('../Jpc_ValueDefine');
-var JE = require('../Jpc_RTE');
-var JpcTextHelper = require('./Jpc_Helper_Text');
-var JpcCommonOutputHelper = require('./Jpc_Helper_CommonOutput');
-var JpcAreaHelper = require('./Jpc_Helper_Area');
+var JV = require('../jpc_value_define');
+var JE = require('../jpc_rte');
+var JpcTextHelper = require('./jpc_helper_text');
+var JpcCommonOutputHelper = require('./jpc_helper_common_output');
+var JpcAreaHelper = require('./jpc_helper_area');
 
 var JpcDiscreteHelper = {
     outputDiscreteInfo: function (discreteArray, bands, dataObj, unitFactor, pageStatus, segIdx, multiCols, multiColIdx, $CURRENT_RPT) {

modules/reports/rpt_component/helper/Jpc_Helper_Field.js

@@ -1,4 +1,4 @@
-var JV = require('../Jpc_ValueDefine');
+var JV = require('../jpc_value_define');
 
 var JpcFieldHelper = {
     getValue: function(dataField, valueIdx) {

modules/reports/rpt_component/helper/Jpc_Helper_Text.js

@@ -1,6 +1,6 @@
-var JV = require('../Jpc_ValueDefine');
-var JpcCommonOutputHelper = require('./Jpc_Helper_CommonOutput');
-var JpcAreaHelper = require('./Jpc_Helper_Area');
+var JV = require('../jpc_value_define');
+var JpcCommonOutputHelper = require('./jpc_helper_common_output');
+var JpcAreaHelper = require('./jpc_helper_area');
 
 var JpcTextHelper = {
     outputText: function (textNode, band, unitFactor, rows, rowIdx, cols, colIdx, multiCols, multiColIdx) {

modules/reports/rpt_component/helper/Jpc_Helper_CommonOutput.js

@@ -1,5 +1,5 @@
-var JV = require('../Jpc_ValueDefine');
-var JpcFieldHelper = require('./Jpc_Helper_Field');
+var JV = require('../jpc_value_define');
+var JpcFieldHelper = require('./jpc_helper_field');
 
 var JpcCommonOutputHelper = {
     createCommonOutputWithoutDecorate: function (node, value, controls) {

modules/reports/rpt_component/helper/Jpc_Helper_CrossTab.js

@@ -1,5 +1,5 @@
-var JV = require('../Jpc_ValueDefine');
-var JpcCommonHelper = require('./Jpc_Helper_Common');
+var JV = require('../jpc_value_define');
+var JpcCommonHelper = require('./jpc_helper_common');
 
 var JpcCrossTabHelper = {
     getColIDX: function(cl, val) {

modules/reports/rpt_component/helper/Jpc_Helper_FlowTab.js

@@ -1,5 +1,5 @@
-var JV = require('../Jpc_ValueDefine');
-var JpcCommonHelper = require('./Jpc_Helper_Common');
+var JV = require('../jpc_value_define');
+var JpcCommonHelper = require('./jpc_helper_common');
 
 var JpcFlowTabHelper = {
     getMaxRowsPerPage: function(bands, rptTpl) {

modules/reports/rpt_component/Jpc_BillTab.js

@@ -1,16 +1,16 @@
-var JV = require('./Jpc_ValueDefine');
-var JpcFieldHelper = require('./helper/Jpc_Helper_Field');
-var JpcBandHelper = require('./helper/Jpc_Helper_Band');
-var JpcBand = require('./Jpc_Band');
-var JpcFlowTabHelper = require('./helper/Jpc_Helper_FlowTab');
-var JpcCommonHelper = require('./helper/Jpc_Helper_Common');
-var JpcDiscreteHelper = require('./helper/Jpc_Helper_Discrete');
-var JpcTextHelper = require('./helper/Jpc_Helper_Text');
-var JpcCommonOutputHelper = require('./helper/Jpc_Helper_CommonOutput');
-var JpcAreaHelper = require('./helper/Jpc_Helper_Area');
+var JV = require('./jpc_value_define');
+var JpcFieldHelper = require('./helper/jpc_helper_field');
+var JpcBandHelper = require('./helper/jpc_helper_band');
+var JpcBand = require('./jpc_band');
+var JpcFlowTabHelper = require('./helper/jpc_helper_flow_tab');
+var JpcCommonHelper = require('./helper/jpc_helper_common');
+var JpcDiscreteHelper = require('./helper/jpc_helper_discrete');
+var JpcTextHelper = require('./helper/jpc_helper_text');
+var JpcCommonOutputHelper = require('./helper/jpc_helper_common_output');
+var JpcAreaHelper = require('./helper/jpc_helper_area');
 
 var JpcBillTabSrv = function(){};
-JpcBillTabSrv.prototype.createInit = function(){
+JpcBillTabSrv.prototype.createNew = function(){
     var JpcBillTabResult = {};
     JpcBillTabResult.initialize = function() {
         var me = this;

modules/reports/rpt_component/Jpc_CrossTab.js

@@ -1,17 +1,17 @@
-var JV = require('./Jpc_ValueDefine');
-var JpcFieldHelper = require('./helper/Jpc_Helper_Field');
-var JpcBandHelper = require('./helper/Jpc_Helper_Band');
-var JpcBand = require('./Jpc_Band');
-var JpcFlowTabHelper = require('./helper/Jpc_Helper_FlowTab');
-var JpcCrossTabHelper = require('./helper/Jpc_Helper_CrossTab');
-var JpcCommonHelper = require('./helper/Jpc_Helper_Common');
-var JpcDiscreteHelper = require('./helper/Jpc_Helper_Discrete');
-var JpcTextHelper = require('./helper/Jpc_Helper_Text');
-var JpcCommonOutputHelper = require('./helper/Jpc_Helper_CommonOutput');
-var JpcAreaHelper = require('./helper/Jpc_Helper_Area');
+var JV = require('./jpc_value_define');
+var JpcFieldHelper = require('./helper/jpc_helper_field');
+var JpcBandHelper = require('./helper/jpc_helper_band');
+var JpcBand = require('./jpc_band');
+var JpcFlowTabHelper = require('./helper/jpc_helper_flow_tab');
+var JpcCrossTabHelper = require('./helper/jpc_helper_cross_tab');
+var JpcCommonHelper = require('./helper/jpc_helper_common');
+var JpcDiscreteHelper = require('./helper/jpc_helper_discrete');
+var JpcTextHelper = require('./helper/jpc_helper_text');
+var JpcCommonOutputHelper = require('./helper/jpc_helper_common_output');
+var JpcAreaHelper = require('./helper/jpc_helper_area');
 
 var JpcCrossTabSrv = function(){};
-JpcCrossTabSrv.prototype.createInit = function(){
+JpcCrossTabSrv.prototype.createNew = function(){
     function private_addTabValue(tabValuedIdxLst, sortedSequence, segIdx, preRec, nextRec, dispSerialIdxLst, sorted_sum_value_Lst, rst_sum_value_Lst) {
         if (tabValuedIdxLst) {
             var serial1stTier = null;
@@ -232,7 +232,7 @@ JpcCrossTabSrv.prototype.createInit = function(){
         var maxRowRec = 1, maxColRec = 1, counterRowRec = 0, counterColRec = 0, pageIdx = 0, segCnt = me.sortedContentSequence.length;
         var pageStatus = [true, true, false, true, false, false, false, false];
         //2. calculate the page info one by one
-        var bands = JpcBand.createInit(rptTpl, defProperties);
+        var bands = JpcBand.createNew(rptTpl, defProperties);
         function private_resetBandArea() {
             JpcBandHelper.setBandArea(bands, rptTpl, pageStatus);
             maxRowRec = JpcCrossTabHelper.getMaxRowsPerPage(bands, rptTpl);

modules/reports/rpt_component/JpcEx.js

@@ -1,17 +1,17 @@
-var JV = require('./Jpc_ValueDefine');
-var JpcBand = require('./Jpc_Band');
-var JpcFlowTab = require('./Jpc_FlowTab');
-var JpcBillTab = require('./Jpc_BillTab');
-var JpcCrossTab = require('./Jpc_CrossTab');
-var JpcField = require('./Jpc_Field');
-var JpcParam = require('./Jpc_Param');
-var JpcFunc = require('./Jpc_Function');
-var JpcData = require('./Jpc_Data');
-var JpcCommonHelper = require('./helper/Jpc_Helper_Common');
-var JE = require('./Jpc_RTE'); //Important: for self-define function execution purpose
+var JV = require('./jpc_value_define');
+var JpcBand = require('./jpc_band');
+var JpcFlowTab = require('./jpc_flow_tab');
+var JpcBillTab = require('./jpc_bill_tab');
+var JpcCrossTab = require('./jpc_cross_tab');
+var JpcField = require('./jpc_field');
+var JpcParam = require('./jpc_param');
+var JpcFunc = require('./jpc_function');
+var JpcData = require('./jpc_data');
+var JpcCommonHelper = require('./helper/jpc_helper_common');
+var JE = require('./jpc_rte'); //Important: for self-define function execution purpose
 
 var JpcExSrv = function(){};
-JpcExSrv.prototype.createInit = function(){
+JpcExSrv.prototype.createNew = function(){
     function private_buildDftItems(rptTpl, dftCollection, propArray, nodeName) {
         var rst = {};
         if (dftCollection) {
@@ -85,29 +85,29 @@ JpcExSrv.prototype.createInit = function(){
     JpcResult.initialize = function(rptTpl) {
         var me = this;
         if (rptTpl[JV.NODE_FLOW_INFO]) {
-            me.flowTab = JpcFlowTab.createInit();
+            me.flowTab = JpcFlowTab.createNew();
             me.flowTab.initialize();
         }
         if (rptTpl[JV.NODE_BILL_INFO]) {
-            me.billTab = JpcBillTab.createInit();
+            me.billTab = JpcBillTab.createNew();
             me.billTab.initialize();
         }
         //var dt1 = new Date();
         if (rptTpl[JV.NODE_CROSS_INFO]) {
-            me.crossTab = JpcCrossTab.createInit();
+            me.crossTab = JpcCrossTab.createNew();
             me.crossTab.initialize();
         }
         me.totalPages = 0;
         me.runTimePageData = {};
-        me.fields = JpcField.createInit(rptTpl);
-        me.params = JpcParam.createInit(rptTpl);
-        me.formulas = JpcFunc.createInit(rptTpl);
+        me.fields = JpcField.createNew(rptTpl);
+        me.params = JpcParam.createNew(rptTpl);
+        me.formulas = JpcFunc.createNew(rptTpl);
     };
 
     JpcResult.analyzeData = function(rptTpl, dataObj, defProperties) {
         var me = this;
         //1. data object
-        var dataHelper = JpcData.createInit();
+        var dataHelper = JpcData.createNew();
         dataHelper.analyzeData(rptTpl, dataObj);
         //2. tab object
         //pre-condition: the data should be sorted in SQL/NoSQL level!
@@ -157,7 +157,7 @@ JpcExSrv.prototype.createInit = function(){
             rst[JV.NODE_FONT_COLLECTION] = private_buildDftFonts(rptTpl, (defProperties == null)?null:defProperties.fonts);
             rst[JV.NODE_PAGE_INFO] = JpcCommonHelper.getPageSize(rptTpl);
             rst.items = [];
-            var bands = JpcBand.createInit(rptTpl, defProperties);
+            var bands = JpcBand.createNew(rptTpl, defProperties);
             try {
                 for (var page = startPage; page <= endPage; page++) {
                     me.runTimePageData.currentPage = page;

modules/reports/rpt_component/Jpc_FlowTab.js

@@ -1,17 +1,17 @@
-var JV = require('./Jpc_ValueDefine');
-var JE = require('./Jpc_RTE');
-var JpcFieldHelper = require('./helper/Jpc_Helper_Field');
-var JpcBandHelper = require('./helper/Jpc_Helper_Band');
-var JpcBand = require('./Jpc_Band');
-var JpcFlowTabHelper = require('./helper/Jpc_Helper_FlowTab');
-var JpcCommonHelper = require('./helper/Jpc_Helper_Common');
-var JpcDiscreteHelper = require('./helper/Jpc_Helper_Discrete');
-var JpcTextHelper = require('./helper/Jpc_Helper_Text');
-var JpcCommonOutputHelper = require('./helper/Jpc_Helper_CommonOutput');
-var JpcAreaHelper = require('./helper/Jpc_Helper_Area');
+var JV = require('./jpc_value_define');
+var JE = require('./jpc_rte');
+var JpcFieldHelper = require('./helper/jpc_helper_field');
+var JpcBandHelper = require('./helper/jpc_helper_band');
+var JpcBand = require('./jpc_band');
+var JpcFlowTabHelper = require('./helper/jpc_helper_flow_tab');
+var JpcCommonHelper = require('./helper/jpc_helper_common');
+var JpcDiscreteHelper = require('./helper/jpc_helper_discrete');
+var JpcTextHelper = require('./helper/jpc_helper_text');
+var JpcCommonOutputHelper = require('./helper/jpc_helper_common_output');
+var JpcAreaHelper = require('./helper/jpc_helper_area');
 
 var JpcFlowTabSrv = function(){};
-JpcFlowTabSrv.prototype.createInit = function(){
+JpcFlowTabSrv.prototype.createNew = function(){
     function private_addPageValue(ValuedIdxLst, sortedSequence, preRec, nextRec,page_seg_map, segIdx, pageIdx) {
         var vIdx = [];
         for (var vi = 0; vi < nextRec; vi++) {
@@ -73,7 +73,7 @@ JpcFlowTabSrv.prototype.createInit = function(){
     JpcFlowTabResult.preSetupPages = function (rptTpl, dataOjb, defProperties) {
         var rst = 0, me = this, counterRowRec = 0, maxRowRec = 1, pageIdx = 0;
         JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, rptTpl[JV.NODE_FLOW_INFO][JV.NODE_FLOW_CONTENT][JV.PROP_FLOW_FIELDS], null, me.disp_fields_idx);
-        var bands = JpcBand.createInit(rptTpl, defProperties);
+        var bands = JpcBand.createNew(rptTpl, defProperties);
         var pageStatus = [true, true, false, false, false, false, false, false];
         if (rptTpl[JV.NODE_FLOW_INFO][JV.PROP_MULTI_COLUMN]) {
             me.multiCols = 1 * rptTpl[JV.NODE_FLOW_INFO][JV.PROP_MULTI_COLUMN];

modules/reports/util/rpt_excel_util.js

@@ -1,11 +1,11 @@
 /**
  * Created by Tony on 2017/4/1.
  */
-var JV = require('../rpt_component/Jpc_ValueDefine');
+var JV = require('../rpt_component/jpc_value_define');
 var fs = require('fs');
 var JSZip = require("jszip");
 var strUtil = require('../../../public/stringUtil');
-var jpcCmnHelper = require('../rpt_component/helper/Jpc_Helper_Common');
+var jpcCmnHelper = require('../rpt_component/helper/jpc_helper_common');
 var DPI = jpcCmnHelper.getScreenDPI()[0];
 const dftHeadXml = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 

server.js

@@ -118,7 +118,7 @@ app.get('/report',  function(req, res) {
         res.redirect('/login');
     }
     else {
-        res.render('report/html/RptHome.html',
+        res.render('maintain/report/html/RptHome.html',
             {userAccount: req.session.userAccount,
                 userID: req.session.userID});
     }

test/unit/reports/testRpt.js

@@ -3,10 +3,10 @@
  */
 var test = require('tape');
 var mongoose = require('mongoose');
-var JV = require('../../../modules/reports/rpt_component/Jpc_ValueDefine');
+var JV = require('../../../modules/reports/rpt_component/jpc_value_define');
 var Template = require('../../../modules/reports/models/rpt_template');
-var TemplateData = require('../../../modules/reports/models/rpt_temp_data');
-var JpcEx = require('../../../modules/reports/rpt_component/JpcEx');
+var TemplateData = require('../../../modules/reports/models/rpt_tpl_data');
+var JpcEx = require('../../../modules/reports/rpt_component/jpc_ex');
 var rptUtil = require("../../../modules/reports/util/rpt_util");
 var fs = require('fs');