From 94e14f8ef9ac098f48d3c361c0087c3c3a8da67f Mon Sep 17 00:00:00 2001
From: Kyle2772547 <restrixt@gmail.com>
Date: Tue, 26 May 2026 18:27:11 +0700
Subject: [PATCH 1/5] add: API

---
 server/api/Subjects/[id].put.js           |  6 +--
 server/api/Subjects/index.post.js         |  4 +-
 server/api/curriculum-categories/[id].js  | 29 +++++++++++++++
 server/api/curriculum-categories/index.js | 27 ++++++++++++++
 server/api/curriculum-subjects/[id].js    | 29 +++++++++++++++
 server/api/curriculum-subjects/index.js   | 33 +++++++++++++++++
 server/api/curriculums/[id].js            | 36 ++++++++++++++++++
 server/api/curriculums/index.js           | 29 +++++++++++++++
 server/api/study-plan-subjects/[id].js    | 14 +++++++
 server/api/study-plan-subjects/index.js   | 45 +++++++++++++++++++++++
 server/api/study-plans/[id].js            | 29 +++++++++++++++
 server/api/study-plans/index.js           | 29 +++++++++++++++
 12 files changed, 305 insertions(+), 5 deletions(-)
 create mode 100644 server/api/curriculum-categories/[id].js
 create mode 100644 server/api/curriculum-categories/index.js
 create mode 100644 server/api/curriculum-subjects/[id].js
 create mode 100644 server/api/curriculum-subjects/index.js
 create mode 100644 server/api/curriculums/[id].js
 create mode 100644 server/api/curriculums/index.js
 create mode 100644 server/api/study-plan-subjects/[id].js
 create mode 100644 server/api/study-plan-subjects/index.js
 create mode 100644 server/api/study-plans/[id].js
 create mode 100644 server/api/study-plans/index.js

diff --git a/server/api/Subjects/[id].put.js b/server/api/Subjects/[id].put.js
index e4b9cf7..4b97976 100644
--- a/server/api/Subjects/[id].put.js
+++ b/server/api/Subjects/[id].put.js
@@ -12,9 +12,9 @@ export default defineEventHandler(async (event) => {
     })
   }
 
