zet-lib 1.2.40 → 1.2.42

package/lib/zRoute.js

@@ -2549,6 +2549,9 @@ zRoute.viewForm = (req, res, MYMODEL, relations, data = {}) => {
           obj[key].type = 'text'
           obj[key].value = data[key] || ''
           break
+        case 'number':
+          obj[key].value = data[key] ? Util.formatNumber(data[key], ',') : ''
+          break
         case 'typeahead':
           obj[key].type = 'text'
           obj[key].value = relations[key + 'Object'][data[key]] || ''
@@ -3347,6 +3350,7 @@ zRoute.insertSQL = async (req, res, table, data) => {
   if (fields.includes('created_at')) data.created_at = Util.now()
   if (fields.includes('updated_by')) data.updated_by = res.locals.userId || 1
   if (fields.includes('created_by')) data.created_by = res.locals.userId || 1
+  delete data.lock
   const result = await connection.insert({ table: table, data: data })
   zRoute.modelsCacheRenew(table, res.locals.companyId)
   return result
@@ -3379,11 +3383,11 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
       }
     }
   }
+  let result = await connection.result({
+    table: MYMODEL.table,
+    where: whereData,
+  })
   if (hasImages) {
-    let result = await connection.result({
-      table: MYMODEL.table,
-      where: whereData,
-    })
     tables.forEach((item) => {
       let dataTables = data[item] ? JSON.parse(data[item]) : []
       let temp = []
@@ -3408,9 +3412,14 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
   }
   delete data.created_at
   delete data.created_by
-  const result = await connection.update({ table: table, where: whereData, data: data })
-  zRoute.modelsCacheRenew(table, res.locals.companyId)
-  return result
+  delete data.lock
+  if (result.lock != 1) {
+    const myresult = await connection.update({ table: table, where: whereData, data: data })
+    zRoute.modelsCacheRenew(table, res.locals.companyId)
+    return myresult
+  } else {
+    return result
+  }
 }
 
 zRoute.deleteSQL = async (table, id, company_id) => {
@@ -3435,7 +3444,7 @@ zRoute.deleteSQL = async (table, id, company_id) => {
     }
     return results[0]
   } catch (e) {
-    throw Error(e.toString())
+    throw Error(e + '')
   }
 }
 
@@ -3568,19 +3577,33 @@ zRoute.import = async (req, res, MYMODEL) => {
         if (Util.in_array('created_by', fields)) data.created_by = res.locals.userId
         if (Util.in_array('updated_at', fields)) data.updated_at = Util.now()
         if (Util.in_array('updated_by', fields)) data.updated_by = res.locals.userId
+        delete data.lock
         await connection.insert({ table: MYMODEL.table, data: data })
       } else {
         if (Util.in_array('updated_at', fields)) data.updated_at = Util.now()
         if (Util.in_array('updated_by', fields)) data.updated_by = res.locals.userId
-        var update = await connection.update({
+        delete data.lock
+        //check data is lock
+        let mydatas = await connection.result({
+          select: 'id,lock',
           table: MYMODEL.table,
-          data: data,
           where: {
             id: data.id,
           },
         })
+        if (mydatas.lock == 1) {
+          hd += `<td class='text text-success'>Data is locked</td>`
+        } else {
+          var update = await connection.update({
+            table: MYMODEL.table,
+            data: data,
+            where: {
+              id: data.id,
+            },
+          })
+        }
+        hd += `<td class='text text-success'>${LANGUAGE['success']}</td>`
       }
-      hd += `<td class='text text-success'>${LANGUAGE['success']}</td>`
     } catch (err) {
       hd += `<td class='text text-danger'>${err + ''}</td>`
       io.to(room).emit('error', err + '' + ' ')

package/package.json

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