From 67c9fefba6f97a9c73bbda9a7768f119c6fe62ce Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 10 Jun 2014 14:27:55 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0tab=E9=A1=B5=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E7=9A=84js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/homework_attach_helper.rb | 6 +-- ...mework.html.erb => _new_homework.html.erb} | 4 +- app/views/homework_attach/new.html.erb | 54 ++++++++++++------- 3 files changed, 38 insertions(+), 26 deletions(-) rename app/views/homework_attach/{_edit_homework.html.erb => _new_homework.html.erb} (75%) diff --git a/app/helpers/homework_attach_helper.rb b/app/helpers/homework_attach_helper.rb index ed8d0949b..85f9a64ad 100644 --- a/app/helpers/homework_attach_helper.rb +++ b/app/helpers/homework_attach_helper.rb @@ -9,12 +9,10 @@ module HomeworkAttachHelper end #作业添加、编辑界面的tab页 def homework_settings_tabs f - @project = Project.find 76 @f = f - tabs = [{:name => 'info', :action => :edit_homework, :partial => 'homework_attach/edit_homework', :label => :label_information_plural}, - {:name => 'members', :action => :homework_member, :partial => 'homework_attach/homework_member', :label => :label_member_plural} + tabs = [{:name => 'info', :partial => 'homework_attach/edit_homework', :label => :label_information_plural}, + {:name => 'members', :partial => 'homework_attach/homework_member', :label => :label_member_plural} ] - #tabs.select {|tab| User.current.allowed_to?(tab[:action], @homework)} end #作业可选成员列表分页 diff --git a/app/views/homework_attach/_edit_homework.html.erb b/app/views/homework_attach/_new_homework.html.erb similarity index 75% rename from app/views/homework_attach/_edit_homework.html.erb rename to app/views/homework_attach/_new_homework.html.erb index 25f90f186..9ff3e2ffe 100644 --- a/app/views/homework_attach/_edit_homework.html.erb +++ b/app/views/homework_attach/_new_homework.html.erb @@ -2,12 +2,12 @@

标 题： - <%= @f.text_field "name", :required => true, :size => 60, :style => "width:490px;" %> + <%= f.text_field "name", :required => true, :size => 60, :style => "width:490px;" %>

描 述： - <%= @f.text_area "description", :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %> + <%= f.text_area "description", :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %>

diff --git a/app/views/homework_attach/new.html.erb b/app/views/homework_attach/new.html.erb index 966176a1d..0ead4babd 100644 --- a/app/views/homework_attach/new.html.erb +++ b/app/views/homework_attach/new.html.erb @@ -1,3 +1,13 @@ + +

<%=h l(:label_new_homework)%>

<%= form_for('new_form', :method => :post, @@ -6,26 +16,30 @@ :user_id => User.current.id, :bid_id => @bid }) do |f|%> -

- 标 题： - <%= f.text_field "name", :required => true, :size => 60, :style => "width:490px;" %> -

-

- 描 述： - - <%= f.text_area "description", :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %> - -

-

-

- - <%= l(:label_attachment_plural) %> - -

- <%= render :partial => 'attachments/form' %> -

-
-

+ +
+ +
+ +
+ <%= render :partial => "new_homework",:locals => {:f => f} %> +
+ +
+ <%= render :partial => "homework_member" %> +
+

