@opengis/admin 0.3.22 → 0.3.24

package/server/routes/widget/controllers/widget.get.js

@@ -1,125 +1,125 @@
-import { getMeta, getToken, pgClients } from '@opengis/fastify-table/utils.js';
-
-const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
-const username = `coalesce(u.sur_name,'')||coalesce(' '||u.user_name,'') ||coalesce(' '||u.father_name,'')`;
-
-/**
- * Дістає CRM для widget
- *
- */
-
-export default async function widgetGet({
-  pg = pgClients.client, user = {}, params = {}, query = {},
-}) {
-  const param = user?.uid ? await getToken({
-    token: params.objectid, mode: 'w', uid: user.uid,
-  }) : null;
-
-  const objectid = param ? JSON.parse(param)?.id : params.objectid;
-
-  if (!objectid) {
-    return { message: 'id required', status: 400 };
-  }
-
-  const sqls = {
-    comment: pg.pk['admin.users']
-      ? `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
-    ${username} as username, u.login, u.avatar
-    from crm.communications c
-    left join admin.users u on u.uid=c.uid 
-    where entity_id=$1 order by cdate desc`
-      : 'select communication_id, entity_id, body, subject, cdate, uid from crm.communications where entity_id=$1 order by cdate desc',
-
-    history: `select * from (
-      SELECT change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
-      ${username} as username, u.login, u.avatar
-      FROM log.table_changes a
-      left join admin.users u on a.change_user_id = u.uid
-      left join lateral(
-        select json_agg(row_to_json(q)) from (
-          select change_data_id, entity_key, value_new, value_old from log.table_changes_data
-          where change_id=a.change_id
-        )q
-      )b on 1=1
-      where b.json_agg is not null and (entity_id=$1 or entity_id in (
-        select communication_id as comments from crm.communications where entity_id=$1
-        union all select checklist_id from crm.checklists where entity_id=$1)
-      )
-
-    union all
-    select change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
-        ${username} as username, u.login, u.avatar
-        FROM log.table_changes a
-        left join admin.users u on a.change_user_id = u.uid
-            left join lateral(
-          select json_agg(o) from (
-            select json_object_agg(entity_key, coalesce(value_new, value_old)) as o from log.table_changes_data
-            where change_id=a.change_id and entity_key not in ('uid', 'file_status', 'editor_id', 'cdate', 'editor_date', 'entity_id')
-          )q 
-        )b on 1=1
-        where a.change_type in ('INSERT', 'DELETE') and a.entity_id in (select file_id from crm.files where entity_id=$1)
-        limit 100
-
-    )q order by cdate desc limit 100`,
-
-    checklist: pg.pk['admin.users']
-      ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, ${username} as username, u.login, u.avatar
-      FROM crm.checklists c
-      left join admin.users u on u.uid=c.uid
-      where entity_id=$1 order by cdate desc`
-      : 'SELECT checklist_id, entity_id, subject, is_done, done_date, uid, cdate FROM crm.checklists where entity_id=$1 order by cdate desc',
-
-    file: pg.pk['admin.users']
-      ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain, 
-    ${username} as username, u.login, isverified, u.avatar, u.uid as author, file_status 
-    FROM crm.files c 
-    left join admin.users u on u.uid=c.uid
-    where entity_id=$1 and file_status<>3 order by cdate desc`
-      : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, uid, cdate, file_type, ismain,
-      isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 order by cdate desc`,
-    gallery: pg.pk['admin.users']
-      ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
-    ${username} as username, u.login, u.avatar, isverified, u.avatar, c.uid as author, file_status 
-    FROM crm.files c 
-    left join admin.users u on u.uid=c.uid
-    where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`
-      : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, ismain,
-      isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`,
-
-  };
-  const sql = sqls[params.type];
-
-  if (!sql) {
-    return { message: 'param type not valid', status: 400 };
-  }
-
-
-  /* data */
-  const time = [Date.now()];
-  const { rows = [] } = await pg.query(sql, [objectid, params.type === 'gallery' ? galleryExtList : null].filter((el) => el));
-  rows.forEach(row => Object.assign(row, { username: row.username?.trim?.() || row.login }));
-  time.push(Date.now());
-
-  /* Object info  */
-  const { tableName } = pg.pk['log.table_changes'] ? await pg.one('select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1', [objectid]) : {};
-  const { pk } = await getMeta({ table: tableName });
-
-  const q = tableName && pg.pk['admin.users'] ? `select ${username} as author, u.login, a.cdate, a.editor_date from ${tableName} a 
-  left join admin.users u on a.uid=u.uid where a.${pk}=$1 limit 1` : undefined;
-
-  const data = pk && q ? await pg.one(q, [objectid]) : {};
-
-  if (query.debug && user?.user_type === 'admin') {
-    return {
-      sql, type: params.type, q, id: objectid, data,
-    };
-  }
-
-  return {
-    time: { data: time[1] - time[0] },
-    rows,
-    user: { uid: user?.uid, name: user?.user_name },
-    data: { author: data?.author, cdate: data?.cdate, edate: data?.editor_date },
-    objectid: params.objectid,
-  };
-}
+import { getMeta, getToken, pgClients } from '@opengis/fastify-table/utils.js';
+
+const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
+const username = `coalesce(u.sur_name,'')||coalesce(' '||u.user_name,'') ||coalesce(' '||u.father_name,'')`;
+
+/**
+ * Дістає CRM для widget
+ *
+ */
+
+export default async function widgetGet({
+  pg = pgClients.client, user = {}, params = {}, query = {},
+}) {
+  const param = user?.uid ? await getToken({
+    token: params.objectid, mode: 'w', uid: user.uid,
+  }) : null;
+
+  const objectid = param ? JSON.parse(param)?.id : params.objectid;
+
+  if (!objectid) {
+    return { message: 'id required', status: 400 };
+  }
+
+  const sqls = {
+    comment: pg.pk['admin.users']
+      ? `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
+    ${username} as username, u.login, u.avatar
+    from crm.communications c
+    left join admin.users u on u.uid=c.uid 
+    where entity_id=$1 order by cdate desc`
+      : 'select communication_id, entity_id, body, subject, cdate, uid from crm.communications where entity_id=$1 order by cdate desc',
+
+    history: `select * from (
+      SELECT change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
+      ${username} as username, u.login, u.avatar
+      FROM log.table_changes a
+      left join admin.users u on a.change_user_id = u.uid
+      left join lateral(
+        select json_agg(row_to_json(q)) from (
+          select change_data_id, entity_key, value_new, value_old from log.table_changes_data
+          where change_id=a.change_id
+        )q
+      )b on 1=1
+      where b.json_agg is not null and (entity_id=$1 or entity_id in (
+        select communication_id as comments from crm.communications where entity_id=$1
+        union all select checklist_id from crm.checklists where entity_id=$1)
+      )
+
+    union all
+    select change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
+        ${username} as username, u.login, u.avatar
+        FROM log.table_changes a
+        left join admin.users u on a.change_user_id = u.uid
+            left join lateral(
+          select json_agg(o) from (
+            select json_object_agg(entity_key, coalesce(value_new, value_old)) as o from log.table_changes_data
+            where change_id=a.change_id and entity_key not in ('uid', 'file_status', 'editor_id', 'cdate', 'editor_date', 'entity_id')
+          )q 
+        )b on 1=1
+        where a.change_type in ('INSERT', 'DELETE') and a.entity_id in (select file_id from crm.files where entity_id=$1)
+        limit 100
+
+    )q order by cdate desc limit 100`,
+
+    checklist: pg.pk['admin.users']
+      ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, ${username} as username, u.login, u.avatar
+      FROM crm.checklists c
+      left join admin.users u on u.uid=c.uid
+      where entity_id=$1 order by cdate desc`
+      : 'SELECT checklist_id, entity_id, subject, is_done, done_date, uid, cdate FROM crm.checklists where entity_id=$1 order by cdate desc',
+
+    file: pg.pk['admin.users']
+      ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain, 
+    ${username} as username, u.login, isverified, u.avatar, u.uid as author, file_status 
+    FROM crm.files c 
+    left join admin.users u on u.uid=c.uid
+    where entity_id=$1 and file_status<>3 order by cdate desc`
+      : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, uid, cdate, file_type, ismain,
+      isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 order by cdate desc`,
+    gallery: pg.pk['admin.users']
+      ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
+    ${username} as username, u.login, u.avatar, isverified, u.avatar, c.uid as author, file_status 
+    FROM crm.files c 
+    left join admin.users u on u.uid=c.uid
+    where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`
+      : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, ismain,
+      isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`,
+
+  };
+  const sql = sqls[params.type];
+
+  if (!sql) {
+    return { message: 'param type not valid', status: 400 };
+  }
+
+
+  /* data */
+  const time = [Date.now()];
+  const { rows = [] } = await pg.query(sql, [objectid, params.type === 'gallery' ? galleryExtList : null].filter((el) => el));
+  rows.forEach(row => Object.assign(row, { username: row.username?.trim?.() || row.login }));
+  time.push(Date.now());
+
+  /* Object info  */
+  const { tableName } = pg.pk['log.table_changes'] ? await pg.one('select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1', [objectid]) : {};
+  const { pk } = await getMeta({ table: tableName });
+
+  const q = tableName && pg.pk['admin.users'] ? `select ${username} as author, u.login, a.cdate, a.editor_date from ${tableName} a 
+  left join admin.users u on a.uid=u.uid where a.${pk}=$1 limit 1` : undefined;
+
+  const data = pk && q ? await pg.one(q, [objectid]) : {};
+
+  if (query.debug && user?.user_type === 'admin') {
+    return {
+      sql, type: params.type, q, id: objectid, data,
+    };
+  }
+
+  return {
+    time: { data: time[1] - time[0] },
+    rows,
+    user: { uid: user?.uid, name: user?.user_name },
+    data: { author: data?.author, cdate: data?.cdate, edate: data?.editor_date },
+    objectid: params.objectid,
+  };
+}