-  // 1. Update Subject name
-  const stmt = db.prepare('UPDATE Subjects SET name_subject = ? WHERE id_subject = ?')
-  stmt.run(body.name_subject, id)
+  // 1. Update Subject name and curriculum link
+  const stmt = db.prepare('UPDATE Subjects SET name_subject = ?, curriculum_subject_id = ? WHERE id_subject = ?')
+  stmt.run(body.name_subject, body.curriculum_subject_id || null, id)
 
   // Update Sections if provided
   if (body.id_sections && Array.isArray(body.id_sections)) {
diff --git a/server/api/Subjects/index.post.js b/server/api/Subjects/index.post.js
index d75802c..1ec9262 100644
--- a/server/api/Subjects/index.post.js
+++ b/server/api/Subjects/index.post.js
@@ -11,8 +11,8 @@ export default defineEventHandler(async (event) => {
     }
 
     // 1. Insert Subject
-    const stmt = db.prepare('INSERT INTO Subjects (name_subject, id_teacher, term) VALUES (?, ?, ?)')
-    const result = stmt.run(body.name_subject, body.id_teacher, body.term || null)
+    const stmt = db.prepare('INSERT INTO Subjects (name_subject, id_teacher, term, curriculum_subject_id) VALUES (?, ?, ?, ?)')
+    const result = stmt.run(body.name_subject, body.id_teacher, body.term || null, body.curriculum_subject_id || null)
     const subjectId = result.lastInsertRowid
 
     // 2. Insert SubjectSections (Join table)
diff --git a/server/api/curriculum-categories/[id].js b/server/api/curriculum-categories/[id].js
new file mode 100644
index 0000000..de91474
--- /dev/null
+++ b/server/api/curriculum-categories/[id].js
@@ -0,0 +1,29 @@
+import db from '../../utils/db.js'
+
+export default defineEventHandler(async (event) => {
+  const id = event.context.params.id
+
+  if (event.node.req.method === 'PUT') {
+    const body = await readBody(event)
+    if (!body.name_category) {
+      throw createError({ statusCode: 400, statusMessage: 'name_category is required' })
+    }
+
+    const stmt = db.prepare('UPDATE curriculum_categories SET name_category = ?, parent_id = ? WHERE id_category = ?')
+    const result = stmt.run(body.name_category, body.parent_id || null, id)
+    
+    if (result.changes === 0) {
+      throw createError({ statusCode: 404, statusMessage: 'Category not found' })
+    }
+    return { success: true }
+  }
+
+  if (event.node.req.method === 'DELETE') {
+    const stmt = db.prepare('DELETE FROM curriculum_categories WHERE id_category = ?')
+    const result = stmt.run(id)
+    if (result.changes === 0) {
+      throw createError({ statusCode: 404, statusMessage: 'Category not found' })
+    }
+    return { success: true }
+  }
+})
diff --git a/server/api/curriculum-categories/index.js b/server/api/curriculum-categories/index.js
new file mode 100644
index 0000000..97fd4b0
--- /dev/null
+++ b/server/api/curriculum-categories/index.js
@@ -0,0 +1,27 @@
+import db from '../../utils/db.js'
+
+export default defineEventHandler(async (event) => {
+  if (event.node.req.method === 'GET') {
+    const query = getQuery(event)
+    if (query.id_curriculum) {
+      return db.prepare('SELECT * FROM curriculum_categories WHERE id_curriculum = ? ORDER BY id_category ASC').all(query.id_curriculum)
+    }
+    return db.prepare('SELECT * FROM curriculum_categories ORDER BY id_category ASC').all()
+  }
+
+  if (event.node.req.method === 'POST') {
+    const body = await readBody(event)
+    if (!body.id_curriculum || !body.name_category) {
+      throw createError({ statusCode: 400, statusMessage: 'id_curriculum and name_category are required' })
+    }
+
+    const stmt = db.prepare('INSERT INTO curriculum_categories (id_curriculum, parent_id, name_category) VALUES (?, ?, ?)')
+    const result = stmt.run(body.id_curriculum, body.parent_id || null, body.name_category)
+    return {
+      id_category: result.lastInsertRowid,
+      id_curriculum: body.id_curriculum,
+      parent_id: body.parent_id || null,
+      name_category: body.name_category
+    }
+  }
+})
diff --git a/server/api/curriculum-subjects/[id].js b/server/api/curriculum-subjects/[id].js
new file mode 100644
index 0000000..57c007c
--- /dev/null
+++ b/server/api/curriculum-subjects/[id].js
@@ -0,0 +1,29 @@
+import db from '../../utils/db.js'
+
+export default defineEventHandler(async (event) => {
+  const id = event.context.params.id
+
+  if (event.node.req.method === 'PUT') {
+    const body = await readBody(event)
+    if (!body.name_subject || !body.id_category) {
+      throw createError({ statusCode: 400, statusMessage: 'name_subject and id_category are required' })
+    }
+
+    const stmt = db.prepare('UPDATE curriculum_subjects SET name_subject = ?, subject_code = ?, id_category = ? WHERE id_subject_curr = ?')
+    const result = stmt.run(body.name_subject, body.subject_code || null, body.id_category, id)
+    
+    if (result.changes === 0) {
+      throw createError({ statusCode: 404, statusMessage: 'Subject not found' })
+    }
+    return { success: true }
+  }
+
+  if (event.node.req.method === 'DELETE') {
+    const stmt = db.prepare('DELETE FROM curriculum_subjects WHERE id_subject_curr = ?')
+    const result = stmt.run(id)
+    if (result.changes === 0) {
+      throw createError({ statusCode: 404, statusMessage: 'Subject not found' })
+    }
+    return { success: true }
+  }
+})
diff --git a/server/api/curriculum-subjects/index.js b/server/api/curriculum-subjects/index.js
new file mode 100644
index 0000000..55847dc
--- /dev/null
+++ b/server/api/curriculum-subjects/index.js
@@ -0,0 +1,33 @@
+import db from '../../utils/db.js'
+
+export default defineEventHandler(async (event) => {
+  if (event.node.req.method === 'GET') {
+    const query = getQuery(event)
+    if (query.id_curriculum) {
+      return db.prepare(`
+        SELECT cs.* 
+        FROM curriculum_subjects cs
+        JOIN curriculum_categories cc ON cs.id_category = cc.id_category
+        WHERE cc.id_curriculum = ?
+        ORDER BY cs.subject_code ASC
+      `).all(query.id_curriculum)
+    }
+    return db.prepare('SELECT * FROM curriculum_subjects ORDER BY subject_code ASC').all()
+  }
+
+  if (event.node.req.method === 'POST') {
+    const body = await readBody(event)
+    if (!body.id_category || !body.name_subject) {
+      throw createError({ statusCode: 400, statusMessage: 'id_category and name_subject are required' })
+    }
+
+    const stmt = db.prepare('INSERT INTO curriculum_subjects (id_category, subject_code, name_subject) VALUES (?, ?, ?)')
+    const result = stmt.run(body.id_category, body.subject_code || null, body.name_subject)
+    return {
+      id_subject_curr: result.lastInsertRowid,
+      id_category: body.id_category,
+      subject_code: body.subject_code || null,
+      name_subject: body.name_subject
+    }
+  }
+})
diff --git a/server/api/curriculums/[id].js b/server/api/curriculums/[id].js
new file mode 100644
index 0000000..651f178
--- /dev/null
+++ b/server/api/curriculums/[id].js
@@ -0,0 +1,36 @@
+import db from '../../utils/db.js'
+
+export default defineEventHandler(async (event) => {
+  const id = event.context.params.id
+
+  if (event.node.req.method === 'PUT') {
+    const body = await readBody(event)
+    if (!body.name_curriculum) {
+      throw createError({ statusCode: 400, statusMessage: 'name_curriculum is required' })
+    }
+
+    try {
+      const stmt = db.prepare('UPDATE curriculums SET name_curriculum = ?, description = ? WHERE id_curriculum = ?')
+      const result = stmt.run(body.name_curriculum, body.description || null, id)
+      
+      if (result.changes === 0) {
+        throw createError({ statusCode: 404, statusMessage: 'Curriculum not found' })
+      }
+      return { success: true }
+    } catch (error) {
+      if (error.code === 'SQLITE_CONSTRAINT_UNIQUE') {
+        throw createError({ statusCode: 409, statusMessage: 'Curriculum name already exists' })
+      }
+      throw error
+    }
+  }
+
+  if (event.node.req.method === 'DELETE') {
+    const stmt = db.prepare('DELETE FROM curriculums WHERE id_curriculum = ?')
+    const result = stmt.run(id)
+    if (result.changes === 0) {
+      throw createError({ statusCode: 404, statusMessage: 'Curriculum not found' })
+    }
+    return { success: true }
+  }
+})
diff --git a/server/api/curriculums/index.js b/server/api/curriculums/index.js
new file mode 100644
index 0000000..d65cf63
--- /dev/null
+++ b/server/api/curriculums/index.js
@@ -0,0 +1,29 @@
+import db from '../../utils/db.js'
+
+export default defineEventHandler(async (event) => {
+  if (event.node.req.method === 'GET') {
+    return db.prepare('SELECT * FROM curriculums ORDER BY created_at DESC').all()
+  }
+
+  if (event.node.req.method === 'POST') {
+    const body = await readBody(event)
+    if (!body.name_curriculum) {
+      throw createError({ statusCode: 400, statusMessage: 'name_curriculum is required' })
+    }
+
+    try {
+      const stmt = db.prepare('INSERT INTO curriculums (name_curriculum, description) VALUES (?, ?)')
+      const result = stmt.run(body.name_curriculum, body.description || null)
+      return {
+        id_curriculum: result.lastInsertRowid,
+        name_curriculum: body.name_curriculum,
+        description: body.description || null
+      }
+    } catch (error) {
+      if (error.code === 'SQLITE_CONSTRAINT_UNIQUE') {
+        throw createError({ statusCode: 409, statusMessage: 'Curriculum name already exists' })
+      }
+      throw error
+    }
+  }
+})
diff --git a/server/api/study-plan-subjects/[id].js b/server/api/study-plan-subjects/[id].js
new file mode 100644
index 0000000..0abd3a6
--- /dev/null
+++ b/server/api/study-plan-subjects/[id].js
@@ -0,0 +1,14 @@
+import db from '../../utils/db.js'
+
+export default defineEventHandler(async (event) => {
+  const id = event.context.params.id
+
+  if (event.node.req.method === 'DELETE') {
+    const stmt = db.prepare('DELETE FROM study_plan_subjects WHERE id_plan_subject = ?')
+    const result = stmt.run(id)
+    if (result.changes === 0) {
+      throw createError({ statusCode: 404, statusMessage: 'Study Plan Subject not found' })
+    }
+    return { success: true }
+  }
+})
diff --git a/server/api/study-plan-subjects/index.js b/server/api/study-plan-subjects/index.js
new file mode 100644
index 0000000..e3b3bd6
--- /dev/null
+++ b/server/api/study-plan-subjects/index.js
@@ -0,0 +1,45 @@
+import db from '../../utils/db.js'
+
+export default defineEventHandler(async (event) => {
+  if (event.node.req.method === 'GET') {
+    const query = getQuery(event)
+    if (query.id_plan) {
+      return db.prepare(`
+        SELECT sps.*, cs.subject_code, cs.name_subject, cc.name_category
+        FROM study_plan_subjects sps
+        JOIN curriculum_subjects cs ON sps.id_subject_curr = cs.id_subject_curr
+        LEFT JOIN curriculum_categories cc ON cs.id_category = cc.id_category
+        WHERE sps.id_plan = ?
+        ORDER BY cc.id_category ASC, cs.subject_code ASC
+      `).all(query.id_plan)
+    }
+    return []
+  }
+
+  if (event.node.req.method === 'POST') {
+    const body = await readBody(event)
+    if (!body.id_plan || !body.id_subject_curr) {
+      throw createError({ statusCode: 400, statusMessage: 'id_plan and id_subject_curr are required' })
+    }
+
+    try {
+      const stmt = db.prepare('INSERT INTO study_plan_subjects (id_plan, id_subject_curr) VALUES (?, ?)')
+      const result = stmt.run(body.id_plan, body.id_subject_curr)
+      
+      // Fetch details back
+      const inserted = db.prepare(`
+        SELECT sps.*, cs.subject_code, cs.name_subject
+        FROM study_plan_subjects sps
+        JOIN curriculum_subjects cs ON sps.id_subject_curr = cs.id_subject_curr
+        WHERE sps.id_plan_subject = ?
+      `).get(result.lastInsertRowid)
+
+      return inserted
+    } catch (error) {
+       if (error.code === 'SQLITE_CONSTRAINT_UNIQUE') {
+        throw createError({ statusCode: 409, statusMessage: 'Subject already exists in this plan' })
+      }
+      throw error
+    }
+  }
+})
diff --git a/server/api/study-plans/[id].js b/server/api/study-plans/[id].js
new file mode 100644
index 0000000..1d42a9b
--- /dev/null
+++ b/server/api/study-plans/[id].js
@@ -0,0 +1,29 @@
+import db from '../../utils/db.js'
+
+export default defineEventHandler(async (event) => {
+  const id = event.context.params.id
+
+  if (event.node.req.method === 'PUT') {
+    const body = await readBody(event)
+    if (!body.name_plan || !body.level || !body.year || !body.semester) {
+      throw createError({ statusCode: 400, statusMessage: 'All fields are required' })
+    }
+
+    const stmt = db.prepare('UPDATE study_plans SET name_plan = ?, level = ?, year = ?, semester = ? WHERE id_plan = ?')
+    const result = stmt.run(body.name_plan, body.level, body.year, body.semester, id)
+    
+    if (result.changes === 0) {
+      throw createError({ statusCode: 404, statusMessage: 'Study Plan not found' })
+    }
+    return { success: true }
+  }
+
+  if (event.node.req.method === 'DELETE') {
+    const stmt = db.prepare('DELETE FROM study_plans WHERE id_plan = ?')
+    const result = stmt.run(id)
+    if (result.changes === 0) {
+      throw createError({ statusCode: 404, statusMessage: 'Study Plan not found' })
+    }
+    return { success: true }
+  }
+})
diff --git a/server/api/study-plans/index.js b/server/api/study-plans/index.js
new file mode 100644
index 0000000..07a5745
--- /dev/null
+++ b/server/api/study-plans/index.js
@@ -0,0 +1,29 @@
+import db from '../../utils/db.js'
+
+export default defineEventHandler(async (event) => {
+  if (event.node.req.method === 'GET') {
+    const query = getQuery(event)
+    if (query.id_curriculum) {
+      return db.prepare('SELECT * FROM study_plans WHERE id_curriculum = ? ORDER BY year ASC, semester ASC').all(query.id_curriculum)
+    }
+    return db.prepare('SELECT * FROM study_plans ORDER BY id_curriculum ASC, year ASC, semester ASC').all()
+  }
+
+  if (event.node.req.method === 'POST') {
+    const body = await readBody(event)
+    if (!body.id_curriculum || !body.name_plan || !body.level || !body.year || !body.semester) {
+      throw createError({ statusCode: 400, statusMessage: 'All fields are required' })
+    }
+
+    const stmt = db.prepare('INSERT INTO study_plans (id_curriculum, name_plan, level, year, semester) VALUES (?, ?, ?, ?, ?)')
+    const result = stmt.run(body.id_curriculum, body.name_plan, body.level, body.year, body.semester)
+    return {
+      id_plan: result.lastInsertRowid,
+      id_curriculum: body.id_curriculum,
+      name_plan: body.name_plan,
+      level: body.level,
+      year: body.year,
+      semester: body.semester
+    }
+  }
+})

From fd9d80752f62b8145d0d59aa0bd53bfd13f0eea8 Mon Sep 17 00:00:00 2001
From: Kyle2772547 <restrixt@gmail.com>
Date: Wed, 27 May 2026 02:14:37 +0700
Subject: [PATCH 2/5] feat: implement study plan management system

---
 app/app.vue                             |   4 +-
 app/pages/curriculums.vue               | 924 ++++++++++++++++++++++++
 app/pages/teacher/[id].vue              | 685 +++++++-----------
 server/api/study-plan-subjects/index.js |   8 +-
 server/api/study-plans/[id].js          |   8 +-
 server/api/study-plans/index.js         |  16 +-
 server/data/data.db                     | Bin 331776 -> 368640 bytes
 server/utils/db.js                      |  73 ++
 8 files changed, 1296 insertions(+), 422 deletions(-)
 create mode 100644 app/pages/curriculums.vue

diff --git a/app/app.vue b/app/app.vue
index 739d312..85eebb3 100644
--- a/app/app.vue
+++ b/app/app.vue
@@ -18,7 +18,7 @@ useHead({
       <template #left>
         <NuxtLink class="flex items-center" to="/">
           <img src="/image/logo it.png" class="h-11 w-auto mx-5" alt="RMUTI logo">
-          <span class="text-2xl">ระบบจัดวันสอนชดเชยกึ่งอัตโนมัติ</span>
+          <span class="text-xl">ระบบจัดวันสอนชดเชยกึ่งอัตโนมัติ</span>
         </NuxtLink>
       </template>
 
@@ -27,6 +27,8 @@ useHead({
           variant="ghost" :ui="{ leadingIcon: 'text-primary' }" to="/guide" />
         <UButton class="text-white" label="ปฏิทิน" size="xl" icon="i-heroicons-calendar" color="primary" variant="ghost"
           :ui="{ leadingIcon: 'text-primary' }" to="/" />
+        <UButton class="text-white" label="หลักสูตร" size="xl" icon="i-heroicons-academic-cap" color="primary"
+          variant="ghost" :ui="{ leadingIcon: 'text-primary' }" to="/curriculums" />
         <UButton class="text-white" label="ปีการศึกษา" size="xl" icon="i-lucide-layers" color="primary" variant="ghost"
           :ui="{ leadingIcon: 'text-primary' }" to="/terms" />
         <UButton class="text-white" to="/sections" size="xl" variant="ghost" color="primary" label="ตารางเรียน"
diff --git a/app/pages/curriculums.vue b/app/pages/curriculums.vue
new file mode 100644
index 0000000..5bbc8c8
--- /dev/null
+++ b/app/pages/curriculums.vue
@@ -0,0 +1,924 @@
+<template>
+  <nav class="sticky top-16 z-50 bg-white border-b border-slate-200 p-3 shadow-sm no-print">
+    <div class="container mx-auto flex items-center">
+      <UButton icon="i-lucide-arrow-left" label="ย้อนกลับ" color="gray" variant="ghost" size="lg" to="/"
+        class="font-bold text-md cursor-pointer hover:bg-slate-100" />
+    </div>
+  </nav>
+  <div class="min-h-screen bg-slate-50">
+    <nav class="bg-white border-b border-slate-200 shadow-sm sticky top-0 z-30">
+      <div class="container mx-auto px-4 py-8">
+        <div class="flex items-center h-16 gap-4">
+          <div class="w-10 h-10 bg-indigo-50 rounded-xl flex items-center justify-center border border-indigo-100">
+            <UIcon name="i-heroicons-academic-cap" class="text-3xl text-indigo-600" />
+          </div>
+          <div>
+            <h1 class="text-3xl font-bold text-slate-900">หลักสูตรและแผนการเรียน</h1>
+            <p class="text-slate-600">จัดการโครงสร้างหลักสูตรและจัดแผนการเรียน</p>
+          </div>
+        </div>
+      </div>
+    </nav>
+
+    <div class="container mx-auto px-4 py-8">
+      <!-- Curriculum Selection Header -->
+      <div
+        class="bg-white rounded-2xl p-6 shadow-sm border border-slate-200 mb-6 flex flex-col md:flex-row gap-4 items-center justify-between">
+        <div class="flex-1 w-full relative">
+          <label
+            class="block text-lg font-bold text-slate-500 uppercase tracking-widest mb-2 ml-1">เลือกหลักสูตรที่ต้องการจัดการ</label>
+          <div class="flex gap-2">
+            <USelect v-model="selectedCurriculumId" :items="curriculumOptions" placeholder="-- เลือกหลักสูตร --"
+              size="xl" class="w-full flex-1" />
+            <UButton icon="i-heroicons-plus" color="primary" variant="solid" @click="manageCurriculumModal = true"
+              label="จัดการหลักสูตร" class="rounded-xl px-4 font-bold cursor-pointer" />
+          </div>
+        </div>
+      </div>
+
+      <div v-if="selectedCurriculum" class="space-y-6">
+        <!-- Tabs -->
+        <div class="flex border-b border-slate-200">
+          <button class="px-6 py-3 font-bold text-lg border-b-2 transition-colors flex items-center gap-2"
+            :class="activeTab === 'structure' ? 'border-indigo-600 text-indigo-600' : 'border-transparent text-slate-500 hover:text-slate-700'"
+            @click="activeTab = 'structure'">
+            <UIcon name="i-heroicons-list-bullet" />
+            โครงสร้างหลักสูตร (หมวดวิชาและรายวิชา)
+          </button>
+          <button class="px-6 py-3 font-bold text-lg border-b-2 transition-colors flex items-center gap-2"
+            :class="activeTab === 'plans' ? 'border-indigo-600 text-indigo-600' : 'border-transparent text-slate-500 hover:text-slate-700'"
+            @click="activeTab = 'plans'">
+            <UIcon name="i-heroicons-map" />
+            แผนการเรียน
+          </button>
+        </div>
+
+        <!-- 1. Structure Tab -->
+        <div v-if="activeTab === 'structure'"
+          class="bg-white rounded-2xl shadow-sm border border-slate-200 overflow-hidden">
+          <div class="p-4 border-b border-slate-100 bg-slate-50/50 flex justify-between items-center">
+            <h2 class="font-bold text-lg text-slate-800">หมวดวิชาในหลักสูตร</h2>
+            <UButton icon="i-heroicons-folder-plus" label="เพิ่มหมวดวิชา" color="primary" size="lg"
+              @click="openAddCategoryModal" class="rounded-xl cursor-pointer" />
+          </div>
+
+          <div class="p-6 space-y-6">
+            <div v-if="!topCategories.length" class="text-center py-10 text-slate-400 italic">ยังไม่มีหมวดวิชา</div>
+
+            <!-- หมวดวิชา (Top Level) -->
+            <div v-for="(cat, index) in topCategories" :key="cat.id_category"
+              class="border border-slate-200 rounded-xl overflow-hidden">
+              <div class="bg-indigo-50 p-4 border-b border-indigo-100 flex justify-between items-center">
+                <h3 class="font-bold text-lg text-indigo-900">{{ index + 1 }}. {{ cat.name_category }}</h3>
+                <div class="flex gap-2">
+                  <UButton size="lg" color="primary" variant="subtle" icon="i-heroicons-plus" label="เพิ่มวิชา"
+                    class="cursor-pointer" @click="openAddSubjectModal(cat.id_category)" />
+                  <UButton size="lg" color="primary" variant="subtle" icon="i-heroicons-folder-plus"
+                    label="เพิ่มกลุ่มวิชา" class="cursor-pointer" @click="openAddSubCategoryModal(cat.id_category)" />
+                  <UButton size="lg" color="warning" variant="subtle" icon="i-heroicons-pencil" class="cursor-pointer"
+                    @click="openEditCategoryModal(cat)" />
+                  <UButton size="lg" color="error" variant="subtle" icon="i-heroicons-trash" class="cursor-pointer"
+                    @click="deleteCategory(cat.id_category)" />
+                </div>
+              </div>
+
+              <div class="p-4 space-y-4">
+                <div v-if="!getSubCategories(cat.id_category).length && !getSubjectsForCategory(cat.id_category).length"
+                  class="text-center py-6 text-slate-400 italic text-sm">ยังไม่มีข้อมูลในหมวดนี้</div>
+
+                <!-- วิชาในหมวดหลัก -->
+                <div v-if="getSubjectsForCategory(cat.id_category).length"
+                  class="border border-slate-200 rounded-lg overflow-hidden bg-white shadow-sm mb-4">
+                  <div class="bg-slate-50 p-2 border-b border-slate-200">
+                    <span class="text-md font-semibold text-slate-600 pl-2">วิชาในหมวดหลัก</span>
+                  </div>
+                  <div class="p-2">
+                    <table class="w-full text-left text-slate-600">
+                      <thead class="text-md uppercase bg-slate-50 text-slate-500">
+                        <tr>
+                          <th class="px-3 py-2 font-bold">รหัสวิชา</th>
+                          <th class="px-3 py-2 font-bold">ชื่อวิชา</th>
+                          <th class="px-3 py-2 text-right">จัดการ</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <tr v-for="sub in getSubjectsForCategory(cat.id_category)" :key="sub.id_subject_curr"
+                          class="border-b border-slate-100 last:border-0 hover:bg-slate-50/50">
+                          <td class="px-3 py-2 font-medium">{{ sub.subject_code || '-' }}</td>
+                          <td class="px-3 py-2">{{ sub.name_subject }}</td>
+                          <td class="px-3 py-2 text-right whitespace-nowrap">
+                            <UButton size="lg" class="mr-1 cursor-pointer" color="warning" variant="subtle"
+                              icon="i-heroicons-pencil" @click="openEditSubjectModal(sub)" />
+                            <UButton size="lg" class="cursor-pointer" color="error" variant="subtle"
+                              icon="i-heroicons-trash" @click="deleteSubject(sub.id_subject_curr)" />
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </div>
+                </div>
+
+                <!-- กลุ่มวิชา (Sub Level) -->
+                <div v-for="(sub_cat, sub_index) in getSubCategories(cat.id_category)" :key="sub_cat.id_category"
+                  class="border border-slate-200 rounded-lg overflow-hidden">
+                  <div class="bg-slate-50 p-3 border-b border-slate-200 flex justify-between items-center">
+                    <h4 class="font-bold text-md text-slate-700">{{ index + 1 }}.{{ sub_index + 1 }} {{
+                      sub_cat.name_category }}</h4>
+                    <div class="flex gap-2">
+                      <UButton size="lg" color="primary" variant="subtle" icon="i-heroicons-folder-plus"
+                        label="เพิ่มย่อย" @click="openAddSubCategoryModal(sub_cat.id_category)" />
+                      <UButton size="lg" color="primary" variant="subtle" icon="i-heroicons-plus" label="เพิ่มวิชา"
+                        @click="openAddSubjectModal(sub_cat.id_category)" />
+                      <UButton size="lg" color="warning" variant="subtle" icon="i-heroicons-pencil"
+                        @click="openEditSubCategoryModal(sub_cat)" />
+                      <UButton size="lg" color="error" variant="subtle" icon="i-heroicons-trash"
+                        @click="deleteCategory(sub_cat.id_category)" />
+                    </div>
+                  </div>
+
+                  <div class="p-3 space-y-3 bg-white">
+                    <!-- กลุ่มวิชาย่อย (Sub-Sub Level) -->
+                    <div v-for="(sub_sub_cat, sub_sub_index) in getSubCategories(sub_cat.id_category)"
+                      :key="sub_sub_cat.id_category" class="border border-slate-100 rounded-lg overflow-hidden ml-4">
+                      <div class="bg-slate-50/50 p-2 border-b border-slate-100 flex justify-between items-center">
+                        <h5 class="font-semibold text-md text-slate-600">{{ index + 1 }}.{{ sub_index + 1 }}.{{
+                          sub_sub_index + 1 }} {{ sub_sub_cat.name_category }}</h5>
+                        <div class="flex gap-2">
+                          <UButton size="lg" color="primary" variant="subtle" icon="i-heroicons-plus" label="เพิ่มวิชา"
+                            @click="openAddSubjectModal(sub_sub_cat.id_category)" class="cursor-pointer" />
+                          <UButton size="lg" color="warning" variant="subtle" icon="i-heroicons-pencil"
+                            @click="openEditSubCategoryModal(sub_sub_cat)" class="cursor-pointer" />
+                          <UButton size="lg" color="error" variant="subtle" icon="i-heroicons-trash"
+                            @click="deleteCategory(sub_sub_cat.id_category)" class="cursor-pointer" />
+                        </div>
+                      </div>
+                      <div class="p-2">
+                        <table class="w-full text-md text-left text-slate-500">
+                          <thead class="uppercase bg-slate-50 text-slate-400">
+                            <tr>
+                              <th class="px-2 py-1 font-bold">รหัสวิชา</th>
+                              <th class="px-2 py-1 font-bold">ชื่อวิชา</th>
+                              <th class="px-2 py-1 text-right">จัดการ</th>
+                            </tr>
+                          </thead>
+                          <tbody>
+                            <tr v-for="sub in getSubjectsForCategory(sub_sub_cat.id_category)"
+                              :key="sub.id_subject_curr"
+                              class="border-b border-slate-50 hover:bg-slate-50 transition-colors">
+                              <td class="px-2 py-1 font-medium">{{ sub.subject_code || '-' }}</td>
+                              <td class="px-2 py-1">{{ sub.name_subject }}</td>
+                              <td class="px-2 py-1 text-right whitespace-nowrap">
+                                <UButton size="lg" class="mr-1 cursor-pointer" color="warning" variant="subtle"
+                                  icon="i-heroicons-pencil" @click="openEditSubjectModal(sub)" />
+                                <UButton size="lg" class="cursor-pointer" color="error" variant="subtle"
+                                  icon="i-heroicons-trash" @click="deleteSubject(sub.id_subject_curr)" />
+                              </td>
+                            </tr>
+                            <tr v-if="!getSubjectsForCategory(sub_sub_cat.id_category).length">
+                              <td colspan="3" class="px-2 py-2 text-center text-slate-300 italic">
+                                ไม่มีรายวิชาในกลุ่มย่อยนี้</td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </div>
+                    </div>
+
+                    <!-- วิชาในกลุ่มหลัก -->
+                    <table class="w-full text-md text-left text-slate-600 mt-2">
+                      <thead class="text-md uppercase bg-slate-50 text-slate-500">
+                        <tr>
+                          <th class="px-3 py-2 font-bold">รหัสวิชา</th>
+                          <th class="px-3 py-2 font-bold">ชื่อวิชา</th>
+                          <th class="px-3 py-2 text-right">จัดการ</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <tr v-for="sub in getSubjectsForCategory(sub_cat.id_category)" :key="sub.id_subject_curr"
+                          class="border-b border-slate-100 last:border-0 hover:bg-slate-50/50">
+                          <td class="px-3 py-2 font-medium">{{ sub.subject_code || '-' }}</td>
+                          <td class="px-3 py-2">{{ sub.name_subject }}</td>
+                          <td class="px-3 py-2 text-right whitespace-nowrap">
+                            <UButton size="lg" class="mr-1" color="warning" variant="soft" icon="i-heroicons-pencil"
+                              @click="openEditSubjectModal(sub)" />
+                            <UButton size="lg" color="error" variant="soft" icon="i-heroicons-trash"
+                              @click="deleteSubject(sub.id_subject_curr)" />
+                          </td>
+                        </tr>
+                        <tr v-if="!getSubjectsForCategory(sub_cat.id_category).length">
+                          <td colspan="3" class="px-3 py-3 text-center text-slate-400 italic text-xs">
+                            ไม่มีรายวิชาในกลุ่มนี้</td>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 2. Plans Tab -->
+        <div v-if="activeTab === 'plans'" class="grid grid-cols-1 lg:grid-cols-4 gap-6">
+
+          <div
+            class="col-span-1 border border-slate-200 bg-white rounded-2xl shadow-sm overflow-hidden flex flex-col h-[calc(100vh-250px)] sticky top-24">
+            <div class="p-4 border-b border-slate-100 bg-slate-50 flex justify-between items-center">
+              <h3 class="font-bold text-slate-800">รายการแผนการเรียน</h3>
+              <UButton icon="i-heroicons-plus" color="primary" variant="ghost" @click="openPlanModal" />
+            </div>
+            <div class="overflow-y-auto flex-1 p-2 custom-scrollbar">
+              <div v-if="!studyPlans.length" class="text-center p-4 text-slate-400 text-sm">ยังไม่มีแผนการเรียน</div>
+              <div v-for="plan in studyPlans" :key="plan.id_plan"
+                class="p-3 mb-2 rounded-xl transition-colors cursor-pointer border relative group"
+                :class="selectedPlanId === plan.id_plan ? 'bg-indigo-50 border-indigo-200 text-indigo-900 shadow-inner' : 'bg-white border-transparent hover:bg-slate-50 text-slate-700'"
+                @click="selectedPlanId = plan.id_plan">
+                <div class="font-bold text-sm flex justify-between items-center">
+                  <span>{{ plan.name_plan }}</span>
+                  <UButton size="sm" color="warning" variant="ghost" icon="i-heroicons-pencil"
+                    class="opacity-0 group-hover:opacity-100 transition-opacity"
+                    @click.stop="openEditPlanModal(plan)" />
+                </div>
+                <div class="text-xs text-slate-500 mt-1">
+                  <span>{{ plan.level }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div
+            class="col-span-1 lg:col-span-3 border border-slate-200 bg-white rounded-2xl shadow-sm overflow-hidden min-h-[500px] flex flex-col">
+            <div v-if="!selectedPlan"
+              class="h-full flex flex-col items-center justify-center text-slate-400 p-8 flex-1">
+              <UIcon name="i-heroicons-map" class="text-6xl text-slate-200 mb-4" />
+              <p>เลือกแผนการเรียนด้านซ้ายเพื่อจัดการรายวิชา</p>
+            </div>
+
+            <div v-else class="flex flex-col h-full flex-1">
+              <!-- Header: Plan name + Year/Semester selectors -->
+              <div class="p-5 border-b border-slate-100 bg-slate-50/50">
+                <div class="flex justify-between items-start mb-4">
+                  <div>
+                    <h2 class="text-xl font-bold text-indigo-900">{{ selectedPlan.name_plan }}</h2>
+                    <p class="text-sm text-slate-500 mt-0.5">ระดับ {{ selectedPlan.level }}</p>
+                  </div>
+                  <UButton color="error" variant="ghost" icon="i-heroicons-trash" size="sm"
+                    @click="deletePlan(selectedPlan.id_plan)" />
+                </div>
+                <div class="flex items-center gap-3">
+                  <div class="flex items-center gap-2 flex-1">
+                    <label class="text-xs font-bold text-slate-500 whitespace-nowrap">ปีที่</label>
+                    <USelect v-model="viewYear" :items="viewYearOptions" class="w-28" />
+                  </div>
+                  <div class="flex items-center gap-2 flex-1">
+                    <label class="text-xs font-bold text-slate-500 whitespace-nowrap">ภาคเรียน</label>
+                    <USelect v-model="viewSemester"
+                      :items="[{ value: 1, label: 'เทอม 1' }, { value: 2, label: 'เทอม 2' }, { value: 3, label: 'เทอม 3 (ฤดูร้อน)' }]"
+                      class="w-40" />
+                  </div>
+                  <UButton color="primary" icon="i-heroicons-plus-circle" label="เพิ่มวิชา"
+                    class="font-bold shadow-md shadow-blue-500/20 ml-auto" @click="openAddPlanSubjectModal" />
+                </div>
+              </div>
+
+              <!-- Filtered subject table -->
+              <div class="p-6 flex-1 overflow-y-auto">
+                <table class="w-full text-sm text-left text-slate-600">
+                  <thead class="text-xs uppercase bg-slate-100 text-slate-500">
+                    <tr>
+                      <th class="px-4 py-3 font-bold">หมวดวิชา</th>
+                      <th class="px-4 py-3 font-bold">รหัสวิชา</th>
+                      <th class="px-4 py-3 font-bold">ชื่อวิชา</th>
+                      <th class="px-4 py-3 text-right">ลบ</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr v-for="ps in filteredPlanSubjectsByTerm" :key="ps.id_plan_subject"
+                      class="border-b border-slate-100 hover:bg-slate-50/50 transition-colors">
+                      <td class="px-4 py-3 text-xs text-slate-400">{{ ps.name_category || '-' }}</td>
+                      <td class="px-4 py-3 font-medium">{{ ps.subject_code || '-' }}</td>
+                      <td class="px-4 py-3 font-bold text-slate-800">{{ ps.name_subject }}</td>
+                      <td class="px-4 py-3 text-right">
+                        <UButton size="sm" color="error" variant="ghost" icon="i-heroicons-x-mark"
+                          @click="removePlanSubject(ps.id_plan_subject)" />
+                      </td>
+                    </tr>
+                    <tr v-if="!filteredPlanSubjectsByTerm.length">
+                      <td colspan="4" class="px-4 py-12 text-center text-slate-400 italic">ยังไม่มีวิชาในปีที่ {{
+                        viewYear }} ภาคเรียนที่ {{ viewSemester }}</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div v-else
+          class="bg-white rounded-2xl py-20 border border-slate-200 shadow-sm flex flex-col items-center justify-center">
+          <UIcon name="i-heroicons-academic-cap" class="text-6xl text-slate-200 mb-4" />
+          <p class="text-slate-500 font-medium text-lg">กรุณาเลือกหรือสร้างหลักสูตรเพื่อเริ่มต้นจัดการ</p>
+        </div>
+      </div>
+
+      <!-- Modals -->
+
+      <!-- Curriculum Modal -->
+      <UModal v-model:open="manageCurriculumModal" :ui="{ content: 'bg-white rounded-2xl' }">
+        <template #content>
+          <div class="p-6">
+            <h3 class="text-2xl font-bold mb-4">จัดการรายชื่อหลักสูตร</h3>
+            <div class="flex gap-2 mb-6">
+              <UInput v-model="newCurriculumName" placeholder="ชื่อหลักสูตรใหม่..." class="flex-1" />
+              <UButton :label="editingCurriculumId ? 'บันทึก' : 'เพิ่ม'" color="primary" @click="addCurriculum"
+                :disabled="!newCurriculumName.trim()" />
+              <UButton v-if="editingCurriculumId" label="ยกเลิก" color="gray" variant="soft"
+                @click="() => { editingCurriculumId = null; newCurriculumName = '' }" />
+            </div>
+            <div class="max-h-60 overflow-y-auto border border-slate-200 rounded-lg">
+              <div v-for="c in curriculums" :key="c.id_curriculum"
+                class="flex justify-between items-center p-3 border-b border-slate-100 last:border-0 hover:bg-slate-50">
+                <span class="font-medium text-sm">{{ c.name_curriculum }}</span>
+                <div class="flex gap-1">
+                  <UButton class="cursor-pointer" icon="i-heroicons-pencil" color="warning" variant="outline" size="lg"
+                    @click="openEditCurriculumModal(c)" />
+                  <UButton class="cursor-pointer" icon="i-heroicons-trash" color="error" variant="outline" size="lg"
+                    @click="deleteCurriculum(c.id_curriculum)" />
+                </div>
+              </div>
+            </div>
+            <div class="mt-6 flex justify-end">
+              <UButton class="cursor-pointer" label="ปิด" color="neutral" variant="soft" size="lg"
+                @click="manageCurriculumModal = false" />
+            </div>
+          </div>
+        </template>
+      </UModal>
+
+      <!-- Category Modal -->
+      <UModal v-model:open="categoryModal" :ui="{ content: 'bg-white rounded-2xl' }">
+        <template #content>
+          <div class="p-6">
+            <h3
+              class="text-xl font-bold mb-4 bg-indigo-50 text-indigo-900 border border-indigo-100 p-4 rounded-xl text-center">
+              {{ editingCategoryId ? 'แก้ไขหมวดวิชา' : 'เพิ่มหมวดวิชา' }}
+            </h3>
+            <div class="space-y-4">
+              <div>
+                <label class="block text-sm font-bold text-slate-500 mb-1">ชื่อหมวดวิชา</label>
+                <UInput v-model="newCategoryName" placeholder="เช่น หมวดวิชาการศึกษาทั่วไป" />
+              </div>
+            </div>
+            <div class="mt-6 flex justify-end gap-2">
+              <UButton label="ยกเลิก" color="neutral" variant="soft" @click="categoryModal = false" />
+              <UButton label="บันทึก" color="primary" @click="saveCategory" :disabled="!newCategoryName.trim()" />
+            </div>
+          </div>
+        </template>
+      </UModal>
+
+      <!-- Sub-Category (กลุ่มวิชา) Modal -->
+      <UModal v-model:open="subCategoryModal" :ui="{ content: 'bg-white rounded-2xl' }">
+        <template #content>
+          <div class="p-6">
+            <h3
+              class="text-xl font-bold mb-4 bg-blue-50 text-blue-900 border border-blue-100 p-4 rounded-xl text-center">
+              {{ editingSubCategoryId ? 'แก้ไขกลุ่มวิชา' : 'เพิ่มกลุ่มวิชา' }}
+            </h3>
+            <div class="space-y-4">
+              <div>
+                <label class="block text-sm font-bold text-slate-500 mb-1">ชื่อกลุ่มวิชา</label>
+                <UInput v-model="newSubCategoryName" placeholder="เช่น กลุ่มวิชาทักษะการสื่อสาร" />
+              </div>
+            </div>
+            <div class="mt-6 flex justify-end gap-2">
+              <UButton label="ยกเลิก" color="neutral" variant="soft" @click="subCategoryModal = false" />
+              <UButton label="บันทึก" color="primary" @click="saveSubCategory" :disabled="!newSubCategoryName.trim()" />
+            </div>
+          </div>
+        </template>
+      </UModal>
+      <UModal v-model:open="subjectModal" :ui="{ content: 'bg-white rounded-2xl' }">
+        <template #content>
+          <div class="p-6">
+            <h3
+              class="text-xl font-bold mb-4 bg-slate-50 text-slate-900 border border-slate-200 p-4 rounded-xl text-center">
+              {{ editingSubjectId ? 'แก้ไขรายวิชา' : 'เพิ่มวิชาลงหมวด' }}
+            </h3>
+            <div class="space-y-4">
+              <div>
+                <label class="block text-sm font-bold text-slate-500 mb-1">รหัสวิชา</label>
+                <UInput v-model="newSubjectCode" placeholder="รหัสวิชา (ถ้ามี)" />
+              </div>
+              <div>
+                <label class="block text-sm font-bold text-slate-500 mb-1">ชื่อวิชา <span
+                    class="text-red-500">*</span></label>
+                <UInput v-model="newSubjectName" placeholder="ชื่อรายวิชา" />
+              </div>
+            </div>
+            <div class="mt-6 flex justify-end gap-2">
+              <UButton label="ยกเลิก" color="neutral" variant="soft" @click="subjectModal = false" />
+              <UButton label="บันทึก" color="primary" @click="saveSubject" :disabled="!newSubjectName.trim()" />
+            </div>
+          </div>
+        </template>
+      </UModal>
+
+      <!-- Plan Modal -->
+      <UModal v-model:open="planModal" :ui="{ content: 'bg-white rounded-2xl' }">
+        <template #content>
+          <div class="p-6">
+            <h3
+              class="text-xl font-bold mb-4 bg-indigo-50 text-indigo-900 border border-indigo-100 p-4 rounded-xl text-center">
+              {{ editingPlanId ? 'แก้ไขแผนการเรียน' : 'สร้างแผนการเรียน' }}
+            </h3>
+            <div class="space-y-4">
+              <div>
+                <label class="block text-sm font-bold text-slate-500 mb-1">ชื่อแผน <span
+                    class="text-red-500">*</span></label>
+                <UInput v-model="newPlan.name" placeholder="เช่น แผน ป.ตรี ปกติ 4 ปี" />
+              </div>
+              <div class="grid grid-cols-2 gap-4">
+                <div>
+                  <label class="block text-sm font-bold text-slate-500 mb-1">ระดับ</label>
+                  <USelect v-model="newPlan.level"
+                    :items="[{ value: 'ป.ตรี', label: 'ปริญญาตรี' }, { value: 'ปวส.', label: 'ปวส.' }]" />
+                </div>
+                <div>
+                  <label class="block text-sm font-bold text-slate-500 mb-1">ปีที่</label>
+                  <USelect v-model="newPlan.year" :items="[1, 2, 3, 4, 5].map(v => ({ value: v, label: `ปี ${v}` }))" />
+                </div>
+              </div>
+              <div>
+                <label class="block text-sm font-bold text-slate-500 mb-1">ภาคเรียน</label>
+                <USelect v-model="newPlan.semester" :items="[1, 2, 3].map(v => ({ value: v, label: `เทอม ${v}` }))" />
+              </div>
+            </div>
+            <div class="mt-6 flex justify-end gap-2">
+              <UButton label="ยกเลิก" color="neutral" variant="soft" @click="planModal = false" />
+              <UButton label="บันทึก" color="primary" @click="savePlan" :disabled="!newPlan.name.trim()" />
+            </div>
+          </div>
+        </template>
+      </UModal>
+
+      <!-- Add Subject to Plan Modal -->
+      <UModal v-model:open="planSubjectModal" :ui="{ content: 'bg-white rounded-2xl w-full max-w-2xl' }">
+        <template #content>
+          <div class="p-6">
+            <h3 class="text-xl font-bold mb-1">เพิ่มวิชาลงแผน</h3>
+            <p class="text-sm text-slate-500 mb-4">จัดเข้า <span class="font-bold text-indigo-600">ปีที่ {{ viewYear }}
+                ภาคเรียนที่ {{ viewSemester }}</span></p>
+
+            <div class="mb-4">
+              <label class="block text-sm font-bold text-slate-500 mb-1">กรองหมวดวิชา</label>
+              <USelect class="w-full" v-model="filterCategoryId" :items="formattedCategoryOptions" />
+            </div>
+
+            <div class="max-h-80 overflow-y-auto custom-scrollbar border border-slate-200 rounded-xl p-2 bg-slate-50">
+              <div v-for="sub in filteredSubjectsForPlan" :key="sub.id_subject_curr"
+                class="flex items-center gap-3 p-3 hover:bg-white rounded-lg cursor-pointer border border-transparent hover:border-blue-200 transition-colors"
+                @click="togglePlanSubjectSel(sub.id_subject_curr)">
+                <UCheckbox :model-value="selectedSubjectsToAdd.includes(sub.id_subject_curr)"
+                  @update:model-value="togglePlanSubjectSel(sub.id_subject_curr)" />
+                <div>
+                  <div class="font-bold text-slate-800 text-sm">{{ sub.subject_code ? sub.subject_code + ' ' : '' }}{{
+                    sub.name_subject }}</div>
+                  <div class="text-xs text-slate-400 mt-0.5">{{ sub.categoryName }}</div>
+                </div>
+              </div>
+              <div v-if="!filteredSubjectsForPlan.length" class="text-center py-8 text-slate-400">ไม่พบวิชาในหมวดนี้
+              </div>
+            </div>
+
+            <div class="mt-6 flex justify-between items-center">
+              <div class="text-sm font-medium text-slate-600">เลือกแล้ว: {{ selectedSubjectsToAdd.length }} วิชา</div>
+              <div class="flex gap-2">
+                <UButton label="ยกเลิก" color="neutral" variant="soft" @click="planSubjectModal = false" />
+                <UButton label="บันทึกเข้าแผน" color="primary" @click="savePlanSubjects"
+                  :disabled="!selectedSubjectsToAdd.length" :loading="savingPlanSubs" />
+              </div>
+            </div>
+          </div>
+        </template>
+      </UModal>
+
+      <!-- Plan Modal -->
+      <UModal v-model:open="planModal" :ui="{ content: 'bg-white rounded-2xl' }">
+        <template #content>
+          <div class="p-6">
+            <h3 class="text-xl font-bold mb-4">{{ editingPlanId ? 'แก้ไขแผนการเรียน' : 'เพิ่มแผนการเรียน' }}</h3>
+            <div class="space-y-4">
+              <div>
+                <label class="block text-sm font-bold text-slate-500 mb-1">ชื่อแผนการเรียน</label>
+                <UInput v-model="newPlan.name" placeholder="เช่น แผนการเรียน 66..." />
+              </div>
+              <div>
+                <label class="block text-sm font-bold text-slate-500 mb-1">ระดับ</label>
+                <USelect v-model="newPlan.level"
+                  :items="[{ value: 'ปวช.', label: 'ปวช. (3 ปี)' }, { value: 'ปวส.', label: 'ปวส. (2 ปี)' }, { value: 'ป.ตรี', label: 'ป.ตรี (4 ปี)' }]" />
+              </div>
+            </div>
+            <div class="flex justify-end gap-2 mt-6">
+              <UButton label="ยกเลิก" color="gray" variant="soft" @click="planModal = false" />
+              <UButton :label="editingPlanId ? 'บันทึก' : 'เพิ่ม'" color="primary" @click="savePlan"
+                :disabled="!newPlan.name.trim()" />
+            </div>
+          </div>
+        </template>
+      </UModal>
+
+    </div>
+  </div>
+</template>
+
+<script setup>
+const toast = useToast()
+
+// Curriculums logic
+const { data: curriculumsRef, refresh: refreshCurriculum } = await useFetch('/api/curriculums')
+const curriculums = computed(() => curriculumsRef.value || [])
+const curriculumOptions = computed(() => curriculums.value.map(c => ({ value: c.id_curriculum, label: c.name_curriculum })))
+const selectedCurriculumId = ref(null)
+const selectedCurriculum = computed(() => curriculums.value.find(c => c.id_curriculum === selectedCurriculumId.value))
+
+const manageCurriculumModal = ref(false)
+const newCurriculumName = ref('')
+const editingCurriculumId = ref(null)
+
+const openEditCurriculumModal = (c) => {
+  editingCurriculumId.value = c.id_curriculum
+  newCurriculumName.value = c.name_curriculum
+}
+
+const addCurriculum = async () => {
+  try {
+    if (editingCurriculumId.value) {
+      await $fetch(`/api/curriculums/${editingCurriculumId.value}`, { method: 'PUT', body: { name_curriculum: newCurriculumName.value } })
+    } else {
+      await $fetch('/api/curriculums', { method: 'POST', body: { name_curriculum: newCurriculumName.value } })
+    }
+
+    newCurriculumName.value = ''
+    editingCurriculumId.value = null
+    refreshCurriculum()
+    toast.add({ title: 'สำเร็จ', color: 'green' })
+  } catch (e) {
+    toast.add({ title: 'เกิดข้อผิดพลาด', description: e.statusMessage || e.message, color: 'red' })
+  }
+}
+
+const deleteCurriculum = async (id) => {
+  if (!confirm('ยืนยันลบหลักสูตร? หากลบ ข้อมูลหมวดหมู่ แผน และวิชาที่เกี่ยวข้องจะหายทั้งหมด')) return
+  try {
+    await $fetch(`/api/curriculums/${id}`, { method: 'DELETE' })
+    if (selectedCurriculumId.value === id) selectedCurriculumId.value = null
+    refreshCurriculum()
+  } catch (e) { }
+}
+
+const activeTab = ref('structure')
+
+// Categories and Subjects logic
+const { data: categoriesRef, refresh: refreshCat } = await useFetch('/api/curriculum-categories', { query: computed(() => ({ id_curriculum: selectedCurriculumId.value })) })
+const allCategories = computed(() => categoriesRef.value || [])
+const topCategories = computed(() => allCategories.value.filter(c => !c.parent_id))
+const getSubCategories = (parentId) => allCategories.value.filter(c => c.parent_id === parentId)
+
+// Keep `categories` for backward compat (used in plan subject filter)
+const categories = computed(() => allCategories.value || [])
+
+const formattedCategoryOptions = computed(() => {
+  const options = [{ value: null, label: 'ทุกหมวดวิชา' }]
+  const topList = allCategories.value.filter(c => !c.parent_id)
+
+  topList.forEach((topIter, i) => {
+    const topNum = `${i + 1}.`
+    options.push({ value: topIter.id_category, label: `${topNum} ${topIter.name_category}` })
+
+    const subList = allCategories.value.filter(c => c.parent_id === topIter.id_category)
+    subList.forEach((subIter, j) => {
+      const subNum = `${i + 1}.${j + 1}`
+      options.push({ value: subIter.id_category, label: `  ${subNum} ${subIter.name_category}` })
+
+      const subSubList = allCategories.value.filter(c => c.parent_id === subIter.id_category)
+      subSubList.forEach((subSubIter, k) => {
+        const subSubNum = `${i + 1}.${j + 1}.${k + 1}`
+        options.push({ value: subSubIter.id_category, label: `    ${subSubNum} ${subSubIter.name_category}` })
+      })
+    })
+  })
+
+  return options
+})
+
+const { data: subjectsRef, refresh: refreshSubj } = await useFetch('/api/curriculum-subjects', { query: computed(() => ({ id_curriculum: selectedCurriculumId.value })) })
+const subjects = computed(() => subjectsRef.value || [])
+
+// Plans logic (must be declared before the watch that calls refreshPlans)
+const { data: plansRef, refresh: refreshPlans } = await useFetch('/api/study-plans', { query: computed(() => ({ id_curriculum: selectedCurriculumId.value })) })
+const studyPlans = computed(() => plansRef.value || [])
+
+const selectedPlanId = ref(null)
+const selectedPlan = computed(() => studyPlans.value.find(p => p.id_plan === selectedPlanId.value))
+
+watch(selectedCurriculumId, () => {
+  if (selectedCurriculumId.value) {
+    refreshCat()
+    refreshSubj()
+    refreshPlans()
+    selectedPlanId.value = null
+  }
+}, { immediate: true })
+
+const getSubjectsForCategory = (catId) => subjects.value.filter(s => s.id_category === catId)
+
+// หมวดวิชา (Top Level) Modal
+const categoryModal = ref(false)
+const newCategoryName = ref('')
+const editingCategoryId = ref(null)
+
+const openAddCategoryModal = () => {
+  editingCategoryId.value = null
+  newCategoryName.value = ''
+  categoryModal.value = true
+}
+
+const openEditCategoryModal = (cat) => {
+  editingCategoryId.value = cat.id_category
+  newCategoryName.value = cat.name_category
+  categoryModal.value = true
+}
+
+const saveCategory = async () => {
+  try {
+    if (editingCategoryId.value) {
+      await $fetch(`/api/curriculum-categories/${editingCategoryId.value}`, { method: 'PUT', body: { name_category: newCategoryName.value } })
+    } else {
+      await $fetch('/api/curriculum-categories', { method: 'POST', body: { id_curriculum: selectedCurriculumId.value, name_category: newCategoryName.value } })
+    }
+    categoryModal.value = false
+    refreshCat()
+    toast.add({ title: 'สำเร็จ', color: 'green' })
+  } catch (e) { toast.add({ title: 'Error', color: 'red' }) }
+}
+
+// กลุ่มวิชา (Sub Level) Modal
+const subCategoryModal = ref(false)
+const newSubCategoryName = ref('')
+const subCategoryParentId = ref(null)
+const editingSubCategoryId = ref(null)
+
+const openAddSubCategoryModal = (parentId) => {
+  editingSubCategoryId.value = null
+  subCategoryParentId.value = parentId
+  newSubCategoryName.value = ''
+  subCategoryModal.value = true
+}
+
+const openEditSubCategoryModal = (cat) => {
+  editingSubCategoryId.value = cat.id_category
+  subCategoryParentId.value = cat.parent_id
+  newSubCategoryName.value = cat.name_category
+  subCategoryModal.value = true
+}
+
+const saveSubCategory = async () => {
+  try {
+    if (editingSubCategoryId.value) {
+      await $fetch(`/api/curriculum-categories/${editingSubCategoryId.value}`, { method: 'PUT', body: { parent_id: subCategoryParentId.value, name_category: newSubCategoryName.value } })
+    } else {
+      await $fetch('/api/curriculum-categories', { method: 'POST', body: { id_curriculum: selectedCurriculumId.value, parent_id: subCategoryParentId.value, name_category: newSubCategoryName.value } })
+    }
+    subCategoryModal.value = false
+    refreshCat()
+    toast.add({ title: 'สำเร็จ', color: 'green' })
+  } catch (e) { toast.add({ title: 'Error', color: 'red' }) }
+}
+
+const deleteCategory = async (id) => {
+  if (!confirm('ยืนยันลบ?')) return
+  await $fetch(`/api/curriculum-categories/${id}`, { method: 'DELETE' })
+  refreshCat()
+  refreshSubj()
+}
+
+const subjectModal = ref(false)
+const newSubjectCode = ref('')
+const newSubjectName = ref('')
+const selectedCategoryIdForNewSubject = ref(null)
+const editingSubjectId = ref(null)
+
+const openAddSubjectModal = (catId) => {
+  editingSubjectId.value = null
+  selectedCategoryIdForNewSubject.value = catId
+  newSubjectCode.value = ''
+  newSubjectName.value = ''
+  subjectModal.value = true
+}
+
+const openEditSubjectModal = (sub) => {
+  editingSubjectId.value = sub.id_subject_curr
+  selectedCategoryIdForNewSubject.value = sub.id_category
+  newSubjectCode.value = sub.subject_code || ''
+  newSubjectName.value = sub.name_subject
+  subjectModal.value = true
+}
+
+const saveSubject = async () => {
+  try {
+    if (editingSubjectId.value) {
+      await $fetch(`/api/curriculum-subjects/${editingSubjectId.value}`, {
+        method: 'PUT',
+        body: { id_category: selectedCategoryIdForNewSubject.value, subject_code: newSubjectCode.value.trim(), name_subject: newSubjectName.value.trim() }
+      })
+    } else {
+      await $fetch('/api/curriculum-subjects', {
+        method: 'POST',
+        body: { id_category: selectedCategoryIdForNewSubject.value, subject_code: newSubjectCode.value.trim(), name_subject: newSubjectName.value.trim() }
+      })
+    }
+    subjectModal.value = false
+    refreshSubj()
+    toast.add({ title: 'สำเร็จ', color: 'green' })
+  } catch (e) { toast.add({ title: 'Error', color: 'red' }) }
+}
+
+const deleteSubject = async (id) => {
+  if (!confirm('ลบวิชานี้?')) return
+  await $fetch(`/api/curriculum-subjects/${id}`, { method: 'DELETE' })
+  refreshSubj()
+}
+
+const deletePlan = async (id) => {
+  if (!confirm('ยืนยันลบแผนการเรียน?')) return
+  await $fetch(`/api/study-plans/${id}`, { method: 'DELETE' })
+  selectedPlanId.value = null
+  await refreshPlans()
+}
+
+// Plans modal logic
+const planModal = ref(false)
+const newPlan = ref({ name: '', level: 'ป.ตรี' })
+const editingPlanId = ref(null)
+
+const openPlanModal = () => {
+  editingPlanId.value = null
+  newPlan.value = { name: '', level: 'ป.ตรี' }
+  planModal.value = true
+}
+
+const openEditPlanModal = (plan) => {
+  editingPlanId.value = plan.id_plan
+  newPlan.value = { name: plan.name_plan, level: plan.level }
+  planModal.value = true
+}
+
+const savePlan = async () => {
+  try {
+    const bodyArgs = {
+      id_curriculum: selectedCurriculumId.value,
+      name_plan: newPlan.value.name,
+      level: newPlan.value.level
+    }
+
+    let res;
+    if (editingPlanId.value) {
+      res = await $fetch(`/api/study-plans/${editingPlanId.value}`, { method: 'PUT', body: bodyArgs })
+      selectedPlanId.value = editingPlanId.value
+    } else {
+      res = await $fetch('/api/study-plans', { method: 'POST', body: bodyArgs })
+      selectedPlanId.value = res.id_plan
+    }
+
+    planModal.value = false
+    await refreshPlans()
+    toast.add({ title: 'สำเร็จ', color: 'green' })
+  } catch (e) { toast.add({ title: 'Error', color: 'red' }) }
+}
+
+// Plan Subjects mapping logic
+const { data: planSubsRef, refresh: refreshPlanSubs } = await useFetch('/api/study-plan-subjects', { query: computed(() => ({ id_plan: selectedPlanId.value })) })
+const planSubjects = computed(() => planSubsRef.value || [])
+
+watch(selectedPlanId, () => {
+  if (selectedPlanId.value) refreshPlanSubs()
+})
+
+const planSubjectsList = computed(() => {
+  if (!selectedPlanId.value) return []
+  return planSubjects.value
+})
+
+// View filters for year/semester (live in the card header)
+const viewYear = ref(1)
+const viewSemester = ref(1)
+
+// Dynamic max year based on plan level
+const maxPlanYear = computed(() => {
+  if (!selectedPlan.value) return 5
+  if (selectedPlan.value.level === 'ปวช.') return 3
+  if (selectedPlan.value.level === 'ปวส.') return 2
+  return 5
+})
+
+const viewYearOptions = computed(() => {
+  return Array.from({ length: maxPlanYear.value }, (_, i) => ({ value: i + 1, label: `ปีที่ ${i + 1}` }))
+})
+
+// Reset viewYear when switching plans
+watch(selectedPlanId, () => {
+  viewYear.value = 1
+  viewSemester.value = 1
+})
+
+// Filter subjects by selected year+semester
+const filteredPlanSubjectsByTerm = computed(() => {
+  return planSubjectsList.value.filter(ps => (ps.year || 1) === viewYear.value && (ps.semester || 1) === viewSemester.value)
+})
+
+const planSubjectModal = ref(false)
+const filterCategoryId = ref(null)
+const selectedSubjectsToAdd = ref([])
+const savingPlanSubs = ref(false)
+
+const filteredSubjectsForPlan = computed(() => {
+  let list = subjects.value.map(s => {
+    const formatLabel = formattedCategoryOptions.value.find(o => o.value === s.id_category)?.label
+    const cName = formatLabel ? formatLabel.trim() : '-'
+    return { ...s, categoryName: cName }
+  })
+
+  // Exclude subjects already in plan (any year/semester)
+  const existingIds = planSubjectsList.value.map(ps => ps.id_subject_curr)
+  list = list.filter(s => !existingIds.includes(s.id_subject_curr))
+
+  if (filterCategoryId.value) {
+    const getAllChildIds = (parentId, categoriesList) => {
+      let ids = [parentId]
+      const children = categoriesList.filter(c => c.parent_id === parentId)
+      children.forEach(child => {
+        ids = ids.concat(getAllChildIds(child.id_category, categoriesList))
+      })
+      return ids
+    }
+    const targetIds = getAllChildIds(filterCategoryId.value, allCategories.value)
+    list = list.filter(s => targetIds.includes(s.id_category))
+  }
+  return list
+})
+
+const openAddPlanSubjectModal = () => {
+  filterCategoryId.value = null
+  selectedSubjectsToAdd.value = []
+  planSubjectModal.value = true
+}
+
+const togglePlanSubjectSel = (id) => {
+  if (selectedSubjectsToAdd.value.includes(id)) selectedSubjectsToAdd.value = selectedSubjectsToAdd.value.filter(i => i !== id)
+  else selectedSubjectsToAdd.value.push(id)
+}
+
+const savePlanSubjects = async () => {
+  savingPlanSubs.value = true
+  try {
+    for (const sid of selectedSubjectsToAdd.value) {
+      await $fetch('/api/study-plan-subjects', {
+        method: 'POST', body: {
+          id_plan: selectedPlanId.value,
+          id_subject_curr: sid,
+          year: viewYear.value,
+          semester: viewSemester.value
+        }
+      })
+    }
+    planSubjectModal.value = false
+    refreshPlanSubs()
+    toast.add({ title: 'สำเร็จ', color: 'success' })
+  } catch (e) {
+    toast.add({ title: 'Error', description: e.message, color: 'error' })
+  } finally {
+    savingPlanSubs.value = false
+  }
+}
+
+const removePlanSubject = async (psId) => {
+  await $fetch(`/api/study-plan-subjects/${psId}`, { method: 'DELETE' })
+  refreshPlanSubs()
+}
+</script>
+
+<style scoped>
+.custom-scrollbar::-webkit-scrollbar {
+  width: 6px;
+}
+
+.custom-scrollbar::-webkit-scrollbar-track {
+  background: #f8fafc;
+  border-radius: 10px;
+}
+
+.custom-scrollbar::-webkit-scrollbar-thumb {
+  background: #cbd5e1;
+  border-radius: 10px;
+}
+</style>
diff --git a/app/pages/teacher/[id].vue b/app/pages/teacher/[id].vue
index 369b8ed..5b5bbb9 100644
--- a/app/pages/teacher/[id].vue
+++ b/app/pages/teacher/[id].vue
@@ -1,21 +1,15 @@
 <template>
   <div class="bg-slate-50 text-slate-900 min-h-screen">
     <!-- ปุ่มย้อนกลับ -->
-    <UButton
-      label="ย้อนกลับ"
-      icon="i-lucide-arrow-left"
-      color="error"
-      class="m-4 cursor-pointer"
-      @click="$router.back()"
-    />
+    <UButton label="ย้อนกลับ" icon="i-lucide-arrow-left" color="error" class="m-4 cursor-pointer"
+      @click="$router.back()" />
     <div class="container mx-auto py-2 pb-10">
       <!-- แสดงรายละเอียดอาจารย์ตาม id -->
       <div class="flex flex-col md:flex-row gap-6 mb-8">
         <!-- Profile Card -->
         <div class="flex-1 bg-white p-6 rounded-2xl border border-slate-200 shadow-sm flex items-center gap-6">
           <div
-            class="w-20 h-20 rounded-full bg-amber-100 text-slate-800 font-bold flex items-center justify-center text-3xl shadow-sm border border-amber-200"
-          >
+            class="w-20 h-20 rounded-full bg-amber-100 text-slate-800 font-bold flex items-center justify-center text-3xl shadow-sm border border-amber-200">
             {{ (teacherData?.first_name?.[0] || '') + (teacherData?.last_name?.[0] || '') }}
           </div>
           <div>
@@ -63,10 +57,7 @@
           <div class="p-5 border-b border-slate-100 flex justify-between items-center text-slate-900 bg-slate-50/50">
             <div class="flex items-center gap-3">
               <div class="w-10 h-10 bg-blue-50 rounded-xl flex items-center justify-center border border-blue-100">
-                <UIcon
-                  name="i-heroicons-book-open"
-                  class="text-xl text-blue-600"
-                />
+                <UIcon name="i-heroicons-book-open" class="text-xl text-blue-600" />
               </div>
               <h1 class="text-xl font-bold text-slate-900">
                 รายวิชาที่สอน
@@ -75,21 +66,15 @@
 
             <div class="flex gap-3">
               <!-- Quick Add Subject to Schedule (Simplified Button) -->
-              <UModal
-                v-model:open="quickAddOpen"
-                :ui="{ content: 'bg-white border border-slate-200 rounded-3xl overflow-hidden' }"
-              >
+              <UModal v-model:open="quickAddOpen"
+                :ui="{ content: 'bg-white border border-slate-200 rounded-3xl overflow-hidden' }">
                 <template #content>
                   <div class="flex flex-col max-h-[90vh]">
                     <!-- Header -->
                     <div class="p-8 pb-4">
                       <div
-                        class="w-16 h-16 bg-blue-50 rounded-full flex items-center justify-center mx-auto mb-6 border border-blue-100"
-                      >
-                        <UIcon
-                          name="i-heroicons-calendar-days"
-                          class="text-3xl text-blue-600"
-                        />
+                        class="w-16 h-16 bg-blue-50 rounded-full flex items-center justify-center mx-auto mb-6 border border-blue-100">
+                        <UIcon name="i-heroicons-calendar-days" class="text-3xl text-blue-600" />
                       </div>
                       <h3 class="text-2xl font-bold text-slate-900 text-center mb-4">
                         เพิ่มรายวิชาในตารางสอน
@@ -102,14 +87,9 @@
                         <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">
                           เลือกวิชา
                         </h3>
-                        <USelect
-                          v-model="quickAddSubject"
-                          placeholder="เลือกรายวิชา"
-                          :items="subjectOptions"
-                          size="xl"
+                        <USelect v-model="quickAddSubject" placeholder="เลือกรายวิชา" :items="subjectOptions" size="xl"
                           class="w-full"
-                          :ui="{ base: 'bg-white border-slate-200 text-slate-900 rounded-2xl shadow-xs' }"
-                        />
+                          :ui="{ base: 'bg-white border-slate-200 text-slate-900 rounded-2xl shadow-xs' }" />
                       </div>
 
                       <div v-if="quickAddSubject">
@@ -118,10 +98,8 @@
                           (เลือกเฉพาะที่เรียนคาบนี้)
                         </h3>
                         <div
-                          class="space-y-2 max-h-40 overflow-y-auto custom-scrollbar border border-slate-200 rounded-2xl p-4 bg-slate-50 shadow-inner"
-                        >
-                          <div
-                            v-for="sec in subjects.find(s => s.id_subject == quickAddSubject)?.sections"
+                          class="space-y-2 max-h-40 overflow-y-auto custom-scrollbar border border-slate-200 rounded-2xl p-4 bg-slate-50 shadow-inner">
+                          <div v-for="sec in subjects.find(s => s.id_subject == quickAddSubject)?.sections"
                             :key="sec.id_section"
                             class="flex items-center gap-3 p-2 hover:bg-slate-100/50 rounded-xl cursor-pointer text-slate-700 transition-colors"
                             @click="() => {
@@ -131,15 +109,12 @@
                               else {
                                 quickAddSelectedSections = [...quickAddSelectedSections, sec.id_section]
                               }
-                            }"
-                          >
-                            <UCheckbox
-                              :model-value="quickAddSelectedSections.includes(sec.id_section)"
+                            }">
+                            <UCheckbox :model-value="quickAddSelectedSections.includes(sec.id_section)"
                               @update:model-value="(val) => {
                                 if (val) quickAddSelectedSections = [...quickAddSelectedSections, sec.id_section]
                                 else quickAddSelectedSections = quickAddSelectedSections.filter(id => id !== sec.id_section)
-                              }"
-                            />
+                              }" />
                             <span class="text-sm font-medium">{{ sec.section_name }}</span>
                           </div>
                         </div>
@@ -150,27 +125,17 @@
                           <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">
                             วัน
                           </h3>
-                          <USelect
-                            v-model="quickAddDay"
-                            placeholder="เลือกวัน"
-                            :items="dayOptions"
-                            size="xl"
+                          <USelect v-model="quickAddDay" placeholder="เลือกวัน" :items="dayOptions" size="xl"
                             class="w-full"
-                            :ui="{ base: 'bg-white border-slate-200 text-slate-900 rounded-2xl shadow-xs' }"
-                          />
+                            :ui="{ base: 'bg-white border-slate-200 text-slate-900 rounded-2xl shadow-xs' }" />
                         </div>
                         <div>
                           <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">
                             ห้องเรียน
                           </h3>
-                          <USelect
-                            v-model="quickAddRoom"
-                            placeholder="ไม่ระบุ"
-                            :items="roomOptions"
-                            size="xl"
+                          <USelect v-model="quickAddRoom" placeholder="ไม่ระบุ" :items="roomOptions" size="xl"
                             class="w-full"
-                            :ui="{ base: 'bg-white border-slate-200 text-slate-900 rounded-2xl shadow-xs' }"
-                          />
+                            :ui="{ base: 'bg-white border-slate-200 text-slate-900 rounded-2xl shadow-xs' }" />
                         </div>
                       </div>
 
@@ -179,33 +144,21 @@
                           <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">
                             เวลาเริ่ม
                           </h3>
-                          <USelect
-                            v-model="quickAddStartTime"
-                            placeholder="เลือกเวลา"
-                            :items="timeSlotIndexOptions"
-                            size="xl"
-                            class="w-full"
-                            :ui="{ base: 'bg-white border-slate-200 text-slate-900 rounded-2xl shadow-xs' }"
-                          />
+                          <USelect v-model="quickAddStartTime" placeholder="เลือกเวลา" :items="timeSlotIndexOptions"
+                            size="xl" class="w-full"
+                            :ui="{ base: 'bg-white border-slate-200 text-slate-900 rounded-2xl shadow-xs' }" />
                         </div>
                         <div>
                           <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">
                             จำนวนชั่วโมง
                           </h3>
-                          <USelect
-                            v-model="quickAddDuration"
-                            :items="durationOptions"
-                            size="xl"
-                            class="w-full"
-                            :ui="{ base: 'bg-white border-slate-200 text-slate-900 rounded-2xl shadow-xs' }"
-                          />
+                          <USelect v-model="quickAddDuration" :items="durationOptions" size="xl" class="w-full"
+                            :ui="{ base: 'bg-white border-slate-200 text-slate-900 rounded-2xl shadow-xs' }" />
                         </div>
                       </div>
 
-                      <div
-                        v-if="quickAddPreview"
-                        class="bg-blue-500/5 border border-blue-500/10 p-4 rounded-2xl text-center"
-                      >
+                      <div v-if="quickAddPreview"
+                        class="bg-blue-500/5 border border-blue-500/10 p-4 rounded-2xl text-center">
                         <p class="text-xs font-bold text-blue-500 uppercase tracking-widest mb-1">
                           แสดงตัวอย่าง
                         </p>
@@ -217,69 +170,63 @@
 
                     <!-- Sticky Footer Buttons -->
                     <div class="p-6 pt-4 border-t border-slate-100 bg-white flex gap-3">
-                      <UButton
-                        label="ยกเลิก"
-                        color="neutral"
-                        variant="soft"
-                        size="xl"
-                        block
-                        class="rounded-2xl py-4 flex-1 font-bold"
-                        @click="quickAddOpen = false"
-                      />
-                      <UButton
-                        label="เพิ่มลงตาราง"
-                        color="primary"
-                        size="xl"
-                        block
-                        class="rounded-2xl py-4 flex-1 shadow-lg shadow-blue-500/10 font-bold"
-                        @click="async () => {
+                      <UButton label="ยกเลิก" color="neutral" variant="soft" size="xl" block
+                        class="rounded-2xl py-4 flex-1 font-bold" @click="quickAddOpen = false" />
+                      <UButton label="เพิ่มลงตาราง" color="primary" size="xl" block
+                        class="rounded-2xl py-4 flex-1 shadow-lg shadow-blue-500/10 font-bold" @click="async () => {
                           await addToSchedule()
                           quickAddOpen = false
-                        }"
-                      />
+                        }" />
                     </div>
                   </div>
                 </template>
               </UModal>
 
               <!-- เพิ่มรายวิชา -->
-              <UModal
-                v-model:open="open"
-                :ui="{ content: 'bg-white border border-slate-200 rounded-3xl overflow-hidden' }"
-              >
-                <UButton
-                  label="เพิ่มรายวิชาที่สอน"
-                  size="xl"
-                  icon="i-heroicons-plus-circle"
-                  class="cursor-pointer rounded-xl font-bold"
-                />
+              <UModal v-model:open="open"
+                :ui="{ content: 'bg-white border border-slate-200 rounded-3xl overflow-hidden' }">
+                <UButton label="เพิ่มรายวิชาที่สอน" size="xl" icon="i-heroicons-plus-circle"
+                  class="cursor-pointer rounded-xl font-bold" />
                 <template #content>
                   <div class="flex flex-col max-h-[85vh]">
                     <div class="p-8 overflow-y-auto custom-scrollbar flex-1">
                       <div
-                        class="w-16 h-16 bg-blue-50 rounded-full flex items-center justify-center mx-auto mb-6 border border-blue-100"
-                      >
-                        <UIcon
-                          name="i-heroicons-plus-circle"
-                          class="text-3xl text-blue-600"
-                        />
+                        class="w-16 h-16 bg-blue-50 rounded-full flex items-center justify-center mx-auto mb-6 border border-blue-100">
+                        <UIcon name="i-heroicons-plus-circle" class="text-3xl text-blue-600" />
                       </div>
                       <h3 class="text-2xl font-bold text-slate-900 text-center mb-6">
                         เพิ่มรายวิชาที่สอน
                       </h3>
 
                       <div class="space-y-6">
-                        <div>
-                          <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">
-                            ชื่อวิชา
-                          </h3>
-                          <UInput
-                            v-model="subjectName"
-                            placeholder="กรอกชื่อวิชา"
-                            size="xl"
-                            class="w-full"
-                            :ui="{ base: 'bg-white border-slate-200 text-slate-900 focus:ring-blue-500 rounded-2xl shadow-xs' }"
-                          />
+                        <div class="flex flex-col gap-4">
+                          <div>
+                            <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">แผนการเรียน
+                            </h3>
+                            <USelectMenu v-model="selectedAddPlanId" :items="studyPlanOptions"
+                              value-attribute="value" option-attribute="label"
+                              placeholder="เลือกแผนการเรียน" size="xl" class="w-full"
+                              :ui="{ base: 'bg-white border-slate-200 text-slate-900 focus:ring-blue-500 rounded-2xl shadow-xs break-words whitespace-normal text-left h-auto py-2' }">
+                              <template #item="{ item }">
+                                <span class="whitespace-normal break-words text-left w-full block py-0.5">
+                                  {{ item.label }}
+                                </span>
+                              </template>
+                            </USelectMenu>
+                          </div>
+                          <div>
+                            <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">วิชา</h3>
+                            <USelectMenu v-model="selectedAddSubjectId" :items="availableAddSubjectOptions"
+                              value-attribute="value" option-attribute="label"
+                              placeholder="เลือกวิชา" size="xl" :disabled="!selectedAddPlanId" class="w-full"
+                              :ui="{ base: 'bg-white border-slate-200 text-slate-900 focus:ring-blue-500 rounded-2xl shadow-xs break-words whitespace-normal text-left h-auto py-2' }">
+                              <template #item="{ item }">
+                                <span class="whitespace-normal break-words text-left w-full block py-0.5">
+                                  {{ item.label }}
+                                </span>
+                              </template>
+                            </USelectMenu>
+                          </div>
                         </div>
 
                         <div>
@@ -288,46 +235,33 @@
                             (Sections)
                           </h3>
                           <div
-                            class="space-y-2 max-h-48 overflow-y-auto custom-scrollbar border border-slate-200 rounded-2xl p-4 bg-slate-50 shadow-inner"
-                          >
+                            class="space-y-2 max-h-48 overflow-y-auto custom-scrollbar border border-slate-200 rounded-2xl p-4 bg-slate-50 shadow-inner">
                             <!-- Loading state -->
-                            <div
-                              v-if="sectionsStatus === 'pending'"
-                              class="flex items-center justify-center gap-2 py-4 text-slate-400 text-sm"
-                            >
+                            <div v-if="sectionsStatus === 'pending'"
+                              class="flex items-center justify-center gap-2 py-4 text-slate-400 text-sm">
                               <UIcon name="i-heroicons-arrow-path" class="animate-spin" />
                               กำลังโหลดกลุ่มเรียน...
                             </div>
                             <!-- Empty state -->
-                            <div
-                              v-else-if="!sections || sections.length === 0"
-                              class="text-center py-4"
-                            >
+                            <div v-else-if="!sections || sections.length === 0" class="text-center py-4">
                               <p class="text-slate-400 text-sm italic">ไม่มีกลุ่มเรียนในระบบ</p>
                               <p class="text-xs text-slate-300 mt-1">กรุณาเพิ่มกลุ่มเรียนในหน้าจัดการกลุ่มเรียนก่อน</p>
                             </div>
                             <!-- Section list -->
                             <template v-else>
-                              <div
-                                v-for="section in sections"
-                                :key="section.id_section"
+                              <div v-for="section in sections" :key="section.id_section"
                                 class="flex items-center gap-3 p-2.5 hover:bg-slate-100/50 rounded-xl cursor-pointer text-slate-700 transition-colors"
-                                @click="toggleSection(section.id_section)"
-                              >
-                                <UCheckbox
-                                  :model-value="selectedSections.includes(section.id_section)"
-                                  @update:model-value="toggleSection(section.id_section)"
-                                />
+                                @click="toggleSection(section.id_section)">
+                                <UCheckbox :model-value="selectedSections.includes(section.id_section)"
+                                  @update:model-value="toggleSection(section.id_section)" />
                                 <span class="text-sm font-medium">{{ section.section_name }}</span>
                               </div>
                             </template>
                           </div>
                         </div>
 
-                        <div
-                          v-if="selectedSections.length > 0"
-                          class="bg-blue-50 border border-blue-100 p-3 rounded-xl text-center"
-                        >
+                        <div v-if="selectedSections.length > 0"
+                          class="bg-blue-50 border border-blue-100 p-3 rounded-xl text-center">
                           <p class="text-sm text-blue-600 font-medium">
                             เลือกแล้ว {{ selectedSections?.length || 0 }}
                             กลุ่มเรียน
@@ -338,26 +272,13 @@
 
                     <div class="p-6 border-t border-slate-100 bg-white/95 backdrop-blur-sm sticky bottom-0 z-10 w-full">
                       <div class="flex gap-3">
-                        <UButton
-                          label="ยกเลิก"
-                          color="neutral"
-                          variant="soft"
-                          size="xl"
-                          block
-                          class="rounded-2xl py-4 flex-1 font-bold"
-                          @click="open = false"
-                        />
-                        <UButton
-                          label="บันทึกรายวิชา"
-                          color="primary"
-                          size="xl"
-                          block
-                          class="rounded-2xl py-4 flex-1 shadow-lg shadow-blue-500/10 font-bold"
-                          @click="async () => {
+                        <UButton label="ยกเลิก" color="neutral" variant="soft" size="xl" block
+                          class="rounded-2xl py-4 flex-1 font-bold" @click="open = false" />
+                        <UButton label="บันทึกรายวิชา" color="primary" size="xl" block
+                          class="rounded-2xl py-4 flex-1 shadow-lg shadow-blue-500/10 font-bold" @click="async () => {
                             await addSubject()
                             open = false
-                          }"
-                        />
+                          }" />
                       </div>
                     </div>
                   </div>