<%= submit_tag t(:label_button_ok), :sta => 0, :class => "enterprise"%> From cbb348dc0ebbd1cdf0ab22768455a7261cb7896a Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 10 Jun 2014 15:44:10 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=BB=99=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9B=B8=E5=85=B3js=E4=BB=A3=E7=A0=81=E5=8F=8Acss=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_attach_controller.rb | 2 +- app/helpers/homework_attach_helper.rb | 32 ++-- .../homework_attach/_homework_member.html.erb | 149 +++--------------- .../homework_attach/_new_homework.html.erb | 1 - app/views/homework_attach/new.html.erb | 4 +- 5 files changed, 50 insertions(+), 138 deletions(-) diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index c4c1f8922..e20a5a868 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -78,8 +78,8 @@ class HomeworkAttachController < ApplicationController def new @bid = Bid.find(params[:id]) if User.current.admin? || User.current.member_of?(@bid.courses.first) + #该课程的学生的集合 @members = @bid.courses.first.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and user_id <> #{User.current.id}", {:role_id => [5, 10]}) - #@all_user = [] #@bid.courses.first.members.each do |member| # @all_user << member.user diff --git a/app/helpers/homework_attach_helper.rb b/app/helpers/homework_attach_helper.rb index 85f9a64ad..95327edd1 100644 --- a/app/helpers/homework_attach_helper.rb +++ b/app/helpers/homework_attach_helper.rb @@ -19,23 +19,37 @@ module HomeworkAttachHelper def render_new_members_for_homework members #scope = Principal.active.sorted.not_member_of(project).like(params[:q]) #scope = project.members - principal_count = members.count - limit = 10 - principal_pages = Redmine::Pagination::Paginator.new principal_count, limit, params['page'] #by young - offset ||= principal_pages.offset - principals = members[offset, limit] + principals = paginateHelper members,10 + #principal_count = members.count + #limit = 10 + #principal_pages = Redmine::Pagination::Paginator.new principal_count, limit, params['page'] #by young + #offset ||= principal_pages.offset + #principals = members[offset, limit] s = content_tag('div', member_check_box_tags_ex('membership[user_ids][]', principals), :id => 'principals') - links = pagination_links_full(principal_pages, principal_count, :per_page_links => false,:remote => true) - - s + content_tag('div', content_tag('ul', links), :class => 'pagination_new') + links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false) {|text, parameters, options| + link_to text, new_homework_attach_path( parameters.merge(:q => params[:q], :format => 'js')), :remote => true } + return s + content_tag('div', content_tag('ul', links), :class => 'pagination_new') end #扩展的checkbox生成 def member_check_box_tags_ex(name, principals) s = '' principals.each do |member| - s << "\n" + s << "
" end s.html_safe end + + def paginateHelper obj, pre_size=20 + @obj_count = obj.count + @obj_pages = Redmine::Pagination::Paginator.new @obj_count, pre_size, params['page'] + if obj.kind_of? ActiveRecord::Base or obj.kind_of? ActiveRecord::Relation + obj.limit(@obj_pages.per_page).offset(@obj_pages.offset) + elsif obj.kind_of? Array + obj[@obj_pages.offset, @obj_pages.per_page] + else + logger.error "[ApplicationController] Error : application_controller#paginateHelper ===> unknow category: #{obj.class}" + raise RuntimeError, 'unknow type, Please input you type into this helper.' + end + end end \ No newline at end of file diff --git a/app/views/homework_attach/_homework_member.html.erb b/app/views/homework_attach/_homework_member.html.erb index f69f9edff..ed268f652 100644 --- a/app/views/homework_attach/_homework_member.html.erb +++ b/app/views/homework_attach/_homework_member.html.erb @@ -1,131 +1,30 @@ <%= error_messages_for 'member' %> -<% - roles = Role.givable.all - if @project.project_type == Project::ProjectType_course - roles = roles[3..5] - else - roles = roles[0..2] - end - members = @project.member_principals.includes(:roles, :principal).all.sort -%> - -

- <% if members.any? %> - - - - - - - <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %> +
+
<%= l(:label_user) %><%= l(:label_role_plural) %>
+ + + + + + + + + + + - - - <% members.each do |member| %> - <% next if member.new_record? %> - - - - - <% if @project.project_type == 1 %> - <% if member.roles.first.to_s == "Manager" %> - - <% else %> - - <% end %> - <% else %> - - <% end %> - - <%= call_hook(:view_projects_settings_members_table_row, {:project => @project, :member => member}) %> - - <% end; reset_cycle %> - -
<%= l(:label_user) %><%= l(:label_role_plural) %>
<%= link_to_user User.current %> 发布人员
<%= link_to_user member.principal %> - - <%= h member.roles.sort.collect(&:to_s).join(', ') %> - - <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), - :method => :put, - :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}} - ) do |f| %> - -

- <% roles.each do |role| %> -
- <% end %>

- <%= hidden_field_tag 'membership[role_ids][]', '' %> -

<%= submit_tag l(:button_change), :class => "small" %> - <%= link_to_function l(:button_cancel), - "$('#member-#{member.id}-roles').show(); $('#member-#{member.id}-roles-form').hide(); return false;" - %>

- <% end %> - 		- <%= link_to_function l(:button_edit), - "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;", - :class => 'icon icon-edit' %> - <%= delete_link membership_path(member), - :remote => true, - :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %> - - <%= link_to_function l(:button_edit), - "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;", - :class => 'icon icon-edit' %> - <%= delete_link membership_path(member), - :remote => true, - :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %> -
- <% else %> -

<%= l(:label_no_data) %>

