孙向锦 / SunvoteEducation

Commit e9e8146364ce6eb3211f24a71bf1938b8debe0e0

Authored by jack
1 parent fa9c9dad

1.添加金太阳id（id=7）识别

Inline Side-by-side
Showing 5 changed files with 217 additions and 9 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
  View file @e9e8146
... ... @@ -50,8 +50,8 @@
50 50 </div>
51 51 <div class="name">
52 52 <p>欢迎！</p>
53   - <p id="school" title="${SNAME }">${SNAME }</p>
54   - <p id="name" title="${SNAME } 管理员">${SNAME }管理员</p>
  53 + <p id="school" title="${adminInfos.SNAME }">${adminInfos.SNAME }</p>
  54 + <p id="name" title="${adminInfos.SNAME } 管理员">${adminInfos.SNAME }管理员</p>
55 55 </br>
56 56 </br>
57 57 </div>
... ... @@ -161,7 +161,7 @@
161 161 <p>
162 162 课后练<span class="right jiao"></span>
163 163 </p>
164   -
  164 +
165 165 <ul class="menu_1">
166 166 <li>
167 167 <p onclick="event.stopPropagation();monitor('${SCHOOL_ID}')">班长管理</p>
... ... @@ -169,10 +169,15 @@
169 169 <li>
170 170 <p id="homework_paper">作业管理</p>
171 171 </li>
  172 + <c:if test="${adminInfos.ID != 7}">
172 173 <li>
173 174 <p id="homework_analysis">作业分析</p>
174 175 </li>
  176 + </c:if>
  177 +
175 178 </ul>
  179 +
  180 +
176 181 </div>
177 182  
178 183 <div class="analyse tab1">
... ... @@ -380,7 +385,29 @@
380 385 window.top.loading.show();
381 386 }
382 387 }
383   -
  388 + function homeWorkList(schoolId){
  389 + //var path = "../school/goEdit2.do?ID=" + schoolId ;
  390 +
  391 + var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER.ID}' ;
  392 +
  393 + $("#mainFrame").attr('src',path);
  394 + window.top.loading.show();
  395 + }
  396 + function homeWork(schoolId){
  397 + //var path = "../school/goEdit2.do?ID=" + schoolId ;
  398 +
  399 + var path = '<%=basePath%>homework/goAdd2.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ;
  400 +
  401 + $("#mainFrame").attr('src',path);
  402 + window.top.loading.show();
  403 + }
  404 +
  405 + function homeReport(){
  406 + var path = '<%=basePath%>homework/report.do?';
  407 +
  408 + $("#mainFrame").attr('src',path);
  409 + window.top.loading.show();
  410 + }
384 411 function chooseListClass(school_id,gradle_id){
385 412 var path = "../sclass/listcs.do?school_id=" + school_id + "&grade_id=" + gradle_id ;
386 413 $("#mainFrame").attr('src',path);
... ... @@ -442,6 +469,12 @@
442 469 $("#mainFrame").attr('src', path);
443 470 window.top.loading.show();
444 471 });
  472 + $("#homework_analysis2").click(function() {
  473 + var path = "../homework/report_goldsun.do?school_id=" + schoolId;
  474 + //$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
  475 + $("#mainFrame").attr('src', path);
  476 + window.top.loading.show();
  477 + });
