孙向锦 / SunvoteEducation

Commit f4117436ef6d336b3b77cda4a0ae3aacbc2c4dac

Authored by jack
1 parent 0184fec5

1.bug修复

Inline Side-by-side
Showing 5 changed files with 19 additions and 16 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report_bak.jsp
  View file @f411743
@@ -103,7 +103,7 @@ @@ -103,7 +103,7 @@
103 <th class="center th_name"><div style="width:150px;">姓名</div></th> 103 <th class="center th_name"><div style="width:150px;">姓名</div></th>
104 <th class="center "><div style="width:150px;">课程平均得分率</div></th> 104 <th class="center "><div style="width:150px;">课程平均得分率</div></th>
105 <th class="center"><div style="width:80px;">课程总分</div></th> 105 <th class="center"><div style="width:80px;">课程总分</div></th>
106 - <th class="center"><div style="width:150px;">个人完成情况</div></th> 106 + <!-- <th class="center"><div style="width:150px;">个人完成情况</div></th> -->
107 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> 107 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
108 <th class="center kc"><a 108 <th class="center kc"><a
109 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> 109 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>
@@ -115,7 +115,7 @@ @@ -115,7 +115,7 @@
115 <td class="center"><div style="width:150px;">班级课程总分</div></td> 115 <td class="center"><div style="width:150px;">班级课程总分</div></td>
116 <td class="center"><div style="width:150px;"></div></td> 116 <td class="center"><div style="width:150px;"></div></td>
117 <td class="center"><div style="width:80px;"></div></td> 117 <td class="center"><div style="width:80px;"></div></td>
118 - <td class="center"><div style="width:80px;"></div></td> 118 + <!-- <td class="center"><div style="width:80px;"></div></td> -->
119 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> 119 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
120 <td class="center"><div style="width:80px;margin:0 auto;">${var_h.ALL_SCORE}</div></td> 120 <td class="center"><div style="width:80px;margin:0 auto;">${var_h.ALL_SCORE}</div></td>
121 </c:forEach> 121 </c:forEach>
@@ -124,25 +124,26 @@ @@ -124,25 +124,26 @@
124 <td class="center"><div style="width:150px;">班级课程平均分</div></td> 124 <td class="center"><div style="width:150px;">班级课程平均分</div></td>
125 <td class="center"><div style="width:150px;"></div></td> 125 <td class="center"><div style="width:150px;"></div></td>
126 <td class="center"><div style="width:80px;"></div></td> 126 <td class="center"><div style="width:80px;"></div></td>
127 - <td class="center"><div style="width:80px;"></div></td> 127 + <!-- <td class="center"><div style="width:80px;"></div></td> -->
128 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> 128 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
129 - <td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE}</div></td> 129 + <td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number" value="${var_h.GET_SCORE}" pattern="#.00"/>%</div></td>
130 </c:forEach> 130 </c:forEach>
131 </tr> 131 </tr>
132 <tr> 132 <tr>
133 <td class="center"><div style="width:150px;">班级课程平均得分率</div></td> 133 <td class="center"><div style="width:150px;">班级课程平均得分率</div></td>
134 <td class="center"><div style="width:150px;"></div></td> 134 <td class="center"><div style="width:150px;"></div></td>
135 <td class="center"><div style="width:80px;"></div></td> 135 <td class="center"><div style="width:80px;"></div></td>
136 - <td class="center"><div style="width:80px;"></div></td> 136 + <!-- <td class="center"><div style="width:80px;"></div></td> -->
137 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> 137 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
138 - <td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE_PERSENT }</div></td> 138 +
  139 + <td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number" value="${fn:replace(var_h.GET_SCORE_PERSENT, '%', '')}" pattern="#.00"/>%</div></td>
139 </c:forEach> 140 </c:forEach>
140 </tr> 141 </tr>
141 <tr> 142 <tr>
142 <td class="center"><div style="width:150px;">练习完成情况</div></td> 143 <td class="center"><div style="width:150px;">练习完成情况</div></td>
143 <td class="center"><div style="width:150px;"></div></td> 144 <td class="center"><div style="width:150px;"></div></td>
144 <td class="center"><div style="width:80px;"></div></td> 145 <td class="center"><div style="width:80px;"></div></td>
145 - <td class="center"><div style="width:80px;"></div></td> 146 + <!-- <td class="center"><div style="width:80px;"></div></td> -->
146 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> 147 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
147 <td class="center"><div style="width:80px;margin:0 auto;">${var_h.COMPLETE_DESC }</div></td> 148 <td class="center"><div style="width:80px;margin:0 auto;">${var_h.COMPLETE_DESC }</div></td>
148 </c:forEach> 149 </c:forEach>
@@ -162,9 +163,9 @@ @@ -162,9 +163,9 @@
162 value="${var.PAPER_ALL_SCORE == 0 ? 0: (var.STUDENT_ALL_SCORE / var.PAPER_ALL_SCORE * 100)}" 163 value="${var.PAPER_ALL_SCORE == 0 ? 0: (var.STUDENT_ALL_SCORE / var.PAPER_ALL_SCORE * 100)}"
163 maxFractionDigits="2" />%</div></td> 164 maxFractionDigits="2" />%</div></td>
164 <td class="center"><div style="width:80px;margin:0 auto;">${var.PAPER_ALL_SCORE}</div></td> 165 <td class="center"><div style="width:80px;margin:0 auto;">${var.PAPER_ALL_SCORE}</div></td>
165 - <td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number" 166 + <!-- <td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number"
166 value="${var.ALL_COUNT == 0 ? 0: (var.COMPLETE_COUNT / var.ALL_COUNT * 100)}" 167 value="${var.ALL_COUNT == 0 ? 0: (var.COMPLETE_COUNT / var.ALL_COUNT * 100)}"
167 - maxFractionDigits="2" />%</div></td> 168 + maxFractionDigits="2" />%</div></td> -->
168 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var1" varStatus="vs1"> 169 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var1" varStatus="vs1">
169 <td class="center"><div style="width:80px;margin:0 auto;"><c:set var="TEST_ID" 170 <td class="center"><div style="width:80px;margin:0 auto;"><c:set var="TEST_ID"
170 value="${var1.HOMEWORK_ID}" /> ${var[TEST_ID] }</div></td> 171 value="${var1.HOMEWORK_ID}" /> ${var[TEST_ID] }</div></td>
WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp
  View file @f411743
