@opengis/admin 0.2.144 → 0.2.146

package/module/settings/form/admin.users.form.json

@@ -61,7 +61,6 @@
         },
         "password": {
             "type": "Password",
-            "hidden": true,
             "validators": [
                 {
                     "type": "regexp",
@@ -116,6 +115,20 @@
                 }
             ]
         },
+        "organ_edrpou": {
+            "type": "MarkedText",
+            "mask": "99999999",
+            "ua": "Код ЄДРПОУ",
+            "col": 6,
+            "validators": [
+              {
+                "type": "regexp",
+                "regexp": "^([0-9]{8,8})$",
+                "flags": "g",
+                "message": "Лише цифри, 8 символів"
+              }
+            ]
+        },
         "avatar": {
             "type": "File",
             "ua": "Аватар",

package/module/settings/form/admin.users_edit.form.json

@@ -84,6 +84,20 @@
                 }
             ]
         },
+        "organ_edrpou": {
+            "type": "MarkedText",
+            "mask": "99999999",
+            "ua": "Код ЄДРПОУ",
+            "col": 6,
+            "validators": [
+              {
+                "type": "regexp",
+                "regexp": "^([0-9]{8,8})$",
+                "flags": "g",
+                "message": "Лише цифри, 8 символів"
+              }
+            ]
+        },
         "avatar": {
             "type": "File",
             "ua": "Аватар",

package/module/settings/table/admin.users.table.json

@@ -6,9 +6,7 @@
     "order": "cdate desc",
     "access": "admin",
     "actions": [
-        "add",
-        "edit",
-        "del"
+        "add"
     ],
     "meta": {
         "status": "user_type",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.2.144",
+  "version": "0.2.146",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -49,7 +49,7 @@
     "@opengis/fastify-auth": "^1.0.73",
     "@opengis/fastify-file": "^1.0.42",
     "@opengis/fastify-table": "^1.2.18",
-    "@opengis/v3-core": "^0.3.45",
+    "@opengis/v3-core": "^0.3.58",
     "@opengis/v3-filter": "^0.0.72",
     "@tabler/icons-vue": "^3.28.1",
     "@tiptap/core": "^2.8.0",

package/server/helpers/list/utils/button.js

@@ -1,6 +1,6 @@
-
-
-export default function button(token, title) {
-    return `<button onclick="window.v3plugin.$form({ token: '${token}' })"
-    class="inline-flex items-center px-2 py-1 text-sm font-medium text-white duration-300 bg-blue-600 border border-transparent rounded-lg gap-x-2 hover:bg-blue-700 hover:text-white">${title || 'Додати'}</button>`;
+
+
+export default function button(token, title) {
+    return `<button onclick="window.v3plugin.$form({ token: '${token}' })"
+    class="inline-flex items-center px-2 py-1 text-sm font-medium text-white duration-300 bg-blue-600 border border-transparent rounded-lg gap-x-2 hover:bg-blue-700 hover:text-white">${title || 'Додати'}</button>`;
 }

package/server/routes/data/controllers/utils/conditions.js

@@ -1,21 +1,21 @@
-function onCheck(rule, data) {
-    const val = data[rule[0]];
-    // console.log(val, rule[1], rule[2])
-    if (rule[1] === '==') return val === rule[2];
-    if (rule[1] === '!=') return val !== rule[2];
-    if (rule[1] === 'in' && rule[2].split) return rule[2].split(',').includes(val);
-    if (rule[1] === 'in' && rule[2].includes) return rule[2].includes(val);
-
-    if (rule[1] === 'not in' && rule[2].split) return !rule[2].split(',').includes(val);
-    if (rule[1] === 'not in' && rule[2].includes) return !rule[2].includes(val);
-
-    if (rule[1] === '>') return val > rule[2];
-    if (rule[1] === '<') return val < rule[2];
-}
-export default function conditions(rules, data) {
-    if (!rules?.length) return true;
-    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
-    // console.log(rules, result)
-    return result;
-
+function onCheck(rule, data) {
+    const val = data[rule[0]];
+    // console.log(val, rule[1], rule[2])
+    if (rule[1] === '==') return val === rule[2];
+    if (rule[1] === '!=') return val !== rule[2];
+    if (rule[1] === 'in' && rule[2].split) return rule[2].split(',').includes(val);
+    if (rule[1] === 'in' && rule[2].includes) return rule[2].includes(val);
+
+    if (rule[1] === 'not in' && rule[2].split) return !rule[2].split(',').includes(val);
+    if (rule[1] === 'not in' && rule[2].includes) return !rule[2].includes(val);
+
+    if (rule[1] === '>') return val > rule[2];
+    if (rule[1] === '<') return val < rule[2];
+}
+export default function conditions(rules, data) {
+    if (!rules?.length) return true;
+    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
+    // console.log(rules, result)
+    return result;
+
 }

package/module/settings/card/admin.users.table/context.hbs

@@ -1,20 +0,0 @@
-<div>
-    <div class="flex justify-between items-center border-b pb-[15px]">
-    <div class="font-semibold text-[16px]">Повноваження</div>
-    <div class="flex gap-4">
-
-    </div>
-    </div>
-    {{#contentList table="(select rule_name,attr,rule_values from admin.account_grants g
-    left join (select rule_name,attr,rule_id from admin.rules )r on r.rule_id=g.rule_id
-    where account_id in (select account_id from admin.account_users where user_uid='{{id}}'))" limit="50" sql1=1}}
-    {{{tableList rows
-        
-        columns="
-        Правило, rule_name,
-        Атрибут,attr,
-        Значення,rule_values
-        "
-        }}}
-    {{/contentList}}
-</div>