diff --git a/src/gdms/GlobalTimePoint.json b/src/gdms/GlobalTimePoint.json index b5d8112..f1d908e 100644 --- a/src/gdms/GlobalTimePoint.json +++ b/src/gdms/GlobalTimePoint.json @@ -1,9 +1,9 @@ { - "teacher_choose_student_start_date":"", - "student_choose_teacher_start_date": "", - "choose_end_date": "", - "opening_report_opinion_deadline_date": "", - "finished_product_deadline_date": "", - "finished_product_review_deadline_date": "", - "reply_opition_deadline_date": "" + "teacher_choose_student_start_date":"";, + "student_choose_teacher_start_date": "",; + "choose_end_date": "",; + "opening_report_opinion_deadline_date": "",; + "finished_product_deadline_date": "",; + "finished_product_review_deadline_date": "",; + "reply_opition_deadline_date": ""; } \ No newline at end of file diff --git a/src/servlet/Submit/S_TextSubmit.java b/src/servlet/S_CollegeFillOpeningReportOpinion.java similarity index 50% rename from src/servlet/Submit/S_TextSubmit.java rename to src/servlet/S_CollegeFillOpeningReportOpinion.java index f799e8a..774b28f 100644 --- a/src/servlet/Submit/S_TextSubmit.java +++ b/src/servlet/S_CollegeFillOpeningReportOpinion.java @@ -1,5 +1,4 @@ -package servlet.Submit; - +package servlet; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; @@ -7,17 +6,14 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet("/textsubmit") -public class S_TextSubmit extends HttpServlet { + +@WebServlet(name = "S_CollegeFillOpeningReportOpinion") +public class S_CollegeFillOpeningReportOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doPost(request, response); - String content=new String(request.getParameter("text").getBytes("ISO8859-1"),"UTF-8"); - String score=request.getParameter("score"); - try { + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - } catch (Exception e) { - e.printStackTrace(); - } } } diff --git a/src/servlet/S_CollegeFillScoreOpinion.java b/src/servlet/S_CollegeFillScoreOpinion.java new file mode 100644 index 0000000..e937d1d --- /dev/null +++ b/src/servlet/S_CollegeFillScoreOpinion.java @@ -0,0 +1,19 @@ +package servlet; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@WebServlet(name = "S_CollegeFillScoreOpinion") +public class S_CollegeFillScoreOpinion extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_MentorFillOpeningReportOpinion.java b/src/servlet/S_MentorFillOpeningReportOpinion.java new file mode 100644 index 0000000..409ff1f --- /dev/null +++ b/src/servlet/S_MentorFillOpeningReportOpinion.java @@ -0,0 +1,19 @@ +package servlet; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@WebServlet(name = "S_MentorFillOpeningReportOpinion") +public class S_MentorFillOpeningReportOpinion extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/Submit/S_ScoreSubmit.java b/src/servlet/S_MentorFillReview.java similarity index 53% rename from src/servlet/Submit/S_ScoreSubmit.java rename to src/servlet/S_MentorFillReview.java index 8e8a11c..732bf0e 100644 --- a/src/servlet/Submit/S_ScoreSubmit.java +++ b/src/servlet/S_MentorFillReview.java @@ -1,15 +1,19 @@ -package servlet.Submit; +package servlet; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -public class S_ScoreSubmit extends HttpServlet { +@WebServlet(name = "S_MentorFillReview") +public class S_MentorFillReview extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doPost(request, response); - String score = request.getParameter("score"); + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { } } diff --git a/src/servlet/S_ReviewerFillReview.java b/src/servlet/S_ReviewerFillReview.java new file mode 100644 index 0000000..437556e --- /dev/null +++ b/src/servlet/S_ReviewerFillReview.java @@ -0,0 +1,19 @@ +package servlet; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@WebServlet(name = "S_ReviewerFillReview") +public class S_ReviewerFillReview extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_SchoolFillScoreOpinion.java b/src/servlet/S_SchoolFillScoreOpinion.java new file mode 100644 index 0000000..4ece4f4 --- /dev/null +++ b/src/servlet/S_SchoolFillScoreOpinion.java @@ -0,0 +1,19 @@ +package servlet; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@WebServlet(name = "S_SchoolFillScoreOpinion") +public class S_SchoolFillScoreOpinion extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_SecretaryFillOpeningReportRecord.java b/src/servlet/S_SecretaryFillOpeningReportRecord.java new file mode 100644 index 0000000..74926a9 --- /dev/null +++ b/src/servlet/S_SecretaryFillOpeningReportRecord.java @@ -0,0 +1,19 @@ +package servlet; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@WebServlet(name = "S_SecretaryFillOpeningReportRecord") +public class S_SecretaryFillOpeningReportRecord extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_SecretaryFillReplyRecord.java b/src/servlet/S_SecretaryFillReplyRecord.java new file mode 100644 index 0000000..ea217f6 --- /dev/null +++ b/src/servlet/S_SecretaryFillReplyRecord.java @@ -0,0 +1,19 @@ +package servlet; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@WebServlet(name = "S_SecretaryFillReplyRecord") +public class S_SecretaryFillReplyRecord extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/Submit/S_StudentFillTopicInformation.java b/src/servlet/S_StudentFillGraduationDesignInformation.java similarity index 75% rename from src/servlet/Submit/S_StudentFillTopicInformation.java rename to src/servlet/S_StudentFillGraduationDesignInformation.java index a71f113..142b43d 100644 --- a/src/servlet/Submit/S_StudentFillTopicInformation.java +++ b/src/servlet/S_StudentFillGraduationDesignInformation.java @@ -1,12 +1,14 @@ -package servlet.Submit; +package servlet; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -public class S_StudentFillTopicInformation extends HttpServlet { +@WebServlet("/student-fill-graduation-design-information") +public class S_StudentFillGraduationDesignInformation extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); String content1=new String(request.getParameter("text").getBytes("ISO8859-1"),"UTF-8"); diff --git a/src/servlet/Select/S_StudentSelectTeacher.java b/src/servlet/S_StudentSelectTeacher.java similarity index 74% rename from src/servlet/Select/S_StudentSelectTeacher.java rename to src/servlet/S_StudentSelectTeacher.java index 11ba9f3..bc76e6c 100644 --- a/src/servlet/Select/S_StudentSelectTeacher.java +++ b/src/servlet/S_StudentSelectTeacher.java @@ -1,4 +1,4 @@ -package servlet.Select; +package servlet; import core.process.C_StudentSearchTeacher; import core.process.C_StudentSelectTeacher; @@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet("/studentselectteacher") +@WebServlet("/student-select-teacher") public class S_StudentSelectTeacher extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); @@ -17,11 +17,13 @@ public class S_StudentSelectTeacher extends HttpServlet { User user=(User)request.getSession().getAttribute("user"); String student_id=user.getId(); try { - C_StudentSelectTeacher test=new C_StudentSelectTeacher(); - test.setTeacherId(teacher_id); - test.setStudentId(student_id); + C_StudentSelectTeacher SST=new C_StudentSelectTeacher(); + SST.setTeacherId(teacher_id); + SST.setStudentId(student_id); + SST.select(); } catch (Exception e) { e.printStackTrace(); + response.sendRedirect("/op_fail.jsp"); } } } diff --git a/src/servlet/S_StudentUploadFinishedProduct.java b/src/servlet/S_StudentUploadFinishedProduct.java new file mode 100644 index 0000000..0389973 --- /dev/null +++ b/src/servlet/S_StudentUploadFinishedProduct.java @@ -0,0 +1,19 @@ +package servlet; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@WebServlet(name = "S_StudentUploadFinishedProduct") +public class S_StudentUploadFinishedProduct extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/Submit/S_StudentUploadOpeningReport.java b/src/servlet/S_StudentUploadOpeningReport.java similarity index 95% rename from src/servlet/Submit/S_StudentUploadOpeningReport.java rename to src/servlet/S_StudentUploadOpeningReport.java index 78afd75..df0f052 100644 --- a/src/servlet/Submit/S_StudentUploadOpeningReport.java +++ b/src/servlet/S_StudentUploadOpeningReport.java @@ -1,4 +1,4 @@ -package servlet.Submit; +package servlet; import core.user.User; @@ -12,7 +12,7 @@ import javax.servlet.http.Part; import java.io.IOException; import java.util.UUID; -@WebServlet("/upload") +@WebServlet("/student-upload-opening-report") @MultipartConfig //学生id+文件 public class S_StudentUploadOpeningReport extends HttpServlet { diff --git a/src/servlet/Select/S_TeacherSelectStudent.java b/src/servlet/S_TeacherSelectStudent.java similarity index 73% rename from src/servlet/Select/S_TeacherSelectStudent.java rename to src/servlet/S_TeacherSelectStudent.java index 0bd9ad4..fe20103 100644 --- a/src/servlet/Select/S_TeacherSelectStudent.java +++ b/src/servlet/S_TeacherSelectStudent.java @@ -1,4 +1,4 @@ -package servlet.Select; +package servlet; import core.process.C_TeacherSelectStudent; import core.user.User; @@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet("/teacherselectstudent") +@WebServlet("/teacher-select-student") public class S_TeacherSelectStudent extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); @@ -17,11 +17,13 @@ public class S_TeacherSelectStudent extends HttpServlet { User user=(User)request.getSession().getAttribute("user"); String teacher_id=user.getId(); try { - C_TeacherSelectStudent test=new C_TeacherSelectStudent(); - test.setTeacherId(teacher_id); - test.setStudentId(student_id); + C_TeacherSelectStudent TSS=new C_TeacherSelectStudent(); + TSS.setTeacherId(teacher_id); + TSS.setStudentId(student_id); + TSS.select(); } catch (Exception e) { e.printStackTrace(); + response.sendRedirect("/op_fail.jsp"); } } } diff --git a/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java b/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java new file mode 100644 index 0000000..ac47c5b --- /dev/null +++ b/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java @@ -0,0 +1,19 @@ +package servlet; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@WebServlet(name = "S_TeacherTeamFillOpeningReportOpinion") +public class S_TeacherTeamFillOpeningReportOpinion extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_TeacherTeamFillScoreOpinion.java b/src/servlet/S_TeacherTeamFillScoreOpinion.java new file mode 100644 index 0000000..e3418ef --- /dev/null +++ b/src/servlet/S_TeacherTeamFillScoreOpinion.java @@ -0,0 +1,19 @@ +package servlet; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@WebServlet(name = "S_TeacherFillTeamFillScoreOpinion") +public class S_TeacherFillTeamFillScoreOpinion extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/Utils.java b/src/servlet/Utils.java new file mode 100644 index 0000000..06037af --- /dev/null +++ b/src/servlet/Utils.java @@ -0,0 +1,4 @@ +package servlet; + +public interface Utils { +} diff --git a/src/servlet/account/S_Login.java b/src/servlet/account/S_Login.java index c394db1..f7b9506 100644 --- a/src/servlet/account/S_Login.java +++ b/src/servlet/account/S_Login.java @@ -18,10 +18,10 @@ import error.GExcptSQL; @WebServlet("/login") public class S_Login extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws IOException { String id=request.getParameter("id"); String password=request.getParameter("password"); - User user = null; + User user; try { user = AccountManagement.login(id,password); } catch (GExcptSQL | SQLException gExcptSQL) { diff --git a/web/cssFile/blank-style.css b/web/cssFile/blank-style.css new file mode 100644 index 0000000..fa2bd36 --- /dev/null +++ b/web/cssFile/blank-style.css @@ -0,0 +1,94 @@ +.blank-frame-sub{ + width: 100%; + min-height: 825px; + border: 1px solid rgba(255, 255, 255, 0); + } +.sub-msg{ + background-color: white; + width: 960px; + min-height: 400px; + border-radius: 5px; + margin: 100px 10px 0px 18px; + border: 1px solid rgba(0, 0, 0, 0.23); +} +.sub-fill-frame{ + height: 80px; + width: 940px; + margin: 20px 10px; +} +.sub-fill-frame input{ + float: left; + margin-right: 10px; + padding-left: 12px; + background-color: #f5f5f5; + border-radius: 5px; + height: 40px; + width: 300px; + border:1px solid rgba(0, 0, 0, 0.27); +} +.sub-fill-frame input:hover{ + border:1px solid rgb(120, 190, 255); + background-color: #ffffff; +} +.sub-fill-frame input:focus{ + border:1px solid rgb(120, 190, 255); + background-color: #ffffff; +} +.sub-fill-frame select{ + appearance:none; + -moz-appearance:none; + -webkit-appearance:none; + width: 150px; + height: 40px; + color: rgba(0,0,0,0.58); + border:1px solid rgba(0, 0, 0, 0.41); + padding-left: 12px; + border-radius: 5px; +} +.sub-scb-text{ + width: 700px; + height: 120px; + border-radius: 10px; + border: 1px solid rgba(0, 0, 0, 0.2); + resize: none; + padding: 10px 10px; + background-color: #f4f4f4; +} +.sub-scb-text:focus{ + border: 1px solid rgb(55, 157, 255); + background-color: white; +} +.sub-scb-text:hover{ + background-color: white; + border: 1px solid rgb(55, 157, 255); +} +.sub-fill-frame.sub-scb{ + height:120px ; +} +.sub-tips{ + text-align: right; + line-height: 40px; + margin-right: 20px; + width: 150px; + height: 100%; + float: left; +} +.sub-input-button{ + width: 100px; + height: 40px; + color: white; + background-color: #d74144; + border-radius: 5px; + margin: 20px 430px; + border: 0px; + cursor: pointer; +} +.sub-input-button:hover{ + background-color: #eb4548; +} +.sub-fill-frame select:focus{ + border: 1px solid rgb(55, 157, 255); +} +.sub-fill-frame select:hover{ + border: 1px solid rgb(55, 157, 255); +} \ No newline at end of file diff --git a/web/cssFile/fill-style.css b/web/cssFile/fill-style.css index aa4a574..e63055f 100644 --- a/web/cssFile/fill-style.css +++ b/web/cssFile/fill-style.css @@ -119,12 +119,3 @@ right: 220px; padding-left: 15px; } -.fill-top-blank{ - border-radius: 5px; - height: 70px; - width: 960px; - position: absolute; - top: 20px; - right: 10px; - background-color: #323232; -} diff --git a/web/cssFile/home.css b/web/cssFile/home.css index b16aac0..f0985a6 100644 --- a/web/cssFile/home.css +++ b/web/cssFile/home.css @@ -5,6 +5,15 @@ body{ width: 100%; height: 100%; } +.fill-top-blank{ + border-radius: 5px; + height: 70px; + width: 960px; + position: absolute; + top: 20px; + right: 10px; + background-color: #323232; +} .main2{ background-color:#fafafa; } @@ -410,14 +419,16 @@ ul{ color: #7b7b7b; } .model-info{ + text-align: center; float: left; - width: 100px; + width: 400px; height: 40px; margin: 15px 10px; background-color: #e4e4e4; border-radius: 5px; - color: #1b1b1b; + color: rgba(27, 27, 27, 0.87); padding-left: 10px; line-height: 35px; font-size: 18px; + font-weight: 400; } \ No newline at end of file diff --git a/web/cssFile/images/filText.png b/web/cssFile/images/filText.png new file mode 100644 index 0000000..6859d43 Binary files /dev/null and b/web/cssFile/images/filText.png differ diff --git a/web/cssFile/personal.css b/web/cssFile/personal.css index c621e6a..623656e 100644 --- a/web/cssFile/personal.css +++ b/web/cssFile/personal.css @@ -41,9 +41,8 @@ ul{ top: 70px; left: 250px; width: 600px; - border: 1px solid rgba(0, 0, 0, 0.27); + border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 5px; - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.23); } .personal-msg-frame .personal-msg-part{ width: 100%; diff --git a/web/cssFile/select-style.css b/web/cssFile/select-style.css index d06576a..ac9a999 100644 --- a/web/cssFile/select-style.css +++ b/web/cssFile/select-style.css @@ -77,6 +77,9 @@ a{ border: 0px; transition: all 0.3s; } +.select-it.on{ + background-color: rgba(88, 137, 238, 0.97); +} .select-it:hover{ width: 100px; } @@ -161,13 +164,4 @@ a{ } .one-msg:hover{ background-color: rgba(39, 39, 39, 0.78); -} -.top-blank{ - position: absolute; - height: 70px; - width: 960px; - top: 20px; - left: 20px; - background-color: #323232; - border-radius: 5px; } \ No newline at end of file diff --git a/web/fillSbjMsg.jsp b/web/fillSbjMsg.jsp new file mode 100644 index 0000000..422ac55 --- /dev/null +++ b/web/fillSbjMsg.jsp @@ -0,0 +1,65 @@ +<%-- + Created by IntelliJ IDEA. + User: lenovo + Date: 2019/1/14 + Time: 15:53 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + +
+