Commit 2c322a7a authored by Deep Dey's avatar Deep Dey

chore: update fees structure

parent 329c59d2
...@@ -84,7 +84,7 @@ public class AdmissionFormMapper implements RowMapper<AdmissionFormData> { ...@@ -84,7 +84,7 @@ public class AdmissionFormMapper implements RowMapper<AdmissionFormData> {
formData.setDuplicateFatherEmail(rs.getBoolean("is_duplicate")); formData.setDuplicateFatherEmail(rs.getBoolean("is_duplicate"));
formData.setProvisional(rs.getBoolean("provisional")); formData.setProvisional(rs.getBoolean("provisional"));
// end newly added fields // end newly added fields
formData.setSessionYear(RowMapperUtil.getString(rs, "session_year"));
return formData; return formData;
} }
} }
...@@ -78,12 +78,19 @@ public class TemplateService { ...@@ -78,12 +78,19 @@ public class TemplateService {
context.setVariable("givenYear", Integer.parseInt(givenYear)); context.setVariable("givenYear", Integer.parseInt(givenYear));
context.setVariable("showSignature", true); context.setVariable("showSignature", true);
context.setVariable("fees", FEES_STRUCTURE.getFeesStructure( List<String> fees = FEES_STRUCTURE.getFeesStructure(
admissionFormData.getSchool(), admissionFormData.getSchool(),
admissionFormData.getAdmissionClass(), admissionFormData.getAdmissionClass(),
false)); false);
assert fees != null;
double amount1 = Double.parseDouble(fees.get(0).replace(",", ""));
double amount2 = Double.parseDouble(fees.get(1).replace(",", ""));
double total = amount1 + amount2;
context.setVariable("fees", fees);
context.setVariable("admissionAmount", total);
return templateEngine.process("SpecialAdmissionConfirmationFormListTemplate", context); return templateEngine.process("SpecialAdmissionConfirmationFormListTemplate", context);
} }
...@@ -128,6 +135,15 @@ public class TemplateService { ...@@ -128,6 +135,15 @@ public class TemplateService {
false)) false))
.filter(Objects::nonNull) // Prevents adding null values .filter(Objects::nonNull) // Prevents adding null values
.toList(); .toList();
List<Double> admissionAmountList = new ArrayList<>();
for (List<String> feesStructure : feesStructureList) {
double amount1 = Double.parseDouble(feesStructure.get(0).replace(",", ""));
double amount2 = Double.parseDouble(feesStructure.get(1).replace(",", ""));
double total = amount1 + amount2;
admissionAmountList.add(total);
}
context.setVariable("admissionAmountList", admissionAmountList);
context.setVariable("feesList", feesStructureList); context.setVariable("feesList", feesStructureList);
......
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
</strong> in person, along with a printout of this letter on <b><span th:text="${admissionForm.admissionDate}"></span> at <span th:text="${admissionForm.admissionTime}"></span></b> for necessary formalities.</p> </strong> in person, along with a printout of this letter on <b><span th:text="${admissionForm.admissionDate}"></span> at <span th:text="${admissionForm.admissionTime}"></span></b> for necessary formalities.</p>
<p>Parents willing to pay the full year fee may do so, or pay quarterly by way of Pay Order favouring <b>&quot;La <p>Parents willing to pay the full year fee may do so, or pay quarterly by way of Pay Order favouring <b>&quot;La
Martiniere Calcutta&quot;</b> or bank transfer, at the time of admission.</p> Martiniere Calcutta&quot;</b> or bank transfer, at the time of admission.</p>
<p>For the <b>1<sup>st</sup> Quarter (April to June <span th:text="(${givenYear + 1})"></span>)</b>, parents are to pay Rs.<b><span th:text="${fees.get(0)}"></span>/-</b> towards Tuition Fees, Session Fees, <p>For the <b>1<sup>st</sup> &amp; 2<sup>nd</sup> Quarter fees (April to September <span th:text="(${givenYear + 1})"></span>)</b>, parents are to pay Rs.<b><span th:text="${admissionAmountList[__${formIndex.index}__]}"></span>/-</b> towards Tuition Fees, Session Fees,
Infrastructure Development Fees, Admission Fees, Building Development Fees and Security Deposit Infrastructure Development Fees, Admission Fees, Building Development Fees and Security Deposit
(refundable). The amount may be transferred directly to the following account.</p> (refundable). The amount may be transferred directly to the following account.</p>
<br /> <br />
...@@ -352,8 +352,13 @@ ...@@ -352,8 +352,13 @@
</table> </table>
<br /> <br />
<p>Please email the enclosed format to lmcao@rediffmail.com for confirmation of your payment and also bring a hard copy while visiting Principal's Office.</p> <div>
<strong>IMPORTANT</strong> &ndash;
School fees from the <sup>3<sup>rd</sup></sup> Quarter will be directly debited from your account by the
<strong>Auto Debit</strong> process which is <strong><u>mandatory</u></strong>.
Please bring a cancelled cheque for all Savings and Current accounts
(along with a company rubber stamp for Current Account) to complete the setting up of the auto debit process at the time of admission of your ward.
</div>
<table class="fee-details"> <table class="fee-details">
<tr> <tr>
<th>Quarters</th> <th>Quarters</th>
...@@ -368,7 +373,7 @@ ...@@ -368,7 +373,7 @@
<tr> <tr>
<td>2<sup>nd</sup> Quarter (July to Sept. <span th:text="(${givenYear + 1})"></span>)</td> <td>2<sup>nd</sup> Quarter (July to Sept. <span th:text="(${givenYear + 1})"></span>)</td>
<td>Rs. <span th:text="${fees.get(1)}"></span></td> <td>Rs. <span th:text="${fees.get(1)}"></span></td>
<td>1<sup>st</sup> to 5<sup>th</sup> July, <span th:text="(${givenYear + 1})"></span></td> <td>On the date of admission</td>
</tr> </tr>
<tr> <tr>
<td>3<sup>rd</sup> Quarter (Oct to Dec. <span th:text="(${givenYear + 1})"></span>)</td> <td>3<sup>rd</sup> Quarter (Oct to Dec. <span th:text="(${givenYear + 1})"></span>)</td>
......
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
</span> </span>
<b th:text="${admissionForm.fullName}"></b> <b th:text="${admissionForm.fullName}"></b>
has been has been
granted Provisional admission to <b th:text="${admissionForm.admissionClass}"></b> for the year <span th:text="(${givenYear + 1}) + ' - ' + (${givenYear + 2})">2025 - 2026</span>, subject to Interaction/Interview with Principal. granted Provisional admission to <b th:text="${admissionForm.admissionClass}"></b> for the year <span th:text="(${admissionForm.sessionYear})">2025 - 2026</span>, subject to Interaction/Interview with Principal.
</p> </p>
<div class="middle"> <div class="middle">
<b> BOTH PARENTS AND CANDIDATE MUST ATTEND THE INTERACTION.</b> <b> BOTH PARENTS AND CANDIDATE MUST ATTEND THE INTERACTION.</b>
...@@ -168,9 +168,9 @@ ...@@ -168,9 +168,9 @@
</strong> in person, along with a printout of this letter on <b><span th:text="${admissionForm.admissionDate}"></span> at <span th:text="${admissionForm.admissionTime}"></span></b> for necessary formalities.</p> </strong> in person, along with a printout of this letter on <b><span th:text="${admissionForm.admissionDate}"></span> at <span th:text="${admissionForm.admissionTime}"></span></b> for necessary formalities.</p>
<p>Parents willing to pay the full year fee may do so, or pay quarterly by way of Pay Order favouring <b>&quot;La <p>Parents willing to pay the full year fee may do so, or pay quarterly by way of Pay Order favouring <b>&quot;La
Martiniere Calcutta&quot;</b> or bank transfer, at the time of admission.</p> Martiniere Calcutta&quot;</b> or bank transfer, at the time of admission.</p>
<p>For the <b>1<sup>st</sup> Quarter (April to June <span th:text="(${givenYear + 1})"></span>)</b>, parents are to pay Rs.<b><span th:text="${fees.get(0)}"></span>/-</b> towards Tuition Fees, Session Fees, <p>For the <b>1<sup>st</sup> &amp; 2<sup>nd</sup> Quarter fees (April to September <span th:text="(${givenYear + 1})"></span>)</b>, parents are to pay Rs.<b><span th:text="${admissionAmount}"></span>/-</b> towards Tuition Fees, Session Fees,
Infrastructure Development Fees, Admission Fees, Building Development Fees and Security Deposit Infrastructure Development Fees, Admission Fees, Building Development Fees and Security Deposit
(refundable). The amount may be transferred directly to the following account.</p> (refundable). The amount may be transferred directly to the following account (IMPS / RTGS / NEFT).</p>
<br /> <br />
<p><b><u>Penalty of Rs.5000/- will be levied if fees not paid on the due date.</u></b></p> <p><b><u>Penalty of Rs.5000/- will be levied if fees not paid on the due date.</u></b></p>
...@@ -198,9 +198,13 @@ ...@@ -198,9 +198,13 @@
</tr> </tr>
</table> </table>
<br /> <br />
<div>
<p>Please email the enclosed format to lmcao@rediffmail.com for confirmation of your payment and also bring a hard copy while visiting Principal's Office.</p> <strong>IMPORTANT</strong> &ndash;
School fees from the <sup>3<sup>rd</sup></sup> Quarter will be directly debited from your account by the
<strong>Auto Debit</strong> process which is <strong><u>mandatory</u></strong>.
Please bring a cancelled cheque for all Savings and Current accounts
(along with a company rubber stamp for Current Account) to complete the setting up of the auto debit process at the time of admission of your ward.
</div>
<table class="fee-details"> <table class="fee-details">
<tr> <tr>
<th>Quarters</th> <th>Quarters</th>
...@@ -215,7 +219,7 @@ ...@@ -215,7 +219,7 @@
<tr> <tr>
<td>2<sup>nd</sup> Quarter (July to Sept. <span th:text="(${givenYear + 1})"></span>)</td> <td>2<sup>nd</sup> Quarter (July to Sept. <span th:text="(${givenYear + 1})"></span>)</td>
<td>Rs. <span th:text="${fees.get(1)}"></span></td> <td>Rs. <span th:text="${fees.get(1)}"></span></td>
<td>1<sup>st</sup> to 5<sup>th</sup> July, <span th:text="(${givenYear + 1})"></span></td> <td>On the date of admission</td>
</tr> </tr>
<tr> <tr>
<td>3<sup>rd</sup> Quarter (Oct to Dec. <span th:text="(${givenYear + 1})"></span>)</td> <td>3<sup>rd</sup> Quarter (Oct to Dec. <span th:text="(${givenYear + 1})"></span>)</td>
......
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