- <% end %> + +
-
- <% if roles.any? %> - <% if @project.applied_projects.any? %> -
- <%= form_for(@applied_members, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %> -
- <%= l(:label_apply_project) %> - -
- <%= render_principals_for_applied_members(@project) %> -
- -

<%= l(:label_role_plural) %>: - <% roles.each do |role| %> - - - <% end %>

- -

<%= submit_tag l(:label_approve), :id => 'member-add-submit' %> - <%= submit_tag l(:label_refusal), :name => "refusal_button", :id => 'member-refusal-submit' %> -

-
- <% end %> -
- <% end %> - - <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %> -
- <%= l(:label_member_new) %> - -

<%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %>

- <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %> - -
- <%= render_principals_for_new_members(@project) %> -
- -

<%= l(:label_role_plural) %>: - <% roles.each do |role| %> - - - <% end %>

+
+
+ <%= l(:label_member_new) %> -

<%= submit_tag l(:button_add), :id => 'member-add-submit' %>

-
- <% end %> - <% end %> +

<%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %>

+
+ <%= render_new_members_for_homework(members) %> +
+

<%= submit_tag l(:button_add), :id => 'member-add-submit' %>

+
diff --git a/app/views/homework_attach/_new_homework.html.erb b/app/views/homework_attach/_new_homework.html.erb index 9ff3e2ffe..de749d182 100644 --- a/app/views/homework_attach/_new_homework.html.erb +++ b/app/views/homework_attach/_new_homework.html.erb @@ -1,5 +1,4 @@
-

标 题： <%= f.text_field "name", :required => true, :size => 60, :style => "width:490px;" %> diff --git a/app/views/homework_attach/new.html.erb b/app/views/homework_attach/new.html.erb index 0ead4babd..07475f58d 100644 --- a/app/views/homework_attach/new.html.erb +++ b/app/views/homework_attach/new.html.erb @@ -36,8 +36,8 @@ <%= render :partial => "new_homework",:locals => {:f => f} %>

-
- <%= render :partial => "homework_member" %> +

From 130f9f87c256caafa60e319f49a3ed751bb9ff6c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 10 Jun 2014 17:33:31 +0800 Subject: [PATCH 03/10] =?UTF-8?q?1.=E5=AE=9E=E7=8E=B0=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E7=9A=84=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=202.=E7=BE=8E=E5=8C=96=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=88=90=E5=91=98=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_attach_controller.rb | 18 ++++++++++++++++++ app/helpers/homework_attach_helper.rb | 5 +++-- .../homework_attach/_homework_member.html.erb | 11 +++++++---- .../_member_list_partial.html.erb | 3 +++ .../get_homework_member_list.js.erb | 2 ++ config/routes.rb | 2 ++ 6 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 app/views/homework_attach/_member_list_partial.html.erb create mode 100644 app/views/homework_attach/get_homework_member_list.js.erb diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index e20a5a868..cd7c0b81c 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -80,6 +80,8 @@ class HomeworkAttachController < ApplicationController if User.current.admin? || User.current.member_of?(@bid.courses.first) #该课程的学生的集合 @members = @bid.courses.first.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and user_id <> #{User.current.id}", {:role_id => [5, 10]}) + + @members = paginateHelper @members,10 #@all_user = [] #@bid.courses.first.members.each do |member| # @all_user << member.user @@ -96,6 +98,22 @@ class HomeworkAttachController < ApplicationController end end + def get_homework_member_list + @bid = Bid.find(params[:bid_id]) + if User.current.admin? || User.current.member_of?(@bid.courses.first) + #该课程的学生的集合 + @members = @bid.courses.first.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and user_id <> #{User.current.id}", {:role_id => [5, 10]}) + + @members = paginateHelper @members,10 + else + raise "error" + end + + respond_to do |format| + format.js + end + end + #获取指定作业的所有成员 def members_for_homework homework people = [] diff --git a/app/helpers/homework_attach_helper.rb b/app/helpers/homework_attach_helper.rb index 95327edd1..0e34573e4 100644 --- a/app/helpers/homework_attach_helper.rb +++ b/app/helpers/homework_attach_helper.rb @@ -19,7 +19,8 @@ module HomeworkAttachHelper def render_new_members_for_homework members #scope = Principal.active.sorted.not_member_of(project).like(params[:q]) #scope = project.members - principals = paginateHelper members,10 + #principals = paginateHelper members,10 + principals = members #principal_count = members.count #limit = 10 #principal_pages = Redmine::Pagination::Paginator.new principal_count, limit, params['page'] #by young @@ -27,7 +28,7 @@ module HomeworkAttachHelper #principals = members[offset, limit] s = content_tag('div', member_check_box_tags_ex('membership[user_ids][]', principals), :id => 'principals') links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false) {|text, parameters, options| - link_to text, new_homework_attach_path( parameters.merge(:q => params[:q], :format => 'js')), :remote => true } + link_to text, get_homework_member_list_homework_attach_index_path( parameters.merge(:q => params[:q], bid_id: params[:id]||@bid)), :remote => true } return s + content_tag('div', content_tag('ul', links), :class => 'pagination_new') end diff --git a/app/views/homework_attach/_homework_member.html.erb b/app/views/homework_attach/_homework_member.html.erb index ed268f652..ff25064a0 100644 --- a/app/views/homework_attach/_homework_member.html.erb +++ b/app/views/homework_attach/_homework_member.html.erb @@ -1,23 +1,26 @@ <%= error_messages_for 'member' %> -

+
- + + <% for m in (1..10) %> - + + + <% end %>
<%= l(:label_user) %> <%= l(:label_role_plural) %>
<%= link_to_user User.current %> 发布人员 发布人员 删除
-
+
<%= l(:label_member_new) %> diff --git a/app/views/homework_attach/_member_list_partial.html.erb b/app/views/homework_attach/_member_list_partial.html.erb new file mode 100644 index 000000000..ca422f0df --- /dev/null +++ b/app/views/homework_attach/_member_list_partial.html.erb @@ -0,0 +1,3 @@ +
+ <%= render_new_members_for_homework(members) %> +
\ No newline at end of file diff --git a/app/views/homework_attach/get_homework_member_list.js.erb b/app/views/homework_attach/get_homework_member_list.js.erb new file mode 100644 index 000000000..64fa22cbb --- /dev/null +++ b/app/views/homework_attach/get_homework_member_list.js.erb @@ -0,0 +1,2 @@ +$('#principals_for_new_member').replaceWith('<%= j(render :partial => "member_list_partial", locals:{members: @members})%>'); + diff --git a/config/routes.rb b/config/routes.rb index 91c2047b6..8722a48c2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -26,11 +26,13 @@ RedmineApp::Application.routes.draw do resources :homework_attach do collection do + get 'get_homework_member_list' match 'addjours', via: [:get, :post] match 'add_jour_reply', via: [:get,:post] match 'destroy_jour', via: [:get,:post] end end + resources :open_source_projects do collection do match 'search', via: [:get, :post] From b364b8148ff85b3ae32e95e00b6add7fca0a5bda Mon Sep 17 00:00:00 2001 From: yanxd Date: Wed, 11 Jun 2014 09:24:55 +0800 Subject: [PATCH 04/10] document show html. separate attachment. --- app/views/documents/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb index a7bbc3135..d626fe30c 100644 --- a/app/views/documents/show.html.erb +++ b/app/views/documents/show.html.erb @@ -16,8 +16,8 @@
<%= textilizable @document, :description, :attachments => @document.attachments %>
- +

<%= l(:label_attachment_plural) %>

<%= link_to_attachments @document %> From d0dd6eb78151f4952252c655486983c7588cc323 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 11 Jun 2014 15:28:13 +0800 Subject: [PATCH 05/10] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=97=B6=E5=AE=9E=E7=8E=B0=E4=BD=9C=E4=B8=9A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E4=BA=BA=E5=91=98=E4=B8=8E=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E4=BA=BA=E5=91=98=202.homework=5Fattach?= =?UTF-8?q?=E3=80=81homework=5Fuser=E3=80=81users=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=203.=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_attach_controller.rb | 82 +++++++++++----- app/helpers/homework_attach_helper.rb | 9 +- app/models/homework_attach.rb | 1 + app/models/homework_user.rb | 2 +- app/models/user.rb | 3 +- .../homework_attach/_homework_member.html.erb | 40 +++++--- .../homework_attach/add_homework_users.js.erb | 1 + .../destory_homework_users.js.erb | 1 + app/views/homework_attach/edit.html.erb | 94 ++++++++++++------- app/views/homework_attach/new.html.erb | 57 +++++------ config/routes.rb | 5 + 11 files changed, 181 insertions(+), 114 deletions(-) create mode 100644 app/views/homework_attach/add_homework_users.js.erb create mode 100644 app/views/homework_attach/destory_homework_users.js.erb diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index cd7c0b81c..a3a484079 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -26,13 +26,39 @@ class HomeworkAttachController < ApplicationController end end - def add_users users - if users != nil && users.count > 0 - users.each do |user| - @homework.homework_users.build(:user_id => user.id) - @homework.save + #作业添加成员（参与人员） + def add_homework_users + @homework = HomeworkAttach.find(params[:id]) + + if params[:membership] + if params[:membership][:user_ids] + attrs = params[:membership].dup + user_ids = attrs.delete(:user_ids) + user_ids.each do |user_id| + @homework.homework_users.build(:user_id => user_id) + end end end + @homework.save + @hoemwork_users = users_for_homework(@homework) + @members = members_for_homework(@homework,@hoemwork_users) + @members = paginateHelper @members,10 + respond_to do |format| + format.js + end + end + + #作业删除成员（参与人员） + def destory_homework_users + @homework = HomeworkAttach.find(params[:id]) + homework_user = @homework.homework_users.where("user_id = #{params[:user_id]}").first + homework_user.destroy + @hoemwork_users = users_for_homework(@homework) + @members = members_for_homework(@homework,@hoemwork_users) + @members = paginateHelper @members,10 + respond_to do |format| + format.js + end end def create @@ -78,10 +104,10 @@ class HomeworkAttachController < ApplicationController def new @bid = Bid.find(params[:id]) if User.current.admin? || User.current.member_of?(@bid.courses.first) - #该课程的学生的集合 - @members = @bid.courses.first.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and user_id <> #{User.current.id}", {:role_id => [5, 10]}) + #该课程的学生的集合(新建不实现功能：添加成员) + #@members = @bid.courses.first.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and user_id <> #{User.current.id}", {:role_id => [5, 10]}) - @members = paginateHelper @members,10 + #@members = paginateHelper @members,10 #@all_user = [] #@bid.courses.first.members.each do |member| # @all_user << member.user @@ -98,38 +124,43 @@ class HomeworkAttachController < ApplicationController end end + #获取作业成员的集合 def get_homework_member_list - @bid = Bid.find(params[:bid_id]) - if User.current.admin? || User.current.member_of?(@bid.courses.first) + @homework = HomeworkAttach.includes(:homework_users).includes(:user).find(params[:bid_id]) + course = @homework.bid.courses.first + if User.current.admin? || User.current.member_of?(course) + @hoemwork_users = users_for_homework(@homework) + @members = members_for_homework(@homework,@hoemwork_users) #该课程的学生的集合 - @members = @bid.courses.first.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and user_id <> #{User.current.id}", {:role_id => [5, 10]}) - + #@members = course.members.joins(:member_roles).where("member_roles.role_id IN (:role_id)", {:role_id => [5, 10]}) @members = paginateHelper @members,10 else raise "error" end - respond_to do |format| format.js end end #获取指定作业的所有成员 - def members_for_homework homework - people = [] - if homework != nil - people << homework.user - homework.homework_users do |homework_user| - people << homework_user.user - end - else - end - people + def users_for_homework homework + homework.nil? ? [] : (homework.users + [homework.user]) + end + + #获取可选成员列表 + #homework：作业 + #users：该作业所有成员 + def members_for_homework homework,users + homework.bid.courses.first.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and user_id not in (:users)", {:role_id => [5, 10],:users => users}) end def edit - @homework = HomeworkAttach.find(params[:id]) + @homework = HomeworkAttach.includes(:homework_users).includes(:user).find(params[:id]) if User.current.admin? || User.current.member_of?(@homework.bid.courses.first) + #@members = @homework.bid.courses.first.members.joins(:member_roles).where("member_roles.role_id IN (:role_id)", {:role_id => [5, 10]}) + @hoemwork_users = users_for_homework(@homework) + @members = members_for_homework(@homework,@hoemwork_users) + @members = paginateHelper @members,10 else render_403 :message => :notice_not_authorized end @@ -137,7 +168,8 @@ class HomeworkAttachController < ApplicationController def update @homework = HomeworkAttach.find(params[:id]) - if User.current.admin? || User.current.member_of?(@homework.bid.courses.first) + course = @homework.bid.courses.first + if User.current.admin? || User.current.member_of?(course) name = params[:homework_name] description = params[:homework_description] @homework.name = name diff --git a/app/helpers/homework_attach_helper.rb b/app/helpers/homework_attach_helper.rb index 0e34573e4..28bb48d3c 100644 --- a/app/helpers/homework_attach_helper.rb +++ b/app/helpers/homework_attach_helper.rb @@ -20,15 +20,16 @@ module HomeworkAttachHelper #scope = Principal.active.sorted.not_member_of(project).like(params[:q]) #scope = project.members #principals = paginateHelper members,10 - principals = members + #principals = members #principal_count = members.count #limit = 10 #principal_pages = Redmine::Pagination::Paginator.new principal_count, limit, params['page'] #by young #offset ||= principal_pages.offset #principals = members[offset, limit] - s = content_tag('div', member_check_box_tags_ex('membership[user_ids][]', principals), :id => 'principals') + users = members.map(&:user) + s = content_tag('div', member_check_box_tags_ex('membership[user_ids][]', users), :id => 'principals') links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false) {|text, parameters, options| - link_to text, get_homework_member_list_homework_attach_index_path( parameters.merge(:q => params[:q], bid_id: params[:id]||@bid)), :remote => true } + link_to text, get_homework_member_list_homework_attach_index_path( parameters.merge(:q => params[:q], bid_id: params[:id]||@homework)), :remote => true } return s + content_tag('div', content_tag('ul', links), :class => 'pagination_new') end @@ -36,7 +37,7 @@ module HomeworkAttachHelper def member_check_box_tags_ex(name, principals) s = '' principals.each do |member| - s << "
" + s << "
" end s.html_safe end diff --git a/app/models/homework_attach.rb b/app/models/homework_attach.rb index ad59d107d..c801885b1 100644 --- a/app/models/homework_attach.rb +++ b/app/models/homework_attach.rb @@ -7,6 +7,7 @@ class HomeworkAttach < ActiveRecord::Base belongs_to :bid has_many :journals_for_messages, :as => :jour, :dependent => :destroy has_many :homework_users, :dependent => :destroy + has_many :users, :through => :homework_users seems_rateable :allow_update => true, :dimensions => :quality safe_attributes "bid_id", diff --git a/app/models/homework_user.rb b/app/models/homework_user.rb index 0adef62c4..df75ef821 100644 --- a/app/models/homework_user.rb +++ b/app/models/homework_user.rb @@ -1,6 +1,6 @@ class HomeworkUser < ActiveRecord::Base attr_accessible :homework_attach_id, :user_id - belongs_to :homework_attach + belongs_to :homework_attach, :foreign_key => :homework_attach_id belongs_to :user end diff --git a/app/models/user.rb b/app/models/user.rb index 331ff6993..c0b1ba24e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -73,7 +73,8 @@ class User < Principal ['none', :label_user_mail_option_none] ] - belongs_to :homework_user + has_many :homework_users + has_many :homework_attaches, :through => :homework_users has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)}, :after_remove => Proc.new {|user, group| group.user_removed(user)} diff --git a/app/views/homework_attach/_homework_member.html.erb b/app/views/homework_attach/_homework_member.html.erb index ff25064a0..a372f105f 100644 --- a/app/views/homework_attach/_homework_member.html.erb +++ b/app/views/homework_attach/_homework_member.html.erb @@ -1,5 +1,6 @@ <%= error_messages_for 'member' %> -
+
@@ -9,25 +10,34 @@ - <% for m in (1..10) %> - - + + + - + + <% hoemwork_users.each do |user| %> + + <% if homework.user != user %> + + + + <% end %> + <% end %>
<%= link_to_user User.current %>
<%= link_to_user homework.user %> 发布人员 删除
<%= link_to_user user %> 开发人员 <%= link_to l(:button_delete),destory_homework_users_homework_attach_path(:user_id=>user),:remote => true, :method => :post %>
-
-
- <%= l(:label_member_new) %> - -

<%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %>

-
- <%= render_new_members_for_homework(members) %> -
-

<%= submit_tag l(:button_add), :id => 'member-add-submit' %>

-
+
+ <%= form_for(hoemwork_users, {:url => add_homework_users_homework_attach_path(homework), :remote => true, :method => :post}) do |f| %> +
+ <%= l(:label_member_new) %> +

<%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %>

+
+ <%= render_new_members_for_homework(members) %> +
+

<%= submit_tag l(:button_add), :id => 'member-add-submit' %>

+
+ <% end %>
diff --git a/app/views/homework_attach/add_homework_users.js.erb b/app/views/homework_attach/add_homework_users.js.erb new file mode 100644 index 000000000..dc4b0cc56 --- /dev/null +++ b/app/views/homework_attach/add_homework_users.js.erb @@ -0,0 +1 @@ +$('#content2').html('<%= escape_javascript(render(:partial => 'homework_member', :locals => {:members => @members,:hoemwork_users =>@hoemwork_users,:homework => @homework} )) %>'); \ No newline at end of file diff --git a/app/views/homework_attach/destory_homework_users.js.erb b/app/views/homework_attach/destory_homework_users.js.erb new file mode 100644 index 000000000..dc4b0cc56 --- /dev/null +++ b/app/views/homework_attach/destory_homework_users.js.erb @@ -0,0 +1 @@ +$('#content2').html('<%= escape_javascript(render(:partial => 'homework_member', :locals => {:members => @members,:hoemwork_users =>@hoemwork_users,:homework => @homework} )) %>'); \ No newline at end of file diff --git a/app/views/homework_attach/edit.html.erb b/app/views/homework_attach/edit.html.erb index 80292340f..a36c1a8bf 100644 --- a/app/views/homework_attach/edit.html.erb +++ b/app/views/homework_attach/edit.html.erb @@ -1,35 +1,63 @@ -

<%=raw l(:label_new_homework)%>

-
+ + +

<%=raw l(:label_edit_homework)%>

+
+ +
+
<%= form_for(@homework) do |f|%> -

- 标 题： - <%= f.text_field :name, :required => true, :name => "homework_name", :size => 60, :style => "width:490px;"%> -

-

- 描 述： - - <%= f.text_area :description, :rows => 8, :name => "homework_description", :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %> - -

-

-

-

- <% options = {:author => true, :deletable => attach_delete(@homework)} %> - <%= render :partial => 'attachments/links', - :locals => {:attachments => @homework.attachments, :options => options} %> -

- - <%= l(:label_attachment_plural) %> - -

- <%= render :partial => 'attachments/form' %> -

-
-

-

- - <%= submit_tag t(:label_button_ok), :sta => 0, :class => "enterprise"%> - -

+

+ 标 题： + <%= f.text_field :name, :required => true, :name => "homework_name", :size => 60, :style => "width:490px;"%> +

+

+ 描 述： + + <%= f.text_area :description, :rows => 8, :name => "homework_description", :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %> + +

+

+

+

+ <% options = {:author => true, :deletable => attach_delete(@homework)} %> + <%= render :partial => 'attachments/links', + :locals => {:attachments => @homework.attachments, :options => options} %> +

+ + <%= l(:label_attachment_plural) %> + +

+ <%= render :partial => 'attachments/form' %> +

+
+

+

+ + <%= submit_tag t(:label_button_ok), :sta => 0, :class => "enterprise"%> + +

<% end %> -
\ No newline at end of file +
+ + diff --git a/app/views/homework_attach/new.html.erb b/app/views/homework_attach/new.html.erb index 07475f58d..8fa0eab02 100644 --- a/app/views/homework_attach/new.html.erb +++ b/app/views/homework_attach/new.html.erb @@ -1,13 +1,3 @@ - -

<%=h l(:label_new_homework)%>

<%= form_for('new_form', :method => :post, @@ -16,34 +6,31 @@ :user_id => User.current.id, :bid_id => @bid }) do |f|%> +

