@opengis/admin 0.2.73 → 0.2.75

package/package.json

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

package/server/helpers/index.js

@@ -26,4 +26,6 @@ export default async function route() {
     handlebarsSync.registerHelper('ifCond', ifCond);
     handlebarsSync.registerHelper('button', buttonHelper);
     handlebars.registerHelper('ifCond', ifCond);
+    handlebars.registerHelper('empty', () => { });
+    handlebarsSync.registerHelper('empty', () => { });
 }

package/server/routes/print/controllers/cardPrint.js

@@ -5,8 +5,7 @@ import { fileURLToPath } from 'url';
 import { createHash } from 'crypto';
 
 import {
-    config, getTemplate, pgClients, handlebars, getFolder, getFilterSQL, logger,
-    metaFormat,
+    config, getTemplate, pgClients, handlebars, getFilterSQL, logger, metaFormat, getMeta,
 } from '@opengis/fastify-table/utils.js';
 import { grpc } from '@opengis/fastify-file/utils.js';
 
@@ -14,6 +13,14 @@ const { htmlToPdf } = grpc();
 const filename = fileURLToPath(import.meta.url);
 const dirname = path.dirname(filename);
 
+// printMap
+const host = 'https://data.gki.com.ua';
+const width = 850;
+const height = 400;
+const geomBuffer = 0.001;
+const layers = '';
+const basemap = 'voyager';
+
 export default async function cardPrint(req, reply) {
     const { pg = pgClients.client, params = {}, query = {}, user = {} } = req;
     const { table, id } = params;
@@ -40,6 +47,7 @@ export default async function cardPrint(req, reply) {
     }
 
     const body = await getTemplate('table', table);
+    const { geom } = await getMeta({ pg, table: body?.table });
 
     if (!body?.table) {
         return { message: 'table nof found', status: 404 };
@@ -56,7 +64,7 @@ export default async function cardPrint(req, reply) {
         table,
         query: where,
     })
-    const { rows = [] } = await pg.query(`select * from (${optimizedSQL})q where ${where}`, [id]);
+    const { rows = [] } = await pg.query(`select * ${geom ? `, st_asgeojson(${geom})::json as geom` : ''} from (${optimizedSQL})q where ${where}`, [id]);
 
     const cls = body?.columns?.filter(el => el.data)?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.data }), {});
     await metaFormat({ rows, cls, sufix: false });
@@ -66,6 +74,12 @@ export default async function cardPrint(req, reply) {
         return { message: 'data not found', status: 404 };
     }
 
+    Object.assign(data, { id: data[body.key || pg.pk?.[body.table]] });
+
+    const mapUrl = `${host}/api-user/print-map?basemap=${basemap}&layers=${layers || ''}&geojson=${JSON.stringify(data['geom'])}&base64=1&height=${height}&width=${width}&buffer=${geomBuffer}&nocache=1`;
+    const resp = data['geom'] ? await fetch(mapUrl) : null;
+    const printMap = data['geom'] ? await resp.text() : '';
+
     const pt = await getTemplate('pt', template)
         || await readFile(path.join(dirname, '../../../templates/pt/card-print.pt.hbs'), 'utf8');
 