package/server/templates/form/admin.profile.form.json

@@ -1,31 +1,31 @@
-{
-  "schema": {
-    "sur_name": {
-      "ua": "Прізвище",
-      "type": "text",
-      "validators": ["required"]
-    },
-    "user_name": {
-      "ua": "Ім'я",
-      "type": "text",
-      "validators": ["required"]
-    },
-    "father_name": {
-      "ua": "По батькові",
-      "type": "text"
-    },
-    "email": {
-      "ua": "Email",
-      "type": "email",
-      "validators": ["required"]
-    },
-    "phone": {
-      "ua": "Номер телефону",
-      "type": "text"
-    },
-    "avatar": {
-      "ua": "Аватар",
-      "type": "file"
-    }
-  }
-}
+{
+  "schema": {
+    "sur_name": {
+      "ua": "Прізвище",
+      "type": "text",
+      "validators": ["required"]
+    },
+    "user_name": {
+      "ua": "Ім'я",
+      "type": "text",
+      "validators": ["required"]
+    },
+    "father_name": {
+      "ua": "По батькові",
+      "type": "text"
+    },
+    "email": {
+      "ua": "Email",
+      "type": "email",
+      "validators": ["required"]
+    },
+    "phone": {
+      "ua": "Номер телефону",
+      "type": "text"
+    },
+    "avatar": {
+      "ua": "Аватар",
+      "type": "file"
+    }
+  }
+}

