From 7e90de7f652ede320578247485c39fd8638587c3 Mon Sep 17 00:00:00 2001 From: Amelie Bernier Date: Fri, 23 Nov 2018 09:53:03 -0500 Subject: [PATCH 1/4] Issue #189 Print options fix --- package.json | 2 +- .../print-form/print-form.component.html | 38 ++++++++++--------- .../print-form/print-form.component.scss | 23 +++++------ projects/geo/src/lib/print/print.module.ts | 4 +- .../geo/src/lib/print/shared/print.service.ts | 19 ++++++---- projects/geo/src/locale/en.geo.json | 1 + projects/geo/src/locale/fr.geo.json | 1 + 7 files changed, 51 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index 89ec75b87d..f8882cf205 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "file-saver": "^1.3.8", "hammerjs": "^2.0.8", "html2canvas": "^1.0.0-alpha.12", - "jspdf": "^1.3.5", + "jspdf": "^1.4.1", "jszip": "^3.1.5", "jwt-decode": "^2.2.0", "moment": "^2.22.2", diff --git a/projects/geo/src/lib/print/print-form/print-form.component.html b/projects/geo/src/lib/print/print-form/print-form.component.html index 5a903683c2..c1427f7554 100644 --- a/projects/geo/src/lib/print/print-form/print-form.component.html +++ b/projects/geo/src/lib/print/print-form/print-form.component.html @@ -19,18 +19,18 @@
- - {{'igo.geo.printForm.showProjection' | translate}} - - - {{'igo.geo.printForm.showScale' | translate}} - - - {{'igo.geo.printForm.showLegend' | translate}} - - - {{'igo.geo.printForm.doZipFile' | translate}} - + + {{'igo.geo.printForm.showProjection' | translate}} + + + {{'igo.geo.printForm.showScale' | translate}} + + + {{'igo.geo.printForm.showLegend' | translate}} + + + {{'igo.geo.printForm.doZipFile' | translate}} +
@@ -82,11 +82,15 @@
- - - {{('igo.geo.printForm.' + orientation.value) | translate}} - - + + + + {{('igo.geo.printForm.' + orientation.value) | translate}} + + +
diff --git a/projects/geo/src/lib/print/print-form/print-form.component.scss b/projects/geo/src/lib/print/print-form/print-form.component.scss index 35c612b411..5cc5e15338 100644 --- a/projects/geo/src/lib/print/print-form/print-form.component.scss +++ b/projects/geo/src/lib/print/print-form/print-form.component.scss @@ -4,20 +4,25 @@ mat-form-field { width: 100%; } -mat-checkbox.horizontal-left { +mat-slide-toggle.horizontal-left { text-align: left; @include mobile { text-align: inherit; } } - mat-checkbox.horizontal-left span { - padding: 0 8px; +mat-slide-toggle { + padding-right: 10px; + padding-top: 5px; + padding-bottom: 20px; } -mat-checkbox, mat-radio-button { - padding-right: 20px; - padding-bottom: 10px; +mat-slide-toggle ::ng-deep span { + font-size: 100% !important; +} + +.print-option { + display: block; } .print-button-top-padding { @@ -30,8 +35,4 @@ mat-checkbox, mat-radio-button { .igo-form-button-group { text-align: center; -} - -mat-checkbox ::ng-deep label.mat-checkbox-layout { - padding-bottom: 10px; -} +} \ No newline at end of file diff --git a/projects/geo/src/lib/print/print.module.ts b/projects/geo/src/lib/print/print.module.ts index 67a2820554..041fe5c2bf 100644 --- a/projects/geo/src/lib/print/print.module.ts +++ b/projects/geo/src/lib/print/print.module.ts @@ -9,7 +9,8 @@ import { MatInputModule, MatFormFieldModule, MatRadioModule, - MatCheckboxModule + MatCheckboxModule, + MatSlideToggleModule } from '@angular/material'; import { IgoLanguageModule } from '@igo2/core'; @@ -33,6 +34,7 @@ import { PrintService } from './shared/print.service'; MatFormFieldModule, MatRadioModule, MatCheckboxModule, + MatSlideToggleModule, IgoLanguageModule, IgoKeyValueModule ], diff --git a/projects/geo/src/lib/print/shared/print.service.ts b/projects/geo/src/lib/print/shared/print.service.ts index 9fb6dae02d..c2a223c3f0 100644 --- a/projects/geo/src/lib/print/shared/print.service.ts +++ b/projects/geo/src/lib/print/shared/print.service.ts @@ -71,7 +71,7 @@ export class PrintService { (status: SubjectStatus) => { if (status === SubjectStatus.Done) { if (options.showLegend === true) { - this.addLegend(doc, map); + this.addLegend(doc, map, margins); } else { this.saveDoc(doc); } @@ -236,8 +236,10 @@ export class PrintService { /** Add the legend to the document @param doc - Pdf document where legend will be added + @param map - Map of the app + @param margins - Page margins */ - private addLegend(doc: jsPDF, map: IgoMap) { + private addLegend(doc: jsPDF, map: IgoMap, margins) { const that = this; // Get html code for the legend const width = doc.internal.pageSize.width; @@ -256,7 +258,7 @@ export class PrintService { imgData = canvas.toDataURL('image/png'); doc.addPage(); - const imageSize = this.getImageSizeToFitPdf(doc, canvas); + const imageSize = this.getImageSizeToFitPdf(doc, canvas, margins); doc.addImage(imgData, 'PNG', 10, position, imageSize[0], imageSize[1]); that.saveDoc(doc); div.parentNode.removeChild(div); // remove temp div (IE style) @@ -280,7 +282,7 @@ export class PrintService { if (image !== undefined) { - const imageSize = this.getImageSizeToFitPdf(doc, canvas); + const imageSize = this.getImageSizeToFitPdf(doc, canvas, margins); doc.addImage(image, 'JPEG', margins[3], margins[0], imageSize[0], imageSize[1]); doc.rect(margins[3], margins[0], imageSize[0], imageSize[1]); } @@ -340,6 +342,8 @@ export class PrintService { try { this.addCanvas(doc, canvas, size, margins); } catch (err) { + alert('2' + err.toString()); + console.log(err); status = SubjectStatus.Error; this.messageService.error( this.languageService.translate.instant('igo.geo.printForm.corsErrorMessageBody'), @@ -558,11 +562,12 @@ export class PrintService { Calculate the best Image size to fit in pdf @param doc - Pdf Document @param canvas - Canvas of image + @param margins - Page margins */ - private getImageSizeToFitPdf(doc, canvas) { + private getImageSizeToFitPdf(doc, canvas, margins) { // Define variable to calculate best size to fit in one page - const pageHeight = doc.internal.pageSize.getHeight() - 20; // -20 to let margin work great - const pageWidth = doc.internal.pageSize.getWidth() - 20; // -20 to let margin work great + const pageHeight = doc.internal.pageSize.getHeight() - (margins[0] + margins[2]); + const pageWidth = doc.internal.pageSize.getWidth() - (margins[1] + margins[3]); const canHeight = canvas.height; const canWidth = canvas.width; const heightRatio = canHeight / pageHeight; diff --git a/projects/geo/src/locale/en.geo.json b/projects/geo/src/locale/en.geo.json index 266db0d0e5..158ab3fc97 100644 --- a/projects/geo/src/locale/en.geo.json +++ b/projects/geo/src/locale/en.geo.json @@ -116,6 +116,7 @@ "outputFormat": "Output format", "paperFormat": "Paper format", "imageFormat": "Image format", + "orientation" : "Orientation", "landscape": "Landscape", "portrait": "Portrait", "projection": "Projection", diff --git a/projects/geo/src/locale/fr.geo.json b/projects/geo/src/locale/fr.geo.json index dbd61fe9eb..43c963a6b0 100644 --- a/projects/geo/src/locale/fr.geo.json +++ b/projects/geo/src/locale/fr.geo.json @@ -117,6 +117,7 @@ "outputFormat": "Format de sortie", "paperFormat": "Format du papier", "imageFormat": "Format de l'image", + "orientation" : "Orientation", "landscape": "Paysage", "portrait": "Portrait", "printBtn": "Imprimer", From 4b2c71039c7372e004a12aee5b9e211135579d43 Mon Sep 17 00:00:00 2001 From: Amelie Bernier Date: Fri, 23 Nov 2018 10:28:43 -0500 Subject: [PATCH 2/4] Issue #189 Removed alert --- projects/geo/src/lib/print/shared/print.service.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/geo/src/lib/print/shared/print.service.ts b/projects/geo/src/lib/print/shared/print.service.ts index c2a223c3f0..f43710a0d5 100644 --- a/projects/geo/src/lib/print/shared/print.service.ts +++ b/projects/geo/src/lib/print/shared/print.service.ts @@ -342,8 +342,6 @@ export class PrintService { try { this.addCanvas(doc, canvas, size, margins); } catch (err) { - alert('2' + err.toString()); - console.log(err); status = SubjectStatus.Error; this.messageService.error( this.languageService.translate.instant('igo.geo.printForm.corsErrorMessageBody'), From 5e3600d4ddbee387f1e989a5036307a49a5192c9 Mon Sep 17 00:00:00 2001 From: Amelie Bernier Date: Mon, 26 Nov 2018 10:31:43 -0500 Subject: [PATCH 3/4] Issue #189 Ajusted margins --- .../src/lib/print/print-form/print-form.component.scss | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/projects/geo/src/lib/print/print-form/print-form.component.scss b/projects/geo/src/lib/print/print-form/print-form.component.scss index 5cc5e15338..da1f3b2541 100644 --- a/projects/geo/src/lib/print/print-form/print-form.component.scss +++ b/projects/geo/src/lib/print/print-form/print-form.component.scss @@ -11,18 +11,14 @@ mat-slide-toggle.horizontal-left { } } -mat-slide-toggle { - padding-right: 10px; - padding-top: 5px; - padding-bottom: 20px; -} - mat-slide-toggle ::ng-deep span { font-size: 100% !important; } .print-option { display: block; + margin-right: 10px; + margin-bottom: 15px; } .print-button-top-padding { From 7a756d766b1a37e544f479240fd7d72f416e3d39 Mon Sep 17 00:00:00 2001 From: Amelie Bernier Date: Thu, 6 Dec 2018 12:11:08 -0500 Subject: [PATCH 4/4] Removed '!important' and unused modules --- .../geo/src/lib/print/print-form/print-form.component.scss | 4 ++-- projects/geo/src/lib/print/print.module.ts | 4 ---- projects/geo/src/lib/print/shared/print.service.ts | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/projects/geo/src/lib/print/print-form/print-form.component.scss b/projects/geo/src/lib/print/print-form/print-form.component.scss index da1f3b2541..19e1a343e1 100644 --- a/projects/geo/src/lib/print/print-form/print-form.component.scss +++ b/projects/geo/src/lib/print/print-form/print-form.component.scss @@ -11,8 +11,8 @@ mat-slide-toggle.horizontal-left { } } -mat-slide-toggle ::ng-deep span { - font-size: 100% !important; +mat-slide-toggle ::ng-deep .mat-slide-toggle-content { + font-size: 100%; } .print-option { diff --git a/projects/geo/src/lib/print/print.module.ts b/projects/geo/src/lib/print/print.module.ts index 041fe5c2bf..80a5d10fa7 100644 --- a/projects/geo/src/lib/print/print.module.ts +++ b/projects/geo/src/lib/print/print.module.ts @@ -8,8 +8,6 @@ import { MatOptionModule, MatInputModule, MatFormFieldModule, - MatRadioModule, - MatCheckboxModule, MatSlideToggleModule } from '@angular/material'; @@ -32,8 +30,6 @@ import { PrintService } from './shared/print.service'; MatOptionModule, MatInputModule, MatFormFieldModule, - MatRadioModule, - MatCheckboxModule, MatSlideToggleModule, IgoLanguageModule, IgoKeyValueModule diff --git a/projects/geo/src/lib/print/shared/print.service.ts b/projects/geo/src/lib/print/shared/print.service.ts index f43710a0d5..3b5b95bb33 100644 --- a/projects/geo/src/lib/print/shared/print.service.ts +++ b/projects/geo/src/lib/print/shared/print.service.ts @@ -239,7 +239,7 @@ export class PrintService { @param map - Map of the app @param margins - Page margins */ - private addLegend(doc: jsPDF, map: IgoMap, margins) { + private addLegend(doc: jsPDF, map: IgoMap, margins: Array) { const that = this; // Get html code for the legend const width = doc.internal.pageSize.width;