From 76b4ae24dac2171c41e6e24de3d5c090b3dc81dd Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 30 Apr 2015 16:30:02 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E9=82=80=E8=AF=B7--=E9=82=AE=E4=BB=B6=E5=90=8D=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=88=90=E7=94=A8=E6=88=B7=E7=82=B9=E5=87=BB=E5=90=8C?= =?UTF-8?q?=E6=84=8F=E6=8C=89=E9=92=AE=E5=90=8E=E6=89=8D=E8=83=BD=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 7 +++---- app/models/mailer.rb | 14 +++++++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2b58f1265..96807d2dc 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -247,10 +247,9 @@ class ProjectsController < ApplicationController # 1、自动注册 # 2、加入项目、创建角色 # 3、用户得分 - if params[:login] - # 自动激活用户 - user.status = 1 - user.save + if params[:email] + user = User.find_by_mail(params[:email].to_s) + Member.create(:role_ids => [4], :user_id => user.id,:project_id => @project.id) end if params[:jump] && redirect_to_project_menu_item(@project, params[:jump]) return diff --git a/app/models/mailer.rb b/app/models/mailer.rb index d35374fcf..e2ccb2230 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -71,14 +71,14 @@ class Mailer < ActionMailer::Base # 邀请已注册的用户加入项目 def request_member_to_project(email, project, invitor) + @subject = "#{invitor.name} #{l(:label_invite_project)}: #{project.name} " user = User.find_by_mail(email.to_s) - Member.create(:role_ids => [4], :user_id => user.id,:project_id => project.id) - @invitor_name = "#{invitor.name}" - @project_name = "#{project.name}" - @user = user - @token = Token.get_token_from_user(user, 'autologin') - @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id,:user => user, :token => @token.value) - mail :to => email, :invitor_name => "#{@invitor_name}", :project_name => "#{@project_name}" + @invitor_name = "#{invitor.name}" + @project_name = "#{project.name}" + @user = user + @token = Token.get_token_from_user(user, 'autologin') + @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, :email => email, :token => @token.value) + mail :to => email, :subject => @subject end # author: alan From 88bbd70102a3eedc09fe7f2fd4f54d188cdc004e Mon Sep 17 00:00:00 2001 From: whimlex Date: Thu, 30 Apr 2015 17:24:30 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=EF=BC=9B=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=A1=B9=E7=9B=AE=E5=AF=BC=E8=88=AA=E5=88=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=9B?= =?UTF-8?q?IE=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=BC=A9=E7=95=A5=E5=9B=BE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 4 +- .../attachments/_project_file_links.html.erb | 70 +++++-------------- app/views/avatar/_avatar_preview.html.erb | 66 +++++++++++++++++ app/views/issues/show.html.erb | 2 +- app/views/layouts/base_projects.html.erb | 7 +- public/stylesheets/project.css | 3 +- 6 files changed, 91 insertions(+), 61 deletions(-) create mode 100644 app/views/avatar/_avatar_preview.html.erb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 65ad32602..405dc72ed 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -329,12 +329,12 @@ module ApplicationHelper imagesize = attachment.thumbnail(:size => "200*200") imagepath = named_attachment_path(attachment, attachment.filename) if imagesize - link_to image_tag(thumbnail_path(attachment), height: '73', width: '100', name: 'issue_attachment_picture'), + link_to image_tag(thumbnail_path(attachment), height: '73', width: '100', class: 'issue_attachment_picture'), imagepath, :title => attachment.filename else - link_to image_tag(imagepath , height: '73', width: '100', name: 'issue_attachment_picture'), + link_to image_tag(imagepath , height: '73', width: '100', class: 'issue_attachment_picture'), imagepath, :title => attachment.filename end diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb index a42593290..a18d819da 100644 --- a/app/views/attachments/_project_file_links.html.erb +++ b/app/views/attachments/_project_file_links.html.erb @@ -1,62 +1,28 @@
diff --git a/app/views/avatar/_avatar_preview.html.erb b/app/views/avatar/_avatar_preview.html.erb new file mode 100644 index 000000000..f7a014c64 --- /dev/null +++ b/app/views/avatar/_avatar_preview.html.erb @@ -0,0 +1,66 @@ + + +
+ +
+
+ diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index bed1e3d77..8fb63bd10 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -4,7 +4,7 @@ <% html_title "#{@issue.tracker.name} #{@issue.source_from}'#'#{@issue.project_index}: #{@issue.subject}" %>
- <%= @issue.project.name %> > + <%= link_to "#{@issue.project.name}"+">", project_issues_path(@issue.project) %> <%= "#" + @issue.project_index %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 096dadf8b..64a9111e0 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -89,7 +89,7 @@ <%=l(:label_project_hosting_platform) %> > - <%= link_to @project.name, nil %> + <%= link_to @project.name, project_path(@project.id) %>

