Commit Graph

391 Commits

Author SHA1 Message Date
sw 78039a726e Merge branch 'szzh' into guange_dev 2015-03-12 17:09:20 +08:00
z9hang 8190403380 app添加忘记密码接口,课程动态接口代码优化(去掉其中的中文) 2015-03-12 16:33:31 +08:00
lizanle 437fc243ad 给每个项目添加一条初始创建信息,如果有menber,最早加进来的就算创始人,并给projects表的更新创建人 2015-03-11 15:47:10 +08:00
guange c893a2d99b 迁移优化,原来需要1800秒,现只需800秒 2015-03-09 16:25:41 +08:00
alan 5ff43fdea7 项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
2015-03-07 10:52:20 +08:00
z9hang c1c05067e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/controllers/admin_controller.rb
	db/schema.rb
2015-03-06 15:36:47 +08:00
sw 26081c6120 新建项目时增加不选择所属组织 2015-03-06 09:27:43 +08:00
sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh
Conflicts:
	app/views/projects/show.html.erb
	db/schema.rb
2015-03-06 08:59:29 +08:00
z9hang 3334299808 app版本管理功能(表添加,页面部分添加) 2015-03-05 17:37:33 +08:00
sw bcc8abdee9 1、增加组织相关数据表
2、增加组织和项目的关联关系
2015-03-05 09:27:13 +08:00
lizanle 7ee58d1d44 项目动态重写,并去掉首页缓存 2015-03-04 15:32:00 +08:00
alan f2a3ce0ece 修改《网页标题显示为“中国高校”不合适》bug
Signed-off-by: alan <547533434@qq.com>
2015-01-30 16:05:36 +08:00
huang d0a675f2b8 企业版模块 2015-01-30 14:11:35 +08:00
z9hang 222e2cc135 修改ErrorHandler未能加载问题 2015-01-28 09:25:58 +08:00
z9hang db1cd8851c Merge branch 'szzh' into api
Conflicts:
	Gemfile
	db/schema.rb
2015-01-23 16:51:40 +08:00
sw 900cff8f8e 1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断
2、去掉错误的插件引用
2015-01-23 14:43:40 +08:00
sw 6645648027 学生是否看到问卷结果老师可配置增加数据库 2015-01-23 14:10:38 +08:00
z9hang 3911450787 问卷调查简答题输入字符过多显示超边框问题 2015-01-23 09:51:36 +08:00
alan 6ccb154cc3 课程留言,发邮件给课程所有人
Signed-off-by: alan <547533434@qq.com>
2015-01-21 11:33:29 +08:00
sw 750c8d77aa 11111 2015-01-17 15:21:18 +08:00
huang 34b8ffeb5b tongji 2015-01-16 10:51:08 +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 0433f7c87f 增加新建单选题功能 2015-01-14 15:35:04 +08:00
z9hang b6826a74d3 问卷显示 2015-01-14 11:50:59 +08:00
z9hang 60b0743292 问卷调查页面在火狐中的显示问题 2015-01-14 09:48:19 +08:00
z9hang 0f9915fc2a Merge branch 'szzh' into api
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/bids_controller.rb
	app/controllers/users_controller.rb
	db/schema.rb
2015-01-13 15:12:05 +08:00
sw c0fa21eb9f 问卷调查表增加描述列 2015-01-12 16:07:15 +08:00
sw 197068a2e2 111 2015-01-12 15:44:56 +08:00
alan 9f807438d6 教师数目显示:-1 ,同时动态大量不显示。是不是只显示近期3个月的?
Signed-off-by: alan <547533434@qq.com>
2015-01-12 14:58:11 +08:00
sw ee9d82bfc7 1.实现文件调查的model、control、view的架构
2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题
2015-01-08 17:42:46 +08:00
sw 4c6ade4c08 定义各model之间的关系 2015-01-08 14:41:28 +08:00
sw c9de30bd83 增加问卷调查相关表,以及对应的model、control、view的文件夹 2015-01-08 12:00:43 +08:00
z9hang b5da95d5ce 修改错误 2015-01-05 10:15:14 +08:00
alan c1705bd65b 增加《导入student_for_course数据》
Signed-off-by: alan <547533434@qq.com>
2014-12-31 17:02:55 +08:00
alan 486f0b69b1 数据迁移student_for_course的数据
Signed-off-by: alan <547533434@qq.com>
2014-12-31 10:23:21 +08:00
alan 23140307aa 实现<去存储过程功能,并修改打分的表更新>
Signed-off-by: alan <547533434@qq.com>
2014-12-31 08:48:14 +08:00
alan ed54248494 修改《查找学生信息》bug
Signed-off-by: alan <547533434@qq.com>
2014-12-30 14:33:46 +08:00
alan 6a86e1c386 <分组点击两次>bug
Signed-off-by: alan <547533434@qq.com>
2014-12-30 14:00:48 +08:00
alan 4f5fe52485 基于苏稳添加的字段优化存储过程
Signed-off-by: alan <547533434@qq.com>
2014-12-30 09:21:56 +08:00
alan 5874450d14 修改《学生列表排序用的存储过程》
Signed-off-by: alan <547533434@qq.com>
2014-12-29 22:20:21 +08:00
sw 05b9b26314 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2014-12-29 17:00:35 +08:00
alan fb398904b6 优化《学生列表》分页查询
Signed-off-by: alan <547533434@qq.com>
2014-12-29 16:57:31 +08:00
sw 0a58fce251 优化数据迁移效率 2014-12-29 11:53:26 +08:00
sw 259799eb89 1.增加评分的model
2.修改评分表中为教师评分的历史数据的is_teacher_score的值
2014-12-29 11:38:35 +08:00
sw fa36e6d2b0 增加判断评分是不是老师评分的列 2014-12-29 10:58:45 +08:00
alan b79b08fa8f 编写《作业查询存储过程》
Signed-off-by: alan <547533434@qq.com>
2014-12-26 15:51:39 +08:00
sw 73afb7e6c8 调用作业课程时首先判断该作业的所属课程是否存在 2014-12-22 14:15:49 +08:00
guange 03f2c9c192 关注返回规范化 2014-12-18 13:37:23 +08:00
= bb23468c7d Merge branch 'szzh' into api
Conflicts:
	app/controllers/account_controller.rb
	app/controllers/courses_controller.rb
	db/schema.rb
2014-12-17 16:41:28 +08:00