@@ -365,36 +286,57 @@
               </UModal>
 
               <!-- แก้ไขรายวิชา -->
-              <UModal
-                v-model:open="editOpen"
-                :ui="{ content: 'bg-white border border-slate-200 rounded-3xl overflow-hidden' }"
-              >
+              <UModal v-model:open="editOpen"
+                :ui="{ content: 'bg-white border border-slate-200 rounded-3xl overflow-hidden' }">
                 <template #content>
                   <div class="flex flex-col max-h-[85vh]">
                     <div class="p-8 overflow-y-auto custom-scrollbar flex-1">
                       <div
-                        class="w-16 h-16 bg-amber-50 rounded-full flex items-center justify-center mx-auto mb-6 border border-amber-100"
-                      >
-                        <UIcon
-                          name="i-lucide-edit"
-                          class="text-3xl text-amber-600"
-                        />
+                        class="w-16 h-16 bg-amber-50 rounded-full flex items-center justify-center mx-auto mb-6 border border-amber-100">
+                        <UIcon name="i-lucide-edit" class="text-3xl text-amber-600" />
                       </div>
                       <h3 class="text-2xl font-bold text-slate-900 text-center mb-6">
                         แก้ไขรายวิชา
                       </h3>
 
                       <div class="space-y-6">
-                        <div>
+                        <div class="grid grid-cols-2 gap-4">
+                          <div>
+                            <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">แผนการเรียน
+                              (เพื่อเปลี่ยนวิชา)</h3>
+                            <USelectMenu v-model="editSelectedPlanId" :items="studyPlanOptions"
+                              value-attribute="value" option-attribute="label"
+                              placeholder="ไม่เปลี่ยน" size="xl" class="w-full"
+                              :ui="{ base: 'bg-white border-slate-200 text-slate-900 focus:ring-amber-500 rounded-2xl shadow-xs break-words whitespace-normal text-left h-auto py-2' }">
+                              <template #item="{ item }">
+                                <span class="whitespace-normal break-words text-left w-full block py-0.5">
+                                  {{ item.label }}
+                                </span>
+                              </template>
+                            </USelectMenu>
+                          </div>
+                          <div>
+                            <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">วิชาใหม่
+                              (เลือกจากแผน)</h3>
+                            <USelectMenu v-model="editSelectedSubjectId" :items="availableEditSubjectOptions"
+                              value-attribute="value" option-attribute="label"
+                              placeholder="วิชาเดิม" size="xl" :disabled="!editSelectedPlanId" class="w-full"
+                              :ui="{ base: 'bg-white border-slate-200 text-slate-900 focus:ring-amber-500 rounded-2xl shadow-xs break-words whitespace-normal text-left h-auto py-2' }">
+                              <template #item="{ item }">
+                                <span class="whitespace-normal break-words text-left w-full block py-0.5">
+                                  {{ item.label }}
+                                </span>
+                              </template>
+                            </USelectMenu>
+                          </div>
+                        </div>
+
+                        <div class="mt-4">
                           <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">
