Skip to content

Commit 6c1087d

Browse files
huan-jasonhuan-jason
committed
2026-03-09-1208
1 parent 9aefff7 commit 6c1087d

8 files changed

Lines changed: 128 additions & 49 deletions

File tree

‎taiping/templates/agojin/base/style.html‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,42 @@
183183
letter-spacing: 0.08em;
184184
}
185185

186-
/* Inline svg icon helper */
186+
/* misc */
187187
.ico {
188188
display: inline-flex;
189189
align-items: center;
190190
justify-content: center;
191191
vertical-align: middle;
192192
}
193+
194+
.loader {
195+
border: 4px solid #f3f3f3;
196+
border-top: 4px solid #3498db;
197+
border-radius: 50%;
198+
width: 1.5em;
199+
height: 1.5em;
200+
animation: spin 1s linear infinite;
201+
}
202+
203+
.mx-auto {
204+
margin-inline: auto;
205+
}
206+
207+
.mt-3 {
208+
margin-top: 1em;
209+
}
210+
211+
.visibility-hidden {
212+
visibility: hidden;
213+
}
214+
215+
@keyframes spin {
216+
0% {
217+
transform: rotate(0deg);
218+
}
219+
220+
100% {
221+
transform: rotate(360deg);
222+
}
223+
}
193224
</style>

‎taiping/templates/agojin/instructor/calendar.html‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<div style="background:var(--card-bg);border:1px solid var(--border);padding:16px 20px;">
2+
3+
<div class="cal-month">
4+
{% if not show_action %}
5+
{{ month | date:'F Y' }}
6+
{% endif %}
7+
</div>
8+
9+
10+
<div class="cal-grid" style="margin-bottom:4px;">
11+
<div class="cal-header-day">Mon</div>
12+
<div class="cal-header-day">Tue</div>
13+
<div class="cal-header-day">Wed</div>
14+
<div class="cal-header-day">Thu</div>
15+
<div class="cal-header-day">Fri</div>
16+
<div class="cal-header-day">Sat</div>
17+
<div class="cal-header-day">Sun</div>
18+
</div>
19+
20+
<div class="cal-grid">
21+
22+
{% for item in dates %}
23+
24+
<!-- noformat -->
25+
<div class="cal-day
26+
{% if item.events %} has-event {% endif %}
27+
{% if item.date.month != month.month %}
28+
{% if show_action %} other-month
29+
{% else %} visibility-hidden {% endif %}
30+
{% endif %}
31+
{% if item.date == today %} today {% endif %}
32+
">
33+
<!-- noformat -->
34+
<div class="cal-date">{{ item.date.day }}</div>
35+
36+
{% for event_item in item.events %}
37+
38+
<div class="cal-event {{ event_item.css_class }}">
39+
{{ event_item.course_class.course.name }}
40+
</div>
41+
42+
{% endfor %}
43+
44+
</div>
45+
46+
{% endfor %}
47+
48+
</div>
49+
</div>
50+
51+
{% if not show_action %}
52+
<div id="container--calendar-next-month" hx-get="?htmx=schedule&m={{ next_month | date:'Y-m-d' }}" hx-trigger="revealed"
53+
hx-swap="outerHTML" hx-indicator>
54+
<div class="loader mx-auto mt-3"></div>
55+
</div>
56+
{% endif %}
57+
58+
59+
{% if scroll_to_top %}
60+
<script>
61+
setTimeout(() => {
62+
window.scrollTo(0, 0)
63+
}, 100)
64+
</script>
65+
{% endif %}

‎taiping/templates/agojin/instructor/content.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
Enrolled Students
7070
</a>
7171

72-
<a id="snav--schedule" class="snav-item" hx-get="?htmx=schedule" hx-target=".dash-main"
72+
<a id="snav--schedule" class="snav-item" hx-get="?htmx=schedule&st=1" hx-target=".dash-main"
7373
_="on click take .active from .snav-item">
7474
<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
7575
<rect x="3" y="4" width="18" height="18" rx="2" />

‎taiping/templates/agojin/instructor/overview.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="dash-section" hx-get="?htmx=enrolled-students&c=5&a=1" hx-trigger="load"></div>
99

1010
<!-- Schedule -->
11-
<div class="dash-section" hx-get="?htmx=schedule&c=1&a=1" hx-trigger="load"></div>
11+
<div class="dash-section" hx-get="?htmx=schedule&a=1" hx-trigger="load"></div>
1212

1313
<!-- Manage courses -->
1414
<div class="dash-section" hx-get="?htmx=manage-courses&c=5&a=1" hx-trigger="load"></div>

