Skip to content

remove student teacher links and fully replace with schedules #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gameingame-eng merged 1 commit into from
Apr 25, 2026
+70 −184
Merged

remove student teacher links and fully replace with schedules #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 21 additions & 106 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ function App() {
const [studentSchedules, setStudentSchedules] = useState([])
const [teachers, setTeachers] = useState([])
const [students, setStudents] = useState([])
const [studentAssignments, setStudentAssignments] = useState([])
const [teacherHomework, setTeacherHomework] = useState([])
const [studentHomework, setStudentHomework] = useState([])
const [assignmentFeedback, setAssignmentFeedback] = useState('')
Expand Down Expand Up @@ -71,7 +70,6 @@ function App() {
setStudentSchedules([])
setTeachers([])
setStudents([])
setStudentAssignments([])
setTeacherHomework([])
setStudentHomework([])
setAdminSchedules([])
Expand Down Expand Up @@ -139,7 +137,7 @@ function App() {
let isMounted = true

async function loadTeacherData() {
const [{ data: teacherSchedules = [] }, { data: assignedStudents = [] }, { data: homeworkRows = [] }] = await Promise.all([
const [{ data: teacherSchedules = [] }, { data: homeworkRows = [] }] = await Promise.all([
supabase
.from('student_schedules')
.select(`
Expand All @@ -156,13 +154,6 @@ function App() {
.eq('teacher_id', userId)
.order('scheduled_for', { ascending: true })
.order('start_time', { ascending: true }),
supabase
.from('teacher_student_assignments')
.select(`
student_id,
student:profiles!teacher_student_assignments_student_id_fkey(username)
`)
.eq('teacher_id', userId),
supabase
.from('teacher_homework_assignments')
.select(`
Expand All @@ -182,11 +173,18 @@ function App() {
return
}

const uniqueStudents = new Map()
teacherSchedules.forEach((schedule) => {
if (schedule.student_id && !uniqueStudents.has(schedule.student_id)) {
uniqueStudents.set(schedule.student_id, schedule.student?.username ?? 'Unnamed student')
}
})

setTeacherStudents(
assignedStudents
.map((assignment) => ({
id: assignment.student_id,
username: assignment.student?.username ?? 'Unnamed student',
Array.from(uniqueStudents.entries())
.map(([studentId, username]) => ({
id: studentId,
username,
}))
.sort((a, b) => a.username.localeCompare(b.username)),
)
Expand Down Expand Up @@ -214,7 +212,7 @@ function App() {
)
setTeachers([])
setStudents([])
setStudentAssignments([])
setTeacherHomework([])
setStudentHomework([])
setAdminSchedules([])
}
Expand All @@ -223,19 +221,10 @@ function App() {
const [
{ data: teacherProfiles = [] },
{ data: studentProfiles = [] },
{ data: assignmentRows = [] },
{ data: scheduleRows = [] },
] = await Promise.all([
supabase.from('profiles').select('id, username').eq('role', 'teacher').order('username'),
supabase.from('profiles').select('id, username').eq('role', 'student').order('username'),
supabase
.from('teacher_student_assignments')
.select(`
teacher_id,
student_id,
teacher:profiles!teacher_student_assignments_teacher_id_fkey(username),
student:profiles!teacher_student_assignments_student_id_fkey(username)
`),
supabase
.from('student_schedules')
.select(`
Expand All @@ -258,23 +247,7 @@ function App() {
}

setTeachers(teacherProfiles)
setStudentAssignments(
assignmentRows.map((assignment) => ({
teacherId: assignment.teacher_id,
teacherName: assignment.teacher?.username ?? 'Unknown teacher',
studentId: assignment.student_id,
studentName: assignment.student?.username ?? 'Unknown student',
})),
)
const assignedTeacherByStudentId = new Map(
assignmentRows.map((assignment) => [assignment.student_id, assignment.teacher?.username ?? 'Unknown teacher']),
)
setStudents(
studentProfiles.map((student) => ({
...student,
assignedTeacherName: assignedTeacherByStudentId.get(student.id) ?? null,
})),
)
setStudents(studentProfiles)
setAdminSchedules(
scheduleRows.map((schedule) => ({
id: schedule.id,
Expand All @@ -297,7 +270,7 @@ function App() {
}

async function loadStudentData() {
const [{ data: schedules = [] }, { data: assignment }, { data: homeworkRows = [] }] = await Promise.all([
const [{ data: schedules = [] }, { data: homeworkRows = [] }] = await Promise.all([
supabase
.from('student_schedules')
.select(`
Expand All @@ -312,14 +285,6 @@ function App() {
`)
.eq('student_id', userId)
.order('created_at', { ascending: false }),
supabase
.from('teacher_student_assignments')
.select(`
teacher_id,
teacher:profiles!teacher_student_assignments_teacher_id_fkey(username)
`)
.eq('student_id', userId)
.maybeSingle(),
supabase
.from('teacher_homework_assignments')
.select(`
Expand All @@ -339,11 +304,13 @@ function App() {
return
}

// Get the teacher from the latest schedule
const latestScheduleWithTeacher = schedules.find((schedule) => schedule.teacher_id)
setAssignedTeacher(
assignment?.teacher_id
latestScheduleWithTeacher?.teacher_id
? {
id: assignment.teacher_id,
username: assignment.teacher?.username ?? 'Assigned teacher',
id: latestScheduleWithTeacher.teacher_id,
username: latestScheduleWithTeacher.teacher?.username ?? 'Your teacher',
}
: null,
)
Expand All @@ -355,13 +322,12 @@ function App() {
details: assignmentRow.details,
dueDate: assignmentRow.due_date,
createdAt: assignmentRow.created_at,
teacherName: assignmentRow.teacher?.username ?? 'Assigned teacher',
teacherName: assignmentRow.teacher?.username ?? 'Your teacher',
})),
)
setTeacherSchedules([])
setTeachers([])
setStudents([])
setStudentAssignments([])
setTeacherHomework([])
setAdminSchedules([])
}
Expand Down Expand Up @@ -530,55 +496,6 @@ function App() {
setAssignmentFeedback('Schedule created successfully.')
}

async function handleAssignTeacher() {
if (!supabase || !userId || !scheduleForm.studentId || !scheduleForm.teacherId) {
setAssignmentError('Choose both a student and teacher to save the class assignment.')
return
}

setAssignmentLoading(true)
setAssignmentFeedback('')
setAssignmentError('')

const { error } = await supabase
.from('teacher_student_assignments')
.upsert(
{
student_id: scheduleForm.studentId,
teacher_id: scheduleForm.teacherId,
assigned_by: userId,
},
{ onConflict: 'student_id' },
)

setAssignmentLoading(false)

if (error) {
setAssignmentError(error.message)
return
}

const teacher = teachers.find((item) => item.id === scheduleForm.teacherId)
setStudents((current) =>
current.map((student) =>
student.id === scheduleForm.studentId
? { ...student, assignedTeacherName: teacher?.username ?? 'Assigned teacher' }
: student,
),
)
setStudentAssignments((current) => {
const nextAssignment = {
teacherId: scheduleForm.teacherId,
teacherName: teacher?.username ?? 'Assigned teacher',
studentId: scheduleForm.studentId,
studentName: students.find((item) => item.id === scheduleForm.studentId)?.username ?? 'Unknown student',
}
const remaining = current.filter((assignment) => assignment.studentId !== scheduleForm.studentId)
return [nextAssignment, ...remaining]
})
setAssignmentFeedback('Teacher assigned successfully.')
}

async function handleCreateHomework() {
if (!supabase || !userId || !homeworkForm.studentId || !homeworkForm.title.trim()) {
setAssignmentError('Choose a student and add a homework title.')
Expand Down Expand Up @@ -691,12 +608,10 @@ function App() {
assignmentLoading={assignmentLoading}
schedules={adminSchedules}
onCreateSchedule={handleCreateSchedule}
onAssignTeacher={handleAssignTeacher}
onLogout={handleLogout}
onScheduleFormChange={setScheduleForm}
scheduleForm={scheduleForm}
students={students}
studentAssignments={studentAssignments}
teachers={teachers}
username={username}
/>
Expand Down
80 changes: 2 additions & 78 deletions src/pages/AdminPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,18 @@ function AdminPage({
assignmentError,
assignmentFeedback,
assignmentLoading,
onAssignTeacher,
onCreateSchedule,
onLogout,
onScheduleFormChange,
scheduleForm,
schedules,
students,
studentAssignments,
teachers,
username,
}) {
const [selectedStudentId, setSelectedStudentId] = useState('')
const [selectedTeacherId, setSelectedTeacherId] = useState('')

const progressTemplates = students.map((student) => ({
id: student.id,
username: student.username,
status: 'Not started',
summary: 'Progress reports will appear here once the reporting model is added.',
}))

const selectedStudent = students.find((student) => student.id === selectedStudentId) ?? null
const selectedTeacher = teachers.find((teacher) => teacher.id === selectedTeacherId) ?? null
const visibleSchedules = schedules.filter((schedule) => {
Expand All @@ -47,7 +38,7 @@ function AdminPage({
<p className="eyebrow">ProgCheck</p>
{username ? <p className="dashboard-user">{username}</p> : null}
<h1>Admin</h1>
<p className="dashboard-text">Assign students to teachers and create student schedules.</p>
<p className="dashboard-text">Create and manage student schedules with assigned teachers.</p>
</div>
<button className="secondary-button button-reset" type="button" onClick={onLogout}>
Log out
Expand Down Expand Up @@ -97,56 +88,6 @@ function AdminPage({
</section>

<section className="dashboard-grid" aria-label="Admin tools">
<div className="dashboard-panel">
<h2>Assign teacher</h2>
<div className="dashboard-form">
<label className="field">
<span>Student</span>
<select
className="dashboard-select"
value={scheduleForm.studentId}
onChange={(event) =>
onScheduleFormChange((current) => ({ ...current, studentId: event.target.value }))
}
>
<option value="">Select student</option>
{students.map((student) => (
<option key={student.id} value={student.id}>
{student.username}
</option>
))}
</select>
</label>

<label className="field">
<span>Teacher</span>
<select
className="dashboard-select"
value={scheduleForm.teacherId}
onChange={(event) =>
onScheduleFormChange((current) => ({ ...current, teacherId: event.target.value }))
}
>
<option value="">Select teacher</option>
{teachers.map((teacher) => (
<option key={teacher.id} value={teacher.id}>
{teacher.username}
</option>
))}
</select>
</label>

<button
className="primary-button button-reset"
type="button"
onClick={onAssignTeacher}
disabled={assignmentLoading}
>
Save class assignment
</button>
</div>
</div>

<div className="dashboard-panel">
<h2>Create schedule</h2>
<div className="dashboard-form">
Expand Down Expand Up @@ -258,24 +199,7 @@ function AdminPage({
</div>
</div>

<div className="dashboard-panel">
<h2>Class assignments</h2>
<div className="dashboard-list">
{studentAssignments.length > 0 ? studentAssignments.map((assignment) => (
<article className="dashboard-item plain" key={assignment.studentId}>
<h3>{assignment.studentName}</h3>
<p>{assignment.teacherName}</p>
<p>Current teacher assignment</p>
</article>
)) : progressTemplates.map((report) => (
<article className="dashboard-item plain" key={report.id}>
<h3>{report.username}</h3>
<p>{report.status}</p>
<p>{report.summary}</p>
</article>
))}
</div>
</div>

</section>

<section className="dashboard-panel dashboard-panel-compact">
Expand Down
Loading
Loading