From e9b82da8ab19023e411ddeefe2d548023919defb Mon Sep 17 00:00:00 2001 From: Disha Date: Tue, 23 Nov 2021 15:14:00 +0530 Subject: [PATCH 1/8] Implemented barcode generator --- src/components/BarcodeGenerator.vue | 90 +++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 src/components/BarcodeGenerator.vue diff --git a/src/components/BarcodeGenerator.vue b/src/components/BarcodeGenerator.vue new file mode 100644 index 0000000..3f72442 --- /dev/null +++ b/src/components/BarcodeGenerator.vue @@ -0,0 +1,90 @@ + \ No newline at end of file From 0fd5b64f12f42e974fc7aa4ef62ba518009f3fe2 Mon Sep 17 00:00:00 2001 From: Disha Date: Tue, 23 Nov 2021 15:17:06 +0530 Subject: [PATCH 2/8] Revert "Implemented barcode generator" This reverts commit e9b82da8ab19023e411ddeefe2d548023919defb. --- src/components/BarcodeGenerator.vue | 90 ----------------------------- 1 file changed, 90 deletions(-) delete mode 100644 src/components/BarcodeGenerator.vue diff --git a/src/components/BarcodeGenerator.vue b/src/components/BarcodeGenerator.vue deleted file mode 100644 index 3f72442..0000000 --- a/src/components/BarcodeGenerator.vue +++ /dev/null @@ -1,90 +0,0 @@ - \ No newline at end of file From e66ee7868bf3144b043559052db4c2616688e21d Mon Sep 17 00:00:00 2001 From: Disha Date: Mon, 6 Dec 2021 17:17:40 +0530 Subject: [PATCH 3/8] Implemented: PDF generator --- package.json | 3 +++ src/router/index.ts | 8 +++++++- src/views/PdfGenerator.vue | 31 +++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/views/PdfGenerator.vue diff --git a/package.json b/package.json index 5f35af0..ece5719 100644 --- a/package.json +++ b/package.json @@ -19,10 +19,13 @@ "axios": "^0.21.1", "axios-cache-adapter": "^2.7.3", "core-js": "^3.6.5", + "html-to-pdfmake": "^2.3.7", "http-status-codes": "^2.1.4", + "jspdf": "^2.4.0", "mitt": "^2.1.0", "moment": "^2.29.1", "moment-timezone": "^0.5.33", + "pdfmake": "^0.2.4", "vue": "^3.0.0-0", "vue-i18n": "^9.0.0", "vue-router": "^4.0.0-0", diff --git a/src/router/index.ts b/src/router/index.ts index 62e34bb..320d0c3 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -3,6 +3,7 @@ import { RouteRecordRaw } from 'vue-router'; import Home from '@/views/Home.vue' import Login from '@/views/Login.vue' import Settings from "@/views/Settings.vue" +import PdfGenerator from "@/views/PdfGenerator.vue" import store from '@/store' const authGuard = (to: any, from: any, next: any) => { @@ -43,7 +44,12 @@ const routes: Array = [ name: "Settings", component: Settings, beforeEnter: authGuard - } + }, + { + path: "/pdf", + component: PdfGenerator, + name: 'PdfGenerator' + }, ] const router = createRouter({ diff --git a/src/views/PdfGenerator.vue b/src/views/PdfGenerator.vue new file mode 100644 index 0000000..7332457 --- /dev/null +++ b/src/views/PdfGenerator.vue @@ -0,0 +1,31 @@ + + \ No newline at end of file From 58be2f33802afddbe0d591235d6dfe68fcf5d362 Mon Sep 17 00:00:00 2001 From: Disha Date: Mon, 6 Dec 2021 17:24:16 +0530 Subject: [PATCH 4/8] Added a changelog --- changelogs/unreleased/-1w3w78x.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelogs/unreleased/-1w3w78x.yml diff --git a/changelogs/unreleased/-1w3w78x.yml b/changelogs/unreleased/-1w3w78x.yml new file mode 100644 index 0000000..89fe087 --- /dev/null +++ b/changelogs/unreleased/-1w3w78x.yml @@ -0,0 +1,6 @@ +--- +title: 'Implemented: PDF generator' +ticket_id: "#1w3w78x" +merge_request: 10 +author: Disha +type: added From b1ddd9b29b82ff987c361198dfdac7d4af23e2b3 Mon Sep 17 00:00:00 2001 From: Disha Date: Thu, 9 Dec 2021 12:17:22 +0530 Subject: [PATCH 5/8] Implemented Styles in pdf --- src/views/PdfGenerator.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/views/PdfGenerator.vue b/src/views/PdfGenerator.vue index 7332457..cf90dbf 100644 --- a/src/views/PdfGenerator.vue +++ b/src/views/PdfGenerator.vue @@ -17,15 +17,20 @@ import htmlToPdfmake from 'html-to-pdfmake'; export default { methods: { generatePdf() { - //get table html + pdfMake.vfs = pdfFonts.pdfMake.vfs; const pdfDocument = document.getElementById('PDF'); - //html to pdf format const html = htmlToPdfmake(pdfDocument.innerHTML); - const documentDefinition = { content: html }; - pdfMake.vfs = pdfFonts.pdfMake.vfs; - pdfMake.createPdf(documentDefinition).open(); + + const docDefinition = { + content: [html], + defaultStyle: { + fontSize: 15, + bold: true, + color: 'red' + } + }; + pdfMake.createPdf(docDefinition).open(); } } } - - \ No newline at end of file + From 9aab6c197dc05180c03e930d0d160120e257669c Mon Sep 17 00:00:00 2001 From: Disha Date: Fri, 10 Dec 2021 15:15:55 +0530 Subject: [PATCH 6/8] Improved PDF generation component --- src/views/PdfGenerator.vue | 35 +++++++++++++---------------------- src/views/PdfTemplate.vue | 5 +++++ 2 files changed, 18 insertions(+), 22 deletions(-) create mode 100644 src/views/PdfTemplate.vue diff --git a/src/views/PdfGenerator.vue b/src/views/PdfGenerator.vue index cf90dbf..5dbaea6 100644 --- a/src/views/PdfGenerator.vue +++ b/src/views/PdfGenerator.vue @@ -1,36 +1,27 @@ + }, +} + \ No newline at end of file diff --git a/src/views/PdfTemplate.vue b/src/views/PdfTemplate.vue new file mode 100644 index 0000000..0cdcd3a --- /dev/null +++ b/src/views/PdfTemplate.vue @@ -0,0 +1,5 @@ + From 447a766e31ff0916364be9941c388d910f39a5d4 Mon Sep 17 00:00:00 2001 From: Disha Date: Fri, 10 Dec 2021 16:17:02 +0530 Subject: [PATCH 7/8] Removed route for PDF generation component --- src/router/index.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 320d0c3..73d92f0 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -45,11 +45,6 @@ const routes: Array = [ component: Settings, beforeEnter: authGuard }, - { - path: "/pdf", - component: PdfGenerator, - name: 'PdfGenerator' - }, ] const router = createRouter({ From 52b38387cdbc558f07dd58f57c420048a6cfcc6a Mon Sep 17 00:00:00 2001 From: Disha Date: Thu, 6 Jan 2022 18:42:28 +0530 Subject: [PATCH 8/8] Improved indentation and removed extra spaces(#1w3w78x) --- package.json | 1 + src/views/PdfGenerator.vue | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9e9c407..731e794 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "axios": "^0.21.1", "axios-cache-adapter": "^2.7.3", "core-js": "^3.6.5", + "file-saver": "^2.0.5", "html-to-pdfmake": "^2.3.7", "http-status-codes": "^2.1.4", "jspdf": "^2.4.0", diff --git a/src/views/PdfGenerator.vue b/src/views/PdfGenerator.vue index 5dbaea6..fb4d75c 100644 --- a/src/views/PdfGenerator.vue +++ b/src/views/PdfGenerator.vue @@ -1,18 +1,18 @@