fix parent pages and teachers and admin

src/pages/teacher/TeacherClassProgressSubmitPage.tsx

@@ -1,5 +1,5 @@
 import { Fragment, useCallback, useEffect, useMemo, useState } from 'react'
-import { Link, useSearchParams } from 'react-router-dom'
+import { Link } from 'react-router-dom'
 import { ApiHttpError, apiFetch } from '../../api/http'
 import { TeacherShell } from './TeacherShell'
 import { useTeacherResource } from './useTeacherResource'
@@ -110,16 +110,7 @@ function appendArray(fd: FormData, key: string, values: string[]) {
 
 /** `teacher/class_progress_submit.php` — weekly progress form; POST `/api/v1/teacher/class-progress-submit`. */
 export function TeacherClassProgressSubmitPage() {
-  const [search] = useSearchParams()
-  const classIdQ = search.get('class_id')
-  const path = useMemo(() => {
-    const params = new URLSearchParams()
-    if (classIdQ) params.set('class_id', classIdQ)
-    const q = params.toString()
-    return `/class-progress-submit${q ? `?${q}` : ''}`
-  }, [classIdQ])
-
-  const { data: raw, loading, error, reload } = useTeacherResource<unknown>(path)
+  const { data: raw, loading, error, reload } = useTeacherResource<unknown>('/class-progress-submit')
   const data = useMemo(() => unwrapSubmitForm(raw), [raw])
 
   const subjectSections = data?.subject_sections ?? {}
@@ -132,15 +123,6 @@ export function TeacherClassProgressSubmitPage() {
 
   const unitPickList = useMemo(() => unitChoices(curriculumIslamic), [curriculumIslamic])
 
-  const classIds = useMemo(() => {
-    const s = new Set<number>()
-    for (const c of classes) {
-      const id = Number(c.class_id ?? 0)
-      if (id > 0) s.add(id)
-    }
-    return [...s].sort((a, b) => a - b)
-  }, [classes])
-
   const [weekStart, setWeekStart] = useState('')
   const [classSectionId, setClassSectionId] = useState<number | ''>('')
   const [covered, setCovered] = useState<Record<string, string>>({})
@@ -172,31 +154,20 @@ export function TeacherClassProgressSubmitPage() {
     setSubmitOk(null)
   }, [data, defaults.class_section_id, defaults.week_start, sundayOptions])
 
-  const resolvedClassId = useMemo(() => {
-    const fromQ = classIdQ ? Number(classIdQ) : 0
-    if (fromQ > 0) return fromQ
-    return Number(defaults.class_id ?? 0)
-  }, [classIdQ, defaults.class_id])
-
-  const sectionsForClass = useMemo(() => {
-    if (!resolvedClassId) return classes
-    return classes.filter((c) => Number(c.class_id ?? 0) === resolvedClassId)
-  }, [classes, resolvedClassId])
-
   useEffect(() => {
-    if (classSectionId === '' && sectionsForClass.length === 1) {
-      const only = Number(sectionsForClass[0].class_section_id ?? 0)
+    if (classSectionId === '' && classes.length === 1) {
+      const only = Number(classes[0].class_section_id ?? 0)
       if (only > 0) setClassSectionId(only)
     }
-  }, [sectionsForClass, classSectionId])
+  }, [classes, classSectionId])
 
   const canSubmit = useMemo(() => {
-    if (!weekStart || !classSectionId) return false
+    if (!weekStart) return false
     if (!islamicSelectionValid(islamicRows)) return false
     const covIslamic = (covered.islamic ?? '').trim()
     if (covIslamic === '') return false
     return true
-  }, [weekStart, classSectionId, islamicRows, covered])
+  }, [weekStart, islamicRows, covered])
 
   const updateIslamicRow = useCallback((idx: number, patch: Partial<UnitRow>) => {
     setIslamicRows((prev) => prev.map((r, i) => (i === idx ? { ...r, ...patch } : r)))
@@ -209,7 +180,7 @@ export function TeacherClassProgressSubmitPage() {
   const handleSubmit = useCallback(async () => {
     setSubmitError(null)
     setSubmitOk(null)
-    if (!canSubmit || classSectionId === '') return
+    if (!canSubmit) return
 
     const unitIslamic: string[] = []
     const chapterIslamic: string[] = []
@@ -240,8 +211,9 @@ export function TeacherClassProgressSubmitPage() {
     }
 
     const fd = new FormData()
-    fd.append('class_section_id', String(classSectionId))
     fd.append('week_start', weekStart)
+    if (defaults.school_year) fd.append('school_year', defaults.school_year)
+    if (defaults.semester) fd.append('semester', defaults.semester)
     if (confirmOverwrite) fd.append('confirm_overwrite', '1')
 
     for (const slug of slugs) {
@@ -282,8 +254,9 @@ export function TeacherClassProgressSubmitPage() {
     }
   }, [
     canSubmit,
-    classSectionId,
     weekStart,
+    defaults.school_year,
+    defaults.semester,
     confirmOverwrite,
     slugs,
     covered,
@@ -328,26 +301,6 @@ export function TeacherClassProgressSubmitPage() {
             </div>
           ) : null}
 
-          {classes.length > 0 && classIds.length > 1 ? (
-            <div className="d-flex flex-wrap align-items-center gap-2">
-              <span className="small text-muted me-1">Class:</span>
-              {classIds.map((id) => {
-                const label =
-                  classes.find((c) => Number(c.class_id) === id)?.class_name?.trim() || `Class ${id}`
-                const active = resolvedClassId === id
-                return (
-                  <Link
-                    key={id}
-                    to={`/app/teacher/class-progress-submit?class_id=${encodeURIComponent(String(id))}`}
-                    className={`btn btn-sm ${active ? 'btn-primary' : 'btn-outline-primary'}`}
-                  >
-                    {label}
-                  </Link>
-                )
-              })}
-            </div>
-          ) : null}
-
           {submitOk ? (
             <div className="alert alert-success py-2 mb-0" role="status">
               {submitOk}
@@ -382,29 +335,6 @@ export function TeacherClassProgressSubmitPage() {
                   ))}
                 </select>
               </div>
-              <div className="col-md-6">
-                <label className="form-label" htmlFor="cp-section">
-                  Class section
-                </label>
-                <select
-                  id="cp-section"
-                  className="form-select form-select-sm"
-                  value={classSectionId === '' ? '' : String(classSectionId)}
-                  onChange={(e) => setClassSectionId(e.target.value ? Number(e.target.value) : '')}
-                >
-                  <option value="">Select section…</option>
-                  {sectionsForClass.map((c) => {
-                    const id = Number(c.class_section_id ?? 0)
-                    if (!id) return null
-                    const name = String(c.class_section_name ?? '').trim() || `Section ${id}`
-                    return (
-                      <option key={id} value={id}>
-                        {name}
-                      </option>
-                    )
-                  })}
-                </select>
-              </div>
             </div>
           </section>
 
@@ -671,7 +601,7 @@ export function TeacherClassProgressSubmitPage() {
             </button>
             {!canSubmit ? (
               <span className="small text-muted">
-                Choose section, week, Islamic unit/chapter, and material covered for Islamic Studies.
+                Choose week, Islamic unit/chapter, and material covered for Islamic Studies.
               </span>
             ) : null}
           </div>