From d5c863bbf72bfc5edc2d4caab704744d696cbd32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danyi=20D=C3=A1vid?= Date: Mon, 25 Feb 2019 11:14:45 +0100 Subject: [PATCH] * maintenance pdf changes --- data/pdf-template/maintenanceSheet-style.xml | 4 ++++ data/pdf-template/maintenanceSheet.xml | 3 +++ src/App/Service/PdfService.php | 5 +++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/data/pdf-template/maintenanceSheet-style.xml b/data/pdf-template/maintenanceSheet-style.xml index 02764e5..cd60ed7 100644 --- a/data/pdf-template/maintenanceSheet-style.xml +++ b/data/pdf-template/maintenanceSheet-style.xml @@ -7,6 +7,10 @@ + + + + diff --git a/data/pdf-template/maintenanceSheet.xml b/data/pdf-template/maintenanceSheet.xml index 9606b58..f140f96 100644 --- a/data/pdf-template/maintenanceSheet.xml +++ b/data/pdf-template/maintenanceSheet.xml @@ -164,5 +164,8 @@ + + +
\ No newline at end of file diff --git a/src/App/Service/PdfService.php b/src/App/Service/PdfService.php index 95aebe6..bb858bd 100644 --- a/src/App/Service/PdfService.php +++ b/src/App/Service/PdfService.php @@ -217,8 +217,9 @@ class PdfService '%%MAINTENANCE_DEVICE%%' => $maintenance->getComponentName(), '%%WORK_DESCRIPTION%%' => $maintenance->getWorkDescription(), -// '%%CONFIRMER_NAME%%' => $maintenance->getStartedBy()->getName(), -// '%%CONFIRMER_JOB%%' => $maintenance->getStartedBy()->getJob(), + '%%CONFIRMER_NAME%%' => $maintenance->getStartedBy() ? $maintenance->getStartedBy()->getName() : '', + '%%CONFIRMER_JOB%%' => $maintenance->getStartedBy() ? $maintenance->getStartedBy()->getJob() : '', + '%%MAINTENER_NAME%%' => $maintenance->getResponsible(), '%%MAINTENER_JOB%%' => '',