Commit a7fb8058 authored by Deep Dey's avatar Deep Dey

fix: add combine download option for provisional candidates

parent e595eb12
......@@ -174,7 +174,7 @@ public class AdmissionFormDAOController {
String interactionTime
) throws Exception {
boolean updated = admissionFormDataRepository
.updateAdmissionDateTime(id, interactionDate, interactionTime);
.updateAdmissionDateTime(id, interactionDate, interactionTime, false);
if (updated) {
AdmissionFormData data = this.admissionFormDataRepository.getAdmissionFormDataById(id);
......@@ -208,7 +208,7 @@ public class AdmissionFormDAOController {
String interactionTime
) throws Exception {
boolean updated = admissionFormDataRepository
.updateAdmissionDateTime(id, interactionDate, interactionTime);
.updateAdmissionDateTime(id, interactionDate, interactionTime, true);
if (updated) {
AdmissionFormData data = this.admissionFormDataRepository.getAdmissionFormDataById(id);
......
......@@ -315,14 +315,16 @@ public class AdmissionFormDataRepository {
public boolean updateAdmissionDateTime(
Long admissionFormId,
String admissionDate,
String admissionTime
String admissionTime,
boolean specialAdmission
) {
String sql = "UPDATE admission_form_data SET admission_date = :admissionDate, admission_time = :admissionTime WHERE id = :admissionFormId";
String sql = "UPDATE admission_form_data SET admission_date = :admissionDate, admission_time = :admissionTime, provisional = :specialAdmission WHERE id = :admissionFormId";
MapSqlParameterSource params =
new MapSqlParameterSource()
.addValue("admissionDate", admissionDate)
.addValue("admissionTime", admissionTime)
.addValue("admissionFormId", admissionFormId);
.addValue("admissionFormId", admissionFormId)
.addValue("specialAdmission", specialAdmission);
int rowsAffected = namedParameterJdbcTemplate.update(sql, params);
return rowsAffected > 0;
......
......@@ -82,6 +82,7 @@ public class AdmissionFormMapper implements RowMapper<AdmissionFormData> {
formData.setMotherDenomination(RowMapperUtil.getString(rs, "mother_denomination"));
formData.setMotherChurch(RowMapperUtil.getString(rs, "mother_church"));
formData.setDuplicateFatherEmail(rs.getBoolean("is_duplicate"));
formData.setProvisional(rs.getBoolean("provisional"));
// end newly added fields
return formData;
......
......@@ -109,4 +109,5 @@ public class AdmissionFormData {
private boolean filledByAdmin;
private boolean existing;
private boolean provisional;
}
......@@ -120,7 +120,7 @@
</div> -->
</div>
<div class="content page-break">
<div th:if="${!admissionForm.isProvisional()}" class="content page-break">
<div class="left">
<p><b>To,</b><br />
<b th:text="${admissionForm.fatherName}">Pratik Shrivastava</b>
......@@ -262,6 +262,156 @@
</div>
</div>
<div th:if="${admissionForm.isProvisional()}" class="content page-break">
<div class="left">
<p><b>To,</b><br />
<b th:text="${admissionForm.fatherName}">Pratik Shrivastava</b>
<span th:if="${admissionForm.motherName != null}">
/ <b th:text="${admissionForm.motherName}"></b>
</span>
</p>
</div>
<div class="right">
<p><b th:text="${currentDate}">17/07/2024</b></p>
</div>
<br />
<br />
<br />
<br />
<div class="middle">
<strong>Sub: <u>Intimation for Provisional Admission subject to Interaction/ Interview with Principal.</u></strong>
</div>
<br />
<br />
<p>Dear Parent/s,</p>
<br />
<p>
We are pleased to inform you that your
<span th:if="${admissionForm.school == 'La Martiniere for Boys'}">
<span>son </span>
</span>
<span th:if="${admissionForm.school == 'La Martiniere for Girls'}">
<span>daughter </span>
</span>
<b th:text="${admissionForm.fullName}"></b>
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.
</p>
<div class="middle">
<b> BOTH PARENTS AND CANDIDATE MUST ATTEND THE INTERACTION.</b>
</div>
<p>
Please contact the
<strong>
Principal's office of
<span th:text="${admissionForm.school}"></span>
<span th:if="${admissionForm.school == 'La Martiniere for Boys'}">
<span>11, Dr. U.N. Brahmachari Street, Kolkata - 700 017,</span>
</span>
<span th:if="${admissionForm.school == 'La Martiniere for Girls'}">
<span>14, Sarojini Naidu Sarani, Kolkata - 700 017,</span>
</span>
</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
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,
Infrastructure Development Fees, Admission Fees, Building Development Fees and Security Deposit
(refundable). The amount may be transferred directly to the following account.</p>
<br />
<p><b><u>Penalty of Rs.5000/- will be levied if fees not paid on the due date.</u></b></p>
<table class="account-details">
<tr>
<td>Account Name</td>
<td> La Martiniere, Calcutta</td>
</tr>
<tr>
<td>Account Number</td>
<td> 031201001229</td>
</tr>
<tr>
<td>Bank Name</td>
<td> ICICI Bank, Gorky Terrace</td>
</tr>
<tr>
<td>Account Type</td>
<td> Savings</td>
</tr>
<tr>
<td>RTGS/NEFT/IFS Code</td>
<td> ICIC0000312</td>
</tr>
</table>
<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>
<table class="fee-details">
<tr>
<th>Quarters</th>
<th>Amount</th>
<th>Date of Payment</th>
</tr>
<tr>
<td>1<sup>st</sup> Quarter (April to June <span th:text="(${givenYear + 1})"></span>)</td>
<td>Rs. <span th:text="${fees.get(0)}"></span></td>
<td>On the date of admission</td>
</tr>
<tr>
<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>1<sup>st</sup> to 5<sup>th</sup> July, <span th:text="(${givenYear + 1})"></span></td>
</tr>
<tr>
<td>3<sup>rd</sup> Quarter (Oct to Dec. <span th:text="(${givenYear + 1})"></span>)</td>
<td>Rs. <span th:text="${fees.get(2)}"></span></td>
<td>1<sup>st</sup> to 5<sup>th</sup> Oct. <span th:text="(${givenYear + 1})"></span></td>
</tr>
<tr>
<td>4<sup>th</sup> Quarter (Jan to March <span th:text="(${givenYear + 2})"></span>)</td>
<td>Rs. <span th:text="${fees.get(3)}"></span></td>
<td>6<sup>th</sup> to 11<sup>th</sup> Jan <span th:text="(${givenYear + 2})"></span></td>
</tr>
<tr>
<td><b>Total</b></td>
<td colspan="2"><b>Rs <span th:text="${fees.get(4)}"></span></b></td>
</tr>
</table>
<div class="signature">
<p style="margin-bottom: 10px;">Yours faithfully,</p>
<span th:if="${showSignature == true}">
<img th:src="@{${serverPath + 'static/signature.png'}}" width="70px" alt=""/>
</span>
<span th:if="${showSignature == false}">
<br/>
<br/>
<br/>
</span>
<p><b>SUPRIYO DHAR</b><br />Secretary<br />La Martiniere, Kolkata</p>
</div>
<div class="footer" style="margin-top: 10px;">
<div class="left">
<p>11 Dr. U.N. Brahmachari Street<br />Kolkata - 700 017 (INDIA)</p>
</div>
<div class="center">
<p>+91-33-4040-6600/01<br />22890112(D)</p>
</div>
<div class="right">
<p>secretary@lamartiniere.co<br />lamartiniere.co</p>
</div>
</div>
</div>
</div>
</body>
......
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