Commit 1c795805 authored by Deep Dey's avatar Deep Dey

chore: update new admission protal

parent 952f21f5
...@@ -41,7 +41,7 @@ public class AdmissionFormDAOController { ...@@ -41,7 +41,7 @@ public class AdmissionFormDAOController {
public boolean addNewAdmissionData(@NotNull AdmissionFormData formData) throws Exception { public boolean addNewAdmissionData(@NotNull AdmissionFormData formData) throws Exception {
if (formData.getSessionYear() == null || formData.getSessionYear().isEmpty()) { if (formData.getSessionYear() == null || formData.getSessionYear().isEmpty()) {
formData.setSessionYear("2026-2027"); formData.setSessionYear("2027-2028");
} }
if (!formData.isDuplicateFatherEmail()) { if (!formData.isDuplicateFatherEmail()) {
List<AdmissionFormData> data = admissionFormDataRepository List<AdmissionFormData> data = admissionFormDataRepository
...@@ -53,8 +53,8 @@ public class AdmissionFormDAOController { ...@@ -53,8 +53,8 @@ public class AdmissionFormDAOController {
} }
if (formData.getAdmissionClass().equals("Lower Nursery")) { if (formData.getAdmissionClass().equals("Lower Nursery")) {
if(!formData.getDateOfBirth().startsWith("2023")) { if(!formData.getDateOfBirth().startsWith("2024")) {
throw new Exception("Date of Birth should be 2023"); throw new Exception("Date of Birth should be 2024");
} }
} }
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
<label for="school">Session Year <span>*</span></label> <label for="school">Session Year <span>*</span></label>
<select name="sessionYear" class="la-form-control"> <select name="sessionYear" class="la-form-control">
<option value="">Select session year</option> <option value="">Select session year</option>
<option value="2025-2026">2025-2026</option>
<option value="2026-2027">2026-2027</option> <option value="2026-2027">2026-2027</option>
<option value="2027-2028">2027-2028</option>
</select> </select>
<div class="la-invalid-feedback"></div> <div class="la-invalid-feedback"></div>
<small>Please specify admission session year</small> <small>Please specify admission session year</small>
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
<label for="sessionFilter" class="filter-label">Session</label> <label for="sessionFilter" class="filter-label">Session</label>
<select id="sessionFilter" class="form-control"> <select id="sessionFilter" class="form-control">
<option value="2025-2026">2025-2026</option> <option value="2025-2026">2025-2026</option>
<option value="2026-2027" selected>2026-2027</option> <option value="2026-2027">2026-2027</option>
<option value="2027-2028" selected>2027-2028</option>
</select> </select>
</div> </div>
<div class="filter-box"> <div class="filter-box">
...@@ -233,8 +234,9 @@ ...@@ -233,8 +234,9 @@
<div class="form-group" style="width: 49%;"> <div class="form-group" style="width: 49%;">
<label for="sessionFilterReport" class="filter-label">Session</label> <label for="sessionFilterReport" class="filter-label">Session</label>
<select id="sessionFilterReport" class="form-control" required> <select id="sessionFilterReport" class="form-control" required>
<option value="2025-2026" selected>2025-2026</option> <option value="2025-2026">2025-2026</option>
<option value="2026-2027">2026-2027</option> <option value="2026-2027" selected>2026-2027</option>
<option value="2027-2028">2027-2028</option>
</select> </select>
</div> </div>
<div class="form-group" style="width: 49%;"> <div class="form-group" style="width: 49%;">
......
const BASE_URL_LAMARTIN = 'https://adm.lamartiniere.co/webomagic-lamartin'; const BASE_URL_LAMARTIN = 'https://adm.lamartiniere.co/webomagic-lamartin';
const SESSION_YEAR = '2026-2027'; // const BASE_URL_LAMARTIN = 'http://localhost:8084/webomagic-lamartin';
\ No newline at end of file const SESSION_YEAR = '2027-2028';
\ No newline at end of file
...@@ -428,8 +428,8 @@ ...@@ -428,8 +428,8 @@
<script src="https://code.jquery.com/jquery-3.1.1.min.js"></script> <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/jquery-validation@1.19.5/dist/jquery.validate.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/jquery-validation@1.19.5/dist/jquery.validate.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
<script src="./constant.js?v=03-07-2025"></script> <script src="./constant.js?v=20-05-2025"></script>
<script src="./main.js?v=06-01-2026"></script> <script src="./main.js?v=20-05-2026"></script>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -34,7 +34,7 @@ $(document).ready(function () { ...@@ -34,7 +34,7 @@ $(document).ready(function () {
var currentYear = currentDate.getFullYear(); var currentYear = currentDate.getFullYear();
var upperLimitDate = new Date(currentYear - 1, 0, 1); var upperLimitDate = new Date(currentYear - 1, 0, 1);
var lowerLimitDate = new Date(currentYear - 3, 0, 2); var lowerLimitDate = new Date(currentYear - 2, 0, 2);
// Format the dates as YYYY-MM-DD strings // Format the dates as YYYY-MM-DD strings
var upperLimitDateString = upperLimitDate.toISOString().split('T')[0]; var upperLimitDateString = upperLimitDate.toISOString().split('T')[0];
......
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