Commit ef25c3f5 authored by Shuvankar Naskar's avatar Shuvankar Naskar

chore: update new fees structure for lower nursery

parent 2a65590c
...@@ -57,7 +57,7 @@ public class TemplateService { ...@@ -57,7 +57,7 @@ public class TemplateService {
context.setVariable("fees", FEES_STRUCTURE.getFeesStructure( context.setVariable("fees", FEES_STRUCTURE.getFeesStructure(
admissionFormData.getSchool(), admissionFormData.getSchool(),
admissionFormData.getAdmissionClass(), admissionFormData.getAdmissionClass(),
false)); false, admissionFormData.getSessionYear()));
return templateEngine.process("NewAdmissionConfirmationFormListTemplate", context); return templateEngine.process("NewAdmissionConfirmationFormListTemplate", context);
} }
...@@ -81,7 +81,7 @@ public class TemplateService { ...@@ -81,7 +81,7 @@ public class TemplateService {
List<String> fees = FEES_STRUCTURE.getFeesStructure( List<String> fees = FEES_STRUCTURE.getFeesStructure(
admissionFormData.getSchool(), admissionFormData.getSchool(),
admissionFormData.getAdmissionClass(), admissionFormData.getAdmissionClass(),
false); false, admissionFormData.getSessionYear());
assert fees != null; assert fees != null;
double amount1 = Double.parseDouble(fees.get(0).replace(",", "")); double amount1 = Double.parseDouble(fees.get(0).replace(",", ""));
double amount2 = Double.parseDouble(fees.get(1).replace(",", "")); double amount2 = Double.parseDouble(fees.get(1).replace(",", ""));
...@@ -132,7 +132,7 @@ public class TemplateService { ...@@ -132,7 +132,7 @@ public class TemplateService {
.map(formData -> FEES_STRUCTURE.getFeesStructure( .map(formData -> FEES_STRUCTURE.getFeesStructure(
formData.getSchool(), formData.getSchool(),
formData.getAdmissionClass(), formData.getAdmissionClass(),
false)) false, formData.getSessionYear()))
.filter(Objects::nonNull) // Prevents adding null values .filter(Objects::nonNull) // Prevents adding null values
.toList(); .toList();
......
...@@ -121,6 +121,10 @@ ...@@ -121,6 +121,10 @@
</div> </div>
<div th:if="${!admissionForm.isProvisional()}" class="content page-break"> <div th:if="${!admissionForm.isProvisional()}" class="content page-break">
<br />
<br />
<br />
<br />
<div class="left"> <div class="left">
<p><b>To,</b><br /> <p><b>To,</b><br />
<b th:text="${admissionForm.fatherName}">Pratik Shrivastava</b> <b th:text="${admissionForm.fatherName}">Pratik Shrivastava</b>
...@@ -263,6 +267,10 @@ ...@@ -263,6 +267,10 @@
</div> </div>
<div th:if="${admissionForm.isProvisional()}" class="content page-break"> <div th:if="${admissionForm.isProvisional()}" class="content page-break">
<br />
<br />
<br />
<br />
<div class="left"> <div class="left">
<p><b>To,</b><br /> <p><b>To,</b><br />
<b th:text="${admissionForm.fatherName}">Pratik Shrivastava</b> <b th:text="${admissionForm.fatherName}">Pratik Shrivastava</b>
......
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