 huang
|
98b44d4903
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 14:54:39 +08:00 |
|
huang
|
e8cca08f40
|
多选查询去重，修改样式
|
2015-01-17 14:54:19 +08:00 |
 sw
|
989ff4fcbe
|
修改弹出框高度
|
2015-01-17 14:46:49 +08:00 |
|
sw
|
ebbe2f97d8
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 14:44:12 +08:00 |
|
sw
|
2c6e53b935
|
修改弹出框宽度
|
2015-01-17 14:43:55 +08:00 |
 z9hang
|
26b3aab6a2
|
增加题型显示
|
2015-01-17 14:18:45 +08:00 |
|
sw
|
8a05e032af
|
修改题型显示的样式
|
2015-01-17 14:10:44 +08:00 |
|
huang
|
e5da3c47ed
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 14:04:32 +08:00 |
|
huang
|
6bba6b2b76
|
weiwan
|
2015-01-17 14:04:20 +08:00 |
|
sw
|
c43c6a8c3f
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 13:56:11 +08:00 |
|
sw
|
8e017425cf
|
增加弹出框的样式
|
2015-01-17 13:55:59 +08:00 |
|
sw
|
629c4aaaa1
|
1、#1814 未发布的问卷显示在学生的问卷总数中
2、修复问卷标题过长，问卷列表显示异常
3、已发布的问卷可以删除
|
2015-01-17 13:30:50 +08:00 |
|
huang
|
7c100342f4
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 12:35:18 +08:00 |
|
huang
|
6e698d45bb
|
修改了html边界超出问题
|
2015-01-17 12:34:57 +08:00 |
|
sw
|
abd5996719
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 12:13:19 +08:00 |
|
z9hang
|
33fd43e7b6
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 12:04:29 +08:00 |
|
sw
|
4e19690887
|
1.修改取消编辑多行主观后多行主观从页面消失
2.修改编辑后取消，第二次进入编辑却显示前一次编辑的结果 #1810 #1806
|
2015-01-17 11:58:19 +08:00 |
|
z9hang
|
092dd61c86
|
修改修改资料处样式问题
|
2015-01-17 11:51:59 +08:00 |
|
huang
|
e75193e35a
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 11:47:02 +08:00 |
|
huang
|
0f5c3c5f4c
|
添加主观题统计页面及样式
|
2015-01-17 11:46:34 +08:00 |
|
sw
|
e8f3bd4dbb
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 11:09:39 +08:00 |
|
sw
|
e14deeb4dd
|
增加限制：问卷标题最多100字，问卷描述最多300字，问卷问题最多250字，问卷选项最多200字
|
2015-01-17 11:05:38 +08:00 |
|
z9hang
|
9487ce1245
|
#1807课程--问卷调查：答题多行主观后，再点击打开答题页面，如图，显示html元素<br>
|
2015-01-17 11:02:09 +08:00 |
|
huang
|
3acec4b7c1
|
修改了总统计数
|
2015-01-17 10:14:07 +08:00 |
|
sw
|
f99d159ca1
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 17:34:52 +08:00 |
|
sw
|
d16d5fd362
|
单行文字/多行文字 --> 单行主观/多行主观
|
2015-01-16 17:31:04 +08:00 |
|
sw
|
ae9856c01a
|
发布时弹出框js、css调整
|
2015-01-16 17:21:33 +08:00 |
|
huang
|
b43e6558e1
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 16:48:46 +08:00 |
|
huang
|
59c21d81e9
|
修改了分母不能为0的bug
统计结果精确到两位
|
2015-01-16 16:48:20 +08:00 |
|
z9hang
|
bbf4c4629b
|
问卷show页面国际化
|
2015-01-16 16:13:03 +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
|
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
|
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 |
|
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 |
|
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 |
|
z9hang
|
933ad22cd2
|
修改提交问卷后提示框样式
|
2015-01-15 18:35:27 +08:00 |