+ 标 题： + <%= f.text_field "name", :required => true, :size => 60, :style => "width:490px;" %> +

+

+ 描 述： + + <%= f.text_area "description", :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %> + +

+

+

+ + <%= l(:label_attachment_plural) %> + +

+ <%= render :partial => 'attachments/form' %> +

+
+

-
- -
- -
- <%= render :partial => "new_homework",:locals => {:f => f} %> -
- - - -

+

<%= submit_tag t(:label_button_ok), :sta => 0, :class => "enterprise"%>

<% end %> -
\ No newline at end of file +
diff --git a/config/routes.rb b/config/routes.rb index 8722a48c2..5a5810c78 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -30,6 +30,11 @@ RedmineApp::Application.routes.draw do match 'addjours', via: [:get, :post] match 'add_jour_reply', via: [:get,:post] match 'destroy_jour', via: [:get,:post] + + end + member do + match 'add_homework_users', via:[:get,:post] + match 'destory_homework_users',via:[:get,:post] end end From 2abd8187d08289f219a6332571ca9521e3917bb0 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 11 Jun 2014 15:54:17 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_attach_controller.rb | 16 ++++++++-------- .../homework_attach/_homework_member.html.erb | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index a3a484079..ef0e99452 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -41,7 +41,7 @@ class HomeworkAttachController < ApplicationController end @homework.save @hoemwork_users = users_for_homework(@homework) - @members = members_for_homework(@homework,@hoemwork_users) + @members = members_for_homework(@homework,@hoemwork_users,params[:q]) @members = paginateHelper @members,10 respond_to do |format| format.js @@ -54,7 +54,7 @@ class HomeworkAttachController < ApplicationController homework_user = @homework.homework_users.where("user_id = #{params[:user_id]}").first homework_user.destroy @hoemwork_users = users_for_homework(@homework) - @members = members_for_homework(@homework,@hoemwork_users) + @members = members_for_homework(@homework,@hoemwork_users,params[:q]) @members = paginateHelper @members,10 respond_to do |format| format.js @@ -126,11 +126,11 @@ class HomeworkAttachController < ApplicationController #获取作业成员的集合 def get_homework_member_list - @homework = HomeworkAttach.includes(:homework_users).includes(:user).find(params[:bid_id]) + @homework = HomeworkAttach.find(params[:bid_id]) course = @homework.bid.courses.first if User.current.admin? || User.current.member_of?(course) @hoemwork_users = users_for_homework(@homework) - @members = members_for_homework(@homework,@hoemwork_users) + @members = members_for_homework(@homework,@hoemwork_users,params[:q]) #该课程的学生的集合 #@members = course.members.joins(:member_roles).where("member_roles.role_id IN (:role_id)", {:role_id => [5, 10]}) @members = paginateHelper @members,10 @@ -150,16 +150,16 @@ class HomeworkAttachController < ApplicationController #获取可选成员列表 #homework：作业 #users：该作业所有成员 - def members_for_homework homework,users - homework.bid.courses.first.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and user_id not in (:users)", {:role_id => [5, 10],:users => users}) + def members_for_homework homework,users,q + homework.bid.courses.first.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and user_id not in (:users)", {:role_id => [5, 10],:users => users}).joins(:user).where("users.login like '%#{q}%'") end def edit - @homework = HomeworkAttach.includes(:homework_users).includes(:user).find(params[:id]) + @homework = HomeworkAttach.find(params[:id]) if User.current.admin? || User.current.member_of?(@homework.bid.courses.first) #@members = @homework.bid.courses.first.members.joins(:member_roles).where("member_roles.role_id IN (:role_id)", {:role_id => [5, 10]}) @hoemwork_users = users_for_homework(@homework) - @members = members_for_homework(@homework,@hoemwork_users) + @members = members_for_homework(@homework,@hoemwork_users,params[:q]) @members = paginateHelper @members,10 else render_403 :message => :notice_not_authorized diff --git a/app/views/homework_attach/_homework_member.html.erb b/app/views/homework_attach/_homework_member.html.erb index a372f105f..c8e3bfbd2 100644 --- a/app/views/homework_attach/_homework_member.html.erb +++ b/app/views/homework_attach/_homework_member.html.erb @@ -34,6 +34,7 @@
<%= l(:label_member_new) %>

