jsharmony 1.7.0 → 1.8.0

package/.eslintrc.js

@@ -1,13 +1,20 @@
 module.exports = {
     "env": {
         "browser": true,
-        "node": true
+        "node": true,
+        "es6": true,
     },
-    "extends": "eslint:recommended",
+    "extends": [
+      "eslint:recommended",
+    ],
     "parserOptions": {
-        "ecmaVersion": 6
+        "ecmaVersion": 8
     },
     "rules": {
+        "no-trailing-spaces":[
+          "error",
+          { "skipBlankLines": true }
+        ],
         "indent": [
             "error",
             2,

package/.eslintrc_clientjs.js

@@ -0,0 +1,46 @@
+module.exports = {
+    "env": {
+        "browser": true,
+    },
+    "plugins": [
+        "es5"
+    ],
+    "extends": [
+        "eslint:recommended",
+        "plugin:es5/no-es2015"
+    ],
+    "rules": {
+        "no-trailing-spaces":[
+          "error",
+          { "skipBlankLines": true }
+        ],
+        "indent": [
+            "error",
+            2,
+            { "SwitchCase":1 }
+        ],
+        "linebreak-style": [
+            "error",
+            "windows"
+        ],
+        "quotes": [
+            "error",
+            "single",
+            { "avoidEscape": true }
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "no-unused-vars": [
+          "error",
+          {
+            "args": "none"
+          }
+        ],
+        "no-cond-assign": [
+          "error",
+          "except-parens"
+        ]
+    }
+};

package/.eslintrc_test.js

@@ -0,0 +1,51 @@
+module.exports = {
+    "env": {
+        "browser": true,
+    },
+    "plugins": [
+        "es5"
+    ],
+    "extends": [
+        "eslint:recommended"
+    ],
+    "globals": {
+      "it": "readonly",
+      "describe": "readonly",
+      "after": "readonly",
+    },
+    "rules": {
+        "no-trailing-spaces":[
+          "error",
+          { "skipBlankLines": true }
+        ],
+        "indent": [
+            "error",
+            2,
+            { "SwitchCase":1 }
+        ],
+        "linebreak-style": [
+            "error",
+            "windows"
+        ],
+        "quotes": [
+            "error",
+            "single",
+            { "avoidEscape": true }
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "no-console": "off",
+        "no-unused-vars": [
+          "error",
+          {
+            "args": "none"
+          }
+        ],
+        "no-cond-assign": [
+          "error",
+          "except-parens"
+        ]
+    }
+};

package/AppSrv.DB.js

@@ -60,7 +60,7 @@ exports.ExecScalar = function (context, sql, ptypes, params, callback, dbconfig,
 
 exports.GetDBErrorMessage = function(dberrors, errmsg){
   if(!dberrors) return null;
-  var errmsg = (errmsg||'').toString().toLowerCase();
+  errmsg = (errmsg||'').toString().toLowerCase();
   for (var i = 0; i < dberrors.length; i++) {
     var dberr = dberrors[i];
     var erex = dberr[0].toString().toLowerCase();
@@ -72,7 +72,7 @@ exports.GetDBErrorMessage = function(dberrors, errmsg){
     else if (errmsg.indexOf(erex) >= 0) { return etxt; }
   }
   return null;
-}
+};
 
 exports.AppDBError = function (req, res, err, stats, errorHandler) {
   if(err.stats) stats = err.stats;

package/AppSrv.File.js

@@ -202,7 +202,7 @@ exports.Download = function (req, res, fullmodelid, keyid, fieldid, options) {
     var datalockqueries = [];
     var fields = _this.getFieldsByName(model.fields, fieldlist);
     
-    //Add DataLock parameters to SQL 
+    //Add DataLock parameters to SQL
     this.getDataLockSQL(req, model, model.fields, sql_ptypes, sql_params, verrors, function (datalockquery) { datalockqueries.push(datalockquery); });
     //Add keys as SQL parameters
     var keyfield = keys[0];
@@ -372,8 +372,6 @@ exports.ProcessFileOperations = function (keyval, fileops, rslt, stats, callback
     if (fileop.src) filesrc = Helper.ReplaceAll(fileop.src, '%%%KEY%%%', keyval);
     if (fileop.dest) filedest = Helper.ReplaceAll(fileop.dest, '%%%KEY%%%', keyval);
 
-    var allfiles = [];
-
     async.waterfall([
       function(filehandlercb){
         //Get src file extension

package/AppSrv.Helper.js

@@ -24,7 +24,7 @@ module.exports = exports = {};
 
 exports.getFieldNames = function (req, fields, perm, fcond) {
   return _.map(exports.getFields(req, fields, perm, fcond), 'name');
-}
+};
 
 exports.getFields = function (req, fields, perm, fcond) {
   var rslt = [];
@@ -37,11 +37,11 @@ exports.getFields = function (req, fields, perm, fcond) {
     }
   });
   return rslt;
-}
+};
 
 exports.getFieldNamesWithProp = function (fields, prop) {
   return _.map(exports.getFieldsWithProp(fields, prop), 'name');
-}
+};
 
 exports.getFieldsWithProp = function (fields, prop) {
   var rslt = [];
@@ -52,7 +52,7 @@ exports.getFieldsWithProp = function (fields, prop) {
     }
   });
   return rslt;
-}
+};
 
 exports.getFieldsByName = function (fields, fieldnames, fcond) {
   var rslt = [];
@@ -62,7 +62,7 @@ exports.getFieldsByName = function (fields, fieldnames, fcond) {
     var field = fields[i];
     if (_.includes(fieldnames, field.name)){
       for(var j=0;j<fieldnames_missing.length;j++){
-        if(fieldnames_missing[j]==field.name){ 
+        if(fieldnames_missing[j]==field.name){
           fieldnames_missing.splice(j,1);
           j--;
         }
@@ -74,7 +74,7 @@ exports.getFieldsByName = function (fields, fieldnames, fcond) {
   if(fieldnames_missing.length > 0){ this.jsh.Log.warning('Fields not found: ' + fieldnames_missing.join(', ')); }
   
   return rslt;
-}
+};
 
 //Static function
 exports.getFieldByName = function (fields, fieldname) {
@@ -82,18 +82,18 @@ exports.getFieldByName = function (fields, fieldname) {
     if (fields[i].name == fieldname) return fields[i];
   }
   return;
-}
+};
 
 exports.getKeyNames = function (fields) {
   return _.map(exports.getKeys(fields), 'name');
-}
+};
 
 exports.getKeys = function (fields) {
   return _.filter(fields, function (field) {
     if (field.key) return true;
     return false;
   });
-}
+};
 
 exports.getEncryptedFields = function (req, fields, perm) {
   var rslt = [];

package/AppSrv.ModelExec.js

@@ -26,9 +26,6 @@ exports.getModelExec = function (req, res, fullmodelid, Q, P, form_m) {
   var _this = this;
   var model = this.jsh.getModel(req, fullmodelid);
   if (!Helper.hasModelAction(req, model, 'B')) { Helper.GenError(req, res, -11, _this._tP('Invalid Model Access for @fullmodelid', { fullmodelid })); return; }
-  var fieldlist = this.getFieldNames(req, model.fields, 'B');
-  var filelist = this.getFileFieldNames(req, model.fields, 'B');
-  var keylist = this.getKeyNames(model.fields);
   var crumbfieldlist = this.getFieldNames(req, model.fields, 'C');
   
   if (!_this.ParamCheck('Q', Q, _.union(_.map(crumbfieldlist, function (field) { return '|' + field; }), ['|_action']), false)) {
@@ -36,7 +33,6 @@ exports.getModelExec = function (req, res, fullmodelid, Q, P, form_m) {
   }
   if (!_this.ParamCheck('P', P, [])) { Helper.GenError(req, res, -4, 'Invalid Parameters'); return; }
   
-  var nokey = (('nokey' in model) && (model.nokey));
   var is_browse = (('_action' in Q) && (Q['_action'] == 'browse'));
   
   //Return applicable drop-down lists
@@ -53,12 +49,12 @@ exports.getModelExec = function (req, res, fullmodelid, Q, P, form_m) {
   if(_this.addLOVTasks(req, res, model, Q, dbtasks)===false) return;
   if (!_.isEmpty(verrors)) { Helper.GenError(req, res, -2, verrors[''].join('\n')); return; }
   return dbtasks;
-}
+};
 
 exports.postModelExec = function (req, res, fullmodelid, Q, P, onComplete) {
   var _this = this;
   var jsh = this.jsh;
-  if (!jsh.hasModel(req, fullmodelid)) throw new Error("Error: Model " + fullmodelid + " not found in collection.");
+  if (!jsh.hasModel(req, fullmodelid)) throw new Error('Error: Model ' + fullmodelid + ' not found in collection.');
   var model = jsh.getModel(req, fullmodelid);
   if (!Helper.hasModelAction(req, model, 'U')) { Helper.GenError(req, res, -11, _this._tP('Invalid Model Access for @fullmodelid', { fullmodelid })); return; }
   var db = jsh.getModelDB(req, fullmodelid);
@@ -69,14 +65,14 @@ exports.postModelExec = function (req, res, fullmodelid, Q, P, onComplete) {
   if (!_this.ParamCheck('Q', Q, [])) { Helper.GenError(req, res, -4, 'Invalid Parameters'); return; }
   if (!_this.ParamCheck('P', P, Pcheck)) { Helper.GenError(req, res, -4, 'Invalid Parameters'); return; }
   
-  if (!('sqlexec' in model)) throw new Error("Error: Model " + fullmodelid + " missing sqlexec.");
+  if (!('sqlexec' in model)) throw new Error('Error: Model ' + fullmodelid + ' missing sqlexec.');
   var sql_ptypes = [];
   var sql_params = {};
   var verrors = {};
   var param_datalocks = [];
   var datalockqueries = [];
   
-  //Add fields from post	
+  //Add fields from post
   var fields = _this.getFieldsByName(model.fields, fieldlist);
   _.each(fields, function (field) {
     var fname = field.name;
@@ -96,7 +92,7 @@ exports.postModelExec = function (req, res, fullmodelid, Q, P, onComplete) {
     else throw new Error('Missing parameter ' + fname);
   });
   
-  //Add DataLock parameters to SQL 
+  //Add DataLock parameters to SQL
   _this.getDataLockSQL(req, model, model.fields, sql_ptypes, sql_params, verrors, function (datalockquery) { datalockqueries.push(datalockquery); });
   
   verrors = _.merge(verrors, model.xvalidate.Validate('UK', sql_params));
@@ -116,6 +112,6 @@ exports.postModelExec = function (req, res, fullmodelid, Q, P, onComplete) {
     });
   };
   return onComplete(null, dbtasks);
-}
+};
 
 return module.exports;

package/AppSrv.ModelForm.js

@@ -42,6 +42,7 @@ exports.getModelForm = function (req, res, fullmodelid, Q, P, form_m) {
   if ((encryptedfields.length > 0) && !(req.secure) && (!_this.jsh.Config.system_settings.allow_insecure_http_encryption)) { Helper.GenError(req, res, -51, 'Encrypted fields require HTTPS connection'); return; }
   
 
+
   var is_insert = false;
   var is_browse = false;
   var selecttype = 'single';
@@ -54,11 +55,11 @@ exports.getModelForm = function (req, res, fullmodelid, Q, P, form_m) {
     else if (_this.ParamCheck('Q', Q, _.union(_.map(foreignkeylist, function (field) { return '|' + field; }), ['|_action']), false)) {
       selecttype = 'multiple';
     }
-    else { 
+    else {
       //Display missing keys
       _this.ParamCheck('Q', Q, _.map(keylist, function (key) { return '&' + key; }), true);
       Helper.GenError(req, res, -4, 'Invalid Parameters');
-      return; 
+      return;
     }
   }
   else {
@@ -124,7 +125,7 @@ exports.getModelForm = function (req, res, fullmodelid, Q, P, form_m) {
   var keys = [];
   if (is_insert && !Helper.hasModelAction(req, model, 'I')) { Helper.GenError(req, res, -11, _this._tP('Invalid Model Access for @fullmodelid', { fullmodelid })); return; }
   if (!is_insert && !nokey && !model.unbound) {
-    //Add dynamic parameters from query string	
+    //Add dynamic parameters from query string
     if (selecttype == 'single') keys = this.getKeys(model.fields);
     else if (selecttype == 'multiple') keys = this.getFields(req, model.fields, 'F');
     for (var i = 0; i < keys.length; i++) {
@@ -205,7 +206,7 @@ exports.getModelForm = function (req, res, fullmodelid, Q, P, form_m) {
       }
       callback(err, rslt, stats);
     });
-  }
+  };
   else if (is_insert && (selecttype == 'multiple')) {
     dbtasks[0][fullmodelid] = function (dbtrans, callback) {
       var rslt = [];
@@ -232,7 +233,7 @@ exports.getModelForm = function (req, res, fullmodelid, Q, P, form_m) {
   if(_this.addLOVTasks(req, res, model, Q, dbtasks[1], { action: targetperm })===false) return;
   if (!_.isEmpty(verrors)) { Helper.GenError(req, res, -2, verrors[''].join('\n')); return; }
   return dbtasks;
-}
+};
 
 exports.putModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
   var _this = this;
@@ -303,7 +304,7 @@ exports.putModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
         }
         else throw new Error('Missing parameter ' + fname);
       });
-      //Add DataLock parameters to Encryption SQL 
+      //Add DataLock parameters to Encryption SQL
       _this.getDataLockSQL(req, model, model.fields, enc_sql_ptypes, enc_sql_params, verrors, function (datalockquery) { enc_datalockqueries.push(datalockquery); });
     }
     
@@ -330,7 +331,7 @@ exports.putModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
       else throw new Error('Missing parameter ' + fname);
     });
 
-    var ignore_subs = _.map(subs, function(val){ return '_obj.'+val });
+    var ignore_subs = _.map(subs, function(val){ return '_obj.'+val; });
     verrors = _.merge(verrors, model.xvalidate.Validate('I', _.merge(vfiles, enc_sql_params, sql_params), '', ignore_subs));
     if (!_.isEmpty(verrors)) { Helper.GenError(req, res, -2, verrors[''].join('\n')); return; }
     
@@ -392,14 +393,14 @@ exports.putModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
     }
     if (fileops.length > 0) dbtasks['_POSTPROCESS'] = function (callback) {
       _this.ProcessFileOperationsDone(fileops, callback);
-    }
+    };
     return onComplete(null, dbtasks);
   });
