From f19da10849bc68c6f95a8377c8b197f653b85ef6 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Tue, 18 Dec 2018 09:25:55 +0800
Subject: [PATCH] 添加英语对应的修改

---
 WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list2.jsp      |   3 ++-
 WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp         |   1 +
 WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp  |   5 +++--
 WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp     |   1 +
 WebRoot/WEB-INF/jsp/sunvote/teacher/en_creat_question.jsp |   2 +-
 WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view2.jsp    |   2 +-
 WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp    |   2 +-
 WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp   |  20 ++++++++++----------
 WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp      |   2 +-
 WebRoot/static/js/en_control-604.js                       |  34 +++++++++++++++++-----------------
 WebRoot/static/js/en_teach_paper.js                       | 241 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/static/js/en_test_list.js                         |  13 +++++++++++++
 WebRoot/static/js/remove.js                               |  12 ++++++++++--
 WebRoot/static/js/teach_paper.js                          |   1 +
 src/com/fh/entity/Page.java                               |  10 +++++-----
 15 files changed, 308 insertions(+), 41 deletions(-)
 create mode 100644 WebRoot/static/js/en_teach_paper.js

diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list2.jsp
index babb74d..7181f2e 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list2.jsp
@@ -62,7 +62,7 @@
 						<th><input type="checkbox"  name='ids' id="ids" />Serial No.</th>
 						<th>Test Paper Title</th>
 						<th>Create Time</th>
-						<th>Advice Time</th>
+						<th>Suggested Time</th>
 						<th>Total Score</th>
 						<th>Operate</th>
 					</tr>