<%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %>

+ <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript get_homework_member_list_homework_attach_index_path(:q => params[:q], :bid_id => params[:id]||homework, :format => 'js') }')" %>
<%= render_new_members_for_homework(members) %>
From a681aa76cb89325e7b79f6673976002ff074a8f6 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 11 Jun 2014 16:17:35 +0800 Subject: [PATCH 07/10] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E4=BA=92=E8=AF=84=E7=95=8C=E9=9D=A2=E7=9A=84=E6=8A=A5=E9=94=99?= =?UTF-8?q?=202.=E4=BA=92=E8=AF=84=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E4=BA=BA=E5=91=98=E6=98=BE=E7=A4=BA=203.?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E9=A1=B5=E9=9D=A2=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E4=BA=BA=E5=91=98=E6=94=B9=E4=B8=BA=E5=8F=82=E4=B8=8E?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/bids_helper.rb | 21 ------------------- .../homework_attach/_homework_member.html.erb | 2 +- app/views/homework_attach/show.html.erb | 17 +++++++++++---- 3 files changed, 14 insertions(+), 26 deletions(-) diff --git a/app/helpers/bids_helper.rb b/app/helpers/bids_helper.rb index a41867c64..a5c25ecb5 100644 --- a/app/helpers/bids_helper.rb +++ b/app/helpers/bids_helper.rb @@ -155,27 +155,6 @@ module BidsHelper end people.include?(User.current) end - #当前用户是不是指定课程的学生 - def is_cur_course_student? course - #people = [] - #course.members.includes(:user, :roles).each do |member| - # if [5,10].include? member.roles.first.id - # people << member.user - # end - #end - #people.include?(User.current) - #修改：能新建占位且不能新建任务的角色判定为学生 - is_student = false - @membership = User.current.memberships.all(:conditions => Project.visible_condition(User.current)) - @membership.each do |membership| - unless(membership.project.project_type==0) - if !User.current.allowed_to?({:controller => "projects", :action => "new_homework"}, membership.project, :global => false) && User.current.allowed_to?({:controller => "homework_attach", :action => "new"}, membership.project, :global => false) - is_student = true - end - end - end - is_student - end # def select_option_helper option # tmp = Hash.new diff --git a/app/views/homework_attach/_homework_member.html.erb b/app/views/homework_attach/_homework_member.html.erb index c8e3bfbd2..9dfe170bd 100644 --- a/app/views/homework_attach/_homework_member.html.erb +++ b/app/views/homework_attach/_homework_member.html.erb @@ -20,7 +20,7 @@ <% if homework.user != user %> <%= link_to_user user %> - 开发人员 + 参与人员 <%= link_to l(:button_delete),destory_homework_users_homework_attach_path(:user_id=>user),:remote => true, :method => :post %> <% end %> diff --git a/app/views/homework_attach/show.html.erb b/app/views/homework_attach/show.html.erb index cdbbe9fda..4cf9903fe 100644 --- a/app/views/homework_attach/show.html.erb +++ b/app/views/homework_attach/show.html.erb @@ -6,7 +6,7 @@ height: 200px; } -<% is_student = is_cur_course_student? @homework.bid.courses.first %> +<% is_student = is_cur_course_student @homework.bid.courses.first %> <% is_teacher = is_course_teacher User.current,@homework.bid.courses.first %>

