From 64aa07625ee66537529531689361129c098ae6e1 Mon Sep 17 00:00:00 2001 From: Aaron Lee Date: Sat, 18 Sep 2021 22:04:31 +0800 Subject: [PATCH] Added time and switch font --- static/allpages.css | 21 ++++++++++- static/time.js | 20 +++++++++++ templates/admin.html | 74 +++++++++++++++++++------------------- templates/group_teach.html | 30 ++++++++-------- templates/homeroom.html | 15 ++++---- templates/login.html | 3 +- templates/uploadcsv.html | 4 +-- 7 files changed, 106 insertions(+), 61 deletions(-) create mode 100644 static/time.js diff --git a/static/allpages.css b/static/allpages.css index 66d2fc9..55bd3c0 100644 --- a/static/allpages.css +++ b/static/allpages.css @@ -1,3 +1,10 @@ +@import url('https://fonts.googleapis.com/css2?family=Lato&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+TC&display=swap'); + +body { + font-family: "Lato", "Noto Sans TC", "Microsoft JhengHei", "sans-serif"; +} + div.col .row .col { border: 1px solid black; } @@ -99,7 +106,7 @@ input[type="checkbox"].late:checked { background: rgb(15, 184, 0); } input[type="checkbox"].late:checked:after { - content: "φ"; + content: "𝜑"; color: #fff; position: absolute; left: 50%; @@ -118,4 +125,16 @@ input[type="checkbox"].late:checked:after { button.logout { margin-left: 0 !important; +} + +div.showTime { + z-index: 1; + position:fixed; + padding: 10px; + font-size: 1.2em; + bottom:1em; + right:1em; + border:1px solid black; + color:rgb(77, 77, 77); + background:rgb(179, 255, 169); } \ No newline at end of file diff --git a/static/time.js b/static/time.js new file mode 100644 index 0000000..a4899bf --- /dev/null +++ b/static/time.js @@ -0,0 +1,20 @@ +(function () { + function checkTime(i) { + return (i < 10) ? "0" + i : i; + } + + function startTime() { + var today = new Date(), + y = today.getFullYear(), + mm = checkTime(today.getMonth() + 1), + d = checkTime(today.getDate()), + h = checkTime(today.getHours()), + m = checkTime(today.getMinutes()), + s = checkTime(today.getSeconds()); + document.getElementById('showTime').innerHTML = y + "/" + mm + "/" + d + " " + h + ":" + m + ":" + s; + t = setTimeout(function () { + startTime() + }, 500); + } + startTime(); +})(); \ No newline at end of file diff --git a/templates/admin.html b/templates/admin.html index c8576e9..4439653 100644 --- a/templates/admin.html +++ b/templates/admin.html @@ -23,6 +23,7 @@ +
Current Time:

Admin View | 管理頁面

{{homeroomCode[0]}} {{homeroomCode[1]}}

@@ -64,21 +65,13 @@
-
HR
-
Number
-
Name
-
Eng Name
-
Morning
-
1
-
2
-
3
-
4
-
Nap
-
5
-
6
-
7
-
8
-
9
+
班級
+
座號
+
姓名
+
英文姓名
+ {% for p in periods %} +
{{p}}
+ {% endfor %}
@@ -107,34 +100,40 @@
{{ homeroomData[i]['name'] }}
{{ homeroomData[i]['eng_name'] }}
{% for j in periods %} - {% if 'signature' in absData[currDate][j] %} - {% if i in absData[currDate][j] %} -
+
+ {% if 'signature' in absData[currDate][j] %} + {% if i in absData[currDate][j] %} + {% if absData[currDate][j][i] == 1 %}

X

-
- {% else %} - {% if absData[currDate][j]['name'] != 'GP' %} -
+ {% else %} +

𝜑

+ {% endif %} + {% else %} + {% if absData[currDate][j]['name'] != 'GP' %}

V

-
- {% else %} - {% if (homeroomData[i]['GP_Class'][absData[currDate][j]['teacher']] in - absData[currDate][j]['signature'])%} -
+ {% else %} + {% if (homeroomData[i]['GP_Class'][absData[currDate][j]['teacher']] in + absData[currDate][j]['signature'])%}

V

-
- {% else %} -
+ {% else %}

-
- {% endif %} - {% endif %} - {% endif %} - {% else %} -
+ {% endif %} + {% endif %} + {% endif %} + {% elif absData[currDate][j]['name'] == 'GP' %}

+ {% else %} + {% if 'confirm' in absData[currDate] %} +

+ {% else %} + + + {% endif %} + + {% endif %}
- {% endif %} {% endfor %}
{% endfor %} @@ -247,6 +246,7 @@ document.getElementById('hrSelForm').submit(); } + \ No newline at end of file diff --git a/templates/group_teach.html b/templates/group_teach.html index d5dcef4..c442b1c 100644 --- a/templates/group_teach.html +++ b/templates/group_teach.html @@ -23,6 +23,7 @@ +
Current Time:

Group Class View | 分組課頁面

{{cclass['category']}}: {{cclass['class_id']}}: {{cclass['name']}}

@@ -47,12 +48,12 @@
-
Grade
-
Class Code
-
Number
-
Name
-
Eng Name
-
Period {{i}}
+
Grade 年級
+
Class 班級
+
Number 座號
+
Name 姓名
+
English Name 英文名
+
Period {{i}} | 第 {{i}} 節
{% if data != None %} {% for grade in absData[i] %} @@ -73,7 +74,7 @@
{% elif absData[i][grade][homeroom][student]['absent'] == 2 %}
-

φ

+

𝜑

{% else %}
@@ -109,20 +110,20 @@ {% else %} + ↑ Confirm 確認 (Period {{i}}) ↑ {% endif %} @@ -202,6 +203,7 @@ document.getElementById('dateSelForm').submit(); } + \ No newline at end of file diff --git a/templates/homeroom.html b/templates/homeroom.html index e06f3a2..1c5e860 100644 --- a/templates/homeroom.html +++ b/templates/homeroom.html @@ -24,6 +24,7 @@ +
Current Time:

Homeroom View | 班級主頁

{{homeroomCode[0]}}{{homeroomCode[1]}}

@@ -90,7 +91,7 @@ {% if absData[currDate][j][i] == 1 %}

X

{% else %} -

φ

+

𝜑

{% endif %} {% else %} {% if absData[currDate][j]['name'] != 'GP' %} @@ -155,19 +156,20 @@ {% endif %}