@@ -125,6 +125,7 @@
 		
 		$(document).ready(function(){
 			window.top.loading.remove();
+			$(".table_box").css("margin-top",$(".head_box").height() - 143);
 		});
 		
 		function tosearch(){
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
index cccefb4..7962221 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
@@ -125,6 +125,7 @@
 		
 		$(document).ready(function(){
 			window.top.loading.remove();
+			$(".table_box").css("margin-top",$(".head_box").height() - 143);
 		});
 		
 		function tosearch(){
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
index 1c0ff07..fd4c5b0 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
@@ -113,6 +113,7 @@
 <script type="text/javascript">
 		$(document).ready(function(){
 			window.top.loading.remove();
+			$(".table_box").css("margin-top",$(".head_box").height() - 143);
 		});
 		function tosearch(){
 			$("#Form").submit();
@@ -157,7 +158,7 @@
 		
 		function edit(Id){
 			window.top.modal.init({
-			'title':'添加学生',
+			'title':'Add Student',
 			'url':'<%=basePath%>student/goEdit2.do?ID='+Id,
 			func:function() {
 				tosearch();
@@ -167,7 +168,7 @@
 		}
 		
 		function deleteAll(){
-			window.top.remove.init({"title":"Delete","func":function(success){
+			window.top.remove.init({"title":"Delete","ok":"OK","cancel":"Cancel","func":function(success){
 				if(success){
 					var str = '';
 					for(var i=0;i < document.getElementsByName('ids').length;i++){
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
index 4c16fe9..a6b17a2 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
@@ -116,6 +116,7 @@
 <script type="text/javascript">
 		$(document).ready(function(){
 			window.top.loading.remove();
+			$(".table_box").css("margin-top",$(".head_box").height() - 143);
 		});
 		function tosearch(){
 			$("#Form").submit();
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_creat_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_creat_question.jsp
index 8c889d0..872814f 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_creat_question.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_creat_question.jsp
@@ -211,7 +211,7 @@
 	//var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"单选","option_num":"","option_content":"","answer":"","difficulty":"","analysis":"","question_from":"","score":1,"part_score":"","remark":"","rank":"1","no_name":"一、","questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.1"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"B","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.2"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"C","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.3"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"D","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.4"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.5"}]}]};
 	//var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[]};
 </script>
-<script type="text/javascript" src="../static/js/en_control-604.js?"></script>
+<script type="text/javascript" src="../static/js/en_control-604.js?a=1"></script>
 
 
 </body>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view2.jsp
index e2ffee2..b898b54 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view2.jsp
@@ -40,7 +40,7 @@
   <div class="container">
     <div class="page-header">
 	  <h3 class="col-md-6" id="paper_title"></h3>
-	   <h3 class="col-md-6">Exam Time:<span id="time"></span>Minutes</h3>
+	   <h3 class="col-md-6">Exam Time:<span id="time"></span> Minutes</h3>
 		<div class="clearfix"></div>
 	</div>
 	<div class="content_report">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
index a348f0f..4d06311 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
@@ -147,5 +147,5 @@
 				
 				var view = "View" ;
   	</script>
-	<script src="../static/js/teach_paper.js?a=1"></script>
+	<script src="../static/js/en_teach_paper.js?a=2"></script>
 </html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
index c246c26..fc3399f 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
@@ -41,7 +41,7 @@
 		<div class="clear"></div>
 	</div>
 	<div class="content">
-		<div class="content_l">
+		<div class="content_l" style="min-width:300px">
 			<div class="info_tab">
 				<div class="head_pic">
 					<img src="../static/images/head_defult.png" />
@@ -54,29 +54,29 @@
 			</div>
 			<div class="class tab1">
 				<p>
-					Class Management<span class="right jiao"></span>
+					Classes<span class="right jiao"></span>
 				</p>
 				<ul class="menu_1">
 					<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-						<li onclick="event.stopPropagation();chooseClass('${var.CLASS_ID}','${var.TERM_ID}')"><p>${var.GRADE_ENAME} ${var.SUBJECT_ENAME}
-								<span>${var.CLASS_NAME}</span></p>
+						<li onclick="event.stopPropagation();chooseClass('${var.CLASS_ID}','${var.TERM_ID}')"><p>${var.CLASS_NAME}
+								<span>${var.SUBJECT_ENAME}</span></p>
 						</li>
 			</c:forEach>
 
 			</ul>
 		</div>
 		<div class="testpaper tab1">
-			<p>Paper Management<span class="right jiao"></span></p>
+			<p>Test Papers<span class="right jiao"></span></p>
 				<ul class="menu_1">
 					<li >
-						<p id="qingsongkao_paper">E-exam Paper Management</p>
+						<p id="qingsongkao_paper">E-exam Papers</p>
 						<!-- <ul class="menu_2">
 							<li><p>高一数学 202班</p></li>
 							<li><p>高一数学 203班</p></li>
 						</ul> -->
 					</li>
 					<li>
-						<p id="jishice_paper">SunVote Class Paper Management</p>
+						<p id="jishice_paper">SunVote Class Papers</p>
 						
 						<!-- <ul class="menu_2">
 							<li><p>高一数学 202班</p></li>
@@ -93,15 +93,15 @@
 			
 			<ul class="menu_1">
 					<li >
-						<p>E-exam Examination Analysis</p>
+						<p>E-exam Tests</p>
 						<ul class="menu_2">
 						<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-							<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>${var.CLASS_NAME} Score</p></li>
+							<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>Result of ${var.CLASS_NAME}</p></li>
 						</c:forEach>
 						</ul>
 					</li>
 					<li>
-						<p>SunVote Class Exam Analysis</p>
+						<p>SunVote Class Tests</p>
 						<ul class="menu_2">
 						<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
 							<li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>${var.CLASS_NAME} Score</p></li>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp
index 4799fd3..6eccaf5 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp
@@ -83,5 +83,5 @@
 		var user_id= "${pd.userId}";
 		var url = "<%=basePath%>";
 	</script>
-	<script src="../static/js/en_test_list.js?a=1"></script>
+	<script src="../static/js/en_test_list.js?a=0"></script>
 </html>
\ No newline at end of file
diff --git a/WebRoot/static/js/en_control-604.js b/WebRoot/static/js/en_control-604.js
index 6d0eab2..aef57b8 100644
--- a/WebRoot/static/js/en_control-604.js
+++ b/WebRoot/static/js/en_control-604.js
@@ -18,7 +18,7 @@ $(function() {
 		/*
 		 * $(".content").append('<div class="section section-1 single"
 		 * data-fraction="'+fraction+'" data-score=""> <div class="title"> <h3><span
-		 * class="que_num">一、</span><span class="que_name">单选</span></h3>
+		 * class="que_num">一.</span><span class="que_name">单选</span></h3>
 		 * <input type="button" class="btn btn-danger pull-right remove"
 		 * name="remove" value="删除" /> </div> <div class="question_list"></div></div>')
 		 */
@@ -46,7 +46,7 @@ $(function() {
 				$(".section-" + answer_index_b + " .question_list").append(
 						'<div class="question question' + (questionNUm)
 								+ '"><span>' + (questionNUm)
-								+ '、</span><ul></ul></div>');
+								+ '.</span><ul></ul></div>');
 				for (var j = 0; j < a_num; j++) {
 					option = String.fromCharCode(0x41 + j);
 					if (on_index == j) {
@@ -72,7 +72,7 @@ $(function() {
 	}
 
 	/***************************************************************************
-	 * 1、单选题 2、完形填空 3、阅读理解 4、判断题 5、多选题
+	 * 1.单选题 2.完形填空 3.阅读理解 4.判断题 5.多选题
 	 **************************************************************************/
 
 	function addQuestion(type, a_num, index_s_2, index_e_2, fraction2) {
@@ -90,12 +90,12 @@ $(function() {
 									+ fraction2
 									+ '" data-score=""> <div class="title"> <h3><span class="que_num">'
 									+ question_num
-									+ '、</span>'
+									+ '.</span>'
 									+ '<span class="que_name">单选</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
 			for (i = index_s_2; i <= index_e_2; i++) {
 				$(".section-" + answer_index_b + " .question_list").append(
 						'<div class="question question' + i + '"><span>' + i
-								+ '、</span><ul></ul></div>');
+								+ '.</span><ul></ul></div>');
 				for (var j = 0; j < a_num; j++) {
 					option = String.fromCharCode(0x41 + j);
 					$(".section-" + answer_index_b + " .question" + i + ' ul')
@@ -114,11 +114,11 @@ $(function() {
 									+ fraction2
 									+ '" data-score=""> <div class="title"> <h3><span class="que_num">'
 									+ question_num
-									+ '、</span><span class="que_name">完形填空</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
+									+ '.</span><span class="que_name">完形填空</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
 			for (var i = index_s_2; i <= index_e_2; i++) {
 				$(".section-" + answer_index_b + " .question_list").append(
 						'<div class="question question' + i + '"><span>' + i
-								+ '、</span><ul></ul></div>');
+								+ '.</span><ul></ul></div>');
 				for (var j = 0; j < a_num; j++) {
 					option = String.fromCharCode(0x41 + j);
 					$(".section-" + answer_index_b + " .question" + i + ' ul')
@@ -137,11 +137,11 @@ $(function() {
 									+ fraction2
 									+ '" data-score=""> <div class="title"> <h3><span class="que_num">'
 									+ question_num
-									+ '、</span><span class="que_name">阅读理解</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
+									+ '.</span><span class="que_name">阅读理解</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
 			for (var i = index_s_2; i <= index_e_2; i++) {
 				$(".section-" + answer_index_b + " .question_list").append(
 						'<div class="question question' + i + '"><span>' + i
-								+ '、</span><ul></ul></div>');
+								+ '.</span><ul></ul></div>');
 				for (var j = 0; j < a_num; j++) {
 					option = String.fromCharCode(0x41 + j);
 					$(".section-" + answer_index_b + " .question" + i + ' ul')
@@ -160,11 +160,11 @@ $(function() {
 									+ fraction2
 									+ '" data-score=""> <div class="title"> <h3><span class="que_num">'
 									+ question_num
-									+ '、</span><span class="que_name">判断题</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
+									+ '.</span><span class="que_name">判断题</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
 			for (var i = index_s_2; i <= index_e_2; i++) {
 				$(".section-" + answer_index_b + " .question_list").append(
 						'<div class="question question' + i + '"><span>' + i
-								+ '、</span><ul></ul></div>');
+								+ '.</span><ul></ul></div>');
 				for (var j = 0; j < a_num; j++) {
 					if (j % 2 == 0)
 						option = "√";
@@ -181,12 +181,12 @@ $(function() {
 		 * case 5: //多选题 $(".content").append('<div class="section
 		 * section-'+answer_index_b+' check" data-fraction="'+fraction2+'"
 		 * data-score=""> <div class="title"> <h3><span
-		 * class="que_num">'+question_num+'、</span><span class="que_name">多选题</span></h3>
+		 * class="que_num">'+question_num+'.</span><span class="que_name">多选题</span></h3>
 		 * <input type="button" class="btn btn-danger pull-right remove"
 		 * name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
 		 * for(var i=index_s_2;i<=index_e_2;i++){
 		 * $(".section-"+answer_index_b+" .question_list").append('<div
-		 * class="question question'+i+'"><span>'+i+'、</span><ul></ul></div>');
+		 * class="question question'+i+'"><span>'+i+'.</span><ul></ul></div>');
 		 * for(var j=0;j<a_num;j++){ option=String.fromCharCode(0x41+j);
 		 * $(".section-"+answer_index_b+" .question"+i+' ul').append('<li class="btn btn-default">'+option+'</li>'); } }
 		 */
@@ -214,7 +214,7 @@ $(function() {
 				$(".section-" + answer_index_b + " .question_list").append(
 						'<div class="question question' + questionNUm
 								+ '"><span>' + questionNUm
-								+ '、</span><ul></ul></div>');
+								+ '.</span><ul></ul></div>');
 				for (var j = 0; j < a_num; j++) {
 					option = String.fromCharCode(0x41 + j);
 					$(
@@ -510,7 +510,7 @@ $(function() {
 				}
 				$(".section0").find(".question_list").append(
 						'<div class="question question' + (i + 1) + '"><span>'
-								+ (++questionNUm) + '、</span><ul></ul></div>');
+								+ (++questionNUm) + '.</span><ul></ul></div>');
 				for (var k = 0; k < parseInt(data.questions[i].option_num); k++) {
 					str_temp = data.questions[i].answer;
 					$(".section0").find(".question" + (i + 1) + ' ul').append(
@@ -535,7 +535,7 @@ $(function() {
 					$(".section-" + i).find(".question_list").append(
 							'<div class="question question' + (j + 1)
 									+ '"><span>' + (++questionNUm)
-									+ '、</span><ul></ul></div>');
+									+ '.</span><ul></ul></div>');
 					if ($(".section-" + i).find(".que_name").text() == "判断题") {
 						for (var k = 0; k < parseInt(data.questions[i].questions[j].option_num); k++) {
 							str_temp = data.questions[i].questions[j].answer;
@@ -603,7 +603,7 @@ $(function() {
 		}
 		$("#answer").val(result);
 		if (answerStr.length > 0) {
-			$(".tips").text("Total number of questions" + answerStr.length + " ");
+			$(".tips").text("Total number of questions " + answerStr.length + " ");
 		} else {
 			$(".tips").text("");
 		}
diff --git a/WebRoot/static/js/en_teach_paper.js b/WebRoot/static/js/en_teach_paper.js
new file mode 100644
index 0000000..6800601
--- /dev/null
+++ b/WebRoot/static/js/en_teach_paper.js
@@ -0,0 +1,241 @@
+		var class_html="",
+			option_html="";
+		var user_id= "",
+			subject_id="",
+			class_id="";
+		$(document).ready(function(){
+			
+			timeList();
+			$.ajax({
+				url:url+"/teacher/info",
+				async:false,
+				type:"post",
+				success:function(data){
+					console.log(data);
+					subject_id=data.data.subjectList[0].SUBJECT_ID;
+					user_id=data.data.ID;
+
+					if(data.data.classInfoList.length>0){
+						for(var i=0;i<data.data.classInfoList.length;i++){
+							class_html += '<li data-classId="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</li>';
+							option_html += '<option value="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</option>'
+						}
+						$(".classList").html(class_html+'<div class="clearfix"></div>');
+						$(".classList li").eq(0).addClass("active");
+						$("#dealer_id_2").html(option_html);
+					}
+					getList();
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// wrong massage   
+				alert("Status code:"+XMLHttpRequest.status+"Status"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
+				window.top.loading.remove();
+				}
+			})
+
+			
+			window.top.loading.remove();
+			$(".table_box").css("margin-top",$(".head_box").height() - 143);
+		})
+		
+		function getList(start_date,end_date,class_id){       //获取试卷列表
+			var tab_html="";
+			$.ajax({
+				url:url+"/api/v1/paper",
+				async:false,
+				type:"post",
+				data:{
+					paper_type:"101",
+					user_id:user_id,
+					subject_id:subject_id,
+					class_id:class_id,
+					currentpage:"1",
+					showcount:"",
+					start_date:start_date,
+					end_date:end_date
+				},
+				success:function(data){
+					console.log(data);
+					for(var i=0;i<data.data.length;i++){
+						tab_html += '<tr data-id="'+data.data[i].PAPER_ID+'" data-classid="'+data.data[i].CLASS_ID+'"><td><input type="checkbox" name="ids" id="ids" value="'+data.data[i].PAPER_ID+'"/>'+(i+1)+'</td><td>'+data.data[i].TITLE+'</td><td>'+getClassName(data.data[i].CLASS_ID)+'</td><td>'+getSubjectName(data.data[i].SUBJECT_ID)+'</td><td>'+data.data[i].EXAM_TIME+' Minutes</td><td>'+data.data[i].CREATE_DATE+'</td><td><a style="cursor:pointer" onclick="jump($(this))">' + view + '</a></td><td><a href="#" onclick="del($(this));"><img src="../static/images/remove.png" /></a></td></tr>';
+					}
+					$("#tab_body").html(tab_html);
+					window.top.loading.remove();
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// wrong massage   
+				alert("Status code:"+XMLHttpRequest.status+"Status"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
+				window.top.loading.remove();
+			}
+			});
+		}
+		$('#ids').on('click', function(){
+				var th_checked = $("#ids").prop('checked');//checkbox inside "TH" table header
+				
+				$(".table_box .table").find('tbody > tr').each(function(){
+					var row = this;
+					if(th_checked) $(row).find('input[type=checkbox]').eq(0).prop('checked', true);
+					else $(row).find('input[type=checkbox]').eq(0).prop('checked', false);
+				});
+		});
+		function jump(obj){          //预览试卷
+			window.top.loading.show();
+			var id=obj.closest("tr").attr("data-id");
+			var classid=obj.closest("tr").attr("data-classid");
+			location.href="paper_view2.do?PAPER_ID="+id+"&classID="+classid+"&userid="+user_id;
+		}
+		$(".classList").on("click","li",function(){
+			$(this).siblings().removeClass("active");
+			$(this).addClass("active");
+			
+		});
+		$("#creatPaper").click(function(){   //新建试卷
+			$('#myModal').modal('show');
+		});
+		function setQUestion(){             //新建试卷-选择班级
+			if($(".classList .active").length>0){
+				class_id=$(".classList .active").attr("data-classid");
+				location.href="set_question.do?subject_id="+subject_id+"&class_id="+class_id+"&user_id="+user_id;
+			}else{
+				alert("Please select class first");
+			}
+			window.top.loading.show();
+				console.log($(".classList .active").length);
+			//location.href="";
+		}
+		function getSubjectName(id){           //获取科目中文名
+			var subjectName="";
+			$.ajax({
+				url:url+"/api/v1/subjectename",
+				async:false,
+				type:"post",
+				data:{id:id},
+				success:function(data){
+					subjectName=data.data;
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// wrong massage   
+				alert("Status code:"+XMLHttpRequest.status+"Status"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
+				window.top.loading.remove();
+			}
+			})
+			return subjectName;
+		}
+		function getClassName(id){        //获取班级中文名
+			var className="";
+			$.ajax({
+				url:url+"/api/v1/classname",
+				async:false,
+				type:"post",
+				data:{id:id},
+				success:function(data){
+					className=data.data;
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// wrong massage   
+				alert("Status code:"+XMLHttpRequest.status+"Status:"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
+				window.top.loading.remove();
+			}
+			})
+			return className;
+		}
+		function getday(month){         //获取日期
+			var time=[];
+			var  d= new Date();
+			 d.setMonth(month-1);
+			 d.setDate(1);
+			 var day=d.getDate();
+			 var month=d.getMonth()+1;
+			 if((d.getMonth()+1)<10){
+				 var month="0"+(d.getMonth()+1);
+			 }
+			 var year=d.getFullYear();
+			 var startTime=year+"-"+month+"-"+day;
+			 d.setMonth(month);
+			 var end_day=d.getDate();
+			 var end_month=d.getMonth()+1;
+			 if((d.getMonth()+1)<10){
+				 var end_month="0"+(d.getMonth()+1);
+			 }
+			 var end_year=d.getFullYear();
+			 var endTime=end_year+"-"+end_month+"-"+end_day;
+			 time[0]=startTime;
+			 time[1]=endTime;
+			 return time;
+		}
+		function timeList(){          //渲染时间列表
+			var time = new Date();
+			var now_month=time.getMonth()+1;
+			time.setMonth(now_month-1)
+			if(time.getMonth()!= 0 ){
+				var preceding_month = time.getMonth();
+			}else
+				var preceding_month = 12;
+			time.setMonth(now_month-2)
+			if(time.getMonth()!= 0 ){
+				var last_month = time.getMonth();
+			}else
+				var last_month = 12;
+			var option_html="";
+			option_html += '<option value="'+now_month+'">'+now_month+'月</option><option value="'+preceding_month+'">'+preceding_month+'月</option><option value="'+last_month+'">'+last_month+'月</option>';
+			$("#dealer_id_1").html(option_html);
+		}
+		function tosearch(){        //搜索
+			//var timeBox=getday($("#dealer_id_1").val());
+			var start_date=$("#lastStart").val();
+			var end_date=$("#lastEnd").val();
+			var class_id=$("#dealer_id_2").val();
+			getList(start_date,end_date,class_id);
+		}
+
+		function del(obj){       //删除
+			//var remove = new remove();
+			var id=obj.closest("tr").attr("data-id");
+			window.top.remove.init({"title":"Delete","func":function(success){
+				if(success){
+					var url1 = url+ "/paper/delete.do?PAPER_ID="+id+"&tm="+new Date().getTime();
+					window.top.loading.show();
+					$.get(url1,function(data){
+						tosearch();
+					});
+				}
+				else{
+					console.log("false");
+				}
+			}});
+			window.top.remove.show();
+		}
+		function deleteAll(){       //批量删除
+			window.top.remove.init({"title":"Delete","func":function(success){
+				if(success){
+					var str = '';
+					for(var i=0;i < document.getElementsByName('ids').length;i++){
+					  if(document.getElementsByName('ids')[i].checked){
+					  	if(str=='') str += document.getElementsByName('ids')[i].value;
+					  	else str += ',' + document.getElementsByName('ids')[i].value;
+					  }
+					}
+					if(str==''){
+						
+					}else{
+						$.ajax({
+								type: "POST",
+								url:url+ '/paper/deleteAll.do?tm='+new Date().getTime(),
+						    	data: {DATA_IDS:str},
+								dataType:'json',
+								//beforeSend: validateData,
+								cache: false,
+								success: function(data){
+									 $.each(data.list, function(i, list){
+											tosearch();
+									 });
+								}
+							});
+					}
+				}
+				else{
+					console.log("false");
+				}
+			}});
+			window.top.remove.show();
+		}
\ No newline at end of file
diff --git a/WebRoot/static/js/en_test_list.js b/WebRoot/static/js/en_test_list.js
index d12625c..252349c 100644
--- a/WebRoot/static/js/en_test_list.js
+++ b/WebRoot/static/js/en_test_list.js
@@ -37,6 +37,19 @@ $(document).ready(
 									window.top.loading.remove();
 								}
 							})
+							
+					$.fn.datepicker.dates['en'] = {
+				    days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
+				    daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
+				    daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"],
+				    months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
+				    monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+				    today: "Today",
+				    clear: "Clear",
+				    format: "mm/dd/yyyy",
+				    titleFormat: "MM yyyy", /* Leverages same syntax as 'format' */
+				    weekStart: 0
+					};
 					// 日期框
 					$('.date-picker').datepicker({
 						autoclose : true,
diff --git a/WebRoot/static/js/remove.js b/WebRoot/static/js/remove.js
index d264b09..6882484 100644
--- a/WebRoot/static/js/remove.js
+++ b/WebRoot/static/js/remove.js
@@ -4,10 +4,18 @@ var remove={
 		this.init.title=obj.title;
 		this.init.func = obj.func;
 		this.init.msg = obj.msg;
+		this.init.ok = obj.ok;
+		this.init.cancel = obj.cancel;
+		if(typeof(this.init.ok) ==  "undefined"){
+			this.init.ok = "确定";
+		}
+		if(typeof(this.init.ok) ==  "undefined"){
+			this.init.cancel = "取消" ;
+		}
 		},
 	show:function(){
 		if(window.top!=window.self){			
-			$("body",top.document).append('<div class="mb remove"><div class="mb_box" ><div class="mb_head"><p>'+window.top.remove.init.title+'</p><div class="close"><img src="../static/images/close.png" /></div></div><div class="mb_content"><div class="mb_content_l"><a href="#" onclick="window.top.remove.init.func(true);window.top.remove.remove();">确认</a></div><div class="mb_content_r"><a href="#" onclick="window.top.remove.remove();window.top.remove.init.func(false);">取消</a></div></div></div></div>');
+			$("body",top.document).append('<div class="mb remove"><div class="mb_box" ><div class="mb_head"><p>'+window.top.remove.init.title+'</p><div class="close"><img src="../static/images/close.png" /></div></div><div class="mb_content"><div class="mb_content_l"><a href="#" onclick="window.top.remove.init.func(true);window.top.remove.remove();">' +window.top.remove.init.ok + '</a></div><div class="mb_content_r"><a href="#" onclick="window.top.remove.remove();window.top.remove.init.func(false);">' + window.top.remove.init.cancel + '</a></div></div></div></div>');
 			console.log(typeof(window.top.remove.init.msg));
 			if(typeof(window.top.remove.init.msg) != "undefined"){
 				$(".mb_content_l").before('<div class="mb_msg"><p>'+window.top.remove.init.msg+'</p></div>');
@@ -16,7 +24,7 @@ var remove={
 			if($(".loading").length==0)
 			{
 				console.log(typeof(window.top.remove.init.msg));
-				$("body").append('<div class="mb remove"><div class="mb_box" ><div class="mb_head"><p>'+window.top.remove.init.title+'</p><div class="close"><img src="../static/images/close.png" /></div></div><div class="mb_content"><div class="mb_content_l"><a href="#" onclick="window.top.remove.init.func(true);window.top.remove.remove();">确认</a></div><div class="mb_content_r"><a href="#" onclick="window.top.remove.remove();window.top.remove.init.func(false);">取消</a></div></div></div></div>');
+				$("body").append('<div class="mb remove"><div class="mb_box" ><div class="mb_head"><p>'+window.top.remove.init.title+'</p><div class="close"><img src="../static/images/close.png" /></div></div><div class="mb_content"><div class="mb_content_l"><a href="#" onclick="window.top.remove.init.func(true);window.top.remove.remove();">' + window.top.remove.init.ok +'</a></div><div class="mb_content_r"><a href="#" onclick="window.top.remove.remove();window.top.remove.init.func(false);">' + window.top.remove.init.cancel + '</a></div></div></div></div>');
 				if(typeof(window.top.remove.init.msg) != "undefined"){
 					$(".mb_content_l").before('<div class="mb_msg"><p>'+window.top.remove.init.msg+'</p></div>');
 				}
diff --git a/WebRoot/static/js/teach_paper.js b/WebRoot/static/js/teach_paper.js
index bef22f0..ea3bb6d 100644
--- a/WebRoot/static/js/teach_paper.js
+++ b/WebRoot/static/js/teach_paper.js
@@ -30,6 +30,7 @@
 				// wrong massage   
 				alert("Status code:"+XMLHttpRequest.status+"Status"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
 				window.top.loading.remove();
+				$(".table_box").css("margin-top",$(".head_box").height() - 143);
 				}
 			})
 
diff --git a/src/com/fh/entity/Page.java b/src/com/fh/entity/Page.java
index 1a47145..f9dce86 100644
--- a/src/com/fh/entity/Page.java
+++ b/src/com/fh/entity/Page.java
@@ -84,9 +84,9 @@ public class Page {
 			frist = "Frist" ;
 			previous = "Previous";
 			next = "Next";
-			tail = "Tail" ;
-			jump = "JUMP" ;
-			pageNumber = "Page number";
+			tail = "Last" ;
+			jump = "Goto" ;
+			pageNumber = "PageNo.";
 			displayNumber = "Display Number" ;
 		}
 	}
@@ -97,13 +97,13 @@ public class Page {
 			sb.append("	<ul class=\"pagination pull-right no-margin\">\n");
 			if(currentPage==1){
 				sb.append("	<li><a>" + total +totalResult+articles + "</a></li>\n");
-				sb.append("	<li><span style='padding:0'><input type=\"number\" value=\"\" id=\"toGoPage\" style=\"width:50px;text-align:center;float:left\" placeholder=\"" + pageNumber + "\"/></span></li>\n");
+				sb.append("	<li><span style='padding:0'><input type=\"number\" value=\"\" id=\"toGoPage\" style=\"width:80px;text-align:center;float:left\" placeholder=\"" + pageNumber + "\"/></span></li>\n");
 				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"toTZ();\"  class=\"btn btn-mini btn-success\">" + jump + "</a></li>\n");
 				sb.append("	<li><a>" + frist + "</a></li>\n");
 				sb.append("	<li><a>" + previous + "</a></li>\n");
 			}else{
 				sb.append("	<li><a>"+ total +"<font color=red>"+totalResult+"</font>" + articles + "</a></li>\n");
-				sb.append("	<li><input type=\"number\" value=\"\" id=\"toGoPage\" style=\"width:50px;text-align:center;float:left\" placeholder=\"" + pageNumber + "\"/></li>\n");
+				sb.append("	<li><input type=\"number\" value=\"\" id=\"toGoPage\" style=\"width:80px;text-align:center;float:left\" placeholder=\"" + pageNumber + "\"/></li>\n");
 				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"toTZ();\"  class=\"btn btn-mini btn-success\">" + jump + "</a></li>\n");
 				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"nextPage(1)\">" + frist + "</a></li>\n");
 				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"nextPage("+(currentPage-1)+")\">" + previous + "</a></li>\n");
--
libgit2 0.21.4