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
44be4135
Commit
44be4135
authored
Sep 12, 2024
by
Pratik Shrivastava
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: pdf download and email issue
parent
3d7d1b87
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
9 deletions
+33
-9
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/controller/AdmissionFormDAOController.java
.../admission/dao/controller/AdmissionFormDAOController.java
+4
-1
lamartinBackend/src/main/java/com/example/LaMartin/common/service/TemplateService.java
.../com/example/LaMartin/common/service/TemplateService.java
+15
-0
lamartinBackend/src/main/resources/templates/AdmissionConfirmationFormListTemplate.html
...rces/templates/AdmissionConfirmationFormListTemplate.html
+5
-4
lamartinBackend/src/main/resources/templates/AdmissionConfirmationFormListTemplatePdf.html
...s/templates/AdmissionConfirmationFormListTemplatePdf.html
+9
-4
No files found.
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/controller/AdmissionFormDAOController.java
View file @
44be4135
...
...
@@ -177,7 +177,10 @@ public class AdmissionFormDAOController {
String
emailBody
=
this
.
templateService
.
generateAdmissionConfirmationFormTemplate
(
data
);
ByteArrayInputStream
pdfStream
=
pdfService
.
convertHtmlToPdf
(
emailBody
);
String
pdfBody
=
this
.
templateService
.
generateAdmissionConfirmationFormTemplatePdf
(
data
);
ByteArrayInputStream
pdfStream
=
pdfService
.
convertHtmlToPdf
(
pdfBody
);
String
[]
bcc
=
BCC_LM_BOYS
;
...
...
lamartinBackend/src/main/java/com/example/LaMartin/common/service/TemplateService.java
View file @
44be4135
...
...
@@ -46,6 +46,21 @@ public class TemplateService {
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
();
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
)
{
...
...
lamartinBackend/src/main/resources/templates/AdmissionConfirmationFormListTemplate.html
View file @
44be4135
...
...
@@ -32,16 +32,17 @@
.right
{
display
:
inline-block
;
}
.left
{
position
:
absolute
;
left
:
0
;
position
:
absolute
!important
;
left
:
0
!important
;
}
.right
{
position
:
absolute
;
right
:
0
;
position
:
absolute
!important
;
right
:
0
!important
;
}
.middle
{
...
...
lamartinBackend/src/main/resources/templates/AdmissionConfirmationFormListTemplate
Bcp
.html
→
lamartinBackend/src/main/resources/templates/AdmissionConfirmationFormListTemplate
Pdf
.html
View file @
44be4135
...
...
@@ -96,13 +96,18 @@
}
.page-break
{
page-break-after
:
always
;
}
.header
{
border
:
1px
solid
white
;
margin
:
30px
;
}
</style>
</head>
<body>
<div
class=
"container"
th:each=
"admissionForm : ${admissionFormList}"
>
<div
class=
"header"
>
<div
class=
"left"
>
<
!-- <
div class="left">
<h4>Supriyo Dhar, HRM, MBA, LLB<br />Secretary</h4>
</div>
<div class="center">
...
...
@@ -110,7 +115,7 @@
</div>
<div class="right">
<h2>La Martiniere</h2>
</div>
</div>
-->
</div>
<div
class=
"content page-break"
>
...
...
@@ -244,7 +249,7 @@
</div>
<div
class=
"footer"
style=
"margin-top: 10px;"
>
<div
class=
"left"
>
<
!-- <
div class="left">
<p>11 Dr. U.N. Brahmachari Street<br />Kolkata - 700 017 (INDIA)</p>
</div>
<div class="center">
...
...
@@ -252,7 +257,7 @@
</div>
<div class="right">
<p>secretary@lamartiniere.co<br />lamartiniere.co</p>
</div>
</div>
-->
</div>
</div>
...
...
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