@@ -122,13 +122,12 @@
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 27a32b18a..3040728b2 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -87,7 +87,7 @@ a.pro_mes_w{ height:20px; float:left;display:block; color:#999999;} .pro_page_top{ font-size:14px; border-bottom:2px solid #64bdd9; margin-bottom:10px; padding-bottom:5px;} .pro_page_tit{color:#3e4040; font-weight:bold;width:480px; float:left; font-size:14px; margin-bottom:5px;} .pro_pic_box{ margin-left:60px; } -.pro_pic{ width:100px; height:73px;line-height:73px;border:2px solid #CCC; margin:10px 0;} +.pro_pic{ width:100px; height:75px;line-height:73px;border:2px solid #CCC; margin:10px 0; text-align: center;} .pro_info_box{ margin-left:60px; background:#f0fbff; height:80px; padding:10px 0;} .pro_info_box ul{} .pro_info_box ul li{ margin-bottom:10px;} @@ -338,7 +338,6 @@ a:hover.st_add{ color:#ff8e15;} .newpro_box input{ height:26px; float:left; margin-bottom:10px;} .newpro_box textarea{ height:150px; float:left; margin-bottom:10px;} .newpro_box select{ height:29px; float:left; margin-bottom:10px;} -.label{ width:80px; text-align:right; font-size:14px; background-image: url(../images/true.png); } .icon-reload { background-image: url(../images/reload.png); } .icon { background-position: 0% 50%; From 0d3e129c3965dab8b74078480ef45a9cc69aba68 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 4 May 2015 08:36:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?mailer=E9=82=AE=E4=BB=B6=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/mailer.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index a834ddb14..a7c8a02aa 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -72,13 +72,14 @@ class Mailer < ActionMailer::Base # 邀请已注册的用户加入项目 def request_member_to_project(email, project, invitor) user = User.find_by_mail(email.to_s) - Member.create(:role_ids => [4], :user_id => user.id,:project_id => project.id) - @invitor_name = "#{invitor.name}" - @project_name = "#{project.name}" - @user = user - @token = Token.get_token_from_user(user, 'autologin') - @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id,:user => user, :token => @token.value) - mail :to => email, :invitor_name => "#{@invitor_name}", :project_name => "#{@project_name}" + @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} " + Member.create(:role_ids => [4], :user_id => user.id,:project_id => project.id) + @invitor_name = "#{invitor.name}" + @project_name = "#{project.name}" + @user = user + @token = Token.get_token_from_user(user, 'autologin') + @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id,:user => user, :token => @token.value) + mail :to => email,:subject => @subject, :invitor_name => "#{@invitor_name}", :project_name => "#{@project_name}" end # author: alan From c353398d65d110894f723fecc3bf74ed10c89626 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 4 May 2015 17:36:48 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/mobile/apis/courses.rb | 12 +++++++ app/api/mobile/entities/course.rb | 1 + app/services/courses_service.rb | 54 ++++++++++++++++++++++++++++++- 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb index ce02f4249..f7b03947c 100644 --- a/app/api/mobile/apis/courses.rb +++ b/app/api/mobile/apis/courses.rb @@ -240,6 +240,18 @@ module Mobile present :status, 0 end + desc '课程学生' + params do + requires :token,type:String + requires :course_id,type:Integer,desc: '课程id' + end + get ":course_id/members" do + cs = CoursesService.new + count = cs.course_members params + present :data, count, with: Mobile::Entities::Member + present :status, 0 + end + end end end diff --git a/app/api/mobile/entities/course.rb b/app/api/mobile/entities/course.rb index 520f73384..50812b349 100644 --- a/app/api/mobile/entities/course.rb +++ b/app/api/mobile/entities/course.rb @@ -46,6 +46,7 @@ module Mobile course_expose :term course_expose :time course_expose :updated_at + course_expose :course_student_num expose :teacher, using: Mobile::Entities::User do |c, opt| if c.is_a? ::Course c.teacher diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index b992665d3..42bf8fe3f 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -169,7 +169,7 @@ class CoursesService unless (course.is_public == 1 || current_user.member_of_course?(course) || current_user.admin?) raise '403' end - {:course => course,:work_unit => work_unit, :img_url => url_to_avatar(course),:current_user_is_member => current_user.member_of_course?(course),:current_user_is_teacher => is_course_teacher(current_user,course)} + {:course => course,:work_unit => work_unit, :img_url => url_to_avatar(course),:current_user_is_member => current_user.member_of_course?(course),:current_user_is_teacher => is_course_teacher(current_user,course),:course_student_num => course ? course.student.count.to_s : 0} end #创建课程 @@ -439,6 +439,11 @@ class CoursesService result end + # 课程学生列表 + def course_members params + @all_members = student_homework_score(0,params[:course_id], 10,"desc") + end + private def show_homework_info course,bid,current_user,is_course_teacher author_real_name = bid.author.lastname + bid.author.firstname @@ -476,5 +481,52 @@ class CoursesService end + def student_homework_score(groupid,course_id, nums, score_sort_by) + #teachers = find_course_teachers(@course) + #start_from = start_from * nums + sql_select = "" + if groupid == 0 + if nums == 0 + sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches + WHERE members.course_id = #{course_id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{course_id}) AND members.user_id = homework_attaches.user_id + AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id}) GROUP BY members.user_id + UNION all + SELECT members.*, 0 as score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{course_id} AND + students_for_courses.course_id = #{course_id} and members.user_id = students_for_courses.student_id AND + members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id} ) + ) + GROUP BY members.user_id ORDER BY score #{score_sort_by}" + else + sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches + WHERE members.course_id = #{course_id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{course_id}) AND members.user_id = homework_attaches.user_id + AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id}) GROUP BY members.user_id + UNION all + SELECT members.*, 0 as score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{course_id} AND + students_for_courses.course_id = #{course_id} and members.user_id = students_for_courses.student_id AND + members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id} ) + ) + GROUP BY members.user_id ORDER BY score #{score_sort_by} " #limit #{start_from}, #{nums}" + + end + else + sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches + WHERE members.course_id = #{course_id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{course_id}) AND members.user_id = homework_attaches.user_id + and members.course_group_id = #{groupid} AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id}) + GROUP BY members.user_id + UNION all + SELECT members.*, 0 as score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{course_id} + and members.course_group_id = #{groupid} AND + students_for_courses.course_id = #{course_id} and members.user_id = students_for_courses.student_id AND + members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id} ) + ) + GROUP BY members.user_id ORDER BY score #{score_sort_by}" + end + sql = ActiveRecord::Base.connection() + homework_scores = Member.find_by_sql(sql_select) + sql.close() + + homework_scores + end + end \ No newline at end of file From 8929644ab15890c18f24dffd45b8a9b155e95000 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 4 May 2015 17:38:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AD=A6=E7=94=9Fmodel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/mobile/entities/member.rb | 33 +++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 app/api/mobile/entities/member.rb diff --git a/app/api/mobile/entities/member.rb b/app/api/mobile/entities/member.rb new file mode 100644 index 000000000..837ec788a --- /dev/null +++ b/app/api/mobile/entities/member.rb @@ -0,0 +1,33 @@ +module Mobile + module Entities + class Member < Grape::Entity + include ApplicationHelper + include ApiHelper + def self.member_expose(f) + expose f do |u,opt| + if u.is_a?(Hash) && u.key?(f) + u[f] + elsif u.is_a?(::Member) + if u.respond_to?(f) + u.send(f) + else + case f + when :student_id + u.user.user_extensions.student_id + end + end + end + + end + end + + expose :user, using: Mobile::Entities::User do |c, opt| + if c.is_a?(::Member) + c.user + end + end + member_expose :student_id + member_expose :score + end + end +end \ No newline at end of file From 71004e2f7832acd901d916873ff10e420dd0b3ab Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 5 May 2015 10:58:37 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=A4=AA=E6=85=A2=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=AF=B9=E8=A1=A8=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20150505023015_add_index_to_homeworkattach_bid_id.rb | 5 +++++ ...0150505023127_add_index_to_studentforcourse_student_id.rb | 5 +++++ ...20150505023452_add_index_to_studentforcourse_course_id.rb | 5 +++++ ...0150505025003_add_index_to_homeworkforcourse_course_id.rb | 5 +++++ .../20150505025537_add_index_to_homeworkforcourse_bid_id.rb | 5 +++++ 5 files changed, 25 insertions(+) create mode 100644 db/migrate/20150505023015_add_index_to_homeworkattach_bid_id.rb create mode 100644 db/migrate/20150505023127_add_index_to_studentforcourse_student_id.rb create mode 100644 db/migrate/20150505023452_add_index_to_studentforcourse_course_id.rb create mode 100644 db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb create mode 100644 db/migrate/20150505025537_add_index_to_homeworkforcourse_bid_id.rb diff --git a/db/migrate/20150505023015_add_index_to_homeworkattach_bid_id.rb b/db/migrate/20150505023015_add_index_to_homeworkattach_bid_id.rb new file mode 100644 index 000000000..ce4d4499c --- /dev/null +++ b/db/migrate/20150505023015_add_index_to_homeworkattach_bid_id.rb @@ -0,0 +1,5 @@ +class AddIndexToHomeworkattachBidId < ActiveRecord::Migration + def change + add_index(:homework_attaches,:bid_id) + end +end diff --git a/db/migrate/20150505023127_add_index_to_studentforcourse_student_id.rb b/db/migrate/20150505023127_add_index_to_studentforcourse_student_id.rb new file mode 100644 index 000000000..d24e2f31e --- /dev/null +++ b/db/migrate/20150505023127_add_index_to_studentforcourse_student_id.rb @@ -0,0 +1,5 @@ +class AddIndexToStudentforcourseStudentId < ActiveRecord::Migration + def change + add_index(:students_for_courses,:student_id) + end +end diff --git a/db/migrate/20150505023452_add_index_to_studentforcourse_course_id.rb b/db/migrate/20150505023452_add_index_to_studentforcourse_course_id.rb new file mode 100644 index 000000000..99c0a640a --- /dev/null +++ b/db/migrate/20150505023452_add_index_to_studentforcourse_course_id.rb @@ -0,0 +1,5 @@ +class AddIndexToStudentforcourseCourseId < ActiveRecord::Migration + def change + add_index(:students_for_courses,:course_id) + end +end diff --git a/db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb b/db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb new file mode 100644 index 000000000..cd60a00af --- /dev/null +++ b/db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb @@ -0,0 +1,5 @@ +class AddIndexToHomeworkattachCourseId < ActiveRecord::Migration + def change + add_index(:homework_for_courses,:course_id) + end +end diff --git a/db/migrate/20150505025537_add_index_to_homeworkforcourse_bid_id.rb b/db/migrate/20150505025537_add_index_to_homeworkforcourse_bid_id.rb new file mode 100644 index 000000000..7504e8421 --- /dev/null +++ b/db/migrate/20150505025537_add_index_to_homeworkforcourse_bid_id.rb @@ -0,0 +1,5 @@ +class AddIndexToHomeworkforcourseBidId < ActiveRecord::Migration + def change + add_index(:homework_for_courses,:bid_id) + end +end