Skip to content

Commit

Permalink
Fix: 향후계획/시간표 탭 전환 버그 수정 #50
Browse files Browse the repository at this point in the history
  • Loading branch information
@dkyuuum
dkyuuum committed Feb 20, 2024
1 parent b404f7a commit 61315a6
Show file tree
Hide file tree
Showing 7 changed files with 373 additions and 288 deletions.
19 changes: 17 additions & 2 deletions app/src/main/java/umc/com/mobile/project/data/network/api/PlanApi.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,13 @@ 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>

Expand All @@ -51,14 +55,25 @@ interface PlanApi {
fun postFreeMemo(@Body request: PlanFreeRequest): Call<PlanFreeResponse>

@GET("/plans/timetable")
fun getUptime(@Query("grade") grade:Int, @Query("semseter") semester : Int):Call<UpTimeResponse>
fun getUptime(@Query("grade") grade:Int, @Query("semester") semester : Int):Call<UpTimeResponse>

@PATCH("/plans/memo")
fun editMemo(@Body editMemoRequest: EditMemoRequest) : Call<PlanFreeResponse>

@PATCH("/plans/certifications")
fun certificateLicense(@Body request: CertificateLicenseRequest) : Call<CertificateResponse>
fun certificateLicense(@Body request: List<CertificateLicenseRequest>) : Call<CertificateResponse>

@DELETE("/plans/certifications")
fun deleteLicense(@Query("certificateId") certificateId: Long): Call<DeleteLicense>











}
2 changes: 1 addition & 1 deletion app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class HomeFragment : Fragment() {
// 페이지 이동
private fun navigateFragment() {
binding.btnCheeringWordMove.setOnClickListener {
navigate(R.id.action_fragment_home_to_planTimetableFragment)
navigate(R.id.action_fragment_home_to_fragment_date)
}
binding.layoutNextPlan.setOnClickListener {
navigate(R.id.action_fragment_home_to_planTimetableFragment)
Expand Down
208 changes: 105 additions & 103 deletions app/src/main/java/umc/com/mobile/project/ui/plan/PlanTimetableFragment.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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
Expand All @@ -17,157 +18,158 @@ import umc.com.mobile.project.ui.common.NavigationUtil.navigate

class PlanTimetableFragment : Fragment() {

private var _binding: PlanTimeMainBinding? = null
private val binding get() = _binding!!
private val viewModel: PlanViewModel by activityViewModels()
private lateinit var adapter: PlanTimeAdapter
private var _binding: PlanTimeMainBinding? = null
private val binding get() = _binding!!
private val viewModel: PlanViewModel by activityViewModels()
private lateinit var adapter: PlanTimeAdapter

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
_binding = PlanTimeMainBinding.inflate(inflater, container, false)
return binding.root
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
_binding = PlanTimeMainBinding.inflate(inflater, container, false)
return binding.root
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
setupRecyclerView()
observeSelectedTimeResults()
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
setupRecyclerView()
observeSelectedTimeResults()


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
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)
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)
Log.d("selected Item",selectedItem)


}
}

"1학년 2학기" -> {
viewModel.setGradeAndSemester(1, 2)
// viewModel.getTimeInfo(1, 2)
"1학년 2학기" -> {
viewModel.setGradeAndSemester(1, 2)
viewModel.getTimeInfo(1, 2)


}
}

"2학년 1학기" -> {
viewModel.setGradeAndSemester(2, 1)
// viewModel.getTimeInfo(2, 1)
"2학년 1학기" -> {
viewModel.setGradeAndSemester(2, 1)
viewModel.getTimeInfo(2, 1)


}
}

"2학년 2학기" -> {
viewModel.setGradeAndSemester(2, 2)
// viewModel.getTimeInfo(2, 2)
"2학년 2학기" -> {
viewModel.setGradeAndSemester(2, 2)
viewModel.getTimeInfo(2, 2)


}
}

"3학년 1학기" -> {
viewModel.setGradeAndSemester(3, 1)
// viewModel.getTimeInfo(3, 1)
"3학년 1학기" -> {
viewModel.setGradeAndSemester(3, 1)
viewModel.getTimeInfo(3, 1)


}
}

"3학년 2학기" -> {
viewModel.setGradeAndSemester(3, 2)
"3학년 2학기" -> {
viewModel.setGradeAndSemester(3, 2)
// viewModel.getTimeInfo(3, 2)


}
}

"4학년 1학기" -> {
viewModel.setGradeAndSemester(4, 1)
"4학년 1학기" -> {
viewModel.setGradeAndSemester(4, 1)
// viewModel.getTimeInfo(4, 1)


}
}

"4학년 2학기" -> {
viewModel.setGradeAndSemester(4, 2)
"4학년 2학기" -> {
viewModel.setGradeAndSemester(4, 2)
// viewModel.getTimeInfo(4, 2)


}
}

}
}


}
}

override fun onNothingSelected(parent: AdapterView<*>?) {
// 아무 것도 선택되지 않은 경우의 동작 구현
}
}
binding.timeStoreButton.setOnClickListener {
// grade와 semester가 선택되었는지 확인
val grade = viewModel.grade.value
val semester = viewModel.semester.value
override fun onNothingSelected(parent: AdapterView<*>?) {
// 아무 것도 선택되지 않은 경우의 동작 구현
}
}
binding.timeStoreButton.setOnClickListener {
// grade와 semester가 선택되었는지 확인
val grade = viewModel.grade.value
val semester = viewModel.semester.value

if (grade == null || semester == null) {
// 학년 또는 학기가 선택되지 않았다면 토스트 메시지 표시
Toast.makeText(context, "학년과 학기를 선택해주세요.", Toast.LENGTH_SHORT).show()
} else {
// 선택된 경우에만 서버로 데이터 전송 처리
viewModel.sendAddTimeRequest()
viewModel.getTimeInfo(grade, semester)
}
}
if (grade == null || semester == null) {
// 학년 또는 학기가 선택되지 않았다면 토스트 메시지 표시
Toast.makeText(context, "학년과 학기를 선택해주세요.", Toast.LENGTH_SHORT).show()
} else {
// 선택된 경우에만 서버로 데이터 전송 처리
viewModel.sendAddTimeRequest()
viewModel.getTimeInfo(grade, semester)
}
}



binding.titleMoveTimetable.setOnClickListener {
navigate(R.id.action_planTimetableFragment_to_planSettingFragment)
binding.titleMoveTimetable.setOnClickListener {
navigate(R.id.action_planTimetableFragment_to_planSettingFragment)

}
}

}
}




private fun observeSelectedTimeResults() {
viewModel.selectedTimeResults.observe(viewLifecycleOwner) { selectedTimeResults ->
(binding.recyclerView.adapter as PlanTimeAdapter).updateTimeList(selectedTimeResults)
}
}
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
}
// 추가하기 버튼으로 시간표에 과목 업데이트
private fun setupRecyclerView() {
// 초기 데이터 리스트를 비어 있는 리스트로 설정합니다.
// 데이터가 준비되면, 나중에 observeSelectedTimeResults 함수 내에서 submitList를 통해 업데이트합니다.
adapter = PlanTimeAdapter(emptyList())
binding.recyclerView.layoutManager = LinearLayoutManager(context)
binding.recyclerView.adapter = adapter
}


override fun onDestroyView() {
super.onDestroyView()
_binding = null
}
override fun onDestroyView() {
super.onDestroyView()
_binding = null
}
}

Loading

0 comments on commit 61315a6

Please sign in to comment.