Merge branch 'feature/timetable' into merge-test

Author: ohiayame

src/api/timetableApi.js

@@ -142,7 +142,7 @@ export const getCourses = async (sec_id) => {
 }
 
 // ---------------------------------------------------------------
-// 시간표 정보 조회
+// [학생] 시간표 정보 조회
 // ---------------------------------------------------------------
 export const getStudentTimetable = async (today) => {
   try {
@@ -159,7 +159,24 @@ export const getStudentTimetable = async (today) => {
 }
 
 // ---------------------------------------------------------------
-// 시간표 정보 조회
+// [교수] 시간표 정보 조회
+// ---------------------------------------------------------------
+export const getProfessorTimetable = async (today) => {
+  try {
+    const res = await api.get(`/timetables/professor`, {
+      params: {
+        date: today,
+      },
+    })
+    console.log('교수 시간표 정보 조회', res.data)
+    return res.data
+  } catch (e) {
+    errorMsg(e)
+  }
+}
+
+// ---------------------------------------------------------------
+// [전체] 시간표 정보 조회
 // ---------------------------------------------------------------
 export const getAdminTimetable = async (today) => {
   try {

src/pages/TimeTable/TimeTablePage.vue

@@ -12,12 +12,13 @@ const sidebarIsOpen = ref(false)
 const Ustore = useUserStore()
 const Tstore = useTimetableStore()
 
-const isStudent = ref(null) // 학생인지
+const roleType = ref(null) // 권한
+const professorTT = ref(true)
 
 // 사용자 정보 확인
 watch(
   () => {
-    isStudent.value = Ustore.userInfo.role_type == 'student' ? true : false
+    roleType.value = Ustore.userInfo.role_type
     // console.log(isStudent.value)
   },
   { immediate: true },
@@ -34,8 +35,8 @@ function setData(data) {
 <template>
   <AppLayout pageName="Timetable">
     <!-- ===============  학생 시간표 =============== -->
-    <div v-if="isStudent">
-      <TimeTable />
+    <div v-if="roleType == 'student'">
+      <TimeTable v-model="professorTT" />
     </div>
 
     <!-- ===============  교수, 관리자 시간표  =============== -->
@@ -48,8 +49,20 @@ function setData(data) {
       <!-- 사이드바 컴포넌트 -->
       <Sidebar v-if="sidebarIsOpen" />
 
+      <div v-if="roleType == 'professor'">
+        <div v-if="professorTT">
+          <button @click="professorTT = !professorTT">전체 시간표 보기</button>
+          <TimeTable v-model="professorTT" />
+        </div>
+        <div v-else>
+          <button @click="professorTT = !professorTT">담당 시간표 보기</button>
+        </div>
+      </div>
+
       <!-- 시간표 컴포넌트 -->
-      <AdminTimeTable @setRange="setData" />
+      <div v-if="!professorTT">
+        <AdminTimeTable @setRange="setData" />
+      </div>
     </div>
   </AppLayout>
 </template>

src/pages/TimeTable/components/AdminTimeTable.vue

@@ -9,12 +9,13 @@ const Tstore = useTimetableStore()
 const timetableData = ref(null)
 const today = new Date('2025-06-05') // 오늘
 const today_day = today.getDay() // 오늘의 요일 (일요일=0)
-const selectDate = ref(today)
+const selectDate = ref(null)
 
 // 주 변경시 시간표 데이터 갱신
 watch(
   () => selectDate.value,
   async () => {
+    if (selectDate.value == null) selectDate.value = Tstore.date ? new Date(Tstore.date) : today
     // console.log("selectDate", selectDate.value);
     await Tstore.setTimetable(selectDate.value.toISOString().split('T')[0])
   },

src/pages/TimeTable/components/TimeTable.vue

@@ -2,20 +2,29 @@
 import { ref, watch } from 'vue'
 import { day } from '@/utils/reName'
 import { useTimetableStore } from '@/stores/timetable'
+import { getStudentTimetable } from '@/api/timetableApi'
 
 const Tstore = useTimetableStore()
 
 //  시간표 조회 ====================================
 const timetableData = ref(null)
 const today = new Date('2025-06-05') // 오늘
 const today_day = today.getDay() // 오늘의 요일 (일요일=0)
-const selectDate = ref(today)
+const selectDate = ref(null)
 
+const professorTT = defineModel()
 // 주 변경시 시간표 데이터 갱신
 watch(
   () => selectDate.value,
   async () => {
-    timetableData.value = await Tstore.getStdTimetable(selectDate.value.toISOString().split('T')[0])
+    if (selectDate.value == null) selectDate.value = Tstore.date ? new Date(Tstore.date) : today
+    if (professorTT.value) {
+      timetableData.value = await Tstore.getPfsTimetable(
+        selectDate.value.toISOString().split('T')[0],
+      )
+    } else {
+      timetableData.value = await getStudentTimetable(selectDate.value.toISOString().split('T')[0])
+    }
   },
   { immediate: true },
 )

src/stores/timetable.js

@@ -2,12 +2,17 @@ import { defineStore } from 'pinia'
 import { lengthHour } from '@/utils/lengthHour'
 import { useClassroomStore } from '@/stores/classroom'
 import { useProfessorStore } from '@/stores/professor'
-import { getStudentTimetable, getAdminTimetable, getCourses, getSections } from '@/api/timetableApi'
+import {
+  getProfessorTimetable,
+  getAdminTimetable,
+  getCourses,
+  getSections,
+} from '@/api/timetableApi'
 
 export const useTimetableStore = defineStore('timetable', {
   state: () => ({
-    // 학생 Timetable
-    studentTimetable: [],
+    // 교수 Timetable
+    professorTimetable: [],
     // 관리자 Timetable / 기준 date
     adminTimetable: [],
     date: null,
@@ -40,19 +45,18 @@ export const useTimetableStore = defineStore('timetable', {
   actions: {
     // ------------------------ studentTimetable --------------------------
     // [ set ] : studentTimetable 셋팅
-    async setStdTimetable(day = this.selectTT.date) {
+    async setPfsTimetable(day = this.date) {
       if (day == null) day = new Date().toISOString().split('T')[0]
-      this.studentTimetable = await getStudentTimetable(day)
+      this.professorTimetable = await getProfessorTimetable(day)
       this.date = day
-      // console.log('store: studentTimetable', this.studentTimetable)
     },
 
     // [ get ] : studentTimetable 반환
-    async getStdTimetable(day) {
+    async getPfsTimetable(day) {
       if (this.date != day) {
-        await this.setStdTimetable(day)
+        await this.setPfsTimetable(day)
       }
-      return this.studentTimetable
+      return this.professorTimetable
     },
 
     // ------------------------ adminTimetable --------------------------