孙向锦 / SunvoteEducation

Commit 0e4da37e059a7eb13219c8b414bd6900fbd25073

Authored by 孙向锦
1 parent f19da108

学校管理员界面

Inline Side-by-side
Showing 35 changed files with 724 additions and 92 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
  View file @0e4da37
@@ -151,7 +151,7 @@ @@ -151,7 +151,7 @@
151 151
152 </li> 152 </li>
153 <li> 153 <li>
154 - <p >年级设置</p> 154 + <p onclick="event.stopPropagation();grade('${var.SCHOOL_ID}')">年级设置</p>
155 </li> 155 </li>
156 <li> 156 <li>
157 <p>年级升级</p> 157 <p>年级升级</p>
@@ -249,6 +249,12 @@ @@ -249,6 +249,12 @@
249 window.top.loading.show(); 249 window.top.loading.show();
250 //} 250 //}
251 } 251 }
  252 +
  253 + function grade(school_id){
  254 + var path = "../grade/listcs.do?school_id=" + school_id ;
  255 + $("#mainFrame").attr('src',path);
  256 + window.top.loading.show();
  257 + }
252 258
253 function coursemanager(school_id){ 259 function coursemanager(school_id){
254 var path = "../coursemanagement/listcs.do?school_id=" + school_id ; 260 var path = "../coursemanagement/listcs.do?school_id=" + school_id ;
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp
  View file @0e4da37
@@ -86,8 +86,12 @@ @@ -86,8 +86,12 @@
86 </tbody> 86 </tbody>
87 </table> 87 </table>
88 <div class="footer"> 88 <div class="footer">
89 - <div class="creat"></div>  
90 - <div class="removeAll"></div> 89 + <div class="creat">
  90 + <input type="button" value="分配任课" />
  91 + </div>
  92 + <div class="removeAll">
  93 + <input type="button" onclick="deleteAll()" value="移除任课" />
  94 + </div>
91 <div class="page_box"> 95 <div class="page_box">
92 96
93 <div class="pagination" 97 <div class="pagination"
WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp 0 → 100644
  View file @0e4da37
  1 +<%@ page language="java" contentType="text/html; charset=UTF-8"
  2 + pageEncoding="UTF-8"%>
  3 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  4 +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  5 +<%
  6 + String path = request.getContextPath();
  7 + String basePath = request.getScheme() + "://"
  8 + + request.getServerName() + ":" + request.getServerPort()
  9 + + path + "/";
  10 +%>
  11 +<!DOCTYPE html>
  12 +<html lang="en">
  13 +<head>
  14 +<base href="<%=basePath%>">
  15 +<!-- 下拉框 -->
  16 +<link rel="stylesheet" href="static/ace/css/chosen.css" />
  17 +<!-- jsp文件头和头部 -->
  18 +<%@ include file="../../system/index/top.jsp"%>
  19 +<link href="../static/css/teach.css" rel="stylesheet">
  20 +<!-- 日期框 -->
  21 +<link rel="stylesheet" href="static/ace/css/datepicker.css" />
  22 +<link
  23 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  24 + rel="stylesheet">
  25 +<link href="static/css/teach.css" rel="stylesheet">
  26 +</head>
  27 +<body class="no-skin">
  28 + <form action="grade/listcs.do" method="post" name="Form" id="Form">
  29 + <div class="head_box">
  30 + <div class="box_header">
  31 + <div class="head_box_l">
  32 + <p>
  33 + <span class="right_b"></span>年级管理
  34 + </p>
  35 + </div>
  36 + <div class="head_box_r"></div>
  37 + <div class="clear"></div>
  38 + </div>
  39 + <div style="padding:0 5%;background:#fff;">
  40 + <table class="table table-striped">
  41 + <col style="width: 10%" />
  42 + <col style="width: 45%" />
  43 + <col style="width: 45%" />
  44 + <thead>
  45 + <tr>
  46 + <th><input type="checkbox" name='ids' id="ids" />序号</th>
  47 + <th class="center">年级名称</th>
  48 + <th class="center">年级描述</th>
  49 + </tr>
  50 + </thead>
  51 + </table>
  52 + </div>
  53 + </div>
  54 + <div class="table_box">
  55 + <table class="table table-striped">
  56 + <col style="width: 10%" />
  57 + <col style="width: 30%" />
  58 + <col style="width: 30%" />
  59 + <col style="width: 30%" />
  60 +
  61 + <tbody>
  62 + <c:choose>
  63 + <c:when test="${not empty varList}">
  64 + <c:forEach items="${varList}" var="var" varStatus="vs">
  65 + <tr>
  66 + <td><input type="checkbox" name='ids' id="ids"
  67 + value="${var.ID}" />${vs.index+1}</td>
  68 + <td class='center'>${var.CNAME}</td>
  69 + <td class='center'>${var.ENAME}</td>
  70 + <td class='center'></td>
  71 +
  72 + </tr>
  73 +
  74 + </c:forEach>
  75 + </c:when>
  76 + <c:otherwise>
  77 + <tr class="main_info">
  78 + <td colspan="100" class="center">没有相关数据</td>
  79 + </tr>
  80 + </c:otherwise>
  81 + </c:choose>
  82 + </tbody>
  83 + </table>
  84 + <div class="footer" style="width:auto">
  85 + <div class="creat">
  86 + <input type="button" value="添加年级" />
  87 + </div>
  88 + <div class="removeAll">
  89 + <input type="button" onclick="deleteAll()" value="移除年级" />
  90 + </div>
  91 + <div class="page_box">
  92 +
  93 + <div class="pagination"
  94 + style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
  95 + </div>
  96 + </div>
  97 + </div>
  98 + </form>
  99 +
  100 + <!-- /.main-container -->
  101 +
  102 + <!-- basic scripts -->
  103 + <!-- 页面底部js¨ -->
  104 + <%@ include file="../../system/index/foot.jsp"%>
  105 + <!-- 删除时确认窗口 -->
  106 + <script src="static/ace/js/bootbox.js"></script>
  107 + <!-- ace scripts -->
  108 + <script src="static/ace/js/ace/ace.js"></script>
  109 + <!-- 下拉框 -->
  110 + <script src="static/ace/js/chosen.jquery.js"></script>
  111 + <!-- 日期框 -->
  112 + <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
  113 + <!--提示框-->
  114 + <script type="text/javascript" src="static/js/jquery.tips.js"></script>
  115 + <script type="text/javascript">
  116 + $(document).ready(function(){
  117 + window.top.loading.remove();
  118 + });
  119 + </script>
  120 +
  121 +
  122 +</body>
  123 +</html>
0 \ No newline at end of file 124 \ No newline at end of file
WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list2.jsp
  View file @0e4da37
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 <div class="box_header"> 38 <div class="box_header">
39 <div class="head_box_l"> 39 <div class="head_box_l">
40 <p> 40 <p>
41 - <span class="right_b"></span>Paper Management 41 + <span class="right_b"></span>Exam Paper Management
42 </p> 42 </p>
43 </div> 43 </div>
44 <div class="head_box_r"> 44 <div class="head_box_r">
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 <th>Test Paper Title</th> 63 <th>Test Paper Title</th>
64 <th>Create Time</th> 64 <th>Create Time</th>
65 <th>Suggested Time</th> 65 <th>Suggested Time</th>
66 - <th>Total Score</th> 66 + <th>Total Marks</th>
67 <th>Operate</th> 67 <th>Operate</th>
68 </tr> 68 </tr>
69 </thead> 69 </thead>
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
146 146
147 function del(Id){ 147 function del(Id){
148 //var remove = new remove(); 148 //var remove = new remove();
149 - window.top.remove.init({"title":"Delete","func":function(success){ 149 + window.top.remove.init({"title":"Delete","ok":"Ok","cancel":"Cancel","func":function(success){
150 if(success){ 150 if(success){
151 var url = "<%=basePath%>paper/delete.do?PAPER_ID="+Id+"&qingsongkao=true&tm="+new Date().getTime(); 151 var url = "<%=basePath%>paper/delete.do?PAPER_ID="+Id+"&qingsongkao=true&tm="+new Date().getTime();
152 window.top.loading.show(); 152 window.top.loading.show();
@@ -185,7 +185,7 @@ @@ -185,7 +185,7 @@
185 }); 185 });
186 186
187 function deleteAll(){ 187 function deleteAll(){
188 - window.top.remove.init({"title":"Delete","func":function(success){ 188 + window.top.remove.init({"title":"Delete","ok":"Ok","cancel":"Cancel","func":function(success){
189 if(success){ 189 if(success){
190 var str = ''; 190 var str = '';
191 for(var i=0;i < document.getElementsByName('ids').length;i++){ 191 for(var i=0;i < document.getElementsByName('ids').length;i++){
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp 0 → 100644
  View file @0e4da37
  1 +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
  2 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  3 +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  4 +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
  5 +<%
  6 + String path = request.getContextPath();
  7 + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
  8 +%>
  9 +<!DOCTYPE html>
  10 +<html lang="en">
  11 + <head>
  12 + <base href="<%=basePath%>">
  13 + <!-- 下拉框 -->
  14 + <link rel="stylesheet" href="static/ace/css/chosen.css" />
  15 + <!-- jsp文件头和头部 -->
  16 + <%@ include file="../../system/index/top.jsp"%>
  17 + <!-- 日期框 -->
  18 + <link rel="stylesheet" href="static/ace/css/datepicker.css" />
  19 +</head>
  20 +<body class="no-skin">
  21 +<!-- /section:basics/navbar.layout -->
  22 +<div class="main-container" id="main-container">
  23 + <!-- /section:basics/sidebar -->
  24 + <div class="main-content">
  25 + <div class="main-content-inner">
  26 + <div class="page-content">
  27 + <div class="row">
  28 + <div class="col-xs-12">
  29 +
  30 + <form action="sclass/${msg }.do" name="Form" id="Form" method="post">
  31 + <input type="hidden" name="ID" id="ID" value="${pd.ID}"/>
  32 + <div id="zhongxin" style="padding-top: 13px;">
  33 + <table id="table_report" class="table table-striped table-bordered table-hover">
  34 + <tr>
  35 + <td style="width:75px;text-align: right;padding-top: 13px;">所属学校:</td>
  36 + <td>
  37 + <%-- <input type="text" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}" maxlength="255" placeholder="这里输入所属学校" title="所属学校" style="width:98%;"/> --%>
  38 +
  39 + <select class="chosen-select form-control" name="SCHOOL_ID" id="SCHOOL_ID" disabled="disabled" data-placeholder="这里输入所属学校">
  40 + <c:forEach var="item" items="${schools}">
  41 + <option value="${item.ID}" <c:if test="${pd.SCHOOL_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
  42 + </c:forEach>
  43 + </select>
  44 + </td>
  45 + </tr>
  46 + <tr>
  47 + <td style="width:75px;text-align: right;padding-top: 13px;">所属年级:</td>
  48 + <td>
  49 + <%-- <input type="text" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}" maxlength="255" placeholder="这里输入所属年级" title="所属年级" style="width:98%;"/></td> --%>
  50 + <select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="这里输入所属年级" disabled="disabled">
  51 + <c:forEach var="item" items="${grades}">
  52 + <option value="${item.ID}" <c:if test="${pd.GRADE_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
  53 + </c:forEach>
  54 + </select>
  55 + </td>
  56 + </tr>
  57 + <tr>
  58 + <td style="width:75px;text-align: right;padding-top: 13px;">班级类型:</td>
  59 + <td>
  60 + <%-- <input type="text" name="CLASS_TYPE" id="CLASS_TYPE" value="${pd.CLASS_TYPE}" maxlength="255" placeholder="这里输入班级类型" title="班级类型" style="width:98%;"/></td> --%>
  61 + <select class="chosen-select form-control" name="CLASS_TYPE" id="CLASS_TYPE" data-placeholder="这里输入班级类型">
  62 + <c:forEach var="item" items="${classTypes}">
  63 + <option value="${item.ID}" <c:if test="${pd.CLASS_TYPE==item.ID}">selected="true"</c:if>>${item.NAME}</option>
  64 + </c:forEach>
  65 + </select>
  66 + </td>
  67 + </tr>
  68 + <tr>
  69 + <td style="width:75px;text-align: right;padding-top: 13px;">班级名称:</td>
  70 + <td><input type="text" name="CLASS_NAME" id="CLASS_NAME" value="${pd.CLASS_NAME}" maxlength="255" placeholder="这里输入班级名称" title="班级名称" style="width:98%;"/></td>
  71 + </tr>
  72 + <tr>
  73 + <td style="width:75px;text-align: right;padding-top: 13px;">班级编码:</td>
  74 + <td><input type="text" name="CLASS_CODE" id="CLASS_CODE" value="${pd.CLASS_CODE}" maxlength="255" placeholder="这里输入班级编码" title="班级编码" style="width:98%;"/></td>
  75 + </tr>
  76 + <tr>
  77 + <td style="width:75px;text-align: right;padding-top: 13px;">班级基站:</td>
  78 + <td>
  79 + <%-- <input type="text" name="BASESTATION_ID" id="BASESTATION_ID" value="${pd.BASESTATION_ID}" maxlength="255" placeholder="这里输入班级基站" title="班级基站" style="width:98%;"/></td> --%>
  80 + <select class="chosen-select form-control" name="BASESTATION_ID" id="BASESTATION_ID" data-placeholder="这里输入班级基站">
  81 + <c:forEach var="item" items="${basestations}">
  82 + <option value="${item.ID}" <c:if test="${pd.BASESTATION_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
  83 + </c:forEach>
  84 + </select>
  85 + </td>
  86 + </tr>
  87 + <tr>
  88 + <td style="text-align: center;" colspan="10">
  89 + <a class="btn btn-mini btn-primary" onclick="save();">保存</a>
  90 + <a class="btn btn-mini btn-danger" onclick="top.Dialog.close();">取消</a>
  91 + </td>
  92 + </tr>
  93 + </table>
  94 + </div>
  95 + <div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div>
  96 + </form>
  97 + </div>
  98 + <!-- /.col -->
  99 + </div>
  100 + <!-- /.row -->
  101 + </div>
  102 + <!-- /.page-content -->
  103 + </div>
  104 + </div>
  105 + <!-- /.main-content -->
  106 +</div>
  107 +<!-- /.main-container -->
  108 +
  109 +
  110 + <!-- 页面底部js¨ -->
  111 + <%@ include file="../../system/index/foot.jsp"%>
  112 + <!-- 下拉框 -->
  113 + <script src="static/ace/js/chosen.jquery.js"></script>
  114 + <!-- 日期框 -->
  115 + <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
  116 + <!--提示框-->
  117 + <script type="text/javascript" src="static/js/jquery.tips.js"></script>
  118 + <script type="text/javascript">
  119 + $(top.hangge());
  120 + //保存
  121 + function save(){
  122 + if($("#SCHOOL_ID").val()==""){
  123 + $("#SCHOOL_ID").tips({
  124 + side:3,
  125 + msg:'请输入所属学校',
  126 + bg:'#AE81FF',
  127 + time:2
  128 + });
  129 + $("#SCHOOL_ID").focus();
  130 + return false;
  131 + }
  132 + if($("#GRADE_ID").val()==""){
  133 + $("#GRADE_ID").tips({
  134 + side:3,
  135 + msg:'请输入所属年级',
  136 + bg:'#AE81FF',
  137 + time:2
  138 + });
  139 + $("#GRADE_ID").focus();
  140 + return false;
  141 + }
  142 + if($("#CLASS_TYPE").val()==""){
  143 + $("#CLASS_TYPE").tips({
  144 + side:3,
  145 + msg:'请输入班级类型',
  146 + bg:'#AE81FF',
  147 + time:2
  148 + });
  149 + $("#CLASS_TYPE").focus();
  150 + return false;
  151 + }
  152 + if($("#CLASS_NAME").val()==""){
  153 + $("#CLASS_NAME").tips({
  154 + side:3,
  155 + msg:'请输入班级名称',
  156 + bg:'#AE81FF',
  157 + time:2
  158 + });
  159 + $("#CLASS_NAME").focus();
  160 + return false;
  161 + }
  162 + if($("#CLASS_CODE").val()==""){
  163 + $("#CLASS_CODE").tips({
  164 + side:3,
  165 + msg:'请输入班级编码',
  166 + bg:'#AE81FF',
  167 + time:2
  168 + });
  169 + $("#CLASS_CODE").focus();
  170 + return false;
  171 + }
  172 + if($("#BASESTATION_ID").val()==""){
  173 + $("#BASESTATION_ID").tips({
  174 + side:3,
  175 + msg:'请输入班级基站',
  176 + bg:'#AE81FF',
  177 + time:2
  178 + });
  179 + $("#BASESTATION_ID").focus();
  180 + return false;
  181 + }
  182 + $("#SCHOOL_ID").removeAttr("disabled");
  183 + $("#GRADE_ID").removeAttr("disabled");
  184 + $("#Form").submit();
  185 + $("#zhongxin").hide();
  186 + $("#zhongxin2").show();
  187 + }
  188 +
  189 + $(function() {
  190 + //日期框
  191 + $('.date-picker').datepicker({autoclose: true,todayHighlight: true});
  192 + });
  193 + </script>
  194 +</body>
  195 +</html>
0 \ No newline at end of file 196 \ No newline at end of file
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
  View file @0e4da37
@@ -28,6 +28,8 @@ @@ -28,6 +28,8 @@
28 28
29 <!-- 检索 --> 29 <!-- 检索 -->
30 <form action="sclass/listcs.do" method="post" name="Form" id="Form"> 30 <form action="sclass/listcs.do" method="post" name="Form" id="Form">
  31 + <input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
  32 + <input type="hidden" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}"/>
31 <div class="head_box"> 33 <div class="head_box">
32 <div class="box_header"> 34 <div class="box_header">
33 <div class="head_box_l"> 35 <div class="head_box_l">
@@ -96,7 +98,7 @@ @@ -96,7 +98,7 @@
96 <input type="button" onclick="add();" value="添加班级" /> 98 <input type="button" onclick="add();" value="添加班级" />
97 </div> 99 </div>
98 <div class="removeAll"> 100 <div class="removeAll">
99 - <input type="button" onclick="delete();" value="删除" /> 101 + <input type="button" onclick="del();" value="删除" />
100 </div> 102 </div>
101 103
102 <div class="page_box"> 104 <div class="page_box">
@@ -125,6 +127,10 @@ @@ -125,6 +127,10 @@
125 $(".table_box").css("padding-top",$(".head_box").height()); 127 $(".table_box").css("padding-top",$(".head_box").height());
126 }); 128 });
127 129
  130 + function tosearch(){
  131 + $("#Form").submit();
  132 + }
  133 +
128 $('#ids').on('click', function(){ 134 $('#ids').on('click', function(){
129 var th_checked = $("#ids").prop('checked');//checkbox inside "TH" table header 135 var th_checked = $("#ids").prop('checked');//checkbox inside "TH" table header
130 136
@@ -134,6 +140,50 @@ @@ -134,6 +140,50 @@
134 else $(row).find('input[type=checkbox]').eq(0).prop('checked', false); 140 else $(row).find('input[type=checkbox]').eq(0).prop('checked', false);
135 }); 141 });
136 }); 142 });
  143 +
  144 + function del(Id){
  145 + window.top.remove.init({"title":"删除","func":function(success){
  146 + if(success){
  147 + var str = '';
  148 + for(var i=0;i < document.getElementsByName('ids').length;i++){
  149 + if(document.getElementsByName('ids')[i].checked){
  150 + if(str=='') str += document.getElementsByName('ids')[i].value;
  151 + else str += ',' + document.getElementsByName('ids')[i].value;
  152 + }
  153 + }
  154 + if(str==''){
  155 +
  156 + }else{
  157 + $.ajax({
  158 + type: "POST",
  159 + url: '<%=basePath%>sclass/deleteAll.do?tm='+new Date().getTime(),
  160 + data: {DATA_IDS:str},
  161 + dataType:'json',
  162 + //beforeSend: validateData,
  163 + cache: false,
  164 + success: function(data){
  165 + tosearch();
  166 + }
  167 + });
  168 + }
  169 + }
  170 + else{
  171 + console.log("false");
  172 + }
  173 + }});
  174 + window.top.remove.show();
  175 + }
  176 +
  177 + function add(){
  178 + window.top.modal.init({
  179 + 'title':'添加班级',
  180 + 'url':'<%=basePath%>sclass/goAdd2.do?school_id=${pd.SCHOOL_ID}&grade_id=${pd.GRADE_ID}',
  181 + func:function() {
  182 + tosearch();
  183 + }
  184 + });
  185 + window.top.modal.show();
  186 + }
137 </script> 187 </script>
138 188
139 189
WebRoot/WEB-INF/jsp/sunvote/student/en_student_edit2.jsp
  View file @0e4da37
@@ -98,10 +98,10 @@ input[type=&quot;text&quot;],select { @@ -98,10 +98,10 @@ input[type=&quot;text&quot;],select {
98 </div> 98 </div>
99 </li> 99 </li>
100 <li> 100 <li>
101 - <p><span style="color:#f00">*</span>No.:</p> 101 + <p><span style="color:#f00">*</span>Student ID:</p>
102 <div class="li_r"> 102 <div class="li_r">
103 <input type="text" name="NUMBER" id="NUMBER" value="${pd.NUMBER}" 103 <input type="text" name="NUMBER" id="NUMBER" value="${pd.NUMBER}"
104 - maxlength="255" placeholder="please input the No." title="No." /> 104 + maxlength="255" placeholder="please input the Student ID" title="Student ID" />
105 </div> 105 </div>
106 </li> 106 </li>
107 <li> 107 <li>
@@ -118,8 +118,8 @@ input[type=&quot;text&quot;],select { @@ -118,8 +118,8 @@ input[type=&quot;text&quot;],select {
118 <div class="li_r"> 118 <div class="li_r">
119 <select class="chosen-select form-control" name="SEX" id="SEX" 119 <select class="chosen-select form-control" name="SEX" id="SEX"
120 data-placeholder="please choose the sex"> 120 data-placeholder="please choose the sex">
121 - <option value="1" <c:if test="${pd.SEX==1}">selected="true"</c:if>>Man</option>  
122 - <option value="0" <c:if test="${pd.SEX==0}">selected="true"</c:if>>Woman</option> 121 + <option value="1" <c:if test="${pd.SEX==1}">selected="true"</c:if>>Male</option>
  122 + <option value="0" <c:if test="${pd.SEX==0}">selected="true"</c:if>>Female</option>
123 </select> 123 </select>
124 </div> 124 </div>
125 </li> 125 </li>
WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
  View file @0e4da37
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
130 }); 130 });
131 131
132 function del(Id){ 132 function del(Id){
133 - window.top.remove.init({"title":"Delete","func":function(success){ 133 + window.top.remove.init({"title":"Delete","ok":"Ok","cancel":"Cancel","func":function(success){
134 if(success){ 134 if(success){
135 var url = "<%=basePath%>student/delete.do?ID="+Id+"&tm="+new Date().getTime(); 135 var url = "<%=basePath%>student/delete.do?ID="+Id+"&tm="+new Date().getTime();
136 window.top.loading.show(); 136 window.top.loading.show();
WebRoot/WEB-INF/jsp/sunvote/subject/subject_edit2.jsp 0 → 100644
  View file @0e4da37
  1 +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
  2 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  3 +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  4 +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
  5 +<%
  6 + String path = request.getContextPath();
  7 + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
  8 +%>
  9 +<!DOCTYPE html>
  10 +<html lang="en">
  11 + <head>
  12 + <base href="<%=basePath%>">
  13 + <!-- 下拉框 -->
  14 + <link rel="stylesheet" href="static/ace/css/chosen.css" />
  15 + <!-- jsp文件头和头部 -->
  16 + <%@ include file="../../system/index/top.jsp"%>
  17 + <!-- 日期框 -->
  18 + <link rel="stylesheet" href="static/ace/css/datepicker.css" />
  19 +</head>
  20 +<body class="no-skin">
  21 +<!-- /section:basics/navbar.layout -->
  22 +<div class="main-container" id="main-container">
  23 + <!-- /section:basics/sidebar -->
  24 + <div class="main-content">
  25 + <div class="main-content-inner">
  26 + <div class="page-content">
  27 + <div class="row">
  28 + <div class="col-xs-12">
  29 +
  30 + <form action="subject/${msg }.do" name="Form" id="Form" method="post">
  31 + <input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
  32 + <div id="zhongxin" style="padding-top: 13px;">
  33 + <table id="table_report" class="table table-striped table-bordered table-hover">
  34 + <tr>
  35 + <td style="width:75px;text-align: right;padding-top: 13px;">科目名称:</td>
  36 + <td>
  37 + <select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入所属科目">
  38 + <c:forEach var="item" items="${varList}">
  39 + <option value="${item.ID}">${item.CNAME}</option>
  40 + </c:forEach>
  41 + </select>
  42 + </td>
  43 + </tr>
  44 + <tr>
  45 + <td style="text-align: center;" colspan="10">
  46 + <a class="btn btn-mini btn-primary" onclick="save();">保存</a>
  47 + <a class="btn btn-mini btn-danger" onclick="top.Dialog.close();">取消</a>
  48 + </td>
  49 + </tr>
  50 + </table>
  51 + </div>
  52 + <div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div>
  53 + </form>
  54 + </div>
  55 + <!-- /.col -->
  56 + </div>
  57 + <!-- /.row -->
  58 + </div>
  59 + <!-- /.page-content -->
  60 + </div>
  61 + </div>
  62 + <!-- /.main-content -->
  63 +</div>
  64 +<!-- /.main-container -->
  65 +
  66 +
  67 + <!-- 页面底部js¨ -->
  68 + <%@ include file="../../system/index/foot.jsp"%>
  69 + <!-- 下拉框 -->
  70 + <script src="static/ace/js/chosen.jquery.js"></script>
  71 + <!-- 日期框 -->
  72 + <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
  73 + <!--提示框-->
  74 + <script type="text/javascript" src="static/js/jquery.tips.js"></script>
  75 + <script type="text/javascript">
  76 + $(top.hangge());
  77 + //保存
  78 + function save(){
  79 + $("#Form").submit();
  80 + $("#zhongxin").hide();
  81 + $("#zhongxin2").show();
  82 + }
  83 +
  84 + $(function() {
  85 + //日期框
  86 + $('.date-picker').datepicker({autoclose: true,todayHighlight: true});
  87 + });
  88 + </script>
  89 +</body>
  90 +</html>
0 \ No newline at end of file 91 \ No newline at end of file
WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
  View file @0e4da37
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
16 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 16 <link rel="stylesheet" href="static/ace/css/chosen.css" />
17 <!-- jsp文件头和头部 --> 17 <!-- jsp文件头和头部 -->
18 <%@ include file="../../system/index/top.jsp"%> 18 <%@ include file="../../system/index/top.jsp"%>
  19 +<link href="../static/css/teach.css" rel="stylesheet">
19 <!-- 日期框 --> 20 <!-- 日期框 -->
20 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
21 <link 22 <link
@@ -25,6 +26,7 @@ @@ -25,6 +26,7 @@
25 </head> 26 </head>
26 <body class="no-skin"> 27 <body class="no-skin">
27 <form action="subject/listcs.do" method="post" name="Form" id="Form"> 28 <form action="subject/listcs.do" method="post" name="Form" id="Form">
  29 + <input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
28 <div class="head_box"> 30 <div class="head_box">
29 <div class="box_header"> 31 <div class="box_header">
30 <div class="head_box_l"> 32 <div class="head_box_l">
@@ -46,7 +48,7 @@ @@ -46,7 +48,7 @@
46 <th><input type="checkbox" name='ids' id="ids" />序号</th> 48 <th><input type="checkbox" name='ids' id="ids" />序号</th>
47 <th class="center">中文名称</th> 49 <th class="center">中文名称</th>
48 <th class="center">英文名称</th> 50 <th class="center">英文名称</th>
49 - <th class="center">备注</th> 51 + <th class="center">操作</th>
50 </tr> 52 </tr>
51 </thead> 53 </thead>
52 </table> 54 </table>
@@ -57,7 +59,7 @@ @@ -57,7 +59,7 @@
57 <col style="width: 10%" /> 59 <col style="width: 10%" />
58 <col style="width: 30%" /> 60 <col style="width: 30%" />
59 <col style="width: 30%" /> 61 <col style="width: 30%" />
60 - <col style="width: 35%" /> 62 + <col style="width: 30%" />
61 63
62 <tbody> 64 <tbody>
63 <c:choose> 65 <c:choose>
@@ -68,7 +70,7 @@ @@ -68,7 +70,7 @@
68 value="${var.ID}" />${vs.index+1}</td> 70 value="${var.ID}" />${vs.index+1}</td>
69 <td class='center'>${var.CNAME}</td> 71 <td class='center'>${var.CNAME}</td>
70 <td class='center'>${var.ENAME}</td> 72 <td class='center'>${var.ENAME}</td>
71 - <td class='center'>${var.REMARK}</td> 73 + <td class='center'></td>
72 74
73 </tr> 75 </tr>
74 76
@@ -83,8 +85,12 @@ @@ -83,8 +85,12 @@
83 </tbody> 85 </tbody>
84 </table> 86 </table>
85 <div class="footer" style="width:auto"> 87 <div class="footer" style="width:auto">
86 - <div class="creat"></div>  
87 - <div class="removeAll"></div> 88 + <div class="creat">
  89 + <input type="button" onclick="add()" value="添加科目" />
  90 + </div>
  91 + <div class="removeAll">
  92 + <input type="button" onclick="del()" value="移除科目" />
  93 + </div>
88 <div class="page_box"> 94 <div class="page_box">
89 95
90 <div class="pagination" 96 <div class="pagination"
@@ -113,6 +119,49 @@ @@ -113,6 +119,49 @@
113 $(document).ready(function(){ 119 $(document).ready(function(){
114 window.top.loading.remove(); 120 window.top.loading.remove();
115 }); 121 });
  122 + function del(Id){
  123 + window.top.remove.init({"title":"删除","func":function(success){
  124 + if(success){
  125 + var str = '';
  126 + for(var i=0;i < document.getElementsByName('ids').length;i++){
  127 + if(document.getElementsByName('ids')[i].checked){
  128 + if(str=='') str += document.getElementsByName('ids')[i].value;
  129 + else str += ',' + document.getElementsByName('ids')[i].value;
  130 + }
  131 + }
  132 + if(str==''){
  133 +
  134 + }else{
  135 + $.ajax({
  136 + type: "POST",
  137 + url: '<%=basePath%>subject/deleteAll.do?tm='+new Date().getTime(),
  138 + data: {DATA_IDS:str},
  139 + dataType:'json',
  140 + //beforeSend: validateData,
  141 + cache: false,
  142 + success: function(data){
  143 + tosearch();
  144 + }
  145 + });
  146 + }
  147 + }
  148 + else{
  149 + console.log("false");
  150 + }
  151 + }});
  152 + window.top.remove.show();
  153 + }
  154 +
  155 + function add(){
  156 + window.top.modal.init({
  157 + 'title':'添加科目',
  158 + 'url':'<%=basePath%>subject/goAdd2.do?school_id=${pd.SCHOOL_ID}&grade_id=${pd.GRADE_ID}',
  159 + func:function() {
  160 + tosearch();
  161 + }
  162 + });
  163 + window.top.modal.show();
  164 + }
116 </script> 165 </script>
117 166
118 167
WebRoot/WEB-INF/jsp/sunvote/teacher/en_creat_question.jsp
  View file @0e4da37
@@ -25,8 +25,8 @@ @@ -25,8 +25,8 @@
25 <div class="header_box container"> 25 <div class="header_box container">
26 <h1 class="text-center"></h1> 26 <h1 class="text-center"></h1>
27 <div class="btn_group"> 27 <div class="btn_group">
28 - <div class="time text-center" data-toggle="modal" data-target=".test_time"><h3>Exam time:<span class="bg-primary" id="time">45</span><span class="bg-primary">Min</span></h3></div>  
29 - <div class="pull-left"><h3>Total score:<span id='score_all'>0</span> </h3></div> 28 + <div class="time text-center" data-toggle="modal" data-target=".test_time"><h3>Time Allowed:<span class="bg-primary" id="time">45</span><span class="bg-primary">Min</span></h3></div>
  29 + <div class="pull-left"><h3>Total Marks:<span id='score_all'>0</span> </h3></div>
30 <div class="btn_box pull-right"> 30 <div class="btn_box pull-right">
31 <input type="button" class="btn btn-success btn-lg" name="save" value="Save" id="save"/> 31 <input type="button" class="btn btn-success btn-lg" name="save" value="Save" id="save"/>
32 <button type="button" class="btn btn-success btn-lg" data-toggle="modal" data-target=".fast" id="fast">Set single choice question</button> 32 <button type="button" class="btn btn-success btn-lg" data-toggle="modal" data-target=".fast" id="fast">Set single choice question</button>
WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view.jsp
  View file @0e4da37
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 <div class="container"> 39 <div class="container">
40 <div class="page-header"> 40 <div class="page-header">
41 <h3 class="col-md-6" id="paper_title"></h3> 41 <h3 class="col-md-6" id="paper_title"></h3>
42 - <h3 class="col-md-6">Exam Time:<span id="time"></span>Minutes</h3> 42 + <h3 class="col-md-6">Time Allowed:<span id="time"></span>Minutes</h3>
43 <div class="clearfix"></div> 43 <div class="clearfix"></div>
44 </div> 44 </div>
45 <div class="content_report"> 45 <div class="content_report">
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 </script> 60 </script>
61 <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script> 61 <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
62 <script src="../static/js/echars.js"></script> 62 <script src="../static/js/echars.js"></script>
63 - <script src="../static/js/en_paper_view.js?a=2"></script> 63 + <script src="../static/js/en_paper_view.js?a=0"></script>
64 64
65 </html> 65 </html>
66 66
WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view2.jsp
  View file @0e4da37
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 <div class="container"> 40 <div class="container">
41 <div class="page-header"> 41 <div class="page-header">
42 <h3 class="col-md-6" id="paper_title"></h3> 42 <h3 class="col-md-6" id="paper_title"></h3>
43 - <h3 class="col-md-6">Exam Time:<span id="time"></span> Minutes</h3> 43 + <h3 class="col-md-6">Time Allowed:<span id="time"></span> Minutes</h3>
44 <div class="clearfix"></div> 44 <div class="clearfix"></div>
45 </div> 45 </div>
46 <div class="content_report"> 46 <div class="content_report">
WebRoot/WEB-INF/jsp/sunvote/teacher/en_stduent_report.jsp
  View file @0e4da37
@@ -77,12 +77,12 @@ li { @@ -77,12 +77,12 @@ li {
77 <div class="info row"> 77 <div class="info row">
78 <div class="col-md-6"> 78 <div class="col-md-6">
79 <p> 79 <p>
80 - Average Class Score Rate<span id="class_avg">0.0</span>% 80 + Class Average <span id="class_avg">0.0</span>%
81 </p> 81 </p>
82 </div> 82 </div>
83 <div class="col-md-6"> 83 <div class="col-md-6">
84 <p> 84 <p>
85 - The highest scoring rate<span id="class_max">0.0</span>% 85 + Class Highest <span id="class_max">0.0</span>%
86 </p> 86 </p>
87 </div> 87 </div>
88 </div> 88 </div>
@@ -91,20 +91,20 @@ li { @@ -91,20 +91,20 @@ li {
91 </div> 91 </div>
92 <div class="tabel_b"> 92 <div class="tabel_b">
93 <div class="tab_top row"> 93 <div class="tab_top row">
94 - <div class="col-md-3">Correctness Rate Trend Contrast Chart</div> 94 + <div class="col-md-3"></div>
95 <div class="col-md-9"> 95 <div class="col-md-9">
96 <div class="color"> 96 <div class="color">
97 <ul> 97 <ul>
98 - <li><span class="green"></span>Class average</li> 98 + <li><span class="green"></span>Class Avg.</li>
  99 + <li><span class="yellow"></span>Class Highest</li>
99 <li><span class="blue"></span>Student</li> 100 <li><span class="blue"></span>Student</li>
100 - <li><span class="yellow"></span>Best</li>  
101 <div class="clear"></div> 101 <div class="clear"></div>
102 </ul> 102 </ul>
103 </div> 103 </div>
104 <div class="check_box"> 104 <div class="check_box">
105 <input type="radio" checked value="1" name="check" id="check1" /> 105 <input type="radio" checked value="1" name="check" id="check1" />
106 - <label for="check1">Score rate</label> <input type="radio" value="2"  
107 - name="check" id="check2" /> <label for="check2">Score</label> 106 + <label for="check1">Correct Rate</label> <input type="radio" value="2"
  107 + name="check" id="check2" /> <label for="check2">Marks</label>
108 </div> 108 </div>
109 </div> 109 </div>
110 </div> 110 </div>
@@ -117,7 +117,7 @@ li { @@ -117,7 +117,7 @@ li {
117 <script type=""> 117 <script type="">
118 var URL = '<%=basePath%>${URL}'; 118 var URL = '<%=basePath%>${URL}';
119 </script> 119 </script>
120 - <script src="../static/js/en_control1.js?a=1"></script> 120 + <script src="../static/js/en_control1.js?a=0"></script>
121 <!-- 日期框 --> 121 <!-- 日期框 -->
122 <script> 122 <script>
123 //lay('#version').html('-v'+ laydate.v); 123 //lay('#version').html('-v'+ laydate.v);
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
  View file @0e4da37
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <meta charset="utf-8"> 12 <meta charset="utf-8">
13 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 13 <meta http-equiv="X-UA-Compatible" content="IE=edge">
14 <meta name="viewport" content="width=device-width, initial-scale=1"> 14 <meta name="viewport" content="width=device-width, initial-scale=1">
15 - <title>SunVote Class Paper Management</title> 15 + <title>E-class Paper Management</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 18 <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <div class="box_header"> 27 <div class="box_header">
28 <div class="head_box_l"> 28 <div class="head_box_l">
29 <p> 29 <p>
30 - <span class="right_b"></span>SunVote Class Paper Management 30 + <span class="right_b"></span>E-class Paper Management
31 </p> 31 </p>
32 </div> 32 </div>
33 <div class="head_box_r"> 33 <div class="head_box_r">
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
  View file @0e4da37
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 </ul> --> 76 </ul> -->
77 </li> 77 </li>
78 <li> 78 <li>
79 - <p id="jishice_paper">SunVote Class Papers</p> 79 + <p id="jishice_paper">E-class Papers</p>
80 80
81 <!-- <ul class="menu_2"> 81 <!-- <ul class="menu_2">
82 <li><p>高一数学 202班</p></li> 82 <li><p>高一数学 202班</p></li>
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 </div> 88 </div>
89 <div class="analyse tab1"> 89 <div class="analyse tab1">
90 <p> 90 <p>
91 - Exam Analysis<span class="right jiao"></span> 91 + Result Analysis<span class="right jiao"></span>
92 </p> 92 </p>
93 93
94 <ul class="menu_1"> 94 <ul class="menu_1">
@@ -101,10 +101,10 @@ @@ -101,10 +101,10 @@
101 </ul> 101 </ul>
102 </li> 102 </li>
103 <li> 103 <li>
104 - <p>SunVote Class Tests</p> 104 + <p>E-class Tests</p>
105 <ul class="menu_2"> 105 <ul class="menu_2">
106 <c:forEach items="${pd.TEACHER}" var="var" varStatus="vs"> 106 <c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
107 - <li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>${var.CLASS_NAME} Score</p></li> 107 + <li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>Result of ${var.CLASS_NAME}</p></li>
108 </c:forEach> 108 </c:forEach>
109 </ul> 109 </ul>
110 </li> 110 </li>
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_report_1.jsp
  View file @0e4da37
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 <td><div style="width:150px;text-align:center;">Tests: ${info.testsize}</div></td> 39 <td><div style="width:150px;text-align:center;">Tests: ${info.testsize}</div></td>
40 <td><div style="width:150px;text-align:center;">Class list: ${info.CLASS_NAME}</div></td> 40 <td><div style="width:150px;text-align:center;">Class list: ${info.CLASS_NAME}</div></td>
41 41
42 - <td><div style="width:150px;text-align:center;"><span>Student number: ${info.STUDENT_NUM}</span></div></td> 42 + <td><div style="width:150px;text-align:center;"><span>Students: ${info.STUDENT_NUM}</span></div></td>
43 <td></td> 43 <td></td>
44 <c:if test="${not empty subjectInfos}"> 44 <c:if test="${not empty subjectInfos}">
45 <td> 45 <td>
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 <thead> 74 <thead>
75 <tr> 75 <tr>
76 <th class="center th_name"><div style="width:150px;">Name</div></th> 76 <th class="center th_name"><div style="width:150px;">Name</div></th>
77 - <th class="center "><div style="width:150px;">Average Score Rate</div></th> 77 + <th class="center "><div style="width:150px;">Correct Rate</div></th>
78 <th class="center"><div style="width:80px;">Total</div></th> 78 <th class="center"><div style="width:80px;">Total</div></th>
79 <c:forEach items="${testpaperList}" var="var" varStatus="vs"> 79 <c:forEach items="${testpaperList}" var="var" varStatus="vs">
80 <th class="center kc"><a 80 <th class="center kc"><a
@@ -84,25 +84,25 @@ @@ -84,25 +84,25 @@
84 </thead> 84 </thead>
85 <tbody> 85 <tbody>
86 <tr> 86 <tr>
87 - <td class="center"><div style="width:150px;">Total score</div></td>  
88 - <td class="center"><div style="width:150px;"></div></td>  
89 - <td class="center"><div style="width:80px;"></div></td> 87 + <td class="center"><div style="width:150px;">Total Marks</div></td>
  88 + <td class="center"><div style="width:150px;">N/A</div></td>
  89 + <td class="center"><div style="width:80px;">N/A</div></td>
90 <c:forEach items="${testpaperList}" var="var" varStatus="vs"> 90 <c:forEach items="${testpaperList}" var="var" varStatus="vs">
91 <td class="center"><div style="width:80px;margin:0 auto;">${var.TOTAL_SCORE}</div></td> 91 <td class="center"><div style="width:80px;margin:0 auto;">${var.TOTAL_SCORE}</div></td>
92 </c:forEach> 92 </c:forEach>
93 </tr> 93 </tr>
94 <tr> 94 <tr>
95 <td class="center"><div style="width:150px;">Average Score</div></td> 95 <td class="center"><div style="width:150px;">Average Score</div></td>
96 - <td class="center"><div style="width:150px;"></div></td>  
97 - <td class="center"><div style="width:80px;"></div></td> 96 + <td class="center"><div style="width:150px;">N/A</div></td>
  97 + <td class="center"><div style="width:80px;">N/A</div></td>
98 <c:forEach items="${testpaperList}" var="var" varStatus="vs"> 98 <c:forEach items="${testpaperList}" var="var" varStatus="vs">
99 <td class="center"><div style="width:80px;margin:0 auto;">${var.AVG_SCORE}</div></td> 99 <td class="center"><div style="width:80px;margin:0 auto;">${var.AVG_SCORE}</div></td>
100 </c:forEach> 100 </c:forEach>
101 </tr> 101 </tr>
102 <tr> 102 <tr>
103 - <td class="center"><div style="width:150px;">Average Score Rate</div></td>  
104 - <td class="center"><div style="width:150px;"></div></td>  
105 - <td class="center"><div style="width:80px;"></div></td> 103 + <td class="center"><div style="width:150px;">Correct Rate</div></td>
  104 + <td class="center"><div style="width:150px;">N/A</div></td>
  105 + <td class="center"><div style="width:80px;">N/A</div></td>
106 <c:forEach items="${testpaperList}" var="var" varStatus="vs"> 106 <c:forEach items="${testpaperList}" var="var" varStatus="vs">
107 <td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number" 107 <td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number"
108 value="${var.TOTAL_SCORE == 0 ? 0: (var.AVG_SCORE / var.TOTAL_SCORE * 100)}" 108 value="${var.TOTAL_SCORE == 0 ? 0: (var.AVG_SCORE / var.TOTAL_SCORE * 100)}"
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_report_test.jsp
  View file @0e4da37
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <tr style="height: 30px"> 49 <tr style="height: 30px">
50 <td>Class list:${classInfo.CLASS_NAME}</td> 50 <td>Class list:${classInfo.CLASS_NAME}</td>
51 <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td> 51 <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
52 - <td><span>Student number: ${classInfo.studentNum}</span></td> 52 + <td><span>Students: ${classInfo.studentNum}</span></td>
53 53
54 </tr> 54 </tr>
55 </table> 55 </table>
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 <tr> 60 <tr>
61 <th class="center"><div style="width:80px;">Name</div></th> 61 <th class="center"><div style="width:80px;">Name</div></th>
62 <th class="center"><div style="width:80px;">Ranking</div></th> 62 <th class="center"><div style="width:80px;">Ranking</div></th>
63 - <th class="center"><div style="width:80px;">Score</div></th> 63 + <th class="center"><div style="width:80px;">Marks</div></th>
64 <th class="center"><div style="width:80px;">Student ID</div></th> 64 <th class="center"><div style="width:80px;">Student ID</div></th>
65 <th class="center"><div style="width:109px;">Keypad</div></th> 65 <th class="center"><div style="width:109px;">Keypad</div></th>
66 <!-- <th class="center"><div style="width:80px;">正确率</div></th> --> 66 <!-- <th class="center"><div style="width:80px;">正确率</div></th> -->
WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp
  View file @0e4da37
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <meta charset="utf-8"> 12 <meta charset="utf-8">
13 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 13 <meta http-equiv="X-UA-Compatible" content="IE=edge">
14 <meta name="viewport" content="width=device-width, initial-scale=1"> 14 <meta name="viewport" content="width=device-width, initial-scale=1">
15 - <title>SunVote Class</title> 15 + <title>E-class</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 18 <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <div class="box_header"> 25 <div class="box_header">
26 <div class="head_box_l"> 26 <div class="head_box_l">
27 <p> 27 <p>
28 - <span class="right_b"></span>SunVote Class Test Paper Management 28 + <span class="right_b"></span>E-class Result Analysis
29 </p> 29 </p>
30 </div> 30 </div>
31 <div class="head_box_r"> 31 <div class="head_box_r">
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
  View file @0e4da37
@@ -99,12 +99,12 @@ @@ -99,12 +99,12 @@
99 </tbody> 99 </tbody>
100 </table> 100 </table>
101 <div class="footer" style="width:auto"> 101 <div class="footer" style="width:auto">
102 - <!-- <div class="creat"> 102 + <div class="creat">
103 <input type="button" onclick="parent.$('.title_time').modal('show');" value="添加老师" /> 103 <input type="button" onclick="parent.$('.title_time').modal('show');" value="添加老师" />
104 </div> 104 </div>
105 <div class="removeAll"> 105 <div class="removeAll">
106 <input type="button" onclick="deleteAll()" value="删除" /> 106 <input type="button" onclick="deleteAll()" value="删除" />
107 - </div> --> 107 + </div>
108 <div class="page_box"> 108 <div class="page_box">
109 <div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div> 109 <div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
110 </div> 110 </div>
WebRoot/static/js/en_control-604.js
  View file @0e4da37
@@ -32,9 +32,9 @@ $(function() { @@ -32,9 +32,9 @@ $(function() {
32 } 32 }
33 q_num = str.length; 33 q_num = str.length;
34 $(".content").append('<div class="section section-' + answer_index_b+ ' single" data-fraction="'+ fraction+ '" data-score="' 34 $(".content").append('<div class="section section-' + answer_index_b+ ' single" data-fraction="'+ fraction+ '" data-score="'
35 - + (q_num * fraction) + '" style="margin-top:80px;"><div class="title"><h3>Total score of question number ' + answer_index_b+ '(single choice) :'  
36 - + q_num + ' X ' + fraction + ' = ' + (q_num * fraction)  
37 - + ' 分<!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span> --></h3> </div><div class="question_list"></div></div>'); 35 + + (q_num * fraction) + '" style="margin-top:80px;"><div class="title"><h3>Total marks of part ' + answer_index_b+ '(single choice) :'
  36 + + (q_num * fraction)
  37 + + ' <!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span> --></h3> </div><div class="question_list"></div></div>');
38 for (var i = 0; i < q_num; i++) { 38 for (var i = 0; i < q_num; i++) {
39 str_temp = str[i]; 39 str_temp = str[i];
40 str_temp = str_temp.toUpperCase() 40 str_temp = str_temp.toUpperCase()
@@ -200,15 +200,11 @@ $(function() { @@ -200,15 +200,11 @@ $(function() {
200 + fraction2 200 + fraction2
201 + '" data-score="' 201 + '" data-score="'
202 + ((index_e_2 - index_s_2 + 1) * fraction2) 202 + ((index_e_2 - index_s_2 + 1) * fraction2)
203 - + '"> <div class="title"><h3>Total score of question number ' 203 + + '"> <div class="title"><h3>Total marks of part '
204 + answer_index_b 204 + answer_index_b
205 - + '(multiple choice): '  
206 - + (index_e_2 - index_s_2 + 1)  
207 - + ' X '  
208 - + fraction2  
209 - + ' = ' 205 + + '(multiple choice) '
210 + ((index_e_2 - index_s_2 + 1) * fraction2) 206 + ((index_e_2 - index_s_2 + 1) * fraction2)
211 - + ' 分<!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span>--></h3> </div> <div class="question_list"></div></div>'); 207 + + '<!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span>--></h3> </div> <div class="question_list"></div></div>');
212 for (var i = index_s_2; i <= index_e_2; i++) { 208 for (var i = index_s_2; i <= index_e_2; i++) {
213 questionNUm++; 209 questionNUm++;
214 $(".section-" + answer_index_b + " .question_list").append( 210 $(".section-" + answer_index_b + " .question_list").append(
@@ -490,13 +486,9 @@ $(function() { @@ -490,13 +486,9 @@ $(function() {
490 + '" data-fraction="' 486 + '" data-fraction="'
491 + data.questions[i].score 487 + data.questions[i].score
492 + '" style="margin-top:80px;"> <h3><span class="que_num">' 488 + '" style="margin-top:80px;"> <h3><span class="que_num">'
493 - + 'Total score of question number ' 489 + + 'Total marks of part '
494 + (i + 1) 490 + (i + 1)
495 - + ':'  
496 - + data.questions[i].questions.length  
497 - + " X "  
498 - + (parseFloat(data.questions[i].sug_score) / data.questions[i].questions.length)  
499 - + " = " 491 + + ":"
500 + data.questions[i].sug_score 492 + data.questions[i].sug_score
501 + '</span>' 493 + '</span>'
502 + '<span class="que_name">' 494 + '<span class="que_name">'
WebRoot/static/js/en_control1.js
  View file @0e4da37
@@ -148,8 +148,8 @@ @@ -148,8 +148,8 @@
148 $("#class_avg").html(class_avg); 148 $("#class_avg").html(class_avg);
149 $("#class_max").html(class_max); 149 $("#class_max").html(class_max);
150 $(".name h1").html(data.data.studentList[index].NAME); 150 $(".name h1").html(data.data.studentList[index].NAME);
151 - $(".circle .col-md-6").eq(1).html('<div id="myStathalf1" data-dimension="350" data-text="'+ratio+"%"+'" data-info="Student" data-width="10" data-fontsize="38" data-percent="'+ratio+'" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div>');  
152 - $(".circle .col-md-6").eq(0).html('<div id="myStathalf" data-dimension="350" data-text="'+part_num+'/'+test_num+'" data-info="Participation testing" data-width="10" data-fontsize="38" data-percent="'+partake+'" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div>'); 151 + $(".circle .col-md-6").eq(1).html('<div id="myStathalf1" data-dimension="350" data-text="'+ratio+"%"+'" data-info="Individual Average Correct Rate" data-width="10" data-fontsize="38" data-percent="'+ratio+'" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div>');
  152 + $(".circle .col-md-6").eq(0).html('<div id="myStathalf" data-dimension="350" data-text="'+part_num+'/'+test_num+'" data-info="Tests Paticipated" data-width="10" data-fontsize="38" data-percent="'+partake+'" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div>');
153 $('#myStathalf1').circliful(); 153 $('#myStathalf1').circliful();
154 $('#myStathalf').circliful(); 154 $('#myStathalf').circliful();
155 myChart.setOption({ 155 myChart.setOption({
@@ -167,7 +167,7 @@ @@ -167,7 +167,7 @@
167 splitArea: {show: true} 167 splitArea: {show: true}
168 }, 168 },
169 series: [{ 169 series: [{
170 - name:"Avg Score", 170 + name:"Class Avg",
171 data: data1, 171 data: data1,
172 type: 'line', 172 type: 'line',
173 symbol: 'circle', 173 symbol: 'circle',
@@ -187,7 +187,7 @@ @@ -187,7 +187,7 @@
187 } 187 }
188 } 188 }
189 },{ 189 },{
190 - name:"Highest", 190 + name:"Class Highest",
191 data: data3, 191 data: data3,
192 type: 'line', 192 type: 'line',
193 symbol: 'circle', 193 symbol: 'circle',
@@ -207,7 +207,7 @@ @@ -207,7 +207,7 @@
207 } 207 }
208 } 208 }
209 },{ 209 },{
210 - name:"Personal", 210 + name:"Student",
211 data: data2, 211 data: data2,
212 type: 'line', 212 type: 'line',
213 symbol: 'circle', 213 symbol: 'circle',
WebRoot/static/js/en_paper_view.js
  View file @0e4da37
@@ -5,7 +5,7 @@ var url=&quot;&quot;; @@ -5,7 +5,7 @@ var url=&quot;&quot;;
5 if($(".resolve").css("display") == "none") 5 if($(".resolve").css("display") == "none")
6 obj.text("View Analysis"); 6 obj.text("View Analysis");
7 else 7 else
8 - obj.text("Fold analysis"); 8 + obj.text("Hide analysis");
9 }); 9 });
10 } 10 }
11 11
@@ -46,7 +46,7 @@ function getQueryString(name) { @@ -46,7 +46,7 @@ function getQueryString(name) {
46 console.log(data); 46 console.log(data);
47 if(data.data.length>0){ 47 if(data.data.length>0){
48 for(var i=0;i<data.data.length;i++){ 48 for(var i=0;i<data.data.length;i++){
49 - _html += '<li class="question_li" data-id="'+data.data[i].QUESTION_ID+'" data-knowledge="' +getknowledgeid(data.data[i].QUESTION_ID,knowledge_ids) + '"><div class="stem"></div><div class="option"><ul></ul><div class="clearfix"></div></div><div class="resolve"><div class="resolve_box"><p>【Answer】 '+data.data[i].ANSWER+'</p><p><span>【Analysis】</span>'+data.data[i].ANALYSIS+'</p></div><div class="clearfix"></div></div><div class="star_box"><div class="col-md-6 move"><img src="../static/images/up_ico.png" class="up"/><img src="../static/images/down_ico.png" class="down"/></div><div class="col-md-6"><div class="star"><span style="float:left;">Diffcult</span></div><div class="resolve_click"><a onclick="slide($(this))">View Analysis</a></div></div><div class="clearfix"></div></div></li>'; 49 + _html += '<li class="question_li" data-id="'+data.data[i].QUESTION_ID+'" data-knowledge="' +getknowledgeid(data.data[i].QUESTION_ID,knowledge_ids) + '"><div class="stem"></div><div class="option"><ul></ul><div class="clearfix"></div></div><div class="resolve"><div class="resolve_box"><p>【Answer】 '+data.data[i].ANSWER+'</p><p><span>【Analysis】</span>'+data.data[i].ANALYSIS+'</p></div><div class="clearfix"></div></div><div class="star_box"><div class="col-md-6 move"><img src="../static/images/up_ico.png" class="up"/><img src="../static/images/down_ico.png" class="down"/></div><div class="col-md-6"><div class="star"><span style="float:left;">Difficulty Level </span></div><div class="resolve_click"><a onclick="slide($(this))">View Analysis</a></div></div><div class="clearfix"></div></div></li>';
50 } 50 }
51 console.log(_html); 51 console.log(_html);
52 $(".analysis ul").html(_html); 52 $(".analysis ul").html(_html);
WebRoot/static/js/en_paper_view2.js
  View file @0e4da37
@@ -5,7 +5,7 @@ var url=&quot;&quot;; @@ -5,7 +5,7 @@ var url=&quot;&quot;;
5 if($(".resolve").css("display") == "none") 5 if($(".resolve").css("display") == "none")
6 obj.text("View Analysis "); 6 obj.text("View Analysis ");
7 else 7 else
8 - obj.text("Fold analysis"); 8 + obj.text("Hide analysis");
9 }); 9 });
10 } 10 }
11 11
@@ -32,7 +32,7 @@ function getQueryString(name) { @@ -32,7 +32,7 @@ function getQueryString(name) {
32 $("#time").html(data.data.exam_time); 32 $("#time").html(data.data.exam_time);
33 if(data.data.questions.length>0){ 33 if(data.data.questions.length>0){
34 for(var i=0;i<data.data.questions.length;i++){ 34 for(var i=0;i<data.data.questions.length;i++){
35 - _html += '<li class="question_li" data-id="'+data.data.questions[i].question_id+'"><div class="stem"></div><div class="option"><ul></ul><div class="clearfix"></div></div><div class="resolve"><div class="resolve_box"><p>【Answer】 '+data.data.questions[i].answer+'</p><p><span>【Analysis】</span>'+data.data.questions[i].analysis+'</p></div><div class="clearfix"></div></div><div class="star_box"><div class="col-md-6"><div class="star"><span style="float:left;">Diffcult </span></div><div class="resolve_click"><a onclick="slide($(this))">View Analysis</a></div></div><div class="clearfix"></div></div></li>'; 35 + _html += '<li class="question_li" data-id="'+data.data.questions[i].question_id+'"><div class="stem"></div><div class="option"><ul></ul><div class="clearfix"></div></div><div class="resolve"><div class="resolve_box"><p>【Answer】 '+data.data.questions[i].answer+'</p><p><span>【Analysis】</span>'+data.data.questions[i].analysis+'</p></div><div class="clearfix"></div></div><div class="star_box"><div class="col-md-6"><div class="star"><span style="float:left;">Difficulty Level </span></div><div class="resolve_click"><a onclick="slide($(this))">View Analysis</a></div></div><div class="clearfix"></div></div></li>';
36 } 36 }
37 console.log(_html); 37 console.log(_html);
38 $(".analysis ul").html(_html); 38 $(".analysis ul").html(_html);
@@ -41,7 +41,7 @@ function getQueryString(name) { @@ -41,7 +41,7 @@ function getQueryString(name) {
41 var sum=0; 41 var sum=0;
42 var right_num=0; 42 var right_num=0;
43 var answer=""; 43 var answer="";
44 - $(".analysis li .stem").eq(j).append('<span class="li_index">'+(j+1)+'</span>、'+data.data.questions[j].content); 44 + $(".analysis li .stem").eq(j).append('<span class="li_index">'+(j+1)+'</span>.'+data.data.questions[j].content);
45 var arry_option=data.data.questions[j].option_content; 45 var arry_option=data.data.questions[j].option_content;
46 arry_option=arry_option.replace("[",""); 46 arry_option=arry_option.replace("[","");
47 arry_option=arry_option.replace("]",""); 47 arry_option=arry_option.replace("]","");
WebRoot/static/js/en_set_question.js
  View file @0e4da37
@@ -27,7 +27,7 @@ var url=&quot;&quot;; @@ -27,7 +27,7 @@ var url=&quot;&quot;;
27 27
28 28
29 function getPoint(){ //获取知识点 29 function getPoint(){ //获取知识点
30 - $.ajax({ 30 + $.ajax({
31 url:url+"/SunvoteEducation/api/v1/point", 31 url:url+"/SunvoteEducation/api/v1/point",
32 async:false, 32 async:false,
33 type:"post", 33 type:"post",
@@ -106,7 +106,7 @@ var url=&quot;&quot;; @@ -106,7 +106,7 @@ var url=&quot;&quot;;
106 if($(".resolve").css("display") == "none") 106 if($(".resolve").css("display") == "none")
107 obj.text("View Analysis"); 107 obj.text("View Analysis");
108 else 108 else
109 - obj.text("Fold analysis"); 109 + obj.text("Hide analysis");
110 }); 110 });
111 111
112 } 112 }
@@ -132,7 +132,7 @@ var url=&quot;&quot;; @@ -132,7 +132,7 @@ var url=&quot;&quot;;
132 if(data.data.length>0){ 132 if(data.data.length>0){
133 for(var i=0;i<data.data.length;i++){ 133 for(var i=0;i<data.data.length;i++){
134 134
135 - _html += '<li data-id="'+data.data[i].QUESTION_ID+'" data-knowledge="' + knowledge_id + '"><div class="content"></div><div class="option"><ul></ul></div><div class="resolve"><div class="resolve_box"><p><span>【Answer】</span> '+data.data[i].ANSWER+'</p><p><span>【Analysis】</span>'+data.data[i].ANALYSIS+'</p></div></div><div class="star_box"><div class="col-md-6"><div class="star"><span style="float:left;">Diffcult </span></div><div class="resolve_click"><a onclick="slide($(this))">View Analysis</a><div class="check_box"></div></div></div><div class="clearfix"></div></div></li>'; 135 + _html += '<li data-id="'+data.data[i].QUESTION_ID+'" data-knowledge="' + knowledge_id + '"><div class="content"></div><div class="option"><ul></ul></div><div class="resolve"><div class="resolve_box"><p><span>【Answer】</span> '+data.data[i].ANSWER+'</p><p><span>【Analysis】</span>'+data.data[i].ANALYSIS+'</p></div></div><div class="star_box"><div class="col-md-6"><div class="star"><span style="float:left;">Difficulty Level </span></div><div class="resolve_click"><a onclick="slide($(this))">View Analysis</a><div class="check_box"></div></div></div><div class="clearfix"></div></div></li>';
136 } 136 }
137 $(".question_box").children("ul").append(_html); 137 $(".question_box").children("ul").append(_html);
138 console.log(5*(pageNum-1)); 138 console.log(5*(pageNum-1));
WebRoot/static/js/en_teach_paper.js
  View file @0e4da37
@@ -191,7 +191,7 @@ @@ -191,7 +191,7 @@
191 function del(obj){ //删除 191 function del(obj){ //删除
192 //var remove = new remove(); 192 //var remove = new remove();
193 var id=obj.closest("tr").attr("data-id"); 193 var id=obj.closest("tr").attr("data-id");
194 - window.top.remove.init({"title":"Delete","func":function(success){ 194 + window.top.remove.init({"title":"Delete","ok":"Ok","cancel":"Cancel","func":function(success){
195 if(success){ 195 if(success){
196 var url1 = url+ "/paper/delete.do?PAPER_ID="+id+"&tm="+new Date().getTime(); 196 var url1 = url+ "/paper/delete.do?PAPER_ID="+id+"&tm="+new Date().getTime();
197 window.top.loading.show(); 197 window.top.loading.show();
@@ -206,7 +206,7 @@ @@ -206,7 +206,7 @@
206 window.top.remove.show(); 206 window.top.remove.show();
207 } 207 }
208 function deleteAll(){ //批量删除 208 function deleteAll(){ //批量删除
209 - window.top.remove.init({"title":"Delete","func":function(success){ 209 + window.top.remove.init({"title":"Delete","ok":"Ok","cancel":"Cancel","func":function(success){
210 if(success){ 210 if(success){
211 var str = ''; 211 var str = '';
212 for(var i=0;i < document.getElementsByName('ids').length;i++){ 212 for(var i=0;i < document.getElementsByName('ids').length;i++){
WebRoot/static/js/remove.js
  View file @0e4da37
@@ -9,7 +9,7 @@ var remove={ @@ -9,7 +9,7 @@ var remove={
9 if(typeof(this.init.ok) == "undefined"){ 9 if(typeof(this.init.ok) == "undefined"){
10 this.init.ok = "确定"; 10 this.init.ok = "确定";
11 } 11 }
12 - if(typeof(this.init.ok) == "undefined"){ 12 + if(typeof(this.init.cancel) == "undefined"){
13 this.init.cancel = "取消" ; 13 this.init.cancel = "取消" ;
14 } 14 }
15 }, 15 },
resources/dbconfig.properties
  View file @0e4da37
1 #数据源 1 1 #数据源 1
2 -url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 2 +url:jdbc:mysql://47.107.98.47:3306/education?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
3 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 3 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
4 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 4 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
5 driverClassName:com.mysql.jdbc.Driver 5 driverClassName:com.mysql.jdbc.Driver
resources/mybatis1/sunvote/SubjectMapper.xml
  View file @0e4da37
@@ -125,6 +125,26 @@ @@ -125,6 +125,26 @@
125 </if> 125 </if>
126 </select> 126 </select>
127 127
  128 + <!-- 添加学校科目，从未添加的科目里面进行添加 -->
  129 + <select id="listNotSchoolSubject" parameterType="pd" resultType="pd">
  130 + select
  131 + <include refid="Field"></include>
  132 + from
  133 + <include refid="tableName"></include>
  134 + WHERE
  135 + sv_subject.ID NOT IN (
  136 + SELECT
  137 + sv_schoolgradesubject.SUBJECT_ID
  138 + FROM
  139 + sv_schoolgradesubject
  140 + WHERE 1 = 1
  141 + <if test="SCHOOL_ID != null and SCHOOL_ID != ''">
  142 + and sv_schoolgradesubject.SCHOOL_ID = #{SCHOOL_ID}
  143 + </if>
  144 + )
  145 +
  146 + </select>
  147 +
128 <!-- 批量删除 --> 148 <!-- 批量删除 -->
129 <delete id="deleteAll" parameterType="String"> 149 <delete id="deleteAll" parameterType="String">
130 delete from 150 delete from
src/com/fh/controller/sunvote/grade/GradeController.java
  View file @0e4da37
@@ -112,6 +112,31 @@ public class GradeController extends BaseController { @@ -112,6 +112,31 @@ public class GradeController extends BaseController {
112 return mv; 112 return mv;
113 } 113 }
114 114
  115 + /**列表
  116 + * @param page
  117 + * @throws Exception
  118 + */
  119 + @RequestMapping(value="/listcs")
  120 + public ModelAndView listcs(Page page) throws Exception{
  121 + logBefore(logger, Jurisdiction.getUsername()+"列表Grade");
  122 + //if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
  123 + ModelAndView mv = this.getModelAndView();
  124 + PageData pd = new PageData();
  125 + pd = this.getPageData();
  126 + String keywords = pd.getString("keywords"); //关键词检索条件
  127 + if(null != keywords && !"".equals(keywords)){
  128 + pd.put("keywords", keywords.trim());
  129 + }
  130 + page.setPd(pd);
  131 +
  132 + List<PageData> varList = gradeService.list(page); //列出Grade列表
  133 + mv.setViewName("sunvote/grade/grade_list2");
  134 + mv.addObject("varList", varList);
  135 + mv.addObject("pd", pd);
  136 + mv.addObject("QX",Jurisdiction.getHC()); //按钮权限
  137 + return mv;
  138 + }
  139 +
115 /**去新增页面 140 /**去新增页面
116 * @param 141 * @param
117 * @throws Exception 142 * @throws Exception
src/com/fh/controller/sunvote/schoolgradesubject/SchoolGradeSubjectController.java
  View file @0e4da37
@@ -21,16 +21,14 @@ import org.springframework.web.servlet.ModelAndView; @@ -21,16 +21,14 @@ import org.springframework.web.servlet.ModelAndView;
21 21
22 import com.fh.controller.base.BaseController; 22 import com.fh.controller.base.BaseController;
23 import com.fh.entity.Page; 23 import com.fh.entity.Page;
24 -import com.fh.util.AppUtil;  
25 -import com.fh.util.ObjectExcelView;  
26 -import com.fh.util.PageData;  
27 -import com.fh.util.Jurisdiction;  
28 -import com.fh.util.Tools;  
29 import com.fh.service.sunvote.grade.GradeManager; 24 import com.fh.service.sunvote.grade.GradeManager;
30 import com.fh.service.sunvote.school.SchoolManager; 25 import com.fh.service.sunvote.school.SchoolManager;
31 import com.fh.service.sunvote.schoolgradesubject.SchoolGradeSubjectManager; 26 import com.fh.service.sunvote.schoolgradesubject.SchoolGradeSubjectManager;
32 import com.fh.service.sunvote.subject.SubjectManager; 27 import com.fh.service.sunvote.subject.SubjectManager;
33 -import com.fh.service.system.fhlog.FHlogManager; 28 +import com.fh.util.AppUtil;
  29 +import com.fh.util.Jurisdiction;
  30 +import com.fh.util.ObjectExcelView;
  31 +import com.fh.util.PageData;
34 32
35 /** 33 /**
36 * 说明：学校年级科目表 34 * 说明：学校年级科目表
@@ -205,6 +203,7 @@ public class SchoolGradeSubjectController extends BaseController { @@ -205,6 +203,7 @@ public class SchoolGradeSubjectController extends BaseController {
205 } 203 }
206 204
207 /**导出到excel 205 /**导出到excel
  206 + *
208 * @param 207 * @param
209 * @throws Exception 208 * @throws Exception
210 */ 209 */
src/com/fh/controller/sunvote/sclass/SClassController.java
  View file @0e4da37
@@ -182,6 +182,33 @@ public class SClassController extends BaseController { @@ -182,6 +182,33 @@ public class SClassController extends BaseController {
182 return mv; 182 return mv;
183 } 183 }
184 184
  185 + /**去新增页面
  186 + * @param
  187 + * @throws Exception
  188 + */
  189 + @RequestMapping(value="/goAdd2")
  190 + public ModelAndView goAdd2()throws Exception{
  191 + ModelAndView mv = this.getModelAndView();
  192 + PageData pd = new PageData();
  193 + pd = this.getPageData();
  194 + if(isChineseLanguageClient()){
  195 + mv.setViewName("sunvote/sclass/sclass_edit2");
  196 + }else{
  197 + mv.setViewName("sunvote/sclass/sclass_edit2");
  198 + }
  199 + List<PageData> schools = schoolService.listAll(pd);
  200 + mv.addObject("schools",schools);
  201 + List<PageData> basestations = basestationService.listAll(pd);
  202 + mv.addObject("basestations",basestations);
  203 + List<PageData> grades = gradeService.listAll(pd);
  204 + mv.addObject("grades", grades);
  205 + List<PageData> classTypes = classtypeService.listAll(pd);
  206 + mv.addObject("classTypes", classTypes);
  207 + mv.addObject("msg", "save");
  208 + mv.addObject("pd", pd);
  209 + return mv;
  210 + }
  211 +
185 /**去修改页面 212 /**去修改页面
186 * @param 213 * @param
187 * @throws Exception 214 * @throws Exception
src/com/fh/controller/sunvote/subject/SubjectController.java
  View file @0e4da37
@@ -8,7 +8,9 @@ import java.util.Date; @@ -8,7 +8,9 @@ import java.util.Date;
8 import java.util.HashMap; 8 import java.util.HashMap;
9 import java.util.List; 9 import java.util.List;
10 import java.util.Map; 10 import java.util.Map;
  11 +
11 import javax.annotation.Resource; 12 import javax.annotation.Resource;
  13 +
12 import org.springframework.beans.propertyeditors.CustomDateEditor; 14 import org.springframework.beans.propertyeditors.CustomDateEditor;
13 import org.springframework.stereotype.Controller; 15 import org.springframework.stereotype.Controller;
14 import org.springframework.web.bind.WebDataBinder; 16 import org.springframework.web.bind.WebDataBinder;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder; @@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder;
16 import org.springframework.web.bind.annotation.RequestMapping; 18 import org.springframework.web.bind.annotation.RequestMapping;
17 import org.springframework.web.bind.annotation.ResponseBody; 19 import org.springframework.web.bind.annotation.ResponseBody;
18 import org.springframework.web.servlet.ModelAndView; 20 import org.springframework.web.servlet.ModelAndView;
  21 +
19 import com.fh.controller.base.BaseController; 22 import com.fh.controller.base.BaseController;
20 import com.fh.entity.Page; 23 import com.fh.entity.Page;
21 import com.fh.util.AppUtil; 24 import com.fh.util.AppUtil;
@@ -23,6 +26,7 @@ import com.fh.util.ObjectExcelView; @@ -23,6 +26,7 @@ import com.fh.util.ObjectExcelView;
23 import com.fh.util.PageData; 26 import com.fh.util.PageData;
24 import com.fh.util.Jurisdiction; 27 import com.fh.util.Jurisdiction;
25 import com.fh.util.Tools; 28 import com.fh.util.Tools;
  29 +import com.fh.service.sunvote.schoolgradesubject.SchoolGradeSubjectManager;
26 import com.fh.service.sunvote.subject.SubjectManager; 30 import com.fh.service.sunvote.subject.SubjectManager;
27 31
28 /** 32 /**
@@ -38,6 +42,9 @@ public class SubjectController extends BaseController { @@ -38,6 +42,9 @@ public class SubjectController extends BaseController {
38 @Resource(name="subjectService") 42 @Resource(name="subjectService")
39 private SubjectManager subjectService; 43 private SubjectManager subjectService;
40 44
  45 + @Resource(name="schoolgradesubjectService")
  46 + private SchoolGradeSubjectManager schoolgradesubjectService;
  47 +
41 /**保存 48 /**保存
42 * @param 49 * @param
43 * @throws Exception 50 * @throws Exception
@@ -55,6 +62,23 @@ public class SubjectController extends BaseController { @@ -55,6 +62,23 @@ public class SubjectController extends BaseController {
55 return mv; 62 return mv;
56 } 63 }
57 64
  65 + /**保存
  66 + * @param
  67 + * @throws Exception
  68 + */
  69 + @RequestMapping(value="/save2")
  70 + public ModelAndView save2() throws Exception{
  71 + logBefore(logger, Jurisdiction.getUsername()+"新增SchoolGradeSubject");
  72 + ModelAndView mv = this.getModelAndView();
  73 + PageData pd = new PageData();
  74 + pd = this.getPageData();
  75 + pd.put("SCHOOLGRADESUBJECT_ID", this.get32UUID()); //主键
  76 + schoolgradesubjectService.save(pd);
  77 + mv.addObject("msg","success");
  78 + mv.setViewName("save_result");
  79 + return mv;
  80 + }
  81 +
58 /**删除 82 /**删除
59 * @param out 83 * @param out
60 * @throws Exception 84 * @throws Exception
@@ -146,6 +170,23 @@ public class SubjectController extends BaseController { @@ -146,6 +170,23 @@ public class SubjectController extends BaseController {
146 return mv; 170 return mv;
147 } 171 }
148 172
  173 + /**去新增页面
  174 + * @param
  175 + * @throws Exception
  176 + */
  177 + @RequestMapping(value="/goAdd2")
  178 + public ModelAndView goAdd2()throws Exception{
  179 + ModelAndView mv = this.getModelAndView();
  180 + PageData pd = new PageData();
  181 + pd = this.getPageData();
  182 + mv.setViewName("sunvote/subject/subject_edit2");
  183 + List<PageData> varList = subjectService.listNotSchoolSubject(pd);
  184 + mv.addObject("varList", varList);
  185 + mv.addObject("msg", "save2");
  186 + mv.addObject("pd", pd);
  187 + return mv;
  188 + }
  189 +
149 /**去修改页面 190 /**去修改页面
150 * @param 191 * @param
151 * @throws Exception 192 * @throws Exception
src/com/fh/service/sunvote/subject/SubjectManager.java
  View file @0e4da37
@@ -60,5 +60,7 @@ public interface SubjectManager{ @@ -60,5 +60,7 @@ public interface SubjectManager{
60 */ 60 */
61 public void deleteAll(String[] ArrayDATA_IDS)throws Exception; 61 public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
62 62
  63 + public List<PageData> listNotSchoolSubject(PageData pd)throws Exception;
  64 +
63 } 65 }
64 66
src/com/fh/service/sunvote/subject/impl/SubjectService.java
  View file @0e4da37
@@ -80,6 +80,15 @@ public class SubjectService implements SubjectManager{ @@ -80,6 +80,15 @@ public class SubjectService implements SubjectManager{
80 return (List<PageData>)dao.findForList("SubjectMapper.listAllSchoollistPage", pd); 80 return (List<PageData>)dao.findForList("SubjectMapper.listAllSchoollistPage", pd);
81 } 81 }
82 82
  83 + /**列表(全部)
  84 + * @param pd
  85 + * @throws Exception
  86 + */
  87 + @SuppressWarnings("unchecked")
  88 + public List<PageData> listNotSchoolSubject(PageData pd)throws Exception{
  89 + return (List<PageData>)dao.findForList("SubjectMapper.listNotSchoolSubject", pd);
  90 + }
  91 +
83 /**通过id获取数据 92 /**通过id获取数据
84 * @param pd 93 * @param pd
85 * @throws Exception 94 * @throws Exception