@@ -73,14 +87,17 @@ export default async function cardPrint(req, reply) {
     const qrCode = `<img src="${await qr.toDataURL(url, { type: 'png', ec_level: 'M', size: 5, margin: 4 })}" alt="qrcode">`;
 
     const cardTemplates = await getTemplate('card', table);
-    const titles = (cardTemplates?.find(el => el[0] === 'index.yml')?.[1] || {})?.panels
-        ?.reduce((acc, curr) => curr.items?.reduce?.((acc1, curr1) => Object.assign(acc, { [curr1.name]: curr1.title })), {});
+    const index = cardTemplates?.find(el => el[0] === 'index.yml')?.[1];
     const cardHbsTabs = cardTemplates.filter(el => el[0].endsWith('hbs'));
 
-    const tabs = tab ? cardHbsTabs.filter(el => [tab, `${tab}.hbs`].includes(el[0])) : cardHbsTabs;
-    const tabData = await Promise.all(tabs.map(async (el) => {
-        const html = await handlebars.compile(el[1].replace(/\{\{\{button[^\}]*\}\}\}/g, ''))(data);
-        return { name: el[0], title: titles[el[0].slice(0, el[0].length - 4)], html };
+    const orderedTabs = index?.panels?.flatMap(panel => panel.items?.map(item => {
+        const body = cardHbsTabs.find(el => el[0] === `${item.name}.hbs`)?.[1];
+        return { ...item, body };
+    })).filter(el => el.name && el.body);
+
+    const tabData = await Promise.all(orderedTabs.map(async (el) => {
+        const html = await handlebars.compile(el.body.replace(/\{\{\{button[^\}]*\}\}\}/g, ''))(data);
+        return { name: el.name, title: el.title, html };
     }));
 
     const title = data?.[body.meta.title || ''];
@@ -89,6 +106,7 @@ export default async function cardPrint(req, reply) {
     const obj = {
         title,
         table_title: body.ua || body.title,
+        printMap,
         rows: tabData,
         data: Object.keys(data).filter(el => columnTitles[el]).reduce((acc, curr) => Object.assign(acc, { [columnTitles[curr] || curr]: data[curr] }), {}),
         rawData: data,
@@ -108,6 +126,6 @@ export default async function cardPrint(req, reply) {
     // await mkdir(path.dirname(filepath), { recursive: true });
     // await writeFile(filepath, buffer);
 
-    logger.file('printPdf', { table, id, format, uid: user?.uid });
+    logger.file('cardPrint', { table, id, format, uid: user?.uid });
     return reply.headers(headers).send(buffer);
 }

package/server/templates/pt/card-print.pt.hbs

@@ -1,15 +1,217 @@
-<h2>{{table_title}}</h2>
+<div style="display:flex; flex-direction: row; align-items: start; justify-content:space-between">
+    <div
+        style=" display: flex; flex-direction:column; text-align: center;  align-items: center; justify-content: center; width:100%;">
+        {{#if table_title}}<h2 style="text-align: center;">{{table_title}}</h2>{{/if}}
+        {{#if title}}<h3>{{title}}</h3>{{/if}}
+        <p>{{formatDate 0 format="dd.mm.yy / hh:mi"}}</p>
+    </div>
+    <div class="qr-wrapper" style=" width:180px; height:180px;">{{{qr}}}</div>
+</div>
 
-<h3>{{title}}</h3>
+<div class="print-map">
+    {{{printMap}}}
+</div>
 
-<hr>
-{{{json data}}}
-<hr>
 {{#each rows}}
-<h3>{{title}}</h3>
-<div>{{{html}}}</div>
+<div style="margin-bottom:30px">
+    <h3>{{title}}</h3>
+    <div>{{{html}}}</div>
+</div>
+
 {{/each}}
-<hr>
-{{{url}}}
-<hr>
-{{{qr}}}
+<div style="margin-top: 50px;">
+    <hr />
+    <div style="word-break: break-all;">{{{url}}}</div>
+
+</div>
+
+<style>
+    * {
+        margin: 0;
+        padding: 0;
+        box-sizing: border-box;
+    }
+
+    body {
+        font-family:
+            Arial, sans-serif;
+        font-size: 14px;
+        color: #333;
+        line-height: 1.5;
+        background-color: #fff;
+    }
+
+    h1,
+    h2,
+    h3 {
+        font-weight: bold;
+        margin-bottom: 15px;
+        color: #000;
+    }
+
+    h2 {
+        font-size: 28px;
+        margin-bottom: 10px;
+    }
+
+    h3 {
+        font-size:
+            18px;
+        margin-bottom: 10px;
+    }
+
+    div.font-semibold {
+        margin-bottom: 15px;
+        color:
+            #000000;
+        font-size: 16px;
+    }
+
+    hr {
+        border: none;
+        border-top: 1px solid #ddd;
+        margin: 15px 0;
+    }
+
+    dl {
+        margin: 10px 0 25px;
+        width: 100%;
+    }
+
+    dl>div {
+        display:
+            flex;
+        flex-wrap: wrap;
+        align-items: center;
+        padding: 10px 0;
+        border-bottom:
+            1px solid #ddd;
+    }
+
+    dt {
+        font-weight: 400;
+        color: #111827;
+        width: 50%;
+        min-width: 150px;
+        padding-right: 10px;
+    }
+
+    dd {
+        flex: 1;
+        color: #374151;
+    }
+
+    div.bg-gray-200.text-center.p-6.rounded-xl h3 {
+        color: #374151;
+        font-weight: 400;
+        font-size: 14px;
+    }
+
+    button {
+        display: none;
+    }
+
+    a {
+        color: #374151;
+        text-decoration: none;
+        transition: color 0.3s;
+    }
+
+    ul {
+        list-style: none;
+        margin: 10px 0;
+        padding-left:
+            20px;
+    }
+
+    li {
+        margin-bottom: 5px;
+        color: #374151;
+        font-size: 16px;
+    }
+
+    button {
+        padding: 8px 12px;
+        font-size: 14px;
+        font-weight: 600;
+        border: none;
+        border-radius: 4px;
+    }
+
+    .qr-wrapper img {
+        width: 100%;
+        object-fit: cover;
+    }
+
+    .text-sm {
+        font-size: 14px;
+    }
+
+    .text-gray-700 {
+        color:
+            #4a5568;
+    }
+
+    .text-gray-900 {
+        color: #1a202c;
+    }
+
+    .font-semibold {
+        font-weight:
+            600;
+    }
+
+    .rounded-md {
+        border-radius: 6px;
+    }
+
+    .gap-4 {
+        gap: 16px;
+    }
+
+    .grid {
+        display: grid;
+        gap: 16px;
+    }
+
+    .grid-cols-1 {
+        grid-template-columns: 1fr;
+    }
+
+    .sm\\:grid-cols-3 {
+        grid-template-columns: repeat(3, 1fr);
+    }
+
+    .sm\\:col-span-2 {
+        grid-column: span 2 / span 2;
+    }
+
+    .divide-y>div:not(:last-child) {
+        border-bottom: 1px solid #ddd;
+    }
+
+    .flex {
+        display: flex;
+        align-items: center;
+    }
+
+    .justify-between {
+        justify-content: space-between;
+    }
+
+    .justify-center {
+        justify-content: center;
+    }
+
+    .border-b {
+        border-bottom: 1px solid #ddd;
+    }
+
+    .pb-\\[15px\\] {
+        padding-bottom: 15px;
+    }
+
+    .pt-\\[30px\\] {
+        padding-top: 30px;
+    }
+</style>