孙向锦 / SunvoteEducation

Commit 8f88069a84455432bfcf83895191f036d730b588

Authored by jack
1 parent 45213c57

1.英文翻译（4）

Inline Side-by-side
Showing 10 changed files with 37 additions and 10 deletions
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp
  View file @8f88069
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 <td><input type="checkbox" name='ids' id="ids" value="${var.ID}"/>${vs.index+1}</td> 73 <td><input type="checkbox" name='ids' id="ids" value="${var.ID}"/>${vs.index+1}</td>
74 <td >${var.NAME}</td> 74 <td >${var.NAME}</td>
75 <td >${var.CLASS_NAME}</td> 75 <td >${var.CLASS_NAME}</td>
76 - <td >${var.CNAME}</td> 76 + <td >${var.ENAME}</td>
77 </tr> 77 </tr>
78 78
79 </c:forEach> 79 </c:forEach>
WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp
  View file @8f88069
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 <tr> 66 <tr>
67 <td><input type="checkbox" name='ids' id="ids" 67 <td><input type="checkbox" name='ids' id="ids"
68 value="${var.SCHOOLGRADESUBJECT_ID}" />${vs.index+1}</td> 68 value="${var.SCHOOLGRADESUBJECT_ID}" />${vs.index+1}</td>
69 - <td class='center'>${var.NAME}</td> 69 + <td class='center'>${var.ENAME}</td>
70 <td class='center'>${var.DESC}</td> 70 <td class='center'>${var.DESC}</td>
71 </tr> 71 </tr>
72 72
WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp
  View file @8f88069
@@ -76,8 +76,8 @@ @@ -76,8 +76,8 @@
76 <tr> 76 <tr>
77 <td><input type="checkbox" name='ids' id="ids" value="${var.PAGETEMPLATE_ID}" />${vs.index+1}</td> 77 <td><input type="checkbox" name='ids' id="ids" value="${var.PAGETEMPLATE_ID}" />${vs.index+1}</td>
78 <td class='center'>${var.NAME}</td> 78 <td class='center'>${var.NAME}</td>
79 - <td class='center'>${myelfun:findSubjectCName(var.SUBJECT_ID)}</td>  
80 - <td class='center'>${myelfun:findGradeName(var.GRADE_ID)}</td> 79 + <td class='center'>${myelfun:findSubjectEName(var.SUBJECT_ID)}</td>
  80 + <td class='center'>${myelfun:findGradeEName(var.GRADE_ID)}</td>
81 <td class='center'>${var.PAGE_SCORE}</td> 81 <td class='center'>${var.PAGE_SCORE}</td>
82 <td><a hidden onclick="edit('${var.PAGETEMPLATE_ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a> 82 <td><a hidden onclick="edit('${var.PAGETEMPLATE_ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a>
83 <a onclick="del('${var.PAGETEMPLATE_ID}');"><img src="static/images/remove.png" /></a></td> 83 <a onclick="del('${var.PAGETEMPLATE_ID}');"><img src="static/images/remove.png" /></a></td>
WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp
  View file @8f88069
@@ -116,8 +116,8 @@ @@ -116,8 +116,8 @@
116 value="${var.PAPER_ID}" />${vs.index+1}</td> 116 value="${var.PAPER_ID}" />${vs.index+1}</td>
117 <td><a target="_blank" 117 <td><a target="_blank"
118 href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}">${var.TITLE}</a></td> 118 href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}">${var.TITLE}</a></td>
119 - <td>${myelfun:findGradeName(var.GRADE_ID)}</td>  
120 - <td>${myelfun:findSubjectCName(var.SUBJECT_ID)}</td> 119 + <td>${myelfun:findGradeEName(var.GRADE_ID)}</td>
  120 + <td>${myelfun:findSubjectEName(var.SUBJECT_ID)}</td>
121 <td>${myelfun:findTeacherName(var.USER_ID)}</td> 121 <td>${myelfun:findTeacherName(var.USER_ID)}</td>
122 <td>${var.CREATE_DATE}</td> 122 <td>${var.CREATE_DATE}</td>
123 <td>${var.EXAM_TIME}</td> 123 <td>${var.EXAM_TIME}</td>
WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp
  View file @8f88069
@@ -95,8 +95,8 @@ @@ -95,8 +95,8 @@
95 <td><input type="checkbox" name='ids' id="ids" value="${var.PAPER_ID}"/>${vs.index+1}</td> 95 <td><input type="checkbox" name='ids' id="ids" value="${var.PAPER_ID}"/>${vs.index+1}</td>
96 <td ><a target="_blank" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}">${var.TITLE}</a></td> 96 <td ><a target="_blank" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}">${var.TITLE}</a></td>
97 <td >${var.CREATE_DATE}</td> 97 <td >${var.CREATE_DATE}</td>
98 - <td >${myelfun:findGradeName(var.GRADE_ID)}</td>  
99 - <td >${myelfun:findSubjectCName(var.SUBJECT_ID)}</td> 98 + <td >${myelfun:findGradeEName(var.GRADE_ID)}</td>
  99 + <td >${myelfun:findSubjectEName(var.SUBJECT_ID)}</td>
