merge prod to main
This commit is contained in:
Regular → Executable
+30
-1
@@ -1,7 +1,9 @@
|
||||
<?= $this->extend('layout/main_layout') ?>
|
||||
<?= $this->section('content') ?>
|
||||
<div class="container my-5">
|
||||
<h3 class="text-center text-success" style="font-family: Arial, sans-serif;">Scores</h2>
|
||||
<div class="d-flex flex-wrap align-items-center justify-content-between gap-2">
|
||||
<h3 class="text-success mb-0" style="font-family: Arial, sans-serif;">Scores</h3>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Filter Form -->
|
||||
@@ -73,6 +75,7 @@ $showExamScoresBySemester = $showExamScoresBySemester ?? [];
|
||||
<?php if ($showExamScoresForSemester): ?><th>Exam</th><?php endif; ?>
|
||||
<?php endif; ?>
|
||||
<?php if ($showExamScoresForSemester): ?><th>Semester Score</th><?php endif; ?>
|
||||
<?php if ($showExamScoresForSemester): ?><th>Report Card</th><?php endif; ?>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -96,6 +99,32 @@ $showExamScoresBySemester = $showExamScoresBySemester ?? [];
|
||||
<?php if ($showExamScoresForSemester): ?><td><?= esc($student['scores']['midterm_exam']['score'] ?? $student['scores']['final_exam']['score'] ?? '-') ?></td><?php endif; ?>
|
||||
<?php endif; ?>
|
||||
<?php if ($showExamScoresForSemester): ?><td><?= esc($student['scores']['semester']['score'] ?? '-') ?></td><?php endif; ?>
|
||||
<?php if ($showExamScoresForSemester): ?>
|
||||
<td>
|
||||
<?php
|
||||
$reportStudentId = (int) ($student['student_id'] ?? 0);
|
||||
if ($reportStudentId > 0) {
|
||||
$reportYear = (string) ($selectedYear ?? '');
|
||||
$reportSemester = (string) ($semester ?? '');
|
||||
$reportDate = date('Y-m-d');
|
||||
$reportUrl = base_url('parent/report-cards/view/' . $reportStudentId);
|
||||
$query = http_build_query([
|
||||
'school_year' => $reportYear,
|
||||
'semester' => $reportSemester,
|
||||
'report_date' => $reportDate,
|
||||
]);
|
||||
if ($query) {
|
||||
$reportUrl .= '?' . $query;
|
||||
}
|
||||
}
|
||||
?>
|
||||
<?php if ($reportStudentId > 0): ?>
|
||||
<a class="btn btn-sm btn-outline-primary" href="<?= esc($reportUrl) ?>" target="_blank" rel="noopener">View</a>
|
||||
<?php else: ?>
|
||||
<span class="text-muted">Unavailable</span>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<?php endif; ?>
|
||||
</tr>
|
||||
<?php if (!empty($student['comment'])): ?>
|
||||
<tr>
|
||||
|
||||
Reference in New Issue
Block a user