diff --git a/app/templates/student.html b/app/templates/student.html index 6d8f1f3..7ad5558 100644 --- a/app/templates/student.html +++ b/app/templates/student.html @@ -46,7 +46,7 @@
-
问题记录
+
当前问题
@@ -474,50 +474,140 @@ function renderProblemList(problems) { `).join(''); } +// 学习历程时间线（替代原 loadPlans） async function loadPlans() { - try { - const resp = await fetch(`/api/students/${currentStudentId}/plans`); - const plans = await resp.json(); - renderPlanList(plans); - } catch (e) { - document.getElementById('planList').innerHTML = '

加载失败

'; - } + await loadTimeline(); } -function renderPlanList(plans) { +// 学习历程时间线 +async function loadTimeline() { + const [plansRes, goalsRes] = await Promise.all([ + fetch(`/api/students/${currentStudentId}/plans`), + fetch(`/api/students/${currentStudentId}/goals`) + ]); + const plans = await plansRes.json(); + const goals = await goalsRes.json(); + + // 构建时间线条目 + const timeline = []; + + // 添加目标开始记录 + goals.forEach(g => { + if (g.start_date) { + const startDate = new Date(g.start_date); + const endDate = g.assessment_date ? new Date(g.assessment_date) : null; + const days = endDate ? Math.ceil((endDate - startDate) / (1000*60*60*24)) : null; + timeline.push({ + date: startDate, + type: 'goal_start', + goal: g, + days: days, + endDate: endDate + }); + } + // 添加目标达成记录 + if (g.achievement_date) { + timeline.push({ + date: new Date(g.achievement_date), + type: 'goal_achieved', + goal: g + }); + } + }); + + // 添加方案生成记录 + plans.forEach(p => { + timeline.push({ + date: new Date(p.created_at), + type: 'plan', + plan: p + }); + }); + + // 按时间逆序排序 + timeline.sort((a, b) => b.date - a.date); + + renderTimeline(timeline); +} + +function renderTimeline(timeline) { const container = document.getElementById('planList'); - if (plans.length === 0) { - container.innerHTML = '

暂无练习方案

'; + if (timeline.length === 0) { + container.innerHTML = '

暂无学习记录

'; return; } - container.innerHTML = plans.map(p => ` -
-
- - -
-
-
-
- ${p.created_at ? p.created_at.substring(0, 16) : '未知'} - ${p.is_typical ? '典型' : ''} + + container.innerHTML = timeline.map(entry => { + if (entry.type === 'goal_start') { + const g = entry.goal; + return ` +
+
+ 目标启动 +
+
+
+
+ ${escapeHtml(g.goal_name)} + ${formatDate(entry.date)} +
+ 预期 ${entry.days} 天 +
+
+ ${g.goal_level || '入门'} | ${g.goal_category || '综合'} | 评估日期: ${entry.endDate ? formatDate(entry.endDate) : '未设置'}
-
-
- ${p.problem_names && p.problem_names.length > 0 ? '问题: ' + p.problem_names.join(', ') : ''} - ${p.template_name ? ' | 模板: ' + p.template_name : ''} +
`; + } else if (entry.type === 'goal_achieved') { + const g = entry.goal; + const stars = '⭐'.repeat(g.mastery_level || 1); + return ` +
+
+ 目标达成
-
-
- `).join(''); +
+
+
+ ${escapeHtml(g.goal_name)} + ${formatDate(entry.date)} +
+ ${stars} +
+ ${g.comment ? `
"${escapeHtml(g.comment)}"
` : ''} +
+
`; + } else { + const p = entry.plan; + return ` +
+
+ + +
+
+
+
+ ${formatDate(entry.date)} + ${p.is_typical ? '典型' : ''} +
+ +
+
+ ${p.problem_names && p.problem_names.length > 0 ? '问题: ' + p.problem_names.join(', ') : ''} + ${p.template_name ? ' | 模板: ' + p.template_name : ''} +
+
+
`; + } + }).join(''); } async function toggleTypical(planId) { await fetch(`/api/plans/${planId}/typical`, {method: 'POST'}); - loadPlans(); + loadTimeline(); } function showEditStudentModal() {