孙向锦 / SunvoteEducation

Commit 6d78f08d76ea65ae7e4926b78e9ddea38bf9c14a

Authored by 孙向锦
2 parents 7fe4d780 f9f80b6b

Merge branch 'develop' of http://120.78.57.84/Elvis/SunvoteEducation into develop

Inline Side-by-side
Showing 2 changed files with 35 additions and 39 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp
  View file @6d78f08
... ... @@ -2,6 +2,8 @@
2 2 pageEncoding="UTF-8"%>
3 3 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
4 4 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  5 +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
  6 +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
5 7 <%
6 8 String path = request.getContextPath();
7 9 String basePath = request.getScheme() + "://"
... ... @@ -28,14 +30,14 @@
28 30 </style>
29 31 </head>
30 32  
31   -<body style="background:#fff;/* overflow-y:hidden; */">${pd }
  33 +<body style="background:#fff;/* overflow-y:hidden; */">
32 34 <div style="padding:20px 20px;">
33 35  
34 36 <form action="report/report_test.do" method="post" name="Form" id="Form">
35   - <input type="hidden" name="CLASSID" id="CLASSID" value="${info.CLASS_ID}" />
  37 + <input type="hidden" name="CLASSID" id="CLASSID" value="${pd.CLASS_ID}" />
36 38 <table style="margin-top:5px;">
37 39 <tr style="height: 30px">
38   - <td>测验名称: ${testpaperInfo.NAME}</td>
  40 + <td>测验名称: ${pd.DATA[0].NAME}</td>
39 41 <c:if test="${display}">
40 42 <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
41 43 <td>教师: ${teacherPd.NAME}</td>
... ... @@ -44,12 +46,18 @@
44 46 </c:if>
45 47 </tr>
46 48 <tr style="height: 30px">
47   - <td>收卷时间: ${testpaperInfo.END_DATE}</td>
  49 + <td>练习说明: ${pd.END_DATE}</td>
48 50 </tr>
49 51 <tr style="height: 30px">
50   - <td>班级名册：${classInfo.CLASS_NAME}</td>
  52 + <td>班级完成情况: ${pd.END_DATE}</td>
  53 + </tr>
  54 + <tr style="height: 30px">
  55 + <td>收卷时间: ${pd.END_DATE}</td>
  56 + </tr>
  57 + <tr style="height: 30px">
  58 + <td>班级名册：${myelfun:findClassName(pd.CLASS_ID)}</td>
51 59 <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
52   - <td><span>学生人数: ${classInfo.studentNum}</span></td>
  60 + <td><span>学生人数: ${fn:length(pd.STUDENTS)}</span></td>
53 61  
54 62 </tr>
55 63 </table>
... ... @@ -58,51 +66,39 @@
58 66 style="margin-top:0px;margin-bottom:0;">
59 67 <thead>
60 68 <tr>
61   - <th class="center"><div style="width:80px;">姓名</div></th>
62 69 <th class="center"><div style="width:80px;">排名</div></th>
63   - <th class="center"><div style="width:80px;">得分</div></th>
  70 + <th class="center"><div style="width:80px;">姓名</div></th>
64 71 <th class="center"><div style="width:80px;">学号</div></th>
65 72 <th class="center"><div style="width:109px;">键盘</div></th>
66   - <!-- <th class="center"><div style="width:80px;">正确率</div></th> -->
67   - <c:forEach items="${questionInfo}" var="var" varStatus="vs">
  73 + <th class="center"><div style="width:80px;">正确率</div></th>
  74 + <th class="center"><div style="width:80px;">得分</div></th>
  75 + <c:set value="${ fn:split(pd.DATA[0].ANSWER, ';') }" var="ANSWER" />
  76 + <c:forEach items="${ANSWER}" var="var" varStatus="vs">
68 77 <th class="center"><div style="width:80px;margin:0 auto;">题目${vs.index+1}</div></th>
69 78 </c:forEach>
70   - <!-- <th class="center"><div style="width:150px;">非选择题得分</div></th> -->
71   - <th class="center"><div style="width:80px;margin:0 auto;">总分</div></th>
  79 +
