From b55c5d20a3ccff9fbd16cb2b2ea0d6682cd81790 Mon Sep 17 00:00:00 2001 From: yanxd Date: Thu, 31 Oct 2013 20:13:49 +0800 Subject: [PATCH 1/8] added activity info from event, warning. --- app/helpers/projects_helper.rb | 17 +++++++++++++++++ app/views/projects/member.html.erb | 5 +++-- app/views/projects/show.html.erb | 7 +++---- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 8e792d690..9f9d0f35d 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -225,4 +225,21 @@ module ProjectsHelper end return @result end + + # 将动态中类型转换为可读的字符串 + def eventToLanguage event_type + case event_type + when "issue-note" + l :label_issue + when "issue" + l :label_issue + when "attachment" + l :label_attachment + when "news" + l :label_news + else + "" + end + end + end diff --git a/app/views/projects/member.html.erb b/app/views/projects/member.html.erb index d70831279..83c668744 100644 --- a/app/views/projects/member.html.erb +++ b/app/views/projects/member.html.erb @@ -7,8 +7,9 @@ <%= error_messages_for 'member' %> <% roles = Role.find_all_givable %> <% members = @project.member_principals.includes(:roles, :principal).all.sort %> - <% members = searchPeopleByRoles(@project, 3).sort if params[:role] == '1' %> - <% members = searchPeopleByRoles(@project, 5).sort if params[:role] == '2' %> + + <% members = searchPeopleByRoles(@project, 3).sort if params[:role] == '1' %> + <% members = searchPeopleByRoles(@project, 5).sort if params[:role] == '2' %> <% if @project.project_type == 1 %> <%= render :partial => 'member_list', :locals => {:members => members} %> <% else %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 23061be39..81d2ac2dc 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -21,15 +21,14 @@ <%= h(e.project) if @project.nil? || @project.id != e.project.id %> <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> - <%= l(:label_new_activity) %> - <%= link_to format_activity_title(e.event_title), e.event_url %> + <%= l(:label_new_activity) %> + <%= link_to "#{eventToLanguage(e.event_type)}: "<

- - <%= textilizable( stringCut240(e.event_description) ) %> + <%= textilizable( truncate(e.event_description, :length => 240)) %>

