Commit Graph

399 Commits

Author SHA1 Message Date
Tim 4b62a39b15 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-17 16:49:57 +08:00
Tim 24458ecb48 table可拖拽,在线测验表格布局优化 2016-06-16 11:31:39 +08:00
cxt caa966c85a 分组作业的作品列表提示的修改
分组作业提交作品时的最小人数限制不起作用
2016-06-15 14:12:42 +08:00
cxt c50d307e89 分组作业添加成员后再次打开,数据未保存 2016-06-14 17:36:12 +08:00
cxt 254e1f44f6 评分设置提示的修改与提交时的判断 2016-06-14 15:44:03 +08:00
cxt 6c7237509d “当前作品未进行评分,是否确定提交”改为“您当次评阅未对作品进行评分,分数将取上次的评分结果,若没有评分记录则不评分,是否确定提交?” 2016-06-13 14:08:30 +08:00
cxt b6eb5a3668 还原作品列表的拖动 2016-06-08 11:28:20 +08:00
Tim c5e6514c18 作品列表排序图标float消除 2016-06-07 16:02:20 +08:00
Tim 1d44116841 作品列表可拖拽 2016-06-07 15:30:17 +08:00
Tim ed46ca0735 可拖拽作业列表 2016-06-02 13:45:06 +08:00
Tim 308f247c71 可拖拽调整 2016-06-01 16:09:01 +08:00
Tim 3b55e9e39b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	app/views/student_work/_evaluation_un_title.html.erb
	app/views/student_work/_evaluation_un_work.html.erb
2016-06-01 13:59:01 +08:00
Tim 513fe1a93d 作品列表可拖拽 2016-06-01 13:46:05 +08:00
cxt 086ccedc08 先隐藏作业信息,再点击查询或分班后“显示作业信息”的按钮不见了 2016-05-27 16:45:04 +08:00
cxt 227a668413 分组匿评的显示 2016-05-27 15:15:14 +08:00
cxt 7599bf75a3 分组作业不关联项目时的作品列表样式调整 2016-05-27 15:04:56 +08:00
Tim 5f27519c67 table可拖拽 2016-05-27 14:44:32 +08:00
cxt 400a470a2b 作品列表的样式调整 2016-05-27 14:42:12 +08:00
cxt 03d70e8c9a 作品列表:当先进行作品搜索或选择分班操作后,然后点击“隐藏作业信息”,再点击“显示作业信息”无反应 (测验列表也一起修复了) 2016-05-27 14:27:54 +08:00
cxt c3ec7289b7 Merge branch 'develop' into cxt_course 2016-05-23 09:51:59 +08:00
Tim 51cd9c6dd1 学号溢出bug 2016-05-20 21:47:31 +08:00
Tim dd4786d639 作品列表查看详情定位 2016-05-20 20:44:13 +08:00
Tim 5f4a9304fe 提交成绩后,列表成绩没刷新修改;分组作业列表宽度调整 2016-05-20 20:05:39 +08:00
Tim 1c7efa247e 老师提交分数后格式混乱修改 2016-05-20 19:13:55 +08:00
cxt 56a151a7b4 学生打开的作品列表中不应通过下拉列表访问到挂起的作业 2016-05-20 19:11:09 +08:00
cxt 8f9ead0a12 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-20 15:39:37 +08:00
cxt da375dcb4e 挂起作业的作品列表中下拉列表的内容为空,截止时间和发布时间不应显示 2016-05-20 15:39:07 +08:00
Tim 13f83719c1 作品列表改为table布局 2016-05-20 15:15:42 +08:00
huang 561f1b0572 Merge branch 'cxt_course' into develop 2016-05-13 18:25:15 +08:00
cxt 821cd8ad99 作品列表样式调整 2016-05-13 17:26:17 +08:00
cxt 01287ff93c 学生打开新建的作业列表报500 2016-05-13 14:40:28 +08:00
cxt 345e1c0a48 评分的回复连续点击多次防止提交多次表单 2016-05-13 10:57:45 +08:00
cxt cc92105da9 作品列表添加序号及样式调整 2016-05-13 09:58:24 +08:00
cxt f74e5eb6ae Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-12 17:49:13 +08:00
cxt 0f61994252 点击作业动态优秀排行中学生链接,在打开的作品列表中自动定位到该学生作品并默认打开该作品 2016-05-12 17:49:07 +08:00
Tim 2ac201ffdd Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-12 17:41:42 +08:00
Tim 565d5e3bcc 作业测验列表html代码重构,添加序号列 2016-05-12 17:41:27 +08:00
cxt 7481d96166 Merge branch 'develop' into cxt_course
Conflicts:
	app/controllers/admin_controller.rb
	config/routes.rb
	lib/redmine.rb
2016-05-12 10:40:35 +08:00
cxt fdefbf3795 作品打分连续点击不会多次提交 2016-05-11 15:31:33 +08:00
cxt 9bc8ccbb9e 教辅可只评语不评分 2016-05-11 09:18:55 +08:00
cxt 5baf467d13 作品评分不覆盖 2016-05-10 15:26:08 +08:00
cxt ba07e564db 老师评分的弹框 2016-05-10 11:51:41 +08:00
cxt 11017d72c5 老师对作品的评分可为空 2016-05-10 11:28:24 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-05-06 22:02:22 +08:00
cxt 262fd8bb65 学生提交禁用匿评的作业时会弹出匿评关闭的提示 2016-05-06 18:54:51 +08:00
huang df1c70880a Merge branch 'cxt_course' into develop
Conflicts:
	app/views/users/_homework_repository.html.erb
	public/stylesheets/new_user.css
2016-05-06 12:22:43 +08:00
cxt 71dcedc443 取消作品评分的缺省评分 2016-05-04 16:24:42 +08:00
cxt b0988dc950 Merge branch 'cxt_course' into develop 2016-04-29 17:57:32 +08:00
cxt c2d60b8958 教师优先的迟交扣分和缺评扣分 2016-04-29 16:38:26 +08:00
cxt 3aa891acf6 Merge branch 'cxt_course' into develop
Conflicts:
	app/controllers/student_work_controller.rb
	app/views/praise_tread/_praise.html.erb
	db/schema.rb
2016-04-27 16:27:55 +08:00