72 80 </tr>
73 81 </thead>
74 82 <tbody>
75   - <tr>
76   - <td class="center"><div style="width:109px;">--</div></td>
77   - <td class="center"><div style="width:80px;">--</div></td>
78   - <td class="center"><div style="width:80px;">--</div></td>
79   - <td class="center"><div style="width:80px;">--</div></td>
80   - <!-- <td class="center"></td> -->
81   - <td class="center"><div style="width:80px;">--</div></td>
82   - <c:forEach items="${questionInfo}" var="var" varStatus="vs">
83   - <td class="center"><div style="width:80px;margin:0 auto;"><c:set var="key"><c:out value="${vs.index+1}" /></c:set><fmt:formatNumber type="number"
84   - value="${(questionInfo[key] / classInfo.studentNum * 100)}"
85   - maxFractionDigits="1" />%</div></td>
86   - </c:forEach>
87   - <!-- <td class="center"></td> -->
88   - <td class="center"><div style="width:80px;margin:0 auto;"></div></td>
89   - </tr>
  83 +
90 84  
91 85 <c:choose>
92   - <c:when test="${not empty studentInfo}">
93   - <c:forEach items="${studentInfo}" var="var" varStatus="vs">
  86 + <c:when test="${not empty pd.STUDENTS}">
  87 + <c:forEach items="${pd.STUDENTS}" var="var" varStatus="vs">
94 88 <tr>
95   - <td class="center"><div style="width:80px;">${var.NAME}</div></td>
96 89 <td class="center"><div style="width:80px;">${var.RANK_NUM}</div></td>
97   - <td class="center"><div style="width:80px;">${var.GETSCORE}</div></td>
98   - <td class="center"><div style="width:80px;">${var.NUMBER}</div></td>
99   - <td class="center"><div style="width:109px;">${var.KEYPAD_ID}</div></td>
100   - <%-- <td class="center">${var.RIGHT}</td> --%>
101   - <c:forEach items="${questionInfo}" var="var1" varStatus="vs1">
102   - <td class="center" <c:if test="${var.detail[vs1.index].RIGHT== '1'}">style="background:#0bb8b9"</c:if>div style="width:80px;margin:0 auto;">${var.detail[vs1.index].ANSWER}</div></td>
  90 + <td class="center"><div style="width:80px;">${var.NAME}</div></td>
  91 + <td class="center"><div style="width:80px;">${var.SNO}</div></td>
  92 + <td class="center"><div style="width:80px;">${var.KEYPAD_ID}</div></td>
  93 + <td class="center"><div style="width:109px;"><fmt:formatNumber type="number" value="${pd.DATA[vs.index].STUDENT_SCORE/pd.DATA[vs.index].PAPER_SCORE*100}" pattern="#.00"/>%</div></td>
  94 + <td class="center"><div style="width:80px;">${pd.DATA[vs.index].STUDENT_SCORE}</div></td>
  95 +
  96 + <c:forEach items="${ANSWER}" var="var1" varStatus="vs1">
  97 + <c:set value="${ fn:split(ANSWER[vs1.index], ',') }" var="ANSWER1" />
  98 + <td class="center" <c:if test="${ANSWER1[1]== '1'}">style="background:#0bb8b9"</c:if>div style="width:80px;margin:0 auto;">${ANSWER1[0]}</div></td>
103 99 </c:forEach>
104   - <%-- <td class="center">${var.OTHER_SCORE}</td> --%>
105   - <td class="center"><div style="width:80px;margin:0 auto;">${var.GETSCORE}</div></td>
  100 +
  101 +
106 102 </tr>
107 103 </c:forEach>
108 104 </c:when>
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
  View file @6d78f08
... ... @@ -302,7 +302,7 @@
302 302 var url = "<%=basePath%>homework/homework_report?HOMEWORK_ID=" + testpaper_id + "&CLASS_ID=" + class_id;
303 303 var startDate = $("#lastStart").val();
304 304 var endDate = $("#lastEnd").val();
305   - url = url + "&start_date=" + startDate + "&end_date=" + endDate ;
  305 + url = url + "&START_DATE=" + startDate + "&END_DATE=" + endDate ;
306 306 window.self.location.href = url;
307 307 window.top.loading.show();
308 308 }
... ...