jqgrid_utils 1.5.0 → 1.5.3

package/README.md

@@ -27,6 +27,7 @@ A module for Jqgrid_utils
 
 
 * [Jqgrid_utils](#module_Jqgrid_utils)
+    * [module.exports#get_col_model_from_data(obj, data, exclude, col_model)](#exp_module_Jqgrid_utils--module.exports+get_col_model_from_data) ⇒ <code>array</code> ⏏
     * [module.exports#_date112_to_DMY(cell_value, seperator)](#exp_module_Jqgrid_utils--module.exports+_date112_to_DMY) ⏏
     * [module.exports#date112_to_DMY(col_model, edit_field, seperator)](#exp_module_Jqgrid_utils--module.exports+date112_to_DMY) ⏏
     * [module.exports#add_ok_button(col_model, fields)](#exp_module_Jqgrid_utils--module.exports+add_ok_button) ⇒ <code>array</code> ⏏
@@ -57,6 +58,31 @@ A module for Jqgrid_utils
     * [module.exports#set_filter(grid, data, fx, append_to)](#exp_module_Jqgrid_utils--module.exports+set_filter) ⏏
     * [module.exports#_filter()](#exp_module_Jqgrid_utils--module.exports+_filter) ⏏
 
+<a name="exp_module_Jqgrid_utils--module.exports+get_col_model_from_data"></a>
+
+### module.exports#get\_col\_model\_from\_data(obj, data, exclude, col_model) ⇒ <code>array</code> ⏏
+Get basic colModel data from raw data
+
+**Kind**: Exported function  
+**Returns**: <code>array</code> - - col_model  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| obj | <code>array</code> | grid object |
+| data | <code>array</code> | raw data object from loadComplete |
+| exclude | <code>array</code> | list of columns to exclude (optional) |
+| col_model | <code>array</code> | existing colModel (optional) |
+
+**Example**  
+```js
+var jqu = new Jqgrid_utils();
+,loadComplete: async function(data)
+{
+  let col_model = jQuery(this).jqGrid('getGridParam',"colModel");
+  const new_col_model= await update_col_model(this, data, ['id','cust_qty','waiting_supplier_orders','waiting_assemblies','pending_components','pending_customer_order',col_model);
+  jQuery(this).jqGrid('setGridParam',{colModel:new_col_model});
+},
+```
 <a name="exp_module_Jqgrid_utils--module.exports+_date112_to_DMY"></a>
 
 ### module.exports#\_date112\_to\_DMY(cell_value, seperator) ⏏

package/dist/jqgrid_utils.js

@@ -22,6 +22,56 @@ module.exports = class Vanilla_website_utils
 
   }
 
+/**
+* Get basic colModel data from raw data
+@alias module:Jqgrid_utils
+@param {array} - grid object 
+@param {array} - raw data object from loadComplete
+@param {array} - list of columns to exclude (optional)
+@param {array} - existing colModel (optional)
+@returns {array} - col_model
+@example
+var jqu = new Jqgrid_utils();
+,loadComplete: async function(data)
+{
+  let col_model = jQuery(this).jqGrid('getGridParam',"colModel");
+  const new_col_model= await update_col_model(this, data, ['id','cust_qty','waiting_supplier_orders','waiting_assemblies','pending_components','pending_customer_order',col_model);
+  jQuery(this).jqGrid('setGridParam',{colModel:new_col_model});
+},
+*/
+  async get_col_model_from_data(obj, data, exclude=[],col_model=[])
+  {
+   let cols = [];
+   for(let i in data)
+   {
+     const keys = Object.keys(data[i]);
+     for(let ii in keys)
+     {
+       const key = keys[ii];
+       cols.push(key);
+     }
+   }
+   cols = cols.filter((item, pos) => cols.indexOf(item) === pos);
+   let mcols = [];
+   for(let i in col_model)
+   {
+     mcols.push(col_model[i]['name']);
+   }
+  
+
+   let diff = cols.filter(x => !mcols.includes(x));
+   const _exclude = new Set(exclude);
+   diff = diff.filter((name) => {return !_exclude.has(name); });
+   diff.sort();
+
+   for(let x=0; x < diff.length; x++)
+   {
+      col_model.push({'name': diff[x],'label': diff[x]});
+   }
+   //console.log(col_model);
+   return col_model;
+  }
+
 
 /**
 * Convert a 112 date string to a DMY format with sepertaor - sync function
@@ -67,6 +117,7 @@ console.log(_data);
       {
         col_model[i]['formatter'] = function (cell_value, o)
         {
+          cell_value = cell_value.toString();
           let value = cell_value;
           if(cell_value.length >= 8 && cell_value.indexOf(seperator) === -1)
           {
@@ -677,15 +728,19 @@ async add_link_details(col_model, url, edit_field, attr = '', keys, format)
             {
               pref = pref.slice(0, -1);
             }
-
-            const _cell_val = self.__cell_format(cell_val, format);
-
-            cell_val = '<a ' + attr + 'href="' + url + pref + '"> ' + _cell_val + '</a>';
+              const _cell_val = self.__cell_format(cell_val, format);
+              cell_val = '<a ' + attr + 'href="' + url + pref + '"> ' + _cell_val + '</a>';
           }
 
         }
-
-        return cell_val;
+        if(cell_val)
+        {
+          return cell_val;
+        }
+        else
+        {
+          return '';
+        }
       };
     }
 

package/jqgrid_utils.js

@@ -21,6 +21,56 @@ module.exports = class Vanilla_website_utils
 
   }
 
+/**
+* Get basic colModel data from raw data
+@alias module:Jqgrid_utils
+@param {array} - grid object 
+@param {array} - raw data object from loadComplete
+@param {array} - list of columns to exclude (optional)
+@param {array} - existing colModel (optional)
+@returns {array} - col_model
+@example
+var jqu = new Jqgrid_utils();
+,loadComplete: async function(data)
+{
+  let col_model = jQuery(this).jqGrid('getGridParam',"colModel");
+  const new_col_model= await update_col_model(this, data, ['id','cust_qty','waiting_supplier_orders','waiting_assemblies','pending_components','pending_customer_order',col_model);
+  jQuery(this).jqGrid('setGridParam',{colModel:new_col_model});
+},
+*/
+  async get_col_model_from_data(obj, data, exclude=[],col_model=[])
+  {
+   let cols = [];
+   for(let i in data)
+   {
+     const keys = Object.keys(data[i]);
+     for(let ii in keys)
+     {
+       const key = keys[ii];
+       cols.push(key);
+     }
+   }
+   cols = cols.filter((item, pos) => cols.indexOf(item) === pos);
+   let mcols = [];
+   for(let i in col_model)
+   {
+     mcols.push(col_model[i]['name']);
+   }
+  
+
+   let diff = cols.filter(x => !mcols.includes(x));
+   const _exclude = new Set(exclude);
+   diff = diff.filter((name) => {return !_exclude.has(name); });
+   diff.sort();
+
+   for(let x=0; x < diff.length; x++)
+   {
+      col_model.push({'name': diff[x],'label': diff[x]});
+   }
+   //console.log(col_model);
+   return col_model;
+  }
+
 
 /**
 * Convert a 112 date string to a DMY format with sepertaor - sync function
@@ -66,6 +116,7 @@ console.log(_data);
       {
         col_model[i]['formatter'] = function (cell_value, o)
         {
+          cell_value = cell_value.toString();
           let value = cell_value;
           if(cell_value.length >= 8 && cell_value.indexOf(seperator) === -1)
           {
@@ -676,15 +727,19 @@ async add_link_details(col_model, url, edit_field, attr = '', keys, format)
             {
               pref = pref.slice(0, -1);
             }
-
-            const _cell_val = self.__cell_format(cell_val, format);
-
-            cell_val = '<a ' + attr + 'href="' + url + pref + '"> ' + _cell_val + '</a>';
+              const _cell_val = self.__cell_format(cell_val, format);
+              cell_val = '<a ' + attr + 'href="' + url + pref + '"> ' + _cell_val + '</a>';
           }
 
         }
-
-        return cell_val;
+        if(cell_val)
+        {
+          return cell_val;
+        }
+        else
+        {
+          return '';
+        }
       };
     }
 

package/package.json

@@ -29,5 +29,5 @@
   {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "1.5.0"
+  "version": "1.5.3"
 }