From b7c4449f4b940ba6a0ee2b2ea6f59659067221e0 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Mon, 13 Jul 2015 16:44:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 4 +- app/helpers/users_helper.rb | 29 +++++++++ app/views/layouts/base_users_new.html.erb | 60 +++++++++---------- app/views/my/account.html.erb | 21 +++++-- app/views/users/show.html.erb | 2 +- ...1100_add_description_to_user_extensions.rb | 9 +++ 6 files changed, 85 insertions(+), 40 deletions(-) create mode 100644 db/migrate/20150713161100_add_description_to_user_extensions.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c83afd397..d89dc35a3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -129,7 +129,7 @@ class UsersController < ApplicationController limit = 10; query = Project.joins("join members m on #{Project.table_name}.id=m.project_id") - query = query.where("m.user_id = ?",@user.id) + query = query.where("m.user_id = ? and #{Project.table_name}.project_type=?",@user.id,Project::ProjectType_project) if(params[:status] == '1') query = query.where("#{Project.table_name}.user_id = ?",@user.id); elsif(params[:status] == '2') @@ -465,7 +465,7 @@ class UsersController < ApplicationController def user_projects4show query = Project.joins("join members m on #{Project.table_name}.id=m.project_id") - query = query.where("m.user_id = ?",@user.id) + query = query.where("m.user_id = ? and #{Project.table_name}.project_type=?",@user.id,Project::ProjectType_project) if User.current == @user #看自己 else query = query.where(Project.table_name+".is_public = 1") diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index b1f71f40f..8f8f38878 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -322,6 +322,35 @@ module UsersHelper return [count,list]; end + def get_create_course_count(user) + return Course.where("tea_id = ?",user.id).count() + end + def get_join_course_count(user) + return user.coursememberships.count() - get_create_course_count(user) + end + def get_homework_commons_count(user) + return HomeworkCommon.where("user_id = ?",user.id).count() + end + def get_projectandcourse_attachment_count(user) + return Attachment.where("author_id = ? and container_type in ('Project','Course')",user.id).count() + end + def get_create_project_count(user) + return Project.where("user_id = ? and project_type = ?",user.id,Project::ProjectType_project).count() + end + def get_join_project_count(user) + return user.memberships.count(conditions: "projects.project_type = #{Project::ProjectType_project}") - get_create_project_count(user) + end + def get_create_issue_count(user) + return Issue.where("author_id = ?",user.id).count() + end + def get_resolve_issue_count(user) + return Issue.where("assigned_to_id = ? and status_id=3",user.id).count() + end + def get_anonymous_evaluation_count(user) + return StudentWorksScore.where("user_id = ? and reviewer_role=3",user.id).count() + end + + def query_activities(query,type) query_rec_count = 50 query = query.where("act_type not in ('Contest','Contestnotifications','Principal')") diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 4da9ae3a3..7277761ce 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -197,37 +197,35 @@ $(".subNav").click(function(){
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + +
+
<% if @center_flag %>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 377844a33..9b190f224 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -1,5 +1,4 @@
- <%= render_flash_messages %>
    @@ -11,6 +10,10 @@
    <%= labelled_form_for :user, @user, :url => {:action => "account"}, :html => {:id => 'my_account_form', :method => :post} do |f| %>
    + <% if( @act.nil? || @act != 'password') %> + <%= render_flash_messages %> + <%= error_messages_for 'user' %> + <% end %>
    • 登录名 : 
    • 邮箱 : 
      • @@ -137,7 +140,8 @@
    • <%= f.select :language, :Chinese => :zh, :English => :en %>
    • - 确认 + 确认 +
    @@ -146,17 +150,22 @@ <% end %> <%= form_tag({:action => "password"},:id => 'my_password_form') do %>
    + <% if( !@act.nil? && @act == 'password') %> + <%= render_flash_messages %> + <%= error_messages_for 'user' %> + <% end %>
    • 原始密码 : 
    • 新密码 : 
    • 确认密码 : 
      -
      • -
    • 请输入6-12个字符
      • -
      • +
      • +
    • 请输入6-12个字符
      • +
    • - 确认 + 确认 +
    diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index f355ad2ca..42a543c03 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -7,7 +7,7 @@ span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;} div.ke-toolbar .ke-outline{border:none;} -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> <% @center_flag = (User.current == @user) %> <% if @center_flag %>
    diff --git a/db/migrate/20150713161100_add_description_to_user_extensions.rb b/db/migrate/20150713161100_add_description_to_user_extensions.rb new file mode 100644 index 000000000..97cca4222 --- /dev/null +++ b/db/migrate/20150713161100_add_description_to_user_extensions.rb @@ -0,0 +1,9 @@ +class AddDescriptionToUserExtensions < ActiveRecord::Migration + def up + add_column :user_extensions, :description, :string, default: '' + end + + def down + remove_column :user_extensions, :description + end +end \ No newline at end of file