@opengis/gis 0.1.34 → 0.1.36

package/module/gis/cls/view.json

@@ -0,0 +1,22 @@
+[
+    {
+        "id": "1",
+        "text": "Шаблон 1"
+    },
+    {
+        "id": "2",
+        "text": "Шаблон 2"
+    },
+    {
+        "id": "3",
+        "text": "Шаблон 3"
+    },
+    {
+        "id": "4",
+        "text": "Шаблон 4"
+    },
+    {
+        "id": "5",
+        "text": "Шаблон 5"
+    }
+]

package/module/gis/form/gis.registers.form.json

@@ -46,23 +46,27 @@
       "col": 6,
       "type": "Tags"
     },
-    "is_public": {
-      "ua": "Чи публічний реєстр?",
+    "view": {
+      "ua": "Вигляд реєстру",
       "col": 6,
-      "type": "Switcher",
-      "data": "yes_no",
+      "defaultValue": "1",
+      "data": "view",
+      "type": "Autocomplete",
       "validators": [
         "required"
       ]
     },
+    "is_public": {
+      "ua": "Чи публічний реєстр?",
+      "col": 6,
+      "type": "Switcher",
+      "data": "yes_no"
+    },
     "is_active": {
       "ua": "Чи активний?",
       "col": 6,
       "type": "Switcher",
-      "data": "yes_no",
-      "validators": [
-        "required"
-      ]
+      "data": "yes_no"
     },
     "image": {
       "ua": "Фото",
@@ -131,13 +135,21 @@
       "type": "HTML",
       "title": "Структура реєстру",
       "text": "<h2 class='text-xl font-bold text-left'>Структура реєстру</h2>",
-      "conditions": ["table_name","!=","null"],
+      "conditions": [
+        "table_name",
+        "!=",
+        "null"
+      ],
       "col": 12
     },
     "columns": {
       "type": "DataTable",
       "ua": "Колонки",
-      "conditions": ["table_name","!=","null"],
+      "conditions": [
+        "table_name",
+        "!=",
+        "null"
+      ],
       "colModel": [
         {
           "key": "name",
@@ -147,7 +159,7 @@
           "ua": "Назва колонки в БД",
           "i": "Для працездатності випадаючого списку оберіть табличку в БД вище",
           "behavior": {
-            "set" : {
+            "set": {
               "ua": "comment"
             }
           },
@@ -184,7 +196,15 @@
         {
           "key": "data",
           "ua": "Класифікатор",
-          "conditions": ["format","in",["select","badge","tags"]],
+          "conditions": [
+            "format",
+            "in",
+            [
+              "select",
+              "badge",
+              "tags"
+            ]
+          ],
           "type": "Text"
         },
         {
@@ -213,7 +233,11 @@
     "filters": {
       "type": "DataTable",
       "ua": "Фільтри",
-      "conditions": ["table_name","!=","null"],
+      "conditions": [
+        "table_name",
+        "!=",
+        "null"
+      ],
       "colModel": [
         {
           "key": "id",
@@ -223,7 +247,7 @@
           "ua": "Назва колонки в БД",
           "i": "Для працездатності випадаючого списку оберіть табличку в БД вище",
           "behavior": {
-            "set" : {
+            "set": {
               "label": "comment"
             }
           },
@@ -252,7 +276,14 @@
           "key": "data",
           "type": "Text",
           "ua": "Класифікатор",
-          "conditions": ["type","in",["Autocomplete","Check"]]
+          "conditions": [
+            "type",
+            "in",
+            [
+              "Autocomplete",
+              "Check"
+            ]
+          ]
         },
         {
           "key": "disabled",
@@ -268,4 +299,4 @@
       ]
     }
   }
-}
+}

package/module/gis/table/site.gis.registers.table.json

@@ -20,6 +20,12 @@
     },
     "title": "Реєстри",
     "form": "gis.registers.form",
+    "sql": [
+        {
+            "name": "is_export_sql",
+            "sql": "select jsonb_path_exists(columns, '$[*] ? (@.is_export == true)') as is_export"
+        }
+    ],
     "columns": [
         {
             "ua": "Назва",
@@ -58,6 +64,12 @@
             "ua": "Аліас реєстру",
             "name": "register_key",
             "format": "text"
+        },
+        {
+            "ua": "Наявність колонок для експорту",
+            "name": "is_export",
+            "data": "yes_no",
+            "format": "badge"
         }
     ],
     "filterList": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "type": "module",
   "author": "Softpro",
   "main": "dist/import-file.js",
@@ -57,4 +57,4 @@
     "sass-embedded": "1.86.3",
     "vite": "^6.3.5"
   }
-}
+}

package/server/routes/gis/registers/funcs/handleRegistryRequest.js

@@ -3,7 +3,7 @@ import { extractVisibleColumns } from './columns.js';
 import { getMeta, getFilterSQL } from "@opengis/fastify-table/utils.js";
 
 export async function handleRegistryRequest({ settings, query, object_id, offset = 0, limit = 16, page = 1, pg }) {
-    const { name, table_name, columns, filters, query: whereQuery, order, pk, register_id, is_files } = settings;
+    const { name, table_name, columns, filters, query: whereQuery, order, pk, register_id, is_files, view } = settings;
     const parsedColumns = Array.isArray(columns) ? columns : JSON.parse(columns);
     const filtersParsed = Array.isArray(filters) ? filters : JSON.parse(filters);
     const activeFilters = filtersParsed.filter((f) => f.disabled !== true);
@@ -93,6 +93,7 @@ export async function handleRegistryRequest({ settings, query, object_id, offset
         filters: activeFilters,
         limit,
         page,
+        view,
         config: {
             listConfig
         }

package/server/routes/gis/registers/gis.registry.js

@@ -19,7 +19,7 @@ export default async function gisRegistry({
     const {
         rows: [registry],
     } = await pg.query(
-        `SELECT register_id, name, table_name, columns, filters, query, "order", pk, register_key, is_files
+        `SELECT register_id, name, table_name, columns, filters, query, "order", pk, register_key, is_files, view
         FROM gis.registers
         WHERE register_key = $1`,
         [slug]

package/server/routes/map/controllers/mapFormat.js

@@ -38,19 +38,19 @@ export default async function mapFormat(req, reply) {
         }
     }
 
-    let source_path, attributes, tpl;
+    let source_path, attributes, tpl, cardInterface;
     if (service) {
-        ({ source_path, attributes } = service);
+        ({ source_path, attributes, interface: cardInterface } = service);
     } else {
         // git
         tpl = await getTemplate('map', map);
         const matchedLayer = tpl?.layers?.find(l => l.id === layer || l.service === layer);
         if (!matchedLayer || !matchedLayer.source_path || !matchedLayer.card) {
             return reply.status(404).send('template not found');
-        }
-
+        };
         source_path = matchedLayer.source_path;
         attributes = matchedLayer.card;
+
     }
 
     const columns = attributes;
@@ -101,11 +101,16 @@ export default async function mapFormat(req, reply) {
 
     const html = `<dl class="divide-y divide-gray-100 py-[5px]">${result.join('')}</dl>`;
 
-    return {
+    const res = {
         time: Date.now() - time,
         id,
         rows: fullRow,
         columns,
         html
     };
+    if (service) {
+        res.cardInterface = cardInterface;
+    }
+
+    return res;
 }