-
Notifications
You must be signed in to change notification settings - Fork 0
Feat : 변경된 학과명 추가 및 수정 #277
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 3 commits
411928d
123d2e3
f88e308
b1176a9
e01514e
0ec4bde
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,19 +1,18 @@ | ||||||
| package com.dongyang.android.youdongknowme.standard.util | ||||||
|
|
||||||
| sealed class Department( | ||||||
| var name: String, | ||||||
| var code: Int | ||||||
| var name: String, var code: Int | ||||||
| ) { | ||||||
| object Mechanical : Department("기계공학과", CODE.MECHANICAL_ENGINE_CODE) | ||||||
| object MechanicalDesign : Department("기계설계공학과", CODE.MECHANICAL_DESIGN_CODE) | ||||||
| object Automation : Department("자동화공학과", CODE.AUTOMATION_ENGINE_CODE) | ||||||
| object Robot : Department("로봇공학과", CODE.ROBOT_ENGINE_CODE) | ||||||
| object Robot : Department("로봇소프트웨어과", CODE.ROBOT_ENGINE_CODE) | ||||||
| object Electrical : Department("전기공학과", CODE.ELECTRICAL_ENGINE_CODE) | ||||||
| object InfoElectrical : Department("정보전자공학과", CODE.INFO_ELECTRONIC_ENGINE_CODE) | ||||||
| object Semiconductor : Department("반도체전자공학과", CODE.SEMICONDUCTOR_ENGINE_CODE) | ||||||
| object InfoCommunication : Department("정보통신공학과", CODE.INFO_COMMUNICATION_ENGINE_CODE) | ||||||
| object FireManagement : Department("소방안전관리과", CODE.FIRE_MANAGEMENT_CODE) | ||||||
| object ComputerInfo : Department("컴퓨터정보공학과", CODE.COMPUTER_INFO_ENGINE_CODE) | ||||||
| object ComputerInfo : Department("웹응용소프트웨어공학과", CODE.COMPUTER_INFO_ENGINE_CODE) | ||||||
|
||||||
| object ComputerSoftware : Department("컴퓨터소프트웨어공학과", CODE.COMPUTER_SOFTWARE_ENGINE_CODE) | ||||||
| object Artificial : Department("인공지능소프트웨어학과", CODE.ARTIFICIAL_ENGINE_CODE) | ||||||
| object Biochemical : Department("생명화학공학과", CODE.BIOCHEMICAL_ENGINE_CODE) | ||||||
|
|
@@ -28,20 +27,21 @@ sealed class Department( | |||||
| object HotelTourism : Department("호텔관광학과", CODE.HOTEL_TOURISM_CODE) | ||||||
| object BusinessInfo : Department("경영정보학과", CODE.MANAGEMENT_INFORMATION_CODE) | ||||||
| object BigDataManagement : Department("빅데이터경영과", CODE.BIG_DATA_MANAGEMENT_CODE) | ||||||
| object UndeclaredMajor : Department("자유전공학과", CODE.UNDECLARED_MAJOR_CODE) | ||||||
|
|
||||||
| companion object { | ||||||
| fun getDepartment(department: String): Department { | ||||||
| return when (department) { | ||||||
| "기계공학과" -> Mechanical | ||||||
| "기계설계공학과" -> MechanicalDesign | ||||||
| "로봇공학과" -> Robot | ||||||
| "로봇소프트웨어과" -> Robot | ||||||
| "자동화공학과" -> Automation | ||||||
| "전기공학과" -> Electrical | ||||||
| "정보전자공학과" -> InfoElectrical | ||||||
| "반도체전자공학과" -> Semiconductor | ||||||
| "정보통신공학과" -> InfoCommunication | ||||||
| "소방안전관리과" -> FireManagement | ||||||
| "컴퓨터정보공학과" -> ComputerInfo | ||||||
| "웹응용소프트웨어공학과" -> ComputerInfo | ||||||
| "컴퓨터소프트웨어공학과" -> ComputerSoftware | ||||||
| "인공지능소프트웨어학과" -> Artificial | ||||||
| "생명화학공학과" -> Biochemical | ||||||
|
|
@@ -56,38 +56,9 @@ sealed class Department( | |||||
| "호텔관광학과" -> HotelTourism | ||||||
| "경영정보학과" -> BusinessInfo | ||||||
| "빅데이터경영과" -> BigDataManagement | ||||||
| "자유전공학과" -> UndeclaredMajor | ||||||
|
||||||
| "자유전공학과" -> UndeclaredMajor | |
| "자유전공학과" -> LiberalMajor |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,8 +17,7 @@ class DepartActivity : BaseActivity<ActivityDepartBinding, DepartViewModel>(), D | |
| override fun initStartView() { | ||
| // 학과 리스트 | ||
| items = | ||
| resources.getStringArray(R.array.dmu_department_list).toCollection(ArrayList<String>()) | ||
| items.sort() | ||
| resources.getStringArray(R.array.dmu_department_list).toCollection(ArrayList()) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||
|
|
||
| adapter = DepartAdapter().apply { | ||
| submitList(items) | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
UNDECLARED_MAJOR_CODE는 오류 코드처럼 보일 수도 있을거 같아요!처음 보고서 오류 코드를 추가하신 불 알았어요.
LIBERAL_MAJOR_CODE,INTERDISCIPLINARY_CODE,EXPLORATORY_MAJOR_CODE가 더 명확하지 않을까 제안해봅니다!