孙向锦 / SunvoteEducation

Commit 63f5e2f0c3c1f7bdf8b714007bd4e8185e2f73ea

Authored by 孙向锦
2 parents 41bc74d2 42d54a48

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

Inline Side-by-side
Showing 1 changed file with 21 additions and 36 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
  View file @63f5e2f
... ... @@ -3,6 +3,7 @@
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 5 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
  6 +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
6 7 <%
7 8 String path = request.getContextPath();
8 9 String basePath = request.getScheme() + "://"
... ... @@ -43,50 +44,36 @@
43 44 <ul class="nav nav-tabs" role="tablist">
44 45  
45 46  
46   - <c:forEach items="${pd.CLASS}" var="var" varStatus="vs">
47   - <li role="presentation" class="${vs.index==0?'active':''}"><a href="#${var.ID}" aria-controls="${var.ID}" role="tab" data-toggle="tab">${var.CLASS_NAME}</a></li>
  47 + <c:forEach items="${pd.CLASSES}" var="var" varStatus="vs">
  48 + <li role="presentation" class="${vs.index==0?'active':''}"><a href="#${var.CLASS_ID}" aria-controls="${var.CLASS_ID}" role="tab" data-toggle="tab">${var.CLASS_NAME}</a></li>
48 49 </c:forEach>
49 50  
50 51 </ul>
51 52  
52   - <!-- Tab panes -->
53   - <div class="tab-content">
54   -
55   - <c:forEach items="${pd.CLASS}" var="var" varStatus="vs">
56   - <div role="tabpanel" class="tab-pane ${vs.index==0?'active':''}" id="${var.ID}">
57   - ${var.CLASS_NAME}
  53 +
58 54 <div style="padding:20px 20px;">
59 55 <form action="report/report.do" method="post" name="Form" id="Form" style="margin-bottom:0;">
60 56 <input type="hidden" name="CLASSID" id="CLASSID" value="${var.ID}" />
61 57 <input type="hidden" name="ROLE" id="ROLE" value="${pd.ROLE}" />
62 58 <table style="margin-top:5px;margin-bottom:20px;">
63 59 <tr>
64   - <td><div style="width:150px;text-align:center;">课程统计: ${fn:length(var.HOMEWORKS)}</div></td>
65   - <td><div style="width:150px;text-align:center;">班级名册: ${var.CLASS_NAME}</div></td>
  60 + <td><div style="width:150px;text-align:center;">课程统计: ${fn:length(pd.DATA.HOMEWORKS)}</div></td>
  61 + <td><div style="width:150px;text-align:center;">班级名册: ${myelfun:findClassName(pd.CLASS_ID)}</div></td>
66 62  
67   - <td><div style="width:150px;text-align:center;"><span>学生人数: ${var.STUDENT_NUM}</span></div></td>
  63 + <td><div style="width:150px;text-align:center;"><span>学生人数: ${fn:length(pd.DATA.STUDENTS)}</span></div></td>
68 64 <td></td>
69 65  
70 66  
71   - <c:if test="${not empty subjectInfos}">
72   - <td>
73   - <select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入所属学校">
74   - <option value="">全部</option>
75   - <c:forEach var="item" items="${subjectInfos}">
76   - <option value="${item.SUBJECT_ID}" <c:if test="${pd.SUBJECT_ID == item.SUBJECT_ID }">selected = ture</c:if>>${item.SCNAME}</option>
77   - </c:forEach>
78   - </select>
79   - </td>
80   - </c:if>
  67 +
81 68 <td style="padding-left:2px;">
82 69 <input
83 70 class="span10 date-picker" name="lastStart" id="lastStart"
84   - value="${start_date}" type="text" data-date-format="yyyy-mm-dd"
  71 + value="${pd.START_DATE}" type="text" data-date-format="yyyy-mm-dd"
85 72 readonly="readonly" style="width:88px;" placeholder="开始日期"
86 73 title="开始日期" />
87 74 </td>
88 75 <td style="padding-left:2px;"><input
89   - class="span10 date-picker" name="lastEnd" id="lastEnd" value="${end_date}"
  76 + class="span10 date-picker" name="lastEnd" id="lastEnd" value="${pd.END_DATE}"
