zet-lib 1.3.5 → 1.3.7

package/lib/Form.js

@@ -62,7 +62,7 @@ Form.field = (obj) => {
     }
   }
   let type = obj.type || 'text',
-    id = Form.addProperty('id', [obj.id]),
+    id = obj.isTableModule ? '' : Form.addProperty('id', [obj.id]),
     name = obj.name ? ` name="${obj.name}" ` : '',
     title = obj.title || '',
     prepend = obj.prepend || '',
@@ -916,7 +916,7 @@ Form.modal = (obj, LANGUAGE = {}) => {
                         <input type="hidden" id="serialize_right" name="serialize_right" value=''/>
                     </form>
                 </div> <!-- .dynagrid-config-form -->`,
-    footer: `<select id="zgrid_default_type" class="form-control select-sm" style="width:100px"><option value="1">Data Table</option><option value="2">Table</option> </select>
+    footer: `<select id="zgrid_default_type" class="form-control select-sm" style="width:100px"><option value="1">Standart</option><option value="2">Fixed Header</option><option value="3">Footer Total</option><option value="4">No Wrap</option><option value="5">Fixed Header & No Wrap</option><option value="6">Footer Total & No Wrap</option><option value="7">Fixed Header & Footer & No Wrap</option></select>
 <button type="reset" class="btn btn-default refresh gridreload image-button" title="Abort any changes and reset settings">
                     <img src="/assets/icons/refresh.svg" class="icons-bg-black"> ${LANGUAGE.reset || 'Reset'}
                 </button>

package/lib/languages/lang_en.js

@@ -13,7 +13,7 @@ langs['grid_labeling'] = 'Labeling'
 langs['grid_configure_field_labeling'] = 'Configure Field Labeling'
 langs['grid_personalize_labeling'] = 'Personalize Labeling'
 langs['grid_personalize_setting'] = 'Personalize grid settings'
-langs['grid_refresh'] = 'Refresh / Factory Reset'
+langs['grid_refresh'] = 'Refresh / Reset Filter'
 langs.settings = 'Setting'
 langs.settings_info = 'Settings'
 langs.grid_settings = 'Settings Grid'

package/lib/languages/lang_id.js

@@ -13,7 +13,7 @@ langs['grid_labeling'] = 'Penamaan'
 langs['grid_configure_field_labeling'] = 'Configure Field Labeling'
 langs['grid_personalize_labeling'] = 'Personalize Labeling'
 langs['grid_personalize_setting'] = 'Personalize grid settings'
-langs['grid_refresh'] = 'Muat Ulang / Kembali setelan pabrik'
+langs['grid_refresh'] = 'Muat Ulang / Hapus filter'
 langs.settings = 'Pengaturan'
 langs.settings_info = 'Pengaturan'
 langs.grid_settings = 'Pengaturan Grid'

package/lib/zRoute.js

@@ -2475,7 +2475,7 @@ zRoute.forms = (req, res, MYMODEL, relations, data = {}, tableRelations = {}) =>
           break
         case 'radio':
           obj.type = 'radio'
-          obj.class = '';
+          obj.class = ''
           obj.data = relations[key]
           obj.array = relations[key + 'Array']
           break
@@ -4736,6 +4736,7 @@ zRoute.tableBody = (req, res, relations, dataObject, parentTable, fieldName, MYM
           myobj.class = `${parentTable}_${fieldName}_${key}`
           myobj.name = `${parentTable}[${fieldName}][${index}][${key}]`
           myobj.additional_attributes = ` data-name="${key}"  data-id="${parentTable}_${fieldName}_${key}" `
+          myobj.isTableModule = 1
           html += `<td class="td_${key}_${MYMODEL.table}">${cForm.field(myobj)}</td>`
         }
         html += `<td style="vertical-align:top"><span class="icon-small icons-danger trash_${fieldName}_${MYMODEL.table}" onclick="$(this).closest('tr').remove()" title="Delete"><img class="icons-bg-white griddelete icon-image" src="/assets/icons/trash-filled.svg"></span></td>`

package/lib/zdataTable.js

@@ -10,8 +10,7 @@ class dataTable {
     this.visibles = datas.visiblesObj //array object
     this.setColumns = ''
     this.setTable = ''
-    this.srcScript = '/modules/datatables.min.js'
-    this.dataTableScript = '/js/datatable-grids.js'
+    this.srcScript = '/modules/datatable/datatables.min.js'
     this.dataTableButtons = '/js/datatable-buttons.js'
     this.customButtons = ''
     this.MYMODEL = null
@@ -24,6 +23,30 @@ class dataTable {
     this.hasLevels = Object.keys(this.level_approval).length == 0 ? false : true
     this.visiblesKey = this.visibles.map((item) => item.key)
     this.gridType = datas.gridType || 1
+    if (this.gridType == 1) {
+      this.dataTableScript = '/modules/datatable/normal.js'
+    } else if (this.gridType == 2) {
+      this.dataTableScript = '/modules/datatable/fixed-header.js'
+    } else if (this.gridType == 3) {
+      this.dataTableScript = '/modules/datatable/footer-total.js'
+    } else if (this.gridType == 4) {
+      this.dataTableScript = '/modules/datatable/normal.js'
+      this.additionalCss = `<style>thead > tr > th {white-space: nowrap;}</style>`
+    } else if (this.gridType == 5) {
+      this.dataTableScript = '/modules/datatable/fixed-header.js'
+      this.additionalCss = `<style>thead > tr > th {white-space: nowrap;}</style>`
+    } else if (this.gridType == 6) {
+      this.dataTableScript = '/modules/datatable/footer-total.js'
+      this.additionalCss = `<style>thead > tr > th {white-space: nowrap;}</style>`
+    } else if (this.gridType == 7) {
+      this.dataTableScript = '/modules/datatable/fixed-header-totalnowrap.js'
+      this.additionalCss = `<style>thead > tr > th {white-space: nowrap;}</style>`
+    } else {
+      this.dataTableScript = '/modules/datatable/normal.js'
+      this.additionalCss = `<style>thead > tr > th {white-space: nowrap;}</style>`
+    }
+    this.totalFields = []
+    this.additionalCss = ''
   }
 
   // for filter html
@@ -32,6 +55,7 @@ class dataTable {
     this.relations = obj.relations
     this.routeName = this.MYMODEL.routeName
     this.types = obj.TYPES
+    this.totalFields = this.visiblesKey.filter((item) => this.MYMODEL.widgets[item] && this.MYMODEL.widgets[item].name == 'number')
     delete obj.MYMODEL
     delete obj.relations
     delete obj.TYPES
@@ -164,6 +188,7 @@ class dataTable {
     script += `var dataTableFields = ${JSON.stringify(this.visiblesKey, null, 2)};${Util.newLine}`
     script += `var dataTableTypes = ${JSON.stringify(this.types, null, 2)};${Util.newLine}`
     script += `var dataTableRoute = "${this.routeName}";${Util.newLine}`
+    script += `var dataTableHasTotalFields = ${JSON.stringify(this.totalFields)};${Util.newLine}`
     script += `</script>${Util.newLine}`
     script += `<script type="text/javascript" src="${this.dataTableScript}"></script>${Util.newLine}`
     if (this.searchColumns.FILTERKEY) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"