-}
+};
 
 exports.postModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
   var _this = this;
-  if (!this.jsh.hasModel(req, fullmodelid)) throw new Error("Error: Model " + fullmodelid + " not found in collection.");
+  if (!this.jsh.hasModel(req, fullmodelid)) throw new Error('Error: Model ' + fullmodelid + ' not found in collection.');
   var model = this.jsh.getModel(req, fullmodelid);
   if (!Helper.hasModelAction(req, model, 'U')) { Helper.GenError(req, res, -11, _this._tP('Invalid Model Access for @fullmodelid', { fullmodelid })); return; }
   
@@ -434,14 +435,14 @@ exports.postModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
     _.each(encryptedfields, function (field) {
       if (field.type == 'encascii') {
         if ('hash' in field) {
-          var hashfield = _.find(model.fields, function (xfield) { return xfield.name == field.hash; });
+          let hashfield = _.find(model.fields, function (xfield) { return xfield.name == field.hash; });
           if (typeof hashfield == 'undefined') throw new Error('Field ' + field.name + ' hash is not defined.');
           hashfields[field.name] = hashfield;
         }
       }
     });
     
-    //Add key from query string	
+    //Add key from query string
     var keys = _this.getKeys(model.fields);
     _.each(keys, function (field) {
       var fname = field.name;
@@ -485,7 +486,7 @@ exports.postModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
         else throw new Error('Missing parameter ' + fname);
       });
       