100 <td >${var.EXAM_TIME}</td> 100 <td >${var.EXAM_TIME}</td>
101 <td >${var.SCORE}</td> 101 <td >${var.SCORE}</td>
102 <td> 102 <td>
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp
  View file @8f88069
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 <td class='center'>${var.ACCOUT}</td> 94 <td class='center'>${var.ACCOUT}</td>
95 <td class='center'>${var.SEX == 1? "male":"female"}</td> 95 <td class='center'>${var.SEX == 1? "male":"female"}</td>
96 <td class='center'>${var.KEYPAD_ID}</td> 96 <td class='center'>${var.KEYPAD_ID}</td>
97 - <td class='center'>${myelfun:findSubjectCName(var.SUBJECT_IDS)}</td> 97 + <td class='center'>${myelfun:findSubjectEName(var.SUBJECT_IDS)}</td>
98 <td><a onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td> 98 <td><a onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
99 99
100 </tr> 100 </tr>
WebRoot/WEB-INF/tld/elfun.tld
  View file @8f88069
@@ -25,6 +25,14 @@ @@ -25,6 +25,14 @@
25 </function> 25 </function>
26 26
27 <function> 27 <function>
  28 + <description>根据ID获取年级名称</description><!-- 对该标签的说明 -->
  29 + <name>findGradeEName</name><!-- 定义标签名，放在短标签之后 -->
  30 + <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径 -->
  31 + <function-signature>java.lang.String findGradeEName(java.lang.String)</function-signature><!-- 标签处理域值的具体的类方法 -->
  32 + <example>${myelfun:findGradeEName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->
  33 + </function>
  34 +
  35 + <function>
28 <description>根据ID获取班级类型名称</description><!-- 对该标签的说明 --> 36 <description>根据ID获取班级类型名称</description><!-- 对该标签的说明 -->
29 <name>findClassTypeName</name><!-- 定义标签名，放在短标签之后 --> 37 <name>findClassTypeName</name><!-- 定义标签名，放在短标签之后 -->
30 <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径 --> 38 <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径 -->
resources/mybatis1/sunvote/GradeMapper.xml
  View file @8f88069
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 9
10 <!-- 字段 --> 10 <!-- 字段 -->
11 <sql id="Field"> 11 <sql id="Field">
12 - SV_GRADE.NAME,SV_GRADE.DESC,REMARK,ID 12 + SV_GRADE.NAME,SV_GRADE.ENAME,SV_GRADE.DESC,REMARK,ID
13 </sql> 13 </sql>
14 14
15 <!-- 字段值 --> 15 <!-- 字段值 -->
src/com/fh/controller/sunvote/Myelfun.java
  View file @8f88069
@@ -61,6 +61,24 @@ public class Myelfun { @@ -61,6 +61,24 @@ public class Myelfun {
61 } 61 }
62 62
63 /** 63 /**
  64 + * 根据ID获取年级名称
  65 + * @param type
  66 + * @return
  67 + * @throws Exception
  68 + */
  69 + public static String findGradeEName(String type) throws Exception{
  70 + GradeService gradeService = (GradeService)SpringBeanFactoryUtils.getBean("gradeService");
  71 + PageData pageData = new PageData();
  72 + pageData.put("ID", type);
  73 + pageData = gradeService.findById(pageData);
  74 + if(pageData != null){
  75 + return pageData.getString("ENAME");
  76 + }else{
  77 + return "" ;
  78 + }
  79 + }
  80 +
  81 + /**
64 * 根据ID或者班级类型名称 82 * 根据ID或者班级类型名称
65 * @param type 83 * @param type
66 * @return 84 * @return
src/com/fh/controller/sunvote/paper/PaperController.java
  View file @8f88069
@@ -379,6 +379,7 @@ public class PaperController extends BaseController { @@ -379,6 +379,7 @@ public class PaperController extends BaseController {
379 } 379 }
380 pd.put("PAPER_TYPE","1"); 380 pd.put("PAPER_TYPE","1");
381 page.setPd(pd); 381 page.setPd(pd);
  382 + page.setLangIsChina(isChineseLanguageClient());
382 List<PageData> varList = paperService.list(page); //列出Paper列表 383 List<PageData> varList = paperService.list(page); //列出Paper列表
383 // pd.put("PAPER_TYPE","2"); 384 // pd.put("PAPER_TYPE","2");
384 // List<PageData> varList2 = paperService.list(page); //列出Paper列表 385 // List<PageData> varList2 = paperService.list(page); //列出Paper列表