-                            ชื่อวิชา
+                            วิชาที่จะแสดง
                           </h3>
-                          <UInput
-                            v-model="editSubjectName"
-                            size="xl"
-                            class="w-full"
-                            :ui="{ base: 'bg-white border-slate-200 text-slate-900 focus:ring-amber-500 rounded-2xl shadow-xs' }"
-                          />
+                          <UInput v-model="computedEditSubjectName" disabled size="xl" class="w-full"
+                            :ui="{ base: 'bg-slate-100 border-slate-200 text-slate-500 focus:ring-amber-500 rounded-2xl shadow-xs' }" />
                         </div>
 
                         <div>
@@ -403,35 +345,25 @@
                             (Sections)
                           </h3>
                           <div
-                            class="space-y-2 max-h-48 overflow-y-auto custom-scrollbar border border-slate-200 rounded-2xl p-4 bg-slate-50 shadow-inner"
-                          >
+                            class="space-y-2 max-h-48 overflow-y-auto custom-scrollbar border border-slate-200 rounded-2xl p-4 bg-slate-50 shadow-inner">
                             <!-- Loading state -->
-                            <div
-                              v-if="sectionsStatus === 'pending'"
-                              class="flex items-center justify-center gap-2 py-4 text-slate-400 text-sm"
-                            >
+                            <div v-if="sectionsStatus === 'pending'"
+                              class="flex items-center justify-center gap-2 py-4 text-slate-400 text-sm">
                               <UIcon name="i-heroicons-arrow-path" class="animate-spin" />
                               กำลังโหลดกลุ่มเรียน...
                             </div>
                             <!-- Empty state -->
-                            <p
-                              v-else-if="!sections || sections.length === 0"
-                              class="text-slate-400 text-sm text-center py-4 italic"
-                            >
+                            <p v-else-if="!sections || sections.length === 0"
+                              class="text-slate-400 text-sm text-center py-4 italic">
                               ไม่มีกลุ่มเรียนในระบบ
                             </p>
                             <!-- Section list -->
                             <template v-else>
-                              <div
-                                v-for="section in sections"
-                                :key="section.id_section"
+                              <div v-for="section in sections" :key="section.id_section"
                                 class="flex items-center gap-3 p-2.5 hover:bg-slate-100/50 rounded-xl cursor-pointer text-slate-700 transition-colors"
-                                @click="toggleEditSection(section.id_section)"
-                              >
-                                <UCheckbox
-                                  :model-value="editSelectedSections.includes(section.id_section)"
-                                  @update:model-value="toggleEditSection(section.id_section)"
-                                />
+                                @click="toggleEditSection(section.id_section)">
+                                <UCheckbox :model-value="editSelectedSections.includes(section.id_section)"
+                                  @update:model-value="toggleEditSection(section.id_section)" />
                                 <span class="text-sm font-medium">{{ section.section_name }}</span>
                               </div>
                             </template>
@@ -442,26 +374,13 @@
 
                     <div class="p-6 border-t border-slate-100 bg-white/95 backdrop-blur-sm sticky bottom-0 z-10 w-full">
                       <div class="flex gap-3">
-                        <UButton
-                          label="ยกเลิก"
-                          color="neutral"
-                          variant="soft"
-                          size="xl"
-                          block
-                          class="rounded-2xl py-4 flex-1 font-bold"
-                          @click="editOpen = false"
-                        />
-                        <UButton
-                          label="บันทึกการแก้ไข"
-                          color="warning"
-                          size="xl"
-                          block
-                          class="rounded-2xl py-4 flex-1 shadow-lg shadow-amber-500/10 font-bold"
-                          @click="async () => {
+                        <UButton label="ยกเลิก" color="neutral" variant="soft" size="xl" block
+                          class="rounded-2xl py-4 flex-1 font-bold" @click="editOpen = false" />
+                        <UButton label="บันทึกการแก้ไข" color="warning" size="xl" block
+                          class="rounded-2xl py-4 flex-1 shadow-lg shadow-amber-500/10 font-bold" @click="async () => {
                             await updateSubject()
                             editOpen = false
-                          }"
-                        />
+                          }" />
                       </div>
                     </div>
                   </div>
@@ -469,20 +388,14 @@
               </UModal>
 
               <!-- ลบรายวิชา -->
-              <UModal
-                v-model:open="deleteOpen"
-                :ui="{ content: 'bg-white border border-slate-200 rounded-3xl overflow-hidden' }"
-              >
+              <UModal v-model:open="deleteOpen"
+                :ui="{ content: 'bg-white border border-slate-200 rounded-3xl overflow-hidden' }">
                 <template #content>
                   <div class="flex flex-col max-h-[85vh]">
                     <div class="p-8 overflow-y-auto custom-scrollbar flex-1">
                       <div
-                        class="w-20 h-20 bg-red-500/10 rounded-full flex items-center justify-center mx-auto mb-6 border border-red-500/20"
-                      >
-                        <UIcon
-                          name="i-heroicons-exclamation-triangle"
-                          class="text-4xl text-red-500"
-                        />
+                        class="w-20 h-20 bg-red-500/10 rounded-full flex items-center justify-center mx-auto mb-6 border border-red-500/20">
+                        <UIcon name="i-heroicons-exclamation-triangle" class="text-4xl text-red-500" />
                       </div>
 
                       <h3 class="text-2xl font-bold text-slate-900 text-center mb-2">
@@ -492,7 +405,8 @@
                         การดำเนินการนี้จะลบรายวิชาออกจากระบบและตารางสอน อาจารย์/กลุ่มเรียน จะได้รับผลกระทบ
                       </p>
 
-                      <div class="bg-red-500/5 border border-red-500/20 p-6 rounded-2xl text-center relative overflow-hidden">
+                      <div
+                        class="bg-red-500/5 border border-red-500/20 p-6 rounded-2xl text-center relative overflow-hidden">
                         <div class="relative z-10">
                           <p class="text-xs font-black uppercase tracking-widest text-red-400/80 mb-1">
                             วิชาที่เลือก
@@ -508,23 +422,11 @@
                     </div>
                     <div class="p-6 border-t border-slate-200 bg-white/95 backdrop-blur-sm sticky bottom-0 z-10">
                       <div class="flex flex-col sm:flex-row gap-3">
-                        <UButton
-                          label="ยกเลิก"
-                          color="neutral"
-                          variant="outline"
-                          size="xl"
-                          block
-                          class="rounded-2xl border-slate-200 py-4 flex-1"
-                          @click="deleteOpen = false"
-                        />
-                        <UButton
-                          label="ยืนยันการลบถาวร"
-                          color="error"
-                          size="xl"
-                          block
+                        <UButton label="ยกเลิก" color="neutral" variant="outline" size="xl" block
+                          class="rounded-2xl border-slate-200 py-4 flex-1" @click="deleteOpen = false" />
+                        <UButton label="ยืนยันการลบถาวร" color="error" size="xl" block
                           class="rounded-2xl py-4 flex-1 shadow-lg shadow-red-500/20 font-bold"
-                          @click="deleteSubject"
-                        />
+                          @click="deleteSubject" />
                       </div>
                     </div>
                   </div>
@@ -535,35 +437,22 @@
           <div class="px-5 py-4 border-t border-slate-50 max-h-80 overflow-y-auto custom-scrollbar">
             <div v-if="pending">
               <div class="flex items-center justify-center py-10 text-slate-400">
