+
+
+
+
+
+
+
+ {{ m1_year }}-{{ m1_month|stringformat:"02d" }} Schedule
+ (Current Month)
+
+
+ {% for item in schedule_m1 %}
+
+
+
+
+ {% if item.students %}
+
+
+
+
+ | Name |
+ Degree Level |
+ Category |
+
+
+
+ {% for student in item.students %}
+
+ | {{ student.name }} |
+
+ {% if student.degree_type == '博士生' %}
+ Ph.D. Student
+ {% elif student.degree_type == '學士生' %}
+ Undergraduate
+ Student
+ {% else %}
+ Master's Student
+ {% endif %}
+ |
+
+ {% if student.student_category == '在職生' %}
+ In-Service
+ {% elif student.student_category == '交換中' %}
+ On Exchange
+ {% else %}
+ Regular
+ {% endif %}
+ |
+
+ {% endfor %}
+
+
+
+ {% else %}
+ {% if item.is_past %}
+
Cannot move schedule date to earlier than
+ today
+ {% else %}
+
No presenter scheduled for this day
+ {% endif %}
+ {% endif %}
+
+
+
+ {% endfor %}
+
+
+
+
+
+
+ {{ m2_year }}-{{ m2_month|stringformat:"02d" }} Schedule (Next
+ Month)
+
+
+ {% for item in schedule_m2 %}
+
+
+
+
+ {% if item.students %}
+
+
+
+
+ | Name |
+ Degree Level |
+ Category |
+
+
+
+ {% for student in item.students %}
+
+ | {{ student.name }} |
+
+ {% if student.degree_type == '博士生' %}
+ Ph.D. Student
+ {% elif student.degree_type == '學士生' %}
+ Undergraduate
+ Student
+ {% else %}
+ Master's Student
+ {% endif %}
+ |
+
+ {% if student.student_category == '在職生' %}
+ In-Service
+ {% elif student.student_category == '交換中' %}
+ On Exchange
+ {% else %}
+ Regular
+ {% endif %}
+ |
+
+ {% endfor %}
+
+
+
+ {% else %}
+ {% if item.is_past %}
+
Cannot move schedule date to earlier than
+ today
+ {% else %}
+
No presenter scheduled for this day
+ {% endif %}
+ {% endif %}
+
+
+
+ {% endfor %}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/point_system/students/tests.py b/point_system/students/tests.py
index 112ba54..c8ad166 100644
--- a/point_system/students/tests.py
+++ b/point_system/students/tests.py
@@ -1,6 +1,7 @@
from django.test import TestCase, Client
from django.contrib.auth import authenticate, get_user_model
from django.urls import reverse
+from django.conf import settings
from unittest.mock import patch, MagicMock
from students.models import Student
from students.ad_backend import ActiveDirectoryBackend, parse_group_dn
@@ -182,7 +183,12 @@ class ActiveDirectoryBackendTestCase(TestCase):
s = Student.objects.create(student_id='D12458003', name='測試生', degree_type='博士生', is_active=True)
PointRecord.objects.create(student=s)
- # Unauthenticated / non-admin user -> 簽到歷史紀錄 hidden with permission notice
+ # Unauthenticated user -> redirected to login
+ response = self.client.get(reverse('show_attendance', kwargs={'student_id': 'D12458003'}))
+ self.assertEqual(response.status_code, 302)
+
+ # Authenticated non-admin user -> 簽到歷史紀錄 hidden with permission notice
+ self.client.force_login(self.test_user)
response = self.client.get(reverse('show_attendance', kwargs={'student_id': 'D12458003'}))
self.assertEqual(response.status_code, 200)
self.assertContains(response, 'D12458003')
@@ -553,3 +559,55 @@ class ActiveDirectoryBackendTestCase(TestCase):
with open(log_file, 'r', encoding='utf-8') as f:
content = f.read()
self.assertIn("AUDIT LOG: User 'aduser' executed Verify & Clean Schedule Rules", content)
+
+class EnglishStaticIframeAndPastEmptyCardTestCase(TestCase):
+ def setUp(self):
+ self.client = Client()
+ self.student = Student.objects.create(
+ student_id="M999",
+ name="Test Student",
+ degree_type="碩士生",
+ student_category="一般生",
+ is_active=True
+ )
+
+ def test_past_date_empty_card_message(self):
+ response = self.client.get(reverse('weekly_schedule'))
+ self.assertEqual(response.status_code, 200)
+
+ def test_generate_english_schedule_static_html_and_iframe_endpoint(self):
+ response = self.client.get(reverse('weekly_schedule_en_iframe'))
+ self.assertEqual(response.status_code, 200)
+ self.assertIn("Weekly Seminar Schedule", response.content.decode('utf-8'))
+
+ static_file = settings.BASE_DIR / 'static' / 'weekly_schedule_en.html'
+ self.assertTrue(static_file.exists())
+
+ def test_bachelor_student_degree_choice_and_scheduling(self):
+ bachelor = Student.objects.create(
+ student_id="B101",
+ name="Bachelor Student",
+ degree_type="學士生",
+ student_category="一般生",
+ is_active=True
+ )
+ self.assertEqual(bachelor.degree_type, "學士生")
+
+ response = self.client.get(reverse('weekly_schedule'))
+ self.assertEqual(response.status_code, 200)
+ self.assertIn("學士生", response.content.decode('utf-8'))
+
+ def test_verify_schedule_rules_never_adds_past_dates(self):
+ from datetime import date
+ today = date.today()
+ # Delete schedules for a student
+ s = Student.objects.create(student_id="M888", name="New M Student", degree_type="碩士生", student_category="一般生", is_active=True)
+ # Verify rules
+ self.client.post(reverse('verify_schedule_rules'))
+ # Check all schedules for this student
+ from students.models import WeeklySchedule
+ past_schedules = WeeklySchedule.objects.filter(student=s, date__lt=today)
+ self.assertEqual(past_schedules.count(), 0)
+
+
+
diff --git a/point_system/students/urls.py b/point_system/students/urls.py
index c8b33e3..56c1053 100644
--- a/point_system/students/urls.py
+++ b/point_system/students/urls.py
@@ -14,6 +14,7 @@ urlpatterns = [
path('schedule/', views.weekly_schedule, name='weekly_schedule'),
path('schedule/move/', views.move_schedule_item, name='move_schedule_item'),
path('schedule/verify-rules/', views.verify_schedule_rules, name='verify_schedule_rules'),
+ path('schedule/embed/en/', views.weekly_schedule_en_iframe, name='weekly_schedule_en_iframe'),
path('update-from-excel/', views.update_students_from_excel, name='update_students_from_excel'),
path('upload-excel/', views.upload_students_excel, name='upload_students_excel'),
path('set-language/
/', views.set_language, name='set_language'),
diff --git a/point_system/students/views.py b/point_system/students/views.py
index 1c7d22d..4c50eea 100644
--- a/point_system/students/views.py
+++ b/point_system/students/views.py
@@ -8,7 +8,8 @@ from django.contrib.auth import authenticate, login, logout
from django.contrib.auth.decorators import login_required
from django.contrib import messages
from django.conf import settings
-from django.http import HttpResponseForbidden, JsonResponse
+from django.http import HttpResponseForbidden, JsonResponse, HttpResponse
+from django.views.decorators.clickjacking import xframe_options_exempt
from django.db.models import Q, Case, When, Value, IntegerField
from .models import Student, PointRecord, WeeklySchedule
from .forms import StudentLoginForm, ADLoginForm
@@ -22,6 +23,7 @@ def get_month_mondays(year, month):
return [d for d in c.itermonthdates(year, month) if d.month == month and d.weekday() == 0]
from django.utils import translation
+from django.utils.translation import gettext_lazy as _
def set_language(request, lang_code):
"""
@@ -171,6 +173,8 @@ def process_excel_rows(rows):
else:
if student_id.upper().startswith('D'):
degree_type = '博士生'
+ elif student_id.upper().startswith('B'):
+ degree_type = '學士生'
student_category = '一般生'
for k, v in row_dict.items():
@@ -301,7 +305,7 @@ def sync_weekly_schedule_to_db(m1_year, m1_month, m2_year, m2_month, force=False
for s in active_students:
if s.student_category == '交換中':
continue
- elif s.degree_type == '碩士生':
+ elif s.degree_type in ('碩士生', '學士生'):
monthly_students.append(s)
elif s.degree_type == '博士生' and s.student_category == '一般生':
monthly_students.append(s)
@@ -316,14 +320,18 @@ def sync_weekly_schedule_to_db(m1_year, m1_month, m2_year, m2_month, force=False
m1_pool = monthly_students + bimonthly_m1
m2_pool = monthly_students + bimonthly_m2
+ today = date.today()
+ valid_m1 = [d for d in m1_mondays if d >= today] or m1_mondays
+ valid_m2 = [d for d in m2_mondays if d >= today] or m2_mondays
+
if not m1_exists or force:
for idx, student in enumerate(m1_pool):
- monday_date = m1_mondays[idx % len(m1_mondays)]
+ monday_date = valid_m1[idx % len(valid_m1)]
WeeklySchedule.objects.get_or_create(student=student, date=monday_date)
if not m2_exists or force:
for idx, student in enumerate(m2_pool):
- monday_date = m2_mondays[idx % len(m2_mondays)]
+ monday_date = valid_m2[idx % len(valid_m2)]
WeeklySchedule.objects.get_or_create(student=student, date=monday_date)
def index(request):
@@ -399,6 +407,7 @@ def record_attendance(request):
students = Student.objects.filter(is_active=True).order_by('name')
return render(request, 'students/record_attendance.html', {'students': students, 'point_records': point_records})
+@login_required(login_url='login')
def show_attendance(request, student_id):
student = Student.objects.get(student_id=student_id)
point_records = PointRecord.objects.filter(student=student).order_by('-datetime')
@@ -506,39 +515,41 @@ def weekly_schedule(request):
default=Value(4),
output_field=IntegerField()
)
+ degree_order = Case(
+ When(student__degree_type='博士生', then=Value(1)),
+ When(student__degree_type='碩士生', then=Value(2)),
+ When(student__degree_type='學士生', then=Value(3)),
+ default=Value(4),
+ output_field=IntegerField()
+ )
schedule_m1 = []
for m in m1_mondays:
records = WeeklySchedule.objects.filter(date=m).select_related('student').annotate(
- cat_order=category_order
- ).order_by('cat_order', 'student__student_id')
+ cat_order=category_order,
+ deg_order=degree_order,
+ ).order_by('cat_order', 'deg_order', 'student__student_id')
schedule_m1.append({
'date': m,
'formatted': m.strftime('%Y-%m-%d'),
- 'students': [r.student for r in records]
+ 'students': [r.student for r in records],
+ 'is_past': m < today,
})
schedule_m2 = []
for m in m2_mondays:
records = WeeklySchedule.objects.filter(date=m).select_related('student').annotate(
- cat_order=category_order
- ).order_by('cat_order', 'student__student_id')
+ cat_order=category_order,
+ deg_order=degree_order,
+ ).order_by('cat_order', 'deg_order', 'student__student_id')
schedule_m2.append({
'date': m,
'formatted': m.strftime('%Y-%m-%d'),
- 'students': [r.student for r in records]
+ 'students': [r.student for r in records],
+ 'is_past': m < today,
})
- student_cat_order = Case(
- When(student_category='一般生', then=Value(1)),
- When(student_category='在職生', then=Value(2)),
- When(student_category='交換中', then=Value(3)),
- default=Value(4),
- output_field=IntegerField()
- )
- active_students = Student.objects.filter(is_active=True).annotate(
- cat_order=student_cat_order
- ).order_by('cat_order', 'student_id')
+ active_students = Student.objects.filter(is_active=True).order_by('student_id')
summary_data = []
for s in active_students:
assigned_m1 = [m['formatted'] for m in schedule_m1 if s in m['students']]
@@ -546,13 +557,15 @@ def weekly_schedule(request):
assigned_dates = assigned_m1 + assigned_m2
if s.student_category == '交換中':
- rule_desc = '交換生 (免報告)'
+ rule_desc = _('交換生 (免報告)')
+ elif s.degree_type == '學士生':
+ rule_desc = _('學士生 (1次/月)')
elif s.degree_type == '碩士生':
- rule_desc = '碩士生 (1次/月)'
+ rule_desc = _('碩士生 (1次/月)')
elif s.degree_type == '博士生' and s.student_category == '一般生':
- rule_desc = '博士一般生 (1次/月)'
+ rule_desc = _('博士一般生 (1次/月)')
else:
- rule_desc = '博士在職生 (1次/2個月)'
+ rule_desc = _('博士在職生 (1次/2個月)')
summary_data.append({
'student': s,
@@ -565,6 +578,9 @@ def weekly_schedule(request):
request.user.is_superuser or check_user_has_all_ad_groups(request.user, request, ['Administrators'])
)
+ # Generate clean English static HTML for iframe embedding
+ generate_english_schedule_static_html()
+
return render(request, 'students/weekly_schedule.html', {
'm1_year': m1_year,
'm1_month': m1_month,
@@ -616,7 +632,7 @@ def move_schedule_item(request):
if student.student_category == '交換中':
return JsonResponse({'success': False, 'error': '交換生無需報告，無法排程'}, status=400)
- is_monthly = (student.degree_type == '碩士生') or (student.degree_type == '博士生' and student.student_category == '一般生')
+ is_monthly = (student.degree_type in ('碩士生', '學士生')) or (student.degree_type == '博士生' and student.student_category == '一般生')
if is_monthly:
if from_date.month != to_date.month or from_date.year != to_date.year:
@@ -633,6 +649,9 @@ def move_schedule_item(request):
schedule_entry.month = to_date.month
schedule_entry.save()
+ # Update static English HTML for iframe embed
+ generate_english_schedule_static_html()
+
log_msg = f"AUDIT LOG: User '{request.user.username}' (authenticated) moved weekly schedule for student '{student.student_id}' ({student.name}) from {from_date} to {to_date}."
logger.info(log_msg)
schedule_logger.info(log_msg)
@@ -684,8 +703,12 @@ def verify_schedule_rules(request):
active_students = Student.objects.filter(is_active=True).exclude(student_category='交換中')
+ valid_m1_mondays = [d for d in m1_mondays if d >= today]
+ valid_m2_mondays = [d for d in m2_mondays if d >= today]
+ valid_all_mondays = [d for d in (m1_mondays + m2_mondays) if d >= today]
+
for s in active_students:
- is_monthly = (s.degree_type == '碩士生') or (s.degree_type == '博士生' and s.student_category == '一般生')
+ is_monthly = (s.degree_type in ('碩士生', '學士生')) or (s.degree_type == '博士生' and s.student_category == '一般生')
if is_monthly:
# Check Month 1
@@ -695,9 +718,10 @@ def verify_schedule_rules(request):
r.delete()
deleted_count += 1
elif len(m1_records) == 0:
- monday = min(m1_mondays, key=lambda d: WeeklySchedule.objects.filter(date=d).count())
- WeeklySchedule.objects.create(student=s, date=monday)
- created_count += 1
+ if valid_m1_mondays:
+ monday = min(valid_m1_mondays, key=lambda d: WeeklySchedule.objects.filter(date=d).count())
+ WeeklySchedule.objects.create(student=s, date=monday)
+ created_count += 1
# Check Month 2
m2_records = list(WeeklySchedule.objects.filter(student=s, year=m2_year, month=m2_month).order_by('date'))
@@ -706,9 +730,10 @@ def verify_schedule_rules(request):
r.delete()
deleted_count += 1
elif len(m2_records) == 0:
- monday = min(m2_mondays, key=lambda d: WeeklySchedule.objects.filter(date=d).count())
- WeeklySchedule.objects.create(student=s, date=monday)
- created_count += 1
+ if valid_m2_mondays:
+ monday = min(valid_m2_mondays, key=lambda d: WeeklySchedule.objects.filter(date=d).count())
+ WeeklySchedule.objects.create(student=s, date=monday)
+ created_count += 1
else:
# 博士在職生: 1 report per 2 months
bimonthly_records = list(WeeklySchedule.objects.filter(student=s, year__in=[m1_year, m2_year], month__in=[m1_month, m2_month]).order_by('date'))
@@ -717,16 +742,19 @@ def verify_schedule_rules(request):
r.delete()
deleted_count += 1
elif len(bimonthly_records) == 0:
- all_mondays = m1_mondays + m2_mondays
- monday = min(all_mondays, key=lambda d: WeeklySchedule.objects.filter(date=d).count())
- WeeklySchedule.objects.create(student=s, date=monday)
- created_count += 1
+ if valid_all_mondays:
+ monday = min(valid_all_mondays, key=lambda d: WeeklySchedule.objects.filter(date=d).count())
+ WeeklySchedule.objects.create(student=s, date=monday)
+ created_count += 1
log_msg = f"AUDIT LOG: User '{request.user.username}' executed Verify & Clean Schedule Rules. Deleted {deleted_count} non-compliant/exchange cards, added {created_count} missing cards."
logger.info(log_msg)
schedule_logger.info(log_msg)
print(log_msg)
+ # Update static English HTML for iframe embed
+ generate_english_schedule_static_html()
+
messages.success(
request,
f"校正與驗證排程規則完成！已清理 {deleted_count} 筆不符規則之卡片（包含刪除交換生卡片與重複排程），補齊 {created_count} 筆缺漏排程。"
@@ -820,4 +848,135 @@ def upload_students_excel(request):
except Exception as e:
messages.error(request, f"上傳匯入學生資料失敗: {e}")
- return redirect('student_list')
\ No newline at end of file
+ return redirect('student_list')
+
+
+def generate_english_schedule_static_html():
+ """
+ Generates a standalone, clean English static HTML file for the weekly schedule,
+ suitable for embedding directly in an