From 75c0480071916da633df46bc74e5f40e9efff21f Mon Sep 17 00:00:00 2001 From: nieguanghui Date: Thu, 31 Oct 2013 21:44:10 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8=EF=BC=8C=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E6=90=9C=E7=B4=A2=E6=A1=86?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BB=A5=E5=AD=A6=E7=94=9F=E8=A7=92=E8=89=B2=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B9=9F=E4=BC=9A=E5=87=BA=E7=8E=B0=E6=96=B0=E5=BB=BA=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/bids_controller.rb | 36 ++++++++++++------- app/controllers/users_controller.rb | 21 ++++++++++- app/views/bids/_list_projects.html.erb | 23 ++++++++++-- app/views/layouts/base_users.html.erb | 2 ++ app/views/projects/_project.html.erb | 2 +- app/views/projects/search.html.erb | 7 ++-- app/views/users/show.html.erb | 16 +++++++++ app/views/users/user_activities.html.erb | 1 + config/locales/zh.yml | 7 +++- config/routes.rb | 1 + .../stylesheets/application.css | 13 ++++++- 11 files changed, 109 insertions(+), 20 deletions(-) diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index 13ef9be5d..9161287bf 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -7,7 +7,7 @@ class BidsController < ApplicationController menu_item :homework_respond, :only => :homework_respond menu_item :homework_statistics, :only => :homework_statistics #Ended by young - before_filter :find_bid, :only => [:show, :show_project, :create, :destroy, :more, :back, :add,:new,:show_results,:set_reward, :add_homework, :fork, :create_fork, + before_filter :find_bid, :only => [:show, :show_project, :create,:destroy,:more,:back,:add,:new,:show_results,:set_reward, :add_homework, :fork, :create_fork, :show_course, :show_bid_project, :show_bid_user] before_filter :require_login,:only => [:set_reward, :destroy, :add, :new, ] @@ -27,8 +27,6 @@ class BidsController < ApplicationController else @bids = Bid.visible.where('reward_type = ?', 1) end - - @bids = @bids.like(params[:name]) if params[:name].present? @bid_count = @bids.count @@ -206,7 +204,7 @@ class BidsController < ApplicationController format.html { render :layout => 'base_contest' } - end + end format.api end @@ -232,12 +230,12 @@ class BidsController < ApplicationController format.html { render :layout => 'base_contest' } - end + end format.api end end - + def show_bid_project bids = Bid.where('parent_id = ?', @bid.id) @projects = [] @@ -258,12 +256,12 @@ class BidsController < ApplicationController format.html { render :layout => 'base_contest' } - end + end format.api end end - + def show_bid_user bids = Bid.where('parent_id = ?', @bid.id) @users = [] @@ -286,7 +284,7 @@ class BidsController < ApplicationController format.html { render :layout => 'base_contest' } - end + end format.api end @@ -310,6 +308,18 @@ class BidsController < ApplicationController # @project = Project.where("id in []", a) @user = @bid.author @bidding_project = @bid.biding_projects.all + if params[:student_id].present? + @temp = [] + @bidding_project.each do |pro| + if pro.project && pro.project.project_status + if /#{params[:student_id]}/ =~ pro.user.user_extensions.student_id + @temp << pro + end + end + @temp + end + @bidding_project = @temp + else #added by nie @temp = [] @bidding_project.each do |pro| @@ -319,9 +329,11 @@ class BidsController < ApplicationController @temp end if @temp.size > 0 - @bidding_project = @temp.sort {|a,b| b.project.project_status.grade <=> a.project.project_status.grade} + @bidding_project = @temp.sort {|a,b| b.project.project_status.grade <=> a.project.project_status.grade} end #ended + end + if @bid.homework_type == 1 @homework = HomeworkAttach.new @homework_list = @bid.homeworks @@ -340,7 +352,7 @@ class BidsController < ApplicationController format.html { render :layout => 'base_contest' } - end + end format.api end end @@ -369,7 +381,7 @@ class BidsController < ApplicationController format.html { render :layout => 'base_contest' } - end + end format.api end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index cb6b2d677..abb9b3079 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -112,7 +112,9 @@ class UsersController < ApplicationController for user in @watcher events << Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 30) end - + + + @events_by_day = events.group_by(&:event_date) unless User.current.admin? @@ -424,6 +426,23 @@ class UsersController < ApplicationController @state = 0 end + if params[:user].present? + user_temp = User.find_by_sql("select id from users where firstname like '%#{params[:user]}%' or lastname like '%#{params[:user]}%'") + if user_temp.size > 1 + activity = Activity.where('user_id in (?)', user_temp).order('id desc') + elsif user_temp.size == 1 + activity = Activity.where('user_id = ?', user_temp).order('id desc') + else + activity = Activity.where("1 = 0") + end + @offset, @limit = api_offset_and_limit({:limit => 10}) + @activity_count = activity.count + @activity_pages = Paginator.new @activity_count, @limit, params['page'] + @offset ||= @activity_pages.offset + @activity = activity.offset(@offset).limit(@limit) + @state = 0 + end + #Modified by nie unless User.current.admin? diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb index 790ee53d2..cd0494aea 100644 --- a/app/views/bids/_list_projects.html.erb +++ b/app/views/bids/_list_projects.html.erb @@ -1,6 +1,25 @@ - +<%= form_tag(:controller => 'bids', :action => "show_project", :method => :get) do %> +
+ + + + + + + + +
<%= l(:label_task_plural)%> +
+ <%= text_field_tag 'student_id', params[:student_id], :size => 30 %> + <%= submit_tag l(:label_search_by_student_id), :class => "small", :name => nil %> +
+
+<% end %> <% bidding_project.each do |b_project|%> <% if b_project.project %> + + + <% else %> - <%= l(:label_new_course)%> - + + <%= l(:label_new_course)%> + + <% if User.current.user_extensions.identity == 0 %> + <% end %> <% end %>
@@ -24,7 +43,7 @@ - <%= l(:label_system_grade) %>:<%= (b_project.project.project_status.nil? ? 0 : b_project.project.project_status.grade) unless (b_project.project.project_status.nil? && b_project.project.nil?) %> + <%= l(:label_system_grade) %>:<%= (b_project.project.project_status.nil? ? 0.0 : b_project.project.project_status.grade) unless (b_project.project.project_status.nil? && b_project.project.nil?) %> <% if get_prize(b_project).nil? or get_prize(b_project) == "" %> <% if @bid.deadline < Date.today %> <%= l(:label_noawards)%> diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 5b031bda1..bf17535d6 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -213,12 +213,14 @@ <%= render_menu :user_menu %> <% end %> + <%= yield %> <%= call_hook :view_layouts_base_content %>
<%= render_flash_messages %> + <%= render :partial => 'layouts/base_footer'%>
<% if @project.project_type !=1 %> - <%= content_tag('span', "#{l(:label_project_grade)}: ")%><%= @project.project_status.grade%> + <%= content_tag('span', "#{l(:label_project_grade)}: ")%><%=@project.project_status ? @project.project_status.grade : 0.0 %> <% end %>
diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb index 195e49618..7363b63c0 100644 --- a/app/views/projects/search.html.erb +++ b/app/views/projects/search.html.erb @@ -12,10 +12,13 @@ 		<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %><%= link_to(l(:label_course_new), {:controller => 'projects', :action => 'new', :course => 1, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 3daeeb116..26cfd31b5 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,6 +1,22 @@ <% if User.current.id == @user.id%> <%= show_activity @state%> +<%= form_tag(:controller => 'users', :action => "show") do %> +
+ + + + +
+
+ <%= text_field_tag 'user', params[:user], :size => 30 %> + <%= submit_tag l(:label_search_by_user), :class => "small", :name => nil %> +
+
<% end %> +<% end %> + + + <% unless @state == 2%> <% unless @activity.empty? %>
diff --git a/app/views/users/user_activities.html.erb b/app/views/users/user_activities.html.erb index b094ce70f..813815a29 100644 --- a/app/views/users/user_activities.html.erb +++ b/app/views/users/user_activities.html.erb @@ -19,6 +19,7 @@ <% unless @events_by_day.empty? %> +
<% @events_by_day.keys.sort.reverse.each do |day| %> <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 8996b794d..b10005539 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -827,7 +827,7 @@ zh: label_user_login: "最后登录:" label_user_mail: "邮件地址:" label_user_joinin: "加入时间:" - label_user_activities: 您当前还没有活动，快来加入我们吧！ + label_user_activities: 您没有关注该用户，请尝试重新输入！ label_user_activities_other: 该用户暂无任何动态！ label_project_overview: "概述" label_project_tool: "工具" @@ -1603,6 +1603,8 @@ zh: one: 份资料 other: 份资料 + + #add by men label_technicl_title_professor: 教授 label_technicl_title_associate_professor: 副教授 @@ -1663,4 +1665,7 @@ zh: label_has_watched_project: 关注的项目 label_project_take: 参与的项目 label_peoject_take_in: 加入了项目： + label_search_by_user: 按用户搜索 label_update_homework_succeed: 作业更新成功 + label_task_plural: 作业 + label_search_by_student_id: 按学号过滤 \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 7b6a13ae4..cbebb4ffe 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -81,6 +81,7 @@ RedmineApp::Application.routes.draw do get 'projects/:id/issues/report', :to => 'reports#issue_report', :as => 'project_issues_report' get 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :as => 'project_issues_report_details' + post '/users/:id/user_activities', :to => 'users#show', :as => "user_activities" #added by young resources :users do diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 0f1e8781e..78b88c45d 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -1571,6 +1571,17 @@ div.issue-note .description { overflow: hidden; } +/* + *Added by nie + */ + +div.user-search-block { + display: inline; + float: right; + margin-top: -65px; + +} + /*issue style Added by nie */ @@ -1710,7 +1721,7 @@ div.member_content { } /* - * Designed for search content + * Designed for project#search * Added by nie */ div.project-search-block { From db25900336e55941bc8c42c093a2c7d6467bc619 Mon Sep 17 00:00:00 2001 From: nieguanghui Date: Thu, 31 Oct 2013 22:07:31 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=97=B6=E5=80=99=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=86=99=E5=85=A5=E4=B8=A2=E5=A4=B1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 3 +- db/schema.rb | 113 ++++++++++++++++--------- 2 files changed, 75 insertions(+), 41 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index af968144f..eab4feff8 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -536,7 +536,7 @@ class ProjectsController < ApplicationController r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first m = Member.new(:user => User.current, :roles => [r]) project = ProjectInfo.new(:user_id => User.current.id, :project_id => @project.id) - UserGrade.create(:user_id => User.current.id, :project_id => @project.id, :grade => 0) + user_grades = UserGrade.create(:user_id => User.current.id, :project_id => @project.id) if params[:project][:is_public] == '1' project_status = ProjectStatus.create(:project_id => @project.id, :watchers_count => 0, :changesets_count => 0, :grade => 0, :project_type => @course_tag) end @@ -590,6 +590,7 @@ class ProjectsController < ApplicationController r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first m = Member.new(:user => User.current, :roles => [r]) project = ProjectInfo.new(:user_id => User.current.id, :project_id => @project.id) + user_grades = UserGrade.create(:user_id => User.current.id, :project_id => @project.id) if params[:project][:is_public] == '1' || @course_tag=="1" project_status = ProjectStatus.create(:project_id => @project.id, :watchers_count => 0, :changesets_count => 0) end diff --git a/db/schema.rb b/db/schema.rb index 7b97e6911..00647a7cc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,15 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20131021024144) do +ActiveRecord::Schema.define(:version => 20131031093317) do + + create_table "a_user_watchers", :force => true do |t| + t.string "name" + t.text "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "member_id" + end create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -163,12 +171,15 @@ ActiveRecord::Schema.define(:version => 20131021024144) do t.string "code" t.integer "time" t.string "extra" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "location" t.string "term" t.string "string" t.string "password" + t.string "setup_time" + t.string "endup_time" + t.string "class_period" end create_table "custom_fields", :force => true do |t| @@ -279,9 +290,9 @@ ActiveRecord::Schema.define(:version => 20131021024144) do add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id" create_table "issue_relations", :force => true do |t| - t.integer "issue_from_id", :null => false - t.integer "issue_to_id", :null => false - t.string "relation_type", :default => "", :null => false + t.integer "issue_from_id", :null => false + t.integer "issue_to_id", :null => false + t.string "relation_type", :null => false t.integer "delay" end @@ -423,6 +434,22 @@ ActiveRecord::Schema.define(:version => 20131021024144) do add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" add_index "messages", ["parent_id"], :name => "messages_parent_id" + create_table "messages_for_bids", :force => true do |t| + t.string "message" + t.integer "user_id" + t.integer "bid_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "messages_for_users", :force => true do |t| + t.integer "messager_id" + t.integer "user_id" + t.string "message" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "news", :force => true do |t| t.integer "project_id" t.string "title", :limit => 60, :default => "", :null => false @@ -482,10 +509,20 @@ ActiveRecord::Schema.define(:version => 20131021024144) do t.integer "watchers_count" t.integer "project_id" t.integer "project_type" - t.float "grade", :default => 0.0 + t.integer "gitlab_group_id", :limit => 8 end - add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade" + add_index "project_statuses", ["changesets_count"], :name => "index_project_statuses_on_changesets_count" + add_index "project_statuses", ["watchers_count"], :name => "index_project_statuses_on_watchers_count" + + create_table "project_tags", :force => true do |t| + t.integer "project_id" + t.integer "tag_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "user_id" + end create_table "projects", :force => true do |t| t.string "name", :default => "", :null => false @@ -530,17 +567,18 @@ ActiveRecord::Schema.define(:version => 20131021024144) do add_index "queries", ["user_id"], :name => "index_queries_on_user_id" create_table "repositories", :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.string "url", :default => "", :null => false - t.string "login", :limit => 60, :default => "" - t.string "password", :default => "" - t.string "root_url", :default => "" + t.integer "project_id", :default => 0, :null => false + t.string "url", :default => "", :null => false + t.string "login", :limit => 60, :default => "" + t.string "password", :default => "" + t.string "root_url", :default => "" t.string "type" - t.string "path_encoding", :limit => 64 - t.string "log_encoding", :limit => 64 + t.string "path_encoding", :limit => 64 + t.string "log_encoding", :limit => 64 t.text "extra_info" t.string "identifier" - t.boolean "is_default", :default => false + t.boolean "is_default", :default => false + t.string "git_project_id" end add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id" @@ -554,26 +592,6 @@ ActiveRecord::Schema.define(:version => 20131021024144) do t.string "issues_visibility", :limit => 30, :default => "default", :null => false end - create_table "seems_rateable_cached_ratings", :force => true do |t| - t.integer "cacheable_id", :limit => 8 - t.string "cacheable_type" - t.float "avg", :null => false - t.integer "cnt", :null => false - t.string "dimension" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "seems_rateable_rates", :force => true do |t| - t.integer "rater_id", :limit => 8 - t.integer "rateable_id" - t.string "rateable_type" - t.float "stars", :null => false - t.string "dimension" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - create_table "settings", :force => true do |t| t.string "name", :default => "", :null => false t.text "value" @@ -584,9 +602,9 @@ ActiveRecord::Schema.define(:version => 20131021024144) do create_table "shares", :force => true do |t| t.date "created_on" - t.string "url" t.string "title" - t.integer "share_type" + t.string "share_type" + t.string "url" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false t.integer "project_id" @@ -594,6 +612,12 @@ ActiveRecord::Schema.define(:version => 20131021024144) do t.string "description" end + create_table "students", :force => true do |t| + t.string "name" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "students_for_courses", :force => true do |t| t.integer "student_id" t.integer "course_id" @@ -652,7 +676,7 @@ ActiveRecord::Schema.define(:version => 20131021024144) do create_table "tokens", :force => true do |t| t.integer "user_id", :default => 0, :null => false t.string "action", :limit => 30, :default => "", :null => false - t.string "value", :limit => 40, :default => "", :null => false + t.string "value", :limit => 40 t.datetime "created_on", :null => false end @@ -678,12 +702,13 @@ ActiveRecord::Schema.define(:version => 20131021024144) do t.integer "zip_code" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.string "technical_title" t.integer "identity" + t.string "technical_title" t.string "student_id" t.string "teacher_realname" t.string "student_realname" t.string "location_city" + t.string "git_token" end create_table "user_grades", :force => true do |t| @@ -720,6 +745,14 @@ ActiveRecord::Schema.define(:version => 20131021024144) do add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade" add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count" + create_table "user_tags", :force => true do |t| + t.integer "user_id" + t.integer "tag_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "users", :force => true do |t| t.string "login", :default => "", :null => false t.string "hashed_password", :limit => 40, :default => "", :null => false From b2080a44703d29689ca81abfb9642c12e040eff8 Mon Sep 17 00:00:00 2001 From: baiyu Date: Fri, 1 Nov 2013 08:45:24 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BA=86=E5=BC=80?= =?UTF-8?q?=E8=AF=BE=E6=97=B6=E9=97=B4=EF=BC=8C=E7=BB=93=E8=AF=BE=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=80=89=E9=A1=B9=20=E5=A2=9E=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E8=AF=BE=E6=97=B6=E6=96=87=E6=9C=AC=E6=A1=86=20=E7=9B=B8?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 14 ++++-- app/views/layouts/base_courses.html.erb | 17 +++++-- app/views/layouts/base_homework.html.erb | 2 +- app/views/projects/_course_form.html.erb | 49 +++++++++++++++++-- config/locales/zh.yml | 7 ++- ...20131021024144_add_description_to_share.rb | 5 -- ...0131031071414_add_setup_time_to_courses.rb | 5 ++ ...0131031071452_add_endup_time_to_courses.rb | 5 ++ ...31031093317_add_class_period_to_courses.rb | 5 ++ db/schema.rb | 2 + 10 files changed, 93 insertions(+), 18 deletions(-) delete mode 100644 db/migrate/20131021024144_add_description_to_share.rb create mode 100644 db/migrate/20131031071414_add_setup_time_to_courses.rb create mode 100644 db/migrate/20131031071452_add_endup_time_to_courses.rb create mode 100644 db/migrate/20131031093317_add_class_period_to_courses.rb diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index eab4feff8..f1b8f6cc2 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -510,11 +510,14 @@ class ProjectsController < ApplicationController @course.extra='course' + DateTime.parse(Time.now.to_s).strftime('%Y-%m-%d_%H-%M-%S').to_s @course.safe_attributes = params[:project][:course] @course.tea_id = User.current.id - # added by bai + # added by bai @course.term = params[:term] @course.time = params[:time] + @course.setup_time = params[:setup_time] + @course.endup_time = params[:endup_time] + @course.class_period = params[:class_period] end - # end + # end # @course.save # project = ProjectInfo.create(:user_id => User.current.id, :project_id => @project.id) # project_status = ProjectStatus.create(:project_id => @project.id) @@ -806,10 +809,13 @@ class ProjectsController < ApplicationController @course = Course.find_by_extra(@project.identifier) unless @course.nil? @course.password = params[:project][:course][:password] - # added by bai + # added by bai @course.term = params[:term] @course.time = params[:time] - # end + @course.setup_time = params[:setup_time] + @course.endup_time = params[:endup_time] + @course.class_period = params[:class_period] + # end @course.save end @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 711d47e96..6b02530b2 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -111,14 +111,25 @@
- + - + + + + + + + + + + + + - + diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 0f447d831..fbca9bd23 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -67,7 +67,7 @@ - + <% unless @bid.parent_id.nil?%> diff --git a/app/views/projects/_course_form.html.erb b/app/views/projects/_course_form.html.erb index e57371f33..47a61681d 100644 --- a/app/views/projects/_course_form.html.erb +++ b/app/views/projects/_course_form.html.erb @@ -17,11 +17,52 @@ <%= f.fields_for @course do |m| %> - -

<%= l(:label_main_teacher) %> :<%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher)) %>
<%= l(:label_setup_time) %> :<%= @course.setup_time %>
<%= l(:label_endup_time) %> :<%= @course.endup_time %>
<%= l(:label_class_period) %> :<%= @course.class_period %> <%= l(:label_class_hour)%>
<%= l(:label_main_term) %> :<%= @course.time %> -- <%= @course.term %><%= l(:label_main_term) %> :<%= @course.time %> <%= @course.term %>
<%= l(:label_limit_time) %>： <%= @bid.deadline %><%= l(:label_limit_time) %>: <%= @bid.deadline %>
+ + + + + + <% unless @course.nil?%> +