@@ -118,7 +118,7 @@ li { @@ -118,7 +118,7 @@ li {
118 var URL = '<%=basePath%>${URL}'; 118 var URL = '<%=basePath%>${URL}';
119 var data = ${data}; 119 var data = ${data};
120 </script> 120 </script>
121 - <script src="../static/js/home_control1.js?a=3"></script> 121 + <script src="../static/js/home_control1.js?a=4"></script>
122 <!-- 日期框 --> 122 <!-- 日期框 -->
123 <script> 123 <script>
124 //lay('#version').html('-v'+ laydate.v); 124 //lay('#version').html('-v'+ laydate.v);
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
  View file @f411743
@@ -105,7 +105,7 @@ @@ -105,7 +105,7 @@
105 <p id="practice_manage" 105 <p id="practice_manage"
106 onclick="event.stopPropagation();homeWorkList('${pd.TEACHER.SCHOOL_ID}')">练习列表</p> 106 onclick="event.stopPropagation();homeWorkList('${pd.TEACHER.SCHOOL_ID}')">练习列表</p>
107 </li> 107 </li>
108 - <c:if test="${pd.TEACHER.SCHOOL_ID !=7 }"> 108 + <c:if test="${pd.TEACHER.SCHOOL_ID !='7' }">
109 <li> 109 <li>
110 <p id="practice_do" 110 <p id="practice_do"
111 onclick="event.stopPropagation();homeWork('${pd.TEACHER.SCHOOL_ID}')">布置练习</p> 111 onclick="event.stopPropagation();homeWork('${pd.TEACHER.SCHOOL_ID}')">布置练习</p>
WebRoot/static/js/home_control1.js
  View file @f411743
@@ -22,12 +22,13 @@ @@ -22,12 +22,13 @@
22 console.log(data.DATA.length); 22 console.log(data.DATA.length);
23 for(var j=0;j<data.DATA.length;j++){ 23 for(var j=0;j<data.DATA.length;j++){
24 home_all_score+=parseInt(data.DATA[j].PAPER_SCORE); 24 home_all_score+=parseInt(data.DATA[j].PAPER_SCORE);
25 - home_avg_score+=parseInt(data.DATA[j].AVG_SCORE);  
26 - home_max_score+=parseInt(data.DATA[j].GET_MAX_SCORE); 25 + home_avg_score+=typeof(data.DATA[j].AVG_SCORE)=="undefined"?0:parseInt(data.DATA[j].AVG_SCORE);
  26 + home_max_score+=typeof(data.DATA[j].GET_MAX_SCORE)=="undefined"?0:parseInt(data.DATA[j].GET_MAX_SCORE);
27 home_get_score+=parseInt(data.DATA[j].STUDENT_SCORE); 27 home_get_score+=parseInt(data.DATA[j].STUDENT_SCORE);
28 28
29 } 29 }
30 30
  31 +
31 $(".content_l ul").html(_html); 32 $(".content_l ul").html(_html);
32 33
33 dataMethod(_index,data_temp); 34 dataMethod(_index,data_temp);
@@ -94,8 +95,9 @@ @@ -94,8 +95,9 @@
94 var GETSCORE = parseFloat(home_get_score); 95 var GETSCORE = parseFloat(home_get_score);
95 var TOTALSCORE = parseFloat(home_all_score); 96 var TOTALSCORE = parseFloat(home_all_score);
96 var ratio=(GETSCORE/TOTALSCORE*100).toFixed(2); 97 var ratio=(GETSCORE/TOTALSCORE*100).toFixed(2);
97 - var class_avg= (home_avg_score/ home_all_score*100).toFixed(2);  
98 - var class_max=(home_max_score/ home_all_score*100).toFixed(2); 98 +
  99 + var class_avg= (home_avg_score*100/ home_all_score).toFixed(2);
  100 + var class_max=(home_max_score*100/ home_all_score).toFixed(2);
99 101
100 var test_num=data.DATA.length; 102 var test_num=data.DATA.length;
101 var part_num=test_num; 103 var part_num=test_num;
src/com/fh/controller/sunvote/homework/HomeworkController.java
  View file @f411743
@@ -277,7 +277,7 @@ public class HomeworkController extends BaseController { @@ -277,7 +277,7 @@ public class HomeworkController extends BaseController {
277 ca.set(Calendar.DAY_OF_WEEK, a); // Sunday 277 ca.set(Calendar.DAY_OF_WEEK, a); // Sunday
278 ca.add(Calendar.DATE, cur * 7); 278 ca.add(Calendar.DATE, cur * 7);
279 String weekEnd = format.format(ca.getTime()); 279 String weekEnd = format.format(ca.getTime());
280 - return weekEnd; 280 + return weekEnd + " 00:00:00";
281 } 281 }
282 282
283 public static String getWeekEnd(int cur){ 283 public static String getWeekEnd(int cur){