Commit f0c352c6 authored by Deep Dey's avatar Deep Dey

chore: fix admission confirmation template

parent 4af718ce
...@@ -176,11 +176,8 @@ public class AdmissionFormDAOController { ...@@ -176,11 +176,8 @@ public class AdmissionFormDAOController {
String emailBody = this.templateService String emailBody = this.templateService
.generateAdmissionConfirmationFormTemplate(data); .generateAdmissionConfirmationFormTemplate(data);
String pdfBody = this.templateService
.generateAdmissionConfirmationFormTemplatePdf(data);
ByteArrayInputStream pdfStream = pdfService.convertHtmlToPdf(pdfBody); ByteArrayInputStream pdfStream = pdfService.convertHtmlToPdf(emailBody);
String[] bcc = BCC_LM_BOYS; String[] bcc = BCC_LM_BOYS;
......
...@@ -46,21 +46,23 @@ public class TemplateService { ...@@ -46,21 +46,23 @@ public class TemplateService {
return templateEngine.process("AdmissionConfirmationFormListTemplate", context); return templateEngine.process("AdmissionConfirmationFormListTemplate", context);
} }
public String generateAdmissionConfirmationFormTemplatePdf(@NotNull AdmissionFormData admissionFormData) {
LocalDate date = LocalDate.parse(admissionFormData.getAdmissionDate()); // TODO: remove logic
String givenYear = admissionFormData.getAdmissionDate().substring(0, 4); // public String generateAdmissionConfirmationFormTemplatePdf(@NotNull AdmissionFormData admissionFormData) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy"); // LocalDate date = LocalDate.parse(admissionFormData.getAdmissionDate());
admissionFormData.setAdmissionDate(date.format(formatter)); // String givenYear = admissionFormData.getAdmissionDate().substring(0, 4);
// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy");
Context context = new Context(); // admissionFormData.setAdmissionDate(date.format(formatter));
context.setVariable("admissionFormList", List.of(admissionFormData)); //
context.setVariable("serverPath", settings.getStaticServerPath()); // Context context = new Context();
context.setVariable("currentDate", LocalDate.now().format(formatter)); // context.setVariable("admissionFormList", List.of(admissionFormData));
context.setVariable("givenYear", Integer.parseInt(givenYear)); // context.setVariable("serverPath", settings.getStaticServerPath());
context.setVariable("showSignature", true); // context.setVariable("currentDate", LocalDate.now().format(formatter));
// context.setVariable("givenYear", Integer.parseInt(givenYear));
return templateEngine.process("AdmissionConfirmationFormListTemplatePdf", context); // context.setVariable("showSignature", true);
} //
// return templateEngine.process("AdmissionConfirmationFormListTemplatePdf", context);
// }
public String generateAdmissionConfirmationFormListTemplate(@NotNull List<AdmissionFormData> admissionFormDataList) { public String generateAdmissionConfirmationFormListTemplate(@NotNull List<AdmissionFormData> admissionFormDataList) {
...@@ -79,7 +81,7 @@ public class TemplateService { ...@@ -79,7 +81,7 @@ public class TemplateService {
context.setVariable("givenYear", Integer.parseInt(givenYear)); context.setVariable("givenYear", Integer.parseInt(givenYear));
context.setVariable("showSignature", false); context.setVariable("showSignature", false);
return templateEngine.process("AdmissionConfirmationFormListTemplate", context); return templateEngine.process("AdmissionConfirmationFormListTemplatePdf", context);
} }
public String generateAdmissionInterviewTemplate(@NotNull AdmissionFormData admissionFormData) { public String generateAdmissionInterviewTemplate(@NotNull AdmissionFormData admissionFormData) {
......
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