aaronleetw/Attendance
1
0
Fork 0
mirror of https://github.com/aaronleetw/Attendance.git synced 2024-11-14 19:11:39 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add emoji and func to show only 2-curr-4 in HR or GP

Browse source
This commit is contained in:
Aaron Lee 2021-10-18 15:42:51 +08:00
parent 56957fdbdb
commit e2536ab19e
5 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
manage.py
View file

@ -138,7 +138,7 @@ def manageProcess(fCommand, fData):
cclass['class_id'] in tmpAbsData[currDate][p]['signature']),
"absent": False if not num in tmpAbsData[currDate][p] else tmpAbsData[currDate][p][num]
}
return render_template('group_teach.html', cclass=cclass, absData=absData, dow=dow, currDate=currDate, tmpAbsData=tmpAbsData, confirmed=confirmed)
return render_template('group_teach.html', dateKeys=sorted(tmpAbsData.keys()), cclass=cclass, absData=absData, dow=dow, currDate=currDate, tmpAbsData=tmpAbsData, confirmed=confirmed)
elif pl == 'homeroom':
homeroom = session['homeroom'].split('^')
homeroomData = db.child("Homerooms").child(homeroom[0]).child(
@ -177,7 +177,7 @@ def manageProcess(fCommand, fData):
if i >= datetime.now(tz).strftime("%Y-%m-%d"):
break
return render_template('homeroom.html', absData=absData, homeroomCode=homeroom, homeroomData=homeroomData,
currDate=currDate, periods=['m', '1', '2', '3', '4', 'n', '5', '6', '7', '8', '9'], currPeriod=currPeriod)
currDate=currDate, dateKeys=sorted(absData.keys()), periods=['m', '1', '2', '3', '4', 'n', '5', '6', '7', '8', '9'], currPeriod=currPeriod)
else:
return redirect('/logout')

9
templates/admin.html
View file

@ -34,13 +34,6 @@
<h2 style="color: red; text-align: center;">Homeroom NOT Confirmed 班導尚未確認</h2>
{% endif %}
<a href="/logout"><button class="btn btn-primary logout margin-top">Logout 登出</button></a>
<form action="/swapClass" method="post" id="swapClassForm" hidden>
<input type="text" name="homeroom" value="{{homeroomCode[0]}}^{{homeroomCode[1]}}">
<input type="text" name="date" value="{{currDate}}">
<input type="text" name="type" value="seewindow">
</form>
<a href="/swapClass/{{homeroomCode[0]}}/{{homeroomCode[1]}}/{{currDate}}"><button
class="btn btn-warning logout margin-top">Swap Classes 改、換課</button></a>
<div class="container margin-bottom">
<div class="row">
<div class="col">
@ -60,7 +53,7 @@
<select name="date" id="date" class="form-select">
{% for date in absData %}
{% if date == currDate %}
<option value="{{date}}" selected="selected">{{date}}</option>
<option value="{{date}}" selected="selected">{{date}} ★</option>
{% else %}
<option value="{{date}}">{{date}}</option>
{% endif %}

13
templates/group_teach.html
View file

@ -31,11 +31,14 @@
<a href="/logout"><button class="btn btn-primary margin-top logout">Logout 登出</button></a>
<a href="/select"><button class="btn btn-primary margin-top logout">Choose Subuser 選擇其他帳號</button></a>
<select name="date" id="date" class="form-select logout" onchange="chgDate();">
{% for date in tmpAbsData %}
{% if date == currDate %}
<option value="{{date}}" selected="selected">{{date}}</option>
{% else %}
<option value="{{date}}">{{date}}</option>
{% for date in range(dateKeys|length) %}
{% if dateKeys[date] == currDate %}
{% if date-2 >= 0 %}<option value="{{dateKeys[date-2]}}">{{dateKeys[date-2]}}</option>{% endif %}
{% if date-1 >= 0 %}<option value="{{dateKeys[date-1]}}">{{dateKeys[date-1]}}</option>{% endif %}
<option value="{{dateKeys[date]}}" selected="selected">{{dateKeys[date]}} ★</option>
{% for i in range(1,5) %}
{% if date+i < dateKeys|length %}<option value="{{dateKeys[date+i]}}">{{dateKeys[date+i]}}</option>{%endif%}
{% endfor %}
{% endif %}
{% endfor %}
</select>

13
templates/homeroom.html
View file

@ -32,11 +32,14 @@
<a href="/logout"><button class="btn btn-primary logout margin-top">Logout 登出</button></a>
<a href="/select"><button class="btn btn-primary margin-top logout">Choose Subuser 選擇其他帳號</button></a>
<select name="date" id="date" class="form-select logout" onchange="chgDate();">
{% for date in absData %}
{% if date == currDate %}
<option value="{{date}}" selected="selected">{{date}}</option>
{% else %}
<option value="{{date}}">{{date}}</option>
{% for date in range(dateKeys|length) %}
{% if dateKeys[date] == currDate %}
{% if date-2 >= 0 %}<option value="{{dateKeys[date-2]}}">{{dateKeys[date-2]}}</option>{% endif %}
{% if date-1 >= 0 %}<option value="{{dateKeys[date-1]}}">{{dateKeys[date-1]}}</option>{% endif %}
<option value="{{dateKeys[date]}}" selected="selected">{{dateKeys[date]}} ★</option>
{% for i in range(1,5) %}
{% if date+i < dateKeys|length %}<option value="{{dateKeys[date+i]}}">{{dateKeys[date+i]}}</option>{%endif%}
{% endfor %}
{% endif %}
{% endfor %}
</select>

4
templates/selSubUser.html
View file

@ -35,13 +35,13 @@
<option value="" selected>Please select</option>
{% for key in data %}
{% if data[key]['type'] == 'homeroom' %}
<option value="homeroom^{{data[key]['homeroom']}}">HR: {{data[key]['homeroom']}}
<option value="homeroom^{{data[key]['homeroom']}}">🏠 {{data[key]['homeroom']}}
</option>
{% else %}
{% for i in data[key] %}
{% if i == 'type' %}
{% else %}
<option value="group^{{i}}^{{data[key][i]}}">GP: {{i}}: {{data[key][i]}}</option>
<option value="group^{{i}}^{{data[key][i]}}">🧑‍🏫 {{i}}: {{data[key][i]}}</option>
{% endif %}
{% endfor %}
{% endif %}