From 11443413a1fe795d492090d8c3b6d80d4faa4d60 Mon Sep 17 00:00:00 2001
From: Chenx221 <chenx221@yandex.com>
Date: Mon, 12 Jun 2023 20:58:35 +0800
Subject: [PATCH] up

Signed-off-by: Chenx221 <chenx221@yandex.com>
---
 .../chenx221/controller/ScoreController.class | Bin 2032 -> 2032 bytes
 .../classes/cyou/chenx221/pojo/Score.class    | Bin 2378 -> 3055 bytes
 .../WEB-INF/views/dashboard.jsp               |   6 +--
 .../WEB-INF/views/scoreopv2.jsp               |  19 ++++++--
 .../resources/js/multi_function_v1.js}        |  13 ++++++
 .../chenx221/controller/ScoreController.java  |  44 +++++++++++++++++-
 .../main/java/cyou/chenx221/pojo/Score.java   |  27 +++++++++++
 project2/web/WEB-INF/views/dashboard.jsp      |   6 +--
 project2/web/WEB-INF/views/scoreopv2.jsp      |  19 ++++++--
 .../resources/js/multi_function_v1.js}        |  15 +++++-
 10 files changed, 131 insertions(+), 18 deletions(-)
 rename project2/{web/resources/js/range-limit.js => out/artifacts/project2_war_exploded/resources/js/multi_function_v1.js} (56%)
 rename project2/{out/artifacts/project2_war_exploded/resources/js/range-limit.js => web/resources/js/multi_function_v1.js} (55%)

diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/ScoreController.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/ScoreController.class
index 638701c5e07a18517b3f20956ceae8ed49eeb04d..6687b95b4eeed57db9db800bbf8f9c33a7e6da4a 100644
GIT binary patch
delta 73
zcmeys|ABwQV^&Tv1{MZ!22KWv$!}OI1!Wkx8Dtsw8RQrw859^a85Ad%v2BplVBi6=
a1sSv$WEgaSP?y1sL65<K!C<mI`$hl>z6@gk

delta 73
zcmeys|ABwQV^&U41{MY}22KX?$!}OI1*I9d8Dtpv8DtqG8RQu>85Aa$v2Bo4XW(Jb
aU=RfIWf-&>bb!!|L6^aSL4UG6`$hl<xeQbQ

diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/pojo/Score.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/pojo/Score.class
index e48a648509987d72929ff5eb5fb5c436a763a445..d74e5fa6171b3980ab39342ba6b91895a5971e73 100644
GIT binary patch
literal 3055
zcmcJQ-A)@v6vzK#Y%e$_7-9@I-zjlzhu}bHo79jdF{RL&Bo!%D)tfG61q)`EdY1@P
zRq9orp^wnZRsvPZMIWFKRrQ?NvAsBB?kdYWAA9D1esj*u*?<0h_cwqwyiOp3J_FGt
zVu%Z*j?A}axnVj7<yU)0R^1nfuiB37KNaXJ6n6*Ej{yUTByJ%oFkZiK&&u^f%Q;_O
zUMiouM{aqi?lvs}L$+J%0(WX1(JjZf4y<N{b#5my#3C_|SMbbm5+k@nYd!yL-*U+L
zWKHKGcq>IllgMC<DC_Q7(<8qVx)oLVQZC3Qkz=oYC$_^rCzF^8#^(75#bhRlS<DHH
zotVc~)phEo|E=vGQqS{E$M*z&ENC{Q^SYxrb?+3BMyVK@+wq&Wb5Ic|YJI*R*W#`~
zwCe6tAcktTW4$~(*|VB&%)JK9jMUt^+1NFkHjmY0)IYRoQ#l=^Od)wUWQI7GKWI5_
z$dOL=hP@O1um7)$P;^^|Q8UGHj2~G3w(SUv7Q#7cts(<Y8Dw<GZ3**SnQ|vVqV1cJ
zAc4++-?YyCG`YMXs-(k9Th=p$n~WJ`fW(8a3ry*?RaVHBq+7PrT4iO*!u_rNP`9-k
z>iTYQbOqAag4aIKi5<F<b!)@sgPD*)SmfhOCFq6g`kvo3Pq!`q(B1cj;;1IDj?WEj
z@a6nMV7_zmZRf3fY?TAy;J$8{b>D4X2>ce#i!uyEH%({1VR`d4*F8Qvt%Od1A`H!3
zTlnVU)Y6!LAF>Y$XC-`Qltk5RG<Iy?s`O(^U{UV+Cv^bU#KNp9d)%$diX|txI<ASI
z1(I8iV>PP{)AKCPKuzG@dvVZh&%jH8>6=aIhz7C192La~6~Z_@smN0=!c|$eRBB~Q
zbz8PnNo7kFl-glXF~?ncen6w|_{&1=Q0Xs-()}wKrG+aD{wWvC({lt-dfuXE5(5~-
zZTj7#nb}|&^7xQOB!B{02-#!D5$Ptb+&rR|-^JKXN1VTFK#IhNrDz}!Q=-gSR06+{
zWsGcd*Emz92Ukd!ve9eEIf@D>7Ez=Ld6a-NG#Wz|<I>AYpwvdswb64jhRl@X50>0w
zj=z7T#WW>F^E=TPWR>qpQ_9A!FkZ^WuQ1Ws?_J6oYez9bWRpZTMP$=NHbcKzqMMV1
zn}K?pFyAK3w+ZuY!n`6R9{y^|-R1dvNpTRkj|D|trZz~zCC2|CkO(-#Yy|3YR=X4M
z0E=qzQ?ix^jt|LrXG=i}3*@vY6*7TU8$B+O*l}44GSLmPpaprT2MNVC0C`9tOFck1
zA`G&m1u?ooR<t0?dJv;KB995=Ne__VrU*R3ii&PHHK}fpRV~Oz_*gBzmYP&I$TI?Y
z-UEay21n!*Jl24uyFu2qAW!hA4kX<TvPmFYJwW)fF-S$5n!#?6nigbLpPEoH3(m-E
z0{OZJ2;X%ES;JF$a)o>*?>>+zT~cwpM2h}t`VYRNi;HfuZ$e}lbqV_L8R<kw={dFi
Ur2B&YoA{DO3F>`?ZM;JEKluhcg8%>k

delta 935
zcmZ`%O-~b16g|(G&e+%THI}I@47Sw)Y0H;@C<@k!3m2~Z0mhKVg$omL=b{UL0eSom
z0s&*ff)y)%iit7)0pq!EDwxT1@$S9v<-T*yJ@5T0Uk3W}&)GSEExg><KXt&eQbZL~
zCw28j74-Yw=Qq0_KlNVin6^_b=)LRxYiH`@z?oK~k2D@*)5jCJ_|%-c7i!yl&2`=9
z3bFa&#*U8{=67yYxhD4Ng(4Jkm}ZR3JFm7hL(%{)W1dkn7BGq;?(n1rhjEO#&MZ~K
z9C_t##CnwoiaFQ(4t31p1_Vkog8(j@1w!c9G=LE5yF7_Z-fwM4e-$3%1p5P0-{Q>@
z<0L8w?fo_0kgk6cs+91-kNtayEza9~*cTkn@>DW8XE7(e?AoR}(dRW=-{7ZJN93BZ
z2w~E7#p<D9CsDYM`2p4vvz@KqJjM7CQ4<FeCG|`tO|-I<jHi{vR5Ck6NkD&uxs8Pc
z%k1gW+_eYunaqn2y^%T8W$Rb+P7CB&9KsW#Y<ZRwr#au%#2k1eJ@85<?MjCAeR@BV
zo_L)~9u845Ht_y|{dDq<9sU>bKBN*~?B^<psx#aM($Y5nlNO@Zw!hiIntif$(gHUL
Rx52fAXWVI49dxmS%3rF|P3-^x

diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/views/dashboard.jsp b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/dashboard.jsp
index 0cc29af..0ddc329 100644
--- a/project2/out/artifacts/project2_war_exploded/WEB-INF/views/dashboard.jsp
+++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/dashboard.jsp
@@ -54,8 +54,6 @@
                             <li>
                                 <hr class="dropdown-divider" />
                             </li>
-                            <li><a class="dropdown-item" href="course/all">课程查看</a></li>
-                            <li><a class="dropdown-item" href="course/infomodv2">课程管理</a></li>
                             <li><a class="dropdown-item" href="#">学生选课管理</a></li>
                         </ul>
                     </li>
@@ -75,8 +73,8 @@
                             课程管理
                         </a>
                         <ul class="dropdown-menu" aria-labelledby="navbarDropdown3">
-                            <li><a class="dropdown-item" href="#">课程信息管理</a></li>
-                            <li><a class="dropdown-item" href="#">课程安排管理</a></li>
+                            <li><a class="dropdown-item" href="course/all">课程查看</a></li>
+                            <li><a class="dropdown-item" href="course/infomodv2">课程管理</a></li>
                         </ul>
                     </li>
                     <li class="nav-item dropdown">
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/views/scoreopv2.jsp b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/scoreopv2.jsp
index 0107679..79c44b9 100644
--- a/project2/out/artifacts/project2_war_exploded/WEB-INF/views/scoreopv2.jsp
+++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/scoreopv2.jsp
@@ -203,7 +203,7 @@
                                             <div class="col-12">
                                                 <div class="form-outline">
                                                     <input type="number" id="typeText2" class="form-control"
-                                                           name="scoreid"/>
+                                                           name="studentid"/>
                                                     <label class="form-label" for="typeText2">学号</label>
                                                 </div>
                                             </div>
@@ -241,7 +241,8 @@
                                                     <output id="score_min_value"></output>
                                                 </label>
                                                 <div class="range">
-                                                    <input type="range" class="form-range" id="customRange1" name="min" value="0" min="0" max="100"/>
+                                                    <input type="range" class="form-range" id="customRange1" name="min"
+                                                           value="0" min="0" max="100" disabled/>
                                                 </div>
                                             </div>
                                             <div class="col-12">
@@ -249,10 +250,20 @@
                                                     <output id="score_max_value"></output>
                                                 </label>
                                                 <div class="range">
-                                                    <input type="range" class="form-range" id="customRange2" name="max" value="100" min="0" max="100"/>
+                                                    <input type="range" class="form-range" id="customRange2" name="max"
+                                                           value="100" min="0" max="100" disabled/>
                                                 </div>
                                             </div>
                                         </div>
+                                        <div class="row mb-2">
+                                            <div class="col-12">
+                                                <div class="form-check">
+                                                    <input class="form-check-input" type="checkbox" value="" id="range_enabler" name="range_enabler" />
+                                                    <label class="form-check-label" for="range_enabler">设定成绩范围</label>
+                                                </div>
+                                            </div>
+                                        </div>
+
                                         <div class="row mb-2 mt-4">
                                             <div class="col-lg-6 text-center">
                                                 <button type="submit" class="btn btn-primary">查询
@@ -440,7 +451,7 @@
         </c:if>
     });
 </script>
-<script type="text/javascript" src="${pageContext.request.contextPath}/resources/js/range-limit.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath}/resources/js/multi_function_v1.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/project2/web/resources/js/range-limit.js b/project2/out/artifacts/project2_war_exploded/resources/js/multi_function_v1.js
similarity index 56%
rename from project2/web/resources/js/range-limit.js
rename to project2/out/artifacts/project2_war_exploded/resources/js/multi_function_v1.js
index 28b0545..823cd60 100644
--- a/project2/web/resources/js/range-limit.js
+++ b/project2/out/artifacts/project2_war_exploded/resources/js/multi_function_v1.js
@@ -10,3 +10,16 @@ input_max.addEventListener("input", (event) => {
     value_max.textContent = event.target.value
     input_min.setAttribute("max", event.target.value)
 })
+
+const range_enabler = document.querySelector("#range_enabler")
+range_enabler.addEventListener("click", (event) => {
+    //if range_enabler is checked, then enable the range
+    //if range_enabler is unchecked, then disable the range
+    if (range_enabler.checked) {
+        input_min.disabled = false
+        input_max.disabled = false
+    } else {
+        input_min.disabled = true
+        input_max.disabled = true
+    }
+})
diff --git a/project2/src/main/java/cyou/chenx221/controller/ScoreController.java b/project2/src/main/java/cyou/chenx221/controller/ScoreController.java
index 7e4bc67..5e24aea 100644
--- a/project2/src/main/java/cyou/chenx221/controller/ScoreController.java
+++ b/project2/src/main/java/cyou/chenx221/controller/ScoreController.java
@@ -2,11 +2,14 @@ package cyou.chenx221.controller;
 
 import cyou.chenx221.helper.UsernameHelper;
 import cyou.chenx221.pojo.Course;
+import cyou.chenx221.pojo.Score;
+import cyou.chenx221.pojo.Student;
 import cyou.chenx221.service.ScoreService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -23,7 +26,7 @@ public class ScoreController {
     }
 
     @GetMapping("/all")
-    public String getAllScore(Model model){
+    public String getAllScore(Model model) {
         String username = new UsernameHelper().getCurrentUsername();
         if (username != null) {
             model.addAttribute("username", username);
@@ -46,4 +49,43 @@ public class ScoreController {
 
         return "scoreopv2";
     }
+
+//    @PostMapping(value = "/query", produces = "application/x-www-form-urlencoded;charset=UTF-8")//学生信息查询（带条件）
+//    public String getQueryCourses(@RequestParam(value = "name", defaultValue = "null", required = false) String name,//学生姓名
+//                                  @RequestParam(value = "coursename", defaultValue = "null", required = false) String course_name,//课程名
+//                                  @RequestParam(value = "scoreid", defaultValue = "-1", required = false) int score_id,//成绩ID
+//                                  @RequestParam(value = "studentid", defaultValue = "-1", required = false) int student_id,//学号
+//                                  @RequestParam(value = "courseid", defaultValue = "-1", required = false) int course_id,//课程ID
+//                                  @RequestParam(value = "min", required = false) int min,//最低分
+//                                  @RequestParam(value = "max", required = false) int max,//最高分
+//                                  @RequestParam(value = "range_enabler", defaultValue = "false", required = false) boolean range_enabler,//是否启用分数范围
+//                                  Model model) {
+//
+//        //username helper start
+//        String username = new UsernameHelper().getCurrentUsername();
+//        if (username != null) {
+//            model.addAttribute("username", username);
+//        }
+//        //username helper end
+//
+//        if (name.equals("null")) {
+//            name = null;
+//        }
+//        if (course_name.equals("null")) {
+//            course_name = null;
+//        }
+//        if (score_id == -1 && student_id == -1 && course_id == -1 && !range_enabler) {
+//            model.addAttribute("errorMessage", "查询条件不可全为空");
+//            return "redirect:/score/infomodv2";
+//        }
+//        List<Score> scores;
+//        Score score;
+//
+//        score = new Score((score_id == -1? null:score_id), ((student_id==-1&&name==null)==null?null:(new Student(student_id,name))), null, null, min, max);
+//        course = new Course((id == -1 ? null : id), name, description);
+////        System.out.println("id:" + id + " name:" + name + " description:" + description);
+//        courses = courseService.getQueryCourses(course);
+//        model.addAttribute("courses", courses);
+//        return "courseQueryResult";
+//    }
 }
diff --git a/project2/src/main/java/cyou/chenx221/pojo/Score.java b/project2/src/main/java/cyou/chenx221/pojo/Score.java
index 4950975..5637bb6 100644
--- a/project2/src/main/java/cyou/chenx221/pojo/Score.java
+++ b/project2/src/main/java/cyou/chenx221/pojo/Score.java
@@ -5,6 +5,8 @@ public class Score {
     private Student student; //。。。
     private Course course; //。。。
     private Integer score; //成绩
+    private Integer min; //最小成绩
+    private Integer max; //最大成绩
 
     public Score(Integer scoreID, Integer score) {
         ScoreID = scoreID;
@@ -21,6 +23,31 @@ public class Score {
         this.score = score;
     }
 
+    public Score(Integer scoreID, Student student, Course course, Integer score, Integer min, Integer max) {
+        ScoreID = scoreID;
+        this.student = student;
+        this.course = course;
+        this.score = score;
+        this.min = min;
+        this.max = max;
+    }
+
+    public Integer getMin() {
+        return min;
+    }
+
+    public void setMin(Integer min) {
+        this.min = min;
+    }
+
+    public Integer getMax() {
+        return max;
+    }
+
+    public void setMax(Integer max) {
+        this.max = max;
+    }
+
     public Integer getScoreID() {
         return ScoreID;
     }
diff --git a/project2/web/WEB-INF/views/dashboard.jsp b/project2/web/WEB-INF/views/dashboard.jsp
index 0cc29af..0ddc329 100644
--- a/project2/web/WEB-INF/views/dashboard.jsp
+++ b/project2/web/WEB-INF/views/dashboard.jsp
@@ -54,8 +54,6 @@
                             <li>
                                 <hr class="dropdown-divider" />
                             </li>
-                            <li><a class="dropdown-item" href="course/all">课程查看</a></li>
-                            <li><a class="dropdown-item" href="course/infomodv2">课程管理</a></li>
                             <li><a class="dropdown-item" href="#">学生选课管理</a></li>
                         </ul>
                     </li>
@@ -75,8 +73,8 @@
                             课程管理
                         </a>
                         <ul class="dropdown-menu" aria-labelledby="navbarDropdown3">
-                            <li><a class="dropdown-item" href="#">课程信息管理</a></li>
-                            <li><a class="dropdown-item" href="#">课程安排管理</a></li>
+                            <li><a class="dropdown-item" href="course/all">课程查看</a></li>
+                            <li><a class="dropdown-item" href="course/infomodv2">课程管理</a></li>
                         </ul>
                     </li>
                     <li class="nav-item dropdown">
diff --git a/project2/web/WEB-INF/views/scoreopv2.jsp b/project2/web/WEB-INF/views/scoreopv2.jsp
index 0107679..79c44b9 100644
--- a/project2/web/WEB-INF/views/scoreopv2.jsp
+++ b/project2/web/WEB-INF/views/scoreopv2.jsp
@@ -203,7 +203,7 @@
                                             <div class="col-12">
                                                 <div class="form-outline">
                                                     <input type="number" id="typeText2" class="form-control"
-                                                           name="scoreid"/>
+                                                           name="studentid"/>
                                                     <label class="form-label" for="typeText2">学号</label>
                                                 </div>
                                             </div>
@@ -241,7 +241,8 @@
                                                     <output id="score_min_value"></output>
                                                 </label>
                                                 <div class="range">
-                                                    <input type="range" class="form-range" id="customRange1" name="min" value="0" min="0" max="100"/>
+                                                    <input type="range" class="form-range" id="customRange1" name="min"
+                                                           value="0" min="0" max="100" disabled/>
                                                 </div>
                                             </div>
                                             <div class="col-12">
@@ -249,10 +250,20 @@
                                                     <output id="score_max_value"></output>
                                                 </label>
                                                 <div class="range">
-                                                    <input type="range" class="form-range" id="customRange2" name="max" value="100" min="0" max="100"/>
+                                                    <input type="range" class="form-range" id="customRange2" name="max"
+                                                           value="100" min="0" max="100" disabled/>
                                                 </div>
                                             </div>
                                         </div>
+                                        <div class="row mb-2">
+                                            <div class="col-12">
+                                                <div class="form-check">
+                                                    <input class="form-check-input" type="checkbox" value="" id="range_enabler" name="range_enabler" />
+                                                    <label class="form-check-label" for="range_enabler">设定成绩范围</label>
+                                                </div>
+                                            </div>
+                                        </div>
+
                                         <div class="row mb-2 mt-4">
                                             <div class="col-lg-6 text-center">
                                                 <button type="submit" class="btn btn-primary">查询
@@ -440,7 +451,7 @@
         </c:if>
     });
 </script>
-<script type="text/javascript" src="${pageContext.request.contextPath}/resources/js/range-limit.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath}/resources/js/multi_function_v1.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/project2/out/artifacts/project2_war_exploded/resources/js/range-limit.js b/project2/web/resources/js/multi_function_v1.js
similarity index 55%
rename from project2/out/artifacts/project2_war_exploded/resources/js/range-limit.js
rename to project2/web/resources/js/multi_function_v1.js
index 9fef4f2..823cd60 100644
--- a/project2/out/artifacts/project2_war_exploded/resources/js/range-limit.js
+++ b/project2/web/resources/js/multi_function_v1.js
@@ -9,4 +9,17 @@ input_min.addEventListener("input", (event) => {
 input_max.addEventListener("input", (event) => {
     value_max.textContent = event.target.value
     input_min.setAttribute("max", event.target.value)
-})
\ No newline at end of file
+})
+
+const range_enabler = document.querySelector("#range_enabler")
+range_enabler.addEventListener("click", (event) => {
+    //if range_enabler is checked, then enable the range
+    //if range_enabler is unchecked, then disable the range
+    if (range_enabler.checked) {
+        input_min.disabled = false
+        input_max.disabled = false
+    } else {
+        input_min.disabled = true
+        input_max.disabled = true
+    }
+})