90 77 type="text" data-date-format="yyyy-mm-dd" readonly="readonly"
91 78 style="width:88px;" placeholder="结束日期" title="结束日期" /></td>
92 79 <td style="vertical-align:top;padding-left:2px"><a
... ... @@ -105,9 +92,9 @@
105 92 <th class="center th_name"><div style="width:150px;">姓名</div></th>
106 93 <th class="center "><div style="width:150px;">课程平均得分率</div></th>
107 94 <th class="center"><div style="width:80px;">课程总分</div></th>
108   - <c:forEach items="${var.HOMEWORKS}" var="var_h" varStatus="vs">
  95 + <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
109 96 <th class="center kc"><a
110   - onclick="paper('${info.CLASS_ID}','${var.TESTPAPER_ID}');"><div style="width:180px; margin: 0 auto;cursor:hand" class="font">${var_h.NAME}</br><span>${var_h.SUMBIT_DATE}</span></div></a></th>
  97 + onclick="paper('${info.CLASS_ID}','${var.TESTPAPER_ID}');"><div style="width:180px; margin: 0 auto;cursor:hand" class="font">${var_h.NAME}</br><span>${var_h.COMPLETE_DATE}</span></div></a></th>
111 98 </c:forEach>
112 99 </tr>
113 100 </thead>
... ... @@ -116,7 +103,7 @@
116 103 <td class="center"><div style="width:150px;">班级课程总分</div></td>
117 104 <td class="center"><div style="width:150px;"></div></td>
118 105 <td class="center"><div style="width:80px;"></div></td>
119   - <c:forEach items="${var.HOMEWORKS}" var="var_h" varStatus="vs">
  106 + <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
120 107 <td class="center"><div style="width:80px;margin:0 auto;">${var_h.ALL_SCORE}</div></td>
121 108 </c:forEach>
122 109 </tr>
... ... @@ -124,7 +111,7 @@
124 111 <td class="center"><div style="width:150px;">班级课程平均分</div></td>
125 112 <td class="center"><div style="width:150px;"></div></td>
126 113 <td class="center"><div style="width:80px;"></div></td>
127   - <c:forEach items="${var.HOMEWORKS}" var="var_h" varStatus="vs">
  114 + <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
128 115 <td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE}</div></td>
129 116 </c:forEach>
130 117 </tr>
... ... @@ -132,14 +119,14 @@
132 119 <td class="center"><div style="width:150px;">班级课程平均得分率</div></td>
133 120 <td class="center"><div style="width:150px;"></div></td>
134 121 <td class="center"><div style="width:80px;"></div></td>
135   - <c:forEach items="${var.HOMEWORKS}" var="var_h" varStatus="vs">
  122 + <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
136 123 <td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE_PERSENT }</div></td>
137 124 </c:forEach>
138 125 </tr>
139 126  
140 127 <c:choose>
141   - <c:when test="${not empty $var.HOMEWORKS}">
142   - <c:forEach items="${studentList}" var="var" varStatus="vs">
  128 + <c:when test="${not empty pd.DATA.STUDENTS}">
  129 + <c:forEach items="${pd.DATA.STUDENTS}" var="var" varStatus="vs">
143 130 <tr>
144 131 <%-- <td class="center"><a
145 132 href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a>
... ... @@ -150,10 +137,10 @@
150 137 <td class="center"><div style="width:150px;"><fmt:formatNumber type="number"
151 138 value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}"
152 139 maxFractionDigits="2" />%</div></td>
153   - <td class="center"><div style="width:80px;margin:0 auto;">${var.GETSCORE }</div></td>
154   - <c:forEach items="${testpaperList}" var="var1" varStatus="vs1">
  140 + <td class="center"><div style="width:80px;margin:0 auto;">${var.GET_SCORE_PERSENT }</div></td>
  141 + <c:forEach items="${pd.DATA.HOMEWORKS}" var="var1" varStatus="vs1">
155 142 <td class="center"><div style="width:180px;margin:0 auto;"><c:set var="TEST_ID"
156   - value="${var1.TESTPAPER_ID}" /> ${var[TEST_ID] }</div></td>
  143 + value="${var1.HOMEWORK_ID}" /> ${var[TEST_ID] }</div></td>
157 144 </c:forEach>
158 145 </tr>
159 146 </c:forEach>
... ... @@ -167,9 +154,7 @@
167 154 </div>
168 155  
169 156  
170   - </div>
171   - </c:forEach>
172   - </div>
  157 +
173 158  
174 159 </div>
175 160  
... ...