Skip to content

Commit 1d44c6c

Browse files
committed
add Interdisciplinary Studies : Inter(IN)
1 parent ef7e9f4 commit 1d44c6c

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

backend/freshman/models.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ class Freshman(models.Model):
1010
ENGINEERING = 'EN'
1111
SOCIAL_SCIENCE = 'SS'
1212
HUMANITIES_SCIENCE = 'HS'
13+
INTER = 'IN'
1314

1415
DEPARTMENT_CHOICES = [
1516
(NATURAL_SCIENCE, '자연과학계열'),
1617
(ENGINEERING, '공학계열'),
1718
(SOCIAL_SCIENCE, '사회과학계열'),
1819
(HUMANITIES_SCIENCE, '인문과학계열'),
20+
(INTER, '자유전공계열')
1921
]
2022

2123
lc = ForeignKey(LC, on_delete=CASCADE, null=True)

backend/freshman/serializers.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ def get_department(self, obj):
2929
elif obj.department == "HS":
3030
return "인문과학계열"
3131
elif obj.department == "SS":
32-
return "사회과학계열"
32+
return "사회과학계열"
33+
elif obj.department == 'IN':
34+
return "자유전공계열"
3335

3436
# def get_register(self, obj):
3537
# if obj.register:
@@ -59,7 +61,9 @@ def get_department(self, obj):
5961
elif obj.department == "HS":
6062
return "인문과학"
6163
elif obj.department == "SS":
62-
return "사회과학"
64+
return "사회과학"
65+
elif obj.department == "IN":
66+
return "자유전공"
6367

6468
def get_register(self, obj):
6569
if obj.register:

backend/freshman/views/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def post(self, request):
3838

3939
# 성명/휴대폰번호/LC/지망모집단위
4040
freshman_list = []
41-
department_dict = {'자연과학계열':'NC', '공학계열':'EN', '사회과학계열':'SS', '인문과학계열':'HS'}
41+
department_dict = {'자연과학계열':'NC', '공학계열':'EN', '사회과학계열':'SS', '인문과학계열':'HS', '자유전공계열':'IN'}
4242

4343
for data in data_list:
4444
lc_name = data[2]

0 commit comments

Comments
 (0)