Commit Graph

8948 Commits

Author SHA1 Message Date
cxt c9ba57f64b 去掉关闭、导入等功能 2015-11-20 18:29:26 +08:00
cxt da34083a2a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 18:00:22 +08:00
cxt 332ace0f34 列表 2015-11-20 18:00:11 +08:00
huang 431d1d886c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 17:29:33 +08:00
huang 8728557813 老师和学生统计数目区分 2015-11-20 17:29:15 +08:00
cxt d4d2adddb2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
	app/controllers/exercise_controller.rb
2015-11-20 17:26:49 +08:00
cxt eee63b2495 提交前验证数据不为空 2015-11-20 17:25:03 +08:00
huang ed86e3ee5a 三种类型题目计算总分 2015-11-20 17:18:57 +08:00
huang 74f6cb2e64 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 15:14:07 +08:00
huang db46e5e4af 问卷得分统计 2015-11-20 15:13:53 +08:00
cxt b0730dfb81 测验 2015-11-20 15:12:07 +08:00
cxt 9f6fc79df0 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 14:34:27 +08:00
cxt 863d7ed4b5 单选和填空 2015-11-20 14:34:09 +08:00
huang cb3f0d1c97 按类型分类,序号递增 2015-11-20 14:28:47 +08:00
huang 07ee819370 学生多选答题 2015-11-20 13:39:40 +08:00
huang 302dfaf933 新建万卷初始showresult 2015-11-20 13:04:51 +08:00
huang 469e71e77d Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 12:55:30 +08:00
huang 13af6e64b2 修改允许学生查看参数 2015-11-20 12:55:23 +08:00
cxt 99945d5bb5 学生答题界面的修改 2015-11-20 12:54:41 +08:00
huang e9998edbc2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 11:08:55 +08:00
cxt 4204521e14 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 11:09:02 +08:00
cxt acaac93da1 tijiao 2015-11-20 11:08:50 +08:00
huang 3deebf2006 show 2015-11-20 11:08:47 +08:00
huang 21694daa59 多选顺序按小到大排序 2015-11-20 10:05:34 +08:00
cxt d583ca1d70 样式调整 2015-11-20 09:54:46 +08:00
huang 08c7eb8d40 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 21:21:26 +08:00
huang 81e2827277 解决参数为空的bug 2015-11-19 21:21:02 +08:00
cxt 20f7560b07 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 21:19:30 +08:00
cxt 9aee23507c 学生答题页面、答题结果页面、老师的试卷页面 2015-11-19 21:19:18 +08:00
huang b71e6a9b9a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 20:38:24 +08:00
huang 20a80fe6eb 修改JS 2015-11-19 20:38:03 +08:00
huang 74343a4929 发布问卷、取消问卷 2015-11-19 20:35:08 +08:00
cxt 602373812f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 17:50:32 +08:00
cxt d91a6c03b1 编辑 2015-11-19 17:50:24 +08:00
huang 87e7a51278 删除 2015-11-19 17:36:58 +08:00
huang 7ab0f4764a 主管题插入删除更新 2015-11-19 17:31:26 +08:00
cxt 27c88fda4f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
	app/views/exercise/_edit_single.html.erb
2015-11-19 17:20:25 +08:00
cxt 2c1b03079b 学生测验界面 2015-11-19 17:18:58 +08:00
huang 02f6b636cd 完成更新功能 2015-11-19 17:09:59 +08:00
huang f3614999da gi 2015-11-19 16:38:46 +08:00
huang 841ebb7846 简单题更新,未完 2015-11-19 16:21:31 +08:00
cxt cf4717278f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 14:36:45 +08:00
cxt 5e5c18725d 用户在新建题目时必须先保存其他正在编辑的题 2015-11-19 14:35:51 +08:00
huang a900c70e76 试题更新 2015-11-19 14:26:51 +08:00
huang d7020fad1f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 13:07:00 +08:00
cxt 3929aa6dde 编辑 2015-11-19 13:06:17 +08:00
huang 4c71d8a85e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 11:39:04 +08:00
huang bc47382115 用户提交答卷后,给出得分 2015-11-19 11:38:44 +08:00
cxt 4cd9f6a502 新建题目时分数自动获取同一类型题目的最后一个分数 2015-11-19 11:37:49 +08:00
cxt c7476b3f86 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 09:13:56 +08:00