zet-lib 1.2.117 → 1.3.0

package/lib/Form.js

@@ -428,6 +428,35 @@ Form.field = (obj) => {
       displayForm += `<textarea  ${additional_attributes} class="form-control ${obj.class}" ${id} ${name} ${placeholder}  ${readonly} ${style}  ${htmlOptions}  rows="4">${JSON.stringify(obj.value)}</textarea>${information}${append}`
       break
 
+    case 'dragdrop':
+      //dataObject
+      let leftButtons = ``
+      let rightButtons = ``
+      let all = Object.keys(obj.dataObject)
+      all.map((item, index) => {
+        if (!value.includes(item)) {
+          rightButtons += `<li><button class="btn btn-danger boxy" type="button">${obj.dataObject[item]}<input type="hidden" name='trashx' value="${item}"></button></li>`
+        }
+      })
+      value = value || []
+      value.map((item, index) => {
+        leftButtons += `<li><button class="btn btn-primary boxy" type="button">${obj.dataObject[item]}<input type="hidden" name='${obj.name}[]' value="${item}"></button></li>`
+      })
+
+      displayForm += `<div id="dragdrop_${obj.id}" class="row contentfields">
+        <div class="col-md-6">
+            <h5>${obj.attributes.left}</h5>
+            <ol class="mydragable${obj.id} divboxlittle" data-type="left" data-name="${obj.name}[]">${leftButtons}</ol>
+        </div>
+        <div class="col-md-6">
+        <h5>${obj.attributes.right}</h5>
+            <ol class="mydragable${obj.id} divboxlittle" data-type="right"  data-name="trashx">
+                ${rightButtons}
+            </ol>
+        </div>
+    </div>`
+      break
+
     case 'array':
       displayForm += `<textarea  ${additional_attributes} class="form-control ${obj.class}" ${id} ${name} ${placeholder} ${readonly} ${style}  ${htmlOptions}  rows="4">${JSON.stringify(obj.value)}</textarea>${information}${append}`
       break

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 grid filter'
+langs['grid_refresh'] = 'Refresh / Factory Reset'
 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'
+langs['grid_refresh'] = 'Muat Ulang / Kembali setelan pabrik'
 langs.settings = 'Pengaturan'
 langs.settings_info = 'Pengaturan'
 langs.grid_settings = 'Pengaturan Grid'

package/lib/moduleLib.js

@@ -79,6 +79,42 @@ m.dropzone = function (req, res, elem) {
   }
 }
 