-      //Add DataLock parameters to SQL 
+      //Add DataLock parameters to SQL
       _this.getDataLockSQL(req, model, model.fields, sql_ptypes, sql_params, verrors, function (datalockquery) { datalockqueries.push(datalockquery); });
       
       verrors = _.merge(verrors, model.xvalidate.Validate('UK', _.merge(vfiles, sql_params), '', vignorefiles, req._roles));
@@ -501,7 +502,7 @@ exports.postModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
           if (clearval.length == 0) {
             sql_params[field.name] = null;
             if ('hash' in field) {
-              var hashfield = hashfields[field.name];
+              let hashfield = hashfields[field.name];
               sql_ptypes.push(_this.getDBType(hashfield));
               sql_params[hashfield.name] = null;
             }
@@ -513,10 +514,10 @@ exports.postModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
               cipher.update(clearval, 'ascii');
               sql_params[field.name] = cipher.final();
               if ('hash' in field) {
-                var hashfield = hashfields[field.name];
+                let hashfield = hashfields[field.name];
                 if (!(hashfield.salt in _this.jsh.Config.salts)) throw new Error('Hash salt not defined.');
                 sql_ptypes.push(_this.getDBType(hashfield));
-                sql_params[hashfield.name] = crypto.createHash('sha1').update(clearval + _this.jsh.Config.salts[hashfield.salt]).digest();;
+                sql_params[hashfield.name] = crypto.createHash('sha1').update(clearval + _this.jsh.Config.salts[hashfield.salt]).digest();
               }
             }
           }
