孙向锦 / SunvoteEducation

Commit 4faf63560bd4ab8a3bf075fee6e55e63e92ac960

Authored by jack
1 parent fba7642f

1.修改练习报表

Inline Side-by-side
Showing 1 changed file with 14 additions and 6 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
  View file @4faf635
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 <div class="clear"></div> 50 <div class="clear"></div>
51 </div> 51 </div>
52 <div style="padding-top:3%;margin-top:102px;"> 52 <div style="padding-top:3%;margin-top:102px;">
53 -${pd } 53 +
54 <!-- Nav tabs --> 54 <!-- Nav tabs -->
55 <ul class="nav nav-tabs" role="tablist" style="padding-bottom:3%"> 55 <ul class="nav nav-tabs" role="tablist" style="padding-bottom:3%">
56 56
@@ -102,6 +102,7 @@ ${pd } @@ -102,6 +102,7 @@ ${pd }
102 <th class="center th_name"><div style="width:150px;">姓名</div></th> 102 <th class="center th_name"><div style="width:150px;">姓名</div></th>
103 <th class="center "><div style="width:150px;">课程平均得分率</div></th> 103 <th class="center "><div style="width:150px;">课程平均得分率</div></th>
104 <th class="center"><div style="width:80px;">课程总分</div></th> 104 <th class="center"><div style="width:80px;">课程总分</div></th>
  105 + <th class="center"><div style="width:150px;">个人完成情况</div></th>
105 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> 106 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
106 <th class="center kc"><a 107 <th class="center kc"><a
107 onclick="paper('${pd.CLASS_ID}','${var_h.HOMEWORK_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> 108 onclick="paper('${pd.CLASS_ID}','${var_h.HOMEWORK_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>
@@ -113,6 +114,7 @@ ${pd } @@ -113,6 +114,7 @@ ${pd }
113 <td class="center"><div style="width:150px;">班级课程总分</div></td> 114 <td class="center"><div style="width:150px;">班级课程总分</div></td>
114 <td class="center"><div style="width:150px;"></div></td> 115 <td class="center"><div style="width:150px;"></div></td>
115 <td class="center"><div style="width:80px;"></div></td> 116 <td class="center"><div style="width:80px;"></div></td>
  117 + <td class="center"><div style="width:80px;"></div></td>
116 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> 118 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
117 <td class="center"><div style="width:80px;margin:0 auto;">${var_h.ALL_SCORE}</div></td> 119 <td class="center"><div style="width:80px;margin:0 auto;">${var_h.ALL_SCORE}</div></td>
118 </c:forEach> 120 </c:forEach>
@@ -121,24 +123,27 @@ ${pd } @@ -121,24 +123,27 @@ ${pd }
121 <td class="center"><div style="width:150px;">班级课程平均分</div></td> 123 <td class="center"><div style="width:150px;">班级课程平均分</div></td>
122 <td class="center"><div style="width:150px;"></div></td> 124 <td class="center"><div style="width:150px;"></div></td>
123 <td class="center"><div style="width:80px;"></div></td> 125 <td class="center"><div style="width:80px;"></div></td>
  126 + <td class="center"><div style="width:80px;"></div></td>
124 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> 127 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
125 <td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE}</div></td> 128 <td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE}</div></td>
126 </c:forEach> 129 </c:forEach>
127 </tr> 130 </tr>
128 <tr> 131 <tr>
129 - <td class="center"><div style="width:150px;">完成情况</div></td> 132 + <td class="center"><div style="width:150px;">班级课程平均得分率</div></td>
130 <td class="center"><div style="width:150px;"></div></td> 133 <td class="center"><div style="width:150px;"></div></td>
131 <td class="center"><div style="width:80px;"></div></td> 134 <td class="center"><div style="width:80px;"></div></td>
  135 + <td class="center"><div style="width:80px;"></div></td>
132 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> 136 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
133 <td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE_PERSENT }</div></td> 137 <td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE_PERSENT }</div></td>
134 </c:forEach> 138 </c:forEach>
135 </tr> 139 </tr>
136 <tr> 140 <tr>
137 - <td class="center"><div style="width:150px;">班级课程平均得分率</div></td> 141 + <td class="center"><div style="width:150px;">练习完成情况</div></td>
138 <td class="center"><div style="width:150px;"></div></td> 142 <td class="center"><div style="width:150px;"></div></td>
139 <td class="center"><div style="width:80px;"></div></td> 143 <td class="center"><div style="width:80px;"></div></td>
  144 + <td class="center"><div style="width:80px;"></div></td>
140 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> 145 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
141 - <td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE_PERSENT }</div></td> 146 + <td class="center"><div style="width:80px;margin:0 auto;">${var_h.COMPLETE_DESC }</div></td>
142 </c:forEach> 147 </c:forEach>
143 </tr> 148 </tr>
144 149
@@ -156,6 +161,9 @@ ${pd } @@ -156,6 +161,9 @@ ${pd }
156 value="${var.PAPER_ALL_SCORE == 0 ? 0: (var.STUDENT_ALL_SCORE / var.PAPER_ALL_SCORE * 100)}" 161 value="${var.PAPER_ALL_SCORE == 0 ? 0: (var.STUDENT_ALL_SCORE / var.PAPER_ALL_SCORE * 100)}"
157 maxFractionDigits="2" />%</div></td> 162 maxFractionDigits="2" />%</div></td>
158 <td class="center"><div style="width:80px;margin:0 auto;">${var.PAPER_ALL_SCORE}</div></td> 163 <td class="center"><div style="width:80px;margin:0 auto;">${var.PAPER_ALL_SCORE}</div></td>
  164 + <td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number"
  165 + value="${var.ALL_COUNT == 0 ? 0: (var.COMPLETE_COUNT / var.ALL_COUNT * 100)}"
  166 + maxFractionDigits="2" />%</div></td>
159 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var1" varStatus="vs1"> 167 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var1" varStatus="vs1">
160 <td class="center"><div style="width:80px;margin:0 auto;"><c:set var="TEST_ID" 168 <td class="center"><div style="width:80px;margin:0 auto;"><c:set var="TEST_ID"
161 value="${var1.HOMEWORK_ID}" /> ${var[TEST_ID] }</div></td> 169 value="${var1.HOMEWORK_ID}" /> ${var[TEST_ID] }</div></td>
@@ -338,8 +346,8 @@ ${pd } @@ -338,8 +346,8 @@ ${pd }
338 var options = { 346 var options = {
339 width: _width, 347 width: _width,
340 height: _heigh, 348 height: _heigh,
341 - pinnedRows: 4,  
342 - pinnedCols: 3, 349 + pinnedRows: 5,
  350 + pinnedCols: 4,
343 container: "#scrollableTable", 351 container: "#scrollableTable",
344 removeOriginal: true 352 removeOriginal: true
345 }; 353 };