‎taiping/templates/agojin/instructor/schedule.html‎

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,25 @@
11
<div class="dash-section">
22
<div class="section-header">
3-
<span class="section-title">{{ today | date:'F Y' }} Schedule</span>
3+
4+
<span class="section-title">
5+
{% if show_action %}
6+
{{ today | date:'F Y' }}
7+
{% endif %}
8+
Schedule
9+
</span>
410

511
{% if show_action %}
6-
<a class="section-action" hx-get="?htmx=schedule" hx-target=".dash-main"
12+
<a class="section-action" hx-get="?htmx=schedule&st=1" hx-target=".dash-main"
713
_="on click remove .active from .snav-item add .active to #snav--schedule">
814
Full Calendar
915
</a>
16+
1017
{% endif %}
1118

1219
</div>
1320

14-
<div style="background:var(--card-bg);border:1px solid var(--border);padding:16px 20px;">
15-
16-
<div class="cal-grid" style="margin-bottom:4px;">
17-
<div class="cal-header-day">Mon</div>
18-
<div class="cal-header-day">Tue</div>
19-
<div class="cal-header-day">Wed</div>
20-
<div class="cal-header-day">Thu</div>
21-
<div class="cal-header-day">Fri</div>
22-
<div class="cal-header-day">Sat</div>
23-
<div class="cal-header-day">Sun</div>
24-
</div>
25-
26-
<div class="cal-grid">
27-
28-
{% for item in dates %}
29-
30-
<div class="cal-day
31-
{% if item.events %} has-event {% endif %}
32-
{% if item.date.month != today.month %} other-month {% endif %}
33-
{% if item.date == today %} today {% endif %}
34-
">
35-
<div class="cal-date">{{ item.date.day }}</div>
36-
37-
{% for event_item in item.events %}
38-
39-
<div class="cal-event {{ event_item.css_class }}">
40-
{{ event_item.course_class.course.name }}
41-
</div>
42-
43-
{% endfor %}
44-
45-
</div>
46-
47-
{% endfor %}
48-
49-
</div>
21+
<div id="container--calendar">
22+
{% include "./calendar.html" %}
5023
</div>
24+
5125
</div>

‎taiping/templates/agojin/style_dashboard.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,10 @@
395395
min-height: 72px;
396396
}
397397

398+
.cal-month {
399+
text-align: center;
400+
}
401+
398402
/* Revenue chart bar */
399403
.rev-chart {
400404
display: flex;

‎taiping/views/instructor/schedulemixin.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from typing import Any
55

66
from django.db.models import QuerySet
7-
from django.utils import timezone
87

98
from taiping.models import Instructor, CourseClassSchedule
109

@@ -33,10 +32,9 @@ def schedule__add_date_events(self,
3332

3433
return dates
3534

36-
def schedule__get_calendar_dates(self, instructor: Instructor) -> list[dict[str, Any]]:
37-
today: date = timezone.now().date()
38-
first_of_the_month: date = today.replace(day=1)
39-
next_month: date = self.schedule__get_first_of_next_month(today)
35+
def schedule__get_calendar_dates(self, instructor: Instructor, month: date) -> list[dict[str, Any]]:
36+
first_of_the_month: date = month.replace(day=1)
37+
next_month: date = self.schedule__get_first_of_next_month(month)
4038
first_date: date = first_of_the_month - timedelta(days=first_of_the_month.weekday())
4139

4240
dates: list[dict[str, Any]] = []

‎taiping/views/instructorview.py‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from datetime import date
1+
from datetime import date, datetime
22
from typing import Any, cast
33

44
from django.db.models import QuerySet
@@ -88,13 +88,20 @@ def htmx_schedule(self, request: HttpRequest) -> HttpResponse:
8888
instructor: Instructor | None = getattr(request.user, "instructor", None)
8989
show_action: bool = request.GET.get("a") == "1"
9090
today: date = timezone.now().date()
91+
month: date = (datetime.strptime(mth, "%Y-%m-%d").date()
92+
if (mth := request.GET.get("m", "")) else timezone.now().date()
93+
)
9194

9295
dates: list[dict[str, Any]] = []
9396
if instructor:
94-
dates = self.schedule__get_calendar_dates(instructor)
97+
dates = self.schedule__get_calendar_dates(instructor, month)
9598
dates = self.schedule__add_date_events(dates, instructor)
99+
next_month: date = self.schedule__get_first_of_next_month(month)
100+
101+
scroll_to_top: bool = request.GET.get("st") == "1"
102+
template: str = "schedule" if show_action else "calendar"
96103

97-
return render(request, "agojin/instructor/schedule.html", locals())
104+
return render(request, f"agojin/instructor/{template}.html", locals())
98105

99106
def htmx_stats(self, request: HttpRequest) -> HttpResponse:
100107
instructor: Instructor | None = getattr(request.user, "instructor", None)

0 commit comments

Comments
 (0)