Commit Graph

99 Commits

Author SHA1 Message Date
sw 17b96bdb14 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:57:58 +08:00
sw 79ad33a90f 增加发布问卷的路由 2015-01-16 15:57:49 +08:00
z9hang e49dfefefb Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:51:41 +08:00
z9hang dd42c89ee6 百分比除数为0问题 2015-01-16 15:51:26 +08:00
huang 2cbe801528 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:49:41 +08:00
huang 7177303eeb 问卷统计最终效果 2015-01-16 15:49:22 +08:00
sw d448599664 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:34:43 +08:00
z9hang b8047bec28 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:32:33 +08:00
z9hang 0a367249ae 问卷完成度显示 2015-01-16 15:32:09 +08:00
sw 65a3ddce41 1、增加新增单行文字功能
2、修改题目后总是显示为单选题
2015-01-16 15:05:30 +08:00
huang b53686dfd7 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 11:19:01 +08:00
huang eacc1079b0 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
	app/controllers/poll_controller.rb
2015-01-16 11:18:39 +08:00
sw a683acf85c 修复新建问卷时刷新页面,会新建一个问卷的BUG 2015-01-16 11:05:04 +08:00
huang 34b8ffeb5b tongji 2015-01-16 10:51:08 +08:00
sw 40d6ebfd88 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 10:49:00 +08:00
sw 9fb0275563 1.增加修改单选题时页面js的刷新
2.修改单选题时删除某些选项有误
2015-01-16 10:43:05 +08:00
z9hang dc2c96f59a 提交后的问卷禁止查看与编辑 2015-01-16 10:19:38 +08:00
sw f41cd0a8ab 1.修改单选题业务逻辑处理
2.删除选项时,单选题至少有一个选项
2015-01-16 10:11:17 +08:00
z9hang 30a058133d Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-15 18:22:38 +08:00
z9hang e44cc07f86 提交问卷功能 2015-01-15 18:22:30 +08:00
sw c4bedfb369 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
	app/controllers/poll_controller.rb
2015-01-15 18:22:05 +08:00
sw d55492b07a 增加修改单选题的路由、action、以及js 2015-01-15 18:17:45 +08:00
z9hang 77dc9607df 简答题答题 2015-01-15 17:36:30 +08:00
sw 5ec2789881 删除某一题目后,后面的题目序号自动-1,以及页面js的刷新 2015-01-15 17:26:56 +08:00
sw 3fab26214f 删除单选题后页面数据的删除,增加删除题目的路由及相关方法 2015-01-15 17:15:29 +08:00
sw 870f9bba98 必答按钮的数据存入 2015-01-15 16:50:06 +08:00
sw a99d7c5145 1、分离出新建问卷问题页面
2、增加修改问题相关路由及action
2015-01-15 14:40:17 +08:00
z9hang d684acf527 多选题答题功能 2015-01-15 11:54:30 +08:00
sw 20c160f03f 1、修改标题头、取消修改标题头数据的保存和页面的变更 2015-01-15 10:50:08 +08:00
z9hang d2fadfda08 单选题选择答案 2015-01-15 10:11:52 +08:00
z9hang 8dab2057a9 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
	config/routes.rb
2015-01-15 09:42:41 +08:00
z9hang 6d82e79e7f 答题相关方法添加 2015-01-15 09:41:19 +08:00
huang 2b0775da26 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
	db/schema.rb
2015-01-14 16:37:45 +08:00
huang b63b4974eb 统计 2015-01-14 16:36:30 +08:00
sw 2a23eb8e17 1.增加单选题的显示
2.去掉无用页面
2015-01-14 16:15:33 +08:00
sw 0433f7c87f 增加新建单选题功能 2015-01-14 15:35:04 +08:00
sw 2af6121f82 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-14 14:24:08 +08:00
sw eb2498c62c 1.增加新增单选题、新增选项、删除选项等js
2.修改问卷layout增加
3.增加新增单选题确定按钮的路由以及相关action
2015-01-14 14:23:41 +08:00
z9hang b6826a74d3 问卷显示 2015-01-14 11:50:59 +08:00
sw 311d90d565 1.增加点击单选、多选、单行文本、多行文本的js
2.分割问卷标题头
3.增加新增问题的路由及action
2015-01-13 20:13:50 +08:00
sw fc72d6f9a9 1.增加问卷统计、问卷答卷等页面跳转,并增加对应路由
2.调整页面样式
3.动态分页
2015-01-13 15:59:02 +08:00
sw a18fa10de5 1.增加老师和学生显示界面的区别
2.增加分页的动态显示,以及分页相关css修改
2015-01-13 11:44:28 +08:00
sw 32219bd850 增加访问权限控制 2015-01-13 10:23:26 +08:00
sw d0dc01b992 增加问卷修改功能,以及相关js 2015-01-12 17:55:22 +08:00
sw 475b046898 修改访问poll#index报ArgumentError 2015-01-12 16:56:53 +08:00
sw 1c24a306fe 去掉无用的control 2015-01-12 16:37:23 +08:00
sw c964194d85 增加问卷调查相关的路由、action、以及部分对应的页面 2015-01-12 16:02:15 +08:00
sw ee9d82bfc7 1.实现文件调查的model、control、view的架构
2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题
2015-01-08 17:42:46 +08:00
sw c9de30bd83 增加问卷调查相关表,以及对应的model、control、view的文件夹 2015-01-08 12:00:43 +08:00