diff --git a/README.md b/README.md index c359786..cf8f768 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SMUNITY ![Python versions](https://img.shields.io/badge/Python-3.9-blue) ![License](https://img.shields.io/badge/license-MIT-green) ![Release](https://img.shields.io/badge/release-1.3.1-red) +# SMUNITY ![Python versions](https://img.shields.io/badge/Python-3.9-blue) ![License](https://img.shields.io/badge/license-MIT-green) ![Release](https://img.shields.io/badge/release-1.4.0-red) #### 상명대학교 졸업요건 검사 사이트 ![SMUNITY](https://github.com/smu-nity/SMUNITY/assets/63601183/f1e9be66-3894-42f7-a3a7-b730e8066a58) diff --git a/core/views.py b/core/views.py index a3f99f4..15d1450 100644 --- a/core/views.py +++ b/core/views.py @@ -75,7 +75,7 @@ def course_update(request): if not Course.objects.filter(user=request.user, subject=subject): Course.objects.create(user=request.user, subject=subject, year=sub['SCH_YEAR'], semester=sub['SMT_NM'], credit=sub['CDT'], type=sub['CMP_DIV_NM'], domain=domain) messages.error(request, '기이수과목이 업데이트 되었습니다.') - return redirect('core:mypage') + return redirect('core:result') messages.error(request, '⚠️ 샘물 포털 ID/PW를 다시 확인하세요! (Caps Lock 확인)') return redirect('core:mypage') diff --git a/static/css/main.css b/static/css/main.css index 2e28622..a88f665 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -226,6 +226,7 @@ input[type="button"] text-align:left; padding:1.5rem 2rem 1.5rem 2rem; border: 1px solid rgb(216, 216, 216); + line-height: 1.2; } .popup_box li{ line-height: 2.5rem; @@ -677,6 +678,7 @@ strong { font-size: 1rem; padding-top: 2rem; padding-bottom: 1rem; + line-height: 1.2; } .myth { height: 2.5rem; @@ -699,10 +701,10 @@ strong { color: rgb(199, 199, 199) } .partdiv { - padding-top: 2rem; - padding-bottom: 5rem; + padding: 2rem 0; font-size: 1.5rem; letter-spacing: 1.5px; + line-height: 1.2; } .gear { animation: i 5s linear infinite; @@ -781,7 +783,7 @@ strong { } .modal-title { text-align: center; - padding-top:2rem; + padding-top:1rem; font-weight: bold; font-size:2rem; margin-top:1.7rem; @@ -867,6 +869,7 @@ input[type=checkbox] { color:white; border-radius: 3px; background-color: #6188E8; + word-break: keep-all; } .target_color_span { font-size: 1.8rem; @@ -1221,8 +1224,6 @@ input[type=checkbox] { width: 100%; text-align: center; margin:0 auto; - margin-top:1rem; - margin-bottom:1rem; } .grade_table_th { font-size: 1rem; @@ -1646,9 +1647,16 @@ body:not(.device-touch) .suc_btn .modal_title { font-size: 1.5rem; } -.modal-test { - max-height: 600px; +.modal-scroll { + max-height: 300px; + overflow-y: auto; +} +.scroll { + height: 300px; overflow-y: auto; + overflow-x: hidden; + margin-top: 1rem; + margin-bottom: 1rem; } .box-margin1 { margin-top: 1rem; @@ -1668,6 +1676,12 @@ body:not(.device-touch) .suc_btn .form-readonly { background-color:rgb(248,249,250); } +.resultbox-mobile { + display: none; +} +.modal-ul { + padding: 0; +} @media screen and (max-width: 1024px) { .main-img { justify-content: center; @@ -1720,7 +1734,9 @@ body:not(.device-touch) .suc_btn font-size: 0.8rem; } .modal-title { - font-size: 1.8rem; + font-size: 1.6rem; + margin-top: 1.5rem; + margin-bottom: 1.5rem; } .table_hidden { display: none; @@ -1728,8 +1744,29 @@ body:not(.device-touch) .suc_btn .modal_title { font-size: 1.4rem; } - .modal-test { - max-height: 500px; + .modal-scroll { + max-height: 250px; + } + .resultbox-main { + display: none; + } + .resultbox-mobile { + display: block; + } + .partdiv { + font-size: 1.3rem; + } + .popup_content { + width: 90%; + } + .popup_box { + font-size: 0.95rem; + } + .link_site { + font-size: 0.7rem; + } + .popup_check { + font-size: 1rem; } } @media screen and (max-width: 767px) { @@ -1774,6 +1811,7 @@ body:not(.device-touch) .suc_btn } .update_modal_content { width: 70%; + padding: 2rem; } .close { font-size: 2.1rem; @@ -1782,7 +1820,9 @@ body:not(.device-touch) .suc_btn font-size: 0.7rem; } .modal-title { - font-size: 1.6rem; + font-size: 1.3rem; + margin-top: 1rem; + margin-bottom: 1rem; } .info_content { font-size:0.85rem; @@ -1798,7 +1838,7 @@ body:not(.device-touch) .suc_btn font-size: 1rem; } .mydiv { - font-size: 0.9rem; + font-size: 0.7rem; line-height: 1.2; } .target_num_div { @@ -1814,12 +1854,78 @@ body:not(.device-touch) .suc_btn .modal_title { font-size: 1.3rem; } - .modal-test { - max-height: 400px; + .modal-scroll { + max-height: 200px; } .white-box { width: 80%; } + .resultbox { + width: 95%; + box-sizing: border-box; + margin: 0.8rem auto; + height: auto; + } + .lcontainer { + padding-bottom : 1.5rem; + } + .result_name { + margin: 0.5rem 1rem 0 1rem; + font-size: 1.1rem; + } + .small { + font-size: 1rem; + } + .result_container { + margin: 1rem; + } + .result_content { + width: 100px; + height: 100px; + align-items: center; + display: grid; + } + .result_content_number { + font-size: 2rem; + height: 60px; + } + .pie-chart { + margin-left: 5px; + width: 90px; + height: 90px; + } + .result_content_info { + font-size: 0.7rem; + } + .recommend { + left: 70%; + height: 2rem; + width: 6rem; + font-size: 0.8rem; + } + .partdiv { + font-size: 0.9rem; + } + .mytable { + width: 100%; + padding-top: 1rem; + font-size: 0.5rem; + } + .myth { + font-size: 0.6rem; + } + .popup_content { + width: 95%; + } + .popup_box { + font-size: 0.75rem; + } + .link_site { + font-size: 0.6rem; + } + .popup_check { + font-size: 0.8rem; + } } @media screen and (max-width: 400px) { .bg_small_text { diff --git a/static/js/head.js b/static/js/head.js index d128615..836362b 100644 --- a/static/js/head.js +++ b/static/js/head.js @@ -28,21 +28,4 @@ var Spanclick_set_cookie = function (x, y) { } } } - -// 검사대상표 모달 -var target_btn = document.getElementById("target_btn"); -var target_modal = document.getElementById('target_modal'); -var target_close = document.getElementById("target_close"); -Btnclick(target_btn, target_modal); -Spanclick(target_close, target_modal); -Spanclick_set_cookie(span, modal); -window.onclick = function (event) { - if (event.target == target_modal) { - target_modal.style.display = "none"; - } -} -window.onclick = function (event) { - if (event.target == modal) { - modal.style.display = "none"; - } -} +Spanclick_set_cookie(span, modal); \ No newline at end of file diff --git a/templates/accounts/agree.html b/templates/accounts/agree.html index cdda938..9efcc53 100644 --- a/templates/accounts/agree.html +++ b/templates/accounts/agree.html @@ -59,7 +59,7 @@ - - - - - -{% endblock %} -{% block js %} - - {% endblock %} \ No newline at end of file diff --git a/templates/core/mypage.html b/templates/core/mypage.html index 38d95dc..e35533a 100644 --- a/templates/core/mypage.html +++ b/templates/core/mypage.html @@ -75,65 +75,34 @@
- - - - - - - - - - - - {% for course in short %} - - - - - - - - - - {% endfor %} -
년도학기학수번호과목명이수구분선택영역학점
{{ course.year }}{{ course.semester }}{{ course.subject.number }}{{ course.subject.name }}{{ course.type }} - {% if course.domain %} - {{ course.domain }} - {% endif %} - {{ course.credit }}
- - - - - - - - - - - - {% for course in courses %} - - - - - - - - - - {% endfor %} - - -
 펼치기 -
- +
+ + + + + + + + + + + {% for course in courses %} + + + + + + + + + + {% endfor %} +
년도학기학수번호과목명이수구분선택영역학점
{{ course.year }}{{ course.semester }}{{ course.subject.number }}{{ course.subject.name }}{{ course.type }} + {% if course.domain %} + {{ course.domain }} + {% endif %} + {{ course.credit }}
+
@@ -286,7 +255,7 @@ {% if courses %} location.href = "{% url 'core:result' %}"; {% else %} - alert('성적사항 엑셀파일을 먼저 업로드 해주세요!'); + m4.style.display = "block"; {% endif %} } @@ -346,22 +315,6 @@ return true; } - function show_table() { - // 테이블 전환 - document.getElementById("short_table").style.display = "none"; - document.getElementById("long_table").style.display = "table"; - // 버튼 전환 - document.getElementById("show_btn").style.display = "none"; - document.getElementById("hide_btn").style.display = "block"; - } - - function hide_table() { - document.getElementById("short_table").style.display = "table"; - document.getElementById("long_table").style.display = "none"; - document.getElementById("show_btn").style.display = "block"; - document.getElementById("hide_btn").style.display = "none"; - } - // 모달 켜는 버튼 id var b1 = document.getElementById("b1"); // 1. 내 정보 업데이트 var b2 = document.getElementById("b2"); // 2. 비번 변경 diff --git a/templates/core/result.html b/templates/core/result.html index ac48342..f84cd81 100644 --- a/templates/core/result.html +++ b/templates/core/result.html @@ -9,11 +9,10 @@ {% block main_area %}
- +
 이수학점  {{ profile.tostring }} -{# #}
@@ -53,6 +52,35 @@
+ +
+
+  이수학점  {{ profile.tostring }} +
+
+
+
{{ profile.year.all }}
+
총 기준 학점
+
+
+
+
총 이수 학점
+
+
+
+
필요 학점
+
+
+
+
+
+ +
+
+
+
+
+
@@ -83,7 +111,6 @@
-
@@ -118,12 +145,6 @@
 교양 -{# #} -{#
#} -{# 교양

#} -{# 설명설명#} -{#
명#} -{#
추천 과목 보기
#}
@@ -183,11 +204,6 @@
 상명핵심역량교양 -{# #} -{#
#} -{# 상명핵심역량교양

#} -{# 설명설명#} -{#
#}
추천 과목 보기
@@ -246,41 +262,41 @@
- -