 sw
|
00633c8331
|
1
|
2015-01-17 19:00:32 +08:00 |
|
sw
|
750c8d77aa
|
11111
|
2015-01-17 15:21:18 +08:00 |
|
sw
|
1e8c6374d7
|
Merge branch 'szzh' into Poll
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
2015-01-17 15:03:59 +08:00 |
|
sw
|
155d48b7cb
|
问卷列表每页显示20个
|
2015-01-17 14:41:33 +08:00 |
 alan
|
ade0720331
|
邮件系统界面重置
Signed-off-by: alan <547533434@qq.com>
|
2015-01-17 14:19:54 +08:00 |
|
sw
|
c43c6a8c3f
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 13:56:11 +08:00 |
 z9hang
|
05b1b9741b
|
问卷调查页面修改为每页显示5题
|
2015-01-17 13:35:15 +08:00 |
|
sw
|
629c4aaaa1
|
1、#1814 未发布的问卷显示在学生的问卷总数中
2、修复问卷标题过长，问卷列表显示异常
3、已发布的问卷可以删除
|
2015-01-17 13:30:50 +08:00 |
|
alan
|
b9ea3e589e
|
修改《邮件系统》页面
Signed-off-by: alan <547533434@qq.com>
|
2015-01-17 11:18:24 +08:00 |
|
sw
|
ae9856c01a
|
发布时弹出框js、css调整
|
2015-01-16 17:21:33 +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 |
|
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 |
|
alan
|
5191411508
|
<邮件加密自动登录功能，邮件附件下载功能>
Signed-off-by: alan <547533434@qq.com>
|
2015-01-15 18:48:19 +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 |
|
alan
|
2bba0ddd70
|
添加《邮件加入附件下载功能及私有项目自动登录》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-14 16:08:56 +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 |