diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index e65faff1..00000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="LGMG600SRb821ebcd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2024-02-19T16:03:29.365697Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/umc/com/mobile/project/data/model/plan/CertificateResponse.kt b/app/src/main/java/umc/com/mobile/project/data/model/plan/CertificateResponse.kt
new file mode 100644
index 00000000..3b8857e3
--- /dev/null
+++ b/app/src/main/java/umc/com/mobile/project/data/model/plan/CertificateResponse.kt
@@ -0,0 +1,13 @@
+package umc.com.mobile.project.data.model.plan
+
+data class CertificateResponse(
+    val isSuccess: Boolean,
+    val code: String,
+    val message: String,
+    val result: List<CertificateUpdateInfo>
+)
+
+data class CertificateUpdateInfo(
+    val certificateId: Long,
+    val updatedAt: String
+)
diff --git a/app/src/main/java/umc/com/mobile/project/data/model/plan/DeleteLicense.kt b/app/src/main/java/umc/com/mobile/project/data/model/plan/DeleteLicense.kt
new file mode 100644
index 00000000..efd8410c
--- /dev/null
+++ b/app/src/main/java/umc/com/mobile/project/data/model/plan/DeleteLicense.kt
@@ -0,0 +1,14 @@
+package umc.com.mobile.project.data.model
+
+data class DeleteLicense(
+    val isSuccess: Boolean,
+    val code: String,
+    val message: String,
+    val result: List<DeleteItem>
+)
+
+data class DeleteItem(
+    val certificateId: Long,
+    val name: String,
+    val date: String
+)
diff --git a/app/src/main/java/umc/com/mobile/project/data/model/plan/TimeInfoResponse.kt b/app/src/main/java/umc/com/mobile/project/data/model/plan/TimeInfoResponse.kt
new file mode 100644
index 00000000..c0bbf970
--- /dev/null
+++ b/app/src/main/java/umc/com/mobile/project/data/model/plan/TimeInfoResponse.kt
@@ -0,0 +1,7 @@
+package umc.com.mobile.project.data.model.plan
+
+data class TimeInfoResponse(
+    val type: String,
+    val name: String,
+    val credit:String,
+)
diff --git a/app/src/main/java/umc/com/mobile/project/data/model/plan/UpTimeResponse.kt b/app/src/main/java/umc/com/mobile/project/data/model/plan/UpTimeResponse.kt
new file mode 100644
index 00000000..832cd3c3
--- /dev/null
+++ b/app/src/main/java/umc/com/mobile/project/data/model/plan/UpTimeResponse.kt
@@ -0,0 +1,16 @@
+package umc.com.mobile.project.data.model.plan
+
+data class UpTimeResponse(
+    val isSuccess: Boolean,
+    val code: String,
+    val message: String,
+    val result: List<upTimeResult>,
+)
+
+data class upTimeResult(
+    val subjectId: Long,
+    val type: String,
+    val name: String,
+    val credit: Long,
+)
+
diff --git a/app/src/main/java/umc/com/mobile/project/data/network/api/PlanApi.kt b/app/src/main/java/umc/com/mobile/project/data/network/api/PlanApi.kt
index 614f3748..6c8157c9 100644
--- a/app/src/main/java/umc/com/mobile/project/data/network/api/PlanApi.kt
+++ b/app/src/main/java/umc/com/mobile/project/data/network/api/PlanApi.kt
@@ -3,12 +3,17 @@ package umc.com.mobile.project.data.network.api
 import retrofit2.http.GET
 import retrofit2.Call
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.PATCH
 import retrofit2.http.POST
+import retrofit2.http.Path
 import retrofit2.http.Query
+import umc.com.mobile.project.data.model.DeleteLicense
 import umc.com.mobile.project.data.model.plan.AddTimeRequest
 import umc.com.mobile.project.data.model.plan.AddTimeResponse
 import umc.com.mobile.project.data.model.plan.BringlicenseResponse
+import umc.com.mobile.project.data.model.plan.CertificateLicenseRequest
+import umc.com.mobile.project.data.model.plan.CertificateResponse
 import umc.com.mobile.project.data.model.plan.ListTimeResponse
 import umc.com.mobile.project.data.model.plan.PlanFreeRequest
 import umc.com.mobile.project.data.model.plan.PlanFreeResponse
@@ -17,19 +22,16 @@ import umc.com.mobile.project.data.model.plan.SaveInfo
 import umc.com.mobile.project.data.model.plan.SemesterTimeResponse
 import umc.com.mobile.project.data.model.plan.UPlicenseResponse
 import umc.com.mobile.project.data.model.plan.EditMemoRequest
