 sw
|
b8c9651079
|
111
|
2014-11-06 15:50:39 +08:00 |
|
sw
|
e2c034dcef
|
修改关闭匿评之后，学生匿评列表显示为已评列表，学生评分显示为我的评分
分数显示为我对该作业的评分
|
2014-11-06 11:58:26 +08:00 |
|
sw
|
6178919735
|
修改创建课程时当前学期的默认选择设置
|
2014-11-05 14:46:01 +08:00 |
|
sw
|
cd83ebbe91
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-05 10:54:54 +08:00 |
|
sw
|
5e91a258fe
|
修改已经提交过作业、再次提交报403
|
2014-11-05 10:54:39 +08:00 |
|
sw
|
bc36e16e57
|
1.修改创建作业后跳转到作业列表
2.修改作业创建成功提示
|
2014-11-05 10:49:00 +08:00 |
 z9hang
|
b462d4e00a
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-05 10:41:50 +08:00 |
|
z9hang
|
b141db6624
|
用户留言修复
|
2014-11-05 10:41:34 +08:00 |
|
sw
|
0151caa00c
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-05 10:14:24 +08:00 |
|
sw
|
54a9044679
|
修改匿评个数可配置、以及增加其相关js验证
|
2014-11-05 10:06:20 +08:00 |
|
z9hang
|
24dc839a39
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-05 09:52:00 +08:00 |
|
z9hang
|
7d4d3f590c
|
项目、课程、竞赛留言模块分页控件修复
|
2014-11-05 09:51:30 +08:00 |
|
sw
|
eb551788ac
|
1.修复匿评列表查询不正确
2.匿评分配支持2份作业分配
3.匿评分配不正确提示
|
2014-11-05 09:16:06 +08:00 |
 gonglexin
|
ed258a98ba
|
作业分配算法优化
|
2014-11-04 21:43:14 +08:00 |
|
z9hang
|
13c3ac8551
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-04 18:31:16 +08:00 |
|
z9hang
|
07c21e97d6
|
修复竞赛、课程、项目留言模块样式
|
2014-11-04 18:30:45 +08:00 |
|
sw
|
2f8f8593eb
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-04 17:00:09 +08:00 |
|
sw
|
def7a7f5e3
|
作业增加按教师评分/匿评/时间排序
|
2014-11-04 16:01:55 +08:00 |
|
sw
|
334a99bcef
|
1.取消老师修改作业时启动互评按钮显示
2创建作业改为提交作业
3.修改不能评分时的样式
|
2014-11-04 15:41:10 +08:00 |
|
sw
|
0f14fbef98
|
增加判断：作业总数大于4份时才可以开启匿评
增加不可重复开启匿评
|
2014-11-04 14:53:49 +08:00 |
|
z9hang
|
b506a961a1
|
1、回复匿名评论时显示出了名字bug。2、样式调整
|
2014-11-04 14:49:36 +08:00 |
|
z9hang
|
316c407a87
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-04 10:58:04 +08:00 |
|
z9hang
|
4a72dd3380
|
1、留言中时间显示不正确问题。2教师评论失败问题
|
2014-11-04 10:57:56 +08:00 |
|
sw
|
df7744e22e
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-04 10:41:57 +08:00 |
|
sw
|
6c75dc6af3
|
增加老师、学生评分后列表界面刷新的js
|
2014-11-04 10:41:34 +08:00 |
|
z9hang
|
1ec82a923e
|
1、重新进入留言界面后，不能删除自己的留言bug。2、删除留言后留言数量未变问题
|
2014-11-04 10:07:15 +08:00 |
|
z9hang
|
c3152b55de
|
创建作业后路由跳转错误问题
|
2014-11-04 09:30:17 +08:00 |
|
z9hang
|
2d157e1898
|
匿评逻辑判断完善
|
2014-11-03 17:31:04 +08:00 |
|
z9hang
|
157010bdad
|
匿评、教师评论
|
2014-11-03 15:28:54 +08:00 |
|
z9hang
|
c2fe1b7c72
|
修正评分不能点问题，作品留言
|
2014-11-03 14:47:28 +08:00 |
|
z9hang
|
2628ab4808
|
修改评分列表获取方式
|
2014-11-03 11:01:17 +08:00 |
|
z9hang
|
e0ff4ec949
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-02 17:26:52 +08:00 |
|
sw
|
f3ac5a0a84
|
1.修改学生创建作业界面
2.取消老师修改作业界面启动互评按钮
3.修改css.css文件中样式
|
2014-11-02 17:08:19 +08:00 |
|
z9hang
|
8bfcbcc602
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
config/locales/zh.yml
|
2014-11-02 14:43:00 +08:00 |
|
z9hang
|
cb87d6337c
|
留言修改
|
2014-11-02 14:41:41 +08:00 |
|
gonglexin
|
e8e7708d6e
|
作业匿评功能
|
2014-11-02 14:38:43 +08:00 |
|
sw
|
8a6da7a0a1
|
作业参与人员增加退出作业按钮显示，实现参与人员自主退出作业的功能
|
2014-11-02 13:18:02 +08:00 |
|
sw
|
58295bc97a
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-02 10:35:14 +08:00 |
|
sw
|
ac59bc8623
|
实现点赞功能
|
2014-11-02 10:34:22 +08:00 |
|
z9hang
|
96626eeb6b
|
恢复respond_path路由并修改部分respond_path
恢复homework_list.html.erb文件
|
2014-11-02 10:20:28 +08:00 |
|
z9hang
|
c3bfbf7a97
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/homework_attach/_homeworks_list.html.erb
|
2014-11-02 09:50:57 +08:00 |
|
z9hang
|
44433e1672
|
评分界面修改
|
2014-11-02 09:46:07 +08:00 |
|
sw
|
8a7757f3c2
|
1.整理踩、赞页面代码
2.增加作业点赞功能
3.作业列表界面增加是否已经点赞判断
|
2014-11-02 09:39:18 +08:00 |
|
sw
|
243803cc5e
|
1.增加点赞样式
2.修改学生进入作业列表，未评列表只能点赞
3.学生修改作品、创建作品报错
4.增加点赞图片
|
2014-11-01 16:19:04 +08:00 |
|
z9hang
|
5cbbb98536
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
2014-11-01 15:14:50 +08:00 |
|
z9hang
|
79b7373446
|
留言修改
|
2014-11-01 15:06:03 +08:00 |
|
sw
|
2dc79889b9
|
1.增加访问界面时根据角色不同显示不同界面
2.增加学生创建作业、删除作业功能
3.修改学生创建作业时的路由
|
2014-11-01 14:33:50 +08:00 |
|
sw
|
58d2306728
|
增加学生进入课程作业界面后相关的路由、界面动态切换显示
|
2014-11-01 11:02:13 +08:00 |
|
sw
|
6a34cef31e
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/homework_attach/get_homework_jours.js.erb
|
2014-10-31 15:40:11 +08:00 |
|
sw
|
a3c5d7eb5e
|
1.获取作业列表时增加老师和学生的判断
2.增加学生进入作业列表时的界面
|
2014-10-31 15:28:04 +08:00 |