Commit Graph

10925 Commits

Author SHA1 Message Date
Tim 09e0e5e93d 单选多选还原 2015-11-26 11:10:17 +08:00
Tim 2a73751fd9 多选题样式调整 2015-11-26 10:56:24 +08:00
Tim 2b6cae5418 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
	app/views/exercise/_show_MC.html.erb
2015-11-26 10:29:21 +08:00
Tim a0c73a5a54 单选题样式调整 2015-11-26 10:27:32 +08:00
cxt 6513c0afee 测验题目的删除按钮增加title 2015-11-26 10:11:54 +08:00
cxt 6f4b6a6b67 填空题的候选答案不能为空,选择题和填空题至少得有一个选项或一个候选答案 2015-11-26 10:03:12 +08:00
cxt 2cd1c07028 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-25 16:05:13 +08:00
cxt c7cf34500c 老师若未设置测验的发布时间则提交后立即发布 2015-11-25 16:05:02 +08:00
Tim bd7ee66e77 新建测验样式调整 2015-11-25 15:02:32 +08:00
cxt 7fb78e4816 新建测验标题等内容时 点击取消应还原编辑框中的内容 2015-11-25 10:38:43 +08:00
cxt 3e0609afe3 测验时长和题目分数增加数字验证 2015-11-25 10:24:46 +08:00
Tim d1f16a0851 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
	db/schema.rb
2015-11-25 10:15:12 +08:00
Tim ec42cd2d7f 系统自动生成文件 2015-11-25 10:12:20 +08:00
cxt 1ae514ca48 测验的发布日期和测验时长做成可选的 2015-11-25 09:38:13 +08:00
cxt 0e7cf4b122 学生作品页面的批次列表只显示已发布的作业 2015-11-24 16:21:25 +08:00
cxt e89cb99743 添加学生测验结果页面的批次链接 2015-11-24 16:20:29 +08:00
cxt f262a7cc13 cffd 2015-11-20 22:05:31 +08:00
huang 83c7e981af Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 21:50:35 +08:00
cxt dbe236032b 新建题目时必须先保存标题 2015-11-20 21:50:27 +08:00
huang 95e8173e0b Merge branch 'szzh' into sw_new_course 2015-11-20 21:50:25 +08:00
huang 6c87908886 Merge branch 'develop' into szzh 2015-11-20 21:49:55 +08:00
huang 1df8c94b98 解决字符过长不能保存成功的问题 2015-11-20 21:49:36 +08:00
huang 3083f683b9 修改删除的时候顺序乱的问题
添加相应的参数
2015-11-20 21:14:09 +08:00
huang 550d056630 删除某个题目后顺序排列 2015-11-20 20:55:37 +08:00
cxt 89f8f5f383 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 20:44:40 +08:00
cxt b10fbcde8c 取消发布和发布测验 2015-11-20 20:44:27 +08:00
huang fc041d5e99 Merge branch 'szzh' into develop 2015-11-20 20:27:25 +08:00
huang 7478b8a449 Merge branch 'sw_new_course' into szzh 2015-11-20 20:26:47 +08:00
huang dd148fb7c5 Merge branch 'szzh' into sw_new_course
Conflicts:
	db/schema.rb
2015-11-20 20:25:17 +08:00
cxt b9460efa08 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 20:23:21 +08:00
cxt cc19c345e1 提交 2015-11-20 20:23:02 +08:00
huang 2435f06f44 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 20:03:11 +08:00
huang 8b29002a0f 修改得分规则 2015-11-20 20:02:57 +08:00
cxt c36ec99ff6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 19:59:17 +08:00
cxt 9ca336a70a 发布和取消发布 2015-11-20 19:59:05 +08:00
ouyangxuhua 5ac65d86b1 将org_document_comment中的title改成text类型 2015-11-20 19:58:25 +08:00
huang c0dfc17b19 修改状态更新 2015-11-20 19:35:32 +08:00
huang da55b00da7 删除插入问题 2015-11-20 19:05:39 +08:00
huang a3122a9a2c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 18:39:44 +08:00
huang aa36c927d3 0 2015-11-20 18:39:35 +08:00
cxt c07e2fe2d2 发布试卷 2015-11-20 18:38:50 +08:00
cxt 98297da226 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 18:29:36 +08:00
cxt c9ba57f64b 去掉关闭、导入等功能 2015-11-20 18:29:26 +08:00
huang bb726e3475 提交答案验证 2015-11-20 18:21:31 +08:00
huang d1e0e0fd30 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 18:02:04 +08:00
huang 97485ca221 修改show逻辑
提交问卷后学生页面显示
2015-11-20 18:01:50 +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
ouyangxuhua 6068867670 项目动态和组织动态删除后,删除相应的组织动态 2015-11-20 17:42:43 +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