Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
LaMartin-Webomagic
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Deep Dey
LaMartin-Webomagic
Commits
f0c352c6
Commit
f0c352c6
authored
Sep 20, 2024
by
Deep Dey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: fix admission confirmation template
parent
4af718ce
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
20 deletions
+19
-20
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/controller/AdmissionFormDAOController.java
.../admission/dao/controller/AdmissionFormDAOController.java
+1
-4
lamartinBackend/src/main/java/com/example/LaMartin/common/service/TemplateService.java
.../com/example/LaMartin/common/service/TemplateService.java
+18
-16
No files found.
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/controller/AdmissionFormDAOController.java
View file @
f0c352c6
...
@@ -177,10 +177,7 @@ public class AdmissionFormDAOController {
...
@@ -177,10 +177,7 @@ public class AdmissionFormDAOController {
String
emailBody
=
this
.
templateService
String
emailBody
=
this
.
templateService
.
generateAdmissionConfirmationFormTemplate
(
data
);
.
generateAdmissionConfirmationFormTemplate
(
data
);
String
pdfBody
=
this
.
templateService
ByteArrayInputStream
pdfStream
=
pdfService
.
convertHtmlToPdf
(
emailBody
);
.
generateAdmissionConfirmationFormTemplatePdf
(
data
);
ByteArrayInputStream
pdfStream
=
pdfService
.
convertHtmlToPdf
(
pdfBody
);
String
[]
bcc
=
BCC_LM_BOYS
;
String
[]
bcc
=
BCC_LM_BOYS
;
...
...
lamartinBackend/src/main/java/com/example/LaMartin/common/service/TemplateService.java
View file @
f0c352c6
...
@@ -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
());
String
givenYear
=
admissionFormData
.
getAdmissionDate
().
substring
(
0
,
4
);
DateTimeFormatter
formatter
=
DateTimeFormatter
.
ofPattern
(
"dd-MM-yyyy"
);
admissionFormData
.
setAdmissionDate
(
date
.
format
(
formatter
));
Context
context
=
new
Context
();
// TODO: remove logic
context
.
setVariable
(
"admissionFormList"
,
List
.
of
(
admissionFormData
));
// public String generateAdmissionConfirmationFormTemplatePdf(@NotNull AdmissionFormData admissionFormData) {
context
.
setVariable
(
"serverPath"
,
settings
.
getStaticServerPath
());
// LocalDate date = LocalDate.parse(admissionFormData.getAdmissionDate());
context
.
setVariable
(
"currentDate"
,
LocalDate
.
now
().
format
(
formatter
));
// String givenYear = admissionFormData.getAdmissionDate().substring(0, 4);
context
.
setVariable
(
"givenYear"
,
Integer
.
parseInt
(
givenYear
));
// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy");
context
.
setVariable
(
"showSignature"
,
true
);
// admissionFormData.setAdmissionDate(date.format(formatter));
//
return
templateEngine
.
process
(
"AdmissionConfirmationFormListTemplatePdf"
,
context
);
// Context context = new Context();
}
// context.setVariable("admissionFormList", List.of(admissionFormData));
// context.setVariable("serverPath", settings.getStaticServerPath());
// context.setVariable("currentDate", LocalDate.now().format(formatter));
// context.setVariable("givenYear", Integer.parseInt(givenYear));
// 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
(
"AdmissionConfirmationFormListTemplate
Pdf
"
,
context
);
}
}
public
String
generateAdmissionInterviewTemplate
(
@NotNull
AdmissionFormData
admissionFormData
)
{
public
String
generateAdmissionInterviewTemplate
(
@NotNull
AdmissionFormData
admissionFormData
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment