From 9e77d3e0017921705b1593162c79de04e0f7807f Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Wed, 9 Oct 2013 16:14:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=87=8C=E9=9D=A2=E4=B8=80=E4=BA=9BBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/bids_controller.rb | 9 +- app/helpers/bids_helper.rb | 17 ++++ app/helpers/watchers_helper.rb | 2 +- app/views/bids/_contest_show.html.erb | 14 +-- app/views/bids/_homework_list.html.erb | 4 +- app/views/bids/_project_list.html.erb | 117 ++++++++++++++++++---- app/views/bids/contest.html.erb | 3 +- app/views/layouts/base_courses.html.erb | 3 +- app/views/users/_my_course.html.erb | 13 +-- app/views/users/_my_joinedcourse.html.erb | 9 +- config/locales/zh.yml | 8 +- 11 files changed, 144 insertions(+), 55 deletions(-) diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index 1042c8809..162cc09cb 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -76,11 +76,12 @@ class BidsController < ApplicationController #end end + #huang def contest - @project_type = params[:project_type] + # Modified by nie # @requirement_title = "4" - @offset, @limit = api_offset_and_limit({:limit => 10}) + @offset, @limit = api_offset_and_limit({:limit => 10}) @bids = Bid.visible.where('reward_type = ?', 2) @@ -131,7 +132,8 @@ class BidsController < ApplicationController @bids = @bids.reorder('bids.commit').offset(@offset).limit(limit).all.reverse end @s_state = 1 - end + end + #end end def fork @@ -365,7 +367,6 @@ class BidsController < ApplicationController @bid = Bid.new @bid.safe_attributes = params[:bid] end - #huang def create_contest @bid = Bid.new diff --git a/app/helpers/bids_helper.rb b/app/helpers/bids_helper.rb index ed8c8873f..74d24a863 100644 --- a/app/helpers/bids_helper.rb +++ b/app/helpers/bids_helper.rb @@ -71,6 +71,23 @@ module BidsHelper content_tag('div', content, :class => "tabs") end + #huang + def sort_contest(state) + content = ''.html_safe + case state + when 0 + content << content_tag('li', link_to(l(:label_sort_by_active), calls_path(:contest_sort_type => '1'))) + content << content_tag('li', link_to(l(:label_sort_by_time), calls_path(:contest_sort_type => '0'), :class=>"selected"), :class=>"selected") + + when 1 + content << content_tag('li', link_to(l(:label_sort_by_active), calls_path(:contest_sort_type => '1'), :class=>"selected"), :class=>"selected") + content << content_tag('li', link_to(l(:label_sort_by_time), calls_path(:contest_sort_type => '0'))) + end + content = content_tag('ul', content) + content_tag('div', content, :class => "tabs") + end + #end + def course_options_for_select(courses) # html = '' diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index 2baee6479..a42921300 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -50,7 +50,7 @@ module WatchersHelper def join_in_course(course, user) return '' unless user && user.logged? joined = user.member_of?(course) - text = joined ? '退出课程' : '加入课程' + text = joined ? '退出课程 ' : '加入课程' url_t = join_path(:object_id => course.id) url_f = try_join_path(:object_id => course.id) method = joined ? 'delete' : 'post' diff --git a/app/views/bids/_contest_show.html.erb b/app/views/bids/_contest_show.html.erb index adbaf82cf..96c3d1f42 100644 --- a/app/views/bids/_contest_show.html.erb +++ b/app/views/bids/_contest_show.html.erb @@ -14,21 +14,11 @@ <% if bid.reward_type.nil? or bid.reward_type == 1%> <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %><%= bid.budget%> <% elsif bid.reward_type == 2%> <%= l(:label_bids_reward_method) %><%= bid.budget%> <% else %> <% end %> - <% unless bid.reward_type == 3 %> + <%= l(:label_x_biding_project, :count => bid.biding_projects.count) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid) %>)<%= l(:label_x_bids_responses, :count => bid.commit) %>(<%= link_to bid.commit, respond_path(bid) %>) <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<%= link_to bid.watcher_users.count, respond_path(bid) %>) - <% else %> - - <%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid) %>) <%= l(:label_x_responses, :count => bid.commit) %>(<%= link_to bid.commit, respond_path(bid) %>) <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<%= link_to bid.watcher_users.count, respond_path(bid) %>) - - <% unless bid.courses.empty? %> - <% teacher = Course.find_by_extra(bid.courses.first.identifier).teacher %> - - 课程名称：<%= link_to bid.courses.first.name, project_path(bid.courses.first)%>  教师：<%= link_to teacher.lastname+teacher.firstname, user_path(teacher) %> - - <% end %> - <% end %> + <%= format_time bid.created_on %> diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index 7ec7b7073..bd26baf07 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -28,7 +28,5 @@ -
- - +
<% end %> diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index 08ddee5de..db76d006d 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -1,35 +1,112 @@ <%= render_flash_messages %> - <% if @bid.reward_type == 3 %> - + <% if User.current.logged? %> <% end %>
<%= l(:label_homework_project) %>(<%= @bidding_project.count%>) - + <% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %>
- <%= toggle_link l(:button_bidding_homework), 'put-bid-form' %>
- + <% end %>
- <% else %> - - - - <% if User.current.logged? %> + +<% @bidding_project.each do |b_project|%> +
<%= l(:label_bidding_project) %>(<%= @bidding_project.count%>)
+ - <% end %> -
- -
- <%= toggle_link l(:button_bidding_homework), 'put-bid-form' %> -
- -
+ + + + + + +
+
+ <%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %> +
+ + + + + + + + + + + +
<%= link_to(b_project.project.name, project_path(b_project.project)) %><%= l(:label_jion_bidding_homework)%>
<%= b_project.project.description %>
<%=format_time(b_project.created_at) %>
 +
