From 0b2f57537e2e66f66ae17490925bea75080e6b87 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Fri, 29 Mar 2019 07:12:48 +0100
Subject: [PATCH] OO-3981: Add location variable to PDF certificates
---
.../certificate/manager/CertificatePDFFormWorker.java | 2 ++
.../certificate/manager/CertificatePdfServiceWorker.java | 4 +++-
.../certificate/manager/CertificatePhantomWorker.java | 6 ++++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/course/certificate/manager/CertificatePDFFormWorker.java b/src/main/java/org/olat/course/certificate/manager/CertificatePDFFormWorker.java
index c8c03652b1c..df9765c9686 100644
--- a/src/main/java/org/olat/course/certificate/manager/CertificatePDFFormWorker.java
+++ b/src/main/java/org/olat/course/certificate/manager/CertificatePDFFormWorker.java
@@ -181,6 +181,8 @@ public class CertificatePDFFormWorker {
fillField("expenditureOfWorks", expenditureOfWorks, acroForm);
String mainLanguage = entry.getMainLanguage();
fillField("mainLanguage", mainLanguage, acroForm);
+ String location = entry.getLocation();
+ fillField("location", location, acroForm);
if (entry.getLifecycle() != null) {
Formatter format = Formatter.getInstance(locale);
diff --git a/src/main/java/org/olat/course/certificate/manager/CertificatePdfServiceWorker.java b/src/main/java/org/olat/course/certificate/manager/CertificatePdfServiceWorker.java
index 8c8109750a9..8ac577533dc 100644
--- a/src/main/java/org/olat/course/certificate/manager/CertificatePdfServiceWorker.java
+++ b/src/main/java/org/olat/course/certificate/manager/CertificatePdfServiceWorker.java
@@ -20,12 +20,12 @@
package org.olat.course.certificate.manager;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
-import java.io.FileOutputStream;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.Date;
@@ -192,6 +192,8 @@ public class CertificatePdfServiceWorker {
context.put("expenditureOfWorks", expenditureOfWorks);
String mainLanguage = entry.getMainLanguage();
context.put("mainLanguage", mainLanguage);
+ String location = entry.getLocation();
+ context.put("location", location);
if (entry.getLifecycle() != null) {
Formatter format = Formatter.getInstance(locale);
diff --git a/src/main/java/org/olat/course/certificate/manager/CertificatePhantomWorker.java b/src/main/java/org/olat/course/certificate/manager/CertificatePhantomWorker.java
index 69cebb36e30..f3741b9474f 100644
--- a/src/main/java/org/olat/course/certificate/manager/CertificatePhantomWorker.java
+++ b/src/main/java/org/olat/course/certificate/manager/CertificatePhantomWorker.java
@@ -98,7 +98,7 @@ public class CertificatePhantomWorker {
File templateFile = certificatesManager.getTemplateFile(template);
File htmlCertificateFile = copyAndEnrichTemplate(templateFile);
- List<String> cmds = new ArrayList<String>();
+ List<String> cmds = new ArrayList<>();
cmds.add("phantomjs");
cmds.add(certificatesManager.getRasterizePath().toFile().getAbsolutePath());
cmds.add(htmlCertificateFile.getAbsolutePath());
@@ -205,6 +205,8 @@ public class CertificatePhantomWorker {
context.put("expenditureOfWorks", expenditureOfWorks);
String mainLanguage = entry.getMainLanguage();
context.put("mainLanguage", mainLanguage);
+ String location = entry.getLocation();
+ context.put("location", location);
if (entry.getLifecycle() != null) {
Formatter format = Formatter.getInstance(locale);
@@ -271,7 +273,7 @@ public class CertificatePhantomWorker {
}
public static boolean checkPhantomJSAvailabilty() {
- List<String> cmds = new ArrayList<String>();
+ List<String> cmds = new ArrayList<>();
cmds.add("phantomjs");
cmds.add("--help");
--
GitLab