Commit e5172c91 authored by Shuvankar Naskar's avatar Shuvankar Naskar

feat: add session year in report

parent 26b5b93d
...@@ -230,6 +230,13 @@ ...@@ -230,6 +230,13 @@
</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="sessionFilterReport" class="filter-label">Session</label>
<select id="sessionFilterReport" class="form-control" required>
<option value="2025-2026" selected>2025-2026</option>
<option value="2026-2027">2026-2027</option>
</select>
</div>
<div class="form-group" style="width: 49%;"> <div class="form-group" style="width: 49%;">
<label for="schoolFilterReport" class="filter-label">School</label> <label for="schoolFilterReport" class="filter-label">School</label>
<select id="schoolFilterReport" class="form-control" required> <select id="schoolFilterReport" class="form-control" required>
...@@ -237,12 +244,12 @@ ...@@ -237,12 +244,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="dateFilterReport" class="filter-label">Interaction Date</label> <label for="dateFilterReport" class="filter-label">Interaction Date</label>
<input type="date" id="dateFilterReport" class="form-control" /> <input type="date" id="dateFilterReport" 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="classFilterReport" class="filter-label">Class</label> <label for="classFilterReport" class="filter-label">Class</label>
<select id="classFilterReport" class="form-control"> <select id="classFilterReport" class="form-control">
......
...@@ -299,6 +299,7 @@ $(document).ready(function () { ...@@ -299,6 +299,7 @@ $(document).ready(function () {
let schoolName = $('#schoolFilterReport').val(); let schoolName = $('#schoolFilterReport').val();
let interactionDate = $('#dateFilterReport').val(); let interactionDate = $('#dateFilterReport').val();
let className = $('#classFilterReport').val(); let className = $('#classFilterReport').val();
let sessionYear = $('#sessionFilterReport').val();
if (!schoolName || !interactionDate) { if (!schoolName || !interactionDate) {
$('#reportModal').modal('hide'); $('#reportModal').modal('hide');
...@@ -315,7 +316,7 @@ $(document).ready(function () { ...@@ -315,7 +316,7 @@ $(document).ready(function () {
BASE_URL_LAMARTIN + BASE_URL_LAMARTIN +
`/admission-form/download-counsellor-scoring-template?apikey=${ `/admission-form/download-counsellor-scoring-template?apikey=${
loginData.apiKey loginData.apiKey
}&schoolName=${schoolName}&className=${className}&interactionDate=${interactionDate}`, }&schoolName=${schoolName}&className=${className}&interactionDate=${interactionDate}&sessionYear=${sessionYear}`,
'_blank' '_blank'
) )
.focus(); .focus();
...@@ -325,6 +326,7 @@ $(document).ready(function () { ...@@ -325,6 +326,7 @@ $(document).ready(function () {
let schoolName = $('#schoolFilterReport').val(); let schoolName = $('#schoolFilterReport').val();
let interactionDate = $('#dateFilterReport').val(); let interactionDate = $('#dateFilterReport').val();
let className = $('#classFilterReport').val(); let className = $('#classFilterReport').val();
let sessionYear = $('#sessionFilterReport').val();
if (!schoolName || !interactionDate) { if (!schoolName || !interactionDate) {
$('#reportModal').modal('hide'); $('#reportModal').modal('hide');
...@@ -341,7 +343,7 @@ $(document).ready(function () { ...@@ -341,7 +343,7 @@ $(document).ready(function () {
BASE_URL_LAMARTIN + BASE_URL_LAMARTIN +
`/admission-form/download-interaction-scoring-template?apikey=${ `/admission-form/download-interaction-scoring-template?apikey=${
loginData.apiKey loginData.apiKey
}&schoolName=${schoolName}&className=${className}&interactionDate=${interactionDate}`, }&schoolName=${schoolName}&className=${className}&interactionDate=${interactionDate}&sessionYear=${sessionYear}`,
'_blank' '_blank'
) )
.focus(); .focus();
...@@ -351,6 +353,7 @@ $(document).ready(function () { ...@@ -351,6 +353,7 @@ $(document).ready(function () {
let schoolName = $('#schoolFilterReport').val(); let schoolName = $('#schoolFilterReport').val();
let interactionDate = $('#dateFilterReport').val(); let interactionDate = $('#dateFilterReport').val();
let className = $('#classFilterReport').val(); let className = $('#classFilterReport').val();
let sessionYear = $('#sessionFilterReport').val();
if (!schoolName || !interactionDate) { if (!schoolName || !interactionDate) {
$('#reportModal').modal('hide'); $('#reportModal').modal('hide');
...@@ -372,9 +375,7 @@ $(document).ready(function () { ...@@ -372,9 +375,7 @@ $(document).ready(function () {
}&className=${ }&className=${
className className
} }
&interactionDate=${ &interactionDate=${interactionDate}&sessionYear=${sessionYear}`,
interactionDate
}`,
'_blank' '_blank'
) )
.focus(); .focus();
...@@ -384,6 +385,7 @@ $(document).ready(function () { ...@@ -384,6 +385,7 @@ $(document).ready(function () {
let schoolName = $('#schoolFilterReport').val(); let schoolName = $('#schoolFilterReport').val();
let interactionDate = $('#dateFilterReport').val(); let interactionDate = $('#dateFilterReport').val();
let className = $('#classFilterReport').val(); let className = $('#classFilterReport').val();
let sessionYear = $('#sessionFilterReport').val();
if (!schoolName || !interactionDate) { if (!schoolName || !interactionDate) {
$('#reportModal').modal('hide'); $('#reportModal').modal('hide');
...@@ -406,6 +408,8 @@ $(document).ready(function () { ...@@ -406,6 +408,8 @@ $(document).ready(function () {
className className
}&interactionDate=${ }&interactionDate=${
interactionDate interactionDate
}&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