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
ef25c3f5
Commit
ef25c3f5
authored
Aug 21, 2025
by
Shuvankar Naskar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: update new fees structure for lower nursery
parent
2a65590c
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
80 additions
and
66 deletions
+80
-66
lamartinBackend/src/main/java/com/example/LaMartin/admission/enums/FEES_STRUCTURE.java
.../com/example/LaMartin/admission/enums/FEES_STRUCTURE.java
+69
-63
lamartinBackend/src/main/java/com/example/LaMartin/common/service/TemplateService.java
.../com/example/LaMartin/common/service/TemplateService.java
+3
-3
lamartinBackend/src/main/resources/templates/AdmissionConfirmationFormListTemplatePdf.html
...s/templates/AdmissionConfirmationFormListTemplatePdf.html
+8
-0
No files found.
lamartinBackend/src/main/java/com/example/LaMartin/admission/enums/FEES_STRUCTURE.java
View file @
ef25c3f5
This diff is collapsed.
Click to expand it.
lamartinBackend/src/main/java/com/example/LaMartin/common/service/TemplateService.java
View file @
ef25c3f5
...
...
@@ -57,7 +57,7 @@ public class TemplateService {
context
.
setVariable
(
"fees"
,
FEES_STRUCTURE
.
getFeesStructure
(
admissionFormData
.
getSchool
(),
admissionFormData
.
getAdmissionClass
(),
false
));
false
,
admissionFormData
.
getSessionYear
()
));
return
templateEngine
.
process
(
"NewAdmissionConfirmationFormListTemplate"
,
context
);
}
...
...
@@ -81,7 +81,7 @@ public class TemplateService {
List
<
String
>
fees
=
FEES_STRUCTURE
.
getFeesStructure
(
admissionFormData
.
getSchool
(),
admissionFormData
.
getAdmissionClass
(),
false
);
false
,
admissionFormData
.
getSessionYear
()
);
assert
fees
!=
null
;
double
amount1
=
Double
.
parseDouble
(
fees
.
get
(
0
).
replace
(
","
,
""
));
double
amount2
=
Double
.
parseDouble
(
fees
.
get
(
1
).
replace
(
","
,
""
));
...
...
@@ -132,7 +132,7 @@ public class TemplateService {
.
map
(
formData
->
FEES_STRUCTURE
.
getFeesStructure
(
formData
.
getSchool
(),
formData
.
getAdmissionClass
(),
false
))
false
,
formData
.
getSessionYear
()
))
.
filter
(
Objects:
:
nonNull
)
// Prevents adding null values
.
toList
();
...
...
lamartinBackend/src/main/resources/templates/AdmissionConfirmationFormListTemplatePdf.html
View file @
ef25c3f5
...
...
@@ -121,6 +121,10 @@
</div>
<div
th:if=
"${!admissionForm.isProvisional()}"
class=
"content page-break"
>
<br
/>
<br
/>
<br
/>
<br
/>
<div
class=
"left"
>
<p><b>
To,
</b><br
/>
<b
th:text=
"${admissionForm.fatherName}"
>
Pratik Shrivastava
</b>
...
...
@@ -263,6 +267,10 @@
</div>
<div
th:if=
"${admissionForm.isProvisional()}"
class=
"content page-break"
>
<br
/>
<br
/>
<br
/>
<br
/>
<div
class=
"left"
>
<p><b>
To,
</b><br
/>
<b
th:text=
"${admissionForm.fatherName}"
>
Pratik Shrivastava
</b>
...
...
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