+import umc.com.mobile.project.data.model.plan.UpTimeResponse
 
 
 interface PlanApi {
     @GET("plans/certifications")
     fun getUPlicense(): Call<UPlicenseResponse>
 
-
     @POST("plans/certifications")
     fun saveLicense(@Body request: List<SaveInfo>): Call<BringlicenseResponse>
 
-
-
-
     @GET("/plans/timetable/searchSubject")
     fun getListTime(@Query("hakki") hakki:String, @Query("track") track : String) : Call<ListTimeResponse>
 
@@ -48,12 +50,15 @@ interface PlanApi {
     @POST("/plans/memo")
     fun postFreeMemo(@Body request: PlanFreeRequest): Call<PlanFreeResponse>
 
+    @GET("/plans/timetable")
+    fun getUptime(@Query("grade") grade:Int, @Query("semseter") semester : Int):Call<UpTimeResponse>
+
     @PATCH("/plans/memo")
     fun editMemo(@Body editMemoRequest: EditMemoRequest) : Call<PlanFreeResponse>
 
+    @PATCH("/plans/certifications")
+    fun certificateLicense(@Body request: CertificateLicenseRequest) : Call<CertificateResponse>
 
-
-
-
-
+    @DELETE("/plans/certifications")
+    fun deleteLicense(@Query("certificateId") certificateId: Long): Call<DeleteLicense>
 }
\ No newline at end of file
diff --git a/app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt b/app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt
index 6987dc85..46dee1e4 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt
@@ -56,13 +56,13 @@ class HomeFragment : Fragment() {
 	// 페이지 이동
 	private fun navigateFragment() {
 		binding.btnCheeringWordMove.setOnClickListener {
-			navigate(R.id.action_fragment_home_to_fragment_date)
+			navigate(R.id.action_fragment_home_to_planTimetableFragment)
 		}
 		binding.layoutNextPlan.setOnClickListener {
-			navigate(R.id.action_fragment_home_to_planSettingFragment)
+			navigate(R.id.action_fragment_home_to_planTimetableFragment)
 		}
 		binding.constraintLayout3.setOnClickListener {
-			navigate(R.id.action_fragment_home_to_planSettingFragment)
+			navigate(R.id.action_fragment_home_to_planTimetableFragment)
 		}
 	}
 
diff --git a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanRecyclerAdapter.kt b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanRecyclerAdapter.kt
index 57440ad9..8c72eeb0 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanRecyclerAdapter.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanRecyclerAdapter.kt
@@ -4,10 +4,8 @@ import android.text.Editable
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import umc.com.mobile.project.data.model.career.PointDtoList
-import umc.com.mobile.project.data.model.career.Result
+import umc.com.mobile.project.data.model.plan.TimeInfoResponse
 import umc.com.mobile.project.data.model.plan.TimeResult
-import umc.com.mobile.project.databinding.ItemCertificateBinding
 import umc.com.mobile.project.databinding.ItemTimeSubjectBinding
 
 class PlanRecyclerAdapter(
@@ -27,7 +25,7 @@ class PlanRecyclerAdapter(
 
     override fun getItemCount(): Int = timeList.size
 
-    fun updateTimeList(newTimeList: List<TimeResult?>) {
+    fun updateTimeList(newTimeList: List<TimeResult>) {
         this.timeList = newTimeList
         notifyDataSetChanged() // 데이터가 변경되었음을 알리고 UI를 갱신
     }
diff --git a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanSettingFragment.kt b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanSettingFragment.kt
index 6750ae59..4a6c9995 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanSettingFragment.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanSettingFragment.kt
@@ -1,26 +1,16 @@
 package umc.com.mobile.project.ui.plan
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
-import androidx.viewpager.widget.ViewPager
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
-import umc.com.mobile.project.R
-import umc.com.mobile.project.databinding.FragmentSettingBinding
-import umc.com.mobile.project.databinding.PlanSubjectListBinding
 import umc.com.mobile.project.databinding.PlanTimeTabMainBinding
-import umc.com.mobile.project.databinding.SemesterChooseBinding
-import umc.com.mobile.project.ui.gradInfo.adapter.GradInfoVPAdapter
-import umc.com.mobile.project.ui.gradInfo.viewmodel.GradInfoViewModel
 
 class PlanSettingFragment : Fragment() {
     private var _binding: PlanTimeTabMainBinding? = null
@@ -39,14 +29,23 @@ class PlanSettingFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        // PlanTimeTabMainBinding을 인플레이트하여 루트 뷰를 가져옴
         _binding = PlanTimeTabMainBinding.inflate(inflater, container, false)
         val view = binding.root
 
+
+
         // 탭 레이아웃 및 뷰페이저 초기화
         initTabLayout()
         initViewPager()
 
+        binding.planSettingBackButton.setOnClickListener {
+            findNavController().navigateUp()
+        }
+
         return view
+
+
     }
 
 
@@ -54,9 +53,11 @@ class PlanSettingFragment : Fragment() {
 
         val tabTitle = arrayOf("시간표", "자격증", "자유")
 
+
         viewPager = binding.viewPagerTimeTabMain
         tabLayout = binding.tabLayoutPlanTime
 
+
         val adapter = PlanVPAdapter(this)
 
         adapter.addFragment(PlanTimeFragment())
diff --git a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanTimeAdapter.kt b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanTimeAdapter.kt
index 6b143b95..93f3e3ce 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanTimeAdapter.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanTimeAdapter.kt
@@ -1,19 +1,21 @@
+package umc.com.mobile.project.ui.plan
+
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import umc.com.mobile.project.data.model.plan.TimeResult
+import umc.com.mobile.project.data.model.plan.TimeInfoResponse
 import umc.com.mobile.project.databinding.ItemPlanTimeBinding
 
-class PlanTimeAdapter : ListAdapter<TimeResult, PlanTimeAdapter.ViewHolder>(TimeResultDiffCallback()) {
+class PlanTimeAdapter(private var addnewtime: List<Any> = ArrayList()): ListAdapter<TimeInfoResponse, PlanTimeAdapter.ViewHolder>(UpTimeResultDiffCallback()) {
 
-    // ViewHolder 클래스는 그대로 유지합니다.
     class ViewHolder(private val binding: ItemPlanTimeBinding) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(item: TimeResult) {
-            binding.timeKindTitle.text = item.searchType
-            binding.timeClassTitle.text = item.searchName
-            binding.timeGradeTitle.text = item.searchCredit.toString() // toString() 추가, 학점을 문자열로 표시
+        fun bind(item: TimeInfoResponse) {
+            binding.timeKindTitle.text = item.type
+            binding.timeClassTitle.text = item.name
+            // 학점을 문자열로 변환하여 표시
+            binding.timeGradeTitle.text = item.credit.toString()
         }
     }
 
@@ -27,17 +29,18 @@ class PlanTimeAdapter : ListAdapter<TimeResult, PlanTimeAdapter.ViewHolder>(Time
         holder.bind(item)
     }
 
-    // 현재 데이터 리스트를 가져오는 편의 메서드를 추가합니다.
-    fun getCurrentData(): List<TimeResult> {
-        return currentList
+    fun updateTimeList(addnewtime: ArrayList<TimeInfoResponse>) {
+        submitList(addnewtime)
     }
 
-    class TimeResultDiffCallback : DiffUtil.ItemCallback<TimeResult>() {
-        override fun areItemsTheSame(oldItem: TimeResult, newItem: TimeResult): Boolean {
-            return oldItem.searchName == newItem.searchName
+    class UpTimeResultDiffCallback : DiffUtil.ItemCallback<TimeInfoResponse>() {
+        override fun areItemsTheSame(oldItem: TimeInfoResponse, newItem: TimeInfoResponse): Boolean {
+            // subjectId를 비교하여 동일한 아이템인지 판별
+            return oldItem.name== newItem.name
         }
 
-        override fun areContentsTheSame(oldItem: TimeResult, newItem: TimeResult): Boolean {
+        override fun areContentsTheSame(oldItem: TimeInfoResponse, newItem: TimeInfoResponse): Boolean {
+            // 내용이 동일한지 비교
             return oldItem == newItem
         }
     }
diff --git a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanTimeFragment.kt b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanTimeFragment.kt
index 06982e7a..ac6c2a8c 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanTimeFragment.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanTimeFragment.kt
@@ -10,6 +10,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import umc.com.mobile.project.R
+import umc.com.mobile.project.data.model.plan.TimeInfoResponse
 import umc.com.mobile.project.databinding.PlanSubjectListBinding
 import umc.com.mobile.project.ui.common.NavigationUtil.navigate
 
@@ -38,7 +39,7 @@ class PlanTimeFragment : Fragment() {
         val adapter = PlanRecyclerAdapter(emptyList(), onAddButtonClicked = { timeResult ->
 
             if (timeResult != null) {
-                viewModel.setSelectedTimeResult(timeResult)
+                viewModel.setSelectedTimeResult(timeResult = TimeInfoResponse(timeResult.searchType,timeResult.searchName,timeResult.searchCredit))
             }
 
 
@@ -67,9 +68,7 @@ class PlanTimeFragment : Fragment() {
     }
 
     private fun setupNavigation() {
-        binding.planTimeMoveTimetable.setOnClickListener {
-            navigate(R.id.action_planSettingFragment_to_planTimetableFragment)
-        }
+
 
         binding.planSubjectListSemester.setOnClickListener {
             navigate(R.id.action_planSettingFragment_to_planSemesterFragment)
diff --git a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanTimetableFragment.kt b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanTimetableFragment.kt
index ce079f10..a4135379 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanTimetableFragment.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanTimetableFragment.kt
@@ -1,20 +1,19 @@
 package umc.com.mobile.project.ui.plan
 
-import PlanTimeAdapter
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
+import umc.com.mobile.project.R
 import umc.com.mobile.project.databinding.PlanTimeMainBinding
-import umc.com.mobile.project.data.model.plan.AddTimeRequest
-import umc.com.mobile.project.data.model.plan.SemesterDto
-import umc.com.mobile.project.data.model.plan.SubjectDtoList
+import umc.com.mobile.project.ui.common.NavigationUtil.navigate
+
 
 class PlanTimetableFragment : Fragment() {
 
@@ -35,61 +34,140 @@ class PlanTimetableFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupRecyclerView()
-        setupSaveButton()
-        observeAddTimeResponse()
+        observeSelectedTimeResults()
 
-        binding.planTimetableBackButton.setOnClickListener {
-            findNavController().navigateUp()
-        }
-    }
 
-    private fun setupRecyclerView() {
-        adapter = PlanTimeAdapter()
-        binding.recyclerView.layoutManager = LinearLayoutManager(context)
-        binding.recyclerView.adapter = adapter
+        val spinner = binding.spinnerPlanTimeTrackSemester
+        val adapter = ArrayAdapter.createFromResource(
+            requireContext(),
+            R.array.semester_options,
+            android.R.layout.simple_spinner_item
+        )
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        spinner.adapter = adapter
+
+        // 선택한 항목 리스너 추가 (필요한 경우)
+
+        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?,
+                view: View?,
+                position: Int,
+                id: Long
+            ) {
+                val selectedItem = parent?.getItemAtPosition(position).toString()
+                when (selectedItem) {
+                    "1학년 1학기" -> {
+                        viewModel.setGradeAndSemester(1, 1)
+//                        viewModel.getTimeInfo(1, 1)
+
+
+                    }
+
+                    "1학년 2학기" -> {
+                        viewModel.setGradeAndSemester(1, 2)
+//                        viewModel.getTimeInfo(1, 2)
+
+
+                    }
+
+                    "2학년 1학기" -> {
+                        viewModel.setGradeAndSemester(2, 1)
+//                        viewModel.getTimeInfo(2, 1)
+
+
+                    }
+
+                    "2학년 2학기" -> {
+                        viewModel.setGradeAndSemester(2, 2)
+//                        viewModel.getTimeInfo(2, 2)
+
+
+                    }
+
+                    "3학년 1학기" -> {
+                        viewModel.setGradeAndSemester(3, 1)
+//                        viewModel.getTimeInfo(3, 1)
+
+
+                    }
+
+                    "3학년 2학기" -> {
+                        viewModel.setGradeAndSemester(3, 2)
+//                        viewModel.getTimeInfo(3, 2)
+
+
+                    }
+
+                    "4학년 1학기" -> {
+                        viewModel.setGradeAndSemester(4, 1)
+//                        viewModel.getTimeInfo(4, 1)
+
+
+                    }
+
+                    "4학년 2학기" -> {
+                        viewModel.setGradeAndSemester(4, 2)
+//                        viewModel.getTimeInfo(4, 2)
+
+
+                    }
+
+                }
 
-        viewModel.selectedTimeResults.observe(viewLifecycleOwner) { results ->
-            adapter.submitList(results.toList())
-        }
-    }
 
-    private fun setupSaveButton() {
-        binding.timeStoreButton.setOnClickListener {
-            val currentDataList = adapter.getCurrentData()
-
-            // 서버로 전송할 데이터 리스트를 기반으로 AddTimeRequest 객체를 생성합니다.
-            val subjectDtoList = currentDataList.map {
-                SubjectDtoList(
-                    it.searchType,
-                    it.searchName,
-                    it.searchCredit
-                )
             }
-            val addTimeRequest = AddTimeRequest(
-                SemesterDto(grade = 1, semester = 1),
-                subjectDtoList
-            ) // 예시값을 사용한 SemesterDto
 
-            // ViewModel의 addTime 메서드를 호출하여 서버로 데이터를 전송합니다.
-            viewModel.addTime(addTimeRequest)
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                // 아무 것도 선택되지 않은 경우의 동작 구현
+            }
         }
-    }
+        binding.timeStoreButton.setOnClickListener {
+            // grade와 semester가 선택되었는지 확인
+            val grade = viewModel.grade.value
+            val semester = viewModel.semester.value
 
-    private fun observeAddTimeResponse() {
-        viewModel.addTimeResponse.observe(viewLifecycleOwner) { response ->
-            if (response != null && response.isSuccess) {
-                Toast.makeText(context, "Data saved successfully!", Toast.LENGTH_SHORT).show()
-                Log.d("PlanTimetableFragment", "Data saved successfully: ${response.message}")
+            if (grade == null || semester == null) {
+                // 학년 또는 학기가 선택되지 않았다면 토스트 메시지 표시
+                Toast.makeText(context, "학년과 학기를 선택해주세요.", Toast.LENGTH_SHORT).show()
             } else {
-                Toast.makeText(context, "Failed to save data.", Toast.LENGTH_SHORT).show()
-                Log.e("PlanTimetableFragment", "Failed to save data")
+                // 선택된 경우에만 서버로 데이터 전송 처리
+                viewModel.sendAddTimeRequest()
+                viewModel.getTimeInfo(grade, semester)
             }
         }
+
+
+
+        binding.titleMoveTimetable.setOnClickListener {
+            navigate(R.id.action_fragment_home_to_planTimetableFragment)
+
+        }
+
     }
 
-        override fun onDestroyView() {
-            super.onDestroyView()
-            _binding = null
+
+
+
+    private fun observeSelectedTimeResults() {
+        viewModel.selectedTimeResults.observe(viewLifecycleOwner) { selectedTimeResults ->
+            (binding.recyclerView.adapter as PlanTimeAdapter).updateTimeList(selectedTimeResults)
         }
     }
 
+    // 추가하기 버튼으로 시간표에 과목 업데이트
+    private fun setupRecyclerView() {
+        // 초기 데이터 리스트를 비어 있는 리스트로 설정합니다.
+        // 데이터가 준비되면, 나중에 observeSelectedTimeResults 함수 내에서 submitList를 통해 업데이트합니다.
+        adapter = PlanTimeAdapter(emptyList())
+        binding.recyclerView.layoutManager = LinearLayoutManager(context)
+        binding.recyclerView.adapter = adapter
+    }
+
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
+
diff --git a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanViewModel.kt b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanViewModel.kt
index fba47fdc..1d9b3853 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanViewModel.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanViewModel.kt
@@ -1,408 +1,548 @@
-package umc.com.mobile.project.ui.plan
-
-
-import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import umc.com.mobile.project.data.model.plan.AddTimeRequest
-import umc.com.mobile.project.data.model.plan.AddTimeResponse
-import umc.com.mobile.project.data.model.plan.BringlicenseResponse
-import umc.com.mobile.project.data.model.plan.EditMemoRequest
-import umc.com.mobile.project.data.model.plan.ListTimeResponse
-import umc.com.mobile.project.data.model.plan.PlanFreeRequest
-import umc.com.mobile.project.data.model.plan.PlanFreeResponse
-import umc.com.mobile.project.data.model.plan.PlanTrackResponse
-import umc.com.mobile.project.data.model.plan.SaveInfo
-
-import umc.com.mobile.project.data.model.plan.SavelicenseRequest
-import umc.com.mobile.project.data.model.plan.SemesterTimeResponse
-import umc.com.mobile.project.data.model.plan.SubjectDtoList
-import umc.com.mobile.project.data.model.plan.TimeResult
-
-import umc.com.mobile.project.data.model.plan.UPlicenseResponse
-import umc.com.mobile.project.data.network.ApiClient
-import umc.com.mobile.project.data.network.api.PlanApi
-
-class PlanViewModel : ViewModel() {
-
-
-    //api
-    private val planApiService = ApiClient.createService<PlanApi>()
-
-    private val _selectedTimeResults = MutableLiveData<ArrayList<TimeResult>>()
-    val selectedTimeResults: LiveData<ArrayList<TimeResult>> = _selectedTimeResults
-
-    fun setSelectedTimeResult(timeResult: TimeResult) {
-        val currentList = _selectedTimeResults.value ?: ArrayList()
-        currentList.add(timeResult)
-        _selectedTimeResults.value = currentList
-        Log.d("PlanTimetable", "setSelectedTimeResult: $timeResult")
-    }
+    package umc.com.mobile.project.ui.plan
 
 
+    import android.util.Log
+    import androidx.lifecycle.LiveData
+    import androidx.lifecycle.MutableLiveData
+    import androidx.lifecycle.ViewModel
+    import retrofit2.Call
+    import retrofit2.Callback
+    import retrofit2.Response
+    import umc.com.mobile.project.data.model.DeleteLicense
+    import umc.com.mobile.project.data.model.plan.AddTimeRequest
+    import umc.com.mobile.project.data.model.plan.AddTimeResponse
+    import umc.com.mobile.project.data.model.plan.BringlicenseResponse
+    import umc.com.mobile.project.data.model.plan.CertificateLicenseRequest
+    import umc.com.mobile.project.data.model.plan.CertificateResponse
+    import umc.com.mobile.project.data.model.plan.EditMemoRequest
+    import umc.com.mobile.project.data.model.plan.ListTimeResponse
+    import umc.com.mobile.project.data.model.plan.PlanFreeRequest
+    import umc.com.mobile.project.data.model.plan.PlanFreeResponse
+    import umc.com.mobile.project.data.model.plan.PlanTrackResponse
+    import umc.com.mobile.project.data.model.plan.SaveInfo
 
+    import umc.com.mobile.project.data.model.plan.SavelicenseRequest
+    import umc.com.mobile.project.data.model.plan.SemesterDto
+    import umc.com.mobile.project.data.model.plan.SemesterTimeResponse
+    import umc.com.mobile.project.data.model.plan.SubjectDtoList
+    import umc.com.mobile.project.data.model.plan.TimeInfoResponse
+    import umc.com.mobile.project.data.model.plan.TimeResult
 
-    private val _planFreeInfo: MutableLiveData<PlanFreeResponse?> = MutableLiveData()
-    val planFreeInfo: LiveData<PlanFreeResponse?>
-        get() = _planFreeInfo
+    import umc.com.mobile.project.data.model.plan.UPlicenseResponse
+    import umc.com.mobile.project.data.model.plan.UpTimeResponse
+    import umc.com.mobile.project.data.model.plan.upTimeResult
+    import umc.com.mobile.project.data.network.ApiClient
+    import umc.com.mobile.project.data.network.api.PlanApi
 
-    private val _postMemoResult = MutableLiveData<Boolean>()
-    val postMemoResult: LiveData<Boolean>
-        get() = _postMemoResult
+    class PlanViewModel : ViewModel() {
 
-    private val _hakki: MutableLiveData<String> = MutableLiveData()
-    val hakki: LiveData<String>
-        get() = _hakki
 
-    private val _track: MutableLiveData<String> = MutableLiveData()
-    val track: LiveData<String>
-        get() = _track
+        //api
+        private val planApiService = ApiClient.createService<PlanApi>()
 
+        private val _upTimeResponse: MutableLiveData<UpTimeResponse?> = MutableLiveData()
+        val upTimeResponse: LiveData<UpTimeResponse?>
+            get() = upTimeResponse
 
-    private val _planSemesterInfo: MutableLiveData<SemesterTimeResponse?> = MutableLiveData()
-    val planSemesterInfo: LiveData<SemesterTimeResponse?>
-        get() = _planSemesterInfo
+        private val _grade: MutableLiveData<Int> = MutableLiveData()
+        val grade: LiveData<Int>
+            get() = _grade
 
-    private val _planTrackInfo: MutableLiveData<PlanTrackResponse?> = MutableLiveData()
-    val planTrackInfo: LiveData<PlanTrackResponse?>
-        get() = _planTrackInfo
+        private val _semester: MutableLiveData<Int> = MutableLiveData()
+        val semester: LiveData<Int>
+            get() = _semester
+        fun setGradeAndSemester(grade: Int, semester: Int) {
+            _grade.value = grade
+            _semester.value = semester
+        }
 
-    private val _timeTableInfo = MutableLiveData<AddTimeResponse?>()
-    val timeTableInfo: LiveData<AddTimeResponse?> = _timeTableInfo
+        //viewmodel 에 데이터 저장, 시간표 조회, 과목 검색
+        private val _selectedTimeResults = MutableLiveData<ArrayList<TimeInfoResponse>>()
+        val selectedTimeResults: LiveData<ArrayList<TimeInfoResponse>> = _selectedTimeResults
 
+        fun setSelectedTimeResult(timeResult:TimeInfoResponse) {
+            val currentList = _selectedTimeResults.value ?: ArrayList()
+            currentList.add(timeResult)
+            _selectedTimeResults.value = currentList
+            Log.d("PlanTimetable", "setSelectedTimeResult: $timeResult")
+        }
 
-    private val _planTimeStatus: MutableLiveData<Boolean> = MutableLiveData()
-    val planTimeStatus: LiveData<Boolean>
-        get() = _planTimeStatus
 
-    private val _bringLicenseInfo = MutableLiveData<BringlicenseResponse?>()
 
 
-    private val _listTimeInfo = MutableLiveData<ListTimeResponse?>()
+        private val _planFreeInfo: MutableLiveData<PlanFreeResponse?> = MutableLiveData()
+        val planFreeInfo: LiveData<PlanFreeResponse?>
+            get() = _planFreeInfo
 
-    val listTimeInfo: LiveData<ListTimeResponse?>
-        get() = _listTimeInfo
+        private val _postMemoResult = MutableLiveData<Boolean>()
+        val postMemoResult: LiveData<Boolean>
+            get() = _postMemoResult
 
-    val bringLicenseInfo: LiveData<BringlicenseResponse?>
-        get() = _bringLicenseInfo
+        private val _hakki: MutableLiveData<String> = MutableLiveData()
+        val hakki: LiveData<String>
+            get() = _hakki
 
+        private val _track: MutableLiveData<String> = MutableLiveData()
+        val track: LiveData<String>
+            get() = _track
 
-    private val _licenseInfo: MutableLiveData<UPlicenseResponse?> = MutableLiveData()
-    val licenseInfo: LiveData<UPlicenseResponse?>
-        get() = _licenseInfo
 
+        private val _planSemesterInfo: MutableLiveData<SemesterTimeResponse?> = MutableLiveData()
+        val planSemesterInfo: LiveData<SemesterTimeResponse?>
+            get() = _planSemesterInfo
 
-    private val _error: MutableLiveData<String> = MutableLiveData()
-    val error: LiveData<String>
-        get() = _error
+        private val _planTrackInfo: MutableLiveData<PlanTrackResponse?> = MutableLiveData()
+        val planTrackInfo: LiveData<PlanTrackResponse?>
+            get() = _planTrackInfo
 
+        private val _timeTableInfo = MutableLiveData<AddTimeResponse?>()
+        val timeTableInfo: LiveData<AddTimeResponse?> = _timeTableInfo
 
-    private val _savelicenseInfo: MutableLiveData<SavelicenseRequest> = MutableLiveData()
-    val savelicenseInfo: LiveData<SavelicenseRequest>
-        get() = _savelicenseInfo
 
+        private val _planTimeStatus: MutableLiveData<Boolean> = MutableLiveData()
+        val planTimeStatus: LiveData<Boolean>
+            get() = _planTimeStatus
 
+        private val _bringLicenseInfo = MutableLiveData<BringlicenseResponse?>()
 
 
-    // 기존에 있던 text LiveData
-    private val _text = MutableLiveData<String>().apply {
-        value = "This is Plan Fragment"
-    }
-    val text: LiveData<String> = _text
+        private val _listTimeInfo = MutableLiveData<ListTimeResponse?>()
 
-    // 새로 추가된 isFilledAllOptions LiveData
-    private val _isFilledAllOptions = MutableLiveData<Boolean>().apply {
-        value = false // 초기값 설정
-    }
-    val isFilledAllOptions: LiveData<Boolean> = _isFilledAllOptions
+        val listTimeInfo: LiveData<ListTimeResponse?>
+            get() = _listTimeInfo
 
-    // isFilledAllOptions의 값을 업데이트하는 메서드
-    fun updateIsFilledAllOptions(isFilled: Boolean) {
-        _isFilledAllOptions.value = isFilled
-    }
-    fun resetSemesterSelection() {
-        // 학기 정보 관련 상태 초기화
-        _planSemesterInfo.postValue(null) // 학기 정보 초기화
-        _hakki.postValue("") // 학기 식별자 초기화 (또는 적절한 초기 값으로 설정)
-    }
+        val bringLicenseInfo: LiveData<BringlicenseResponse?>
+            get() = _bringLicenseInfo
 
-    fun resetTrackSelection() {
-        // 선택된 트랙 정보 초기화
-        _track.postValue("") // 트랙 식별자 초기화 (또는 적절한 초기 값으로 설정)
-    }
 
-    fun setHakki(hakki: String) {
-        _hakki.value = hakki
-        Log.d("hakki value", "setHakki 호출됨: hakki=$hakki")
-    }
+        private val _licenseInfo: MutableLiveData<UPlicenseResponse?> = MutableLiveData()
+        val licenseInfo: LiveData<UPlicenseResponse?>
+            get() = _licenseInfo
 
 
-    fun setHakkiAndTrack(hakki: String, trackId: String) {
-        Log.d("hakkitrackvalue", "setHakkiAndTrack 호출됨: hakki=$hakki, trackId=$trackId")
-        _hakki.value = hakki
-        _track.value = trackId
-    }
+        private val _error: MutableLiveData<String> = MutableLiveData()
+        val error: LiveData<String>
+            get() = _error
 
-    private val _addTimeResponse = MutableLiveData<AddTimeResponse?>()
-    val addTimeResponse: MutableLiveData<AddTimeResponse?> = _addTimeResponse
-
-    fun addTime(request: AddTimeRequest) {
-        planApiService.addTime(request).enqueue(object : Callback<AddTimeResponse> {
-            override fun onResponse(call: Call<AddTimeResponse>, response: Response<AddTimeResponse>) {
-                if (response.isSuccessful) {
-                    // 서버로부터 응답을 성공적으로 받았을 때 LiveData 업데이트
-                    Log.d("TimeTableApi", "getListTimeInfo 성공: ${response.body()}")
-                    _addTimeResponse.postValue(response.body())
-                } else {
-                    // 에러 처리: 실패 응답 처리
-                    Log.e("TimeTableApi", "Error posting memo: ${response.errorBody()?.string()}")
-                    _addTimeResponse.postValue(null)
-                }
-            }
 
-            override fun onFailure(call: Call<AddTimeResponse>, t: Throwable) {
-                // 네트워크 에러 처리: LiveData 업데이트로 에러 상태 전달 가능
-                _addTimeResponse.postValue(null)
-            }
-        })
-    }
+        private val _savelicenseInfo: MutableLiveData<SavelicenseRequest> = MutableLiveData()
+        val savelicenseInfo: LiveData<SavelicenseRequest>
+            get() = _savelicenseInfo
 
+        private val _certificateResponse = MutableLiveData<CertificateResponse?>()
+        val certificateResponse: LiveData<CertificateResponse?>
+            get() = _certificateResponse
 
 
 
 
-    fun postMemo(memoRequest: PlanFreeRequest) {
-        planApiService.postFreeMemo(memoRequest).enqueue(object : Callback<PlanFreeResponse> {
-            override fun onResponse(
-                call: Call<PlanFreeResponse>,
-                response: Response<PlanFreeResponse>
-            ) {
-                if (response.isSuccessful) {
-                    // API 호출 성공 시, 성공 LiveData 업데이트
-                    _postMemoResult.postValue(true)
-                } else {
-                    // 실패 시, 실패 LiveData 업데이트
-                    Log.e("PlanViewModel", "Error posting memo: ${response.errorBody()?.string()}")
-                    _postMemoResult.postValue(false)
-                }
-            }
+        // 기존에 있던 text LiveData
+        private val _text = MutableLiveData<String>().apply {
+            value = "This is Plan Fragment"
+        }
+        val text: LiveData<String> = _text
 
-            override fun onFailure(call: Call<PlanFreeResponse>, t: Throwable) {
-                // 네트워크 오류 등으로 호출 실패 시, 실패 LiveData 업데이트
-                _postMemoResult.postValue(false)
-            }
-        })
-    }
+        // 새로 추가된 isFilledAllOptions LiveData
+        private val _isFilledAllOptions = MutableLiveData<Boolean>().apply {
+            value = false // 초기값 설정
+        }
+        val isFilledAllOptions: LiveData<Boolean> = _isFilledAllOptions
+
+        // isFilledAllOptions의 값을 업데이트하는 메서드
+        fun updateIsFilledAllOptions(isFilled: Boolean) {
+            _isFilledAllOptions.value = isFilled
+        }
+        fun resetSemesterSelection() {
+            // 학기 정보 관련 상태 초기화
+            _planSemesterInfo.postValue(null) // 학기 정보 초기화
+            _hakki.postValue("") // 학기 식별자 초기화 (또는 적절한 초기 값으로 설정)
+        }
+
+        fun resetTrackSelection() {
+            // 선택된 트랙 정보 초기화
+            _track.postValue("") // 트랙 식별자 초기화 (또는 적절한 초기 값으로 설정)
+        }
+
+        fun setHakki(hakki: String) {
+            _hakki.value = hakki
+            Log.d("hakki value", "setHakki 호출됨: hakki=$hakki")
+        }
+
+
+        fun setHakkiAndTrack(hakki: String, trackId: String) {
+            Log.d("hakkitrackvalue", "setHakkiAndTrack 호출됨: hakki=$hakki, trackId=$trackId")
+            _hakki.value = hakki
+            _track.value = trackId
+        }
 
+        private val _addTimeResponse = MutableLiveData<AddTimeResponse?>()
+        val addTimeResponse: MutableLiveData<AddTimeResponse?> = _addTimeResponse
 
-    fun getFreeInfo() {
-        planApiService.getFreeInfo().enqueue(object : Callback<PlanFreeResponse> {
-            override fun onResponse(
-                call: Call<PlanFreeResponse>,
-                response: Response<PlanFreeResponse>
-            ) {
-                if (response.isSuccessful) {
-                    if (response.body() != null) {
-                        _planFreeInfo.postValue(response.body())
-                        Log.d("PlanFree", "${response.body()}")
+        fun addTime(request: AddTimeRequest) {
+            Log.d("gradesemester", "Sending AddTimeRequest with grade: ${request.semesterDto.grade}, semester: ${request.semesterDto.semester}")
+            planApiService.addTime(request).enqueue(object : Callback<AddTimeResponse> {
+                override fun onResponse(call: Call<AddTimeResponse>, response: Response<AddTimeResponse>) {
+                    if (response.isSuccessful) {
+                        // 서버로부터 응답을 성공적으로 받았을 때 LiveData 업데이트
+                        Log.d("TimeTableApi", "getListTimeInfo 성공: ${response.body()}")
+                        _addTimeResponse.postValue(response.body())
                     } else {
-                        _error.postValue("서버 응답이 올바르지 않습니다.")
-                    }
-                } else {
-                    _error.postValue("사용자 정보를 가져오지 못했습니다.")
-                    try {
-                        throw response.errorBody()?.string()?.let {
-                            RuntimeException(it)
-                        } ?: RuntimeException("Unknown error")
-                    } catch (e: Exception) {
-                        Log.e("PlanInfo", "PlanResponse API 오류: ${e.message}")
+                        // 에러 처리: 실패 응답 처리
+                        Log.e("TimeTableApi", "Error posting memo: ${response.errorBody()?.string()}")
+                        _addTimeResponse.postValue(null)
                     }
                 }
-            }
 
-            override fun onFailure(call: Call<PlanFreeResponse>, t: Throwable) {
-                _error.postValue("네트워크 오류: ${t.message}")
-                Log.d("gradInfo", "completion: ${t.message}")
-            }
-        })
-    }
+                override fun onFailure(call: Call<AddTimeResponse>, t: Throwable) {
+                    // 네트워크 에러 처리: LiveData 업데이트로 에러 상태 전달 가능
+                    _addTimeResponse.postValue(null)
+                }
+            })
+        }
+        fun sendAddTimeRequest() {
+            val currentSelectedSubjects = _selectedTimeResults.value ?: return
 
 
-    fun getListTimeInfo(hakki: String, track: String) {
-        Log.d("PlanViewModel", "getListTimeInfo 호출됨: hakki=$hakki, track=$track")
-        planApiService.getListTime(hakki, track).enqueue(object : Callback<ListTimeResponse> {
-            override fun onResponse(call: Call<ListTimeResponse>, response: Response<ListTimeResponse>) {
-                if (response.isSuccessful && response.body() != null) {
-                    Log.d("PlanViewModel", "getListTimeInfo 성공: ${response.body()}")
-                    _listTimeInfo.postValue(response.body())
-                } else {
-                    Log.e("PlanViewModel", "getListTimeInfo 실패: ${response.errorBody()?.string()}")
-                    _error.postValue("리스트 정보를 가져오는데 실패했습니다.")
-                }
-            }
+            val grade = _grade.value
+            val semester = _semester.value
+            if (grade == null || semester == null) {
 
-            override fun onFailure(call: Call<ListTimeResponse>, t: Throwable) {
-                Log.e("PlanViewModel", "getListTimeInfo 네트워크 오류: ${t.message}")
-                _error.postValue("네트워크 오류: ${t.message}")
+                return
+            } else {
+                // 로그 출력: grade와 semester 값 로깅
+                Log.d("gradesemester1", "Sending AddTimeRequest with grade: $grade, semester: $semester")
             }
-        })
-    }
+
+            val semesterDto = SemesterDto(grade = grade.toLong(), semester = semester.toLong())
+
+            val request = AddTimeRequest(
+                semesterDto = semesterDto,
+                subjectDtoList = currentSelectedSubjects.map { SubjectDtoList(type = it.type, name = it.name, credit = it.credit) }
+            )
+
+            addTime(request)
+        }
 
 
 
-    fun getLicenseInfo() {
-        planApiService.getUPlicense().enqueue(object : Callback<UPlicenseResponse> {
-            override fun onResponse(
-                call: Call<UPlicenseResponse>,
-                response: Response<UPlicenseResponse>
-            ) {
-                if (response.isSuccessful) {
-                    if (response.body() != null) {
-                        _licenseInfo.postValue(response.body())
-                        Log.d("Planlicense", "${response.body()}")
+
+
+
+        fun postMemo(memoRequest: PlanFreeRequest) {
+            planApiService.postFreeMemo(memoRequest).enqueue(object : Callback<PlanFreeResponse> {
+                override fun onResponse(
+                    call: Call<PlanFreeResponse>,
+                    response: Response<PlanFreeResponse>
+                ) {
+                    if (response.isSuccessful) {
+                        // API 호출 성공 시, 성공 LiveData 업데이트
+                        _postMemoResult.postValue(true)
                     } else {
-                        _error.postValue("서버 응답이 올바르지 않습니다.")
+                        // 실패 시, 실패 LiveData 업데이트
+                        Log.e("PlanViewModel", "Error posting memo: ${response.errorBody()?.string()}")
+                        _postMemoResult.postValue(false)
                     }
-                } else {
-                    _error.postValue("사용자 정보를 가져오지 못했습니다.")
-                    try {
-                        throw response.errorBody()?.string()?.let {
-                            RuntimeException(it)
-                        } ?: RuntimeException("Unknown error")
-                    } catch (e: Exception) {
-                        Log.e("PlanInfo", "PlanResponse API 오류: ${e.message}")
+                }
+
+                override fun onFailure(call: Call<PlanFreeResponse>, t: Throwable) {
+                    // 네트워크 오류 등으로 호출 실패 시, 실패 LiveData 업데이트
+                    _postMemoResult.postValue(false)
+                }
+            })
+        }
+
+
+        fun getFreeInfo() {
+            planApiService.getFreeInfo().enqueue(object : Callback<PlanFreeResponse> {
+                override fun onResponse(
+                    call: Call<PlanFreeResponse>,
+                    response: Response<PlanFreeResponse>
+                ) {
+                    if (response.isSuccessful) {
+                        if (response.body() != null) {
+                            _planFreeInfo.postValue(response.body())
+                            Log.d("PlanFree", "${response.body()}")
+                        } else {
+                            _error.postValue("서버 응답이 올바르지 않습니다.")
+                        }
+                    } else {
+                        _error.postValue("사용자 정보를 가져오지 못했습니다.")
+                        try {
+                            throw response.errorBody()?.string()?.let {
+                                RuntimeException(it)
+                            } ?: RuntimeException("Unknown error")
+                        } catch (e: Exception) {
+                            Log.e("PlanInfo", "PlanResponse API 오류: ${e.message}")
+                        }
                     }
                 }
-            }
 
-            override fun onFailure(call: Call<UPlicenseResponse>, t: Throwable) {
-                _error.postValue("네트워크 오류: ${t.message}")
-                Log.d("gradInfo", "completion: ${t.message}")
-            }
-        })
-    }
+                override fun onFailure(call: Call<PlanFreeResponse>, t: Throwable) {
+                    _error.postValue("네트워크 오류: ${t.message}")
+                    Log.d("gradInfo", "completion: ${t.message}")
+                }
+            })
+        }
 
 
-    fun saveLicense(request: List<SaveInfo>) {
-
-        planApiService.saveLicense(request).enqueue(object : Callback<BringlicenseResponse> {
-            override fun onResponse(
-                call: Call<BringlicenseResponse>, response: Response<BringlicenseResponse>
-            ) {
-                if (response.isSuccessful) {
-                    _bringLicenseInfo.postValue(response.body())
-                    Log.d("PlanViewModel", "License saved successfully: ${response.body()}")
-                } else {
-                    _error.postValue("자격증 정보 저장 실패: ${response.errorBody()?.string()}")
-                    Log.e(
-                        "PlanViewModel",
-                        "Error saving license: ${response.errorBody()?.string()}"
-                    )
+        fun getListTimeInfo(hakki: String, track: String) {
+            Log.d("PlanViewModel", "getListTimeInfo 호출됨: hakki=$hakki, track=$track")
+            planApiService.getListTime(hakki, track).enqueue(object : Callback<ListTimeResponse> {
+                override fun onResponse(call: Call<ListTimeResponse>, response: Response<ListTimeResponse>) {
+                    if (response.isSuccessful && response.body() != null) {
+                        Log.d("PlanViewModel", "getListTimeInfo 성공: ${response.body()}")
+                        _listTimeInfo.postValue(response.body())
+                    } else {
+                        Log.e("PlanViewModel", "getListTimeInfo 실패: ${response.errorBody()?.string()}")
+                        _error.postValue("리스트 정보를 가져오는데 실패했습니다.")
+                    }
                 }
-            }
 
-            override fun onFailure(call: Call<BringlicenseResponse>, t: Throwable) {
-                _error.postValue("네트워크 오류: ${t.message}")
-                Log.e("PlanViewModel", "Network error: ${t.message}")
-            }
-        })
-    }
+                override fun onFailure(call: Call<ListTimeResponse>, t: Throwable) {
+                    Log.e("PlanViewModel", "getListTimeInfo 네트워크 오류: ${t.message}")
+                    _error.postValue("네트워크 오류: ${t.message}")
+                }
+            })
+        }
+
+
+
+        fun getLicenseInfo() {
+            planApiService.getUPlicense().enqueue(object : Callback<UPlicenseResponse> {
+                override fun onResponse(
+                    call: Call<UPlicenseResponse>,
+                    response: Response<UPlicenseResponse>
+                ) {
+                    if (response.isSuccessful) {
+                        if (response.body() != null) {
+                            _licenseInfo.postValue(response.body())
+                            Log.d("Planlicense", "${response.body()}")
+                        } else {
+                            _error.postValue("서버 응답이 올바르지 않습니다.")
+                        }
+                    } else {
+                        _error.postValue("사용자 정보를 가져오지 못했습니다.")
+                        try {
+                            throw response.errorBody()?.string()?.let {
+                                RuntimeException(it)
+                            } ?: RuntimeException("Unknown error")
+                        } catch (e: Exception) {
+                            Log.e("PlanInfo", "PlanResponse API 오류: ${e.message}")
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call<UPlicenseResponse>, t: Throwable) {
+                    _error.postValue("네트워크 오류: ${t.message}")
+                    Log.d("gradInfo", "completion: ${t.message}")
+                }
+            })
+        }
 
 
-    fun getSemesterInfo() {
-        planApiService.getSemesterInfo().enqueue(object : Callback<SemesterTimeResponse> {
-            override fun onResponse(
-                call: Call<SemesterTimeResponse>,
-                response: Response<SemesterTimeResponse>
-            ) {
-                if (response.isSuccessful) {
-                    if (response.body() != null) {
-                        _planSemesterInfo.postValue(response.body())
-                        Log.d("PlanSemester", "${response.body()}")
+        fun saveLicense(request: List<SaveInfo>) {
+
+            planApiService.saveLicense(request).enqueue(object : Callback<BringlicenseResponse> {
+                override fun onResponse(
+                    call: Call<BringlicenseResponse>, response: Response<BringlicenseResponse>
+                ) {
+                    if (response.isSuccessful) {
+                        _bringLicenseInfo.postValue(response.body())
+                        Log.d("PlanLicenseSave", "License saved successfully: ${response.body()}")
                     } else {
-                        _error.postValue("서버 응답이 올바르지 않습니다.")
-                    }
-                } else {
-                    _error.postValue("사용자 정보를 가져오지 못했습니다.")
-                    try {
-                        throw response.errorBody()?.string()?.let {
-                            RuntimeException(it)
-                        } ?: RuntimeException("Unknown error")
-                    } catch (e: Exception) {
-                        Log.e("PlanInfo", "PlanResponse API 오류: ${e.message}")
+                        _error.postValue("자격증 정보 저장 실패: ${response.errorBody()?.string()}")
+                        Log.e(
+                            "PlanLicenseSave",
+                            "Error saving license: ${response.errorBody()?.string()}"
+                        )
                     }
                 }
-            }
 
-            override fun onFailure(call: Call<SemesterTimeResponse>, t: Throwable) {
-                _error.postValue("네트워크 오류: ${t.message}")
-                Log.d("gradInfo", "completion: ${t.message}")
-            }
-        })
-    }
+                override fun onFailure(call: Call<BringlicenseResponse>, t: Throwable) {
+                    _error.postValue("네트워크 오류: ${t.message}")
+                    Log.e("PlanViewModel", "Network error: ${t.message}")
+                }
+            })
+        }
+
+
+        fun getSemesterInfo() {
+            planApiService.getSemesterInfo().enqueue(object : Callback<SemesterTimeResponse> {
+                override fun onResponse(
+                    call: Call<SemesterTimeResponse>,
+                    response: Response<SemesterTimeResponse>
+                ) {
+                    if (response.isSuccessful) {
+                        if (response.body() != null) {
+                            _planSemesterInfo.postValue(response.body())
+                            Log.d("PlanSemester", "${response.body()}")
+                        } else {
+                            _error.postValue("서버 응답이 올바르지 않습니다.")
+                        }
+                    } else {
+                        _error.postValue("사용자 정보를 가져오지 못했습니다.")
+                        try {
+                            throw response.errorBody()?.string()?.let {
+                                RuntimeException(it)
+                            } ?: RuntimeException("Unknown error")
+                        } catch (e: Exception) {
+                            Log.e("PlanInfo", "PlanResponse API 오류: ${e.message}")
+                        }
+                    }
+                }
 
+                override fun onFailure(call: Call<SemesterTimeResponse>, t: Throwable) {
+                    _error.postValue("네트워크 오류: ${t.message}")
+                    Log.d("gradInfo", "completion: ${t.message}")
+                }
+            })
+        }
+
+
+        fun getTrackInfo(hakki: String) {
+            planApiService.getTrackInfo(hakki).enqueue(object : Callback<PlanTrackResponse> {
+                override fun onResponse(
+                    call: Call<PlanTrackResponse>,
+                    response: Response<PlanTrackResponse>
+                ) {
+                    if (response.isSuccessful) {
+                        if (response.body() != null) {
+                            _planTrackInfo.postValue(response.body())
+                            Log.d("PlanTrackInfo", "${response.body()}")
+                        } else {
+                            _error.postValue("서버 응답이 올바르지 않습니다.")
+                        }
+                    } else {
+                        _error.postValue("사용자 정보를 가져오지 못했습니다.")
+                        try {
+                            throw response.errorBody()?.string()?.let {
+                                RuntimeException(it)
+                            } ?: RuntimeException("Unknown error")
+                        } catch (e: Exception) {
+                            Log.e("PlanInfo", "PlanResponse API 오류: ${e.message}")
+                        }
+                    }
+                }
 
-    fun getTrackInfo(hakki: String) {
-        planApiService.getTrackInfo(hakki).enqueue(object : Callback<PlanTrackResponse> {
-            override fun onResponse(
-                call: Call<PlanTrackResponse>,
-                response: Response<PlanTrackResponse>
-            ) {
-                if (response.isSuccessful) {
-                    if (response.body() != null) {
-                        _planTrackInfo.postValue(response.body())
-                        Log.d("PlanTrackInfo", "${response.body()}")
+                override fun onFailure(call: Call<PlanTrackResponse>, t: Throwable) {
+                    _error.postValue("네트워크 오류: ${t.message}")
+                    Log.d("gradInfo", "completion: ${t.message}")
+                }
+            })
+        }
+
+
+        fun editMemo(memo: String) {
+            val editMemoRequest = EditMemoRequest(memo = memo)
+            planApiService.editMemo(editMemoRequest).enqueue(object : Callback<PlanFreeResponse> {
+                override fun onResponse(
+                    call: Call<PlanFreeResponse>,
+                    response: Response<PlanFreeResponse>
+                ) {
+                    if (response.isSuccessful) {
+                        Log.d("PlanMemoEdit", "Memo successfully edited: ${response.body()}")
+                        // 필요한 경우, UI 업데이트를 위한 LiveData 업데이트 로직을 여기에 추가하세요.
                     } else {
-                        _error.postValue("서버 응답이 올바르지 않습니다.")
+                        Log.e("PlanMemoEdit", "Failed to edit memo: ${response.errorBody()?.string()}")
                     }
-                } else {
-                    _error.postValue("사용자 정보를 가져오지 못했습니다.")
-                    try {
-                        throw response.errorBody()?.string()?.let {
-                            RuntimeException(it)
-                        } ?: RuntimeException("Unknown error")
-                    } catch (e: Exception) {
-                        Log.e("PlanInfo", "PlanResponse API 오류: ${e.message}")
+                }
+
+                override fun onFailure(call: Call<PlanFreeResponse>, t: Throwable) {
+                    Log.e("PlanMemoEdit", "Network error on edit memo: ${t.message}")
+                }
+            })
+        }
+
+        fun certificateLicense(request: CertificateLicenseRequest) {
+            planApiService.certificateLicense(request).enqueue(object : Callback<CertificateResponse> {
+                override fun onResponse(call: Call<CertificateResponse>, response: Response<CertificateResponse>) {
+                    if (response.isSuccessful) {
+                        // 서버로부터 응답을 성공적으로 받았을 때 LiveData 업데이트
+                        _certificateResponse.postValue(response.body())
+                        Log.d("PlanViewModel", "Certificate License update success: ${response.body()}")
+                    } else {
+                        // 에러 처리: 실패 응답 처리
+                        _certificateResponse.postValue(null)
+                        Log.e("PlanViewModel", "Failed to update certificate license: ${response.errorBody()?.string()}")
                     }
                 }
-            }
 
-            override fun onFailure(call: Call<PlanTrackResponse>, t: Throwable) {
-                _error.postValue("네트워크 오류: ${t.message}")
-                Log.d("gradInfo", "completion: ${t.message}")
-            }
-        })
-    }
+                override fun onFailure(call: Call<CertificateResponse>, t: Throwable) {
+                    // 네트워크 에러 처리: LiveData 업데이트로 에러 상태 전달 가능
+                    _certificateResponse.postValue(null)
+                    Log.e("PlanViewModel", "Network error on certificate license update: ${t.message}")
+                }
+            })
+        }
+
+
+        fun getTimeInfo(grade:Int,semester:Int) {
+            planApiService.getUptime(grade,semester).enqueue(object : Callback<UpTimeResponse> {
+                override fun onResponse(
+                    call: Call<UpTimeResponse>,
+                    response: Response<UpTimeResponse>
+                ) {
+                    if (response.isSuccessful) {
+                        if (response.body() != null) {
+                            var timeList =  response.body()!!.result
+                            var itemList = ArrayList<TimeInfoResponse>()
+                           timeList.forEach{
+
+                                itemList.add(TimeInfoResponse(it.type,it.name,it.credit.toString()))
+                            }
+                            _selectedTimeResults.postValue(itemList)
+
+                            Log.d("PlanUpTime", "${response.body()}")
+                        } else {
+                            _error.postValue("서버 응답이 올바르지 않습니다.")
+                        }
+                    } else {
+                        _error.postValue("사용자 정보를 가져오지 못했습니다.")
+                        try {
+                            throw response.errorBody()?.string()?.let {
+                                RuntimeException(it)
+                            } ?: RuntimeException("Unknown error")
+                        } catch (e: Exception) {
+                            Log.e("PlanUpTime", "PlanResponse API 오류: ${e.message}")
+                        }
+                    }
+                }
 
+                override fun onFailure(call: Call<UpTimeResponse>, t: Throwable) {
+                    _error.postValue("네트워크 오류: ${t.message}")
+                    Log.d("gradInfo", "completion: ${t.message}")
+                }
+            })
+        }
+
+        fun deleteLicense(certificateId: Long) {
+            planApiService.deleteLicense(certificateId).enqueue(object : Callback<DeleteLicense> {
+                override fun onResponse(call: Call<DeleteLicense>, response: Response<DeleteLicense>) {
+                    if (response.isSuccessful) {
+                        // 삭제 요청이 성공적으로 처리된 경우
+                        Log.d("DeleteLicense", "License deleted successfully")
+                        // 여기에 필요한 처리를 추가하세요.
+                    } else {
+                        // 삭제 요청이 실패한 경우
+                        val errorMessage = response.errorBody()?.string() ?: "Unknown error"
+                        Log.e("DeleteLicense", "Failed to delete license: $errorMessage")
+                        // 여기에 필요한 처리를 추가하세요.
+                    }
+                }
 
-    fun editMemo(memo: String) {
-        val editMemoRequest = EditMemoRequest(memo = memo)
-        planApiService.editMemo(editMemoRequest).enqueue(object : Callback<PlanFreeResponse> {
-            override fun onResponse(
-                call: Call<PlanFreeResponse>,
-                response: Response<PlanFreeResponse>
-            ) {
-                if (response.isSuccessful) {
-                    Log.d("PlanMemoEdit", "Memo successfully edited: ${response.body()}")
-                    // 필요한 경우, UI 업데이트를 위한 LiveData 업데이트 로직을 여기에 추가하세요.
-                } else {
-                    Log.e("PlanMemoEdit", "Failed to edit memo: ${response.errorBody()?.string()}")
+                override fun onFailure(call: Call<DeleteLicense>, t: Throwable) {
+                    // 네트워크 오류 등으로 요청이 실패한 경우
+                    Log.e("DeleteLicense", "Network error: ${t.message}")
+                    // 여기에 필요한 처리를 추가하세요.
                 }
-            }
+            })
+        }
 
-            override fun onFailure(call: Call<PlanFreeResponse>, t: Throwable) {
-                Log.e("PlanMemoEdit", "Network error on edit memo: ${t.message}")
-            }
-        })
-    }
 
 
 
-}
+
+    }
 
 
 
diff --git a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanlicenseFragment.kt b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanlicenseFragment.kt
index 0a8dde84..662b3f8e 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/plan/PlanlicenseFragment.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/plan/PlanlicenseFragment.kt
@@ -27,13 +27,8 @@ class PlanlicenseFragment : Fragment() {
 	): View {
 		_binding = FragmentPlanlicenseBinding.inflate(inflater, container, false)
 
-
-
 		viewModel.getLicenseInfo() // api 연결
 
-
-
-
 		// UPlicenseResponse-자격증 정보 불러오기
 		viewModel.licenseInfo.observe(viewLifecycleOwner) { licenseInfo ->
 			licenseInfo?.result?.let { resultList ->
@@ -64,10 +59,10 @@ class PlanlicenseFragment : Fragment() {
 			}
 		}
 
-
 		return binding.root
 	}
 
+
 	private fun submitData() {
 
 		val name = binding.planLicenseName.text.toString()
@@ -78,14 +73,13 @@ class PlanlicenseFragment : Fragment() {
 
 		// SavelicenseRequest 객체 생성
 
-
 		// API 호출
 		viewModel.saveLicense(saveInfoList)
 
 	}
 
 
-	private fun setupEditTextListener(){
+	private fun setupEditTextListener() {
 		val textWatcher = object : TextWatcher {
 			override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
 				// 필요 없음
@@ -112,9 +106,6 @@ class PlanlicenseFragment : Fragment() {
 		val colorResId = if (isAnyFieldFilled) R.color.skyBlue else R.color.gray
 		val color = ContextCompat.getColor(requireContext(), colorResId)
 		binding.licenseButtonStore.backgroundTintList = ColorStateList.valueOf(color)
-
-
-
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -124,16 +115,21 @@ class PlanlicenseFragment : Fragment() {
 		binding.licenseButtonStore.setOnClickListener {
 			submitData() // 사용자 입력을 기반으로 API 호출
 		}
+		binding.licenseDeleteButton.setOnClickListener {
+			deleteLicense() // 삭제 API 호출
+		}
+	}
 
+	private fun deleteLicense() {
+		// 삭제할 자격증 ID
+		val certificateId = 1 // 예시로 1을 사용하였습니다. 실제로는 삭제할 자격증의 ID를 전달해야 합니다.
 
-
-
-
+		// API 호출
+//        viewModel.deleteLicense(certificateId)
 	}
 
 	override fun onDestroyView() {
 		super.onDestroyView()
 		_binding = null
 	}
-}
-
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_planlicense.xml b/app/src/main/res/layout/fragment_planlicense.xml
index 00568ddb..2135eaa0 100644
--- a/app/src/main/res/layout/fragment_planlicense.xml
+++ b/app/src/main/res/layout/fragment_planlicense.xml
@@ -5,10 +5,12 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <variable
             name="vm"
             type="umc.com.mobile.project.ui.plan.PlanViewModel" />
     </data>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -17,15 +19,15 @@
             android:id="@+id/license_const_layout"
             android:layout_width="322dp"
             android:layout_height="223dp"
+            android:layout_marginTop="29dp"
             android:background="@drawable/rectangle_4257"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:paddingTop="10dp"
             android:paddingLeft="8dp"
+            android:paddingTop="10dp"
             android:paddingRight="9dp"
             android:paddingBottom="10dp"
-            android:layout_marginTop="29dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
 
             >
 
@@ -36,10 +38,10 @@
                 android:background="@drawable/edittext_rounded_line"
                 android:padding="16dp"
                 app:columnCount="2"
-                app:rowCount="5"
-                app:layout_constraintTop_toTopOf="@id/license_const_layout"
-                app:layout_constraintStart_toStartOf="@id/license_const_layout"
                 app:layout_constraintEnd_toEndOf="@id/license_const_layout"
+                app:layout_constraintStart_toStartOf="@id/license_const_layout"
+                app:layout_constraintTop_toTopOf="@id/license_const_layout"
+                app:rowCount="5"
 
                 tools:layout_editor_absoluteX="11dp"
                 tools:layout_editor_absoluteY="4dp">
@@ -66,106 +68,103 @@
                     android:text="시험 일정"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_rowWeight="1"
-                    />
+                    app:layout_rowWeight="1" />
 
                 <EditText
-                    style="@style/MediumFont.10"
                     android:id="@+id/plan_license_name"
+                    style="@style/MediumFont.10"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
                     android:background="@drawable/edittext_white_line"
+                    android:gravity="center"
                     android:hint=""
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_rowWeight="1"
-                    android:gravity="center"
-                    />
+                    app:layout_rowWeight="1" />
 
                 <EditText
-                    style="@style/MediumFont.10"
                     android:id="@+id/plan_license_date"
+                    style="@style/MediumFont.10"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
                     android:background="@drawable/edittext_white_line"
+                    android:gravity="center"
                     android:hint=""
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_rowWeight="1"
-                    android:gravity="center"
-                    />
+                    app:layout_rowWeight="1" />
 
                 <EditText
-                    style="@style/MediumFont.10"
                     android:id="@+id/plan_license_name2"
+                    style="@style/MediumFont.10"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
                     android:background="@drawable/edittext_white_line"
+                    android:gravity="center"
                     android:hint=""
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_rowWeight="1"
-                    android:gravity="center"/>
+                    app:layout_rowWeight="1" />
 
                 <EditText
-                    style="@style/MediumFont.10"
                     android:id="@+id/plan_license_date2"
+                    style="@style/MediumFont.10"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
                     android:background="@drawable/edittext_white_line"
+                    android:gravity="center"
                     android:hint=""
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_rowWeight="1"
-                    android:gravity="center"/>
+                    app:layout_rowWeight="1" />
 
                 <EditText
-                    style="@style/MediumFont.10"
                     android:id="@+id/plan_license_name3"
+                    style="@style/MediumFont.10"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
                     android:background="@drawable/edittext_white_line"
+                    android:gravity="center"
                     android:hint=""
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_rowWeight="1"
-                    android:gravity="center"/>
+                    app:layout_rowWeight="1" />
 
                 <EditText
-                    style="@style/MediumFont.10"
                     android:id="@+id/plan_license_date3"
+                    style="@style/MediumFont.10"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
                     android:background="@drawable/edittext_white_line"
+                    android:gravity="center"
                     android:hint=""
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_rowWeight="1"
-                    android:gravity="center"/>
+                    app:layout_rowWeight="1" />
 
                 <EditText
-                    style="@style/MediumFont.10"
                     android:id="@+id/plan_license_name4"
+                    style="@style/MediumFont.10"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
                     android:background="@drawable/edittext_white_line"
+                    android:gravity="center"
                     android:hint=""
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_rowWeight="1"
-                    android:gravity="center"/>
+                    app:layout_rowWeight="1" />
 
                 <EditText
-                    style="@style/MediumFont.10"
                     android:id="@+id/plan_license_date4"
+                    style="@style/MediumFont.10"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
                     android:background="@drawable/edittext_white_line"
+                    android:gravity="center"
                     android:hint=""
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_rowWeight="1"
-                    android:gravity="center"/>
+                    app:layout_rowWeight="1" />
 
 
             </androidx.gridlayout.widget.GridLayout>
@@ -173,14 +172,27 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/license_addrow_button"
+            android:id="@+id/license_certificate_button"
             style="@style/MediumFont.12"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
-            android:text="칸 추가하기"
+            android:text="수정하기"
             android:textColor="@color/gray"
             app:layout_constraintEnd_toEndOf="@+id/license_const_layout"
+            app:layout_constraintTop_toBottomOf="@+id/license_const_layout"
+
+            />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/license_delete_button"
+            style="@style/MediumFont.12"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:text="삭제하기"
+            android:textColor="@color/gray"
+            app:layout_constraintStart_toStartOf="@+id/license_const_layout"
             app:layout_constraintTop_toBottomOf="@+id/license_const_layout" />
 
         <androidx.appcompat.widget.AppCompatButton
diff --git a/app/src/main/res/layout/plan_time_main.xml b/app/src/main/res/layout/plan_time_main.xml
index 47295bd4..bd28e4c5 100644
--- a/app/src/main/res/layout/plan_time_main.xml
+++ b/app/src/main/res/layout/plan_time_main.xml
@@ -12,182 +12,175 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/plan_timetable_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="시간표"
-            app:layout_constraintBottom_toTopOf="@+id/time_track_name"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginTop="54dp"
-            android:layout_marginBottom="40dp"
-            style="@style/BoldFont.20"
-            android:textColor="@color/black"
-
-
-
-
-            />
-
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/plan_timetable_back_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/plan_time_back"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginTop="59dp"
-            android:layout_marginLeft="19dp"
-            />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/time_track_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="118dp"
-        android:background="@drawable/time_track_name_title"
-        android:gravity="center"
-        android:text="트랙이름~"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-         />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/appCompatImageView4"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="2dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginBottom="50dp"
-        android:background="@drawable/time_solid_white_radius_20"
-        android:paddingBottom="10dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/time_track_name"
-        >
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/plan_time_track_semester"
-            style="SemiBoldFont.12"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="6dp"
-            android:background="@drawable/time_solid_beige_top_radius_20"
-            android:paddingStart="34dp"
-            android:paddingTop="12dp"
-            android:paddingEnd="34dp"
-            android:text="0학년 0학기"
-            android:textColor="#B3B3B3"
-            app:layout_constraintStart_toStartOf="@+id/appCompatImageView4"
-            app:layout_constraintTop_toTopOf="@+id/appCompatImageView4" />
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:layout_marginBottom="6dp"
-            android:background="@drawable/time_solid_beige_radius_without_top_right_20"
-            app:layout_constraintEnd_toEndOf="@+id/appCompatImageView4"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/plan_time_track_semester"
-            app:layout_constraintVertical_bias="0.0">
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:id="@+id/linearLayoutCompat3"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:visibility="invisible"
+            android:layout_height="match_parent">
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/plan_timetable_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="시간표"
+                app:layout_constraintBottom_toTopOf="@+id/title_move_timetable"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:visibleIf="@{vm.planTimeStatus}">
+                android:layout_marginTop="54dp"
+                android:layout_marginBottom="40dp"
+                style="@style/BoldFont.20"
+                android:textColor="@color/black"
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/BoldFont.14"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="7dp"
-                    android:text="분류"
-                    android:textColor="@color/black" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/MediumFont.13"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="7dp"
-                    android:text="교과목"
-                    android:textColor="@color/gray" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/MediumFont.13"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="7dp"
-                    android:text="학점"
-                    android:textColor="@color/gray" />
 
-            </androidx.appcompat.widget.LinearLayoutCompat>
+                />
+
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recyclerView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="horizontal"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/linearLayoutCompat3"
-                tools:listitem="@layout/item_plan_time" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/SemiBoldFont.14"
+                android:id="@+id/title_move_timetable"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:text=""
-                android:textColor="@color/white"
+                android:layout_marginTop="118dp"
+                android:background="@drawable/time_track_name_title"
+                android:gravity="center"
+                android:text="시간표 담기~"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/linearLayoutCompat3"
-                app:visibleIf="@{!vm.planTimeStatus}" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
+                app:layout_constraintTop_toTopOf="parent"
+                />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/time_store_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/time_store_button"
-        android:layout_marginTop="60dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/appCompatImageView4" />
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/appCompatImageView4"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="2dp"
+                android:layout_marginEnd="20dp"
+                android:layout_marginBottom="50dp"
+                android:background="@drawable/time_solid_white_radius_20"
+                android:paddingBottom="10dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/title_move_timetable"
+                >
+
+                <Spinner
+                    android:background="@drawable/time_solid_beige_top_radius_20"
+                    android:id="@+id/spinner_plan_time_track_semester"
+                    style="SemiBoldFont.12"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#B3B3B3"
+                    android:layout_marginStart="6dp"
+                    android:layout_marginTop="6dp"
+                    android:paddingStart="34dp"
+                    android:paddingTop="12dp"
+                    android:paddingEnd="34dp"
+                    app:layout_constraintTop_toTopOf="@+id/appCompatImageView4"
+                    app:layout_constraintStart_toStartOf="@+id/appCompatImageView4"
+                    />
+
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="6dp"
+                    android:layout_marginEnd="6dp"
+                    android:layout_marginBottom="6dp"
+                    android:background="@drawable/time_solid_beige_radius_without_top_right_20"
+                    app:layout_constraintEnd_toEndOf="@+id/appCompatImageView4"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/spinner_plan_time_track_semester"
+                    app:layout_constraintVertical_bias="0.0">
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/linearLayoutCompat3"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:visibility="invisible"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:visibleIf="@{vm.planTimeStatus}">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/BoldFont.14"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:paddingTop="12dp"
+                            android:paddingBottom="7dp"
+                            android:text="분류"
+                            android:textColor="@color/black" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/MediumFont.13"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:paddingTop="12dp"
+                            android:paddingBottom="7dp"
+                            android:text="교과목"
+                            android:textColor="@color/gray" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/MediumFont.13"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:paddingTop="12dp"
+                            android:paddingBottom="7dp"
+                            android:text="학점"
+                            android:textColor="@color/gray" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/recyclerView"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/linearLayoutCompat3"
+                        tools:listitem="@layout/item_plan_time" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/SemiBoldFont.14"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:text=""
+                        android:textColor="@color/white"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="@+id/linearLayoutCompat3"
+                        app:visibleIf="@{!vm.planTimeStatus}" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.appcompat.widget.AppCompatImageButton
+                android:id="@+id/time_store_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/time_store_button"
+                android:layout_marginTop="60dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/appCompatImageView4" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/plan_time_tab_main.xml b/app/src/main/res/layout/plan_time_tab_main.xml
index e93e983c..7de324cd 100644
--- a/app/src/main/res/layout/plan_time_tab_main.xml
+++ b/app/src/main/res/layout/plan_time_tab_main.xml
@@ -18,6 +18,17 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/plan_setting_back_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/plan_time_back"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginTop="59dp"
+        android:layout_marginLeft="19dp"
+        />
+
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabLayout_plan_time"
         style="@style/SemiBoldFont.15"
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 760d2697..98707090 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -17,8 +17,8 @@
             android:id="@+id/action_fragment_home_to_fragment_grad_info"
             app:destination="@id/fragment_grad_info" />
         <action
-            android:id="@+id/action_fragment_home_to_planSettingFragment"
-            app:destination="@id/planSettingFragment" />
+            android:id="@+id/action_fragment_home_to_planTimetableFragment"
+            app:destination="@id/planTimetableFragment" />
     </fragment>
 
     <fragment
@@ -247,9 +247,6 @@
         <action
             android:id="@+id/action_planSettingFragment_to_planTimeFragment"
             app:destination="@id/planTimeFragment" />
-        <action
-            android:id="@+id/action_planSettingFragment_to_planTimetableFragment"
-            app:destination="@id/planTimetableFragment" />
     </fragment>
     <fragment
         android:id="@+id/planSemesterFragment"
@@ -277,7 +274,11 @@
     <fragment
         android:id="@+id/planTimetableFragment"
         android:name="umc.com.mobile.project.ui.plan.PlanTimetableFragment"
-        android:label="PlanTimetableFragment" />
+        android:label="PlanTimetableFragment" >
+        <action
+            android:id="@+id/action_planTimetableFragment_to_planSettingFragment"
+            app:destination="@id/planSettingFragment" />
+    </fragment>
 
 
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 82b382c3..d66f3e2a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,6 +15,17 @@
     <!-- 나단 -->
     <string name="plan_license">자격증 이름</string>
 
+    <string-array name="semester_options">
+        <item>1학년 1학기</item>
+        <item>1학년 2학기</item>
+        <item>2학년 1학기</item>
+        <item>2학년 2학기</item>
+        <item>3학년 1학기</item>
+        <item>3학년 2학기</item>
+        <item>4학년 1학기</item>
+        <item>4학년 2학기</item>
+    </string-array>
+
     <!-- 유진 -->
     <!--졸업 예정일-->
     <string name="board_grad_date_date">졸업 예정일 0000년 00월 00일</string>