diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index f3a263d..e5c1bf2 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +encoding//WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp=UTF-8 encoding//WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp=UTF-8 encoding//WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp=UTF-8 encoding//WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp=UTF-8 diff --git a/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_edit2.jsp new file mode 100644 index 0000000..40cc522 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_edit2.jsp @@ -0,0 +1,103 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + + <%@ include file="../../system/index/top.jsp"%> + + + + + + + +
+ +
+
+
+
+
+ +
+ +
+ + + + + + + + + +
Course name: + +
+ Save + Cancel +
+
+ +
+
+ +
+ +
+ +
+
+ +
+ + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp new file mode 100644 index 0000000..236919f --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp @@ -0,0 +1,184 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + + + + + + + + + + +
+ + +
+
+
+

+ Grade management +

+
+
+
+
+
+ + + + + + + + + + + +
NumberGrade nameGrade description
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
${vs.index+1}${var.NAME}${var.DESC}
There is no data
+
+
+ +
+
+ +
+
+ + +
+
+
+
+ + + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_edit2.jsp new file mode 100644 index 0000000..ec98a78 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_edit2.jsp @@ -0,0 +1,152 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + + <%@ include file="../../system/index/top.jsp"%> + + + + + + + +
+ +
+
+
+
+
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Class: + +
Name:
User Name:
Password:
Contact number:
+ Save + Cancel +
+
+ +
+
+ +
+ +
+ +
+
+ +
+ + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp new file mode 100644 index 0000000..9afe34f --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp @@ -0,0 +1,190 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + +中天电子-教育管理系统 + + + + + + + + + + + + + + + + +
+ + +
+
+
+

+ Monitor Management +

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + +
NumberNameUser NamePasswordContact NumberClassOperation
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${vs.index+1}${var.NAME}${var.USERNAME}${var.PASSWORD}${var.PHONE}${var.CLASS_NAME}
There is no data
+
+
+ +
+
+ +
+ +
+ +
+
+
+
+ + + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_edit2.jsp new file mode 100644 index 0000000..02f3a89 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_edit2.jsp @@ -0,0 +1,297 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%> + +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + + + + + + + + + + + + +
+ +
+
+
+
+
+
+
+

+ Arrange Exercise +

+
+
+
+
+ +
+ + + + + + + + + + + + + + +
Exercise Title
Exercise Description
Assign completed time of class +
+
    + +
  • + + + ${myelfun:findClassName(pd.CLASS_ID)} + +
    • +     + +
+
+ +
+
+
+
+ + + + + + + + + + + + + +
question number-+option number-+score-+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
${var.RANK} +
+
    + + + +
  • on ">${a}
    • +     + +
+
+ + 		option number-+score-+
There is no data
+
+
+ + +
+ + + + +
+ +
+ +
+ +
+
+ +
+ + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp new file mode 100644 index 0000000..0c86a51 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp @@ -0,0 +1,231 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + + + + + + + + + + +
+ +
+
+
+

+ Exercise List +

+
+
+ + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
NumberExercise ListAssignment timeCompletion timeClassItem numberCompletion SituationTotal scoreOperation
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${vs.index+1}${var.NAME}(${myelfun:findClassName(var.CLASS_ID)})${var.CREATE_DATE}${var.COMPLETE_DATE}${myelfun:findClassName(var.CLASS_ID)}${var.QUESTION_COUNT}${var.COMPLETE_COUNT == "0" ? "Unfinished":"Finished"}${var.ALL_SCORE} + + + + + + + + +
There is no data
+
+
style="display:none;"> + +
+
+ +
+
+ + +
+
+
+
+ + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp new file mode 100644 index 0000000..cde39be --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp @@ -0,0 +1,365 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + + +${info.CLASS_NAME}Scores report + + + + + + + + + + + + + + +
+
+

+ Exercise Report +

+
+
+
+
+ + + + + +
+
+ + + + + + + + + + + + + + + + + + + +
Course statistics: ${fn:length(pd.DATA.HOMEWORKS)}
Class roster: ${myelfun:findClassName(pd.CLASS_ID)}
student number: ${fn:length(pd.DATA.STUDENTS)}
 + — +
  • Last week
  • Next week
    • +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + + +
    Name
    Average score of the course
    Course total scores
    Personal performance
    ${var_h.NAME}
    ${var_h.COMPLETE_DATE}
    course total scores of class
    ${var_h.ALL_SCORE}
    Class average score
    ${var_h.GET_SCORE}
    course average correct rate of class
    ${var_h.GET_SCORE_PERSENT }
    Exercise finish situation
    ${var_h.COMPLETE_DESC }
    ${var.NAME} + +
    %
    ${var.PAPER_ALL_SCORE}
    %
    ${var[TEST_ID] }
    + +
    +
    +
    + + + + +
    + + + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + + + + + + + + + diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp new file mode 100644 index 0000000..fac50cc --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp @@ -0,0 +1,156 @@ + + + +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + +班级-测试名单 + + + + + + + + + + + + + + + + + + + + + + +
    + +
    +
    +
    + +
    +
    +
    +
    +

    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    +

    + Class average score0.0% +

    +
    +
    +

    + Highest grade rate in class0.0% +

    +
    +
    + + +
    +
    +
    +
    Comparison chart of correct rate
    +
    +
    +
      +
    • Class average
      • +
    • Student personal
      • +
    • Highest score in class
      • +
      +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_view.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_view.jsp new file mode 100644 index 0000000..7f1f710 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_view.jsp @@ -0,0 +1,190 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%> + +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + + + + + + + + + + + + +
    + +
    +
    +
    +
    +
    +
    +
    +

    + Exercise Preview +

    +
    +
    +
    +
    + +
    + + + + + + + + + + + + + + +
    exercise title
    exercise description
    Assign completed time of class +
    +
      + +
    • + + + ${myelfun:findClassName(pd.CLASS_ID)} + +
      • +       + +
    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + +
    question numberoption numberscore
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ${var.RANK} +
    +
      + + + +
    • on ">${a}
      • +       + +
    +
    + +     		option numberscore
    There is no data
    +
    +
    +
    +
    + + + Quit +
    +
    + +
    + + + + +
    + +
    + +
    + +
    +
    + +
    + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_edit.jsp new file mode 100644 index 0000000..f6170cf --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_edit.jsp @@ -0,0 +1,178 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + + <%@ include file="../../system/index/top.jsp"%> + + + + + +
    + +
    +
    +
    +
    +
    + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Template name:
    School:
    Subject:
    Grade:
    User ID:
    Total score:
    Template content:
    + Save + Cancel +
    +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp new file mode 100644 index 0000000..f3e51e5 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp @@ -0,0 +1,353 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + + + + + + + + + +
    + +
    +
    +
    +

    + Template management +

    +
    +
    +
    +
    + +
    + + + + + + + + + + + + + + + + + +
    NumberTemplate nameSubjectGradeTotal scoreoperation
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ${vs.index+1}${var.NAME}${myelfun:findSubjectCName(var.SUBJECT_ID)}${myelfun:findGradeName(var.GRADE_ID)}${var.PAGE_SCORE} +
    There is no data
    +
    +
    + +
    +
    + +
    +
    + + +
    +
    +
    +
    + + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/school/en_school_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/school/en_school_edit2.jsp new file mode 100644 index 0000000..da5030b --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/school/en_school_edit2.jsp @@ -0,0 +1,160 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + + + + + + + + +
    + +
    +
    +
    +

    + School Management +

    +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    + + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + \ No newline at end of file diff --git a/src/com/fh/controller/sunvote/grade/GradeController.java b/src/com/fh/controller/sunvote/grade/GradeController.java index 058b1dd..663d244 100644 --- a/src/com/fh/controller/sunvote/grade/GradeController.java +++ b/src/com/fh/controller/sunvote/grade/GradeController.java @@ -150,9 +150,13 @@ public class GradeController extends BaseController { pd.put("keywords", keywords.trim()); } page.setPd(pd); - + page.setLangIsChina(isChineseLanguageClient()); List varList = gradeService.datalistPageInSchool(page); //列出Grade列表 - mv.setViewName("sunvote/grade/grade_list2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/grade/grade_list2"); + }else{ + mv.setViewName("sunvote/grade/en_grade_list2"); + } mv.addObject("varList", varList); mv.addObject("pd", pd); mv.addObject("QX",Jurisdiction.getHC()); //按钮权限 @@ -184,7 +188,11 @@ public class GradeController extends BaseController { pd = this.getPageData(); List list = gradeService.listAllNot(pd); mv.addObject("gradeList", list); - mv.setViewName("sunvote/grade/grade_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/grade/grade_edit2"); + }else{ + mv.setViewName("sunvote/grade/en_grade_edit2"); + } mv.addObject("msg", "save2"); mv.addObject("pd", pd); return mv; diff --git a/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java b/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java index 6def87a..b390f6c 100644 --- a/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java +++ b/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java @@ -161,8 +161,14 @@ public class HeadmasterController extends BaseController { pd.put("keywords", keywords.trim()); } page.setPd(pd); + page.setLangIsChina(isChineseLanguageClient()); List varList = headmasterService.listClass(page); //列出Headmaster列表 - mv.setViewName("sunvote/headmaster/headmaster_list2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/headmaster/headmaster_list2"); + }else{ + mv.setViewName("sunvote/headmaster/en_headmaster_list2"); + } + mv.addObject("varList", varList); mv.addObject("pd", pd); return mv; @@ -192,7 +198,11 @@ public class HeadmasterController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - mv.setViewName("sunvote/headmaster/headmaster_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/headmaster/headmaster_edit2"); + }else{ + mv.setViewName("sunvote/headmaster/en_headmaster_edit2"); + } List classes = headmasterService.listNoHeaderClass(pd); mv.addObject("classes",classes); mv.addObject("msg", "save2"); @@ -232,7 +242,11 @@ public class HeadmasterController extends BaseController { List classes = new ArrayList(); classes.add(classPageData); mv.addObject("classes",classes); - mv.setViewName("sunvote/headmaster/headmaster_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/headmaster/headmaster_edit2"); + }else{ + mv.setViewName("sunvote/headmaster/en_headmaster_edit2"); + } mv.addObject("msg", "edit2"); mv.addObject("pd", pd); return mv; diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java index 6ff58c7..b7a2140 100644 --- a/src/com/fh/controller/sunvote/homework/HomeworkController.java +++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java @@ -141,8 +141,14 @@ public class HomeworkController extends BaseController { pd.put("keywords", keywords.trim()); } page.setPd(pd); + page.setLangIsChina(isChineseLanguageClient()); List varList = homeworkService.list(page); // 列出Homework列表 - mv.setViewName("sunvote/homework/homework_list"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/homework/homework_list"); + }else{ + mv.setViewName("sunvote/homework/en_homework_list"); + } + mv.addObject("varList", varList); mv.addObject("pd", pd); mv.addObject("QX", Jurisdiction.getHC()); // 按钮权限 @@ -180,7 +186,11 @@ public class HomeworkController extends BaseController { // 添加科目ID pd.put("TEACHER_ID", getTeacherID()); pd.put("SUBJECT_ID", homeworkService.querySubjectId(pd)); - mv.setViewName("sunvote/homework/homework_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/homework/homework_edit2"); + }else{ + mv.setViewName("sunvote/homework/en_homework_edit2"); + } mv.addObject("msg", "save"); mv.addObject("operation", "add"); mv.addObject("pd", pd); @@ -219,7 +229,11 @@ public class HomeworkController extends BaseController { pd = homeworkService.findById(pd); // 根据ID读取 pd.put("QUESTIONS", homeworkproblemService.listProblem(pd)); pd.put("TEACHER_ID", getTeacherID()); - mv.setViewName("sunvote/homework/homework_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/homework/homework_edit2"); + }else{ + mv.setViewName("sunvote/homework/en_homework_edit2"); + } mv.addObject("msg", "edit"); mv.addObject("operation", "edit"); mv.addObject("pd", pd); @@ -240,7 +254,11 @@ public class HomeworkController extends BaseController { pd = homeworkService.findById(pd); // 根据ID读取 pd.put("QUESTIONS", homeworkproblemService.listProblem(pd)); pd.put("TEACHER_ID", getTeacherID()); - mv.setViewName("sunvote/homework/homework_view"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/homework/homework_view"); + }else{ + mv.setViewName("sunvote/homework/en_homework_view"); + } mv.addObject("msg", "edit"); mv.addObject("operation", "view"); mv.addObject("pd", pd); @@ -394,7 +412,11 @@ public class HomeworkController extends BaseController { pd.put("CLASS_ID", ""); } pd.remove("JSON"); - mv.setViewName("sunvote/homework/homework_report"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/homework/homework_report"); + }else{ + mv.setViewName("sunvote/homework/en_homework_report"); + } mv.addObject("pd", pd); return mv; } @@ -434,7 +456,12 @@ public class HomeworkController extends BaseController { } pd.remove("JSON"); pd.put("STUDENT_ID", studentId); - mv.setViewName("sunvote/homework/homework_student_report"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/homework/homework_student_report"); + }else{ + mv.setViewName("sunvote/homework/en_homework_student_report"); + } + mv.addObject("pd", pd); Gson gson = new Gson(); mv.addObject("data",gson.toJson(pd)); diff --git a/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java b/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java index 1902509..10e2047 100644 --- a/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java +++ b/src/com/fh/controller/sunvote/pagetemplate/PageTemplateController.java @@ -179,8 +179,14 @@ public class PageTemplateController extends BaseController { pd.put("keywords", keywords.trim()); } page.setPd(pd); + page.setLangIsChina(isChineseLanguageClient()); List varList = pagetemplateService.list(page); //列出PageTemplate列表 - mv.setViewName("sunvote/pagetemplate/pagetemplate_list2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/pagetemplate/pagetemplate_list2"); + }else{ + mv.setViewName("sunvote/pagetemplate/en_pagetemplate_list2"); + } + List gradeList = schoolgradesubjectService.listAllGrade(pd); List subjectList = schoolgradesubjectService.listAllSubject(pd); mv.addObject("varList", varList); @@ -201,7 +207,11 @@ public class PageTemplateController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - mv.setViewName("sunvote/pagetemplate/pagetemplate_edit"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/pagetemplate/pagetemplate_edit"); + }else{ + mv.setViewName("sunvote/pagetemplate/en_pagetemplate_edit"); + } mv.addObject("msg", "save"); mv.addObject("pd", pd); return mv; @@ -217,7 +227,11 @@ public class PageTemplateController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd = pagetemplateService.findById(pd); //根据ID读取 - mv.setViewName("sunvote/pagetemplate/pagetemplate_edit"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/pagetemplate/pagetemplate_edit"); + }else{ + mv.setViewName("sunvote/pagetemplate/en_pagetemplate_edit"); + } mv.addObject("msg", "edit"); mv.addObject("pd", pd); return mv; diff --git a/src/com/fh/controller/sunvote/school/SchoolController.java b/src/com/fh/controller/sunvote/school/SchoolController.java index 262bfc5..f8538c6 100644 --- a/src/com/fh/controller/sunvote/school/SchoolController.java +++ b/src/com/fh/controller/sunvote/school/SchoolController.java @@ -225,7 +225,11 @@ public class SchoolController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd = schoolService.findById(pd); //根据ID读取 - mv.setViewName("sunvote/school/school_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/school/school_edit2"); + }else{ + mv.setViewName("sunvote/school/en_school_edit2"); + } mv.addObject("msg", "edit2"); mv.addObject("pd", pd); return mv;