diff --git a/src/app/resource/controllers/SummarySheetController.php b/src/app/resource/controllers/SummarySheetController.php index 8134b8bc929a56d0346a8d430e8cf6c2253270ab..3834a0357842836cf02cb7cd58133dcf69aef6c9 100755 --- a/src/app/resource/controllers/SummarySheetController.php +++ b/src/app/resource/controllers/SummarySheetController.php @@ -724,8 +724,7 @@ class SummarySheetController $pdf->SetFont('', '', 9); $parameter = ParameterModel::getById(['select' => ['param_value_string'], 'id' => 'traffic_record_summary_sheet']); - $pdf->writeHTMLCell(575, 0, 25, $pdf->GetY(), $parameter['param_value_string']); - // $pdf->writeHTML($parameter['param_value_string']); + $pdf->writeHTMLCell($widthNoMargins + $dimensions['lm'], 0, $dimensions['lm'] - 2, $pdf->GetY(), $parameter['param_value_string']); } } } diff --git a/src/frontend/app/administration/parameter/customization/parameters-customization.component.ts b/src/frontend/app/administration/parameter/customization/parameters-customization.component.ts index b25abe48791abcaeb95fc639570f45142fa39824..35b0e533c9c132f0d7ee8d1d733b09b9aa59eb4c 100644 --- a/src/frontend/app/administration/parameter/customization/parameters-customization.component.ts +++ b/src/frontend/app/administration/parameter/customization/parameters-customization.component.ts @@ -87,7 +87,7 @@ export class ParametersCustomizationComponent implements OnInit, OnDestroy { tap(() => this.saveParameter('traffic_record_summary_sheet')) ).subscribe(); this.initMce(); - }, 0); + }, 100); }), catchError((err: any) => { this.notify.handleSoftErrors(err); @@ -118,18 +118,19 @@ export class ParametersCustomizationComponent implements OnInit, OnDestroy { statusbar: false, readonly: readonly, plugins: [ - 'autolink', 'table' + 'autolink', 'table', 'code' ], external_plugins: { 'maarch_b64image': '../../src/frontend/plugins/tinymce/maarch_b64image/plugin.min.js' }, table_toolbar: '', table_sizing_mode: 'relative', + table_resize_bars: false, toolbar_sticky: true, toolbar_drawer: 'floating', toolbar: !readonly ? 'undo redo | fontselect fontsizeselect | bold italic underline strikethrough forecolor | table maarch_b64image | \ alignleft aligncenter alignright alignjustify \ - bullist numlist outdent indent | removeformat' : '' + bullist numlist outdent indent | removeformat code' : '' }); } diff --git a/src/frontend/app/list/summarySheet/summary-sheet.component.ts b/src/frontend/app/list/summarySheet/summary-sheet.component.ts index d3e6fe5b47ea87300e177e629746f1b39ad6f246..2d6680ac30511ee9258cb22ea25dfd5e14fee930 100644 --- a/src/frontend/app/list/summarySheet/summary-sheet.component.ts +++ b/src/frontend/app/list/summarySheet/summary-sheet.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Inject } from '@angular/core'; +import { Component, OnInit, Inject, OnDestroy } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { TranslateService } from '@ngx-translate/core'; import { NotificationService } from '../../../service/notification/notification.service'; @@ -13,7 +13,7 @@ declare var tinymce: any; templateUrl: 'summary-sheet.component.html', styleUrls: ['summary-sheet.component.scss'] }) -export class SummarySheetComponent implements OnInit { +export class SummarySheetComponent implements OnInit, OnDestroy { loading: boolean = false; withQrcode: boolean = true; @@ -141,12 +141,16 @@ export class SummarySheetComponent implements OnInit { }); setTimeout(() => { this.initMce(); - }); + }, 200); } }) ).subscribe(); } + ngOnDestroy() { + tinymce.remove('textarea'); + } + initMce() { tinymce.init({ selector: 'textarea',