-                <UIcon
-                  name="i-heroicons-arrow-path"
-                  class="animate-spin mr-2"
-                />
+                <UIcon name="i-heroicons-arrow-path" class="animate-spin mr-2" />
                 กำลังโหลดวิชา...
               </div>
             </div>
             <div v-else>
-              <p
-                v-if="!subjects || subjects.length === 0"
-                class="py-10 text-center text-slate-400 font-medium italic"
-              >
+              <p v-if="!subjects || subjects.length === 0" class="py-10 text-center text-slate-400 font-medium italic">
                 ยังไม่มีรายวิชาที่สอน
               </p>
 
               <!-- แสดงรายวิชาที่สอนเป็น Grid -->
-              <div
-                v-else
-                class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4"
-              >
-                <div
-                  v-for="subject in subjects"
-                  :key="subject.id_subject"
-                  class="group p-4 rounded-2xl bg-slate-100/50 hover:bg-white border border-blue-200 shadow-md shadow-blue-500/5 transition-all duration-300 flex flex-col justify-between"
-                >
+              <div v-else class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4">
+                <div v-for="subject in subjects" :key="subject.id_subject"
+                  class="group p-4 rounded-2xl bg-slate-100/50 hover:bg-white border border-blue-200 shadow-md shadow-blue-500/5 transition-all duration-300 flex flex-col justify-between">
                   <div class="mb-3">
                     <h3
-                      class="font-bold text-slate-900 leading-tight group-hover:text-blue-600 transition-colors line-clamp-2"
-                    >
+                      class="font-bold text-slate-900 leading-tight group-hover:text-blue-600 transition-colors line-clamp-2">
                       {{ subject.name_subject }}
                     </h3>
                     <p class="text-xs text-slate-500 mt-1 line-clamp-1">
@@ -572,24 +461,10 @@
                   </div>
 
                   <div class="flex items-center justify-end gap-1 mt-auto pt-3 border-t border-slate-100">
-                    <UButton
-                      label="แก้ไข"
-                      icon="i-lucide-edit"
-                      color="warning"
-                      variant="outline"
-                      size="xs"
-                      class="cursor-pointer rounded-lg hover:bg-amber-50"
-                      @click="editSubject(subject)"
-                    />
-                    <UButton
-                      label="ลบ"
-                      icon="i-lucide-trash"
-                      color="error"
-                      variant="ghost"
-                      size="xs"
-                      class="cursor-pointer rounded-lg hover:bg-red-50"
-                      @click="confirmDeleteSubject(subject)"
-                    />
+                    <UButton label="แก้ไข" icon="i-lucide-edit" color="warning" variant="outline" size="xs"
+                      class="cursor-pointer rounded-lg hover:bg-amber-50" @click="editSubject(subject)" />
+                    <UButton label="ลบ" icon="i-lucide-trash" color="error" variant="ghost" size="xs"
+                      class="cursor-pointer rounded-lg hover:bg-red-50" @click="confirmDeleteSubject(subject)" />
                   </div>
                 </div>
               </div>
@@ -601,15 +476,11 @@
 
     <!-- ตารางสอน Section Header -->
     <div
-      class="container mx-auto flex flex-col md:flex-row justify-between items-center mt-12 mb-6 gap-6 bg-white p-6 rounded-2xl border border-slate-200 shadow-sm"
-    >
+      class="container mx-auto flex flex-col md:flex-row justify-between items-center mt-12 mb-6 gap-6 bg-white p-6 rounded-2xl border border-slate-200 shadow-sm">
       <div class="flex-1">
         <h2 class="text-2xl font-bold text-slate-900 flex items-center gap-3 uppercase">
           <div class="w-10 h-10 bg-indigo-50 rounded-xl flex items-center justify-center border border-indigo-100">
-            <UIcon
-              name="i-heroicons-calendar-days"
-              class="text-xl text-indigo-600"
-            />
+            <UIcon name="i-heroicons-calendar-days" class="text-xl text-indigo-600" />
           </div>
           ตารางสอน
         </h2>
@@ -621,195 +492,123 @@
       <div class="flex flex-wrap items-center gap-4">
         <!-- ปุ่มบันทึกตารางสอน -->
         <div class="flex gap-2">
-          <UButton
-            label="ลงวิชาทีละหลายชั่วโมง"
-            icon="i-heroicons-calendar-days"
-            color="primary"
-            variant="solid"
-            size="xl"
-            class="cursor-pointer rounded-xl font-bold"
-            @click="quickAddOpen = true"
-          />
-          <UButton
-            label="บันทึกตาราง"
-            color="primary"
-            icon="i-heroicons-check-circle"
-            size="xl"
-            class="cursor-pointer px-6 rounded-xl font-bold shadow-lg shadow-blue-500/20"
-            :loading="saving"
-            @click="saveSchedule"
-          />
-          <UButton
-            label="ล้างตาราง"
-            color="error"
-            variant="soft"
-            icon="i-heroicons-trash"
-            size="xl"
-            class="cursor-pointer px-4 rounded-xl font-bold"
-            @click="clearSchedule"
-          />
+          <UButton label="ลงวิชาทีละหลายชั่วโมง" icon="i-heroicons-calendar-days" color="primary" variant="solid"
+            size="xl" class="cursor-pointer rounded-xl font-bold" @click="quickAddOpen = true" />
+          <UButton label="บันทึกตาราง" color="primary" icon="i-heroicons-check-circle" size="xl"
+            class="cursor-pointer px-6 rounded-xl font-bold shadow-lg shadow-blue-500/20" :loading="saving"
+            @click="saveSchedule" />
+          <UButton label="ล้างตาราง" color="error" variant="soft" icon="i-heroicons-trash" size="xl"
+            class="cursor-pointer px-4 rounded-xl font-bold" @click="clearSchedule" />
         </div>
 
         <div class="h-8 w-px bg-slate-200 mx-2 hidden md:block" />
 
         <div class="min-w-[200px]">
           <label
-            class="block text-lg font-bold text-slate-400 uppercase tracking-widest mb-1.5 ml-1"
-          >เทอมที่แสดง</label>
-          <USelect
-            v-model="selectedTerm"
-            placeholder="เลือกภาคการศึกษา"
-            color="primary"
-            variant="outline"
-            size="xl"
-            :items="termOptions"
-            class="w-full"
-            icon="i-heroicons-academic-cap"
-            :ui="{ base: 'bg-white border-slate-200 text-slate-900 rounded-2xl shadow-xs' }"
-          />
+            class="block text-lg font-bold text-slate-400 uppercase tracking-widest mb-1.5 ml-1">เทอมที่แสดง</label>
+          <USelect v-model="selectedTerm" placeholder="เลือกภาคการศึกษา" color="primary" variant="outline" size="xl"
+            :items="termOptions" class="w-full" icon="i-heroicons-academic-cap"
+            :ui="{ base: 'bg-white border-slate-200 text-slate-900 rounded-2xl shadow-xs' }" />
         </div>
       </div>
     </div>
 
     <div class="container mx-auto">
-      <div
-        v-if="!selectedTerm"
-        class="text-center text-slate-400 py-10 font-medium italic"
-      >
+      <div v-if="!selectedTerm" class="text-center text-slate-400 py-10 font-medium italic">
         กรุณาเลือกภาคการศึกษาเพื่อแสดง/จัดการตารางสอน
       </div>
 
       <!-- ตารางสอน -->
-      <div
-        v-else
-        class="mt-4 overflow-x-auto pb-6 custom-scrollbar"
-      >
+      <div v-else class="mt-4 overflow-x-auto pb-6 custom-scrollbar">
         <div class="min-w-fit md:min-w-full p-1">
           <div
-            class="grid grid-cols-[80px_repeat(13,minmax(85px,1fr))] text-center border border-slate-200 rounded-2xl overflow-hidden shadow-sm bg-white"
-          >
+            class="grid grid-cols-[80px_repeat(13,minmax(85px,1fr))] text-center border border-slate-200 rounded-2xl overflow-hidden shadow-sm bg-white">
             <!-- แสดงเวลา Header -->
             <div
-              class="bg-slate-50 font-bold border-r border-b border-slate-200 flex items-center justify-center text-slate-700 sticky left-0 z-40 p-2 text-sm uppercase tracking-wider"
-            >
+              class="bg-slate-50 font-bold border-r border-b border-slate-200 flex items-center justify-center text-slate-700 sticky left-0 z-40 p-2 text-sm uppercase tracking-wider">
               วัน / เวลา
             </div>
-            <div
-              v-for="time in timeSlots"
-              :key="time"
-              class="bg-slate-50 p-2 text-center text-xs font-bold border-b border-r border-slate-200 last:border-r-0 text-slate-500 uppercase tracking-tighter"
-            >
+            <div v-for="time in timeSlots" :key="time"
+              class="bg-slate-50 p-2 text-center text-xs font-bold border-b border-r border-slate-200 last:border-r-0 text-slate-500 uppercase tracking-tighter">
               {{ time }}
             </div>
 
             <!-- ลูปทุกวัน -->
-            <template
-              v-for="(day, dayIndex) in days"
-              :key="dayIndex"
-            >
+            <template v-for="(day, dayIndex) in days" :key="dayIndex">
               <div
-                class="border-r border-b border-slate-200 p-2 text-center bg-slate-50 text-slate-700 flex items-center justify-center font-bold sticky left-0 z-40 text-lg min-h-[90px]"
-              >
+                class="border-r border-b border-slate-200 p-2 text-center bg-slate-50 text-slate-700 flex items-center justify-center font-bold sticky left-0 z-40 text-lg min-h-[90px]">
                 {{ day }}
               </div>
 
               <!-- ช่วงเวลาทั้งหมด 13 ช่อง (แสดงแบบ Merge ตาม displaySlots) -->
-              <template
-                v-for="(slot, gIndex) in displaySlots[dayIndex]"
-                :key="`${dayIndex}-${slot.originalIndex}`"
-              >
+              <template v-for="(slot, gIndex) in displaySlots[dayIndex]" :key="`${dayIndex}-${slot.originalIndex}`">
                 <!-- ช่วงปกติ (ข้ามคาบที่ 5/index 4 พักเที่ยง) -->
-                <div
-                  v-if="!slot.isLunch"
+                <div v-if="!slot.isLunch"
                   class="relative border-r border-b border-slate-200 last:border-r-0 min-h-[90px]"
-                  :style="{ gridColumn: `span ${slot.span}`, minWidth: `${slot.span * 85}px` }"
-                >
+                  :style="{ gridColumn: `span ${slot.span}`, minWidth: `${slot.span * 85}px` }">
                   <div
                     class="absolute inset-0 cursor-pointer transition-all flex flex-col items-center justify-center text-center gap-1.5"
                     :class="[
                       slot.value ? 'bg-blue-50 hover:bg-blue-100 font-bold text-blue-700 border border-blue-100/50 m-1 rounded-xl shadow-xs' : 'bg-transparent hover:bg-slate-50 text-slate-300',
                       isActiveBox(dayIndex, slot.originalIndex) ? 'ring-2 ring-inset ring-blue-500 bg-blue-50' : ''
-                    ]"
-                    @click="toggleDropdown(dayIndex, slot.originalIndex)"
-                  >
+                    ]" @click="toggleDropdown(dayIndex, slot.originalIndex)">
                     <template v-if="slot.value">
                       <span class="text-xs line-clamp-2 leading-tight">
                         {{ getSubjectLabel(slot.value, slot.room_id, slot.section_ids) }}
                       </span>
                     </template>
-                    <span
-                      v-else
-                      class="text-md"
-                    >ว่าง</span>
+                    <span v-else class="text-md">ว่าง</span>
                   </div>
 
                   <!-- Dropdown -->
-                  <div
-                    v-if="isActiveBox(dayIndex, slot.originalIndex)"
+                  <div v-if="isActiveBox(dayIndex, slot.originalIndex)"
                     class="absolute z-50 w-56 bg-white border border-slate-200 rounded-2xl shadow-xl overflow-hidden py-1 animate-in fade-in zoom-in duration-200"
                     :class="[
                       dayIndex >= 4 ? 'bottom-full mb-2' : 'top-full mt-2',
                       slot.originalIndex <= 1 ? 'left-0' : slot.originalIndex >= 10 ? 'right-0' : 'left-1/2 -translate-x-1/2'
-                    ]"
-                  >
+                    ]">
                     <div class="max-h-80 overflow-y-auto custom-scrollbar">
                       <button
                         class="w-full text-left px-4 py-2.5 hover:bg-red-50 text-red-600 text-[11px] font-bold border-b border-slate-50 flex items-center gap-2 transition-colors"
-                        @click="setSlotValue(dayIndex, slot.originalIndex, null, slot.span)"
-                      >
-                        <UIcon
-                          name="i-lucide-trash"
-                          class="text-red-500 text-sm"
-                        />
+                        @click="setSlotValue(dayIndex, slot.originalIndex, null, slot.span)">
+                        <UIcon name="i-lucide-trash" class="text-red-500 text-sm" />
                         <span>ล้างข้อมูลคาบนี้</span>
                       </button>
 
                       <div
-                        class="px-4 py-1.5 text-[9px] font-bold text-slate-400 bg-slate-50/80 uppercase tracking-widest mt-1"
-                      >
+                        class="px-4 py-1.5 text-[9px] font-bold text-slate-400 bg-slate-50/80 uppercase tracking-widest mt-1">
                         เลือกรายวิชา
                       </div>
-                      <button
-                        v-for="opt in subjectOptions"
-                        :key="opt.value"
+                      <button v-for="opt in subjectOptions" :key="opt.value"
                         class="w-full text-left px-4 py-2 hover:bg-blue-50 text-slate-700 text-[11px] truncate transition-colors font-medium border-l-4 border-transparent"
                         :class="{ 'bg-blue-50 border-blue-500 text-blue-700': slot.value === opt.value }"
-                        @click="setSlotValue(dayIndex, slot.originalIndex, opt.value, slot.span)"
-                      >
+                        @click="setSlotValue(dayIndex, slot.originalIndex, opt.value, slot.span)">
                         {{ opt.label }}
                       </button>
 
                       <template v-if="slot.value">
                         <div
-                          class="px-4 py-1.5 text-[9px] font-bold text-slate-400 bg-slate-50/80 uppercase tracking-widest mt-2"
-                        >
+                          class="px-4 py-1.5 text-[9px] font-bold text-slate-400 bg-slate-50/80 uppercase tracking-widest mt-2">
                           กลุ่มเรียน (Sections)
                         </div>
-                        <div
-                          v-for="sec in subjects.find(s => s.id_subject == slot.value)?.sections"
+                        <div v-for="sec in subjects.find(s => s.id_subject == slot.value)?.sections"
                           :key="sec.id_section"
                           class="w-full text-left px-4 py-2 hover:bg-amber-50 text-slate-700 text-[11px] flex items-center gap-2 cursor-pointer transition-colors font-medium"
-                          @click="toggleSlotSection(dayIndex, slot.originalIndex, sec.id_section, slot.span)"
-                        >
+                          @click="toggleSlotSection(dayIndex, slot.originalIndex, sec.id_section, slot.span)">
                           <UCheckbox
                             :model-value="(scheduleSlots[dayIndex][slot.originalIndex].section_ids || []).includes(sec.id_section)"
-                            @update:model-value="toggleSlotSection(dayIndex, slot.originalIndex, sec.id_section, slot.span)"
-                          />
+                            @update:model-value="toggleSlotSection(dayIndex, slot.originalIndex, sec.id_section, slot.span)" />
                           <span class="truncate">{{ sec.section_name }}</span>
                         </div>
 
                         <div
-                          class="px-4 py-1.5 text-[9px] font-bold text-slate-400 bg-slate-50/80 uppercase tracking-widest mt-2"
-                        >
+                          class="px-4 py-1.5 text-[9px] font-bold text-slate-400 bg-slate-50/80 uppercase tracking-widest mt-2">
                           ห้องเรียน (คาบนี้)
                         </div>
-                        <button
-                          v-for="room in roomOptions"
-                          :key="room.value"
+                        <button v-for="room in roomOptions" :key="room.value"
                           class="w-full text-left px-4 py-2 hover:bg-indigo-50 text-slate-600 text-[11px] truncate transition-colors font-medium"
                           :class="{ 'bg-indigo-50 text-indigo-700': slot.room_id === room.value }"
-                          @click="setSlotRoom(dayIndex, slot.originalIndex, room.value, slot.span)"
-                        >
+                          @click="setSlotRoom(dayIndex, slot.originalIndex, room.value, slot.span)">
                           {{ room.label || 'ไม่ระบุห้อง' }}
                         </button>
                       </template>
@@ -818,10 +617,8 @@
                 </div>
 
                 <!-- ช่อง พักกลางวัน -->
-                <div
-                  v-else
-                  class="border-r border-b border-slate-200 p-1 text-center bg-slate-50 text-slate-400 font-bold flex items-center justify-center text-md select-none uppercase tracking-tighter min-h-[90px]"
-                >
+                <div v-else
+                  class="border-r border-b border-slate-200 p-1 text-center bg-slate-50 text-slate-400 font-bold flex items-center justify-center text-md select-none uppercase tracking-tighter min-h-[90px]">
                   พักกลางวัน
                 </div>
               </template>
@@ -848,9 +645,13 @@ const editSubjectName = ref('')
 const currentEditSubject = ref(null)
 const deleteOpen = ref(false)
 const subjectToDelete = ref(null)
-const subjectName = ref('')
+const selectedAddPlanId = ref(null)
+const selectedAddSubjectId = ref(null)
 const selectedSections = ref([])
 const editSelectedSections = ref([])
+const editSelectedPlanId = ref(null)
+const editSelectedSubjectId = ref(null)
+const editLegacySubjectName = ref('')
 const saving = ref(false)
 
 // Quick Add Subject to Schedule states
@@ -869,6 +670,51 @@ const { data: teachers, pending } = await useFetch('/api/teachers')
 const { data: terms } = await useFetch('/api/terms')
 // sections เป็น master table ไม่ขึ้นกับ term — fetch ครั้งเดียวพอ
 const { data: sections, refresh: refreshSections, status: sectionsStatus } = await useFetch('/api/sections')
