Commit e75ac191 authored by Hando Lukats's avatar Hando Lukats
Browse files

TEIS-2422 fixes

parent 88b8f175
......@@ -57,7 +57,7 @@ public class RiskAssessmentPDFComposeService {
if (string == null) {
return null;
}
String pattern = "(.*) (\\[([a-zA-Z]*)\\]\\?\\([0-9]*\\))(.)";
String pattern = "(.*) (\\[([a-zA-Z]*)]\\?\\([0-9]*\\))(.)";
return string.replaceAll(pattern, "$1 $3$4");
}
......
......@@ -81,6 +81,7 @@ public class RiskAssessmentPDFService {
String riskAssessmentStatus = calculateStatus(riskAssessment.getStatus().getCode());
dto.setTitle(riskAssessment.getTitle());
dto.setArchivedDate(riskAssessment.getArchivedDate());
dto.setPublishedDate(riskAssessment.getPublishedDate());
dto.setStatus(riskAssessmentStatus);
dto.setEmployerName(employer.getLegalPerson().getName());
dto.setRegCode(employer.getLegalPerson().getRegCode());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment