diff --git a/.classpath b/.classpath index 2a8b9d2..bb8defb 100644 --- a/.classpath +++ b/.classpath @@ -4,7 +4,8 @@ - + + @@ -15,6 +16,5 @@ - 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/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 8000cd6..7341ab1 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 754c7a9..0c53ca2 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -6,5 +6,5 @@ - + diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp index e813a46..65fbcf9 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp @@ -29,7 +29,7 @@ - +
@@ -50,8 +50,9 @@

欢迎！

${SNAME }

-

${SNAME } 管理员

-

+

${SNAME }管理员

+
+
@@ -60,14 +61,15 @@

    -
  • +

  • ${ var.NAME }

    • -     + -
-
- <%--
+ +
+ <%--

科目管理

@@ -84,32 +86,36 @@ 任课管理

    -

  • 科目管理

    -
      +
    • +

      科目管理

      +
        -
      • +

      • ${ var.NAME }

        •
      • - +

    • 任课管理

    • 教师管理

      • -
    -
-
-

轻松考

+ +
+
+

+ 轻松考 +

    -
  • -

    试卷管理

    +
  • +

    试卷管理

      -

    • 出卷

      • -

    • 查看所有试卷

      • - +

    • 出卷

      • +

    • 查看所有试卷

      • +
    • -
  • +

  • 考试情况

      @@ -121,41 +127,41 @@
    • - +
- -
-
-

- 即时测 -

- -
    + +
+
+

+ 即时测 +

+ +

  • 试卷管理

  • 测验分析

      - - -
    • -

      ${ var1.CLASS_NAME }

      -
      • + + +
    • +

      ${ var1.CLASS_NAME }

      +
      • +       -
-
- - -
-

- 课后练 -

- -
    +
+ + +
+

+ 课后练 +

+ +

  • 班长管理

    • @@ -166,17 +172,17 @@

    作业分析

-
- -
-

- 系统设置 -

- -
    -
  • +
+ +
+

+ 系统设置 +

+ +
    +

  • 学校设置

    - +

  • 年级设置

    @@ -184,87 +190,102 @@

  • 模板设置

    • - +

  • 其他配置

+
- -
- - -
+
+ -

- 年级管理 + Grade management

    -
  • -

    ${ var.GNAME }

    +
  • +

    ${ var.NAME }

    • -     + -
-
- <%--
+ +
+ <%--

科目管理

@@ -80,42 +83,40 @@
--%>

- 任课管理 + Classroom management

    -

  • 科目管理

    • -

  • 任课管理

    • -

  • 教师管理

    • -
-
-
-

试卷管理

-
    -
  • -

    轻松考试卷管理

    +
  • +

    Course management

      -

    • 出卷

      • -

    • 查看所有试卷

      • - + +
    • +

      ${ var.NAME }

      +
      • +
    • -
  • -

    即时测试卷管理

    -
    • + +

  • Classroom management

    • +

  • teacher management

- -
-
-

- 测验分析 -

- -
    -
  • -

    轻松考统考

    +
+
+

+ E-Exam +

+
    +
  • +

    test paper management

    +
      +

    • paper making

      • +

    • View all papers

      • + +
    • -
  • -

    轻松考班级情况

    +
  • +

    examination situation

      @@ -126,9 +127,22 @@
    • + +
+ +
+
+

+ E-Class +

+ +
    +
  • +

    test paper management

    +
  • -

    即时测测验分析

    -
      +

      test analysis

      +
      • @@ -139,116 +153,217 @@
    -
-
-

- 系统设置 -

- -
    -
  • -

    学校设置

    - +
+ + +
+

+ after-class exercise +

+ +
    +
  • +

    monitor management

  • -

    年级设置

    +

    homework management

  • -

    年级升级

    +

    homework analysis

    • +
+
+ +
+

+ system settings +

+ +
  • -

    其他配置

    +

    school settings

    + +
    • +
  • +

    grade settings

    +
    • +
  • +

    Template Settings

    +
    • + +
  • +

    Other configuration

+
- -
- - -
+
+ - + + + + + <%@ 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 +

+
+
+
+
+ + +
    + + +
  • ${var.CLASS_NAME}
    • +     + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + +
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/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp index b44915c..e5fc527 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp @@ -19,7 +19,7 @@ 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/paper/en_paper_list4.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp new file mode 100644 index 0000000..03d4635 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp @@ -0,0 +1,254 @@ +<%@ 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 + "/"; +%> + + + + + +中天电子-教育管理系统 + + + + + + + + + + + + + + + +
    +
    +
    +
    +

    + test paper management +

    +
    +
    +            +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    numberTest titleGradeClass出卷老师Creation timeRecommended test durationTotal score
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ${vs.index+1}${var.TITLE}${myelfun:findGradeName(var.GRADE_ID)}${myelfun:findSubjectCName(var.SUBJECT_ID)}${myelfun:findTeacherName(var.USER_ID)}${var.CREATE_DATE}${var.EXAM_TIME}${var.SCORE}
    There is no data
    +
    + +
    + + +
    +
    +
    +
    + + +<%@ include file="../../system/index/foot2.jsp"%> + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp new file mode 100644 index 0000000..be7bba4 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp @@ -0,0 +1,234 @@ +<%@ 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 + "/"; +%> + + + + + +中天电子-教育管理系统 + + + + + + + + + + + + + + + +
    +
    +
    +
    +

    + test paper management +

    +
    +
    + + + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    NumberTest titleCreation timegradesubjectRecommended test durationTotal scoreoperation
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ${vs.index+1}${var.TITLE}${var.CREATE_DATE}${myelfun:findGradeName(var.GRADE_ID)}${myelfun:findSubjectCName(var.SUBJECT_ID)}${var.EXAM_TIME}${var.SCORE} + +
    There is no data
    +
    +
    + +
    +
    + +
    +
    + + +
    +
    +
    +
    + + +<%@ include file="../../system/index/foot2.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/WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_edit2.jsp new file mode 100644 index 0000000..75fc884 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_edit2.jsp @@ -0,0 +1,197 @@ +<%@ 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"%> + + + + + + + +
    + +
    +
    +
    +
    +
    + +
    + +
    + + + + + + + + --%> + + + + + + --%> + + + + + + + + + + + + + + --%> + + + + + + +
    School: + <%-- --%> + + +
    Grade: + <%--
    Class type: + <%--
    Class name:
    Class code:
    Class base station: + <%--
    + Save + Cancel +
    +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_list2.jsp new file mode 100644 index 0000000..a01b53e --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_list2.jsp @@ -0,0 +1,213 @@ +<%@ 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 + "/"; +%> + + + + + + + + + + + + + + + + +
    + + +
    +
    +
    +

    + Class Management +

    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + +
    NumberClass NameClass TypeClass Coding班级基站Operation
    +
    + +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ${vs.index+1}${var.CLASS_NAME}${myelfun:findClassTypeName(var.CLASS_TYPE)}${var.CLASS_CODE}${myelfun:findBasestationName(var.BASESTATION_ID)}
    There is no data
    +
    +
    + +
    +
    + +
    + +
    + +
    +
    +
    +
    + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_edit2.jsp new file mode 100644 index 0000000..4423970 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_edit2.jsp @@ -0,0 +1,93 @@ +<%@ 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/subject/en_subject_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp new file mode 100644 index 0000000..68310ff --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_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 + "/"; +%> + + + + + + + + + + + + + + + +
    + + +
    +
    +
    +

    + Course management +

    +
    +
    +
    +
    +
    + + + + + + + + + + + + + +
    NumberChinese nameEnglish namesOperation
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ${vs.index+1}${var.CNAME}${var.ENAME}
    There is no data
    +
    +
    + +
    +
    + +
    +
    + + +
    +
    +
    +
    + + + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_edit2.jsp new file mode 100644 index 0000000..a1a22b6 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_edit2.jsp @@ -0,0 +1,226 @@ +<%@ 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"%> + + + + + + + + +
    + +
    +
    +
    +
    +
    + +
    + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + <%-- + + + --%> + + + + + + + + + + + +
    Name:
    Phone Number:
    Tel Number:
    Id no.:
    Account:
    Password:
    Sex: + +
    科目列表:
    Teacher card number:
    subjects: + +
    + Save + Cancel +
    +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp new file mode 100644 index 0000000..35e1cb9 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp @@ -0,0 +1,283 @@ +<%@ 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 + "/"; +%> + + + + + + + + + + + + + + + +
    + +
    +
    +
    +

    + Teacher Management +

    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    NumberNamePhone numberTel numberId no.AccountSexTeacher card numbersubjectsOperation
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ${vs.index+1}${var.NAME}${var.PHONE}${var.SEAT_PHONE}${var.CARD_NO}${var.ACCOUT}${var.SEX == 1? "male":"female"}${var.KEYPAD_ID}${myelfun:findSubjectCName(var.SUBJECT_IDS)}
    There is no data
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    + + + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/system/index/en_login.jsp b/WebRoot/WEB-INF/jsp/system/index/en_login.jsp index d7abb92..beafdea 100644 --- a/WebRoot/WEB-INF/jsp/system/index/en_login.jsp +++ b/WebRoot/WEB-INF/jsp/system/index/en_login.jsp @@ -17,23 +17,27 @@ SunVote-Education Management System - + + - + + - + @@ -61,12 +74,34 @@
    -
    - -
    +
    +
    + + + +
    +
    + +
    + + 记住密码 +
    +
    + +
    +
    + + +
    +
      + +
    +

    Clear

    +
    +
    @@ -78,13 +113,69 @@ if(window.top != window.self){ window.top.location.href = "<%=basePath%>"; } + + document.onkeydown = function (e) { // 回车提交表单 + // 兼容FF和IE和Opera + var theEvent = window.event || e; + var code = theEvent.keyCode || theEvent.which || theEvent.charCode; + if (code == 13) { + severCheck(); + } + } + + $(".icon_down").click(function(){ + $("#loginname").focus(); + + }); + $("#loginname").focus(function(e){ + + $("#password").attr("type","password"); + var _html=""; + var u_list=JSON.parse(storage.getItem('userNameList')); + console.log(u_list); + if((u_list!=null)||(u_list.length>0)){ + $("#loginname").blur(function(){ + $(".history").hide(); + }) + for(var i=0;i'; + } + $(".history ul").html(_html); + $(".history").show(); + } + + }); + + $('.history').hover(function(){ //鼠标悬停下拉框时，解绑blur事件 + $("#loginname").unbind("blur"); + },function(){ + $("#loginname").blur(function(){ //鼠标移出下拉框时，添加blur事件 + $(".history").hide(); + }) + }); + + $(document).on('click','.history li',function(){ + var p_list=JSON.parse(storage.getItem('passWordList')); + $("#loginname").val($(this).text()); + $("#password").val(p_list[$(this).index()]); + $(".history").hide(); + }) + + //更换语言 + $("#language").change(function(){ + $.cookie("lang",$("#language").val()); + window.location.reload(); + }) + console.log($.cookie("lang")); + + //客户端校验 function check() { if ($("#loginname").val() == "") { $("#loginname").tips({ side : 2, - msg : 'User name cannot be empty', + msg : '用户名不得为空', bg : '#AE81FF', time : 3 }); @@ -97,7 +188,7 @@ if ($("#password").val() == "") { $("#password").tips({ side : 2, - msg : 'Password cannot be empty', + msg : '密码不得为空', bg : '#AE81FF', time : 3 }); @@ -108,13 +199,15 @@ $("#loginbox").tips({ side : 1, - msg : 'Logining, please wait...', + msg : '正在登录 , 请稍后 ...', bg : '#68B500', time : 10 }); return true; } + + //服务器校验 function severCheck(){ @@ -130,7 +223,8 @@ cache: false, success: function(data){ if("success" == data.result){ - saveCookie(); + if($("#rem_flag").prop("checked")) //如果选择了记住密码 + saveCookie(); if(data.teacher != null){ window.location.href="main/teacher"; }else if(data.admin != null){ @@ -141,7 +235,7 @@ }else if("usererror" == data.result){ $("#loginname").tips({ side : 1, - msg : "Incorrect user name or password", + msg : "用户名或密码有误", bg : '#FF5080', time : 15 }); @@ -150,7 +244,7 @@ }else if("codeerror" == data.result){ $("#code").tips({ side : 1, - msg : "Incorrect captcha input", + msg : "验证码输入有误", bg : '#FF5080', time : 15 }); @@ -159,7 +253,7 @@ }else{ $("#loginname").tips({ side : 1, - msg : "Missing parameters", + msg : "缺少参数", bg : '#FF5080', time : 15 }); @@ -171,31 +265,77 @@ } } + var storage=window.localStorage; + var userNameList=[]; + var passWordList=[]; + + //console.log(JSON.parse(storage.getItem('userNameList'))); + + //清除历史记录 + function clear_history(){ + window.top.remove.init({"title":"确定清除历史记录吗？","func":function(success){ + if(success){ + storage.clear(); + $(".history").hide(); + }else{ + console.log("false"); + } + }}); + window.top.remove.show(); + $(".mb_head .close img").css("display","none"); + } + //保存登录记录 function saveCookie() { - if ($("#saveid").attr("checked")) { - $.cookie('loginname', $("#loginname").val(), { + if(!window.localStorage){ + alert("浏览器不支持localstorage"); + + }else{ + //主逻辑业务 + + userNameList=JSON.parse(storage.getItem('userNameList')); + passWordList=JSON.parse(storage.getItem('passWordList')); + + + if(userNameList==null){ + var userNameList=[]; + var passWordList=[]; + userNameList.push($("#loginname").val()); + passWordList.push($("#password").val()); + + storage.setItem('userNameList',JSON.stringify(userNameList)); + storage.setItem('passWordList',JSON.stringify(passWordList)); + }else{ + + if(userNameList.indexOf($("#loginname").val())>-1){ + return false; + }else{ + userNameList.push($("#loginname").val()); + passWordList.push($("#password").val()); + storage.setItem('userNameList',JSON.stringify(userNameList)); + storage.setItem('passWordList',JSON.stringify(passWordList)); + } + } + + + + //console.log(userNameList); + + + + } + + /*$.cookie('loginname', $("#loginname").val(), { expires : 7 }); $.cookie('password', $("#password").val(), { expires : 7 - }); - } + });*/ + } - - - - - - - - - - - - + + + + + @@ -75,15 +76,21 @@ body{
    - +
    - -
    + +
    记住密码
    +
    + +
    @@ -120,6 +127,8 @@ body{ }); $("#loginname").focus(function(e){ + + $("#password").attr("type","password"); var _html=""; var u_list=JSON.parse(storage.getItem('userNameList')); console.log(u_list); @@ -151,7 +160,12 @@ body{ $(".history").hide(); }) - + //更换语言 + $("#language").change(function(){ + $.cookie("lang",$("#language").val()); + window.location.reload(); + }) + console.log($.cookie("lang")); //客户端校验 diff --git a/WebRoot/static/css/en_teach.css b/WebRoot/static/css/en_teach.css new file mode 100644 index 0000000..8d11ca8 --- /dev/null +++ b/WebRoot/static/css/en_teach.css @@ -0,0 +1,63 @@ +html,body{width:100%;height:100%;} +table{font-size:16px;} +.clear{clear:both;} +.right{width:12px;height:12px;display:inline-block;background:url(../images/right.png) no-repeat;background-size:100%;} +.right_b{width:20px;height:20px;margin-right:20px;display:inline-block;background:url(../images/right_b.png) no-repeat;background-size:100%;} +.down{width:12px;height:12px;display:inline-block;background:url(../images/down.png) no-repeat;background-size:100%;} +.jiao{float:right;margin-top:32.5px;margin-right:10%;} + +.pagination{border-radius:0;float:left;} +.pagination>li>a, .pagination>li>span{color:#34c99d;} +.pagination>.active>a, .pagination>.active>a:focus, .pagination>.active>a:hover, .pagination>.active>span, .pagination>.active>span:focus, .pagination>.active>span:hover{ + background-color:#6fd9bb; + border-color:#6fd9bb; +} +.pagination>li:first-child>a, .pagination>li:first-child>span{border-radius:0;} +.pagination>li:last-child>a, .pagination>li:last-child>span{border-radius:0;} +input[type="checkbox"]{margin-right:10px;} + +.header{width:100%;background:#0bb8b9;box-sizing:border-box;padding:20px 30px;position:fixed;top:0;} +.header .logo{float:left;} +.header .out{float:right;font-size:18px;color:#fff;} +.header .out a{color:#fff;text-decoration:none;} +.header .out img{width:18px;margin-right:15px;} +.content{width:100%;height:100%;box-sizing:border-box;padding-top:66px;} +.content .content_l{width:18%;float:left;height:100%;background:#13707b;overflow-y:auto;} +.content .content_l .info_tab{padding:10% 0;border-bottom:1px solid #80afb4;} +.content .content_l .head_pic{width:88px;height:88px;border-radius:44px;overflow:hidden;float:left;margin-left:2%;} +.content .content_l .name{margin-left:calc(88px + 10%);} +.content .content_l .name p{width:100%;color:#fff;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;} +.content .content_l .name p:first-child{font-size:14px;} +.content .content_l .name p:nth-child(2){font-size:20px;} +.content .content_l .name p:nth-child(3){font-size:14px;} +.content .content_l .tab1{border-bottom:1px solid #80afb4;cursor:pointer} +.content .content_l .tab1 p{width:90%;height:77px;line-height:77px;margin-bottom:0;font-size:18px;color:#fff;padding-left:5%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.content .content_l .tab1 ul{margin-bottom:0;padding:0;font-size:18px;line-height:64px;display:none;} +.content .content_l .tab1 ul li{list-style:none;color:#fff;cursor:pointer;} +.menu_1 li{background:#1b535b;border-bottom: 1px solid #80afb4;} +.menu_2 li{background:#333333;border-bottom: 1px dashed #80afb4;} +.content .content_l .tab1 ul li:last-child{border:0;} +.content .content_l .tab1 ul li p{padding-left:10%;font-size:14px;} +.content .content_r{margin-left:18%;height:100%;overflow-y:hidden;} + + + .head_box{width:100%;height:auto;position:fixed;top:0;} + .box_header{padding:30px 5%;background:#f5f5f5;} + .head_box_l{float:left;font-size:30px;} + .head_box .table{padding:0px 5%;margin-bottom:0;} + .head_box_l p{color:#106666;margin-bottom:0;} + .head_box_r{float:right;} + .head_box_r input{padding-left:10px;} + .head_box_r img{width:30px;margin-left:10px;} + .table_box{padding:5%;padding-top:143px;} + .table_box input[name="choose"]{vertical-align:top;margin-right:15px;} + .table_box img{width:24px;} + .footer .creat,.content .content_r .footer .removeAll {float:left;} + .footer .creat input{background:#3bc2d6;outline-style:none;text-decoration:none;border:none;color:#fff;padding:15px 20px;margin-right:20px;font-size:18px;} + .footer .removeAll input{background:#f29c9f;outline-style:none;text-decoration:none;border:none;margin-left:15px;color:#fff;padding:15px 20px;font-size:18px;} + .footer .page_box{float:right;} + + +.enter{padding:0 !important;} +.jump_btn{background:#74c4a2 !important;color:#fff !important;border-color:#74c4a2 !important;} +.pagination li input{display: block;border: 0;width: 3em;height:32px;outline-style: none;} diff --git a/src/com/fh/controller/base/BaseController.java b/src/com/fh/controller/base/BaseController.java index 7ea4cd5..6769a61 100644 --- a/src/com/fh/controller/base/BaseController.java +++ b/src/com/fh/controller/base/BaseController.java @@ -1,6 +1,5 @@ package com.fh.controller.base; - import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -21,135 +20,160 @@ import com.fh.util.UuidUtil; * 修改时间：2015、12、11 */ public class BaseController { - + protected Logger logger = Logger.getLogger(this.getClass()); private static final long serialVersionUID = 6357869213649815390L; - - /** new PageData对象 + + /** + * new PageData对象 + * * @return */ - public PageData getPageData(){ + public PageData getPageData() { return new PageData(this.getRequest()); } - - /**得到ModelAndView + + /** + * 得到ModelAndView + * * @return */ - public ModelAndView getModelAndView(){ + public ModelAndView getModelAndView() { return new ModelAndView(); } - - /**得到request对象 + + /** + * 得到request对象 + * * @return */ public HttpServletRequest getRequest() { - HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder + .getRequestAttributes()).getRequest(); return request; } - /**得到32位的uuid + /** + * 得到32位的uuid + * * @return */ - public String get32UUID(){ + public String get32UUID() { return UuidUtil.get32UUID(); } - - /**得到分页列表的信息 + + /** + * 得到分页列表的信息 + * * @return */ - public Page getPage(){ + public Page getPage() { return new Page(); } - - public static void logBefore(Logger logger, String interfaceName){ + + public static void logBefore(Logger logger, String interfaceName) { logger.info(""); logger.info("start"); logger.info(interfaceName); } - - public static void logAfter(Logger logger){ + + public static void logAfter(Logger logger) { logger.info("end"); logger.info(""); } - - - public String getUsername(){ + + public String getUsername() { Session session = Jurisdiction.getSession(); - User user = (User)session.getAttribute(Const.SESSION_USER); - if(user != null){ + User user = (User) session.getAttribute(Const.SESSION_USER); + if (user != null) { return user.getUSERNAME(); } return "ERROR"; } - - public String getUserID(){ + + public String getUserID() { Session session = Jurisdiction.getSession(); - User user = (User)session.getAttribute(Const.SESSION_USER); - if(user != null){ + User user = (User) session.getAttribute(Const.SESSION_USER); + if (user != null) { return user.getUSER_ID(); } return "ERROR"; } - - public String getRole(){ + + public String getRole() { Session session = Jurisdiction.getSession(); - String role = (String)session.getAttribute(getUsername() + Const.ROLE_ID); + String role = (String) session.getAttribute(getUsername() + + Const.ROLE_ID); return role; } - - public String getTeacherID(){ + + public String getTeacherID() { Session session = Jurisdiction.getSession(); - User user = (User)session.getAttribute(Const.SESSION_USER); - if(user != null){ + User user = (User) session.getAttribute(Const.SESSION_USER); + if (user != null) { return user.getTeacherID(); } return "ERROR"; } - - - public String getSchoolID(){ + + public String getSchoolID() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.SCHOOL_ID); + String schoolName = (String) session.getAttribute(getUsername() + + Const.SCHOOL_ID); return schoolName; } - public String getSchoolName(){ + + public String getSchoolName() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.SCHOOL_NAME); + String schoolName = (String) session.getAttribute(getUsername() + + Const.SCHOOL_NAME); return schoolName; } - public String getGradeID(){ + + public String getGradeID() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.GRADE_ID); + String schoolName = (String) session.getAttribute(getUsername() + + Const.GRADE_ID); return schoolName; } - public String getGradeName(){ + + public String getGradeName() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.GRADE_NAME); + String schoolName = (String) session.getAttribute(getUsername() + + Const.GRADE_NAME); return schoolName; } - public String getSubjectId(){ + + public String getSubjectId() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.SUBJECT_ID); + String schoolName = (String) session.getAttribute(getUsername() + + Const.SUBJECT_ID); return schoolName; } - public String getSubjectName(){ + + public String getSubjectName() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.SUBJECT_NAME); + String schoolName = (String) session.getAttribute(getUsername() + + Const.SUBJECT_NAME); return schoolName; } - public String getClassId(){ + + public String getClassId() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.CLASS_ID); + String schoolName = (String) session.getAttribute(getUsername() + + Const.CLASS_ID); return schoolName; } - public String getClassName(){ + + public String getClassName() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.CLASS_NAME); + String schoolName = (String) session.getAttribute(getUsername() + + Const.CLASS_NAME); return schoolName; } - - public String getCookieLanguage(){ + + public String getCookieLanguage() { Cookie[] cookies = getRequest().getCookies(); if (cookies != null) { for (Cookie cookie : cookies) { @@ -160,22 +184,27 @@ public class BaseController { } return null; } - + public String getLang() { String lang = getCookieLanguage(); - if(lang == null){ + if (lang == null) { lang = getRequest().getLocale().getLanguage(); + + Cookie cookies = new Cookie("lang", lang); + + + } + return lang; } - - public boolean isChineseLanguageClient(){ + + public boolean isChineseLanguageClient() { String lang = getLang(); - if(lang != null && lang.length() >= 2){ - lang = lang.substring(0,2); + if (lang != null && lang.length() >= 2) { + lang = lang.substring(0, 2); } return "zh".equals(getLang()); } - - + } diff --git a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java index 35b26c9..4880ef9 100644 --- a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java +++ b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java @@ -193,8 +193,14 @@ public class CourseManagementController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); page.setPd(pd); + page.setLangIsChina(isChineseLanguageClient()); List varList = coursemanagementService.listCourse(page); //列出CourseManagement列表 - mv.setViewName("sunvote/coursemanagement/coursemanagement_list2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/coursemanagement/coursemanagement_list2"); + }else{ + mv.setViewName("sunvote/coursemanagement/en_coursemanagement_list2"); + } + mv.addObject("varList", varList); mv.addObject("pd", pd); mv.addObject("QX",Jurisdiction.getHC()); //按钮权限 @@ -256,7 +262,12 @@ public class CourseManagementController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - mv.setViewName("sunvote/coursemanagement/coursemanagement_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/coursemanagement/coursemanagement_edit2"); + }else{ + mv.setViewName("sunvote/coursemanagement/en_coursemanagement_edit2"); + } + List teachers = teacherService.listAll(pd); mv.addObject("teachers",teachers); 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/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java index c6902c1..4b7183b 100644 --- a/src/com/fh/controller/sunvote/paper/PaperController.java +++ b/src/com/fh/controller/sunvote/paper/PaperController.java @@ -383,7 +383,12 @@ public class PaperController extends BaseController { // pd.put("PAPER_TYPE","2"); // List varList2 = paperService.list(page); //列出Paper列表 // varList.addAll(varList2); - mv.setViewName("sunvote/paper/paper_list4"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/paper/paper_list4"); + }else{ + mv.setViewName("sunvote/paper/en_paper_list4"); + } + for(PageData p:varList){ String examTime = p.getString("EXAM_TIME"); @@ -445,8 +450,13 @@ public class PaperController extends BaseController { pd.put("PAPER_TYPE","2"); pd.put("USER_ID", this.getUserID()); page.setPd(pd); + page.setLangIsChina(isChineseLanguageClient()); List varList = paperService.list(page); //列出Paper列表 - mv.setViewName("sunvote/paper/paper_list5"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/paper/paper_list5"); + }else{ + mv.setViewName("sunvote/paper/en_paper_list5"); + } for(PageData p:varList){ String examTime = p.getString("EXAM_TIME"); 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; diff --git a/src/com/fh/controller/sunvote/sclass/SClassController.java b/src/com/fh/controller/sunvote/sclass/SClassController.java index 6d232e7..479fc4c 100644 --- a/src/com/fh/controller/sunvote/sclass/SClassController.java +++ b/src/com/fh/controller/sunvote/sclass/SClassController.java @@ -181,7 +181,12 @@ public class SClassController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = this.getPageData(); page.setPd(pd); - mv.setViewName("sunvote/sclass/sclass_list2"); + page.setLangIsChina(isChineseLanguageClient()); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/sclass/sclass_list2"); + }else{ + mv.setViewName("sunvote/sclass/en_sclass_list2"); + } List varList = sclassService.list(page); //列出SClass列表 mv.addObject("varList", varList); mv.addObject("pd", pd); @@ -224,7 +229,7 @@ public class SClassController extends BaseController { if(isChineseLanguageClient()){ mv.setViewName("sunvote/sclass/sclass_edit2"); }else{ - mv.setViewName("sunvote/sclass/sclass_edit2"); + mv.setViewName("sunvote/sclass/en_sclass_edit2"); } List schools = schoolService.listAll(pd); mv.addObject("schools",schools); @@ -273,7 +278,12 @@ public class SClassController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd = sclassService.findById(pd); //根据ID读取 - mv.setViewName("sunvote/sclass/sclass_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/sclass/sclass_edit2"); + }else{ + mv.setViewName("sunvote/sclass/en_sclass_edit2"); + } + //mv.setViewName("sunvote/sclass/sclass_edit2"); List schools = schoolService.listAll(pd); mv.addObject("schools",schools); List basestations = basestationService.listAll(pd); diff --git a/src/com/fh/controller/sunvote/subject/SubjectController.java b/src/com/fh/controller/sunvote/subject/SubjectController.java index 1eab3ff..af010e2 100644 --- a/src/com/fh/controller/sunvote/subject/SubjectController.java +++ b/src/com/fh/controller/sunvote/subject/SubjectController.java @@ -148,8 +148,13 @@ public class SubjectController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); page.setPd(pd); + page.setLangIsChina(isChineseLanguageClient()); List varList = subjectService.listAllSchool(page); //列出Subject列表 - mv.setViewName("sunvote/subject/subject_list2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/subject/subject_list2"); + }else{ + mv.setViewName("sunvote/subject/en_subject_list2"); + } mv.addObject("varList", varList); mv.addObject("pd", pd); mv.addObject("QX",Jurisdiction.getHC()); //按钮权限 @@ -194,7 +199,11 @@ public class SubjectController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - mv.setViewName("sunvote/subject/subject_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/subject/subject_edit2"); + }else{ + mv.setViewName("sunvote/subject/en_subject_edit2"); + } List varList = subjectService.listNotSchoolSubject(pd); mv.addObject("varList", varList); mv.addObject("msg", "save2"); diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java index ed8443d..4028025 100644 --- a/src/com/fh/controller/sunvote/teacher/TeacherController.java +++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java @@ -532,8 +532,14 @@ public class TeacherController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); page.setPd(pd); + page.setLangIsChina(isChineseLanguageClient()); List varList = teacherService.list(page); // 列出Teacher列表 - mv.setViewName("sunvote/teacher/teacher_list2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/teacher/teacher_list2"); + }else{ + mv.setViewName("sunvote/teacher/en_teacher_list2"); + } + mv.addObject("varList", varList); mv.addObject("pd", pd); @@ -583,7 +589,12 @@ public class TeacherController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - mv.setViewName("sunvote/teacher/teacher_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/teacher/teacher_edit2"); + }else{ + mv.setViewName("sunvote/teacher/en_teacher_edit2"); + } + List schools = schoolService.listAll(pd); mv.addObject("schools", schools); @@ -630,7 +641,11 @@ public class TeacherController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd = teacherService.findById(pd); // 根据ID读取 - mv.setViewName("sunvote/teacher/teacher_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/teacher/teacher_edit2"); + }else{ + mv.setViewName("sunvote/teacher/en_teacher_edit2"); + } List schools = schoolService.listAll(pd); mv.addObject("schools", schools); List subjects = subjectService.listAllSchool(pd);