From 3ee0add6f6ca18c1a783cb98d1cf39fe49f8cd49 Mon Sep 17 00:00:00 2001
From: Enishowk <kenshineuh@gmail.com>
Date: Fri, 7 May 2021 18:54:59 +0200
Subject: [PATCH 1/2] feat: add parent name column in excel export

---
 models/exportExcel.js | 47 +++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/models/exportExcel.js b/models/exportExcel.js
index f5ef53849..58dde6d21 100644
--- a/models/exportExcel.js
+++ b/models/exportExcel.js
@@ -235,7 +235,7 @@ export class ExporterExcel {
       },
       {
         key: 'b',
-        width: 20,
+        width: 40,
       },
       {
         key: 'c',
@@ -243,25 +243,11 @@ export class ExporterExcel {
       },
       {
         key: 'd',
-        width: 20,
-        style: {
-          font: {
-            name: TAPi18n.__('excel-font'),
-            size: '10',
-          },
-          numFmt: 'yyyy/mm/dd hh:mm:ss',
-        },
+        width: 40,
       },
       {
         key: 'e',
         width: 20,
-        style: {
-          font: {
-            name: TAPi18n.__('excel-font'),
-            size: '10',
-          },
-          numFmt: 'yyyy/mm/dd hh:mm:ss',
-        },
       },
       {
         key: 'f',
@@ -321,6 +307,13 @@ export class ExporterExcel {
       {
         key: 'k',
         width: 20,
+        style: {
+          font: {
+            name: TAPi18n.__('excel-font'),
+            size: '10',
+          },
+          numFmt: 'yyyy/mm/dd hh:mm:ss',
+        },
       },
       {
         key: 'l',
@@ -346,6 +339,10 @@ export class ExporterExcel {
         key: 'q',
         width: 20,
       },
+      {
+        key: 'r',
+        width: 20,
+      },
     ];
 
     //add title line
@@ -430,7 +427,7 @@ export class ExporterExcel {
       size: 10,
       bold: true,
     };
-    ws.mergeCells('F3:Q3');
+    ws.mergeCells('F3:R3');
     ws.getCell('B3').style = {
       font: {
         name: TAPi18n.__('excel-font'),
@@ -509,6 +506,7 @@ export class ExporterExcel {
       TAPi18n.__('number'),
       TAPi18n.__('title'),
       TAPi18n.__('description'),
+      TAPi18n.__('parent-card'),
       TAPi18n.__('owner'),
       TAPi18n.__('createdAt'),
       TAPi18n.__('last-modified-at'),
@@ -542,6 +540,7 @@ export class ExporterExcel {
     allBorder('O5');
     allBorder('P5');
     allBorder('Q5');
+    allBorder('R5');
     cellCenter('A5');
     cellCenter('B5');
     cellCenter('C5');
@@ -559,6 +558,7 @@ export class ExporterExcel {
     cellCenter('O5');
     cellCenter('P5');
     cellCenter('Q5');
+    cellCenter('R5');
     ws.getRow(5).font = {
       name: TAPi18n.__('excel-font'),
       size: 12,
@@ -586,6 +586,11 @@ export class ExporterExcel {
         jclabel += jlabel[jcard.labelIds[jl]];
         jclabel += ' ';
       }
+      //get parent name
+      if (jcard.parentId) {
+        const parent = result.cards.find(card => card._id === jcard.parentId);
+        jcard.parentName = parent ? parent.title : '';
+      }
 
       //add card detail
       const t = Number(i) + 1;
@@ -593,6 +598,7 @@ export class ExporterExcel {
         t.toString(),
         jcard.title,
         jcard.description,
+        jcard.parentName,
         jmeml[jcard.userId],
         addTZhours(jcard.createdAt),
         addTZhours(jcard.dateLastActivity),
@@ -627,6 +633,7 @@ export class ExporterExcel {
       allBorder(`O${y}`);
       allBorder(`P${y}`);
       allBorder(`Q${y}`);
+      allBorder(`R${y}`);
       cellCenter(`A${y}`);
       ws.getCell(`B${y}`).alignment = {
         wrapText: true,
@@ -634,15 +641,15 @@ export class ExporterExcel {
       ws.getCell(`C${y}`).alignment = {
         wrapText: true,
       };
-      ws.getCell(`L${y}`).alignment = {
-        wrapText: true,
-      };
       ws.getCell(`M${y}`).alignment = {
         wrapText: true,
       };
       ws.getCell(`N${y}`).alignment = {
         wrapText: true,
       };
+      ws.getCell(`O${y}`).alignment = {
+        wrapText: true,
+      };
     }
     workbook.xlsx.write(res).then(function() {});
   }

From 120cb4820e80ef0b0ad4c9f5a5872b67c8b4d10e Mon Sep 17 00:00:00 2001
From: Enishowk <kenshineuh@gmail.com>
Date: Fri, 7 May 2021 18:58:24 +0200
Subject: [PATCH 2/2] fix: typo

---
 models/exportExcel.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/models/exportExcel.js b/models/exportExcel.js
index 58dde6d21..c8eceb1e4 100644
--- a/models/exportExcel.js
+++ b/models/exportExcel.js
@@ -588,8 +588,10 @@ export class ExporterExcel {
       }
       //get parent name
       if (jcard.parentId) {
-        const parent = result.cards.find(card => card._id === jcard.parentId);
-        jcard.parentName = parent ? parent.title : '';
+        const parentCard = result.cards.find(
+          card => card._id === jcard.parentId,
+        );
+        jcard.parentCardTitle = parentCard ? parentCard.title : '';
       }
 
       //add card detail
@@ -598,7 +600,7 @@ export class ExporterExcel {
         t.toString(),
         jcard.title,
         jcard.description,
-        jcard.parentName,
+        jcard.parentCardTitle,
         jmeml[jcard.userId],
         addTZhours(jcard.createdAt),
         addTZhours(jcard.dateLastActivity),