<%= l(:label_setup_time) %> *   + <%= text_field_tag :setup_time, @course.setup_time, :placeholder => "在此选择开课日期" %> + <%= calendar_for('setup_time')%> +

+ <% else %> +

<%= l(:label_setup_time) %> *   + <%= text_field_tag :setup_time, nil, :placeholder => "在此选择开课日期" %> + <%= calendar_for('setup_time')%> +

+ <% end %> + + <% unless @course.nil?%> +

<%= l(:label_endup_time) %> *   + <%= text_field_tag :endup_time, @course.endup_time, :placeholder => "在此选择结课日期" %> + <%= calendar_for('endup_time')%> +

+ <% else %> +

<%= l(:label_endup_time) %> *   + <%= text_field_tag :endup_time, nil, :placeholder => "在此选择结课日期" %> + <%= calendar_for('endup_time')%> +

+ <% end %> + + <% unless @course.nil?%> +

<%= l(:label_class_period) %> *   + <%= text_field_tag :class_period, @course.class_period, :placeholder => "在此输入课时" %>  <%= l(:label_class_hour)%> +

+ <% else %> +

<%= l(:label_class_period) %> *   + <%= text_field_tag :class_period, nil, :placeholder => "在此输入课时" %><%= l(:label_class_hour)%> +