@@ -557,14 +558,14 @@ exports.postModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
 
     if (fileops.length > 0) dbtasks['_POSTPROCESS'] = function (callback) {
       _this.ProcessFileOperationsDone(fileops, callback);
-    }
+    };
 
     return onComplete(null, dbtasks);
   });
-}
+};
 
 exports.deleteModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
-  if (!this.jsh.hasModel(req, fullmodelid)) throw new Error("Error: Model " + fullmodelid + " not found in collection.");
+  if (!this.jsh.hasModel(req, fullmodelid)) throw new Error('Error: Model ' + fullmodelid + ' not found in collection.');
   var _this = this;
   var model = this.jsh.getModel(req, fullmodelid);
   if (!Helper.hasModelAction(req, model, 'D')) { Helper.GenError(req, res, -11, _this._tP('Invalid Model Access for @fullmodelid', { fullmodelid })); return; }
@@ -595,7 +596,7 @@ exports.deleteModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
     else throw new Error('Missing parameter ' + fname);
   });
   
-  //Add DataLock parameters to SQL 
+  //Add DataLock parameters to SQL
   _this.getDataLockSQL(req, model, model.fields, sql_ptypes, sql_params, verrors, function (datalockquery) { datalockqueries.push(datalockquery); });
   
   verrors = _.merge(verrors, model.xvalidate.Validate('K', sql_params));