package/server/templates/form/cp_building.form.json

@@ -1,33 +1,33 @@
-{
-    "schema": {
-        
-        "cp_umuni_id": {
-            "type": "Text",
-            "ua": "ID UMUNI"
-        },
-        "cp_year": {
-            "type": "Text",
-            "ua": "Рік будівництва"
-        },
-        "cp_date_en_audit": {
-            "type": "DatePicker",
-            "ua": "Дата проведення останнього енергоаудиту"
-        },
-        "cp_certificate": {
-            "type": "Text",
-            "ua": "Сертифікат енергоефективності будівлі",
-            "help": "Вкажіть посилання"
-        },
-        "cp_pkd": {
-            "type": "Autocomplete",
-            "data": "customer_name",
-            "add": {
-                "model": "crm.accounts",
-                "ua": "Додати",
-                "form": "account_light.form"
-            },
-            "ua": "Замовник ПКД"
-        }
-    },
-    "label_style": "vertical"
+{
+    "schema": {
+        
+        "cp_umuni_id": {
+            "type": "Text",
+            "ua": "ID UMUNI"
+        },
+        "cp_year": {
+            "type": "Text",
+            "ua": "Рік будівництва"
+        },
+        "cp_date_en_audit": {
+            "type": "DatePicker",
+            "ua": "Дата проведення останнього енергоаудиту"
+        },
+        "cp_certificate": {
+            "type": "Text",
+            "ua": "Сертифікат енергоефективності будівлі",
+            "help": "Вкажіть посилання"
+        },
+        "cp_pkd": {
+            "type": "Autocomplete",
+            "data": "customer_name",
+            "add": {
+                "model": "crm.accounts",
+                "ua": "Додати",
+                "form": "account_light.form"
+            },
+            "ua": "Замовник ПКД"
+        }
+    },
+    "label_style": "vertical"
 }