+ <% end %> + + + + +

<% unless @course.nil? %> <% if @course.time == 2008 %> -

+

<%= l(:label_term) %> *  
<%= l(:label_term) %> *   <%= select_tag 'time', " @@ -227,7 +268,7 @@ <%= l(:text_command) %> <% end %>

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

-

<%= f.check_box :is_public, :style => "margin-left:10px;" %>

+

<%= f.check_box :is_public, :style => "margin-left:10px;" %><%= l(:label_public_info) %>

<%= f.text_field :project_type, :value => 1 %>

diff --git a/config/locales/zh.yml b/config/locales/zh.yml index b10005539..1d4dca012 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1546,14 +1546,19 @@ zh: label_requirement_from: 需求来源 label_course_view: 作业界面 label_course_return: "返 回 课 程" + label_setup_time: 开课时间 + label_endup_time: 结课时间 + label_class_period: 整体课时 + label_class_hour: 学时 + #end label_course: 课程 label_course_new: 新建课程 label_course_join_student: 加入课程 + label_public_info: （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该项目。） label_course_view_student: 查看其他课程 - label_public_info: 若不公开，仅项目成员可见该项目 label_course_student: 学生 label_homework: 课程作业 label_course_file: 资料共享 diff --git a/db/migrate/20131021024144_add_description_to_share.rb b/db/migrate/20131021024144_add_description_to_share.rb deleted file mode 100644 index 1ac25a9b4..000000000 --- a/db/migrate/20131021024144_add_description_to_share.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddDescriptionToShare < ActiveRecord::Migration - def change - add_column :shares, :description, :string - end -end diff --git a/db/migrate/20131031071414_add_setup_time_to_courses.rb b/db/migrate/20131031071414_add_setup_time_to_courses.rb new file mode 100644 index 000000000..882e1d932 --- /dev/null +++ b/db/migrate/20131031071414_add_setup_time_to_courses.rb @@ -0,0 +1,5 @@ +class AddSetupTimeToCourses < ActiveRecord::Migration + def change + add_column :courses, :setup_time, :string + end +end diff --git a/db/migrate/20131031071452_add_endup_time_to_courses.rb b/db/migrate/20131031071452_add_endup_time_to_courses.rb new file mode 100644 index 000000000..587a8eff6 --- /dev/null +++ b/db/migrate/20131031071452_add_endup_time_to_courses.rb @@ -0,0 +1,5 @@ +class AddEndupTimeToCourses < ActiveRecord::Migration + def change + add_column :courses, :endup_time, :string + end +end diff --git a/db/migrate/20131031093317_add_class_period_to_courses.rb b/db/migrate/20131031093317_add_class_period_to_courses.rb new file mode 100644 index 000000000..7a7abc8a9 --- /dev/null +++ b/db/migrate/20131031093317_add_class_period_to_courses.rb @@ -0,0 +1,5 @@ +class AddClassPeriodToCourses < ActiveRecord::Migration + def change + add_column :courses, :class_period, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 00647a7cc..a5a245bd2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -510,9 +510,11 @@ ActiveRecord::Schema.define(:version => 20131031093317) do t.integer "project_id" t.integer "project_type" t.integer "gitlab_group_id", :limit => 8 + t.float "grade" end add_index "project_statuses", ["changesets_count"], :name => "index_project_statuses_on_changesets_count" + add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade" add_index "project_statuses", ["watchers_count"], :name => "index_project_statuses_on_watchers_count" create_table "project_tags", :force => true do |t| From 5febe8a58d432382f32066f45dad8b13706a8525 Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Fri, 1 Nov 2013 09:06:06 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=E5=8A=A0=E5=85=A5=E4=BA=86?= =?UTF-8?q?=E2=80=9C=E9=80=80=E5=87=BA=E8=AF=BE=E7=A8=8B=E2=80=9D=E5=92=8C?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/members_controller.rb | 2 +- app/controllers/projects_controller.rb | 6 +++--- app/views/users/_course_form.html.erb | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 712c86680..5168913a7 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -100,7 +100,7 @@ class MembersController < ApplicationController #added by nie if(params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3") @projectInfo = ProjectInfo.new(:user_id => @member.user_id, :project_id => @project.id) - @projectInfo.save + @projectInfo.save else user_admin = ProjectInfo.where("user_id = ? and project_id = ?", @member.user_id, @project.id) if user_admin.size > 0 diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index f1b8f6cc2..8023042ff 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -748,7 +748,7 @@ class ProjectsController < ApplicationController # @course_tag = params[:course] # if @course_tag == '1' if @project.project_type == 1 - @course = Course.find_by_extra(@project.identifier) + @course = Course.find_by_extra(@project.identifier) render :layout => 'base_courses' else render :layout => 'base_projects' @@ -762,7 +762,7 @@ class ProjectsController < ApplicationController #by young def member if @project.project_type == 1 - render :layout => 'base_courses' + render :layout => 'base_courses' end # roles = Role.find_all_givable # members = @project.member_principals.includes(:roles, :principal).all.sort @@ -912,7 +912,7 @@ class ProjectsController < ApplicationController def watcherlist if @watched - @users -= watched.watcher_users + @users -= watched.watcher_users end end end diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb index 579f5dbef..0fe03a825 100644 --- a/app/views/users/_course_form.html.erb +++ b/app/views/users/_course_form.html.erb @@ -9,8 +9,10 @@
<%= link_to_project(membership.project) %> - - <%= l(:label_x_base_courses_member, :count => membership.project.members.count) %>(<%= link_to "#{membership.project.members.count}", project_member_path(membership.project), :course =>'1' %>)   + + + + <%= join_in_course(membership.project, User.current)%>    <%= l(:label_x_base_courses_member, :count => membership.project.members.count) %>(<%= link_to "#{membership.project.members.count}", project_member_path(membership.project), :course =>'1' %>)   <%= l(:label_homework) %> (<%= link_to (membership.project.homeworks.count), {:controller => 'projects', :action => 'homework', :id => membership.project.identifier} %>)    <%= l(:label_course_news)%> (<%= link_to (membership.project.news.count), {:controller => 'news', :action => 'index', :project_id => membership.project.identifier} %>) From 775ebc3607512ed8089a4a0113678f0b3e06a877 Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Fri, 1 Nov 2013 10:01:16 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=96=B0=E9=97=BB=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/news/index.html.erb | 156 ++++++++++++++++++---------------- app/views/news/show.html.erb | 2 +- 2 files changed, 83 insertions(+), 75 deletions(-) diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb index cded25576..9718a30df 100644 --- a/app/views/news/index.html.erb +++ b/app/views/news/index.html.erb @@ -1,32 +1,33 @@ +
<% if @project.project_type == 1%> -<%= link_to(l(:label_news_notice), - new_project_news_path(@project), - :class => 'icon icon-add', - :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %> - <% else %> - <%= link_to(l(:label_news_new), - new_project_news_path(@project), - :class => 'icon icon-add', - :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %> - - <% end %> + <%= link_to(l(:label_news_notice), + new_project_news_path(@project), + :class => 'icon icon-add', + :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %> + <% else %> + <%= link_to(l(:label_news_new), + new_project_news_path(@project), + :class => 'icon icon-add', + :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %> + + <% end %>
-<% if @newss.empty? %> -

<%= l(:label_no_data) %>

-<% else %> -<% @newss.each do |news| %> - - - - - -
<%=link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %> - <% if @project.project_type == 1 %> - - - - <% else %> - - - - <% end %> - - - - - - - -
<%=link_to_user(news.author)if news.respond_to?(:author) %> <%= l(:label_project_notice)%> <%= link_to h(news.title), news_path(news) %>
<%=link_to_user(news.author)if news.respond_to?(:author) %> <%= l(:label_project_newshare)%> <%= link_to h(news.title), news_path(news) %>
<%= textilizable(news, :description) %>
<%= format_time(news.created_on) %><%= link_to l(:label_project_newother),news_path(news)%><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %>
-<% end %> -<% end %>
+ <% if @newss.empty? %> +

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

+ <% else %> + <% @newss.each do |news| %> + + + + + +
<%= link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %> + + <% if @project.project_type == 1 %> + + + + <% else %> + + + + <% end %> + + + + + + + +
<%= link_to_user(news.author)if news.respond_to?(:author) %><%= l(:label_project_notice)%><%= link_to h(news.title), news_path(news) %> + <%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %>
<%= link_to_user(news.author)if news.respond_to?(:author) %><%= l(:label_project_newshare)%> <%= link_to h(news.title), news_path(news) %> + <%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %>
<%= textilizable(news, :description) %>
<%= format_time(news.created_on) %><%= link_to l(:label_project_newother),news_path(news)%><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %>
+ <% end %> + <% end %> +
+ + <% other_formats_links do |f| %> + <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %> + <% end %> + + <% content_for :header_tags do %> + <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> + <%= stylesheet_link_tag 'scm' %> + <% end %> + + <% html_title(l(:label_news_plural)) -%>
- -<% other_formats_links do |f| %> - <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %> -<% end %> - -<% content_for :header_tags do %> - <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> - <%= stylesheet_link_tag 'scm' %> -<% end %> - -<% html_title(l(:label_news_plural)) -%> diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb index b8296716d..3c7d0adad 100644 --- a/app/views/news/show.html.erb +++ b/app/views/news/show.html.erb @@ -8,7 +8,7 @@ <%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %> -

<%= h @news.title %>

+

<%=h @news.title %>

<% if authorize_for('news', 'edit') %>