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

modules/reports/util/rpt_excel_util.js

@@ -46,7 +46,7 @@ function writeApp(sheets) {
     rst.push('<ScaleCrop>false</ScaleCrop>');
     rst.push('<HeadingPairs>');
     rst.push('<vt:vector size="2" baseType="variant">');
-    rst.push('<vt:variant><vt:lpstr>工作表</vt:lpstr></vt:variant>');
+    rst.push('<vt:variant><vt:lpstr>工作�</vt:lpstr></vt:variant>');
     rst.push('<vt:variant><vt:i4>' + sheets.length + '</vt:i4></vt:variant>');
     rst.push('</vt:vector>');
     rst.push('</HeadingPairs>');
@@ -79,7 +79,7 @@ function writeCore() {
     rst.push('<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">');
     rst.push('<dc:creator>SmartCost</dc:creator>');
     rst.push('<cp:lastModifiedBy>SmartCost</cp:lastModifiedBy>');
-    var dt = new Date(), dtStr = dt.getFullYear() + '-' + p_fillZero(dt.getMonth()) + '-' + p_fillZero(dt.getDate()) + 'T' +
+    var dt = new Date(), dtStr = dt.getFullYear() + '-' + p_fillZero(dt.getMonth()+1) + '-' + p_fillZero(dt.getDate()) + 'T' +
         p_fillZero(dt.getHours()) + ':' + p_fillZero(dt.getMinutes()) + ':' + p_fillZero(dt.getSeconds()) + 'Z';
     rst.push('<dcterms:created xsi:type="dcterms:W3CDTF">' + dtStr + '</dcterms:created>');
     rst.push('<dcterms:modified xsi:type="dcterms:W3CDTF">' + dtStr + '</dcterms:modified>');
@@ -122,7 +122,7 @@ function writeXlRels(sheets){
     return rst;
 }
 function writeTheme(){
-    var rst = fs.readFileSync('./excel_base_files/theme1.xml', 'utf8', 'r');
+    var rst = fs.readFileSync(__dirname + '/excel_base_files/theme1.xml', 'utf8', 'r');
     return rst;
 }
 function writeStyles(styleList){
@@ -362,4 +362,7 @@ module.exports = {
     ,testWriteSharedString: function(sharedStrList){
         return writeSharedString(sharedStrList);
     }
+    ,testWriteTheme: function() {
+        return writeTheme();
+    }
 }

test/unit/excel_export/rpt_excel_export_test.js

@@ -42,5 +42,11 @@ test('check excel output', function(t){
     var sharedStr = rpt_xl_util.testWriteSharedString(sharedStrList);
     fsUtil.writeArrayToFile(sharedStr, '../../../tmp/sharedStrings.xml');
     t.pass('pass shared string');
+    var theme = rpt_xl_util.testWriteTheme();
+    //console.log(theme);
+    var themeArr = [];
+    themeArr.push(theme)
+    fsUtil.writeArrayToFile(themeArr, '../../../tmp/theme1.xml');
+    t.pass('pass theme');
     t.end();
 });

web/main/html/main.html

@@ -515,6 +515,7 @@
     <script type="text/javascript" src="lib/ztree/jquery.ztree.excheck.js"></script>
     <!-- SpreadJs -->
     <script type="text/javascript" src="lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
+    <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
     <!-- Model -->
     <script type="text/javascript" src="web/main/js/models/project.js"></script>
     <script type="text/javascript" src="web/main/js/models/bills.js"></script>