<%= notice %>

@@ -23,7 +23,16 @@ 发布人员：<%= link_to @homework.user, user_path(@homework.user)%> - 发布时间：<%=format_time @homework.created_at %> + + 参与人员： + <% @homework.users.each do |homework_user| %> + <%= link_to homework_user, user_path(homework_user)%> + <% if @homework.users.count > 1 && homework_user != @homework.users.last %> +
                 + <% end %> + <% end %> + + @@ -38,12 +47,12 @@ 所属任务：<%= link_to(@homework.bid.name, project_for_bid_path(@homework.bid))%> - - 平均评分： + 平均评分： <%= rating_for @homework, :static => true, dimension: :quality, class: 'rateable div_inline' %> + 发布时间：<%=format_time @homework.created_at %> From 541ced18ec8e972ab4d0918b98d261eacca73ba1 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 11 Jun 2014 16:53:07 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=AF=BC=E8=88=AA=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_attach/show.html.erb | 2 +- app/views/layouts/_base_homework_attach.html.erb | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 app/views/layouts/_base_homework_attach.html.erb diff --git a/app/views/homework_attach/show.html.erb b/app/views/homework_attach/show.html.erb index 4cf9903fe..0e7adacbe 100644 --- a/app/views/homework_attach/show.html.erb +++ b/app/views/homework_attach/show.html.erb @@ -1,4 +1,4 @@ - +<%= render :partial => 'layouts/base_homework_attach', :locals => {:homework_attach => @homework} %>