jsharmony 1.6.0 → 1.7.0

package/AppSrv.Report.js

@@ -29,7 +29,7 @@ exports.getReport = function (req, res, fullmodelid, Q, P, callback) {
   var _this = this;
   if (typeof Q == 'undefined') Q = req.query;
   if (typeof P == 'undefined') P = req.body;
-  if (typeof callback == 'undefined') callback = function (err, tmppath, dispose) {
+  if (typeof callback == 'undefined') callback = function (err, tmppath, dispose, dbdata) {
     if(err){ Helper.GenError(req, res, -99999, err.toString()); return; }
 
     /* Report Done */ 
@@ -37,23 +37,34 @@ exports.getReport = function (req, res, fullmodelid, Q, P, callback) {
       if (err != null) return dispose();
       var fsize = stat.size;
       var model = _this.jsh.getModel(req, fullmodelid);
-      //Send MIME type
-      if(model.format=='xlsx'){
-        res.writeHead(200, {
-          'Content-Type': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-          'Content-Length': fsize,
-          'Content-Disposition': 'filename = ' + encodeURIComponent(fullmodelid + '.xlsx')
-        });
-      }
-      else {
-        res.writeHead(200, {
-          'Content-Type': 'application/pdf',
-          'Content-Length': fsize,
-          'Content-Disposition': 'filename = ' + encodeURIComponent(fullmodelid + '.pdf')
-        });
-      }
-      var rs = fs.createReadStream(tmppath);
-      rs.pipe(res).on('finish', function () { dispose(); });
+      var filename = fullmodelid + (model.format == 'xlsx' ? '.xlsx' : '.pdf');
+      Helper.execif(model.ongetfilename,
+        function(done){
+          model.ongetfilename(function(rslt){
+            if(rslt) filename = rslt.toString();
+            return done();
+          }, model, Q, P, req, dbdata);
+        },
+        function(){
+          //Send MIME type
+          if(model.format=='xlsx'){
+            res.writeHead(200, {
+              'Content-Type': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+              'Content-Length': fsize,
+              'Content-Disposition': 'filename = ' + encodeURIComponent(filename)
+            });
+          }
+          else {
+            res.writeHead(200, {
+              'Content-Type': 'application/pdf',
+              'Content-Length': fsize,
+              'Content-Disposition': 'filename = ' + encodeURIComponent(filename)
+            });
+          }
+          var rs = fs.createReadStream(tmppath);
+          rs.pipe(res).on('finish', function () { dispose(); });
+        }
+      );
     });
   }
   

package/jsHarmony.LoadModels.js

@@ -1752,7 +1752,7 @@ exports.ParseEntities = function () {
     }
     
     //Convert mutli-line variables to single string
-    ParseMultiLineProperties(model, ['js', 'jslib', 'sqlselect', 'sqldownloadselect', 'sqlinsert', 'sqlinsertencrypt', 'sqlupdate', 'sqldelete', 'sqlexec', 'sqlwhere', 'sqlgetinsertkeys', 'oninit', 'onload', 'onloadimmediate', 'oninsert', 'onvalidate', 'onupdate', 'ondestroy', 'oncommit', 'onchange']);
+    ParseMultiLineProperties(model, ['js', 'jslib', 'sqlselect', 'sqldownloadselect', 'sqlinsert', 'sqlinsertencrypt', 'sqlupdate', 'sqldelete', 'sqlexec', 'sqlwhere', 'sqlgetinsertkeys', 'ongetfilename', 'oninit', 'onload', 'onloadimmediate', 'oninsert', 'onvalidate', 'onupdate', 'ondestroy', 'oncommit', 'onchange']);
     if (model.breadcrumbs) ParseMultiLineProperties(model.breadcrumbs, ['sql']);
     if (model.fields) _.each(model.fields, function (field) {
       ParseMultiLineProperties(field, ['onchange', 'sqlselect', 'sqlupdate', 'sqlinsert', 'sqlwhere', 'sqlsort', 'sqlsearch', 'sqlsearchsound', 'value']);
@@ -1908,6 +1908,8 @@ exports.ParseEntities = function () {
       });
     }
     _this.validateDisplayLayouts(model);
+    if(model.ongetfilename) model.ongetfilename = _this.createFunction(model.ongetfilename, ['callback', 'xmodel', 'Q', 'P', 'req', 'dbdata'], model.id+' model.ongetfilename');
+
 
     //Validate Model and Field Parameters
     var _v_model = [
@@ -1917,7 +1919,7 @@ exports.ParseEntities = function () {
       'hide_system_buttons', 'grid_expand_search', 'grid_rowcount', 'reselectafteredit', 'newrowposition', 'commitlevel', 'validationlevel',
       'grid_require_search', 'default_search', 'grid_static', 'rowstyle', 'rowclass', 'rowlimit', 'disableautoload',
       'oninit', 'oncommit', 'onload', 'oninsert', 'onupdate', 'onvalidate', 'onloadstate', 'ongetstate', 'onrowbind', 'onrowunbind', 'ondestroy', 'onchange', 'getapi', 'onrender', 'onrendered',
-      'js', 'jslib', 'ejs', 'header', 'css', 'dberrors', 'tablestyle', 'tableclass', 'formstyle', 'formclass', 'popup', 'onloadimmediate', 'sqlwhere', 'sqlwhere_disabled_on_insert', 'breadcrumbs', 'tabpos', 'tabs', 'tabpanelstyle',
+      'js', 'jslib', 'ejs', 'header', 'css', 'dberrors', 'tablestyle', 'tableclass', 'formstyle', 'formclass', 'popup', 'ongetfilename', 'onloadimmediate', 'sqlwhere', 'sqlwhere_disabled_on_insert', 'breadcrumbs', 'tabpos', 'tabs', 'tabpanelstyle',
       'nokey', 'nodatalock', 'unbound', 'duplicate', 'sqlselect', 'sqlupdate', 'sqlinsert', 'sqlgetinsertkeys', 'sqldelete', 'sqlexec', 'sqlexec_comment', 'sqltype', 'onroute', 'tabcode', 'noresultsmessage', 'bindings',
       'path', 'module', 'templates', 'db', 'onecolumn', 'namespace',
       //Report Parameters

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsharmony",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Rapid Application Development (RAD) Platform for Node.js Database Application Development",
   "main": "index.js",
   "scripts": {