+const { data: studyPlans } = await useFetch('/api/study-plans')
+
+const studyPlanOptions = computed(() => {
+  if (!studyPlans.value) return []
+  return studyPlans.value.map(p => ({ value: p.id_plan, label: p.name_plan }))
+})
+
+// Helper to strictly get the primitive value from select boxes
+const getRawValue = (val) => {
+  if (val && typeof val === 'object' && 'value' in val) return val.value
+  return val
+}
+
+// Variables for fetching subjects dynamically
+const availableAddSubjectOptions = ref([])
+watch(selectedAddPlanId, async (newVal) => {
+  selectedAddSubjectId.value = null
+  const planId = getRawValue(newVal)
+  if (!planId) {
+    availableAddSubjectOptions.value = []
+    return
+  }
+  const subs = await $fetch('/api/study-plan-subjects', { query: { id_plan: planId } })
+  availableAddSubjectOptions.value = subs.map(s => ({ value: s.id_subject_curr, label: `${s.subject_code || ''} ${s.name_subject}`, name_subject: s.name_subject }))
+})
+
+const availableEditSubjectOptions = ref([])
+watch(editSelectedPlanId, async (newVal) => {
+  editSelectedSubjectId.value = null
+  const planId = getRawValue(newVal)
+  if (!planId) {
+    availableEditSubjectOptions.value = []
+    return
+  }
+  const subs = await $fetch('/api/study-plan-subjects', { query: { id_plan: planId } })
+  availableEditSubjectOptions.value = subs.map(s => ({ value: s.id_subject_curr, label: `${s.subject_code || ''} ${s.name_subject}`, name_subject: s.name_subject }))
+})
+
+const computedEditSubjectName = computed(() => {
+  if (editSelectedSubjectId.value) {
+    const s = availableEditSubjectOptions.value.find(s => s.value === editSelectedSubjectId.value)
+    return s ? s.label : editLegacySubjectName.value
+  }
+  return editLegacySubjectName.value
+})
 
 const termOptions = computed(() => {
   if (!terms.value || terms.value.length === 0) return []
@@ -1130,22 +976,29 @@ const getSubjectLabel = (val, roomId = null, sectionIds = null) => {
 }
 
 const addSubject = async () => {
-  if (!subjectName.value || selectedSections.value.length === 0) {
-    toast.add({ title: 'ข้อผิดพลาด', description: 'กรุณากรอกชื่อวิชาและคุณกลุ่มเรียน อย่างน้อย 1 กลุ่ม', color: 'red' })
+  const subjectId = getRawValue(selectedAddSubjectId.value)
+  if (!subjectId || selectedSections.value.length === 0) {
+    toast.add({ title: 'ข้อผิดพลาด', description: 'กรุณาเลือกวิชา และคุณกลุ่มเรียน อย่างน้อย 1 กลุ่ม', color: 'red' })
     return
   }
+
+  const selectedSubjectData = availableAddSubjectOptions.value.find(s => s.value === subjectId)
+  if (!selectedSubjectData) return
+
   try {
     const res = await $fetch('/api/Subjects', {
       method: 'POST',
       body: {
-        name_subject: subjectName.value,
+        name_subject: selectedSubjectData.name_subject, // Provide default name
+        curriculum_subject_id: selectedSubjectData.value, // Send ID
         id_teacher: id,
         id_sections: selectedSections.value,
         term: selectedTerm.value
       }
     })
     toast.add({ title: 'สำเร็จ', description: 'เพิ่มรายวิชาเรียบร้อยแล้ว', color: 'primary' })
-    subjectName.value = ''
+    selectedAddPlanId.value = null
+    selectedAddSubjectId.value = null
     selectedSections.value = []
     await refreshSubjects()
   } catch (err) {
@@ -1184,22 +1037,39 @@ const deleteSubject = async () => {
 
 const editSubject = (subject) => {
   currentEditSubject.value = subject
-  editSubjectName.value = subject.name_subject
+  editLegacySubjectName.value = subject.name_subject
+  editSelectedPlanId.value = null
+  editSelectedSubjectId.value = null
   // Get existing sections for this subject
   editSelectedSections.value = subject.sections ? subject.sections.map(s => s.id_section) : []
   editOpen.value = true
 }
 
 const updateSubject = async () => {
-  if (!editSubjectName.value || editSelectedSections.value.length === 0) {
-    toast.add({ title: 'ข้อผิดพลาด', description: 'กรุณากรอกชื่อวิชาและคุณกลุ่มเรียน อย่างน้อย 1 กลุ่ม', color: 'red' })
+  if (editSelectedSections.value.length === 0) {
+    toast.add({ title: 'ข้อผิดพลาด', description: 'กรุณาเลือกกลุ่มเรียน อย่างน้อย 1 กลุ่ม', color: 'red' })
     return
   }
+
+  let newName = editLegacySubjectName.value
+  let newCurrId = currentEditSubject.value.curriculum_subject_id || null
+
+  const subjectId = getRawValue(editSelectedSubjectId.value)
+
+  if (subjectId) {
+    const s = availableEditSubjectOptions.value.find(s => s.value === subjectId)
+    if (s) {
+      newName = s.name_subject
+      newCurrId = s.value
+    }
+  }
+
   try {
     await $fetch(`/api/Subjects/${currentEditSubject.value.id_subject}`, {
       method: 'PUT',
       body: {
-        name_subject: editSubjectName.value,
+        name_subject: newName,
+        curriculum_subject_id: newCurrId,
         id_sections: editSelectedSections.value
       }
     })
@@ -1380,4 +1250,3 @@ watch(scheduleError, (err) => {
   if (err) console.error('[Schedule] API Error:', err)
 })
 </script>
-
diff --git a/server/api/study-plan-subjects/index.js b/server/api/study-plan-subjects/index.js
index e3b3bd6..2602574 100644
--- a/server/api/study-plan-subjects/index.js
+++ b/server/api/study-plan-subjects/index.js
@@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => {
         JOIN curriculum_subjects cs ON sps.id_subject_curr = cs.id_subject_curr
         LEFT JOIN curriculum_categories cc ON cs.id_category = cc.id_category
         WHERE sps.id_plan = ?
-        ORDER BY cc.id_category ASC, cs.subject_code ASC
+        ORDER BY sps.year ASC, sps.semester ASC, cc.id_category ASC, cs.subject_code ASC
       `).all(query.id_plan)
     }
     return []
@@ -21,10 +21,12 @@ export default defineEventHandler(async (event) => {
     if (!body.id_plan || !body.id_subject_curr) {
       throw createError({ statusCode: 400, statusMessage: 'id_plan and id_subject_curr are required' })
     }
+    const year = body.year || 1
+    const semester = body.semester || 1
 
     try {
-      const stmt = db.prepare('INSERT INTO study_plan_subjects (id_plan, id_subject_curr) VALUES (?, ?)')
-      const result = stmt.run(body.id_plan, body.id_subject_curr)
+      const stmt = db.prepare('INSERT INTO study_plan_subjects (id_plan, id_subject_curr, year, semester) VALUES (?, ?, ?, ?)')
+      const result = stmt.run(body.id_plan, body.id_subject_curr, year, semester)
       
       // Fetch details back
       const inserted = db.prepare(`
diff --git a/server/api/study-plans/[id].js b/server/api/study-plans/[id].js
index 1d42a9b..2a6b41e 100644
--- a/server/api/study-plans/[id].js
+++ b/server/api/study-plans/[id].js
@@ -5,12 +5,14 @@ export default defineEventHandler(async (event) => {
 
   if (event.node.req.method === 'PUT') {
     const body = await readBody(event)
-    if (!body.name_plan || !body.level || !body.year || !body.semester) {
-      throw createError({ statusCode: 400, statusMessage: 'All fields are required' })
+    if (!body.name_plan || !body.level) {
+      throw createError({ statusCode: 400, statusMessage: 'Name and level are required' })
     }
+    const year = body.year || 0
+    const semester = body.semester || 0
 
     const stmt = db.prepare('UPDATE study_plans SET name_plan = ?, level = ?, year = ?, semester = ? WHERE id_plan = ?')
-    const result = stmt.run(body.name_plan, body.level, body.year, body.semester, id)
+    const result = stmt.run(body.name_plan, body.level, year, semester, id)
     
     if (result.changes === 0) {
       throw createError({ statusCode: 404, statusMessage: 'Study Plan not found' })
diff --git a/server/api/study-plans/index.js b/server/api/study-plans/index.js
index 07a5745..5b5a891 100644
--- a/server/api/study-plans/index.js
+++ b/server/api/study-plans/index.js
@@ -4,26 +4,28 @@ export default defineEventHandler(async (event) => {
   if (event.node.req.method === 'GET') {
     const query = getQuery(event)
     if (query.id_curriculum) {
-      return db.prepare('SELECT * FROM study_plans WHERE id_curriculum = ? ORDER BY year ASC, semester ASC').all(query.id_curriculum)
+      return db.prepare('SELECT * FROM study_plans WHERE id_curriculum = ? ORDER BY created_at DESC').all(query.id_curriculum)
     }
-    return db.prepare('SELECT * FROM study_plans ORDER BY id_curriculum ASC, year ASC, semester ASC').all()
+    return db.prepare('SELECT * FROM study_plans ORDER BY id_curriculum ASC, created_at DESC').all()
   }
 
   if (event.node.req.method === 'POST') {
     const body = await readBody(event)
-    if (!body.id_curriculum || !body.name_plan || !body.level || !body.year || !body.semester) {
-      throw createError({ statusCode: 400, statusMessage: 'All fields are required' })
+    if (!body.id_curriculum || !body.name_plan || !body.level) {
+      throw createError({ statusCode: 400, statusMessage: 'Curriculum ID, name, and level are required' })
     }
+    const year = body.year || 0
+    const semester = body.semester || 0
 
     const stmt = db.prepare('INSERT INTO study_plans (id_curriculum, name_plan, level, year, semester) VALUES (?, ?, ?, ?, ?)')
-    const result = stmt.run(body.id_curriculum, body.name_plan, body.level, body.year, body.semester)
+    const result = stmt.run(body.id_curriculum, body.name_plan, body.level, year, semester)
     return {
       id_plan: result.lastInsertRowid,
       id_curriculum: body.id_curriculum,
       name_plan: body.name_plan,
       level: body.level,
-      year: body.year,
-      semester: body.semester
+      year: year,
+      semester: semester
     }
   }
 })
diff --git a/server/data/data.db b/server/data/data.db
index fae60eb20622ffe11f1526cef18591375e1a9c18..0315f432d9fd7c39d1d8d80f0cca8c8315878e00 100644
GIT binary patch
delta 21312
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

delta 845
zcma)3TS!z<6utZ0bLXYEGdj}@zNQ&JGO2MMIy%_{b*N1I7}HX;D5FUX2Omrj_|agI
zkYF?2^hiQ!L?2OVUhzhx*+)Tv)TBQ}Pmn+&tRN^%>`Xx~DEe5NwHEsv_S!o<WeN`%
zBdN*wEyr;c3>z6RgE_j+ZDMZDNu$6dkVRHGGg%b-u7x^?E?}+NQo|gRc2p1gG;*5L
z5g$kHkQp*Wo|6ycJZU2Bq?-6-+ej9Xe2zmfAP+f0NwQ5JNRYziSneu+hM8K{$PKli
zW^9{A9&X(6nurljt3Jn(TA~q`#lC2$UvlaX$OI-479)I2j`5wq7}`ps4NxFS!c&zP
z0f#Sx+A3icy|)WQWwaU=RB}W-h`is1t<qVo*`lg|Gk}F7CkR@xTKt%JHL*=MtZULP
zX<OAXb(yM6ZAMSfZkU6^V3BP4cbc8)DzhU4g3_R9ROT9B2^-WUoWX21!?Bc5{r;vv
zTXS=eCI(@ezG{NC8n%@<IOTB=vXDezQAw+WGs1WaWVW)DXEk(W9&qQ>JSbE1sOWCg
zuNHaspp?PSP(fp3_=uwaf@+a6@EP65KWhMK_P88wPyTu>eKCZsg2!9v%4dUqQt%X?
z(?V}I@?*5S7-v#zDJFEH7~81-I^IlA#o2G(rtwF7Iw;m$T!N|fJ(MX|3UG~A1ws-h
zB+<c(__)%&j|ZSPXOV$Etmg?Get<+eF^iIWFW_5BxC?h6#Wuq)=q`nEOYcjh!gfxu
zvy?_5wP){24R^Ud1#)xi>e@4V{Bh}vOS*jxPNS0oN}wCEvHtJus1{j%X=(h?{GUu=
zA4Ku^8#IGm-`BRn?R4kcogTY8-|EaObh!%i+<#c!Lbr#Vfs<VACR(J%qB7l&Z~W^N
IEUyK=0@1_up#T5?

diff --git a/server/utils/db.js b/server/utils/db.js
index 19ea07c..ab60efa 100644
--- a/server/utils/db.js
+++ b/server/utils/db.js
@@ -13,6 +13,62 @@ if (!existsSync(dbDir)) {
 const dbPath = resolve(dbDir, 'data.db')
 const db = new Database(dbPath)
 
+// curriculums
+db.exec(`
+  CREATE TABLE IF NOT EXISTS curriculums (
+    id_curriculum INTEGER PRIMARY KEY AUTOINCREMENT,
+    name_curriculum TEXT NOT NULL UNIQUE,
+    description TEXT,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+  );`)
+
+// curriculum_categories
+db.exec(`
+  CREATE TABLE IF NOT EXISTS curriculum_categories (
+    id_category INTEGER PRIMARY KEY AUTOINCREMENT,
+    id_curriculum INTEGER NOT NULL,
+    parent_id INTEGER,
+    name_category TEXT NOT NULL,
+    FOREIGN KEY (id_curriculum) REFERENCES curriculums(id_curriculum) ON DELETE CASCADE,
+    FOREIGN KEY (parent_id) REFERENCES curriculum_categories(id_category) ON DELETE CASCADE
+  );`)
+
+// curriculum_subjects
+db.exec(`
+  CREATE TABLE IF NOT EXISTS curriculum_subjects (
+    id_subject_curr INTEGER PRIMARY KEY AUTOINCREMENT,
+    id_category INTEGER NOT NULL,
+    subject_code TEXT,
+    name_subject TEXT NOT NULL,
+    FOREIGN KEY (id_category) REFERENCES curriculum_categories(id_category) ON DELETE CASCADE
+  );`)
+
+// study_plans
+db.exec(`
+  CREATE TABLE IF NOT EXISTS study_plans (
+    id_plan INTEGER PRIMARY KEY AUTOINCREMENT,
+    id_curriculum INTEGER NOT NULL,
+    name_plan TEXT NOT NULL,
+    level TEXT NOT NULL,
+    year INTEGER NOT NULL,
+    semester INTEGER NOT NULL,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (id_curriculum) REFERENCES curriculums(id_curriculum) ON DELETE CASCADE
+  );`)
+
+// study_plan_subjects
+db.exec(`
+  CREATE TABLE IF NOT EXISTS study_plan_subjects (
+    id_plan_subject INTEGER PRIMARY KEY AUTOINCREMENT,
+    id_plan INTEGER NOT NULL,
+    id_subject_curr INTEGER NOT NULL,
+    year INTEGER DEFAULT 1,
+    semester INTEGER DEFAULT 1,
+    FOREIGN KEY (id_plan) REFERENCES study_plans(id_plan) ON DELETE CASCADE,
+    FOREIGN KEY (id_subject_curr) REFERENCES curriculum_subjects(id_subject_curr) ON DELETE CASCADE,
+    UNIQUE(id_plan, id_subject_curr)
+  );`)
+
 // teachers
 db.exec(`
   CREATE TABLE IF NOT EXISTS teachers (
@@ -106,6 +162,17 @@ try {
     db.exec('ALTER TABLE teachers DROP COLUMN subject')
     console.log('Migrated teachers table: removed unused subject column')
   }
+  // Migration: Add year and semester to study_plan_subjects
+  const spsTableInfo = db.prepare('PRAGMA table_info(study_plan_subjects)').all()
+  if (!spsTableInfo.some(col => col.name === 'year')) {
+    db.exec('ALTER TABLE study_plan_subjects ADD COLUMN year INTEGER DEFAULT 1')
+    console.log('Migrated study_plan_subjects table: added year column')
+  }
+  if (!spsTableInfo.some(col => col.name === 'semester')) {
+    db.exec('ALTER TABLE study_plan_subjects ADD COLUMN semester INTEGER DEFAULT 1')
+    console.log('Migrated study_plan_subjects table: added semester column')
+  }
+
 } catch (err) {
   console.error('Migration error:', err)
 }
@@ -331,6 +398,12 @@ try {
   // Add index for Subjects term
   db.exec('CREATE INDEX IF NOT EXISTS idx_subjects_term ON Subjects(term)')
 
+  // Add curriculum_subject_id to Subjects if missing
+  if (!subjectInfo.some(col => col.name === 'curriculum_subject_id')) {
+    db.exec('ALTER TABLE Subjects ADD COLUMN curriculum_subject_id INTEGER REFERENCES curriculum_subjects(id_subject_curr) ON DELETE SET NULL')
+    console.log('Migrated Subjects table: added curriculum_subject_id column')
+  }
+
   // 2. Sections/Terms Restructuring
   const sectionInfo = db.prepare('PRAGMA table_info(sections)').all()
   if (sectionInfo.some(col => col.name === 'term')) {

From fcb4139c287d332a7245265688e1544e1c45bbf1 Mon Sep 17 00:00:00 2001
From: Kyle2772547 <restrixt@gmail.com>
Date: Wed, 27 May 2026 12:26:13 +0700
Subject: [PATCH 3/5] feature: paint subjects

---
 app/pages/curriculums.vue  |   2 +-
 app/pages/teacher/[id].vue | 323 +++++++++++++++++++++++++------------
 server/data/data.db        | Bin 368640 -> 376832 bytes
 3 files changed, 218 insertions(+), 107 deletions(-)

diff --git a/app/pages/curriculums.vue b/app/pages/curriculums.vue
index 5bbc8c8..f3cf321 100644
--- a/app/pages/curriculums.vue
+++ b/app/pages/curriculums.vue
@@ -313,7 +313,7 @@
           </div>
         </div>
 
-        <div v-else
+        <div v-else-if="!curriculums || !curriculums.length"
           class="bg-white rounded-2xl py-20 border border-slate-200 shadow-sm flex flex-col items-center justify-center">
           <UIcon name="i-heroicons-academic-cap" class="text-6xl text-slate-200 mb-4" />
           <p class="text-slate-500 font-medium text-lg">กรุณาเลือกหรือสร้างหลักสูตรเพื่อเริ่มต้นจัดการ</p>
diff --git a/app/pages/teacher/[id].vue b/app/pages/teacher/[id].vue
index 5b5bbb9..3ffd5bb 100644
--- a/app/pages/teacher/[id].vue
+++ b/app/pages/teacher/[id].vue
@@ -203,9 +203,8 @@
                           <div>
                             <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">แผนการเรียน
                             </h3>
-                            <USelectMenu v-model="selectedAddPlanId" :items="studyPlanOptions"
-                              value-attribute="value" option-attribute="label"
-                              placeholder="เลือกแผนการเรียน" size="xl" class="w-full"
+                            <USelectMenu v-model="selectedAddPlanId" :items="studyPlanOptions" value-attribute="value"
+                              option-attribute="label" placeholder="เลือกแผนการเรียน" size="xl" class="w-full"
                               :ui="{ base: 'bg-white border-slate-200 text-slate-900 focus:ring-blue-500 rounded-2xl shadow-xs break-words whitespace-normal text-left h-auto py-2' }">
                               <template #item="{ item }">
                                 <span class="whitespace-normal break-words text-left w-full block py-0.5">
@@ -217,8 +216,8 @@
                           <div>
                             <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">วิชา</h3>
                             <USelectMenu v-model="selectedAddSubjectId" :items="availableAddSubjectOptions"
-                              value-attribute="value" option-attribute="label"
-                              placeholder="เลือกวิชา" size="xl" :disabled="!selectedAddPlanId" class="w-full"
+                              value-attribute="value" option-attribute="label" placeholder="เลือกวิชา" size="xl"
+                              :disabled="!selectedAddPlanId" class="w-full"
                               :ui="{ base: 'bg-white border-slate-200 text-slate-900 focus:ring-blue-500 rounded-2xl shadow-xs break-words whitespace-normal text-left h-auto py-2' }">
                               <template #item="{ item }">
                                 <span class="whitespace-normal break-words text-left w-full block py-0.5">
@@ -304,9 +303,8 @@
                           <div>
                             <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">แผนการเรียน
                               (เพื่อเปลี่ยนวิชา)</h3>
-                            <USelectMenu v-model="editSelectedPlanId" :items="studyPlanOptions"
-                              value-attribute="value" option-attribute="label"
-                              placeholder="ไม่เปลี่ยน" size="xl" class="w-full"
+                            <USelectMenu v-model="editSelectedPlanId" :items="studyPlanOptions" value-attribute="value"
+                              option-attribute="label" placeholder="ไม่เปลี่ยน" size="xl" class="w-full"
                               :ui="{ base: 'bg-white border-slate-200 text-slate-900 focus:ring-amber-500 rounded-2xl shadow-xs break-words whitespace-normal text-left h-auto py-2' }">
                               <template #item="{ item }">
                                 <span class="whitespace-normal break-words text-left w-full block py-0.5">
@@ -319,8 +317,8 @@
                             <h3 class="text-sm font-bold text-slate-400 uppercase tracking-widest mb-2 ml-1">วิชาใหม่
                               (เลือกจากแผน)</h3>
                             <USelectMenu v-model="editSelectedSubjectId" :items="availableEditSubjectOptions"
-                              value-attribute="value" option-attribute="label"
-                              placeholder="วิชาเดิม" size="xl" :disabled="!editSelectedPlanId" class="w-full"
+                              value-attribute="value" option-attribute="label" placeholder="วิชาเดิม" size="xl"
+                              :disabled="!editSelectedPlanId" class="w-full"
                               :ui="{ base: 'bg-white border-slate-200 text-slate-900 focus:ring-amber-500 rounded-2xl shadow-xs break-words whitespace-normal text-left h-auto py-2' }">
                               <template #item="{ item }">
                                 <span class="whitespace-normal break-words text-left w-full block py-0.5">
@@ -518,111 +516,151 @@
         กรุณาเลือกภาคการศึกษาเพื่อแสดง/จัดการตารางสอน
       </div>
 
-      <!-- ตารางสอน -->
-      <div v-else class="mt-4 overflow-x-auto pb-6 custom-scrollbar">
-        <div class="min-w-fit md:min-w-full p-1">
-          <div
-            class="grid grid-cols-[80px_repeat(13,minmax(85px,1fr))] text-center border border-slate-200 rounded-2xl overflow-hidden shadow-sm bg-white">
-            <!-- แสดงเวลา Header -->
-            <div
-              class="bg-slate-50 font-bold border-r border-b border-slate-200 flex items-center justify-center text-slate-700 sticky left-0 z-40 p-2 text-sm uppercase tracking-wider">
-              วัน / เวลา
+      <!-- ตารางสอนและแถบเครื่องมือ (แสดงเมื่อเลือกเทอมแล้ว) -->
+      <div v-else class="mt-4">
+
+        <!-- Paint Mode Toolbar -->
+        <div
+          class="bg-indigo-50/50 border border-indigo-200 p-4 rounded-2xl mb-4 flex flex-col xl:flex-row gap-4 items-center shadow-inner transition-all"
+          :class="isPaintMode ? 'bg-indigo-50 ring-2 ring-indigo-500/20' : ''">
+          <div class="flex items-center gap-3 w-full xl:w-auto">
+            <USwitch v-model="isPaintMode" color="primary" size="lg" @update:model-value="togglePaintMode" />
+            <div>
+              <span class="font-bold text-indigo-900 text-lg flex items-center gap-2">
+                <UIcon name="i-lucide-paint-brush" /> โหมดวาดตาราง (Paint)
+              </span>
+              <p class="text-xs text-indigo-600/80 font-medium mt-0.5">ลากเมาส์ผ่านช่องเวลาเพื่อลงวิชาอัตโนมัติ</p>
             </div>
-            <div v-for="time in timeSlots" :key="time"
-              class="bg-slate-50 p-2 text-center text-xs font-bold border-b border-r border-slate-200 last:border-r-0 text-slate-500 uppercase tracking-tighter">
-              {{ time }}
+          </div>
+
+          <div v-if="isPaintMode"
+            class="flex-1 flex flex-col md:flex-row w-full gap-3 animate-in fade-in slide-in-from-left-4 duration-300">
+            <USelectMenu v-model="paintSubjectId"
+              :items="[{ label: '🧹 ลบวิชา (ยางลบ)', value: null }, ...subjectOptions]" value-attribute="value"
+              option-attribute="label" placeholder="-- เลือกวิชาที่จะระบาย --" size="xl" class="flex-1 shadow-sm"
+              :ui="{ base: 'bg-white border-indigo-300 text-slate-900 focus:ring-indigo-500 rounded-xl font-bold' }" />
+
+            <USelectMenu v-model="paintRoomId" :items="roomOptions" value-attribute="value" option-attribute="label"
+              placeholder="ห้องเรียน (ไม่บังคับ)" size="xl" class="w-full md:w-56 shadow-sm"
+              :disabled="paintSubjectId === null"
+              :ui="{ base: 'bg-white border-indigo-300 text-slate-900 focus:ring-indigo-500 rounded-xl' }" />
+
+            <div v-if="isDragging"
+              class="hidden md:flex items-center px-4 bg-indigo-500 text-white font-bold rounded-xl text-sm shadow-md animate-pulse">
+              กำลังวาด...
             </div>
+          </div>
+        </div>
 
-            <!-- ลูปทุกวัน -->
-            <template v-for="(day, dayIndex) in days" :key="dayIndex">
+        <!-- ตัวตารางสอน -->
+        <div class="overflow-x-auto pb-6 custom-scrollbar">
+          <div class="min-w-fit md:min-w-full p-1">
+            <div
+              class="grid grid-cols-[80px_repeat(13,minmax(85px,1fr))] text-center border border-slate-200 rounded-2xl overflow-hidden shadow-sm bg-white">
+              <!-- แสดงเวลา Header -->
               <div
-                class="border-r border-b border-slate-200 p-2 text-center bg-slate-50 text-slate-700 flex items-center justify-center font-bold sticky left-0 z-40 text-lg min-h-[90px]">
-                {{ day }}
+                class="bg-slate-50 font-bold border-r border-b border-slate-200 flex items-center justify-center text-slate-700 sticky left-0 z-40 p-2 text-sm uppercase tracking-wider">
+                วัน / เวลา
+              </div>
+              <div v-for="time in timeSlots" :key="time"
+                class="bg-slate-50 p-2 text-center text-xs font-bold border-b border-r border-slate-200 last:border-r-0 text-slate-500 uppercase tracking-tighter">
+                {{ time }}
               </div>
 
-              <!-- ช่วงเวลาทั้งหมด 13 ช่อง (แสดงแบบ Merge ตาม displaySlots) -->
-              <template v-for="(slot, gIndex) in displaySlots[dayIndex]" :key="`${dayIndex}-${slot.originalIndex}`">
-                <!-- ช่วงปกติ (ข้ามคาบที่ 5/index 4 พักเที่ยง) -->
-                <div v-if="!slot.isLunch"
-                  class="relative border-r border-b border-slate-200 last:border-r-0 min-h-[90px]"
-                  :style="{ gridColumn: `span ${slot.span}`, minWidth: `${slot.span * 85}px` }">
-                  <div
-                    class="absolute inset-0 cursor-pointer transition-all flex flex-col items-center justify-center text-center gap-1.5"
-                    :class="[
-                      slot.value ? 'bg-blue-50 hover:bg-blue-100 font-bold text-blue-700 border border-blue-100/50 m-1 rounded-xl shadow-xs' : 'bg-transparent hover:bg-slate-50 text-slate-300',
-                      isActiveBox(dayIndex, slot.originalIndex) ? 'ring-2 ring-inset ring-blue-500 bg-blue-50' : ''
-                    ]" @click="toggleDropdown(dayIndex, slot.originalIndex)">
-                    <template v-if="slot.value">
-                      <span class="text-xs line-clamp-2 leading-tight">
-                        {{ getSubjectLabel(slot.value, slot.room_id, slot.section_ids) }}
-                      </span>
-                    </template>
-                    <span v-else class="text-md">ว่าง</span>
-                  </div>
-
-                  <!-- Dropdown -->
-                  <div v-if="isActiveBox(dayIndex, slot.originalIndex)"
-                    class="absolute z-50 w-56 bg-white border border-slate-200 rounded-2xl shadow-xl overflow-hidden py-1 animate-in fade-in zoom-in duration-200"
-                    :class="[
-                      dayIndex >= 4 ? 'bottom-full mb-2' : 'top-full mt-2',
-                      slot.originalIndex <= 1 ? 'left-0' : slot.originalIndex >= 10 ? 'right-0' : 'left-1/2 -translate-x-1/2'
-                    ]">
-                    <div class="max-h-80 overflow-y-auto custom-scrollbar">
-                      <button
-                        class="w-full text-left px-4 py-2.5 hover:bg-red-50 text-red-600 text-[11px] font-bold border-b border-slate-50 flex items-center gap-2 transition-colors"
-                        @click="setSlotValue(dayIndex, slot.originalIndex, null, slot.span)">
-                        <UIcon name="i-lucide-trash" class="text-red-500 text-sm" />
-                        <span>ล้างข้อมูลคาบนี้</span>
-                      </button>
-
-                      <div
-                        class="px-4 py-1.5 text-[9px] font-bold text-slate-400 bg-slate-50/80 uppercase tracking-widest mt-1">
-                        เลือกรายวิชา
-                      </div>
-                      <button v-for="opt in subjectOptions" :key="opt.value"
-                        class="w-full text-left px-4 py-2 hover:bg-blue-50 text-slate-700 text-[11px] truncate transition-colors font-medium border-l-4 border-transparent"
-                        :class="{ 'bg-blue-50 border-blue-500 text-blue-700': slot.value === opt.value }"
-                        @click="setSlotValue(dayIndex, slot.originalIndex, opt.value, slot.span)">
-                        {{ opt.label }}
-                      </button>
+              <!-- ลูปทุกวัน -->
+              <template v-for="(day, dayIndex) in days" :key="dayIndex">
+                <div
+                  class="border-r border-b border-slate-200 p-2 text-center bg-slate-50 text-slate-700 flex items-center justify-center font-bold sticky left-0 z-40 text-lg min-h-[90px]">
+                  {{ day }}
+                </div>
 
+                <!-- ช่วงเวลาทั้งหมด 13 ช่อง (แสดงแบบ Merge ตาม displaySlots) -->
+                <template v-for="(slot, gIndex) in displaySlots[dayIndex]" :key="`${dayIndex}-${slot.originalIndex}`">
+                  <!-- ช่วงปกติ (ข้ามคาบที่ 5/index 4 พักเที่ยง) -->
+                  <div v-if="!slot.isLunch"
+                    class="relative border-r border-b border-slate-200 last:border-r-0 min-h-[90px]"
+                    :style="{ gridColumn: `span ${slot.span}`, minWidth: `${slot.span * 85}px` }">
+                    <div
+                      class="absolute inset-0 cursor-pointer transition-all flex flex-col items-center justify-center text-center gap-1.5 select-none"
+                      :class="[
+                        slot.value ? 'bg-blue-50 hover:bg-blue-100 font-bold text-blue-700 border border-blue-100/50 m-1 rounded-xl shadow-xs' : 'bg-transparent hover:bg-slate-50 text-slate-300',
+                        isActiveBox(dayIndex, slot.originalIndex) ? 'ring-2 ring-inset ring-blue-500 bg-blue-50' : '',
+                        isPaintMode ? 'cursor-crosshair hover:bg-indigo-50 border border-dashed hover:border-indigo-300 transition-colors' : ''
+                      ]" @click="toggleDropdown(dayIndex, slot.originalIndex)"
+                      @mousedown="startDrag(dayIndex, slot.originalIndex)"
+                      @mouseenter="onDragOver(dayIndex, slot.originalIndex)">
                       <template v-if="slot.value">
-                        <div
-                          class="px-4 py-1.5 text-[9px] font-bold text-slate-400 bg-slate-50/80 uppercase tracking-widest mt-2">
-                          กลุ่มเรียน (Sections)
-                        </div>
-                        <div v-for="sec in subjects.find(s => s.id_subject == slot.value)?.sections"
-                          :key="sec.id_section"
-                          class="w-full text-left px-4 py-2 hover:bg-amber-50 text-slate-700 text-[11px] flex items-center gap-2 cursor-pointer transition-colors font-medium"
-                          @click="toggleSlotSection(dayIndex, slot.originalIndex, sec.id_section, slot.span)">
-                          <UCheckbox
-                            :model-value="(scheduleSlots[dayIndex][slot.originalIndex].section_ids || []).includes(sec.id_section)"
-                            @update:model-value="toggleSlotSection(dayIndex, slot.originalIndex, sec.id_section, slot.span)" />
-                          <span class="truncate">{{ sec.section_name }}</span>
-                        </div>
+                        <span class="text-xs line-clamp-2 leading-tight">
+                          {{ getSubjectLabel(slot.value, slot.room_id, slot.section_ids) }}
+                        </span>
+                      </template>
+                      <span v-else class="text-md">ว่าง</span>
+                    </div>
+
+                    <!-- Dropdown -->
+                    <div v-if="isActiveBox(dayIndex, slot.originalIndex)"
+                      class="absolute z-50 w-56 bg-white border border-slate-200 rounded-2xl shadow-xl overflow-hidden py-1 animate-in fade-in zoom-in duration-200"
+                      :class="[
+                        dayIndex >= 4 ? 'bottom-full mb-2' : 'top-full mt-2',
+                        slot.originalIndex <= 1 ? 'left-0' : slot.originalIndex >= 10 ? 'right-0' : 'left-1/2 -translate-x-1/2'
+                      ]">
+                      <div class="max-h-80 overflow-y-auto custom-scrollbar">
+                        <button
+                          class="w-full text-left px-4 py-2.5 hover:bg-red-50 text-red-600 text-[11px] font-bold border-b border-slate-50 flex items-center gap-2 transition-colors"
+                          @click="setSlotValue(dayIndex, slot.originalIndex, null, slot.span)">
+                          <UIcon name="i-lucide-trash" class="text-red-500 text-sm" />
+                          <span>ล้างข้อมูลคาบนี้</span>
+                        </button>
 
                         <div
-                          class="px-4 py-1.5 text-[9px] font-bold text-slate-400 bg-slate-50/80 uppercase tracking-widest mt-2">
-                          ห้องเรียน (คาบนี้)
+                          class="px-4 py-1.5 text-[9px] font-bold text-slate-400 bg-slate-50/80 uppercase tracking-widest mt-1">
+                          เลือกรายวิชา
                         </div>
-                        <button v-for="room in roomOptions" :key="room.value"
-                          class="w-full text-left px-4 py-2 hover:bg-indigo-50 text-slate-600 text-[11px] truncate transition-colors font-medium"
-                          :class="{ 'bg-indigo-50 text-indigo-700': slot.room_id === room.value }"
-                          @click="setSlotRoom(dayIndex, slot.originalIndex, room.value, slot.span)">
-                          {{ room.label || 'ไม่ระบุห้อง' }}
+                        <button v-for="opt in subjectOptions" :key="opt.value"
+                          class="w-full text-left px-4 py-2 hover:bg-blue-50 text-slate-700 text-[11px] truncate transition-colors font-medium border-l-4 border-transparent"
+                          :class="{ 'bg-blue-50 border-blue-500 text-blue-700': slot.value === opt.value }"
+                          @click="setSlotValue(dayIndex, slot.originalIndex, opt.value, slot.span)">
+                          {{ opt.label }}
                         </button>
-                      </template>
+
+                        <template v-if="slot.value">
+                          <div
+                            class="px-4 py-1.5 text-[9px] font-bold text-slate-400 bg-slate-50/80 uppercase tracking-widest mt-2">
+                            กลุ่มเรียน (Sections)
+                          </div>
+                          <div v-for="sec in subjects.find(s => s.id_subject == slot.value)?.sections"
+                            :key="sec.id_section"
+                            class="w-full text-left px-4 py-2 hover:bg-amber-50 text-slate-700 text-[11px] flex items-center gap-2 cursor-pointer transition-colors font-medium"
+                            @click="toggleSlotSection(dayIndex, slot.originalIndex, sec.id_section, slot.span)">
+                            <UCheckbox
+                              :model-value="(scheduleSlots[dayIndex][slot.originalIndex].section_ids || []).includes(sec.id_section)"
+                              @update:model-value="toggleSlotSection(dayIndex, slot.originalIndex, sec.id_section, slot.span)" />
+                            <span class="truncate">{{ sec.section_name }}</span>
+                          </div>
+
+                          <div
+                            class="px-4 py-1.5 text-[9px] font-bold text-slate-400 bg-slate-50/80 uppercase tracking-widest mt-2">
+                            ห้องเรียน (คาบนี้)
+                          </div>
+                          <button v-for="room in roomOptions" :key="room.value"
+                            class="w-full text-left px-4 py-2 hover:bg-indigo-50 text-slate-600 text-[11px] truncate transition-colors font-medium"
+                            :class="{ 'bg-indigo-50 text-indigo-700': slot.room_id === room.value }"
+                            @click="setSlotRoom(dayIndex, slot.originalIndex, room.value, slot.span)">
+                            {{ room.label || 'ไม่ระบุห้อง' }}
+                          </button>
+                        </template>
+                      </div>
                     </div>
                   </div>
-                </div>
 
-                <!-- ช่อง พักกลางวัน -->
-                <div v-else
-                  class="border-r border-b border-slate-200 p-1 text-center bg-slate-50 text-slate-400 font-bold flex items-center justify-center text-md select-none uppercase tracking-tighter min-h-[90px]">
-                  พักกลางวัน
-                </div>
+                  <!-- ช่อง พักกลางวัน -->
+                  <div v-else
+                    class="border-r border-b border-slate-200 p-1 text-center bg-slate-50 text-slate-400 font-bold flex items-center justify-center text-md select-none uppercase tracking-tighter min-h-[90px]">
+                    พักกลางวัน
+                  </div>
+                </template>
               </template>
-            </template>
+            </div>
           </div>
         </div>
       </div>
@@ -654,6 +692,73 @@ const editSelectedSubjectId = ref(null)
 const editLegacySubjectName = ref('')
 const saving = ref(false)
 
+// --- Paint Mode State (Drag to Schedule) ---
+const isPaintMode = ref(false)
+const paintSubjectId = ref(null)
+const paintRoomId = ref(null)
+const isDragging = ref(false)
+const dragCurrentDay = ref(null)
+
+const togglePaintMode = (val = null) => {
+  if (!isPaintMode.value) {
+    isDragging.value = false
+    dragCurrentDay.value = null
+  }
+}
+
+const applyPaint = (dayIndex, slotIndex) => {
+  if (slotIndex === 4) return // Skip lunch break
+
+  const rawPaintSubjectId = getRawValue(paintSubjectId.value)
+  const rawPaintRoomId = getRawValue(paintRoomId.value)
+
+  // Calculate default section_ids based on selected subject
+  let sectionIds = []
+  if (rawPaintSubjectId) {
+    const subj = subjects.value?.find(sub => sub.id_subject == rawPaintSubjectId)
+    if (subj && subj.sections) {
+      sectionIds = subj.sections.map(sec => sec.id_section)
+    }
+  }
+
+  // Erase mode (if rawPaintSubjectId is null), otherwise paint mode
+  scheduleSlots.value[dayIndex][slotIndex].value = rawPaintSubjectId || null
+  scheduleSlots.value[dayIndex][slotIndex].room_id = rawPaintSubjectId ? (rawPaintRoomId || null) : null
+  scheduleSlots.value[dayIndex][slotIndex].section_ids = rawPaintSubjectId ? [...sectionIds] : []
+}
+
+const startDrag = (dayIndex, slotIndex) => {
+  if (!isPaintMode.value) return
+  isDragging.value = true
+  dragCurrentDay.value = dayIndex
+  applyPaint(dayIndex, slotIndex)
+}
+
+const onDragOver = (dayIndex, slotIndex) => {
+  if (!isPaintMode.value || !isDragging.value) return
+  if (dragCurrentDay.value !== dayIndex) return // Can only drag vertically across same day
+  applyPaint(dayIndex, slotIndex)
+}
+
+const endDrag = () => {
+  if (isDragging.value) {
+    isDragging.value = false
+    dragCurrentDay.value = null
+  }
+}
+
+onMounted(() => {
+  if (import.meta.client) {
+    document.addEventListener('mouseup', endDrag)
+  }
+})
+
+onUnmounted(() => {
+  if (import.meta.client) {
+    document.removeEventListener('mouseup', endDrag)
+  }
+})
+
 // Quick Add Subject to Schedule states
 const quickAddOpen = ref(false)
 const quickAddSubject = ref(null)
@@ -909,7 +1014,7 @@ const slotsCanMerge = (a, b) => {
 // Logic สำหรับการ Merge ช่องที่วิชา + ห้อง + กลุ่มนักศึกษาเหมือนกันและติดกัน
 const displaySlots = computed(() => {
   if (!scheduleSlots.value) return []
-  return scheduleSlots.value.map((daySlots) => {
+  return scheduleSlots.value.map((daySlots, dayIndex) => {
     const grouped = []
     for (let i = 0; i < daySlots.length; i++) {
       const current = daySlots[i]
@@ -918,13 +1023,18 @@ const displaySlots = computed(() => {
         continue
       }
       let span = 1
-      while (
-        i + span < daySlots.length
-        && i + span !== 4 // ไม่ Merge ข้ามพักเที่ยง
-        && slotsCanMerge(current, daySlots[i + span])
-      ) {
-        span++
+
+      // Merge cells only if we are not in Paint Mode
+      if (!isPaintMode.value) {
+        while (
+          i + span < daySlots.length
+          && i + span !== 4 // ไม่ Merge ข้ามพักเที่ยง
+          && slotsCanMerge(current, daySlots[i + span])
+        ) {
+          span++
+        }
       }
+
       grouped.push({ ...current, span, originalIndex: i })
       i += span - 1
     }
@@ -1112,6 +1222,7 @@ const clearSchedule = (noConfirm = false) => {
 const isActiveBox = (d, s) => activeBox.value.day === d && activeBox.value.slot === s
 
 const toggleDropdown = (d, s) => {
+  if (isPaintMode.value) return // Disable dropdown in paint mode
   if (isActiveBox(d, s)) {
     activeBox.value = { day: null, slot: null }
   } else {
diff --git a/server/data/data.db b/server/data/data.db
index 0315f432d9fd7c39d1d8d80f0cca8c8315878e00..e310dbe533d3a177ac27032d208c8da77ea265d8 100644
GIT binary patch
delta 6092
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

delta 3084
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


From ff6a60c8926582d63c30e482aabb377904d7987f Mon Sep 17 00:00:00 2001
From: Kyle2772547 <restrixt@gmail.com>
Date: Wed, 27 May 2026 13:08:16 +0700
Subject: [PATCH 4/5] normalization: db

---
 server/api/Subjects/[id].put.js       |  13 ++++++-----
 server/api/Subjects/index.get.js      |  22 +++++++++++++-----
 server/api/Subjects/index.post.js     |  29 ++++++++++++++++++------
 server/api/makeup-classes/[id].js     |   8 +++++--
 server/api/makeup-classes/index.js    |   3 ++-
 server/api/rooms/schedule.js          |  14 +++++++++---
 server/api/study-plans/[id].js        |   7 ++----
 server/api/study-plans/index.js       |  11 +++------
 server/api/teacher-classes-on-date.js |  11 ++++++---
 server/api/terms/[id].delete.js       |   5 ++---
 server/api/terms/[id].put.js          |   1 -
 server/data/data.db                   | Bin 376832 -> 376832 bytes
 server/utils/autoSchedule.js          |  31 ++++++++++++++++++++------
 server/utils/availability.js          |  12 ++++++++--
 server/utils/db.js                    |  20 +++++++----------
 15 files changed, 122 insertions(+), 65 deletions(-)

diff --git a/server/api/Subjects/[id].put.js b/server/api/Subjects/[id].put.js
index 4b97976..f343fce 100644
--- a/server/api/Subjects/[id].put.js
+++ b/server/api/Subjects/[id].put.js
@@ -4,17 +4,18 @@ export default defineEventHandler(async (event) => {
   const { id } = event.context.params
   const body = await readBody(event)
 
-  // Validate input
-  if (!body.name_subject || body.name_subject.trim() === '') {
+  const newCurrId = body.curriculum_subject_id || null
+
+  if (!newCurrId) {
     throw createError({
       statusCode: 400,
-      statusMessage: 'name_subject is required'
+      statusMessage: 'curriculum_subject_id is required'
     })
   }
 
-  // 1. Update Subject name and curriculum link
-  const stmt = db.prepare('UPDATE Subjects SET name_subject = ?, curriculum_subject_id = ? WHERE id_subject = ?')
-  stmt.run(body.name_subject, body.curriculum_subject_id || null, id)
+  // 1. Update Subject curriculum link (name_subject column is removed)
+  const stmt = db.prepare('UPDATE Subjects SET curriculum_subject_id = ? WHERE id_subject = ?')
+  stmt.run(newCurrId, id)
 
   // Update Sections if provided
   if (body.id_sections && Array.isArray(body.id_sections)) {
diff --git a/server/api/Subjects/index.get.js b/server/api/Subjects/index.get.js
index d6f1185..67201e3 100644
--- a/server/api/Subjects/index.get.js
+++ b/server/api/Subjects/index.get.js
@@ -9,6 +9,8 @@ export default defineEventHandler((event) => {
   let baseQuery = `
     SELECT s.*,
     t.prefix, t.first_name, t.last_name,
+    cs.name_subject as curriculum_name_subject,
+    cs.subject_code,
     (
       SELECT GROUP_CONCAT(sec.section_name, ', ')
       FROM SubjectSections ss
@@ -24,6 +26,7 @@ export default defineEventHandler((event) => {
     ) as sections_json
     FROM Subjects s
     LEFT JOIN teachers t ON s.id_teacher = t.id_teacher
+    LEFT JOIN curriculum_subjects cs ON s.curriculum_subject_id = cs.id_subject_curr
   `
 
   let whereClauses = []
@@ -45,9 +48,18 @@ export default defineEventHandler((event) => {
   stmt = db.prepare(finalQuery)
   subjects = stmt.all(...params)
 
-  // Parse JSON sections for each subject
-  return subjects.map(s => ({
-    ...s,
-    sections: s.sections_json ? JSON.parse(s.sections_json) : []
-  }))
+  // Parse JSON sections for each subject and resolve dynamic name
+  return subjects.map(s => {
+    let resolvedName = 'Unknown'
+    if (s.curriculum_name_subject) {
+      // Strictly use its name (prepended with code if available)
+      resolvedName = s.subject_code ? `${s.subject_code} ${s.curriculum_name_subject}` : s.curriculum_name_subject
+    }
+    
+    return {
+      ...s,
+      name_subject: resolvedName,
+      sections: s.sections_json ? JSON.parse(s.sections_json) : []
+    }
+  })
 })
diff --git a/server/api/Subjects/index.post.js b/server/api/Subjects/index.post.js
index 1ec9262..a030a6e 100644
--- a/server/api/Subjects/index.post.js
+++ b/server/api/Subjects/index.post.js
@@ -3,16 +3,31 @@ import db from '../../utils/db.js'
 export default defineEventHandler(async (event) => {
   try {
     const body = await readBody(event)
-    if (!body.name_subject || !body.id_sections || body.id_sections.length === 0) {
+
+    // curriculum_subject_id is now strictly required as the sole name source
+    if (!body.curriculum_subject_id) {
       throw createError({
         statusCode: 400,
-        statusMessage: 'name subject and sections are required'
+        statusMessage: 'curriculum_subject_id is required'
       })
     }
+    if (!body.id_sections || body.id_sections.length === 0) {
+      throw createError({
+        statusCode: 400,
+        statusMessage: 'sections are required'
+      })
+    }
+
+    // Resolve name for the response payload to keep frontend happy
+    let resolvedName = 'Unknown'
+    const cs = db.prepare('SELECT subject_code, name_subject FROM curriculum_subjects WHERE id_subject_curr = ?').get(body.curriculum_subject_id)
+    if (cs) {
+      resolvedName = cs.subject_code ? `${cs.subject_code} ${cs.name_subject}` : cs.name_subject
+    }
 
-    // 1. Insert Subject
-    const stmt = db.prepare('INSERT INTO Subjects (name_subject, id_teacher, term, curriculum_subject_id) VALUES (?, ?, ?, ?)')
-    const result = stmt.run(body.name_subject, body.id_teacher, body.term || null, body.curriculum_subject_id || null)
+    // 1. Insert Subject (name_subject column is removed)
+    const stmt = db.prepare('INSERT INTO Subjects (id_teacher, term, curriculum_subject_id) VALUES (?, ?, ?)')
+    const result = stmt.run(body.id_teacher, body.term || null, body.curriculum_subject_id)
     const subjectId = result.lastInsertRowid
 
     // 2. Insert SubjectSections (Join table)
@@ -26,7 +41,7 @@ export default defineEventHandler(async (event) => {
 
     return {
       id_subject: subjectId,
-      name_subject: body.name_subject,
+      name_subject: resolvedName,
       id_sections: body.id_sections,
       status: 1
     }
@@ -34,7 +49,7 @@ export default defineEventHandler(async (event) => {
     if (error.code === 'SQLITE_CONSTRAINT_UNIQUE') {
       throw createError({
         statusCode: 409,
-        statusMessage: 'Name already exists'
+        statusMessage: 'Subject constraint error'
       })
     }
     throw error
diff --git a/server/api/makeup-classes/[id].js b/server/api/makeup-classes/[id].js
index 7a72c0e..b052254 100644
--- a/server/api/makeup-classes/[id].js
+++ b/server/api/makeup-classes/[id].js
@@ -13,12 +13,13 @@ export default defineEventHandler(async (event) => {
         t.first_name,
         t.last_name,
         s.section_name,
-        sub.name_subject,
+        CASE WHEN cs.subject_code IS NOT NULL THEN cs.subject_code || ' ' || cs.name_subject ELSE cs.name_subject END as name_subject,
         r.room_name
       FROM makeup_classes mc
       LEFT JOIN teachers t ON mc.teacher_id = t.id_teacher
       LEFT JOIN sections s ON mc.section_id = s.id_section
       LEFT JOIN Subjects sub ON mc.subject_id = sub.id_subject
+      LEFT JOIN curriculum_subjects cs ON sub.curriculum_subject_id = cs.id_subject_curr
       LEFT JOIN rooms r ON mc.room_id = r.id_room
       WHERE mc.id_makeup = ?
     `)
@@ -142,9 +143,12 @@ export default defineEventHandler(async (event) => {
     const syncCalendarEvent = async (makeupId) => {
       // ค้นหาข้อมูล makeup class ปัจจุบัน
       const cls = db.prepare(`
-        SELECT mc.*, s.name_subject, r.room_name, t.prefix, t.first_name, t.last_name
+        SELECT mc.*,
+          CASE WHEN cs.subject_code IS NOT NULL THEN cs.subject_code || ' ' || cs.name_subject ELSE cs.name_subject END as name_subject,
+          r.room_name, t.prefix, t.first_name, t.last_name
         FROM makeup_classes mc
         LEFT JOIN Subjects s ON mc.subject_id = s.id_subject
+        LEFT JOIN curriculum_subjects cs ON s.curriculum_subject_id = cs.id_subject_curr
         LEFT JOIN rooms r ON mc.room_id = r.id_room
         LEFT JOIN teachers t ON mc.teacher_id = t.id_teacher
         WHERE mc.id_makeup = ?
diff --git a/server/api/makeup-classes/index.js b/server/api/makeup-classes/index.js
index 8b29a38..3f31d2b 100644
--- a/server/api/makeup-classes/index.js
+++ b/server/api/makeup-classes/index.js
@@ -14,12 +14,13 @@ export default defineEventHandler(async (event) => {
         t.first_name,
         t.last_name,
         s.section_name,
-        sub.name_subject,
+        CASE WHEN cs.subject_code IS NOT NULL THEN cs.subject_code || ' ' || cs.name_subject ELSE cs.name_subject END as name_subject,
         r.room_name
       FROM makeup_classes mc
       LEFT JOIN teachers t ON mc.teacher_id = t.id_teacher
       LEFT JOIN sections s ON mc.section_id = s.id_section
       LEFT JOIN Subjects sub ON mc.subject_id = sub.id_subject
+      LEFT JOIN curriculum_subjects cs ON sub.curriculum_subject_id = cs.id_subject_curr
       LEFT JOIN rooms r ON mc.room_id = r.id_room
       WHERE 1=1
     `
diff --git a/server/api/rooms/schedule.js b/server/api/rooms/schedule.js
index b4cd193..b079895 100644
--- a/server/api/rooms/schedule.js
+++ b/server/api/rooms/schedule.js
@@ -47,10 +47,12 @@ export default defineEventHandler(async (event) => {
     // 2. Fetch Makeup Classes for the specific date
     const makeupClasses = db.prepare(`
       SELECT mc.id_makeup, mc.makeup_time_start, mc.makeup_time_end, mc.room_id,
-             t.prefix, t.first_name, t.last_name, sub.name_subject as subject_name
+             t.prefix, t.first_name, t.last_name,
+             CASE WHEN cs.subject_code IS NOT NULL THEN cs.subject_code || ' ' || cs.name_subject ELSE cs.name_subject END as subject_name
       FROM makeup_classes mc
       LEFT JOIN teachers t ON mc.teacher_id = t.id_teacher
       LEFT JOIN Subjects sub ON mc.subject_id = sub.id_subject
+      LEFT JOIN curriculum_subjects cs ON sub.curriculum_subject_id = cs.id_subject_curr
       WHERE mc.makeup_date = ? AND mc.status != 'cancelled' AND mc.room_id IS NOT NULL
     `).all(date)
 
@@ -90,11 +92,17 @@ export default defineEventHandler(async (event) => {
     }
 
     // Lookup table for subjects to get their default rooms
-    const subjectsRaw = db.prepare('SELECT id_subject, name_subject FROM Subjects').all()
+    const subjectsRaw = db.prepare(`
+      SELECT s.id_subject, cs.name_subject as curriculum_name, cs.subject_code
+      FROM Subjects s
+      LEFT JOIN curriculum_subjects cs ON s.curriculum_subject_id = cs.id_subject_curr
+    `).all()
     const subjectData = {}
     subjectsRaw.forEach((s) => {
       subjectData[s.id_subject] = {
-        name: s.name_subject
+        name: s.curriculum_name
+          ? (s.subject_code ? `${s.subject_code} ${s.curriculum_name}` : s.curriculum_name)
+          : 'ไม่ทราบชื่อวิชา'
       }
     })
 
diff --git a/server/api/study-plans/[id].js b/server/api/study-plans/[id].js
index 2a6b41e..4333175 100644
--- a/server/api/study-plans/[id].js
+++ b/server/api/study-plans/[id].js
@@ -8,11 +8,8 @@ export default defineEventHandler(async (event) => {
     if (!body.name_plan || !body.level) {
       throw createError({ statusCode: 400, statusMessage: 'Name and level are required' })
     }
-    const year = body.year || 0
-    const semester = body.semester || 0
-
-    const stmt = db.prepare('UPDATE study_plans SET name_plan = ?, level = ?, year = ?, semester = ? WHERE id_plan = ?')
-    const result = stmt.run(body.name_plan, body.level, year, semester, id)
+    const stmt = db.prepare('UPDATE study_plans SET name_plan = ?, level = ? WHERE id_plan = ?')
+    const result = stmt.run(body.name_plan, body.level, id)
     
     if (result.changes === 0) {
       throw createError({ statusCode: 404, statusMessage: 'Study Plan not found' })
diff --git a/server/api/study-plans/index.js b/server/api/study-plans/index.js
index 5b5a891..ff7b016 100644
--- a/server/api/study-plans/index.js
+++ b/server/api/study-plans/index.js
@@ -14,18 +14,13 @@ export default defineEventHandler(async (event) => {
     if (!body.id_curriculum || !body.name_plan || !body.level) {
       throw createError({ statusCode: 400, statusMessage: 'Curriculum ID, name, and level are required' })
     }
-    const year = body.year || 0
-    const semester = body.semester || 0
-
-    const stmt = db.prepare('INSERT INTO study_plans (id_curriculum, name_plan, level, year, semester) VALUES (?, ?, ?, ?, ?)')
-    const result = stmt.run(body.id_curriculum, body.name_plan, body.level, year, semester)
+    const stmt = db.prepare('INSERT INTO study_plans (id_curriculum, name_plan, level) VALUES (?, ?, ?)')
+    const result = stmt.run(body.id_curriculum, body.name_plan, body.level)
     return {
       id_plan: result.lastInsertRowid,
       id_curriculum: body.id_curriculum,
       name_plan: body.name_plan,
-      level: body.level,
-      year: year,
-      semester: semester
+      level: body.level
     }
   }
 })
diff --git a/server/api/teacher-classes-on-date.js b/server/api/teacher-classes-on-date.js
index 74e44f7..3c25c89 100644
--- a/server/api/teacher-classes-on-date.js
+++ b/server/api/teacher-classes-on-date.js
@@ -145,9 +145,14 @@ function createClassObj(subjectId, startSlot, duration, teacherId, date, roomId,
 }
 
 function getSubjectName(subjectId) {
-  const stmt = db.prepare('SELECT name_subject FROM Subjects WHERE id_subject = ?')
-  const result = stmt.get(subjectId)
-  return result?.name_subject || 'ไม่ทราบชื่อวิชา'
+  const result = db.prepare(`
+    SELECT cs.name_subject as curriculum_name, cs.subject_code
+    FROM Subjects s
+    LEFT JOIN curriculum_subjects cs ON s.curriculum_subject_id = cs.id_subject_curr
+    WHERE s.id_subject = ?
+  `).get(subjectId)
+  if (!result || !result.curriculum_name) return 'ไม่ทราบชื่อวิชา'
+  return result.subject_code ? `${result.subject_code} ${result.curriculum_name}` : result.curriculum_name
 }
 
 function getSectionsForSubjectArray(subjectId) {
diff --git a/server/api/terms/[id].delete.js b/server/api/terms/[id].delete.js
index e666a2f..75307ae 100644
--- a/server/api/terms/[id].delete.js
+++ b/server/api/terms/[id].delete.js
@@ -28,7 +28,7 @@ export default defineEventHandler(async (event) => {
 
     // 1. Get IDs before deletion so we know what to clean up
     const teacherIdsInTerm = db.prepare('SELECT DISTINCT id_teacher FROM schedules WHERE term = ?').all(termStr).map(r => r.id_teacher)
-    const sectionIdsInTerm = db.prepare('SELECT id_section FROM section_terms WHERE term = ?').all(termStr).map(r => r.id_section)
+    const sectionIdsInTerm = db.prepare('SELECT id_section FROM section_schedules WHERE term = ?').all(termStr).map(r => r.id_section)
 
     // 2. Identify and Delete makeup_classes AND their associated Calendar Events
     const combinedMakeupIds = []
@@ -64,8 +64,7 @@ export default defineEventHandler(async (event) => {
     // 4. Delete section_schedules
     db.prepare('DELETE FROM section_schedules WHERE term = ?').run(termStr)
 
-    // 5. Delete section_terms for this term
-    db.prepare('DELETE FROM section_terms WHERE term = ?').run(termStr)
+
 
     // 6. Delete schedules (teacher timetables)
     db.prepare('DELETE FROM schedules WHERE term = ?').run(termStr)
diff --git a/server/api/terms/[id].put.js b/server/api/terms/[id].put.js
index 2c03472..bf50444 100644
--- a/server/api/terms/[id].put.js
+++ b/server/api/terms/[id].put.js
@@ -59,7 +59,6 @@ export default defineEventHandler(async (event) => {
     const updateRefs = db.transaction(() => {
       db.prepare('UPDATE schedules SET term = ? WHERE term = ?').run(newTermStr, oldTermStr)
       db.prepare('UPDATE section_schedules SET term = ? WHERE term = ?').run(newTermStr, oldTermStr)
-      db.prepare('UPDATE section_terms SET term = ? WHERE term = ?').run(newTermStr, oldTermStr)
       db.prepare('UPDATE external_subjects SET term = ? WHERE term = ?').run(newTermStr, oldTermStr)
       db.prepare('UPDATE Subjects SET term = ? WHERE term = ?').run(newTermStr, oldTermStr)
       db.prepare('UPDATE terms SET term = ?, academic_year = ?, start_date = ?, end_date = ? WHERE id_term = ?')
diff --git a/server/data/data.db b/server/data/data.db
index e310dbe533d3a177ac27032d208c8da77ea265d8..7f81e6cf0d601330aacea9f21b093c8387727672 100644
GIT binary patch
delta 8091
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
M&1S==56P$h8-*Eq<p2Nx

delta 6637
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
WS6jN$Y{Vz=8Xw2<0aql18~k7X=2Tt)

diff --git a/server/utils/autoSchedule.js b/server/utils/autoSchedule.js
index 03c9193..a893809 100644
--- a/server/utils/autoSchedule.js
+++ b/server/utils/autoSchedule.js
@@ -32,10 +32,16 @@ export async function findAvailableSlots(teacherId, missedDate, term) {
     }
   })
 
-  const allSubjects = db.prepare('SELECT id_subject, name_subject FROM Subjects').all()
+  const allSubjects = db.prepare(`
+    SELECT s.id_subject, cs.name_subject as curriculum_name, cs.subject_code
+    FROM Subjects s
+    LEFT JOIN curriculum_subjects cs ON s.curriculum_subject_id = cs.id_subject_curr
+  `).all()
   const subjectNameMap = {}
   allSubjects.forEach((s) => {
-    subjectNameMap[s.id_subject] = s.name_subject
+    subjectNameMap[s.id_subject] = s.curriculum_name
+      ? (s.subject_code ? `${s.subject_code} ${s.curriculum_name}` : s.curriculum_name)
+      : 'ไม่ทราบชื่อวิชา'
   })
 
   // 1. ดึงตารางสอนของอาจารย์ในวันที่ขาด
@@ -395,9 +401,14 @@ function getSectionSchedule(sectionId, term) {
  * ดึงชื่อวิชา
  */
 function getSubjectName(subjectId) {
-  const stmt = db.prepare('SELECT name_subject FROM Subjects WHERE id_subject = ?')
-  const result = stmt.get(subjectId)
-  return result?.name_subject || 'ไม่ทราบชื่อวิชา'
+  const result = db.prepare(`
+    SELECT cs.name_subject as curriculum_name, cs.subject_code
+    FROM Subjects s
+    LEFT JOIN curriculum_subjects cs ON s.curriculum_subject_id = cs.id_subject_curr
+    WHERE s.id_subject = ?
+  `).get(subjectId)
+  if (!result || !result.curriculum_name) return 'ไม่ทราบชื่อวิชา'
+  return result.subject_code ? `${result.subject_code} ${result.curriculum_name}` : result.curriculum_name
 }
 
 /**
@@ -496,10 +507,16 @@ export async function findAvailableSlotsForMultipleClasses(teacherId, missedDate
     }
   })
 
-  const allSubjects = db.prepare('SELECT id_subject, name_subject FROM Subjects').all()
+  const allSubjects = db.prepare(`
+    SELECT s.id_subject, cs.name_subject as curriculum_name, cs.subject_code
+    FROM Subjects s
+    LEFT JOIN curriculum_subjects cs ON s.curriculum_subject_id = cs.id_subject_curr
+  `).all()
   const subjectNameMap = {}
   allSubjects.forEach((s) => {
-    subjectNameMap[s.id_subject] = s.name_subject
+    subjectNameMap[s.id_subject] = s.curriculum_name
+      ? (s.subject_code ? `${s.subject_code} ${s.curriculum_name}` : s.curriculum_name)
+      : 'ไม่ทราบชื่อวิชา'
   })
 
   // เตรียมข้อมูลวันหยุดและวันลาของอาจารย์
diff --git a/server/utils/availability.js b/server/utils/availability.js
index f05f507..1662d05 100644
--- a/server/utils/availability.js
+++ b/server/utils/availability.js
@@ -126,11 +126,19 @@ export function checkRoomAvailability({ room_id, date, start_time, end_time, ter
           }
 
           if (classUsesRoom) {
-            const subject = db.prepare('SELECT name_subject FROM Subjects WHERE id_subject = ?').get(slot.value)
+            const subject = db.prepare(`
+              SELECT cs.name_subject as curriculum_name, cs.subject_code
+              FROM Subjects s
+              LEFT JOIN curriculum_subjects cs ON s.curriculum_subject_id = cs.id_subject_curr
+              WHERE s.id_subject = ?
+            `).get(slot.value)
+            const subjectName = subject?.curriculum_name
+              ? (subject.subject_code ? `${subject.subject_code} ${subject.curriculum_name}` : subject.curriculum_name)
+              : slot.value
             const teacherName = [ts.prefix, ts.first_name, ts.last_name].filter(Boolean).join(' ').trim()
             return {
               available: false,
-              reason: `ตรงกับตารางเรียนปกติ (วิชา ${subject?.name_subject || slot.value}) สอนโดย ${teacherName}`
+              reason: `ตรงกับตารางเรียนปกติ (วิชา ${subjectName}) สอนโดย ${teacherName}`
             }
           }
         }
diff --git a/server/utils/db.js b/server/utils/db.js
index ab60efa..7cac59c 100644
--- a/server/utils/db.js
+++ b/server/utils/db.js
@@ -50,8 +50,6 @@ db.exec(`
     id_curriculum INTEGER NOT NULL,
     name_plan TEXT NOT NULL,
     level TEXT NOT NULL,
-    year INTEGER NOT NULL,
-    semester INTEGER NOT NULL,
     created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
     FOREIGN KEY (id_curriculum) REFERENCES curriculums(id_curriculum) ON DELETE CASCADE
   );`)
@@ -82,7 +80,6 @@ db.exec(`
 db.exec(`
   CREATE TABLE IF NOT EXISTS Subjects (
     id_subject INTEGER PRIMARY KEY AUTOINCREMENT,
-    name_subject TEXT NOT NULL,
     id_teacher INTEGER,
     term TEXT,
     FOREIGN KEY (id_teacher) REFERENCES teachers(id_teacher)
@@ -293,10 +290,7 @@ db.exec(`
     UNIQUE(id_section, term)
   );`)
 
-// สร้าง indexes สำหรับ sections
-db.exec(`
-  CREATE INDEX IF NOT EXISTS idx_section_terms_term 
-  ON section_terms(term);`)
+
 
 db.exec(`
   CREATE INDEX IF NOT EXISTS idx_section_schedules_section 
@@ -386,7 +380,12 @@ try {
   safeDropColumn('rooms', 'capacity')
   safeDropColumn('rooms', 'building')
   safeDropColumn('Subjects', 'id_room')
+  safeDropColumn('Subjects', 'name_subject')
   safeDropColumn('teachers', 'subject')
+  safeDropColumn('study_plans', 'year')
+  safeDropColumn('study_plans', 'semester')
+  
+  db.exec('DROP TABLE IF EXISTS section_terms')
 
   // Add term column to Subjects if missing
   const subjectInfo = db.prepare('PRAGMA table_info(Subjects)').all()
@@ -439,7 +438,7 @@ try {
       db.exec('DELETE FROM sections')
 
       const insertMaster = db.prepare('INSERT INTO sections (section_name, description, created_at) VALUES (?, ?, ?)')
-      const insertTerm = db.prepare('INSERT OR IGNORE INTO section_terms (id_section, term) VALUES (?, ?)')
+
 
       for (const name in masterSections) {
         const m = masterSections[name]
@@ -448,7 +447,6 @@ try {
 
         for (const old of m.oldIds) {
           mapping[old.id] = newId
-          insertTerm.run(newId, old.term)
         }
       }
 
@@ -486,14 +484,12 @@ try {
     console.log('Sections/Terms migration completed successfully.')
 
     // 2.5 Subjects table migration (Populate term if missing)
-    // Run this AFTER section_terms is populated
     console.log('Finalizing Subjects term data...')
     db.exec(`
       UPDATE Subjects 
       SET term = (
-        SELECT st.term 
+        SELECT ss.term 
         FROM SubjectSections ss
-        JOIN section_terms st ON ss.id_section = st.id_section
         WHERE ss.id_subject = Subjects.id_subject
         LIMIT 1
       )

From a9bf82e5f495a16b04e7358a2f9ae43613fc94c0 Mon Sep 17 00:00:00 2001
From: Kyle2772547 <restrixt@gmail.com>
Date: Wed, 27 May 2026 14:03:52 +0700
Subject: [PATCH 5/5] feature: checkbox section

---
 app/pages/teacher/[id].vue |  82 ++++++++++++++++++++++++++++---------
 server/data/data.db        | Bin 376832 -> 376832 bytes
 2 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/app/pages/teacher/[id].vue b/app/pages/teacher/[id].vue
index 3ffd5bb..ba0f621 100644
--- a/app/pages/teacher/[id].vue
+++ b/app/pages/teacher/[id].vue
@@ -534,20 +534,43 @@
           </div>
 
           <div v-if="isPaintMode"
-            class="flex-1 flex flex-col md:flex-row w-full gap-3 animate-in fade-in slide-in-from-left-4 duration-300">
-            <USelectMenu v-model="paintSubjectId"
-              :items="[{ label: '🧹 ลบวิชา (ยางลบ)', value: null }, ...subjectOptions]" value-attribute="value"
-              option-attribute="label" placeholder="-- เลือกวิชาที่จะระบาย --" size="xl" class="flex-1 shadow-sm"
-              :ui="{ base: 'bg-white border-indigo-300 text-slate-900 focus:ring-indigo-500 rounded-xl font-bold' }" />
-
-            <USelectMenu v-model="paintRoomId" :items="roomOptions" value-attribute="value" option-attribute="label"
-              placeholder="ห้องเรียน (ไม่บังคับ)" size="xl" class="w-full md:w-56 shadow-sm"
-              :disabled="paintSubjectId === null"
-              :ui="{ base: 'bg-white border-indigo-300 text-slate-900 focus:ring-indigo-500 rounded-xl' }" />
-
-            <div v-if="isDragging"
-              class="hidden md:flex items-center px-4 bg-indigo-500 text-white font-bold rounded-xl text-sm shadow-md animate-pulse">
-              กำลังวาด...
+            class="flex-1 flex flex-col w-full gap-3 animate-in fade-in slide-in-from-left-4 duration-300">
+            
+            <div class="flex flex-col md:flex-row w-full gap-3">
+              <USelectMenu v-model="paintSubjectId"
+                :items="[{ label: '🧹 ลบวิชา (ยางลบ)', value: null }, ...subjectOptions]" value-attribute="value"
+                option-attribute="label" placeholder="-- เลือกวิชาที่จะระบาย --" size="xl" class="flex-1 shadow-sm"
+                :ui="{ base: 'bg-white border-indigo-300 text-slate-900 focus:ring-indigo-500 rounded-xl font-bold' }" />
+
+              <USelectMenu v-model="paintRoomId" :items="roomOptions" value-attribute="value" option-attribute="label"
+                placeholder="ห้องเรียน (ไม่บังคับ)" size="xl" class="w-full md:w-56 shadow-sm"
+                :disabled="paintSubjectId === null"
+                :ui="{ base: 'bg-white border-indigo-300 text-slate-900 focus:ring-indigo-500 rounded-xl' }" />
+
+              <div v-if="isDragging"
+                class="hidden md:flex items-center px-4 bg-indigo-500 text-white font-bold rounded-xl text-sm shadow-md animate-pulse">
+                กำลังวาด...
+              </div>
+            </div>
+
+            <!-- Checkboxes for sections -->
+            <div v-if="paintSectionOptions.length > 0" class="flex flex-wrap items-center gap-4 bg-white/60 p-2.5 rounded-xl border border-indigo-200/50">
+              <span class="text-sm font-bold text-indigo-800">เลือกลงแต่ละกลุ่มเรียน:</span>
+              <UCheckbox 
+                v-for="sec in paintSectionOptions" 
+                :key="sec.value" 
+                :model-value="paintSectionIds.includes(sec.value)"
+                @update:model-value="(checked) => {
+                  if (checked) {
+                    if (!paintSectionIds.includes(sec.value)) paintSectionIds.push(sec.value);
+                  } else {
+                    paintSectionIds = paintSectionIds.filter(orig => orig !== sec.value);
+                  }
+                }"
+                :label="sec.label" 
+                color="primary"
+                :ui="{ label: 'font-medium text-slate-700' }"
+              />
             </div>
           </div>
         </div>
@@ -695,10 +718,33 @@ const saving = ref(false)
 // --- Paint Mode State (Drag to Schedule) ---
 const isPaintMode = ref(false)
 const paintSubjectId = ref(null)
+const paintSectionIds = ref([])
 const paintRoomId = ref(null)
 const isDragging = ref(false)
 const dragCurrentDay = ref(null)
 
+const paintSectionOptions = computed(() => {
+  const rawId = getRawValue(paintSubjectId.value)
+  if (!rawId) return []
+  const subj = subjects.value?.find(sub => sub.id_subject == rawId)
+  if (!subj || !subj.sections) return []
+  return subj.sections.map(sec => ({ label: sec.section_name, value: sec.id_section }))
+})
+
+watch(() => paintSubjectId.value, (newVal) => {
+  const rawId = getRawValue(newVal)
+  if (!rawId) {
+    paintSectionIds.value = []
+  } else {
+    const subj = subjects.value?.find(sub => sub.id_subject == rawId)
+    if (subj && subj.sections) {
+      paintSectionIds.value = subj.sections.map(sec => sec.id_section)
+    } else {
+      paintSectionIds.value = []
+    }
+  }
+})
+
 const togglePaintMode = (val = null) => {
   if (!isPaintMode.value) {
     isDragging.value = false
@@ -712,19 +758,15 @@ const applyPaint = (dayIndex, slotIndex) => {
   const rawPaintSubjectId = getRawValue(paintSubjectId.value)
   const rawPaintRoomId = getRawValue(paintRoomId.value)
 
-  // Calculate default section_ids based on selected subject
   let sectionIds = []
   if (rawPaintSubjectId) {
-    const subj = subjects.value?.find(sub => sub.id_subject == rawPaintSubjectId)
-    if (subj && subj.sections) {
-      sectionIds = subj.sections.map(sec => sec.id_section)
-    }
+    sectionIds = [...paintSectionIds.value]
   }
 
   // Erase mode (if rawPaintSubjectId is null), otherwise paint mode
   scheduleSlots.value[dayIndex][slotIndex].value = rawPaintSubjectId || null
   scheduleSlots.value[dayIndex][slotIndex].room_id = rawPaintSubjectId ? (rawPaintRoomId || null) : null
-  scheduleSlots.value[dayIndex][slotIndex].section_ids = rawPaintSubjectId ? [...sectionIds] : []
+  scheduleSlots.value[dayIndex][slotIndex].section_ids = rawPaintSubjectId ? sectionIds : []
 }
 
 const startDrag = (dayIndex, slotIndex) => {
diff --git a/server/data/data.db b/server/data/data.db
index 7f81e6cf0d601330aacea9f21b093c8387727672..6ad7a17f5f2a716131e819ff18dbed75d1c96234 100644
GIT binary patch
delta 8326
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

delta 6238
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
KC-Gt;UHfkf2|?We