Commit 5b1b9568 authored by Deep Dey's avatar Deep Dey

Merge branch 'master' into 'master'

feat: add class dropdown, special admission schedule, and admin portal form updates

See merge request deepdey/lamartin-webomagic!6
parents 78a5f007 50b8b16b
This diff is collapsed.
...@@ -28,6 +28,26 @@ ...@@ -28,6 +28,26 @@
<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 class="filter-box">
<label for="classFilter" class="filter-label">Class</label>
<select id="classFilter" class="form-control">
<option value="">Select class</option>
<option value="Lower Nursery" >Lower Nursery</option>
<option value="Upper Nursery">Upper Nursery</option>
<option value="Kindergarten">Kindergarten</option>
<option value="Class 1">Class 1</option>
<option value="Class 2">Class 2</option>
<option value="Class 3">Class 3</option>
<option value="Class 4">Class 4</option>
<option value="Class 5">Class 5</option>
<option value="Class 6">Class 6</option>
<option value="Class 7">Class 7</option>
<option value="Class 8">Class 8</option>
<option value="Class 9">Class 9</option>
<option value="Class 10">Class 10</option>
<option value="Class 11">Class 11</option>
</select>
</div>
<div class="filter-box"> <div class="filter-box">
<label for="dateFilter" class="filter-label">Interaction Date</label> <label for="dateFilter" class="filter-label">Interaction Date</label>
<input type="date" id="dateFilter" class="form-control" /> <input type="date" id="dateFilter" class="form-control" />
...@@ -150,6 +170,10 @@ ...@@ -150,6 +170,10 @@
<label for="modalAdmissionTime">Time</label> <label for="modalAdmissionTime">Time</label>
<input type="time" class="form-control" id="modalAdmissionTime" required /> <input type="time" class="form-control" id="modalAdmissionTime" required />
</div> </div>
<div class="form-group">
<input type="checkbox" id="scheduleSpecialAdmission" />
<label for="scheduleSpecialAdmission">Schedule Special Admission</label>
</div>
<div class="modal-footer p-0 pt-2 border-top-0"> <div class="modal-footer p-0 pt-2 border-top-0">
<button type="submit" class="btn btn-primary admission-submit-btn">Schedule</button> <button type="submit" class="btn btn-primary admission-submit-btn">Schedule</button>
<button class="btn btn-primary admission-loading-btn" type="button" disabled> <button class="btn btn-primary admission-loading-btn" type="button" disabled>
...@@ -190,8 +214,21 @@ ...@@ -190,8 +214,21 @@
<div style="display: flex; justify-content: center;"> <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" disabled> <select id="classFilterReport" class="form-control">
<option value="Lower Nursery" selected>Lower Nursery</option> <option value="Lower Nursery" selected>Lower Nursery</option>
<option value="Upper Nursery">Upper Nursery</option>
<option value="Kindergarten">Kindergarten</option>
<option value="Class 1">Class 1</option>
<option value="Class 2">Class 2</option>
<option value="Class 3">Class 3</option>
<option value="Class 4">Class 4</option>
<option value="Class 5">Class 5</option>
<option value="Class 6">Class 6</option>
<option value="Class 7">Class 7</option>
<option value="Class 8">Class 8</option>
<option value="Class 9">Class 9</option>
<option value="Class 10">Class 10</option>
<option value="Class 11">Class 11</option>
</select> </select>
</div> </div>
</div> </div>
...@@ -233,8 +270,21 @@ ...@@ -233,8 +270,21 @@
<div style="display: flex; justify-content: center;"> <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" disabled> <select id="admissionClassFilterReport" class="form-control" >
<option value="Lower Nursery" selected>Lower Nursery</option> <option value="Lower Nursery" selected>Lower Nursery</option>
<option value="Upper Nursery">Upper Nursery</option>
<option value="Kindergarten">Kindergarten</option>
<option value="Class 1">Class 1</option>
<option value="Class 2">Class 2</option>
<option value="Class 3">Class 3</option>
<option value="Class 4">Class 4</option>
<option value="Class 5">Class 5</option>
<option value="Class 6">Class 6</option>
<option value="Class 7">Class 7</option>
<option value="Class 8">Class 8</option>
<option value="Class 9">Class 9</option>
<option value="Class 10">Class 10</option>
<option value="Class 11">Class 11</option>
</select> </select>
</div> </div>
</div> </div>
......
...@@ -150,9 +150,51 @@ $(document).ready(function () { ...@@ -150,9 +150,51 @@ $(document).ready(function () {
$('#application-form').validate({ $('#application-form').validate({
rules: { rules: {
school: 'required',//
category: 'required',//
fullName: 'required',//
admissionClass: 'required',//
dateOfBirth: 'required',//
homeAddress: 'required',//
correspondenceAddress: 'required',//
fatherName: 'required',//
fatherEmail: 'required',//
fatherMobile: {
required: true,
regex: /^[0-9]{10}$/,
},//
candidateImage: {
extension: ['jpg', 'png', 'jpeg', 'svg'],
fileSize: 1 * 1024 * 1024,
},
fatherImage: {
extension: ['jpg', 'png', 'jpeg', 'svg'],
fileSize: 1 * 1024 * 1024,
},
formSubmitCheck: 'required', formSubmitCheck: 'required',
}, },
messages: { messages: {
school: 'Please select your school',
category: 'Please specify the category',
fullName: 'Please enter your full name',
admissionClass: 'Please specify the class',
dateOfBirth: 'Please enter the date of birth',
homeAddress: 'Please enter the home address',
correspondenceAddress: 'Please enter the correspondence address',
fatherName: "Please enter father's name",
fatherEmail: "Please enter father's email",
fatherMobile: {
required: "Please enter father's phone number",
regex: 'Please enter a valid phone number',
},
candidateImage: {
extension: 'Only jpg, jpeg, png, svg files are allowed.',
fileSize: 'Please upload a file smaller than 1 MB',
},
fatherImage: {
extension: 'Only jpg, jpeg, png, svg files are allowed.',
fileSize: 'Please upload a file smaller than 1 MB',
},
formSubmitCheck: 'Please check this box to submit the form', formSubmitCheck: 'Please check this box to submit the form',
}, },
errorPlacement: function (error, element) { errorPlacement: function (error, element) {
......
...@@ -140,15 +140,17 @@ $(document).ready(function () { ...@@ -140,15 +140,17 @@ $(document).ready(function () {
// Apply filters button click event // Apply filters button click event
$('#applyFilters').click(function () { $('#applyFilters').click(function () {
var schoolFilter = $('#schoolFilter').val(); var schoolFilter = $('#schoolFilter').val();
var classFilter = $('#classFilter').val();
var dateFilter = $('#dateFilter').val(); var dateFilter = $('#dateFilter').val();
var timeFilter = $('#timeFilter').val(); var timeFilter = $('#timeFilter').val();
var emailFilter = $('#emailFilter').val(); var emailFilter = $('#emailFilter').val();
getAdmissionData(schoolFilter, null, dateFilter, timeFilter, emailFilter); getAdmissionData(schoolFilter, classFilter, dateFilter, timeFilter, emailFilter);
}); });
// Reset filters button click event // Reset filters button click event
$('#resetFilters').click(function () { $('#resetFilters').click(function () {
$('#schoolFilter').val(''); $('#schoolFilter').val('');
$('#classFilter').val('');
$('#dateFilter').val(''); $('#dateFilter').val('');
$('#timeFilter').val(''); $('#timeFilter').val('');
$('#emailFilter').val(''); $('#emailFilter').val('');
...@@ -271,12 +273,13 @@ $(document).ready(function () { ...@@ -271,12 +273,13 @@ $(document).ready(function () {
$('#counsellorScoring').click(function () { $('#counsellorScoring').click(function () {
let schoolName = $('#schoolFilterReport').val(); let schoolName = $('#schoolFilterReport').val();
let interactionDate = $('#dateFilterReport').val(); let interactionDate = $('#dateFilterReport').val();
let className = $('#classFilterReport').val();
if (!schoolName || !interactionDate) { if (!schoolName || !interactionDate || !className) {
$('#reportModal').modal('hide'); $('#reportModal').modal('hide');
$('#messageModal .modal-title').text('Error'); $('#messageModal .modal-title').text('Error');
$('#messageModal .modal-body').text( $('#messageModal .modal-body').text(
'Please select school and date to download counsellor scoring sheet.' 'Please select school,class and date to download counsellor scoring sheet.'
); );
$('#messageModal').modal('show'); $('#messageModal').modal('show');
return; return;
...@@ -287,7 +290,7 @@ $(document).ready(function () { ...@@ -287,7 +290,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}&interactionDate=${interactionDate}`, }&schoolName=${schoolName}&className=${className}&interactionDate=${interactionDate}`,
'_blank' '_blank'
) )
.focus(); .focus();
...@@ -296,12 +299,13 @@ $(document).ready(function () { ...@@ -296,12 +299,13 @@ $(document).ready(function () {
$('#interactionScoring').click(function () { $('#interactionScoring').click(function () {
let schoolName = $('#schoolFilterReport').val(); let schoolName = $('#schoolFilterReport').val();
let interactionDate = $('#dateFilterReport').val(); let interactionDate = $('#dateFilterReport').val();
let className = $('#classFilterReport').val();
if (!schoolName || !interactionDate) { if (!schoolName || !interactionDate || !className) {
$('#reportModal').modal('hide'); $('#reportModal').modal('hide');
$('#messageModal .modal-title').text('Error'); $('#messageModal .modal-title').text('Error');
$('#messageModal .modal-body').text( $('#messageModal .modal-body').text(
'Please select school and date to download counsellor scoring sheet.' 'Please select school , class and date to download interaction scoring sheet.'
); );
$('#messageModal').modal('show'); $('#messageModal').modal('show');
return; return;
...@@ -312,7 +316,7 @@ $(document).ready(function () { ...@@ -312,7 +316,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}&interactionDate=${interactionDate}`, }&schoolName=${schoolName}&className=${className}&interactionDate=${interactionDate}`,
'_blank' '_blank'
) )
.focus(); .focus();
...@@ -321,12 +325,13 @@ $(document).ready(function () { ...@@ -321,12 +325,13 @@ $(document).ready(function () {
$('#download-interaction-sheet-btn').click(function () { $('#download-interaction-sheet-btn').click(function () {
let schoolName = $('#schoolFilterReport').val(); let schoolName = $('#schoolFilterReport').val();
let interactionDate = $('#dateFilterReport').val(); let interactionDate = $('#dateFilterReport').val();
let className = $('#classFilterReport').val();
if (!schoolName || !interactionDate) { if (!schoolName || !interactionDate || !className) {
$('#reportModal').modal('hide'); $('#reportModal').modal('hide');
$('#messageModal .modal-title').text('Error'); $('#messageModal .modal-title').text('Error');
$('#messageModal .modal-body').text( $('#messageModal .modal-body').text(
'Please select school and date to download counsellor scoring sheet.' 'Please select school,class and date to download interaction scoring sheet.'
); );
$('#messageModal').modal('show'); $('#messageModal').modal('show');
return; return;
...@@ -339,7 +344,10 @@ $(document).ready(function () { ...@@ -339,7 +344,10 @@ $(document).ready(function () {
loginData.apiKey loginData.apiKey
}&schoolName=${ }&schoolName=${
schoolName schoolName
}&interactionDate=${ }&className=${
className
}
&interactionDate=${
interactionDate interactionDate
}`, }`,
'_blank' '_blank'
...@@ -350,12 +358,13 @@ $(document).ready(function () { ...@@ -350,12 +358,13 @@ $(document).ready(function () {
$('#download-interaction-excel-btn').click(function () { $('#download-interaction-excel-btn').click(function () {
let schoolName = $('#schoolFilterReport').val(); let schoolName = $('#schoolFilterReport').val();
let interactionDate = $('#dateFilterReport').val(); let interactionDate = $('#dateFilterReport').val();
let className = $('#classFilterReport').val();
if (!schoolName || !interactionDate) { if (!schoolName || !interactionDate || !className) {
$('#reportModal').modal('hide'); $('#reportModal').modal('hide');
$('#messageModal .modal-title').text('Error'); $('#messageModal .modal-title').text('Error');
$('#messageModal .modal-body').text( $('#messageModal .modal-body').text(
'Please select school and date to download counsellor scoring sheet.' 'Please select school,class and date to download interaction scoring sheet.'
); );
$('#messageModal').modal('show'); $('#messageModal').modal('show');
return; return;
...@@ -368,7 +377,9 @@ $(document).ready(function () { ...@@ -368,7 +377,9 @@ $(document).ready(function () {
loginData.apiKey loginData.apiKey
}&schoolName=${ }&schoolName=${
schoolName schoolName
}&interactionDate=${ }&className=${
className
}&interactionDate=${
interactionDate interactionDate
}`, }`,
'_blank' '_blank'
...@@ -380,12 +391,13 @@ $(document).ready(function () { ...@@ -380,12 +391,13 @@ $(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();
if (!schoolName || !admissionDate) { if (!schoolName || !admissionDate || !className) {
$('#reportModal').modal('hide'); $('#reportModal').modal('hide');
$('#messageModal .modal-title').text('Error'); $('#messageModal .modal-title').text('Error');
$('#messageModal .modal-body').text( $('#messageModal .modal-body').text(
'Please select school and date to download counsellor scoring sheet.' 'Please select school,class and date to download counsellor scoring sheet.'
); );
$('#messageModal').modal('show'); $('#messageModal').modal('show');
return; return;
...@@ -398,7 +410,9 @@ $(document).ready(function () { ...@@ -398,7 +410,9 @@ $(document).ready(function () {
loginData.apiKey loginData.apiKey
}&schoolName=${ }&schoolName=${
schoolName schoolName
}&admissionDate=${ }&className=${
className
}&admissionDate=${
admissionDate admissionDate
}`, }`,
'_blank' '_blank'
...@@ -414,12 +428,13 @@ $(document).ready(function () { ...@@ -414,12 +428,13 @@ $(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();
if (!schoolName || !admissionDate) { if (!schoolName || !admissionDate || !className) {
$('#admissionReportModal').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 and date to proceed.' 'Please select school,class and date to proceed.'
); );
$('#messageModal').modal('show'); $('#messageModal').modal('show');
return; return;
...@@ -432,7 +447,9 @@ $(document).ready(function () { ...@@ -432,7 +447,9 @@ $(document).ready(function () {
loginData.apiKey loginData.apiKey
}&schoolName=${ }&schoolName=${
schoolName schoolName
}&admissionDate=${ }&className=${
className
}&admissionDate=${
admissionDate admissionDate
}`, }`,
'_blank' '_blank'
...@@ -460,6 +477,7 @@ $(document).ready(function () { ...@@ -460,6 +477,7 @@ $(document).ready(function () {
var formIds = $('#studentIdForAdmission').val(); var formIds = $('#studentIdForAdmission').val();
var admissionDate = $('#modalAdmissionDate').val(); var admissionDate = $('#modalAdmissionDate').val();
var admissionTime = $('#modalAdmissionTime').val(); var admissionTime = $('#modalAdmissionTime').val();
var isSpecialAdmission = $('#scheduleSpecialAdmission').is(':checked');
var selectedAdmissionDateTime = new Date( var selectedAdmissionDateTime = new Date(
admissionDate + 'T' + admissionTime admissionDate + 'T' + admissionTime
...@@ -478,8 +496,13 @@ $(document).ready(function () { ...@@ -478,8 +496,13 @@ $(document).ready(function () {
$('.admission-submit-btn').hide(); $('.admission-submit-btn').hide();
$('.admission-loading-btn').show(); $('.admission-loading-btn').show();
var apiUrl = isSpecialAdmission
? BASE_URL_LAMARTIN + '/admission-form/set-special-admission-interview'
: BASE_URL_LAMARTIN + '/admission-form/set-admission-interview';
$.ajax({ $.ajax({
url: BASE_URL_LAMARTIN + '/admission-form/set-admission-interview', // url: BASE_URL_LAMARTIN + '/admission-form/set-admission-interview',
url: apiUrl,
type: 'GET', type: 'GET',
contentType: 'application/json', contentType: 'application/json',
dataType: 'json', dataType: 'json',
......
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