@opengis/admin 0.3.10 → 0.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",

package/server/helpers/index.js

@@ -13,6 +13,7 @@ import mdToHTML from "./utils/mdToHTML.js";
 
 import ifCond from "./temp/ifCond.js";
 import contentList from "./temp/contentList.js";
+import paddingNumber from './utils/paddingNumber.js';
 
 
 
@@ -33,4 +34,7 @@ export default async function route() {
     handlebarsSync.registerHelper('empty', () => { });
     handlebars.registerHelper('coalesce', coalesce);
     handlebarsSync.registerHelper('coalesce', coalesce);
+
+    handlebarsSync.registerHelper('paddingNumber', paddingNumber);
+    handlebars.registerHelper('paddingNumber', paddingNumber);
 }

package/server/helpers/utils/paddingNumber.js

@@ -0,0 +1,4 @@
+export default function (num) {
+    const padding = arguments.length === 3 ? arguments[1] : 6;
+    return num.toLocaleString('en', { minimumIntegerDigits: padding, useGrouping: false })
+}

package/server/routes/user/controllers/user.cls.js

@@ -32,7 +32,8 @@ export default async function userCls(req) {
       case when type='sql' then data else null end as sql from admin.user_cls u
     where (case when type='json' then parent is null else true end)
     and uid=(select uid from admin.users where $1 in (login,uid) limit 1)
-    and parent is null and ${query.type ? `type='${query.type}'` : '1=1'} and ${params?.id ? 'u.name=$2' : '1=1'}`;
+    and parent is null and ${query.type ? `type='${query.type}'` : '1=1'} and ${params?.id ? 'u.name=$2' : '1=1'}
+    order by cdate desc`;
 
   if (query?.sql) return q;
 

package/server/routes/util/controllers/code.generator.js

@@ -31,6 +31,10 @@ export default async function codeGenerator({
   const loadTemplate = await getTemplate('form', tokenData.form);
   const schema = loadTemplate?.schema || loadTemplate;
 
+  if (!schema) {
+    return reply.status(404).send('form not found');
+  }
+
   if (!schema?.[column]?.template) {
     return reply.status(400).send('template not specified');
   }
@@ -48,14 +52,20 @@ export default async function codeGenerator({
     `select count(*) from ${table} where ${columnValue ? `${column}::text = '${columnValue}'` : 'true'} limit 1`,
   ).then(el => el.rows?.[0] || {});
 
-  const { ynum = 0 } = await pg.query(
-    `select ${column} as ynum from ${table} where ${column} is not null and date_part('year', cdate) = $1 order by cdate desc limit 1`,
+  const { NUMY = 0 } = await pg.query(
+    `select ${column} as "NUMY" from ${table} where ${column} is not null and date_part('year', cdate) = $1 order by cdate desc limit 1`,
     [(new Date()).getFullYear()]
   ).then(el => el.rows?.[0] || {});
 
   const date = new Date();
 
-  const result = handlebarsSync.compile(schema[column].template)({
+  const template = schema[column].template.match(/NUM[M|Y] \d/g)
+    .reduce((acc, curr) => acc.replace(
+      curr.startsWith('{{{') ? `{{{${curr}}}}` : `{{${curr}}}`,
+      handlebarsSync.compile(`{{paddingNumber value padding}}`)({ padding: curr.substring(4, curr.length)?.trim?.(), value: curr.startsWith('NUMY') ? NUMY : +count + 1 })),
+      schema[column].template
+    );
+  const result = handlebarsSync.compile(template)({
     HH: date.getHours(),                      // hours 24h: 14:00 = 14
     HH12: (date.getHours() + 24) % 12 || 12,  // hours 12h: 14:00 = 2
     HH24: date.getHours(),                    // hours 24h: 14:00 = 14
@@ -72,9 +82,6 @@ export default async function codeGenerator({
     D: date.getDay(),         // day of the week: 1 - monday, 7 - sunday
     DD: date.getDate(),       // day of the month: january 4 = 4
     DDD: dayOfTheYear(date),  // day of the year: march 4 = 63
-
-    ynum,
-    num: +count + 1,
     ...data,
   });