Commit eda87df7 authored by Deep Dey's avatar Deep Dey

chore: update dashboard fonts and admission reports

parent 24b548b2
body { body {
background-color: #f4f4f4; background-color: #f4f4f4;
font-family: "Arial", sans-serif; font-family: "Poppins", sans-serif;
color: #333; color: #333;
font-size: 13px;
}
.btn, .form-control {
font-size: 13px;
}
.btn.btn-sm {
font-size: 12px;
} }
.navbar { .navbar {
......
...@@ -4,7 +4,7 @@ body { ...@@ -4,7 +4,7 @@ body {
align-items: center; align-items: center;
height: 100vh; height: 100vh;
background-color: #f4f4f4; background-color: #f4f4f4;
font-family: 'Arial', sans-serif; font-family: "Poppins", sans-serif;
} }
.login-container { .login-container {
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-3" style="margin-top: 90px;"> <div class="col-lg-3" style="margin-top: 110px;">
<div class="navbar-filter"> <div class="navbar-filter">
<!-- <h5>Filters</h5> <!-- <h5>Filters</h5>
<hr /> --> <hr /> -->
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
<div class="book-appointment-box mt-3"> <div class="book-appointment-box mt-3">
<div style="display: flex; gap: 4px;"> <div style="display: flex; gap: 4px;">
<button id="summary-popup-btn" class="btn btn-success btn-sm">Download Score Sheets</button> <button id="summary-popup-btn" class="btn btn-success btn-sm">Download Score Sheets</button>
<button id="download-interaction-sheet-btn" class="btn btn-success btn-sm">Download Interaction Sheet</button>
<button id="download-admission-data-btn" class="btn btn-success btn-sm">Download Admission Data</button> <button id="download-admission-data-btn" class="btn btn-success btn-sm">Download Admission Data</button>
</div> </div>
<button id="bookAppointmentBtn" class="btn btn-primary btn-sm">Schedule Appointment</button> <button id="bookAppointmentBtn" class="btn btn-primary btn-sm">Schedule Appointment</button>
...@@ -66,6 +65,7 @@ ...@@ -66,6 +65,7 @@
</th> </th>
<th scope="col">Candidate Name</th> <th scope="col">Candidate Name</th>
<th scope="col">Interaction Date/Time</th> <th scope="col">Interaction Date/Time</th>
<th scope="col">Correspondence Email</th>
<th scope="col">Father Name</th> <th scope="col">Father Name</th>
<th scope="col">Mother Name</th> <th scope="col">Mother Name</th>
</tr> </tr>
...@@ -139,6 +139,7 @@ ...@@ -139,6 +139,7 @@
<div class="book-appointment-box2"> <div class="book-appointment-box2">
<button id="interactionScoring" class="btn btn-primary btn-sm">Interaction Scoring Sheet</button> <button id="interactionScoring" class="btn btn-primary btn-sm">Interaction Scoring Sheet</button>
<button id="counsellorScoring" class="btn btn-secondary btn-sm">Counsellor Scoring Sheet</button> <button id="counsellorScoring" class="btn btn-secondary btn-sm">Counsellor Scoring Sheet</button>
<button id="download-interaction-sheet-btn" class="btn btn-success btn-sm">Download Interaction Sheet</button>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -26,6 +26,7 @@ $(document).ready(function () { ...@@ -26,6 +26,7 @@ $(document).ready(function () {
' ' + ' ' +
(student.interactionTime || '') + (student.interactionTime || '') +
'</td>'; '</td>';
outputHtml += `<td><a href="mailto:${student.fatherEmail}">${student.fatherEmail}</a></td>`;
outputHtml += '<td>' + student.fatherName + '</td>'; outputHtml += '<td>' + student.fatherName + '</td>';
outputHtml += '<td>' + student.motherName + '</td>'; outputHtml += '<td>' + student.motherName + '</td>';
outputHtml += '</tr>'; outputHtml += '</tr>';
...@@ -244,11 +245,13 @@ $(document).ready(function () { ...@@ -244,11 +245,13 @@ $(document).ready(function () {
let interactionDate = $('#dateFilterReport').val(); let interactionDate = $('#dateFilterReport').val();
if (!schoolName || !interactionDate) { if (!schoolName || !interactionDate) {
$('#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 and date to download counsellor scoring sheet.'
); );
$('#messageModal').modal('show'); $('#messageModal').modal('show');
return;
} }
window window
...@@ -267,11 +270,13 @@ $(document).ready(function () { ...@@ -267,11 +270,13 @@ $(document).ready(function () {
let interactionDate = $('#dateFilterReport').val(); let interactionDate = $('#dateFilterReport').val();
if (!schoolName || !interactionDate) { if (!schoolName || !interactionDate) {
$('#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 interaction scoring sheet.' 'Please select school and date to download counsellor scoring sheet.'
); );
$('#messageModal').modal('show'); $('#messageModal').modal('show');
return;
} }
window window
...@@ -286,32 +291,29 @@ $(document).ready(function () { ...@@ -286,32 +291,29 @@ $(document).ready(function () {
}); });
$('#download-interaction-sheet-btn').click(function () { $('#download-interaction-sheet-btn').click(function () {
let schoolFilter = $('#schoolFilter').val(); let schoolName = $('#schoolFilterReport').val();
let dateFilter = $('#dateFilter').val(); let interactionDate = $('#dateFilterReport').val();
let timeFilter = $('#timeFilter').val();
if (!schoolFilter || !dateFilter || !timeFilter) { if (!schoolName || !interactionDate) {
$('#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 and time from filter to download interaction sheet.' 'Please select school and date to download counsellor scoring sheet.'
); );
$('#messageModal').modal('show'); $('#messageModal').modal('show');
return;
} }
var selectedDateTime = new Date(
dateFilter + 'T' + timeFilter
);
window window
.open( .open(
BASE_URL_LAMARTIN + BASE_URL_LAMARTIN +
`/admission-form/download-master-interaction-template?apikey=${ `/admission-form/download-master-interaction-template?apikey=${
loginData.apiKey loginData.apiKey
}&schoolName=${ }&schoolName=${
schoolFilter schoolName
}&interactionDate=${ }&interactionDate=${
dateFilter interactionDate
}&interactionTime=${formatAMPM(selectedDateTime)}`, }`,
'_blank' '_blank'
) )
.focus(); .focus();
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<select id="category" name="category" class="la-form-control"> <select id="category" name="category" class="la-form-control">
<option value="">Specify Category</option> <option value="">Specify Category</option>
<option value="General">General</option> <option value="General">General</option>
<option value="Brother / Sister(Not Cousins) studying at La Martiniere, Kolkata">Brother / <option value="Brother / Sister">Brother /
Sister(Not Cousins) studying at La Martiniere, Kolkata</option> Sister(Not Cousins) studying at La Martiniere, Kolkata</option>
<option value="Staff Child">Staff Child</option> <option value="Staff Child">Staff Child</option>
<option value="Ex-Student">Ex-Student</option> <option value="Ex-Student">Ex-Student</option>
......
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