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
Pratik Shrivastava
LaMartin-Webomagic
Commits
a5c940d7
Commit
a5c940d7
authored
Jul 17, 2024
by
Deep Dey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: download option to admission form pdf
parent
f0ac2409
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
158 additions
and
10 deletions
+158
-10
lamartinBackend/src/main/java/com/example/LaMartin/admission/controller/AdmissionFormController.java
...aMartin/admission/controller/AdmissionFormController.java
+48
-0
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/controller/AdmissionFormDAOController.java
.../admission/dao/controller/AdmissionFormDAOController.java
+5
-2
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/repository/AdmissionFormDataRepository.java
...admission/dao/repository/AdmissionFormDataRepository.java
+6
-1
lamartinBackend/src/main/java/com/example/LaMartin/common/service/TemplateService.java
.../com/example/LaMartin/common/service/TemplateService.java
+17
-4
lamartinBackend/src/main/resources/templates/AdmissionConfirmationFormListTemplate.html
...rces/templates/AdmissionConfirmationFormListTemplate.html
+7
-2
lamartinDashboard/dashboard.html
lamartinDashboard/dashboard.html
+42
-1
lamartinDashboard/js/dashboard.js
lamartinDashboard/js/dashboard.js
+33
-0
No files found.
lamartinBackend/src/main/java/com/example/LaMartin/admission/controller/AdmissionFormController.java
View file @
a5c940d7
...
@@ -314,6 +314,7 @@ public class AdmissionFormController {
...
@@ -314,6 +314,7 @@ public class AdmissionFormController {
null
,
null
,
interactionDate
,
interactionDate
,
null
,
null
,
null
,
null
null
);
);
...
@@ -354,6 +355,7 @@ public class AdmissionFormController {
...
@@ -354,6 +355,7 @@ public class AdmissionFormController {
null
,
null
,
interactionDate
,
interactionDate
,
null
,
null
,
null
,
null
null
);
);
...
@@ -394,6 +396,7 @@ public class AdmissionFormController {
...
@@ -394,6 +396,7 @@ public class AdmissionFormController {
null
,
null
,
interactionDate
,
interactionDate
,
null
,
null
,
null
,
null
null
);
);
...
@@ -467,6 +470,7 @@ public class AdmissionFormController {
...
@@ -467,6 +470,7 @@ public class AdmissionFormController {
null
,
null
,
interactionDate
,
interactionDate
,
null
,
null
,
null
,
null
null
);
);
...
@@ -488,6 +492,50 @@ public class AdmissionFormController {
...
@@ -488,6 +492,50 @@ public class AdmissionFormController {
}
}
@GetMapping
(
value
=
"/admission-form/download-admission-pdf"
)
@ApiResponses
(
value
=
{
@ApiResponse
(
code
=
200
,
message
=
"SUCCESS"
),
@ApiResponse
(
code
=
400
,
message
=
"FAILED"
),
@ApiResponse
(
code
=
500
,
message
=
"Exception Occurred"
)
})
@ApiOperation
(
value
=
""
)
public
void
downloadAdmissionPdf
(
HttpServletRequest
request
,
HttpServletResponse
response
,
@RequestParam
(
"apikey"
)
String
apiKey
,
@RequestParam
String
schoolName
,
@RequestParam
String
admissionDate
)
throws
Exception
{
List
<
AdmissionFormData
>
admissionFormDataList
=
this
.
admissionFormDAOController
.
getAdmissionFormDataList
(
schoolName
,
null
,
null
,
null
,
null
,
admissionDate
);
if
(
admissionFormDataList
.
isEmpty
())
{
throw
new
Exception
(
"No Admission Data Found"
);
}
String
output
=
templateService
.
generateAdmissionConfirmationFormListTemplate
(
admissionFormDataList
);
ByteArrayInputStream
pdfStream
=
pdfService
.
convertHtmlToPdf
(
output
);
response
.
setContentType
(
MediaType
.
APPLICATION_OCTET_STREAM_VALUE
);
response
.
setHeader
(
"Content-Disposition"
,
"attachment; filename=admission-confirmation-forms.pdf"
);
IOUtils
.
copy
(
pdfStream
,
response
.
getOutputStream
());
}
@GetMapping
(
@GetMapping
(
value
=
"/admission-form/count"
,
value
=
"/admission-form/count"
,
produces
=
MediaType
.
APPLICATION_JSON_VALUE
produces
=
MediaType
.
APPLICATION_JSON_VALUE
...
...
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/controller/AdmissionFormDAOController.java
View file @
a5c940d7
...
@@ -87,14 +87,16 @@ public class AdmissionFormDAOController {
...
@@ -87,14 +87,16 @@ public class AdmissionFormDAOController {
String
className
,
String
className
,
String
interactionDate
,
String
interactionDate
,
String
interactionTime
,
String
interactionTime
,
String
correspondenceEmail
String
correspondenceEmail
,
String
admissionDate
)
{
)
{
return
admissionFormDataRepository
.
getAdmissionFormDataList
(
return
admissionFormDataRepository
.
getAdmissionFormDataList
(
schoolName
,
schoolName
,
className
,
className
,
interactionDate
,
interactionDate
,
interactionTime
,
interactionTime
,
correspondenceEmail
correspondenceEmail
,
admissionDate
);
);
}
}
...
@@ -160,6 +162,7 @@ public class AdmissionFormDAOController {
...
@@ -160,6 +162,7 @@ public class AdmissionFormDAOController {
ByteArrayInputStream
pdfStream
=
pdfService
.
convertHtmlToPdf
(
emailBody
);
ByteArrayInputStream
pdfStream
=
pdfService
.
convertHtmlToPdf
(
emailBody
);
// TODO: also add the principal email here
this
.
emailService
.
sendHtmlEmail
(
this
.
emailService
.
sendHtmlEmail
(
data
.
getFatherEmail
(),
data
.
getFatherEmail
(),
"ADMISSION APPOINTMENT | "
+
data
.
getSchool
().
toUpperCase
(),
"ADMISSION APPOINTMENT | "
+
data
.
getSchool
().
toUpperCase
(),
...
...
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/repository/AdmissionFormDataRepository.java
View file @
a5c940d7
...
@@ -209,7 +209,8 @@ public class AdmissionFormDataRepository {
...
@@ -209,7 +209,8 @@ public class AdmissionFormDataRepository {
String
className
,
String
className
,
String
interactionDate
,
String
interactionDate
,
String
interactionTime
,
String
interactionTime
,
String
correspondenceEmail
String
correspondenceEmail
,
String
admissionDate
)
{
)
{
StringBuilder
sql
=
new
StringBuilder
(
StringBuilder
sql
=
new
StringBuilder
(
"""
"""
...
@@ -246,6 +247,10 @@ public class AdmissionFormDataRepository {
...
@@ -246,6 +247,10 @@ public class AdmissionFormDataRepository {
sql
.
append
(
" AND afd.father_email = :correspondenceEmail"
);
sql
.
append
(
" AND afd.father_email = :correspondenceEmail"
);
parameters
.
addValue
(
"correspondenceEmail"
,
correspondenceEmail
);
parameters
.
addValue
(
"correspondenceEmail"
,
correspondenceEmail
);
}
}
if
(
admissionDate
!=
null
&&
!
admissionDate
.
isEmpty
())
{
sql
.
append
(
" AND afd.admission_date = :admissionDate"
);
parameters
.
addValue
(
"admissionDate"
,
admissionDate
);
}
return
namedParameterJdbcTemplate
return
namedParameterJdbcTemplate
.
query
(
sql
.
toString
(),
parameters
,
new
AdmissionFormMapper
());
.
query
(
sql
.
toString
(),
parameters
,
new
AdmissionFormMapper
());
}
}
...
...
lamartinBackend/src/main/java/com/example/LaMartin/common/service/TemplateService.java
View file @
a5c940d7
...
@@ -32,25 +32,38 @@ public class TemplateService {
...
@@ -32,25 +32,38 @@ public class TemplateService {
public
String
generateAdmissionConfirmationFormTemplate
(
@NotNull
AdmissionFormData
admissionFormData
)
{
public
String
generateAdmissionConfirmationFormTemplate
(
@NotNull
AdmissionFormData
admissionFormData
)
{
LocalDate
date
=
LocalDate
.
parse
(
admissionFormData
.
getAdmissionDate
());
LocalDate
date
=
LocalDate
.
parse
(
admissionFormData
.
getAdmissionDate
());
DateTimeFormatter
formatter
=
DateTimeFormatter
.
ofPattern
(
"dd-MM-yyyy"
);
admissionFormData
.
setInteractionDate
(
date
.
format
(
formatter
));
String
givenYear
=
admissionFormData
.
getAdmissionDate
().
substring
(
0
,
4
);
String
givenYear
=
admissionFormData
.
getAdmissionDate
().
substring
(
0
,
4
);
DateTimeFormatter
formatter
=
DateTimeFormatter
.
ofPattern
(
"dd-MM-yyyy"
);
admissionFormData
.
setAdmissionDate
(
date
.
format
(
formatter
));
Context
context
=
new
Context
();
Context
context
=
new
Context
();
context
.
setVariable
(
"admissionFormList"
,
List
.
of
(
admissionFormData
));
context
.
setVariable
(
"admissionFormList"
,
List
.
of
(
admissionFormData
));
context
.
setVariable
(
"serverPath"
,
settings
.
getStaticServerPath
());
context
.
setVariable
(
"serverPath"
,
settings
.
getStaticServerPath
());
context
.
setVariable
(
"currentDate"
,
LocalDate
.
now
().
format
(
formatter
));
context
.
setVariable
(
"currentDate"
,
LocalDate
.
now
().
format
(
formatter
));
context
.
setVariable
(
"givenYear"
,
Integer
.
parseInt
(
givenYear
));
context
.
setVariable
(
"givenYear"
,
Integer
.
parseInt
(
givenYear
));
context
.
setVariable
(
"showSignature"
,
true
);
return
templateEngine
.
process
(
"AdmissionConfirmationFormListTemplate"
,
context
);
return
templateEngine
.
process
(
"AdmissionConfirmationFormListTemplate"
,
context
);
}
}
public
String
generateAdmissionConfirmationFormListTemplate
(
List
<
AdmissionFormData
>
admissionFormDataList
)
{
public
String
generateAdmissionConfirmationFormListTemplate
(
@NotNull
List
<
AdmissionFormData
>
admissionFormDataList
)
{
DateTimeFormatter
formatter
=
DateTimeFormatter
.
ofPattern
(
"dd-MM-yyyy"
);
String
givenYear
=
admissionFormDataList
.
get
(
0
).
getAdmissionDate
().
substring
(
0
,
4
);
for
(
AdmissionFormData
admissionFormData
:
admissionFormDataList
)
{
LocalDate
date
=
LocalDate
.
parse
(
admissionFormData
.
getAdmissionDate
());
admissionFormData
.
setAdmissionDate
(
date
.
format
(
formatter
));
}
// String givenYear = admissionFormDataList.get(0).getAdmissionDate().substring(0, 4);
Context
context
=
new
Context
();
Context
context
=
new
Context
();
context
.
setVariable
(
"admissionFormList"
,
admissionFormDataList
);
context
.
setVariable
(
"admissionFormList"
,
admissionFormDataList
);
context
.
setVariable
(
"serverPath"
,
settings
.
getStaticServerPath
());
context
.
setVariable
(
"serverPath"
,
settings
.
getStaticServerPath
());
context
.
setVariable
(
"currentDate"
,
LocalDate
.
now
().
format
(
formatter
));
context
.
setVariable
(
"givenYear"
,
Integer
.
parseInt
(
givenYear
));
context
.
setVariable
(
"showSignature"
,
false
);
return
templateEngine
.
process
(
"AdmissionConfimationFormListTemplate"
,
context
);
return
templateEngine
.
process
(
"AdmissionConfi
r
mationFormListTemplate"
,
context
);
}
}
public
String
generateAdmissionInterviewTemplate
(
@NotNull
AdmissionFormData
admissionFormData
)
{
public
String
generateAdmissionInterviewTemplate
(
@NotNull
AdmissionFormData
admissionFormData
)
{
...
...
lamartinBackend/src/main/resources/templates/AdmissionConfirmationFormListTemplate.html
View file @
a5c940d7
...
@@ -220,8 +220,13 @@
...
@@ -220,8 +220,13 @@
</table>
</table>
<div
class=
"signature"
>
<div
class=
"signature"
>
<p>
Yours faithfully,
</p>
<p
style=
"margin-bottom: 10px;"
>
Yours faithfully,
</p>
<img
th:src=
"@{${serverPath + 'static/signature.png'}}"
width=
"80px"
/>
<span
th:if=
"${showSignature == true}"
>
<img
th:src=
"@{${serverPath + 'static/signature.png'}}"
width=
"70px"
alt=
""
/>
</span>
<span
th:if=
"${showSignature == false}"
>
<span
style=
"margin-top: 100px"
>
</span>
</span>
<p><b>
SUPRIYO DHAR
</b><br
/>
Secretary
<br
/>
La Martiniere, Kolkata
</p>
<p><b>
SUPRIYO DHAR
</b><br
/>
Secretary
<br
/>
La Martiniere, Kolkata
</p>
</div>
</div>
...
...
lamartinDashboard/dashboard.html
View file @
a5c940d7
...
@@ -52,7 +52,8 @@
...
@@ -52,7 +52,8 @@
</div>
</div>
<div
class=
"book-appointment-box mt-3"
>
<div
class=
"book-appointment-box mt-3"
>
<div
style=
"display: flex; gap: 4px;"
>
<div
style=
"display: flex; gap: 4px;"
>
<button
id=
"summary-popup-btn"
class=
"btn btn-success btn-sm"
>
Download Score Sheets
</button>
<button
id=
"summary-popup-btn"
class=
"btn btn-secondary btn-sm"
>
Download Score Sheets
</button>
<button
id=
"admission-popup-btn"
class=
"btn btn-secondary btn-sm"
>
Download Admission PDF
</button>
<button
id=
"download-admission-data-btn"
class=
"btn btn-success btn-sm"
>
Download Admission Data
</button>
<button
id=
"download-admission-data-btn"
class=
"btn btn-success btn-sm"
>
Download Admission Data
</button>
</div>
</div>
<div>
<div>
...
@@ -200,6 +201,46 @@
...
@@ -200,6 +201,46 @@
</div>
</div>
</div>
</div>
<div
class=
"modal fade"
id=
"admissionReportModal"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"admissionReportModalLabel"
aria-hidden=
"true"
>
<div
class=
"modal-dialog modal-lg"
role=
"document"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<h5
class=
"modal-title"
id=
"admissionReportModal"
>
Download Admission Documents
</h5>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-label=
"Close"
>
<span
aria-hidden=
"true"
>
×
</span>
</button>
</div>
<div
class=
"modal-body"
>
<div
style=
"display: flex; justify-content: space-between;"
>
<div
class=
"form-group"
style=
"width: 49%;"
>
<label
for=
"admissionSchoolFilterReport"
class=
"filter-label"
>
School
</label>
<select
id=
"admissionSchoolFilterReport"
class=
"form-control"
required
>
<option
value=
"La Martiniere for Boys"
selected
>
La Martiniere for Boys
</option>
<option
value=
"La Martiniere for Girls"
>
La Martiniere for Girls
</option>
</select>
</div>
<div
class=
"form-group"
style=
"width: 49%;"
>
<label
for=
"admissionDateFilterReport"
class=
"filter-label"
>
Admission Date
</label>
<input
type=
"date"
id=
"admissionDateFilterReport"
class=
"form-control"
/>
</div>
</div>
<div
style=
"display: flex; justify-content: center;"
>
<div
class=
"form-group"
style=
"width: 49%;"
>
<label
for=
"admissionClassFilterReport"
class=
"filter-label"
>
Class
</label>
<select
id=
"admissionClassFilterReport"
class=
"form-control"
disabled
>
<option
value=
"Lower Nursery"
selected
>
Lower Nursery
</option>
</select>
</div>
</div>
<div
class=
"book-appointment-box2"
>
<button
id=
"downloadAdmissionFormList"
class=
"btn btn-primary btn-sm"
>
Admission Form PDF
</button>
</div>
</div>
</div>
</div>
</div>
<div
class=
"modal"
tabindex=
"-1"
role=
"dialog"
id=
"messageModal"
>
<div
class=
"modal"
tabindex=
"-1"
role=
"dialog"
id=
"messageModal"
>
<div
class=
"modal-dialog"
role=
"document"
>
<div
class=
"modal-dialog"
role=
"document"
>
<div
class=
"modal-content"
>
<div
class=
"modal-content"
>
...
...
lamartinDashboard/js/dashboard.js
View file @
a5c940d7
...
@@ -376,6 +376,39 @@ $(document).ready(function () {
...
@@ -376,6 +376,39 @@ $(document).ready(function () {
.
focus
();
.
focus
();
});
});
$
(
'
#admission-popup-btn
'
).
click
(
function
()
{
$
(
'
#admissionReportModal
'
).
modal
(
'
show
'
);
});
$
(
'
#downloadAdmissionFormList
'
).
click
(
function
()
{
let
schoolName
=
$
(
'
#admissionSchoolFilterReport
'
).
val
();
let
admissionDate
=
$
(
'
#admissionDateFilterReport
'
).
val
();
if
(
!
schoolName
||
!
admissionDate
)
{
$
(
'
#admissionReportModal
'
).
modal
(
'
hide
'
);
$
(
'
#messageModal .modal-title
'
).
text
(
'
Error
'
);
$
(
'
#messageModal .modal-body
'
).
text
(
'
Please select school and date to proceed.
'
);
$
(
'
#messageModal
'
).
modal
(
'
show
'
);
return
;
}
window
.
open
(
BASE_URL_LAMARTIN
+
`/admission-form/download-admission-pdf?apikey=
${
loginData
.
apiKey
}
&schoolName=
${
schoolName
}
&admissionDate=
${
admissionDate
}
`
,
'
_blank
'
)
.
focus
();
});
$
(
'
#bookAdmissionBtn
'
).
click
(
function
()
{
$
(
'
#bookAdmissionBtn
'
).
click
(
function
()
{
var
checkedValues
=
[];
var
checkedValues
=
[];
$
(
'
.student-checkbox:checked
'
).
each
(
function
()
{
$
(
'
.student-checkbox:checked
'
).
each
(
function
()
{
...
...
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