Commit 7571bc79 authored by Deep Dey's avatar Deep Dey

Merge branch 'master' into 'master'

feat: stop auto reply mail for admin filled forms

See merge request deepdey/lamartin-webomagic!10
parents 3c42563d e2137523
...@@ -84,7 +84,7 @@ public class AdmissionFormDAOController { ...@@ -84,7 +84,7 @@ public class AdmissionFormDAOController {
Long id = admissionFormDataRepository.saveAdmissionFormData(formData); Long id = admissionFormDataRepository.saveAdmissionFormData(formData);
formData.setId(id); formData.setId(id);
if (id > 0) { if (id > 0 && !formData.isFilledByAdmin()) {
String emailBody = this.templateService String emailBody = this.templateService
.generateAutoReplyTemplate(formData); .generateAutoReplyTemplate(formData);
......
...@@ -37,13 +37,13 @@ public enum FEES_STRUCTURE { ...@@ -37,13 +37,13 @@ public enum FEES_STRUCTURE {
LMB_NEW_C8 (LMB_SCHOOL, "Class 8", false, List.of("1,67,000.00", "1,22,000.00", "1,22,000.00", "1,22,000.00", "5,33,000.00")), LMB_NEW_C8 (LMB_SCHOOL, "Class 8", false, List.of("1,67,000.00", "1,22,000.00", "1,22,000.00", "1,22,000.00", "5,33,000.00")),
LMB_EX_C9 (LMB_SCHOOL, "Class 9", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")), LMB_EX_C9 (LMB_SCHOOL, "Class 9", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")),
LMB_NEW_C9 (LMB_SCHOOL, "Class 9", false, List.of("1,48,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")), LMB_NEW_C9 (LMB_SCHOOL, "Class 9", false, List.of("1,46,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")),
LMB_EX_C10 (LMB_SCHOOL, "Class 10", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")), LMB_EX_C10 (LMB_SCHOOL, "Class 10", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")),
LMB_NEW_C10 (LMB_SCHOOL, "Class 10", false, List.of("1,48,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")), LMB_NEW_C10 (LMB_SCHOOL, "Class 10", false, List.of("1,46,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")),
LMB_EX_C11 (LMB_SCHOOL, "Class 11", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")), LMB_EX_C11 (LMB_SCHOOL, "Class 11", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")),
LMB_NEW_C11 (LMB_SCHOOL, "Class 11", false, List.of("1,48,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")), LMB_NEW_C11 (LMB_SCHOOL, "Class 11", false, List.of("1,46,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")),
LMB_EX_C12 (LMB_SCHOOL, "Class 12", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")), LMB_EX_C12 (LMB_SCHOOL, "Class 12", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")),
LMB_NEW_C12 (LMB_SCHOOL, "Class 12", false, List.of("1,48,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")), LMB_NEW_C12 (LMB_SCHOOL, "Class 12", false, List.of("1,46,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")),
// Lamartiniere Girls // Lamartiniere Girls
LMG_EX_LN (LMG_SCHOOL, "Lower Nursery", true, List.of("69,500.00", "34,500.00", "34,500.00", "34,500.00", "1,73,000.00")), LMG_EX_LN (LMG_SCHOOL, "Lower Nursery", true, List.of("69,500.00", "34,500.00", "34,500.00", "34,500.00", "1,73,000.00")),
...@@ -72,13 +72,13 @@ public enum FEES_STRUCTURE { ...@@ -72,13 +72,13 @@ public enum FEES_STRUCTURE {
LMG_NEW_C8 (LMG_SCHOOL, "Class 8", false, List.of("1,67,000.00", "1,22,000.00", "1,22,000.00", "1,22,000.00", "5,33,000.00")), LMG_NEW_C8 (LMG_SCHOOL, "Class 8", false, List.of("1,67,000.00", "1,22,000.00", "1,22,000.00", "1,22,000.00", "5,33,000.00")),
LMG_EX_C9 (LMG_SCHOOL, "Class 9", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")), LMG_EX_C9 (LMG_SCHOOL, "Class 9", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")),
LMG_NEW_C9 (LMG_SCHOOL, "Class 9", false, List.of("1,48,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")), LMG_NEW_C9 (LMG_SCHOOL, "Class 9", false, List.of("1,46,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")),
LMG_EX_C10 (LMG_SCHOOL, "Class 10", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")), LMG_EX_C10 (LMG_SCHOOL, "Class 10", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")),
LMG_NEW_C10 (LMG_SCHOOL, "Class 10", false, List.of("1,48,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")), LMG_NEW_C10 (LMG_SCHOOL, "Class 10", false, List.of("1,46,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")),
LMG_EX_C11 (LMG_SCHOOL, "Class 11", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")), LMG_EX_C11 (LMG_SCHOOL, "Class 11", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")),
LMG_NEW_C11 (LMG_SCHOOL, "Class 11", false, List.of("1,48,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")), LMG_NEW_C11 (LMG_SCHOOL, "Class 11", false, List.of("1,46,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")),
LMG_EX_C12 (LMG_SCHOOL, "Class 12", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")), LMG_EX_C12 (LMG_SCHOOL, "Class 12", true, List.of("63,500.00", "28,500.00", "28,500.00", "28,500.00", "1,49,000.00")),
LMG_NEW_C12 (LMG_SCHOOL, "Class 12", false, List.of("1,48,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00")); LMG_NEW_C12 (LMG_SCHOOL, "Class 12", false, List.of("1,46,000.00", "1,01,000.00", "1,01,000.00", "1,01,000.00", "4,49,000.00"));
private final String schoolName; private final String schoolName;
private final String className; private final String className;
......
...@@ -149,9 +149,11 @@ ...@@ -149,9 +149,11 @@
</span> </span>
<b th:text="${admissionForm.fullName}"></b> <b th:text="${admissionForm.fullName}"></b>
has been has been
granted 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="(${givenYear + 1}) + ' - ' + (${givenYear + 2})">2025 - 2026</span>, subject to Interaction/Interview with Principal.
</p> </p>
<div class="middle">
<b> BOTH PARENTS AND CANDIDATE MUST ATTEND THE INTERACTION.</b> <b> BOTH PARENTS AND CANDIDATE MUST ATTEND THE INTERACTION.</b>
</div>
<p> <p>
Please contact the Please contact the
<strong> <strong>
......
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