@@ -614,9 +615,10 @@ exports.deleteModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
   };
   //Add post-processing task to delete any files
   if (filelist.length > 0) {
+    var keyval = '';
     if (keys.length == 1) keyval = sql_params[keys[0].name];
     else throw new Error('File uploads require one key');
-    if ((typeof keyval == 'undefined') || !keyval) return callback(Helper.NewError('Invalid file key', -13), null);
+    if ((typeof keyval == 'undefined') || !keyval) return Helper.GenError(req, res, -13, 'Invalid file key');
     
     var fileops = [];
     _.each(filelist, function (file) {
@@ -630,9 +632,9 @@ exports.deleteModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
     });
     dbtasks['_POSTPROCESS'] = function (callback) {
       _this.ProcessFileOperationsDone(fileops, callback);
-    }
+    };
   }
   return onComplete(null, dbtasks);
-}
+};
 
 return module.exports;

package/AppSrv.ModelGrid.js

@@ -40,7 +40,7 @@ exports.getModelRecordset = function (req, res, fullmodelid, Q, P, rowlimit, opt
   searchlist = _.union(keylist, searchlist);
   var encryptedfields = this.getFields(req, model.fields, '*', function(field){ return field.type=='encascii'; });
   if (encryptedfields.length > 0) throw new Error('Encrypted fields not supported on GRID (field.type=encascii)');
-  var encryptedfields = this.getEncryptedFields(req, model.fields, 'S');
+  encryptedfields = this.getEncryptedFields(req, model.fields, 'S'); //Encrypted fields can be used for search
   if ((encryptedfields.length > 0) && !(req.secure) && (!_this.jsh.Config.system_settings.allow_insecure_http_encryption)) { Helper.GenError(req, res, -51, 'Encrypted / hash fields require HTTPS connection'); return; }
   var db = _this.jsh.getModelDB(req, fullmodelid);
   if ('d' in Q) P = JSON.parse(Q.d);
@@ -80,7 +80,7 @@ exports.getModelRecordset = function (req, res, fullmodelid, Q, P, rowlimit, opt
     var sortfield = val.substring(1);
     var lovtxtfield = '';
     if(sortfield.indexOf('__'+_this.jsh.map.code_txt+'__')==0){
-      var lovtxtfield = sortfield;
+      lovtxtfield = sortfield;
       sortfield = sortfield.substr(_this.jsh.map.code_txt.length + 4);
     }
     var sortdir = val[0];
@@ -89,7 +89,7 @@ exports.getModelRecordset = function (req, res, fullmodelid, Q, P, rowlimit, opt
     else throw new Error('Invalid sort string');
     if (!_.includes(availablesortfieldslist, sortfield)) throw new Error('Invalid sort field ' + sortfield);
     
-    var field = _this.getFieldByName(model.fields, sortfield);
+    let field = _this.getFieldByName(model.fields, sortfield);
     var sortfieldname = sortfield;
     if(lovtxtfield && field.lov && !field.lov.showcode) sortfieldname = lovtxtfield;
     sortfields.push({ 'field': sortfieldname, 'dir': sortdir, 'sql': (field.sqlsort || '') });
@@ -105,7 +105,7 @@ exports.getModelRecordset = function (req, res, fullmodelid, Q, P, rowlimit, opt
     var search_items = JSON.parse(Q.searchjson);
     var search_join = 'and';
     if (_.isArray(search_items) && (search_items.length > 0)) {
-      for (var i = 0; i < search_items.length; i++) {
+      for (let i = 0; i < search_items.length; i++) {
         var search_column = search_items[i].Column;
         var search_value = search_items[i].Value;
         var search_comparison = 'contains';
@@ -129,7 +129,6 @@ exports.getModelRecordset = function (req, res, fullmodelid, Q, P, rowlimit, opt
         if (search_column == 'ALL') {
           if (searchlist.length == 0) continue;
           var searchall = [];
-          var firstSearchItem = true;
           var searchlistfields = this.getFieldsByName(model.fields, searchlist);
           _.each(searchlistfields, function (field) {
             if(field.disable_search_all) return;
@@ -146,7 +145,7 @@ exports.getModelRecordset = function (req, res, fullmodelid, Q, P, rowlimit, opt
           }
         }
         else {
-          var field = this.getFieldByName(model.fields, search_column);
+          let field = this.getFieldByName(model.fields, search_column);
           var searchtermsql = this.addSearchTerm(req, model, field, i, search_value, search_comparison, sql_ptypes, sql_params, verrors);
           if (searchtermsql) {
             if (searchparams.length) searchparams.push(search_join);
@@ -177,8 +176,8 @@ exports.getModelRecordset = function (req, res, fullmodelid, Q, P, rowlimit, opt
   }
   
   var keys = searchfields;
-  for (var i = 0; i < keys.length; i++) {
-    var field = keys[i];
+  for (let i = 0; i < keys.length; i++) {
+    let field = keys[i];
     var fname = field.name;
     if ((fname in P) && !(fname in sql_params)) {
       var dbtype = _this.getDBType(field);
@@ -186,15 +185,15 @@ exports.getModelRecordset = function (req, res, fullmodelid, Q, P, rowlimit, opt
       sql_params[fname] = _this.DeformatParam(field, P[fname], verrors);
     }
   }
-  for (var i = 0; i < model.fields.length; i++){
-    var field = model.fields[i];
+  for (let i = 0; i < model.fields.length; i++){
+    let field = model.fields[i];
     if(field.lov && field.lov.sqlselect && field.lov.sqlselect_params){
       for(var j = 0; j < field.lov.sqlselect_params.length; j++){
         if(!(field.lov.sqlselect_params[j] in P)){ Helper.GenError(req, res, -99999, model.id + ' > ' + field.name + ': Missing lov.sqlselect parameter @'+field.lov.sqlselect_params[j] + ' - grid parameters must be passed in the querystring or bindings.  The lov.sqlselect is inserted into the grid select statement; if this is a per-record lookup, use the expression LOVSQLTABLE.FIELD = MODELTABLE.FIELD'); return; }
       }
     }
   }
-  //Add DataLock parameters to SQL 
+  //Add DataLock parameters to SQL
   this.getDataLockSQL(req, model, model.fields, sql_ptypes, sql_params, verrors, function (datalockquery) { datalockqueries.push(datalockquery); }, null, fullmodelid);
   verrors = _.merge(verrors, model.xvalidate.Validate('BFK', sql_params, undefined, undefined, undefined, { ignoreUndefined: true }));
   if (!_.isEmpty(verrors)) { Helper.GenError(req, res, -2, verrors[''].join('\n')); return; }
@@ -283,7 +282,7 @@ exports.getModelRecordset = function (req, res, fullmodelid, Q, P, rowlimit, opt
     if(_this.addTitleTasks(req, res, model, P, dbtasks, (is_browse?'B':'U'))===false) return;
   }
   return dbtasks;
-}
+};
 
 exports.exportCSV = function (req, res, dbtasks, fullmodelid, options) {
   var _this = this;
@@ -315,17 +314,17 @@ exports.exportCSV = function (req, res, dbtasks, fullmodelid, options) {
   dbtasks = _.reduce(dbtasks, function (rslt, dbtask, key) { rslt[key] = async.apply(dbtask, undefined); return rslt; }, {});
   db.ExecTasks(dbtasks, function (err, rslt, stats) {
     if (err != null) { _this.AppDBError(req, res, err, stats); return; }
-    if (!fullmodelid in rslt) throw new Error('DB result missing model.');
+    if (!(fullmodelid in rslt)) throw new Error('DB result missing model.');
     var eof = false;
     if (_.isArray(rslt[fullmodelid]) && (_.isObject(rslt[fullmodelid][rslt[fullmodelid].length - 1])) && ('_eof' in rslt[fullmodelid][rslt[fullmodelid].length - 1])) {
-      var eof = rslt[fullmodelid].pop();
-      eof = eof._eof;
+      var rslt_eof = rslt[fullmodelid].pop();
+      eof = rslt_eof._eof;
     }
     //Add header
     if (rslt[fullmodelid].length > 0) {
       var header = {};
       var frow = _.extend({}, rslt[fullmodelid][0]);
-      for (var fcol in frow) {
+      for (let fcol in frow) {
         //Ignore columns that should not be exported
         if(!_.includes(exportColumns, fcol)){ delete frow[fcol]; continue; }
         var field = _this.getFieldByName(model.fields, fcol);
@@ -342,10 +341,10 @@ exports.exportCSV = function (req, res, dbtasks, fullmodelid, options) {
       //If data was truncated, add notification row
       if (!eof) {
         var eofrow = {};
-        for (var fcol in frow) {
+        for (let fcol in frow) {
           eofrow[fcol] = '';
         }
-        for (var fcol in frow) {
+        for (let fcol in frow) {
           eofrow[fcol] = 'Data exceeded limit of ' + _this.jsh.Config.export_rowlimit + ' rows, data has been truncated.';
           break;
         }
@@ -355,7 +354,7 @@ exports.exportCSV = function (req, res, dbtasks, fullmodelid, options) {
       //Process data
       for (var i = dataidx; i < rslt[fullmodelid].length; i++) {
         var crow = rslt[fullmodelid][i];
-        for (ccol in crow) {
+        for (let ccol in crow) {
           if(!ccol) continue;
           //Overwrite code_val with code_txt
           if(Helper.beginsWith(ccol, '__'+jsh.map.code_txt+'__')){
@@ -367,7 +366,7 @@ exports.exportCSV = function (req, res, dbtasks, fullmodelid, options) {
             crow[ccol] = crow[ccol].toISOString();//.replace('T', ' ').replace('Z', '');
           }
         }
-        for (ccol in crow) {
+        for (let ccol in crow) {
           if(!_.includes(exportColumns, ccol)){ delete crow[ccol]; continue; }
         }
       }
@@ -380,6 +379,6 @@ exports.exportCSV = function (req, res, dbtasks, fullmodelid, options) {
     });
     csv.stringify(rslt[fullmodelid], { quotedString: true }).pipe(res);
   });
-}
+};
 
 return module.exports;