@ejfdelgado/ejflab-back 1.25.1 → 1.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ejfdelgado/ejflab-back",
-  "version": "1.25.1",
+  "version": "1.26.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-back.git"

package/srv/MyPdf.mjs

@@ -1,10 +1,16 @@
 import fs from "fs";
 import puppeteer from 'puppeteer';
 import { General } from "./common/General.mjs";
+import { MyTemplate } from "@ejfdelgado/ejflab-common/src/MyTemplate.js";
 
 export class MyPdf {
-    static async localRender(template) {
+    static async localRender(template, model = {}, format = "pdf") {
         const source = fs.readFileSync(`./src/assets/templates/pdf/${template}`, { encoding: "utf8" });
+        const renderer = new MyTemplate();
+        const rendered = renderer.render(source, model);
+        if (format == "html") {
+            return rendered;
+        }
         const browser = await puppeteer.launch({
             headless: 'new',
             executablePath: '/usr/bin/google-chrome',
@@ -14,7 +20,7 @@ export class MyPdf {
             ]
         });
         const page = await browser.newPage();
-        await page.setContent(source);
+        await page.setContent(rendered);
         await page.emulateMediaType('print');
         const pdf = await page.pdf({
             margin: { top: '100px', right: '50px', bottom: '100px', left: '50px' },
@@ -27,11 +33,21 @@ export class MyPdf {
 
     static async render(req, res, next) {
         const template = General.readParam(req, "template");
-        const pdf = await MyPdf.localRender(template);
-        res.writeHead(200, {
-            "Content-Type": "application/pdf",
-            "Content-disposition": "inline"
-        });
-        res.end(pdf);
+        const format = General.readParam(req, "format", "pdf");
+        const body = req.body;
+        const rendered = await MyPdf.localRender(template, body, format);
+        if (format == "html") {
+            res.writeHead(200, {
+                "Content-Type": "text/html",
+                "Content-disposition": "inline"
+            });
+            res.end(rendered);
+        } else {
+            res.writeHead(200, {
+                "Content-Type": "application/pdf",
+                "Content-disposition": "inline"
+            });
+            res.end(rendered);
+        }
     }
 }

package/srv/common/General.mjs

@@ -74,12 +74,13 @@ export class General {
         const limit = parseInt(General.readParam(req, "limit", General.PAGE_SIZE_DEFAULT));
         const orderColumn = General.readParam(req, "orderColumn", orderColumnDef);
         const direction = General.readParam(req, "direction", General.PAGE_DIRECTION).toLowerCase();
-        const page = parseInt(General.readParam(req, "page", "0"));
+        const page = parseInt(General.readParam(req, "page", null));
+        const offsetProvided = parseInt(General.readParam(req, "offset", null));
         if (!(typeof limit == "number")) {
             throw new MalaPeticionException("limit is expected to be a number");
         }
-        if (!(typeof page == "number")) {
-            throw new MalaPeticionException("page is expected to be a number");
+        if (isNaN(page) && isNaN(offsetProvided)) {
+            throw new MalaPeticionException("page or offset is expected to be a number");
         }
         if (General.DIRECTION_CHOICES.indexOf(direction) < 0) {
             throw new MalaPeticionException(`direction is expected to be one of ${General.DIRECTION_CHOICES.join(', ')}`);
@@ -89,7 +90,7 @@ export class General {
             orderColumn,
             direction,
             page,
-            offset: page * limit
+            offset: !isNaN(offsetProvided) ? offsetProvided : page * limit
         };
     }
 }