zet-lib 1.3.37 → 1.3.39

package/lib/Util.js

@@ -1335,23 +1335,40 @@ Util.terbilang = (nilai) => {
   return penyimpanan
 }
 
-Util.tableShowInGrid = (arr) => {
+Util.array_id_to_zname = (arr) => {
+  let r = {}
+  arr.map((item) => {
+    r[item.id] = item.zname;
+  })
+  return r;
+}
+
+Util.tableShowInGrid = (arr, qey, MYMODEL, myCache, companyId) => {
   try {
     if (typeof arr != 'object') {
       arr = []
     }
     arr = arr || []
     let html = ''
+    let MYMODELS = myCache.get('MYMODELS');
+    let mywidget = MYMODELS[MYMODEL.widgets[qey].table].widgets
     if (arr.length > 0) {
       html += `<table class="table table-sm table-striped table-bordered table-hover">`
       let json = arr[0]
       arr.map((item) => {
         html += `<tr>`
         for (let key in item) {
+          var keyFields = key + 'Fields'
+          var keyObject = key + 'Object'
           let value = item[key]
-          if (Util.isNumeric(value)) {
-            value = Util.formatNumber(value, '.')
+          if(mywidget[key].name == "relation"){
+            value = value ? Util.array_id_to_zname(myCache.get(`${mywidget[key].table}_${MYMODEL.widgets[qey].table}___${key}_${companyId}`))[value] : ''
+          } else {
+            if (Util.isNumeric(value)) {
+              value = Util.formatNumber(value, '.')
+            }
           }
+
           html += `<td>${value}</td>`
         }
         html += `</tr>`

package/lib/zAppRouter.js

@@ -1294,12 +1294,16 @@ router.post('/zdeleted-selected/:table', async (req, res) => {
     if (datas.length > 0) {
       for (const data of datas) {
         let id = data.name.replace('ck[', '').replace(']', '')
-        await connection.delete({
-          table: table,
-          where: {
-            id: id,
-          },
-        })
+        try {
+          await connection.delete({
+            table: table,
+            where: {
+              id: id,
+            },
+          })
+        } catch (e) {
+          io.emit('error', e + '')
+        }
       }
     } else {
       json = Util.flashError('No Data')

package/lib/zRoute.js

@@ -1026,137 +1026,141 @@ zRoute.approval_history_data = (arr = []) => {
   return myvalue
 }
 
-zRoute.dataTableData = (key, value, MYMODEL, relations, myid = '') => {
-  relations = relations || {}
-  var keyFields = key + 'Fields'
-  var keyObject = key + 'Object'
-  let myvalue = value
-  var widgetName = MYMODEL.widgets[key] ? MYMODEL.widgets[key].name : ''
-  if (key == 'lock') {
-    myvalue = value == 1 ? 'Lock' : 'Unlock'
-  } else if (key == 'approval_history') {
-    myvalue = zRoute.approval_history_data(myvalue)
-  } else {
-    if (widgetName) {
-      switch (widgetName) {
-        case 'switch':
-          myvalue = relations[keyFields][value] || ''
-          break
+zRoute.dataTableData = (key, value, MYMODEL, relations, myid = '', companyId = 1) => {
+  try {
+    relations = relations || {}
+    var keyFields = key + 'Fields'
+    var keyObject = key + 'Object'
+    let myvalue = value
+    var widgetName = MYMODEL.widgets[key] ? MYMODEL.widgets[key].name : ''
+    if (key == 'lock') {
+      myvalue = value == 1 ? 'Lock' : 'Unlock'
+    } else if (key == 'approval_history') {
+      myvalue = zRoute.approval_history_data(myvalue)
+    } else {
+      if (widgetName) {
+        switch (widgetName) {
+          case 'switch':
+            myvalue = relations[keyFields][value] || ''
+            break
 
-        case 'color':
-          myvalue = `<input type="color" value="${value}">`
-          break
+          case 'color':
+            myvalue = `<input type="color" value="${value}">`
+            break
 
-        case 'relation':
-          myvalue = relations[keyObject][value] || ''
-          break
+          case 'relation':
+            myvalue = relations[keyObject][value] || ''
+            break
 
-        case 'dropdown_multi':
-          let arr = value ? value : []
-          if (arr.length) {
-            let myarr = []
-            arr.forEach(function (item) {
-              myarr.push(relations[keyObject][item])
-            })
-            myvalue = myarr.length ? myarr.join(', ') : ''
-          }
-          break
+          case 'dropdown_multi':
+            let arr = value ? value : []
+            if (arr.length) {
+              let myarr = []
+              arr.forEach(function (item) {
+                myarr.push(relations[keyObject][item])
+              })
+              myvalue = myarr.length ? myarr.join(', ') : ''
+            }
+            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 '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
+          case 'dropdown_chain':
+            myvalue = relations[key][value] || ''
+            break
 
-        case 'select':
-          myvalue = relations[keyFields][value] || ''
-          break
+          case 'select':
+            myvalue = relations[keyFields][value] || ''
+            break
 
-        case 'radio':
-          myvalue = relations[keyFields][value] || ''
-          break
+          case 'radio':
+            myvalue = relations[keyFields][value] || ''
+            break
 
-        case 'typeahead':
-          myvalue = relations[keyObject][value] || ''
-          break
+          case 'typeahead':
+            myvalue = relations[keyObject][value] || ''
+            break
 
-        case 'datetime':
-          myvalue = Util.timeSql(value)
-          break
+          case 'datetime':
+            myvalue = Util.timeSql(value)
+            break
 
-        case 'datepicker':
-          myvalue = Util.dateFormat(value, MYMODEL.widgets[key].format)
-          break
+          case 'datepicker':
+            myvalue = Util.dateFormat(value, MYMODEL.widgets[key].format)
+            break
 
-        case 'number':
-          myvalue = Util.formatNumber(value)
-          break
+          case 'number':
+            myvalue = Util.formatNumber(value)
+            break
 
-        case 'integer':
-          myvalue = value + ''
-          break
+          case 'integer':
+            myvalue = value + ''
+            break
 
-        case 'image':
-          myvalue = Util.fileView('/uploads/' + MYMODEL.routeName + '/', value, { width: 60 })
-          break
+          case 'image':
+            myvalue = Util.fileView('/uploads/' + MYMODEL.routeName + '/', value, { width: 60 })
+            break
 
-        case 'file':
-          myvalue = Util.fileView('/uploads/' + MYMODEL.routeName + '/', value)
-          break
+          case 'file':
+            myvalue = Util.fileView('/uploads/' + MYMODEL.routeName + '/', value)
+            break
 
-        case 'dropzone':
-          if (myvalue && myvalue.length > 0) {
-            if (typeof myvalue === 'string') {
-              value = [myvalue]
+          case 'dropzone':
+            if (myvalue && myvalue.length > 0) {
+              if (typeof myvalue === 'string') {
+                value = [myvalue]
+              }
+              myvalue = value.map((item) => `<a class="text-success" target="_blank" href="/uploads/${MYMODEL.routeName}/${key}/${item}"> ${item.substring(13)}</a>  `)
             }
-            myvalue = value.map((item) => `<a class="text-success" target="_blank" href="/uploads/${MYMODEL.routeName}/${key}/${item}"> ${item.substring(13)}</a>  `)
-          }
-          break
+            break
 
-        case 'password':
-          myvalue = 'xxxxxx'
-          break
+          case 'password':
+            myvalue = 'xxxxxx'
+            break
 
-        case 'json':
-          myvalue = value ? JSON.stringify(value).replaceAll('","', '", "') : ''
-          break
+          case 'json':
+            myvalue = value ? JSON.stringify(value).replaceAll('","', '", "') : ''
+            break
 
-        case 'location':
-          myvalue = value ? value.address1 : ''
-          break
+          case 'location':
+            myvalue = value ? value.address1 : ''
+            break
 
-        case 'json_array':
-          myvalue = value ? JSON.stringify(value).replaceAll('","', '", "') : ''
-          break
+          case 'json_array':
+            myvalue = value ? JSON.stringify(value).replaceAll('","', '", "') : ''
+            break
 
-        case 'dropdown_checkbox':
-          myvalue = value ? value.reduce((acc, item) => `${acc} <u>${item}</u>  `, '') : ''
-          break
+          case 'dropdown_checkbox':
+            myvalue = value ? value.reduce((acc, item) => `${acc} <u>${item}</u>  `, '') : ''
+            break
 
-        case 'array':
-          myvalue = value ? JSON.stringify(value).replaceAll('","', '", "') : ''
-          break
+          case 'array':
+            myvalue = value ? JSON.stringify(value).replaceAll('","', '", "') : ''
+            break
 
-        case 'table':
-          myvalue = Util.tableShowInGrid(value)
-          break
+          case 'table':
+            myvalue = Util.tableShowInGrid(value, key, MYMODEL, myCache, companyId)
+            break
 
-        default:
-          value = value || ''
-          myvalue = value.length > 50 ? value.substring(0, 50) : value
+          default:
+            value = value || ''
+            myvalue = value.length > 50 ? value.substring(0, 50) : value
+        }
       }
     }
+    return myvalue
+  } catch (e) {
+    console.log(e)
   }
-  return myvalue
 }
 
 zRoute.users = async (req) => {
@@ -1637,7 +1641,7 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
   let aliasResults = {}
   for (let key in MYMODEL.widgets) {
     if (!notJoins.includes(key)) {
-      if (MYMODEL.widgets[key].name == 'relation' || MYMODEL.widgets[key].name == 'typeahead') {
+      if (MYMODEL.widgets[key].name == 'relation' || MYMODEL.widgets[key].name == 'typeahead' || MYMODEL.widgets[key].name == 'dropdown_multi') {
         if (MYMODEL.widgets[key].import_field && MYMODEL.widgets[key].import_field != 'id') {
           aliasResults[key] = Util.arrayToObject(
             await connection.results({
@@ -1671,7 +1675,7 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
         tableObj[key] = widget.fields
       } else if (widget.name == 'switch') {
         tableObj[key] = widget.fields
-      } else if (widget.name == 'relation' || widget.name == 'typeahead') {
+      } else if (widget.name == 'relation' || widget.name == 'typeahead' || widget.name == 'dropdown_multi') {
         var rowsarr = await connection.results({
           table: widget.table,
           select: widget.fields[0] + ',' + widget.fields[1] + ' as zname ',
@@ -1747,20 +1751,31 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
           } else {
             t = !callback(result, field) ? tableObj[field][result[field]] || '' : callback(result, field)
           }
-        } else if ((widgets.hasOwnProperty(field) && widgets[field].name == 'relation') || (widgets.hasOwnProperty(field) && widgets[field].name == 'typeahead')) {
+        } else if ((widgets.hasOwnProperty(field) && widgets[field].name == 'relation') || (widgets.hasOwnProperty(field) && widgets[field].name == 'typeahead') || (widgets.hasOwnProperty(field) && widgets[field].name == 'dropdown_multi')) {
           let myvalue = ''
           if (widgets[field].import_field && widgets[field].import_field != 'id') {
-            /*console.log(result[field])
-            console.log(widgets[field].import_field)
-            console.log([result[field]][widgets[field].import_field])*/
-            if (isNaN(result[field])) {
-              myvalue = result[field]
+            if (widgets[field].name == 'dropdown_multi') {
+              if (Array.isArray(result[field])) {
+                let dropdownmultivalue = []
+                result[field].map((item) => {
+                  dropdownmultivalue.push(relations[field][item].zname)
+                })
+                result[field] = result[field] ? JSON.stringify(dropdownmultivalue) : ''
+              }
             } else {
-              myvalue = result[field] ? aliasResults[field][result[field]][widgets[field].import_field] : ''
-              result[field] = result[field] ? aliasResults[field][result[field]][widgets[field].import_field] : ''
+              if (isNaN(result[field])) {
+                myvalue = result[field]
+              } else {
+                myvalue = result[field] ? aliasResults[field][result[field]][widgets[field].import_field] : ''
+                result[field] = result[field] ? aliasResults[field][result[field]][widgets[field].import_field] : ''
+              }
             }
           } else {
-            myvalue = result[field] ? relations[field][result[field]].zname : ''
+            if (widgets[field].name == 'dropdown_multi') {
+              myvalue = result[field] ? result[field] : ''
+            } else {
+              myvalue = result[field] ? relations[field][result[field]].zname : ''
+            }
           }
           if (isRaws) {
             t = !callback(result, field) ? result[field] : callback(result, field)
@@ -2161,6 +2176,7 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
 zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
   const room = res.locals.token || 'aa'
   const table = MYMODEL.table
+  const companyId = res.locals.companyId;
   try {
     actionButtonsFn = actionButtonsFn || function () {}
     const relations = await zRoute.relations(req, res, MYMODEL.table)
@@ -2270,7 +2286,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
           let buttons = !actionButtonsFn(levels, row, MYMODEL.table) ? zRoute.actionButtons(levels, row, MYMODEL.table) : actionButtonsFn(levels, row, MYMODEL.table)
           arr.push(buttons)
         } else {
-          arr.push(zRoute.dataTableData(item, row[item], MYMODEL, relations, row.id))
+          arr.push(zRoute.dataTableData(item, row[item], MYMODEL, relations, row.id, companyId))
         }
       })
       datas.push(arr)
@@ -4180,6 +4196,8 @@ zRoute.import = async (req, res, MYMODEL) => {
   let json = Util.jsonSuccess(LANGUAGE['import_success'])
   let aliasRelations = []
   let selectRelations = ''
+  let isDropdownWidgets = []
+  let dropdownWidgetRelations = {}
   for (let key in MYMODEL.widgets) {
     if (MYMODEL.widgets[key]) {
       if (MYMODEL.widgets[key].name == 'relation' || MYMODEL.widgets[key].name == 'typeahead') {
@@ -4188,6 +4206,19 @@ zRoute.import = async (req, res, MYMODEL) => {
           selectRelations += `, (select ${MYMODEL.widgets[key].import_field} from "${MYMODEL.widgets[key].table}" where  ${MYMODEL.widgets[key].table}.id = ${MYMODEL.table}.${key} limit 1) as ${key} `
         }
       }
+
+      if (MYMODEL.widgets[key].name == 'dropdown_multi') {
+        if (MYMODEL.widgets[key].import_field && MYMODEL.widgets[key].import_field != 'id') {
+          isDropdownWidgets.push(key)
+          let cacheName = `${MYMODEL.widgets[key].table}_${MYMODEL.table}___${key}_${companyId}`
+          let datasName = myCache.get(cacheName) || []
+          let objDatas = {}
+          datasName.map((item) => {
+            objDatas[item.zname] = item.id
+          })
+          dropdownWidgetRelations[key] = objDatas
+        }
+      }
     }
   }
   try {
@@ -4253,12 +4284,26 @@ zRoute.import = async (req, res, MYMODEL) => {
             table: MYMODEL.widgets[keys[prop]].table,
             whereArray: [
               //{field:"your_field",option:"=>",value:"12",operator:"AND",type:"text,json,date"}
-              { field: MYMODEL.widgets[keys[prop]].import_field, option: 'ILIKE', value: value },
+              //{ field: MYMODEL.widgets[keys[prop]].import_field, option: 'ILIKE', value: value },
+              { field: MYMODEL.widgets[keys[prop]].import_field, option: '=', value: value },
             ],
           })
           if (result_alias.id) {
             data[keys[prop]] = result_alias.id
           }
+        } else if (isDropdownWidgets.includes(keys[prop])) {
+          value = value + ''.trim()
+          let letter = value.charAt(0)
+          if (letter == '[') {
+            let dArray = []
+            let dropdownMultiArrays = JSON.parse(value)
+            dropdownMultiArrays.map((dropdownMultiArray) => {
+              if (dropdownWidgetRelations[keys[prop]][dropdownMultiArray]) {
+                dArray.push(dropdownWidgetRelations[keys[prop]][dropdownMultiArray])
+              }
+            })
+            data[keys[prop]] = JSON.stringify(dArray)
+          }
         } else {
           let name = MYMODEL.widgets[keys[prop]] && MYMODEL.widgets[keys[prop]].name ? MYMODEL.widgets[keys[prop]].name : ''
           if (name != 'virtual') {

package/package.json

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