Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

config/cacheCfg.js

@@ -0,0 +1,12 @@
+/**
+ * Created by Tony on 2017/3/24.
+ */
+var rptUtil = require("../modules/reports/util/rpt_util");
+//rptUtil.setReportDefaultCache();
+
+module.exports = {
+    setupDftCache: function() {
+        rptUtil.setReportDefaultCache();
+        //and others...(if any)
+    }
+}

modules/reports/controllers/rpt_controller.js

@@ -6,7 +6,8 @@ var JV = require('../rpt_component/Jpc_ValueDefine');
 var Template = require('../models/rpt_template');
 var TemplateData = require('../models/rpt_temp_data');
 var JpcEx = require('../rpt_component/JpcEx');
-var cache = require('../../../public/cache/cacheUtil');
+//var cache = require('../../../public/cache/cacheUtil');
+var rptUtil = require("../util/rpt_util");
 
 //统一回调函数
 var callback = function(req, res, err, data){
@@ -31,10 +32,7 @@ module.exports = {
                     if (tplData) {
                         var printCom = JpcEx.createNew();
                         rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] = pageSize;
-                        var dftControls = cache.getCache("common_ctrls");
-                        var dftFonts = cache.getCache("common_fonts");
-                        var dftStyles = cache.getCache("common_styles");
-                        var defProperties = {ctrls: dftControls, fonts: dftFonts, styles: dftStyles};
+                        var defProperties = rptUtil.getReportDefaultCache();
                         printCom.initialize(rptTpl);
                         printCom.analyzeData(rptTpl, tplData, defProperties);
                         var maxPages = printCom.totalPages;

modules/reports/controllers/rtp_cfg_controller.js

@@ -1,48 +0,0 @@
-/**
- * Created by Tony on 2017/3/17.
- */
-var cmn_ctrl = require('../models/rpt_control');
-var cmn_font = require('../models/rpt_font');
-var cmn_style = require('../models/rpt_style');
-
-var callback = function(req, res, err, data){
-    if(err){
-        //res.send({success: false, error: err});
-        res.json({success: false, error: err});
-    }
-    else{
-        //res.send({success: true, data: data});
-        res.json({success:true, data: data});
-    }
-}
-
-module.exports = {
-    setReportDefaultCache: function (req, res) {
-        var err = "", defProperties = {ctrls: null, fonts: null, styles: null};
-        cmn_ctrl.getAll(null, function(err, ctrls){
-            if (ctrls) {
-                cache.common_ctrls = ctrls;
-                defProperties.ctrls = ctrls;
-            } else {
-                err += 'No default controls! ';
-            }
-        });
-        cmn_font.getAll(null, function(err, fonts){
-            if (fonts) {
-                cache.common_fonts = fonts;
-                defProperties.fonts = fonts;
-            } else {
-                err += 'No default fonts! ';
-            }
-        });
-        cmn_style.getAll(null, function(err, styles){
-            if (styles) {
-                cache.common_styles = styles;
-                defProperties.styles = styles;
-            } else {
-                err += 'No default styles!';
-            }
-        });
-        callback(req, res, err, defProperties);
-    }
-}

modules/reports/models/cfg_control.js

@@ -20,7 +20,7 @@ var CtrlDAO = function(){};
 
 //根据id
 CtrlDAO.prototype.get = function(id, callback){
-    Control.find({ID: id}, function(err, templates){
+    Control.find({ID: id}, '-_id', function(err, templates){
         if(templates.length){
             callback(false, templates[0]);
         }
@@ -31,7 +31,7 @@ CtrlDAO.prototype.get = function(id, callback){
 }
 
 CtrlDAO.prototype.getAll = function(id, callback){
-    Control.find({}, function(err, templates){
+    Control.find({}, '-_id', function(err, templates){
         if(templates.length){
             callback(false, templates);
         }

modules/reports/models/cfg_font.js

@@ -23,7 +23,7 @@ var FontDAO = function(){};
 
 //根据id
 FontDAO.prototype.get = function(id, callback){
-    Font.find({ID: id}, function(err, templates){
+    Font.find({ID: id}, '-_id', function(err, templates){
         if(templates.length){
             callback(false, templates[0]);
         }
@@ -34,7 +34,7 @@ FontDAO.prototype.get = function(id, callback){
 }
 
 FontDAO.prototype.getAll = function(id, callback){
-    Font.find({}, function(err, templates){
+    Font.find({}, '-_id', function(err, templates){
         if(templates.length){
             callback(false, templates);
         }

modules/reports/models/cfg_style.js

@@ -16,7 +16,7 @@ var StyleDAO = function(){};
 
 //根据id
 StyleDAO.prototype.get = function(id, callback){
-    Style.find({ID: id}, function(err, templates){
+    Style.find({ID: id}, '-_id', function(err, templates){
         if(templates.length){
             callback(false, templates[0]);
         }
@@ -27,7 +27,7 @@ StyleDAO.prototype.get = function(id, callback){
 }
 
 StyleDAO.prototype.getAll = function(id, callback){
-    Style.find({}, function(err, templates){
+    Style.find({}, '-_id', function(err, templates){
         if(templates.length){
             callback(false, templates);
         }

modules/reports/models/rpt_temp_data.js

@@ -18,8 +18,6 @@ var RplTplDataDAO = function(){};
 
 //根据id获取临时数据
 RplTplDataDAO.prototype.get = function(tpl_id, callback){
-    //TemplateData.find({"Data_Key": tpl_id}, function(err, templates){
-    //TemplateData.find({}, function(err, templates){
     TemplateData.find({"Data_Key": tpl_id}, function(err, templates){
         if(templates.length){
             callback(false, templates[0]);
@@ -28,6 +26,11 @@ RplTplDataDAO.prototype.get = function(tpl_id, callback){
             callback('查找不到模板临时数据！');
         }
     })
+};
+
+RplTplDataDAO.prototype.getPromise = function(tpl_id, callback){
+    return TemplateData.findOne({"Data_Key": tpl_id}).exec();
 }
 
+
 module.exports = new RplTplDataDAO();

modules/reports/models/rpt_template.js

@@ -22,9 +22,8 @@ var Template = smartcostdb.model("rpt_templates", RptTemplateSchema);
 
 var RplTplDAO = function(){};
 
-//根据id获取试卷
 RplTplDAO.prototype.get = function(grpId, id, callback){
-    Template.find({GROUP_KEY: grpId, ID_KEY: id}, function(err, templates){
+    Template.find({GROUP_KEY: grpId, ID_KEY: id}, '-_id', function(err, templates){
         if(templates.length){
             callback(false, templates[0]);
         }
@@ -32,6 +31,11 @@ RplTplDAO.prototype.get = function(grpId, id, callback){
             callback('查找不到报表模板！');
         }
     })
+};
+
+RplTplDAO.prototype.getPromise = function(grpId, id){
+    var rst = Template.findOne({GROUP_KEY: grpId, ID_KEY: id}, '-_id').exec() ;
+    return rst;
 }
 
 module.exports = new RplTplDAO();

modules/reports/util/rpt_util.js

@@ -0,0 +1,36 @@
+/**
+ * Created by Tony on 2017/3/24.
+ */
+var cache = require('../../../public/cache/cacheUtil');
+var cmn_ctrl = require('../models/cfg_control');
+var cmn_font = require('../models/cfg_font');
+var cmn_style = require('../models/cfg_style');
+
+const RPT_CFG_GRP = 'rpt_cfg';
+
+module.exports = {
+    setReportDefaultCache: function () {
+        cmn_ctrl.getAll(null, function(err, ctrls){
+            if (ctrls) {
+                cache.setCache(RPT_CFG_GRP,'common_ctrls',ctrls);
+            }
+        });
+        cmn_font.getAll(null, function(err, fonts){
+            if (fonts) {
+                cache.setCache(RPT_CFG_GRP,'common_fonts',fonts);
+            }
+        });
+        cmn_style.getAll(null, function(err, styles){
+            if (styles) {
+                cache.setCache(RPT_CFG_GRP,'common_styles',styles);
+            }
+        });
+    },
+    getReportDefaultCache: function () {
+        var rst = {ctrls: null, fonts: null, styles: null};
+        rst.ctrls = cache.getCache(RPT_CFG_GRP,'common_ctrls');
+        rst.fonts = cache.getCache(RPT_CFG_GRP,'common_fonts');
+        rst.styles = cache.getCache(RPT_CFG_GRP,'common_styles');
+        return rst;
+    }
+}

server.js

@@ -3,6 +3,9 @@ var express = require('express');
 var config = require("./config/config.js");
 //config.setToLocalDb();
 config.setToQaDb();
+//config.setupCache();
+var cfgCacheUtil = require("./config/cacheCfg");
+cfgCacheUtil.setupDftCache();
 
 var path = require('path');
 var session = require('express-session');
@@ -65,6 +68,16 @@ app.get('/main',  function(req, res) {
 });
 
 var rpt_Router = require("./modules/reports/routes/report_router");
+app.get('/report',  function(req, res) {
+    if (!req.session.userAccount) {
+        res.redirect('/login');
+    }
+    else {
+        res.render('report/html/RptHome.html',
+            {userAccount: req.session.userAccount,
+                userID: req.session.userID});
+    }
+});
 app.use("/report", rpt_Router);
 
 //zhangenping add 2017.0.13-----------------------------------------begin
@@ -82,8 +95,10 @@ app.use(function(req, res, next) {
 	res.status(404).sendFile(_rootDir+'/src/404.html');
 });
 app.use(function(err, req, res, next) {
-	console.error(err.stack);
-	res.status(500).send('500 Error');
+    console.error(err.stack);
+    res.status(500).send('500 Error');
 });
 
 app.listen(6060);
+
+

test/unit/cache/testCacheUsage.js

@@ -1,8 +1,11 @@
 /**
  * Created by Tony on 2017/3/20.
  */
+var mongoose = require('mongoose');
 var test = require('tape');
 var cache = require('../../../public/cache/cacheUtil');
+var rptUtil = require("../../../modules/reports/util/rpt_util");
+//var cfgCacheUtil = require("../../../config/cacheCfg");
 
 test('test cache usage:', function(t) {
     cache.setCache("unit_Test_Grp","unit_TestKey","hello my cache!");
@@ -10,4 +13,25 @@ test('test cache usage:', function(t) {
     console.log(msg);
     t.equal(msg, "hello my cache!")
     t.end();
-})
+});
+
+test('test report default config cache', function(t){
+    //setReportDefaultCache
+    rptUtil.setReportDefaultCache();
+    //cfgCacheUtil.setupDftRptCache();
+    setTimeout(function(){
+        var cfg = rptUtil.getReportDefaultCache();
+        console.log(cfg)
+        t.equal(cfg.ctrls != null, true);
+        t.equal(cfg.fonts != null, true);
+        t.equal(cfg.styles != null, true);
+        //t.pass('just pass');
+        t.end();
+    }, 1000 );
+});
+
+test('finish', function (t) {
+    mongoose.disconnect();
+    t.pass('closing db connection');
+    t.end();
+});

test/unit/reports/testRpt.js

@@ -2,48 +2,50 @@
  * Created by Tony on 2017/3/17.
  */
 var test = require('tape');
-var cmn_ctrl = require('../../../modules/reports/models/cfg_control');
-var cmn_font = require('../../../modules/reports/models/cfg_font');
-var cmn_style = require('../../../modules/reports/models/cfg_style');
 var mongoose = require('mongoose');
+var JV = require('../../../modules/reports/rpt_component/Jpc_ValueDefine');
+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 rptUtil = require("../../../modules/reports/util/rpt_util");
 
 test('test get report pages function: ', function (t) {
-    /*/
-    t.plan(1);
-    t.equal(2 + 3, 5);
-    /*/
-    cmn_ctrl.getAll(null, function(err, ctrls){
-        t.notEqual(ctrls, null);
-        t.end();
-        return true;
-    });
-    //*/
+    rptUtil.setReportDefaultCache();
+    t.pass('just pass for cache setup!');
+    t.end();
 });
 
 test('test get report pages function: ', function (t) {
-    /*/
-    t.plan(1);
-    t.equal(7 * 8 + 9, 65);
-    /*/
-    cmn_font.getAll(null, function(err, fonts){
-        t.notEqual(fonts, null);
+    var grp_id = "SC";
+    var tpl_id = "07_1";
+    var pageSize = "A4";
+    var rptTpl = null, tplData = null;
+    Template.getPromise(grp_id, tpl_id).then(function(rst) {
+        //console.log(rst);
+        rptTpl = rst;
+        console.log(rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE]);
+        t.equal(rptTpl != null, true);
+        return TemplateData.getPromise(tpl_id);
+    }).then(function(rst){
+        //console.log(rst);
+        tplData = rst;
+        t.equal(tplData != null, true);
+        if (tplData) {
+            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);
+            printCom.analyzeData(rptTpl, tplData, defProperties);
+            var maxPages = printCom.totalPages;
+            var pageRst = printCom.outputAsSimpleJSONPageArray(rptTpl, tplData, 1, maxPages, defProperties);
+            t.equal(pageRst != null, true);
+        }
         t.end();
-        return true;
-    });
-    //*/
-});
-
-test('test get report pages function: ', function (t) {
-    /*/
-    t.plan(1);
-    t.equal(1+2, 65);
-    /*/
-    cmn_style.getAll(null, function(err, styles){
-        t.notEqual(styles, null);
+    }).catch(function (err) {
+        console.log("err: " + err);
         t.end();
-        return true;
-    });
-    //*/
+    })
+
 });
 
 test('finish', function (t) {

web/report/html/RptHome.html

@@ -0,0 +1,167 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Report Demo!</title>
+</head>
+<body>
+    <!--
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
+    -->
+
+    <script src="/src/lib/jquery-1.9.1.min.js"></script>
+    <script type="text/javascript" src="/src/jpc_report/rpt_component/Jpc_Output_ValueDefine.js"></script>
+    <script type="text/javascript" src="/src/jpc_report/rpt_component/Jpc_Output.js"></script>
+    <table id="forPrintHide">
+        <tr>
+            <td width="5"></td>
+            <td>
+                <select name="select1" id="select_k1" onchange="ajaxCall()">
+                    <option value="SC;07_1">07-1表</option>
+                    <option value="SC;08_2">08-2表</option>
+                    <option value="MEASURE;M_ZB03_QDZF_09">计量-清单支付09表</option>
+                </select>
+                <select name="select2" id="select_k2" onchange="ajaxCall()">
+                    <option value="A4">A4</option>
+                    <option value="A3">A3</option>
+                </select>
+            </td>
+            <td>
+                <input type="button" value="显示报表" onclick="ajaxCall()"/>
+                <input type="button" value="< 前一页" onclick="showPage(-1)"/>
+                <input type="button" value="后一页 >" onclick="showPage(1)"/>
+                <input type="button" value="打印" onclick="printCurrentPage()"/>
+            </td>
+        </tr>
+    </table>
+    <canvas id="myCanvas" width="2000" height="1280">
+    </canvas>
+</body>
+<style>
+    body {
+        margin: 0px;
+        padding: 0px;
+    }
+    #myCanvas {
+        border: 0px solid #9C9898;
+    }
+</style>
+<script>
+    var currentPage = 1;
+    var pageRst = null;
+    var currentRptTpl = null;
+    var maxPages = 20;
+    var defProperties = null;
+    var rpt_grp = null;
+    var rpt_id = null;
+    var rpt_size = null;
+
+    window.onload = function (){
+        $.ajax({
+            type:"POST",
+            url: 'http://localhost:3010/api/setDftCache',
+            dataType: 'json',
+            cache: false,
+            timeout: 10000,
+            success: function(data){
+                defProperties = data;
+            },
+            error: function(jqXHR, textStatus, errorThrown){
+                //alert('error ' + textStatus + " " + errorThrown);
+                //or create local default cache...
+            }
+        });
+
+    }
+
+    function printCurrentPage() {
+        if (currentRptTpl) {
+            //$("table#forPrintHide").css
+            $("table#forPrintHide").css("display","none");
+            window.print();
+            //$("canvas#myCanvas").printArea();
+        }
+    }
+
+    function getScreenDPI() {
+        var me = this, arrDPI = [];
+        if (window.screen.deviceXDPI != undefined) {
+            arrDPI.push(window.screen.deviceXDPI);
+            arrDPI.push(window.screen.deviceYDPI);
+        } else {
+            var tmpNode = document.createElement("DIV");
+            tmpNode.style.cssText = "width:1in;height:1in;position:absolute;left:0px;top:0px;z-index:99;visibility:hidden";
+            document.body.appendChild(tmpNode);
+            arrDPI.push(parseInt(tmpNode.offsetWidth));
+            arrDPI.push(parseInt(tmpNode.offsetHeight));
+            tmpNode.parentNode.removeChild(tmpNode);
+        }
+        return arrDPI;
+    }
+
+    function setupReport() {
+        var rst = false;
+        var rpt = document.getElementById("select_k1");
+        var size = document.getElementById("select_k2");
+        if (rpt.selectedIndex >= 0 && size.selectedIndex >= 0) {
+            var strs = rpt.options[rpt.selectedIndex].value.split(';');
+            rpt_grp = strs[0];
+            rpt_id = strs[1];
+            rpt_size = size.options[size.selectedIndex].value;
+            rst = true;
+        }
+        return rst;
+    }
+
+    function showPage(pageStep, cv) {
+        if (currentPage + pageStep >= 1 && currentPage + pageStep <= maxPages) {
+            currentPage = currentPage + pageStep;
+            var canvas = null;
+            if (cv) {
+                canvas = cv;
+            } else canvas = document.getElementById("myCanvas");
+            JpcCanvasOutput.cleanCanvas(canvas);
+            JpcCanvasOutput.drawPageBorder(currentRptTpl, canvas, getScreenDPI());
+            JpcCanvasOutput.drawToCanvas(pageRst, canvas, currentPage);
+        }
+    }
+
+    function ajaxCall() {
+        if (setupReport()) {
+            var canvas = document.getElementById("myCanvas");
+            canvas.style.cursor = "wait";
+            $.ajax({
+                type:"POST",
+                url: 'http://localhost:3010/api/getReport',
+                //url: 'http://www.smart_cost_tony.cn:3010/api/getReport',
+                data: {"grp_id": rpt_grp, "tpl_id": rpt_id, "pageSize": rpt_size},
+                dataType: 'json',
+                cache: false,
+                timeout: 15000,
+                success: function(result){
+                    canvas.style.cursor = "default";
+                    currentPage = 1;
+                    pageRst = result.data;
+                    if (pageRst) {
+                        maxPages = pageRst.items.length;
+                        currentRptTpl = pageRst;
+                        if (rpt_size === "A4") {
+                            canvas.width = 1200;
+                            canvas.height = 900;
+                        } else if (rpt_size === "A3") {
+                            canvas.width = 1880;
+                            canvas.height = 1200;
+                        }
+                        showPage(0, canvas);
+                    }
+                },
+                error: function(jqXHR, textStatus, errorThrown){
+                    canvas.style.cursor = "default";
+                    alert('error ' + textStatus + " " + errorThrown);
+                }
+            });
+        }
+    }
+</script>
+
+</html>