Commit 85ea5817d2dc251c9e672cca84fc5a94a48bf260
1 parent
1b90180a
布置练习更新
Showing
4 changed files
with
29 additions
and
7 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
| ... | ... | @@ -41,11 +41,11 @@ |
| 41 | 41 | <table id="table_report" class="table"> |
| 42 | 42 | <tr> |
| 43 | 43 | <td style="width:95px;text-align: right;padding-top: 13px;">练习标题</td> |
| 44 | - <td><input type="text" name="NAME" class="form-control" id="NAME" value="${pd.CODE}" maxlength="255" placeholder="输入练习标题，不超过20个汉字" title="作业代码" /></td> | |
| 44 | + <td><input type="text" name="NAME" class="form-control" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="输入练习标题，不超过20个汉字" title="作业代码" /></td> | |
| 45 | 45 | </tr> |
| 46 | 46 | <tr> |
| 47 | 47 | <td style="width:95px;text-align: right;padding-top: 13px;">练习说明</td> |
| 48 | - <td><input type="text" name=HOMEWORK_DESC class="form-control" id="HOMEWORK_DESC" value="${pd.NAME}" maxlength="255" placeholder="输入题目说明，如教材第12页1-5题，教辅第5页1-3题，尽量精简，不超过100个汉字" title="作业名称" /></td> | |
| 48 | + <td><input type="text" name=HOMEWORK_DESC class="form-control" id="HOMEWORK_DESC" value="${pd.HOMEWORK_DESC}" maxlength="255" placeholder="输入题目说明，如教材第12页1-5题，教辅第5页1-3题，尽量精简，不超过100个汉字" title="作业名称" /></td> | |
| 49 | 49 | </tr> |
| 50 | 50 | <tr> |
| 51 | 51 | <td style="width:95px;text-align: right;padding-top: 13px;">指定班级完成时间</td> |
| ... | ... | @@ -171,6 +171,10 @@ |
| 171 | 171 | </div> |
| 172 | 172 | <div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div> |
| 173 | 173 | </form> |
| 174 | + | |
| 175 | + | |
| 176 | + ${pd} | |
| 177 | + | |
| 174 | 178 | </div> |
| 175 | 179 | <!-- /.col --> |
| 176 | 180 | </div> |
| ... | ... | @@ -235,6 +239,7 @@ |
| 235 | 239 | } |
| 236 | 240 | }); |
| 237 | 241 | } |
| 242 | + | |
| 238 | 243 | </script> |
| 239 | 244 | </body> |
| 240 | 245 | </html> |
| 241 | 246 | \ No newline at end of file | ... | ... |
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
| ... | ... | @@ -156,7 +156,7 @@ |
| 156 | 156 | window.top.loading.show(); |
| 157 | 157 | } |
| 158 | 158 | function edit(Id){ |
| 159 | - var path = '<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&ID='+Id; | |
| 159 | + var path = '<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&HOMEWORK_ID='+Id; | |
| 160 | 160 | parent.$("#mainFrame").attr('src',path); |
| 161 | 161 | window.top.loading.show(); |
| 162 | 162 | } | ... | ... |
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
| ... | ... | @@ -187,7 +187,7 @@ |
| 187 | 187 | function homeWork(schoolId){ |
| 188 | 188 | //var path = "../school/goEdit2.do?ID=" + schoolId ; |
| 189 | 189 | |
| 190 | - var path = '<%=basePath%>homework/goEdit2.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ; | |
| 190 | + var path = '<%=basePath%>homework/goAdd2.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ; | |
| 191 | 191 | |
| 192 | 192 | $("#mainFrame").attr('src',path); |
| 193 | 193 | window.top.loading.show(); | ... | ... |
src/com/fh/controller/sunvote/homework/HomeworkController.java
| ... | ... | @@ -113,7 +113,7 @@ public class HomeworkController extends BaseController { |
| 113 | 113 | logBefore(logger, Jurisdiction.getUsername() + "列表Homework"); |
| 114 | 114 | ModelAndView mv = this.getModelAndView(); |
| 115 | 115 | PageData pd = new PageData(); |
| 116 | - pd = this.getPageData(); | |
| 116 | + pd = this.getPageData(); | |
| 117 | 117 | String keywords = pd.getString("keywords"); // 关键词检索条件 |
| 118 | 118 | if (null != keywords && !"".equals(keywords)) { |
| 119 | 119 | pd.put("keywords", keywords.trim()); |
| ... | ... | @@ -143,6 +143,23 @@ public class HomeworkController extends BaseController { |
| 143 | 143 | mv.addObject("pd", pd); |
| 144 | 144 | return mv; |
| 145 | 145 | } |
| 146 | + | |
| 147 | + /** | |
| 148 | + * 去新增页面 | |
| 149 | + * | |
| 150 | + * @param | |
| 151 | + * @throws Exception | |
| 152 | + */ | |
| 153 | + @RequestMapping(value = "/goAdd2") | |
| 154 | + public ModelAndView goAdd2() throws Exception { | |
| 155 | + ModelAndView mv = this.getModelAndView(); | |
| 156 | + PageData pd = new PageData(); | |
| 157 | + pd = this.getPageData(); | |
| 158 | + mv.setViewName("sunvote/homework/homework_edit2"); | |
| 159 | + mv.addObject("msg", "save"); | |
| 160 | + mv.addObject("pd", pd); | |
| 161 | + return mv; | |
| 162 | + } | |
| 146 | 163 | |
| 147 | 164 | /** |
| 148 | 165 | * 去修改页面 |
| ... | ... | @@ -174,7 +191,7 @@ public class HomeworkController extends BaseController { |
| 174 | 191 | PageData pd = new PageData(); |
| 175 | 192 | pd = this.getPageData(); |
| 176 | 193 | pd = homeworkService.findById(pd); // 根据ID读取 |
| 177 | - pd.put("PROBLEMS", homeworkproblemService.listProblem(pd)); | |
| 194 | + pd.put("QUESTIONS", homeworkproblemService.listProblem(pd)); | |
| 178 | 195 | pd.put("TEACHER_ID", geTeacherID()); |
| 179 | 196 | mv.setViewName("sunvote/homework/homework_edit2"); |
| 180 | 197 | mv.addObject("msg", "edit"); |
| ... | ... | @@ -372,7 +389,7 @@ public class HomeworkController extends BaseController { |
| 372 | 389 | homeworkproblemService.save(qpd); |
| 373 | 390 | } |
| 374 | 391 | |
| 375 | - responseGson.setData(pd.getString("CODE")); | |
| 392 | + responseGson.setData(hpd.getString("CODE")); | |
| 376 | 393 | } else { |
| 377 | 394 | responseGson.setDataError(); |
| 378 | 395 | } | ... | ... |