Commit Graph

4770 Commits

Author SHA1 Message Date
z9hang bbf4c4629b 问卷show页面国际化 2015-01-16 16:13:03 +08:00
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
sw fe3a84c8db 实现添加多行文字 2015-01-16 15:34:25 +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
sw f46c8e8adc 新建单选、多选取消之后无法继续新建的BUG 2015-01-16 14:47:09 +08:00
sw 164c89d7b8 1.实现添加多选题
2.单选题、多选题后面增加括号提示
2015-01-16 14:39:40 +08:00
sw b1985ad794 Merge branch 'develop' into szzh 2015-01-16 14:05:44 +08:00
sw dedb70c56b 显示问题增加多选、单行文字、多行文字的显示 2015-01-16 14:03:12 +08:00
sw 2954bba411 j进入新建、修改页面时,问卷头显示为可编辑 2015-01-16 13:54:06 +08:00
sw a5cf1576f1 将新增问题栏放到问题列表下面 2015-01-16 13:44:20 +08:00
sw 6ae2a0dd5f Merge branch 'szzh' into develop 2015-01-16 11:41:04 +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
z9hang d0117e5d03 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 11:02:07 +08:00
z9hang 0dc0ba3a4a 问卷显示权限管理 2015-01-16 10:59:25 +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
alan 5191411508 <邮件加密自动登录功能,邮件附件下载功能>
Signed-off-by: alan <547533434@qq.com>
2015-01-15 18:48:19 +08:00
z9hang 933ad22cd2 修改提交问卷后提示框样式 2015-01-15 18:35:27 +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 f78de71814 编辑单选题时页面js添加 2015-01-15 16:44:35 +08:00
sw 4edd9fee64 新增单选题取消后无法重新添加单选题 2015-01-15 16:33:11 +08:00
sw 5792bd77e5 实现新增单选题题时页面的刷新 2015-01-15 16:31:40 +08:00
sw a1f21f3ebb 1、修改一次添加一个题目
2、新增题目时,新建题目获取焦点
3、新增题目后页面事件改变
2015-01-15 16:10:24 +08:00
sw a99d7c5145 1、分离出新建问卷问题页面
2、增加修改问题相关路由及action
2015-01-15 14:40:17 +08:00
sw 4996b9a546 修复重复编辑问卷头会使问卷头信息显示不正确的BUG 2015-01-15 14:09:27 +08:00
sw 517c3d1ca5 修复部分情况下删除单选题题选项后,后面再添加的单选题与前面单选题name有重复的BUG 2015-01-15 13:58:50 +08:00
z9hang d684acf527 多选题答题功能 2015-01-15 11:54:30 +08:00
sw 496ef94b97 增加编辑头页面js 2015-01-15 11:05:19 +08:00
sw 20c160f03f 1、修改标题头、取消修改标题头数据的保存和页面的变更 2015-01-15 10:50:08 +08:00
z9hang d2fadfda08 单选题选择答案 2015-01-15 10:11:52 +08:00