445 478  
446 479 $("#new_paper").click(function() {
447 480 var path = "../paper/list5.do?school_id=" + schoolId;
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
  View file @e9e8146
... ... @@ -109,7 +109,12 @@
109 109 <a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a>
110 110 </c:if>
111 111 <c:if test="${var.COMPLETE_COUNT == '1'}">
  112 + <c:if test="${pd.SCHOOLID ==7}">
  113 + <a onclick="homeReport2('${var.HOMEWORK_ID}');" ><img src="static/images/view.png" /></a>
  114 + </c:if>
  115 + <c:if test="${pd.SCHOOLID !=7}">
112 116 <a onclick="homeReport('${var.HOMEWORK_ID}');" ><img src="static/images/view.png" /></a>
  117 + </c:if>
113 118 <a onclick="del('${var.HOMEWORK_ID}');" ><img src="static/images/remove.png" /></a>
114 119 </c:if>
115 120  
... ... @@ -201,7 +206,12 @@
201 206 window.top.loading.show();
202 207 }
203 208 function homeReport(homework_id){
204   - var path = '<%=basePath%>homework/report2.do?HOMEWORK_ID='+homework_id;
  209 + var path = '<%=basePath%>homework/report.do?HOMEWORK_ID='+homework_id;
  210 + parent.$("#mainFrame").attr('src',path);
  211 + window.top.loading.show();
  212 + }
  213 + function homeReport2(homework_id){
  214 + var path = '<%=basePath%>homework/report2_goldsun.do?HOMEWORK_ID='+homework_id;
205 215 parent.$("#mainFrame").attr('src',path);
206 216 window.top.loading.show();
207 217 }
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
  View file @e9e8146
... ... @@ -210,6 +210,7 @@
210 210 <script type="text/javascript">
211 211 $(document).ready(function() {
212 212 window.top.loading.remove();
  213 + $(".table_box").css("padding-top",$(".head_box").height());
213 214 });
214 215  
215 216 //检索
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
  View file @e9e8146
... ... @@ -105,14 +105,16 @@
105 105 <p id="practice_manage"
106 106 onclick="event.stopPropagation();homeWorkList('${pd.TEACHER.SCHOOL_ID}')">练习列表</p>
107 107 </li>
108   - <!-- <li>
  108 + <c:if test="${pd.TEACHER.SCHOOL_ID !=7 }">
  109 + <li>
109 110 <p id="practice_do"
110 111 onclick="event.stopPropagation();homeWork('${pd.TEACHER.SCHOOL_ID}')">布置练习</p>
111 112 </li>
112 113 <li>
113 114 <p id="practice_report"
114 115 onclick="event.stopPropagation();homeReport()">练习报表</p>
115   - </li> -->
  116 + </li>
  117 + </c:if>
116 118 </ul>
117 119 </div>
118 120 </div>
... ... @@ -196,7 +198,7 @@
196 198 function homeWorkList(schoolId){
197 199 //var path = "../school/goEdit2.do?ID=" + schoolId ;
198 200  
199   - var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER.ID}' ;
  201 + var path = '<%=basePath%>homework/list.do?schoolId='+schoolId+'&teacher_id=${pd.TEACHER.ID}' ;
200 202  
201 203 $("#mainFrame").attr('src',path);
202 204 window.top.loading.show();
... ...
src/com/fh/controller/sunvote/homework/HomeworkController.java
  View file @e9e8146
... ... @@ -314,6 +314,36 @@ public class HomeworkController extends BaseController {
314 314  
315 315 }
316 316 if(isChineseLanguageClient()){
  317 + modelAndView.setViewName("sunvote/homework/homework_report_bak");
  318 + }else{
  319 + modelAndView.setViewName("sunvote/homework/en_homework_report");
  320 + }
  321 +
  322 + return modelAndView;
  323 + }
  324 +
  325 + /**
  326 + * 传入homework_id
  327 + * 查询该场课后练的整体情况，最高分，最低分，平均分，总分，总题数，未答人数等
  328 + * 未答人数列表
  329 + * @return
  330 + * @throws Exception
  331 + */
  332 + @RequestMapping(value = "/report2_goldsun")
  333 + public ModelAndView report2_goldsun() throws Exception {
  334 + PageData pageData = this.getPageData();
  335 + ModelAndView modelAndView = getModelAndView();
  336 +
  337 + String homeworkId = pageData.getString("HOMEWORK_ID");
  338 + if(!StringUtils.isEmpty(homeworkId.trim())){
  339 + pageData = homeworkService.findById(pageData);
  340 + List<PageData> data = homeworkReporkService.findNoAnswerByHomeworkID(pageData);
  341 + pageData.put("NO_COUNT", data.size());
  342 + modelAndView.addObject("page_data", pageData); // 报表统计情况
  343 + modelAndView.addObject("data", data);// 未答学生列表
  344 +
  345 + }
  346 + if(isChineseLanguageClient()){
317 347 modelAndView.setViewName("sunvote/homework/homework_report");
318 348 }else{
319 349 modelAndView.setViewName("sunvote/homework/en_homework_report");
... ... @@ -380,7 +410,7 @@ public class HomeworkController extends BaseController {
380 410  
381 411  
382 412 /**
383   - * 去修改页面
  413 + * 练习报表
384 414 *
385 415 * @param
386 416 * @throws Exception
... ... @@ -503,6 +533,138 @@ public class HomeworkController extends BaseController {
503 533 }
504 534 pd.remove("JSON");
505 535 if(isChineseLanguageClient()){
  536 + mv.setViewName("sunvote/homework/homework_report_bak");
  537 + }else{
  538 + mv.setViewName("sunvote/homework/en_homework_report");
  539 + }
  540 + mv.addObject("pd", pd);
  541 + return mv;
  542 + }
  543 +
  544 + /**
  545 + * 练习报表
  546 + *
  547 + * @param
  548 + * @throws Exception
  549 + */
  550 + @RequestMapping(value = "/report_goldsun")
  551 + public ModelAndView report_goldsun() throws Exception {
  552 + ModelAndView mv = this.getModelAndView();
  553 + PageData pd = new PageData();
  554 + pd = this.getPageData();
  555 + if(pd.get("SCHOOL_ID") == null || "".equals(pd.get("SCHOOL_ID").toString().trim())){
  556 + pd.put("TEACHER_ID", getTeacherID());
  557 + }
  558 +
  559 +
  560 + if(pd.get("CURRENT_WEEK") == null && pd.get("START_DATE") == null && pd.get("END_DATE") == null){
  561 + pd.put("CURRENT_WEEK", "0");
  562 + String currentWeek = pd.getString("CURRENT_WEEK");
  563 + int current = Integer.parseInt(currentWeek);
  564 + pd.put("START_DATE", getWeekStart(current));
  565 + pd.put("END_DATE", getWeekEnd(current));
  566 + }else if(pd.get("CURRENT_WEEK") != null){
  567 + String currentWeek = pd.getString("CURRENT_WEEK");
  568 + int current = Integer.parseInt(currentWeek);
  569 + pd.put("START_DATE", getWeekStart(current));
  570 + pd.put("END_DATE", getWeekEnd(current));
  571 + }
  572 +
  573 + // 班级信息
  574 + List<PageData> list = coursemanagementService.listTeacherClass(pd);
  575 + for(PageData temp : list){
  576 + temp.remove("HEADMASTER_ID");
  577 + temp.remove("SCHOOL_ID");
  578 + temp.remove("GRADE_ID");
  579 + temp.remove("TEACHER_ID");
  580 + temp.remove("KEYBOARD_TYPE");
  581 + temp.remove("BASESTATION_ID");
  582 + temp.put("CLASS_ID", temp.get("ID"));
  583 + temp.remove("ID");
  584 + }
  585 + if(pd.get("CLASS_ID") == null && list.size() > 0){
  586 + pd.put("CLASS_ID", list.get(0).get("CLASS_ID"));
  587 + }
  588 + pd.put("CLASSES", list);
  589 +
  590 + if (pd.get("CLASS_ID") != null) {
  591 + // 对应班级数据
  592 + PageData data = new PageData();
  593 + List<PageData> studentList = studentService.findByClassId(pd);
  594 + pd.put("COMPLETE_COUNT", "1");
  595 + List<PageData> homeworkList = homeworkService.listAll(pd);
  596 + List<PageData> dataList = homeworkService.report(pd);
  597 + for (PageData stuPd : studentList) {
  598 + double all = 0;
  599 + double get = 0;
  600 + int sc = 0 ;
  601 + int ac = 0 ;
  602 + for (PageData dpd : dataList) {
  603 + if (stuPd.get("ID") != null && dpd.get("STUDENT_ID") != null && dpd.get("STUDENT_ID").equals(stuPd.get("ID")) && isIn(dpd.getString("HOMEWORK_ID"),homeworkList)) {
  604 + stuPd.put(dpd.get("HOMEWORK_ID"),
  605 + dpd.get("STUDENT_SCORE"));
  606 + try {
  607 + get += Double.parseDouble(dpd.get("STUDENT_SCORE")
  608 + .toString());
  609 + } catch (Exception ex) {
  610 +
  611 + }
  612 + try {
  613 + all += Double.parseDouble(dpd.get("PAPER_SCORE")
  614 + .toString());
  615 + } catch (Exception ex) {
  616 +
  617 + }
  618 + try {
  619 + sc += Integer.parseInt(dpd.get("COMPLETE_COUNT")
  620 + .toString());
  621 + } catch (Exception ex) {
  622 +
  623 + }
  624 + try {
  625 + ac += Integer.parseInt(dpd.get("QUESTION_COUNT")
  626 + .toString());
  627 + } catch (Exception ex) {
  628 +
  629 + }
  630 +
  631 + }
  632 + }
  633 + stuPd.put("STUDENT_ALL_SCORE", get);
  634 + stuPd.put("PAPER_ALL_SCORE", all);
  635 + stuPd.put("COMPLETE_COUNT", sc);
  636 + stuPd.put("ALL_COUNT", ac);
  637 + stuPd.remove("SCHOOL_ID");
  638 + stuPd.remove("SEX");
  639 + stuPd.remove("CLASS_ID");
  640 + stuPd.remove("NUMBER");
  641 + stuPd.put("STUDENT_ID", stuPd.get("ID"));
  642 + stuPd.remove("ID");
  643 + }
  644 +
  645 + for (PageData hpd : homeworkList) {
  646 + hpd.remove("QUESTION_COUNT");
  647 + hpd.remove("COMPLETE_COUNT");
  648 + hpd.remove("SUBJECT_ID");
  649 + hpd.remove("SCHOOL_ID");
  650 + hpd.remove("GRADE_ID");
  651 + hpd.remove("SUMBIT_DATE");
  652 + hpd.remove("MODIFY_DATE");
  653 + hpd.remove("TEACHER_ID");
  654 + hpd.remove("CREATE_DATE");
  655 + hpd.remove("CLASS_ID");
  656 + hpd.remove("CODE");
  657 + hpd.remove("GET_MAX_SCORE");
  658 + hpd.remove("HOMEWORK_DESC");
  659 + }
  660 + data.put("HOMEWORKS", homeworkList);//
  661 + data.put("STUDENTS", studentList);
  662 + pd.put("DATA", data);
  663 + }else{
  664 + pd.put("CLASS_ID", "");
  665 + }
  666 + pd.remove("JSON");
  667 + if(isChineseLanguageClient()){
506 668 mv.setViewName("sunvote/homework/homework_report");
507 669 }else{
508 670 mv.setViewName("sunvote/homework/en_homework_report");
... ...