Commit 6ac19e7a authored by Deep Dey's avatar Deep Dey

feat: add session year for admission form download modal

parent 2e9dd73d
{
"java.compile.nullAnalysis.mode": "disabled"
}
\ No newline at end of file
...@@ -649,7 +649,8 @@ public class AdmissionFormController { ...@@ -649,7 +649,8 @@ public class AdmissionFormController {
@RequestParam("apikey") String apiKey, @RequestParam("apikey") String apiKey,
@RequestParam String schoolName, @RequestParam String schoolName,
@RequestParam String admissionDate, @RequestParam String admissionDate,
@RequestParam String className @RequestParam String className,
@RequestParam String sessionYear
) throws Exception { ) throws Exception {
List<AdmissionFormData> admissionFormDataList = List<AdmissionFormData> admissionFormDataList =
...@@ -662,7 +663,7 @@ public class AdmissionFormController { ...@@ -662,7 +663,7 @@ public class AdmissionFormController {
admissionDate, admissionDate,
null, null,
null, null,
null sessionYear
); );
if (admissionFormDataList.isEmpty()) { if (admissionFormDataList.isEmpty()) {
......
{"properties": [
{
"name": "lamartin.static.resources.root.path",
"type": "java.lang.String",
"description": "A description for 'lamartin.static.resources.root.path'"
},
{
"name": "lamartin.static.server.path",
"type": "java.lang.String",
"description": "A description for 'lamartin.static.server.path'"
},
{
"name": "lamartin.username",
"type": "java.lang.String",
"description": "A description for 'lamartin.username'"
},
{
"name": "lamartin.password",
"type": "java.lang.String",
"description": "A description for 'lamartin.password'"
}
]}
\ No newline at end of file
...@@ -296,6 +296,14 @@ ...@@ -296,6 +296,14 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div style="display: flex; justify-content: space-between;"> <div style="display: flex; justify-content: space-between;">
<div class="form-group" style="width: 49%;">
<label for="admissionSessionFilterReport" class="filter-label">Session</label>
<select id="admissionSessionFilterReport" class="form-control" required>
<option value="2025-2026">2025-2026</option>
<option value="2026-2027" selected>2026-2027</option>
<option value="2027-2028">2027-2028</option>
</select>
</div>
<div class="form-group" style="width: 49%;"> <div class="form-group" style="width: 49%;">
<label for="admissionSchoolFilterReport" class="filter-label">School</label> <label for="admissionSchoolFilterReport" class="filter-label">School</label>
<select id="admissionSchoolFilterReport" class="form-control" required> <select id="admissionSchoolFilterReport" class="form-control" required>
...@@ -303,12 +311,12 @@ ...@@ -303,12 +311,12 @@
<option value="La Martiniere for Girls">La Martiniere for Girls</option> <option value="La Martiniere for Girls">La Martiniere for Girls</option>
</select> </select>
</div> </div>
</div>
<div style="display: flex; justify-content: space-between;">
<div class="form-group" style="width: 49%;"> <div class="form-group" style="width: 49%;">
<label for="admissionDateFilterReport" class="filter-label">Admission Date</label> <label for="admissionDateFilterReport" class="filter-label">Admission Date</label>
<input type="date" id="admissionDateFilterReport" class="form-control" /> <input type="date" id="admissionDateFilterReport" class="form-control" />
</div> </div>
</div>
<div style="display: flex; justify-content: center;">
<div class="form-group" style="width: 49%;"> <div class="form-group" style="width: 49%;">
<label for="admissionClassFilterReport" class="filter-label">Class</label> <label for="admissionClassFilterReport" class="filter-label">Class</label>
<select id="admissionClassFilterReport" class="form-control" > <select id="admissionClassFilterReport" class="form-control" >
......
...@@ -420,13 +420,14 @@ $(document).ready(function () { ...@@ -420,13 +420,14 @@ $(document).ready(function () {
$('#download-admission-excel-btn').click(function () { $('#download-admission-excel-btn').click(function () {
let schoolName = $('#admissionSchoolFilterReport').val(); let schoolName = $('#admissionSchoolFilterReport').val();
let admissionDate = $('#admissionDateFilterReport').val(); let admissionDate = $('#admissionDateFilterReport').val();
let className = $('#classFilterReport').val(); let className = $('#admissionClassFilterReport').val();
let sessionYear = $('#admissionSessionFilterReport').val();
if (!schoolName || !admissionDate) { if (!schoolName || !admissionDate) {
$('#reportModal').modal('hide'); $('#admissionReportModal').modal('hide');
$('#messageModal .modal-title').text('Error'); $('#messageModal .modal-title').text('Error');
$('#messageModal .modal-body').text( $('#messageModal .modal-body').text(
'Please select school,class and date to download counsellor scoring sheet.' 'Please select school,class and date to download admission excel.'
); );
$('#messageModal').modal('show'); $('#messageModal').modal('show');
return; return;
...@@ -443,6 +444,8 @@ $(document).ready(function () { ...@@ -443,6 +444,8 @@ $(document).ready(function () {
className className
}&admissionDate=${ }&admissionDate=${
admissionDate admissionDate
}&sessionYear=${
sessionYear
}`, }`,
'_blank' '_blank'
) )
...@@ -457,7 +460,8 @@ $(document).ready(function () { ...@@ -457,7 +460,8 @@ $(document).ready(function () {
$('#downloadAdmissionFormList').click(function () { $('#downloadAdmissionFormList').click(function () {
let schoolName = $('#admissionSchoolFilterReport').val(); let schoolName = $('#admissionSchoolFilterReport').val();
let admissionDate = $('#admissionDateFilterReport').val(); let admissionDate = $('#admissionDateFilterReport').val();
let className = $('#classFilterReport').val(); let className = $('#admissionClassFilterReport').val();
let sessionYear = $('#admissionSessionFilterReport').val();
if (!schoolName || !admissionDate) { if (!schoolName || !admissionDate) {
$('#admissionReportModal').modal('hide'); $('#admissionReportModal').modal('hide');
...@@ -480,6 +484,8 @@ $(document).ready(function () { ...@@ -480,6 +484,8 @@ $(document).ready(function () {
className className
}&admissionDate=${ }&admissionDate=${
admissionDate admissionDate
}&sessionYear=${
sessionYear
}`, }`,
'_blank' '_blank'
) )
......
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