+//module for dragdrop
+m.dragdrop = function (req, res, elem) {
+  let script = ''
+  let head = ``
+  let end = ``
+  head += '<link href="/modules/drag/drag.css" rel="stylesheet">'
+  end += '<script src="/modules/drag/jquery-sortable.js"></script>'
+  script += `$(function () {
+    $("ol.mydragable${elem}").sortable({
+        group: 'mydragable${elem}',
+        isValidTarget: function ($item, container) {
+            return true;
+        },
+        onDrop: function ($item, container, _super) {
+            var getidname = $item.parents().attr('id') || "";
+            var iname = $item.find('input[type=text]').attr('data-name');
+            var containertype = $item.parents().data('type');
+            var containername = $item.parents().data('name');
+            var newname = getidname ? iname + "___" + getidname : iname;
+            $item.find('input[type=text]').attr('name', newname);
+            $item.find('input[type=hidden]').attr('name', containername);
+            $item.find('button').addClass(containertype == "left" ? "btn-primary" : "btn-danger");
+            $item.find('button').removeClass(containertype == "right" ? "btn-primary" : "btn-danger");
+            _super($item, container);
+        }
+    });
+});
+
+`
+  return {
+    head: head,
+    end: end,
+    script: script,
+  }
+}
+
 //module for google map
 m.location = function (req, res, key) {
   let script = ``

package/lib/views/generator_layout.ejs

@@ -161,7 +161,7 @@
                   <a class="dropdown-item" href="/zmenu"><span>Menu Generator</span></a>
                 </li>
                 <li>
-                  <a class="dropdown-item" href="/zreport"><span>Report Generator</span></a>
+                  <a class="dropdown-item" href="/zreports"><span>Report Generator</span></a>
                 </li>
               </ul>
             </li>

package/lib/views/generatorjs.ejs

@@ -98,7 +98,6 @@
     $('#modal_setting_label').html(`Setting ${label} <span class="badge bg-primary text-dark">${caption}</span>`)
     $('#body_content').html('Loading...')
     $('body').find('#delete_field').attr('data-name', name)
-
     ajaxPost(
       '/<%- routeName%>/setting_field',
       {
@@ -111,6 +110,9 @@
         if ($('#relation_table').length) {
           dropdownRelations('relation_table', 'relation_name', 'relation_concat', $('#relation_table').data('value'), $('#relation_name').data('value'), $('#relation_concat').data('value'))
         }
+        if ($('#dragdrop_table').length) {
+          dropdownRelations('dragdrop_table', 'dragdrop_name', 'dragdrop_concat', $('#dragdrop_table').data('value'), $('#dragdrop_name').data('value'), $('#dragdrop_concat').data('value'))
+        }
         if ($('#typeahead_table').length) {
           val = $('body').find('#typeahead_concat').attr('value')
           dropdownRelations('typeahead_table', 'typeahead_name', 'typeahead_concat', $('#typeahead_table').data('value'), $('#typeahead_name').data('value'), val)
@@ -620,6 +622,12 @@
         $('.divconcat').show()
         $('.divfield').hide()
         dropdownRelations()
+      } else if ($(this).val() == 'dragdrop') {
+        $('.divrelation').show()
+        $('.divrelationfield').show()
+        $('.divconcat').show()
+        $('.divfield').hide()
+        dropdownRelations()
       } else {
         $('.divrelation').hide()
         $('.divconcat').hide()
@@ -871,11 +879,11 @@
         table: $('#table').val(),
         others: JSON.stringify(others),
       },
-      function (dt) {}
+      function (dt) { }
     )
   }
 </script>
 <script>
   //tab draggable
-  $(function () {})
-</script>
+  $(function () { })
+</script>

package/lib/zGeneratorRouter.js

@@ -803,7 +803,7 @@ router.delete('/delete-table', csrfProtection, async (req, res) => {
 router.post('/add_field', csrfProtection, async (req, res) => {
   try {
     const body = req.body
-    //console.log(JSON.stringify(body.others))
+    console.log(JSON.stringify(body))
     const table = body.table
     if (nots.includes(table)) {
       return res.json(Util.flashError('Table is locked'))

package/lib/zRoute.js

@@ -194,6 +194,14 @@ zRoute.post = (req, res, MYMODEL, routeName, body) => {
         post[routeName][key] = cleaning ? JSON.stringify(cleaning) : null
         break
 
+      case 'dragdrop':
+        let cleaning2
+        if (Array.isArray(post[routeName][key])) {
+          cleaning2 = post[routeName][key] ? post[routeName][key].filter((item) => item) : null
+        }
+        post[routeName][key] = cleaning2 ? JSON.stringify(cleaning2) : null
+        break
+
       case 'lexical':
         post[routeName][key] = JSON.stringify(post[routeName][key])
         break
@@ -589,27 +597,6 @@ zRoute.relations = async (req, res, table) => {
         relations[keyFields] = widget.fields
         relations[keyObject] = Util.objectToGridFormat(relations[key], true)
       } else if (widgetName == 'relation') {
-        let select = widget.fields.join(',') + ' as zname '
-        let obj = {
-          select: select,
-          table: widget.table,
-          where: { company_id: company_id },
-          order_by: widget.hasOwnProperty('order_by') && widget.order_by ? [`${widget.order_by}`] : ['zname asc'],
-        }
-        if (Util.in_array(widget.table, zRoute.tableHasNoCompanyId)) {
-          delete obj.where
-        }
-
-        if (widget.hasOwnProperty('please_select')) {
-          if (widget.please_select != undefined) {
-            if (widget.please_select != '') {
-              emptyArray = {
-                id: '',
-                zname: widget.please_select,
-              }
-            }
-          }
-        }
         let cacheKey = `${widget.table}_${MYMODEL.table}___${key}_${company_id}`
         if (key == 'created_by' || key == 'updated_by') {
           cacheKey = `zuser_${key}_${company_id}`
@@ -618,6 +605,26 @@ zRoute.relations = async (req, res, table) => {
         if (myCache.has(cacheKey)) {
           results = myCache.get(cacheKey)
         } else {
+          let select = widget.fields.join(',') + ' as zname '
+          let obj = {
+            select: select,
+            table: widget.table,
+            where: { company_id: company_id },
+            order_by: widget.hasOwnProperty('order_by') && widget.order_by ? [`${widget.order_by}`] : ['zname asc'],
+          }
+          if (Util.in_array(widget.table, zRoute.tableHasNoCompanyId)) {
+            delete obj.where
+          }
+          if (widget.hasOwnProperty('please_select')) {
+            if (widget.please_select != undefined) {
+              if (widget.please_select != '') {
+                emptyArray = {
+                  id: '',
+                  zname: widget.please_select,
+                }
+              }
+            }
+          }
           results = await connection.results(obj)
         }
         relations[key] = [emptyArray, ...results]
@@ -628,41 +635,41 @@ zRoute.relations = async (req, res, table) => {
           hasAttributes = true
         }
       } else if (widgetName == 'dropdown_chain') {
-        const obj = {
-          select: widget.fields.join(',') + ' as zname ',
-          table: widget.table,
-          where: { company_id: company_id },
-          orderBy: ['id', 'asc'],
-        }
-        if (Util.in_array(widget.table, zRoute.tableHasNoCompanyId)) {
-          delete obj.where
-        }
         const cacheKey = `${widget.table}_${MYMODEL.table}___${key}_${company_id}`
         let results
         if (myCache.has(cacheKey)) {
           results = myCache.get(cacheKey)
         } else {
+          const obj = {
+            select: widget.fields.join(',') + ' as zname ',
+            table: widget.table,
+            where: { company_id: company_id },
+            orderBy: ['id', 'asc'],
+          }
+          if (Util.in_array(widget.table, zRoute.tableHasNoCompanyId)) {
+            delete obj.where
+          }
           results = await connection.results(obj)
         }
         relations[key] = [Util.arrayUnShift(['id', 'zname']), ...results]
         relations[keyFields] = widget.fields
         relations[keyObject] = Util.arrayWithObject(relations[key], 'id', 'zname')
       } else if (widgetName == 'typeahead') {
-        let select = widget.fields.join(',') + ' as zname '
-        let obj = {
-          select: select,
-          table: widget.table,
-          where: { company_id: company_id },
-          order_by: widget.hasOwnProperty('order_by') && widget.order_by ? [`${widget.order_by}`] : ['zname asc'],
-        }
-        if (Util.in_array(widget.table, zRoute.tableHasNoCompanyId)) {
-          delete obj.where
-        }
         const cacheKey = `${widget.table}_${MYMODEL.table}___${key}_${company_id}`
         let results
         if (myCache.has(cacheKey)) {
           results = myCache.get(cacheKey)
         } else {
+          let select = widget.fields.join(',') + ' as zname '
+          let obj = {
+            select: select,
+            table: widget.table,
+            where: { company_id: company_id },
+            order_by: widget.hasOwnProperty('order_by') && widget.order_by ? [`${widget.order_by}`] : ['zname asc'],
+          }
+          if (Util.in_array(widget.table, zRoute.tableHasNoCompanyId)) {
+            delete obj.where
+          }
           results = await connection.results(obj)
         }
         relations[key] = [Util.arrayUnShift(['id', 'zname']), ...results]
@@ -673,8 +680,43 @@ zRoute.relations = async (req, res, table) => {
         relations[keyFields] = widget.fields
       } else if (widgetName == 'virtual') {
         relations['zvirtuals'][key] = widget.fields
+      } else if (widgetName == 'dragdrop') {
+        const cacheKey = `${table}_${key}_${company_id}`
+        let results = {}
+        if (myCache.has(cacheKey)) {
+          results = myCache.get(cacheKey)
+        } else {
+          let wheredragdrop = {}
+          wheredragdrop['company_id'] = company_id
+          let whereWidget = widget.where || ''
+          if (whereWidget) {
+            if (whereWidget.includes(',')) {
+              let splits = whereWidget.split(',')
+              splits.map((item) => {
+                let splits2 = item.split('=')
+                wheredragdrop[splits2[0]] = splits2[1]
+              })
+            } else {
+              let splits = whereWidget.split('=')
+              wheredragdrop[splits[0]] = splits[1]
+            }
+          }
+          let obj = {
+            select: widget.fields.join(',') + ' as zname ',
+            table: widget.table,
+            where: wheredragdrop,
+            order_by: widget.hasOwnProperty('order_by') && widget.order_by ? [`${widget.order_by}`] : ['zname asc'],
+          }
+          if (Util.in_array(widget.table, zRoute.tableHasNoCompanyId)) {
+            delete obj.where
+          }
+          results = await connection.results(obj)
+        }
+        relations[key] = results
+        relations[keyObject] = Util.arrayWithObject(relations[key], 'id', 'zname')
       }
     }
+    //console.log(relations);
 
     let selectZvirtuals = ''
     for (let key in relations['zvirtuals']) {
@@ -686,6 +728,7 @@ zRoute.relations = async (req, res, table) => {
 
     return relations
   } catch (err) {
+    console.log(err)
     debug(req, res, err)
   }
 }
@@ -802,6 +845,15 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
             types[key] = 'select'
             break
 
+          case 'dragdrop':
+            options = relations[key].reduce((result, item) => {
+              var selected = value == item.id ? ' selected ' : ''
+              return result + `<option value="${item.id}" ${selected} >${item.zname}</option>`
+            }, '')
+            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select search"><option value=""></option>${options}</select>`
+            types[key] = 'select'
+            break
+
           case 'dropdown_chain':
             options = relations[key].reduce((result, item) => {
               var selected = value == item.id ? ' selected ' : ''
@@ -957,6 +1009,17 @@ zRoute.dataTableData = (key, value, MYMODEL, relations, myid = '') => {
           }
           break
 
+        case 'dragdrop':
+          let arr2 = value ? value : []
+          if (arr2.length) {
+            let myarr2 = []
+            arr2.forEach(function (item) {
+              myarr2.push(relations[keyObject][item])
+            })
+            myvalue = myarr2.length ? myarr2.join(', ') : ''
+          }
+          break
+
         case 'dropdown_chain':
           myvalue = relations[key][value] || ''
           break
@@ -1966,6 +2029,9 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
       if (MYMODEL.widgets[key].name == 'dropdown_multi') {
         asJSONb.push(key)
       }
+      if (MYMODEL.widgets[key].name == 'dragdrop') {
+        asJSONb.push(key)
+      }
       if (MYMODEL.widgets[key].name == 'dropdown_checkbox') {
         asJSONb.push(key)
       }
@@ -2440,6 +2506,11 @@ zRoute.forms = (req, res, MYMODEL, relations, data = {}, tableRelations = {}) =>
           obj.data = relations[key] || []
           obj.multi = relations[key + 'Object']
           break
+        case 'dragdrop':
+          obj.type = 'dragdrop'
+          obj.data = relations[key] || []
+          obj.dataObject = relations[key + 'Object']
+          break
         case 'number':
           obj.type = 'number'
           obj.class = 'form-control number'
@@ -3131,6 +3202,7 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
   let hasTags = false
   let hasLexical = false
   let hasLocation = false
+  let hasDragdrop = false
   let lexicals = []
   let mapKey = ''
   let hasAttributes = []
@@ -3161,6 +3233,11 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
       endObj.location = locationObj.end
       hasLocation = true
       mapKey = key
+    } else if (widgets[key].name == 'dragdrop') {
+      let dragdropObj = moduleLib.dragdrop(req, res, key)
+      scriptForm += dragdropObj.script
+      headObj.dragdrop = dragdropObj.head
+      endObj.dragdrop = dragdropObj.end
     } else if (widgets[key].name == 'datetime') {
       hasDateTimePicker = true
     } else if (widgets[key].name == 'table') {
@@ -4252,6 +4329,7 @@ cache models in so it's no need call database repeatly
 zRoute.modelsCache = async () => {
   let obj = {}
   let orderBy = {}
+  let dragdropsObj = {}
   if (process.env.APP_IS_CACHE == 1) {
     let models = zRoute.MYMODELS() || {}
     delete models.zrole
@@ -4262,6 +4340,10 @@ zRoute.modelsCache = async () => {
     for (let keys in models) {
       let widgets = models[keys].widgets
       for (let key in widgets) {
+        //check if has dragdrop
+        if (widgets[key].name == 'dragdrop') {
+          dragdropsObj[keys] = models[keys]
+        }
         if (Util.in_array(widgets[key].name, mustCaches)) {
           let widget = widgets[key]
           let table = widget.table
@@ -4283,6 +4365,7 @@ zRoute.modelsCache = async () => {
         }
       }
     }
+    //console.log(whereObj)
     companies = await connection.results({
       table: 'zcompany',
     })
@@ -4313,6 +4396,7 @@ zRoute.modelsCache = async () => {
                   company_id: company.id,
                 },
               }
+              //console.log(keys)
               if (orderBy[keys]) {
                 objectSQL.order_by = [`${orderBy[keys]}`]
               }
@@ -4341,6 +4425,49 @@ zRoute.modelsCache = async () => {
           }
         }
       }
+
+      //this is for dragdrops
+      //yg lain tidak support where
+      //dibuat sendiri
+      let MODELS_DRAGDROPS = {}
+      for (let keys in dragdropsObj) {
+        let widgets = dragdropsObj[keys].widgets
+        for (let key in widgets) {
+          if (widgets[key].name == 'dragdrop') {
+            if (!MODELS_DRAGDROPS[keys]) {
+              MODELS_DRAGDROPS[keys] = []
+            }
+            companies.map((company) => {
+              let where = {}
+              where['company_id'] = company.id
+              let whereWidget = widgets[key].where || ''
+              if (whereWidget) {
+                if (whereWidget.includes(',')) {
+                  let splits = whereWidget.split(',')
+                  splits.map((item) => {
+                    let splits2 = item.split('=')
+                    where[splits2[0]] = splits2[1]
+                  })
+                } else {
+                  let splits = whereWidget.split('=')
+                  where[splits[0]] = splits[1]
+                }
+              }
+              let objectSQL = {
+                table: widgets[key].table,
+                select: ` id, ${widgets[key].fields[1]} as zname `,
+                where: where,
+              }
+              connection.results(objectSQL).then(function (results) {
+                myCache.set(`${keys}_${key}_${company.id}`, results)
+              })
+              MODELS_DRAGDROPS[keys].push({ key: `${keys}_${key}_${company.id}`, objectSQL: objectSQL })
+            })
+          }
+        }
+      }
+      myCache.set('MODELS_DRAGDROPS', MODELS_DRAGDROPS)
+      //console.log(MODELS_DRAGDROPS)
     } catch (e) {
       //debug(req,res,e.toString());
       console.log('modelsCache :', e + '')
@@ -4364,7 +4491,6 @@ zRoute.modelsCacheRenew = (table, companyId) => {
             selects += `${obj[key]},`
           }
           selects += `id`
-
           let objectSQL = {
             select: selects,
             table: table,
@@ -4395,6 +4521,15 @@ zRoute.modelsCacheRenew = (table, companyId) => {
           })
         }
       }
+
+      let MODELS_DRAGDROPS = myCache.get('MODELS_DRAGDROPS')
+      if (MODELS_DRAGDROPS[table]) {
+        MODELS_DRAGDROPS[table].map((item) => {
+          connection.results(item.objectSQL).then(function (results) {
+            myCache.set(item.key, results)
+          })
+        })
+      }
     }
   } catch (err) {
     console.log(err)

package/package.json

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