Skip to content

Commit e48f89d

Browse files
committed
26 Dec 2022
1) More custom date time settings for students/teachers. 2) Updated QR code scanner.
1 parent 1bbcde0 commit e48f89d

File tree

7 files changed

+11
-27
lines changed

7 files changed

+11
-27
lines changed

assets/html5-qrcode.min.js

Lines changed: 1 addition & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/LIB-Classes.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function del ($id) {
3737
// $id : class id
3838
function get ($id) {
3939
return $this->DB->fetch(
40-
"SELECT cl.*, co.`course_code`, co.`course_name`, u.`user_name`
40+
"SELECT cl.*, DATE_FORMAT(cl.`class_date`, '".DT_LONG."') `cd`, co.`course_code`, co.`course_name`, u.`user_name`
4141
FROM `classes` cl
4242
LEFT JOIN `courses` co USING (`course_id`)
4343
LEFT JOIN `users` u USING (`user_id`)
@@ -227,7 +227,7 @@ function getByTeacher ($uid, $date=null, $range=null, $page=null) {
227227
}
228228

229229
// (J3) GET CLASSES
230-
$sql = "SELECT cl.*, co.`course_code`, co.`course_name` $sql ORDER BY `class_date` DESC";
230+
$sql = "SELECT cl.*, DATE_FORMAT(cl.`class_date`, '".DT_LONG."') `cd`, co.`course_code`, co.`course_name` $sql ORDER BY `class_date` DESC";
231231
if ($page != null) { $sql .= $this->core->page["lim"]; }
232232

233233
// (J4) RESULTS
@@ -269,7 +269,7 @@ function getByStudent ($uid, $date=null, $range=null, $page=null) {
269269
}
270270

271271
// (K3) GET CLASSES
272-
$sql = "SELECT cl.*, co.`course_code`, co.`course_name`, a.`sign_date`
272+
$sql = "SELECT cl.*, DATE_FORMAT(cl.`class_date`, '".DT_LONG."') `cd`, co.`course_code`, co.`course_name`, a.`sign_date`
273273
FROM `classes` cl
274274
LEFT JOIN `attendance` a ON (cl.`class_id`=a.`class_id` AND a.`user_id`=?)
275275
LEFT JOIN `courses` co ON (cl.`course_id`=co.`course_id`)

pages/A-class-attend.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="flex-grow-1">
99
<h3 class="mb-0">[<?=$course["course_code"]?>] <?=$course["course_name"]?></h3>
1010
<small class="fw-bold">
11-
<?=$class["class_date"]?>
11+
<?=$class["cd"]?>
1212
</small>
1313
</div>
1414
<button class="btn btn-danger mi me-1" onclick="cb.page(0)">

pages/PAGE-classqr.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@
3030
font-size: 0.9em;
3131
}
3232
#qrtime {
33+
margin-top: 5px;
3334
text-transform: uppercase;
34-
font-size: 1.7em;
35+
font-size: 1em;
3536
}
3637
</style>
3738
<script src="<?=HOST_ASSETS?>qrcode.min.js"></script>
@@ -54,7 +55,7 @@
5455
<div id="qrwrap">
5556
<div id="qrcode"></div>
5657
<div id="qrcourse">[<?=$class["course_code"]?>] <?=$class["course_name"]?></div>
57-
<div id="qrtime"><?=$class["class_date"]?></div>
58+
<div id="qrtime"><?=$class["cd"]?></div>
5859
</div>
5960
</body>
6061
</html>

pages/S-class-list.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
if (is_array($classes)) { foreach ($classes as $id=>$c) { ?>
88
<div class="d-flex align-items-center border p-2">
99
<div class="flex-grow-1">
10-
<strong><?=$c["class_date"]?></strong><br>
10+
<strong><?=$c["cd"]?></strong><br>
1111
[<?=$c["course_code"]?>] <?=$c["course_name"]?><br>
1212
<small><?=$c["class_desc"]?></small>
1313
</div>

pages/T-attend.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="flex-grow-1">
99
<h3 class="mb-0">[<?=$course["course_code"]?>] <?=$course["course_name"]?></h3>
1010
<small class="fw-bold">
11-
<?=$class["class_date"]?>
11+
<?=$class["cd"]?>
1212
</small>
1313
</div>
1414
<button class="btn btn-danger mi me-1" onclick="cb.page(0)">

pages/T-class-list.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
if (is_array($classes)) { foreach ($classes as $id=>$c) { ?>
88
<div class="d-flex align-items-center border p-2">
99
<div class="flex-grow-1">
10-
<strong><?=$c["class_date"]?></strong><br>
10+
<strong><?=$c["cd"]?></strong><br>
1111
[<?=$c["course_code"]?>] <?=$c["course_name"]?><br>
1212
<small><?=$c["class_desc"]?></small>
1313
</div>

0 commit comments

Comments
 (0)