+ + + + + + + + + + +
<%= l(:label_bidding_user_studentcode) %> : <%= @user.user_extensions.student_id %>
<%= l(:label_bidding_user_homework) %> : <%= link_to(b_project.user.name, user_path(b_project.user)) %>
<%= l(:label_bidding_reason_homewrok) %> : <%= b_project.description %>
+
+ + +<% end %> + + + +<% else %> + + + <% if User.current.logged? %> + + <% end %> +
<%= l(:label_bidding_project) %>(<%= @bidding_project.count%>) +
+ <%= toggle_link l(:button_bidding), 'put-bid-form' %> +
+ +<% @bidding_project.each do |b_project|%> + + + + +
+ + + + + + +
+
+ <%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %> +
+ + + + + + + + + + + +
<%= link_to(b_project.project.name, project_path(b_project.project)) %><%= l(:label_join_bidding)%>
<%= b_project.project.description %>
<%= b_project.created_at%>
 +
+ + + + + + + +
<%= l(:label_bidding_user) %><%= link_to(b_project.user.name, user_path(b_project.user)) %>
<%= l(:label_bidding_reason) %><%= b_project.description %>
+
<% end %> -<% unless @bid.reward_type == 3%> -<%= render :partial=> "list_projects",:locals => {:bidding_project => @bidding_project,:bid => @bid }%> <% end %> diff --git a/app/views/bids/contest.html.erb b/app/views/bids/contest.html.erb index c5a97f0b9..5f5c5f5a7 100644 --- a/app/views/bids/contest.html.erb +++ b/app/views/bids/contest.html.erb @@ -31,7 +31,7 @@ <% end %> -<%= sort_bid(@s_state, @project_type)%> +<%= sort_contest(@s_state)%>
diff --git a/app/views/users/_my_course.html.erb b/app/views/users/_my_course.html.erb index 47d78c4fb..60ce7525b 100644 --- a/app/views/users/_my_course.html.erb +++ b/app/views/users/_my_course.html.erb @@ -5,15 +5,16 @@ <%= l(:label_project_course_un) %>

<% else %> -

- <%= l(:label_project_course_unadd) %> - <% if User.current.user_extensions.identity == 0 %> - <%= link_to"#{l(:label_course_new)}",{:controller=>'projects',:action=>'new', :course => 1}, :class => 'icon icon-add' %> +

+ <% if @user.user_extensions.identity == 0 %> + <%= l(:label_project_course_unadd) %><%= link_to"#{l(:label_course_new)}",{:controller=>'projects',:action=>'new', :course => 1}, :class => 'icon icon-add' %> + <% else %> + <%= l(:label_project_cousre_studentun) %><%= link_to"#{l(:label_course_join_student)}",{:controller=>'projects',:action=>'index', :course => 1}, :class => 'icon icon-add' %> <% end %> -

+

<% end %> <% else %> - <% if User.current.user_extensions.identity == 0 %> + <% if @user.user_extensions.identity == 0 %> <%= link_to"#{l(:label_course_new)}",{:controller=>'projects',:action=>'new', :course => 1}, :class => 'icon icon-add' %> <% end %>