History fixes. Ui updates. Logout fix. Minor updates.

grnet · Mar 17, 2023 · c73c1ab · c73c1ab
1 parent 259961e
commit c73c1ab
Show file tree

Hide file tree

Showing 21 changed files with 425 additions and 368 deletions.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -55,6 +55,7 @@ services:
             - GSIS_GOV=$GSIS_GOV
     database:
         image: mysql:8
+        # command: --sort_buffer_size=1073741824
         ports:
             - '127.0.0.1:2306:3306'
         expose: 

diff --git a/middleware/diff.js b/middleware/diff.js
@@ -11,12 +11,12 @@ const tablesLib = require("../lib/tables");
 
 exports.exportPDF = async function (req, res, next) {
   let data = req.diffData;
-  const minister_names = await tablesLib.getTableData(["minister_name"], data);
-  const minister_ministries = await tablesLib.getTableData(
-    ["minister_ministry"],
-    data
-  );
-  const minister_roles = await tablesLib.getTableData(["minister_role"], data);
+  // const minister_names = await tablesLib.getTableData(["minister_name"], data);
+  // const minister_ministries = await tablesLib.getTableData(
+  //   ["minister_ministry"],
+  //   data
+  // );
+  // const minister_roles = await tablesLib.getTableData(["minister_role"], data);
 
   // const field_17_minister_names = await tablesLib.getTableData(
   //   ["field_17_minister_name"],
@@ -2310,10 +2310,10 @@ exports.exportPDF = async function (req, res, next) {
           },
         },
         { text: "\n\n" },
-        createSignatories(
-          minister_names.minister_name,
-          minister_roles.minister_role
-        ),
+        // createSignatories(
+        //   minister_names.minister_name,
+        //   minister_roles.minister_role
+        // ),
       ],
     ],
   };

diff --git a/middleware/export.js b/middleware/export.js
@@ -1283,6 +1283,7 @@ exports.exportPDF = async function (req, res, next) {
           },
         },
         createField19(data),
+        { text: "", pageBreak: "before" },
         {
           table: {
             widths: ["5%", "95%"],

diff --git a/middleware/export_glk.js b/middleware/export_glk.js
@@ -9,9 +9,17 @@ const htmlToPdfmake = require("html-to-pdfmake");
 const tablesLib = require("../lib/tables");
 
 exports.exportGlk = async function (req, res, next) {
+  console.log(req.params);
+  console.log("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+  const index = req.params.entry_id.indexOf(":");
+  const id =
+    index != -1 ? req.params.entry_id.substring(1) : req.params.entry_id;
   let result = await database.analysis.findOne({
-    where: { id: req.params.entry_id },
+    where: {
+      id: id,
+    },
   });
+  console.log(result);
   let data = result.dataValues.data;
   let accountingData = result.dataValues.accountingData;
 
@@ -421,7 +429,7 @@ exports.exportGlk = async function (req, res, next) {
   };
 
   var pdfDoc = printer.createPdfKitDocument(docDefinition);
-  var pdf_name = data.glk_pdf_name + ".pdf";
+  var pdf_name = data.title +'_accounting' + ".pdf";
   //pdf_name = pdf_name.replace(/\s+/g, '');
   var export_path = "public/exports/";
   var pdf_path = path.resolve(export_path, pdf_name);
@@ -613,4 +621,4 @@ function createSignatoryTables(indexes, names, ministries, roles) {
     },
   });
   return result;
-}
+}