From eadab840b61b03fe62925c37530e27c98a3bba1d Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 3 Nov 2015 11:19:38 +0800 Subject: [PATCH 001/285] =?UTF-8?q?=E5=BB=BA=E7=AB=8B=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E3=80=81=E6=88=90=E5=91=98=E8=A1=A8=E5=8F=8A=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=EF=BC=9B=20=E7=BC=96=E5=86=99?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BB=84=E7=BB=87=E9=A1=B5=E9=9D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../javascripts/organizations.js.coffee | 3 + app/assets/stylesheets/organizations.css.scss | 3 + app/controllers/organizations_controller.rb | 15 +++ app/helpers/organizations_helper.rb | 2 +- app/models/org_member.rb | 4 + app/models/organization.rb | 4 +- app/views/layouts/new_base.html.erb | 2 +- app/views/organizations/create.js.erb | 0 app/views/organizations/new.html.erb | 95 +++++++++++++++++++ config/locales/commons/zh.yml | 4 + config/routes.rb | 2 + ...b => 20151103011119_create_org_members.rb} | 7 +- public/stylesheets/org.css | 6 ++ .../organizations_controller_spec.rb | 5 + spec/factories/org_members.rb | 8 ++ spec/models/org_member_spec.rb | 5 + 16 files changed, 156 insertions(+), 9 deletions(-) create mode 100644 app/assets/javascripts/organizations.js.coffee create mode 100644 app/assets/stylesheets/organizations.css.scss create mode 100644 app/controllers/organizations_controller.rb create mode 100644 app/models/org_member.rb create mode 100644 app/views/organizations/create.js.erb create mode 100644 app/views/organizations/new.html.erb rename db/migrate/{20151102090519_create_org_members.rb => 20151103011119_create_org_members.rb} (76%) create mode 100644 public/stylesheets/org.css create mode 100644 spec/controllers/organizations_controller_spec.rb create mode 100644 spec/factories/org_members.rb create mode 100644 spec/models/org_member_spec.rb diff --git a/app/assets/javascripts/organizations.js.coffee b/app/assets/javascripts/organizations.js.coffee new file mode 100644 index 000000000..761567942 --- /dev/null +++ b/app/assets/javascripts/organizations.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/organizations.css.scss b/app/assets/stylesheets/organizations.css.scss new file mode 100644 index 000000000..39819880e --- /dev/null +++ b/app/assets/stylesheets/organizations.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the organizations controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb new file mode 100644 index 000000000..1d0edbd7e --- /dev/null +++ b/app/controllers/organizations_controller.rb @@ -0,0 +1,15 @@ +class OrganizationsController < ApplicationController + def new + @organization = Organization.new + render :layout => 'new_base' + end + def create + @organization = Organization.new + @organization.name = params[:organization][:name] + @organization.description = params[:organization][:description] + @organization.is_public = params[:organization][:is_public] + @organization.creator_id = User.current.id + member = OrgMember.new(:user_id => User.current.id, :role => 'Manager') + @organization.org_members << member + end +end diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb index 10321ba16..24cc9a80e 100644 --- a/app/helpers/organizations_helper.rb +++ b/app/helpers/organizations_helper.rb @@ -1,2 +1,2 @@ -module EnterprisesHelper +module OrganizationsHelper end diff --git a/app/models/org_member.rb b/app/models/org_member.rb new file mode 100644 index 000000000..c4be034fe --- /dev/null +++ b/app/models/org_member.rb @@ -0,0 +1,4 @@ +class OrgMember < ActiveRecord::Base + attr_accessible :organization_id, :role, :user_id + belongs_to :organization +end diff --git a/app/models/organization.rb b/app/models/organization.rb index 5f52dee98..39b5900d9 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -1,5 +1,5 @@ class Organization < ActiveRecord::Base - attr_accessible :logo_link, :name - + attr_accessible :name, :description, :creator_id, :home_id, :domain, :is_public + has_many :org_members, :dependent => :destroy has_many :projects end diff --git a/app/views/layouts/new_base.html.erb b/app/views/layouts/new_base.html.erb index 6ab83d393..a2bbee9e3 100644 --- a/app/views/layouts/new_base.html.erb +++ b/app/views/layouts/new_base.html.erb @@ -13,7 +13,7 @@ <%= javascript_heads %> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> - <%= stylesheet_link_tag 'public', 'leftside', 'courses','header','prettify'%> + <%= stylesheet_link_tag 'public', 'leftside', 'courses','header','prettify', 'org'%> <%= javascript_include_tag "course","header",'prettify' %> <%= yield :header_tags -%> diff --git a/app/views/organizations/create.js.erb b/app/views/organizations/create.js.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb new file mode 100644 index 000000000..de8983f02 --- /dev/null +++ b/app/views/organizations/new.html.erb @@ -0,0 +1,95 @@ + +<% @nav_dispaly_organization_label = 1 + @nav_dispaly_forum_label = 1 %> +<%= error_messages_for 'organization' %> +
+

<%= l(:label_organization_new)%>

+
+
+ +
+
+ +<% html_title(l(:label_organization_new)) -%> + + + diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index 61bad2a00..54f0fbdaf 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -288,6 +288,10 @@ zh: label_tags_project_name: "项目名称：" label_projects_new_name: "项目名称" label_tags_project_description: "项目描述" + + label_organization_name: "组织名称" + label_organization_description: "组织描述" + label_organization_new: "新建组织" label_tags_user_mail: "用户邮箱：" label_tags_user_name: "用户名：" diff --git a/config/routes.rb b/config/routes.rb index 9a6b48da2..0394cdb53 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -31,6 +31,8 @@ RedmineApp::Application.routes.draw do # Enable Grack support # mount Trustie::Grack.new, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post] + resources :organizations + resources :homework_users resources :no_uses delete 'no_uses', :to => 'no_uses#delete' diff --git a/db/migrate/20151102090519_create_org_members.rb b/db/migrate/20151103011119_create_org_members.rb similarity index 76% rename from db/migrate/20151102090519_create_org_members.rb rename to db/migrate/20151103011119_create_org_members.rb index 037d8a3c6..6ef208794 100644 --- a/db/migrate/20151102090519_create_org_members.rb +++ b/db/migrate/20151103011119_create_org_members.rb @@ -1,14 +1,11 @@ class CreateOrgMembers < ActiveRecord::Migration - def up + def change create_table :org_members do |t| t.integer :user_id t.integer :organization_id t.string :role + t.timestamps end end - - def down - drop_table :org_members - end end diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css new file mode 100644 index 000000000..b1dfbbcf0 --- /dev/null +++ b/public/stylesheets/org.css @@ -0,0 +1,6 @@ +@charset "utf-8"; +/* CSS Document */ + +.orgName {width:130px; color:#484848;} +.organization_r_h02{ width:970px; height:40px; background:#eaeaea; margin-bottom:10px;} +.organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} \ No newline at end of file diff --git a/spec/controllers/organizations_controller_spec.rb b/spec/controllers/organizations_controller_spec.rb new file mode 100644 index 000000000..cf00f4cf9 --- /dev/null +++ b/spec/controllers/organizations_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrganizationsController, :type => :controller do + +end diff --git a/spec/factories/org_members.rb b/spec/factories/org_members.rb new file mode 100644 index 000000000..90997fd30 --- /dev/null +++ b/spec/factories/org_members.rb @@ -0,0 +1,8 @@ +FactoryGirl.define do + factory :org_member do + user_id 1 +organization_id 1 +role "MyString" + end + +end diff --git a/spec/models/org_member_spec.rb b/spec/models/org_member_spec.rb new file mode 100644 index 000000000..e7058e5b3 --- /dev/null +++ b/spec/models/org_member_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgMember, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end From 3f289dcd74ead27f1afbcb0593e0416d5dedf654 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 3 Nov 2015 17:21:32 +0800 Subject: [PATCH 002/285] =?UTF-8?q?org=E5=BC=80=E5=8F=91=E9=83=A8=E5=88=86?= =?UTF-8?q?=EF=BC=88=E6=9C=AA=E5=AE=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organization_controller.rb | 55 ------- app/controllers/organizations_controller.rb | 12 ++ app/views/layouts/base_org.html.erb | 157 ++++++++++++++++++++ app/views/organizations/show.html.erb | 4 + 4 files changed, 173 insertions(+), 55 deletions(-) delete mode 100644 app/controllers/organization_controller.rb create mode 100644 app/views/layouts/base_org.html.erb create mode 100644 app/views/organizations/show.html.erb diff --git a/app/controllers/organization_controller.rb b/app/controllers/organization_controller.rb deleted file mode 100644 index 748fc1732..000000000 --- a/app/controllers/organization_controller.rb +++ /dev/null @@ -1,55 +0,0 @@ -class OrganizationController < ApplicationController - # layout 'base_projects' - before_filter :require_admin, :except => [:index] - - def index - #@projects = Project.find_by_sql("SELECT * FROM projects WHERE id IN (select MAX(id) from projects GROUP BY enterprise_name)") - @organizations = Organization.all - respond_to do |format| - format.html - end - end - - def new - @organizations = Organization.new - respond_to do |format| - format.html - end - end - - def create - @organizations = Organization.new - @organizations.name = params[:organization][:name] - if @organizations.save - redirect_to admin_organization_url - end - end - - def edit - @organization = Organization.find params[:id] - respond_to do |format| - format.html - end - rescue Exception => e - render_404 - end - - def update - @organization = Organization.find params[:id] - @organization.name = params[:organization][:name] - if @organization.save - redirect_to admin_organization_url - end - rescue Exception => e - render_404 - end - - def destroy - @organization = Organization.find params[:id] - if @organization.destroy - redirect_to admin_organization_url - end - rescue Exception => e - render_404 - end -end diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 1d0edbd7e..0def8b5f8 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -1,4 +1,5 @@ class OrganizationsController < ApplicationController + layout 'base_org' def new @organization = Organization.new render :layout => 'new_base' @@ -11,5 +12,16 @@ class OrganizationsController < ApplicationController @organization.creator_id = User.current.id member = OrgMember.new(:user_id => User.current.id, :role => 'Manager') @organization.org_members << member + if @organization.save + redirect_to organization_path(@organization) + end + end + + def show + + end + + def update + end end diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb new file mode 100644 index 000000000..a3829ea3b --- /dev/null +++ b/app/views/layouts/base_org.html.erb @@ -0,0 +1,157 @@ +<% @nav_dispaly_project_label = 1 + @nav_dispaly_forum_label = 1 %> +<%#@nav_dispaly_project_label = 1 %> + + + + + <%= h html_title %> + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= javascript_heads %> + <%= heads_for_theme %> + <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository' %> + <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move' %> + <%= call_hook :view_layouts_base_html_head %> + + <%= yield :header_tags -%> + + + + + +
+ <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else %> + <%= render :partial => 'layouts/unlogin_header' %> + <% end %> +
+
+ <% @organization = Organization.find(params[:id])%> +
+
+
+
+ +
组织id:<%= @organization.id %>
+ 配置 +
+
文章 ( 3 ) | 成员 ( 10 )
+
+
+
动态
+
项目
+
+ +
+
+
+
+
+
最新动态
+ +
+
+
+
用户头像
+
+
尹教授 TO micROS研究团队 | 组织
+
如何打造一场罗永浩式的精彩演讲？
+
发帖时间：2015-11-02 11:25
+
罗永浩已经把他的主题演讲成功变成了一次次的重大的媒体事件，这让科技界和营销界的从业者们羡慕不已。事实上，老罗不仅从乔布斯那里继承了乔式审美，设计哲学，同时也继承了乔布斯的演讲艺术。乔布斯是人类历史上最伟大的演讲者。在一次又一次的"罗氏演讲"中，我们可以清晰看到老罗对乔布斯演讲的拆解，学习，模仿。每一次的公开演讲，都是一堂案例级的营销课程，值得每一位有志于从事营销相关的朋友分析研究。
+ 下面，我们将从"故事"、"现场"、"准备"三个方面分析学习老罗的演讲技巧，教你如何打造一场"罗永浩式"的演讲。
+
+ +
+
+
+
+
+
+
回复（2）
+ + +
+
+
用户头像
+
+
黄井泉 学生 2015-11-03 12:26
+
学习下！
+
+
+
+
+
用户头像
+
+
陈正东 学生 2015-11-02 17:08
+
锤子手机，卖的就是情怀
+
+
+
+
+
用户头像
+
+ + 发送
+
+
+
+
+
+
+
+
用户头像
+
+
唐湘政 创建了 micROS研究团队 + | 组织
+
micROS研究团队
+
创建时间：2015-10-29 11:23
+
+
+
+
+
+
+
+ +
+ <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
+
+ + +
+ <%= render :partial => 'layouts/footer' %> +
+ + + diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb new file mode 100644 index 000000000..9d38aedc1 --- /dev/null +++ b/app/views/organizations/show.html.erb @@ -0,0 +1,4 @@ +<%= javascript_include_tag "jquery.infinitescroll.js" %> +
+

组织活动

+
\ No newline at end of file From 283af137c69426b72e2857c1c440d242c5101c26 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 5 Nov 2015 17:57:07 +0800 Subject: [PATCH 003/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8F=8A=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 47 ++- app/helpers/application_helper.rb | 9 + app/helpers/organizations_helper.rb | 17 + app/models/org_member.rb | 3 + app/models/org_member_role.rb | 5 + app/models/organization.rb | 10 +- app/models/principal.rb | 10 + app/models/project.rb | 4 +- app/models/role.rb | 2 + app/models/user.rb | 1 + app/views/layouts/base_org.html.erb | 191 +++++----- app/views/org_member/create.js.erb | 2 + app/views/org_member/destroy.js.erb | 1 + .../org_member/org_member_autocomplete.js.erb | 23 ++ app/views/org_member/update.js.erb | 1 + .../_new_org_avatar_form.html.erb | 33 ++ .../organizations/_org_member_list.html.erb | 44 +++ app/views/organizations/check_uniq.js.erb | 18 + app/views/organizations/new.html.erb | 25 +- app/views/organizations/setting.html.erb | 109 ++++++ app/views/organizations/show.html.erb | 39 +- config/routes.rb | 19 +- db/schema.rb | 349 +++++++++++++++++- public/javascripts/org.js | 34 ++ public/stylesheets/org.css | 29 +- 25 files changed, 918 insertions(+), 107 deletions(-) create mode 100644 app/models/org_member_role.rb create mode 100644 app/views/org_member/create.js.erb create mode 100644 app/views/org_member/destroy.js.erb create mode 100644 app/views/org_member/org_member_autocomplete.js.erb create mode 100644 app/views/org_member/update.js.erb create mode 100644 app/views/organizations/_new_org_avatar_form.html.erb create mode 100644 app/views/organizations/_org_member_list.html.erb create mode 100644 app/views/organizations/check_uniq.js.erb create mode 100644 app/views/organizations/setting.html.erb create mode 100644 public/javascripts/org.js diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 0def8b5f8..a51093ad9 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -1,5 +1,10 @@ +# encoding: utf-8 class OrganizationsController < ApplicationController + # before_filter :find_organization, :except => [:show,:new,:index,:create] layout 'base_org' + def index + + end def new @organization = Organization.new render :layout => 'new_base' @@ -10,18 +15,56 @@ class OrganizationsController < ApplicationController @organization.description = params[:organization][:description] @organization.is_public = params[:organization][:is_public] @organization.creator_id = User.current.id - member = OrgMember.new(:user_id => User.current.id, :role => 'Manager') + member = OrgMember.new(:user_id => User.current.id) + @organization.org_members << member if @organization.save + OrgMemberRole.create(:org_member_id => member.id, :role_id => 11) redirect_to organization_path(@organization) end end def show - + @organization = Organization.find(params[:id]) + @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?)', @organization.id, 'CreateOrganization ') + @activities = paginateHelper @activities, 10 end def update + @organization = Organization.find(params[:id]) + @organization.name = params[:organization][:name] + @organization.description = params[:organization][:description] + @organization.domain = params[:organization][:domain] + @organization.is_public = params[:organization][:is_public] == 'on' ? 1 : 0 + #@organization.name = params[:organization][:name] + @organization.save + respond_to do |format| + format.html { redirect_to setting_organization_path(@organization)} + end + end + + def check_uniq + @check = false; + @config_page = params[:config_page] + sameName = @config_page ? Organization.where('name = ? and id != ?',params[:org_name],params[:org_id].to_i).count == 0 : Organization.where('name = ?',params[:org_name]).count == 0 + if sameName == true + @check = true + end + respond_to do |format| + format.js + end + end + + def find_organization + @organization = Organization.find(params[:id]) + end + + def setting + @organization = Organization.find(params[:id]) + end + + + def clear_org_avatar_temp end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 84364b4f6..dbf246141 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -48,6 +48,15 @@ module ApplicationHelper end end end + # 获取组织成员中文名字 + def get_org_member_role_name member + case member.roles[0].name + when 'orgManager' + '组织管理员' + when 'orgMember' + '组织成员' + end + end # Time 2015-03-24 16:38:05 # Author lizanle diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb index 24cc9a80e..e10d4026d 100644 --- a/app/helpers/organizations_helper.rb +++ b/app/helpers/organizations_helper.rb @@ -1,2 +1,19 @@ +# encoding: utf-8 module OrganizationsHelper + include ApplicationHelper + + + def find_user_not_in_current_org_by_name org + if params[:q] && params[:q].lstrip.rstrip != "" + scope = Principal.active.sorted.not_member_of_org(org).like(params[:q]) + else + scope = [] + end + principals = paginateHelper scope,10 + s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals') + links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options| + link_to text, org_member_autocomplete_org_member_index_path( parameters.merge(:q => params[:q],:flag => true,:org=>org, :format => 'js')), :remote => true + } + s + content_tag('ul', links,:class => 'wlist', :id => "org_member_pagination_links" ) + end end diff --git a/app/models/org_member.rb b/app/models/org_member.rb index c4be034fe..091c20f22 100644 --- a/app/models/org_member.rb +++ b/app/models/org_member.rb @@ -1,4 +1,7 @@ class OrgMember < ActiveRecord::Base attr_accessible :organization_id, :role, :user_id belongs_to :organization + has_many :roles ,:through => :org_member_roles,:foreign_key => 'role_id' + has_many :org_member_roles,:dependent => :destroy + end diff --git a/app/models/org_member_role.rb b/app/models/org_member_role.rb new file mode 100644 index 000000000..0ce4f8141 --- /dev/null +++ b/app/models/org_member_role.rb @@ -0,0 +1,5 @@ +class OrgMemberRole < ActiveRecord::Base + # attr_accessible :title, :body + belongs_to :org_member + belongs_to :role +end diff --git a/app/models/organization.rb b/app/models/organization.rb index 39b5900d9..567df954c 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -1,5 +1,13 @@ class Organization < ActiveRecord::Base attr_accessible :name, :description, :creator_id, :home_id, :domain, :is_public has_many :org_members, :dependent => :destroy - has_many :projects + has_many :org_projects ,:dependent => :destroy + has_many :projects,:through => :org_projects + has_many :org_document_comments, :dependent => :destroy + validates_uniqueness_of :name + after_create :save_as_org_activity + + def save_as_org_activity + OrgActivity.create(:user_id => User.current.id, :org_act_id => self.id, :org_act_type => 'CreateOrganization', :container_id => self.id, :container_type => 'Organization') + end end diff --git a/app/models/principal.rb b/app/models/principal.rb index 0f0746f78..fc9c7cac4 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -87,6 +87,16 @@ class Principal < ActiveRecord::Base end } + scope :not_member_of_org, lambda {|org| + orgs = [org] unless org.is_a?(Array) + if orgs.empty? + where("1=0") + else + ids = orgs.map(&:id) + where("#{Principal.table_name}.id NOT IN (SELECT DISTINCT user_id FROM #{OrgMember.table_name} WHERE organization_id IN (?))", ids) + end + } + scope :sorted, lambda { order(*Principal.fields_for_order_statement)} scope :applied_members, lambda {|project| diff --git a/app/models/project.rb b/app/models/project.rb index fd1012fa0..0b0420920 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -69,6 +69,7 @@ class Project < ActiveRecord::Base has_many :applied_projects, :dependent => :destroy has_many :invite_lists, :dependent => :destroy has_one :dts + has_many :organizations,:through => :org_projects # end #ADDED BY NIE @@ -96,7 +97,8 @@ class Project < ActiveRecord::Base # 关联虚拟表 has_many :forge_messages, :class_name =>'ForgeMessage', :as => :forge_message, :dependent => :destroy - belongs_to :organization + has_many :org_projects,:dependent => :destroy + has_many :organization,:through => :org_projects # has_many :journals diff --git a/app/models/role.rb b/app/models/role.rb index 8bf5ebc05..f6a24a27f 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -55,6 +55,8 @@ class Role < ActiveRecord::Base has_many :member_roles, :dependent => :destroy has_many :members, :through => :member_roles + has_many :org_member_roles, :dependent => :destroy + has_many :org_members,:through => :org_member_roles acts_as_list serialize :permissions, ::Role::PermissionsAttributeCoder diff --git a/app/models/user.rb b/app/models/user.rb index edc29c015..4c6449863 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -94,6 +94,7 @@ class User < Principal has_one :preference, :dependent => :destroy, :class_name => 'UserPreference' has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'" has_one :blog, :class_name => 'Blog', :foreign_key => "author_id" + has_many :org_document_comments, :dependent =>:destroy has_one :api_token, :class_name => 'Token', :conditions => "action='api'" belongs_to :auth_source belongs_to :ucourse, :class_name => 'Course', :foreign_key => :id #huang diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index a3829ea3b..d84bd5e8c 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -12,8 +12,8 @@ <%= favicon %> <%= javascript_heads %> <%= heads_for_theme %> - <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository' %> - <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move' %> + <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %> + <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> @@ -35,11 +35,24 @@
- @@ -59,94 +72,94 @@
-
-
最新动态
- -
-
-
-
用户头像
-
-
尹教授 TO micROS研究团队 | 组织
-
如何打造一场罗永浩式的精彩演讲？
-
发帖时间：2015-11-02 11:25
-
罗永浩已经把他的主题演讲成功变成了一次次的重大的媒体事件，这让科技界和营销界的从业者们羡慕不已。事实上，老罗不仅从乔布斯那里继承了乔式审美，设计哲学，同时也继承了乔布斯的演讲艺术。乔布斯是人类历史上最伟大的演讲者。在一次又一次的"罗氏演讲"中，我们可以清晰看到老罗对乔布斯演讲的拆解，学习，模仿。每一次的公开演讲，都是一堂案例级的营销课程，值得每一位有志于从事营销相关的朋友分析研究。
- 下面，我们将从"故事"、"现场"、"准备"三个方面分析学习老罗的演讲技巧，教你如何打造一场"罗永浩式"的演讲。
-
- -
-
-
-
-
-
-
回复（2）
- - -
-
-
用户头像
-
-
黄井泉 学生 2015-11-03 12:26
-
学习下！
-
-
-
-
-
用户头像
-
-
陈正东 学生 2015-11-02 17:08
-
锤子手机，卖的就是情怀
-
-
-
-
-
用户头像
-
- - 发送
-
-
-
-
-
-
-
-
用户头像
-
-
唐湘政 创建了 micROS研究团队 - | 组织
-
micROS研究团队
-
创建时间：2015-10-29 11:23
-
-
-
-
+ <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
- <%= render_flash_messages %> - <%= yield %> - <%= call_hook :view_layouts_base_content %> -
-
diff --git a/app/views/org_member/create.js.erb b/app/views/org_member/create.js.erb new file mode 100644 index 000000000..d3e8c144e --- /dev/null +++ b/app/views/org_member/create.js.erb @@ -0,0 +1,2 @@ +$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>'); +$("#principals_for_new_member").html('') \ No newline at end of file diff --git a/app/views/org_member/destroy.js.erb b/app/views/org_member/destroy.js.erb new file mode 100644 index 000000000..8bd949fde --- /dev/null +++ b/app/views/org_member/destroy.js.erb @@ -0,0 +1 @@ +$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>'); \ No newline at end of file diff --git a/app/views/org_member/org_member_autocomplete.js.erb b/app/views/org_member/org_member_autocomplete.js.erb new file mode 100644 index 000000000..b1672038a --- /dev/null +++ b/app/views/org_member/org_member_autocomplete.js.erb @@ -0,0 +1,23 @@ +<% if @org%> + var checked = $("#not_org_members input:checked").size(); + if(checked > 0) + { + alert('翻页或搜索后将丢失当前选择的用户数据!'); + } + <% if @flag == "true"%> + $('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>'); + <% else%> + $('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>'); + <% end%> + +<%end%> +var collection=$("#principals_for_new_member").children("#principals").children("label"); +collection.css("text-overflow","ellipsis"); +collection.css("white-space","nowrap"); +collection.css("width","200px"); +collection.css("overflow","hidden"); +for(i=0;i"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>'); \ No newline at end of file diff --git a/app/views/organizations/_new_org_avatar_form.html.erb b/app/views/organizations/_new_org_avatar_form.html.erb new file mode 100644 index 000000000..8b80641e8 --- /dev/null +++ b/app/views/organizations/_new_org_avatar_form.html.erb @@ -0,0 +1,33 @@ + + + + +<%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %> + +<%= file_field_tag 'avatar[image]', + :id => 'upload_org_logo', + :class => 'undis upload_file', + :size => "1", + :multiple => true, + :data => { + :max_file_size => Setting.upload_avatar_max_size, + :max_file_size_message => l(:error_upload_avatar_to_large, :max_size => number_to_human_size(Setting.upload_avatar_max_size.to_i)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :file_type => Redmine::Configuration['pic_types'].to_s, + :type_support_message => l(:error_pic_type), + :upload_path => upload_avatar_path(:format => 'js'), + :description_placeholder => nil ,# l(:label_optional_description) + :source_type => source.class.to_s, + :source_id => source.id.to_s + } %> + +<% content_for :header_tags do %> + <%= javascript_include_tag 'jq-upload/jquery.ui.widget', 'jq-upload/jquery.iframe-transport', 'jq-upload/jquery.fileupload', 'jq-upload/upload' %> +<% end %> +
diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb new file mode 100644 index 000000000..23a31fab3 --- /dev/null +++ b/app/views/organizations/_org_member_list.html.erb @@ -0,0 +1,44 @@ +<% members.each do |member|%> +
    +
  • <%= User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname %>
    • +
  • + <%= get_org_member_role_name member %> + <%= form_for(member, {:as => :org_member, :remote => true, :url => org_member_path(member), + :method => :put, + :html => {:id => "org-member-#{member.id}-roles-form", :style=>'display:none'}} + ) do |f| %> + <% Role.givable.where("id in (11,12)").each do |role| %> +
      + <%= radio_button_tag 'org_member[role_ids][]', role.id, member.roles.include?(role) %> + + <% if User.current.language == "zh" %> + <% if role.id == 11 %> + + <% elsif role.id == 12 %> + + <% end %> + <% else %> + + <% end %> +
    + + <% end %> + <%= hidden_field_tag 'membership[role_ids][]', '' %> +
    + + <%= l(:button_change)%> + + + <%= l(:button_cancel)%> + +
    + <% end %> +
    • +
  • + + <% if ( (User.current.id == member.organization.creator_id || member.roles[0].name == "orgManager" ) && member.user_id != member.organization.creator_id )%> + 编辑 | <%= link_to '删除', org_member_path(member.id),:method=>'delete', :remote => true %><% end %> +
    • +
    +
+<% end %> \ No newline at end of file diff --git a/app/views/organizations/check_uniq.js.erb b/app/views/organizations/check_uniq.js.erb new file mode 100644 index 000000000..2d295c4d1 --- /dev/null +++ b/app/views/organizations/check_uniq.js.erb @@ -0,0 +1,18 @@ +<%if @check == false %> + $checkName = false + <% if @config_page%> + $("#check_name_hint").html('名字不能重复').show(); + <% else%> + $("#organization_name_notice").html('名字不能重复').show(); + + <%end%> + +<% else %> + $checkName = true; + <% if @config_page%> + $("#check_name_hint").html('名字可以使用').show(); + <% else%> + + $("#organization_name_notice").html('名字可以使用').show(); + <%end%> +<%end%> \ No newline at end of file diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb index de8983f02..2496ac133 100644 --- a/app/views/organizations/new.html.erb +++ b/app/views/organizations/new.html.erb @@ -12,8 +12,8 @@ - - + +
@@ -55,20 +55,35 @@ var name = $.trim($("#organization_name").val()); if(name.length == 0) { - $("#organization_name_notice").show(); + $("#organization_name_notice").html('名字不能为空').show(); return false; } else { - $("#organization_name_notice").hide(); + $("#organization_name_notice").html('').hide(); return true; } } + var $checkName = false; + + function check_uniq(dom){ + if($("#organization_name").val().trim() == ""){ + $("#organization_name_notice").html('名字不能为空').show(); + return; + } + $.get( + '<%= check_uniq_organizations_path%>'+'?org_name='+$("#organization_name").val().trim() + ) + } + //提交新建项目 function submit_new_organization() { - if(regex_organization_name()) + $.get( + '<%= check_uniq_organizations_path%>'+'?org_name='+$("#organization_name").val().trim() + ) + if(regex_organization_name() && $checkName) { $("#new_organization").submit(); } diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb new file mode 100644 index 000000000..61e6b1534 --- /dev/null +++ b/app/views/organizations/setting.html.erb @@ -0,0 +1,109 @@ + +
+
配置
+
+
+
    +
  • 信息
    • +
  • 成员
    • +
  • +
    +
+
+ + + <%#= form_for( @organization,{:controller => 'organizations',:action => 'update',:id=>@organization,:html=>{:id=>'update_org_form',:method=>'put'}}) do %> + <%= labelled_form_for @organization do |f|%> + <%= render :partial=>"new_org_avatar_form",:locals=> {source:@organization} %> + + +
* 组织名称： + +
+
+
+
组织描述： + +
+
+
+
组织URL： +
https：// + + .trustie.net申请 +

+ +
+
+
公开 : + class="ml3" /> +
+ 保存 + <% end %> +
+
+
+
    +
  • 用户
    • +
  • 角色
    • +
  • +
    +
+
+ <%= render :partial=>"org_member_list",:locals=> {:members=>@organization.org_members} %> +
+
+
+
+

添加成员

+ <%= form_tag url_for(:controller => 'org_member',:action => 'create',:org=>@organization),:id=>'org_member_add_form',:remote=>true do |f|%> + + <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript org_member_autocomplete_org_member_index_path(:org=>@organization, :format => 'js') }')" %> +
+ <%= find_user_not_in_current_org_by_name(@project) %> +
+
    +
  • 角色
    • +
  • + + +
    • +
  • + + +
    • +
新增成员 + <% end %> +
+
+
+
+
\ No newline at end of file diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 9d38aedc1..2f25ae8a3 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -1,4 +1,37 @@ <%= javascript_include_tag "jquery.infinitescroll.js" %> -
-

组织活动

-
\ No newline at end of file + +
+
最新动态
+ +
+ <% unless @activities.nil? %> + <% @activities.each do |act| %> + <% if act.org_act_type == 'CreateOrganization' %> +
+
+
+ <%= image_tag(url_to_avatar(User.find(act.user_id)), :width => "45", :height => "45") %> +
+
+
<%= link_to User.find(act.user_id), user_path(act.user_id) %>  创建了 <%= Organization.find(act.org_act_id).name %> + | 组织
+
创建时间：<%= format_activity_day(act.created_at) %> <%= format_time(act.created_at, false) %>
+
+
+
+
+ <% end %> + <% end %> +
    + <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
+ <% end %> + + diff --git a/config/routes.rb b/config/routes.rb index 0394cdb53..639056b94 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -31,7 +31,24 @@ RedmineApp::Application.routes.draw do # Enable Grack support # mount Trustie::Grack.new, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post] - resources :organizations + resources :organizations do + member do + get 'setting'#, :action => 'settings', :as => 'settings' + get 'clear_org_avatar_temp' + end + collection do + get 'check_uniq' + end + end + + resources :org_member do + member do + + end + collection do + get 'org_member_autocomplete' + end + end resources :homework_users resources :no_uses diff --git a/db/schema.rb b/db/schema.rb index 4b6d7ab5d..d75b4f7a4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151029030006) do +ActiveRecord::Schema.define(:version => 20151104090032) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -293,6 +293,16 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.boolean "diff_all" end + create_table "columns_priv", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "Db", :limit => 64, :default => "", :null => false + t.string "User", :limit => 16, :default => "", :null => false + t.string "Table_name", :limit => 64, :default => "", :null => false + t.string "Column_name", :limit => 64, :default => "", :null => false + t.timestamp "Timestamp", :null => false + t.string "Column_priv", :limit => 0, :default => "", :null => false + end + create_table "comments", :force => true do |t| t.string "commented_type", :limit => 30, :default => "", :null => false t.integer "commented_id", :default => 0, :null => false @@ -491,6 +501,33 @@ ActiveRecord::Schema.define(:version => 20151029030006) do add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" + create_table "db", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "Db", :limit => 64, :default => "", :null => false + t.string "User", :limit => 16, :default => "", :null => false + t.string "Select_priv", :limit => 1, :default => "N", :null => false + t.string "Insert_priv", :limit => 1, :default => "N", :null => false + t.string "Update_priv", :limit => 1, :default => "N", :null => false + t.string "Delete_priv", :limit => 1, :default => "N", :null => false + t.string "Create_priv", :limit => 1, :default => "N", :null => false + t.string "Drop_priv", :limit => 1, :default => "N", :null => false + t.string "Grant_priv", :limit => 1, :default => "N", :null => false + t.string "References_priv", :limit => 1, :default => "N", :null => false + t.string "Index_priv", :limit => 1, :default => "N", :null => false + t.string "Alter_priv", :limit => 1, :default => "N", :null => false + t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false + t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false + t.string "Create_view_priv", :limit => 1, :default => "N", :null => false + t.string "Show_view_priv", :limit => 1, :default => "N", :null => false + t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false + t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false + t.string "Execute_priv", :limit => 1, :default => "N", :null => false + t.string "Event_priv", :limit => 1, :default => "N", :null => false + t.string "Trigger_priv", :limit => 1, :default => "N", :null => false + end + + add_index "db", ["User"], :name => "User" + create_table "delayed_jobs", :force => true do |t| t.integer "priority", :default => 0, :null => false t.integer "attempts", :default => 0, :null => false @@ -572,6 +609,31 @@ ActiveRecord::Schema.define(:version => 20151029030006) do add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" + create_table "event", :id => false, :force => true do |t| + t.string "db", :limit => 64, :default => "", :null => false + t.string "name", :limit => 64, :default => "", :null => false + t.binary "body", :limit => 2147483647, :null => false + t.string "definer", :limit => 77, :default => "", :null => false + t.datetime "execute_at" + t.integer "interval_value" + t.string "interval_field", :limit => 18 + t.timestamp "created", :null => false + t.timestamp "modified", :null => false + t.datetime "last_executed" + t.datetime "starts" + t.datetime "ends" + t.string "status", :limit => 18, :default => "ENABLED", :null => false + t.string "on_completion", :limit => 8, :default => "DROP", :null => false + t.string "sql_mode", :limit => 0, :default => "", :null => false + t.string "comment", :limit => 64, :default => "", :null => false + t.integer "originator", :null => false + t.string "time_zone", :limit => 64, :default => "SYSTEM", :null => false + t.string "character_set_client", :limit => 32 + t.string "collation_connection", :limit => 32 + t.string "db_collation", :limit => 32 + t.binary "body_utf8", :limit => 2147483647 + end + create_table "first_pages", :force => true do |t| t.string "web_title" t.string "title" @@ -623,6 +685,21 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.integer "locked" end + create_table "func", :primary_key => "name", :force => true do |t| + t.boolean "ret", :default => false, :null => false + t.string "dl", :limit => 128, :default => "", :null => false + t.string "type", :limit => 9, :null => false + end + + create_table "general_log", :id => false, :force => true do |t| + t.timestamp "event_time", :null => false + t.text "user_host", :limit => 16777215, :null => false + t.integer "thread_id", :null => false + t.integer "server_id", :null => false + t.string "command_type", :limit => 64, :null => false + t.text "argument", :limit => 16777215, :null => false + end + create_table "groups_users", :id => false, :force => true do |t| t.integer "group_id", :null => false t.integer "user_id", :null => false @@ -630,6 +707,35 @@ ActiveRecord::Schema.define(:version => 20151029030006) do add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true + create_table "help_category", :primary_key => "help_category_id", :force => true do |t| + t.string "name", :limit => 64, :null => false + t.integer "parent_category_id", :limit => 2 + t.text "url", :null => false + end + + add_index "help_category", ["name"], :name => "name", :unique => true + + create_table "help_keyword", :primary_key => "help_keyword_id", :force => true do |t| + t.string "name", :limit => 64, :null => false + end + + add_index "help_keyword", ["name"], :name => "name", :unique => true + + create_table "help_relation", :id => false, :force => true do |t| + t.integer "help_topic_id", :null => false + t.integer "help_keyword_id", :null => false + end + + create_table "help_topic", :primary_key => "help_topic_id", :force => true do |t| + t.string "name", :limit => 64, :null => false + t.integer "help_category_id", :limit => 2, :null => false + t.text "description", :null => false + t.text "example", :null => false + t.text "url", :null => false + end + + add_index "help_topic", ["name"], :name => "name", :unique => true + create_table "homework_attaches", :force => true do |t| t.integer "bid_id" t.integer "user_id" @@ -714,6 +820,29 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.datetime "updated_at", :null => false end + create_table "host", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "Db", :limit => 64, :default => "", :null => false + t.string "Select_priv", :limit => 1, :default => "N", :null => false + t.string "Insert_priv", :limit => 1, :default => "N", :null => false + t.string "Update_priv", :limit => 1, :default => "N", :null => false + t.string "Delete_priv", :limit => 1, :default => "N", :null => false + t.string "Create_priv", :limit => 1, :default => "N", :null => false + t.string "Drop_priv", :limit => 1, :default => "N", :null => false + t.string "Grant_priv", :limit => 1, :default => "N", :null => false + t.string "References_priv", :limit => 1, :default => "N", :null => false + t.string "Index_priv", :limit => 1, :default => "N", :null => false + t.string "Alter_priv", :limit => 1, :default => "N", :null => false + t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false + t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false + t.string "Create_view_priv", :limit => 1, :default => "N", :null => false + t.string "Show_view_priv", :limit => 1, :default => "N", :null => false + t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false + t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false + t.string "Execute_priv", :limit => 1, :default => "N", :null => false + t.string "Trigger_priv", :limit => 1, :default => "N", :null => false + end + create_table "invite_lists", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -943,6 +1072,15 @@ ActiveRecord::Schema.define(:version => 20151029030006) 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 "ndb_binlog_index", :primary_key => "epoch", :force => true do |t| + t.integer "Position", :limit => 8, :null => false + t.string "File", :null => false + t.integer "inserts", :limit => 8, :null => false + t.integer "updates", :limit => 8, :null => false + t.integer "deletes", :limit => 8, :null => false + t.integer "schemaops", :limit => 8, :null => false + end + create_table "news", :force => true do |t| t.integer "project_id" t.string "title", :limit => 60, :default => "", :null => false @@ -1037,11 +1175,53 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.integer "project_id" end + create_table "org_activities", :force => true do |t| + t.integer "user_id" + t.integer "org_act_id" + t.string "org_act_type" + t.integer "container_id" + t.string "container_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "org_document_comments", :force => true do |t| + t.string "title" + t.text "content" + t.integer "organization_id" + t.integer "creator_id" + t.integer "parent_id" + t.integer "reply_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.boolean "locked", :default => false + t.integer "sticky", :default => 0 + end + + create_table "org_member_roles", :force => true do |t| + t.integer "org_member_id" + t.integer "role_id" + end + + create_table "org_members", :force => true do |t| + t.integer "user_id" + t.integer "organization_id" + end + + create_table "org_projects", :force => true do |t| + t.integer "organization_id" + t.integer "project_id" + end + create_table "organizations", :force => true do |t| t.string "name" - t.string "logo_link" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.text "description" + t.integer "creator_id" + t.integer "home_id" + t.string "domain" + t.boolean "is_public" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "phone_app_versions", :force => true do |t| @@ -1051,6 +1231,10 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.datetime "updated_at", :null => false end + create_table "plugin", :primary_key => "name", :force => true do |t| + t.string "dl", :limit => 128, :default => "", :null => false + end + create_table "poll_answers", :force => true do |t| t.integer "poll_question_id" t.text "answer_text" @@ -1126,6 +1310,42 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.datetime "updated_at", :null => false end + create_table "proc", :id => false, :force => true do |t| + t.string "db", :limit => 64, :default => "", :null => false + t.string "name", :limit => 64, :default => "", :null => false + t.string "type", :limit => 9, :null => false + t.string "specific_name", :limit => 64, :default => "", :null => false + t.string "language", :limit => 3, :default => "SQL", :null => false + t.string "sql_data_access", :limit => 17, :default => "CONTAINS_SQL", :null => false + t.string "is_deterministic", :limit => 3, :default => "NO", :null => false + t.string "security_type", :limit => 7, :default => "DEFINER", :null => false + t.binary "param_list", :null => false + t.binary "returns", :limit => 2147483647, :null => false + t.binary "body", :limit => 2147483647, :null => false + t.string "definer", :limit => 77, :default => "", :null => false + t.timestamp "created", :null => false + t.timestamp "modified", :null => false + t.string "sql_mode", :limit => 0, :default => "", :null => false + t.text "comment", :null => false + t.string "character_set_client", :limit => 32 + t.string "collation_connection", :limit => 32 + t.string "db_collation", :limit => 32 + t.binary "body_utf8", :limit => 2147483647 + end + + create_table "procs_priv", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "Db", :limit => 64, :default => "", :null => false + t.string "User", :limit => 16, :default => "", :null => false + t.string "Routine_name", :limit => 64, :default => "", :null => false + t.string "Routine_type", :limit => 9, :null => false + t.string "Grantor", :limit => 77, :default => "", :null => false + t.string "Proc_priv", :limit => 0, :default => "", :null => false + t.timestamp "Timestamp", :null => false + end + + add_index "procs_priv", ["Grantor"], :name => "Grantor" + create_table "project_infos", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1200,6 +1420,18 @@ ActiveRecord::Schema.define(:version => 20151029030006) do add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" + create_table "proxies_priv", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "User", :limit => 16, :default => "", :null => false + t.string "Proxied_host", :limit => 60, :default => "", :null => false + t.string "Proxied_user", :limit => 16, :default => "", :null => false + t.boolean "With_grant", :default => false, :null => false + t.string "Grantor", :limit => 77, :default => "", :null => false + t.timestamp "Timestamp", :null => false + end + + add_index "proxies_priv", ["Grantor"], :name => "Grantor" + create_table "queries", :force => true do |t| t.integer "project_id" t.string "name", :default => "", :null => false @@ -1313,6 +1545,17 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.integer "is_teacher_score", :default => 0 end + create_table "servers", :primary_key => "Server_name", :force => true do |t| + t.string "Host", :limit => 64, :default => "", :null => false + t.string "Db", :limit => 64, :default => "", :null => false + t.string "Username", :limit => 64, :default => "", :null => false + t.string "Password", :limit => 64, :default => "", :null => false + t.integer "Port", :default => 0, :null => false + t.string "Socket", :limit => 64, :default => "", :null => false + t.string "Wrapper", :limit => 64, :default => "", :null => false + t.string "Owner", :limit => 64, :default => "", :null => false + end + create_table "settings", :force => true do |t| t.string "name", :default => "", :null => false t.text "value" @@ -1333,6 +1576,20 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.string "description" end + create_table "slow_log", :id => false, :force => true do |t| + t.timestamp "start_time", :null => false + t.text "user_host", :limit => 16777215, :null => false + t.time "query_time", :null => false + t.time "lock_time", :null => false + t.integer "rows_sent", :null => false + t.integer "rows_examined", :null => false + t.string "db", :limit => 512, :null => false + t.integer "last_insert_id", :null => false + t.integer "insert_id", :null => false + t.integer "server_id", :null => false + t.text "sql_text", :limit => 16777215, :null => false + end + create_table "softapplications", :force => true do |t| t.string "name" t.text "description" @@ -1414,6 +1671,19 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.string "subject" end + create_table "tables_priv", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "Db", :limit => 64, :default => "", :null => false + t.string "User", :limit => 16, :default => "", :null => false + t.string "Table_name", :limit => 64, :default => "", :null => false + t.string "Grantor", :limit => 77, :default => "", :null => false + t.timestamp "Timestamp", :null => false + t.string "Table_priv", :limit => 0, :default => "", :null => false + t.string "Column_priv", :limit => 0, :default => "", :null => false + end + + add_index "tables_priv", ["Grantor"], :name => "Grantor" + create_table "taggings", :force => true do |t| t.integer "tag_id" t.integer "taggable_id" @@ -1463,6 +1733,32 @@ ActiveRecord::Schema.define(:version => 20151029030006) do add_index "time_entries", ["project_id"], :name => "time_entries_project_id" add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" + create_table "time_zone", :primary_key => "Time_zone_id", :force => true do |t| + t.string "Use_leap_seconds", :limit => 1, :default => "N", :null => false + end + + create_table "time_zone_leap_second", :primary_key => "Transition_time", :force => true do |t| + t.integer "Correction", :null => false + end + + create_table "time_zone_name", :primary_key => "Name", :force => true do |t| + t.integer "Time_zone_id", :null => false + end + + create_table "time_zone_transition", :id => false, :force => true do |t| + t.integer "Time_zone_id", :null => false + t.integer "Transition_time", :limit => 8, :null => false + t.integer "Transition_type_id", :null => false + end + + create_table "time_zone_transition_type", :id => false, :force => true do |t| + t.integer "Time_zone_id", :null => false + t.integer "Transition_type_id", :null => false + t.integer "Offset", :default => 0, :null => false + t.integer "Is_DST", :limit => 1, :default => 0, :null => false + t.string "Abbreviation", :limit => 8, :default => "", :null => false + end + create_table "tokens", :force => true do |t| t.integer "user_id", :default => 0, :null => false t.string "action", :limit => 30, :default => "", :null => false @@ -1481,6 +1777,51 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.integer "fields_bits", :default => 0 end + create_table "user", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "User", :limit => 16, :default => "", :null => false + t.string "Password", :limit => 41, :default => "", :null => false + t.string "Select_priv", :limit => 1, :default => "N", :null => false + t.string "Insert_priv", :limit => 1, :default => "N", :null => false + t.string "Update_priv", :limit => 1, :default => "N", :null => false + t.string "Delete_priv", :limit => 1, :default => "N", :null => false + t.string "Create_priv", :limit => 1, :default => "N", :null => false + t.string "Drop_priv", :limit => 1, :default => "N", :null => false + t.string "Reload_priv", :limit => 1, :default => "N", :null => false + t.string "Shutdown_priv", :limit => 1, :default => "N", :null => false + t.string "Process_priv", :limit => 1, :default => "N", :null => false + t.string "File_priv", :limit => 1, :default => "N", :null => false + t.string "Grant_priv", :limit => 1, :default => "N", :null => false + t.string "References_priv", :limit => 1, :default => "N", :null => false + t.string "Index_priv", :limit => 1, :default => "N", :null => false + t.string "Alter_priv", :limit => 1, :default => "N", :null => false + t.string "Show_db_priv", :limit => 1, :default => "N", :null => false + t.string "Super_priv", :limit => 1, :default => "N", :null => false + t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false + t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false + t.string "Execute_priv", :limit => 1, :default => "N", :null => false + t.string "Repl_slave_priv", :limit => 1, :default => "N", :null => false + t.string "Repl_client_priv", :limit => 1, :default => "N", :null => false + t.string "Create_view_priv", :limit => 1, :default => "N", :null => false + t.string "Show_view_priv", :limit => 1, :default => "N", :null => false + t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false + t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false + t.string "Create_user_priv", :limit => 1, :default => "N", :null => false + t.string "Event_priv", :limit => 1, :default => "N", :null => false + t.string "Trigger_priv", :limit => 1, :default => "N", :null => false + t.string "Create_tablespace_priv", :limit => 1, :default => "N", :null => false + t.string "ssl_type", :limit => 9, :default => "", :null => false + t.binary "ssl_cipher", :null => false + t.binary "x509_issuer", :null => false + t.binary "x509_subject", :null => false + t.integer "max_questions", :default => 0, :null => false + t.integer "max_updates", :default => 0, :null => false + t.integer "max_connections", :default => 0, :null => false + t.integer "max_user_connections", :default => 0, :null => false + t.string "plugin", :limit => 64, :default => "" + t.text "authentication_string" + end + create_table "user_activities", :force => true do |t| t.string "act_type" t.integer "act_id" diff --git a/public/javascripts/org.js b/public/javascripts/org.js new file mode 100644 index 000000000..f74277a9e --- /dev/null +++ b/public/javascripts/org.js @@ -0,0 +1,34 @@ +//֯Աύ +function submit_add_org_members(){ + $("#org_member_add_form").submit(); +} + +function observeSearchfield(fieldId, targetId, url) { + $('#'+fieldId).each(function() { + var $this = $(this); + $this.addClass('autocomplete'); + $this.attr('data-value-was', $this.val()); + var check = function() { + var val = $this.val(); + if ($this.attr('data-value-was') != val){ + $this.attr('data-value-was', val); + $.ajax({ + url: url, + type: 'get', + data: {q: $this.val()}, + success: function(data){ if(targetId) $('#'+targetId).html(data); }, + beforeSend: function(){ $this.addClass('ajax-loading'); }, + complete: function(){ $this.removeClass('ajax-loading'); } + }); + } + }; + var reset = function() { + if (timer) { + clearInterval(timer); + timer = setInterval(check, 300); + } + }; + var timer = setInterval(check, 300); + $this.bind('keyup click mousemove', reset); + }); +} \ No newline at end of file diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index b1dfbbcf0..8d9275f31 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -3,4 +3,31 @@ .orgName {width:130px; color:#484848;} .organization_r_h02{ width:970px; height:40px; background:#eaeaea; margin-bottom:10px;} -.organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} \ No newline at end of file +.organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} + +.orgSettingOp {width:45px; height:21px; color:#269ac9; text-align:center; border-bottom:3px solid #e4e4e4; float:left; font-weight:bold; cursor:pointer;} +.orgBorder {width:628px; height:21px; border-bottom:3px solid #e4e4e4; float:left;} +.orgOpActive {border-bottom:3px solid #269ac9 !important; color:#444444;} +.logoBorder {border:1px solid #eaeaea; padding:2px;} +.logoBorder:hover {border:1px solid #269ac9;} +.logoEnter {border:1px solid #eaeaea; padding:2px 5px; margin-top:37px;} +.orgNameInput {width:600px; outline:none; border:1px solid #eaeaea; float:right; height:22px;} +.orgRow {font-size:14px; color:#484848;} +.orgDes {width:600px; height:150px; outline:none; border:1px solid #eaeaea; float:right; resize:none;} +.w607 {width:607px;} +.orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;} +a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;} +a.saveBtn:hover {background-color:#297fb8;} +.orgMemberList {width:410px; float:left;} +.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;} +.orgListUser {width:125px; float:left;} +.orgListRole {width:285px; float:left;} +.orgMemContainer {width:278px;} +.orgMemberAdd {float:right; width:240px;} +.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;} +.undis {display:none;} +.dis {display:inline-block;} +.upbtn { margin: 40px 0px 0px 15px; + display: block; + padding: 2px 5px; + border: 1px solid #EAEAEA;} \ No newline at end of file From 6dd264990e08efaece2ee5605d9c9eeb98f7a43e Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 10 Nov 2015 15:27:59 +0800 Subject: [PATCH 004/285] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E2=80=9C=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../student_work/_evaluation_un_work.html.erb | 15 ++++++++++++--- .../student_work/_evaluation_work.html.erb | 19 +++++++++++++------ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index ebe3d4cc6..2a0962244 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -5,7 +5,7 @@
  • <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(student_work.user)) %>
    • -
    +
  • <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
    @@ -25,7 +25,7 @@
    • -
  • +
  • <% if student_work.created_at && @homework.end_time%> <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> @@ -80,6 +80,15 @@
    • <% end%> - + + diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index 81d868a50..e336b0282 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -7,13 +7,13 @@
  • <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
    • -
  • +
  • <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
    <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
    • -
  • +
    • <%= student_work.user.show_name%> @@ -27,12 +27,12 @@
    • <%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
      • -
    • +
    • <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
      • -
    • +
      • 匿名 @@ -46,7 +46,7 @@
      • -
    • +
    • <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> [迟交] @@ -58,6 +58,13 @@
    • <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
      • - +
    + From 2cf61ad74f9eb6a0f05cd5645bc805107b15a3fe Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 17:34:18 +0800 Subject: [PATCH 005/285] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 4 ++-- app/views/memos/edit.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 5bbc52db2..05c086ed4 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -128,8 +128,8 @@ $("#error").html("主题 过长（最长为 50 个字符）").show(); return false; } - if(memo_content.html().length > 30000){ - $("#error").html("内容 过长（最长为 30000 个字符）").show(); + if(memo_content.html().length > 20000){ + $("#error").html("内容 过长（最长为 20000 个字符）").show(); $("html,body").animate({scrollTop:$("#error").offset().top},1000) return false; } diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index b2b7d73f0..cace5bcc8 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -7,8 +7,8 @@ $("#error").html('主题不能超过50个字符').show(); return; } - if(memo_content.html().length > 30000){ - $("#error").html("内容 过长（最长为 30000 个字符）").show(); + if(memo_content.html().length > 20000){ + $("#error").html("内容 过长（最长为 20000 个字符）").show(); $("html,body").animate({scrollTop:$("#error").offset().top},1000) return false; } From d8dc7786ca2a8adda01992f91e6f8c3096e4cb50 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 11 Nov 2015 10:25:24 +0800 Subject: [PATCH 006/285] =?UTF-8?q?fork=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/fork.html.erb | 0 lib/gitlab-cli/lib/gitlab/client/projects.rb | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 app/views/repositories/fork.html.erb diff --git a/app/views/repositories/fork.html.erb b/app/views/repositories/fork.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/lib/gitlab-cli/lib/gitlab/client/projects.rb b/lib/gitlab-cli/lib/gitlab/client/projects.rb index 04ea682aa..476e88b72 100644 --- a/lib/gitlab-cli/lib/gitlab/client/projects.rb +++ b/lib/gitlab-cli/lib/gitlab/client/projects.rb @@ -222,6 +222,12 @@ class Gitlab::Client delete("/projects/#{project}/hooks/#{id}") end + # Forks a project into the user namespace of the authenticated user. + # @param [Integer] - The ID of the project to be forked + def fork(id) + post("/projects/fork/#{id}") + end + # Mark this project as forked from the other # # @example From 508ca7f823c474d756d002b437557633b3648a3e Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 11 Nov 2015 11:19:10 +0800 Subject: [PATCH 007/285] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=20=E6=96=87=E4=BB=B6=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_form_course.html.erb | 3 ++- .../files/_new_style_attachment_list.html.erb | 3 ++- .../_upload_project_files_list.html.erb | 3 ++- public/javascripts/attachments.js | 17 ++++++++++++++--- public/stylesheets/courses.css | 3 ++- public/stylesheets/new_user.css | 3 ++- public/stylesheets/project.css | 4 ++-- 7 files changed, 26 insertions(+), 10 deletions(-) diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb index b66632c7f..dddd0209e 100644 --- a/app/views/attachments/_form_course.html.erb +++ b/app/views/attachments/_form_course.html.erb @@ -60,7 +60,8 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), - :delete_all_files => l(:text_are_you_sure_all) + :delete_all_files => l(:text_are_you_sure_all), + :containerid => "#{container.id}" } %> <% if container.nil? %> <%= l(:label_no_file_uploaded)%> diff --git a/app/views/files/_new_style_attachment_list.html.erb b/app/views/files/_new_style_attachment_list.html.erb index af679c4d3..7147769da 100644 --- a/app/views/files/_new_style_attachment_list.html.erb +++ b/app/views/files/_new_style_attachment_list.html.erb @@ -16,7 +16,8 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), - :delete_all_files => l(:text_are_you_sure_all) + :delete_all_files => l(:text_are_you_sure_all), + :containerid => "#{container.id}" } %> diff --git a/app/views/projects/_upload_project_files_list.html.erb b/app/views/projects/_upload_project_files_list.html.erb index 59da30012..b072faa24 100644 --- a/app/views/projects/_upload_project_files_list.html.erb +++ b/app/views/projects/_upload_project_files_list.html.erb @@ -16,7 +16,8 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), - :delete_all_files => l(:text_are_you_sure_all) + :delete_all_files => l(:text_are_you_sure_all), + :containerid => "#{container.id}" } %> diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 813c10dee..424e0e572 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -178,6 +178,17 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { }) .done(function(result) { progressSpan.progressbar('value', 100).remove(); + var containerid = $(inputEl).data('containerid'); + console.log($(inputEl)) + if(containerid == undefined ){ + var count = $('#attachments_fields>span').length; + $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); + } + else{ + var count = $('#attachments_fields' + containerid + '>span').length; + $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); + } + fileSpan.find('input.description, a').css('display', 'inline-block'); fileSpan.find('input.is_public_checkbox, a').css('display', 'inline-block'); }) @@ -202,7 +213,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { var containerid = $(inputEl).data('containerid'); if (containerid == undefined) { var count = $('#attachments_fields>span').length; - $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); + //$('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); if (count >= 1) { var add_attachs = $('.add_attachment'); var delete_all = $('.remove_all'); @@ -216,7 +227,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { } } else { var count = $('#attachments_fields' + containerid + '>span').length; - $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); + //$('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); if (count >= 1) { var add_attachs = $('.add_attachment').filter(function(index) { return $(this).data('containerid') == containerid; @@ -240,7 +251,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { } - var progressSpan = $('
    ').insertAfter(fileSpan.find('input.filename')); + var progressSpan = $('
    ').insertAfter(fileSpan.find('input.upload_filename')); progressSpan.progressbar(); fileSpan.addClass('ajax-waiting'); diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 48c6a2d88..71b473abe 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -905,7 +905,8 @@ a.work_list_tit{width:580px; display:block; overflow:hidden; font-size:14px; f .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} -.upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} +div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; } +.upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .evaluation{position: relative;} .evaluation_submit{position: absolute;right: 0px;bottom: 0px;} .student_work_search{background-color: #64bdd9;color: white !important;padding: 2px 7px;margin-left: 10px;cursor: pointer; } diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index f21a4b1fd..b9e7bf227 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1155,7 +1155,8 @@ img.ui-datepicker-trigger { } .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} -.upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} +div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; } +.upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;} .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index e7a24b151..3dedf1396 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -371,10 +371,10 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;} .reply_btn:hover{ background:#999; color:#fff; } .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} -.upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} +.upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .attachments_fields input.description {margin-left:4px; width:100px; } .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';} -.attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; } +div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; } a.remove-upload:hover {text-decoration:none !important;} .attachments_fields input.is_public_checkbox {width:20px;} From d13205bd3de9e40c0a35d0eb2e545e69dedda452 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 11 Nov 2015 11:39:02 +0800 Subject: [PATCH 008/285] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_form.html.erb | 1 + app/views/attachments/_form_course.html.erb | 1 + app/views/attachments/_form_project.html.erb | 2 ++ app/views/attachments/_new_form.html.erb | 1 + app/views/blog_comments/_blog_attachments.erb | 1 + app/views/files/_attachement_list.html.erb | 2 ++ app/views/files/_new_style_attachment_list.html.erb | 1 + app/views/forums/_file_form.html.erb | 1 + app/views/projects/_upload_project_files_list.html.erb | 1 + app/views/student_work/_student_work_attachment_form.html.erb | 1 + app/views/users/_attachment_list.html.erb | 1 + app/views/users/_user_homework_attachment.html.erb | 1 + config/locales/projects/zh.yml | 1 + public/javascripts/attachments.js | 4 ++-- 14 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb index 3dbc8d8ba..ab8b80dcb 100644 --- a/app/views/attachments/_form.html.erb +++ b/app/views/attachments/_form.html.erb @@ -62,6 +62,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb index dddd0209e..ef5385647 100644 --- a/app/views/attachments/_form_course.html.erb +++ b/app/views/attachments/_form_course.html.erb @@ -61,6 +61,7 @@ :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), :delete_all_files => l(:text_are_you_sure_all), + :lebel_file_uploding => l(:lebel_file_uploding), :containerid => "#{container.id}" } %> <% if container.nil? %> diff --git a/app/views/attachments/_form_project.html.erb b/app/views/attachments/_form_project.html.erb index d1cdf8cc9..a9cb068ad 100644 --- a/app/views/attachments/_form_project.html.erb +++ b/app/views/attachments/_form_project.html.erb @@ -60,7 +60,9 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all), + :lebel_file_uploding => l(:lebel_file_uploding), :containerid => "#{container.id}" } %> <%= l(:label_no_file_uploaded)%> diff --git a/app/views/attachments/_new_form.html.erb b/app/views/attachments/_new_form.html.erb index 47f6fd202..75efb448e 100644 --- a/app/views/attachments/_new_form.html.erb +++ b/app/views/attachments/_new_form.html.erb @@ -42,6 +42,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> diff --git a/app/views/blog_comments/_blog_attachments.erb b/app/views/blog_comments/_blog_attachments.erb index 48fe91099..dd8be659b 100644 --- a/app/views/blog_comments/_blog_attachments.erb +++ b/app/views/blog_comments/_blog_attachments.erb @@ -62,6 +62,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb index 01e5dca5f..c5a3b9af0 100644 --- a/app/views/files/_attachement_list.html.erb +++ b/app/views/files/_attachement_list.html.erb @@ -17,6 +17,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> <% else %> @@ -35,6 +36,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> <% end %> diff --git a/app/views/files/_new_style_attachment_list.html.erb b/app/views/files/_new_style_attachment_list.html.erb index 7147769da..174a05047 100644 --- a/app/views/files/_new_style_attachment_list.html.erb +++ b/app/views/files/_new_style_attachment_list.html.erb @@ -17,6 +17,7 @@ :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), :delete_all_files => l(:text_are_you_sure_all), + :lebel_file_uploding => l(:lebel_file_uploding), :containerid => "#{container.id}" } %> diff --git a/app/views/forums/_file_form.html.erb b/app/views/forums/_file_form.html.erb index 560afc6d9..2510952f1 100644 --- a/app/views/forums/_file_form.html.erb +++ b/app/views/forums/_file_form.html.erb @@ -63,6 +63,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> diff --git a/app/views/projects/_upload_project_files_list.html.erb b/app/views/projects/_upload_project_files_list.html.erb index b072faa24..c399bf210 100644 --- a/app/views/projects/_upload_project_files_list.html.erb +++ b/app/views/projects/_upload_project_files_list.html.erb @@ -16,6 +16,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all), :containerid => "#{container.id}" } %> diff --git a/app/views/student_work/_student_work_attachment_form.html.erb b/app/views/student_work/_student_work_attachment_form.html.erb index 265ff9be7..d82aea7f9 100644 --- a/app/views/student_work/_student_work_attachment_form.html.erb +++ b/app/views/student_work/_student_work_attachment_form.html.erb @@ -19,6 +19,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all), :containerid => "#{work.id}" } %> diff --git a/app/views/users/_attachment_list.html.erb b/app/views/users/_attachment_list.html.erb index 33e944498..3d44fa267 100644 --- a/app/views/users/_attachment_list.html.erb +++ b/app/views/users/_attachment_list.html.erb @@ -18,6 +18,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb index 9b7c6c06a..24d37ae63 100644 --- a/app/views/users/_user_homework_attachment.html.erb +++ b/app/views/users/_user_homework_attachment.html.erb @@ -40,6 +40,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %>
    diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 88a710633..1a18e5a14 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -183,6 +183,7 @@ zh: label_optional_description: 可选的描述 label_file_count: "个文件已上传" + lebel_file_uploding: "个文件正在上传" # diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 424e0e572..5718983fa 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -213,7 +213,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { var containerid = $(inputEl).data('containerid'); if (containerid == undefined) { var count = $('#attachments_fields>span').length; - //$('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); + $('#upload_file_count').html("" + count + "" + $(inputEl).data('lebelFileUploding')); if (count >= 1) { var add_attachs = $('.add_attachment'); var delete_all = $('.remove_all'); @@ -227,7 +227,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { } } else { var count = $('#attachments_fields' + containerid + '>span').length; - //$('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); + $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('lebelFileUploding')); if (count >= 1) { var add_attachs = $('.add_attachment').filter(function(index) { return $(this).data('containerid') == containerid; From cc0afa7d9b735ee5056cc5b60049435703c10900 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 11 Nov 2015 12:43:59 +0800 Subject: [PATCH 009/285] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E7=89=88=E6=9C=AC=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/sync_sigle_rep.rake | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/lib/tasks/sync_sigle_rep.rake b/lib/tasks/sync_sigle_rep.rake index 591dcce84..4ed360426 100644 --- a/lib/tasks/sync_sigle_rep.rake +++ b/lib/tasks/sync_sigle_rep.rake @@ -27,4 +27,30 @@ namespace :sync_rep do end end end + + task :delete_rep => :environment do + projects = Project.where("user_id !=?",12) + projects.each do |project| + # 针对类型为Git并且只有一个版本库的项目 + if project.repositories && project.repositories.count == 1 && project.repositories.first.type == "Repository::Git" + rep = project.repositories.first + count = Repository.find_by_sql("SELECT * FROM `repositories` where identifier = '#{rep.identifier}'").count + puts count + unless count > 1 + rep.identifier + puts "################################" + puts project.id + puts rep.id + s = Trustie::Gitlab::Sync.new + s.sync_project(project, path: rep.identifier, import_url: rep.url) + rep.type = 'Repository::Gitlab' + rep.save + puts "*************************************" + puts project.id + puts rep.id + puts rep.identifier + end + end + end + end end \ No newline at end of file From 16c31e254e5f21a9f63be6c149b90964d886bb9e Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 11 Nov 2015 15:33:43 +0800 Subject: [PATCH 010/285] =?UTF-8?q?=E5=8C=BA=E5=88=86Gitlab=E5=85=AC?= =?UTF-8?q?=E5=BC=80=E9=A1=B9=E7=9B=AE=E5=92=8C=E7=A7=81=E6=9C=89=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/trustie/gitlab/sync.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb index a303b22fb..ac01a44ec 100644 --- a/lib/trustie/gitlab/sync.rb +++ b/lib/trustie/gitlab/sync.rb @@ -10,6 +10,9 @@ module Trustie DEVELOPER = 30 MASTER = 40 OWNER = 50 + # 项目公开和私有 + PUBLIC = 20 + PRIVATE = 0 end class Sync @@ -45,7 +48,8 @@ module Trustie issues_enabled: false, snippets_enabled: false, public: false, - user_id: gid + user_id: gid, + visibility_level: project.is_public? ? UserLevel::PUBLIC : UserLevel::PRIVATE ) project.gpid = gproject.id project.save! @@ -84,7 +88,8 @@ module Trustie merge_requests_enabled: true, public: false, user_id: gid, - import_url: import_url + import_url: import_url, + visibility_level: project.is_public? ? UserLevel::PUBLIC : UserLevel::PRIVATE ) puts "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" project.gpid = gproject.id From b8999e1c6edca3e74b87f584f8c4f1a4b5674a26 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 11 Nov 2015 15:35:47 +0800 Subject: [PATCH 011/285] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blog_comments/_edit.html.erb | 2 +- app/views/blog_comments/_new.html.erb | 2 +- public/stylesheets/new_user.css | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/blog_comments/_edit.html.erb b/app/views/blog_comments/_edit.html.erb index d56557ce7..375c948d4 100644 --- a/app/views/blog_comments/_edit.html.erb +++ b/app/views/blog_comments/_edit.html.erb @@ -3,7 +3,7 @@
    - +

    diff --git a/app/views/blog_comments/_new.html.erb b/app/views/blog_comments/_new.html.erb index 2a2281a40..48f152c4e 100644 --- a/app/views/blog_comments/_new.html.erb +++ b/app/views/blog_comments/_new.html.erb @@ -3,7 +3,7 @@
    - +

    - <%= l(:button_cancel)%> - <%= l(:button_confirm)%> + <%= l(:button_cancel)%> + + <%= submit_tag '确定',:onclick=>'submit_resource();',:onfocus=>'this.blur()',:id=>'submit_resource',:class=>'sendSourceText fr' %> <% end %>
    diff --git a/app/views/files/_upload_show.html.erb b/app/views/files/_upload_show.html.erb index 21cd94d8d..dbd0277d7 100644 --- a/app/views/files/_upload_show.html.erb +++ b/app/views/files/_upload_show.html.erb @@ -11,7 +11,8 @@ <%= render :partial => 'attachement_list',:locals => {:course => course} %>
    <%= l(:button_cancel)%> - <%= l(:button_confirm)%> + + <%= submit_tag '确定',:onclick=>'submit_resource();',:onfocus=>'this.blur()',:id=>'submit_resource',:class=>'sendSourceText fr' %> <% end %>
    diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb index fdf1e31a3..b71d36f97 100644 --- a/app/views/student_work/new.html.erb +++ b/app/views/student_work/new.html.erb @@ -95,7 +95,7 @@
    - <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %> + <%= render :partial => 'users/special_user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %>
    @@ -111,9 +111,11 @@
    - 确定 + + <%= submit_tag '确定',:onclick=>'popupRegex();new_student_work();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText fr' %> 或 - <%= link_to "取消", user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%> + <%#= link_to "取消", user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%> + <%= l(:button_cancel)%>
    <% end%> diff --git a/app/views/users/_attachment_list.html.erb b/app/views/users/_attachment_list.html.erb index 3d44fa267..939513627 100644 --- a/app/views/users/_attachment_list.html.erb +++ b/app/views/users/_attachment_list.html.erb @@ -7,7 +7,7 @@ :id => '_file', :class => ie8? ? '':'file_selector', :multiple => true, - :onchange => 'addInputFiles(this);', + :onchange => 'addInputFiles(this,"'+'upload_files_submit_btn'+'");', :style => ie8? ? '': 'display:none', :data => { :max_file_size => Setting.attachment_max_size.to_i.kilobytes, diff --git a/app/views/users/_special_user_homework_attachment.html.erb b/app/views/users/_special_user_homework_attachment.html.erb new file mode 100644 index 000000000..2f5a4e8e3 --- /dev/null +++ b/app/views/users/_special_user_homework_attachment.html.erb @@ -0,0 +1,61 @@ +
    + + <% if defined?(container) && container && container.saved_attachments %> + <% container.attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename link_file', :readonly=>'readonly')%> + <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> + <%= l(:field_is_public)%>: + <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> + <%= link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %> + <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> + +
    + <% end %> + <% container.saved_attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%> + <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> + <%= l(:field_is_public)%>: + <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> + <%= link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %> + <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> + +
    + <% end %> + <% end %> +     + <%= file_field_tag 'attachments[dummy][file]', + :id => '_file', + :class => ie8? ? '' : 'file_selector', + :multiple => true, + :onchange => 'addInputFiles(this,"'+'upload_files_submit_btn'+'");', + :style => ie8? ? '' : 'display:none', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :upload_path => uploads_path(:format => 'js',:project =>nil), + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), + :delete_all_files => l(:text_are_you_sure_all) + } %> +
    +
    + +
    + + 上传附件 + <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mt3 mr20",:remote => true%> + <% if defined?(has_program) && has_program %> + 编程 + + <% end %> +
    + +<% content_for :header_tags do %> + <%= javascript_include_tag 'attachments' %> +<% end %> \ No newline at end of file diff --git a/app/views/users/_upload_resource.html.erb b/app/views/users/_upload_resource.html.erb index d73b2986a..c973217f6 100644 --- a/app/views/users/_upload_resource.html.erb +++ b/app/views/users/_upload_resource.html.erb @@ -45,9 +45,9 @@
    - <%= submit_tag '确定',:onclick=>'submit_files();',:onfocus=>'this.blur()',:class=>'sendSourceText' %> + <%= submit_tag '确定',:onclick=>'submit_files();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText' %>
    -
    取消
    +
    取消
    <% end %>
    diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 5718983fa..20e845424 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -22,7 +22,7 @@ function reload(fileSpan) { } -function addFile_board(inputEl, file, eagerUpload, id) { +function addFile_board(inputEl, file, eagerUpload, id,btnId) { var attachments_frame = '#attachments_fields' + id; if ($(attachments_frame).children().length < 30) { @@ -80,7 +80,7 @@ function addFile_board(inputEl, file, eagerUpload, id) { ).appendTo(attachments_frame); if (eagerUpload) { - ajaxUpload(file, attachmentId, fileSpan, inputEl); + ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId); } return attachmentId; @@ -88,7 +88,7 @@ function addFile_board(inputEl, file, eagerUpload, id) { return null; } -function addFile(inputEl, file, eagerUpload) { +function addFile(inputEl, file, eagerUpload,btnId) { var attachments_frame = '#attachments_fields'; if ($(attachments_frame).children().length < 30) { @@ -145,7 +145,7 @@ function addFile(inputEl, file, eagerUpload) { ).appendTo('#attachments_fields'); if (eagerUpload) { - ajaxUpload(file, attachmentId, fileSpan, inputEl); + ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId); } return attachmentId; @@ -154,7 +154,7 @@ function addFile(inputEl, file, eagerUpload) { } addFile.nextAttachmentId = 1; -function ajaxUpload(file, attachmentId, fileSpan, inputEl) { +function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { function onLoadstart(e) { fileSpan.removeClass('ajax-waiting'); @@ -168,7 +168,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { } } - function actualUpload(file, attachmentId, fileSpan, inputEl) { + function actualUpload(file, attachmentId, fileSpan, inputEl,btnId) { ajaxUpload.uploading++; @@ -182,9 +182,15 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { console.log($(inputEl)) if(containerid == undefined ){ var count = $('#attachments_fields>span').length; + $('#'+btnId).removeAttr("disabled"); + $('#'+btnId).val('确定') + $('#'+btnId).css('background-color','#269ac9') $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); } else{ + $('#'+btnId).removeAttr("disabled"); + $('#'+btnId).val('确定') + $('#'+btnId).css('background-color','#269ac9') var count = $('#attachments_fields' + containerid + '>span').length; $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); } @@ -213,6 +219,9 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { var containerid = $(inputEl).data('containerid'); if (containerid == undefined) { var count = $('#attachments_fields>span').length; + $('#'+btnId).attr("disabled",true); + $('#'+btnId).val('提交中'); + $('#'+btnId).css('background-color','#c1c1c1') $('#upload_file_count').html("" + count + "" + $(inputEl).data('lebelFileUploding')); if (count >= 1) { var add_attachs = $('.add_attachment'); @@ -227,6 +236,9 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { } } else { var count = $('#attachments_fields' + containerid + '>span').length; + $('#'+btnId).attr("disabled",true); + $('#'+btnId).val('提交中'); + $('#'+btnId).css('background-color','#c1c1c1') $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('lebelFileUploding')); if (count >= 1) { var add_attachs = $('.add_attachment').filter(function(index) { @@ -258,7 +270,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { var maxSyncUpload = $(inputEl).data('max-concurrent-uploads'); if (maxSyncUpload == null || maxSyncUpload <= 0 || ajaxUpload.uploading < maxSyncUpload) - actualUpload(file, attachmentId, fileSpan, inputEl); + actualUpload(file, attachmentId, fileSpan, inputEl,btnId); else $(inputEl).parents('form').queue('upload', actualUpload.bind(this, file, attachmentId, fileSpan, inputEl)); } @@ -323,11 +335,11 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) { }); } -function addInputFiles(inputEl) { +function addInputFiles(inputEl,btnId) { // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { // upload files using ajax - uploadAndAttachFiles(inputEl.files, inputEl); + uploadAndAttachFiles(inputEl.files, inputEl,btnId); // $(inputEl).remove(); } else { // browser not supporting the file API, upload on form submission @@ -349,12 +361,12 @@ function addInputFiles(inputEl) { //clearedFileInput.insertAfter('#attachments_fields'); } -function addInputFiles_board(inputEl, id) { +function addInputFiles_board(inputEl, id,btnId) { // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { // upload files using ajax - uploadAndAttachFiles_board(inputEl.files, inputEl, id); + uploadAndAttachFiles_board(inputEl.files, inputEl, id,btnId); // $(inputEl).remove(); } else { // browser not supporting the file API, upload on form submission @@ -374,7 +386,7 @@ function addInputFiles_board(inputEl, id) { //clearedFileInput.insertAfter('#attachments_fields'); } -function uploadAndAttachFiles(files, inputEl) { +function uploadAndAttachFiles(files, inputEl,btnId) { var maxFileSize = $(inputEl).data('max-file-size'); var maxFileSizeExceeded = $(inputEl).data('max-file-size-message'); @@ -389,12 +401,12 @@ function uploadAndAttachFiles(files, inputEl) { window.alert(maxFileSizeExceeded); } else { $.each(files, function() { - addFile(inputEl, this, true); + addFile(inputEl, this, true,btnId); }); } } -function uploadAndAttachFiles_board(files, inputEl, id) { +function uploadAndAttachFiles_board(files, inputEl, id,btnId) { var maxFileSize = $(inputEl).data('max-file-size'); var maxFileSizeExceeded = $(inputEl).data('max-file-size-message'); @@ -409,7 +421,7 @@ function uploadAndAttachFiles_board(files, inputEl, id) { window.alert(maxFileSizeExceeded); } else { $.each(files, function() { - addFile_board(inputEl, this, true, id); + addFile_board(inputEl, this, true, id,btnId); }); } } @@ -482,10 +494,11 @@ $(function() { //课程课件 function addInputFilesCourseSource(inputEl) { checkBox = arguments[1] == 'public' ? false : true; + btnId = arguments[2]; // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { // upload files using ajax - uploadAndAttachFilesCourseSource(inputEl.files, inputEl,checkBox); + uploadAndAttachFilesCourseSource(inputEl.files, inputEl,checkBox,btnId); // $(inputEl).remove(); } else { // browser not supporting the file API, upload on form submission @@ -507,7 +520,7 @@ function addInputFilesCourseSource(inputEl) { //clearedFileInput.insertAfter('#attachments_fields'); } -function uploadAndAttachFilesCourseSource(files, inputEl,checkBox) { +function uploadAndAttachFilesCourseSource(files, inputEl,checkBox,btnId) { var maxFileSize = $(inputEl).data('max-file-size'); var maxFileSizeExceeded = $(inputEl).data('max-file-size-message'); @@ -522,12 +535,12 @@ function uploadAndAttachFilesCourseSource(files, inputEl,checkBox) { window.alert(maxFileSizeExceeded); } else { $.each(files, function() { - addFileCourseSource(inputEl, this, true,checkBox); + addFileCourseSource(inputEl, this, true,checkBox,btnId); }); } } -function addFileCourseSource(inputEl, file, eagerUpload,checkBox) { +function addFileCourseSource(inputEl, file, eagerUpload,checkBox,btnId) { var attachments_frame = '#attachments_fields'; if ($(attachments_frame).children().length < 30) { @@ -606,7 +619,7 @@ function addFileCourseSource(inputEl, file, eagerUpload,checkBox) { } if (eagerUpload) { - ajaxUpload(file, attachmentId, fileSpan, inputEl); + ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId); } return attachmentId; diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 71b473abe..0cb6e203f 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1128,3 +1128,15 @@ a.postRouteLink:hover {text-decoration:underline;} .syllabusSettingIcon:hover {cursor: pointer} .pic_files{display:block; background:url(../images/public_icon.png) 0px -578px no-repeat; width:20px; height:15px;} + +/*确定按钮*/ +input.sendSourceText { + font-size: 14px; + color: #ffffff; + background-color: #269ac9; + cursor: pointer; + outline: none; + border: none; + width: 50px; + height: 25px; +} From 84348d15ea0341d25cffbafaa6249daa2d1da895 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 11 Nov 2015 16:32:13 +0800 Subject: [PATCH 013/285] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=9A=84=20=E7=A1=AE=E5=AE=9A=E6=8C=89=E9=92=AE=E7=9A=84?= =?UTF-8?q?=E8=81=94=E5=8A=A8=20=E4=BD=9C=E4=B8=9A=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/new.html.erb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb index b71d36f97..fdf1e31a3 100644 --- a/app/views/student_work/new.html.erb +++ b/app/views/student_work/new.html.erb @@ -95,7 +95,7 @@
    - <%= render :partial => 'users/special_user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %> + <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %>
    @@ -111,11 +111,9 @@
    - - <%= submit_tag '确定',:onclick=>'popupRegex();new_student_work();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText fr' %> + 确定 或 - <%#= link_to "取消", user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%> - <%= l(:button_cancel)%> + <%= link_to "取消", user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%>
    <% end%> From 3aa73fba35712f916d3e2e1d56886648d371295e Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 11 Nov 2015 16:33:09 +0800 Subject: [PATCH 014/285] =?UTF-8?q?Gitlab=E6=9D=83=E9=99=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AEGitlab=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 9 +++++++++ lib/gitlab-cli/lib/gitlab/client/projects.rb | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d26e465ba..58dea46b7 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -607,6 +607,15 @@ class ProjectsController < ApplicationController @project.organization_id = params[:organization_id] params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0 params[:project][:hidden_repo] ? @project.hidden_repo = 1 : @project.hidden_repo = 0 + # 更新公开私有时同步gitlab公开私有 + g = Gitlab.client + gproject = g.project(@project.gpid) + if params[:project][:is_public] + g.edit_project(gproject.id, 20) + else + g.edit_project(gproject.id, 0) + end + # end if validate_parent_id && @project.save @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') if params[:project][:is_public] == '0' diff --git a/lib/gitlab-cli/lib/gitlab/client/projects.rb b/lib/gitlab-cli/lib/gitlab/client/projects.rb index 04ea682aa..6247294f3 100644 --- a/lib/gitlab-cli/lib/gitlab/client/projects.rb +++ b/lib/gitlab-cli/lib/gitlab/client/projects.rb @@ -72,6 +72,23 @@ class Gitlab::Client post(url, :body => {:name => name}.merge(options)) end + # Updates a project team member to a specified access level. + # id (required) - The ID of a project + # name (optional) - project name + # path (optional) - repository name for project + # description (optional) - short project description + # default_branch (optional) + # issues_enabled (optional) + # merge_requests_enabled (optional) + # wiki_enabled (optional) + # snippets_enabled (optional) + # public (optional) - if true same as setting visibility_level = 20 + # visibility_level (optional) + + def edit_project(id, visibility_level) + put("/projects/#{id}", :body => {:visibility_level => visibility_level}) + end + # Deletes a project. # # @example From 2596f0a78844af5dbbaec1031be71610884a3f5f Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 11 Nov 2015 16:39:05 +0800 Subject: [PATCH 015/285] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 58dea46b7..065adf596 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -608,12 +608,10 @@ class ProjectsController < ApplicationController params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0 params[:project][:hidden_repo] ? @project.hidden_repo = 1 : @project.hidden_repo = 0 # 更新公开私有时同步gitlab公开私有 - g = Gitlab.client - gproject = g.project(@project.gpid) - if params[:project][:is_public] - g.edit_project(gproject.id, 20) - else - g.edit_project(gproject.id, 0) + unless @project.gpid.nil? + g = Gitlab.client + gproject = g.project(@project.gpid) + params[:project][:is_public] ? g.edit_project(gproject.id, 20) : g.edit_project(gproject.id, 0) end # end if validate_parent_id && @project.save From 7dd299255bc8edf11fd0f11c2a81ba1287ab9817 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 11 Nov 2015 17:16:19 +0800 Subject: [PATCH 016/285] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blog_comments/show.html.erb | 4 ++-- app/views/blogs/_article_list.html.erb | 2 +- public/stylesheets/new_user.css | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 54c9541f2..cf24f0f2d 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -28,7 +28,7 @@ showNormalImage('message_description_<%= @article.id %>'); }); -
    +
    <%= link_to image_tag(url_to_avatar(@article.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@article.author) %> @@ -165,7 +165,7 @@ <%= form_for :blog_comment, :url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %> <%= render :partial => 'blog_comments/reply_form', :locals => {:f => f,:user=>@user,:article=>@article} %> <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %> - <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-right: 5px;" %> + <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'submit_message_replay();', :class => "blue_btn fr c_white mt10 mb10", :style => "margin-right: 5px;" %> <% end %>
    diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb index e397da2cc..b8bcc9ad0 100644 --- a/app/views/blogs/_article_list.html.erb +++ b/app/views/blogs/_article_list.html.erb @@ -32,7 +32,7 @@ <%#end%> -
    +
    <%= @user.name%>的博客 diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index ea45fdbd0..7d8944094 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -261,7 +261,7 @@ a:hover.grey_n_btn{ background:#717171; color:#fff;} .green_btn{ background:#28be6c; color:#fff; font-weight:normal;padding:2px 10px; text-align:center;} a.green_btn{background:#28be6c;color:#fff; font-weight:normal; padding:2px 10px; text-align:center;} a:hover.green_btn{ background:#14ad5a;} -.blue_btn{ background:#64bdd9; color:#fff; font-size:14px; font-weight:normal;padding:2px 8px; text-align:center;} +.blue_btn{ background:#64bdd9; color:#fff; font-weight:normal;padding:2px 8px; text-align:center;} a.blue_btn{background:#64bdd9;color:#fff; font-weight:normal; padding:2px 10px; text-align:center;} a:hover.blue_btn{ background:#329cbd;} a.orange_btn{ background:#ff5722;color:#fff; font-weight:normal; padding:2px 10px; text-align:center; } From a3443ba968934dc56ac703c11bf00558f6893508 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 12 Nov 2015 09:32:00 +0800 Subject: [PATCH 017/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org_document_comment.js.coffee | 3 + app/assets/javascripts/org_member.js.coffee | 3 + app/assets/javascripts/org_projects.js.coffee | 3 + .../stylesheets/org_document_comment.css.scss | 3 + app/assets/stylesheets/org_member.css.scss | 3 + app/assets/stylesheets/org_projects.css.scss | 3 + .../org_document_comments_controller.rb | 54 +++++++++ app/controllers/org_member_controller.rb | 53 +++++++++ app/controllers/org_projects_controller.rb | 18 +++ app/controllers/organizations_controller.rb | 19 ++- app/controllers/projects_controller.rb | 28 ++++- app/helpers/org_document_comment_helper.rb | 2 + app/helpers/org_member_helper.rb | 16 +++ app/helpers/org_projects_helper.rb | 2 + app/helpers/organizations_helper.rb | 1 + app/models/org_activity.rb | 5 + app/models/org_document_comment.rb | 16 +++ app/models/org_project.rb | 5 + app/views/layouts/base_org.html.erb | 91 ++------------- app/views/my/account.html.erb | 10 +- app/views/org_document_comments/_new.html.erb | 40 +++++++ .../org_document_comments/add_reply.js.erb | 3 + .../org_document_comments/destroy.js.erb | 1 + .../org_document_comments/index.html.erb | 26 +++++ app/views/org_document_comments/new.html.erb | 40 +++++++ app/views/org_document_comments/show.html.erb | 0 app/views/org_projects/create.js.erb | 4 + app/views/org_projects/destroy.js.erb | 2 + app/views/organization/_form.html.erb | 21 ---- app/views/organization/edit.html.erb | 25 ---- app/views/organization/index.html.erb | 31 ----- app/views/organization/new.html.erb | 18 --- .../organizations/_show_org_document.html.erb | 90 +++++++++++++++ .../organizations/autocomplete_search.js.erb | 13 +++ app/views/organizations/set_homepage.js.erb | 1 + app/views/organizations/setting.html.erb | 3 +- app/views/organizations/show.html.erb | 7 +- app/views/projects/settings.html.erb | 6 + .../projects/settings/_added_orgs.html.erb | 9 ++ .../projects/settings/_join_org.html.erb | 108 ++++++++++++++++++ config/routes.rb | 30 +++++ ...1104020233_create_org_document_comments.rb | 13 +++ ..._column_to_entity_org_document_comments.rb | 6 + .../20151104032831_create_org_activity.rb | 16 +++ .../20151104070007_create_org_projects.rb | 11 ++ ...455_delete_column_role_from_org_members.rb | 8 ++ ...04073902_rename_column_for_org_activity.rb | 6 + .../20151104090032_create_org_member_roles.rb | 11 ++ .../20151110011003_add_time_to_org_project.rb | 5 + db/schema.rb | 7 +- public/stylesheets/org.css | 13 ++- .../org_document_comment_controller_spec.rb | 5 + .../controllers/org_member_controller_spec.rb | 5 + .../org_projects_controller_spec.rb | 5 + spec/factories/org_activities.rb | 6 + spec/factories/org_document_comments.rb | 11 ++ spec/models/org_activity_spec.rb | 5 + spec/models/org_document_comment_spec.rb | 5 + 58 files changed, 761 insertions(+), 193 deletions(-) create mode 100644 app/assets/javascripts/org_document_comment.js.coffee create mode 100644 app/assets/javascripts/org_member.js.coffee create mode 100644 app/assets/javascripts/org_projects.js.coffee create mode 100644 app/assets/stylesheets/org_document_comment.css.scss create mode 100644 app/assets/stylesheets/org_member.css.scss create mode 100644 app/assets/stylesheets/org_projects.css.scss create mode 100644 app/controllers/org_document_comments_controller.rb create mode 100644 app/controllers/org_member_controller.rb create mode 100644 app/controllers/org_projects_controller.rb create mode 100644 app/helpers/org_document_comment_helper.rb create mode 100644 app/helpers/org_member_helper.rb create mode 100644 app/helpers/org_projects_helper.rb create mode 100644 app/models/org_activity.rb create mode 100644 app/models/org_document_comment.rb create mode 100644 app/models/org_project.rb create mode 100644 app/views/org_document_comments/_new.html.erb create mode 100644 app/views/org_document_comments/add_reply.js.erb create mode 100644 app/views/org_document_comments/destroy.js.erb create mode 100644 app/views/org_document_comments/index.html.erb create mode 100644 app/views/org_document_comments/new.html.erb create mode 100644 app/views/org_document_comments/show.html.erb create mode 100644 app/views/org_projects/create.js.erb create mode 100644 app/views/org_projects/destroy.js.erb delete mode 100644 app/views/organization/_form.html.erb delete mode 100644 app/views/organization/edit.html.erb delete mode 100644 app/views/organization/index.html.erb delete mode 100644 app/views/organization/new.html.erb create mode 100644 app/views/organizations/_show_org_document.html.erb create mode 100644 app/views/organizations/autocomplete_search.js.erb create mode 100644 app/views/organizations/set_homepage.js.erb create mode 100644 app/views/projects/settings/_added_orgs.html.erb create mode 100644 app/views/projects/settings/_join_org.html.erb create mode 100644 db/migrate/20151104020233_create_org_document_comments.rb create mode 100644 db/migrate/20151104024335_add_locked_and_sticky_column_to_entity_org_document_comments.rb create mode 100644 db/migrate/20151104032831_create_org_activity.rb create mode 100644 db/migrate/20151104070007_create_org_projects.rb create mode 100644 db/migrate/20151104070455_delete_column_role_from_org_members.rb create mode 100644 db/migrate/20151104073902_rename_column_for_org_activity.rb create mode 100644 db/migrate/20151104090032_create_org_member_roles.rb create mode 100644 db/migrate/20151110011003_add_time_to_org_project.rb create mode 100644 spec/controllers/org_document_comment_controller_spec.rb create mode 100644 spec/controllers/org_member_controller_spec.rb create mode 100644 spec/controllers/org_projects_controller_spec.rb create mode 100644 spec/factories/org_activities.rb create mode 100644 spec/factories/org_document_comments.rb create mode 100644 spec/models/org_activity_spec.rb create mode 100644 spec/models/org_document_comment_spec.rb diff --git a/app/assets/javascripts/org_document_comment.js.coffee b/app/assets/javascripts/org_document_comment.js.coffee new file mode 100644 index 000000000..761567942 --- /dev/null +++ b/app/assets/javascripts/org_document_comment.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/javascripts/org_member.js.coffee b/app/assets/javascripts/org_member.js.coffee new file mode 100644 index 000000000..761567942 --- /dev/null +++ b/app/assets/javascripts/org_member.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/javascripts/org_projects.js.coffee b/app/assets/javascripts/org_projects.js.coffee new file mode 100644 index 000000000..761567942 --- /dev/null +++ b/app/assets/javascripts/org_projects.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/org_document_comment.css.scss b/app/assets/stylesheets/org_document_comment.css.scss new file mode 100644 index 000000000..9359415ae --- /dev/null +++ b/app/assets/stylesheets/org_document_comment.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the org_document_comment controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/org_member.css.scss b/app/assets/stylesheets/org_member.css.scss new file mode 100644 index 000000000..4bab7e008 --- /dev/null +++ b/app/assets/stylesheets/org_member.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the OrgMember controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/org_projects.css.scss b/app/assets/stylesheets/org_projects.css.scss new file mode 100644 index 000000000..12f4fef6a --- /dev/null +++ b/app/assets/stylesheets/org_projects.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the org_projects controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb new file mode 100644 index 000000000..325a5ff85 --- /dev/null +++ b/app/controllers/org_document_comments_controller.rb @@ -0,0 +1,54 @@ +class OrgDocumentCommentsController < ApplicationController + before_filter :find_organization, :only => [:new, :create, :show, :index] + + layout 'base_org' + + def new + @org_document_comment = OrgDocumentComment.new + end + + def create + @org_document_comment = OrgDocumentComment.new(:organization_id => @organization.id, :creator_id => User.current.id) + @org_document_comment.title = params[:org_document_comment][:title] + @org_document_comment.content = params[:org_document_comment][:content] + if @org_document_comment.save + #flash[:notice] = 'success' + OrgActivity + redirect_to organization_org_document_comments_path(@organization) + else + redirect_to new_org_document_comment_path(:organization_id => @organization.id) + end + end + def show + + end + + def index + @documents = @organization.org_document_comments.where("parent_id is null").order("created_at desc") + end + def update + + end + + def add_reply + @document = OrgDocumentComment.find(params[:id]).root + @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id]) + @comment.content = params[:org_content] + @document.children << @comment + @document.save + end + + def find_organization + @organization = Organization.find(params[:organization_id]) + end + + def destroy + @org_document_comment = OrgDocumentComment.find(params[:id]) + org = @org_document_comment.organization + if @org_document_comment.destroy + if @org_document_comment.id == org.id + org.home_id == nil + end + end + end +end diff --git a/app/controllers/org_member_controller.rb b/app/controllers/org_member_controller.rb new file mode 100644 index 000000000..18724882c --- /dev/null +++ b/app/controllers/org_member_controller.rb @@ -0,0 +1,53 @@ +class OrgMemberController < ApplicationController + + def org_member_autocomplete + @org = Organization.find(params[:org]) + @flag = params[:flag] || false + respond_to do |format| + format.js + end + end + + def create + @org = Organization.find(params[:org]) + member_ids = params[:membership][:user_ids] + role_id = params[:orgRole] + member_ids.each do |user_id| + member = OrgMember.create(:user_id=>user_id) + @org.org_members << member + OrgMemberRole.create(:org_member_id => member.id, :role_id => role_id) + end + respond_to do |format| + format.js + end + end + + def update + @member = OrgMember.find(params[:id]) + #@member.change_role params[:org_member][:role_ids] + @member_role = @member.org_member_roles[0] + @member_role.role_id = params[:org_member][:role_ids][0] + @member_role.save + @org = @member.organization + respond_to do |format| + format.js + end + end + + def new + + end + + def destroy + member = OrgMember.find(params[:id]) + @org = member.organization + member.destroy + respond_to do |format| + format.js + end + end + + def index + + end +end diff --git a/app/controllers/org_projects_controller.rb b/app/controllers/org_projects_controller.rb new file mode 100644 index 000000000..e11005b4a --- /dev/null +++ b/app/controllers/org_projects_controller.rb @@ -0,0 +1,18 @@ +class OrgProjectsController < ApplicationController + def create + org_ids = params[:orgNames] + @project = Project.find(params[:project_id]) + org_ids.each do |org_id| + OrgProject.create(:organization_id => org_id.to_i, :project_id => params[:project_id].to_i, :created_at => Time.now) + p 1 + end + respond_to do |format| + format.js + end + end + def destroy + @project = Project.find(params[:project_id]) + @org_project = OrgProject.find(params[:id]) + @org_project.destroy + end +end diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index a51093ad9..fbe3814a4 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -1,6 +1,6 @@ # encoding: utf-8 class OrganizationsController < ApplicationController - # before_filter :find_organization, :except => [:show,:new,:index,:create] + before_filter :find_organization, :only => [:show] layout 'base_org' def index @@ -26,7 +26,8 @@ class OrganizationsController < ApplicationController def show @organization = Organization.find(params[:id]) - @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?)', @organization.id, 'CreateOrganization ') + @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?) || (container_id =? and org_act_type =? and org_act_id !=?)', + @organization.id, 'CreateOrganization ', @organization.id, 'OrgDocumentComment', @organization.home_id).order('updated_at desc') @activities = paginateHelper @activities, 10 end @@ -67,4 +68,18 @@ class OrganizationsController < ApplicationController def clear_org_avatar_temp end + + def set_homepage + org = Organization.find(params[:id]) + org.home_id = params[:home_id] + org.save + end + + def autocomplete_search + @project = Project.find(params[:project_id]) + #@flag = params[:flag] || false + respond_to do |format| + format.js + end + end end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d26e465ba..a55251d5b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -69,6 +69,24 @@ class ProjectsController < ApplicationController ### added by william include ActsAsTaggableOn::TagsHelper + #查找组织 + def search_public_orgs_not_in_project + condition = '%%' + if !params[:name].nil? + condition = "%#{params[:name].strip}%".gsub(" ","") + end + project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:id]}").map(&:organization_id) + if project_org_ids.empty? + @orgs_not_in_project = Organization.where("is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)-1).per(10) + @org_count = Organization.where("is_public = 1").where("name like ?", condition).count + else + project_org_ids = "(" + project_org_ids.join(',') + ")" + @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)-1).per(10) + @org_count = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition) + end + render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json + end + def index render_404 end @@ -338,6 +356,15 @@ class ProjectsController < ApplicationController @wiki ||= @project.wiki @select_tab = params[:tab] + #找出所有不属于项目的公共组织 + project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{@project.id}") + if project_org_ids.empty? + @orgs_not_in_project = Organization.where("is_public = 1") + else + project_org_ids = "(" + project_org_ids.join(',') + ")" + @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and is_public = 1") + end + # 处理从新建版本库返回来的错误信息 if !params[:repository_error_message].to_s.blank? html = "" @@ -826,5 +853,4 @@ class ProjectsController < ApplicationController end #gcmend - end diff --git a/app/helpers/org_document_comment_helper.rb b/app/helpers/org_document_comment_helper.rb new file mode 100644 index 000000000..b430114f2 --- /dev/null +++ b/app/helpers/org_document_comment_helper.rb @@ -0,0 +1,2 @@ +module OrgDocumentCommentHelper +end diff --git a/app/helpers/org_member_helper.rb b/app/helpers/org_member_helper.rb new file mode 100644 index 000000000..08313f4e9 --- /dev/null +++ b/app/helpers/org_member_helper.rb @@ -0,0 +1,16 @@ +module OrgMemberHelper + include ApplicationHelper + def find_user_not_in_current_org_by_name org + if params[:q] && params[:q].lstrip.rstrip != "" + scope = Principal.active.sorted.not_member_of_org(org).like(params[:q]) + else + scope = [] + end + principals = paginateHelper scope,10 + s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals') + links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options| + link_to text, org_member_autocomplete_org_member_index_path(parameters.merge(:q => params[:q],:flag => true,:org=> org, :format => 'js')), :remote => true + } + s + content_tag('ul', links,:class => 'wlist', :id => "org_member_pagination_links" ) + end +end diff --git a/app/helpers/org_projects_helper.rb b/app/helpers/org_projects_helper.rb new file mode 100644 index 000000000..f3a7025bd --- /dev/null +++ b/app/helpers/org_projects_helper.rb @@ -0,0 +1,2 @@ +module OrgProjectsHelper +end diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb index e10d4026d..33d5dea6e 100644 --- a/app/helpers/organizations_helper.rb +++ b/app/helpers/organizations_helper.rb @@ -16,4 +16,5 @@ module OrganizationsHelper } s + content_tag('ul', links,:class => 'wlist', :id => "org_member_pagination_links" ) end + end diff --git a/app/models/org_activity.rb b/app/models/org_activity.rb new file mode 100644 index 000000000..c48ebdf8e --- /dev/null +++ b/app/models/org_activity.rb @@ -0,0 +1,5 @@ +class OrgActivity < ActiveRecord::Base + # attr_accessible :title, :body + belongs_to :org_act ,:polymorphic => true + belongs_to :container,:polymorphic => true +end diff --git a/app/models/org_document_comment.rb b/app/models/org_document_comment.rb new file mode 100644 index 000000000..2b3c9132a --- /dev/null +++ b/app/models/org_document_comment.rb @@ -0,0 +1,16 @@ +class OrgDocumentComment < ActiveRecord::Base + attr_accessible :content, :creator_id, :organization_id, :parent_id, :reply_id, :title,:sticky,:locked + include Redmine::SafeAttributes + belongs_to :organization + belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id' + + acts_as_tree :order => "#{OrgDocumentComment.table_name}.sticky asc, #{OrgDocumentComment.table_name}.created_at desc" + has_many :org_acts, :class_name => 'OrgActivity',:as =>:org_act ,:dependent => :destroy + after_create :document_save_as_org_activity + + def document_save_as_org_activity + if(self.parent().nil?) + self.org_acts << OrgActivity.new(:user_id => User.current.id, :container_id => self.organization.id, :container_type => 'Organization') + end + end +end diff --git a/app/models/org_project.rb b/app/models/org_project.rb new file mode 100644 index 000000000..ec01013fc --- /dev/null +++ b/app/models/org_project.rb @@ -0,0 +1,5 @@ +class OrgProject < ActiveRecord::Base + # attr_accessible :title, :body + belongs_to :organization + belongs_to :project +end diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index d84bd5e8c..88acb59f6 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -14,6 +14,7 @@ <%= heads_for_theme %> <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %> <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%> + <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> @@ -30,7 +31,6 @@ <% end %>
    - <% @organization = Organization.find(params[:id])%>
    @@ -50,11 +50,15 @@ <% end %> <% end%>
    -
    组织id:<%= @organization.id %>
    +
    组织id：<%= @organization.id %>
    配置
    -
    文章 ( 3 ) | 成员 ( 10 )
    +
    + <%= link_to '文章', organization_org_document_comments_path(@organization) %> (  + <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %> +  ) | 成员 ( <%= @organization.org_members.count %>  ) +
    动态
    @@ -77,90 +81,9 @@ <%= call_hook :view_layouts_base_content %>
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    <%= render :partial => 'layouts/footer' %> diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index be178607f..3bf109f37 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -581,10 +581,7 @@ } }); - //查询学校 - $("input[name='province']").on('input', function (e) { - throttle(shcool_search_fn,window,e); - }); + function throttle(method,context,e){ clearTimeout(method.tId); @@ -606,7 +603,10 @@ type: 'post', success: function (data) { schoolsResult = data.schools; - count = data.count; + count = data.count; //查询学校 + $("input[name='province']").on('input', function (e) { + throttle(shcool_search_fn,window,e); + }); maxPage = Math.ceil(count/100) //最大页码值 if(schoolsResult.length != undefined && schoolsResult.length != 0) { var i = 0; diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb new file mode 100644 index 000000000..f47048bf9 --- /dev/null +++ b/app/views/org_document_comments/_new.html.erb @@ -0,0 +1,40 @@ +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> + +<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %> +
    +
    + +
    +
    + +
    +<% end %> \ No newline at end of file diff --git a/app/views/org_document_comments/add_reply.js.erb b/app/views/org_document_comments/add_reply.js.erb new file mode 100644 index 000000000..930c8ebb0 --- /dev/null +++ b/app/views/org_document_comments/add_reply.js.erb @@ -0,0 +1,3 @@ +$("#organization_document_<%= @document.id %>").html(""); +$("#organization_document_<%= @document.id %>").html("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document}) %>"); +init_activity_KindEditor_data(<%= @document.id %>,"","87%"); \ No newline at end of file diff --git a/app/views/org_document_comments/destroy.js.erb b/app/views/org_document_comments/destroy.js.erb new file mode 100644 index 000000000..bcebe9d37 --- /dev/null +++ b/app/views/org_document_comments/destroy.js.erb @@ -0,0 +1 @@ +location.reload(); \ No newline at end of file diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb new file mode 100644 index 000000000..8915e020c --- /dev/null +++ b/app/views/org_document_comments/index.html.erb @@ -0,0 +1,26 @@ +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %> + +<%= render :partial => 'new' %> +<% unless @documents.nil? %> + <% @documents.each do |document| %> + +
    + <%= render :partial => 'organizations/show_org_document', :locals => {:document => document} %> +
    + <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/org_document_comments/new.html.erb b/app/views/org_document_comments/new.html.erb new file mode 100644 index 000000000..11a7e9359 --- /dev/null +++ b/app/views/org_document_comments/new.html.erb @@ -0,0 +1,40 @@ +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> + +<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %> +
    +
    + +
    +
    + +
    +<% end %> \ No newline at end of file diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/org_projects/create.js.erb b/app/views/org_projects/create.js.erb new file mode 100644 index 000000000..cadad16b2 --- /dev/null +++ b/app/views/org_projects/create.js.erb @@ -0,0 +1,4 @@ + +$("#search_orgs_result_list").next().html(""); +$("#added_orgs").html(""); +$("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>') \ No newline at end of file diff --git a/app/views/org_projects/destroy.js.erb b/app/views/org_projects/destroy.js.erb new file mode 100644 index 000000000..ee3c67bbd --- /dev/null +++ b/app/views/org_projects/destroy.js.erb @@ -0,0 +1,2 @@ +$("#added_orgs").html(""); +$("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>') \ No newline at end of file diff --git a/app/views/organization/_form.html.erb b/app/views/organization/_form.html.erb deleted file mode 100644 index 80cc76850..000000000 --- a/app/views/organization/_form.html.erb +++ /dev/null @@ -1,21 +0,0 @@ -<%= error_messages_for 'project' %> - -<% unless @organizations.new_record? %> -

    - <%= render :partial=>"avatar/avatar_form",:locals=> {source:@organizations} %> -

    -<% end %> -

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

    - - - <%#= l(:field_description)%> - - - - diff --git a/app/views/organization/edit.html.erb b/app/views/organization/edit.html.erb deleted file mode 100644 index 60b7c06a0..000000000 --- a/app/views/organization/edit.html.erb +++ /dev/null @@ -1,25 +0,0 @@ -<%= form_for(@organization) do |f|%> -

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

    -
    - <%= error_messages_for 'project' %> -

    - <%= render :partial=>"avatar/avatar_form",:locals=> {source:@organization} %> -

    -

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

    - - <%= submit_tag l(:button_create), :class => "enterprise"%> - -
    - <%#= submit_tag l(:button_create_and_continue), :name => 'continue' %> - <%= javascript_tag "$('#project_name').focus();" %> -<% end %> - -<% html_title(l(:label_organization_edit)) -%> \ No newline at end of file diff --git a/app/views/organization/index.html.erb b/app/views/organization/index.html.erb deleted file mode 100644 index f1c50d6ab..000000000 --- a/app/views/organization/index.html.erb +++ /dev/null @@ -1,31 +0,0 @@ - - <%= l(:label_all_enterprises) %> - -
    -
    - <%= l(:label_all_enterprises) %> -
    -
    - <% if @organizations.empty? %> -

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

    - <% else %> - <% @organizations.each do |organization| %> - <% unless organization.name.blank? %> -
      -
    • - <%= organization.name%> - <%= link_to organization.name, home_path(:organization => organization.id) %> -
      • -
    - <% end %> - <% end %> - <% end %> -
    -
    -
    -
    -
      -
      -<% html_title(l(:label_enterprise_all)) -%> diff --git a/app/views/organization/new.html.erb b/app/views/organization/new.html.erb deleted file mode 100644 index 163f4a5f5..000000000 --- a/app/views/organization/new.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -<%= form_for(@organizations, :method => :post, - :name => 'new_form', - :url => {:controller => 'organization', - :action => 'create'}) do |f|%> -

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

      -
      - <%= render :partial => 'form', :locals => { :f => f } %> - - <%= submit_tag l(:button_create), :class => "enterprise"%> - -
      - <%#= submit_tag l(:button_create_and_continue), :name => 'continue' %> - <%= javascript_tag "$('#project_name').focus();" %> -<% end %> - -<% html_title(l(:label_organization_new)) -%> \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb new file mode 100644 index 000000000..102867ce0 --- /dev/null +++ b/app/views/organizations/_show_org_document.html.erb @@ -0,0 +1,90 @@ +
      +
      +
      + <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_path(document.creator_id) %> +
      +
      +
      + <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> + TO<%= link_to document.organization.name, organization_path(document.organization) %> | 组织 +
      +
      <%= document.title %>
      +
      + 发帖时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
      + <% unless document.content.blank? %> +
      + <%= document.content.html_safe %> +
      + <% end %> +
      +
        +
      • +
          +
        • + <%= form_for('new_form',:url => {:controller => 'organizations',:action => 'set_homepage',:id => document.organization_id, :home_id => document.id},:method => "put",:remote => true) do |f|%> + 设为首页 + <% end %> +
          • +
        • 编辑文章
          • +
        • + <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',:remote => true, :class => 'postOptionLink' %> +
          • +
        +
        • +
      +
      +
      +
      +
      +<% comments_for_doc = document.children.reorder("created_at desc") %> +
      +
      +
      回复（<%= document.children.count() %>）
      + <% if count > 3 %> +
      + + 展开更多 + +
      + <% end %> + + +
      + <% comments_for_doc.each do |comment| %> +
      <%= image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像") %>
      +
      +
      + <%= link_to User.find(comment.creator_id), user_path(comment.creator_id), :class => "newsBlue mr10 f14" %> + <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %> +
      + <% unless comment.content.blank? %> +
      <%= comment.content.html_safe %>
      + <% end %> +
      +
      + <% end %> +
      +
      +
      + <%= image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像") %> +
      +
      +
      + <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id), :method => "post", :remote => true) do |f| %> + + + +
      + + +
      +

      + <% end %> +
      +
      +
      +
      +
      +
      +
      +
      \ No newline at end of file diff --git a/app/views/organizations/autocomplete_search.js.erb b/app/views/organizations/autocomplete_search.js.erb new file mode 100644 index 000000000..357ef668c --- /dev/null +++ b/app/views/organizations/autocomplete_search.js.erb @@ -0,0 +1,13 @@ +<% if @project%> +var checked = $("#not_org_members input:checked").size(); +if(checked > 0) +{ + alert('翻页或搜索后将丢失当前选择的用户数据!'); +} +<% if @flag == "true"%> +$('#new_orgs_for_project').html('<%= escape_javascript(search_public_orgs_not_in_project(@project.id)) %>'); +<% else%> +$('#new_orgs_for_project').html('<%= escape_javascript(search_public_orgs_not_in_project(@project.id)) %>'); +<% end%> + +<%end%> diff --git a/app/views/organizations/set_homepage.js.erb b/app/views/organizations/set_homepage.js.erb new file mode 100644 index 000000000..bcebe9d37 --- /dev/null +++ b/app/views/organizations/set_homepage.js.erb @@ -0,0 +1 @@ +location.reload(); \ No newline at end of file diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index 61e6b1534..e203b5eed 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -89,7 +89,8 @@ <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript org_member_autocomplete_org_member_index_path(:org=>@organization, :format => 'js') }')" %>
      <%= find_user_not_in_current_org_by_name(@project) %> -
      +
      +
      • 角色
      • diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 2f25ae8a3..2c94ed163 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -1,5 +1,7 @@ <%= javascript_include_tag "jquery.infinitescroll.js" %> - +<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %> + <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id)} %> + <% end %>
        最新动态
          @@ -28,6 +30,9 @@
      <% end %> + <% if act.org_act_type == 'OrgDocumentComment' %> + <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> + <% end %> <% end %>
        <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb index 3fc9a89d6..76258b9e9 100644 --- a/app/views/projects/settings.html.erb +++ b/app/views/projects/settings.html.erb @@ -12,6 +12,7 @@ project_setting(6); $("#pro_st_edit_ku").toggle(); <%else%> + project_setting(5); <% end%> <% end%> $("div[nhname='pro_setting']").show(); @@ -36,6 +37,7 @@ <% if User.current.allowed_to?(:manage_members, @project) %>
      • 成员
        • <% end %> +
      • 组织
        • <% if User.current.allowed_to?(:manage_versions, @project) %>
      • 版本
        • <% end %> @@ -63,6 +65,7 @@ <%= render :partial=>"projects/settings/new_members" if User.current.allowed_to?(:manage_members, @project)%>
      +
      <%= render :partial=>"projects/settings/new_versions" if User.current.allowed_to?(:manage_versions, @project)%>
      @@ -70,6 +73,9 @@ +
      + <%= render :partial=>"projects/settings/join_org" %> +
      <%= render :partial=>"projects/settings/new_repositories" if User.current.allowed_to?(:manage_repository, @project)%> diff --git a/app/views/projects/settings/_added_orgs.html.erb b/app/views/projects/settings/_added_orgs.html.erb new file mode 100644 index 000000000..06d3ae439 --- /dev/null +++ b/app/views/projects/settings/_added_orgs.html.erb @@ -0,0 +1,9 @@ +
        +
      • 名称操作
        • + <% orgs.each do |org| %> +
      • <%= org.name %> + <%= link_to "取消关联", org_project_path(:id => OrgProject.where(:organization_id => org.id, :project_id => project_id).first.id, :project_id => project_id), + :method => 'delete',:remote => true, :class => "relatedListOption fl linkGrey3" %> +
        • + <% end %> +
      \ No newline at end of file diff --git a/app/views/projects/settings/_join_org.html.erb b/app/views/projects/settings/_join_org.html.erb new file mode 100644 index 000000000..b7e58ee4c --- /dev/null +++ b/app/views/projects/settings/_join_org.html.erb @@ -0,0 +1,108 @@ + + + + + + + +<%= stylesheet_link_tag 'org' %> + +
        +
      • 组织
        • +
      • +
        +
      +
      +
      + 关联组织 +
      + <%= form_tag url_for(:controller => 'org_projects', :action => 'create', :project_id => @project.id), :id => 'join_orgs_for_project', :remote => true %> + +
      +
        +
      + 关联 + 取消 +
      +
      +
      + 已关联组织 +
      + <%= render :partial => 'projects/settings/added_orgs', :locals => {:orgs => @project.organizations, :project_id => params[:id]} %> +
      +
      +
      +
      +
      +
      + + \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 639056b94..fc7b74cd8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,9 +35,19 @@ RedmineApp::Application.routes.draw do member do get 'setting'#, :action => 'settings', :as => 'settings' get 'clear_org_avatar_temp' + put 'set_homepage' end collection do get 'check_uniq' + get 'autocomplete_search' + end + resources :org_document_comments do + member do + + end + collection do + + end end end @@ -50,6 +60,25 @@ RedmineApp::Application.routes.draw do end end + resources :org_document_comments do + member do + post 'add_reply' + end + collection do + + end + end + + resources :org_projects do + member do + + end + collection do + + end + end + #match '/organizations/:organization_id/org_document_comments/new', :to => 'org_document_comments#new', :as => 'new_org_documents', :via => [:get, :post] + #match '/organizations/:organization_id/org_document_comments/create', :to => 'org_document_comments#create', :as => 'create_org_documents', :via => [:post] resources :homework_users resources :no_uses delete 'no_uses', :to => 'no_uses#delete' @@ -493,6 +522,7 @@ RedmineApp::Application.routes.draw do post 'unarchive' post 'close' post 'reopen' + post 'search_public_orgs_not_in_project' match 'copy', :via => [:get, :post] end diff --git a/db/migrate/20151104020233_create_org_document_comments.rb b/db/migrate/20151104020233_create_org_document_comments.rb new file mode 100644 index 000000000..e300785aa --- /dev/null +++ b/db/migrate/20151104020233_create_org_document_comments.rb @@ -0,0 +1,13 @@ +class CreateOrgDocumentComments < ActiveRecord::Migration + def change + create_table :org_document_comments do |t| + t.string :title + t.text :content + t.integer :organization_id + t.integer :creator_id + t.integer :parent_id + t.integer :reply_id + t.timestamps + end + end +end diff --git a/db/migrate/20151104024335_add_locked_and_sticky_column_to_entity_org_document_comments.rb b/db/migrate/20151104024335_add_locked_and_sticky_column_to_entity_org_document_comments.rb new file mode 100644 index 000000000..313800985 --- /dev/null +++ b/db/migrate/20151104024335_add_locked_and_sticky_column_to_entity_org_document_comments.rb @@ -0,0 +1,6 @@ +class AddLockedAndStickyColumnToEntityOrgDocumentComments < ActiveRecord::Migration + def change + add_column :org_document_comments,:locked,:boolean,:default => false + add_column :org_document_comments,:sticky,:integer,:default => 0 + end +end diff --git a/db/migrate/20151104032831_create_org_activity.rb b/db/migrate/20151104032831_create_org_activity.rb new file mode 100644 index 000000000..8d78102b3 --- /dev/null +++ b/db/migrate/20151104032831_create_org_activity.rb @@ -0,0 +1,16 @@ +class CreateOrgActivity < ActiveRecord::Migration + def up + create_table :org_activities do |t| + t.integer :user_id + t.integer :act_id + t.string :act_type + t.integer :container_id + t.string :container_type + + t.timestamps + end + end + + def down + end +end diff --git a/db/migrate/20151104070007_create_org_projects.rb b/db/migrate/20151104070007_create_org_projects.rb new file mode 100644 index 000000000..db83f9632 --- /dev/null +++ b/db/migrate/20151104070007_create_org_projects.rb @@ -0,0 +1,11 @@ +class CreateOrgProjects < ActiveRecord::Migration + def up + create_table :org_projects do |t| + t.integer :organization_id + t.integer :project_id + end + end + + def down + end +end diff --git a/db/migrate/20151104070455_delete_column_role_from_org_members.rb b/db/migrate/20151104070455_delete_column_role_from_org_members.rb new file mode 100644 index 000000000..2e986dd9b --- /dev/null +++ b/db/migrate/20151104070455_delete_column_role_from_org_members.rb @@ -0,0 +1,8 @@ +class DeleteColumnRoleFromOrgMembers < ActiveRecord::Migration + def up + remove_column :org_members, :role + end + + def down + end +end diff --git a/db/migrate/20151104073902_rename_column_for_org_activity.rb b/db/migrate/20151104073902_rename_column_for_org_activity.rb new file mode 100644 index 000000000..e644c16cb --- /dev/null +++ b/db/migrate/20151104073902_rename_column_for_org_activity.rb @@ -0,0 +1,6 @@ +class RenameColumnForOrgActivity < ActiveRecord::Migration + def change + rename_column :org_activities,:act_id,:org_act_id + rename_column :org_activities,:act_type,:org_act_type + end +end diff --git a/db/migrate/20151104090032_create_org_member_roles.rb b/db/migrate/20151104090032_create_org_member_roles.rb new file mode 100644 index 000000000..d97d6eda7 --- /dev/null +++ b/db/migrate/20151104090032_create_org_member_roles.rb @@ -0,0 +1,11 @@ +class CreateOrgMemberRoles < ActiveRecord::Migration + def up + create_table :org_member_roles do |t| + t.integer :org_member_id + t.integer :role_id + end + end + + def down + end +end diff --git a/db/migrate/20151110011003_add_time_to_org_project.rb b/db/migrate/20151110011003_add_time_to_org_project.rb new file mode 100644 index 000000000..dfe370103 --- /dev/null +++ b/db/migrate/20151110011003_add_time_to_org_project.rb @@ -0,0 +1,5 @@ +class AddTimeToOrgProject < ActiveRecord::Migration + def change + add_column :org_projects, :created_at, :timestamp + end +end diff --git a/db/schema.rb b/db/schema.rb index d75b4f7a4..90f58aa3c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151104090032) do +ActiveRecord::Schema.define(:version => 20151110011003) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1209,8 +1209,9 @@ ActiveRecord::Schema.define(:version => 20151104090032) do end create_table "org_projects", :force => true do |t| - t.integer "organization_id" - t.integer "project_id" + t.integer "organization_id" + t.integer "project_id" + t.datetime "created_at" end create_table "organizations", :force => true do |t| diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 8d9275f31..3857b53e2 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -30,4 +30,15 @@ a.saveBtn:hover {background-color:#297fb8;} .upbtn { margin: 40px 0px 0px 15px; display: block; padding: 2px 5px; - border: 1px solid #EAEAEA;} \ No newline at end of file + border: 1px solid #EAEAEA;} + +/*项目关联css*/ +.relateOrg {width:335px;} +.relatedList {width:335px;} +.searchOrg {height:24px; width:200px; color:#9b9b9b9; border:1px solid #15bccf;} +a.cancelBtn {padding:3px 5px; background-color:#D9D9D9; color:#656565;} +a.cancelBtn:hover {background-color:#717171; color:#ffffff;} +.relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;} +.relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} +.relatedListOption {width:80px; text-align:center;} +.relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} \ No newline at end of file diff --git a/spec/controllers/org_document_comment_controller_spec.rb b/spec/controllers/org_document_comment_controller_spec.rb new file mode 100644 index 000000000..016416264 --- /dev/null +++ b/spec/controllers/org_document_comment_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgDocumentCommentController, :type => :controller do + +end diff --git a/spec/controllers/org_member_controller_spec.rb b/spec/controllers/org_member_controller_spec.rb new file mode 100644 index 000000000..a116db00f --- /dev/null +++ b/spec/controllers/org_member_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgMemberController, :type => :controller do + +end diff --git a/spec/controllers/org_projects_controller_spec.rb b/spec/controllers/org_projects_controller_spec.rb new file mode 100644 index 000000000..8adc91d66 --- /dev/null +++ b/spec/controllers/org_projects_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgProjectsController, :type => :controller do + +end diff --git a/spec/factories/org_activities.rb b/spec/factories/org_activities.rb new file mode 100644 index 000000000..552ea70f9 --- /dev/null +++ b/spec/factories/org_activities.rb @@ -0,0 +1,6 @@ +FactoryGirl.define do + factory :org_activity do + + end + +end diff --git a/spec/factories/org_document_comments.rb b/spec/factories/org_document_comments.rb new file mode 100644 index 000000000..206c471aa --- /dev/null +++ b/spec/factories/org_document_comments.rb @@ -0,0 +1,11 @@ +FactoryGirl.define do + factory :org_document_comment do + title "MyString" +content "MyText" +organization_id 1 +creator_id 1 +parent_id 1 +reply_id 1 + end + +end diff --git a/spec/models/org_activity_spec.rb b/spec/models/org_activity_spec.rb new file mode 100644 index 000000000..e452fe172 --- /dev/null +++ b/spec/models/org_activity_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgActivity, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/org_document_comment_spec.rb b/spec/models/org_document_comment_spec.rb new file mode 100644 index 000000000..ba5dd15a4 --- /dev/null +++ b/spec/models/org_document_comment_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgDocumentComment, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end From 41751f08bac7c32866f75158c27fdd62f19cf87c Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 11:31:35 +0800 Subject: [PATCH 018/285] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8F=B3=E4=B8=8A=E8=A7=92=E7=9A=84=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=92=8C=E5=88=A0=E9=99=A4icon=E5=A2=9E=E5=8A=A0tip?= =?UTF-8?q?=EF=BC=8C=E4=B8=A4=E4=B8=AAicon=E7=9A=84=E8=B7=9D=E7=A6=BB?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_show.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb index 286d5eb39..1b0202536 100644 --- a/app/views/student_work/_show.html.erb +++ b/app/views/student_work/_show.html.erb @@ -9,10 +9,10 @@ <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
    • - <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del") %> + <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del",:title=>"删除") %>
      • -
    • - <%= link_to "",edit_student_work_path(work),:class => "pic_edit"%> +
    • + <%= link_to "",edit_student_work_path(work),:class => "pic_edit",:title => "修改"%>
      • <% end%> <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%> From 8fa790dd6b453255b297b043d3ed046eeeb494f4 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 11:48:27 +0800 Subject: [PATCH 019/285] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=96=87=E5=AD=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_student_work_list.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index 64f097114..c18ec4c73 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -2,10 +2,14 @@ 作品 - (已有<%= @student_work_count%>人提交) + (<%= @student_work_count%>人已交) <% if !@is_teacher && @stundet_works.empty?%> 您尚未提交作品 + <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%> + 您已提交且不可再修改，因为截止日期已过 + <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%> + 您已提交，您还可以修改 <% end %> <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%> From 3f60893591a4316c3d96956c09d45a0f37239dba Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 14:53:12 +0800 Subject: [PATCH 020/285] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E5=9C=A8=E6=88=AA=E6=AD=A2=E6=97=B6?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=8A=B6=E6=80=81=E5=8F=98=E4=B8=BA3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/homework_publishtime.rake | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/tasks/homework_publishtime.rake b/lib/tasks/homework_publishtime.rake index 4d79086d4..8e231fafd 100644 --- a/lib/tasks/homework_publishtime.rake +++ b/lib/tasks/homework_publishtime.rake @@ -1,7 +1,7 @@ #coding=utf-8 namespace :homework_publishtime do - desc "start publish homework" + desc "start publish homework and end homework" task :publish => :environment do homework_commons = HomeworkCommon.where("publish_time = '#{Date.today}'") homework_commons.each do |homework| @@ -20,4 +20,16 @@ namespace :homework_publishtime do end end end + + task :end => :environment do + homework_commons = HomeworkCommon.where("end_time < '#{Date.today}'") + homework_commons.each do |homework| + if homework.anonymous_comment == 1 + homework_detail_manual = homework.homework_detail_manual + if homework_detail_manual.comment_status == 1 + homework_detail_manual.update_column('comment_status', 3) + end + end + end + end end \ No newline at end of file From d508cfa381d3c1d8e28a8d021d05188ee87c01a3 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 12 Nov 2015 14:55:31 +0800 Subject: [PATCH 021/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org_document_comments_controller.rb | 7 ++ app/controllers/projects_controller.rb | 13 ++-- .../org_document_comments/index.html.erb | 1 + app/views/org_projects/create.js.erb | 4 +- app/views/org_projects/destroy.js.erb | 2 + .../organizations/_show_org_document.html.erb | 68 ++++++++++++------ app/views/organizations/show.html.erb | 24 +++++++ .../search_public_orgs_not_in_project.js.erb | 13 ++++ .../projects/settings/_join_org.html.erb | 71 +++++++++---------- config/routes.rb | 2 +- 10 files changed, 141 insertions(+), 64 deletions(-) create mode 100644 app/views/projects/search_public_orgs_not_in_project.js.erb diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index 325a5ff85..d9ed0f1f5 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -27,6 +27,13 @@ class OrgDocumentCommentsController < ApplicationController @documents = @organization.org_document_comments.where("parent_id is null").order("created_at desc") end def update + @org_document = OrgDocumentComment.find(params[:id]) + respond_to do |format| + # format.html {redirect_to :} + end + end + + def edit end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index a55251d5b..5e6a584c8 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -77,14 +77,19 @@ class ProjectsController < ApplicationController end project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:id]}").map(&:organization_id) if project_org_ids.empty? - @orgs_not_in_project = Organization.where("is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)-1).per(10) + @orgs_not_in_project = Organization.where("is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)).per(10) @org_count = Organization.where("is_public = 1").where("name like ?", condition).count else project_org_ids = "(" + project_org_ids.join(',') + ")" - @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)-1).per(10) - @org_count = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition) + @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)).per(10) + @org_count = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).count + end + # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count + @orgs_page = Paginator.new @org_count, 10,params[:page] + #render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json + respond_to do |format| + format.js end - render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json end def index diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb index 8915e020c..a7340c08a 100644 --- a/app/views/org_document_comments/index.html.erb +++ b/app/views/org_document_comments/index.html.erb @@ -16,6 +16,7 @@ <% @documents.each do |document| %> diff --git a/app/views/org_projects/create.js.erb b/app/views/org_projects/create.js.erb index cadad16b2..545918c73 100644 --- a/app/views/org_projects/create.js.erb +++ b/app/views/org_projects/create.js.erb @@ -1,4 +1,6 @@ -$("#search_orgs_result_list").next().html(""); +$("#search_orgs_result_list").html(""); +//$("#search_orgs_result_list").append('
        '); $("#added_orgs").html(""); +$("#paginator").css("display", "none"); $("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>') \ No newline at end of file diff --git a/app/views/org_projects/destroy.js.erb b/app/views/org_projects/destroy.js.erb index ee3c67bbd..45a014b23 100644 --- a/app/views/org_projects/destroy.js.erb +++ b/app/views/org_projects/destroy.js.erb @@ -1,2 +1,4 @@ $("#added_orgs").html(""); +$("#search_orgs_result_list").html(""); +$("#paginator").css("display", "none"); $("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>') \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 102867ce0..db27cacc3 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -37,9 +37,10 @@
      <% comments_for_doc = document.children.reorder("created_at desc") %> -
      -
      -
      回复（<%= document.children.count() %>）
      +<% count = document.children.count() %> +
      +
      +
      回复（<%= count %>）
      <% if count > 3 %>
      @@ -47,31 +48,36 @@
      <% end %> - - -
      - <% comments_for_doc.each do |comment| %> -
      <%= image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像") %>
      -
      -
      - <%= link_to User.find(comment.creator_id), user_path(comment.creator_id), :class => "newsBlue mr10 f14" %> - <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %> -
      - <% unless comment.content.blank? %> -
      <%= comment.content.html_safe %>
      - <% end %> -
      -
      - <% end %> +
      +
      +
        + <% reply_id = 0 %> + <% comments_for_doc.each do |comment| %> + <% reply_id += 1 %> +
      • +
        <%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_path(comment.creator_id) %>
        +
        +
        + <%= link_to User.find(comment.creator_id), user_path(comment.creator_id), :class => "newsBlue mr10 f14" %> + <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %> +
        + <% unless comment.content.blank? %> +
        <%= comment.content.html_safe %>
        + <% end %> +
        +
        +
        • + <% end %> +
      - <%= image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像") %> + <%=link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %>
      <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id), :method => "post", :remote => true) do |f| %> - +
      @@ -87,4 +93,22 @@
      -
      \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 2c94ed163..2f3610abc 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -1,5 +1,23 @@ <%= javascript_include_tag "jquery.infinitescroll.js" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %> + <% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %> + <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id)} %> <% end %>
      @@ -31,6 +49,12 @@
      <% end %> <% if act.org_act_type == 'OrgDocumentComment' %> + <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> <% end %> <% end %> diff --git a/app/views/projects/search_public_orgs_not_in_project.js.erb b/app/views/projects/search_public_orgs_not_in_project.js.erb new file mode 100644 index 000000000..69005d304 --- /dev/null +++ b/app/views/projects/search_public_orgs_not_in_project.js.erb @@ -0,0 +1,13 @@ +$("#search_orgs_result_list").html(""); +$("#search_orgs_result_list").append('
        '); + <% @orgs_not_in_project.each do |org|%> + link = "
        • "; + $("#search_orgs_result_list").append(link ); + <%end %> +$("#search_orgs_result_list").append('
      ') +<% if @org_count > 10 %> +$("#paginator").html(' <%= pagination_links_full @orgs_page, @org_count ,:per_page_links => true,:remote =>true,:flag=>true%>'); +$("#paginator").css("display", "block"); +<% else %> +$("#paginator").css("display", "none"); +<% end %> diff --git a/app/views/projects/settings/_join_org.html.erb b/app/views/projects/settings/_join_org.html.erb index b7e58ee4c..57ae714bd 100644 --- a/app/views/projects/settings/_join_org.html.erb +++ b/app/views/projects/settings/_join_org.html.erb @@ -18,9 +18,8 @@
      <%= form_tag url_for(:controller => 'org_projects', :action => 'create', :project_id => @project.id), :id => 'join_orgs_for_project', :remote => true %> -
      -
        -
      +
      +
        关联 取消
        @@ -50,22 +49,22 @@ page = 1; $.ajax({ url: '<%= url_for(:controller => 'projects', :action => 'search_public_orgs_not_in_project') %>'+'?name='+ e.target.value+'&page='+page, - type:'post', - success: function(data){ - orgs = data.orgs; - count = data.count; - maxPage = Math.ceil(count/10); - $("#search_orgs_result_list").next().html(""); - if(orgs.length != undefined && orgs.length != 0){ - var i = 0; - for(; i" + orgs[i].organization.name + "
        "; - console.log(link) - $("#search_orgs_result_list").next().append(link ); - } - - } - } + type:'get' +// success: function(data){ +// orgs = data.orgs; +// count = data.count; +// maxPage = Math.ceil(count/10); +// $("#search_orgs_result_list").next().html(""); +// if(orgs.length != undefined && orgs.length != 0){ +// var i = 0; +// for(; i" + orgs[i].organization.name + "
        "; +// console.log(link) +// $("#search_orgs_result_list").next().append(link ); +// } +// +// } +// } }); } @@ -84,25 +83,25 @@ $(document).ready(function(){ $.ajax({ url: '<%= url_for(:controller => 'projects', :action => 'search_public_orgs_not_in_project') %>'+'?page=1', - type:'post', - success: function(data){ - orgs = data.orgs; - count = data.count; - maxPage = Math.ceil(count/10); - $("#search_orgs_result_list").next().html(""); - if(orgs.length != undefined && orgs.length != 0){ - var i = 0; - for(; i" + orgs[i].organization.name + "
        "; - console.log(link) - $("#search_orgs_result_list").next().append(link ); - } - - } - } + type:'get' +// success: function(data){ +// orgs = data.orgs; +// count = data.count; +// maxPage = Math.ceil(count/10); +// $("#search_orgs_result_list").next().html(""); +// if(orgs.length != undefined && orgs.length != 0){ +// var i = 0; +// for(; i" + orgs[i].organization.name + "
        "; +// console.log(link) +// $("#search_orgs_result_list").next().append(link ); +// } +// +// } +// } }); }); function cancel_join_orgs() { - $("#search_orgs_result_list").next().html(""); + $("#search_orgs_result_list").html(""); } \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index fc7b74cd8..44a65133b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -522,7 +522,7 @@ RedmineApp::Application.routes.draw do post 'unarchive' post 'close' post 'reopen' - post 'search_public_orgs_not_in_project' + get 'search_public_orgs_not_in_project' match 'copy', :via => [:get, :post] end From bf01994e4f47b468072cfd7affa885eb6476d577 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 12 Nov 2015 15:12:23 +0800 Subject: [PATCH 022/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_show_org_document.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index db27cacc3..e9bd6698b 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -6,7 +6,7 @@
        <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> - TO<%= link_to document.organization.name, organization_path(document.organization) %> | 组织 + TO  <%= link_to document.organization.name, organization_path(document.organization) %> | 组织
        <%= document.title %>
        From b52f4f80c4bbbe088241019b8b4b1974ba3d6a51 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 12 Nov 2015 15:31:47 +0800 Subject: [PATCH 023/285] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema.rb | 60 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 4aa12f627..b7e1bfa1c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151020021234) do +ActiveRecord::Schema.define(:version => 20151102090519) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -144,6 +144,36 @@ ActiveRecord::Schema.define(:version => 20151020021234) do t.integer "open_anonymous_evaluation", :default => 1 end + create_table "blog_comments", :force => true do |t| + t.integer "blog_id", :null => false + t.integer "parent_id" + t.string "title", :default => "", :null => false + t.text "content" + t.integer "author_id" + t.integer "comments_count", :default => 0, :null => false + t.integer "last_comment_id" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + t.boolean "locked", :default => false + t.integer "sticky", :default => 0 + t.integer "reply_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "blogs", :force => true do |t| + t.string "name", :default => "", :null => false + t.text "description" + t.integer "position", :default => 1 + t.integer "article_count", :default => 0, :null => false + t.integer "comments_count", :default => 0, :null => false + t.integer "last_comments_id" + t.integer "parent_id" + t.integer "author_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "boards", :force => true do |t| t.integer "project_id", :null => false t.string "name", :default => "", :null => false @@ -413,6 +443,7 @@ ActiveRecord::Schema.define(:version => 20151020021234) do t.integer "is_public", :limit => 1, :default => 1 t.integer "inherit_members", :limit => 1, :default => 1 t.integer "open_student", :default => 0 + t.integer "outline", :default => 0 end create_table "custom_fields", :force => true do |t| @@ -621,12 +652,13 @@ ActiveRecord::Schema.define(:version => 20151020021234) do t.text "description" t.date "publish_time" t.date "end_time" - t.integer "homework_type", :default => 1 + t.integer "homework_type", :default => 1 t.string "late_penalty" t.integer "course_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "teacher_priority", :default => 1 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "teacher_priority", :default => 1 + t.integer "anonymous_comment", :default => 0 end create_table "homework_detail_manuals", :force => true do |t| @@ -1006,11 +1038,21 @@ ActiveRecord::Schema.define(:version => 20151020021234) do t.integer "project_id" end + create_table "org_members", :force => true do |t| + t.integer "user_id" + t.integer "organization_id" + t.string "role" + end + create_table "organizations", :force => true do |t| t.string "name" - t.string "logo_link" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.text "description" + t.integer "creator_id" + t.integer "home_id" + t.string "domain" + t.boolean "is_public" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "phone_app_versions", :force => true do |t| @@ -1155,6 +1197,7 @@ ActiveRecord::Schema.define(:version => 20151020021234) do t.string "enterprise_name" t.integer "organization_id" t.integer "project_new_type" + t.integer "gpid" end add_index "projects", ["lft"], :name => "index_projects_on_lft" @@ -1571,6 +1614,7 @@ ActiveRecord::Schema.define(:version => 20151020021234) do t.string "identity_url" t.string "mail_notification", :default => "", :null => false t.string "salt", :limit => 64 + t.integer "gid" end add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id" From 506709b4742176806663692ea2096ee36e26e585 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 16:35:13 +0800 Subject: [PATCH 024/285] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E8=AF=BE=E7=A8=8B=20=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=20=201.=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=20=202.=E7=BB=99=E5=87=BA=E6=98=8E=E7=A1=AE?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=20=203.=E6=8C=89=E9=92=AE=E8=81=94?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/attachments.js | 91 +++++++++++++++++++------------ 1 file changed, 57 insertions(+), 34 deletions(-) diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 20e845424..d7b49c8be 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -155,13 +155,13 @@ function addFile(inputEl, file, eagerUpload,btnId) { addFile.nextAttachmentId = 1; function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { - + //上传开始调用函数 function onLoadstart(e) { fileSpan.removeClass('ajax-waiting'); fileSpan.addClass('ajax-loading'); $('input:submit', $(this).parents('form')).attr('disabled', 'disabled'); } - + //更改progressbar的值 function onProgress(e) { if (e.lengthComputable) { this.progressbar('value', e.loaded * 100 / e.total); @@ -177,40 +177,43 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { progressEventHandler: onProgress.bind(progressSpan) }) .done(function(result) { - progressSpan.progressbar('value', 100).remove(); - var containerid = $(inputEl).data('containerid'); - console.log($(inputEl)) - if(containerid == undefined ){ - var count = $('#attachments_fields>span').length; - $('#'+btnId).removeAttr("disabled"); - $('#'+btnId).val('确定') - $('#'+btnId).css('background-color','#269ac9') - $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); - } - else{ - $('#'+btnId).removeAttr("disabled"); - $('#'+btnId).val('确定') - $('#'+btnId).css('background-color','#269ac9') - var count = $('#attachments_fields' + containerid + '>span').length; - $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); - } - + progressSpan.progressbar('value', 100).remove(); //上传完成就去掉该文件名后的进度条 fileSpan.find('input.description, a').css('display', 'inline-block'); fileSpan.find('input.is_public_checkbox, a').css('display', 'inline-block'); }) .fail(function(result) { - progressSpan.text(result.statusText); - if ($("#network_issue")) { + progressSpan.text("网络错误"); + if ($("#network_issue")) { //在上传处都要给出一个network_issue的div用来显示错误 $("#network_issue").show(); } }).always(function() { ajaxUpload.uploading--; fileSpan.removeClass('ajax-loading'); + var containerid = $(inputEl).data('containerid');//多个上传控件需要的容器id + if(containerid == undefined ){ + var count = 1;//同步上传参数为1，所以不需要去获取正在上传的文件就知道是1 + $('#upload_file_count').html("" + count + "" + $(inputEl).data('lebelFileUploding')); + } + else{ + var count = 1; + $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('lebelFileUploding')); + } var form = fileSpan.parents('form'); - if (form.queue('upload').length == 0 && ajaxUpload.uploading == 0) { + if (form.queue('upload').length == 0 && ajaxUpload.uploading == 0) { //所有文件上传完毕,更改状态 $('input:submit', form).removeAttr('disabled'); + $('#' + btnId).removeAttr("disabled"); + $('#' + btnId).val('确定') + $('#' + btnId).css('background-color', '#269ac9') + if(containerid == undefined ){ + var count = $('#attachments_fields>span').length; + $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); + }else{ + var count = $('#attachments_fields' + containerid + '>span').length; + $('#upload_file_count'+containerid).html("" + count + "" + $(inputEl).data('fileCount')); + } + } - form.dequeue('upload'); + form.dequeue('upload');//上传完成一个就退出一个 }); //gcm files count and add delete_all link @@ -222,7 +225,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { $('#'+btnId).attr("disabled",true); $('#'+btnId).val('提交中'); $('#'+btnId).css('background-color','#c1c1c1') - $('#upload_file_count').html("" + count + "" + $(inputEl).data('lebelFileUploding')); + $('#upload_file_count').html("1" + $(inputEl).data('lebelFileUploding'));//目前肯定是穿一个文件 if (count >= 1) { var add_attachs = $('.add_attachment'); var delete_all = $('.remove_all'); @@ -239,7 +242,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { $('#'+btnId).attr("disabled",true); $('#'+btnId).val('提交中'); $('#'+btnId).css('background-color','#c1c1c1') - $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('lebelFileUploding')); + $('#upload_file_count' + containerid).html("1" + $(inputEl).data('lebelFileUploding'));//目前肯定是穿一个文件 if (count >= 1) { var add_attachs = $('.add_attachment').filter(function(index) { return $(this).data('containerid') == containerid; @@ -262,17 +265,25 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { //gcm } - + //在插入文件名的后边插入div var progressSpan = $('
        ').insertAfter(fileSpan.find('input.upload_filename')); - progressSpan.progressbar(); - fileSpan.addClass('ajax-waiting'); - - var maxSyncUpload = $(inputEl).data('max-concurrent-uploads'); - + progressSpan.progressbar(); //将div处理成progress bar + fileSpan.addClass('ajax-waiting'); //添加文件正在上传的状态 + var containerid = $(inputEl).data('containerid');//多个上传控件需要的容器id + if(containerid == undefined ){ //选择了多少个文件也要显示，因为有时候文件过大，一时半会传不完，但还是显示文件没有选择 + var count = $('#attachments_fields>span').length; + $('#upload_file_count').html("" + count + "" + '个文件被选择'); + }else{ + var count = $('#attachments_fields' + containerid + '>span').length; + $('#upload_file_count'+containerid).html("" + count + "" + '个文件被选择'); + } + //最大的同步上传参数 + var maxSyncUpload = 1 //$(inputEl).data('max-concurrent-uploads'); + //如果没有指定同步上传参数 或者参数不对，或者需要上传的文件已经小于同步上传的个数，那么直接上传 if (maxSyncUpload == null || maxSyncUpload <= 0 || ajaxUpload.uploading < maxSyncUpload) actualUpload(file, attachmentId, fileSpan, inputEl,btnId); - else - $(inputEl).parents('form').queue('upload', actualUpload.bind(this, file, attachmentId, fileSpan, inputEl)); + else //否则就进行队列上传 + $(inputEl).parents('form').queue('upload', actualUpload.bind(this, file, attachmentId, fileSpan, inputEl,btnId)); } ajaxUpload.uploading = 0; @@ -338,6 +349,10 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) { function addInputFiles(inputEl,btnId) { // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { +// if(inputEl.files.length >= 5){ +// alert('一次选择的文件不能超过5个') +// return; +// } // upload files using ajax uploadAndAttachFiles(inputEl.files, inputEl,btnId); // $(inputEl).remove(); @@ -365,6 +380,10 @@ function addInputFiles_board(inputEl, id,btnId) { // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { +// if(inputEl.files.length >= 5){ +// alert('一次选择的文件不能超过5个') +// return; +// } // upload files using ajax uploadAndAttachFiles_board(inputEl.files, inputEl, id,btnId); // $(inputEl).remove(); @@ -497,6 +516,10 @@ function addInputFilesCourseSource(inputEl) { btnId = arguments[2]; // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { +// if(inputEl.files.length >= 5){ +// alert('一次选择的文件不能超过5个') +// return; +// } // upload files using ajax uploadAndAttachFilesCourseSource(inputEl.files, inputEl,checkBox,btnId); // $(inputEl).remove(); From ab868d7b65654746ae12ea2d848a8184b7a9eef6 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 16:52:42 +0800 Subject: [PATCH 025/285] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=AE=E9=A1=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/news_controller.rb | 4 ++-- app/models/news.rb | 2 +- app/views/news/_course_form.html.erb | 4 ++++ app/views/news/_course_news_list.html.erb | 3 +++ app/views/news/_course_show.html.erb | 3 +++ app/views/users/_course_news.html.erb | 6 +++++- db/migrate/20151112072948_add_news_sticky.rb | 9 +++++++++ db/schema.rb | 3 ++- public/stylesheets/courses.css | 2 +- public/stylesheets/new_user.css | 1 + 10 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 db/migrate/20151112072948_add_news_sticky.rb diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index 5d83c1320..be2b44c06 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -74,10 +74,10 @@ class NewsController < ApplicationController @q = params[:subject] if params[:subject].nil? || params[:subject].blank? scope_order = scope.all(:include => [:author, :course], - :order => "#{News.table_name}.created_on DESC") + :order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC") else scope_order = scope.where("#{News.table_name}.title like '#{'%' << params[:subject].to_s << '%'}'").all(:include => [:author, :course], - :order => "#{News.table_name}.created_on DESC") + :order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC") end # :offset => @offset, diff --git a/app/models/news.rb b/app/models/news.rb index a9e9d1d18..e9b8b5314 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -66,7 +66,7 @@ class News < ActiveRecord::Base scope :course_visible, lambda {|*args| includes(:course).where(Course.allowed_to_condition(args.shift || User.current, :view_course_news, *args)) } - safe_attributes 'title', 'summary', 'description' + safe_attributes 'title', 'summary', 'description', 'sticky' def visible?(user=User.current) !user.nil? && user.allowed_to?(:view_news, project) diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb index 0a5488714..a51b85870 100644 --- a/app/views/news/_course_form.html.erb +++ b/app/views/news/_course_form.html.erb @@ -4,6 +4,10 @@

        +
      • + <%= f.check_box :sticky, :value => is_new ? 0 : @news.sticky %> + <%= label_tag 'news_sticky', l(:label_board_sticky) %> +
      • <% if is_new %> <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> diff --git a/app/views/news/_course_news_list.html.erb b/app/views/news/_course_news_list.html.erb index 74a70e33d..3db222f25 100644 --- a/app/views/news/_course_news_list.html.erb +++ b/app/views/news/_course_news_list.html.erb @@ -13,6 +13,9 @@ <%= l(:label_release_news) %>： <%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %> + <% if news.sticky == 1%> + 置顶 + <% end%> <%=link_to "#{news.comments.all.count}".html_safe, news_path(news.id), :class => "pro_mes_w" %>
        diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb index 2d8dae59d..34e6e943f 100644 --- a/app/views/news/_course_show.html.erb +++ b/app/views/news/_course_show.html.erb @@ -8,6 +8,9 @@

        <%=h @news.title %>

        + <% if @news.sticky == 1%> + 置顶 + <% end%> <%= link_to(l(:button_edit), edit_news_path(@news), :class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %> diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index f9087f057..475a982e5 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -12,9 +12,13 @@ <% end %> TO <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
        • -
        + + <% if activity.sticky == 1%> + 置顶 + <% end%> +
        发布时间：<%= format_time(activity.created_on) %>
        diff --git a/db/migrate/20151112072948_add_news_sticky.rb b/db/migrate/20151112072948_add_news_sticky.rb new file mode 100644 index 000000000..85001debe --- /dev/null +++ b/db/migrate/20151112072948_add_news_sticky.rb @@ -0,0 +1,9 @@ +class AddNewsSticky < ActiveRecord::Migration + def up + add_column :news, :sticky, :integer, :default => 0 + end + + def down + remove_column :news, :sticky + end +end diff --git a/db/schema.rb b/db/schema.rb index 7898b3f4d..419b30c3e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151109080256) do +ActiveRecord::Schema.define(:version => 20151112072948) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -953,6 +953,7 @@ ActiveRecord::Schema.define(:version => 20151109080256) do t.datetime "created_on" t.integer "comments_count", :default => 0, :null => false t.integer "course_id" + t.integer "sticky", :default => 0 end add_index "news", ["author_id"], :name => "index_news_on_author_id" diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 0cb6e203f..05bba54f6 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -555,7 +555,6 @@ a:hover.st_add{ color:#ff8e15;} a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; } a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} -.r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;} blockquote {background: #e8e8e8;padding: 10px;margin-bottom: 5px;word-break: break-all;word-wrap: break-word;} .respond-form{display: none;margin: auto;clear: both;} @@ -987,6 +986,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r .m_w505{max-width: 505px;} .m_w500{max-width: 500px;} .m_w530{max-width: 530px;} +.m_w600{max-width: 600px;} .ProResultTable{ color:#888888;} .T_C{ text-align:center;} .SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; } diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index ea45fdbd0..490de9e08 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1082,6 +1082,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r .m_w460{max-width: 460px;} .m_w505{max-width: 505px;} .m_w530{max-width: 530px;} +.m_w600{max-width: 600px;} .ProResultTable{ color:#888888;} .T_C{ text-align:center;} .SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; } From 7751dc9081113b382d4d5fc6aa27f9873a9d3d04 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 12 Nov 2015 17:00:35 +0800 Subject: [PATCH 026/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org.html.erb | 186 +++++------ app/views/org_document_comments/_new.html.erb | 79 ++--- .../organizations/_show_org_document.html.erb | 226 ++++++------- db/schema.rb | 310 ------------------ 4 files changed, 246 insertions(+), 555 deletions(-) diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 88acb59f6..ef65bf8b2 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -1,93 +1,93 @@ -<% @nav_dispaly_project_label = 1 - @nav_dispaly_forum_label = 1 %> -<%#@nav_dispaly_project_label = 1 %> - - - - - <%= h html_title %> - - - <%= csrf_meta_tag %> - <%= favicon %> - <%= javascript_heads %> - <%= heads_for_theme %> - <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %> - <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%> - - <%= call_hook :view_layouts_base_html_head %> - - <%= yield :header_tags -%> - - - - - -
        - <% if User.current.logged? %> - <%= render :partial => 'layouts/logined_header' %> - <% else %> - <%= render :partial => 'layouts/unlogin_header' %> - <% end %> -
        -
        -
        -
        -
        -
        - - - - -
        组织id：<%= @organization.id %>
        - 配置 - -
        -
        - <%= link_to '文章', organization_org_document_comments_path(@organization) %> (  - <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %> -  ) | 成员 ( <%= @organization.org_members.count %>  ) -
        -
        -
        -
        动态
        -
        项目
        -
        - -
        -
        -
        -
        - <%= render_flash_messages %> - <%= yield %> - <%= call_hook :view_layouts_base_content %> -
        -
        -
        -
        - - -
        - <%= render :partial => 'layouts/footer' %> -
        - - - +<% @nav_dispaly_project_label = 1 + @nav_dispaly_forum_label = 1 %> +<%#@nav_dispaly_project_label = 1 %> + + + + + <%= h html_title %> + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= javascript_heads %> + <%= heads_for_theme %> + <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %> + <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%> + + <%= call_hook :view_layouts_base_html_head %> + + <%= yield :header_tags -%> + + + + + +
        + <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else %> + <%= render :partial => 'layouts/unlogin_header' %> + <% end %> +
        +
        +
        +
        +
        +
        + + + + +
        组织id：<%= @organization.id %>
        + 配置 + +
        +
        + <%= link_to '文章', organization_org_document_comments_path(@organization) %> (  + <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %> +  ) | 成员 ( <%= @organization.org_members.count %>  ) +
        +
        +
        +
        动态
        +
        项目
        +
        + +
        +
        +
        +
        + <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
        +
        +
        +
        + + +
        + <%= render :partial => 'layouts/footer' %> +
        + + + diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb index f47048bf9..91bcad2a9 100644 --- a/app/views/org_document_comments/_new.html.erb +++ b/app/views/org_document_comments/_new.html.erb @@ -1,40 +1,41 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> - -<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %> -
        -
        - -
        -
        - -
        +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> + +<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %> +
        +
        + +
        +
        +
        + +
        <% end %> \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index e9bd6698b..a9802bf66 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -1,114 +1,114 @@ -
        -
        -
        - <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_path(document.creator_id) %> -
        -
        -
        - <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> - TO  <%= link_to document.organization.name, organization_path(document.organization) %> | 组织 -
        -
        <%= document.title %>
        -
        - 发帖时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
        - <% unless document.content.blank? %> -
        - <%= document.content.html_safe %> -
        - <% end %> -
        -
          -
        • -
            -
          • - <%= form_for('new_form',:url => {:controller => 'organizations',:action => 'set_homepage',:id => document.organization_id, :home_id => document.id},:method => "put",:remote => true) do |f|%> - 设为首页 - <% end %> -
            • -
          • 编辑文章
            • -
          • - <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',:remote => true, :class => 'postOptionLink' %> -
            • -
          -
          • -
        -
        -
        -
        -
        -<% comments_for_doc = document.children.reorder("created_at desc") %> -<% count = document.children.count() %> -
        -
        -
        回复（<%= count %>）
        - <% if count > 3 %> -
        - - 展开更多 - -
        - <% end %> -
        -
        -
          - <% reply_id = 0 %> - <% comments_for_doc.each do |comment| %> - <% reply_id += 1 %> -
        • -
          <%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_path(comment.creator_id) %>
          -
          -
          - <%= link_to User.find(comment.creator_id), user_path(comment.creator_id), :class => "newsBlue mr10 f14" %> - <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %> -
          - <% unless comment.content.blank? %> -
          <%= comment.content.html_safe %>
          - <% end %> -
          -
          -
          • - <% end %> -
        -
        -
        -
        - <%=link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %> -
        -
        -
        - <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id), :method => "post", :remote => true) do |f| %> - - - -
        - - -
        -

        - <% end %> -
        -
        -
        -
        -
        -
        -
        - - \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index 6aaa08ec4..7c2722e75 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,11 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -<<<<<<< HEAD -ActiveRecord::Schema.define(:version => 20151102090519) do -======= ActiveRecord::Schema.define(:version => 20151110011003) do ->>>>>>> bf01994e4f47b468072cfd7affa885eb6476d577 create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -297,16 +293,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.boolean "diff_all" end - create_table "columns_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Table_name", :limit => 64, :default => "", :null => false - t.string "Column_name", :limit => 64, :default => "", :null => false - t.timestamp "Timestamp", :null => false - t.string "Column_priv", :limit => 0, :default => "", :null => false - end - create_table "comments", :force => true do |t| t.string "commented_type", :limit => 30, :default => "", :null => false t.integer "commented_id", :default => 0, :null => false @@ -505,33 +491,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" - create_table "db", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Select_priv", :limit => 1, :default => "N", :null => false - t.string "Insert_priv", :limit => 1, :default => "N", :null => false - t.string "Update_priv", :limit => 1, :default => "N", :null => false - t.string "Delete_priv", :limit => 1, :default => "N", :null => false - t.string "Create_priv", :limit => 1, :default => "N", :null => false - t.string "Drop_priv", :limit => 1, :default => "N", :null => false - t.string "Grant_priv", :limit => 1, :default => "N", :null => false - t.string "References_priv", :limit => 1, :default => "N", :null => false - t.string "Index_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false - t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false - t.string "Create_view_priv", :limit => 1, :default => "N", :null => false - t.string "Show_view_priv", :limit => 1, :default => "N", :null => false - t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Execute_priv", :limit => 1, :default => "N", :null => false - t.string "Event_priv", :limit => 1, :default => "N", :null => false - t.string "Trigger_priv", :limit => 1, :default => "N", :null => false - end - - add_index "db", ["User"], :name => "User" - create_table "delayed_jobs", :force => true do |t| t.integer "priority", :default => 0, :null => false t.integer "attempts", :default => 0, :null => false @@ -613,31 +572,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" - create_table "event", :id => false, :force => true do |t| - t.string "db", :limit => 64, :default => "", :null => false - t.string "name", :limit => 64, :default => "", :null => false - t.binary "body", :limit => 2147483647, :null => false - t.string "definer", :limit => 77, :default => "", :null => false - t.datetime "execute_at" - t.integer "interval_value" - t.string "interval_field", :limit => 18 - t.timestamp "created", :null => false - t.timestamp "modified", :null => false - t.datetime "last_executed" - t.datetime "starts" - t.datetime "ends" - t.string "status", :limit => 18, :default => "ENABLED", :null => false - t.string "on_completion", :limit => 8, :default => "DROP", :null => false - t.string "sql_mode", :limit => 0, :default => "", :null => false - t.string "comment", :limit => 64, :default => "", :null => false - t.integer "originator", :null => false - t.string "time_zone", :limit => 64, :default => "SYSTEM", :null => false - t.string "character_set_client", :limit => 32 - t.string "collation_connection", :limit => 32 - t.string "db_collation", :limit => 32 - t.binary "body_utf8", :limit => 2147483647 - end - create_table "first_pages", :force => true do |t| t.string "web_title" t.string "title" @@ -689,21 +623,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "locked" end - create_table "func", :primary_key => "name", :force => true do |t| - t.boolean "ret", :default => false, :null => false - t.string "dl", :limit => 128, :default => "", :null => false - t.string "type", :limit => 9, :null => false - end - - create_table "general_log", :id => false, :force => true do |t| - t.timestamp "event_time", :null => false - t.text "user_host", :limit => 16777215, :null => false - t.integer "thread_id", :null => false - t.integer "server_id", :null => false - t.string "command_type", :limit => 64, :null => false - t.text "argument", :limit => 16777215, :null => false - end - create_table "groups_users", :id => false, :force => true do |t| t.integer "group_id", :null => false t.integer "user_id", :null => false @@ -711,35 +630,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true - create_table "help_category", :primary_key => "help_category_id", :force => true do |t| - t.string "name", :limit => 64, :null => false - t.integer "parent_category_id", :limit => 2 - t.text "url", :null => false - end - - add_index "help_category", ["name"], :name => "name", :unique => true - - create_table "help_keyword", :primary_key => "help_keyword_id", :force => true do |t| - t.string "name", :limit => 64, :null => false - end - - add_index "help_keyword", ["name"], :name => "name", :unique => true - - create_table "help_relation", :id => false, :force => true do |t| - t.integer "help_topic_id", :null => false - t.integer "help_keyword_id", :null => false - end - - create_table "help_topic", :primary_key => "help_topic_id", :force => true do |t| - t.string "name", :limit => 64, :null => false - t.integer "help_category_id", :limit => 2, :null => false - t.text "description", :null => false - t.text "example", :null => false - t.text "url", :null => false - end - - add_index "help_topic", ["name"], :name => "name", :unique => true - create_table "homework_attaches", :force => true do |t| t.integer "bid_id" t.integer "user_id" @@ -825,29 +715,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "updated_at", :null => false end - create_table "host", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "Select_priv", :limit => 1, :default => "N", :null => false - t.string "Insert_priv", :limit => 1, :default => "N", :null => false - t.string "Update_priv", :limit => 1, :default => "N", :null => false - t.string "Delete_priv", :limit => 1, :default => "N", :null => false - t.string "Create_priv", :limit => 1, :default => "N", :null => false - t.string "Drop_priv", :limit => 1, :default => "N", :null => false - t.string "Grant_priv", :limit => 1, :default => "N", :null => false - t.string "References_priv", :limit => 1, :default => "N", :null => false - t.string "Index_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false - t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false - t.string "Create_view_priv", :limit => 1, :default => "N", :null => false - t.string "Show_view_priv", :limit => 1, :default => "N", :null => false - t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Execute_priv", :limit => 1, :default => "N", :null => false - t.string "Trigger_priv", :limit => 1, :default => "N", :null => false - end - create_table "invite_lists", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1077,15 +944,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) 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 "ndb_binlog_index", :primary_key => "epoch", :force => true do |t| - t.integer "Position", :limit => 8, :null => false - t.string "File", :null => false - t.integer "inserts", :limit => 8, :null => false - t.integer "updates", :limit => 8, :null => false - t.integer "deletes", :limit => 8, :null => false - t.integer "schemaops", :limit => 8, :null => false - end - create_table "news", :force => true do |t| t.integer "project_id" t.string "title", :limit => 60, :default => "", :null => false @@ -1180,12 +1038,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "project_id" end -<<<<<<< HEAD - create_table "org_members", :force => true do |t| - t.integer "user_id" - t.integer "organization_id" - t.string "role" -======= create_table "org_activities", :force => true do |t| t.integer "user_id" t.integer "org_act_id" @@ -1223,7 +1075,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "organization_id" t.integer "project_id" t.datetime "created_at" ->>>>>>> bf01994e4f47b468072cfd7affa885eb6476d577 end create_table "organizations", :force => true do |t| @@ -1244,10 +1095,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "updated_at", :null => false end - create_table "plugin", :primary_key => "name", :force => true do |t| - t.string "dl", :limit => 128, :default => "", :null => false - end - create_table "poll_answers", :force => true do |t| t.integer "poll_question_id" t.text "answer_text" @@ -1323,42 +1170,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "updated_at", :null => false end - create_table "proc", :id => false, :force => true do |t| - t.string "db", :limit => 64, :default => "", :null => false - t.string "name", :limit => 64, :default => "", :null => false - t.string "type", :limit => 9, :null => false - t.string "specific_name", :limit => 64, :default => "", :null => false - t.string "language", :limit => 3, :default => "SQL", :null => false - t.string "sql_data_access", :limit => 17, :default => "CONTAINS_SQL", :null => false - t.string "is_deterministic", :limit => 3, :default => "NO", :null => false - t.string "security_type", :limit => 7, :default => "DEFINER", :null => false - t.binary "param_list", :null => false - t.binary "returns", :limit => 2147483647, :null => false - t.binary "body", :limit => 2147483647, :null => false - t.string "definer", :limit => 77, :default => "", :null => false - t.timestamp "created", :null => false - t.timestamp "modified", :null => false - t.string "sql_mode", :limit => 0, :default => "", :null => false - t.text "comment", :null => false - t.string "character_set_client", :limit => 32 - t.string "collation_connection", :limit => 32 - t.string "db_collation", :limit => 32 - t.binary "body_utf8", :limit => 2147483647 - end - - create_table "procs_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Routine_name", :limit => 64, :default => "", :null => false - t.string "Routine_type", :limit => 9, :null => false - t.string "Grantor", :limit => 77, :default => "", :null => false - t.string "Proc_priv", :limit => 0, :default => "", :null => false - t.timestamp "Timestamp", :null => false - end - - add_index "procs_priv", ["Grantor"], :name => "Grantor" - create_table "project_infos", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1433,18 +1244,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" - create_table "proxies_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Proxied_host", :limit => 60, :default => "", :null => false - t.string "Proxied_user", :limit => 16, :default => "", :null => false - t.boolean "With_grant", :default => false, :null => false - t.string "Grantor", :limit => 77, :default => "", :null => false - t.timestamp "Timestamp", :null => false - end - - add_index "proxies_priv", ["Grantor"], :name => "Grantor" - create_table "queries", :force => true do |t| t.integer "project_id" t.string "name", :default => "", :null => false @@ -1558,17 +1357,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "is_teacher_score", :default => 0 end - create_table "servers", :primary_key => "Server_name", :force => true do |t| - t.string "Host", :limit => 64, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "Username", :limit => 64, :default => "", :null => false - t.string "Password", :limit => 64, :default => "", :null => false - t.integer "Port", :default => 0, :null => false - t.string "Socket", :limit => 64, :default => "", :null => false - t.string "Wrapper", :limit => 64, :default => "", :null => false - t.string "Owner", :limit => 64, :default => "", :null => false - end - create_table "settings", :force => true do |t| t.string "name", :default => "", :null => false t.text "value" @@ -1589,20 +1377,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.string "description" end - create_table "slow_log", :id => false, :force => true do |t| - t.timestamp "start_time", :null => false - t.text "user_host", :limit => 16777215, :null => false - t.time "query_time", :null => false - t.time "lock_time", :null => false - t.integer "rows_sent", :null => false - t.integer "rows_examined", :null => false - t.string "db", :limit => 512, :null => false - t.integer "last_insert_id", :null => false - t.integer "insert_id", :null => false - t.integer "server_id", :null => false - t.text "sql_text", :limit => 16777215, :null => false - end - create_table "softapplications", :force => true do |t| t.string "name" t.text "description" @@ -1684,19 +1458,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.string "subject" end - create_table "tables_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Table_name", :limit => 64, :default => "", :null => false - t.string "Grantor", :limit => 77, :default => "", :null => false - t.timestamp "Timestamp", :null => false - t.string "Table_priv", :limit => 0, :default => "", :null => false - t.string "Column_priv", :limit => 0, :default => "", :null => false - end - - add_index "tables_priv", ["Grantor"], :name => "Grantor" - create_table "taggings", :force => true do |t| t.integer "tag_id" t.integer "taggable_id" @@ -1746,32 +1507,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "time_entries", ["project_id"], :name => "time_entries_project_id" add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" - create_table "time_zone", :primary_key => "Time_zone_id", :force => true do |t| - t.string "Use_leap_seconds", :limit => 1, :default => "N", :null => false - end - - create_table "time_zone_leap_second", :primary_key => "Transition_time", :force => true do |t| - t.integer "Correction", :null => false - end - - create_table "time_zone_name", :primary_key => "Name", :force => true do |t| - t.integer "Time_zone_id", :null => false - end - - create_table "time_zone_transition", :id => false, :force => true do |t| - t.integer "Time_zone_id", :null => false - t.integer "Transition_time", :limit => 8, :null => false - t.integer "Transition_type_id", :null => false - end - - create_table "time_zone_transition_type", :id => false, :force => true do |t| - t.integer "Time_zone_id", :null => false - t.integer "Transition_type_id", :null => false - t.integer "Offset", :default => 0, :null => false - t.integer "Is_DST", :limit => 1, :default => 0, :null => false - t.string "Abbreviation", :limit => 8, :default => "", :null => false - end - create_table "tokens", :force => true do |t| t.integer "user_id", :default => 0, :null => false t.string "action", :limit => 30, :default => "", :null => false @@ -1790,51 +1525,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "fields_bits", :default => 0 end - create_table "user", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Password", :limit => 41, :default => "", :null => false - t.string "Select_priv", :limit => 1, :default => "N", :null => false - t.string "Insert_priv", :limit => 1, :default => "N", :null => false - t.string "Update_priv", :limit => 1, :default => "N", :null => false - t.string "Delete_priv", :limit => 1, :default => "N", :null => false - t.string "Create_priv", :limit => 1, :default => "N", :null => false - t.string "Drop_priv", :limit => 1, :default => "N", :null => false - t.string "Reload_priv", :limit => 1, :default => "N", :null => false - t.string "Shutdown_priv", :limit => 1, :default => "N", :null => false - t.string "Process_priv", :limit => 1, :default => "N", :null => false - t.string "File_priv", :limit => 1, :default => "N", :null => false - t.string "Grant_priv", :limit => 1, :default => "N", :null => false - t.string "References_priv", :limit => 1, :default => "N", :null => false - t.string "Index_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_priv", :limit => 1, :default => "N", :null => false - t.string "Show_db_priv", :limit => 1, :default => "N", :null => false - t.string "Super_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false - t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false - t.string "Execute_priv", :limit => 1, :default => "N", :null => false - t.string "Repl_slave_priv", :limit => 1, :default => "N", :null => false - t.string "Repl_client_priv", :limit => 1, :default => "N", :null => false - t.string "Create_view_priv", :limit => 1, :default => "N", :null => false - t.string "Show_view_priv", :limit => 1, :default => "N", :null => false - t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Create_user_priv", :limit => 1, :default => "N", :null => false - t.string "Event_priv", :limit => 1, :default => "N", :null => false - t.string "Trigger_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tablespace_priv", :limit => 1, :default => "N", :null => false - t.string "ssl_type", :limit => 9, :default => "", :null => false - t.binary "ssl_cipher", :null => false - t.binary "x509_issuer", :null => false - t.binary "x509_subject", :null => false - t.integer "max_questions", :default => 0, :null => false - t.integer "max_updates", :default => 0, :null => false - t.integer "max_connections", :default => 0, :null => false - t.integer "max_user_connections", :default => 0, :null => false - t.string "plugin", :limit => 64, :default => "" - t.text "authentication_string" - end - create_table "user_activities", :force => true do |t| t.string "act_type" t.integer "act_id" From 21275e8b7bd25ab33793a3c990b4cd61b9a8226b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 12 Nov 2015 17:52:47 +0800 Subject: [PATCH 027/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=BC=BA=E9=99=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org_document_comments_controller.rb | 6 ++- app/controllers/organizations_controller.rb | 19 ++++++-- app/models/principal.rb | 16 +++---- app/models/user.rb | 15 ++++++ app/views/org_document_comments/edit.html.erb | 43 ++++++++++++++++++ .../organizations/_show_org_document.html.erb | 4 +- app/views/organizations/setting.html.erb | 18 ++++---- public/images/org_default.jpg | Bin 0 -> 1897 bytes 8 files changed, 96 insertions(+), 25 deletions(-) create mode 100644 app/views/org_document_comments/edit.html.erb create mode 100644 public/images/org_default.jpg diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index d9ed0f1f5..60522dc3f 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -28,13 +28,15 @@ class OrgDocumentCommentsController < ApplicationController end def update @org_document = OrgDocumentComment.find(params[:id]) + @org_document.update_attributes(:title => params[:org_document_comment][:title], :content => params[:org_document_comment][:content]) respond_to do |format| - # format.html {redirect_to :} + format.html {redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)} end end def edit - + @org_document = OrgDocumentComment.find(params[:id]) + @organization = Organization.find(params[:organization_id]) end def add_reply diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index fbe3814a4..25d0783fb 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -25,10 +25,14 @@ class OrganizationsController < ApplicationController end def show - @organization = Organization.find(params[:id]) - @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?) || (container_id =? and org_act_type =? and org_act_id !=?)', - @organization.id, 'CreateOrganization ', @organization.id, 'OrgDocumentComment', @organization.home_id).order('updated_at desc') - @activities = paginateHelper @activities, 10 + if User.current.admin? || User.current.member_of_org?(@organization) + @organization = Organization.find(params[:id]) + @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?) || (container_id =? and org_act_type =? and org_act_id !=?)', + @organization.id, 'CreateOrganization ', @organization.id, 'OrgDocumentComment', @organization.home_id).order('updated_at desc') + @activities = paginateHelper @activities, 10 + else + render_403 + end end def update @@ -61,7 +65,12 @@ class OrganizationsController < ApplicationController end def setting - @organization = Organization.find(params[:id]) + @organization = Organization.find(params[:id]) + + if User.current.admin? || User.current.admin_of_org?(@organization) + else + render_403 + end end diff --git a/app/models/principal.rb b/app/models/principal.rb index fc9c7cac4..dd376f609 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -88,14 +88,14 @@ class Principal < ActiveRecord::Base } scope :not_member_of_org, lambda {|org| - orgs = [org] unless org.is_a?(Array) - if orgs.empty? - where("1=0") - else - ids = orgs.map(&:id) - where("#{Principal.table_name}.id NOT IN (SELECT DISTINCT user_id FROM #{OrgMember.table_name} WHERE organization_id IN (?))", ids) - end - } + orgs = [org] unless org.is_a?(Array) + if orgs.empty? + where("1=0") + else + ids = orgs.map(&:id) + where("#{Principal.table_name}.id NOT IN (SELECT DISTINCT user_id FROM #{OrgMember.table_name} WHERE organization_id IN (?))", ids) + end + } scope :sorted, lambda { order(*Principal.fields_for_order_statement)} diff --git a/app/models/user.rb b/app/models/user.rb index 4c6449863..740523707 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -770,6 +770,21 @@ class User < Principal courses.to_a.include?(course) end + def member_of_org?(org) + OrgMember.where("user_id =? and organization_id =?", self.id, org.id).count > 0 + end + + def admin_of_org?(org) + if OrgMember.where("user_id =? and organization_id =?", self.id, org.id).count == 0 + return false + end + role = OrgMember.where("user_id =? and organization_id =?", self.id, org.id)[0].roles[0] + unless role.nil? + role.name == 'orgManager' ? true : false + else + false + end + end def member_of_course_group?(course_group) course_groups.to_a.include?(course_group) end diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb new file mode 100644 index 000000000..ffa05ff61 --- /dev/null +++ b/app/views/org_document_comments/edit.html.erb @@ -0,0 +1,43 @@ +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> + +
        +
        编辑文章
        +
        +<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id),:method => 'put', :id => 'new_org_document_form' do |f| %> +
        +
        + +
        +
        +
        +
        + <%= kindeditor_tag 'org_document_comment[content]',@org_document.content, :editor_id => 'org_document_description_editor', :height => "150px" %> +
        +
        + + +

        +
        + +
        + 确定 + 或 + 取消 +
        +
        + +
        +
        +<% end %> \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index e9bd6698b..6641ae23d 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -25,7 +25,9 @@ 设为首页 <% end %> -
      • 编辑文章
        • +
      • + <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :class => "postOptionLink" %> +
      • <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',:remote => true, :class => 'postOptionLink' %>
        • diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index e203b5eed..78cd21504 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -38,7 +38,7 @@
        - + <%#= form_for( @organization,{:controller => 'organizations',:action => 'update',:id=>@organization,:html=>{:id=>'update_org_form',:method=>'put'}}) do %> <%= labelled_form_for @organization do |f|%> @@ -55,14 +55,14 @@
        -
        组织URL： -
        https：// - - .trustie.net申请 -

        - -
        -
        + + + + + + + +
        公开 : class="ml3" />
        diff --git a/public/images/org_default.jpg b/public/images/org_default.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ad1b4f007d0c6141a10715ce46f447630e3ce376 GIT binary patch literal 1897 zcmbVMdr%W+5WmYoMM0Bb02^w&UPJ^Xm&=PJ8X+Wsq6GvLL9G~)10p6DFNY-9VzFw` zYN=8jTkErfD5%6LP{vk}D)_)^3yRP2i8ETo(V|wdq?ZUjW*q8M%0Kjz(B62CpszgzXO`tatS-8MJ zm{GgliedsG3QUZ$TlI!KoPx9P9Fs+b+&|EWz$T*#nITOOCRjCiuIZyf5>G8moMtG@ zGboHm)FgPKU1>L4%{Zlp?dJIwo6@dAJm5-t?N*}*>@lJ8REXNm3a2Mbg*60;!%~4b z!XU&jSSAx-5~)mvjfX`-OoR&QR~CUulv0^e6bbhWLbH*^Y-Nfzwx5gsQz89H6%-T* z3d90}%t0}QLgB^`i6Ur=2%Ez~>Fp5~8-D;ni`xvO$x4|B3+zVJXA$|73ZWx?k%HNp zknj@tt<^G{-FbPeZBz>WDvY;U+on0JIGTdnhGpR#=lNgU8M=S&T%1EzEs9FS6C*q-h~;j3o&(?5VHP^cH@NRES9> zLa|QxB5%1gMjIm$V;ZqGRv{EikbYm||EU>D2ZOqs>r9%I)9zz+gxVu%ey0ln!Z zpO=)dGiz&hfep<$&O7nXmnQFvZC+RLTk)0CrALpCd%%n!degg(6frLE?P)^~f7-lp z_JXTLWFt{iUz5vSzy{eYw)+$AP|n+z(vt7JCO-9!pZ$1sO=6u6+^Ei)P^NmAxT1nU z28F;m9qS+Lsi~OZKP+evZ)tRGzpsD9>Xo%svJ2K9>l-FDs~4BIZ~gB5r^+Wo#GMyK zBWGq79y(C_MY;4sP>a{n^U8@W2kT^3kAk$HrLBpj-8q&$hNK zKAAMPXj?*DdHb);;{vkpjxf~J&7ECRGWf{WlZnIchuiz)wQn9e+i|}k z&Z8#oLcfssGt%O^RN&ljyIgs1+ry3E-Y&=8!wwp+8Z;}=IIFXOM}J&)Q- zuNJ1QYnTED2B+Qx9**Xa86B+Z&2u)Yw*PSb)K^f~ja5Bet8)G>W`5n(x4d!UL+MV% OokfMWGD?bF=l=tIZIm|v literal 0 HcmV?d00001 From 2c5cd1a4b33a39c8884b05d7ef5f3dd0d22c6e15 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 18:14:56 +0800 Subject: [PATCH 028/285] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=88=AA=E6=AD=A2=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=92=8C=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9Flabel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 6d929ac5f..0baf31ab2 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -17,11 +17,13 @@
        <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id,:select_course => defined?(select_course)),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%> +
        <%= calendar_for('homework_end_time')%>
        -
        + +
        <%= calendar_for('homework_publish_time')%>
        From 368d755499e5cb34cd8ad5c150c14e09a6e933fd Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 18:41:10 +0800 Subject: [PATCH 029/285] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=AE=A1=E7=90=86?= =?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/views/organizations/_org_member_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb index 23a31fab3..3a27965c0 100644 --- a/app/views/organizations/_org_member_list.html.erb +++ b/app/views/organizations/_org_member_list.html.erb @@ -13,7 +13,7 @@ <% if User.current.language == "zh" %> <% if role.id == 11 %> - + <% elsif role.id == 12 %> <% end %> From 6fd76eb62282eebde06546379dce68d76714842c Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:02:00 +0800 Subject: [PATCH 030/285] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=88=90=E5=91=98?= =?UTF-8?q?=E8=A6=81=E5=81=9A=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_member_list.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb index 3a27965c0..fdaf9ff8d 100644 --- a/app/views/organizations/_org_member_list.html.erb +++ b/app/views/organizations/_org_member_list.html.erb @@ -37,7 +37,8 @@
      • <% if ( (User.current.id == member.organization.creator_id || member.roles[0].name == "orgManager" ) && member.user_id != member.organization.creator_id )%> - 编辑 | <%= link_to '删除', org_member_path(member.id),:method=>'delete', :remote => true %><% end %> + 编辑 | + <%= link_to '删除', org_member_path(member.id),:method=>'delete',:confirm=>'您确定要删除么?', :remote => true %><% end %>
        • From b24fadea05ce2082e29963c19be8381e3ddc61ca Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:15:35 +0800 Subject: [PATCH 031/285] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=20=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E5=81=9A=E6=88=90?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=80=E6=A0=B7=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- .../organizations/_org_member_list.html.erb | 8 +- app/views/organizations/setting.html.erb | 1 - db/schema.rb | 357 ++---------------- public/stylesheets/org.css | 4 +- 5 files changed, 40 insertions(+), 332 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index dbf246141..ec2f52779 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -52,7 +52,7 @@ module ApplicationHelper def get_org_member_role_name member case member.roles[0].name when 'orgManager' - '组织管理员' + '管理人员' when 'orgMember' '组织成员' end diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb index fdaf9ff8d..46403094f 100644 --- a/app/views/organizations/_org_member_list.html.erb +++ b/app/views/organizations/_org_member_list.html.erb @@ -1,7 +1,7 @@ <% members.each do |member|%>
        <% end %> -
      • <% if ( (User.current.id == member.organization.creator_id || member.roles[0].name == "orgManager" ) && member.user_id != member.organization.creator_id )%> - 编辑 | - <%= link_to '删除', org_member_path(member.id),:method=>'delete',:confirm=>'您确定要删除么?', :remote => true %><% end %> -
        • + 编辑 + <%= link_to '删除', org_member_path(member.id),:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
        <% end %> \ No newline at end of file diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index 78cd21504..82b28fb8a 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -74,7 +74,6 @@
        • 用户
        • 角色
          • -
        diff --git a/db/schema.rb b/db/schema.rb index 90f58aa3c..1f48eaf02 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -293,16 +293,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.boolean "diff_all" end - create_table "columns_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Table_name", :limit => 64, :default => "", :null => false - t.string "Column_name", :limit => 64, :default => "", :null => false - t.timestamp "Timestamp", :null => false - t.string "Column_priv", :limit => 0, :default => "", :null => false - end - create_table "comments", :force => true do |t| t.string "commented_type", :limit => 30, :default => "", :null => false t.integer "commented_id", :default => 0, :null => false @@ -501,33 +491,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" - create_table "db", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Select_priv", :limit => 1, :default => "N", :null => false - t.string "Insert_priv", :limit => 1, :default => "N", :null => false - t.string "Update_priv", :limit => 1, :default => "N", :null => false - t.string "Delete_priv", :limit => 1, :default => "N", :null => false - t.string "Create_priv", :limit => 1, :default => "N", :null => false - t.string "Drop_priv", :limit => 1, :default => "N", :null => false - t.string "Grant_priv", :limit => 1, :default => "N", :null => false - t.string "References_priv", :limit => 1, :default => "N", :null => false - t.string "Index_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false - t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false - t.string "Create_view_priv", :limit => 1, :default => "N", :null => false - t.string "Show_view_priv", :limit => 1, :default => "N", :null => false - t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Execute_priv", :limit => 1, :default => "N", :null => false - t.string "Event_priv", :limit => 1, :default => "N", :null => false - t.string "Trigger_priv", :limit => 1, :default => "N", :null => false - end - - add_index "db", ["User"], :name => "User" - create_table "delayed_jobs", :force => true do |t| t.integer "priority", :default => 0, :null => false t.integer "attempts", :default => 0, :null => false @@ -565,26 +528,23 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "documents", ["created_on"], :name => "index_documents_on_created_on" add_index "documents", ["project_id"], :name => "documents_project_id" - create_table "dts", :primary_key => "Num", :force => true do |t| - t.string "Defect", :limit => 50 - t.string "Category", :limit => 50 - t.string "File" - t.string "Method" - t.string "Module", :limit => 20 - t.string "Variable", :limit => 50 - t.integer "StartLine" - t.integer "IPLine" - t.string "IPLineCode", :limit => 200 - t.string "Judge", :limit => 15 - t.integer "Review", :limit => 1 + create_table "dts", :force => true do |t| + t.string "IPLineCode" t.string "Description" - t.text "PreConditions", :limit => 2147483647 - t.text "TraceInfo", :limit => 2147483647 - t.text "Code", :limit => 2147483647 + t.string "Num" + t.string "Variable" + t.string "TraceInfo" + t.string "Method" + t.string "File" + t.string "IPLine" + t.string "Review" + t.string "Category" + t.string "Defect" + t.string "PreConditions" + t.string "StartLine" t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "id", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "enabled_modules", :force => true do |t| @@ -609,31 +569,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" - create_table "event", :id => false, :force => true do |t| - t.string "db", :limit => 64, :default => "", :null => false - t.string "name", :limit => 64, :default => "", :null => false - t.binary "body", :limit => 2147483647, :null => false - t.string "definer", :limit => 77, :default => "", :null => false - t.datetime "execute_at" - t.integer "interval_value" - t.string "interval_field", :limit => 18 - t.timestamp "created", :null => false - t.timestamp "modified", :null => false - t.datetime "last_executed" - t.datetime "starts" - t.datetime "ends" - t.string "status", :limit => 18, :default => "ENABLED", :null => false - t.string "on_completion", :limit => 8, :default => "DROP", :null => false - t.string "sql_mode", :limit => 0, :default => "", :null => false - t.string "comment", :limit => 64, :default => "", :null => false - t.integer "originator", :null => false - t.string "time_zone", :limit => 64, :default => "SYSTEM", :null => false - t.string "character_set_client", :limit => 32 - t.string "collation_connection", :limit => 32 - t.string "db_collation", :limit => 32 - t.binary "body_utf8", :limit => 2147483647 - end - create_table "first_pages", :force => true do |t| t.string "web_title" t.string "title" @@ -685,21 +620,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "locked" end - create_table "func", :primary_key => "name", :force => true do |t| - t.boolean "ret", :default => false, :null => false - t.string "dl", :limit => 128, :default => "", :null => false - t.string "type", :limit => 9, :null => false - end - - create_table "general_log", :id => false, :force => true do |t| - t.timestamp "event_time", :null => false - t.text "user_host", :limit => 16777215, :null => false - t.integer "thread_id", :null => false - t.integer "server_id", :null => false - t.string "command_type", :limit => 64, :null => false - t.text "argument", :limit => 16777215, :null => false - end - create_table "groups_users", :id => false, :force => true do |t| t.integer "group_id", :null => false t.integer "user_id", :null => false @@ -707,35 +627,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true - create_table "help_category", :primary_key => "help_category_id", :force => true do |t| - t.string "name", :limit => 64, :null => false - t.integer "parent_category_id", :limit => 2 - t.text "url", :null => false - end - - add_index "help_category", ["name"], :name => "name", :unique => true - - create_table "help_keyword", :primary_key => "help_keyword_id", :force => true do |t| - t.string "name", :limit => 64, :null => false - end - - add_index "help_keyword", ["name"], :name => "name", :unique => true - - create_table "help_relation", :id => false, :force => true do |t| - t.integer "help_topic_id", :null => false - t.integer "help_keyword_id", :null => false - end - - create_table "help_topic", :primary_key => "help_topic_id", :force => true do |t| - t.string "name", :limit => 64, :null => false - t.integer "help_category_id", :limit => 2, :null => false - t.text "description", :null => false - t.text "example", :null => false - t.text "url", :null => false - end - - add_index "help_topic", ["name"], :name => "name", :unique => true - create_table "homework_attaches", :force => true do |t| t.integer "bid_id" t.integer "user_id" @@ -758,12 +649,13 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.text "description" t.date "publish_time" t.date "end_time" - t.integer "homework_type", :default => 1 + t.integer "homework_type", :default => 1 t.string "late_penalty" t.integer "course_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "teacher_priority", :default => 1 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "teacher_priority", :default => 1 + t.integer "anonymous_comment", :default => 0 end create_table "homework_detail_manuals", :force => true do |t| @@ -820,29 +712,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "updated_at", :null => false end - create_table "host", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "Select_priv", :limit => 1, :default => "N", :null => false - t.string "Insert_priv", :limit => 1, :default => "N", :null => false - t.string "Update_priv", :limit => 1, :default => "N", :null => false - t.string "Delete_priv", :limit => 1, :default => "N", :null => false - t.string "Create_priv", :limit => 1, :default => "N", :null => false - t.string "Drop_priv", :limit => 1, :default => "N", :null => false - t.string "Grant_priv", :limit => 1, :default => "N", :null => false - t.string "References_priv", :limit => 1, :default => "N", :null => false - t.string "Index_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false - t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false - t.string "Create_view_priv", :limit => 1, :default => "N", :null => false - t.string "Show_view_priv", :limit => 1, :default => "N", :null => false - t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Execute_priv", :limit => 1, :default => "N", :null => false - t.string "Trigger_priv", :limit => 1, :default => "N", :null => false - end - create_table "invite_lists", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -945,6 +814,16 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" + create_table "journal_details_copy", :force => true do |t| + t.integer "journal_id", :default => 0, :null => false + t.string "property", :limit => 30, :default => "", :null => false + t.string "prop_key", :limit => 30, :default => "", :null => false + t.text "old_value" + t.text "value" + end + + add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" + create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" @@ -1072,15 +951,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) 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 "ndb_binlog_index", :primary_key => "epoch", :force => true do |t| - t.integer "Position", :limit => 8, :null => false - t.string "File", :null => false - t.integer "inserts", :limit => 8, :null => false - t.integer "updates", :limit => 8, :null => false - t.integer "deletes", :limit => 8, :null => false - t.integer "schemaops", :limit => 8, :null => false - end - create_table "news", :force => true do |t| t.integer "project_id" t.string "title", :limit => 60, :default => "", :null => false @@ -1204,8 +1074,10 @@ ActiveRecord::Schema.define(:version => 20151110011003) do end create_table "org_members", :force => true do |t| - t.integer "user_id" - t.integer "organization_id" + t.integer "user_id" + t.integer "organization_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "org_projects", :force => true do |t| @@ -1232,10 +1104,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "updated_at", :null => false end - create_table "plugin", :primary_key => "name", :force => true do |t| - t.string "dl", :limit => 128, :default => "", :null => false - end - create_table "poll_answers", :force => true do |t| t.integer "poll_question_id" t.text "answer_text" @@ -1311,42 +1179,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "updated_at", :null => false end - create_table "proc", :id => false, :force => true do |t| - t.string "db", :limit => 64, :default => "", :null => false - t.string "name", :limit => 64, :default => "", :null => false - t.string "type", :limit => 9, :null => false - t.string "specific_name", :limit => 64, :default => "", :null => false - t.string "language", :limit => 3, :default => "SQL", :null => false - t.string "sql_data_access", :limit => 17, :default => "CONTAINS_SQL", :null => false - t.string "is_deterministic", :limit => 3, :default => "NO", :null => false - t.string "security_type", :limit => 7, :default => "DEFINER", :null => false - t.binary "param_list", :null => false - t.binary "returns", :limit => 2147483647, :null => false - t.binary "body", :limit => 2147483647, :null => false - t.string "definer", :limit => 77, :default => "", :null => false - t.timestamp "created", :null => false - t.timestamp "modified", :null => false - t.string "sql_mode", :limit => 0, :default => "", :null => false - t.text "comment", :null => false - t.string "character_set_client", :limit => 32 - t.string "collation_connection", :limit => 32 - t.string "db_collation", :limit => 32 - t.binary "body_utf8", :limit => 2147483647 - end - - create_table "procs_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Routine_name", :limit => 64, :default => "", :null => false - t.string "Routine_type", :limit => 9, :null => false - t.string "Grantor", :limit => 77, :default => "", :null => false - t.string "Proc_priv", :limit => 0, :default => "", :null => false - t.timestamp "Timestamp", :null => false - end - - add_index "procs_priv", ["Grantor"], :name => "Grantor" - create_table "project_infos", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1421,18 +1253,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" - create_table "proxies_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Proxied_host", :limit => 60, :default => "", :null => false - t.string "Proxied_user", :limit => 16, :default => "", :null => false - t.boolean "With_grant", :default => false, :null => false - t.string "Grantor", :limit => 77, :default => "", :null => false - t.timestamp "Timestamp", :null => false - end - - add_index "proxies_priv", ["Grantor"], :name => "Grantor" - create_table "queries", :force => true do |t| t.integer "project_id" t.string "name", :default => "", :null => false @@ -1546,17 +1366,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "is_teacher_score", :default => 0 end - create_table "servers", :primary_key => "Server_name", :force => true do |t| - t.string "Host", :limit => 64, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "Username", :limit => 64, :default => "", :null => false - t.string "Password", :limit => 64, :default => "", :null => false - t.integer "Port", :default => 0, :null => false - t.string "Socket", :limit => 64, :default => "", :null => false - t.string "Wrapper", :limit => 64, :default => "", :null => false - t.string "Owner", :limit => 64, :default => "", :null => false - end - create_table "settings", :force => true do |t| t.string "name", :default => "", :null => false t.text "value" @@ -1577,20 +1386,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.string "description" end - create_table "slow_log", :id => false, :force => true do |t| - t.timestamp "start_time", :null => false - t.text "user_host", :limit => 16777215, :null => false - t.time "query_time", :null => false - t.time "lock_time", :null => false - t.integer "rows_sent", :null => false - t.integer "rows_examined", :null => false - t.string "db", :limit => 512, :null => false - t.integer "last_insert_id", :null => false - t.integer "insert_id", :null => false - t.integer "server_id", :null => false - t.text "sql_text", :limit => 16777215, :null => false - end - create_table "softapplications", :force => true do |t| t.string "name" t.text "description" @@ -1672,19 +1467,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.string "subject" end - create_table "tables_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Table_name", :limit => 64, :default => "", :null => false - t.string "Grantor", :limit => 77, :default => "", :null => false - t.timestamp "Timestamp", :null => false - t.string "Table_priv", :limit => 0, :default => "", :null => false - t.string "Column_priv", :limit => 0, :default => "", :null => false - end - - add_index "tables_priv", ["Grantor"], :name => "Grantor" - create_table "taggings", :force => true do |t| t.integer "tag_id" t.integer "taggable_id" @@ -1734,32 +1516,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "time_entries", ["project_id"], :name => "time_entries_project_id" add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" - create_table "time_zone", :primary_key => "Time_zone_id", :force => true do |t| - t.string "Use_leap_seconds", :limit => 1, :default => "N", :null => false - end - - create_table "time_zone_leap_second", :primary_key => "Transition_time", :force => true do |t| - t.integer "Correction", :null => false - end - - create_table "time_zone_name", :primary_key => "Name", :force => true do |t| - t.integer "Time_zone_id", :null => false - end - - create_table "time_zone_transition", :id => false, :force => true do |t| - t.integer "Time_zone_id", :null => false - t.integer "Transition_time", :limit => 8, :null => false - t.integer "Transition_type_id", :null => false - end - - create_table "time_zone_transition_type", :id => false, :force => true do |t| - t.integer "Time_zone_id", :null => false - t.integer "Transition_type_id", :null => false - t.integer "Offset", :default => 0, :null => false - t.integer "Is_DST", :limit => 1, :default => 0, :null => false - t.string "Abbreviation", :limit => 8, :default => "", :null => false - end - create_table "tokens", :force => true do |t| t.integer "user_id", :default => 0, :null => false t.string "action", :limit => 30, :default => "", :null => false @@ -1778,51 +1534,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "fields_bits", :default => 0 end - create_table "user", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Password", :limit => 41, :default => "", :null => false - t.string "Select_priv", :limit => 1, :default => "N", :null => false - t.string "Insert_priv", :limit => 1, :default => "N", :null => false - t.string "Update_priv", :limit => 1, :default => "N", :null => false - t.string "Delete_priv", :limit => 1, :default => "N", :null => false - t.string "Create_priv", :limit => 1, :default => "N", :null => false - t.string "Drop_priv", :limit => 1, :default => "N", :null => false - t.string "Reload_priv", :limit => 1, :default => "N", :null => false - t.string "Shutdown_priv", :limit => 1, :default => "N", :null => false - t.string "Process_priv", :limit => 1, :default => "N", :null => false - t.string "File_priv", :limit => 1, :default => "N", :null => false - t.string "Grant_priv", :limit => 1, :default => "N", :null => false - t.string "References_priv", :limit => 1, :default => "N", :null => false - t.string "Index_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_priv", :limit => 1, :default => "N", :null => false - t.string "Show_db_priv", :limit => 1, :default => "N", :null => false - t.string "Super_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false - t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false - t.string "Execute_priv", :limit => 1, :default => "N", :null => false - t.string "Repl_slave_priv", :limit => 1, :default => "N", :null => false - t.string "Repl_client_priv", :limit => 1, :default => "N", :null => false - t.string "Create_view_priv", :limit => 1, :default => "N", :null => false - t.string "Show_view_priv", :limit => 1, :default => "N", :null => false - t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Create_user_priv", :limit => 1, :default => "N", :null => false - t.string "Event_priv", :limit => 1, :default => "N", :null => false - t.string "Trigger_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tablespace_priv", :limit => 1, :default => "N", :null => false - t.string "ssl_type", :limit => 9, :default => "", :null => false - t.binary "ssl_cipher", :null => false - t.binary "x509_issuer", :null => false - t.binary "x509_subject", :null => false - t.integer "max_questions", :default => 0, :null => false - t.integer "max_updates", :default => 0, :null => false - t.integer "max_connections", :default => 0, :null => false - t.integer "max_user_connections", :default => 0, :null => false - t.string "plugin", :limit => 64, :default => "" - t.text "authentication_string" - end - create_table "user_activities", :force => true do |t| t.string "act_type" t.integer "act_id" diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 3857b53e2..46083ea08 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -20,8 +20,8 @@ a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;} a.saveBtn:hover {background-color:#297fb8;} .orgMemberList {width:410px; float:left;} .orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;} -.orgListUser {width:125px; float:left;} -.orgListRole {width:285px; float:left;} +.orgListUser {width:119px; float:left;} +.orgListRole {width:180px; float:left;} .orgMemContainer {width:278px;} .orgMemberAdd {float:right; width:240px;} .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;} From c2e783d78b73363c50fec4763dde37346607b475 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:19:01 +0800 Subject: [PATCH 032/285] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=20=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E5=81=9A=E6=88=90?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=80=E6=A0=B7=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_member_list.html.erb | 4 ++-- public/stylesheets/org.css | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb index 46403094f..dcbd98451 100644 --- a/app/views/organizations/_org_member_list.html.erb +++ b/app/views/organizations/_org_member_list.html.erb @@ -25,10 +25,10 @@ <% end %> <%= hidden_field_tag 'membership[role_ids][]', '' %>
        - + <%= l(:button_change)%> - + <%= l(:button_cancel)%>
        diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 46083ea08..9b44be938 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -32,6 +32,8 @@ a.saveBtn:hover {background-color:#297fb8;} padding: 2px 5px; border: 1px solid #EAEAEA;} +a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;} + /*项目关联css*/ .relateOrg {width:335px;} .relatedList {width:335px;} From df0051cdd4ba33c98a88ab5838b0cb02a9e0cd0c Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:26:39 +0800 Subject: [PATCH 033/285] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=20=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E5=81=9A=E6=88=90?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=80=E6=A0=B7=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_member_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb index dcbd98451..0ac43d12e 100644 --- a/app/views/organizations/_org_member_list.html.erb +++ b/app/views/organizations/_org_member_list.html.erb @@ -36,7 +36,7 @@ <% if ( (User.current.id == member.organization.creator_id || member.roles[0].name == "orgManager" ) && member.user_id != member.organization.creator_id )%> - 编辑 + 编辑 <%= link_to '删除', org_member_path(member.id),:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
        From f1b61c1581010fd3646575827316b3eb25f02897 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:32:15 +0800 Subject: [PATCH 034/285] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E5=B0=86=E4=B8=A2=E5=A4=B1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_member/org_member_autocomplete.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/org_member/org_member_autocomplete.js.erb b/app/views/org_member/org_member_autocomplete.js.erb index b1672038a..05cf3947c 100644 --- a/app/views/org_member/org_member_autocomplete.js.erb +++ b/app/views/org_member/org_member_autocomplete.js.erb @@ -1,5 +1,5 @@ <% if @org%> - var checked = $("#not_org_members input:checked").size(); + var checked = $("#principals_for_new_member input:checked").size(); if(checked > 0) { alert('翻页或搜索后将丢失当前选择的用户数据!'); From e265047ba96e1a81617fa4241d09fac393a47955 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:37:28 +0800 Subject: [PATCH 035/285] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=88=90=E5=91=98?= =?UTF-8?q?=E7=BF=BB=E9=A1=B5=E9=9D=A0=E5=8F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/org_member_helper.rb | 2 +- app/helpers/organizations_helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/org_member_helper.rb b/app/helpers/org_member_helper.rb index 08313f4e9..fd70a0516 100644 --- a/app/helpers/org_member_helper.rb +++ b/app/helpers/org_member_helper.rb @@ -11,6 +11,6 @@ module OrgMemberHelper links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options| link_to text, org_member_autocomplete_org_member_index_path(parameters.merge(:q => params[:q],:flag => true,:org=> org, :format => 'js')), :remote => true } - s + content_tag('ul', links,:class => 'wlist', :id => "org_member_pagination_links" ) + s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" ) end end diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb index 33d5dea6e..55a7a5d42 100644 --- a/app/helpers/organizations_helper.rb +++ b/app/helpers/organizations_helper.rb @@ -14,7 +14,7 @@ module OrganizationsHelper links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options| link_to text, org_member_autocomplete_org_member_index_path( parameters.merge(:q => params[:q],:flag => true,:org=>org, :format => 'js')), :remote => true } - s + content_tag('ul', links,:class => 'wlist', :id => "org_member_pagination_links" ) + s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" ) end end From 99637924b4ce69e17a052285ddd33f3446c7b7cf Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:52:46 +0800 Subject: [PATCH 036/285] =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E9=99=90=E5=88=B6=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_document_comments/_new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb index 91bcad2a9..b7a9b3a0f 100644 --- a/app/views/org_document_comments/_new.html.erb +++ b/app/views/org_document_comments/_new.html.erb @@ -15,7 +15,7 @@ <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
        - +
        From b3a234cfc6086290ae591a7d7755fcd3c608a1db Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:56:39 +0800 Subject: [PATCH 037/285] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E4=B9=9F=E9=9C=80=E8=A6=81=E5=AF=B9=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E9=99=90=E5=88=B6=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_document_comments/edit.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb index ffa05ff61..ffb04a4f9 100644 --- a/app/views/org_document_comments/edit.html.erb +++ b/app/views/org_document_comments/edit.html.erb @@ -18,7 +18,7 @@ <%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id),:method => 'put', :id => 'new_org_document_form' do |f| %>
        - +
        From 6ec27761fbaa280a4a97234702249c6b8fa40fe8 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 12 Nov 2015 20:57:41 +0800 Subject: [PATCH 038/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=8F=8A=E7=BC=BA=E9=99=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 9 +++- app/models/org_member.rb | 1 + app/models/user.rb | 1 + app/views/layouts/_logined_header.html.erb | 3 ++ app/views/layouts/base_org.html.erb | 9 ++-- app/views/org_document_comments/_new.html.erb | 14 +++++- app/views/organizations/_org_members.html.erb | 26 +++++++++++ .../organizations/_show_org_document.html.erb | 44 ++++++++++--------- app/views/organizations/check_uniq.js.erb | 32 ++++++++------ app/views/organizations/members.html.erb | 1 + app/views/organizations/new.html.erb | 4 +- config/routes.rb | 1 + 12 files changed, 102 insertions(+), 43 deletions(-) create mode 100644 app/views/organizations/_org_members.html.erb create mode 100644 app/views/organizations/members.html.erb diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 25d0783fb..0356bd48c 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -1,6 +1,6 @@ # encoding: utf-8 class OrganizationsController < ApplicationController - before_filter :find_organization, :only => [:show] + before_filter :find_organization, :only => [:show, :members] layout 'base_org' def index @@ -25,7 +25,7 @@ class OrganizationsController < ApplicationController end def show - if User.current.admin? || User.current.member_of_org?(@organization) + if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization) @organization = Organization.find(params[:id]) @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?) || (container_id =? and org_act_type =? and org_act_id !=?)', @organization.id, 'CreateOrganization ', @organization.id, 'OrgDocumentComment', @organization.home_id).order('updated_at desc') @@ -50,6 +50,7 @@ class OrganizationsController < ApplicationController def check_uniq @check = false; + @org_name = params[:org_name].strip @config_page = params[:config_page] sameName = @config_page ? Organization.where('name = ? and id != ?',params[:org_name],params[:org_id].to_i).count == 0 : Organization.where('name = ?',params[:org_name]).count == 0 if sameName == true @@ -91,4 +92,8 @@ class OrganizationsController < ApplicationController format.js end end + + def members + @members = OrgMember.where("organization_id =?", @organization.id) + end end diff --git a/app/models/org_member.rb b/app/models/org_member.rb index 091c20f22..a1c61f99d 100644 --- a/app/models/org_member.rb +++ b/app/models/org_member.rb @@ -1,6 +1,7 @@ class OrgMember < ActiveRecord::Base attr_accessible :organization_id, :role, :user_id belongs_to :organization + belongs_to :user has_many :roles ,:through => :org_member_roles,:foreign_key => 'role_id' has_many :org_member_roles,:dependent => :destroy diff --git a/app/models/user.rb b/app/models/user.rb index 740523707..79175f42e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -97,6 +97,7 @@ class User < Principal has_many :org_document_comments, :dependent =>:destroy has_one :api_token, :class_name => 'Token', :conditions => "action='api'" belongs_to :auth_source + has_many :org_members belongs_to :ucourse, :class_name => 'Course', :foreign_key => :id #huang ## added by xianbo for delete # has_many :biding_projects, :dependent => :destroy diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index c750ff3b5..ffda9c559 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -86,6 +86,9 @@
      • <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
        • +
      • + <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%> +
      • <%= link_to "退出",signout_path,:class => "menuGrey",:method => "post"%> diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index ef65bf8b2..6209ad260 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -55,13 +55,16 @@
        - <%= link_to '文章', organization_org_document_comments_path(@organization) %> (  + <%= link_to '文章', organization_org_document_comments_path(@organization) %> ( <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %> -  ) | 成员 ( <%= @organization.org_members.count %>  ) + ) |  + <%= link_to '成员', members_organization_path(@organization.id ) %> （<%= @organization.org_members.count %> )
        • -
        动态
        +
        + <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %> +
        项目
          diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb index 91bcad2a9..6c4934f1b 100644 --- a/app/views/org_document_comments/_new.html.erb +++ b/app/views/org_document_comments/_new.html.erb @@ -1,14 +1,24 @@ <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> @@ -30,7 +40,7 @@
          - 确定 + 确定 或 取消
          diff --git a/app/views/organizations/_org_members.html.erb b/app/views/organizations/_org_members.html.erb new file mode 100644 index 000000000..8f80b2997 --- /dev/null +++ b/app/views/organizations/_org_members.html.erb @@ -0,0 +1,26 @@ +<%= stylesheet_link_tag 'courses' %> +
          +

          组织成员

          +
          +
          +
          +
          + + <% members.each do |member| %> +
          + + <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32)) %> + + <%= l(:label_username)%> + <%= link_to(member.user.show_name, user_path(member.user),:class => "ml10 c_blue02") %> + <%= member.user.admin_of_org?(organization)?"组织管理员":"组织成员" %> +
          +
          + <% end%> + +
            + <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
          +
          +
          +
          \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 72b7e00dc..21e16549c 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -16,28 +16,32 @@ <%= document.content.html_safe %>
          <% end %> -
          -
            -
          • -
              -
            • - <%= form_for('new_form',:url => {:controller => 'organizations',:action => 'set_homepage',:id => document.organization_id, :home_id => document.id},:method => "put",:remote => true) do |f|%> - 设为首页 - <% end %> -
              • -
            • - <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :class => "postOptionLink" %> -
              • -
            • - <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',:remote => true, :class => 'postOptionLink' %> + <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id) || User.current.id == document.creator_id) %> +
              +
                +
              • +
                  +
                • + <%= form_for('new_form',:url => {:controller => 'organizations',:action => 'set_homepage',:id => document.organization_id, :home_id => document.id},:method => "put",:remote => true) do |f|%> + 设为首页 + <% end %> +
                  • +
                • + <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :class => "postOptionLink" %> +
                  • +
                • + <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete', + :data => {:confirm => l(:text_are_you_sure)}, + :remote => true, :class => 'postOptionLink' %> +
                  • +
              -
              • -
            -
          -
        -
        -
        +
        +
        +
        +
        + <% end %> <% comments_for_doc = document.children.reorder("created_at desc") %> <% count = document.children.count() %> diff --git a/app/views/organizations/check_uniq.js.erb b/app/views/organizations/check_uniq.js.erb index 2d295c4d1..f38578025 100644 --- a/app/views/organizations/check_uniq.js.erb +++ b/app/views/organizations/check_uniq.js.erb @@ -1,18 +1,22 @@ -<%if @check == false %> - $checkName = false - <% if @config_page%> - $("#check_name_hint").html('名字不能重复').show(); - <% else%> - $("#organization_name_notice").html('名字不能重复').show(); +<% if !@org_name.blank? %> + <%if @check == false %> + $checkName = false + <% if @config_page%> + $("#check_name_hint").html('名字不能重复').show(); + <% else%> + $("#organization_name_notice").html('名字不能重复').show(); - <%end%> + <%end%> -<% else %> - $checkName = true; - <% if @config_page%> - $("#check_name_hint").html('名字可以使用').show(); - <% else%> + <% else %> + $checkName = true; + <% if @config_page%> + $("#check_name_hint").html('名字可以使用').show(); + <% else%> - $("#organization_name_notice").html('名字可以使用').show(); + $("#organization_name_notice").html('名字可以使用').show(); + <%end%> <%end%> -<%end%> \ No newline at end of file +<% else %> +$("#check_name_hint").html('名字不能为空').show(); +<% end %> \ No newline at end of file diff --git a/app/views/organizations/members.html.erb b/app/views/organizations/members.html.erb new file mode 100644 index 000000000..91e80b232 --- /dev/null +++ b/app/views/organizations/members.html.erb @@ -0,0 +1 @@ +<%= render :partial => 'org_members', :locals => {:members => @members, :organization => @organization} %> \ No newline at end of file diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb index 2496ac133..08311d51b 100644 --- a/app/views/organizations/new.html.erb +++ b/app/views/organizations/new.html.erb @@ -48,8 +48,8 @@ <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
        @@ -42,7 +48,7 @@
        确定 或 - 取消 + 取消
        diff --git a/app/views/org_member/create.js.erb b/app/views/org_member/create.js.erb index 868dd32b6..f1e48281f 100644 --- a/app/views/org_member/create.js.erb +++ b/app/views/org_member/create.js.erb @@ -3,4 +3,5 @@ <% else %> $("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>'); $("#principals_for_new_member").html(''); + $("#org_members_count_id").html("<%= @org.org_members.count %>"); <% end %> \ No newline at end of file diff --git a/app/views/org_member/destroy.js.erb b/app/views/org_member/destroy.js.erb index 8bd949fde..d87e62c17 100644 --- a/app/views/org_member/destroy.js.erb +++ b/app/views/org_member/destroy.js.erb @@ -1 +1,3 @@ +$("#org_members_count_id").html(""); +$("#org_members_count_id").html("<%= @org.org_members.count %>") $("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>'); \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 21e16549c..03e72263b 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -6,7 +6,12 @@
        <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> - TO  <%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %> | 组织 + TO  <%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %> | + <% if defined?(home_id) %> + 首页 + <% else %> + 组织 + <% end %>
        <%= document.title %>
        @@ -16,6 +21,9 @@ <%= document.content.html_safe %>
        <% end %> + <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id) || User.current.id == document.creator_id) %>
          diff --git a/app/views/organizations/set_homepage.js.erb b/app/views/organizations/set_homepage.js.erb index bcebe9d37..b25c4c4d4 100644 --- a/app/views/organizations/set_homepage.js.erb +++ b/app/views/organizations/set_homepage.js.erb @@ -1 +1,2 @@ -location.reload(); \ No newline at end of file +//location.reload(); +window.location.href ='<%= organization_path(@org)%>' \ No newline at end of file diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 2f3610abc..5f1d0e003 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -12,25 +12,29 @@ .homepagePostReplyInputContainer .ke-inline-block {display: none;} .homepagePostReplyInputContainer .ke-container {float: left;} -<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %> - - <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id)} %> - <% end %>
          最新动态
          -
            +
          + +<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %> + +
          + <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id} %> +
          +<% end %> + <% unless @activities.nil? %> <% @activities.each do |act| %> <% if act.org_act_type == 'CreateOrganization' %> @@ -51,11 +55,12 @@ <% if act.org_act_type == 'OrgDocumentComment' %> - <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> +
          + <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> +
          <% end %> <% end %>
            diff --git a/config/routes.rb b/config/routes.rb index 0cefe29b0..b7acc3bfa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -87,9 +87,9 @@ RedmineApp::Application.routes.draw do resources :apply_project_masters delete 'apply_project_masters', :to => 'apply_project_masters#delete' - resources :organization, :except => [:show] do - - end + # resources :organization, :except => [:show] do + # + # end resources :school, :except => [:show] do collection do From 465bc9bd6c64d52eb6c5f0f70361df353874da20 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 13 Nov 2015 15:04:50 +0800 Subject: [PATCH 047/285] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E6=97=B6=E5=80=99=E6=95=B0=E6=8D=AE=E8=81=94?= =?UTF-8?q?=E5=8A=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_resource_create.js.erb | 2 +- app/views/users/user_resource_delete.js.erb | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb index 2d6c4f4d8..f69057273 100644 --- a/app/views/users/user_resource_create.js.erb +++ b/app/views/users/user_resource_create.js.erb @@ -2,6 +2,6 @@ closeModal(); $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>'); //这里不能将翻页的更新 -$("#res_all_count").html(parseInt($("#res_all_count").html())+1); +$("#res_all_count").html('<%= @atta_count%>'); $("#res_count").html(0); $("#checkboxAll").attr('checked',false); \ No newline at end of file diff --git a/app/views/users/user_resource_delete.js.erb b/app/views/users/user_resource_delete.js.erb index a956ed212..e16abf28d 100644 --- a/app/views/users/user_resource_delete.js.erb +++ b/app/views/users/user_resource_delete.js.erb @@ -1,2 +1,5 @@ $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>'); -$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); \ No newline at end of file +$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); +$("#res_all_count").html('<%= @atta_count%>') +$("#res_count").html(0); +$("#checkboxAll").attr('checked',false); \ No newline at end of file From 78ebeaee3b98cdd4074da3c6934c11ec0c89c2a9 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 13 Nov 2015 15:38:16 +0800 Subject: [PATCH 048/285] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_resource.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 3bd114e7c..4fd4d0cb9 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -288,7 +288,7 @@ function batch_delete(){ var data = $("#resources_list_form").serialize(); if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){ - alert("含有上传者不是您的资源"); + alert("您只能删除自己上传的资源，请重新选择后再删除。"); return; } if(data != "" && confirm('确认要删除这些资源吗？')) { From 466f3c4cc356afccfce09a055c450b132ac77e02 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 13 Nov 2015 15:47:39 +0800 Subject: [PATCH 049/285] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=A5=E5=8F=8A=E4=B8=80=E5=AF=B9=E4=B8=80=EF=BC=8C?= =?UTF-8?q?=E4=B8=80=E5=AF=B9=E5=A4=9A=EF=BC=8C=E5=A4=9A=E5=AF=B9=E5=A4=9A?= =?UTF-8?q?=E7=AD=89=E5=85=B3=E7=B3=BB=E7=9A=84=E7=A1=AE=E7=AB=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/exercise.rb | 2 +- app/models/exercise_answer.rb | 2 +- ...exercise_choices.rb => exercise_choice.rb} | 2 +- app/models/exercise_question.rb | 2 +- app/models/exercise_standard_answer.rb | 2 +- app/models/user.rb | 6 +- db/migrate/20151113025341_exercise.rb | 2 +- .../20151113025459_exercise_question.rb | 2 +- ...20151113025549_exercise_standard_answer.rb | 4 +- db/migrate/20151113025721_exercise_answer.rb | 4 +- db/migrate/20151113025751_user_exercise.rb | 2 +- db/schema.rb | 56 ++++++++++++++++++- 12 files changed, 70 insertions(+), 16 deletions(-) rename app/models/{exercise_choices.rb => exercise_choice.rb} (81%) diff --git a/app/models/exercise.rb b/app/models/exercise.rb index 752441947..cbf3a6e91 100644 --- a/app/models/exercise.rb +++ b/app/models/exercise.rb @@ -3,5 +3,5 @@ class Exercise < ActiveRecord::Base belongs_to :user has_many :exercise_questions, :dependent => :destroy,:order => "#{ExerciseQuestion.table_name}.question_number" has_many :exercise_users, :dependent => :destroy - has_many :users, :through => :exercise_users #该文件被哪些用户提交答案过 + has_many :users, :through => :exercise_users #该测试被哪些用户提交答案过 end diff --git a/app/models/exercise_answer.rb b/app/models/exercise_answer.rb index 14b60982a..c62f5bcd5 100644 --- a/app/models/exercise_answer.rb +++ b/app/models/exercise_answer.rb @@ -4,5 +4,5 @@ class ExerciseAnswer < ActiveRecord::Base belongs_to :user belongs_to :exercise_question - belongs_to :exercise_choices + belongs_to :exercise_choice end diff --git a/app/models/exercise_choices.rb b/app/models/exercise_choice.rb similarity index 81% rename from app/models/exercise_choices.rb rename to app/models/exercise_choice.rb index 8e67a8c0a..00d611566 100644 --- a/app/models/exercise_choices.rb +++ b/app/models/exercise_choice.rb @@ -1,4 +1,4 @@ -class ExerciseChoices < ActiveRecord::Base +class ExerciseChoice < ActiveRecord::Base include Redmine::SafeAttributes belongs_to :exercise_question diff --git a/app/models/exercise_question.rb b/app/models/exercise_question.rb index 64ec53e4c..5189b0274 100644 --- a/app/models/exercise_question.rb +++ b/app/models/exercise_question.rb @@ -2,7 +2,7 @@ class ExerciseQuestion < ActiveRecord::Base include Redmine::SafeAttributes belongs_to :exercise - has_many :exercise_choiceses, :order => "#{ExerciseChoices.table_name}.choice_position",:dependent => :destroy + has_many :exercise_choices, :order => "#{ExerciseChoice.table_name}.choice_position",:dependent => :destroy has_many :exercise_answers, :dependent => :destroy has_many :exercise_standard_answers, :dependent => :destroy end diff --git a/app/models/exercise_standard_answer.rb b/app/models/exercise_standard_answer.rb index 2b67a83a2..ce3d08fbf 100644 --- a/app/models/exercise_standard_answer.rb +++ b/app/models/exercise_standard_answer.rb @@ -3,5 +3,5 @@ class ExerciseStandardAnswer < ActiveRecord::Base include Redmine::SafeAttributes belongs_to :exercise_question - belongs_to :exercise_choices + belongs_to :exercise_choice end diff --git a/app/models/user.rb b/app/models/user.rb index 9e470380d..d79ae575a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -82,10 +82,10 @@ class User < Principal has_many :answers, :source => :poll, :through => :poll_users, :dependent => :destroy #用户已经完成问答的问卷 # end #在线测验相关关系 - has_many :exercise_users, :dependent => :destroy #答卷中间表 - has_many :exercise_answers, :dependent => :destroy #针对每个题目学生的答案 + has_many :exercise_user, :dependent => :destroy #答卷中间表 + has_many :exercise_answer, :dependent => :destroy #针对每个题目学生的答案 has_many :exercises, :dependent => :destroy #创建的试卷 - has_many :exercises_answers, :source => :exercises, :through => :exercise_users, :dependent => :destroy #用户已经完成问答的试卷 + has_many :exercises_answers, :source => :exercise, :through => :exercise_user, :dependent => :destroy #用户已经完成问答的试卷 #end #作业相关关系 has_many :homework_commons, :dependent => :destroy diff --git a/db/migrate/20151113025341_exercise.rb b/db/migrate/20151113025341_exercise.rb index 696f8d953..b29bfdb91 100644 --- a/db/migrate/20151113025341_exercise.rb +++ b/db/migrate/20151113025341_exercise.rb @@ -1,6 +1,6 @@ class Exercise < ActiveRecord::Migration def up - create_table :exercise do |t| + create_table :exercises do |t| t.string :exercise_name t.text :exercise_description t.integer :course_id diff --git a/db/migrate/20151113025459_exercise_question.rb b/db/migrate/20151113025459_exercise_question.rb index 5e83504c5..1dd0409f9 100644 --- a/db/migrate/20151113025459_exercise_question.rb +++ b/db/migrate/20151113025459_exercise_question.rb @@ -1,6 +1,6 @@ class ExerciseQuestion < ActiveRecord::Migration def up - create_table :exercise_question do |t| + create_table :exercise_questions do |t| t.string :question_title t.integer :question_type t.integer :question_number diff --git a/db/migrate/20151113025549_exercise_standard_answer.rb b/db/migrate/20151113025549_exercise_standard_answer.rb index 17e59eaf8..8ed1a25be 100644 --- a/db/migrate/20151113025549_exercise_standard_answer.rb +++ b/db/migrate/20151113025549_exercise_standard_answer.rb @@ -1,8 +1,8 @@ class ExerciseStandardAnswer < ActiveRecord::Migration def up - create_table :exercise_standard_answer do |t| + create_table :exercise_standard_answers do |t| t.integer :exercise_question_id - t.integer :exercise_choices_id + t.integer :exercise_choice_id t.text :answer_text t.timestamps end diff --git a/db/migrate/20151113025721_exercise_answer.rb b/db/migrate/20151113025721_exercise_answer.rb index 0a34c15ea..9cc9c5bc7 100644 --- a/db/migrate/20151113025721_exercise_answer.rb +++ b/db/migrate/20151113025721_exercise_answer.rb @@ -1,9 +1,9 @@ class ExerciseAnswer < ActiveRecord::Migration def up - create_table :exercise_answer do |t| + create_table :exercise_answers do |t| t.integer :user_id t.integer :exercise_question_id - t.integer :exercise_choices_id + t.integer :exercise_choice_id t.text :answer_text t.timestamps end diff --git a/db/migrate/20151113025751_user_exercise.rb b/db/migrate/20151113025751_user_exercise.rb index a49053146..d5e521401 100644 --- a/db/migrate/20151113025751_user_exercise.rb +++ b/db/migrate/20151113025751_user_exercise.rb @@ -1,6 +1,6 @@ class UserExercise < ActiveRecord::Migration def up - create_table :exercise_user do |t| + create_table :exercise_users do |t| t.integer :user_id t.integer :exercise_id t.integer :score diff --git a/db/schema.rb b/db/schema.rb index 419b30c3e..418382a64 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151112072948) do +ActiveRecord::Schema.define(:version => 20151113025751) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -572,6 +572,60 @@ ActiveRecord::Schema.define(:version => 20151112072948) do add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" + create_table "exercise_answers", :force => true do |t| + t.integer "user_id" + t.integer "exercise_question_id" + t.integer "exercise_choices_id" + t.text "answer_text" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_choices", :force => true do |t| + t.integer "exercise_question_id" + t.text "choice_text" + t.integer "choice_position" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_questions", :force => true do |t| + t.string "question_title" + t.integer "question_type" + t.integer "question_number" + t.integer "exercise_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_standard_answers", :force => true do |t| + t.integer "exercise_question_id" + t.integer "exercise_choices_id" + t.text "answer_text" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_users", :force => true do |t| + t.integer "user_id" + t.integer "exercise_id" + t.integer "score" + t.datetime "start_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercises", :force => true do |t| + t.string "exercise_name" + t.text "exercise_description" + t.integer "course_id" + t.integer "exercise_status" + t.integer "user_id" + t.integer "time" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "first_pages", :force => true do |t| t.string "web_title" t.string "title" From 183f019c048737ef8c8757912ec4418d6b95ca3b Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 13 Nov 2015 15:55:29 +0800 Subject: [PATCH 050/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org.html.erb | 2 +- app/views/organizations/_org_members.html.erb | 53 ++++++++++--------- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 55fd13e7d..8e004d4cb 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -69,7 +69,7 @@ <%= link_to '文章', organization_org_document_comments_path(@organization) %> ( <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %> ) |  - <%= link_to '成员', members_organization_path(@organization.id) %> （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id' %>） + <%= link_to '成员', members_organization_path(@organization.id) %> （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
        diff --git a/app/views/organizations/_org_members.html.erb b/app/views/organizations/_org_members.html.erb index 8f80b2997..8719ad275 100644 --- a/app/views/organizations/_org_members.html.erb +++ b/app/views/organizations/_org_members.html.erb @@ -1,26 +1,29 @@ -<%= stylesheet_link_tag 'courses' %> -
        -

        组织成员

        -
        -
        -
        -
        - - <% members.each do |member| %> -
        - - <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32)) %> - - <%= l(:label_username)%> - <%= link_to(member.user.show_name, user_path(member.user),:class => "ml10 c_blue02") %> - <%= member.user.admin_of_org?(organization)?"组织管理员":"组织成员" %> -
        -
        - <% end%> - -
          - <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> -
        -
        -
        +<%= stylesheet_link_tag 'courses' %> +
        +
        +

        组织成员

        +
        +
        +
        + 加入时间 +
        + + <% members.each do |member| %> +
        + + <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32)) %> + + <%= l(:label_username)%> + <%= link_to(member.user.show_name, user_path(member.user),:class => "ml5 c_blue02") %>
        + 身份：<%= member.user.admin_of_org?(organization)?"组织管理员":"组织成员" %> +
        +
        + <% end%> + +
          + <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
        +
        +
        +
        \ No newline at end of file From 3451ced8881ec2374f1e82f869a2bb1e81337503 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 13 Nov 2015 16:34:00 +0800 Subject: [PATCH 051/285] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=91=E7=9A=84?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B5=E9=9D=A2=E5=8F=8A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 8 +++++ app/views/layouts/_logined_header.html.erb | 3 ++ app/views/layouts/base_org.html.erb | 22 ++++++------ .../organizations/_show_org_document.html.erb | 2 +- app/views/users/user_organizations.html.erb | 35 +++++++++++++++++++ config/routes.rb | 3 +- public/stylesheets/org.css | 8 ++++- 7 files changed, 67 insertions(+), 14 deletions(-) create mode 100644 app/views/users/user_organizations.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0d9588d24..273d48ccf 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1910,6 +1910,14 @@ class UsersController < ApplicationController end end + def user_organizations + @user = User.current + @orgs = @user.organizations + respond_to do |format| + format.html {render :layout => 'static_base'} + end + end + private def find_user diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index ffda9c559..6e62e2d5e 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -86,6 +86,9 @@
      • <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
        • +
      • + <%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%> +
      • <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>
        • diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 55fd13e7d..39a6e4fb4 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -76,17 +76,17 @@
        <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %>
        -
        项目
        -
        - -
        + + + + + + + + + + +
        diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 03e72263b..f1c633320 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -15,7 +15,7 @@
        <%= document.title %>
        - 发帖时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
        + 发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
        <% unless document.content.blank? %>
        <%= document.content.html_safe %> diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb new file mode 100644 index 000000000..855dc9c95 --- /dev/null +++ b/app/views/users/user_organizations.html.erb @@ -0,0 +1,35 @@ +<%= stylesheet_link_tag 'pleft','header','new_user','repository','org' %> +<%#= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %> +
        +
        +
        +
        + 组织列表 + +
        + + +
        +
        +
        + <% @orgs.each do |org| %> +
        +
        + <%= link_to image_tag(url_to_avatar(org), :width => '78', :height => '78', :alt => '组织logo'), :class => "linkGrey2" %> +
        +
        +
        + <%= link_to org.name, organization_path(org), :class => 'f16 linkBlue' %> +
        +
        <%= org.description %>
        +
        创建者：<%= link_to User.find(org.creator_id), user_path(org.creator_id), :class => 'linkGrey2', :target => '_blank' %>
        +
        创建时间：<%= format_activity_day(org.created_at) %> <%= format_time(org.created_at, false) %>
        +
        您的身份：<%= User.current.admin_of_org?(org) ? "组织管理员" : "组织成员" %>
        +
        + +
        +
        + <% end %> +
        +
        +
        \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index b7acc3bfa..1ea62752b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -439,6 +439,7 @@ RedmineApp::Application.routes.draw do post 'import_resources_to_homework' get 'dealwith_apply_request' get 'store_selected_resource' + get 'user_organizations' # end end #resources :blogs @@ -485,7 +486,7 @@ RedmineApp::Application.routes.draw do ################# added by william match 'users/tag_save', :via => :post, :as => 'tag' match 'users/tag_saveEx', :via => [:get, :post] - + #get 'users/:id/user_organizations', :to => 'users#user_organizations', :as => 'user_organizations' post 'watchers/watch', :to => 'watchers#watch', :as => 'watch' delete 'watchers/watch', :to => 'watchers#unwatch' get 'watchers/new', :to => 'watchers#new' diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 9b44be938..c8116003e 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -43,4 +43,10 @@ a.cancelBtn:hover {background-color:#717171; color:#ffffff;} .relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;} .relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} .relatedListOption {width:80px; text-align:center;} -.relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} \ No newline at end of file +.relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} + +/*组织列表*/ +.mt28 {margin-top:28px;} +.orgWrap {width:880px; float:left;} +.orgTitle {width:880px; max-width:880px; margin-bottom:5px;word-break: break-all; word-wrap:break-word; } +.orgIntro {width:880px; max-width:880px; margin-bottom:6px; color:#484848;} \ No newline at end of file From 70c5b27a437df83d823f1442fa5e945b7cd2ff56 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 13 Nov 2015 16:40:39 +0800 Subject: [PATCH 052/285] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 39 +++++++++++++++++++++++++ app/helpers/exercise_helper.rb | 3 ++ app/models/course.rb | 1 + app/views/exercise/index.html.erb | 1 + app/views/exercise/new.html.erb | 0 app/views/exercise/show.html.erb | 1 + app/views/layouts/base_courses.html.erb | 5 ++++ config/routes.rb | 9 ++++++ 8 files changed, 59 insertions(+) create mode 100644 app/controllers/exercise_controller.rb create mode 100644 app/helpers/exercise_helper.rb create mode 100644 app/views/exercise/index.html.erb create mode 100644 app/views/exercise/new.html.erb create mode 100644 app/views/exercise/show.html.erb diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb new file mode 100644 index 000000000..96a965f79 --- /dev/null +++ b/app/controllers/exercise_controller.rb @@ -0,0 +1,39 @@ +class ExerciseController < ApplicationController + layout "base_courses" + + before_filter :find_course, :only => [:index,:new,:create] + def index + + end + + def show + + end + + def new + + end + + def create + + end + + def edit + + end + + def update + + end + + def destroy + + end + + private + def find_course + @course = Course.find params[:course_id] + rescue Exception => e + render_404 + end +end \ No newline at end of file diff --git a/app/helpers/exercise_helper.rb b/app/helpers/exercise_helper.rb new file mode 100644 index 000000000..7fc7b1421 --- /dev/null +++ b/app/helpers/exercise_helper.rb @@ -0,0 +1,3 @@ +# encoding: utf-8 +module ExerciseHelper +end \ No newline at end of file diff --git a/app/models/course.rb b/app/models/course.rb index 7288c3b3b..913449d22 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -39,6 +39,7 @@ class Course < ActiveRecord::Base has_many :course_activities # 课程消息 has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy + has_many :exercises, :dependent => :destroy acts_as_taggable acts_as_nested_set :order => 'name', :dependent => :destroy diff --git a/app/views/exercise/index.html.erb b/app/views/exercise/index.html.erb new file mode 100644 index 000000000..52cfcc97f --- /dev/null +++ b/app/views/exercise/index.html.erb @@ -0,0 +1 @@ +111111111111 \ No newline at end of file diff --git a/app/views/exercise/new.html.erb b/app/views/exercise/new.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/exercise/show.html.erb b/app/views/exercise/show.html.erb new file mode 100644 index 000000000..b23c1c517 --- /dev/null +++ b/app/views/exercise/show.html.erb @@ -0,0 +1 @@ +111111 \ No newline at end of file diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 39de4faeb..ac8727e21 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -157,6 +157,11 @@ <%= link_to "(#{course_poll_count})", poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => "subnav_num c_orange" %> <%= link_to( "+#{l(:label_new_poll)}", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'subnav_green c_white') if is_teacher %>
        +
        + <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%> + <%= link_to "(#{@course.exercises.count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %> + <%= link_to( "+新建试卷", new_exercise_path(:course_id => @course.id), :class => 'subnav_green c_white') if is_teacher %> +
        diff --git a/config/routes.rb b/config/routes.rb index 6cf872180..9c557c9a5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -96,6 +96,15 @@ RedmineApp::Application.routes.draw do end end + #show、index、new、create、edit、update、destroy路由自动生成 + resources :exercise do + member do #生成路径为 /exercise/:id/方法名 + end + + collection do #生成路径为 /exercise/方法名 + end + end + resources :homework_common, :except => [:show]do member do get 'start_anonymous_comment' From 022c656db6225733fc2da13e237f1c9f7b1212cf Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 13 Nov 2015 17:19:17 +0800 Subject: [PATCH 053/285] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=BB=84=E7=BB=87=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_projects_controller.rb | 13 ++++++++++++ app/controllers/projects_controller.rb | 8 ++++---- app/views/org_projects/destroy.js.erb | 20 ++++++++++++++++++- .../projects/settings/_added_orgs.html.erb | 2 +- app/views/users/user_organizations.html.erb | 2 +- 5 files changed, 38 insertions(+), 7 deletions(-) diff --git a/app/controllers/org_projects_controller.rb b/app/controllers/org_projects_controller.rb index e11005b4a..733df95b7 100644 --- a/app/controllers/org_projects_controller.rb +++ b/app/controllers/org_projects_controller.rb @@ -14,5 +14,18 @@ class OrgProjectsController < ApplicationController @project = Project.find(params[:project_id]) @org_project = OrgProject.find(params[:id]) @org_project.destroy + + condition = '%%' + project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:project_id]}").map(&:organization_id) + if project_org_ids.empty? + @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page( 1).per(10) + @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count + else + project_org_ids = "(" + project_org_ids.join(',') + ")" + @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page( 1).per(10) + @org_count = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count + end + # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count + @orgs_page = Paginator.new @org_count, 10,1 end end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 5e6a584c8..0077bc378 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -77,12 +77,12 @@ class ProjectsController < ApplicationController end project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:id]}").map(&:organization_id) if project_org_ids.empty? - @orgs_not_in_project = Organization.where("is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)).per(10) - @org_count = Organization.where("is_public = 1").where("name like ?", condition).count + @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(10) + @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count else project_org_ids = "(" + project_org_ids.join(',') + ")" - @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)).per(10) - @org_count = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).count + @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(10) + @org_count = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count end # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count @orgs_page = Paginator.new @org_count, 10,params[:page] diff --git a/app/views/org_projects/destroy.js.erb b/app/views/org_projects/destroy.js.erb index 45a014b23..49ea1dc33 100644 --- a/app/views/org_projects/destroy.js.erb +++ b/app/views/org_projects/destroy.js.erb @@ -1,4 +1,22 @@ +//$("#search_orgs_result_list").html(""); +////$("#paginator").css("display", "none"); $("#added_orgs").html(""); +$("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>') +//$.ajax({ +// url: '<%#= url_for(:controller => 'projects', :action => 'search_public_orgs_not_in_project') %>'+'?page=1', +// type:'get' +//}); $("#search_orgs_result_list").html(""); +$("#search_orgs_result_list").append('
          '); +<% @orgs_not_in_project.each do |org|%> +link = "
          • "; +$("#search_orgs_result_list").append(link ); +<%end %> +$("#search_orgs_result_list").append('
        ') +<% if @org_count > 10 %> +$("#paginator").html(' <%= pagination_links_full @orgs_page, @org_count ,:per_page_links => true,:remote =>true,:flag=>true%>'); +$("#paginator").css("display", "block"); +<% else %> $("#paginator").css("display", "none"); -$("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>') \ No newline at end of file +<% end %> + diff --git a/app/views/projects/settings/_added_orgs.html.erb b/app/views/projects/settings/_added_orgs.html.erb index 06d3ae439..d07ead277 100644 --- a/app/views/projects/settings/_added_orgs.html.erb +++ b/app/views/projects/settings/_added_orgs.html.erb @@ -1,7 +1,7 @@
        • 名称操作
          • <% orgs.each do |org| %> -
        • <%= org.name %> +
        • <%= org.name %> <%= link_to "取消关联", org_project_path(:id => OrgProject.where(:organization_id => org.id, :project_id => project_id).first.id, :project_id => project_id), :method => 'delete',:remote => true, :class => "relatedListOption fl linkGrey3" %>
          • diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb index 855dc9c95..ec66358f5 100644 --- a/app/views/users/user_organizations.html.erb +++ b/app/views/users/user_organizations.html.erb @@ -15,7 +15,7 @@ <% @orgs.each do |org| %>
          - <%= link_to image_tag(url_to_avatar(org), :width => '78', :height => '78', :alt => '组织logo'), :class => "linkGrey2" %> + <%= link_to image_tag(url_to_avatar(org), :width => '78', :height => '78', :alt => '组织logo'), organization_path(org), :class => "linkGrey2" %>
          From e6cd104ead1f32ae3d73cec883173328002bd205 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 13 Nov 2015 17:23:52 +0800 Subject: [PATCH 054/285] =?UTF-8?q?index=E7=95=8C=E9=9D=A2=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E8=AF=95=E5=8D=B7=E7=BB=9F=E8=AE=A1=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 18 +++++- app/models/exercise.rb | 1 + app/views/exercise/_exercise.html.erb | 61 +++++++++++++++++++++ app/views/exercise/_exercises_list.html.erb | 25 +++++++++ app/views/exercise/index.html.erb | 5 +- config/routes.rb | 2 + 6 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 app/views/exercise/_exercise.html.erb create mode 100644 app/views/exercise/_exercises_list.html.erb diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 96a965f79..bed3d9061 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -3,9 +3,18 @@ class ExerciseController < ApplicationController before_filter :find_course, :only => [:index,:new,:create] def index - + @is_teacher = User.current.allowed_to?(:as_teacher,@course) + if @is_teacher + exercises = @course.exercises + else + exercises = @course.exercises.where(:exercise_status => 1) + end + @exercises = paginateHelper exercises,20 #分页 + respond_to do |format| + format.html + end end - + def show end @@ -30,6 +39,11 @@ class ExerciseController < ApplicationController end + #统计结果 + def statistics_result + + end + private def find_course @course = Course.find params[:course_id] diff --git a/app/models/exercise.rb b/app/models/exercise.rb index cbf3a6e91..e4295971e 100644 --- a/app/models/exercise.rb +++ b/app/models/exercise.rb @@ -1,4 +1,5 @@ class Exercise < ActiveRecord::Base + #exercise_status: 1,新建；2，发布；3，关闭 include Redmine::SafeAttributes belongs_to :user has_many :exercise_questions, :dependent => :destroy,:order => "#{ExerciseQuestion.table_name}.question_number" diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb new file mode 100644 index 000000000..e469c471c --- /dev/null +++ b/app/views/exercise/_exercise.html.erb @@ -0,0 +1,61 @@ +<%# has_commit = has_commit_poll?(poll.id ,User.current)%> +<% exercise_name = exercise.exercise_name.empty? ? l(:label_poll_new) : exercise.exercise_name%> +<% if @is_teacher%> +
        • +
          + <%# if has_commit %> + <%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%> + <%# else %> + <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %> + <%# end %> + <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %> +
          +
          • + + <% if exercise.exercise_status == 1%> +
        • 统计结果
          • + <% else %> +
        • <%= link_to l(:label_statistical_results), statistics_result_exercise_path(exercise.id), :class => "pollsbtn fl ml10"%>
          • + <% end%> + + <% if exercise.exercise_status == 1 %> +
        • 发布试卷
          • + <% elsif exercise.exercise_status == 2%> +
        • 取消发布
          • + <% else%> +
        • 发布试卷
          • + <% end%> + + <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10") %> + + <% if exercise.exercise_status == 1 %> +
        • <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%>
          • + <% else%> +
        • 编辑
          • + <% end%> + + <% if exercise.exercise_status == 2 %> +
        • 关闭
          • + <% else %> +
        • 关闭
          • + <% end%> + + <% if exercise.exercise_status == 1%> +
        • 导出
          • + <% elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %> +
        • <%= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%>
          • + <% end%> + + +
        • <%= format_date exercise.created_at.to_date%>
          • +<% else%> + <% if exercise.exercise_status == 2%> + <%# if has_commit%> + + <%#else%> + <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%> + <%#end%> + <% end%> +
        • <%= format_date exercise.created_at.to_date%>
          • +<% end%> \ No newline at end of file diff --git a/app/views/exercise/_exercises_list.html.erb b/app/views/exercise/_exercises_list.html.erb new file mode 100644 index 000000000..16fa24b0e --- /dev/null +++ b/app/views/exercise/_exercises_list.html.erb @@ -0,0 +1,25 @@ +
          +

          所有试卷 + （<%= @obj_count%>） +

          + <% if @is_teacher%> + <%#= link_to "导入", other_poll_poll_index_path(:polls_group_id => @course.id), :remote=>true,:class => "newbtn"%> + <%= link_to "新建试卷 ", new_exercise_path(:course_id => @course.id), :class => "newbtn" %> + <% end%> +
          +
          +
          + + <% @exercises.each do |exercise|%> +
            + <%= render :partial => 'exercise', :locals => {:exercise => exercise} %> +
          +
          + <% end%> + +
            + <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
          + +
          +
          \ No newline at end of file diff --git a/app/views/exercise/index.html.erb b/app/views/exercise/index.html.erb index 52cfcc97f..1a8d15181 100644 --- a/app/views/exercise/index.html.erb +++ b/app/views/exercise/index.html.erb @@ -1 +1,4 @@ -111111111111 \ No newline at end of file +<%= stylesheet_link_tag 'polls', :media => 'all' %> +
          + <%= render :partial => 'exercises_list'%> +
          \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 9c557c9a5..f1c41f65f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -99,6 +99,8 @@ RedmineApp::Application.routes.draw do #show、index、new、create、edit、update、destroy路由自动生成 resources :exercise do member do #生成路径为 /exercise/:id/方法名 + get 'statistics_result' + get 'export_exercise' end collection do #生成路径为 /exercise/方法名 From a40e5c5b54cc416db6d5ed4bd33b8395a5b6b0cc Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 13 Nov 2015 17:30:14 +0800 Subject: [PATCH 055/285] =?UTF-8?q?frok=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91--=E6=9D=83=E9=99=90=E8=BF=98=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 70 +++++++++++++++++++- app/helpers/repositories_helper.rb | 12 ++++ app/models/repository.rb | 10 ++- app/views/repositories/_breadcrumbs.html.erb | 4 +- app/views/repositories/fork.html.erb | 0 app/views/repositories/forked.html.erb | 10 +++ app/views/repositories/show.html.erb | 2 +- config/routes.rb | 2 + 8 files changed, 103 insertions(+), 7 deletions(-) delete mode 100644 app/views/repositories/fork.html.erb create mode 100644 app/views/repositories/forked.html.erb diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 1f252cc24..82f469259 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -31,10 +31,10 @@ class RepositoriesController < ApplicationController default_search_scope :changesets before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo] - before_filter :find_repository, :only => [:edit, :update, :destroy, :committers] + before_filter :find_repository, :only => [:edit, :update, :destroy, :committers, :forked] before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo,:to_gitlab] before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue] - before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab] + before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked] accept_rss_auth :revisions # hidden repositories filter // 隐藏代码过滤器 before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ] @@ -63,6 +63,72 @@ class RepositoriesController < ApplicationController end + def forked + # REDO: 那些人有权限forked项目 + # g = Gitlab.client + # gproject = g.post ("/projects/fork/#{@project.gpid}") + if gproject + copy_project(@project, gproject) + end + # render :layout => 'base_projects' + end + + # copy a project for fork + def copy_project(project, gproject) + project = Project.new + project.name = @project.name + project.is_public = @project.is_public + project.status = @project.status + project.hidden_repo = @project.hidden_repo + project.user_id = User.current.id + project.project_type = 0 + project.project_new_type = @project.project_new_type + project.gpid = gproject.id + if project.save + 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_info = ProjectInfo.new(:user_id => User.current.id, :project_id => project.id) + user_grades = UserGrade.create(:user_id => User.current.id, :project_id => project.id) + Rails.logger.debug "UserGrade created: #{user_grades.to_json}" + project_status = ProjectStatus.create(:project_id => @project.id, :watchers_count => 0, :changesets_count => 0, :project_type => @project.project_type,:grade => 0) + Rails.logger.debug "ProjectStatus created: #{project_status.to_json}" + project.members << m + project.project_infos << project_info + repository = Repository.create(:project_id => project.id, :url =>'ddd222', :type => 'Repository::Gitlab', :identifier => 'ddd222', :is_default => true) + copy_repository(project, gproject) + respond_to do |format| + format.html { + flash[:notice] = l(:notice_successful_create) + if params[:continue] + attrs = {:parent_id => project.parent_id}.reject {|k,v| v.nil?} + redirect_to new_project_url(attrs, :course => '0') + else + redirect_to settings_project_url(project) + end + } + format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => project.id) } + format.js + end + else + respond_to do |format| + format.html { render :action => 'forked', :layout => 'base_projects'} + format.api { render_validation_errors(@project) } + end + end + end + + def copy_repository(project, gproject) + # 避免 + if is_sigle_identifier?(project.owner, gproject.name) + + end + repository = Repository.factory('Git') + repository.project_id = project.id + repository.type = 'Repository::Gitlab' + repository.url = gproject.name + repository.identifier = gproject.name + repository = repository.save + end def newrepo scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index f32bef51b..05403114d 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -27,6 +27,18 @@ module RepositoriesHelper REPO_IP_ADDRESS = Setting.host_repository REPO_GITLAB_ADDRESS = "git.trustie.net" + # 某个成员不能拥有同名版本库，不同的成员可以创建同名版本库 + def is_sigle_identifier?(user, iden) + projects = Project.where("user_id =?",user) + identifiers = [] + projects.each do |project| + # 只针对gitlab类型的，git类型的后期清掉 + repository = Repository.where("project_id =? and type =?", project.id, "Repository::Gitlab").first + identifiers << repository.identifier + end + identifiers + end + def format_revision(revision) if revision.respond_to? :format_identifier revision.format_identifier diff --git a/app/models/repository.rb b/app/models/repository.rb index 94b7905c6..f50f37f31 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -40,7 +40,8 @@ class Repository < ActiveRecord::Base validates_length_of :identifier, :maximum => IDENTIFIER_MAX_LENGTH, :allow_blank => true validates_presence_of :identifier#, :unless => Proc.new { |r| r.is_default? || r.set_as_default? } #validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true - validates_uniqueness_of :identifier, :allow_blank => true + # 改成同一用户不能有两个相同名字的版本库 + # validates_uniqueness_of :identifier, :allow_blank => true validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph) # donwcase letters, digits, dashes, underscores but not digits only validates_format_of :identifier, :with => /^[a-z0-9_\-]+$/, :allow_blank => true @@ -52,7 +53,8 @@ class Repository < ActiveRecord::Base 'password', 'path_encoding', 'log_encoding', - 'is_default' + 'is_default', + 'type' safe_attributes 'url', :if => lambda {|repository, user| repository.new_record?} @@ -63,6 +65,10 @@ class Repository < ActiveRecord::Base end def repo_create_validation + # 之所以可以这样改，是因为Fork的时候不需要从Trustie创建版本库，只需从Gitlab关联即可 + if self.class.name.demodulize == "Repository" + return + end unless Setting.enabled_scm.include?(self.class.name.demodulize) errors.add(:type, :invalid) end diff --git a/app/views/repositories/_breadcrumbs.html.erb b/app/views/repositories/_breadcrumbs.html.erb index 84111afeb..2c675cc1e 100644 --- a/app/views/repositories/_breadcrumbs.html.erb +++ b/app/views/repositories/_breadcrumbs.html.erb @@ -1,12 +1,12 @@
          + <%=link_to @project.owner, user_path(@project.owner), :class => "repository-title-dec" %> + / <%= link_to @repository.identifier.present? ? h(@repository.identifier) : 'root', {:action => 'show', :id => @project, :repository_id => @repository.identifier_param, :path => nil, :rev => @rev }, :class => "repository-title-dec" %> - / - <%=link_to @project.owner, user_path(@project.owner), :class => "repository-title-dec" %>
          diff --git a/app/views/repositories/fork.html.erb b/app/views/repositories/fork.html.erb deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/views/repositories/forked.html.erb b/app/views/repositories/forked.html.erb new file mode 100644 index 000000000..2860b9898 --- /dev/null +++ b/app/views/repositories/forked.html.erb @@ -0,0 +1,10 @@ +
          +

          <%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>

          +
          +<%= form_for('forked',:url => {:controller => 'repositories', :action => 'forked'},:method => "post") do |f| %> + + +<% end %> +<%= @project.id %> +<%= @repository.id %> +<%= User.current %> diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 9601e5188..f210add24 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -25,7 +25,7 @@
          ZIP
          -
          Fork 0
          +
          <%= link_to "Fork", :controller => 'repositories', :action => 'forked' %> 0
          <% if @changesets && !@changesets.empty? %> diff --git a/config/routes.rb b/config/routes.rb index 6cf872180..6d754ffaf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -551,6 +551,7 @@ RedmineApp::Application.routes.draw do # get 'create', :via=>[:get, :post] end end + match 'wiki/index', :via => :get resources :wiki, :except => [:index, :new, :create], :as => 'wiki_page' do member do @@ -647,6 +648,7 @@ RedmineApp::Application.routes.draw do get 'projects/:id/repository/changes(/*path(.:ext))', :to => 'repositories#changes' + get 'projects/:id/repository/forked', :to => 'repositories#forked' get 'projects/:id/repository/revisions', :to => 'repositories#revisions' get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision' get 'projects/:id/repository/revision', :to => 'repositories#revision' From ee8d9d7b4ecef7c35dc6efb9270642c66177fc5a Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 13 Nov 2015 17:47:29 +0800 Subject: [PATCH 056/285] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 418382a64..19bd05677 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -575,7 +575,7 @@ ActiveRecord::Schema.define(:version => 20151113025751) do create_table "exercise_answers", :force => true do |t| t.integer "user_id" t.integer "exercise_question_id" - t.integer "exercise_choices_id" + t.integer "exercise_choice_id" t.text "answer_text" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false @@ -600,7 +600,7 @@ ActiveRecord::Schema.define(:version => 20151113025751) do create_table "exercise_standard_answers", :force => true do |t| t.integer "exercise_question_id" - t.integer "exercise_choices_id" + t.integer "exercise_choice_id" t.text "answer_text" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false From 82541cae1c01e88a39f196419034672a5ab0b0a4 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 13 Nov 2015 17:57:32 +0800 Subject: [PATCH 057/285] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=97=B6=E5=8E=BB=E6=8E=89=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=92=8C=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F=E7=9A=84label?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 0baf31ab2..efaed2d9d 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -17,12 +17,16 @@
          <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id,:select_course => defined?(select_course)),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%> - -
          + <% if edit_mode %> + + <% end %> +
          <%= calendar_for('homework_end_time')%>
          - + <% if edit_mode %> + + <% end %>
          <%= calendar_for('homework_publish_time')%> From ca770f2727b77a31e7531e2572a8a8085b91b245 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 13 Nov 2015 18:16:41 +0800 Subject: [PATCH 058/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb index 08311d51b..1ab3ad933 100644 --- a/app/views/organizations/new.html.erb +++ b/app/views/organizations/new.html.erb @@ -31,7 +31,7 @@
        • - （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该项目。） + （打钩为公开，不打钩则不公开，若不公开，仅组织成员可见该组织。）
        • From e905489157df9de2c5cc8011905dfc2a8330be4f Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 13 Nov 2015 18:23:20 +0800 Subject: [PATCH 059/285] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A2=AB=E5=89=AA?= =?UTF-8?q?=E5=88=87=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/my/account.html.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 3bf109f37..be178607f 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -581,7 +581,10 @@ } }); - + //查询学校 + $("input[name='province']").on('input', function (e) { + throttle(shcool_search_fn,window,e); + }); function throttle(method,context,e){ clearTimeout(method.tId); @@ -603,10 +606,7 @@ type: 'post', success: function (data) { schoolsResult = data.schools; - count = data.count; //查询学校 - $("input[name='province']").on('input', function (e) { - throttle(shcool_search_fn,window,e); - }); + count = data.count; maxPage = Math.ceil(count/100) //最大页码值 if(schoolsResult.length != undefined && schoolsResult.length != 0) { var i = 0; From b6d785bda00eab0e786a26278de19c8cc4fee739 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 13 Nov 2015 19:10:44 +0800 Subject: [PATCH 060/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0=E6=A0=B7=E5=BC=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_document_comments/edit.html.erb | 14 +++++++++----- app/views/organizations/new.html.erb | 2 +- public/images/org_default.jpg | Bin 1897 -> 0 bytes public/images/org_default.png | Bin 0 -> 4471 bytes 4 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 public/images/org_default.jpg create mode 100644 public/images/org_default.png diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb index ffb04a4f9..498ac46a6 100644 --- a/app/views/org_document_comments/edit.html.erb +++ b/app/views/org_document_comments/edit.html.erb @@ -12,18 +12,21 @@ } } -
          +
          编辑文章
          +
          +
          <%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id),:method => 'put', :id => 'new_org_document_form' do |f| %>
          - +
          -
          +
          +
          - <%= kindeditor_tag 'org_document_comment[content]',@org_document.content, :editor_id => 'org_document_description_editor', :height => "150px" %> + <%= kindeditor_tag 'org_document_comment[content]',@org_document.content, :editor_id => 'org1_document_description_editor', :height => "150px" %>
          @@ -40,4 +43,5 @@
          -<% end %> \ No newline at end of file +<% end %> +
          \ No newline at end of file diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb index 08311d51b..1ab3ad933 100644 --- a/app/views/organizations/new.html.erb +++ b/app/views/organizations/new.html.erb @@ -31,7 +31,7 @@
        • - （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该项目。） + （打钩为公开，不打钩则不公开，若不公开，仅组织成员可见该组织。）
        • diff --git a/public/images/org_default.jpg b/public/images/org_default.jpg deleted file mode 100644 index ad1b4f007d0c6141a10715ce46f447630e3ce376..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1897 zcmbVMdr%W+5WmYoMM0Bb02^w&UPJ^Xm&=PJ8X+Wsq6GvLL9G~)10p6DFNY-9VzFw` zYN=8jTkErfD5%6LP{vk}D)_)^3yRP2i8ETo(V|wdq?ZUjW*q8M%0Kjz(B62CpszgzXO`tatS-8MJ zm{GgliedsG3QUZ$TlI!KoPx9P9Fs+b+&|EWz$T*#nITOOCRjCiuIZyf5>G8moMtG@ zGboHm)FgPKU1>L4%{Zlp?dJIwo6@dAJm5-t?N*}*>@lJ8REXNm3a2Mbg*60;!%~4b z!XU&jSSAx-5~)mvjfX`-OoR&QR~CUulv0^e6bbhWLbH*^Y-Nfzwx5gsQz89H6%-T* z3d90}%t0}QLgB^`i6Ur=2%Ez~>Fp5~8-D;ni`xvO$x4|B3+zVJXA$|73ZWx?k%HNp zknj@tt<^G{-FbPeZBz>WDvY;U+on0JIGTdnhGpR#=lNgU8M=S&T%1EzEs9FS6C*q-h~;j3o&(?5VHP^cH@NRES9> zLa|QxB5%1gMjIm$V;ZqGRv{EikbYm||EU>D2ZOqs>r9%I)9zz+gxVu%ey0ln!Z zpO=)dGiz&hfep<$&O7nXmnQFvZC+RLTk)0CrALpCd%%n!degg(6frLE?P)^~f7-lp z_JXTLWFt{iUz5vSzy{eYw)+$AP|n+z(vt7JCO-9!pZ$1sO=6u6+^Ei)P^NmAxT1nU z28F;m9qS+Lsi~OZKP+evZ)tRGzpsD9>Xo%svJ2K9>l-FDs~4BIZ~gB5r^+Wo#GMyK zBWGq79y(C_MY;4sP>a{n^U8@W2kT^3kAk$HrLBpj-8q&$hNK zKAAMPXj?*DdHb);;{vkpjxf~J&7ECRGWf{WlZnIchuiz)wQn9e+i|}k z&Z8#oLcfssGt%O^RN&ljyIgs1+ry3E-Y&=8!wwp+8Z;}=IIFXOM}J&)Q- zuNJ1QYnTED2B+Qx9**Xa86B+Z&2u)Yw*PSb)K^f~ja5Bet8)G>W`5n(x4d!UL+MV% OokfMWGD?bF=l=tIZIm|v diff --git a/public/images/org_default.png b/public/images/org_default.png new file mode 100644 index 0000000000000000000000000000000000000000..3f3cfc575550c44e2261bc7aa9affdd3f5bb6506 GIT binary patch literal 4471 zcmaJ_c|25Y`zIwkB_&j2645Yb%wjNvktkyuV~=45W0_%QWGP!n)Fe~Lo-JFElqEu0 zvP&T(WlKc1Bx}F%JoWtEKc4qJpL5Q=oa=k-*M07DqD`>+f_xHu92^{i24^v5>=wIo z@$6#XIa?|W+09{wo)yEK>ca3N&`2EGM5+@BVBke?C7F>3!~maGk_HC{mkSwZ#jr9u zujWkkQX=foDEWJNv(X$J8e0C|1ZNKt1K>n*B~#GA`RY0#fJ{UKE#XGWM&7z4H}cs) z8p%8mi*pY2a7GbFA(FA{?Q@b~hh(AE6Wz`yvavHLsIU?AWx5{3sF__tD4 zMkWAVDvbnyE2$_tD?=av1VRY{gCh_S5CEzSfr6FUCqfYdQ-dSaph&>)1IU&}Bf6-W zVb1)P#U7!7ZVZOE8W`;7=cnYSqC};+f*~jrYKI3Ds>r5Lqz6zK1b;;e{rDda7!uu? zM)qcqsT9BtM}ia8mw^VdHT~NJFK;8Ge;8Bfza7PP8Q7oT4TdNwgT1_V?D~tE&M+hW zzZ(BaO~(azlfY&qI@Oov%#Mf4@jqa;@BX)-9YVG?YQ{7&J17KC4At4!i$q}er=qR%hsVER;RvX*G903!iaNuN zgdQA)($iK&s-RR55TvrMs`ekO0fo*WP@GAB8jec!{F4DD zZd3-9?nd8AV#K_rt~%XBTDTr$~M>x-Oc>{ln(5RZAd#{4qYwi=$cynR2 z!7+H8iL{g6oU8cQ+i@47%S@>+K854hHWyP?=H+$t77`YAUg|#Fk(!i8T>R3LJy_=Y zPE5fO@IoY4kZd|WjA@7yUQR{P%^c37fB*4g`}#j;B*F?{)D>TTg2P*$@Eq?yMW;8Xy)`r@1rD8h*qFC-*XZ1dE8`b}=D z(hQ#%qF-EmQ#9mM{k=ra2Kmj`#JfqQiReNfyT}-Lv2BGAcK1@LV?{*;f1%d)&uob& zWmfz03rSaRNyjwr3I)l5eenV;~G09033XOg;u+mhT<#ku$IX;!Qj(}SER zTRyM~BP4O9K3FAKxYxj9ZC=XP15LI$5PcRO`}==vZ_F=SxsOGpBr0qfU9SXHA6Beq zMFcE=9!YfQYr{L1mt_|Xe!#Z2 z$zJ-k;sRge(iA1%%j$k$`P_rmsGLD(N|bnxIri+?ADG?T#AW_zcB`2R_kF(ZH&Jie zE7ceAes_0onU!p^qd67toMDQUIMtKL;Tmo`GJk;)&3YB;(c#XDnw8sHY6mAO**~LA z#x%KOJti8gI!8jh?!Bp3Hh<|X^y!ON!oBeDa5>}j+4=dsk~;ZUuU@@*L|wKy_~&R; zD~u+S*yrg(j>8>%Uefet_<%G_4n%TUYXw!=T~1f``}Q)DU$O6^d~T$cBsQnarBkA) zDw6+DGo>AMf_d%kaNVZiy(G%LvE858wCuwB{C)auV=1BG>gvcPF!=O9U*DbvzmGvv zk#6undwm;!+~<|Y7O9oZX)e02b4u*1&yY>sXF?x3)CD^_)~g4z&0zFo>4n8CC|9w| zY?sakyQtbBM4g_myWpcT*UdDq(vp>MAA>g(wI<|mefaQUd8)h4_bdMM97)S!Y{Ana zKU5!<#1a-3c3n#sn3!BO%479Kh=h*9s=mG}3Hi0PYFTmte(ruHsXgJuxr7Dutf(c* zP49?f3c~A+NU7H50@pyx{Fg6|6BlGl3WlW8q4@^UcMqn17sWP5ckkgp_`t4ee=eZF z_?fL)?ySa>@^Z>ZjWxRJ+8JJymzNi4SMO!b#i1q(1}RY>BN6O?n6@awKeVm5xd-^V zCNimI*Idr0yugPw34L}B4jEU!O)pf>*GkH1oQR4O)Ya1i=2aztinMx&3~*Z9X}I~A#4oOPp8qfmLa){6d_sq2lF zNPhQPGl;U|nKoIg+F~agJE4$Mo+es`8!z@AyVK2L3G2alrPmH`Qg(&A{ZwcR+4$jA z$a$0*itqrG^vv8y!H|}op_lh~LPxYD;$^sLmZ*oVi%Krd!Y^8RAo%jGwxeb|@<(Ln zyU+Bp7sV!9Sh|{TOz-2Pj&s(P`j6LY&gqVM0E=3?M72H;C13cD$=&*nKk+)XhjvG1-c6+&6Y+v1fy0VWj?Ca{9C!{O;1l8_&^6A~RUHc-z5HlC*(OHv= z0b`B4WiZRjeDT*0ftA$5t?vcinah=Wk`RAdQv+n%xbIkQXDw#z;kIDo&+NI8SO<|} z*<=0tncU>X0cWF4v|G0%GjGeW*U9Lcfh4Brf%~pJXn! z=ay4G6iVmYt+SWw=-9wK+pZ+8SV1IYfQQ=&o$n(STlg|W$+ldew?)UO1Drg4H6@d| z7AUu6RZS}!dDm8RTWnJF>FZ+J%1mEQ!zgdhZi(kjGTM*!Nf$=*f%dnobY*B!&+5Px zLq!#`i%mVR#ID9bR4nOpb91@7B3Kh)l5ZvR4es8y`J!ke@%(J*Aa1h@R7l{s82q=*$OkA;r)|u9}l>8fzG~iinlX)F-dgA zQKe#Q3=i~Sc=~pyV`RZ5oUx3rBi<1&#pu)Sm4QJs-cwy^pG5{tqj+*T^9Re%*WdW% zO|rQL@V9l7DGG#Lq%|xg_}|Uv(ETB@RNyAifqvCc0>BI6<)sBKm#iF#n8h2h8dJxJ z3A{S{PMmEt#d2kVzU!c?h=yS{wYR9Ahk&Vf1mEXJjV5XT;Crmr+17y8%W@2mi#g!Z zwvaBH*ir~Egy7=O%0;-bGTWP3SJk@PTD_yaZ^=m{&S$k%y}0gKc?YLCB zyY9Apn9Fjp6Zx?cn$q~@iJy*>3GHYwyYBKB?Oe@yVc=8g8WDd7gJi{& zHqn!vWaB(v%yy@#Pwh!C{^i`)6DM-+=GaVRVaws~=g+K9m&Eu4sG{Xi^1S64y#9iX zeX|}ey&a)Eo$?uiI;Y||!k=Q8Oo@C*4N>UmWc7&{_h#3w)KSa!Y3|f@Y6)N3jnx>1 z!&u9Eg)+n8dxa&=G4a;xZw{nq+|A;T?C>AwM(B&Kw`b*8VKto&3Y!vp2dv6>vESC( zKTPwawhtYD$9w7aSQwv*{bbToJaUkHHf%X~;Orw_Zq>3wmbLfm>-2zW(BTQKlj4U8 zv1MHXtcfqB$1G`LI=Skv%@kw}FGUXq4SqV+rTjT@3)9fEN7ir;tVg6ps-k>zh1t?F zzvl)v{NxqQW4IIQpPN~zM+L3(!m<4DTl-&)C1u%|#?xBTcuAQm?q$`g4IQek%n^uQ zy=uHvgWjFPMU`7WuVLUwweB8#U>8t6*lp=+WwaGD=NE)D?07t$yyhD3lli9N*P(op zYedO>k)hcmd3gbgs7}fo@gj$ym3Y`$)k(R!pJV)ApUQ_NA8?0KY47$ePNcwUE;K1P zI(=d)o=VjWtl|;UPiDt%lsmgpD77}~4h;=EA zr)hCC*I-?K{>GeE)#8AbQS#!TYX&o_f9TzknaHV6rfC-QqYY6X=vz+XwLu%ZISxlo z(z@QcCFgXUcs3%SDzf;y+k9@6&Ht^#T* z1d5h_76&wFyMWD=3#%N! z4#r6ih78_!549M}v7F>D-7Ltu?5p7;f*A;oR($6+Jd5ZX2HodNtJ7=lkV#=0v^-i{e7x{JHpR zEt6aND2lc_DjJxUmL?wFZ^vImvrn*o*4F$hjBBsVI z9J4m(@o@)b-i!Q&1v$+dYJP%qO)Ay$a_H%RoW1>xOxX+V4D;Kv(-T!kE5B2PCOvu! zHeWU=hlV{ocECrhbL0G_CD$4kc)y*)kCTU0S|(D(6<2~MRm-Nf?J9b|YsnXC3vGgX zE%8eRI_=l$Ox@SM*4^K1pTS9~)hg84Z093WF0I`TZ57>c;N<4m3L^Asm~@`n`4wWI Lhs6}@I9~ZbFKHr^ literal 0 HcmV?d00001 From a5a413eda018b9231c86d67b5b26c934fdece9a1 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 13 Nov 2015 19:46:04 +0800 Subject: [PATCH 061/285] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2sql?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 0352d80f2..5f823ee3d 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -27,8 +27,9 @@ class OrganizationsController < ApplicationController def show if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization) @organization = Organization.find(params[:id]) - @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?) || (container_id =? and org_act_type =? and org_act_id !=?)', - @organization.id, 'CreateOrganization ', @organization.id, 'OrgDocumentComment', @organization.home_id).order('updated_at desc') + @activities = OrgActivity.where('container_id =? and container_type =? ', + @organization.id, 'Organization ').order('updated_at desc') + @activities = paginateHelper @activities, 10 else render_403 From 4471b6c4856b9fa6a4a9c380f733873cd94819f5 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 13 Nov 2015 20:14:02 +0800 Subject: [PATCH 062/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_document_comments/index.html.erb | 4 ++-- app/views/organizations/_org_members.html.erb | 4 ++-- app/views/organizations/show.html.erb | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb index a7340c08a..a636b2ec8 100644 --- a/app/views/org_document_comments/index.html.erb +++ b/app/views/org_document_comments/index.html.erb @@ -20,8 +20,8 @@ init_activity_KindEditor_data(<%= document.id%>, null, "87%"); }); -
          +

          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document} %> -

          +

          <% end %> <% end %> \ No newline at end of file diff --git a/app/views/organizations/_org_members.html.erb b/app/views/organizations/_org_members.html.erb index 8719ad275..3940a6576 100644 --- a/app/views/organizations/_org_members.html.erb +++ b/app/views/organizations/_org_members.html.erb @@ -1,11 +1,11 @@ <%= stylesheet_link_tag 'courses' %> -
          +

          组织成员

          - 加入时间 +
          <% members.each do |member| %> diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 5f1d0e003..e77cc7d09 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -30,9 +30,9 @@ init_activity_KindEditor_data(<%= @organization.home_id%>, null, "87%"); }); -
          +

          <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id} %> -

          +

          <% end %> <% unless @activities.nil? %> @@ -58,9 +58,9 @@ init_activity_KindEditor_data(<%= act.org_act.id%>, null, "87%"); }); -
          +

          <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> -

          +

          <% end %> <% end %>
            From 36b3d0b6368e494e9816f20ae4b37975cf956988 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 13 Nov 2015 20:22:13 +0800 Subject: [PATCH 063/285] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=81=AB=E7=8B=90?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=8A=E5=8A=A8=E6=80=81=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=96=87=E7=AB=A0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_organizations.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb index ec66358f5..50fa03bbe 100644 --- a/app/views/users/user_organizations.html.erb +++ b/app/views/users/user_organizations.html.erb @@ -6,10 +6,10 @@
            组织列表 -
            - - -
            + + + +
            <% @orgs.each do |org| %> From ddbc9003c2a308fe5839259216fba08edff1919c Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 13 Nov 2015 20:24:30 +0800 Subject: [PATCH 064/285] =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=88=9B=E5=BB=BA=E5=90=8C=E5=90=8D=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=BA=93=20=E4=B8=8D=E5=90=8C=E7=9A=84=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=8F=AF=E4=BB=A5=E5=88=9B=E5=BB=BA=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=20=E6=9B=B4=E6=96=B0fork=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 68 +++++++++++++--------- app/helpers/repositories_helper.rb | 10 ++-- config/locales/projects/zh.yml | 2 + 3 files changed, 48 insertions(+), 32 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 82f469259..d1d8a961a 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -64,13 +64,18 @@ class RepositoriesController < ApplicationController end def forked - # REDO: 那些人有权限forked项目 - # g = Gitlab.client - # gproject = g.post ("/projects/fork/#{@project.gpid}") - if gproject - copy_project(@project, gproject) + # 被forked的标识如果不满足单个用户唯一性，则不执行fork + if is_sigle_identifier?(User.current, @repository.identifier) + # REDO: 那些人有权限forked项目 + g = Gitlab.client + gproject = g.post ("/projects/fork/#{@project.gpid}?user_id=#{User.current.id}") + if gproject + copy_project(@project, gproject) + end + else + flash[:notice] = l(:project_gitlab_fork_double_message) + redirect_to settings_project_url(@project, :tab => 'repositories') end - # render :layout => 'base_projects' end # copy a project for fork @@ -79,6 +84,7 @@ class RepositoriesController < ApplicationController project.name = @project.name project.is_public = @project.is_public project.status = @project.status + project.description = @project.description project.hidden_repo = @project.hidden_repo project.user_id = User.current.id project.project_type = 0 @@ -94,7 +100,6 @@ class RepositoriesController < ApplicationController Rails.logger.debug "ProjectStatus created: #{project_status.to_json}" project.members << m project.project_infos << project_info - repository = Repository.create(:project_id => project.id, :url =>'ddd222', :type => 'Repository::Gitlab', :identifier => 'ddd222', :is_default => true) copy_repository(project, gproject) respond_to do |format| format.html { @@ -119,15 +124,16 @@ class RepositoriesController < ApplicationController def copy_repository(project, gproject) # 避免 - if is_sigle_identifier?(project.owner, gproject.name) - + if is_sigle_identifier?(project.user_id, gproject.name) + repository = Repository.factory('Git') + repository.project_id = project.id + repository.type = 'Repository::Gitlab' + repository.url = gproject.name + repository.identifier = gproject.name + repository = repository.save + else + flash[:notice] = l(:project_gitlab_create_double_message) end - repository = Repository.factory('Git') - repository.project_id = project.id - repository.type = 'Repository::Gitlab' - repository.url = gproject.name - repository.identifier = gproject.name - repository = repository.save end def newrepo @@ -181,21 +187,27 @@ update } def create - attrs = pickup_extra_info - @repository = Repository.factory('Git') - @repository.safe_attributes = params[:repository] - if attrs[:attrs_extra].keys.any? - @repository.merge_extra_info(attrs[:attrs_extra]) - end - @repository.project = @project - @repository.type = 'Repository::Gitlab' - @repository.url = @repository.identifier - if request.post? && @repository.save - s = Trustie::Gitlab::Sync.new - s.create_project(@project, @repository) + # 判断版本库创建者是否有同名版本库，避免版本库路径一致问题 + unless is_sigle_identifier?(@project.user_id, params[:repository].first[1]) + flash[:notice] = l(:project_gitlab_create_double_message) redirect_to settings_project_url(@project, :tab => 'repositories') else - redirect_to settings_project_url(@project, :tab => 'repositories',:repository_error_message=>@repository.errors.full_messages) + attrs = pickup_extra_info + @repository = Repository.factory('Git') + @repository.safe_attributes = params[:repository] + if attrs[:attrs_extra].keys.any? + @repository.merge_extra_info(attrs[:attrs_extra]) + end + @repository.project = @project + @repository.type = 'Repository::Gitlab' + @repository.url = @repository.identifier + if request.post? && @repository.save + s = Trustie::Gitlab::Sync.new + s.create_project(@project, @repository) + redirect_to settings_project_url(@project, :tab => 'repositories') + else + redirect_to settings_project_url(@project, :tab => 'repositories',:repository_error_message=>@repository.errors.full_messages) + end end end diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 05403114d..ddabb5356 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -28,15 +28,17 @@ module RepositoriesHelper REPO_GITLAB_ADDRESS = "git.trustie.net" # 某个成员不能拥有同名版本库，不同的成员可以创建同名版本库 - def is_sigle_identifier?(user, iden) - projects = Project.where("user_id =?",user) + def is_sigle_identifier?(user_id, iden) + projects = Project.where("user_id =?",user_id) identifiers = [] projects.each do |project| # 只针对gitlab类型的，git类型的后期清掉 repository = Repository.where("project_id =? and type =?", project.id, "Repository::Gitlab").first - identifiers << repository.identifier + if repository + identifiers << repository.identifier + end end - identifiers + identifiers.include?(iden) ? false :true end def format_revision(revision) diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 1a18e5a14..aebdebd2c 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -89,6 +89,8 @@ zh: project_module_repository: 版本库 project_module_create_repository: 创建版本库 project_gitlab_create_repository: 新版本库 + project_gitlab_create_double_message: 亲，您已经创建了一个同名的版本库，换个特别点的名字同名的概率就会变小哦~ + project_gitlab_fork_double_message: 亲，您已经有了一个相同名字的版本库，所以不能fork改版本库~ label_project_more: 更多 From bee355e7478585b8c6946a9c600c75648c5cfaa8 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 14 Nov 2015 09:43:15 +0800 Subject: [PATCH 065/285] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B=20=E5=8A=A8=E6=80=81=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=B8=8D=E5=86=97=E4=BD=99=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_document_comments/edit.html.erb | 1 + app/views/org_document_comments/index.html.erb | 1 - app/views/organizations/show.html.erb | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb index ffb04a4f9..b4f8662a3 100644 --- a/app/views/org_document_comments/edit.html.erb +++ b/app/views/org_document_comments/edit.html.erb @@ -21,6 +21,7 @@
          +
          <%= kindeditor_tag 'org_document_comment[content]',@org_document.content, :editor_id => 'org_document_description_editor', :height => "150px" %> diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb index a636b2ec8..d53ce543c 100644 --- a/app/views/org_document_comments/index.html.erb +++ b/app/views/org_document_comments/index.html.erb @@ -16,7 +16,6 @@ <% @documents.each do |document| %> diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index e77cc7d09..358b30c7d 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -52,7 +52,7 @@
          <% end %> - <% if act.org_act_type == 'OrgDocumentComment' %> + <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %> -

          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document} %> -

          <% end %> <% end %> \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index f1c633320..700db0eeb 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -1,4 +1,4 @@ -
          +
          <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_path(document.creator_id) %> diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index e77cc7d09..55d296cd1 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -30,9 +30,8 @@ init_activity_KindEditor_data(<%= @organization.home_id%>, null, "87%"); }); -

          + <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id} %> -

          <% end %> <% unless @activities.nil? %> @@ -58,9 +57,7 @@ init_activity_KindEditor_data(<%= act.org_act.id%>, null, "87%"); }); -

          <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> -

          <% end %> <% end %>
            diff --git a/db/schema.rb b/db/schema.rb index 1f48eaf02..73924d83c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151110011003) do +ActiveRecord::Schema.define(:version => 20151112072948) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -960,6 +960,7 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "created_on" t.integer "comments_count", :default => 0, :null => false t.integer "course_id" + t.integer "sticky", :default => 0 end add_index "news", ["author_id"], :name => "index_news_on_author_id" From e1a88dedbbe20cc0511cec88274da90763d71788 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 14 Nov 2015 09:58:53 +0800 Subject: [PATCH 067/285] =?UTF-8?q?=20=E9=A6=96=E9=A1=B5=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=20=E4=BC=9A=E5=8F=98=E6=88=90=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_show_org_document.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 700db0eeb..b9c8c19aa 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -7,7 +7,7 @@
            <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> TO  <%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %> | - <% if defined?(home_id) %> + <% if document.organization.home_id == document.id %> 首页 <% else %> 组织 From f313509d991a170db68c27c4350cbe63b9ae965c Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 14 Nov 2015 10:01:30 +0800 Subject: [PATCH 068/285] =?UTF-8?q?=E7=BB=84=E7=BB=87id=E7=9A=84=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E6=98=BE=E7=A4=BA=E7=BB=84=E7=BB=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org.html.erb | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 32ada4729..b1434bb0f 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -50,13 +50,9 @@ <% end %> <% end%>
            -
            组织id：<%= @organization.id %>
            - <% if User.current.admin_of_org?(@organization) %> - 配置 - <% end %> - -
            - <%= link_to l(:label_org_name)+"#{@organization.name}", organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %> + +
            + <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %> <% if @organization.is_public? %> <%= l(:label_public)%> <% else %> @@ -64,6 +60,19 @@ <% end %>
            + <% if User.current.admin_of_org?(@organization) %> + 配置 + <% end %> + + + + + + + + + +
            <%= link_to '文章', organization_org_document_comments_path(@organization) %> ( From 9bf8f6058faeb2d43af2588d537d6bcf22d59f60 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 14 Nov 2015 10:25:51 +0800 Subject: [PATCH 069/285] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=92=8C=E6=96=87?= =?UTF-8?q?=E7=AB=A0=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organizations/_show_org_document.html.erb | 141 +++++++++--------- 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index b9c8c19aa..4177c3688 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -1,75 +1,76 @@
            -
            -
            - <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_path(document.creator_id) %> -
            -
            -
            - <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> - TO  <%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %> | - <% if document.organization.home_id == document.id %> - 首页 - <% else %> - 组织 - <% end %> +
            +
            + <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_path(document.creator_id) %>
            -
            <%= document.title %>
            -
            - 发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
            - <% unless document.content.blank? %> -
            - <%= document.content.html_safe %> -
            - <% end %> - - <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id) || User.current.id == document.creator_id) %> -
            -
              -
            • -
                -
              • - <%= form_for('new_form',:url => {:controller => 'organizations',:action => 'set_homepage',:id => document.organization_id, :home_id => document.id},:method => "put",:remote => true) do |f|%> - 设为首页 - <% end %> -
                • -
              • - <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :class => "postOptionLink" %> -
                • -
              • - <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete', - :data => {:confirm => l(:text_are_you_sure)}, - :remote => true, :class => 'postOptionLink' %> -
                • -
              -
              • -
            -
            -
            -
            -
            - <% end %> -<% comments_for_doc = document.children.reorder("created_at desc") %> -<% count = document.children.count() %> - -
            -
            -
            回复（<%= count %>）
            - <% if count > 3 %> -
            - - 展开更多 - -
            - <% end %> + <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id) || User.current.id == document.creator_id) %> +
            +
              +
            • +
                +
              • + <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %> + 设为首页 + <% end %> +
                • +
              • + <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :class => "postOptionLink" %> +
                • +
              • + <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete', + :data => {:confirm => l(:text_are_you_sure)}, + :remote => true, :class => 'postOptionLink' %> +
                • +
              +
              • +
            +
            +
            + <% end %> +
            -
            + <% comments_for_doc = document.children.reorder("created_at desc") %> + <% count = document.children.count() %> + +
            +
            +
            回复（<%= count %>）
            + <% if count > 3 %> +
            + + 展开更多 + +
            + <% end %> +
            +
              <% reply_id = 0 %> <% comments_for_doc.each do |comment| %> <% reply_id += 1 %> -
            • +
            • <%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_path(comment.creator_id) %>
              @@ -87,12 +88,12 @@
              - <%=link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %> + <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %>
              <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id), :method => "post", :remote => true) do |f| %> - +
              @@ -110,15 +111,15 @@
              + diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb new file mode 100644 index 000000000..ed80ba7b1 --- /dev/null +++ b/app/views/organizations/_org_project_issue.html.erb @@ -0,0 +1,136 @@ +
              +
              +
              + <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %> +
              +
              +
              + <% if activity.try(:author).try(:realname) == ' ' %> + <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% else %> + <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% end %> TO + <%= link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%> +
              +
              + <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %> + + <%#= get_issue_priority(activity.priority_id)[1] %> + +
              +
              +
              指派给   + <% unless activity.assigned_to_id.nil? %> + <% if activity.try(:assigned_to).try(:realname) == ' ' %> + <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %> + <% else %> + <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %> + <% end %> + <% end %> +
              +
              + 时间： + <%=format_time(activity.created_on) %> +
              +
              +
              +
              + <% if activity.description? %> + <%= textAreailizable activity, :description, :attachments => activity.attachments %> + <% end %> +
              +
              +
              + + +
              +
              + <% if activity.attachments.any? %> + <% activity.attachments.each do |attachment| %> +
              + + + <%= link_to_short_attachment attachment,:length=> 58, :class => 'link_file_a fl newsBlue', :download => true -%> + + <% if attachment.is_text? %> + <%= link_to image_tag('magnifier.png'), + :controller => 'attachments', + :action => 'show', + :id => attachment, + :class => 'fl', + :filename => attachment.filename %> + <% end %> + + ( + <%= number_to_human_size attachment.filesize %>) + + + <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>, + <%= format_time(attachment.created_on) %> + +
              + <% end %> + <% end %> +
              +
              +
              +
              + <% count = activity.journals.count %> +
              +
              +
              +
              回复（<%= count %>）
              +
              <%#= format_date(activity.updated_on) %>
              + <% if count > 3 %> +
              + + 展开更多 + +
              + <% end %> +
              + + <% replies_all_i = 0 %> + <% if count > 0 %> +
              +
                + <% activity.journals.reorder("created_on desc").each do |reply| %> + + <% replies_all_i=replies_all_i + 1 %> +
              • +
                + <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %> +
                +
                +
                + <% if reply.try(:user).try(:realname) == ' ' %> + <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_time(reply.created_on) %> +
                +
                + <% if reply.details.any? %> + <% details_to_strings(reply.details).each do |string| %> +

                <%= string %>

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

                <%= reply.notes %>

                +
                +
                +
                +
                • + <% end %> +
              +
              + <% end %> + + + +
              +
              diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index deaec4437..0b624d479 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -34,8 +34,8 @@ <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id} %> <% end %> - <% unless @activities.nil? %> - <% @activities.each do |act| %> + <% unless @org_activities.nil? %> + <% @org_activities.each do |act| %> <% if act.org_act_type == 'CreateOrganization' %>
              @@ -60,10 +60,20 @@ <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> <% end %> <% end %> -
                - <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> -
              + + <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> + <% end %> + <%# @org_project_activties.each do |org_act|%> + <%= render :partial => 'organizations/org_project_activities', + :locals => {:org_project_activties =>@org_project_activties, + :page=>@page, + :org => @organization, + :org_act_count=>@org_activities.count, + :pro_act_count=>@org_project_activties.count}%> + <%# end %> + + diff --git a/app/views/organizations/show.js.erb b/app/views/organizations/show.js.erb new file mode 100644 index 000000000..b0a447910 --- /dev/null +++ b/app/views/organizations/show.js.erb @@ -0,0 +1,7 @@ +$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial => 'organizations/org_project_activities', + :locals => {:org_project_activties =>@org_project_activties, + :page=>@page, + :org => @organization, + :org_act_count=>@org_activities.count, + :pro_act_count=>@org_project_activties.count} )%>"); + From 1e1c2109396bdcd00c092e7efc9da3b2d7bce42b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 14 Nov 2015 14:57:49 +0800 Subject: [PATCH 074/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 2 +- .../_org_project_activities.html.erb | 8 +- .../organizations/_org_project_issue.html.erb | 2 +- .../organizations/_project_create.html.erb | 38 +++++++ .../organizations/_project_message.html.erb | 100 ++++++++++++++++++ 5 files changed, 143 insertions(+), 7 deletions(-) create mode 100644 app/views/organizations/_project_create.html.erb create mode 100644 app/views/organizations/_project_message.html.erb diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index daf443d07..cad617e47 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -60,7 +60,7 @@ class OrganizationsController < ApplicationController @org_activities_count = OrgActivity.where('container_id =? and container_type =? ', @organization.id, 'Organization ').order('updated_at desc').count project_ids = @organization.projects.map(&:id) - @org_project_activties = ForgeActivity.where('project_id in (?)',project_ids.join(',')).page(params[:page]).per(10) + @org_project_activties = ForgeActivity.where('project_id in (?) and forge_act_type in("Issue","Message","ProjectCreateInfo")',project_ids.join(',')).order("updated_at desc").page(params[:page] || 1).per(10) @org_project_activties_count = ForgeActivity.where('project_id in (?)',project_ids.join(',')).count #@org_activities = paginateHelper @org_activities, 10 @page = params[:page] diff --git a/app/views/organizations/_org_project_activities.html.erb b/app/views/organizations/_org_project_activities.html.erb index 0a6a8fae4..b46996661 100644 --- a/app/views/organizations/_org_project_activities.html.erb +++ b/app/views/organizations/_org_project_activities.html.erb @@ -1,17 +1,15 @@ <% org_project_activties.each do |act|%> <% if act %> - - <% unless act.forge_act_type == "ProjectCreateInfo" %> <% if act %> <% case act.forge_act_type.to_s %> <% when 'Issue' %> <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %> <% when 'Message' %> - <%= render :partial => 'users/project_message', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %> + <%= render :partial => 'organizations/project_message', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %> <% when 'ProjectCreateInfo'%> - <%= render :partial => 'users/project_create', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %> + <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %> <% end %> - <% end %><% end %> + <% end %> <% end %> <% end %> <% if org_act_count == 10 || pro_act_count == 10 %> diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb index ed80ba7b1..573429752 100644 --- a/app/views/organizations/_org_project_issue.html.erb +++ b/app/views/organizations/_org_project_issue.html.erb @@ -120,7 +120,7 @@

              <%= string %>

              <% end %> <% end %> -

              <%= reply.notes %>

              +

              <%= reply.notes.nil? ? "" : reply.notes.html_safe %>

              diff --git a/app/views/organizations/_project_create.html.erb b/app/views/organizations/_project_create.html.erb new file mode 100644 index 000000000..d966d8e18 --- /dev/null +++ b/app/views/organizations/_project_create.html.erb @@ -0,0 +1,38 @@ +<% project = Project.find(activity.project_id) %> +<% user = User.find(project.user_id)%> +
              +
              +
              + <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %> +
              +
              +
              + <% if user.try(:realname) == ' ' %> + <%= link_to user, user_path(user), :class => "newsBlue mr15" %> + <% else %> + <%= link_to user.try(:realname), user_path(user), :class => "newsBlue mr15" %> + <% end %> + TO + <%= link_to project.to_s+" | 项目", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %> +
              +
              + <%= link_to project.name, project_path(project.id,:host=>Setting.host_course), :class => "postGrey" %> +
              +
              + 创建时间：<%= format_time(project.created_on) %> +
              + +
              +
              +
              +
              \ No newline at end of file diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb new file mode 100644 index 000000000..85ed08f2f --- /dev/null +++ b/app/views/organizations/_project_message.html.erb @@ -0,0 +1,100 @@ +
              +
              +
              + <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %> +
              +
              +
              + <% if activity.try(:author).try(:realname) == ' ' %> + <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% else %> + <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% end %> + TO + <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%> + +
              +
              + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey" + %> + <% else %> + <%= link_to activity.parent.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey" + %> + <% end %> +
              +
              + 时间：<%= format_time(activity.created_on) %> +
              +
              +
              + <% if activity.parent_id.nil? %> + <%= activity.content.to_s.html_safe%> + <% else %> + <%= activity.parent.content.to_s.html_safe%> + <% end %> +
              +
              +
              + + +
              +
              +
              +
              + <% count = 0 %> + <% if activity.parent %> + <% count=activity.parent.children.count%> + <% else %> + <% count=activity.children.count%> + <% end %> +
              +
              +
              +
              回复( + <%=count %> + )
              +
              <%#=format_date(activity.updated_on)%>
              + <%if count>3 %> +
              展开更多
              + <% end %> +
              + + <% activity= activity.parent_id.nil? ? activity : activity.parent %> + <% replies_all_i = 0 %> + <% if count > 0 %> +
              +
                + <% activity.children.reorder("created_on desc").each do |reply| %> + + <% replies_all_i=replies_all_i+1 %> +
              • +
                + <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id), :alt => "用户头像" %> +
                +
                +
                + <% if reply.try(:author).try(:realname) == ' ' %> + <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_time(reply.created_on) %> +
                +
                + <%= reply.content.html_safe %>
                +
                +
                +
                • + <% end %> +
              +
              + <% end %> + + +
              +
              \ No newline at end of file From c9a7a9476708916f5836309640f4ea82b3c6e863 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 14 Nov 2015 15:15:54 +0800 Subject: [PATCH 075/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index cad617e47..774cde02d 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -60,7 +60,7 @@ class OrganizationsController < ApplicationController @org_activities_count = OrgActivity.where('container_id =? and container_type =? ', @organization.id, 'Organization ').order('updated_at desc').count project_ids = @organization.projects.map(&:id) - @org_project_activties = ForgeActivity.where('project_id in (?) and forge_act_type in("Issue","Message","ProjectCreateInfo")',project_ids.join(',')).order("updated_at desc").page(params[:page] || 1).per(10) + @org_project_activties = ForgeActivity.where("project_id in (#{project_ids.join(',')}) and forge_act_type in('Issue','Message','ProjectCreateInfo')").order("updated_at desc").page(params[:page] || 1).per(10) @org_project_activties_count = ForgeActivity.where('project_id in (?)',project_ids.join(',')).count #@org_activities = paginateHelper @org_activities, 10 @page = params[:page] From f5460d11264d67a19809f229928f1dd02207efae Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 14 Nov 2015 15:19:49 +0800 Subject: [PATCH 076/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 774cde02d..b75742164 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -59,7 +59,7 @@ class OrganizationsController < ApplicationController @organization.id, 'Organization ').order('updated_at desc').page(params[:page]).per(10) @org_activities_count = OrgActivity.where('container_id =? and container_type =? ', @organization.id, 'Organization ').order('updated_at desc').count - project_ids = @organization.projects.map(&:id) + project_ids = @organization.projects.map(&:id) << 0 @org_project_activties = ForgeActivity.where("project_id in (#{project_ids.join(',')}) and forge_act_type in('Issue','Message','ProjectCreateInfo')").order("updated_at desc").page(params[:page] || 1).per(10) @org_project_activties_count = ForgeActivity.where('project_id in (?)',project_ids.join(',')).count #@org_activities = paginateHelper @org_activities, 10 From 50dfe5ce8bf0469bf78e597246b700d01187fe29 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 14 Nov 2015 15:20:29 +0800 Subject: [PATCH 077/285] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E9=A1=B9=E7=9B=AEowner=E4=B8=BA=E5=BD=93=E5=89=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=EF=BC=8C=E5=90=8C=E6=AD=A5gitlab=E7=AB=AF=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 750a2d1b6..a7069e87e 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -68,7 +68,7 @@ class RepositoriesController < ApplicationController if is_sigle_identifier?(User.current, @repository.identifier) # REDO: 那些人有权限forked项目 g = Gitlab.client - gproject = g.post ("/projects/fork/#{@project.gpid}?user_id=#{User.current.id}") + gproject = g.post ("/projects/fork/#{@project.gpid}?user_id=#{User.current.gid}") if gproject copy_project(@project, gproject) end From a50ec626cd3e1c19645fac923a59cfa258e26d27 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 16 Nov 2015 08:52:32 +0800 Subject: [PATCH 078/285] =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema.rb | 100 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 74 insertions(+), 26 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 1f48eaf02..272db1944 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151110011003) do +ActiveRecord::Schema.define(:version => 20151113025751) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -528,23 +528,26 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "documents", ["created_on"], :name => "index_documents_on_created_on" add_index "documents", ["project_id"], :name => "documents_project_id" - create_table "dts", :force => true do |t| - t.string "IPLineCode" - t.string "Description" - t.string "Num" - t.string "Variable" - t.string "TraceInfo" - t.string "Method" + create_table "dts", :primary_key => "Num", :force => true do |t| + t.string "Defect", :limit => 50 + t.string "Category", :limit => 50 t.string "File" - t.string "IPLine" - t.string "Review" - t.string "Category" - t.string "Defect" - t.string "PreConditions" - t.string "StartLine" + t.string "Method" + t.string "Module", :limit => 20 + t.string "Variable", :limit => 50 + t.integer "StartLine" + t.integer "IPLine" + t.string "IPLineCode", :limit => 200 + t.string "Judge", :limit => 15 + t.integer "Review", :limit => 1 + t.string "Description" + t.text "PreConditions", :limit => 2147483647 + t.text "TraceInfo", :limit => 2147483647 + t.text "Code", :limit => 2147483647 t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" + t.integer "id", :null => false end create_table "enabled_modules", :force => true do |t| @@ -569,6 +572,60 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" + create_table "exercise_answers", :force => true do |t| + t.integer "user_id" + t.integer "exercise_question_id" + t.integer "exercise_choice_id" + t.text "answer_text" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_choices", :force => true do |t| + t.integer "exercise_question_id" + t.text "choice_text" + t.integer "choice_position" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_questions", :force => true do |t| + t.string "question_title" + t.integer "question_type" + t.integer "question_number" + t.integer "exercise_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_standard_answers", :force => true do |t| + t.integer "exercise_question_id" + t.integer "exercise_choice_id" + t.text "answer_text" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_users", :force => true do |t| + t.integer "user_id" + t.integer "exercise_id" + t.integer "score" + t.datetime "start_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercises", :force => true do |t| + t.string "exercise_name" + t.text "exercise_description" + t.integer "course_id" + t.integer "exercise_status" + t.integer "user_id" + t.integer "time" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "first_pages", :force => true do |t| t.string "web_title" t.string "title" @@ -814,16 +871,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_details_copy", :force => true do |t| - t.integer "journal_id", :default => 0, :null => false - t.string "property", :limit => 30, :default => "", :null => false - t.string "prop_key", :limit => 30, :default => "", :null => false - t.text "old_value" - t.text "value" - end - - add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" @@ -960,6 +1007,7 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "created_on" t.integer "comments_count", :default => 0, :null => false t.integer "course_id" + t.integer "sticky", :default => 0 end add_index "news", ["author_id"], :name => "index_news_on_author_id" From e22b4cbdebaa54aca9e4ab9d276261b0425c8f0c Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 16 Nov 2015 10:44:27 +0800 Subject: [PATCH 079/285] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=88=AA=E6=AD=A2=E5=90=8E=EF=BC=8C=E6=9C=AA=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E7=9A=84=E5=AD=A6=E7=94=9F=E7=9C=8B=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E5=8A=A8=E6=80=81=E5=B0=86=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E2=80=9C=E8=A1=A5=E4=BA=A4=E4=BD=9C=E5=93=81=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e08259b11..f4e0f88ff 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2374,8 +2374,10 @@ module ApplicationHelper link_to "作品(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue" else #学生显示提交作品、修改作品等按钮 work = cur_user_works_for_homework homework - if work.nil? + if work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") link_to "提交作品(#{homework.student_works.count})", new_student_work_path(:homework => homework.id),:class => 'c_blue' + elsif work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") + link_to "补交作品(#{homework.student_works.count})", new_student_work_path(:homework => homework.id),:class => 'c_red' else if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前 link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品" From 9350841d50ffaad5f980d9d5f4597963bfe4f51b Mon Sep 17 00:00:00 2001 From: houxiang Date: Mon, 16 Nov 2015 10:44:36 +0800 Subject: [PATCH 080/285] change by hx --- app/controllers/repositories_controller.rb | 2 +- db/schema.rb | 3532 ++++++++++---------- lib/gitlab-cli/bin/gitlab | 0 lib/grack/bin/console | 0 lib/grack/bin/testserver | 0 5 files changed, 1767 insertions(+), 1767 deletions(-) mode change 100644 => 100755 lib/gitlab-cli/bin/gitlab mode change 100644 => 100755 lib/grack/bin/console mode change 100644 => 100755 lib/grack/bin/testserver diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 1f252cc24..21ee6e1de 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -275,7 +275,7 @@ update @entry = @repository.entry(@path, @rev) (show_error_not_found; return) unless @entry g = Gitlab.client - @commits = g.commits(@project.gpid, page:params[:pamge]) + @commits = g.commits(@project.gpid, page:params[:page]) @commit = g.commit(@project.gpid,@rev) # @changesets = g.get ("/projects/#{@project.gpid}/repository/commits?#{@rev}") #@changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i) diff --git a/db/schema.rb b/db/schema.rb index b7e1bfa1c..a51b811bb 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,1766 +1,1766 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended to check this file into your version control system. - -ActiveRecord::Schema.define(:version => 20151102090519) do - - create_table "activities", :force => true do |t| - t.integer "act_id", :null => false - t.string "act_type", :null => false - t.integer "user_id", :null => false - t.integer "activity_container_id" - t.string "activity_container_type", :default => "" - t.datetime "created_at" - end - - add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type" - add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type" - add_index "activities", ["user_id"], :name => "index_activities_on_user_id" - - create_table "activity_notifies", :force => true do |t| - t.integer "activity_container_id" - t.string "activity_container_type" - t.integer "activity_id" - t.string "activity_type" - t.integer "notify_to" - t.datetime "created_on" - t.integer "is_read" - end - - add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id" - add_index "activity_notifies", ["created_on"], :name => "index_an_created_on" - add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to" - - create_table "api_keys", :force => true do |t| - t.string "access_token" - t.datetime "expires_at" - t.integer "user_id" - t.boolean "active", :default => true - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token" - add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id" - - create_table "applied_projects", :force => true do |t| - t.integer "project_id", :null => false - t.integer "user_id", :null => false - end - - create_table "apply_project_masters", :force => true do |t| - t.integer "user_id" - t.string "apply_type" - t.integer "apply_id" - t.integer "status" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "attachments", :force => true do |t| - t.integer "container_id" - t.string "container_type", :limit => 30 - t.string "filename", :default => "", :null => false - t.string "disk_filename", :default => "", :null => false - t.integer "filesize", :default => 0, :null => false - t.string "content_type", :default => "" - t.string "digest", :limit => 40, :default => "", :null => false - t.integer "downloads", :default => 0, :null => false - t.integer "author_id", :default => 0, :null => false - t.datetime "created_on" - t.string "description" - t.string "disk_directory" - t.integer "attachtype", :default => 1 - t.integer "is_public", :default => 1 - t.integer "copy_from" - t.integer "quotes" - end - - add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id" - add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type" - add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on" - - create_table "attachmentstypes", :force => true do |t| - t.integer "typeId", :null => false - t.string "typeName", :limit => 50 - end - - create_table "auth_sources", :force => true do |t| - t.string "type", :limit => 30, :default => "", :null => false - t.string "name", :limit => 60, :default => "", :null => false - t.string "host", :limit => 60 - t.integer "port" - t.string "account" - t.string "account_password", :default => "" - t.string "base_dn" - t.string "attr_login", :limit => 30 - t.string "attr_firstname", :limit => 30 - t.string "attr_lastname", :limit => 30 - t.string "attr_mail", :limit => 30 - t.boolean "onthefly_register", :default => false, :null => false - t.boolean "tls", :default => false, :null => false - t.string "filter" - t.integer "timeout" - end - - add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type" - - create_table "biding_projects", :force => true do |t| - t.integer "project_id" - t.integer "bid_id" - t.integer "user_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - end - - create_table "bids", :force => true do |t| - t.string "name" - t.string "budget", :null => false - t.integer "author_id" - t.date "deadline" - t.text "description" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - t.integer "commit" - t.integer "reward_type" - t.integer "homework_type" - t.integer "parent_id" - t.string "password" - t.integer "is_evaluation" - t.integer "proportion", :default => 60 - t.integer "comment_status", :default => 0 - t.integer "evaluation_num", :default => 3 - t.integer "open_anonymous_evaluation", :default => 1 - end - - create_table "blog_comments", :force => true do |t| - t.integer "blog_id", :null => false - t.integer "parent_id" - t.string "title", :default => "", :null => false - t.text "content" - t.integer "author_id" - t.integer "comments_count", :default => 0, :null => false - t.integer "last_comment_id" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - t.boolean "locked", :default => false - t.integer "sticky", :default => 0 - t.integer "reply_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "blogs", :force => true do |t| - t.string "name", :default => "", :null => false - t.text "description" - t.integer "position", :default => 1 - t.integer "article_count", :default => 0, :null => false - t.integer "comments_count", :default => 0, :null => false - t.integer "last_comments_id" - t.integer "parent_id" - t.integer "author_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "boards", :force => true do |t| - t.integer "project_id", :null => false - t.string "name", :default => "", :null => false - t.string "description" - t.integer "position", :default => 1 - t.integer "topics_count", :default => 0, :null => false - t.integer "messages_count", :default => 0, :null => false - t.integer "last_message_id" - t.integer "parent_id" - t.integer "course_id" - end - - add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id" - add_index "boards", ["project_id"], :name => "boards_project_id" - - create_table "bug_to_osps", :force => true do |t| - t.integer "osp_id" - t.integer "relative_memo_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "changes", :force => true do |t| - t.integer "changeset_id", :null => false - t.string "action", :limit => 1, :default => "", :null => false - t.text "path", :null => false - t.text "from_path" - t.string "from_revision" - t.string "revision" - t.string "branch" - end - - add_index "changes", ["changeset_id"], :name => "changesets_changeset_id" - - create_table "changeset_parents", :id => false, :force => true do |t| - t.integer "changeset_id", :null => false - t.integer "parent_id", :null => false - end - - add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids" - add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids" - - create_table "changesets", :force => true do |t| - t.integer "repository_id", :null => false - t.string "revision", :null => false - t.string "committer" - t.datetime "committed_on", :null => false - t.text "comments" - t.date "commit_date" - t.string "scmid" - t.integer "user_id" - end - - add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on" - add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true - add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid" - add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id" - add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id" - - create_table "changesets_issues", :id => false, :force => true do |t| - t.integer "changeset_id", :null => false - t.integer "issue_id", :null => false - end - - add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true - - create_table "code_review_assignments", :force => true do |t| - t.integer "issue_id" - t.integer "change_id" - t.integer "attachment_id" - t.string "file_path" - t.string "rev" - t.string "rev_to" - t.string "action_type" - t.integer "changeset_id" - end - - create_table "code_review_project_settings", :force => true do |t| - t.integer "project_id" - t.integer "tracker_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "updated_by" - t.boolean "hide_code_review_tab", :default => false - t.integer "auto_relation", :default => 1 - t.integer "assignment_tracker_id" - t.text "auto_assign" - t.integer "lock_version", :default => 0, :null => false - t.boolean "tracker_in_review_dialog", :default => false - end - - create_table "code_review_user_settings", :force => true do |t| - t.integer "user_id", :default => 0, :null => false - t.integer "mail_notification", :default => 0, :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "code_reviews", :force => true do |t| - t.integer "project_id" - t.integer "change_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "line" - t.integer "updated_by_id" - t.integer "lock_version", :default => 0, :null => false - t.integer "status_changed_from" - t.integer "status_changed_to" - t.integer "issue_id" - t.string "action_type" - t.string "file_path" - t.string "rev" - t.string "rev_to" - t.integer "attachment_id" - t.integer "file_count", :default => 0, :null => false - t.boolean "diff_all" - end - - create_table "comments", :force => true do |t| - t.string "commented_type", :limit => 30, :default => "", :null => false - t.integer "commented_id", :default => 0, :null => false - t.integer "author_id", :default => 0, :null => false - t.text "comments" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - end - - add_index "comments", ["author_id"], :name => "index_comments_on_author_id" - add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type" - - create_table "contest_notifications", :force => true do |t| - t.text "title" - t.text "content" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "contesting_projects", :force => true do |t| - t.integer "project_id" - t.string "contest_id" - t.integer "user_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - end - - create_table "contesting_softapplications", :force => true do |t| - t.integer "softapplication_id" - t.integer "contest_id" - t.integer "user_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - end - - create_table "contestnotifications", :force => true do |t| - t.integer "contest_id" - t.string "title" - t.string "summary" - t.text "description" - t.integer "author_id" - t.integer "notificationcomments_count" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "contests", :force => true do |t| - t.string "name" - t.string "budget", :default => "" - t.integer "author_id" - t.date "deadline" - t.string "description" - t.integer "commit" - t.string "password" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - end - - create_table "course_activities", :force => true do |t| - t.integer "user_id" - t.integer "course_id" - t.integer "course_act_id" - t.string "course_act_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "course_attachments", :force => true do |t| - t.string "filename" - t.string "disk_filename" - t.integer "filesize" - t.string "content_type" - t.string "digest" - t.integer "downloads" - t.string "author_id" - t.string "integer" - t.string "description" - t.string "disk_directory" - t.integer "attachtype" - t.integer "is_public" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "container_id", :default => 0 - end - - create_table "course_groups", :force => true do |t| - t.string "name" - t.integer "course_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "course_infos", :force => true do |t| - t.integer "course_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "course_messages", :force => true do |t| - t.integer "user_id" - t.integer "course_id" - t.integer "course_message_id" - t.string "course_message_type" - t.integer "viewed" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "content" - t.integer "status" - end - - create_table "course_statuses", :force => true do |t| - t.integer "changesets_count" - t.integer "watchers_count" - t.integer "course_id" - t.float "grade", :default => 0.0 - t.integer "course_ac_para", :default => 0 - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "courses", :force => true do |t| - t.integer "tea_id" - t.string "name" - t.integer "state" - t.string "code" - t.integer "time" - t.string "extra" - 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" - t.integer "school_id" - t.text "description" - t.integer "status", :default => 1 - t.integer "attachmenttype", :default => 2 - t.integer "lft" - t.integer "rgt" - t.integer "is_public", :limit => 1, :default => 1 - t.integer "inherit_members", :limit => 1, :default => 1 - t.integer "open_student", :default => 0 - t.integer "outline", :default => 0 - end - - create_table "custom_fields", :force => true do |t| - t.string "type", :limit => 30, :default => "", :null => false - t.string "name", :limit => 30, :default => "", :null => false - t.string "field_format", :limit => 30, :default => "", :null => false - t.text "possible_values" - t.string "regexp", :default => "" - t.integer "min_length", :default => 0, :null => false - t.integer "max_length", :default => 0, :null => false - t.boolean "is_required", :default => false, :null => false - t.boolean "is_for_all", :default => false, :null => false - t.boolean "is_filter", :default => false, :null => false - t.integer "position", :default => 1 - t.boolean "searchable", :default => false - t.text "default_value" - t.boolean "editable", :default => true - t.boolean "visible", :default => true, :null => false - t.boolean "multiple", :default => false - end - - add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type" - - create_table "custom_fields_projects", :id => false, :force => true do |t| - t.integer "custom_field_id", :default => 0, :null => false - t.integer "project_id", :default => 0, :null => false - end - - add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true - - create_table "custom_fields_trackers", :id => false, :force => true do |t| - t.integer "custom_field_id", :default => 0, :null => false - t.integer "tracker_id", :default => 0, :null => false - end - - add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true - - create_table "custom_values", :force => true do |t| - t.string "customized_type", :limit => 30, :default => "", :null => false - t.integer "customized_id", :default => 0, :null => false - t.integer "custom_field_id", :default => 0, :null => false - t.text "value" - end - - add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" - add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" - - create_table "delayed_jobs", :force => true do |t| - t.integer "priority", :default => 0, :null => false - t.integer "attempts", :default => 0, :null => false - t.text "handler", :null => false - t.text "last_error" - t.datetime "run_at" - t.datetime "locked_at" - t.datetime "failed_at" - t.string "locked_by" - t.string "queue" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" - - create_table "discuss_demos", :force => true do |t| - t.string "title" - t.text "body" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "documents", :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.integer "category_id", :default => 0, :null => false - t.string "title", :limit => 60, :default => "", :null => false - t.text "description" - t.datetime "created_on" - t.integer "user_id", :default => 0 - t.integer "is_public", :default => 1 - end - - add_index "documents", ["category_id"], :name => "index_documents_on_category_id" - add_index "documents", ["created_on"], :name => "index_documents_on_created_on" - add_index "documents", ["project_id"], :name => "documents_project_id" - - create_table "dts", :primary_key => "Num", :force => true do |t| - t.string "Defect", :limit => 50 - t.string "Category", :limit => 50 - t.string "File" - t.string "Method" - t.string "Module", :limit => 20 - t.string "Variable", :limit => 50 - t.integer "StartLine" - t.integer "IPLine" - t.string "IPLineCode", :limit => 200 - t.string "Judge", :limit => 15 - t.integer "Review", :limit => 1 - t.string "Description" - t.text "PreConditions", :limit => 2147483647 - t.text "TraceInfo", :limit => 2147483647 - t.text "Code", :limit => 2147483647 - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "id", :null => false - end - - create_table "enabled_modules", :force => true do |t| - t.integer "project_id" - t.string "name", :null => false - t.integer "course_id" - end - - add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id" - - create_table "enumerations", :force => true do |t| - t.string "name", :limit => 30, :default => "", :null => false - t.integer "position", :default => 1 - t.boolean "is_default", :default => false, :null => false - t.string "type" - t.boolean "active", :default => true, :null => false - t.integer "project_id" - t.integer "parent_id" - t.string "position_name", :limit => 30 - end - - add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" - add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" - - create_table "first_pages", :force => true do |t| - t.string "web_title" - t.string "title" - t.text "description" - t.string "page_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "sort_type" - t.integer "image_width", :default => 107 - t.integer "image_height", :default => 63 - t.integer "show_course", :default => 1 - t.integer "show_contest", :default => 1 - end - - create_table "forge_activities", :force => true do |t| - t.integer "user_id" - t.integer "project_id" - t.integer "forge_act_id" - t.string "forge_act_type" - t.integer "org_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id" - - create_table "forge_messages", :force => true do |t| - t.integer "user_id" - t.integer "project_id" - t.integer "forge_message_id" - t.string "forge_message_type" - t.integer "viewed" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "secret_key" - t.integer "status" - end - - create_table "forums", :force => true do |t| - t.string "name", :null => false - t.text "description" - t.integer "topic_count", :default => 0 - t.integer "memo_count", :default => 0 - t.integer "last_memo_id", :default => 0 - t.integer "creator_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "sticky" - t.integer "locked" - end - - create_table "groups_users", :id => false, :force => true do |t| - t.integer "group_id", :null => false - t.integer "user_id", :null => false - end - - add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true - - create_table "homework_attaches", :force => true do |t| - t.integer "bid_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - t.string "name" - t.text "description" - t.integer "state" - t.integer "project_id", :default => 0 - t.float "score", :default => 0.0 - t.integer "is_teacher_score", :default => 0 - end - - add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id" - - create_table "homework_commons", :force => true do |t| - t.string "name" - t.integer "user_id" - t.text "description" - t.date "publish_time" - t.date "end_time" - t.integer "homework_type", :default => 1 - t.string "late_penalty" - t.integer "course_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "teacher_priority", :default => 1 - t.integer "anonymous_comment", :default => 0 - end - - create_table "homework_detail_manuals", :force => true do |t| - t.float "ta_proportion" - t.integer "comment_status" - t.date "evaluation_start" - t.date "evaluation_end" - t.integer "evaluation_num" - t.integer "absence_penalty", :default => 1 - t.integer "homework_common_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "homework_detail_programings", :force => true do |t| - t.string "language" - t.text "standard_code", :limit => 2147483647 - t.integer "homework_common_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.float "ta_proportion", :default => 0.1 - t.integer "question_id" - end - - create_table "homework_evaluations", :force => true do |t| - t.string "user_id" - t.string "homework_attach_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "homework_for_courses", :force => true do |t| - t.integer "course_id" - t.integer "bid_id" - end - - add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id" - add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id" - - create_table "homework_tests", :force => true do |t| - t.text "input" - t.text "output" - t.integer "homework_common_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "result" - t.text "error_msg" - end - - create_table "homework_users", :force => true do |t| - t.string "homework_attach_id" - t.string "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "invite_lists", :force => true do |t| - t.integer "project_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "mail" - end - - create_table "issue_categories", :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.string "name", :limit => 30, :default => "", :null => false - t.integer "assigned_to_id" - end - - add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id" - 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 "delay" - end - - add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true - add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id" - add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id" - - create_table "issue_statuses", :force => true do |t| - t.string "name", :limit => 30, :default => "", :null => false - t.boolean "is_closed", :default => false, :null => false - t.boolean "is_default", :default => false, :null => false - t.integer "position", :default => 1 - t.integer "default_done_ratio" - end - - add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed" - add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default" - add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position" - - create_table "issues", :force => true do |t| - t.integer "tracker_id", :null => false - t.integer "project_id", :null => false - t.string "subject", :default => "", :null => false - t.text "description" - t.date "due_date" - t.integer "category_id" - t.integer "status_id", :null => false - t.integer "assigned_to_id" - t.integer "priority_id", :null => false - t.integer "fixed_version_id" - t.integer "author_id", :null => false - t.integer "lock_version", :default => 0, :null => false - t.datetime "created_on" - t.datetime "updated_on" - t.date "start_date" - t.integer "done_ratio", :default => 0, :null => false - t.float "estimated_hours" - t.integer "parent_id" - t.integer "root_id" - t.integer "lft" - t.integer "rgt" - t.boolean "is_private", :default => false, :null => false - t.datetime "closed_on" - t.integer "project_issues_index" - end - - add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id" - add_index "issues", ["author_id"], :name => "index_issues_on_author_id" - add_index "issues", ["category_id"], :name => "index_issues_on_category_id" - add_index "issues", ["created_on"], :name => "index_issues_on_created_on" - add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id" - add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id" - add_index "issues", ["project_id"], :name => "issues_project_id" - add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt" - add_index "issues", ["status_id"], :name => "index_issues_on_status_id" - add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id" - - create_table "join_in_competitions", :force => true do |t| - t.integer "user_id" - t.integer "competition_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "join_in_contests", :force => true do |t| - t.integer "user_id" - t.integer "bid_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "journal_details", :force => true do |t| - t.integer "journal_id", :default => 0, :null => false - t.string "property", :limit => 30, :default => "", :null => false - t.string "prop_key", :limit => 30, :default => "", :null => false - t.text "old_value" - t.text "value" - end - - add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" - - create_table "journal_replies", :id => false, :force => true do |t| - t.integer "journal_id" - t.integer "user_id" - t.integer "reply_id" - end - - add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id" - add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id" - add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id" - - create_table "journals", :force => true do |t| - t.integer "journalized_id", :default => 0, :null => false - t.string "journalized_type", :limit => 30, :default => "", :null => false - t.integer "user_id", :default => 0, :null => false - t.text "notes" - t.datetime "created_on", :null => false - t.boolean "private_notes", :default => false, :null => false - end - - add_index "journals", ["created_on"], :name => "index_journals_on_created_on" - add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id" - add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id" - add_index "journals", ["user_id"], :name => "index_journals_on_user_id" - - create_table "journals_for_messages", :force => true do |t| - t.integer "jour_id" - t.string "jour_type" - t.integer "user_id" - t.text "notes" - t.integer "status" - t.integer "reply_id" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - t.string "m_parent_id" - t.boolean "is_readed" - t.integer "m_reply_count" - t.integer "m_reply_id" - t.integer "is_comprehensive_evaluation" - end - - create_table "kindeditor_assets", :force => true do |t| - t.string "asset" - t.integer "file_size" - t.string "file_type" - t.integer "owner_id" - t.string "asset_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "owner_type", :default => 0 - end - - create_table "member_roles", :force => true do |t| - t.integer "member_id", :null => false - t.integer "role_id", :null => false - t.integer "inherited_from" - end - - add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id" - add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id" - - create_table "members", :force => true do |t| - t.integer "user_id", :default => 0, :null => false - t.integer "project_id", :default => 0 - t.datetime "created_on" - t.boolean "mail_notification", :default => false, :null => false - t.integer "course_id", :default => -1 - t.integer "course_group_id", :default => 0 - end - - add_index "members", ["project_id"], :name => "index_members_on_project_id" - add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true - add_index "members", ["user_id"], :name => "index_members_on_user_id" - - create_table "memo_messages", :force => true do |t| - t.integer "user_id" - t.integer "forum_id" - t.integer "memo_id" - t.string "memo_type" - t.integer "viewed" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "memos", :force => true do |t| - t.integer "forum_id", :null => false - t.integer "parent_id" - t.string "subject", :null => false - t.text "content", :null => false - t.integer "author_id", :null => false - t.integer "replies_count", :default => 0 - t.integer "last_reply_id" - t.boolean "lock", :default => false - t.boolean "sticky", :default => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "viewed_count", :default => 0 - end - - create_table "message_alls", :force => true do |t| - t.integer "user_id" - t.integer "message_id" - t.string "message_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "messages", :force => true do |t| - t.integer "board_id", :null => false - t.integer "parent_id" - t.string "subject", :default => "", :null => false - t.text "content" - t.integer "author_id" - t.integer "replies_count", :default => 0, :null => false - t.integer "last_reply_id" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - t.boolean "locked", :default => false - t.integer "sticky", :default => 0 - t.integer "reply_id" - end - - add_index "messages", ["author_id"], :name => "index_messages_on_author_id" - add_index "messages", ["board_id"], :name => "messages_board_id" - add_index "messages", ["created_on"], :name => "index_messages_on_created_on" - add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" - add_index "messages", ["parent_id"], :name => "messages_parent_id" - - create_table "news", :force => true do |t| - t.integer "project_id" - t.string "title", :limit => 60, :default => "", :null => false - t.string "summary", :default => "" - t.text "description" - t.integer "author_id", :default => 0, :null => false - t.datetime "created_on" - t.integer "comments_count", :default => 0, :null => false - t.integer "course_id" - end - - add_index "news", ["author_id"], :name => "index_news_on_author_id" - add_index "news", ["created_on"], :name => "index_news_on_created_on" - add_index "news", ["project_id"], :name => "news_project_id" - - create_table "no_uses", :force => true do |t| - t.integer "user_id", :null => false - t.string "no_use_type" - t.integer "no_use_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "notificationcomments", :force => true do |t| - t.string "notificationcommented_type" - t.integer "notificationcommented_id" - t.integer "author_id" - t.text "notificationcomments" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "onclick_times", :force => true do |t| - t.integer "user_id" - t.datetime "onclick_time" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "open_id_authentication_associations", :force => true do |t| - t.integer "issued" - t.integer "lifetime" - t.string "handle" - t.string "assoc_type" - t.binary "server_url" - t.binary "secret" - end - - create_table "open_id_authentication_nonces", :force => true do |t| - t.integer "timestamp", :null => false - t.string "server_url" - t.string "salt", :null => false - end - - create_table "open_source_projects", :force => true do |t| - t.string "name" - t.text "description" - t.integer "commit_count", :default => 0 - t.integer "code_line", :default => 0 - t.integer "users_count", :default => 0 - t.date "last_commit_time" - t.string "url" - t.date "date_collected" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "option_numbers", :force => true do |t| - t.integer "user_id" - t.integer "memo" - t.integer "messages_for_issues" - t.integer "issues_status" - t.integer "replay_for_message" - t.integer "replay_for_memo" - t.integer "follow" - t.integer "tread" - t.integer "praise_by_one" - t.integer "praise_by_two" - t.integer "praise_by_three" - t.integer "tread_by_one" - t.integer "tread_by_two" - t.integer "tread_by_three" - t.integer "changeset" - t.integer "document" - t.integer "attachment" - t.integer "issue_done_ratio" - t.integer "post_issue" - t.integer "score_type" - t.integer "total_score" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "project_id" - end - - create_table "org_members", :force => true do |t| - t.integer "user_id" - t.integer "organization_id" - t.string "role" - end - - create_table "organizations", :force => true do |t| - t.string "name" - t.text "description" - t.integer "creator_id" - t.integer "home_id" - t.string "domain" - t.boolean "is_public" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "phone_app_versions", :force => true do |t| - t.string "version" - t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "poll_answers", :force => true do |t| - t.integer "poll_question_id" - t.text "answer_text" - t.integer "answer_position" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "poll_questions", :force => true do |t| - t.string "question_title" - t.integer "question_type" - t.integer "is_necessary" - t.integer "poll_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "question_number" - end - - create_table "poll_users", :force => true do |t| - t.integer "user_id" - t.integer "poll_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "poll_votes", :force => true do |t| - t.integer "user_id" - t.integer "poll_question_id" - t.integer "poll_answer_id" - t.text "vote_text" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "polls", :force => true do |t| - t.string "polls_name" - t.string "polls_type" - t.integer "polls_group_id" - t.integer "polls_status" - t.integer "user_id" - t.datetime "published_at" - t.datetime "closed_at" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.text "polls_description" - t.integer "show_result", :default => 1 - end - - create_table "praise_tread_caches", :force => true do |t| - t.integer "object_id", :null => false - t.string "object_type" - t.integer "praise_num" - t.integer "tread_num" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "praise_treads", :force => true do |t| - t.integer "user_id", :null => false - t.integer "praise_tread_object_id" - t.string "praise_tread_object_type" - t.integer "praise_or_tread" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "principal_activities", :force => true do |t| - t.integer "user_id" - t.integer "principal_id" - t.integer "principal_act_id" - t.string "principal_act_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "project_infos", :force => true do |t| - t.integer "project_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "project_scores", :force => true do |t| - t.string "project_id" - t.integer "score" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "issue_num", :default => 0 - t.integer "issue_journal_num", :default => 0 - t.integer "news_num", :default => 0 - t.integer "documents_num", :default => 0 - t.integer "changeset_num", :default => 0 - t.integer "board_message_num", :default => 0 - end - - create_table "project_statuses", :force => true do |t| - t.integer "changesets_count" - t.integer "watchers_count" - t.integer "project_id" - t.integer "project_type" - t.float "grade", :default => 0.0 - t.integer "course_ac_para", :default => 0 - end - - add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade" - - create_table "projecting_softapplictions", :force => true do |t| - t.integer "user_id" - t.integer "softapplication_id" - t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "projects", :force => true do |t| - t.string "name", :default => "", :null => false - t.text "description" - t.string "homepage", :default => "" - t.boolean "is_public", :default => true, :null => false - t.integer "parent_id" - t.datetime "created_on" - t.datetime "updated_on" - t.string "identifier" - t.integer "status", :default => 1, :null => false - t.integer "lft" - t.integer "rgt" - t.boolean "inherit_members", :default => false, :null => false - t.integer "project_type" - t.boolean "hidden_repo", :default => false, :null => false - t.integer "attachmenttype", :default => 1 - t.integer "user_id" - t.integer "dts_test", :default => 0 - t.string "enterprise_name" - t.integer "organization_id" - t.integer "project_new_type" - t.integer "gpid" - end - - add_index "projects", ["lft"], :name => "index_projects_on_lft" - add_index "projects", ["rgt"], :name => "index_projects_on_rgt" - - create_table "projects_trackers", :id => false, :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.integer "tracker_id", :default => 0, :null => false - end - - add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true - add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" - - create_table "queries", :force => true do |t| - t.integer "project_id" - t.string "name", :default => "", :null => false - t.text "filters" - t.integer "user_id", :default => 0, :null => false - t.boolean "is_public", :default => false, :null => false - t.text "column_names" - t.text "sort_criteria" - t.string "group_by" - t.string "type" - end - - add_index "queries", ["project_id"], :name => "index_queries_on_project_id" - add_index "queries", ["user_id"], :name => "index_queries_on_user_id" - - create_table "relative_memo_to_open_source_projects", :force => true do |t| - t.integer "osp_id" - t.integer "relative_memo_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "relative_memos", :force => true do |t| - t.integer "osp_id" - t.integer "parent_id" - t.string "subject", :null => false - t.text "content", :limit => 16777215, :null => false - t.integer "author_id" - t.integer "replies_count", :default => 0 - t.integer "last_reply_id" - t.boolean "lock", :default => false - t.boolean "sticky", :default => false - t.boolean "is_quote", :default => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "viewed_count_crawl", :default => 0 - t.integer "viewed_count_local", :default => 0 - t.string "url" - t.string "username" - t.string "userhomeurl" - t.date "date_collected" - t.string "topic_resource" - end - - 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.string "type" - 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 "hidden", :default => false - end - - add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id" - - create_table "rich_rich_files", :force => true do |t| - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "rich_file_file_name" - t.string "rich_file_content_type" - t.integer "rich_file_file_size" - t.datetime "rich_file_updated_at" - t.string "owner_type" - t.integer "owner_id" - t.text "uri_cache" - t.string "simplified_type", :default => "file" - end - - create_table "roles", :force => true do |t| - t.string "name", :limit => 30, :default => "", :null => false - t.integer "position", :default => 1 - t.boolean "assignable", :default => true - t.integer "builtin", :default => 0, :null => false - t.text "permissions" - t.string "issues_visibility", :limit => 30, :default => "default", :null => false - end - - create_table "schools", :force => true do |t| - t.string "name" - t.string "province" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "logo_link" - t.string "pinyin" - 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 - t.integer "is_teacher_score", :default => 0 - end - - create_table "settings", :force => true do |t| - t.string "name", :default => "", :null => false - t.text "value" - t.datetime "updated_on" - end - - add_index "settings", ["name"], :name => "index_settings_on_name" - - create_table "shares", :force => true do |t| - t.date "created_on" - t.string "url" - t.string "title" - t.integer "share_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "project_id" - t.integer "user_id" - t.string "description" - end - - create_table "softapplications", :force => true do |t| - t.string "name" - t.text "description" - t.integer "app_type_id" - t.string "app_type_name" - t.string "android_min_version_available" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "contest_id" - t.integer "softapplication_id" - t.integer "is_public" - t.string "application_developers" - t.string "deposit_project_url" - t.string "deposit_project" - t.integer "project_id" - end - - create_table "student_work_tests", :force => true do |t| - t.integer "student_work_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "status", :default => 9 - t.text "results" - t.text "src" - end - - create_table "student_works", :force => true do |t| - t.string "name" - t.text "description", :limit => 2147483647 - t.integer "homework_common_id" - t.integer "user_id" - t.float "final_score" - t.float "teacher_score" - t.float "student_score" - t.float "teaching_asistant_score" - t.integer "project_id", :default => 0 - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "late_penalty", :default => 0 - t.integer "absence_penalty", :default => 0 - t.float "system_score", :default => 0.0 - t.boolean "is_test", :default => false - end - - create_table "student_works_evaluation_distributions", :force => true do |t| - t.integer "student_work_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "student_works_scores", :force => true do |t| - t.integer "student_work_id" - t.integer "user_id" - t.integer "score" - t.text "comment" - t.integer "reviewer_role" - 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" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id" - add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id" - - create_table "system_messages", :force => true do |t| - t.integer "user_id" - t.string "content" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.text "description" - t.string "subject" - end - - create_table "taggings", :force => true do |t| - t.integer "tag_id" - t.integer "taggable_id" - t.string "taggable_type" - t.integer "tagger_id" - t.string "tagger_type" - t.string "context", :limit => 128 - t.datetime "created_at" - end - - add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" - add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context" - add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type" - - create_table "tags", :force => true do |t| - t.string "name" - end - - create_table "teachers", :force => true do |t| - t.string "tea_name" - t.string "location" - t.integer "couurse_time" - t.integer "course_code" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "extra" - end - - create_table "time_entries", :force => true do |t| - t.integer "project_id", :null => false - t.integer "user_id", :null => false - t.integer "issue_id" - t.float "hours", :null => false - t.string "comments" - t.integer "activity_id", :null => false - t.date "spent_on", :null => false - t.integer "tyear", :null => false - t.integer "tmonth", :null => false - t.integer "tweek", :null => false - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - end - - add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id" - add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on" - add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id" - add_index "time_entries", ["project_id"], :name => "time_entries_project_id" - add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" - - 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.datetime "created_on", :null => false - end - - add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id" - add_index "tokens", ["value"], :name => "tokens_value", :unique => true - - create_table "trackers", :force => true do |t| - t.string "name", :limit => 30, :default => "", :null => false - t.boolean "is_in_chlog", :default => false, :null => false - t.integer "position", :default => 1 - t.boolean "is_in_roadmap", :default => true, :null => false - t.integer "fields_bits", :default => 0 - end - - create_table "user_activities", :force => true do |t| - t.string "act_type" - t.integer "act_id" - t.string "container_type" - t.integer "container_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "user_id" - end - - create_table "user_extensions", :force => true do |t| - t.integer "user_id", :null => false - t.date "birthday" - t.string "brief_introduction" - t.integer "gender" - t.string "location" - t.string "occupation" - t.integer "work_experience" - 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 "student_id" - t.string "teacher_realname" - t.string "student_realname" - t.string "location_city" - t.integer "school_id" - t.string "description", :default => "" - end - - create_table "user_feedback_messages", :force => true do |t| - t.integer "user_id" - t.integer "journals_for_message_id" - t.string "journals_for_message_type" - t.integer "viewed" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "user_grades", :force => true do |t| - t.integer "user_id", :null => false - t.integer "project_id", :null => false - t.float "grade", :default => 0.0 - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade" - add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id" - add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id" - - create_table "user_levels", :force => true do |t| - t.integer "user_id" - t.integer "level" - end - - create_table "user_preferences", :force => true do |t| - t.integer "user_id", :default => 0, :null => false - t.text "others" - t.boolean "hide_mail", :default => false - t.string "time_zone" - end - - add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id" - - create_table "user_score_details", :force => true do |t| - t.integer "current_user_id" - t.integer "target_user_id" - t.string "score_type" - t.string "score_action" - t.integer "user_id" - t.integer "old_score" - t.integer "new_score" - t.integer "current_user_level" - t.integer "target_user_level" - t.integer "score_changeable_obj_id" - t.string "score_changeable_obj_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "user_scores", :force => true do |t| - t.integer "user_id", :null => false - t.integer "collaboration" - t.integer "influence" - t.integer "skill" - t.integer "active" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "user_statuses", :force => true do |t| - t.integer "changesets_count" - t.integer "watchers_count" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.float "grade", :default => 0.0 - end - - add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count" - 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 "users", :force => true do |t| - t.string "login", :default => "", :null => false - t.string "hashed_password", :limit => 40, :default => "", :null => false - t.string "firstname", :limit => 30, :default => "", :null => false - t.string "lastname", :default => "", :null => false - t.string "mail", :limit => 60, :default => "", :null => false - t.boolean "admin", :default => false, :null => false - t.integer "status", :default => 1, :null => false - t.datetime "last_login_on" - t.string "language", :limit => 5, :default => "" - t.integer "auth_source_id" - t.datetime "created_on" - t.datetime "updated_on" - t.string "type" - t.string "identity_url" - t.string "mail_notification", :default => "", :null => false - t.string "salt", :limit => 64 - t.integer "gid" - end - - add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id" - add_index "users", ["id", "type"], :name => "index_users_on_id_and_type" - add_index "users", ["type"], :name => "index_users_on_type" - - create_table "versions", :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.string "name", :default => "", :null => false - t.string "description", :default => "" - t.date "effective_date" - t.datetime "created_on" - t.datetime "updated_on" - t.string "wiki_page_title" - t.string "status", :default => "open" - t.string "sharing", :default => "none", :null => false - end - - add_index "versions", ["project_id"], :name => "versions_project_id" - add_index "versions", ["sharing"], :name => "index_versions_on_sharing" - - create_table "visitors", :force => true do |t| - t.integer "user_id" - t.integer "master_id" - t.datetime "updated_on" - t.datetime "created_on" - end - - add_index "visitors", ["master_id"], :name => "index_visitors_master_id" - add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on" - add_index "visitors", ["user_id"], :name => "index_visitors_user_id" - - create_table "watchers", :force => true do |t| - t.string "watchable_type", :default => "", :null => false - t.integer "watchable_id", :default => 0, :null => false - t.integer "user_id" - end - - add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type" - add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id" - add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type" - - create_table "web_footer_companies", :force => true do |t| - t.string "name" - t.string "logo_size" - t.string "url" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "web_footer_oranizers", :force => true do |t| - t.string "name" - t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "wiki_content_versions", :force => true do |t| - t.integer "wiki_content_id", :null => false - t.integer "page_id", :null => false - t.integer "author_id" - t.binary "data", :limit => 2147483647 - t.string "compression", :limit => 6, :default => "" - t.string "comments", :default => "" - t.datetime "updated_on", :null => false - t.integer "version", :null => false - end - - add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on" - add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid" - - create_table "wiki_contents", :force => true do |t| - t.integer "page_id", :null => false - t.integer "author_id" - t.text "text", :limit => 2147483647 - t.string "comments", :default => "" - t.datetime "updated_on", :null => false - t.integer "version", :null => false - end - - add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id" - add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id" - - create_table "wiki_pages", :force => true do |t| - t.integer "wiki_id", :null => false - t.string "title", :null => false - t.datetime "created_on", :null => false - t.boolean "protected", :default => false, :null => false - t.integer "parent_id" - end - - add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id" - add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title" - add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id" - - create_table "wiki_redirects", :force => true do |t| - t.integer "wiki_id", :null => false - t.string "title" - t.string "redirects_to" - t.datetime "created_on", :null => false - end - - add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title" - add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id" - - create_table "wikis", :force => true do |t| - t.integer "project_id", :null => false - t.string "start_page", :null => false - t.integer "status", :default => 1, :null => false - end - - add_index "wikis", ["project_id"], :name => "wikis_project_id" - - create_table "workflows", :force => true do |t| - t.integer "tracker_id", :default => 0, :null => false - t.integer "old_status_id", :default => 0, :null => false - t.integer "new_status_id", :default => 0, :null => false - t.integer "role_id", :default => 0, :null => false - t.boolean "assignee", :default => false, :null => false - t.boolean "author", :default => false, :null => false - t.string "type", :limit => 30 - t.string "field_name", :limit => 30 - t.string "rule", :limit => 30 - end - - add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id" - add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id" - add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status" - add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id" - - create_table "works_categories", :force => true do |t| - t.string "category" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "zip_packs", :force => true do |t| - t.integer "user_id" - t.integer "homework_id" - t.string "file_digest" - t.string "file_path" - t.integer "pack_times", :default => 1 - t.integer "pack_size", :default => 0 - t.text "file_digests" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - -end +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended to check this file into your version control system. + +ActiveRecord::Schema.define(:version => 20151102090519) do + + create_table "activities", :force => true do |t| + t.integer "act_id", :null => false + t.string "act_type", :null => false + t.integer "user_id", :null => false + t.integer "activity_container_id" + t.string "activity_container_type", :default => "" + t.datetime "created_at" + end + + add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type" + add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type" + add_index "activities", ["user_id"], :name => "index_activities_on_user_id" + + create_table "activity_notifies", :force => true do |t| + t.integer "activity_container_id" + t.string "activity_container_type" + t.integer "activity_id" + t.string "activity_type" + t.integer "notify_to" + t.datetime "created_on" + t.integer "is_read" + end + + add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id" + add_index "activity_notifies", ["created_on"], :name => "index_an_created_on" + add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to" + + create_table "api_keys", :force => true do |t| + t.string "access_token" + t.datetime "expires_at" + t.integer "user_id" + t.boolean "active", :default => true + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token" + add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id" + + create_table "applied_projects", :force => true do |t| + t.integer "project_id", :null => false + t.integer "user_id", :null => false + end + + create_table "apply_project_masters", :force => true do |t| + t.integer "user_id" + t.string "apply_type" + t.integer "apply_id" + t.integer "status" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "attachments", :force => true do |t| + t.integer "container_id" + t.string "container_type", :limit => 30 + t.string "filename", :default => "", :null => false + t.string "disk_filename", :default => "", :null => false + t.integer "filesize", :default => 0, :null => false + t.string "content_type", :default => "" + t.string "digest", :limit => 40, :default => "", :null => false + t.integer "downloads", :default => 0, :null => false + t.integer "author_id", :default => 0, :null => false + t.datetime "created_on" + t.string "description" + t.string "disk_directory" + t.integer "attachtype", :default => 1 + t.integer "is_public", :default => 1 + t.integer "copy_from" + t.integer "quotes" + end + + add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id" + add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type" + add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on" + + create_table "attachmentstypes", :force => true do |t| + t.integer "typeId", :null => false + t.string "typeName", :limit => 50 + end + + create_table "auth_sources", :force => true do |t| + t.string "type", :limit => 30, :default => "", :null => false + t.string "name", :limit => 60, :default => "", :null => false + t.string "host", :limit => 60 + t.integer "port" + t.string "account" + t.string "account_password", :default => "" + t.string "base_dn" + t.string "attr_login", :limit => 30 + t.string "attr_firstname", :limit => 30 + t.string "attr_lastname", :limit => 30 + t.string "attr_mail", :limit => 30 + t.boolean "onthefly_register", :default => false, :null => false + t.boolean "tls", :default => false, :null => false + t.string "filter" + t.integer "timeout" + end + + add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type" + + create_table "biding_projects", :force => true do |t| + t.integer "project_id" + t.integer "bid_id" + t.integer "user_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "reward" + end + + create_table "bids", :force => true do |t| + t.string "name" + t.string "budget", :null => false + t.integer "author_id" + t.date "deadline" + t.text "description" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + t.integer "commit" + t.integer "reward_type" + t.integer "homework_type" + t.integer "parent_id" + t.string "password" + t.integer "is_evaluation" + t.integer "proportion", :default => 60 + t.integer "comment_status", :default => 0 + t.integer "evaluation_num", :default => 3 + t.integer "open_anonymous_evaluation", :default => 1 + end + + create_table "blog_comments", :force => true do |t| + t.integer "blog_id", :null => false + t.integer "parent_id" + t.string "title", :default => "", :null => false + t.text "content" + t.integer "author_id" + t.integer "comments_count", :default => 0, :null => false + t.integer "last_comment_id" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + t.boolean "locked", :default => false + t.integer "sticky", :default => 0 + t.integer "reply_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "blogs", :force => true do |t| + t.string "name", :default => "", :null => false + t.text "description" + t.integer "position", :default => 1 + t.integer "article_count", :default => 0, :null => false + t.integer "comments_count", :default => 0, :null => false + t.integer "last_comments_id" + t.integer "parent_id" + t.integer "author_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "boards", :force => true do |t| + t.integer "project_id", :null => false + t.string "name", :default => "", :null => false + t.string "description" + t.integer "position", :default => 1 + t.integer "topics_count", :default => 0, :null => false + t.integer "messages_count", :default => 0, :null => false + t.integer "last_message_id" + t.integer "parent_id" + t.integer "course_id" + end + + add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id" + add_index "boards", ["project_id"], :name => "boards_project_id" + + create_table "bug_to_osps", :force => true do |t| + t.integer "osp_id" + t.integer "relative_memo_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "changes", :force => true do |t| + t.integer "changeset_id", :null => false + t.string "action", :limit => 1, :default => "", :null => false + t.text "path", :null => false + t.text "from_path" + t.string "from_revision" + t.string "revision" + t.string "branch" + end + + add_index "changes", ["changeset_id"], :name => "changesets_changeset_id" + + create_table "changeset_parents", :id => false, :force => true do |t| + t.integer "changeset_id", :null => false + t.integer "parent_id", :null => false + end + + add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids" + add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids" + + create_table "changesets", :force => true do |t| + t.integer "repository_id", :null => false + t.string "revision", :null => false + t.string "committer" + t.datetime "committed_on", :null => false + t.text "comments" + t.date "commit_date" + t.string "scmid" + t.integer "user_id" + end + + add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on" + add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true + add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid" + add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id" + add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id" + + create_table "changesets_issues", :id => false, :force => true do |t| + t.integer "changeset_id", :null => false + t.integer "issue_id", :null => false + end + + add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true + + create_table "code_review_assignments", :force => true do |t| + t.integer "issue_id" + t.integer "change_id" + t.integer "attachment_id" + t.string "file_path" + t.string "rev" + t.string "rev_to" + t.string "action_type" + t.integer "changeset_id" + end + + create_table "code_review_project_settings", :force => true do |t| + t.integer "project_id" + t.integer "tracker_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "updated_by" + t.boolean "hide_code_review_tab", :default => false + t.integer "auto_relation", :default => 1 + t.integer "assignment_tracker_id" + t.text "auto_assign" + t.integer "lock_version", :default => 0, :null => false + t.boolean "tracker_in_review_dialog", :default => false + end + + create_table "code_review_user_settings", :force => true do |t| + t.integer "user_id", :default => 0, :null => false + t.integer "mail_notification", :default => 0, :null => false + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "code_reviews", :force => true do |t| + t.integer "project_id" + t.integer "change_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "line" + t.integer "updated_by_id" + t.integer "lock_version", :default => 0, :null => false + t.integer "status_changed_from" + t.integer "status_changed_to" + t.integer "issue_id" + t.string "action_type" + t.string "file_path" + t.string "rev" + t.string "rev_to" + t.integer "attachment_id" + t.integer "file_count", :default => 0, :null => false + t.boolean "diff_all" + end + + create_table "comments", :force => true do |t| + t.string "commented_type", :limit => 30, :default => "", :null => false + t.integer "commented_id", :default => 0, :null => false + t.integer "author_id", :default => 0, :null => false + t.text "comments" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + end + + add_index "comments", ["author_id"], :name => "index_comments_on_author_id" + add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type" + + create_table "contest_notifications", :force => true do |t| + t.text "title" + t.text "content" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "contesting_projects", :force => true do |t| + t.integer "project_id" + t.string "contest_id" + t.integer "user_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "reward" + end + + create_table "contesting_softapplications", :force => true do |t| + t.integer "softapplication_id" + t.integer "contest_id" + t.integer "user_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "reward" + end + + create_table "contestnotifications", :force => true do |t| + t.integer "contest_id" + t.string "title" + t.string "summary" + t.text "description" + t.integer "author_id" + t.integer "notificationcomments_count" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "contests", :force => true do |t| + t.string "name" + t.string "budget", :default => "" + t.integer "author_id" + t.date "deadline" + t.string "description" + t.integer "commit" + t.string "password" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + end + + create_table "course_activities", :force => true do |t| + t.integer "user_id" + t.integer "course_id" + t.integer "course_act_id" + t.string "course_act_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "course_attachments", :force => true do |t| + t.string "filename" + t.string "disk_filename" + t.integer "filesize" + t.string "content_type" + t.string "digest" + t.integer "downloads" + t.string "author_id" + t.string "integer" + t.string "description" + t.string "disk_directory" + t.integer "attachtype" + t.integer "is_public" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "container_id", :default => 0 + end + + create_table "course_groups", :force => true do |t| + t.string "name" + t.integer "course_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "course_infos", :force => true do |t| + t.integer "course_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "course_messages", :force => true do |t| + t.integer "user_id" + t.integer "course_id" + t.integer "course_message_id" + t.string "course_message_type" + t.integer "viewed" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "content" + t.integer "status" + end + + create_table "course_statuses", :force => true do |t| + t.integer "changesets_count" + t.integer "watchers_count" + t.integer "course_id" + t.float "grade", :default => 0.0 + t.integer "course_ac_para", :default => 0 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "courses", :force => true do |t| + t.integer "tea_id" + t.string "name" + t.integer "state" + t.string "code" + t.integer "time" + t.string "extra" + 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" + t.integer "school_id" + t.text "description" + t.integer "status", :default => 1 + t.integer "attachmenttype", :default => 2 + t.integer "lft" + t.integer "rgt" + t.integer "is_public", :limit => 1, :default => 1 + t.integer "inherit_members", :limit => 1, :default => 1 + t.integer "open_student", :default => 0 + t.integer "outline", :default => 0 + end + + create_table "custom_fields", :force => true do |t| + t.string "type", :limit => 30, :default => "", :null => false + t.string "name", :limit => 30, :default => "", :null => false + t.string "field_format", :limit => 30, :default => "", :null => false + t.text "possible_values" + t.string "regexp", :default => "" + t.integer "min_length", :default => 0, :null => false + t.integer "max_length", :default => 0, :null => false + t.boolean "is_required", :default => false, :null => false + t.boolean "is_for_all", :default => false, :null => false + t.boolean "is_filter", :default => false, :null => false + t.integer "position", :default => 1 + t.boolean "searchable", :default => false + t.text "default_value" + t.boolean "editable", :default => true + t.boolean "visible", :default => true, :null => false + t.boolean "multiple", :default => false + end + + add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type" + + create_table "custom_fields_projects", :id => false, :force => true do |t| + t.integer "custom_field_id", :default => 0, :null => false + t.integer "project_id", :default => 0, :null => false + end + + add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true + + create_table "custom_fields_trackers", :id => false, :force => true do |t| + t.integer "custom_field_id", :default => 0, :null => false + t.integer "tracker_id", :default => 0, :null => false + end + + add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true + + create_table "custom_values", :force => true do |t| + t.string "customized_type", :limit => 30, :default => "", :null => false + t.integer "customized_id", :default => 0, :null => false + t.integer "custom_field_id", :default => 0, :null => false + t.text "value" + end + + add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" + add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" + + create_table "delayed_jobs", :force => true do |t| + t.integer "priority", :default => 0, :null => false + t.integer "attempts", :default => 0, :null => false + t.text "handler", :null => false + t.text "last_error" + t.datetime "run_at" + t.datetime "locked_at" + t.datetime "failed_at" + t.string "locked_by" + t.string "queue" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" + + create_table "discuss_demos", :force => true do |t| + t.string "title" + t.text "body" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "documents", :force => true do |t| + t.integer "project_id", :default => 0, :null => false + t.integer "category_id", :default => 0, :null => false + t.string "title", :limit => 60, :default => "", :null => false + t.text "description" + t.datetime "created_on" + t.integer "user_id", :default => 0 + t.integer "is_public", :default => 1 + end + + add_index "documents", ["category_id"], :name => "index_documents_on_category_id" + add_index "documents", ["created_on"], :name => "index_documents_on_created_on" + add_index "documents", ["project_id"], :name => "documents_project_id" + + create_table "dts", :primary_key => "Num", :force => true do |t| + t.string "Defect", :limit => 50 + t.string "Category", :limit => 50 + t.string "File" + t.string "Method" + t.string "Module", :limit => 20 + t.string "Variable", :limit => 50 + t.integer "StartLine" + t.integer "IPLine" + t.string "IPLineCode", :limit => 200 + t.string "Judge", :limit => 15 + t.integer "Review", :limit => 1 + t.string "Description" + t.text "PreConditions", :limit => 2147483647 + t.text "TraceInfo", :limit => 2147483647 + t.text "Code", :limit => 2147483647 + t.integer "project_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "id", :null => false + end + + create_table "enabled_modules", :force => true do |t| + t.integer "project_id" + t.string "name", :null => false + t.integer "course_id" + end + + add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id" + + create_table "enumerations", :force => true do |t| + t.string "name", :limit => 30, :default => "", :null => false + t.integer "position", :default => 1 + t.boolean "is_default", :default => false, :null => false + t.string "type" + t.boolean "active", :default => true, :null => false + t.integer "project_id" + t.integer "parent_id" + t.string "position_name", :limit => 30 + end + + add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" + add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" + + create_table "first_pages", :force => true do |t| + t.string "web_title" + t.string "title" + t.text "description" + t.string "page_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "sort_type" + t.integer "image_width", :default => 107 + t.integer "image_height", :default => 63 + t.integer "show_course", :default => 1 + t.integer "show_contest", :default => 1 + end + + create_table "forge_activities", :force => true do |t| + t.integer "user_id" + t.integer "project_id" + t.integer "forge_act_id" + t.string "forge_act_type" + t.integer "org_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id" + + create_table "forge_messages", :force => true do |t| + t.integer "user_id" + t.integer "project_id" + t.integer "forge_message_id" + t.string "forge_message_type" + t.integer "viewed" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "secret_key" + t.integer "status" + end + + create_table "forums", :force => true do |t| + t.string "name", :null => false + t.text "description" + t.integer "topic_count", :default => 0 + t.integer "memo_count", :default => 0 + t.integer "last_memo_id", :default => 0 + t.integer "creator_id", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "sticky" + t.integer "locked" + end + + create_table "groups_users", :id => false, :force => true do |t| + t.integer "group_id", :null => false + t.integer "user_id", :null => false + end + + add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true + + create_table "homework_attaches", :force => true do |t| + t.integer "bid_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "reward" + t.string "name" + t.text "description" + t.integer "state" + t.integer "project_id", :default => 0 + t.float "score", :default => 0.0 + t.integer "is_teacher_score", :default => 0 + end + + add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id" + + create_table "homework_commons", :force => true do |t| + t.string "name" + t.integer "user_id" + t.text "description" + t.date "publish_time" + t.date "end_time" + t.integer "homework_type", :default => 1 + t.string "late_penalty" + t.integer "course_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "teacher_priority", :default => 1 + t.integer "anonymous_comment", :default => 0 + end + + create_table "homework_detail_manuals", :force => true do |t| + t.float "ta_proportion" + t.integer "comment_status" + t.date "evaluation_start" + t.date "evaluation_end" + t.integer "evaluation_num" + t.integer "absence_penalty", :default => 1 + t.integer "homework_common_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "homework_detail_programings", :force => true do |t| + t.string "language" + t.text "standard_code", :limit => 2147483647 + t.integer "homework_common_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.float "ta_proportion", :default => 0.1 + t.integer "question_id" + end + + create_table "homework_evaluations", :force => true do |t| + t.string "user_id" + t.string "homework_attach_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "homework_for_courses", :force => true do |t| + t.integer "course_id" + t.integer "bid_id" + end + + add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id" + add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id" + + create_table "homework_tests", :force => true do |t| + t.text "input" + t.text "output" + t.integer "homework_common_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "result" + t.text "error_msg" + end + + create_table "homework_users", :force => true do |t| + t.string "homework_attach_id" + t.string "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "invite_lists", :force => true do |t| + t.integer "project_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "mail" + end + + create_table "issue_categories", :force => true do |t| + t.integer "project_id", :default => 0, :null => false + t.string "name", :limit => 30, :default => "", :null => false + t.integer "assigned_to_id" + end + + add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id" + 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 "delay" + end + + add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true + add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id" + add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id" + + create_table "issue_statuses", :force => true do |t| + t.string "name", :limit => 30, :default => "", :null => false + t.boolean "is_closed", :default => false, :null => false + t.boolean "is_default", :default => false, :null => false + t.integer "position", :default => 1 + t.integer "default_done_ratio" + end + + add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed" + add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default" + add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position" + + create_table "issues", :force => true do |t| + t.integer "tracker_id", :null => false + t.integer "project_id", :null => false + t.string "subject", :default => "", :null => false + t.text "description" + t.date "due_date" + t.integer "category_id" + t.integer "status_id", :null => false + t.integer "assigned_to_id" + t.integer "priority_id", :null => false + t.integer "fixed_version_id" + t.integer "author_id", :null => false + t.integer "lock_version", :default => 0, :null => false + t.datetime "created_on" + t.datetime "updated_on" + t.date "start_date" + t.integer "done_ratio", :default => 0, :null => false + t.float "estimated_hours" + t.integer "parent_id" + t.integer "root_id" + t.integer "lft" + t.integer "rgt" + t.boolean "is_private", :default => false, :null => false + t.datetime "closed_on" + t.integer "project_issues_index" + end + + add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id" + add_index "issues", ["author_id"], :name => "index_issues_on_author_id" + add_index "issues", ["category_id"], :name => "index_issues_on_category_id" + add_index "issues", ["created_on"], :name => "index_issues_on_created_on" + add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id" + add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id" + add_index "issues", ["project_id"], :name => "issues_project_id" + add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt" + add_index "issues", ["status_id"], :name => "index_issues_on_status_id" + add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id" + + create_table "join_in_competitions", :force => true do |t| + t.integer "user_id" + t.integer "competition_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "join_in_contests", :force => true do |t| + t.integer "user_id" + t.integer "bid_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "journal_details", :force => true do |t| + t.integer "journal_id", :default => 0, :null => false + t.string "property", :limit => 30, :default => "", :null => false + t.string "prop_key", :limit => 30, :default => "", :null => false + t.text "old_value" + t.text "value" + end + + add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" + + create_table "journal_replies", :id => false, :force => true do |t| + t.integer "journal_id" + t.integer "user_id" + t.integer "reply_id" + end + + add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id" + add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id" + add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id" + + create_table "journals", :force => true do |t| + t.integer "journalized_id", :default => 0, :null => false + t.string "journalized_type", :limit => 30, :default => "", :null => false + t.integer "user_id", :default => 0, :null => false + t.text "notes" + t.datetime "created_on", :null => false + t.boolean "private_notes", :default => false, :null => false + end + + add_index "journals", ["created_on"], :name => "index_journals_on_created_on" + add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id" + add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id" + add_index "journals", ["user_id"], :name => "index_journals_on_user_id" + + create_table "journals_for_messages", :force => true do |t| + t.integer "jour_id" + t.string "jour_type" + t.integer "user_id" + t.text "notes" + t.integer "status" + t.integer "reply_id" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + t.string "m_parent_id" + t.boolean "is_readed" + t.integer "m_reply_count" + t.integer "m_reply_id" + t.integer "is_comprehensive_evaluation" + end + + create_table "kindeditor_assets", :force => true do |t| + t.string "asset" + t.integer "file_size" + t.string "file_type" + t.integer "owner_id" + t.string "asset_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "owner_type", :default => 0 + end + + create_table "member_roles", :force => true do |t| + t.integer "member_id", :null => false + t.integer "role_id", :null => false + t.integer "inherited_from" + end + + add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id" + add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id" + + create_table "members", :force => true do |t| + t.integer "user_id", :default => 0, :null => false + t.integer "project_id", :default => 0 + t.datetime "created_on" + t.boolean "mail_notification", :default => false, :null => false + t.integer "course_id", :default => -1 + t.integer "course_group_id", :default => 0 + end + + add_index "members", ["project_id"], :name => "index_members_on_project_id" + add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true + add_index "members", ["user_id"], :name => "index_members_on_user_id" + + create_table "memo_messages", :force => true do |t| + t.integer "user_id" + t.integer "forum_id" + t.integer "memo_id" + t.string "memo_type" + t.integer "viewed" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "memos", :force => true do |t| + t.integer "forum_id", :null => false + t.integer "parent_id" + t.string "subject", :null => false + t.text "content", :null => false + t.integer "author_id", :null => false + t.integer "replies_count", :default => 0 + t.integer "last_reply_id" + t.boolean "lock", :default => false + t.boolean "sticky", :default => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "viewed_count", :default => 0 + end + + create_table "message_alls", :force => true do |t| + t.integer "user_id" + t.integer "message_id" + t.string "message_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "messages", :force => true do |t| + t.integer "board_id", :null => false + t.integer "parent_id" + t.string "subject", :default => "", :null => false + t.text "content" + t.integer "author_id" + t.integer "replies_count", :default => 0, :null => false + t.integer "last_reply_id" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + t.boolean "locked", :default => false + t.integer "sticky", :default => 0 + t.integer "reply_id" + end + + add_index "messages", ["author_id"], :name => "index_messages_on_author_id" + add_index "messages", ["board_id"], :name => "messages_board_id" + add_index "messages", ["created_on"], :name => "index_messages_on_created_on" + add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" + add_index "messages", ["parent_id"], :name => "messages_parent_id" + + create_table "news", :force => true do |t| + t.integer "project_id" + t.string "title", :limit => 60, :default => "", :null => false + t.string "summary", :default => "" + t.text "description" + t.integer "author_id", :default => 0, :null => false + t.datetime "created_on" + t.integer "comments_count", :default => 0, :null => false + t.integer "course_id" + end + + add_index "news", ["author_id"], :name => "index_news_on_author_id" + add_index "news", ["created_on"], :name => "index_news_on_created_on" + add_index "news", ["project_id"], :name => "news_project_id" + + create_table "no_uses", :force => true do |t| + t.integer "user_id", :null => false + t.string "no_use_type" + t.integer "no_use_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "notificationcomments", :force => true do |t| + t.string "notificationcommented_type" + t.integer "notificationcommented_id" + t.integer "author_id" + t.text "notificationcomments" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "onclick_times", :force => true do |t| + t.integer "user_id" + t.datetime "onclick_time" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "open_id_authentication_associations", :force => true do |t| + t.integer "issued" + t.integer "lifetime" + t.string "handle" + t.string "assoc_type" + t.binary "server_url" + t.binary "secret" + end + + create_table "open_id_authentication_nonces", :force => true do |t| + t.integer "timestamp", :null => false + t.string "server_url" + t.string "salt", :null => false + end + + create_table "open_source_projects", :force => true do |t| + t.string "name" + t.text "description" + t.integer "commit_count", :default => 0 + t.integer "code_line", :default => 0 + t.integer "users_count", :default => 0 + t.date "last_commit_time" + t.string "url" + t.date "date_collected" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "option_numbers", :force => true do |t| + t.integer "user_id" + t.integer "memo" + t.integer "messages_for_issues" + t.integer "issues_status" + t.integer "replay_for_message" + t.integer "replay_for_memo" + t.integer "follow" + t.integer "tread" + t.integer "praise_by_one" + t.integer "praise_by_two" + t.integer "praise_by_three" + t.integer "tread_by_one" + t.integer "tread_by_two" + t.integer "tread_by_three" + t.integer "changeset" + t.integer "document" + t.integer "attachment" + t.integer "issue_done_ratio" + t.integer "post_issue" + t.integer "score_type" + t.integer "total_score" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "project_id" + end + + create_table "org_members", :force => true do |t| + t.integer "user_id" + t.integer "organization_id" + t.string "role" + end + + create_table "organizations", :force => true do |t| + t.string "name" + t.text "description" + t.integer "creator_id" + t.integer "home_id" + t.string "domain" + t.boolean "is_public" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "phone_app_versions", :force => true do |t| + t.string "version" + t.text "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_answers", :force => true do |t| + t.integer "poll_question_id" + t.text "answer_text" + t.integer "answer_position" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_questions", :force => true do |t| + t.string "question_title" + t.integer "question_type" + t.integer "is_necessary" + t.integer "poll_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "question_number" + end + + create_table "poll_users", :force => true do |t| + t.integer "user_id" + t.integer "poll_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_votes", :force => true do |t| + t.integer "user_id" + t.integer "poll_question_id" + t.integer "poll_answer_id" + t.text "vote_text" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "polls", :force => true do |t| + t.string "polls_name" + t.string "polls_type" + t.integer "polls_group_id" + t.integer "polls_status" + t.integer "user_id" + t.datetime "published_at" + t.datetime "closed_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.text "polls_description" + t.integer "show_result", :default => 1 + end + + create_table "praise_tread_caches", :force => true do |t| + t.integer "object_id", :null => false + t.string "object_type" + t.integer "praise_num" + t.integer "tread_num" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "praise_treads", :force => true do |t| + t.integer "user_id", :null => false + t.integer "praise_tread_object_id" + t.string "praise_tread_object_type" + t.integer "praise_or_tread" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "principal_activities", :force => true do |t| + t.integer "user_id" + t.integer "principal_id" + t.integer "principal_act_id" + t.string "principal_act_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "project_infos", :force => true do |t| + t.integer "project_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "project_scores", :force => true do |t| + t.string "project_id" + t.integer "score" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "issue_num", :default => 0 + t.integer "issue_journal_num", :default => 0 + t.integer "news_num", :default => 0 + t.integer "documents_num", :default => 0 + t.integer "changeset_num", :default => 0 + t.integer "board_message_num", :default => 0 + end + + create_table "project_statuses", :force => true do |t| + t.integer "changesets_count" + t.integer "watchers_count" + t.integer "project_id" + t.integer "project_type" + t.float "grade", :default => 0.0 + t.integer "course_ac_para", :default => 0 + end + + add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade" + + create_table "projecting_softapplictions", :force => true do |t| + t.integer "user_id" + t.integer "softapplication_id" + t.integer "project_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "projects", :force => true do |t| + t.string "name", :default => "", :null => false + t.text "description" + t.string "homepage", :default => "" + t.boolean "is_public", :default => true, :null => false + t.integer "parent_id" + t.datetime "created_on" + t.datetime "updated_on" + t.string "identifier" + t.integer "status", :default => 1, :null => false + t.integer "lft" + t.integer "rgt" + t.boolean "inherit_members", :default => false, :null => false + t.integer "project_type" + t.boolean "hidden_repo", :default => false, :null => false + t.integer "attachmenttype", :default => 1 + t.integer "user_id" + t.integer "dts_test", :default => 0 + t.string "enterprise_name" + t.integer "organization_id" + t.integer "project_new_type" + t.integer "gpid" + end + + add_index "projects", ["lft"], :name => "index_projects_on_lft" + add_index "projects", ["rgt"], :name => "index_projects_on_rgt" + + create_table "projects_trackers", :id => false, :force => true do |t| + t.integer "project_id", :default => 0, :null => false + t.integer "tracker_id", :default => 0, :null => false + end + + add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true + add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" + + create_table "queries", :force => true do |t| + t.integer "project_id" + t.string "name", :default => "", :null => false + t.text "filters" + t.integer "user_id", :default => 0, :null => false + t.boolean "is_public", :default => false, :null => false + t.text "column_names" + t.text "sort_criteria" + t.string "group_by" + t.string "type" + end + + add_index "queries", ["project_id"], :name => "index_queries_on_project_id" + add_index "queries", ["user_id"], :name => "index_queries_on_user_id" + + create_table "relative_memo_to_open_source_projects", :force => true do |t| + t.integer "osp_id" + t.integer "relative_memo_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "relative_memos", :force => true do |t| + t.integer "osp_id" + t.integer "parent_id" + t.string "subject", :null => false + t.text "content", :limit => 16777215, :null => false + t.integer "author_id" + t.integer "replies_count", :default => 0 + t.integer "last_reply_id" + t.boolean "lock", :default => false + t.boolean "sticky", :default => false + t.boolean "is_quote", :default => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "viewed_count_crawl", :default => 0 + t.integer "viewed_count_local", :default => 0 + t.string "url" + t.string "username" + t.string "userhomeurl" + t.date "date_collected" + t.string "topic_resource" + end + + 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.string "type" + 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 "hidden", :default => false + end + + add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id" + + create_table "rich_rich_files", :force => true do |t| + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "rich_file_file_name" + t.string "rich_file_content_type" + t.integer "rich_file_file_size" + t.datetime "rich_file_updated_at" + t.string "owner_type" + t.integer "owner_id" + t.text "uri_cache" + t.string "simplified_type", :default => "file" + end + + create_table "roles", :force => true do |t| + t.string "name", :limit => 30, :default => "", :null => false + t.integer "position", :default => 1 + t.boolean "assignable", :default => true + t.integer "builtin", :default => 0, :null => false + t.text "permissions" + t.string "issues_visibility", :limit => 30, :default => "default", :null => false + end + + create_table "schools", :force => true do |t| + t.string "name" + t.string "province" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "logo_link" + t.string "pinyin" + 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 + t.integer "is_teacher_score", :default => 0 + end + + create_table "settings", :force => true do |t| + t.string "name", :default => "", :null => false + t.text "value" + t.datetime "updated_on" + end + + add_index "settings", ["name"], :name => "index_settings_on_name" + + create_table "shares", :force => true do |t| + t.date "created_on" + t.string "url" + t.string "title" + t.integer "share_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "project_id" + t.integer "user_id" + t.string "description" + end + + create_table "softapplications", :force => true do |t| + t.string "name" + t.text "description" + t.integer "app_type_id" + t.string "app_type_name" + t.string "android_min_version_available" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "contest_id" + t.integer "softapplication_id" + t.integer "is_public" + t.string "application_developers" + t.string "deposit_project_url" + t.string "deposit_project" + t.integer "project_id" + end + + create_table "student_work_tests", :force => true do |t| + t.integer "student_work_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "status", :default => 9 + t.text "results" + t.text "src" + end + + create_table "student_works", :force => true do |t| + t.string "name" + t.text "description", :limit => 2147483647 + t.integer "homework_common_id" + t.integer "user_id" + t.float "final_score" + t.float "teacher_score" + t.float "student_score" + t.float "teaching_asistant_score" + t.integer "project_id", :default => 0 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "late_penalty", :default => 0 + t.integer "absence_penalty", :default => 0 + t.float "system_score", :default => 0.0 + t.boolean "is_test", :default => false + end + + create_table "student_works_evaluation_distributions", :force => true do |t| + t.integer "student_work_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "student_works_scores", :force => true do |t| + t.integer "student_work_id" + t.integer "user_id" + t.integer "score" + t.text "comment" + t.integer "reviewer_role" + 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" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id" + add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id" + + create_table "system_messages", :force => true do |t| + t.integer "user_id" + t.string "content" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.text "description" + t.string "subject" + end + + create_table "taggings", :force => true do |t| + t.integer "tag_id" + t.integer "taggable_id" + t.string "taggable_type" + t.integer "tagger_id" + t.string "tagger_type" + t.string "context", :limit => 128 + t.datetime "created_at" + end + + add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" + add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context" + add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type" + + create_table "tags", :force => true do |t| + t.string "name" + end + + create_table "teachers", :force => true do |t| + t.string "tea_name" + t.string "location" + t.integer "couurse_time" + t.integer "course_code" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "extra" + end + + create_table "time_entries", :force => true do |t| + t.integer "project_id", :null => false + t.integer "user_id", :null => false + t.integer "issue_id" + t.float "hours", :null => false + t.string "comments" + t.integer "activity_id", :null => false + t.date "spent_on", :null => false + t.integer "tyear", :null => false + t.integer "tmonth", :null => false + t.integer "tweek", :null => false + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + end + + add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id" + add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on" + add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id" + add_index "time_entries", ["project_id"], :name => "time_entries_project_id" + add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" + + 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.datetime "created_on", :null => false + end + + add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id" + add_index "tokens", ["value"], :name => "tokens_value", :unique => true + + create_table "trackers", :force => true do |t| + t.string "name", :limit => 30, :default => "", :null => false + t.boolean "is_in_chlog", :default => false, :null => false + t.integer "position", :default => 1 + t.boolean "is_in_roadmap", :default => true, :null => false + t.integer "fields_bits", :default => 0 + end + + create_table "user_activities", :force => true do |t| + t.string "act_type" + t.integer "act_id" + t.string "container_type" + t.integer "container_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "user_id" + end + + create_table "user_extensions", :force => true do |t| + t.integer "user_id", :null => false + t.date "birthday" + t.string "brief_introduction" + t.integer "gender" + t.string "location" + t.string "occupation" + t.integer "work_experience" + 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 "student_id" + t.string "teacher_realname" + t.string "student_realname" + t.string "location_city" + t.integer "school_id" + t.string "description", :default => "" + end + + create_table "user_feedback_messages", :force => true do |t| + t.integer "user_id" + t.integer "journals_for_message_id" + t.string "journals_for_message_type" + t.integer "viewed" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "user_grades", :force => true do |t| + t.integer "user_id", :null => false + t.integer "project_id", :null => false + t.float "grade", :default => 0.0 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade" + add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id" + add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id" + + create_table "user_levels", :force => true do |t| + t.integer "user_id" + t.integer "level" + end + + create_table "user_preferences", :force => true do |t| + t.integer "user_id", :default => 0, :null => false + t.text "others" + t.boolean "hide_mail", :default => false + t.string "time_zone" + end + + add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id" + + create_table "user_score_details", :force => true do |t| + t.integer "current_user_id" + t.integer "target_user_id" + t.string "score_type" + t.string "score_action" + t.integer "user_id" + t.integer "old_score" + t.integer "new_score" + t.integer "current_user_level" + t.integer "target_user_level" + t.integer "score_changeable_obj_id" + t.string "score_changeable_obj_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "user_scores", :force => true do |t| + t.integer "user_id", :null => false + t.integer "collaboration" + t.integer "influence" + t.integer "skill" + t.integer "active" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "user_statuses", :force => true do |t| + t.integer "changesets_count" + t.integer "watchers_count" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.float "grade", :default => 0.0 + end + + add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count" + 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 "users", :force => true do |t| + t.string "login", :default => "", :null => false + t.string "hashed_password", :limit => 40, :default => "", :null => false + t.string "firstname", :limit => 30, :default => "", :null => false + t.string "lastname", :default => "", :null => false + t.string "mail", :limit => 60, :default => "", :null => false + t.boolean "admin", :default => false, :null => false + t.integer "status", :default => 1, :null => false + t.datetime "last_login_on" + t.string "language", :limit => 5, :default => "" + t.integer "auth_source_id" + t.datetime "created_on" + t.datetime "updated_on" + t.string "type" + t.string "identity_url" + t.string "mail_notification", :default => "", :null => false + t.string "salt", :limit => 64 + t.integer "gid" + end + + add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id" + add_index "users", ["id", "type"], :name => "index_users_on_id_and_type" + add_index "users", ["type"], :name => "index_users_on_type" + + create_table "versions", :force => true do |t| + t.integer "project_id", :default => 0, :null => false + t.string "name", :default => "", :null => false + t.string "description", :default => "" + t.date "effective_date" + t.datetime "created_on" + t.datetime "updated_on" + t.string "wiki_page_title" + t.string "status", :default => "open" + t.string "sharing", :default => "none", :null => false + end + + add_index "versions", ["project_id"], :name => "versions_project_id" + add_index "versions", ["sharing"], :name => "index_versions_on_sharing" + + create_table "visitors", :force => true do |t| + t.integer "user_id" + t.integer "master_id" + t.datetime "updated_on" + t.datetime "created_on" + end + + add_index "visitors", ["master_id"], :name => "index_visitors_master_id" + add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on" + add_index "visitors", ["user_id"], :name => "index_visitors_user_id" + + create_table "watchers", :force => true do |t| + t.string "watchable_type", :default => "", :null => false + t.integer "watchable_id", :default => 0, :null => false + t.integer "user_id" + end + + add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type" + add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id" + add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type" + + create_table "web_footer_companies", :force => true do |t| + t.string "name" + t.string "logo_size" + t.string "url" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "web_footer_oranizers", :force => true do |t| + t.string "name" + t.text "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "wiki_content_versions", :force => true do |t| + t.integer "wiki_content_id", :null => false + t.integer "page_id", :null => false + t.integer "author_id" + t.binary "data", :limit => 2147483647 + t.string "compression", :limit => 6, :default => "" + t.string "comments", :default => "" + t.datetime "updated_on", :null => false + t.integer "version", :null => false + end + + add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on" + add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid" + + create_table "wiki_contents", :force => true do |t| + t.integer "page_id", :null => false + t.integer "author_id" + t.text "text", :limit => 2147483647 + t.string "comments", :default => "" + t.datetime "updated_on", :null => false + t.integer "version", :null => false + end + + add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id" + add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id" + + create_table "wiki_pages", :force => true do |t| + t.integer "wiki_id", :null => false + t.string "title", :null => false + t.datetime "created_on", :null => false + t.boolean "protected", :default => false, :null => false + t.integer "parent_id" + end + + add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id" + add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title" + add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id" + + create_table "wiki_redirects", :force => true do |t| + t.integer "wiki_id", :null => false + t.string "title" + t.string "redirects_to" + t.datetime "created_on", :null => false + end + + add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title" + add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id" + + create_table "wikis", :force => true do |t| + t.integer "project_id", :null => false + t.string "start_page", :null => false + t.integer "status", :default => 1, :null => false + end + + add_index "wikis", ["project_id"], :name => "wikis_project_id" + + create_table "workflows", :force => true do |t| + t.integer "tracker_id", :default => 0, :null => false + t.integer "old_status_id", :default => 0, :null => false + t.integer "new_status_id", :default => 0, :null => false + t.integer "role_id", :default => 0, :null => false + t.boolean "assignee", :default => false, :null => false + t.boolean "author", :default => false, :null => false + t.string "type", :limit => 30 + t.string "field_name", :limit => 30 + t.string "rule", :limit => 30 + end + + add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id" + add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id" + add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status" + add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id" + + create_table "works_categories", :force => true do |t| + t.string "category" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "zip_packs", :force => true do |t| + t.integer "user_id" + t.integer "homework_id" + t.string "file_digest" + t.string "file_path" + t.integer "pack_times", :default => 1 + t.integer "pack_size", :default => 0 + t.text "file_digests" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + +end diff --git a/lib/gitlab-cli/bin/gitlab b/lib/gitlab-cli/bin/gitlab old mode 100644 new mode 100755 diff --git a/lib/grack/bin/console b/lib/grack/bin/console old mode 100644 new mode 100755 diff --git a/lib/grack/bin/testserver b/lib/grack/bin/testserver old mode 100644 new mode 100755 From c50bcf93314617ef7163cd1b9e53cb34f9674033 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 16 Nov 2015 10:56:00 +0800 Subject: [PATCH 081/285] =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=B7=B2=E6=88=AA=E6=AD=A2=E7=9A=84=E4=BD=9C=E4=B8=9A=EF=BC=8C?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=8A=B6=E6=80=81=E7=94=B1=E2=80=9C=E4=BD=9C?= =?UTF-8?q?=E5=93=81=E6=8F=90=E4=BA=A4=E4=B8=AD=E2=80=9D=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E2=80=9C=E4=BD=9C=E5=93=81=E8=A1=A5=E4=BA=A4=E4=B8=AD=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_homework.html.erb | 6 +++++- app/views/users/_user_homework_detail.html.erb | 6 +++++- public/stylesheets/courses.css | 1 + public/stylesheets/new_user.css | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 38a4d6edd..d02cea104 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -23,7 +23,11 @@ <% else %> 匿评已禁用 <% end %> - 作品提交中 + <% if Time.parse(activity.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")%> + 作品提交中 + <% elsif Time.parse(activity.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") %> + 作品补交中 + <% end %> <% elsif activity.homework_detail_manual.comment_status == 2%> <% if activity.anonymous_comment == 0%> 匿评中 diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 0c2a28e5c..539b8b603 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -23,7 +23,11 @@ <% else %> 匿评已禁用 <% end %> - 作品提交中 + <% if Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")%> + 作品提交中 + <% elsif Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") %> + 作品补交中 + <% end %> <% elsif homework_common.homework_detail_manual.comment_status == 2%> <% if homework_common.anonymous_comment == 0%> 匿评中 diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 05bba54f6..5469078a5 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -182,6 +182,7 @@ a.f_grey:hover {color:#000000;} /*.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}*/ .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} +.red_homework_btn_cir{ background:#e74c3c; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .green_homework_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} .grey_homework_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 368964f3b..6ccfc47f6 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -299,6 +299,7 @@ a:hover.bgreen_n_btn{background:#08a384;} .green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .green_homework_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} +.red_homework_btn_cir{ background:#e74c3c; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .grey_homework_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} .blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} From de32745eefcfdfd9979a0fef1d5618867876075f Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 16 Nov 2015 15:02:57 +0800 Subject: [PATCH 082/285] =?UTF-8?q?1.=E5=B0=86=E9=A1=B9=E7=9B=AE=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB=E8=87=B3=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=8A=A8=E6=80=81=EF=BC=9B=202.=E5=9C=A8=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=8A=A8=E6=80=81=E4=B8=AD=EF=BC=8C=E6=8C=89=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=80=92=E6=8E=92=E6=98=BE=E7=A4=BA=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=8A=A8=E6=80=81=EF=BC=9B=203.=E5=A2=9E=E5=8A=A0=E6=88=91?= =?UTF-8?q?=E7=9A=84=E7=BB=84=E7=BB=87=E4=B8=AD=E6=90=9C=E7=B4=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 20 +++---- app/controllers/users_controller.rb | 14 +++++ app/models/forge_activity.rb | 12 +++- .../organizations/_org_activities.html.erb | 56 +++++++++++++++++++ app/views/organizations/show.html.erb | 44 ++------------- app/views/organizations/show.js.erb | 7 +-- app/views/users/_show_user_org.html.erb | 39 +++++++++++++ app/views/users/search_user_orgs.html.erb | 1 + app/views/users/search_user_orgs.js.erb | 2 + app/views/users/user_organizations.html.erb | 46 ++++++++------- config/routes.rb | 1 + ...copy_forge_activities_to_org_activities.rb | 16 ++++++ 12 files changed, 183 insertions(+), 75 deletions(-) create mode 100644 app/views/organizations/_org_activities.html.erb create mode 100644 app/views/users/_show_user_org.html.erb create mode 100644 app/views/users/search_user_orgs.html.erb create mode 100644 app/views/users/search_user_orgs.js.erb create mode 100644 db/migrate/20151116020842_copy_forge_activities_to_org_activities.rb diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index b75742164..6a1030adc 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -55,22 +55,22 @@ class OrganizationsController < ApplicationController def show if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization) @organization = Organization.find(params[:id]) - @org_activities = OrgActivity.where('container_id =? and container_type =? ', - @organization.id, 'Organization ').order('updated_at desc').page(params[:page]).per(10) - @org_activities_count = OrgActivity.where('container_id =? and container_type =? ', - @organization.id, 'Organization ').order('updated_at desc').count project_ids = @organization.projects.map(&:id) << 0 - @org_project_activties = ForgeActivity.where("project_id in (#{project_ids.join(',')}) and forge_act_type in('Issue','Message','ProjectCreateInfo')").order("updated_at desc").page(params[:page] || 1).per(10) - @org_project_activties_count = ForgeActivity.where('project_id in (?)',project_ids.join(',')).count + @org_activities = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and container_id in (#{project_ids.join(',')}))", + @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10) + @org_activities_count = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and container_id in (#{project_ids.join(',')}))" , + @organization.id, 'Organization ').count + # @org_project_activties = ForgeActivity.where("project_id in (#{project_ids.join(',')}) and forge_act_type in('Issue','Message','ProjectCreateInfo')").order("updated_at desc").page(params[:page] || 1).per(10) + # @org_project_activties_count = ForgeActivity.where('project_id in (?)',project_ids.join(',')).count #@org_activities = paginateHelper @org_activities, 10 @page = params[:page] + respond_to do |format| + format.html + format.js + end else render_403 end - respond_to do |format| - format.html - format.js - end end def update diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 273d48ccf..776e6b7d5 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1918,6 +1918,20 @@ class UsersController < ApplicationController end end + def search_user_orgs + name="" + if !params[:search_orgs].nil? + name = params[:search_orgs].strip + end + name = "%"+name+"%" + @orgs = User.current.organizations.where("name like ?", name) + @user = User.current + respond_to do |format| + format.html {render :layout => 'static_base'} + format.js + end + end + private def find_user diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb index c4f13c6d0..8a94f1019 100644 --- a/app/models/forge_activity.rb +++ b/app/models/forge_activity.rb @@ -20,7 +20,7 @@ class ForgeActivity < ActiveRecord::Base validates :forge_act_id,presence: true validates :forge_act_type, presence: true has_many :user_acts, :class_name => 'UserAcivity',:as =>:act - after_save :add_user_activity + after_save :add_user_activity, :add_org_activity before_destroy :destroy_user_activity #在个人动态里面增加当前动态 @@ -45,6 +45,16 @@ class ForgeActivity < ActiveRecord::Base end end + def add_org_activity + OrgActivity.create(:user_id => self.user_id, + :org_act_id => self.forge_act_id, + :org_act_type => self.forge_act_type, + :container_id => self.project_id, + :container_type => 'Project', + :created_at => self.created_at, + :updated_at => self.updated_at) + end + def destroy_user_activity user_activity = UserActivity.where("act_type = '#{self.forge_act_type.to_s}' and act_id = '#{self.forge_act_id}'") user_activity.destroy_all diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb new file mode 100644 index 000000000..cb69738b6 --- /dev/null +++ b/app/views/organizations/_org_activities.html.erb @@ -0,0 +1,56 @@ +<% unless org_activities.nil? %> + <% org_activities.each do |act| %> + <% if act.container_type == 'Organization' %> + <% if act.org_act_type == 'CreateOrganization' %> +
              +
              +
              + <%= image_tag(url_to_avatar(User.find(act.user_id)), :width => "45", :height => "45") %> +
              +
              +
              <%= link_to User.find(act.user_id), user_path(act.user_id) %>  创建了 <%= Organization.find(act.org_act_id).name %> + | 组织
              +
              创建时间：<%= format_activity_day(act.created_at) %> <%= format_time(act.created_at, false) %>
              +
              +
              +
              +
              + <% end %> + <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %> + + <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> + <% end %> + <% end %> + <% if act.container_type == 'Project' %> + <% case act.org_act_type.to_s %> + <% when 'Issue' %> + <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => Issue.find(act.org_act_id),:user_activity_id =>act.id} %> + <% when 'Message' %> + <%= render :partial => 'organizations/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %> + <%# when 'ProjectCreateInfo'%> + <%#= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %> + <% end %> + <% end %> + <% end %> + + <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> + +<% end %> + +<% if org_act_count == 10 %> +
              展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1),:id => "more_org_activities_link",:remote => "true",:class => "none" %>
              + <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> +<% end%> + + \ No newline at end of file diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 0b624d479..a85ffa687 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -30,49 +30,15 @@ init_activity_KindEditor_data(<%= @organization.home_id%>, null, "87%"); }); - <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id} %> <% end %> - <% unless @org_activities.nil? %> - <% @org_activities.each do |act| %> - <% if act.org_act_type == 'CreateOrganization' %> -
              -
              -
              - <%= image_tag(url_to_avatar(User.find(act.user_id)), :width => "45", :height => "45") %> -
              -
              -
              <%= link_to User.find(act.user_id), user_path(act.user_id) %>  创建了 <%= Organization.find(act.org_act_id).name %> - | 组织
              -
              创建时间：<%= format_activity_day(act.created_at) %> <%= format_time(act.created_at, false) %>
              -
              -
              -
              -
              - <% end %> - <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %> - - <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> - <% end %> - <% end %> - - <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> - - <% end %> +<%= render :partial => 'organizations/org_activities', + :locals => {:org_activities =>@org_activities, + :page=>@page, + :org => @organization, + :org_act_count=>@org_activities.count}%> - <%# @org_project_activties.each do |org_act|%> - <%= render :partial => 'organizations/org_project_activities', - :locals => {:org_project_activties =>@org_project_activties, - :page=>@page, - :org => @organization, - :org_act_count=>@org_activities.count, - :pro_act_count=>@org_project_activties.count}%> - <%# end %> diff --git a/app/views/organizations/show.js.erb b/app/views/organizations/show.js.erb index b0a447910..ee405d73c 100644 --- a/app/views/organizations/show.js.erb +++ b/app/views/organizations/show.js.erb @@ -1,7 +1,6 @@ -$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial => 'organizations/org_project_activities', - :locals => {:org_project_activties =>@org_project_activties, +$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial => 'organizations/org_activities', + :locals => {:org_activities =>@org_activities, :page=>@page, :org => @organization, - :org_act_count=>@org_activities.count, - :pro_act_count=>@org_project_activties.count} )%>"); + :org_act_count=>@org_activities.count} )%>"); diff --git a/app/views/users/_show_user_org.html.erb b/app/views/users/_show_user_org.html.erb new file mode 100644 index 000000000..e753092fa --- /dev/null +++ b/app/views/users/_show_user_org.html.erb @@ -0,0 +1,39 @@ +<%= stylesheet_link_tag 'pleft','header','new_user','repository','org', 'project' %> +<%#= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %> +
              +
              +
              +
              + 组织列表 + + <%= form_tag url_for(:controller => 'users', :action => 'search_user_orgs', :id => User.current.id), :method => 'get', :id => "search_org_form", :class=>"resourcesSearchloadBox", :style=>"float:right; margin-top:-5px;" do %> + + + + 搜索 + <% end %> +
              +
              +
              + <% orgs.each do |org| %> +
              +
              + <%= link_to image_tag(url_to_avatar(org), :width => '78', :height => '78', :alt => '组织logo'), organization_path(org), :class => "linkGrey2" %> +
              +
              +
              + <%= link_to org.name, organization_path(org), :class => 'f16 linkBlue' %> +
              +
              <%= org.description %>
              +
              创建者：<%= link_to User.find(org.creator_id), user_path(org.creator_id), :class => 'linkGrey2', :target => '_blank' %>
              +
              创建时间：<%= format_activity_day(org.created_at) %> <%= format_time(org.created_at, false) %>
              +
              您的身份：<%= User.current.admin_of_org?(org) ? "组织管理员" : "组织成员" %>
              +
              + +
              +
              + <% end %> +
              +
              +
              +
              \ No newline at end of file diff --git a/app/views/users/search_user_orgs.html.erb b/app/views/users/search_user_orgs.html.erb new file mode 100644 index 000000000..1a921d38e --- /dev/null +++ b/app/views/users/search_user_orgs.html.erb @@ -0,0 +1 @@ +<%= render :partial => 'show_user_org', :locals => {:orgs => @orgs} %> \ No newline at end of file diff --git a/app/views/users/search_user_orgs.js.erb b/app/views/users/search_user_orgs.js.erb new file mode 100644 index 000000000..7184a29c5 --- /dev/null +++ b/app/views/users/search_user_orgs.js.erb @@ -0,0 +1,2 @@ + +//$("#org_list").replaceWith("<%#= escape_javascript(render :partial => 'show_user_org', :locals => {:orgs => @orgs}) %>") \ No newline at end of file diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb index 50fa03bbe..e2a24b2aa 100644 --- a/app/views/users/user_organizations.html.erb +++ b/app/views/users/user_organizations.html.erb @@ -1,4 +1,4 @@ -<%= stylesheet_link_tag 'pleft','header','new_user','repository','org' %> +<%= stylesheet_link_tag 'pleft','header','new_user','repository','org', 'project' %> <%#= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
              @@ -6,30 +6,34 @@
              组织列表 - - - - + <%= form_tag url_for(:controller => 'users', :action => 'search_user_orgs', :id => User.current.id), :method => 'get', :id => "search_org_form", :class=>"resourcesSearchloadBox", :style=>"float:right; margin-top:-5px;" do %> + + + + 搜索 + <% end %>
              - <% @orgs.each do |org| %> -
              -
              - <%= link_to image_tag(url_to_avatar(org), :width => '78', :height => '78', :alt => '组织logo'), organization_path(org), :class => "linkGrey2" %> -
              -
              -
              - <%= link_to org.name, organization_path(org), :class => 'f16 linkBlue' %> +
              + <% @orgs.each do |org| %> +
              +
              + <%= link_to image_tag(url_to_avatar(org), :width => '78', :height => '78', :alt => '组织logo'), organization_path(org), :class => "linkGrey2" %>
              -
              <%= org.description %>
              -
              创建者：<%= link_to User.find(org.creator_id), user_path(org.creator_id), :class => 'linkGrey2', :target => '_blank' %>
              -
              创建时间：<%= format_activity_day(org.created_at) %> <%= format_time(org.created_at, false) %>
              -
              您的身份：<%= User.current.admin_of_org?(org) ? "组织管理员" : "组织成员" %>
              +
              +
              + <%= link_to org.name, organization_path(org), :class => 'f16 linkBlue' %> +
              +
              <%= org.description %>
              +
              创建者：<%= link_to User.find(org.creator_id), user_path(org.creator_id), :class => 'linkGrey2', :target => '_blank' %>
              +
              创建时间：<%= format_activity_day(org.created_at) %> <%= format_time(org.created_at, false) %>
              +
              您的身份：<%= User.current.admin_of_org?(org) ? "组织管理员" : "组织成员" %>
              +
              + +
              - -
              -
              - <% end %> + <% end %> +
              \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 0f05c3521..69134e666 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -444,6 +444,7 @@ RedmineApp::Application.routes.draw do get 'dealwith_apply_request' get 'store_selected_resource' get 'user_organizations' + get 'search_user_orgs' # end end #resources :blogs diff --git a/db/migrate/20151116020842_copy_forge_activities_to_org_activities.rb b/db/migrate/20151116020842_copy_forge_activities_to_org_activities.rb new file mode 100644 index 000000000..95c4ed5bf --- /dev/null +++ b/db/migrate/20151116020842_copy_forge_activities_to_org_activities.rb @@ -0,0 +1,16 @@ +class CopyForgeActivitiesToOrgActivities < ActiveRecord::Migration + def up + ForgeActivity.all.each do |forge_act| + OrgActivity.create(:user_id => forge_act.user_id, + :org_act_id => forge_act.forge_act_id, + :org_act_type => forge_act.forge_act_type, + :container_id => forge_act.project_id, + :container_type => 'Project', + :created_at => forge_act.created_at, + :updated_at => forge_act.updated_at) + end + end + + def down + end +end From 10dedcb7be406c5864d29457e5a10499477516d8 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 16 Nov 2015 15:39:59 +0800 Subject: [PATCH 083/285] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=88=90=E5=91=98=E5=8A=A0=E5=85=A5=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_member_controller.rb | 2 +- app/views/organizations/_org_members.html.erb | 5 ++++- .../20151116070906_add_created_at_to_org_members.rb | 5 +++++ .../20151116071721_set_time_for_org_member.rb | 13 +++++++++++++ 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20151116070906_add_created_at_to_org_members.rb create mode 100644 db/migrate/20151116071721_set_time_for_org_member.rb diff --git a/app/controllers/org_member_controller.rb b/app/controllers/org_member_controller.rb index 4b842f9dc..642a100c3 100644 --- a/app/controllers/org_member_controller.rb +++ b/app/controllers/org_member_controller.rb @@ -16,7 +16,7 @@ class OrgMemberController < ApplicationController member_ids = params[:membership][:user_ids] role_id = params[:orgRole] member_ids.each do |user_id| - member = OrgMember.create(:user_id=>user_id) + member = OrgMember.create(:user_id=>user_id, :created_at => Time.now) @org.org_members << member OrgMemberRole.create(:org_member_id => member.id, :role_id => role_id) end diff --git a/app/views/organizations/_org_members.html.erb b/app/views/organizations/_org_members.html.erb index 3940a6576..ee15e19d7 100644 --- a/app/views/organizations/_org_members.html.erb +++ b/app/views/organizations/_org_members.html.erb @@ -5,7 +5,7 @@
              - + 加入时间
              <% members.each do |member| %> @@ -16,6 +16,9 @@ <%= l(:label_username)%> <%= link_to(member.user.show_name, user_path(member.user),:class => "ml5 c_blue02") %>
              身份：<%= member.user.admin_of_org?(organization)?"组织管理员":"组织成员" %> + <% if member.created_at %> + <%= format_time(member.created_at) %> + <% end %>
              <% end%> diff --git a/db/migrate/20151116070906_add_created_at_to_org_members.rb b/db/migrate/20151116070906_add_created_at_to_org_members.rb new file mode 100644 index 000000000..33d3a2817 --- /dev/null +++ b/db/migrate/20151116070906_add_created_at_to_org_members.rb @@ -0,0 +1,5 @@ +class AddCreatedAtToOrgMembers < ActiveRecord::Migration + def change + add_column :org_members, :created_at, :timestamp + end +end diff --git a/db/migrate/20151116071721_set_time_for_org_member.rb b/db/migrate/20151116071721_set_time_for_org_member.rb new file mode 100644 index 000000000..f9e78dff5 --- /dev/null +++ b/db/migrate/20151116071721_set_time_for_org_member.rb @@ -0,0 +1,13 @@ +class SetTimeForOrgMember < ActiveRecord::Migration + def up + OrgMember.all.each do |member| + if(member.created_at.nil?) + member.created_at = Time.now - 5.days + member.save + end + end + end + + def down + end +end From 55d3b8abb3dcb64696f2866da4f7634b3e49ed28 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 16 Nov 2015 17:19:53 +0800 Subject: [PATCH 084/285] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=B8=AD=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/sync_sigle_rep.rake | 30 ------------------------------ lib/trustie/gitlab/sync.rb | 6 ------ 2 files changed, 36 deletions(-) diff --git a/lib/tasks/sync_sigle_rep.rake b/lib/tasks/sync_sigle_rep.rake index 4ed360426..e68e37ee8 100644 --- a/lib/tasks/sync_sigle_rep.rake +++ b/lib/tasks/sync_sigle_rep.rake @@ -12,45 +12,15 @@ namespace :sync_rep do puts count unless count > 1 rep.identifier - puts "################################" - puts project.id - puts rep.id s = Trustie::Gitlab::Sync.new s.sync_project(project, path: rep.identifier, import_url: rep.url) rep.type = 'Repository::Gitlab' rep.save - puts "*************************************" - puts project.id - puts rep.id - puts rep.identifier end end end end task :delete_rep => :environment do - projects = Project.where("user_id !=?",12) - projects.each do |project| - # 针对类型为Git并且只有一个版本库的项目 - if project.repositories && project.repositories.count == 1 && project.repositories.first.type == "Repository::Git" - rep = project.repositories.first - count = Repository.find_by_sql("SELECT * FROM `repositories` where identifier = '#{rep.identifier}'").count - puts count - unless count > 1 - rep.identifier - puts "################################" - puts project.id - puts rep.id - s = Trustie::Gitlab::Sync.new - s.sync_project(project, path: rep.identifier, import_url: rep.url) - rep.type = 'Repository::Gitlab' - rep.save - puts "*************************************" - puts project.id - puts rep.id - puts rep.identifier - end - end - end end end \ No newline at end of file diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb index ac01a44ec..1f6f7c146 100644 --- a/lib/trustie/gitlab/sync.rb +++ b/lib/trustie/gitlab/sync.rb @@ -73,11 +73,6 @@ module Trustie # import url http://xianbo_trustie2:1234@repository.trustie.net/xianbo/trustie2.git # can use password - puts "@@@@@@@@@@@@@@@@@@@@@@@" - puts path - puts project.description - puts gid - puts import_url gproject = self.g.create_project(path, path: path, description: project.description, @@ -91,7 +86,6 @@ module Trustie import_url: import_url, visibility_level: project.is_public? ? UserLevel::PUBLIC : UserLevel::PRIVATE ) - puts "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" project.gpid = gproject.id project.save! puts "Successfully created #{project.name}" From bd6a1a9d4931c6e14fa5b2fee516ac00c62a968c Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 16 Nov 2015 17:21:26 +0800 Subject: [PATCH 085/285] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=AD=E7=9A=84=E9=A1=B9=E7=9B=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E7=9A=84=E5=9B=9E=E5=A4=8D=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 21 +++++++++++++++++-- .../org_document_comments_controller.rb | 1 + app/views/issues/add_journal_in_org.js.erb | 3 +++ .../org_document_comments/add_reply.js.erb | 4 ++-- .../organizations/_org_activities.html.erb | 12 +++++------ .../organizations/_org_project_issue.html.erb | 18 +++++++++++++++- .../organizations/_show_org_document.html.erb | 14 ++++++------- app/views/organizations/show.html.erb | 3 ++- config/routes.rb | 1 + 9 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 app/views/issues/add_journal_in_org.js.erb diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index e529dd3b9..edf055370 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -20,11 +20,11 @@ class IssuesController < ApplicationController default_search_scope :issues before_filter :authorize1, :only => [:show] - before_filter :find_issue, :only => [:show, :edit, :update,:add_journal] + before_filter :find_issue, :only => [:show, :edit, :update,:add_journal, :add_journal_in_org] before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy] before_filter :find_project, :only => [:new, :create, :update_form] #before_filter :authorize, :except => [:index, :show] - before_filter :authorize, :except => [:index,:add_journal] + before_filter :authorize, :except => [:index,:add_journal, :add_journal_in_org] before_filter :find_optional_project, :only => [:index] before_filter :check_for_default_issue_status, :only => [:new, :create] @@ -397,6 +397,23 @@ class IssuesController < ApplicationController end end + def add_journal_in_org + if User.current.logged? + jour = Journal.new + jour.user_id = User.current.id + jour.notes = params[:notes] + jour.journalized = @issue + jour.save + org_activity = OrgActivity.where("org_act_type='Issue' and org_act_id =#{@issue.id}").first + org_activity.updated_at = jour.created_on + org_activity.save + @user_activity_id = params[:user_activity_id] + respond_to do |format| + format.js + end + end + end + private def find_project diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index 60522dc3f..13a188e72 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -41,6 +41,7 @@ class OrgDocumentCommentsController < ApplicationController def add_reply @document = OrgDocumentComment.find(params[:id]).root + @act = OrgActivity.find(params[:id]) @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id]) @comment.content = params[:org_content] @document.children << @comment diff --git a/app/views/issues/add_journal_in_org.js.erb b/app/views/issues/add_journal_in_org.js.erb new file mode 100644 index 000000000..ad7a85540 --- /dev/null +++ b/app/views/issues/add_journal_in_org.js.erb @@ -0,0 +1,3 @@ +$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>"); + +init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%"); \ No newline at end of file diff --git a/app/views/org_document_comments/add_reply.js.erb b/app/views/org_document_comments/add_reply.js.erb index 5d54af2bf..40ed2eeb2 100644 --- a/app/views/org_document_comments/add_reply.js.erb +++ b/app/views/org_document_comments/add_reply.js.erb @@ -1,3 +1,3 @@ -$("#organization_document_<%= @document.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document}) %>"); -init_activity_KindEditor_data(<%= @document.id %>,"","87%"); \ No newline at end of file +$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document, :act => @act}) %>"); +init_activity_KindEditor_data(<%= @act.id %>,"","87%"); \ No newline at end of file diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb index cb69738b6..148bb9efe 100644 --- a/app/views/organizations/_org_activities.html.erb +++ b/app/views/organizations/_org_activities.html.erb @@ -1,5 +1,10 @@ <% unless org_activities.nil? %> <% org_activities.each do |act| %> + <% if act.container_type == 'Organization' %> <% if act.org_act_type == 'CreateOrganization' %>
              @@ -17,12 +22,7 @@
              <% end %> <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %> - - <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> + <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act} %> <% end %> <% end %> <% if act.container_type == 'Project' %> diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb index 573429752..e29994967 100644 --- a/app/views/organizations/_org_project_issue.html.erb +++ b/app/views/organizations/_org_project_issue.html.erb @@ -130,7 +130,23 @@
              <% end %> - +
              +
              <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
              +
              +
              + <%= form_for('new_form',:url => add_journal_in_org_issue_path(activity.id),:method => "post", :remote => true) do |f|%> + + +
              + +
              +

              + <% end%> +
              +
              +
              +
              +
              diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 4177c3688..e352288ab 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -91,16 +91,16 @@ <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %>
              -
              - <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id), :method => "post", :remote => true) do |f| %> - - +
              + <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id, :act_id => act.id), :method => "post", :remote => true) do |f| %> + + -
              - +
              +
              -

              +

              <% end %>
              diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index a85ffa687..1ccb2f0e5 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -30,7 +30,8 @@ init_activity_KindEditor_data(<%= @organization.home_id%>, null, "87%"); }); - <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id} %> + <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %> + <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %> <% end %> <%= render :partial => 'organizations/org_activities', diff --git a/config/routes.rb b/config/routes.rb index 69134e666..24d159f04 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -634,6 +634,7 @@ RedmineApp::Application.routes.draw do end member do post 'add_journal' + post 'add_journal_in_org' end resources :time_entries, :controller => 'timelog' do collection do From 5400b907e6a491cea534d9e7575c6a29e423f3e9 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 17 Nov 2015 09:33:40 +0800 Subject: [PATCH 086/285] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=B5=8B=E9=AA=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 19 ++- app/views/exercise/_exercise.html.erb | 2 +- app/views/exercise/_student_exercise.html.erb | 46 ++++++ .../exercise/student_exercise_list.html.erb | 138 ++++++++++++++++++ config/routes.rb | 1 + ...4_add_publish_time_end_time_to_exercise.rb | 6 + db/schema.rb | 4 +- 7 files changed, 213 insertions(+), 3 deletions(-) create mode 100644 app/views/exercise/_student_exercise.html.erb create mode 100644 app/views/exercise/student_exercise_list.html.erb create mode 100644 db/migrate/20151116065904_add_publish_time_end_time_to_exercise.rb diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index bed3d9061..296c744b6 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -1,7 +1,7 @@ class ExerciseController < ApplicationController layout "base_courses" - before_filter :find_course, :only => [:index,:new,:create] + before_filter :find_course, :only => [:index,:new,:create,:student_exercise_list] def index @is_teacher = User.current.allowed_to?(:as_teacher,@course) if @is_teacher @@ -44,6 +44,23 @@ class ExerciseController < ApplicationController end + def student_exercise_list + @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin? + @exercise = Exercise.find params[:id] + @all_exercises = @course.exercises.order("created_at desc") + @exercise_count = @exercise.exercise_users.where('score is not NULL').count + if @is_teacher || (!@exercise.exercise_users.where(:user_id => User.current.id).empty? && Time.parse(@exercise.end_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S")) + @exercise_users_list = @exercise.exercise_users.where('score is not NULL') + elsif !@exercise.exercise_users.where(:user_id => User.current.id).empty? && Time.parse(@exercise.end_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") > Time.now.strftime("%Y-%m-%d-%H-%M-%S") + @exercise_users_list = @exercise.exercise_users.where("user_id = ? and score is not NULL",User.current.id) + else + @exercise_users_list = [] + end + respond_to do |format| + format.html + end + end + private def find_course @course = Course.find params[:course_id] diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb index e469c471c..15a684a62 100644 --- a/app/views/exercise/_exercise.html.erb +++ b/app/views/exercise/_exercise.html.erb @@ -15,7 +15,7 @@ <% if exercise.exercise_status == 1%>
            • 统计结果
              • <% else %> -
            • <%= link_to l(:label_statistical_results), statistics_result_exercise_path(exercise.id), :class => "pollsbtn fl ml10"%>
              • +
            • <%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fl ml10"%>
              • <% end%> <% if exercise.exercise_status == 1 %> diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb new file mode 100644 index 000000000..b133baa04 --- /dev/null +++ b/app/views/exercise/_student_exercise.html.erb @@ -0,0 +1,46 @@ +
              + + 测验 + + (<%= @exercise_count%>人已交) + + <% if !@is_teacher && @exercise_users_list.empty?%> + 您尚未提交 + <% elsif !@is_teacher && !@exercise_users_list.empty?%> + 您已提交 + <% end %> + + <%if @is_teacher || @exercise.exercise_status == 3%> +
              + + +
              + <%#= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty? %> + <% end%> + +
              +
              + +
              + <%= render :partial => "evaluation_un_title"%> +
              +
              + +<% @stundet_works.each do |student_work|%> + <% if @is_evaluation%> + <%= render :partial => "evaluation_work", :locals => {:student_work => student_work}%> + <% else%> + <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work}%> + <% end%> +
              +
              + <% if student_work.user == User.current && !@is_evaluation %> + <% if @homework.homework_type == 2%> + <%=render :partial => 'programing_work_show', :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %> + <% else %> + <%=render :partial => 'show' , :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %> + <% end %> + <% end %> +
              +
              +<% end%> \ No newline at end of file diff --git a/app/views/exercise/student_exercise_list.html.erb b/app/views/exercise/student_exercise_list.html.erb new file mode 100644 index 000000000..8653836ca --- /dev/null +++ b/app/views/exercise/student_exercise_list.html.erb @@ -0,0 +1,138 @@ + + +
              +
              +
              + + +
              +
              + +
              +
              + + <% if @exercise.exercise_status == 1 %> + 未发布 + <% elsif @exercise.exercise_status == 2 %> + 已发布 + <% elsif @exercise.exercise_status == 3 %> + 已截止 + <% end%> + [ 隐藏测验信息 ] +
              +
              发布者：<%= @exercise.user.show_name %>
              +
              +
              <%= @exercise.exercise_description.html_safe %>
              +
              + + +
              +
              +
              截止时间：<%= format_time @exercise.end_time %>
              + <% if @exercise.exercise_status == 1 %> +
              发布时间：<%= format_time @exercise.publish_time %>
              + <% end %> + <% end_time = @exercise.end_time.to_time.to_i %> + <% if end_time > Time.now.to_i %> +
              提交剩余时间： <%= (end_time - Time.now.to_i) / (24*60*60) %> 天 + <%= ((end_time - Time.now.to_i) % (24*60*60)) / (60*60)%> 小时 + <%= (((end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%> 分
              + <% else %> +
              提交已截止
              + <% end %> +
              +
              +
              +
              + +
              +
              +
              + <%= render :partial => "exercise/student_exercise"%> +
              +
              +
              + +
              +
              +
              +
              \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 3f1ca2ba0..f1073381f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -150,6 +150,7 @@ RedmineApp::Application.routes.draw do resources :exercise do member do #生成路径为 /exercise/:id/方法名 get 'statistics_result' + get 'student_exercise_list' get 'export_exercise' end diff --git a/db/migrate/20151116065904_add_publish_time_end_time_to_exercise.rb b/db/migrate/20151116065904_add_publish_time_end_time_to_exercise.rb new file mode 100644 index 000000000..90aec321f --- /dev/null +++ b/db/migrate/20151116065904_add_publish_time_end_time_to_exercise.rb @@ -0,0 +1,6 @@ +class AddPublishTimeEndTimeToExercise < ActiveRecord::Migration + def change + add_column :exercises, :publish_time, :timestamp + add_column :exercises, :end_time, :timestamp + end +end diff --git a/db/schema.rb b/db/schema.rb index 272db1944..3feb43adb 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151113025751) do +ActiveRecord::Schema.define(:version => 20151116065904) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -624,6 +624,8 @@ ActiveRecord::Schema.define(:version => 20151113025751) do t.integer "time" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false + t.datetime "publish_time" + t.datetime "end_time" end create_table "first_pages", :force => true do |t| From fba461f94a62d405c1632eea14902508ec2082bc Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 17 Nov 2015 09:51:16 +0800 Subject: [PATCH 087/285] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=AD=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA=E7=9A=84=E5=9B=9E=E5=A4=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/messages_controller.rb | 5 +++++ app/controllers/organizations_controller.rb | 6 +++--- .../organizations/_org_activities.html.erb | 4 ++-- .../organizations/_project_create.html.erb | 2 +- .../organizations/_project_message.html.erb | 18 ++++++++++++++++++ app/views/organizations/show.html.erb | 9 ++++++--- 6 files changed, 35 insertions(+), 9 deletions(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 4f78d61f5..9b090de9a 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -174,6 +174,11 @@ class MessagesController < ApplicationController user_activity.updated_at = Time.now user_activity.save end + org_activity = OrgActivity.where("org_act_type='Message' and org_act_id =#{@topic.id}").first + if org_activity + org_activity.updated_at = Time.now + org_activity.save + end #@topic.update_attribute(:updated_on, Time.now) if !@reply.new_record? if params[:asset_id] diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 6a1030adc..392966d68 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -56,10 +56,10 @@ class OrganizationsController < ApplicationController if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization) @organization = Organization.find(params[:id]) project_ids = @organization.projects.map(&:id) << 0 - @org_activities = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and container_id in (#{project_ids.join(',')}))", + @org_activities = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and org_act_type in ('Issue','Message','ProjectCreateInfo') and container_id in (#{project_ids.join(',')}))", @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10) - @org_activities_count = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and container_id in (#{project_ids.join(',')}))" , - @organization.id, 'Organization ').count + # @org_activities_count = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and container_id in (#{project_ids.join(',')}))" , + # @organization.id, 'Organization ').count # @org_project_activties = ForgeActivity.where("project_id in (#{project_ids.join(',')}) and forge_act_type in('Issue','Message','ProjectCreateInfo')").order("updated_at desc").page(params[:page] || 1).per(10) # @org_project_activties_count = ForgeActivity.where('project_id in (?)',project_ids.join(',')).count #@org_activities = paginateHelper @org_activities, 10 diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb index 148bb9efe..9523a0a15 100644 --- a/app/views/organizations/_org_activities.html.erb +++ b/app/views/organizations/_org_activities.html.erb @@ -31,8 +31,8 @@ <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => Issue.find(act.org_act_id),:user_activity_id =>act.id} %> <% when 'Message' %> <%= render :partial => 'organizations/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %> - <%# when 'ProjectCreateInfo'%> - <%#= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %> + <% when 'ProjectCreateInfo'%> + <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %> <% end %> <% end %> <% end %> diff --git a/app/views/organizations/_project_create.html.erb b/app/views/organizations/_project_create.html.erb index d966d8e18..607c14a45 100644 --- a/app/views/organizations/_project_create.html.erb +++ b/app/views/organizations/_project_create.html.erb @@ -1,4 +1,4 @@ -<% project = Project.find(activity.project_id) %> +<% project = Project.find(activity.org_act_id) %> <% user = User.find(project.user_id)%>
              diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb index 85ed08f2f..2708bb546 100644 --- a/app/views/organizations/_project_message.html.erb +++ b/app/views/organizations/_project_message.html.erb @@ -95,6 +95,24 @@
              <% end %> +
              +
              <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
              +
              +
              + <%= form_for('new_form',:url => {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%> + + + +
              + +
              +

              + <% end%> +
              +
              +
              +
              +
            \ No newline at end of file diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 1ccb2f0e5..36cc24225 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -14,14 +14,17 @@
            最新动态
            - +
          +
          <% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %> From 6f5cb8f1426a0935690266fcdfa0777a615abab4 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 17 Nov 2015 10:17:07 +0800 Subject: [PATCH 088/285] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9A=84=E8=BF=87=E6=BB=A4=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81=E5=8C=85=E6=8B=AC?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E5=92=8C=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=9A=84=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 18 +++++++++++------- app/views/organizations/show.html.erb | 20 ++++++++++++++++---- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 392966d68..b35d7f3db 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -56,13 +56,17 @@ class OrganizationsController < ApplicationController if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization) @organization = Organization.find(params[:id]) project_ids = @organization.projects.map(&:id) << 0 - @org_activities = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and org_act_type in ('Issue','Message','ProjectCreateInfo') and container_id in (#{project_ids.join(',')}))", - @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10) - # @org_activities_count = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and container_id in (#{project_ids.join(',')}))" , - # @organization.id, 'Organization ').count - # @org_project_activties = ForgeActivity.where("project_id in (#{project_ids.join(',')}) and forge_act_type in('Issue','Message','ProjectCreateInfo')").order("updated_at desc").page(params[:page] || 1).per(10) - # @org_project_activties_count = ForgeActivity.where('project_id in (?)',project_ids.join(',')).count - #@org_activities = paginateHelper @org_activities, 10 + case params[:type] + when nil + @org_activities = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and org_act_type in ('Issue','Message','ProjectCreateInfo') and container_id in (#{project_ids.join(',')}))", + @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10) + when 'project_issue' + @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Issue' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10) + when 'project_message' + @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Message' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10) + when 'org' + @org_activities = OrgActivity.where("container_id =? and container_type =?",@organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10) + end @page = params[:page] respond_to do |format| format.html diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 36cc24225..e62a66913 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -16,10 +16,22 @@
          最新动态
          • -
              -
            • 全部动态
              • -
            • - 我的动态 +
                +
              • +
                  +
                • 项目动态
                  • +
                • <%= link_to "问题动态", {:controller => "organizations", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%> +
                • <%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%> + +
                +
                • +
              • +
                  +
                • 更多
                  • +
                • <%= link_to "组织动态", {:controller => "organizations", :action => "show", :type => "org"}, :class =>"homepagePostTypeMessage postTypeGrey"%> +
                • <%= link_to "全部动态", {:controller => "organizations", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%> +
              • From 6af8bfef3799ad74a3557eeb6d8a24d1c821f54a Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 17 Nov 2015 10:19:48 +0800 Subject: [PATCH 089/285] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E7=B3=BB=E7=BB=9F=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=8A=A0=E4=B8=8Alogo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index da649663d..1a12f0f4f 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -411,7 +411,9 @@ <% if ma.course_message_type == "Course" %>
          -
        •    截止时间快到了！
          • +
        •    截止时间快到了.
        • <%= time_tag(ma.created_at).html_safe %>
        <% end %> @@ -158,7 +158,7 @@
      • 匿评截止：<%= ma.course_message.homework_detail_manual.evaluation_end %>  23:59
        • <% unless User.current.allowed_to?(:as_teacher, ma.course_message.course)%> -

        请您尽早完成匿评！如果您在截止日期前未完成匿评，您的最终成绩将被扣除<%= ma.course_message.homework_detail_manual.absence_penalty %>分乘以缺评份数。

        +

        请您尽早完成匿评,如果您在截止日期前未完成匿评，您的最终成绩将被扣除<%= ma.course_message.homework_detail_manual.absence_penalty %>分乘以缺评份数。

        例如，您缺评了两份作品，则您的最终成绩将被扣除 <%= ma.course_message.homework_detail_manual.absence_penalty %> * 2 = <%= ma.course_message.homework_detail_manual.absence_penalty * 2 %>分

        <% end%>
        @@ -209,7 +209,7 @@ <% end %> @@ -404,7 +404,7 @@

        如需获得最终成绩，请您联系主讲老师对您的作品进行单独评分!

        -
      •   您迟交了作品！
        • +
      •   您迟交了作品
      • <%= time_tag(ma.created_at).html_safe %>
        • <% end %> From 8aeae831b88aa13bda3340f5e52fd0efee525330 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 17 Nov 2015 10:56:11 +0800 Subject: [PATCH 091/285] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_projects_controller.rb | 19 ++++++++++++++++++- app/views/org_projects/create.js.erb | 18 ++++++++++++++++-- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/app/controllers/org_projects_controller.rb b/app/controllers/org_projects_controller.rb index 733df95b7..c944193bd 100644 --- a/app/controllers/org_projects_controller.rb +++ b/app/controllers/org_projects_controller.rb @@ -4,8 +4,25 @@ class OrgProjectsController < ApplicationController @project = Project.find(params[:project_id]) org_ids.each do |org_id| OrgProject.create(:organization_id => org_id.to_i, :project_id => params[:project_id].to_i, :created_at => Time.now) - p 1 end + + #更新组织列表 + condition = '%%' + if !params[:orgs].nil? + condition = "%#{params[:orgs].strip}%".gsub(" ","") + end + project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:project_id]}").map(&:organization_id) + if project_org_ids.empty? + @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(10) + @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count + else + project_org_ids = "(" + project_org_ids.join(',') + ")" + @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(10) + @org_count = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count + end + # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count + @orgs_page = Paginator.new @org_count, 10,params[:page] + respond_to do |format| format.js end diff --git a/app/views/org_projects/create.js.erb b/app/views/org_projects/create.js.erb index 545918c73..23cbab024 100644 --- a/app/views/org_projects/create.js.erb +++ b/app/views/org_projects/create.js.erb @@ -1,6 +1,20 @@ - $("#search_orgs_result_list").html(""); +$("#search_orgs_result_list").append('
          '); +<% @orgs_not_in_project.each do |org|%> + link = "
          • "; + $("#search_orgs_result_list").append(link ); +<%end %> +$("#search_orgs_result_list").append('
        ') +<% if @org_count > 10 %> + $("#paginator").html(' <%= pagination_links_full @orgs_page, @org_count ,:per_page_links => true,:remote =>true,:flag=>true %>'); +//$("#paginator").css("display", "block"); + +//$("#paginator").css("display", "none"); +<% end %> + + +//$("#search_orgs_result_list").html(""); //$("#search_orgs_result_list").append('
          '); +//$("#paginator").css("display", "none"); $("#added_orgs").html(""); -$("#paginator").css("display", "none"); $("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>') \ No newline at end of file From 0316bf698f10087a747988ba193b55a01399c7e6 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 17 Nov 2015 11:25:17 +0800 Subject: [PATCH 092/285] =?UTF-8?q?exercise=E6=96=B0=E5=A2=9E=E3=80=81upda?= =?UTF-8?q?te?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 59 ++++++++++++++++++++++++-- app/helpers/exercise_helper.rb | 11 +++++ 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 296c744b6..87854619c 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -16,11 +16,42 @@ class ExerciseController < ApplicationController end def show - + @exercise = Exercise.find params[:id] + if @exercise.exercise_status != 2 && (!User.current.allowed_to?(:as_teacher,@course) || User.current.admin?) + render_403 + return + end + # 问卷消息状态更新 + # REDO:问卷添加消息 + #已提交问卷的用户不能再访问该界面 + if has_commit_exercise?(@poll.id,User.current.id) && (!User.current.admin?) + redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id) + else + @can_edit_poll = (!has_commit_poll?(@poll.id,User.current.id)) || User.current.admin? + @percent = get_percent(@poll,User.current) + poll_questions = @poll.poll_questions + @poll_questions = paginateHelper poll_questions,5 #分页 + respond_to do |format| + format.html {render :layout => 'base_courses'} + end + end + end end def new - + option = { + :exercise_name => "", + :exercise_description => "", + :course_id => @course.id, + :exercise_status => 1, + :user_id => User.current.id, + :start_at => "", + :end_at => "" + } + @exercise = Exercise.create option + if @exercise + redirect_to edit_exercise_url @exercise.id + end end def create @@ -32,11 +63,31 @@ class ExerciseController < ApplicationController end def update - + @exercise.exercise_name = params[:exercise_name] + @exercise.exercise_description = params[:exercise_name] + @exercise.start_at = params[:start_at] + @exercise.end_at = params[:end_at] + if @exercise.save + respond_to do |format| + format.js + end + else + render_404 + end end def destroy - + if @exercise && @exercise.destroy + if @is_teacher + polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}") + else + polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id} and polls_status = 2") + end + @polls = paginateHelper polls,20 #分页 + respond_to do |format| + format.js + end + end end #统计结果 diff --git a/app/helpers/exercise_helper.rb b/app/helpers/exercise_helper.rb index 7fc7b1421..844cff1c1 100644 --- a/app/helpers/exercise_helper.rb +++ b/app/helpers/exercise_helper.rb @@ -1,3 +1,14 @@ # encoding: utf-8 module ExerciseHelper + + #判断用户是否已经提交了问卷 + def has_commit_exercise?(poll_id,user_id) + pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id) + if pu.nil? + false + else + true + end + end + end \ No newline at end of file From 034a92bb7b45d4a3b23b6bf0724c966cfcdc4e32 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 17 Nov 2015 15:18:07 +0800 Subject: [PATCH 093/285] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=B5=8B=E9=AA=8C?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 10 +- app/views/exercise/_edit_head.html.erb | 24 ++ app/views/exercise/_exercise_content.html.erb | 23 ++ app/views/exercise/_exercise_form.html.erb | 333 ++++++++++++++++++ app/views/exercise/_new_MC.html.erb | 38 ++ app/views/exercise/_new_MCQ.html.erb | 39 ++ app/views/exercise/_new_single.html.erb | 28 ++ app/views/exercise/_student_exercise.html.erb | 71 ++-- app/views/exercise/_student_table.html.erb | 22 ++ app/views/exercise/edit.html.erb | 1 + app/views/exercise/new.html.erb | 1 + public/stylesheets/courses.css | 15 + 12 files changed, 581 insertions(+), 24 deletions(-) create mode 100644 app/views/exercise/_edit_head.html.erb create mode 100644 app/views/exercise/_exercise_content.html.erb create mode 100644 app/views/exercise/_exercise_form.html.erb create mode 100644 app/views/exercise/_new_MC.html.erb create mode 100644 app/views/exercise/_new_MCQ.html.erb create mode 100644 app/views/exercise/_new_single.html.erb create mode 100644 app/views/exercise/_student_table.html.erb create mode 100644 app/views/exercise/edit.html.erb diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 296c744b6..ce3412caa 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -20,7 +20,10 @@ class ExerciseController < ApplicationController end def new - + @exercise = Exercise.new + respond_to do |format| + format.html{render :layout => 'base_courses'} + end end def create @@ -28,7 +31,9 @@ class ExerciseController < ApplicationController end def edit - + respond_to do |format| + format.html{render :layout => 'base_courses'} + end end def update @@ -51,6 +56,7 @@ class ExerciseController < ApplicationController @exercise_count = @exercise.exercise_users.where('score is not NULL').count if @is_teacher || (!@exercise.exercise_users.where(:user_id => User.current.id).empty? && Time.parse(@exercise.end_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S")) @exercise_users_list = @exercise.exercise_users.where('score is not NULL') + @show_all = true; elsif !@exercise.exercise_users.where(:user_id => User.current.id).empty? && Time.parse(@exercise.end_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") > Time.now.strftime("%Y-%m-%d-%H-%M-%S") @exercise_users_list = @exercise.exercise_users.where("user_id = ? and score is not NULL",User.current.id) else diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb new file mode 100644 index 000000000..b315d343c --- /dev/null +++ b/app/views/exercise/_edit_head.html.erb @@ -0,0 +1,24 @@ +
          +
          + +
          + <%# if edit_mode %> + + <%# end %> +
          + + <%= calendar_for('homework_end_time')%> +
          + <%# if edit_mode %> + + <%# end %> +
          + + <%= calendar_for('homework_publish_time')%> +
          +
          考试时长:分钟
          +
          + + 保存 取消 +
          +
          \ No newline at end of file diff --git a/app/views/exercise/_exercise_content.html.erb b/app/views/exercise/_exercise_content.html.erb new file mode 100644 index 000000000..76bad6a83 --- /dev/null +++ b/app/views/exercise/_exercise_content.html.erb @@ -0,0 +1,23 @@ + +<% poll.exercise_questions.each do |poll_question|%> +
          + + +
          +<% end %> \ No newline at end of file diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb new file mode 100644 index 000000000..a062f1d80 --- /dev/null +++ b/app/views/exercise/_exercise_form.html.erb @@ -0,0 +1,333 @@ +<%= stylesheet_link_tag 'polls', :media => 'all' %> + +
          +
          + + +
          + <%= render :partial => 'edit_head', :locals => {:poll => @exercise}%> +
          + + +
          + <%= render :partial => 'exercise_content', :locals => {:poll => @exercise}%> +
          + +
          + +
          +
          + +
          发布 +
          + + +
          +
          +
          + +
          +
          diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb new file mode 100644 index 000000000..0ff662b3f --- /dev/null +++ b/app/views/exercise/_new_MC.html.erb @@ -0,0 +1,38 @@ +
          +
          + + + +
          +
          +
            +
          • + + +
            • +
            +
          • + + +
            • +
            +
          • + + +
            • +
            +
          • + + +
            • +
            +
          • + + +
            • +
            +
          +
          +
          保存 取消
          +
          +
          \ No newline at end of file diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb new file mode 100644 index 000000000..0ba2a0133 --- /dev/null +++ b/app/views/exercise/_new_MCQ.html.erb @@ -0,0 +1,39 @@ +
          +
          + + + +
          +
          +
            +
          • + + +
            • +
            +
          • + + +
            • +
            +
          • + + +
            • +
            +
          • + + +
            • +
            +
          • + + +
            • +
            +
          +
          +
          保存 取消
          +
          +
          \ No newline at end of file diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb new file mode 100644 index 000000000..0082303b7 --- /dev/null +++ b/app/views/exercise/_new_single.html.erb @@ -0,0 +1,28 @@ +
          +
          + + + +
          +
          +
            +
          • + + +
            • +
            +
          • + + +
            • +
            +
          • + + +
            • +
            +
          +
          +
          保存 取消
          +
          +
          \ No newline at end of file diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb index b133baa04..25bf3f7cd 100644 --- a/app/views/exercise/_student_exercise.html.erb +++ b/app/views/exercise/_student_exercise.html.erb @@ -10,37 +10,64 @@ 您已提交 <% end %> - <%if @is_teacher || @exercise.exercise_status == 3%> -
          - + <%#if @is_teacher || @exercise.exercise_status == 3%> + <%#= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty? %> - <% end%> + <%# end%>
          - <%= render :partial => "evaluation_un_title"%> + <%= render :partial => "student_table"%>
          -<% @stundet_works.each do |student_work|%> - <% if @is_evaluation%> - <%= render :partial => "evaluation_work", :locals => {:student_work => student_work}%> - <% else%> - <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work}%> - <% end%> -
          -
          - <% if student_work.user == User.current && !@is_evaluation %> - <% if @homework.homework_type == 2%> - <%=render :partial => 'programing_work_show', :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %> - <% else %> - <%=render :partial => 'show' , :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %> - <% end %> - <% end %> -
          +<% @exercise_users_list.each do |exercise|%> + +
            +
          • +
              +
            • + <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40"),user_activities_path(exercise.user)) %> +
              • +
              +
            • +
                +
              • + <%= exercise.user.show_name%> +
                • +
              • + <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%> +
                • +
              • + -- +
                • +
              +
              • +
              +
            +
            • +
          • + <% if exercise.created_at%> + <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>  + <% end %> +
            • + +
          • + <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%> +
            • + +
          +
          <% end%> \ No newline at end of file diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb new file mode 100644 index 000000000..719667973 --- /dev/null +++ b/app/views/exercise/_student_table.html.erb @@ -0,0 +1,22 @@ +
            +
          • +    + 姓名 + 学号 + 班级 +
            • + +
          • + <%= link_to "时间",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%> + <%# if @show_all && @order == "created_at"%> + <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <%# end%> +
            • + +
          • + <%= link_to "成绩",'',:class => "c_dark f14 fb fl ml10",:remote => true%> + <%# if @show_all && @order == "score"%> + <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <%# end%> +
            • +
          \ No newline at end of file diff --git a/app/views/exercise/edit.html.erb b/app/views/exercise/edit.html.erb new file mode 100644 index 000000000..0b20dc90e --- /dev/null +++ b/app/views/exercise/edit.html.erb @@ -0,0 +1 @@ +<%= render :partial => 'exercise_form'%> \ No newline at end of file diff --git a/app/views/exercise/new.html.erb b/app/views/exercise/new.html.erb index e69de29bb..3d983d64f 100644 --- a/app/views/exercise/new.html.erb +++ b/app/views/exercise/new.html.erb @@ -0,0 +1 @@ +<%= render :partial => 'exercise_form'%> diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 5469078a5..fdba7426a 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -83,6 +83,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re .width180{width: 180px;} .width525{width: 525px;} .width285{width: 285px;} +.width530{width: 530px;} .mr95{margin-right: 95px;} .mr140 {margin-right: 140px;} .ml100{margin-left: 100px;} @@ -1141,3 +1142,17 @@ input.sendSourceText { width: 50px; height: 25px; } + +/*20151117在线测验byTim*/ +.testContainer {width:698px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;} +.testTitle{ width:678px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold; background:#fff;border-style:solid; border:1px solid #CBCBCB;} +.testDes{ width:678px; height:120px; padding:10px; margin-bottom:10px; background:#fff; border-style:solid; border:1px solid #CBCBCB; resize:none;} +.btn_submit{ width:56px; height:24px; padding-top:4px;background:#269ac9; color:#fff; text-align:center; display:block; float:left; margin-right:10px;} +a:hover.btn_submit{background:#297fb8;} +.btn_cancel{width:54px; height:22px; padding-top:4px;background:#fff; color:#999; border:1px solid #999; text-align:center; display:block; float:left; } +a:hover.btn_cancel{ color:#666;} +.testQuestion{ width:708px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;} +.mr118 {margin-right:118px !important;} +.questionContainer {width:698px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;} +.questionTitle{ width:644px; height:30px; border:1px solid #cbcbcb; padding-left:5px; background:#fff;} +.examTime {width:40px; border:1px solid #cbcbcb; outline:none; height:28px; text-align:center; padding-left:0px; } \ No newline at end of file From 23ca20692fe6a10358c05422dafaa53e02e5d1c3 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 17 Nov 2015 15:20:59 +0800 Subject: [PATCH 094/285] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 71 ++++++++++++++++++++++---- app/helpers/exercise_helper.rb | 4 +- db/schema.rb | 54 +------------------- 3 files changed, 65 insertions(+), 64 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 87854619c..e29ae8176 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -21,21 +21,18 @@ class ExerciseController < ApplicationController render_403 return end - # 问卷消息状态更新 - # REDO:问卷添加消息 #已提交问卷的用户不能再访问该界面 - if has_commit_exercise?(@poll.id,User.current.id) && (!User.current.admin?) - redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id) + if has_commit_exercise?(@exercise.id, User.current.id) && (!User.current.admin?) + redirect_to poll_index_url(:course_id=> @course.id) else - @can_edit_poll = (!has_commit_poll?(@poll.id,User.current.id)) || User.current.admin? - @percent = get_percent(@poll,User.current) + @can_edit_poll = (!has_commit_exercise?(@exercise.id,User.current.id)) || User.current.admin? + @percent = get_percent(@exercise,User.current) poll_questions = @poll.poll_questions @poll_questions = paginateHelper poll_questions,5 #分页 respond_to do |format| format.html {render :layout => 'base_courses'} end end - end end def new @@ -45,8 +42,8 @@ class ExerciseController < ApplicationController :course_id => @course.id, :exercise_status => 1, :user_id => User.current.id, - :start_at => "", - :end_at => "" + :time => "", + :end_time => "" } @exercise = Exercise.create option if @exercise @@ -92,7 +89,63 @@ class ExerciseController < ApplicationController #统计结果 def statistics_result + @exercise = Exercise.find(params[:id]) + exercise_questions = @exercise.poll_questions + @exercise_questions = paginateHelper exercise_questions, 5 + respond_to do |format| + format.html{render :layout => 'base_courses'} + end + end + + #添加题目 + #question_type 1：单选 2：多选 3：填空题 + def create_exercise_question + question_title = params[:exercise_questions_title].nil? || params[:poll_questions_title].empty? ? l(:label_enter_single_title) : params[:poll_questions_title] + option = { + :is_necessary => (params[:is_necessary]=="true" ? 1 : 0), + :question_title => question_title, + :question_type => params[:question_type] || 1, + :question_number => @poll.poll_questions.count + 1 + } + @poll_questions = @poll.poll_questions.new option + if params[:question_answer] + for i in 1..params[:question_answer].count + answer = (params[:question_answer].values[i-1].nil? || params[:question_answer].values[i-1].empty?) ? l(:label_new_answer) : params[:question_answer].values[i-1] + question_option = { + :answer_position => i, + :answer_text => answer + } + @poll_questions.poll_answers.new question_option + end + end + # 如果是插入的话，那么从插入的这个id以后的question_num都将要+1 + if params[:quest_id] + @is_insert = true + @poll.poll_questions.where("question_number > #{params[:quest_num].to_i}").update_all(" question_number = question_number + 1") + @poll_question_num = params[:quest_num].to_i + @poll_questions.question_number = params[:quest_num].to_i + 1 + end + if @poll_questions.save + respond_to do |format| + format.js + end + end + + end + #发布问卷 + def publish_excercise + @exercise.exercise_status = 2 + @exercise.publish_time = Time.now + if @exercise.save + if params[:is_remote] + redirect_to poll_index_url(:course_id => @course.id) + else + respond_to do |format| + format.js + end + end + end end def student_exercise_list diff --git a/app/helpers/exercise_helper.rb b/app/helpers/exercise_helper.rb index 844cff1c1..410a9936b 100644 --- a/app/helpers/exercise_helper.rb +++ b/app/helpers/exercise_helper.rb @@ -2,8 +2,8 @@ module ExerciseHelper #判断用户是否已经提交了问卷 - def has_commit_exercise?(poll_id,user_id) - pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id) + def has_commit_exercise?(exercise_id, user_id) + pu = PollUser.find_by_poll_id_and_user_id(excercise_id, user_id) if pu.nil? false else diff --git a/db/schema.rb b/db/schema.rb index 3feb43adb..25d561e86 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151116065904) do +ActiveRecord::Schema.define(:version => 20151116071721) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -241,58 +241,6 @@ ActiveRecord::Schema.define(:version => 20151116065904) do add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true - create_table "code_review_assignments", :force => true do |t| - t.integer "issue_id" - t.integer "change_id" - t.integer "attachment_id" - t.string "file_path" - t.string "rev" - t.string "rev_to" - t.string "action_type" - t.integer "changeset_id" - end - - create_table "code_review_project_settings", :force => true do |t| - t.integer "project_id" - t.integer "tracker_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "updated_by" - t.boolean "hide_code_review_tab", :default => false - t.integer "auto_relation", :default => 1 - t.integer "assignment_tracker_id" - t.text "auto_assign" - t.integer "lock_version", :default => 0, :null => false - t.boolean "tracker_in_review_dialog", :default => false - end - - create_table "code_review_user_settings", :force => true do |t| - t.integer "user_id", :default => 0, :null => false - t.integer "mail_notification", :default => 0, :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "code_reviews", :force => true do |t| - t.integer "project_id" - t.integer "change_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "line" - t.integer "updated_by_id" - t.integer "lock_version", :default => 0, :null => false - t.integer "status_changed_from" - t.integer "status_changed_to" - t.integer "issue_id" - t.string "action_type" - t.string "file_path" - t.string "rev" - t.string "rev_to" - t.integer "attachment_id" - t.integer "file_count", :default => 0, :null => false - t.boolean "diff_all" - end - create_table "comments", :force => true do |t| t.string "commented_type", :limit => 30, :default => "", :null => false t.integer "commented_id", :default => 0, :null => false From 94831443a5894ce1f8cceb952697aa1467b803fc Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 17 Nov 2015 15:24:01 +0800 Subject: [PATCH 095/285] =?UTF-8?q?MathJax=E7=9A=84js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base.html.erb | 12 + app/views/layouts/base_courses.html.erb | 12 + app/views/layouts/base_forums.html.erb | 12 + app/views/layouts/base_homework.html.erb | 12 + app/views/layouts/base_memos.html.erb | 12 + app/views/layouts/base_projects.html.erb | 13 +- app/views/layouts/base_tags.html.erb | 12 + app/views/layouts/base_users.html.erb | 12 + app/views/layouts/base_users_new.html.erb | 13 +- app/views/layouts/contest_base.html.erb | 12 + app/views/layouts/course_base.html.erb | 12 + app/views/layouts/login.html.erb | 12 + app/views/layouts/new_base.html.erb | 12 + app/views/layouts/new_base_user.html.erb | 12 + app/views/layouts/static_base.html.erb | 12 + app/views/layouts/users_base.html.erb | 12 + public/javascripts/MathJax/MathJax.js | 19 + .../MathJax/config/AM_HTMLorMML-full.js | 50 + .../MathJax/config/AM_HTMLorMML.js | 44 + .../MathJax/config/Accessible-full.js | 76 ++ .../javascripts/MathJax/config/Accessible.js | 70 ++ .../MathJax/config/MML_HTMLorMML-full.js | 50 + .../MathJax/config/MML_HTMLorMML.js | 44 + .../javascripts/MathJax/config/MMLorHTML.js | 19 + public/javascripts/MathJax/config/Safe.js | 19 + .../config/TeX-AMS-MML_HTMLorMML-full.js | 64 + .../MathJax/config/TeX-AMS-MML_HTMLorMML.js | 58 + .../MathJax/config/TeX-AMS-MML_SVG-full.js | 56 + .../MathJax/config/TeX-AMS-MML_SVG.js | 52 + .../MathJax/config/TeX-AMS_HTML-full.js | 50 + .../MathJax/config/TeX-AMS_HTML.js | 46 + .../config/TeX-MML-AM_HTMLorMML-full.js | 70 ++ .../MathJax/config/TeX-MML-AM_HTMLorMML.js | 64 + public/javascripts/MathJax/config/default.js | 1093 +++++++++++++++++ .../javascripts/MathJax/config/local/local.js | 40 + .../MathJax/jax/element/mml/jax.js | 19 + .../MathJax/jax/element/mml/optable/Arrows.js | 19 + .../jax/element/mml/optable/BasicLatin.js | 19 + .../element/mml/optable/CombDiacritMarks.js | 19 + .../mml/optable/CombDiactForSymbols.js | 19 + .../jax/element/mml/optable/Dingbats.js | 19 + .../element/mml/optable/GeneralPunctuation.js | 19 + .../element/mml/optable/GeometricShapes.js | 19 + .../jax/element/mml/optable/GreekAndCoptic.js | 19 + .../element/mml/optable/Latin1Supplement.js | 19 + .../element/mml/optable/LetterlikeSymbols.js | 19 + .../jax/element/mml/optable/MathOperators.js | 19 + .../element/mml/optable/MiscMathSymbolsA.js | 19 + .../element/mml/optable/MiscMathSymbolsB.js | 19 + .../mml/optable/MiscSymbolsAndArrows.js | 19 + .../jax/element/mml/optable/MiscTechnical.js | 19 + .../element/mml/optable/SpacingModLetters.js | 19 + .../element/mml/optable/SuppMathOperators.js | 19 + .../mml/optable/SupplementalArrowsA.js | 19 + .../mml/optable/SupplementalArrowsB.js | 19 + .../MathJax/jax/input/AsciiMath/config.js | 19 + .../MathJax/jax/input/AsciiMath/jax.js | 19 + .../MathJax/jax/input/MathML/config.js | 19 + .../MathJax/jax/input/MathML/entities/a.js | 19 + .../MathJax/jax/input/MathML/entities/b.js | 19 + .../MathJax/jax/input/MathML/entities/c.js | 19 + .../MathJax/jax/input/MathML/entities/d.js | 19 + .../MathJax/jax/input/MathML/entities/e.js | 19 + .../MathJax/jax/input/MathML/entities/f.js | 19 + .../MathJax/jax/input/MathML/entities/fr.js | 19 + .../MathJax/jax/input/MathML/entities/g.js | 19 + .../MathJax/jax/input/MathML/entities/h.js | 19 + .../MathJax/jax/input/MathML/entities/i.js | 19 + .../MathJax/jax/input/MathML/entities/j.js | 19 + .../MathJax/jax/input/MathML/entities/k.js | 19 + .../MathJax/jax/input/MathML/entities/l.js | 19 + .../MathJax/jax/input/MathML/entities/m.js | 19 + .../MathJax/jax/input/MathML/entities/n.js | 19 + .../MathJax/jax/input/MathML/entities/o.js | 19 + .../MathJax/jax/input/MathML/entities/opf.js | 19 + .../MathJax/jax/input/MathML/entities/p.js | 19 + .../MathJax/jax/input/MathML/entities/q.js | 19 + .../MathJax/jax/input/MathML/entities/r.js | 19 + .../MathJax/jax/input/MathML/entities/s.js | 19 + .../MathJax/jax/input/MathML/entities/scr.js | 19 + .../MathJax/jax/input/MathML/entities/t.js | 19 + .../MathJax/jax/input/MathML/entities/u.js | 19 + .../MathJax/jax/input/MathML/entities/v.js | 19 + .../MathJax/jax/input/MathML/entities/w.js | 19 + .../MathJax/jax/input/MathML/entities/x.js | 19 + .../MathJax/jax/input/MathML/entities/y.js | 19 + .../MathJax/jax/input/MathML/entities/z.js | 19 + .../MathJax/jax/input/MathML/jax.js | 19 + .../MathJax/jax/input/TeX/config.js | 19 + .../javascripts/MathJax/jax/input/TeX/jax.js | 19 + .../HTML-CSS/autoload/annotation-xml.js | 19 + .../jax/output/HTML-CSS/autoload/maction.js | 19 + .../jax/output/HTML-CSS/autoload/menclose.js | 19 + .../jax/output/HTML-CSS/autoload/mglyph.js | 19 + .../output/HTML-CSS/autoload/mmultiscripts.js | 19 + .../jax/output/HTML-CSS/autoload/ms.js | 19 + .../jax/output/HTML-CSS/autoload/mtable.js | 19 + .../jax/output/HTML-CSS/autoload/multiline.js | 19 + .../MathJax/jax/output/HTML-CSS/config.js | 19 + .../Asana-Math/Alphabets/Regular/Main.js | 19 + .../fonts/Asana-Math/Arrows/Regular/Main.js | 19 + .../Asana-Math/DoubleStruck/Regular/Main.js | 19 + .../fonts/Asana-Math/Fraktur/Regular/Main.js | 19 + .../fonts/Asana-Math/Latin/Regular/Main.js | 19 + .../fonts/Asana-Math/Main/Regular/Main.js | 19 + .../fonts/Asana-Math/Marks/Regular/Main.js | 19 + .../fonts/Asana-Math/Misc/Regular/Main.js | 19 + .../Asana-Math/Monospace/Regular/Main.js | 19 + .../Asana-Math/NonUnicode/Regular/Main.js | 19 + .../fonts/Asana-Math/Normal/Regular/Main.js | 19 + .../Asana-Math/Operators/Regular/Main.js | 19 + .../Asana-Math/SansSerif/Regular/Main.js | 19 + .../fonts/Asana-Math/Script/Regular/Main.js | 19 + .../fonts/Asana-Math/Shapes/Regular/Main.js | 19 + .../fonts/Asana-Math/Size1/Regular/Main.js | 19 + .../fonts/Asana-Math/Size2/Regular/Main.js | 19 + .../fonts/Asana-Math/Size3/Regular/Main.js | 19 + .../fonts/Asana-Math/Size4/Regular/Main.js | 19 + .../fonts/Asana-Math/Size5/Regular/Main.js | 19 + .../fonts/Asana-Math/Size6/Regular/Main.js | 19 + .../fonts/Asana-Math/Symbols/Regular/Main.js | 19 + .../fonts/Asana-Math/Variants/Regular/Main.js | 19 + .../fonts/Asana-Math/fontdata-extra.js | 19 + .../HTML-CSS/fonts/Asana-Math/fontdata.js | 19 + .../Gyre-Pagella/Alphabets/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Arrows/Regular/Main.js | 19 + .../Gyre-Pagella/DoubleStruck/Regular/Main.js | 19 + .../Gyre-Pagella/Fraktur/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Latin/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Main/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Marks/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Misc/Regular/Main.js | 19 + .../Gyre-Pagella/Monospace/Regular/Main.js | 19 + .../Gyre-Pagella/NonUnicode/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Normal/Regular/Main.js | 19 + .../Gyre-Pagella/Operators/Regular/Main.js | 19 + .../Gyre-Pagella/SansSerif/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Script/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Shapes/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Size1/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Size2/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Size3/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Size4/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Size5/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Size6/Regular/Main.js | 19 + .../Gyre-Pagella/Symbols/Regular/Main.js | 19 + .../Gyre-Pagella/Variants/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/fontdata-extra.js | 19 + .../HTML-CSS/fonts/Gyre-Pagella/fontdata.js | 19 + .../Gyre-Termes/Alphabets/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Arrows/Regular/Main.js | 19 + .../Gyre-Termes/DoubleStruck/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Fraktur/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Latin/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Main/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Marks/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Misc/Regular/Main.js | 19 + .../Gyre-Termes/Monospace/Regular/Main.js | 19 + .../Gyre-Termes/NonUnicode/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Normal/Regular/Main.js | 19 + .../Gyre-Termes/Operators/Regular/Main.js | 19 + .../Gyre-Termes/SansSerif/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Script/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Shapes/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Size1/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Size2/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Size3/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Size4/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Size5/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Size6/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Symbols/Regular/Main.js | 19 + .../Gyre-Termes/Variants/Regular/Main.js | 19 + .../fonts/Gyre-Termes/fontdata-extra.js | 19 + .../HTML-CSS/fonts/Gyre-Termes/fontdata.js | 19 + .../Latin-Modern/Alphabets/Regular/Main.js | 19 + .../fonts/Latin-Modern/Arrows/Regular/Main.js | 19 + .../Latin-Modern/DoubleStruck/Regular/Main.js | 19 + .../Latin-Modern/Fraktur/Regular/Main.js | 19 + .../fonts/Latin-Modern/Latin/Regular/Main.js | 19 + .../fonts/Latin-Modern/Main/Regular/Main.js | 19 + .../fonts/Latin-Modern/Marks/Regular/Main.js | 19 + .../fonts/Latin-Modern/Misc/Regular/Main.js | 19 + .../Latin-Modern/Monospace/Regular/Main.js | 19 + .../Latin-Modern/NonUnicode/Regular/Main.js | 19 + .../fonts/Latin-Modern/Normal/Regular/Main.js | 19 + .../Latin-Modern/Operators/Regular/Main.js | 19 + .../Latin-Modern/SansSerif/Regular/Main.js | 19 + .../fonts/Latin-Modern/Script/Regular/Main.js | 19 + .../fonts/Latin-Modern/Shapes/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size1/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size2/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size3/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size4/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size5/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size6/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size7/Regular/Main.js | 19 + .../Latin-Modern/Symbols/Regular/Main.js | 19 + .../Latin-Modern/Variants/Regular/Main.js | 19 + .../fonts/Latin-Modern/fontdata-extra.js | 19 + .../HTML-CSS/fonts/Latin-Modern/fontdata.js | 19 + .../fonts/Neo-Euler/Alphabets/Regular/Main.js | 19 + .../fonts/Neo-Euler/Arrows/Regular/Main.js | 19 + .../fonts/Neo-Euler/Fraktur/Regular/Main.js | 19 + .../fonts/Neo-Euler/Main/Regular/Main.js | 19 + .../fonts/Neo-Euler/Marks/Regular/Main.js | 19 + .../Neo-Euler/NonUnicode/Regular/Main.js | 19 + .../fonts/Neo-Euler/Normal/Regular/Main.js | 19 + .../fonts/Neo-Euler/Operators/Regular/Main.js | 19 + .../fonts/Neo-Euler/Script/Regular/Main.js | 19 + .../fonts/Neo-Euler/Shapes/Regular/Main.js | 19 + .../fonts/Neo-Euler/Size1/Regular/Main.js | 19 + .../fonts/Neo-Euler/Size2/Regular/Main.js | 19 + .../fonts/Neo-Euler/Size3/Regular/Main.js | 19 + .../fonts/Neo-Euler/Size4/Regular/Main.js | 19 + .../fonts/Neo-Euler/Size5/Regular/Main.js | 19 + .../fonts/Neo-Euler/Symbols/Regular/Main.js | 19 + .../fonts/Neo-Euler/Variants/Regular/Main.js | 19 + .../fonts/Neo-Euler/fontdata-extra.js | 19 + .../HTML-CSS/fonts/Neo-Euler/fontdata.js | 19 + .../fonts/STIX-Web/Alphabets/Bold/Main.js | 19 + .../STIX-Web/Alphabets/BoldItalic/Main.js | 19 + .../fonts/STIX-Web/Alphabets/Italic/Main.js | 19 + .../fonts/STIX-Web/Alphabets/Regular/Main.js | 19 + .../fonts/STIX-Web/Arrows/Bold/Main.js | 19 + .../fonts/STIX-Web/Arrows/Regular/Main.js | 19 + .../fonts/STIX-Web/DoubleStruck/Bold/Main.js | 19 + .../STIX-Web/DoubleStruck/BoldItalic/Main.js | 19 + .../STIX-Web/DoubleStruck/Italic/Main.js | 19 + .../STIX-Web/DoubleStruck/Regular/Main.js | 19 + .../fonts/STIX-Web/Fraktur/Bold/Main.js | 19 + .../fonts/STIX-Web/Fraktur/Regular/Main.js | 19 + .../fonts/STIX-Web/Latin/Bold/Main.js | 19 + .../fonts/STIX-Web/Latin/BoldItalic/Main.js | 19 + .../fonts/STIX-Web/Latin/Italic/Main.js | 19 + .../fonts/STIX-Web/Latin/Regular/Main.js | 19 + .../HTML-CSS/fonts/STIX-Web/Main/Bold/Main.js | 19 + .../fonts/STIX-Web/Main/BoldItalic/Main.js | 19 + .../fonts/STIX-Web/Main/Italic/Main.js | 19 + .../fonts/STIX-Web/Main/Regular/Main.js | 19 + .../fonts/STIX-Web/Marks/Bold/Main.js | 19 + .../fonts/STIX-Web/Marks/BoldItalic/Main.js | 19 + .../fonts/STIX-Web/Marks/Italic/Main.js | 19 + .../fonts/STIX-Web/Marks/Regular/Main.js | 19 + .../HTML-CSS/fonts/STIX-Web/Misc/Bold/Main.js | 19 + .../fonts/STIX-Web/Misc/BoldItalic/Main.js | 19 + .../fonts/STIX-Web/Misc/Italic/Main.js | 19 + .../fonts/STIX-Web/Misc/Regular/Main.js | 19 + .../fonts/STIX-Web/Monospace/Regular/Main.js | 19 + .../fonts/STIX-Web/Normal/Bold/Main.js | 19 + .../fonts/STIX-Web/Normal/BoldItalic/Main.js | 19 + .../fonts/STIX-Web/Normal/Italic/Main.js | 19 + .../fonts/STIX-Web/Operators/Bold/Main.js | 19 + .../fonts/STIX-Web/Operators/Regular/Main.js | 19 + .../fonts/STIX-Web/SansSerif/Bold/Main.js | 19 + .../STIX-Web/SansSerif/BoldItalic/Main.js | 19 + .../fonts/STIX-Web/SansSerif/Italic/Main.js | 19 + .../fonts/STIX-Web/SansSerif/Regular/Main.js | 19 + .../fonts/STIX-Web/Script/BoldItalic/Main.js | 19 + .../fonts/STIX-Web/Script/Italic/Main.js | 19 + .../fonts/STIX-Web/Script/Regular/Main.js | 19 + .../fonts/STIX-Web/Shapes/Bold/Main.js | 19 + .../fonts/STIX-Web/Shapes/BoldItalic/Main.js | 19 + .../fonts/STIX-Web/Shapes/Regular/Main.js | 19 + .../fonts/STIX-Web/Size1/Regular/Main.js | 19 + .../fonts/STIX-Web/Size2/Regular/Main.js | 19 + .../fonts/STIX-Web/Size3/Regular/Main.js | 19 + .../fonts/STIX-Web/Size4/Regular/Main.js | 19 + .../fonts/STIX-Web/Size5/Regular/Main.js | 19 + .../fonts/STIX-Web/Symbols/Bold/Main.js | 19 + .../fonts/STIX-Web/Symbols/Regular/Main.js | 19 + .../fonts/STIX-Web/Variants/Bold/Main.js | 19 + .../STIX-Web/Variants/BoldItalic/Main.js | 19 + .../fonts/STIX-Web/Variants/Italic/Main.js | 19 + .../fonts/STIX-Web/Variants/Regular/Main.js | 19 + .../HTML-CSS/fonts/STIX-Web/fontdata-extra.js | 19 + .../HTML-CSS/fonts/STIX-Web/fontdata.js | 19 + .../STIX/General/Bold/AlphaPresentForms.js | 19 + .../fonts/STIX/General/Bold/Arrows.js | 19 + .../fonts/STIX/General/Bold/BBBold.js | 19 + .../fonts/STIX/General/Bold/BoldFraktur.js | 19 + .../fonts/STIX/General/Bold/BoxDrawing.js | 19 + .../STIX/General/Bold/CombDiacritMarks.js | 19 + .../STIX/General/Bold/CombDiactForSymbols.js | 19 + .../STIX/General/Bold/ControlPictures.js | 19 + .../STIX/General/Bold/CurrencySymbols.js | 19 + .../fonts/STIX/General/Bold/Cyrillic.js | 19 + .../STIX/General/Bold/EnclosedAlphanum.js | 19 + .../STIX/General/Bold/GeneralPunctuation.js | 19 + .../STIX/General/Bold/GeometricShapes.js | 19 + .../fonts/STIX/General/Bold/GreekAndCoptic.js | 19 + .../fonts/STIX/General/Bold/GreekBold.js | 19 + .../fonts/STIX/General/Bold/GreekSSBold.js | 19 + .../fonts/STIX/General/Bold/IPAExtensions.js | 19 + .../STIX/General/Bold/Latin1Supplement.js | 19 + .../fonts/STIX/General/Bold/LatinExtendedA.js | 19 + .../General/Bold/LatinExtendedAdditional.js | 19 + .../fonts/STIX/General/Bold/LatinExtendedB.js | 19 + .../fonts/STIX/General/Bold/LatinExtendedD.js | 19 + .../STIX/General/Bold/LetterlikeSymbols.js | 19 + .../HTML-CSS/fonts/STIX/General/Bold/Main.js | 19 + .../fonts/STIX/General/Bold/MathBold.js | 19 + .../fonts/STIX/General/Bold/MathOperators.js | 19 + .../fonts/STIX/General/Bold/MathSSBold.js | 19 + .../STIX/General/Bold/MiscMathSymbolsA.js | 19 + .../STIX/General/Bold/MiscMathSymbolsB.js | 19 + .../fonts/STIX/General/Bold/MiscSymbols.js | 19 + .../fonts/STIX/General/Bold/MiscTechnical.js | 19 + .../fonts/STIX/General/Bold/NumberForms.js | 19 + .../STIX/General/Bold/PhoneticExtensions.js | 19 + .../STIX/General/Bold/SpacingModLetters.js | 19 + .../STIX/General/Bold/SuperAndSubscripts.js | 19 + .../STIX/General/Bold/SuppMathOperators.js | 19 + .../General/BoldItalic/AlphaPresentForms.js | 19 + .../STIX/General/BoldItalic/BasicLatin.js | 19 + .../STIX/General/BoldItalic/BoxDrawing.js | 19 + .../General/BoldItalic/CombDiactForSymbols.js | 19 + .../General/BoldItalic/ControlPictures.js | 19 + .../General/BoldItalic/CurrencySymbols.js | 19 + .../fonts/STIX/General/BoldItalic/Cyrillic.js | 19 + .../General/BoldItalic/EnclosedAlphanum.js | 19 + .../General/BoldItalic/GeneralPunctuation.js | 19 + .../STIX/General/BoldItalic/GreekAndCoptic.js | 19 + .../General/BoldItalic/GreekBoldItalic.js | 19 + .../General/BoldItalic/GreekSSBoldItalic.js | 19 + .../STIX/General/BoldItalic/IPAExtensions.js | 19 + .../General/BoldItalic/Latin1Supplement.js | 19 + .../STIX/General/BoldItalic/LatinExtendedA.js | 19 + .../BoldItalic/LatinExtendedAdditional.js | 19 + .../STIX/General/BoldItalic/LatinExtendedB.js | 19 + .../General/BoldItalic/LetterlikeSymbols.js | 19 + .../fonts/STIX/General/BoldItalic/Main.js | 19 + .../STIX/General/BoldItalic/MathBoldItalic.js | 19 + .../STIX/General/BoldItalic/MathBoldScript.js | 19 + .../STIX/General/BoldItalic/MathOperators.js | 19 + .../General/BoldItalic/MathSSItalicBold.js | 19 + .../General/BoldItalic/SpacingModLetters.js | 19 + .../STIX/General/Italic/AlphaPresentForms.js | 19 + .../fonts/STIX/General/Italic/BoxDrawing.js | 19 + .../General/Italic/CombDiactForSymbols.js | 19 + .../STIX/General/Italic/ControlPictures.js | 19 + .../STIX/General/Italic/CurrencySymbols.js | 19 + .../fonts/STIX/General/Italic/Cyrillic.js | 19 + .../STIX/General/Italic/EnclosedAlphanum.js | 19 + .../STIX/General/Italic/GeneralPunctuation.js | 19 + .../STIX/General/Italic/GreekAndCoptic.js | 19 + .../fonts/STIX/General/Italic/GreekItalic.js | 19 + .../STIX/General/Italic/IPAExtensions.js | 19 + .../STIX/General/Italic/Latin1Supplement.js | 19 + .../STIX/General/Italic/LatinExtendedA.js | 19 + .../General/Italic/LatinExtendedAdditional.js | 19 + .../STIX/General/Italic/LatinExtendedB.js | 19 + .../STIX/General/Italic/LetterlikeSymbols.js | 19 + .../fonts/STIX/General/Italic/Main.js | 19 + .../fonts/STIX/General/Italic/MathItalic.js | 19 + .../STIX/General/Italic/MathOperators.js | 19 + .../fonts/STIX/General/Italic/MathSSItalic.js | 19 + .../fonts/STIX/General/Italic/MathScript.js | 19 + .../STIX/General/Italic/SpacingModLetters.js | 19 + .../HTML-CSS/fonts/STIX/General/Italic/ij.js | 19 + .../STIX/General/Regular/AlphaPresentForms.js | 19 + .../fonts/STIX/General/Regular/Arrows.js | 19 + .../fonts/STIX/General/Regular/BBBold.js | 19 + .../STIX/General/Regular/BlockElements.js | 19 + .../fonts/STIX/General/Regular/BoldFraktur.js | 19 + .../fonts/STIX/General/Regular/BoxDrawing.js | 19 + .../fonts/STIX/General/Regular/CJK.js | 19 + .../STIX/General/Regular/CombDiacritMarks.js | 19 + .../General/Regular/CombDiactForSymbols.js | 19 + .../STIX/General/Regular/ControlPictures.js | 19 + .../STIX/General/Regular/CurrencySymbols.js | 19 + .../fonts/STIX/General/Regular/Cyrillic.js | 19 + .../fonts/STIX/General/Regular/Dingbats.js | 19 + .../STIX/General/Regular/EnclosedAlphanum.js | 19 + .../fonts/STIX/General/Regular/Fraktur.js | 19 + .../General/Regular/GeneralPunctuation.js | 19 + .../STIX/General/Regular/GeometricShapes.js | 19 + .../STIX/General/Regular/GreekAndCoptic.js | 19 + .../fonts/STIX/General/Regular/GreekBold.js | 19 + .../STIX/General/Regular/GreekBoldItalic.js | 19 + .../fonts/STIX/General/Regular/GreekItalic.js | 19 + .../fonts/STIX/General/Regular/GreekSSBold.js | 19 + .../STIX/General/Regular/GreekSSBoldItalic.js | 19 + .../fonts/STIX/General/Regular/Hiragana.js | 19 + .../STIX/General/Regular/IPAExtensions.js | 19 + .../STIX/General/Regular/Latin1Supplement.js | 19 + .../STIX/General/Regular/LatinExtendedA.js | 19 + .../Regular/LatinExtendedAdditional.js | 19 + .../STIX/General/Regular/LatinExtendedB.js | 19 + .../STIX/General/Regular/LatinExtendedD.js | 19 + .../STIX/General/Regular/LetterlikeSymbols.js | 19 + .../fonts/STIX/General/Regular/Main.js | 19 + .../fonts/STIX/General/Regular/MathBold.js | 19 + .../STIX/General/Regular/MathBoldItalic.js | 19 + .../STIX/General/Regular/MathBoldScript.js | 19 + .../fonts/STIX/General/Regular/MathItalic.js | 19 + .../STIX/General/Regular/MathOperators.js | 19 + .../fonts/STIX/General/Regular/MathSS.js | 19 + .../fonts/STIX/General/Regular/MathSSBold.js | 19 + .../STIX/General/Regular/MathSSItalic.js | 19 + .../STIX/General/Regular/MathSSItalicBold.js | 19 + .../fonts/STIX/General/Regular/MathScript.js | 19 + .../fonts/STIX/General/Regular/MathTT.js | 19 + .../STIX/General/Regular/MiscMathSymbolsA.js | 19 + .../STIX/General/Regular/MiscMathSymbolsB.js | 19 + .../fonts/STIX/General/Regular/MiscSymbols.js | 19 + .../General/Regular/MiscSymbolsAndArrows.js | 19 + .../STIX/General/Regular/MiscTechnical.js | 19 + .../fonts/STIX/General/Regular/NumberForms.js | 19 + .../General/Regular/PhoneticExtensions.js | 19 + .../STIX/General/Regular/SpacingModLetters.js | 19 + .../fonts/STIX/General/Regular/Specials.js | 19 + .../General/Regular/SuperAndSubscripts.js | 19 + .../STIX/General/Regular/SuppMathOperators.js | 19 + .../General/Regular/SupplementalArrowsA.js | 19 + .../General/Regular/SupplementalArrowsB.js | 19 + .../HTML-CSS/fonts/STIX/General/Regular/ij.js | 19 + .../fonts/STIX/IntegralsD/Bold/All.js | 19 + .../fonts/STIX/IntegralsD/Regular/All.js | 19 + .../fonts/STIX/IntegralsD/Regular/Main.js | 19 + .../fonts/STIX/IntegralsSm/Bold/All.js | 19 + .../fonts/STIX/IntegralsSm/Regular/All.js | 19 + .../fonts/STIX/IntegralsSm/Regular/Main.js | 19 + .../fonts/STIX/IntegralsUp/Bold/All.js | 19 + .../fonts/STIX/IntegralsUp/Regular/All.js | 19 + .../fonts/STIX/IntegralsUp/Regular/Main.js | 19 + .../fonts/STIX/IntegralsUpD/Bold/All.js | 19 + .../fonts/STIX/IntegralsUpD/Regular/All.js | 19 + .../fonts/STIX/IntegralsUpD/Regular/Main.js | 19 + .../fonts/STIX/IntegralsUpSm/Bold/All.js | 19 + .../fonts/STIX/IntegralsUpSm/Regular/All.js | 19 + .../fonts/STIX/IntegralsUpSm/Regular/Main.js | 19 + .../fonts/STIX/NonUnicode/Bold/All.js | 19 + .../fonts/STIX/NonUnicode/Bold/Main.js | 19 + .../fonts/STIX/NonUnicode/Bold/PrivateUse.js | 19 + .../fonts/STIX/NonUnicode/BoldItalic/All.js | 19 + .../fonts/STIX/NonUnicode/BoldItalic/Main.js | 19 + .../STIX/NonUnicode/BoldItalic/PrivateUse.js | 19 + .../fonts/STIX/NonUnicode/Italic/All.js | 19 + .../fonts/STIX/NonUnicode/Italic/Main.js | 19 + .../STIX/NonUnicode/Italic/PrivateUse.js | 19 + .../fonts/STIX/NonUnicode/Regular/All.js | 19 + .../fonts/STIX/NonUnicode/Regular/Main.js | 19 + .../STIX/NonUnicode/Regular/PrivateUse.js | 19 + .../fonts/STIX/SizeFiveSym/Regular/All.js | 19 + .../fonts/STIX/SizeFiveSym/Regular/Main.js | 19 + .../fonts/STIX/SizeFourSym/Bold/Main.js | 19 + .../fonts/STIX/SizeFourSym/Regular/All.js | 19 + .../fonts/STIX/SizeFourSym/Regular/Main.js | 19 + .../fonts/STIX/SizeOneSym/Bold/All.js | 19 + .../fonts/STIX/SizeOneSym/Bold/Main.js | 19 + .../fonts/STIX/SizeOneSym/Regular/All.js | 19 + .../fonts/STIX/SizeOneSym/Regular/Main.js | 19 + .../fonts/STIX/SizeThreeSym/Bold/Main.js | 19 + .../fonts/STIX/SizeThreeSym/Regular/All.js | 19 + .../fonts/STIX/SizeThreeSym/Regular/Main.js | 19 + .../fonts/STIX/SizeTwoSym/Bold/Main.js | 19 + .../fonts/STIX/SizeTwoSym/Regular/All.js | 19 + .../fonts/STIX/SizeTwoSym/Regular/Main.js | 19 + .../HTML-CSS/fonts/STIX/Variants/Bold/All.js | 19 + .../HTML-CSS/fonts/STIX/Variants/Bold/Main.js | 19 + .../fonts/STIX/Variants/Regular/All.js | 19 + .../fonts/STIX/Variants/Regular/Main.js | 19 + .../HTML-CSS/fonts/STIX/fontdata-1.0.js | 19 + .../HTML-CSS/fonts/STIX/fontdata-beta.js | 19 + .../HTML-CSS/fonts/STIX/fontdata-extra.js | 19 + .../output/HTML-CSS/fonts/STIX/fontdata.js | 19 + .../HTML-CSS/fonts/TeX/AMS/Regular/Arrows.js | 19 + .../HTML-CSS/fonts/TeX/AMS/Regular/BBBold.js | 19 + .../fonts/TeX/AMS/Regular/BoxDrawing.js | 19 + .../fonts/TeX/AMS/Regular/CombDiacritMarks.js | 19 + .../fonts/TeX/AMS/Regular/Dingbats.js | 19 + .../fonts/TeX/AMS/Regular/EnclosedAlphanum.js | 19 + .../TeX/AMS/Regular/GeneralPunctuation.js | 19 + .../fonts/TeX/AMS/Regular/GeometricShapes.js | 19 + .../fonts/TeX/AMS/Regular/GreekAndCoptic.js | 19 + .../fonts/TeX/AMS/Regular/Latin1Supplement.js | 19 + .../fonts/TeX/AMS/Regular/LatinExtendedA.js | 19 + .../TeX/AMS/Regular/LetterlikeSymbols.js | 19 + .../HTML-CSS/fonts/TeX/AMS/Regular/Main.js | 19 + .../fonts/TeX/AMS/Regular/MathOperators.js | 19 + .../fonts/TeX/AMS/Regular/MiscMathSymbolsB.js | 19 + .../fonts/TeX/AMS/Regular/MiscSymbols.js | 19 + .../fonts/TeX/AMS/Regular/MiscTechnical.js | 19 + .../HTML-CSS/fonts/TeX/AMS/Regular/PUA.js | 19 + .../TeX/AMS/Regular/SpacingModLetters.js | 19 + .../TeX/AMS/Regular/SuppMathOperators.js | 19 + .../fonts/TeX/Caligraphic/Bold/Main.js | 19 + .../fonts/TeX/Caligraphic/Regular/Main.js | 19 + .../fonts/TeX/Fraktur/Bold/BasicLatin.js | 19 + .../HTML-CSS/fonts/TeX/Fraktur/Bold/Main.js | 19 + .../HTML-CSS/fonts/TeX/Fraktur/Bold/Other.js | 19 + .../HTML-CSS/fonts/TeX/Fraktur/Bold/PUA.js | 19 + .../fonts/TeX/Fraktur/Regular/BasicLatin.js | 19 + .../fonts/TeX/Fraktur/Regular/Main.js | 19 + .../fonts/TeX/Fraktur/Regular/Other.js | 19 + .../HTML-CSS/fonts/TeX/Fraktur/Regular/PUA.js | 19 + .../HTML-CSS/fonts/TeX/Greek/Bold/Main.js | 19 + .../fonts/TeX/Greek/BoldItalic/Main.js | 19 + .../HTML-CSS/fonts/TeX/Greek/Italic/Main.js | 19 + .../HTML-CSS/fonts/TeX/Greek/Regular/Main.js | 19 + .../HTML-CSS/fonts/TeX/Main/Bold/Arrows.js | 19 + .../fonts/TeX/Main/Bold/CombDiacritMarks.js | 19 + .../TeX/Main/Bold/CombDiactForSymbols.js | 19 + .../fonts/TeX/Main/Bold/GeneralPunctuation.js | 19 + .../fonts/TeX/Main/Bold/GeometricShapes.js | 19 + .../fonts/TeX/Main/Bold/Latin1Supplement.js | 19 + .../fonts/TeX/Main/Bold/LatinExtendedA.js | 19 + .../fonts/TeX/Main/Bold/LatinExtendedB.js | 19 + .../fonts/TeX/Main/Bold/LetterlikeSymbols.js | 19 + .../HTML-CSS/fonts/TeX/Main/Bold/Main.js | 19 + .../fonts/TeX/Main/Bold/MathOperators.js | 19 + .../fonts/TeX/Main/Bold/MiscMathSymbolsA.js | 19 + .../fonts/TeX/Main/Bold/MiscSymbols.js | 19 + .../fonts/TeX/Main/Bold/MiscTechnical.js | 19 + .../fonts/TeX/Main/Bold/SpacingModLetters.js | 19 + .../fonts/TeX/Main/Bold/SuppMathOperators.js | 19 + .../TeX/Main/Bold/SupplementalArrowsA.js | 19 + .../fonts/TeX/Main/Italic/CombDiacritMarks.js | 19 + .../TeX/Main/Italic/GeneralPunctuation.js | 19 + .../fonts/TeX/Main/Italic/Latin1Supplement.js | 19 + .../TeX/Main/Italic/LetterlikeSymbols.js | 19 + .../HTML-CSS/fonts/TeX/Main/Italic/Main.js | 19 + .../TeX/Main/Regular/CombDiacritMarks.js | 19 + .../fonts/TeX/Main/Regular/GeometricShapes.js | 19 + .../HTML-CSS/fonts/TeX/Main/Regular/Main.js | 19 + .../fonts/TeX/Main/Regular/MiscSymbols.js | 19 + .../TeX/Main/Regular/SpacingModLetters.js | 19 + .../fonts/TeX/Math/BoldItalic/Main.js | 19 + .../HTML-CSS/fonts/TeX/Math/Italic/Main.js | 19 + .../fonts/TeX/SansSerif/Bold/BasicLatin.js | 19 + .../TeX/SansSerif/Bold/CombDiacritMarks.js | 19 + .../HTML-CSS/fonts/TeX/SansSerif/Bold/Main.js | 19 + .../fonts/TeX/SansSerif/Bold/Other.js | 19 + .../fonts/TeX/SansSerif/Italic/BasicLatin.js | 19 + .../TeX/SansSerif/Italic/CombDiacritMarks.js | 19 + .../fonts/TeX/SansSerif/Italic/Main.js | 19 + .../fonts/TeX/SansSerif/Italic/Other.js | 19 + .../fonts/TeX/SansSerif/Regular/BasicLatin.js | 19 + .../TeX/SansSerif/Regular/CombDiacritMarks.js | 19 + .../fonts/TeX/SansSerif/Regular/Main.js | 19 + .../fonts/TeX/SansSerif/Regular/Other.js | 19 + .../fonts/TeX/Script/Regular/BasicLatin.js | 19 + .../HTML-CSS/fonts/TeX/Script/Regular/Main.js | 19 + .../fonts/TeX/Script/Regular/Other.js | 19 + .../HTML-CSS/fonts/TeX/Size1/Regular/Main.js | 19 + .../HTML-CSS/fonts/TeX/Size2/Regular/Main.js | 19 + .../HTML-CSS/fonts/TeX/Size3/Regular/Main.js | 19 + .../HTML-CSS/fonts/TeX/Size4/Regular/Main.js | 19 + .../TeX/Typewriter/Regular/BasicLatin.js | 19 + .../Typewriter/Regular/CombDiacritMarks.js | 19 + .../fonts/TeX/Typewriter/Regular/Main.js | 19 + .../fonts/TeX/Typewriter/Regular/Other.js | 19 + .../fonts/TeX/WinChrome/Regular/Main.js | 19 + .../HTML-CSS/fonts/TeX/WinIE6/Regular/AMS.js | 19 + .../HTML-CSS/fonts/TeX/WinIE6/Regular/Bold.js | 19 + .../HTML-CSS/fonts/TeX/WinIE6/Regular/Main.js | 19 + .../HTML-CSS/fonts/TeX/fontdata-extra.js | 19 + .../jax/output/HTML-CSS/fonts/TeX/fontdata.js | 19 + .../MathJax/jax/output/HTML-CSS/imageFonts.js | 19 + .../MathJax/jax/output/HTML-CSS/jax.js | 19 + .../MathJax/jax/output/NativeMML/config.js | 19 + .../MathJax/jax/output/NativeMML/jax.js | 19 + .../jax/output/SVG/autoload/annotation-xml.js | 19 + .../jax/output/SVG/autoload/maction.js | 19 + .../jax/output/SVG/autoload/menclose.js | 19 + .../MathJax/jax/output/SVG/autoload/mglyph.js | 19 + .../jax/output/SVG/autoload/mmultiscripts.js | 19 + .../MathJax/jax/output/SVG/autoload/ms.js | 19 + .../MathJax/jax/output/SVG/autoload/mtable.js | 19 + .../jax/output/SVG/autoload/multiline.js | 19 + .../MathJax/jax/output/SVG/config.js | 19 + .../Asana-Math/Alphabets/Regular/Main.js | 19 + .../fonts/Asana-Math/Arrows/Regular/Main.js | 19 + .../Asana-Math/DoubleStruck/Regular/Main.js | 19 + .../fonts/Asana-Math/Fraktur/Regular/Main.js | 19 + .../fonts/Asana-Math/Latin/Regular/Main.js | 19 + .../SVG/fonts/Asana-Math/Main/Regular/Main.js | 19 + .../fonts/Asana-Math/Marks/Regular/Main.js | 19 + .../SVG/fonts/Asana-Math/Misc/Regular/Main.js | 19 + .../Asana-Math/Monospace/Regular/Main.js | 19 + .../Asana-Math/NonUnicode/Regular/Main.js | 19 + .../fonts/Asana-Math/Normal/Regular/Main.js | 19 + .../Asana-Math/Operators/Regular/Main.js | 19 + .../Asana-Math/SansSerif/Regular/Main.js | 19 + .../fonts/Asana-Math/Script/Regular/Main.js | 19 + .../fonts/Asana-Math/Shapes/Regular/Main.js | 19 + .../fonts/Asana-Math/Size1/Regular/Main.js | 19 + .../fonts/Asana-Math/Size2/Regular/Main.js | 19 + .../fonts/Asana-Math/Size3/Regular/Main.js | 19 + .../fonts/Asana-Math/Size4/Regular/Main.js | 19 + .../fonts/Asana-Math/Size5/Regular/Main.js | 19 + .../fonts/Asana-Math/Size6/Regular/Main.js | 19 + .../fonts/Asana-Math/Symbols/Regular/Main.js | 19 + .../fonts/Asana-Math/Variants/Regular/Main.js | 19 + .../SVG/fonts/Asana-Math/fontdata-extra.js | 19 + .../output/SVG/fonts/Asana-Math/fontdata.js | 19 + .../Gyre-Pagella/Alphabets/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Arrows/Regular/Main.js | 19 + .../Gyre-Pagella/DoubleStruck/Regular/Main.js | 19 + .../Gyre-Pagella/Fraktur/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Latin/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Main/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Marks/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Misc/Regular/Main.js | 19 + .../Gyre-Pagella/Monospace/Regular/Main.js | 19 + .../Gyre-Pagella/NonUnicode/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Normal/Regular/Main.js | 19 + .../Gyre-Pagella/Operators/Regular/Main.js | 19 + .../Gyre-Pagella/SansSerif/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Script/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Shapes/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Size1/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Size2/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Size3/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Size4/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Size5/Regular/Main.js | 19 + .../fonts/Gyre-Pagella/Size6/Regular/Main.js | 19 + .../Gyre-Pagella/Symbols/Regular/Main.js | 19 + .../Gyre-Pagella/Variants/Regular/Main.js | 19 + .../SVG/fonts/Gyre-Pagella/fontdata-extra.js | 19 + .../output/SVG/fonts/Gyre-Pagella/fontdata.js | 19 + .../Gyre-Termes/Alphabets/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Arrows/Regular/Main.js | 19 + .../Gyre-Termes/DoubleStruck/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Fraktur/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Latin/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Main/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Marks/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Misc/Regular/Main.js | 19 + .../Gyre-Termes/Monospace/Regular/Main.js | 19 + .../Gyre-Termes/NonUnicode/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Normal/Regular/Main.js | 19 + .../Gyre-Termes/Operators/Regular/Main.js | 19 + .../Gyre-Termes/SansSerif/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Script/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Shapes/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Size1/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Size2/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Size3/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Size4/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Size5/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Size6/Regular/Main.js | 19 + .../fonts/Gyre-Termes/Symbols/Regular/Main.js | 19 + .../Gyre-Termes/Variants/Regular/Main.js | 19 + .../SVG/fonts/Gyre-Termes/fontdata-extra.js | 19 + .../output/SVG/fonts/Gyre-Termes/fontdata.js | 19 + .../Latin-Modern/Alphabets/Regular/Main.js | 19 + .../fonts/Latin-Modern/Arrows/Regular/Main.js | 19 + .../Latin-Modern/DoubleStruck/Regular/Main.js | 19 + .../Latin-Modern/Fraktur/Regular/Main.js | 19 + .../fonts/Latin-Modern/Latin/Regular/Main.js | 19 + .../fonts/Latin-Modern/Main/Regular/Main.js | 19 + .../fonts/Latin-Modern/Marks/Regular/Main.js | 19 + .../fonts/Latin-Modern/Misc/Regular/Main.js | 19 + .../Latin-Modern/Monospace/Regular/Main.js | 19 + .../Latin-Modern/NonUnicode/Regular/Main.js | 19 + .../fonts/Latin-Modern/Normal/Regular/Main.js | 19 + .../Latin-Modern/Operators/Regular/Main.js | 19 + .../Latin-Modern/SansSerif/Regular/Main.js | 19 + .../fonts/Latin-Modern/Script/Regular/Main.js | 19 + .../fonts/Latin-Modern/Shapes/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size1/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size2/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size3/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size4/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size5/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size6/Regular/Main.js | 19 + .../fonts/Latin-Modern/Size7/Regular/Main.js | 19 + .../Latin-Modern/Symbols/Regular/Main.js | 19 + .../Latin-Modern/Variants/Regular/Main.js | 19 + .../SVG/fonts/Latin-Modern/fontdata-extra.js | 19 + .../output/SVG/fonts/Latin-Modern/fontdata.js | 19 + .../fonts/Neo-Euler/Alphabets/Regular/Main.js | 19 + .../fonts/Neo-Euler/Arrows/Regular/Main.js | 19 + .../fonts/Neo-Euler/Fraktur/Regular/Main.js | 19 + .../SVG/fonts/Neo-Euler/Main/Regular/Main.js | 19 + .../SVG/fonts/Neo-Euler/Marks/Regular/Main.js | 19 + .../Neo-Euler/NonUnicode/Regular/Main.js | 19 + .../fonts/Neo-Euler/Normal/Regular/Main.js | 19 + .../fonts/Neo-Euler/Operators/Regular/Main.js | 19 + .../fonts/Neo-Euler/Script/Regular/Main.js | 19 + .../fonts/Neo-Euler/Shapes/Regular/Main.js | 19 + .../SVG/fonts/Neo-Euler/Size1/Regular/Main.js | 19 + .../SVG/fonts/Neo-Euler/Size2/Regular/Main.js | 19 + .../SVG/fonts/Neo-Euler/Size3/Regular/Main.js | 19 + .../SVG/fonts/Neo-Euler/Size4/Regular/Main.js | 19 + .../SVG/fonts/Neo-Euler/Size5/Regular/Main.js | 19 + .../fonts/Neo-Euler/Symbols/Regular/Main.js | 19 + .../fonts/Neo-Euler/Variants/Regular/Main.js | 19 + .../SVG/fonts/Neo-Euler/fontdata-extra.js | 19 + .../output/SVG/fonts/Neo-Euler/fontdata.js | 19 + .../SVG/fonts/STIX-Web/Alphabets/Bold/Main.js | 19 + .../STIX-Web/Alphabets/BoldItalic/Main.js | 19 + .../fonts/STIX-Web/Alphabets/Italic/Main.js | 19 + .../fonts/STIX-Web/Alphabets/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Arrows/Bold/Main.js | 19 + .../SVG/fonts/STIX-Web/Arrows/Regular/Main.js | 19 + .../fonts/STIX-Web/DoubleStruck/Bold/Main.js | 19 + .../STIX-Web/DoubleStruck/BoldItalic/Main.js | 19 + .../STIX-Web/DoubleStruck/Italic/Main.js | 19 + .../STIX-Web/DoubleStruck/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Fraktur/Bold/Main.js | 19 + .../fonts/STIX-Web/Fraktur/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Latin/Bold/Main.js | 19 + .../fonts/STIX-Web/Latin/BoldItalic/Main.js | 19 + .../SVG/fonts/STIX-Web/Latin/Italic/Main.js | 19 + .../SVG/fonts/STIX-Web/Latin/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Main/Bold/Main.js | 19 + .../fonts/STIX-Web/Main/BoldItalic/Main.js | 19 + .../SVG/fonts/STIX-Web/Main/Italic/Main.js | 19 + .../SVG/fonts/STIX-Web/Main/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Marks/Bold/Main.js | 19 + .../fonts/STIX-Web/Marks/BoldItalic/Main.js | 19 + .../SVG/fonts/STIX-Web/Marks/Italic/Main.js | 19 + .../SVG/fonts/STIX-Web/Marks/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Misc/Bold/Main.js | 19 + .../fonts/STIX-Web/Misc/BoldItalic/Main.js | 19 + .../SVG/fonts/STIX-Web/Misc/Italic/Main.js | 19 + .../SVG/fonts/STIX-Web/Misc/Regular/Main.js | 19 + .../fonts/STIX-Web/Monospace/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Normal/Bold/Main.js | 19 + .../fonts/STIX-Web/Normal/BoldItalic/Main.js | 19 + .../SVG/fonts/STIX-Web/Normal/Italic/Main.js | 19 + .../SVG/fonts/STIX-Web/Operators/Bold/Main.js | 19 + .../fonts/STIX-Web/Operators/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/SansSerif/Bold/Main.js | 19 + .../STIX-Web/SansSerif/BoldItalic/Main.js | 19 + .../fonts/STIX-Web/SansSerif/Italic/Main.js | 19 + .../fonts/STIX-Web/SansSerif/Regular/Main.js | 19 + .../fonts/STIX-Web/Script/BoldItalic/Main.js | 19 + .../SVG/fonts/STIX-Web/Script/Italic/Main.js | 19 + .../SVG/fonts/STIX-Web/Script/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Shapes/Bold/Main.js | 19 + .../fonts/STIX-Web/Shapes/BoldItalic/Main.js | 19 + .../SVG/fonts/STIX-Web/Shapes/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Size1/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Size2/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Size3/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Size4/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Size5/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Symbols/Bold/Main.js | 19 + .../fonts/STIX-Web/Symbols/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/Variants/Bold/Main.js | 19 + .../STIX-Web/Variants/BoldItalic/Main.js | 19 + .../fonts/STIX-Web/Variants/Italic/Main.js | 19 + .../fonts/STIX-Web/Variants/Regular/Main.js | 19 + .../SVG/fonts/STIX-Web/fontdata-extra.js | 19 + .../jax/output/SVG/fonts/STIX-Web/fontdata.js | 19 + .../SVG/fonts/TeX/AMS/Regular/Arrows.js | 19 + .../SVG/fonts/TeX/AMS/Regular/BoxDrawing.js | 19 + .../fonts/TeX/AMS/Regular/CombDiacritMarks.js | 19 + .../SVG/fonts/TeX/AMS/Regular/Dingbats.js | 19 + .../fonts/TeX/AMS/Regular/EnclosedAlphanum.js | 19 + .../TeX/AMS/Regular/GeneralPunctuation.js | 19 + .../fonts/TeX/AMS/Regular/GeometricShapes.js | 19 + .../fonts/TeX/AMS/Regular/GreekAndCoptic.js | 19 + .../fonts/TeX/AMS/Regular/Latin1Supplement.js | 19 + .../fonts/TeX/AMS/Regular/LatinExtendedA.js | 19 + .../TeX/AMS/Regular/LetterlikeSymbols.js | 19 + .../output/SVG/fonts/TeX/AMS/Regular/Main.js | 19 + .../fonts/TeX/AMS/Regular/MathOperators.js | 19 + .../fonts/TeX/AMS/Regular/MiscMathSymbolsB.js | 19 + .../SVG/fonts/TeX/AMS/Regular/MiscSymbols.js | 19 + .../fonts/TeX/AMS/Regular/MiscTechnical.js | 19 + .../output/SVG/fonts/TeX/AMS/Regular/PUA.js | 19 + .../TeX/AMS/Regular/SpacingModLetters.js | 19 + .../TeX/AMS/Regular/SuppMathOperators.js | 19 + .../SVG/fonts/TeX/Caligraphic/Bold/Main.js | 19 + .../SVG/fonts/TeX/Caligraphic/Regular/Main.js | 19 + .../SVG/fonts/TeX/Fraktur/Bold/BasicLatin.js | 19 + .../output/SVG/fonts/TeX/Fraktur/Bold/Main.js | 19 + .../SVG/fonts/TeX/Fraktur/Bold/Other.js | 19 + .../output/SVG/fonts/TeX/Fraktur/Bold/PUA.js | 19 + .../fonts/TeX/Fraktur/Regular/BasicLatin.js | 19 + .../SVG/fonts/TeX/Fraktur/Regular/Main.js | 19 + .../SVG/fonts/TeX/Fraktur/Regular/Other.js | 19 + .../SVG/fonts/TeX/Fraktur/Regular/PUA.js | 19 + .../output/SVG/fonts/TeX/Main/Bold/Arrows.js | 19 + .../SVG/fonts/TeX/Main/Bold/BasicLatin.js | 19 + .../fonts/TeX/Main/Bold/CombDiacritMarks.js | 19 + .../TeX/Main/Bold/CombDiactForSymbols.js | 19 + .../fonts/TeX/Main/Bold/GeneralPunctuation.js | 19 + .../fonts/TeX/Main/Bold/GeometricShapes.js | 19 + .../SVG/fonts/TeX/Main/Bold/GreekAndCoptic.js | 19 + .../fonts/TeX/Main/Bold/Latin1Supplement.js | 19 + .../SVG/fonts/TeX/Main/Bold/LatinExtendedA.js | 19 + .../SVG/fonts/TeX/Main/Bold/LatinExtendedB.js | 19 + .../fonts/TeX/Main/Bold/LetterlikeSymbols.js | 19 + .../output/SVG/fonts/TeX/Main/Bold/Main.js | 19 + .../SVG/fonts/TeX/Main/Bold/MathOperators.js | 19 + .../fonts/TeX/Main/Bold/MiscMathSymbolsA.js | 19 + .../SVG/fonts/TeX/Main/Bold/MiscSymbols.js | 19 + .../SVG/fonts/TeX/Main/Bold/MiscTechnical.js | 19 + .../fonts/TeX/Main/Bold/SpacingModLetters.js | 19 + .../fonts/TeX/Main/Bold/SuppMathOperators.js | 19 + .../TeX/Main/Bold/SupplementalArrowsA.js | 19 + .../SVG/fonts/TeX/Main/Italic/BasicLatin.js | 19 + .../fonts/TeX/Main/Italic/CombDiacritMarks.js | 19 + .../TeX/Main/Italic/GeneralPunctuation.js | 19 + .../fonts/TeX/Main/Italic/GreekAndCoptic.js | 19 + .../fonts/TeX/Main/Italic/LatinExtendedA.js | 19 + .../fonts/TeX/Main/Italic/LatinExtendedB.js | 19 + .../TeX/Main/Italic/LetterlikeSymbols.js | 19 + .../output/SVG/fonts/TeX/Main/Italic/Main.js | 19 + .../fonts/TeX/Main/Italic/MathOperators.js | 19 + .../SVG/fonts/TeX/Main/Regular/BasicLatin.js | 19 + .../TeX/Main/Regular/CombDiacritMarks.js | 19 + .../fonts/TeX/Main/Regular/GeometricShapes.js | 19 + .../fonts/TeX/Main/Regular/GreekAndCoptic.js | 19 + .../fonts/TeX/Main/Regular/LatinExtendedA.js | 19 + .../fonts/TeX/Main/Regular/LatinExtendedB.js | 19 + .../TeX/Main/Regular/LetterlikeSymbols.js | 19 + .../output/SVG/fonts/TeX/Main/Regular/Main.js | 19 + .../fonts/TeX/Main/Regular/MathOperators.js | 19 + .../SVG/fonts/TeX/Main/Regular/MiscSymbols.js | 19 + .../TeX/Main/Regular/SpacingModLetters.js | 19 + .../TeX/Main/Regular/SuppMathOperators.js | 19 + .../SVG/fonts/TeX/Math/BoldItalic/Main.js | 19 + .../output/SVG/fonts/TeX/Math/Italic/Main.js | 19 + .../fonts/TeX/SansSerif/Bold/BasicLatin.js | 19 + .../TeX/SansSerif/Bold/CombDiacritMarks.js | 19 + .../SVG/fonts/TeX/SansSerif/Bold/Main.js | 19 + .../SVG/fonts/TeX/SansSerif/Bold/Other.js | 19 + .../fonts/TeX/SansSerif/Italic/BasicLatin.js | 19 + .../TeX/SansSerif/Italic/CombDiacritMarks.js | 19 + .../SVG/fonts/TeX/SansSerif/Italic/Main.js | 19 + .../SVG/fonts/TeX/SansSerif/Italic/Other.js | 19 + .../fonts/TeX/SansSerif/Regular/BasicLatin.js | 19 + .../TeX/SansSerif/Regular/CombDiacritMarks.js | 19 + .../SVG/fonts/TeX/SansSerif/Regular/Main.js | 19 + .../SVG/fonts/TeX/SansSerif/Regular/Other.js | 19 + .../fonts/TeX/Script/Regular/BasicLatin.js | 19 + .../SVG/fonts/TeX/Script/Regular/Main.js | 19 + .../SVG/fonts/TeX/Size1/Regular/Main.js | 19 + .../SVG/fonts/TeX/Size2/Regular/Main.js | 19 + .../SVG/fonts/TeX/Size3/Regular/Main.js | 19 + .../SVG/fonts/TeX/Size4/Regular/Main.js | 19 + .../TeX/Typewriter/Regular/BasicLatin.js | 19 + .../Typewriter/Regular/CombDiacritMarks.js | 19 + .../SVG/fonts/TeX/Typewriter/Regular/Main.js | 19 + .../SVG/fonts/TeX/Typewriter/Regular/Other.js | 19 + .../output/SVG/fonts/TeX/fontdata-extra.js | 19 + .../jax/output/SVG/fonts/TeX/fontdata.js | 19 + .../javascripts/MathJax/jax/output/SVG/jax.js | 19 + public/javascripts/application.js | 3 + 845 files changed, 17550 insertions(+), 2 deletions(-) create mode 100644 public/javascripts/MathJax/MathJax.js create mode 100644 public/javascripts/MathJax/config/AM_HTMLorMML-full.js create mode 100644 public/javascripts/MathJax/config/AM_HTMLorMML.js create mode 100644 public/javascripts/MathJax/config/Accessible-full.js create mode 100644 public/javascripts/MathJax/config/Accessible.js create mode 100644 public/javascripts/MathJax/config/MML_HTMLorMML-full.js create mode 100644 public/javascripts/MathJax/config/MML_HTMLorMML.js create mode 100644 public/javascripts/MathJax/config/MMLorHTML.js create mode 100644 public/javascripts/MathJax/config/Safe.js create mode 100644 public/javascripts/MathJax/config/TeX-AMS-MML_HTMLorMML-full.js create mode 100644 public/javascripts/MathJax/config/TeX-AMS-MML_HTMLorMML.js create mode 100644 public/javascripts/MathJax/config/TeX-AMS-MML_SVG-full.js create mode 100644 public/javascripts/MathJax/config/TeX-AMS-MML_SVG.js create mode 100644 public/javascripts/MathJax/config/TeX-AMS_HTML-full.js create mode 100644 public/javascripts/MathJax/config/TeX-AMS_HTML.js create mode 100644 public/javascripts/MathJax/config/TeX-MML-AM_HTMLorMML-full.js create mode 100644 public/javascripts/MathJax/config/TeX-MML-AM_HTMLorMML.js create mode 100644 public/javascripts/MathJax/config/default.js create mode 100644 public/javascripts/MathJax/config/local/local.js create mode 100644 public/javascripts/MathJax/jax/element/mml/jax.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/Arrows.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/CombDiactForSymbols.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/Dingbats.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/GeneralPunctuation.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/GeometricShapes.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/GreekAndCoptic.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/Latin1Supplement.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/LetterlikeSymbols.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/MathOperators.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/MiscMathSymbolsA.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/MiscMathSymbolsB.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/MiscSymbolsAndArrows.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/MiscTechnical.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/SpacingModLetters.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/SuppMathOperators.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/SupplementalArrowsA.js create mode 100644 public/javascripts/MathJax/jax/element/mml/optable/SupplementalArrowsB.js create mode 100644 public/javascripts/MathJax/jax/input/AsciiMath/config.js create mode 100644 public/javascripts/MathJax/jax/input/AsciiMath/jax.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/config.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/a.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/b.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/c.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/d.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/e.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/f.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/fr.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/g.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/h.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/i.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/j.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/k.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/l.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/m.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/n.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/o.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/opf.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/p.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/q.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/r.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/s.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/scr.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/t.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/u.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/v.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/w.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/x.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/y.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/entities/z.js create mode 100644 public/javascripts/MathJax/jax/input/MathML/jax.js create mode 100644 public/javascripts/MathJax/jax/input/TeX/config.js create mode 100644 public/javascripts/MathJax/jax/input/TeX/jax.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/autoload/annotation-xml.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/autoload/maction.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/autoload/menclose.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/autoload/mglyph.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/autoload/mmultiscripts.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/autoload/ms.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/autoload/mtable.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/autoload/multiline.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/config.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Alphabets/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Arrows/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/DoubleStruck/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Latin/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Marks/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Misc/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Monospace/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/NonUnicode/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Normal/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Operators/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/SansSerif/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Shapes/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Size5/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Size6/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Symbols/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/Variants/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Asana-Math/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Alphabets/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Arrows/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/DoubleStruck/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Latin/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Marks/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Misc/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Monospace/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/NonUnicode/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Normal/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Operators/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/SansSerif/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Shapes/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Size5/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Size6/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Symbols/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/Variants/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Pagella/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Alphabets/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Arrows/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/DoubleStruck/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Latin/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Marks/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Misc/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Monospace/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/NonUnicode/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Normal/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Operators/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/SansSerif/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Shapes/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Size5/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Size6/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Symbols/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/Variants/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Gyre-Termes/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Alphabets/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Arrows/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/DoubleStruck/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Latin/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Marks/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Misc/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Monospace/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/NonUnicode/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Normal/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Operators/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/SansSerif/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Shapes/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Size5/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Size6/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Size7/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Symbols/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/Variants/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Latin-Modern/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Alphabets/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Arrows/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Marks/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/NonUnicode/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Normal/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Operators/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Shapes/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Size5/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Symbols/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/Variants/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/Neo-Euler/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Alphabets/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Alphabets/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Alphabets/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Alphabets/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Arrows/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Arrows/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/DoubleStruck/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/DoubleStruck/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/DoubleStruck/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/DoubleStruck/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Fraktur/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Latin/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Latin/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Latin/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Latin/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Main/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Main/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Main/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Marks/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Marks/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Marks/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Marks/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Misc/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Misc/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Misc/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Misc/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Monospace/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Normal/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Normal/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Normal/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Operators/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Operators/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/SansSerif/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/SansSerif/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/SansSerif/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/SansSerif/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Script/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Script/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Shapes/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Shapes/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Shapes/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Size5/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Symbols/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Symbols/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Variants/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Variants/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Variants/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/Variants/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX-Web/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/AlphaPresentForms.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/Arrows.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/BBBold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/BoldFraktur.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/BoxDrawing.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/CombDiactForSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/ControlPictures.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/CurrencySymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/Cyrillic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/EnclosedAlphanum.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/GeneralPunctuation.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/GeometricShapes.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/GreekAndCoptic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/GreekBold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/GreekSSBold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/IPAExtensions.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/Latin1Supplement.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/LatinExtendedA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/LatinExtendedAdditional.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/LatinExtendedB.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/LatinExtendedD.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/LetterlikeSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/MathBold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/MathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/MathSSBold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/MiscMathSymbolsA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/MiscMathSymbolsB.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/MiscSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/MiscTechnical.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/NumberForms.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/PhoneticExtensions.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/SpacingModLetters.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/SuperAndSubscripts.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/SuppMathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/AlphaPresentForms.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/BoxDrawing.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/CombDiactForSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/ControlPictures.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/CurrencySymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/Cyrillic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/EnclosedAlphanum.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/GeneralPunctuation.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/GreekAndCoptic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/GreekBoldItalic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/GreekSSBoldItalic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/IPAExtensions.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/Latin1Supplement.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/LatinExtendedA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/LatinExtendedAdditional.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/LatinExtendedB.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/LetterlikeSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/MathBoldItalic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/MathBoldScript.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/MathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/MathSSItalicBold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/BoldItalic/SpacingModLetters.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/AlphaPresentForms.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/BoxDrawing.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/CombDiactForSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/ControlPictures.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/CurrencySymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/Cyrillic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/EnclosedAlphanum.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/GeneralPunctuation.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/GreekAndCoptic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/GreekItalic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/IPAExtensions.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/Latin1Supplement.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/LatinExtendedA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/LatinExtendedAdditional.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/LatinExtendedB.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/LetterlikeSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/MathItalic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/MathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/MathSSItalic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/MathScript.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/SpacingModLetters.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/ij.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/AlphaPresentForms.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/Arrows.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/BBBold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/BlockElements.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/BoldFraktur.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/BoxDrawing.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/CJK.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/CombDiactForSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/ControlPictures.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/CurrencySymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/Cyrillic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/Dingbats.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/EnclosedAlphanum.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/Fraktur.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/GeneralPunctuation.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/GeometricShapes.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/GreekAndCoptic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/GreekBold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/GreekBoldItalic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/GreekItalic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/GreekSSBold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/GreekSSBoldItalic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/Hiragana.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/IPAExtensions.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/Latin1Supplement.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/LatinExtendedA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/LatinExtendedAdditional.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/LatinExtendedB.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/LatinExtendedD.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/LetterlikeSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathBold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathBoldItalic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathBoldScript.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathItalic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathSS.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathSSBold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathSSItalic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathSSItalicBold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathScript.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathTT.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MiscMathSymbolsA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MiscMathSymbolsB.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MiscSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MiscSymbolsAndArrows.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MiscTechnical.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/NumberForms.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/PhoneticExtensions.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/SpacingModLetters.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/Specials.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/SuperAndSubscripts.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/SuppMathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/SupplementalArrowsA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/SupplementalArrowsB.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/ij.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsD/Bold/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsD/Regular/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsD/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsSm/Bold/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsSm/Regular/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsSm/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsUp/Bold/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsUp/Regular/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsUp/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsUpD/Bold/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsUpD/Regular/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsUpD/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsUpSm/Bold/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsUpSm/Regular/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsUpSm/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/NonUnicode/Bold/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/NonUnicode/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/NonUnicode/Bold/PrivateUse.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/NonUnicode/BoldItalic/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/NonUnicode/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/NonUnicode/BoldItalic/PrivateUse.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/NonUnicode/Italic/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/NonUnicode/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/NonUnicode/Italic/PrivateUse.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/NonUnicode/Regular/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/NonUnicode/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/NonUnicode/Regular/PrivateUse.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeFiveSym/Regular/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeFiveSym/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeFourSym/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeFourSym/Regular/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeFourSym/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeOneSym/Bold/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeOneSym/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeOneSym/Regular/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeOneSym/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeThreeSym/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeThreeSym/Regular/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeThreeSym/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeTwoSym/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeTwoSym/Regular/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/SizeTwoSym/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/Variants/Bold/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/Variants/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/Variants/Regular/All.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/Variants/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/fontdata-1.0.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/fontdata-beta.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/STIX/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Arrows.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/BBBold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/BoxDrawing.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Dingbats.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/EnclosedAlphanum.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GeneralPunctuation.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GeometricShapes.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GreekAndCoptic.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Latin1Supplement.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/LatinExtendedA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/LetterlikeSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscMathSymbolsB.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscTechnical.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/PUA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/SpacingModLetters.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/SuppMathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Other.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/PUA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Other.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/PUA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Arrows.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/CombDiactForSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/GeneralPunctuation.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/GeometricShapes.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Latin1Supplement.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LatinExtendedA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LatinExtendedB.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LetterlikeSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscMathSymbolsA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscTechnical.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SpacingModLetters.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SuppMathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SupplementalArrowsA.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/GeneralPunctuation.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Latin1Supplement.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/LetterlikeSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/GeometricShapes.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/MiscSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/SpacingModLetters.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Math/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Math/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Other.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Other.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Other.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Other.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Other.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/WinChrome/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/AMS.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/Bold.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/imageFonts.js create mode 100644 public/javascripts/MathJax/jax/output/HTML-CSS/jax.js create mode 100644 public/javascripts/MathJax/jax/output/NativeMML/config.js create mode 100644 public/javascripts/MathJax/jax/output/NativeMML/jax.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/autoload/annotation-xml.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/autoload/maction.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/autoload/menclose.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/autoload/mglyph.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/autoload/mmultiscripts.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/autoload/ms.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/autoload/mtable.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/autoload/multiline.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/config.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Alphabets/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Arrows/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/DoubleStruck/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Latin/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Marks/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Misc/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Monospace/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/NonUnicode/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Normal/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Operators/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/SansSerif/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Shapes/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Size5/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Size6/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Symbols/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/Variants/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Asana-Math/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Alphabets/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Arrows/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/DoubleStruck/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Latin/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Marks/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Misc/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Monospace/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/NonUnicode/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Normal/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Operators/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/SansSerif/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Shapes/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Size5/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Size6/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Symbols/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/Variants/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Pagella/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Alphabets/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Arrows/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/DoubleStruck/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Latin/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Marks/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Misc/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Monospace/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/NonUnicode/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Normal/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Operators/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/SansSerif/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Shapes/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Size5/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Size6/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Symbols/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/Variants/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Gyre-Termes/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Alphabets/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Arrows/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/DoubleStruck/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Latin/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Marks/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Misc/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Monospace/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/NonUnicode/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Normal/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Operators/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/SansSerif/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Shapes/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Size5/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Size6/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Size7/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Symbols/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/Variants/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Latin-Modern/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Alphabets/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Arrows/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Marks/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/NonUnicode/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Normal/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Operators/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Shapes/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Size5/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Symbols/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/Variants/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/Neo-Euler/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Alphabets/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Alphabets/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Alphabets/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Alphabets/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Arrows/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Arrows/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/DoubleStruck/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/DoubleStruck/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/DoubleStruck/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/DoubleStruck/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Fraktur/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Latin/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Latin/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Latin/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Latin/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Main/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Main/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Main/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Marks/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Marks/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Marks/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Marks/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Misc/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Misc/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Misc/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Misc/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Monospace/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Normal/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Normal/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Normal/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Operators/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Operators/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/SansSerif/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/SansSerif/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/SansSerif/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/SansSerif/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Script/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Script/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Shapes/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Shapes/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Shapes/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Size5/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Symbols/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Symbols/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Variants/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Variants/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Variants/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/Variants/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/STIX-Web/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/Arrows.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/BoxDrawing.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/Dingbats.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/EnclosedAlphanum.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/GeneralPunctuation.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/GeometricShapes.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/GreekAndCoptic.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/Latin1Supplement.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/LatinExtendedA.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/LetterlikeSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/MathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/MiscMathSymbolsB.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/MiscSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/MiscTechnical.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/PUA.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/SpacingModLetters.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/SuppMathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Caligraphic/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Caligraphic/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/Other.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/PUA.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/Other.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/PUA.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/Arrows.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/CombDiactForSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/GeneralPunctuation.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/GeometricShapes.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/GreekAndCoptic.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/Latin1Supplement.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/LatinExtendedA.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/LatinExtendedB.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/LetterlikeSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/MathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/MiscMathSymbolsA.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/MiscSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/MiscTechnical.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/SpacingModLetters.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/SuppMathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/SupplementalArrowsA.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/GeneralPunctuation.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/GreekAndCoptic.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/LatinExtendedA.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/LatinExtendedB.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/LetterlikeSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/MathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/GeometricShapes.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/GreekAndCoptic.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/LatinExtendedA.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/LatinExtendedB.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/LetterlikeSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/MathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/MiscSymbols.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/SpacingModLetters.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/SuppMathOperators.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Math/BoldItalic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Math/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/Other.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Italic/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Italic/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Italic/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Italic/Other.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Regular/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Regular/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Regular/Other.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Script/Regular/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Script/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Size1/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Size2/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Size3/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Size4/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Typewriter/Regular/BasicLatin.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Main.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Other.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/fontdata-extra.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/fonts/TeX/fontdata.js create mode 100644 public/javascripts/MathJax/jax/output/SVG/jax.js diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index 489820f0c..96b015bdc 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -18,6 +18,18 @@ <%= yield :header_tags -%> <%= stylesheet_link_tag 'base','header', :media => 'all'%> + + + + diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 39de4faeb..ae74be8b6 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -21,6 +21,18 @@ <%= javascript_include_tag "course","header","attachments",'prettify' %> <%= yield :header_tags -%> + + + + diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index e03ac2fc5..eb24c0a6e 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -16,6 +16,18 @@ <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> <%= stylesheet_link_tag 'base','header','new_user', :media => 'all'%> + + + + + + + +
          +
          <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
          +
          +
          + <%= form_for @org_comment, :as => :reply, :url => {:controller => 'org_document_comments',:action => 'reply', :id => @org_comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %> + + + +
          + +
          +

          + <% end%> +
          +
          +
          +
          +
          \ No newline at end of file diff --git a/app/views/org_document_comments/add_reply_in_doc.js.erb b/app/views/org_document_comments/add_reply_in_doc.js.erb new file mode 100644 index 000000000..bcebe9d37 --- /dev/null +++ b/app/views/org_document_comments/add_reply_in_doc.js.erb @@ -0,0 +1 @@ +location.reload(); \ No newline at end of file diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb index 498ac46a6..e0224afea 100644 --- a/app/views/org_document_comments/edit.html.erb +++ b/app/views/org_document_comments/edit.html.erb @@ -37,7 +37,7 @@
          确定 或 - 取消 + 取消
          diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb index 6019dae14..d967c42fd 100644 --- a/app/views/org_document_comments/index.html.erb +++ b/app/views/org_document_comments/index.html.erb @@ -16,7 +16,7 @@ <% @documents.each do |document| %> <%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first} %> diff --git a/app/views/org_document_comments/quote.js.erb b/app/views/org_document_comments/quote.js.erb new file mode 100644 index 000000000..a71b23f0e --- /dev/null +++ b/app/views/org_document_comments/quote.js.erb @@ -0,0 +1,10 @@ +if($("#reply_message_<%= @org_comment.id%>").length > 0) { + $("#reply_message_<%= @org_comment.id%>").replaceWith("<%= escape_javascript(render :partial => 'org_document_comments/simple_ke_reply_form', :locals => {:reply => @org_comment,:temp =>@temp,:subject =>@subject}) %>"); + $(function(){ + $('#reply_subject').val("<%= raw escape_javascript(@subject) %>"); + $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>"); + init_activity_KindEditor_data(<%= @org_comment.id%>,null,"85%"); + }); +}else if($("#reply_to_message_<%= @org_comment.id %>").length >0) { + $("#reply_to_message_<%= @org_comment.id%>").replaceWith("

          "); +} \ No newline at end of file diff --git a/app/views/org_document_comments/reply.js.erb b/app/views/org_document_comments/reply.js.erb new file mode 100644 index 000000000..888613c8c --- /dev/null +++ b/app/views/org_document_comments/reply.js.erb @@ -0,0 +1 @@ +//location.reload(); \ No newline at end of file diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index e69de29bb..ae90b15bb 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -0,0 +1,147 @@ +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %> + +
          +
          +
          + <%= link_to image_tag(url_to_avatar(User.find(@document.creator_id)), :width => 45, :heigth => 45), user_path(@document.creator_id) %> +
          +
          +
          + <%= link_to User.find(@document.creator_id), user_path(@document.creator.id), :class => "newsBlue mr15" %> + TO  <%= link_to @document.organization.name, organization_path(@document.organization), :class => "newsBlue" %> + | + <% if @document.organization.home_id == @document.id %> + 首页 + <% else %> + 组织文章 + <% end %> +
          +
          <%= link_to @document.title, org_document_comment_path(:id => @document.id, :organization_id => @document.organization.id) %>
          +
          + 发布时间：<%= format_activity_day(@document.created_at) %> <%= format_time(@document.created_at, false) %>
          + <% unless @document.content.blank? %> +
          + <%= @document.content.html_safe %> +
          + <% end %> + + <% if User.current.admin? || User.current.admin_of_org?(Organization.find(@document.organization_id) || User.current.id == @document.creator_id) %> +
          +
            +
          • +
              +
            • + <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => @document.organization_id, :home_id => @document.id}, :method => "put", :remote => true) do |f| %> + 设为首页 + <% end %> +
              • +
            • + <%= link_to "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id), :class => "postOptionLink" %> +
              • +
            • + <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id), :method => 'delete', + :data => {:confirm => l(:text_are_you_sure)}, + :remote => true, :class => 'postOptionLink' %> +
              • +
            +
            • +
          +
          +
          + <% end %> +
          +
          + <% comments_for_doc = @document.children.reorder("created_at desc") %> + <% count = @document.children.count() %> + +
          + <% if count > 0 %> +
          +
          回复（<%= count %>）
          +
          +
          + <% comments_for_doc.each_with_index do |reply,i| %> + + <% user = User.find(reply.creator_id) %> +
          +
          + <%= link_to image_tag(url_to_avatar(user), :width => 33,:height => 33), user_path(user) %> +
          +
          +
          + <%= reply.content.html_safe unless reply.content.nil? %> +
          +
          + <%= format_time(reply.created_at) %> + +
          +

          +
          +
          +
          + <% end %> +
          +
          + <% end %> + <% if User.current.logged?%> +
          + +
          +
          + <%= form_for :org_comment, :url => {:action => 'add_reply_in_doc',:controller => 'org_document_comments', :id => @document.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %> + <%= f.kindeditor :org_content,:width=>'99%',:height => '100px;',:editor_id=>'message_content_editor' %> + <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %> + <%= link_to l(:button_reply), "javascript:void(0)", :onclick => "message_content_editor.sync();$('#message_form').submit();", :class => "blue_btn fr c_white mt10 mb10", :style => "margin-right: 5px;" %> + <% end %> +
          +
          +
          + <% end %> +
          +
          + + \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 1324729ac..e74da846e 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -14,7 +14,7 @@ 组织文章 <% end %>
        -
        <%= document.title %>
        +
        <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %>
        发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
        <% unless document.content.blank? %> diff --git a/config/routes.rb b/config/routes.rb index c68c8a1c1..993c1e243 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -66,6 +66,10 @@ RedmineApp::Application.routes.draw do resources :org_document_comments do member do post 'add_reply' + get 'quote' + post 'reply' + post 'add_reply_in_doc' + delete 'delete_reply' end collection do diff --git a/db/migrate/20151116070906_add_created_at_to_org_members.rb b/db/migrate/20151116070906_add_created_at_to_org_members.rb deleted file mode 100644 index 33d3a2817..000000000 --- a/db/migrate/20151116070906_add_created_at_to_org_members.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddCreatedAtToOrgMembers < ActiveRecord::Migration - def change - add_column :org_members, :created_at, :timestamp - end -end From 3deebf200688c04940b988b69d20138076b83907 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 11:08:47 +0800 Subject: [PATCH 173/285] show --- app/controllers/exercise_controller.rb | 9 +++++++++ app/helpers/exercise_helper.rb | 17 ++++++++++++++--- ...0151120021958_add_status_to_exercise_user.rb | 5 +++++ db/schema.rb | 3 ++- 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20151120021958_add_status_to_exercise_user.rb diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index cb691c0e3..c3e5d9a67 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -27,11 +27,19 @@ class ExerciseController < ApplicationController render_403 return end + + # 学生点击的时候即创建关联,自动保存 + #eu = ExerciseUser.create(:user_id => User.current, :exercise_id => @exercise.id, :start_at => Time.now, :status => false) + # 已提交问卷的用户不能再访问该界面 if has_commit_exercise?(@exercise.id, User.current.id) && (!User.current.admin?) redirect_to exercise_index_url(:course_id=> @course.id) else + if !@is_teacher && !has_click_exercise?(@exercise.id, User.current.id) + eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false) + end @can_edit_excercise = (!has_commit_exercise?(@exercise.id,User.current.id)) || User.current.admin? + @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first # @percent = get_percent(@exercise,User.current) exercise_questions = @exercise.exercise_questions @exercise_questions = paginateHelper exercise_questions,5 #分页 @@ -411,6 +419,7 @@ class ExerciseController < ApplicationController def commit_exercise # 老师不需要提交 if User.current.allowed_to?(:as_teacher,@course) + redirect_to exercise_url(@exercise) # REDO: 提示提交成功 else diff --git a/app/helpers/exercise_helper.rb b/app/helpers/exercise_helper.rb index db45e8d87..ec7421533 100644 --- a/app/helpers/exercise_helper.rb +++ b/app/helpers/exercise_helper.rb @@ -35,10 +35,21 @@ module ExerciseHelper end end - #判断用户是否已经提交了问卷 + # 判断用户是否已经提交了问卷 + # status 为0的时候是用户点击试卷。为1表示用户已经提交 def has_commit_exercise?(exercise_id, user_id) - pu = ExerciseUser.find_by_exercise_id_and_user_id(exercise_id, user_id) - if pu.nil? + pu = ExerciseUser.where("exercise_id=? and user_id=? and status=?",exercise_id, user_id, true) + if pu.empty? + false + else + true + end + end + + # 判断学生是否点击过问卷，点击则为他保存一个记录，记录start_at + def has_click_exercise?(exercise_id, user_id) + pu = ExerciseUser.where("exercise_id=? and user_id=? and status=?",exercise_id, user_id, false) + if pu.empty? false else true diff --git a/db/migrate/20151120021958_add_status_to_exercise_user.rb b/db/migrate/20151120021958_add_status_to_exercise_user.rb new file mode 100644 index 000000000..ab1355d8c --- /dev/null +++ b/db/migrate/20151120021958_add_status_to_exercise_user.rb @@ -0,0 +1,5 @@ +class AddStatusToExerciseUser < ActiveRecord::Migration + def change + add_column :exercise_users, :status, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 042058c5a..14f4f5eea 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151119124148) do +ActiveRecord::Schema.define(:version => 20151120021958) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -563,6 +563,7 @@ ActiveRecord::Schema.define(:version => 20151119124148) do t.datetime "created_at", :null => false t.datetime "updated_at", :null => false t.datetime "end_at" + t.integer "status" end create_table "exercises", :force => true do |t| From acaac93da1e5fcde0d3744c5009eb911c5d4b044 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 11:08:50 +0800 Subject: [PATCH 174/285] tijiao --- app/views/exercise/_exercise_student.html.erb | 6 +++--- app/views/exercise/_exercise_student_result.html.erb | 6 +++--- app/views/exercise/_exercise_teacher.html.erb | 7 ++++++- app/views/exercise/_show_MC.html.erb | 2 +- app/views/exercise/_show_MCQ.html.erb | 2 +- app/views/exercise/_show_single.html.erb | 2 +- public/stylesheets/courses.css | 3 ++- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index 0cc34958f..bc91ead85 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -18,9 +18,9 @@
        - <% mc_question_list = exercise_questions.where("question_type=1") %> - <% mcq_question_list = exercise_questions.where("question_type=2") %> - <% single_question_list = exercise_questions.where("question_type=3") %> + <% mc_question_list = exercise.exercise_questions.where("question_type=1") %> + <% mcq_question_list = exercise.exercise_questions.where("question_type=2") %> + <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
        ">

        单选题

        <% mc_question_list.each do |exercise_question| %> diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb index 40f9b953b..8a723d75c 100644 --- a/app/views/exercise/_exercise_student_result.html.erb +++ b/app/views/exercise/_exercise_student_result.html.erb @@ -19,9 +19,9 @@
        得分：<%=exercise_user.score %>分
        - <% mc_question_list = exercise_questions.where("question_type=1") %> - <% mcq_question_list = exercise_questions.where("question_type=2") %> - <% single_question_list = exercise_questions.where("question_type=3") %> + <% mc_question_list = exercise.exercise_questions.where("question_type=1") %> + <% mcq_question_list = exercise.exercise_questions.where("question_type=2") %> + <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
        ">

        单选题

        <% mc_question_list.each do |exercise_question| %> diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb index 4ddd5054d..b803519ce 100644 --- a/app/views/exercise/_exercise_teacher.html.erb +++ b/app/views/exercise/_exercise_teacher.html.erb @@ -107,7 +107,12 @@
        <%= link_to "确定",exercise_index_path(:course_id => @course.id),:class => "ur_button_submit" %> - <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "ur_button_submit", :style => "float:right"%> + <% if exercise.exercise_status == 1 %> + <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "ur_button_submit", :style => "float:right"%> + <% else %> + 编辑 + <%#= link_to l(:button_edit), '', :class => "ur_button_submit", :style => "float:right; background:#a3a3a3"%> + <% end %>
        diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb index 0883995dc..183e8d190 100644 --- a/app/views/exercise/_show_MC.html.erb +++ b/app/views/exercise/_show_MC.html.erb @@ -39,7 +39,7 @@ } else{ <% score =exercise_question.question_score %> $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html( - '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.id),:remote=>true) do |f|%>'+ + '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+ '
        '+ '
        '+ ''+ diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb index 52f01e6c7..af2b0facb 100644 --- a/app/views/exercise/_show_MCQ.html.erb +++ b/app/views/exercise/_show_MCQ.html.erb @@ -38,7 +38,7 @@ } else { <% score =exercise_question.question_score %> $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html( - '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.id),:remote=>true) do |f|%>'+ + '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+ '
        '+ '
        '+ ''+ diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb index 933f2edcc..9c7936e6d 100644 --- a/app/views/exercise/_show_single.html.erb +++ b/app/views/exercise/_show_single.html.erb @@ -26,7 +26,7 @@ } else { <% score =exercise_question.question_score %> $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html( - '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.id),:remote=>true) do |f|%>'+ + '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+ '
        '+ '
        '+ ''+ diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index e267b9010..5ff34a4e1 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1165,4 +1165,5 @@ a:hover.testEdit{ background:url(images/icons.png) -21px -272px no-repeat;} .testEditTitle{ padding:10px 0px ; float:left; width:564px; } .questionEditContainer {border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px; margin-top:10px;} .fillInput {border:1px solid #cbcbcb; padding-left:5px; background-color:#ffffff; width:693px; height:30px; color:#888888;} -.mr130 {margin-right:130px;} \ No newline at end of file +.mr130 {margin-right:130px;} +.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; } \ No newline at end of file From b10ff36c5172db0f6d9e3a3af21a7d06b2d2ee4a Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 20 Nov 2015 11:12:45 +0800 Subject: [PATCH 175/285] =?UTF-8?q?1.=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=92=8C=E6=88=90=E5=91=98=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=EF=BC=9B=202.=E4=BF=AE=E6=94=B9=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=96=87=E7=AB=A0=E4=B8=8D=E8=83=BD=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_document_comments_controller.rb | 6 +++++- app/controllers/organizations_controller.rb | 6 +++++- app/views/org_document_comments/edit.html.erb | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index 5b02a4e9b..82a25cb01 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -24,7 +24,11 @@ class OrgDocumentCommentsController < ApplicationController end def index - @documents = @organization.org_document_comments.where("parent_id is null").order("created_at desc") + if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization) + @documents = @organization.org_document_comments.where("parent_id is null").order("created_at desc") + else + render_403 + end end def update @org_document = OrgDocumentComment.find(params[:id]) diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 3713beb22..0d22ab461 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -151,7 +151,11 @@ class OrganizationsController < ApplicationController end def members - @members = OrgMember.where("organization_id =?", @organization.id) + if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization) + @members = OrgMember.where("organization_id =?", @organization.id) + else + render_403 + end end def more_org_projects diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb index e0224afea..4b50c1064 100644 --- a/app/views/org_document_comments/edit.html.erb +++ b/app/views/org_document_comments/edit.html.erb @@ -26,7 +26,7 @@
        - <%= kindeditor_tag 'org_document_comment[content]',@org_document.content, :editor_id => 'org1_document_description_editor', :height => "150px" %> + <%= kindeditor_tag 'org_document_comment[content]',@org_document.content, :editor_id => 'org_document_description_editor', :height => "150px" %>
        From 99945d5bb562a2947a929579915249cb0aa6c95b Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 12:54:41 +0800 Subject: [PATCH 176/285] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=AD=94=E9=A2=98?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 2 +- app/views/exercise/_exercise_student.html.erb | 9 ++-- app/views/exercise/_exercise_submit.html.erb | 2 +- db/schema.rb | 52 +++++++++++++++++++ 4 files changed, 60 insertions(+), 5 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index c3e5d9a67..69d6ebd7d 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -353,7 +353,7 @@ class ExerciseController < ApplicationController ea.exercise_choice_id = params[:exercise_choice_id] if ea.save @percent = get_percent(@exercise,User.current) - render :json => {:text => "true",:percent => format("%.2f" ,@percent)} + render :json => {:text => "ok",:percent => format("%.2f" ,@percent)} else render :json => {:text => "failure"} end diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index bc91ead85..0b12b917e 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -4,6 +4,9 @@ $("#homework_page_right").css("min-height",$("#LSide").height()-30); $("#Container").css("width","1000px"); }); + function getTime() { + + }
        @@ -50,7 +53,7 @@ }, success: function (data) { var dataObj = eval(data); - if(dataObj.text == "true") + if(dataObj.text == "ok") { obj.checked = true; } @@ -105,7 +108,7 @@ }, success: function (data) { var dataObj = eval(data); - if(dataObj.text == "true") + if(dataObj.text == "ok") { obj.checked = true; } @@ -117,7 +120,7 @@ }); } - <%= @can_edit_poll?"":"disabled=disabled" %> > + <%= @can_edit_excercise?"":"disabled=disabled" %> > <%= convert_to_char((index+1).to_s)%>  <%= exercise_choice.choice_text%> diff --git a/app/views/exercise/_exercise_submit.html.erb b/app/views/exercise/_exercise_submit.html.erb index a28c8917b..e9c26a0b5 100644 --- a/app/views/exercise/_exercise_submit.html.erb +++ b/app/views/exercise/_exercise_submit.html.erb @@ -7,7 +7,7 @@
        提交
        - +
        diff --git a/db/schema.rb b/db/schema.rb index 14f4f5eea..ca4e1cad0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -241,6 +241,58 @@ ActiveRecord::Schema.define(:version => 20151120021958) do add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true + create_table "code_review_assignments", :force => true do |t| + t.integer "issue_id" + t.integer "change_id" + t.integer "attachment_id" + t.string "file_path" + t.string "rev" + t.string "rev_to" + t.string "action_type" + t.integer "changeset_id" + end + + create_table "code_review_project_settings", :force => true do |t| + t.integer "project_id" + t.integer "tracker_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "updated_by" + t.boolean "hide_code_review_tab", :default => false + t.integer "auto_relation", :default => 1 + t.integer "assignment_tracker_id" + t.text "auto_assign" + t.integer "lock_version", :default => 0, :null => false + t.boolean "tracker_in_review_dialog", :default => false + end + + create_table "code_review_user_settings", :force => true do |t| + t.integer "user_id", :default => 0, :null => false + t.integer "mail_notification", :default => 0, :null => false + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "code_reviews", :force => true do |t| + t.integer "project_id" + t.integer "change_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "line" + t.integer "updated_by_id" + t.integer "lock_version", :default => 0, :null => false + t.integer "status_changed_from" + t.integer "status_changed_to" + t.integer "issue_id" + t.string "action_type" + t.string "file_path" + t.string "rev" + t.string "rev_to" + t.integer "attachment_id" + t.integer "file_count", :default => 0, :null => false + t.boolean "diff_all" + end + create_table "comments", :force => true do |t| t.string "commented_type", :limit => 30, :default => "", :null => false t.integer "commented_id", :default => 0, :null => false From 13af6e64b272d141729386877a15c19fe5bae4e5 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 12:55:23 +0800 Subject: [PATCH 177/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=9F=A5=E7=9C=8B=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index c3e5d9a67..77302c5db 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -419,7 +419,7 @@ class ExerciseController < ApplicationController def commit_exercise # 老师不需要提交 if User.current.allowed_to?(:as_teacher,@course) - + @exercise.update_attributes(:show_result => params[:exercise][:show_result]) redirect_to exercise_url(@exercise) # REDO: 提示提交成功 else From 302dfaf93380ef24179f3ff0fd1b8522063e5b01 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 13:04:51 +0800 Subject: [PATCH 178/285] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=B8=87=E5=8D=B7?= =?UTF-8?q?=E5=88=9D=E5=A7=8Bshowresult?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 54f8309ea..3d6b4794f 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -59,7 +59,8 @@ class ExerciseController < ApplicationController :end_time => "", :publish_time => "", :exercise_description => "", - :show_result => "" + :show_result => "", + :show_result => 1 } @exercise = Exercise.create option if @exercise From 07ee81937056274fd0a1b38c68408673bce1511d Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 13:39:40 +0800 Subject: [PATCH 179/285] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E7=AD=94=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 3d6b4794f..9efcfc19d 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -345,7 +345,7 @@ class ExerciseController < ApplicationController end elsif eq.question_type == 2 #多选题 - ea = ExerciseAnswer.find_by_exercise_question_id_and_user_id(params[:exercise_question_id],User.current.id) + ea = ExerciseAnswer.find_by_exercise_choice_id_and_user_id(params[:exercise_choice_id],User.current.id) if ea.nil? #尚未答该题，添加答案 ea = ExerciseAnswer.new @@ -360,7 +360,7 @@ class ExerciseController < ApplicationController end else #pv不为空，则当前选项之前已被选择，再次点击则是不再选择该项，故删除该答案 - if pv.delete + if ea.delete @percent = get_percent(@exercise, User.current) render :json => {:text => "false" ,:percent => format("%.2f" , @percent)} else From cb3f0d1c97844d2a7fb62053be688425be185aea Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 14:28:47 +0800 Subject: [PATCH 180/285] =?UTF-8?q?=E6=8C=89=E7=B1=BB=E5=9E=8B=E5=88=86?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E5=BA=8F=E5=8F=B7=E9=80=92=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 9efcfc19d..cf78cbc05 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -142,7 +142,9 @@ class ExerciseController < ApplicationController option = { :question_title => question_title, :question_type => params[:question_type] || 1, - :question_number => @exercise.exercise_questions.count + 1, + :question_number => params[:question_type] == "1"? @exercise.exercise_questions.where("question_type = 1").count + 1 : + (params[:question_type] == "2" ? (@exercise.exercise_questions.where("question_type = 2").count + 1) : + @exercise.exercise_questions.where("question_type = 3").count + 1), :question_score => params[:question_score] } @exercise_questions = @exercise.exercise_questions.new option @@ -160,7 +162,14 @@ class ExerciseController < ApplicationController # 如果是插入的话，那么从插入的这个id以后的question_num都将要+1 if params[:quest_id] @is_insert = true - @exercise.exercise_questions.where("question_number > #{params[:quest_num].to_i}").update_all(" question_number = question_number + 1") + if @exercise_questions.question_type == 1 + ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 1).update_all(" question_number = question_number + 1") + #@exercise.exercise_questions.where("question_number > #{params[:quest_num].to_i} and question_type == 1").update_all(" question_number = question_number + 1") + elsif @exercise_questions.question_type == 2 + ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 2).update_all(" question_number = question_number + 1") + else + ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 3).update_all(" question_number = question_number + 1") + end # @exercise_question_num = params[:quest_num].to_i @exercise_questions.question_number = params[:quest_num].to_i + 1 end From e3d78bf4f089114f76f6e77d5c373f104a5f37e5 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 20 Nov 2015 14:30:54 +0800 Subject: [PATCH 181/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/new.html.erb | 4 +- app/views/users/user_organizations.html.erb | 2 +- ...116070906_add_created_at_to_org_members.rb | 5 --- db/schema.rb | 44 ++++++++----------- public/stylesheets/new_user.css | 1 + public/stylesheets/org.css | 2 +- public/stylesheets/public.css | 1 + 7 files changed, 25 insertions(+), 34 deletions(-) delete mode 100644 db/migrate/20151116070906_add_created_at_to_org_members.rb diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb index 1ab3ad933..ab0a4ec50 100644 --- a/app/views/organizations/new.html.erb +++ b/app/views/organizations/new.html.erb @@ -34,8 +34,8 @@ （打钩为公开，不打钩则不公开，若不公开，仅组织成员可见该组织。）
        -
      • - 提交 +
      • + 创建 <%= link_to "取消",user_activities_path(User.current.id),:class => "blue_btn grey_btn fl c_white"%>
        • diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb index 8c082b225..e9d78e695 100644 --- a/app/views/users/user_organizations.html.erb +++ b/app/views/users/user_organizations.html.erb @@ -2,7 +2,7 @@ <%#= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
        -
        +
        组织列表 diff --git a/db/migrate/20151116070906_add_created_at_to_org_members.rb b/db/migrate/20151116070906_add_created_at_to_org_members.rb deleted file mode 100644 index 33d3a2817..000000000 --- a/db/migrate/20151116070906_add_created_at_to_org_members.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddCreatedAtToOrgMembers < ActiveRecord::Migration - def change - add_column :org_members, :created_at, :timestamp - end -end diff --git a/db/schema.rb b/db/schema.rb index ae220df3d..fc2bcee92 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -529,23 +529,26 @@ ActiveRecord::Schema.define(:version => 20151118031602) do add_index "documents", ["created_on"], :name => "index_documents_on_created_on" add_index "documents", ["project_id"], :name => "documents_project_id" - create_table "dts", :force => true do |t| - t.string "IPLineCode" - t.string "Description" - t.string "Num" - t.string "Variable" - t.string "TraceInfo" - t.string "Method" + create_table "dts", :primary_key => "Num", :force => true do |t| + t.string "Defect", :limit => 50 + t.string "Category", :limit => 50 t.string "File" - t.string "IPLine" - t.string "Review" - t.string "Category" - t.string "Defect" - t.string "PreConditions" - t.string "StartLine" + t.string "Method" + t.string "Module", :limit => 20 + t.string "Variable", :limit => 50 + t.integer "StartLine" + t.integer "IPLine" + t.string "IPLineCode", :limit => 200 + t.string "Judge", :limit => 15 + t.integer "Review", :limit => 1 + t.string "Description" + t.text "PreConditions", :limit => 2147483647 + t.text "TraceInfo", :limit => 2147483647 + t.text "Code", :limit => 2147483647 t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" + t.integer "id", :null => false end create_table "enabled_modules", :force => true do |t| @@ -815,16 +818,6 @@ ActiveRecord::Schema.define(:version => 20151118031602) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_details_copy", :force => true do |t| - t.integer "journal_id", :default => 0, :null => false - t.string "property", :limit => 30, :default => "", :null => false - t.string "prop_key", :limit => 30, :default => "", :null => false - t.text "old_value" - t.text "value" - end - - add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" @@ -1084,6 +1077,7 @@ ActiveRecord::Schema.define(:version => 20151118031602) do create_table "org_members", :force => true do |t| t.integer "user_id" t.integer "organization_id" + t.string "role" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false end diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 6ccfc47f6..d18dd27d8 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -84,6 +84,7 @@ a.linkGrey6:hover {color:#ffffff !important;} .ml90{ margin-left:90px;} .ml100{ margin-left:100px;} .ml110{ margin-left:110px;} +.ml125 { margin-left:125px;} .ml150 { margin-left:150px;} .mr-5 {margin-right:-5px;} .mr5{ margin-right:5px;} diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index c8116003e..914df16b5 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -2,7 +2,7 @@ /* CSS Document */ .orgName {width:130px; color:#484848;} -.organization_r_h02{ width:970px; height:40px; background:#eaeaea; margin-bottom:10px;} +.organization_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;} .organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} .orgSettingOp {width:45px; height:21px; color:#269ac9; text-align:center; border-bottom:3px solid #e4e4e4; float:left; font-weight:bold; cursor:pointer;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 49b2906aa..a1dfe3f4d 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -77,6 +77,7 @@ h4{ font-size:14px; color:#3b3b3b;} .ml90{ margin-left:90px;} .ml100{ margin-left:100px;} .ml110{ margin-left:110px;} +.ml125 { margin-left:125px;} .ml320{ margin-left:320px;} .ml150 { margin-left:150px;} .mr-5 {margin-right:-5px;} From 863d7ed4b55ab286aea776bf4a7dabc6972f2348 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 14:34:09 +0800 Subject: [PATCH 182/285] =?UTF-8?q?=E5=8D=95=E9=80=89=E5=92=8C=E5=A1=AB?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise_student.html.erb | 37 +++++++++++++------ app/views/exercise/_exercise_submit.html.erb | 8 ++-- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index 0b12b917e..68222f8bd 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -3,9 +3,24 @@ $("#RSide").removeAttr("id"); $("#homework_page_right").css("min-height",$("#LSide").height()-30); $("#Container").css("width","1000px"); + var time = <%=exercise.time %>; + var total_seconds = time * 60; + getTime(total_seconds); }); - function getTime() { - + function getTime(total_seconds) { + var total_seconds = total_seconds - 1; + var hours = total_seconds / 60 / 60; + var hoursRound = Math.floor(hours); + var minutes = total_seconds /60 - (60 * hoursRound); + var minutesRound = Math.floor(minutes); + var seconds = total_seconds - (60 * 60 * hoursRound) - (60 * minutesRound); + var secondsRound = Math.round(seconds); + $("#rest_hours").html(hoursRound); + $("#rest_minutes").html(minutesRound); + $("#rest_seconds").html(secondsRound); + if(total_seconds >0) { + setTimeout("getTime("+total_seconds+");", 1000); + } }
        @@ -15,7 +30,7 @@
        开始时间：<%=format_time(exercise_user.start_at.to_s) %> 测验时长：<%=exercise.time %>分钟 - 剩余时长：1 小时 30 分钟 0 秒 + 剩余时长： 小时  分钟  秒
        <%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%>
        @@ -26,11 +41,11 @@ <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
        ">

        单选题

        - <% mc_question_list.each do |exercise_question| %> + <% mc_question_list.each_with_index do |exercise_question, list_index| %>
        -
        第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
        +
        第<%= list_index+1%>题.(<%= exercise_question.question_score %>分)
        <%= exercise_question.question_title %>
        @@ -65,7 +80,7 @@ }); } - <%= radio_button "poll_vote","poll_answer_id",exercise_choice.id,:class=>"ur_radio",:onclick =>"click_#{exercise_choice.id}(this);return false;",:checked => answer_be_selected?(exercise_choice,User.current),:disabled => !@can_edit_excercise %> + <%= radio_button "exercise",exercise_question.id.to_s+"exercise_choice_id",exercise_choice.id,:class=>"ur_radio",:onclick =>"click_#{exercise_choice.id}(this);return false;",:checked => answer_be_selected?(exercise_choice,User.current),:disabled => !@can_edit_excercise %> <%= convert_to_char((index+1).to_s)%>  <%= exercise_choice.choice_text%> @@ -81,11 +96,11 @@
        ">

        多选题

        - <% mcq_question_list.each do |exercise_question| %> + <% mcq_question_list.each_with_index do |exercise_question,list_index| %>
        -
        第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
        +
        第<%= list_index + 1 %>题.(<%= exercise_question.question_score %>分)
        <%= exercise_question.question_title %>
        @@ -136,11 +151,11 @@
        ">

        填空题

        - <% single_question_list.each do |exercise_question| %> + <% single_question_list.each_with_index do |exercise_question, list_index| %>
        -
        第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
        +
        第<%= list_index + 1%>题.(<%= exercise_question.question_score %>分)
        <%= exercise_question.question_title %>
        @@ -164,7 +179,7 @@ } - > + >
        diff --git a/app/views/exercise/_exercise_submit.html.erb b/app/views/exercise/_exercise_submit.html.erb index e9c26a0b5..acbbea244 100644 --- a/app/views/exercise/_exercise_submit.html.erb +++ b/app/views/exercise/_exercise_submit.html.erb @@ -1,4 +1,4 @@ -<%= form_for("", +<%= form_for(exercise, :html => { :multipart => true }, :url => {:controller => 'exercise', :action => 'commit_exercise', @@ -7,8 +7,10 @@
        提交
        - - + <%= f.check_box :show_result, :value => exercise.show_result%> + <%= label_tag 'exercise_show_result', '允许学生查看测验结果' %> +
        <% end %> From dcbdea9bb50927342583da661134bf2c3fb01468 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 20 Nov 2015 14:50:48 +0800 Subject: [PATCH 183/285] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E8=AF=A6=E7=BB=86=E5=88=97=E8=A1=A8=E5=88=A0=E9=99=A4=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B=202.=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=EF=BC=8C=E6=96=87=E7=AB=A0=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E6=98=BE=E7=A4=BA=E4=B8=AD=E5=9B=9E=E5=A4=8D=E4=BA=BA?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_document_comments_controller.rb | 3 +++ app/views/org_document_comments/destroy.js.erb | 3 ++- app/views/org_document_comments/show.html.erb | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index 82a25cb01..fb40032d4 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -75,6 +75,9 @@ class OrgDocumentCommentsController < ApplicationController org.home_id == nil end end + respond_to do |format| + format.js + end end def delete_reply diff --git a/app/views/org_document_comments/destroy.js.erb b/app/views/org_document_comments/destroy.js.erb index bcebe9d37..adbeff4a6 100644 --- a/app/views/org_document_comments/destroy.js.erb +++ b/app/views/org_document_comments/destroy.js.erb @@ -1 +1,2 @@ -location.reload(); \ No newline at end of file +//location.reload(); +window.location.href = '<%= organization_org_document_comments_path(:organization_id => @org_document_comment.root.organization_id)%>' \ No newline at end of file diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index ae90b15bb..9df568e02 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -79,6 +79,7 @@ <%= link_to image_tag(url_to_avatar(user), :width => 33,:height => 33), user_path(user) %>
        + <%= link_to User.find(reply.creator_id).realname, user_path(reply.creator_id), :class => "newsBlue mr10 f14" %>
        <%= reply.content.html_safe unless reply.content.nil? %>
        From b0730dfb818ec5a441912839ca966d543998a271 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 15:12:07 +0800 Subject: [PATCH 184/285] =?UTF-8?q?=E6=B5=8B=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise_student.html.erb | 25 +++++++++++-------- .../_exercise_student_result.html.erb | 15 +++++------ app/views/exercise/_exercise_teacher.html.erb | 18 ++++++------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index 68222f8bd..af9896b01 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -8,6 +8,11 @@ getTime(total_seconds); }); function getTime(total_seconds) { + start_time = new Date($("#start_time").html()); + end_time = start_time + 60*60*<%=exercise.time %>; + now = new Date(); + //start = new Date(start_time); + //end_time = start_time; var total_seconds = total_seconds - 1; var hours = total_seconds / 60 / 60; var hoursRound = Math.floor(hours); @@ -27,8 +32,9 @@

        <%= exercise.exercise_name%>

        +
        - 开始时间：<%=format_time(exercise_user.start_at.to_s) %> + 开始时间：<%=format_time(exercise_user.start_at.to_s)%> 测验时长：<%=exercise.time %>分钟 剩余时长： 小时  分钟  秒
        @@ -36,17 +42,16 @@
        - <% mc_question_list = exercise.exercise_questions.where("question_type=1") %> - <% mcq_question_list = exercise.exercise_questions.where("question_type=2") %> - <% single_question_list = exercise.exercise_questions.where("question_type=3") %> + <% mc_question_list = exercise.exercise_questions.where("question_type=1").shuffle %> + <% mcq_question_list = exercise.exercise_questions.where("question_type=2").shuffle %> + <% single_question_list = exercise.exercise_questions.where("question_type=3").shuffle %>
        ">

        单选题

        <% mc_question_list.each_with_index do |exercise_question, list_index| %>
        -
        第<%= list_index+1%>题.(<%= exercise_question.question_score %>分)
        - <%= exercise_question.question_title %> +
        第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分)
        @@ -100,8 +105,7 @@
        -
        第<%= list_index + 1 %>题.(<%= exercise_question.question_score %>分)
        - <%= exercise_question.question_title %> +
        第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分)
        @@ -155,8 +159,7 @@
        -
        第<%= list_index + 1%>题.(<%= exercise_question.question_score %>分)
        - <%= exercise_question.question_title %> +
        第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分)
        @@ -173,7 +176,7 @@ }, success: function (data) { var dataObj = eval(data); -// obj.value = dataObj.text; + obj.value = dataObj.text; } }); diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb index 8a723d75c..9ce136667 100644 --- a/app/views/exercise/_exercise_student_result.html.erb +++ b/app/views/exercise/_exercise_student_result.html.erb @@ -24,12 +24,11 @@ <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
        ">

        单选题

        - <% mc_question_list.each do |exercise_question| %> + <% mc_question_list.each_with_index do |exercise_question, list_index| %>
        -
        第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
        - <%= exercise_question.question_title %> +
        第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) <% if exercise_question.exercise_standard_answers.first.exercise_choice_id == exercise_question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{User.current.id}.first.exercise_choice_id ") %> √ @@ -62,12 +61,11 @@
        ">

        多选题

        - <% mcq_question_list.each do |exercise_question| %> + <% mcq_question_list.each_wtih_index do |exercise_question, list_index| %>
        -
        第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
        - <%= exercise_question.question_title %> +
        第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) <% if exercise_question.exercise_standard_answers.first.exercise_choice_id == exercise_question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{User.current.id}.first.exercise_choice_id ") %> √ @@ -100,12 +98,11 @@
        ">

        填空题

        - <% single_question_list.each do |exercise_question| %> + <% single_question_list.each_with_index do |exercise_question,list_index| %>
        -
        第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
        - <%= exercise_question.question_title %> +
        第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) <% if exercise_question.exercise_standard_answers.first.exercise_choice_id == exercise_question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{User.current.id}.first.exercise_choice_id ") %> √ diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb index b803519ce..606b14aae 100644 --- a/app/views/exercise/_exercise_teacher.html.erb +++ b/app/views/exercise/_exercise_teacher.html.erb @@ -22,12 +22,12 @@ <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
        ">

        单选题

        - <% mc_question_list.each do |exercise_question| %> + <% mc_question_list.each_with_index do |exercise_question, list_index| %>
        -
        第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
        - <%= exercise_question.question_title %>
        +
        第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) +
        标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
        @@ -54,12 +54,12 @@
        ">

        多选题

        - <% mcq_question_list.each do |exercise_question| %> + <% mcq_question_list.each_with_index do |exercise_question, index| %>
        -
        第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
        - <%= exercise_question.question_title %>
        +
        第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) +
        标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
        @@ -86,12 +86,12 @@
        ">

        填空题

        - <% single_question_list.each do |exercise_question| %> + <% single_question_list.each_with_index do |exercise_question, list_index| %>
        -
        第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
        - <%= exercise_question.question_title %>
        +
        第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) +
        标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
        From db46e5e4afb172cd5499f1bbc3bdcfe3628b71a5 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 15:13:53 +0800 Subject: [PATCH 185/285] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=BE=97=E5=88=86?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 11 +++++++++-- app/helpers/exercise_helper.rb | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index cf78cbc05..04189af6a 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -467,7 +467,7 @@ class ExerciseController < ApplicationController standard_answer = get_user_standard_answer(question, user) # 问答题有多个答案 if question.question_type == 3 - if standard_answer.exercise_choice_id.include?(answer.exercise_choice_id) + if standard_answer.include?(answer.exercise_choice_id) score += question.question_score unless question.question_score.empty? end else @@ -510,7 +510,14 @@ class ExerciseController < ApplicationController # 获取问题的标准答案 def get_user_standard_answer(question,user) - standard_answer = question.exercise_standard_answers + if question.question_type == 3 + standard_answer =[] + question.exercise_standard_answers.each do |answer| + standard_answer << answer.answer_text + end + else + standard_answer = question.exercise_standard_answers + end standard_answer end diff --git a/app/helpers/exercise_helper.rb b/app/helpers/exercise_helper.rb index ec7421533..d67f4443f 100644 --- a/app/helpers/exercise_helper.rb +++ b/app/helpers/exercise_helper.rb @@ -28,6 +28,7 @@ module ExerciseHelper answer.join("") end + # def fill_standart_answer(params, standart_answer) params.each do |param| standart_answer.answer_text = param.value From 5cfc8c2f8dc00864648a5340dbc319c07f8d111d Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 20 Nov 2015 16:16:46 +0800 Subject: [PATCH 186/285] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=88=96=E8=80=85=E5=9B=9E=E5=A4=8D=E6=96=87?= =?UTF-8?q?=E7=AB=A0=E5=90=8E=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9A=84=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_document_comments_controller.rb | 4 ++++ app/models/org_document_comment.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index fb40032d4..61a27c433 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -33,6 +33,10 @@ class OrgDocumentCommentsController < ApplicationController def update @org_document = OrgDocumentComment.find(params[:id]) @org_document.update_attributes(:title => params[:org_document_comment][:title], :content => params[:org_document_comment][:content]) + if @org_document.parent.nil? + act = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", @org_document.id).first + act.update_attributes(:updated_at => @org_document.updated_at) + end respond_to do |format| format.html {redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)} end diff --git a/app/models/org_document_comment.rb b/app/models/org_document_comment.rb index 2b3c9132a..7b9f9cd75 100644 --- a/app/models/org_document_comment.rb +++ b/app/models/org_document_comment.rb @@ -11,6 +11,10 @@ class OrgDocumentComment < ActiveRecord::Base def document_save_as_org_activity if(self.parent().nil?) self.org_acts << OrgActivity.new(:user_id => User.current.id, :container_id => self.organization.id, :container_type => 'Organization') + else + act = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", self.root.id).first + act.update_attributes(:updated_at => self.updated_at) end end + end From a57260aae641e329d17e906679ba237a6d3ea3bb Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 20 Nov 2015 16:41:15 +0800 Subject: [PATCH 187/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=93=E2=80=9CMes?= =?UTF-8?q?sage=E2=80=9D=E5=9B=9E=E5=A4=8D=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/forge_activity.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb index 8a94f1019..5005f9eab 100644 --- a/app/models/forge_activity.rb +++ b/app/models/forge_activity.rb @@ -46,17 +46,28 @@ class ForgeActivity < ActiveRecord::Base end def add_org_activity - OrgActivity.create(:user_id => self.user_id, + if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil? + org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.forge_act.parent.id}").first + org_activity.created_at = self.created_at + org_activity.save + else + OrgActivity.create(:user_id => self.user_id, :org_act_id => self.forge_act_id, :org_act_type => self.forge_act_type, :container_id => self.project_id, :container_type => 'Project', :created_at => self.created_at, :updated_at => self.updated_at) + end end def destroy_user_activity user_activity = UserActivity.where("act_type = '#{self.forge_act_type.to_s}' and act_id = '#{self.forge_act_id}'") user_activity.destroy_all end + + def destroy_org_activity + org_acts = OrgActivity.where("org_act_type='#{self.forge_act_type.to_s}' and act_id = '#{self.forge_act_id}'") + org_acts.destroy_all + end end From ed86e3ee5a6a8e3b1002eed90a7865bcf5b23d11 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 17:18:57 +0800 Subject: [PATCH 188/285] =?UTF-8?q?=E4=B8=89=E7=A7=8D=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=E8=AE=A1=E7=AE=97=E6=80=BB=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 40 ++++++++++++++----- app/views/exercise/_exercise_teacher.html.erb | 2 +- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 04189af6a..2c70757fa 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -437,6 +437,7 @@ class ExerciseController < ApplicationController @uncomplete_question = get_uncomplete_question(@exercise, User.current) # 获取改学生的考试得分 @score = calculate_student_score(@exercise, User.current) + # @score = 100 if @uncomplete_question.count < 1 # 查看是否有已提交记录 eu = get_exercise_user(@exercise.id, User.current.id) @@ -461,22 +462,38 @@ class ExerciseController < ApplicationController # 计算学生得分 def calculate_student_score(exercise, user) score = 0 + score1 = 0 + score2 = 0 + score3 = 0 exercise_qustions = exercise.exercise_questions exercise_qustions.each do |question| answer = get_user_answer(question, user) standard_answer = get_user_standard_answer(question, user) - # 问答题有多个答案 - if question.question_type == 3 - if standard_answer.include?(answer.exercise_choice_id) - score += question.question_score unless question.question_score.empty? - end - else - if answer.exercise_choice_id == standard_answer.exercise_choice_id - score += question.question_score unless question.question_score.empty? + unless answer.nil? + # 问答题有多个答案 + if question.question_type == 3 + if standard_answer.include?(answer.first.answer_text) + score1 = score+ question.question_score unless question.question_score.nil? + end + elsif question.question_type == 1 + if answer.first.exercise_choice.choice_position == standard_answer.exercise_choice_id + score2 = score + question.question_score unless question.question_score.nil? + end + else + ecs = ExerciseAnswer.where("user_id =? and exercise_question_id =?", user.id, question.id) + arr = [] + ecs.each do |ec| + arr << ec.exercise_choice.choice_position + end + arr.sort + arr = arr.join("") + if arr.to_i == standard_answer.exercise_choice_id + score3 = score + question.question_score unless question.question_score.nil? + end end end end - score + score = score1 + score2 + score3 end private @@ -495,7 +512,7 @@ class ExerciseController < ApplicationController uncomplete_question = [] all_questions.each do |question| answers = get_user_answer(question, user) - if answers.nil? || answers.count < 1 + if answers.nil? uncomplete_question << question end end @@ -504,6 +521,7 @@ class ExerciseController < ApplicationController # 获取当前学生回答问题的答案 def get_user_answer(question,user) + # user_answer = ExerciseAnswer.where("user_id=? and exercise_question_id=?", user.id, question.id).first user_answer = question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{user.id}") user_answer end @@ -516,7 +534,7 @@ class ExerciseController < ApplicationController standard_answer << answer.answer_text end else - standard_answer = question.exercise_standard_answers + standard_answer = question.exercise_standard_answers.first end standard_answer end diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb index 606b14aae..a3f6380cf 100644 --- a/app/views/exercise/_exercise_teacher.html.erb +++ b/app/views/exercise/_exercise_teacher.html.erb @@ -54,7 +54,7 @@
        ">

        多选题

        - <% mcq_question_list.each_with_index do |exercise_question, index| %> + <% mcq_question_list.each_with_index do |exercise_question, list_index| %>
        From eee63b2495766cb7699717878025c5a8c7eba279 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 17:25:03 +0800 Subject: [PATCH 189/285] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=89=8D=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E6=95=B0=E6=8D=AE=E4=B8=8D=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 18 ------------ app/helpers/exercise_helper.rb | 19 ++++++++++++ app/views/exercise/_exercise_form.html.erb | 19 +++++++----- app/views/exercise/_exercise_student.html.erb | 29 ++++++++++++------- .../_exercise_student_result.html.erb | 12 ++++++-- app/views/exercise/_exercise_teacher.html.erb | 2 +- app/views/exercise/_new_MC.html.erb | 4 +-- app/views/exercise/_new_MCQ.html.erb | 4 +-- app/views/exercise/_new_single.html.erb | 2 +- app/views/exercise/_show_MC.html.erb | 10 +++---- app/views/exercise/_show_MCQ.html.erb | 10 +++---- app/views/exercise/_show_single.html.erb | 8 ++--- 12 files changed, 78 insertions(+), 59 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 04189af6a..8ef6e8d72 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -502,24 +502,6 @@ class ExerciseController < ApplicationController uncomplete_question end - # 获取当前学生回答问题的答案 - def get_user_answer(question,user) - user_answer = question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{user.id}") - user_answer - end - - # 获取问题的标准答案 - def get_user_standard_answer(question,user) - if question.question_type == 3 - standard_answer =[] - question.exercise_standard_answers.each do |answer| - standard_answer << answer.answer_text - end - else - standard_answer = question.exercise_standard_answers - end - standard_answer - end # 是否完成了答题 def get_complete_question(exercise,user) diff --git a/app/helpers/exercise_helper.rb b/app/helpers/exercise_helper.rb index d67f4443f..21c0144b9 100644 --- a/app/helpers/exercise_helper.rb +++ b/app/helpers/exercise_helper.rb @@ -106,4 +106,23 @@ module ExerciseHelper end end + # 获取当前学生回答问题的答案 + def get_user_answer(question,user) + user_answer = question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{user.id}") + user_answer + end + + # 获取问题的标准答案 + def get_user_standard_answer(question,user) + if question.question_type == 3 + standard_answer =[] + question.exercise_standard_answers.each do |answer| + standard_answer << answer.answer_text + end + else + standard_answer = question.exercise_standard_answers + end + standard_answer + end + end \ No newline at end of file diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index 6e0953e74..69f55f3d7 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -82,19 +82,22 @@ //添加标题时确定按钮 function add_poll_question(doc,quest_type,quest_id) { - if(arguments[1] && arguments[2]){ - var title = $.trim($("#poll_questions_title_"+quest_type+"_"+quest_id)); - if(title.length == 0){alert("题目标题不能为空");}else{doc.parent().parent().parent().submit();} - } else { - var title = $.trim($("#poll_questions_title").val()); - if(title.length == 0){alert("题目标题不能为空");}else{doc.parent().parent().parent().submit();} - } + var title = $.trim($("#poll_questions_title").val()); + var score = $.trim($("#questions_score").val()); + if(title.length == 0 || score.length == 0){ + alert("题目标题/分数+不能为空"); + }else{ + doc.parent().parent().parent().submit();} } //修改标题时确定按钮 function edit_poll_question(doc,id) { var title = $.trim($("#poll_questions_title_" + id).val()); - if(title.length == 0){alert("题目标题不能为空");}else{doc.parent().parent().parent().submit();} + var score = $.trim($("#poll_question_score_"+ id).val()); + if(title.length == 0 || score.length == 0){ + alert("题目标题不能为空"); + }else{ + doc.parent().parent().parent().submit();} } //问卷头 diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index af9896b01..0f51dfeb7 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -3,17 +3,24 @@ $("#RSide").removeAttr("id"); $("#homework_page_right").css("min-height",$("#LSide").height()-30); $("#Container").css("width","1000px"); - var time = <%=exercise.time %>; - var total_seconds = time * 60; - getTime(total_seconds); + /*start_time = new Date(); + start_time.setFullYear(<%#=exercise_user.start_at.year%>); + start_time.setMonth(<%#=exercise_user.start_at.month%>); + start_time.setDate(<%#=exercise_user.start_at.day%>); + start_time.setHours(<%#=exercise_user.start_at.hour%>); + start_time.setMinutes(<%#=exercise_user.start_at.min%>); + start_time.setSeconds(<%#=exercise_user.start_at.sec%>); + //alert(start_time); + end_time = start_time.getTime() + 1000*60*<%#=exercise.time %>; + getTime(end_time);*/ }); - function getTime(total_seconds) { - start_time = new Date($("#start_time").html()); - end_time = start_time + 60*60*<%=exercise.time %>; + function getTime(end_time) { + //alert(end_time); now = new Date(); + var total_seconds = (now.getTime() - end_time)/1000; //start = new Date(start_time); //end_time = start_time; - var total_seconds = total_seconds - 1; + //var total_seconds = total_seconds - 1; var hours = total_seconds / 60 / 60; var hoursRound = Math.floor(hours); var minutes = total_seconds /60 - (60 * hoursRound); @@ -23,9 +30,9 @@ $("#rest_hours").html(hoursRound); $("#rest_minutes").html(minutesRound); $("#rest_seconds").html(secondsRound); - if(total_seconds >0) { - setTimeout("getTime("+total_seconds+");", 1000); - } + //if(total_seconds >0) { + setTimeout("getTime("+end_time+");", 1000); + //} }
        @@ -36,7 +43,9 @@
        开始时间：<%=format_time(exercise_user.start_at.to_s)%> 测验时长：<%=exercise.time %>分钟 +
        <%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%>
        diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb index 9ce136667..c6b9a251c 100644 --- a/app/views/exercise/_exercise_student_result.html.erb +++ b/app/views/exercise/_exercise_student_result.html.erb @@ -30,7 +30,9 @@
        第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) - <% if exercise_question.exercise_standard_answers.first.exercise_choice_id == exercise_question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{User.current.id}.first.exercise_choice_id ") %> + <% answer = get_user_answer(exercise_question, User.current)%> + <% standard_answer = get_user_standard_answer(exercise_question, User.current)%> + <% if answer.exercise_choice_id == standard_answer.exercise_choice_id %> √ <% else %> × @@ -67,7 +69,9 @@
        第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) - <% if exercise_question.exercise_standard_answers.first.exercise_choice_id == exercise_question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{User.current.id}.first.exercise_choice_id ") %> + <% answer = get_user_answer(exercise_question, User.current)%> + <% standard_answer = get_user_standard_answer(exercise_question, User.current)%> + <% if answer.exercise_choice_id == standard_answer.exercise_choice_id %> √ <% else %> × @@ -104,7 +108,9 @@
        第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) - <% if exercise_question.exercise_standard_answers.first.exercise_choice_id == exercise_question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{User.current.id}.first.exercise_choice_id ") %> + <% answer = get_user_answer(exercise_question, User.current)%> + <% standard_answer = get_user_standard_answer(exercise_question, User.current)%> + <% if standard_answer.include?(answer.exercise_choice_id) %> √ <% else %> × diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb index 606b14aae..a3f6380cf 100644 --- a/app/views/exercise/_exercise_teacher.html.erb +++ b/app/views/exercise/_exercise_teacher.html.erb @@ -54,7 +54,7 @@
        ">

        多选题

        - <% mcq_question_list.each_with_index do |exercise_question, index| %> + <% mcq_question_list.each_with_index do |exercise_question, list_index| %>
        diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb index 5d5170562..b749c4374 100644 --- a/app/views/exercise/_new_MC.html.erb +++ b/app/views/exercise/_new_MC.html.erb @@ -13,7 +13,7 @@
      • <% score = exercise.exercise_questions.where("question_type=1").last.nil? ? "": exercise.exercise_questions.where("question_type=1").last.question_score %> - 分 + 分
      • @@ -46,7 +46,7 @@
      • - +
        • diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb index 96b1476ad..a7029d3ea 100644 --- a/app/views/exercise/_new_MCQ.html.erb +++ b/app/views/exercise/_new_MCQ.html.erb @@ -13,7 +13,7 @@
      • <% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %> - 分 + 分
      • @@ -46,7 +46,7 @@
      • - +
        • diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb index c97483bce..1ee79e198 100644 --- a/app/views/exercise/_new_single.html.erb +++ b/app/views/exercise/_new_single.html.erb @@ -13,7 +13,7 @@
      • <% score = exercise.exercise_questions.where("question_type=3").last.nil? ? "": exercise.exercise_questions.where("question_type=3").last.question_score %> - 分 + 分
      • diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb index 183e8d190..b932eac1e 100644 --- a/app/views/exercise/_show_MC.html.erb +++ b/app/views/exercise/_show_MC.html.erb @@ -46,13 +46,13 @@ ''+ ''+ ''+ - ''+ + ''+ '
        • '+ '
        '+ '
          '+ '
        • '+ ''+ - '分'+ + '分'+ '
          • '+ '
        • '+ ''+ @@ -84,13 +84,13 @@ '
          '+ '
        • '+ ''+ - ''+ + ''+ '
          • '+ '
          '+ '
        '+ '
        '+ '
        '+ - ''+ + ''+ '保存'+ ''+ ''+ @@ -101,7 +101,7 @@ '
        '+ '<% end%>' ); - $("#poll_questions_title_"+quest_type+"_"+quest_id).focus(); + $("#poll_questions_title").focus(); } } else { diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb index af2b0facb..2a91afab5 100644 --- a/app/views/exercise/_show_MCQ.html.erb +++ b/app/views/exercise/_show_MCQ.html.erb @@ -45,13 +45,13 @@ ''+ ''+ ''+ - ''+ + ''+ '
        '+ '
        '+ '
          '+ '
        • '+ ''+ - '分'+ + '分'+ '
          • '+ '
        • '+ ''+ @@ -83,13 +83,13 @@ '
          '+ '
        • '+ ''+ - ''+ + ''+ '
          • '+ '
          '+ '
        '+ '
        '+ '
        '+ - ''+ + ''+ '保存'+ ''+ ''+ @@ -100,7 +100,7 @@ '
        '+ '<% end%>' ); - $("#poll_questions_title_"+quest_type+"_"+quest_id).focus(); + $("#poll_questions_title").focus(); } }else { $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(""); diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb index 9c7936e6d..5f36a931e 100644 --- a/app/views/exercise/_show_single.html.erb +++ b/app/views/exercise/_show_single.html.erb @@ -33,13 +33,13 @@ ''+ ''+ ''+ - ''+ + ''+ '
        '+ '
        '+ '
          '+ '
        • '+ ''+ - '分'+ + '分'+ '
          • '+ '
        • '+ ''+ @@ -65,7 +65,7 @@ '
        '+ '
        '+ '
        '+ - ''+ + ''+ '保存'+ ''+ ''+ @@ -76,7 +76,7 @@ '
        '+ '<% end%>' ); - $("#poll_questions_title_"+quest_type+"_"+quest_id).focus(); + $("#poll_questions_title").focus(); } } else { $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(""); From 87285578130fe52a93d0f7c85640f4a609ab44e5 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 17:29:15 +0800 Subject: [PATCH 190/285] =?UTF-8?q?=E8=80=81=E5=B8=88=E5=92=8C=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E7=BB=9F=E8=AE=A1=E6=95=B0=E7=9B=AE=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_courses.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index ac8727e21..9c119f37a 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -159,7 +159,7 @@
        <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%> - <%= link_to "(#{@course.exercises.count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %> + <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %> <%= link_to( "+新建试卷", new_exercise_path(:course_id => @course.id), :class => 'subnav_green c_white') if is_teacher %>
        From 6068867670c33f9868001537c252cb58baa530d4 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 20 Nov 2015 17:42:43 +0800 Subject: [PATCH 191/285] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=92=8C=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=88=A0=E9=99=A4=E7=9B=B8=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/course_activity.rb | 7 ++++++- app/models/forge_activity.rb | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb index cd3234196..e1f9ab9f5 100644 --- a/app/models/course_activity.rb +++ b/app/models/course_activity.rb @@ -6,7 +6,7 @@ class CourseActivity < ActiveRecord::Base belongs_to :user has_many :user_acts, :class_name => 'UserAcivity',:as =>:act after_save :add_user_activity, :add_course_activity - before_destroy :destroy_user_activity + before_destroy :destroy_user_activity, :destroy_org_activity #在个人动态里面增加当前动态 def add_user_activity @@ -55,4 +55,9 @@ class CourseActivity < ActiveRecord::Base user_activity = UserActivity.where("act_type = '#{self.course_act_type.to_s}' and act_id = '#{self.course_act_id}'") user_activity.destroy_all end + + def destroy_org_activity + org_activity = OrgActivity.where("org_act_type = '#{self.course_act_type.to_s}' and org_act_id = '#{self.course_act_id}'") + org_activity.destroy_all + end end diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb index 5005f9eab..bb5f30442 100644 --- a/app/models/forge_activity.rb +++ b/app/models/forge_activity.rb @@ -21,7 +21,7 @@ class ForgeActivity < ActiveRecord::Base validates :forge_act_type, presence: true has_many :user_acts, :class_name => 'UserAcivity',:as =>:act after_save :add_user_activity, :add_org_activity - before_destroy :destroy_user_activity + before_destroy :destroy_user_activity, :destroy_org_activity #在个人动态里面增加当前动态 def add_user_activity @@ -67,7 +67,7 @@ class ForgeActivity < ActiveRecord::Base end def destroy_org_activity - org_acts = OrgActivity.where("org_act_type='#{self.forge_act_type.to_s}' and act_id = '#{self.forge_act_id}'") + org_acts = OrgActivity.where("org_act_type='#{self.forge_act_type.to_s}' and org_act_id = '#{self.forge_act_id}'") org_acts.destroy_all end end From 332ace0f34c85e5d0a833da755e7b58c254d10ac Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 18:00:11 +0800 Subject: [PATCH 192/285] =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 1 + app/views/exercise/_exercise.html.erb | 26 ++++++++++------------ app/views/exercise/_exercise_form.html.erb | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index e23560efe..1a8faff55 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -112,6 +112,7 @@ class ExerciseController < ApplicationController end def destroy + @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin? if @exercise && @exercise.destroy if @is_teacher exercises = Exercise.where("course_id =?", @course.id) diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb index e44cd69c6..78ca97887 100644 --- a/app/views/exercise/_exercise.html.erb +++ b/app/views/exercise/_exercise.html.erb @@ -20,10 +20,8 @@ <% if exercise.exercise_status == 1 %>
      • 发布试卷
        • - <% elsif exercise.exercise_status == 2%> + <% else %>
      • 取消发布
        • - <% else%> -
      • 发布试卷
        • <% end%> <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10") %> @@ -34,17 +32,17 @@
      • 编辑
        • <% end%> - <% if exercise.exercise_status == 2 %> -
      • 关闭
        • - <% else %> -
      • 关闭
        • - <% end%> - - <% if exercise.exercise_status == 1%> -
      • 导出
        • - <% elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %> -
      • <%= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%>
        • - <% end%> + <%# if exercise.exercise_status == 2 %> + + <%# else %> + + <%# end%> + + <%# if exercise.exercise_status == 1%> + + <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %> + + <%# end%>
      • <%= format_date exercise.created_at.to_date%>
        • diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index 69f55f3d7..22589097a 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -83,9 +83,9 @@ function add_poll_question(doc,quest_type,quest_id) { var title = $.trim($("#poll_questions_title").val()); - var score = $.trim($("#questions_score").val()); + var score = $.trim($("#question_score").val()); if(title.length == 0 || score.length == 0){ - alert("题目标题/分数+不能为空"); + alert("题目标题/分数不能为空"); }else{ doc.parent().parent().parent().submit();} } From 97485ca2216a9a95de22995e88da23c396e7fec0 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 18:01:50 +0800 Subject: [PATCH 193/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9show=E9=80=BB?= =?UTF-8?q?=E8=BE=91=20=E6=8F=90=E4=BA=A4=E9=97=AE=E5=8D=B7=E5=90=8E?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E9=A1=B5=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/exercise_controller.rb | 47 +++++++++++++------ .../_exercise_student_result.html.erb | 13 +++-- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index e23560efe..3164235d5 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -27,19 +27,21 @@ class ExerciseController < ApplicationController render_403 return end - + @can_edit_excercise = (!has_commit_exercise?(@exercise.id,User.current.id)) || User.current.admin? + @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first # 学生点击的时候即创建关联,自动保存 #eu = ExerciseUser.create(:user_id => User.current, :exercise_id => @exercise.id, :start_at => Time.now, :status => false) # 已提交问卷的用户不能再访问该界面 if has_commit_exercise?(@exercise.id, User.current.id) && (!User.current.admin?) - redirect_to exercise_index_url(:course_id=> @course.id) + respond_to do |format| + format.html {render :layout => 'base_courses'} + end else if !@is_teacher && !has_click_exercise?(@exercise.id, User.current.id) eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false) end - @can_edit_excercise = (!has_commit_exercise?(@exercise.id,User.current.id)) || User.current.admin? - @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first + # @percent = get_percent(@exercise,User.current) exercise_questions = @exercise.exercise_questions @exercise_questions = paginateHelper exercise_questions,5 #分页 @@ -433,6 +435,8 @@ class ExerciseController < ApplicationController redirect_to exercise_url(@exercise) # REDO: 提示提交成功 else + # 更新提交状态 + @exercise.exercise_users.first.update_attributes(:status => true) # 答题过程中需要统计完成量 @uncomplete_question = get_uncomplete_question(@exercise, User.current) # 获取改学生的考试得分 @@ -480,16 +484,17 @@ class ExerciseController < ApplicationController score2 = score + question.question_score unless question.question_score.nil? end else - ecs = ExerciseAnswer.where("user_id =? and exercise_question_id =?", user.id, question.id) - arr = [] - ecs.each do |ec| - arr << ec.exercise_choice.choice_position - end - arr.sort - arr = arr.join("") - if arr.to_i == standard_answer.exercise_choice_id - score3 = score + question.question_score unless question.question_score.nil? - end + get_mulscore(question, user, standard_answer) + # ecs = ExerciseAnswer.where("user_id =? and exercise_question_id =?", user.id, question.id) + # arr = [] + # ecs.each do |ec| + # arr << ec.exercise_choice.choice_position + # end + # arr.sort + # arr = arr.join("") + # if arr.to_i == standard_answer.exercise_choice_id + # score3 = score + question.question_score unless question.question_score.nil? + # end end end end @@ -497,6 +502,20 @@ class ExerciseController < ApplicationController end private + # 获取多选的得分 + def get_mulscore(question, user, standard_answer) + ecs = ExerciseAnswer.where("user_id =? and exercise_question_id =?", user.id, question.id) + arr = [] + ecs.each do |ec| + arr << ec.exercise_choice.choice_position + end + arr.sort + arr = arr.join("") + if arr.to_i == standard_answer.exercise_choice_id + score3 = score + question.question_score unless question.question_score.nil? + end + end + # ExerciseUser记录用户是否已提交问卷有对应的记录则已提交，没有则新建一个 def get_exercise_user exercise_id,user_id eu = ExerciseUser.find_by_exercise_id_and_user_id(exercise_id,user_id) diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb index c6b9a251c..95ef022d5 100644 --- a/app/views/exercise/_exercise_student_result.html.erb +++ b/app/views/exercise/_exercise_student_result.html.erb @@ -12,9 +12,8 @@
        开始时间：<%=format_time(exercise_user.start_at.to_s) %> 测验时长：<%=exercise.time %>分钟 - <% time = exercise_user.end_at - exercise_user.start_at %> - 测验用时：<%= (time % (24*60*60)) / (60*60)%> 小时 <%= ((time % (24*60*60)) % (60*60)) / 60%> 分钟 <%= ((time % (24*60*60)) % (60*60)) % 60%> 秒 -
        + <%# time = exercise_user.end_at - exercise_user.start_at %> +
        <%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%>
        @@ -32,7 +31,7 @@ <% answer = get_user_answer(exercise_question, User.current)%> <% standard_answer = get_user_standard_answer(exercise_question, User.current)%> - <% if answer.exercise_choice_id == standard_answer.exercise_choice_id %> + <% if answer.first.exercise_choice.choice_position == standard_answer.first.exercise_choice_id %> √ <% else %> × @@ -63,7 +62,7 @@
        ">

        多选题

        - <% mcq_question_list.each_wtih_index do |exercise_question, list_index| %> + <% mcq_question_list.each_with_index do |exercise_question, list_index| %>
        @@ -71,7 +70,7 @@ <% answer = get_user_answer(exercise_question, User.current)%> <% standard_answer = get_user_standard_answer(exercise_question, User.current)%> - <% if answer.exercise_choice_id == standard_answer.exercise_choice_id %> + <% if answer.first.exercise_choice_id == standard_answer.first.exercise_choice_id %> √ <% else %> × @@ -110,7 +109,7 @@ <% answer = get_user_answer(exercise_question, User.current)%> <% standard_answer = get_user_standard_answer(exercise_question, User.current)%> - <% if standard_answer.include?(answer.exercise_choice_id) %> + <% if standard_answer.include?(answer.first.answer_text) %> √ <% else %> × From bb726e3475682c509c498ca9bf7179b8b71494a5 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 18:21:31 +0800 Subject: [PATCH 194/285] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=AD=94=E6=A1=88?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 18 ++++-------------- app/helpers/exercise_helper.rb | 11 +++++++++++ .../exercise/_exercise_student_result.html.erb | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index cbc6009b1..781ea50cd 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -485,7 +485,10 @@ class ExerciseController < ApplicationController score2 = score + question.question_score unless question.question_score.nil? end else - get_mulscore(question, user, standard_answer) + arr = get_mulscore(question, user) + if arr.to_i == standard_answer.exercise_choice_id + score3 = score + question.question_score unless question.question_score.nil? + end # ecs = ExerciseAnswer.where("user_id =? and exercise_question_id =?", user.id, question.id) # arr = [] # ecs.each do |ec| @@ -503,19 +506,6 @@ class ExerciseController < ApplicationController end private - # 获取多选的得分 - def get_mulscore(question, user, standard_answer) - ecs = ExerciseAnswer.where("user_id =? and exercise_question_id =?", user.id, question.id) - arr = [] - ecs.each do |ec| - arr << ec.exercise_choice.choice_position - end - arr.sort - arr = arr.join("") - if arr.to_i == standard_answer.exercise_choice_id - score3 = score + question.question_score unless question.question_score.nil? - end - end # ExerciseUser记录用户是否已提交问卷有对应的记录则已提交，没有则新建一个 def get_exercise_user exercise_id,user_id diff --git a/app/helpers/exercise_helper.rb b/app/helpers/exercise_helper.rb index 21c0144b9..bb87f3b82 100644 --- a/app/helpers/exercise_helper.rb +++ b/app/helpers/exercise_helper.rb @@ -36,6 +36,17 @@ module ExerciseHelper end end + # 获取多选的得分 + def get_mulscore(question, user) + ecs = ExerciseAnswer.where("user_id =? and exercise_question_id =?", user.id, question.id) + arr = [] + ecs.each do |ec| + arr << ec.exercise_choice.choice_position + end + arr.sort + arr = arr.join("") + end + # 判断用户是否已经提交了问卷 # status 为0的时候是用户点击试卷。为1表示用户已经提交 def has_commit_exercise?(exercise_id, user_id) diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb index 95ef022d5..32cb556b3 100644 --- a/app/views/exercise/_exercise_student_result.html.erb +++ b/app/views/exercise/_exercise_student_result.html.erb @@ -70,7 +70,7 @@ <% answer = get_user_answer(exercise_question, User.current)%> <% standard_answer = get_user_standard_answer(exercise_question, User.current)%> - <% if answer.first.exercise_choice_id == standard_answer.first.exercise_choice_id %> + <% if get_mulscore(exercise_question, User.current).to_i == standard_answer.first.exercise_choice_id %> √ <% else %> × From c9ba57f64bbfaf23fbd057847a65ca0399f40ddb Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 18:29:26 +0800 Subject: [PATCH 195/285] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E3=80=81=E5=AF=BC=E5=85=A5=E7=AD=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 10 ++-------- app/views/exercise/_exercise.html.erb | 2 +- app/views/exercise/_exercise_submit.html.erb | 6 +++--- app/views/exercise/index.html.erb | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 1a8faff55..6f08cb75f 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -284,13 +284,7 @@ class ExerciseController < ApplicationController @exercise.exercise_status = 2 @exercise.publish_time = Time.now if @exercise.save - if params[:is_remote] - redirect_to exercise_index_url(:course_id => @course.id) - else - respond_to do |format| - format.js - end - end + redirect_to exercise_index_url(:course_id=> @course.id) end end @@ -430,7 +424,7 @@ class ExerciseController < ApplicationController def commit_exercise # 老师不需要提交 if User.current.allowed_to?(:as_teacher,@course) - @exercise.update_attributes(:show_result => params[:exercise][:show_result]) + @exercise.update_attributes(:show_result => params[:show_result]) redirect_to exercise_url(@exercise) # REDO: 提示提交成功 else diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb index 78ca97887..dfcc8d3b4 100644 --- a/app/views/exercise/_exercise.html.erb +++ b/app/views/exercise/_exercise.html.erb @@ -21,7 +21,7 @@ <% if exercise.exercise_status == 1 %>
      • 发布试卷
        • <% else %> -
      • 取消发布
        • +
      • 发布试卷
        • <% end%> <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10") %> diff --git a/app/views/exercise/_exercise_submit.html.erb b/app/views/exercise/_exercise_submit.html.erb index acbbea244..8e2ad74a2 100644 --- a/app/views/exercise/_exercise_submit.html.erb +++ b/app/views/exercise/_exercise_submit.html.erb @@ -1,4 +1,4 @@ -<%= form_for(exercise, +<%= form_for('', :html => { :multipart => true }, :url => {:controller => 'exercise', :action => 'commit_exercise', @@ -7,8 +7,8 @@
        提交
        - <%= f.check_box :show_result, :value => exercise.show_result%> - <%= label_tag 'exercise_show_result', '允许学生查看测验结果' %> + <%= f.check_box 'show_result', :value => exercise.show_result%> + <%= label_tag '_show_result', '允许学生查看测验结果' %>
        diff --git a/app/views/exercise/index.html.erb b/app/views/exercise/index.html.erb index 14db03e09..1e2d6ff34 100644 --- a/app/views/exercise/index.html.erb +++ b/app/views/exercise/index.html.erb @@ -37,7 +37,7 @@ $('#ajax-modal').html("
        " + "
        " + "
        " + - "

        问卷发布后将不能对问卷进行修改，
        是否确定发布该问卷？

        " + + "

        测验发布后将不能对测验进行修改，
        是否确定发布该测验？

        " + "
        " + "确  定" + "取  消" + From c07e2fe2d2ef413787abc95b500234f626e568b9 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 18:38:50 +0800 Subject: [PATCH 196/285] =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=AF=95=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index e34e89cb7..c95458a57 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -40,6 +40,7 @@ class ExerciseController < ApplicationController else if !@is_teacher && !has_click_exercise?(@exercise.id, User.current.id) eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false) + @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first end # @percent = get_percent(@exercise,User.current) From aa36c927d3c7c0a4ac88fac7741e68ae90c7115b Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 18:39:35 +0800 Subject: [PATCH 197/285] 0 --- app/controllers/exercise_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 781ea50cd..6699702aa 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -41,7 +41,6 @@ class ExerciseController < ApplicationController if !@is_teacher && !has_click_exercise?(@exercise.id, User.current.id) eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false) end - # @percent = get_percent(@exercise,User.current) exercise_questions = @exercise.exercise_questions @exercise_questions = paginateHelper exercise_questions,5 #分页 From da55b00da7f1ccaa5662eb01015bb36bd3f0f1bd Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 19:05:39 +0800 Subject: [PATCH 198/285] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 448c9a90a..9c4ce463a 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -269,11 +269,23 @@ class ExerciseController < ApplicationController def delete_exercise_question @exercise_question = ExerciseQuestion.find params[:exercise_question] @exercise = @exercise_question.exercise - exercise_questions = @exercise.exercise_questions.where("question_number > #{@exercise_question.question_number}") - exercise_questions.each do |question| - question.question_number -= 1 - question.save + + if @exercise_question.question_type == 1 + ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 1).update_all(" question_number = question_number - 1") + #@exercise.exercise_questions.where("question_number > #{params[:quest_num].to_i} and question_type == 1").update_all(" question_number = question_number + 1") + elsif @exercise_question.question_type == 2 + ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 2).update_all(" question_number = question_number - 1") + else + ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 3).update_all(" question_number = question_number - 1") end + # @exercise_question_num = params[:quest_num].to_i + # @exercise_questions.question_number = params[:quest_num].to_i - 1 + # + # exercise_questions = @exercise.exercise_questions.where("question_number > #{@exercise_question.question_number}") + # exercise_questions.each do |question| + # question.question_number -= 1 + # question.save + # end if @exercise_question && @exercise_question.destroy respond_to do |format| format.js @@ -568,7 +580,9 @@ class ExerciseController < ApplicationController exercises = course.exercises.where("exercise_name=?","") unless exercises.empty? exercises.each do |exercise| - exercise.destroy + if exercise.exercise_questions.empty? + exercise.destroy + end end end end From c0dfc17b19e6afd84b76eebbe19ffc391111c57f Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 19:35:32 +0800 Subject: [PATCH 199/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 9c4ce463a..28f532db6 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -443,7 +443,8 @@ class ExerciseController < ApplicationController # REDO: 提示提交成功 else # 更新提交状态 - @exercise.exercise_users.first.update_attributes(:status => true) + cur_exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", User.current, @exercise.id).first + cur_exercise_user.update_attributes(:status => 1) # 答题过程中需要统计完成量 @uncomplete_question = get_uncomplete_question(@exercise, User.current) # 获取改学生的考试得分 From 5ac65d86b18b94b53693c1ac7d3857c8c289ed98 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 20 Nov 2015 19:58:25 +0800 Subject: [PATCH 200/285] =?UTF-8?q?=E5=B0=86org=5Fdocument=5Fcomment?= =?UTF-8?q?=E4=B8=AD=E7=9A=84title=E6=94=B9=E6=88=90text=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0151120115137_changecolumn_of_org_document_comments.rb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 db/migrate/20151120115137_changecolumn_of_org_document_comments.rb diff --git a/db/migrate/20151120115137_changecolumn_of_org_document_comments.rb b/db/migrate/20151120115137_changecolumn_of_org_document_comments.rb new file mode 100644 index 000000000..15cc8fdcd --- /dev/null +++ b/db/migrate/20151120115137_changecolumn_of_org_document_comments.rb @@ -0,0 +1,8 @@ +class ChangecolumnOfOrgDocumentComments < ActiveRecord::Migration + def up + change_column :org_document_comments, :title, :text + end + + def down + end +end From 9ca336a70a926d62ad2fa407fe4c115b238c7354 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 19:59:05 +0800 Subject: [PATCH 201/285] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=92=8C=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 2 +- app/views/exercise/_exercise.html.erb | 6 ++++-- app/views/exercise/_exercise_form.html.erb | 8 +++++++- app/views/exercise/create_exercise_question.js.erb | 4 +++- app/views/exercise/update_exercise_question.js.erb | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 448c9a90a..94a5a8028 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -294,7 +294,7 @@ class ExerciseController < ApplicationController # 重新发布的时候会删除所有的答题 def republish_exercise @exercise.exercise_questions.each do |exercise_question| - exercise_question.exercise_ansers.destroy_all + exercise_question.exercise_answers.destroy_all end @exercise.exercise_users.destroy_all @exercise.exercise_status = 1 diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb index dfcc8d3b4..f5896c5e3 100644 --- a/app/views/exercise/_exercise.html.erb +++ b/app/views/exercise/_exercise.html.erb @@ -20,8 +20,10 @@ <% if exercise.exercise_status == 1 %>
      • 发布试卷
        • - <% else %> -
      • 发布试卷
        • + <% elsif exercise.exercise_status == 2%> +
      • 取消发布
        • + <% else%> +
      • 发布试卷
        • <% end%> <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10") %> diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index 22589097a..29ccc685d 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -84,8 +84,11 @@ { var title = $.trim($("#poll_questions_title").val()); var score = $.trim($("#question_score").val()); + var standard_ans = $.trim($("#question_standard_ans").val()); if(title.length == 0 || score.length == 0){ alert("题目标题/分数不能为空"); + }else if(standard_ans.length == 0) { + alert("标准答案不能为空"); }else{ doc.parent().parent().parent().submit();} } @@ -94,8 +97,11 @@ { var title = $.trim($("#poll_questions_title_" + id).val()); var score = $.trim($("#poll_question_score_"+ id).val()); + var standard_ans = $.trim($("#poll_question_standard_answer_" + id).val()); if(title.length == 0 || score.length == 0){ - alert("题目标题不能为空"); + alert("题目标题/分数不能为空"); + }else if(standard_ans.length == 0) { + alert("标准答案不能为空"); }else{ doc.parent().parent().parent().submit();} } diff --git a/app/views/exercise/create_exercise_question.js.erb b/app/views/exercise/create_exercise_question.js.erb index 9047cfeda..326a19ec8 100644 --- a/app/views/exercise/create_exercise_question.js.erb +++ b/app/views/exercise/create_exercise_question.js.erb @@ -1,6 +1,8 @@ <% if @is_insert %> $("#poll_content").html('<%= escape_javascript(render :partial => 'exercise_content', :locals => {:exercise => @exercise})%>'); $("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise}) %>"); + $("#current_score_div").show(); + $("#current_score").html("<%=get_current_score @exercise %>分"); <% else %> $("#new_exercise_question").html('<%= escape_javascript(render :partial => 'new_question', :locals => {:exercise => @exercise}) %>'); $("#new_poll_question").html(""); @@ -35,6 +37,6 @@ "
        " + "
        "); <% end %> -$("#current_score").html("<%=get_current_score @exercise %>分"); $("#current_score_div").show(); +$("#current_score").html("<%=get_current_score @exercise %>分"); <% end %> diff --git a/app/views/exercise/update_exercise_question.js.erb b/app/views/exercise/update_exercise_question.js.erb index ef9004c06..9e7822cb7 100644 --- a/app/views/exercise/update_exercise_question.js.erb +++ b/app/views/exercise/update_exercise_question.js.erb @@ -16,5 +16,5 @@ $("#poll_questions_<%= @exercise_question.id%>").html("
        {:exercise_question => @exercise_question}) %>" + "<% end%>" + "
        "); -$("#current_score").html("<%=get_current_score @exercise %>分"); +$("#current_score").html("<%=get_current_score @exercise_question.exercise %>分"); $("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise_question.exercise}) %>"); From 8b29002a0fdf30058186869621b7e0bdbc69920b Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 20:02:57 +0800 Subject: [PATCH 202/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=97=E5=88=86?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 28f532db6..c15d5ad23 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -21,6 +21,10 @@ class ExerciseController < ApplicationController end def show + unless User.current.member_of_course?(@course) + render_403 + return + end @exercise = Exercise.find params[:id] @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin? if @exercise.exercise_status != 2 && (!User.current.allowed_to?(:as_teacher,@course) || User.current.admin?) @@ -485,16 +489,16 @@ class ExerciseController < ApplicationController # 问答题有多个答案 if question.question_type == 3 if standard_answer.include?(answer.first.answer_text) - score1 = score+ question.question_score unless question.question_score.nil? + score1 = score1+ question.question_score unless question.question_score.nil? end elsif question.question_type == 1 if answer.first.exercise_choice.choice_position == standard_answer.exercise_choice_id - score2 = score + question.question_score unless question.question_score.nil? + score2 = score2 + question.question_score unless question.question_score.nil? end else arr = get_mulscore(question, user) if arr.to_i == standard_answer.exercise_choice_id - score3 = score + question.question_score unless question.question_score.nil? + score3 = score3 + question.question_score unless question.question_score.nil? end # ecs = ExerciseAnswer.where("user_id =? and exercise_question_id =?", user.id, question.id) # arr = [] From cc19c345e1a629a26f6789f7dd38085e499fa036 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 20:23:02 +0800 Subject: [PATCH 203/285] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise_form.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index 29ccc685d..0d6b8602d 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -87,9 +87,9 @@ var standard_ans = $.trim($("#question_standard_ans").val()); if(title.length == 0 || score.length == 0){ alert("题目标题/分数不能为空"); - }else if(standard_ans.length == 0) { + }/*else if(standard_ans.length == 0) { alert("标准答案不能为空"); - }else{ + }*/else{ doc.parent().parent().parent().submit();} } //修改标题时确定按钮 @@ -100,9 +100,9 @@ var standard_ans = $.trim($("#poll_question_standard_answer_" + id).val()); if(title.length == 0 || score.length == 0){ alert("题目标题/分数不能为空"); - }else if(standard_ans.length == 0) { + }/*else if(standard_ans.length == 0) { alert("标准答案不能为空"); - }else{ + }*/else{ doc.parent().parent().parent().submit();} } From b10fbcde8c2b3c8fb735d5648a60005462472223 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 20:44:27 +0800 Subject: [PATCH 204/285] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=92=8C=E5=8F=91=E5=B8=83=E6=B5=8B=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 7 ++++++- app/views/exercise/_edit_MC.html.erb | 2 +- app/views/exercise/_edit_MCQ.html.erb | 2 +- app/views/exercise/_edit_single.html.erb | 2 +- app/views/exercise/_exercise_form.html.erb | 12 ++++++------ app/views/exercise/_exercises_list.html.erb | 2 +- app/views/exercise/_new_MC.html.erb | 2 +- app/views/exercise/_new_MCQ.html.erb | 2 +- app/views/exercise/_new_single.html.erb | 2 +- app/views/exercise/_show_MC.html.erb | 2 +- app/views/exercise/_show_MCQ.html.erb | 2 +- app/views/exercise/_show_single.html.erb | 2 +- app/views/exercise/index.html.erb | 2 +- app/views/exercise/republish_exercise.js.erb | 2 +- 14 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index c8e5bf27c..d53dc067c 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -299,16 +299,21 @@ class ExerciseController < ApplicationController # 发布试卷 def publish_exercise + @is_teacher = User.current.allowed_to?(:as_teacher,@course) @exercise.exercise_status = 2 @exercise.publish_time = Time.now if @exercise.save - redirect_to exercise_index_url(:course_id=> @course.id) + #redirect_to exercise_index_url(:course_id=> @course.id) + respond_to do |format| + format.js + end end end # 重新发布试卷 # 重新发布的时候会删除所有的答题 def republish_exercise + @is_teacher = User.current.allowed_to?(:as_teacher,@course) @exercise.exercise_questions.each do |exercise_question| exercise_question.exercise_answers.destroy_all end diff --git a/app/views/exercise/_edit_MC.html.erb b/app/views/exercise/_edit_MC.html.erb index a1c8aa8b1..008c95c24 100644 --- a/app/views/exercise/_edit_MC.html.erb +++ b/app/views/exercise/_edit_MC.html.erb @@ -50,7 +50,7 @@
        - + 保存 diff --git a/app/views/exercise/_edit_MCQ.html.erb b/app/views/exercise/_edit_MCQ.html.erb index a3ae74324..2b900d648 100644 --- a/app/views/exercise/_edit_MCQ.html.erb +++ b/app/views/exercise/_edit_MCQ.html.erb @@ -50,7 +50,7 @@
        - + 保存 diff --git a/app/views/exercise/_edit_single.html.erb b/app/views/exercise/_edit_single.html.erb index d22747457..d2e4a6f2c 100644 --- a/app/views/exercise/_edit_single.html.erb +++ b/app/views/exercise/_edit_single.html.erb @@ -46,7 +46,7 @@
        - + 保存 diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index 0d6b8602d..1f415886f 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -80,29 +80,29 @@ } //添加标题时确定按钮 - function add_poll_question(doc,quest_type,quest_id) + function add_poll_question(doc,quest_type) { var title = $.trim($("#poll_questions_title").val()); var score = $.trim($("#question_score").val()); var standard_ans = $.trim($("#question_standard_ans").val()); if(title.length == 0 || score.length == 0){ alert("题目标题/分数不能为空"); - }/*else if(standard_ans.length == 0) { + }else if(quest_type !=3 && standard_ans.length == 0) { alert("标准答案不能为空"); - }*/else{ + }else{ doc.parent().parent().parent().submit();} } //修改标题时确定按钮 - function edit_poll_question(doc,id) + function edit_poll_question(doc,id,quest_type) { var title = $.trim($("#poll_questions_title_" + id).val()); var score = $.trim($("#poll_question_score_"+ id).val()); var standard_ans = $.trim($("#poll_question_standard_answer_" + id).val()); if(title.length == 0 || score.length == 0){ alert("题目标题/分数不能为空"); - }/*else if(standard_ans.length == 0) { + }else if(quest_type !=3 && standard_ans.length == 0) { alert("标准答案不能为空"); - }*/else{ + }else{ doc.parent().parent().parent().submit();} } diff --git a/app/views/exercise/_exercises_list.html.erb b/app/views/exercise/_exercises_list.html.erb index 16fa24b0e..d1774f637 100644 --- a/app/views/exercise/_exercises_list.html.erb +++ b/app/views/exercise/_exercises_list.html.erb @@ -11,7 +11,7 @@
        <% @exercises.each do |exercise|%> -
          +
            <%= render :partial => 'exercise', :locals => {:exercise => exercise} %>
          diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb index b749c4374..d65e01ca7 100644 --- a/app/views/exercise/_new_MC.html.erb +++ b/app/views/exercise/_new_MC.html.erb @@ -52,7 +52,7 @@
        - 保存 + 保存 取消
        diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb index a7029d3ea..0555b997c 100644 --- a/app/views/exercise/_new_MCQ.html.erb +++ b/app/views/exercise/_new_MCQ.html.erb @@ -52,7 +52,7 @@
        - 保存 + 保存 取消
        diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb index 1ee79e198..08b31087a 100644 --- a/app/views/exercise/_new_single.html.erb +++ b/app/views/exercise/_new_single.html.erb @@ -40,7 +40,7 @@
        - 保存 + 保存 取消
        diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb index b932eac1e..5c214165a 100644 --- a/app/views/exercise/_show_MC.html.erb +++ b/app/views/exercise/_show_MC.html.erb @@ -90,7 +90,7 @@ ''+ '
        '+ '
        '+ - ''+ + ''+ '保存'+ ''+ ''+ diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb index 2a91afab5..1e42d23d5 100644 --- a/app/views/exercise/_show_MCQ.html.erb +++ b/app/views/exercise/_show_MCQ.html.erb @@ -89,7 +89,7 @@ ''+ '
        '+ '
        '+ - ''+ + ''+ '保存'+ ''+ ''+ diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb index 5f36a931e..ebc85dea6 100644 --- a/app/views/exercise/_show_single.html.erb +++ b/app/views/exercise/_show_single.html.erb @@ -65,7 +65,7 @@ ''+ '
        '+ '
        '+ - ''+ + ''+ '保存'+ ''+ ''+ diff --git a/app/views/exercise/index.html.erb b/app/views/exercise/index.html.erb index 1e2d6ff34..3cff84e1c 100644 --- a/app/views/exercise/index.html.erb +++ b/app/views/exercise/index.html.erb @@ -5,7 +5,7 @@ $('#ajax-modal').html("
        " + "
        " + "
        " + - "

        取消发布后问卷统计结果将会被清空
        是否确定取消发布该问卷？

        " + + "

        取消发布后学生答题将会被清空
        是否确定取消发布该测验？

        " + "
        " + "确  定" + "取  消" + diff --git a/app/views/exercise/republish_exercise.js.erb b/app/views/exercise/republish_exercise.js.erb index 320cd3cf0..b7172fe9e 100644 --- a/app/views/exercise/republish_exercise.js.erb +++ b/app/views/exercise/republish_exercise.js.erb @@ -1,4 +1,4 @@ -$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise_content',:locals => {:exercise => @exercise}) %>"); +$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise}) %>"); $('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_poll_republish_success)}) %>"); showModal('ajax-modal', '250px'); //$('#ajax-modal').css('height','80px'); From 550d0566304cddd455759fb3e03c550c42e1139e Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 20:55:37 +0800 Subject: [PATCH 205/285] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9F=90=E4=B8=AA?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=E5=90=8E=E9=A1=BA=E5=BA=8F=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index c8e5bf27c..cd1f32fa9 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -275,12 +275,12 @@ class ExerciseController < ApplicationController @exercise = @exercise_question.exercise if @exercise_question.question_type == 1 - ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 1).update_all(" question_number = question_number - 1") + ExerciseQuestion.where("question_number #{params[:quest_num].to_i} and question_type == 1").update_all(" question_number = question_number + 1") elsif @exercise_question.question_type == 2 - ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 2).update_all(" question_number = question_number - 1") + ExerciseQuestion.where("question_number? and question_type=?",params[:quest_num].to_i, 3).update_all(" question_number = question_number - 1") + ExerciseQuestion.where("question_number Date: Fri, 20 Nov 2015 21:14:09 +0800 Subject: [PATCH 206/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E9=A1=BA=E5=BA=8F=E4=B9=B1=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E6=B7=BB=E5=8A=A0=E7=9B=B8=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 6 +++--- app/views/exercise/_show_MC.html.erb | 2 +- app/views/exercise/_show_MCQ.html.erb | 2 +- app/views/exercise/_show_single.html.erb | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index cd1f32fa9..c8e5bf27c 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -275,12 +275,12 @@ class ExerciseController < ApplicationController @exercise = @exercise_question.exercise if @exercise_question.question_type == 1 - ExerciseQuestion.where("question_number? and question_type=?",params[:quest_num].to_i, 1).update_all(" question_number = question_number - 1") #@exercise.exercise_questions.where("question_number > #{params[:quest_num].to_i} and question_type == 1").update_all(" question_number = question_number + 1") elsif @exercise_question.question_type == 2 - ExerciseQuestion.where("question_number? and question_type=?",params[:quest_num].to_i, 2).update_all(" question_number = question_number - 1") else - ExerciseQuestion.where("question_number? and question_type=?",params[:quest_num].to_i, 3).update_all(" question_number = question_number - 1") end # @exercise_question_num = params[:quest_num].to_i # @exercise_questions.question_number = params[:quest_num].to_i - 1 diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb index b932eac1e..6f3081e5f 100644 --- a/app/views/exercise/_show_MC.html.erb +++ b/app/views/exercise/_show_MC.html.erb @@ -4,7 +4,7 @@ (<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)
        - <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id), + <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number), method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb index 2a91afab5..e4bdad3f1 100644 --- a/app/views/exercise/_show_MCQ.html.erb +++ b/app/views/exercise/_show_MCQ.html.erb @@ -3,7 +3,7 @@ <%= exercise_question.question_title %> (<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)
        - <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id), + <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number), method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb index 5f36a931e..8223f98fd 100644 --- a/app/views/exercise/_show_single.html.erb +++ b/app/views/exercise/_show_single.html.erb @@ -2,8 +2,8 @@
        第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
        <%= exercise_question.question_title %>
        - <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id), - method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> + <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number), + method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %>
        From 1df8c94b989483d2cefe12dbc42515662f752b96 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Nov 2015 21:49:36 +0800 Subject: [PATCH 207/285] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E4=B8=8D=E8=83=BD=E4=BF=9D=E5=AD=98=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...opy_course_activities_to_org_activities.rb | 40 ++--- db/schema.rb | 140 ++---------------- 2 files changed, 32 insertions(+), 148 deletions(-) diff --git a/db/migrate/20151118031602_copy_course_activities_to_org_activities.rb b/db/migrate/20151118031602_copy_course_activities_to_org_activities.rb index 08f952afa..2b5d6ba1e 100644 --- a/db/migrate/20151118031602_copy_course_activities_to_org_activities.rb +++ b/db/migrate/20151118031602_copy_course_activities_to_org_activities.rb @@ -1,25 +1,25 @@ class CopyCourseActivitiesToOrgActivities < ActiveRecord::Migration def up - count = CourseActivity.all.count/30 + 1 - for i in 1 ... count do - transaction do - CourseActivity.page(i).per(30).each do |course_act| - if course_act.course_act_type == 'Message' && !course_act.course_act.parent_id.nil? - org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{course_act.course_act.parent.id}").first - org_activity.created_at = course_act.created_at - org_activity.save - else - OrgActivity.create(:user_id => course_act.user_id, - :org_act_id => course_act.course_act_id, - :org_act_type => course_act.course_act_type, - :container_id => course_act.course_id, - :container_type => 'Course', - :created_at => course_act.created_at, - :updated_at => course_act.updated_at) - end - end - end - end + # count = CourseActivity.all.count/30 + 1 + # for i in 1 ... count do + # transaction do + # CourseActivity.page(i).per(30).each do |course_act| + # if course_act.course_act_type == 'Message' && !course_act.course_act.parent_id.nil? + # org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{course_act.course_act.parent.id}").first + # org_activity.created_at = course_act.created_at + # org_activity.save + # else + # OrgActivity.create(:user_id => course_act.user_id, + # :org_act_id => course_act.course_act_id, + # :org_act_type => course_act.course_act_type, + # :container_id => course_act.course_id, + # :container_type => 'Course', + # :created_at => course_act.created_at, + # :updated_at => course_act.updated_at) + # end + # end + # end + # end end def down diff --git a/db/schema.rb b/db/schema.rb index 27b52780d..95f79b84b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151120021958) do +ActiveRecord::Schema.define(:version => 20151120134208) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -241,58 +241,6 @@ ActiveRecord::Schema.define(:version => 20151120021958) do add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true - create_table "code_review_assignments", :force => true do |t| - t.integer "issue_id" - t.integer "change_id" - t.integer "attachment_id" - t.string "file_path" - t.string "rev" - t.string "rev_to" - t.string "action_type" - t.integer "changeset_id" - end - - create_table "code_review_project_settings", :force => true do |t| - t.integer "project_id" - t.integer "tracker_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "updated_by" - t.boolean "hide_code_review_tab", :default => false - t.integer "auto_relation", :default => 1 - t.integer "assignment_tracker_id" - t.text "auto_assign" - t.integer "lock_version", :default => 0, :null => false - t.boolean "tracker_in_review_dialog", :default => false - end - - create_table "code_review_user_settings", :force => true do |t| - t.integer "user_id", :default => 0, :null => false - t.integer "mail_notification", :default => 0, :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "code_reviews", :force => true do |t| - t.integer "project_id" - t.integer "change_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "line" - t.integer "updated_by_id" - t.integer "lock_version", :default => 0, :null => false - t.integer "status_changed_from" - t.integer "status_changed_to" - t.integer "issue_id" - t.string "action_type" - t.string "file_path" - t.string "rev" - t.string "rev_to" - t.integer "attachment_id" - t.integer "file_count", :default => 0, :null => false - t.boolean "diff_all" - end - create_table "comments", :force => true do |t| t.string "commented_type", :limit => 30, :default => "", :null => false t.integer "commented_id", :default => 0, :null => false @@ -425,8 +373,8 @@ ActiveRecord::Schema.define(:version => 20151120021958) 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" @@ -436,14 +384,14 @@ ActiveRecord::Schema.define(:version => 20151120021958) do t.string "class_period" t.integer "school_id" t.text "description" - t.integer "status", :default => 1 - t.integer "attachmenttype", :default => 2 + t.integer "status", :default => 1 + t.integer "attachmenttype", :default => 2 t.integer "lft" t.integer "rgt" - t.integer "is_public", :limit => 1, :default => 1 - t.integer "inherit_members", :limit => 1, :default => 1 - t.integer "open_student", :default => 0 - t.integer "outline", :default => 0 + t.integer "is_public", :limit => 1, :default => 1 + t.integer "inherit_members", :limit => 1, :default => 1 + t.integer "open_student", :default => 0 + t.integer "outline", :default => 0 t.integer "publish_resource", :default => 0 end @@ -573,7 +521,6 @@ ActiveRecord::Schema.define(:version => 20151120021958) do add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" -<<<<<<< .mine create_table "exercise_answers", :force => true do |t| t.integer "user_id" t.integer "exercise_question_id" @@ -592,7 +539,7 @@ ActiveRecord::Schema.define(:version => 20151120021958) do end create_table "exercise_questions", :force => true do |t| - t.string "question_title" + t.text "question_title" t.integer "question_type" t.integer "question_number" t.integer "exercise_id" @@ -621,7 +568,7 @@ ActiveRecord::Schema.define(:version => 20151120021958) do end create_table "exercises", :force => true do |t| - t.string "exercise_name" + t.text "exercise_name" t.text "exercise_description" t.integer "course_id" t.integer "exercise_status" @@ -634,68 +581,6 @@ ActiveRecord::Schema.define(:version => 20151120021958) do t.integer "show_result" end -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> .theirs create_table "first_pages", :force => true do |t| t.string "web_title" t.string "title" @@ -1180,7 +1065,7 @@ ActiveRecord::Schema.define(:version => 20151120021958) do end create_table "org_document_comments", :force => true do |t| - t.string "title" + t.text "title" t.text "content" t.integer "organization_id" t.integer "creator_id" @@ -1200,7 +1085,6 @@ ActiveRecord::Schema.define(:version => 20151120021958) do create_table "org_members", :force => true do |t| t.integer "user_id" t.integer "organization_id" - t.string "role" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false end From dbe236032b677c035f12a1448ae6ac1d3c04c028 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 21:50:27 +0800 Subject: [PATCH 208/285] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A2=98=E7=9B=AE?= =?UTF-8?q?=E6=97=B6=E5=BF=85=E9=A1=BB=E5=85=88=E4=BF=9D=E5=AD=98=E6=A0=87?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise_student.html.erb | 2 +- app/views/exercise/_exercise_student_result.html.erb | 2 +- app/views/exercise/_new_question.html.erb | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index 0f51dfeb7..45d6ccf70 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -191,7 +191,7 @@ } - > + >
        diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb index 32cb556b3..b9306b0d2 100644 --- a/app/views/exercise/_exercise_student_result.html.erb +++ b/app/views/exercise/_exercise_student_result.html.erb @@ -46,7 +46,7 @@ diff --git a/app/views/exercise/_new_question.html.erb b/app/views/exercise/_new_question.html.erb index 6148c9bb9..faadb08a9 100644 --- a/app/views/exercise/_new_question.html.erb +++ b/app/views/exercise/_new_question.html.erb @@ -8,7 +8,9 @@ \ No newline at end of file diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb index fdf1e31a3..4f9999277 100644 --- a/app/views/student_work/new.html.erb +++ b/app/views/student_work/new.html.erb @@ -121,10 +121,13 @@
        \ No newline at end of file From ccfbc1e0bdb93425667e9ee776a5ebecc2cf16b1 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 24 Nov 2015 12:50:43 +0800 Subject: [PATCH 226/285] =?UTF-8?q?1.=E7=BB=84=E7=BB=87=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0type=E5=8F=82=E6=95=B0=EF=BC=9B=202.=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=BB=84=E7=BB=87=E8=A1=A8=E4=B8=AD=E5=86=97=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E5=92=8C=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=8A=A8=E6=80=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organizations/_org_activities.html.erb | 2 +- ...1124032319_delete_useless_org_activities.rb | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20151124032319_delete_useless_org_activities.rb diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb index aa48fedf1..33ac13e76 100644 --- a/app/views/organizations/_org_activities.html.erb +++ b/app/views/organizations/_org_activities.html.erb @@ -56,7 +56,7 @@ <% end %> <% if org_act_count == 10 %> -
        展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1),:id => "more_org_activities_link",:remote => "true",:class => "none" %>
        +
        展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1, :type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %>
        <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> <% end%> diff --git a/db/migrate/20151124032319_delete_useless_org_activities.rb b/db/migrate/20151124032319_delete_useless_org_activities.rb new file mode 100644 index 000000000..705e0dbed --- /dev/null +++ b/db/migrate/20151124032319_delete_useless_org_activities.rb @@ -0,0 +1,18 @@ +class DeleteUselessOrgActivities < ActiveRecord::Migration + def up + OrgActivity.all.each do |act| + if act.container_type == 'Course' + if CourseActivity.where("course_act_type=? and course_act_id =? and course_id =?", act.org_act_type, act.org_act_id, act.container_id).count == 0 + puts "course" + end + else + if act.container_type == 'Project' and ForgeActivity.where("forge_act_type=? and forge_act_id =? and project_id =?", act.org_act_type, act.org_act_id, act.container_id).count == 0 + act.destroy + end + end + end + end + + def down + end +end From 269d2f992eecdbbc426c12184622cc2f5a4bf32e Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 24 Nov 2015 15:02:25 +0800 Subject: [PATCH 227/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E8=B0=83=E6=95=B4=E5=90=8E=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_organizations.html.erb | 6 +++--- public/stylesheets/new_user.css | 1 + public/stylesheets/org.css | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb index 50bb24000..25a0c4508 100644 --- a/app/views/users/user_organizations.html.erb +++ b/app/views/users/user_organizations.html.erb @@ -6,11 +6,11 @@
        组织列表 - <%= form_tag url_for(:controller => 'users', :action => 'search_user_orgs', :id => User.current.id), :method => 'get', :id => "search_org_form", :class=>"resourcesSearchloadBox", :style=>"float:right; margin-top:-5px;" do %> - + <%#= form_tag url_for(:controller => 'users', :action => 'search_user_orgs', :id => User.current.id), :method => 'get', :id => "search_org_form", :class=>"resourcesSearchloadBox", :style=>"float:right; margin-top:-5px;" do %> + - 搜索 + <% end %>
        diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index d18dd27d8..fd7c0c4d6 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -384,6 +384,7 @@ a.resourcesGrey:hover {font-size:12px; color:#269ac9;} a.uploadText {color:#ffffff; font-size:14px;} .resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:left; background-color:#ffffff;} .searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;} +.searchResource:focus {border:none;} .searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;} /*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/ .resourcesSearchBanner {width:710px; height:34px; margin-bottom:10px; margin-top:15px; margin-left:auto; margin-right:auto;} diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 914df16b5..daabfc99d 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -37,7 +37,7 @@ a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;} /*项目关联css*/ .relateOrg {width:335px;} .relatedList {width:335px;} -.searchOrg {height:24px; width:200px; color:#9b9b9b9; border:1px solid #15bccf;} +.searchOrg {height:24px; width:200px; color:#9b9b9b; border:1px solid #15bccf;} a.cancelBtn {padding:3px 5px; background-color:#D9D9D9; color:#656565;} a.cancelBtn:hover {background-color:#717171; color:#ffffff;} .relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;} From ec00b86c15a7eae6a02eba1c2519e6088909bc62 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 24 Nov 2015 15:17:47 +0800 Subject: [PATCH 228/285] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=A4=9A=E6=AC=A1?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E5=93=81=E6=97=B6=E6=8F=90=E9=86=92?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 10 ++++++-- .../student_work/_has_commit_work.html.erb | 24 +++++++++++++++++++ app/views/student_work/create.js.erb | 10 +++++++- 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 app/views/student_work/_has_commit_work.html.erb diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 87d13e169..7eac379e4 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -168,9 +168,15 @@ class StudentWorkController < ApplicationController def create # 提交作品前先判断是否已经提交 + @has_commit = false; if hsd_committed_work?(User.current.id, @homework.id) - flash[:notice] = l(:notice_successful_create) - redirect_to edit_student_work_url(params[:student_work]) + @work = StudentWork.where("user_id =? and homework_common_id =?", User.current.id, @homework.id).first + @has_commit = true; + #flash[:notice] = l(:notice_successful_create) + #redirect_to edit_student_work_url(params[:student_work]) + respond_to do |format| + format.js + end return end if params[:student_work] diff --git a/app/views/student_work/_has_commit_work.html.erb b/app/views/student_work/_has_commit_work.html.erb new file mode 100644 index 000000000..d324f3aaf --- /dev/null +++ b/app/views/student_work/_has_commit_work.html.erb @@ -0,0 +1,24 @@ +
        +
        +

        您已提交过作品，请不要重复提交，如果想修改作品请点击编辑。

        +
        +
        + + 编  辑 + + + 取  消 + +
        +
        +
        + + \ No newline at end of file diff --git a/app/views/student_work/create.js.erb b/app/views/student_work/create.js.erb index 42b1db8b8..afd8617aa 100644 --- a/app/views/student_work/create.js.erb +++ b/app/views/student_work/create.js.erb @@ -1,4 +1,12 @@ -<% if @submit_result%> +<% if @has_commit %> + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/has_commit_work') %>'); + showModal('ajax-modal', '500px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before("" + + ""); + $('#ajax-modal').parent().css("top","").css("left",""); + $('#ajax-modal').parent().addClass("anonymos"); +<% elsif @submit_result%> $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>'); showModal('ajax-modal', '500px'); $('#ajax-modal').siblings().remove(); From e89cb99743e1d8fa8984aa68474ac68964b103b3 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 24 Nov 2015 16:20:29 +0800 Subject: [PATCH 229/285] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 2 +- app/views/exercise/student_exercise_list.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index d53dc067c..1598030a2 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -328,7 +328,7 @@ class ExerciseController < ApplicationController def student_exercise_list @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin? @exercise = Exercise.find params[:id] - @all_exercises = @course.exercises.order("created_at desc") + @all_exercises = @course.exercises.where("exercise_status > 1").order("created_at desc") @exercise_count = @exercise.exercise_users.where('score is not NULL').count if @is_teacher || (!@exercise.exercise_users.where(:user_id => User.current.id).empty? && Time.parse(@exercise.end_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S")) @exercise_users_list = @exercise.exercise_users.where('score is not NULL') diff --git a/app/views/exercise/student_exercise_list.html.erb b/app/views/exercise/student_exercise_list.html.erb index 8653836ca..2e51d61af 100644 --- a/app/views/exercise/student_exercise_list.html.erb +++ b/app/views/exercise/student_exercise_list.html.erb @@ -73,7 +73,7 @@
          <% @all_exercises.each_with_index do |exercise,index |%>
        • - <%= link_to "作业#{@all_exercises.count - index}：#{exercise.exercise_name}",''%> + <%= link_to "测验#{@all_exercises.count - index}：#{exercise.exercise_name}",student_exercise_list_exercise_path(exercise.id,:course_id => @course.id)%> <%#= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%>
          • <% end%> From 0e7cf4b122c7df17684b1a80b8efd08227453ab2 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 24 Nov 2015 16:21:25 +0800 Subject: [PATCH 230/285] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=89=B9=E6=AC=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=B7=B2=E5=8F=91=E5=B8=83=E7=9A=84?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 9ad46cd69..3c60fcaed 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -76,7 +76,7 @@ class StudentWorkController < ApplicationController end ################################################################################################################## @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group] - @homework_commons = @course.homework_commons.order("created_at desc") + @homework_commons = @course.homework_commons.where("publish_time <= ?",Time.now.strftime("%Y-%m-%d")).order("created_at desc") @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin? @is_evaluation = @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评 @show_all = false From 3a66b1859c716bb9668f6805cb9df1fbadfb2e23 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 24 Nov 2015 16:47:31 +0800 Subject: [PATCH 231/285] =?UTF-8?q?reserved=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 4563944c8..ea172b554 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2081,7 +2081,7 @@ zh: label_co_organizer_BHU: 北京航空航天大学 label_co_organizer_CAS: 中国科学院软件研究所 label_co_organizer_InforS: 中创软件 - label_rights_reserved: Copyright 2007~2015, All Rights Riserved + label_rights_reserved: Copyright 2007~2015, All Rights Reserved label_about_us: 关于我们 label_contact_us: 联系我们 label_recruitment_information: 招聘信息 From 85515befc450a1e4ce0f9777c0abb8d466e398a3 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 24 Nov 2015 17:29:57 +0800 Subject: [PATCH 232/285] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=A0=8F=E6=95=B0=E5=AD=97=E5=A4=A7=E4=BA=8E0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=B0=8F=E4=BA=8E0=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/courses_helper.rb | 4 ++ app/views/courses/_tool_expand.html.erb | 60 +++++++++++++++++++++++++ app/views/layouts/base_courses.html.erb | 21 +++++++++ public/javascripts/course.js | 57 +++++++++++++++++++++++ public/stylesheets/courses.css | 11 ++++- 5 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 app/views/courses/_tool_expand.html.erb diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index caca6fb1e..7c1831d56 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -25,6 +25,10 @@ module CoursesHelper # searchTeacherAndAssistant(project).count end + def show_nav?(count) + count == 0 ? true : false + end + #课程模块需要展示的模块 def course_model @nav_dispaly_course_all_label = 1 diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb new file mode 100644 index 000000000..1f793de90 --- /dev/null +++ b/app/views/courses/_tool_expand.html.erb @@ -0,0 +1,60 @@ +<% course_file_num = visable_attachemnts_incourse(@course).count%> +<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> +<% if show_nav?(@course.course_activities.count) %> +
          + <%= link_to l(:label_activity), course_path(@course), :class => "f14 c_blue02" %> + + <%= link_to "(#{@course.course_activities.count})", course_path(@course), :class => "subnav_num c_orange"%> +
          +<% end %> +<% if show_nav?(@course.homework_commons.count) %> +
          + <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%> + <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%> + <%= link_to( "+#{l(:label_course_homework_new)}", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'subnav_green c_white') if is_teacher %> +
          +<% end %> +<% if show_nav?(@course.news.count) %> +
          + <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %> + <%= link_to "(#{@course.news.count})", course_news_index_path(@course), :class => "subnav_num c_orange"%> + <%= link_to( "+#{l(:label_course_news_new)}", new_course_news_path(@course), :class => 'subnav_green c_white') if is_teacher %> +
          +<% end %> +<% if show_nav?(course_file_num) %> +
          + <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %> + <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %> + <% if is_teacher || (@course.publish_resource == 1 && User.current.member_of_course?(@course)) %> + + +上传资源 + <% end %> +
          +<% end %> +<% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %> +
          + <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %> + <%= link_to "(#{@course.boards.first ? @course.boards.first.topics.count : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %> + <%= link_to( "+#{l(:label_message_new)}",course_boards_path(@course, :flag => true, :is_new => 1),:class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %> +
          +<% end %> +<% if show_nav?(course_feedback_count) %> +
          + <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %> + <%= link_to "(#{course_feedback_count})", course_feedback_path(@course), :class => "subnav_num c_orange", :id => "course_jour_count"%> +
          +<% end %> +<% if show_nav?(course_poll_count) %> +
          + <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%> + <%= link_to "(#{course_poll_count})", poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => "subnav_num c_orange" %> + <%= link_to( "+#{l(:label_new_poll)}", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'subnav_green c_white') if is_teacher %> +
          +<% end %> +<% if show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %> +
          + <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%> + <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %> + <%= link_to( "+新建试卷", new_exercise_path(:course_id => @course.id), :class => 'subnav_green c_white') if is_teacher %> +
          +<% end %> \ No newline at end of file diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 106aa35a7..8b15e67ea 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -136,21 +136,28 @@
        + <% unless show_nav?(@course.course_activities.count) %>
        <%= link_to l(:label_activity), course_path(@course), :class => "f14 c_blue02" %> <%= link_to "(#{@course.course_activities.count})", course_path(@course), :class => "subnav_num c_orange"%>
        + <% end %> + <% unless show_nav?(@course.homework_commons.count) %>
        <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%> <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%> <%= link_to( "+#{l(:label_course_homework_new)}", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'subnav_green c_white') if is_teacher %>
        + <% end %> + <% unless show_nav?(@course.news.count) %>
        <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %> <%= link_to "(#{@course.news.count})", course_news_index_path(@course), :class => "subnav_num c_orange"%> <%= link_to( "+#{l(:label_course_news_new)}", new_course_news_path(@course), :class => 'subnav_green c_white') if is_teacher %>
        + <% end %> + <% unless show_nav?(course_file_num) %>
        <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %> <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %> @@ -159,25 +166,39 @@ +上传资源 <% end %>
        + <% end %> + <% unless show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
        <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %> <%= link_to "(#{@course.boards.first ? @course.boards.first.topics.count : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %> <%= link_to( "+#{l(:label_message_new)}",course_boards_path(@course, :flag => true, :is_new => 1),:class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %>
        + <% end %> + <% unless show_nav?(course_feedback_count) %>
        <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %> <%= link_to "(#{course_feedback_count})", course_feedback_path(@course), :class => "subnav_num c_orange", :id => "course_jour_count"%>
        + <% end %> + <% unless show_nav?(course_poll_count) %>
        <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%> <%= link_to "(#{course_poll_count})", poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => "subnav_num c_orange" %> <%= link_to( "+#{l(:label_new_poll)}", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'subnav_green c_white') if is_teacher %>
        + <% end %> + <% unless show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %>
        <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%> <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %> <%= link_to( "+新建试卷", new_exercise_path(:course_id => @course.id), :class => 'subnav_green c_white') if is_teacher %>
        + <% end %> + <%# 工具栏展开 %> + +
        diff --git a/public/javascripts/course.js b/public/javascripts/course.js index 9f1815695..15968772f 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -1306,3 +1306,60 @@ function cancel_org_course_relation(id, courseId){ // alert('<%= @course.id%>') // }) //}) + +//项目点击展开 +function expand_tools_expand(content) { + if (content == "invit") { + $("#expand_tools_expand_invit").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd"); + $("#expand_tools_expand_invit").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt"); + $("#expand_tools_expand_invit").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500); + } + else { +// $("#expand_tools_expand").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd"); +// $("#expand_tools_expand").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt"); +// $("#expand_tools_expand").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500); + $("#navContent").toggle(500); + } + + // 修改数字控制速度， slideUp(500)控制卷起速度 +} + +//通过cookie存储伸开形式 +$(function(){ + var personalized_expand_key = "personalized_expand"; + function personalized_init(){ + var personalized_map = cookieget(personalized_expand_key); + if(personalized_map!=false){ + personalized_map = JSON.parse(personalized_map); + $("*[nhtype='toggle4cookie']").each(function(){ + var personalized_id=$(this).data('id'); + var val = personalized_map[personalized_id]; + if(val!=undefined && val!=$(this).data('val')){ + personalized_click($(this),0); + } + }); + } + } + function personalized_click(obj,timeout){ + var target = $(obj.data('target')); + var oldval = obj.data('val'); + var val=''; + if(oldval=='expand'){val='retract';}else{val='expand';} + obj.data('val',val); + var personalized_map = cookieget(personalized_expand_key); + if(personalized_map == false){ + personalized_map={}; + }else{ + personalized_map = JSON.parse(personalized_map); + } + var personalized_id=obj.data('id'); + personalized_map[personalized_id]=val; + cookiesave(personalized_expand_key,JSON.stringify(personalized_map)); + target.toggle(timeout); + } + $("*[nhtype='toggle4cookie']").on('click',function(){ + personalized_click($(this),500); + }); + + personalized_init(); +}); \ No newline at end of file diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 5ff34a4e1..e71eb975c 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1166,4 +1166,13 @@ a:hover.testEdit{ background:url(images/icons.png) -21px -272px no-repeat;} .questionEditContainer {border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px; margin-top:10px;} .fillInput {border:1px solid #cbcbcb; padding-left:5px; background-color:#ffffff; width:693px; height:30px; color:#888888;} .mr130 {margin-right:130px;} -.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; } \ No newline at end of file +.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; } + +/*20151123课程排行榜Tim*/ +.courseMenuSetting {background:url(../images/homepage_icon2.png) -190px -365px no-repeat; width:15px; height:15px; margin-top:3px; float:right; margin-right:5px;} +.courseMenuSetting:hover {background:url(../images/homepage_icon2.png) -190px -407px no-repeat;} +.rankList {width:220px; padding:10px; background-color:#ffffff; margin-top:10px;} +.rankList li {width:73px; padding:5px 0px; text-align:center; float:left; position:relative;} +.rankList li p {width:100%; overflow:hidden; white-space:normal; text-overflow:ellipsis; color:#585858;} +.rankPortrait {border-radius:50%; width:35px; height:35px;} +.numIntro {position:absolute; text-align:left; z-index:999; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); border:1px solid #eaeaea; background-color:#ffffff; padding:3px 5px; left:15px; width:65px; color:#585858;} \ No newline at end of file From 2dc31637d862c11911ee26004c0f3d81d978f677 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 24 Nov 2015 17:29:58 +0800 Subject: [PATCH 233/285] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=92=8C=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E5=8A=A0=E5=85=A5=E7=BB=84=E7=BB=87=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=B7=B2=E7=BB=8F=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E4=BA=86=E6=9F=90=E7=BB=84=E7=BB=87=EF=BC=8C=E5=B0=B1=E4=B8=8D?= =?UTF-8?q?=E8=A6=81=E9=87=8D=E5=A4=8D=E5=8A=A0=E5=85=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_courses_controller.rb | 4 +++- app/controllers/org_projects_controller.rb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/org_courses_controller.rb b/app/controllers/org_courses_controller.rb index 3d1d313c5..d054e41de 100644 --- a/app/controllers/org_courses_controller.rb +++ b/app/controllers/org_courses_controller.rb @@ -3,7 +3,9 @@ class OrgCoursesController < ApplicationController org_ids = params[:orgNames] @course = Course.find(params[:course_id]) org_ids.each do |org_id| - OrgCourse.create(:organization_id => org_id.to_i, :course_id => params[:course_id].to_i, :created_at => Time.now) + if OrgCourse.where("organization_id =? and course_id =?", org_id.to_i, params[:course_id].to_i).count == 0 + OrgCourse.create(:organization_id => org_id.to_i, :course_id => params[:course_id].to_i, :created_at => Time.now) + end end respond_to do |format| format.js diff --git a/app/controllers/org_projects_controller.rb b/app/controllers/org_projects_controller.rb index 29e60a62a..a455ce408 100644 --- a/app/controllers/org_projects_controller.rb +++ b/app/controllers/org_projects_controller.rb @@ -3,7 +3,9 @@ class OrgProjectsController < ApplicationController org_ids = params[:orgNames] @project = Project.find(params[:project_id]) org_ids.each do |org_id| - OrgProject.create(:organization_id => org_id.to_i, :project_id => params[:project_id].to_i, :created_at => Time.now) + if OrgProject.where("organization_id =? and project_id =?", org_id.to_i, @project.id).count == 0 + OrgProject.create(:organization_id => org_id.to_i, :project_id => params[:project_id].to_i, :created_at => Time.now) + end end respond_to do |format| format.js From 1ae514ca4857d7e2ad53b338731c1e01f899fb4d Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 25 Nov 2015 09:38:13 +0800 Subject: [PATCH 234/285] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E7=9A=84=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=97=A5=E6=9C=9F=E5=92=8C=E6=B5=8B=E9=AA=8C=E6=97=B6?= =?UTF-8?q?=E9=95=BF=E5=81=9A=E6=88=90=E5=8F=AF=E9=80=89=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 5 +- app/views/exercise/_edit_head.html.erb | 17 +++--- app/views/exercise/_exercise_form.html.erb | 60 +++++++++---------- app/views/exercise/_exercise_teacher.html.erb | 8 ++- app/views/exercise/_show_head.html.erb | 9 ++- public/stylesheets/courses.css | 2 +- 6 files changed, 53 insertions(+), 48 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 1598030a2..6fcbb0c6c 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -65,7 +65,6 @@ class ExerciseController < ApplicationController :end_time => "", :publish_time => "", :exercise_description => "", - :show_result => "", :show_result => 1 } @exercise = Exercise.create option @@ -104,10 +103,10 @@ class ExerciseController < ApplicationController def update @exercise.exercise_name = params[:exercise][:exercise_name] @exercise.exercise_description = params[:exercise][:exercise_description] - @exercise.time = params[:exercise][:time] + @exercise.time = params[:exercise][:time].blank? ? -1 : params[:exercise][:time] @exercise.end_time = params[:exercise][:end_time] @exercise.publish_time = params[:exercise][:publish_time] - @exercise.show_result = params[:exercise][:show_result] + @exercise.show_result = params[:exercise][:show_result].blank? ? 1 : params[:exercise][:show_result] if @exercise.save respond_to do |format| format.js diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb index 3090cc2c5..6c357130c 100644 --- a/app/views/exercise/_edit_head.html.erb +++ b/app/views/exercise/_edit_head.html.erb @@ -6,18 +6,17 @@ <%# if edit_mode %> <%# end %> -
        - " > - <%= calendar_for('exercise_publish_time')%> -
        - <%# if edit_mode %> - - <%# end %> +
        - " > + "/> <%= calendar_for('exercise_end_time')%>
        -
        测验时长:分钟
        +
        测验时长:分钟
        + +
        + "/> + <%= calendar_for('exercise_publish_time')%> +
        diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index 1f415886f..cabd0b5e4 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -112,14 +112,10 @@ var title = $.trim($("#exercise_name").val()); if(title.length == 0){ alert("测验标题不能为空"); - } else if($.trim($("#exercise_publish_time").val()) =="") { - alert("发布时间不能为空"); } else if($.trim($("#exercise_end_time").val()) =="") { alert("截止时间不能为空"); - } else if($.trim($("#exercise_time").val()) =="") { - alert("考试时长不能为空"); - } else if(Date.parse($("#exercise_end_time").val()) <= Date.parse($("#exercise_publish_time").val())) { - alert("截止时间必须大于发布时间"); + } else if(Date.parse($("#exercise_end_time").val()) < Date.now()) { + alert("截止时间不能小于当前时间"); } else { doc.parent().parent().parent().submit(); @@ -162,33 +158,35 @@ }
        -
        - - -
        - <%= render :partial => 'edit_head', :locals => {:exercise => @exercise}%> -
        - <% current_score = get_current_score @exercise %> -
        " id="current_score_div">目前试卷总分：<%=current_score %>分
        - -
        - <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise}%> -
        +
        + + +
        + <%= render :partial => 'edit_head', :locals => {:exercise => @exercise} %> +
        + <% current_score = get_current_score @exercise %> +
        " id="current_score_div">目前试卷总分：<%= current_score %> + 分
        + +
        + <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise} %> +
        -
        - <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %> -
        +
        + <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %> +
        + - -
        -
        + +
        +
        -
        - <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %> +
        + <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %> +
        +
        +
        -
        - -
        diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb index a3f6380cf..0a96b782b 100644 --- a/app/views/exercise/_exercise_teacher.html.erb +++ b/app/views/exercise/_exercise_teacher.html.erb @@ -10,9 +10,13 @@

        <%= exercise.exercise_name%>

        - 发布时间：<%=format_time(exercise.publish_time.to_s) %> + <% unless exercise.publish_time.nil? %> + 发布时间：<%=format_time(exercise.publish_time.to_s) %> + <% end %> 截止时间：<%=format_time(exercise.end_time.to_s) %> - 测验时长：<%=exercise.time %>分钟 + <% if exercise.time != -1 %> + 测验时长：<%=exercise.time %>分钟 + <% end %>
        <%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%>
        diff --git a/app/views/exercise/_show_head.html.erb b/app/views/exercise/_show_head.html.erb index ac7c1c162..16a572583 100644 --- a/app/views/exercise/_show_head.html.erb +++ b/app/views/exercise/_show_head.html.erb @@ -3,9 +3,14 @@

        <%= exercise.exercise_name%>

        - 发布时间：<%=Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%> + <% unless exercise.publish_time.nil? %> + 发布时间：<%=Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%> + <% end %> 截止时间：<%=Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.end_time %> - 测验时长：<%= exercise.time %>分钟
        + <% if exercise.time != -1 %> + 测验时长：<%= exercise.time %>分钟 + <% end %> +
        <%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%>
        diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 5ff34a4e1..b7a742994 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1156,7 +1156,7 @@ a:hover.btn_cancel{ color:#666;} .mr118 {margin-right:118px !important;} .questionContainer {width:698px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;} .questionTitle{ width:644px; height:30px; border:1px solid #cbcbcb; padding-left:5px; background:#fff;} -.examTime {width:40px; border:1px solid #cbcbcb; outline:none; height:28px; text-align:center; padding-left:0px; } +.examTime {width:90px; border:1px solid #cbcbcb; outline:none; height:28px; text-align:center; padding-left:0px; } .testStatus{width:698px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px; background:#ffffff; position:relative; color:#767676;} .testEdit{ background:url(images/icons.png) 0px -272px no-repeat; width:16px; height:27px; display:block;float:right; bottom:10px; right:10px; position:absolute;} a:hover.testEdit{ background:url(images/icons.png) -21px -272px no-repeat;} From 394d60049d0f0ea4a3860358babe5ebe9ce6aa3e Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 25 Nov 2015 09:48:20 +0800 Subject: [PATCH 235/285] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema.rb | 59 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 95f79b84b..97c566feb 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151120134208) do +ActiveRecord::Schema.define(:version => 20151124032319) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -241,6 +241,58 @@ ActiveRecord::Schema.define(:version => 20151120134208) do add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true + create_table "code_review_assignments", :force => true do |t| + t.integer "issue_id" + t.integer "change_id" + t.integer "attachment_id" + t.string "file_path" + t.string "rev" + t.string "rev_to" + t.string "action_type" + t.integer "changeset_id" + end + + create_table "code_review_project_settings", :force => true do |t| + t.integer "project_id" + t.integer "tracker_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "updated_by" + t.boolean "hide_code_review_tab", :default => false + t.integer "auto_relation", :default => 1 + t.integer "assignment_tracker_id" + t.text "auto_assign" + t.integer "lock_version", :default => 0, :null => false + t.boolean "tracker_in_review_dialog", :default => false + end + + create_table "code_review_user_settings", :force => true do |t| + t.integer "user_id", :default => 0, :null => false + t.integer "mail_notification", :default => 0, :null => false + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "code_reviews", :force => true do |t| + t.integer "project_id" + t.integer "change_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "line" + t.integer "updated_by_id" + t.integer "lock_version", :default => 0, :null => false + t.integer "status_changed_from" + t.integer "status_changed_to" + t.integer "issue_id" + t.string "action_type" + t.string "file_path" + t.string "rev" + t.string "rev_to" + t.integer "attachment_id" + t.integer "file_count", :default => 0, :null => false + t.boolean "diff_all" + end + create_table "comments", :force => true do |t| t.string "commented_type", :limit => 30, :default => "", :null => false t.integer "commented_id", :default => 0, :null => false @@ -539,7 +591,7 @@ ActiveRecord::Schema.define(:version => 20151120134208) do end create_table "exercise_questions", :force => true do |t| - t.text "question_title" + t.string "question_title" t.integer "question_type" t.integer "question_number" t.integer "exercise_id" @@ -568,7 +620,7 @@ ActiveRecord::Schema.define(:version => 20151120134208) do end create_table "exercises", :force => true do |t| - t.text "exercise_name" + t.string "exercise_name" t.text "exercise_description" t.integer "course_id" t.integer "exercise_status" @@ -1085,6 +1137,7 @@ ActiveRecord::Schema.define(:version => 20151120134208) do create_table "org_members", :force => true do |t| t.integer "user_id" t.integer "organization_id" + t.string "role" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false end From ec42cd2d7fcddede22495b556e0b699575917636 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 25 Nov 2015 10:12:20 +0800 Subject: [PATCH 236/285] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema.rb | 3556 ++++++++++++++++++++++++++------------------------ 1 file changed, 1870 insertions(+), 1686 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 6aa6da41d..97c566feb 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,1686 +1,1870 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended to check this file into your version control system. - -ActiveRecord::Schema.define(:version => 20150826061843) do - - create_table "activities", :force => true do |t| - t.integer "act_id", :null => false - t.string "act_type", :null => false - t.integer "user_id", :null => false - t.integer "activity_container_id" - t.string "activity_container_type", :default => "" - t.datetime "created_at" - end - - add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type" - add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type" - add_index "activities", ["user_id"], :name => "index_activities_on_user_id" - - create_table "activity_notifies", :force => true do |t| - t.integer "activity_container_id" - t.string "activity_container_type" - t.integer "activity_id" - t.string "activity_type" - t.integer "notify_to" - t.datetime "created_on" - t.integer "is_read" - end - - add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id" - add_index "activity_notifies", ["created_on"], :name => "index_an_created_on" - add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to" - - create_table "api_keys", :force => true do |t| - t.string "access_token" - t.datetime "expires_at" - t.integer "user_id" - t.boolean "active", :default => true - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token" - add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id" - - create_table "applied_projects", :force => true do |t| - t.integer "project_id", :null => false - t.integer "user_id", :null => false - end - - create_table "apply_project_masters", :force => true do |t| - t.integer "user_id" - t.string "apply_type" - t.integer "apply_id" - t.integer "status" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "attachments", :force => true do |t| - t.integer "container_id" - t.string "container_type", :limit => 30 - t.string "filename", :default => "", :null => false - t.string "disk_filename", :default => "", :null => false - t.integer "filesize", :default => 0, :null => false - t.string "content_type", :default => "" - t.string "digest", :limit => 40, :default => "", :null => false - t.integer "downloads", :default => 0, :null => false - t.integer "author_id", :default => 0, :null => false - t.datetime "created_on" - t.string "description" - t.string "disk_directory" - t.integer "attachtype", :default => 1 - t.integer "is_public", :default => 1 - t.integer "copy_from" - t.integer "quotes" - end - - add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id" - add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type" - add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on" - - create_table "attachmentstypes", :force => true do |t| - t.integer "typeId", :null => false - t.string "typeName", :limit => 50 - end - - create_table "auth_sources", :force => true do |t| - t.string "type", :limit => 30, :default => "", :null => false - t.string "name", :limit => 60, :default => "", :null => false - t.string "host", :limit => 60 - t.integer "port" - t.string "account" - t.string "account_password", :default => "" - t.string "base_dn" - t.string "attr_login", :limit => 30 - t.string "attr_firstname", :limit => 30 - t.string "attr_lastname", :limit => 30 - t.string "attr_mail", :limit => 30 - t.boolean "onthefly_register", :default => false, :null => false - t.boolean "tls", :default => false, :null => false - t.string "filter" - t.integer "timeout" - end - - add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type" - - create_table "biding_projects", :force => true do |t| - t.integer "project_id" - t.integer "bid_id" - t.integer "user_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - end - - create_table "bids", :force => true do |t| - t.string "name" - t.string "budget", :null => false - t.integer "author_id" - t.date "deadline" - t.text "description" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - t.integer "commit" - t.integer "reward_type" - t.integer "homework_type" - t.integer "parent_id" - t.string "password" - t.integer "is_evaluation" - t.integer "proportion", :default => 60 - t.integer "comment_status", :default => 0 - t.integer "evaluation_num", :default => 3 - t.integer "open_anonymous_evaluation", :default => 1 - end - - create_table "boards", :force => true do |t| - t.integer "project_id", :null => false - t.string "name", :default => "", :null => false - t.string "description" - t.integer "position", :default => 1 - t.integer "topics_count", :default => 0, :null => false - t.integer "messages_count", :default => 0, :null => false - t.integer "last_message_id" - t.integer "parent_id" - t.integer "course_id" - end - - add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id" - add_index "boards", ["project_id"], :name => "boards_project_id" - - create_table "bug_to_osps", :force => true do |t| - t.integer "osp_id" - t.integer "relative_memo_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "changes", :force => true do |t| - t.integer "changeset_id", :null => false - t.string "action", :limit => 1, :default => "", :null => false - t.text "path", :null => false - t.text "from_path" - t.string "from_revision" - t.string "revision" - t.string "branch" - end - - add_index "changes", ["changeset_id"], :name => "changesets_changeset_id" - - create_table "changeset_parents", :id => false, :force => true do |t| - t.integer "changeset_id", :null => false - t.integer "parent_id", :null => false - end - - add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids" - add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids" - - create_table "changesets", :force => true do |t| - t.integer "repository_id", :null => false - t.string "revision", :null => false - t.string "committer" - t.datetime "committed_on", :null => false - t.text "comments" - t.date "commit_date" - t.string "scmid" - t.integer "user_id" - end - - add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on" - add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true - add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid" - add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id" - add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id" - - create_table "changesets_issues", :id => false, :force => true do |t| - t.integer "changeset_id", :null => false - t.integer "issue_id", :null => false - end - - add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true - - create_table "code_review_assignments", :force => true do |t| - t.integer "issue_id" - t.integer "change_id" - t.integer "attachment_id" - t.string "file_path" - t.string "rev" - t.string "rev_to" - t.string "action_type" - t.integer "changeset_id" - end - - create_table "code_review_project_settings", :force => true do |t| - t.integer "project_id" - t.integer "tracker_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "updated_by" - t.boolean "hide_code_review_tab", :default => false - t.integer "auto_relation", :default => 1 - t.integer "assignment_tracker_id" - t.text "auto_assign" - t.integer "lock_version", :default => 0, :null => false - t.boolean "tracker_in_review_dialog", :default => false - end - - create_table "code_review_user_settings", :force => true do |t| - t.integer "user_id", :default => 0, :null => false - t.integer "mail_notification", :default => 0, :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "code_reviews", :force => true do |t| - t.integer "project_id" - t.integer "change_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "line" - t.integer "updated_by_id" - t.integer "lock_version", :default => 0, :null => false - t.integer "status_changed_from" - t.integer "status_changed_to" - t.integer "issue_id" - t.string "action_type" - t.string "file_path" - t.string "rev" - t.string "rev_to" - t.integer "attachment_id" - t.integer "file_count", :default => 0, :null => false - t.boolean "diff_all" - end - - create_table "comments", :force => true do |t| - t.string "commented_type", :limit => 30, :default => "", :null => false - t.integer "commented_id", :default => 0, :null => false - t.integer "author_id", :default => 0, :null => false - t.text "comments" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - end - - add_index "comments", ["author_id"], :name => "index_comments_on_author_id" - add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type" - - create_table "contest_notifications", :force => true do |t| - t.text "title" - t.text "content" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "contesting_projects", :force => true do |t| - t.integer "project_id" - t.string "contest_id" - t.integer "user_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - end - - create_table "contesting_softapplications", :force => true do |t| - t.integer "softapplication_id" - t.integer "contest_id" - t.integer "user_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - end - - create_table "contestnotifications", :force => true do |t| - t.integer "contest_id" - t.string "title" - t.string "summary" - t.text "description" - t.integer "author_id" - t.integer "notificationcomments_count" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "contests", :force => true do |t| - t.string "name" - t.string "budget", :default => "" - t.integer "author_id" - t.date "deadline" - t.string "description" - t.integer "commit" - t.string "password" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - end - - create_table "course_activities", :force => true do |t| - t.integer "user_id" - t.integer "course_id" - t.integer "course_act_id" - t.string "course_act_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "course_attachments", :force => true do |t| - t.string "filename" - t.string "disk_filename" - t.integer "filesize" - t.string "content_type" - t.string "digest" - t.integer "downloads" - t.string "author_id" - t.string "integer" - t.string "description" - t.string "disk_directory" - t.integer "attachtype" - t.integer "is_public" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "container_id", :default => 0 - end - - create_table "course_groups", :force => true do |t| - t.string "name" - t.integer "course_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "course_infos", :force => true do |t| - t.integer "course_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "course_messages", :force => true do |t| - t.integer "user_id" - t.integer "course_id" - t.integer "course_message_id" - t.string "course_message_type" - t.integer "viewed" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "content" - t.integer "status" - end - - create_table "course_statuses", :force => true do |t| - t.integer "changesets_count" - t.integer "watchers_count" - t.integer "course_id" - t.float "grade", :default => 0.0 - t.integer "course_ac_para", :default => 0 - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "courses", :force => true do |t| - t.integer "tea_id" - t.string "name" - t.integer "state" - t.string "code" - t.integer "time" - t.string "extra" - 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" - t.integer "school_id" - t.text "description" - t.integer "status", :default => 1 - t.integer "attachmenttype", :default => 2 - t.integer "lft" - t.integer "rgt" - t.integer "is_public", :limit => 1, :default => 1 - t.integer "inherit_members", :limit => 1, :default => 1 - t.integer "open_student", :default => 0 - end - - create_table "custom_fields", :force => true do |t| - t.string "type", :limit => 30, :default => "", :null => false - t.string "name", :limit => 30, :default => "", :null => false - t.string "field_format", :limit => 30, :default => "", :null => false - t.text "possible_values" - t.string "regexp", :default => "" - t.integer "min_length", :default => 0, :null => false - t.integer "max_length", :default => 0, :null => false - t.boolean "is_required", :default => false, :null => false - t.boolean "is_for_all", :default => false, :null => false - t.boolean "is_filter", :default => false, :null => false - t.integer "position", :default => 1 - t.boolean "searchable", :default => false - t.text "default_value" - t.boolean "editable", :default => true - t.boolean "visible", :default => true, :null => false - t.boolean "multiple", :default => false - end - - add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type" - - create_table "custom_fields_projects", :id => false, :force => true do |t| - t.integer "custom_field_id", :default => 0, :null => false - t.integer "project_id", :default => 0, :null => false - end - - add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true - - create_table "custom_fields_trackers", :id => false, :force => true do |t| - t.integer "custom_field_id", :default => 0, :null => false - t.integer "tracker_id", :default => 0, :null => false - end - - add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true - - create_table "custom_values", :force => true do |t| - t.string "customized_type", :limit => 30, :default => "", :null => false - t.integer "customized_id", :default => 0, :null => false - t.integer "custom_field_id", :default => 0, :null => false - t.text "value" - end - - add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" - add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" - - create_table "delayed_jobs", :force => true do |t| - t.integer "priority", :default => 0, :null => false - t.integer "attempts", :default => 0, :null => false - t.text "handler", :null => false - t.text "last_error" - t.datetime "run_at" - t.datetime "locked_at" - t.datetime "failed_at" - t.string "locked_by" - t.string "queue" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" - - create_table "discuss_demos", :force => true do |t| - t.string "title" - t.text "body" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "documents", :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.integer "category_id", :default => 0, :null => false - t.string "title", :limit => 60, :default => "", :null => false - t.text "description" - t.datetime "created_on" - t.integer "user_id", :default => 0 - t.integer "is_public", :default => 1 - end - - add_index "documents", ["category_id"], :name => "index_documents_on_category_id" - add_index "documents", ["created_on"], :name => "index_documents_on_created_on" - add_index "documents", ["project_id"], :name => "documents_project_id" - - create_table "dts", :force => true do |t| - t.string "IPLineCode" - t.string "Description" - t.string "Num" - t.string "Variable" - t.string "TraceInfo" - t.string "Method" - t.string "File" - t.string "IPLine" - t.string "Review" - t.string "Category" - t.string "Defect" - t.string "PreConditions" - t.string "StartLine" - t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "enabled_modules", :force => true do |t| - t.integer "project_id" - t.string "name", :null => false - t.integer "course_id" - end - - add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id" - - create_table "enumerations", :force => true do |t| - t.string "name", :limit => 30, :default => "", :null => false - t.integer "position", :default => 1 - t.boolean "is_default", :default => false, :null => false - t.string "type" - t.boolean "active", :default => true, :null => false - t.integer "project_id" - t.integer "parent_id" - t.string "position_name", :limit => 30 - end - - add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" - add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" - - create_table "first_pages", :force => true do |t| - t.string "web_title" - t.string "title" - t.text "description" - t.string "page_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "sort_type" - t.integer "image_width", :default => 107 - t.integer "image_height", :default => 63 - t.integer "show_course", :default => 1 - t.integer "show_contest", :default => 1 - end - - create_table "forge_activities", :force => true do |t| - t.integer "user_id" - t.integer "project_id" - t.integer "forge_act_id" - t.string "forge_act_type" - t.integer "org_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id" - - create_table "forge_messages", :force => true do |t| - t.integer "user_id" - t.integer "project_id" - t.integer "forge_message_id" - t.string "forge_message_type" - t.integer "viewed" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "forums", :force => true do |t| - t.string "name", :null => false - t.text "description" - t.integer "topic_count", :default => 0 - t.integer "memo_count", :default => 0 - t.integer "last_memo_id", :default => 0 - t.integer "creator_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "sticky" - t.integer "locked" - end - - create_table "groups_users", :id => false, :force => true do |t| - t.integer "group_id", :null => false - t.integer "user_id", :null => false - end - - add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true - - create_table "homework_attaches", :force => true do |t| - t.integer "bid_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - t.string "name" - t.text "description" - t.integer "state" - t.integer "project_id", :default => 0 - t.float "score", :default => 0.0 - t.integer "is_teacher_score", :default => 0 - end - - add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id" - - create_table "homework_commons", :force => true do |t| - t.string "name" - t.integer "user_id" - t.text "description" - t.date "publish_time" - t.date "end_time" - t.integer "homework_type", :default => 1 - t.string "late_penalty" - t.integer "course_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "homework_detail_manuals", :force => true do |t| - t.float "ta_proportion" - t.integer "comment_status" - t.date "evaluation_start" - t.date "evaluation_end" - t.integer "evaluation_num" - t.integer "absence_penalty", :default => 1 - t.integer "homework_common_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "homework_detail_programings", :force => true do |t| - t.string "language" - t.text "standard_code", :limit => 2147483647 - t.integer "homework_common_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.float "ta_proportion", :default => 0.1 - t.integer "question_id" - end - - create_table "homework_evaluations", :force => true do |t| - t.string "user_id" - t.string "homework_attach_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "homework_for_courses", :force => true do |t| - t.integer "course_id" - t.integer "bid_id" - end - - add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id" - add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id" - - create_table "homework_tests", :force => true do |t| - t.text "input" - t.text "output" - t.integer "homework_common_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "result" - t.text "error_msg" - end - - create_table "homework_users", :force => true do |t| - t.string "homework_attach_id" - t.string "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "invite_lists", :force => true do |t| - t.integer "project_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "issue_categories", :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.string "name", :limit => 30, :default => "", :null => false - t.integer "assigned_to_id" - end - - add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id" - 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 "delay" - end - - add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true - add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id" - add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id" - - create_table "issue_statuses", :force => true do |t| - t.string "name", :limit => 30, :default => "", :null => false - t.boolean "is_closed", :default => false, :null => false - t.boolean "is_default", :default => false, :null => false - t.integer "position", :default => 1 - t.integer "default_done_ratio" - end - - add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed" - add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default" - add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position" - - create_table "issues", :force => true do |t| - t.integer "tracker_id", :null => false - t.integer "project_id", :null => false - t.string "subject", :default => "", :null => false - t.text "description" - t.date "due_date" - t.integer "category_id" - t.integer "status_id", :null => false - t.integer "assigned_to_id" - t.integer "priority_id", :null => false - t.integer "fixed_version_id" - t.integer "author_id", :null => false - t.integer "lock_version", :default => 0, :null => false - t.datetime "created_on" - t.datetime "updated_on" - t.date "start_date" - t.integer "done_ratio", :default => 0, :null => false - t.float "estimated_hours" - t.integer "parent_id" - t.integer "root_id" - t.integer "lft" - t.integer "rgt" - t.boolean "is_private", :default => false, :null => false - t.datetime "closed_on" - t.integer "project_issues_index" - end - - add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id" - add_index "issues", ["author_id"], :name => "index_issues_on_author_id" - add_index "issues", ["category_id"], :name => "index_issues_on_category_id" - add_index "issues", ["created_on"], :name => "index_issues_on_created_on" - add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id" - add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id" - add_index "issues", ["project_id"], :name => "issues_project_id" - add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt" - add_index "issues", ["status_id"], :name => "index_issues_on_status_id" - add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id" - - create_table "join_in_competitions", :force => true do |t| - t.integer "user_id" - t.integer "competition_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "join_in_contests", :force => true do |t| - t.integer "user_id" - t.integer "bid_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "journal_details", :force => true do |t| - t.integer "journal_id", :default => 0, :null => false - t.string "property", :limit => 30, :default => "", :null => false - t.string "prop_key", :limit => 30, :default => "", :null => false - t.text "old_value" - t.text "value" - end - - add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" - - create_table "journal_replies", :id => false, :force => true do |t| - t.integer "journal_id" - t.integer "user_id" - t.integer "reply_id" - end - - add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id" - add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id" - add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id" - - create_table "journals", :force => true do |t| - t.integer "journalized_id", :default => 0, :null => false - t.string "journalized_type", :limit => 30, :default => "", :null => false - t.integer "user_id", :default => 0, :null => false - t.text "notes" - t.datetime "created_on", :null => false - t.boolean "private_notes", :default => false, :null => false - end - - add_index "journals", ["created_on"], :name => "index_journals_on_created_on" - add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id" - add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id" - add_index "journals", ["user_id"], :name => "index_journals_on_user_id" - - create_table "journals_for_messages", :force => true do |t| - t.integer "jour_id" - t.string "jour_type" - t.integer "user_id" - t.text "notes" - t.integer "status" - t.integer "reply_id" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - t.string "m_parent_id" - t.boolean "is_readed" - t.integer "m_reply_count" - t.integer "m_reply_id" - t.integer "is_comprehensive_evaluation" - end - - create_table "kindeditor_assets", :force => true do |t| - t.string "asset" - t.integer "file_size" - t.string "file_type" - t.integer "owner_id" - t.string "asset_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "owner_type", :default => 0 - end - - create_table "member_roles", :force => true do |t| - t.integer "member_id", :null => false - t.integer "role_id", :null => false - t.integer "inherited_from" - end - - add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id" - add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id" - - create_table "members", :force => true do |t| - t.integer "user_id", :default => 0, :null => false - t.integer "project_id", :default => 0 - t.datetime "created_on" - t.boolean "mail_notification", :default => false, :null => false - t.integer "course_id", :default => -1 - t.integer "course_group_id", :default => 0 - end - - add_index "members", ["project_id"], :name => "index_members_on_project_id" - add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true - add_index "members", ["user_id"], :name => "index_members_on_user_id" - - create_table "memo_messages", :force => true do |t| - t.integer "user_id" - t.integer "forum_id" - t.integer "memo_id" - t.string "memo_type" - t.integer "viewed" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "memos", :force => true do |t| - t.integer "forum_id", :null => false - t.integer "parent_id" - t.string "subject", :null => false - t.text "content", :null => false - t.integer "author_id", :null => false - t.integer "replies_count", :default => 0 - t.integer "last_reply_id" - t.boolean "lock", :default => false - t.boolean "sticky", :default => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "viewed_count", :default => 0 - end - - create_table "message_alls", :force => true do |t| - t.integer "user_id" - t.integer "message_id" - t.string "message_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "messages", :force => true do |t| - t.integer "board_id", :null => false - t.integer "parent_id" - t.string "subject", :default => "", :null => false - t.text "content" - t.integer "author_id" - t.integer "replies_count", :default => 0, :null => false - t.integer "last_reply_id" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - t.boolean "locked", :default => false - t.integer "sticky", :default => 0 - end - - add_index "messages", ["author_id"], :name => "index_messages_on_author_id" - add_index "messages", ["board_id"], :name => "messages_board_id" - add_index "messages", ["created_on"], :name => "index_messages_on_created_on" - add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" - add_index "messages", ["parent_id"], :name => "messages_parent_id" - - create_table "news", :force => true do |t| - t.integer "project_id" - t.string "title", :limit => 60, :default => "", :null => false - t.string "summary", :default => "" - t.text "description" - t.integer "author_id", :default => 0, :null => false - t.datetime "created_on" - t.integer "comments_count", :default => 0, :null => false - t.integer "course_id" - end - - add_index "news", ["author_id"], :name => "index_news_on_author_id" - add_index "news", ["created_on"], :name => "index_news_on_created_on" - add_index "news", ["project_id"], :name => "news_project_id" - - create_table "no_uses", :force => true do |t| - t.integer "user_id", :null => false - t.string "no_use_type" - t.integer "no_use_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "notificationcomments", :force => true do |t| - t.string "notificationcommented_type" - t.integer "notificationcommented_id" - t.integer "author_id" - t.text "notificationcomments" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "open_id_authentication_associations", :force => true do |t| - t.integer "issued" - t.integer "lifetime" - t.string "handle" - t.string "assoc_type" - t.binary "server_url" - t.binary "secret" - end - - create_table "open_id_authentication_nonces", :force => true do |t| - t.integer "timestamp", :null => false - t.string "server_url" - t.string "salt", :null => false - end - - create_table "open_source_projects", :force => true do |t| - t.string "name" - t.text "description" - t.integer "commit_count", :default => 0 - t.integer "code_line", :default => 0 - t.integer "users_count", :default => 0 - t.date "last_commit_time" - t.string "url" - t.date "date_collected" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "option_numbers", :force => true do |t| - t.integer "user_id" - t.integer "memo" - t.integer "messages_for_issues" - t.integer "issues_status" - t.integer "replay_for_message" - t.integer "replay_for_memo" - t.integer "follow" - t.integer "tread" - t.integer "praise_by_one" - t.integer "praise_by_two" - t.integer "praise_by_three" - t.integer "tread_by_one" - t.integer "tread_by_two" - t.integer "tread_by_three" - t.integer "changeset" - t.integer "document" - t.integer "attachment" - t.integer "issue_done_ratio" - t.integer "post_issue" - t.integer "score_type" - t.integer "total_score" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "project_id" - end - - create_table "organizations", :force => true do |t| - t.string "name" - t.string "logo_link" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "phone_app_versions", :force => true do |t| - t.string "version" - t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "poll_answers", :force => true do |t| - t.integer "poll_question_id" - t.text "answer_text" - t.integer "answer_position" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "poll_questions", :force => true do |t| - t.string "question_title" - t.integer "question_type" - t.integer "is_necessary" - t.integer "poll_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "question_number" - end - - create_table "poll_users", :force => true do |t| - t.integer "user_id" - t.integer "poll_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "poll_votes", :force => true do |t| - t.integer "user_id" - t.integer "poll_question_id" - t.integer "poll_answer_id" - t.text "vote_text" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "polls", :force => true do |t| - t.string "polls_name" - t.string "polls_type" - t.integer "polls_group_id" - t.integer "polls_status" - t.integer "user_id" - t.datetime "published_at" - t.datetime "closed_at" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.text "polls_description" - t.integer "show_result", :default => 1 - end - - create_table "praise_tread_caches", :force => true do |t| - t.integer "object_id", :null => false - t.string "object_type" - t.integer "praise_num" - t.integer "tread_num" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "praise_treads", :force => true do |t| - t.integer "user_id", :null => false - t.integer "praise_tread_object_id" - t.string "praise_tread_object_type" - t.integer "praise_or_tread" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "project_infos", :force => true do |t| - t.integer "project_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "project_scores", :force => true do |t| - t.string "project_id" - t.integer "score" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "issue_num", :default => 0 - t.integer "issue_journal_num", :default => 0 - t.integer "news_num", :default => 0 - t.integer "documents_num", :default => 0 - t.integer "changeset_num", :default => 0 - t.integer "board_message_num", :default => 0 - end - - create_table "project_statuses", :force => true do |t| - t.integer "changesets_count" - t.integer "watchers_count" - t.integer "project_id" - t.integer "project_type" - t.float "grade", :default => 0.0 - t.integer "course_ac_para", :default => 0 - end - - add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade" - - create_table "projecting_softapplictions", :force => true do |t| - t.integer "user_id" - t.integer "softapplication_id" - t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "projects", :force => true do |t| - t.string "name", :default => "", :null => false - t.text "description" - t.string "homepage", :default => "" - t.boolean "is_public", :default => true, :null => false - t.integer "parent_id" - t.datetime "created_on" - t.datetime "updated_on" - t.string "identifier" - t.integer "status", :default => 1, :null => false - t.integer "lft" - t.integer "rgt" - t.boolean "inherit_members", :default => false, :null => false - t.integer "project_type" - t.boolean "hidden_repo", :default => false, :null => false - t.integer "attachmenttype", :default => 1 - t.integer "user_id" - t.integer "dts_test", :default => 0 - t.string "enterprise_name" - t.integer "organization_id" - t.integer "project_new_type" - end - - add_index "projects", ["lft"], :name => "index_projects_on_lft" - add_index "projects", ["rgt"], :name => "index_projects_on_rgt" - - create_table "projects_trackers", :id => false, :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.integer "tracker_id", :default => 0, :null => false - end - - add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true - add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" - - create_table "queries", :force => true do |t| - t.integer "project_id" - t.string "name", :default => "", :null => false - t.text "filters" - t.integer "user_id", :default => 0, :null => false - t.boolean "is_public", :default => false, :null => false - t.text "column_names" - t.text "sort_criteria" - t.string "group_by" - t.string "type" - end - - add_index "queries", ["project_id"], :name => "index_queries_on_project_id" - add_index "queries", ["user_id"], :name => "index_queries_on_user_id" - - create_table "relative_memo_to_open_source_projects", :force => true do |t| - t.integer "osp_id" - t.integer "relative_memo_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "relative_memos", :force => true do |t| - t.integer "osp_id" - t.integer "parent_id" - t.string "subject", :null => false - t.text "content", :limit => 16777215, :null => false - t.integer "author_id" - t.integer "replies_count", :default => 0 - t.integer "last_reply_id" - t.boolean "lock", :default => false - t.boolean "sticky", :default => false - t.boolean "is_quote", :default => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "viewed_count_crawl", :default => 0 - t.integer "viewed_count_local", :default => 0 - t.string "url" - t.string "username" - t.string "userhomeurl" - t.date "date_collected" - t.string "topic_resource" - end - - 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.string "type" - 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 "hidden", :default => false - end - - add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id" - - create_table "rich_rich_files", :force => true do |t| - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "rich_file_file_name" - t.string "rich_file_content_type" - t.integer "rich_file_file_size" - t.datetime "rich_file_updated_at" - t.string "owner_type" - t.integer "owner_id" - t.text "uri_cache" - t.string "simplified_type", :default => "file" - end - - create_table "roles", :force => true do |t| - t.string "name", :limit => 30, :default => "", :null => false - t.integer "position", :default => 1 - t.boolean "assignable", :default => true - t.integer "builtin", :default => 0, :null => false - t.text "permissions" - t.string "issues_visibility", :limit => 30, :default => "default", :null => false - end - - create_table "schools", :force => true do |t| - t.string "name" - t.string "province" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "logo_link" - 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 - t.integer "is_teacher_score", :default => 0 - end - - create_table "settings", :force => true do |t| - t.string "name", :default => "", :null => false - t.text "value" - t.datetime "updated_on" - end - - add_index "settings", ["name"], :name => "index_settings_on_name" - - create_table "shares", :force => true do |t| - t.date "created_on" - t.string "url" - t.string "title" - t.integer "share_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "project_id" - t.integer "user_id" - t.string "description" - end - - create_table "softapplications", :force => true do |t| - t.string "name" - t.text "description" - t.integer "app_type_id" - t.string "app_type_name" - t.string "android_min_version_available" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "contest_id" - t.integer "softapplication_id" - t.integer "is_public" - t.string "application_developers" - t.string "deposit_project_url" - t.string "deposit_project" - t.integer "project_id" - end - - create_table "student_work_tests", :force => true do |t| - t.integer "student_work_id" - t.integer "homework_test_id" - t.integer "result" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.text "error_msg" - end - - create_table "student_works", :force => true do |t| - t.string "name" - t.text "description", :limit => 2147483647 - t.integer "homework_common_id" - t.integer "user_id" - t.float "final_score" - t.float "teacher_score" - t.float "student_score" - t.float "teaching_asistant_score" - t.integer "project_id", :default => 0 - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "late_penalty", :default => 0 - t.integer "absence_penalty", :default => 0 - t.integer "system_score" - end - - create_table "student_works_evaluation_distributions", :force => true do |t| - t.integer "student_work_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "student_works_scores", :force => true do |t| - t.integer "student_work_id" - t.integer "user_id" - t.integer "score" - t.text "comment" - t.integer "reviewer_role" - 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" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id" - add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id" - - create_table "taggings", :force => true do |t| - t.integer "tag_id" - t.integer "taggable_id" - t.string "taggable_type" - t.integer "tagger_id" - t.string "tagger_type" - t.string "context", :limit => 128 - t.datetime "created_at" - end - - add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" - add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context" - add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type" - - create_table "tags", :force => true do |t| - t.string "name" - end - - create_table "teachers", :force => true do |t| - t.string "tea_name" - t.string "location" - t.integer "couurse_time" - t.integer "course_code" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "extra" - end - - create_table "time_entries", :force => true do |t| - t.integer "project_id", :null => false - t.integer "user_id", :null => false - t.integer "issue_id" - t.float "hours", :null => false - t.string "comments" - t.integer "activity_id", :null => false - t.date "spent_on", :null => false - t.integer "tyear", :null => false - t.integer "tmonth", :null => false - t.integer "tweek", :null => false - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - end - - add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id" - add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on" - add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id" - add_index "time_entries", ["project_id"], :name => "time_entries_project_id" - add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" - - 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.datetime "created_on", :null => false - end - - add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id" - add_index "tokens", ["value"], :name => "tokens_value", :unique => true - - create_table "trackers", :force => true do |t| - t.string "name", :limit => 30, :default => "", :null => false - t.boolean "is_in_chlog", :default => false, :null => false - t.integer "position", :default => 1 - t.boolean "is_in_roadmap", :default => true, :null => false - t.integer "fields_bits", :default => 0 - end - - create_table "user_activities", :force => true do |t| - t.string "act_type" - t.integer "act_id" - t.string "container_type" - t.integer "container_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "user_extensions", :force => true do |t| - t.integer "user_id", :null => false - t.date "birthday" - t.string "brief_introduction" - t.integer "gender" - t.string "location" - t.string "occupation" - t.integer "work_experience" - 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 "student_id" - t.string "teacher_realname" - t.string "student_realname" - t.string "location_city" - t.integer "school_id" - t.string "description", :default => "" - end - - create_table "user_feedback_messages", :force => true do |t| - t.integer "user_id" - t.integer "journals_for_message_id" - t.string "journals_for_message_type" - t.integer "viewed" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "user_grades", :force => true do |t| - t.integer "user_id", :null => false - t.integer "project_id", :null => false - t.float "grade", :default => 0.0 - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade" - add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id" - add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id" - - create_table "user_levels", :force => true do |t| - t.integer "user_id" - t.integer "level" - end - - create_table "user_preferences", :force => true do |t| - t.integer "user_id", :default => 0, :null => false - t.text "others" - t.boolean "hide_mail", :default => false - t.string "time_zone" - end - - add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id" - - create_table "user_score_details", :force => true do |t| - t.integer "current_user_id" - t.integer "target_user_id" - t.string "score_type" - t.string "score_action" - t.integer "user_id" - t.integer "old_score" - t.integer "new_score" - t.integer "current_user_level" - t.integer "target_user_level" - t.integer "score_changeable_obj_id" - t.string "score_changeable_obj_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "user_scores", :force => true do |t| - t.integer "user_id", :null => false - t.integer "collaboration" - t.integer "influence" - t.integer "skill" - t.integer "active" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "user_statuses", :force => true do |t| - t.integer "changesets_count" - t.integer "watchers_count" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.float "grade", :default => 0.0 - end - - add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count" - 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 "users", :force => true do |t| - t.string "login", :default => "", :null => false - t.string "hashed_password", :limit => 40, :default => "", :null => false - t.string "firstname", :limit => 30, :default => "", :null => false - t.string "lastname", :default => "", :null => false - t.string "mail", :limit => 60, :default => "", :null => false - t.boolean "admin", :default => false, :null => false - t.integer "status", :default => 1, :null => false - t.datetime "last_login_on" - t.string "language", :limit => 5, :default => "" - t.integer "auth_source_id" - t.datetime "created_on" - t.datetime "updated_on" - t.string "type" - t.string "identity_url" - t.string "mail_notification", :default => "", :null => false - t.string "salt", :limit => 64 - end - - add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id" - add_index "users", ["id", "type"], :name => "index_users_on_id_and_type" - add_index "users", ["type"], :name => "index_users_on_type" - - create_table "versions", :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.string "name", :default => "", :null => false - t.string "description", :default => "" - t.date "effective_date" - t.datetime "created_on" - t.datetime "updated_on" - t.string "wiki_page_title" - t.string "status", :default => "open" - t.string "sharing", :default => "none", :null => false - end - - add_index "versions", ["project_id"], :name => "versions_project_id" - add_index "versions", ["sharing"], :name => "index_versions_on_sharing" - - create_table "visitors", :force => true do |t| - t.integer "user_id" - t.integer "master_id" - t.datetime "updated_on" - t.datetime "created_on" - end - - add_index "visitors", ["master_id"], :name => "index_visitors_master_id" - add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on" - add_index "visitors", ["user_id"], :name => "index_visitors_user_id" - - create_table "watchers", :force => true do |t| - t.string "watchable_type", :default => "", :null => false - t.integer "watchable_id", :default => 0, :null => false - t.integer "user_id" - end - - add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type" - add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id" - add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type" - - create_table "web_footer_companies", :force => true do |t| - t.string "name" - t.string "logo_size" - t.string "url" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "web_footer_oranizers", :force => true do |t| - t.string "name" - t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "wiki_content_versions", :force => true do |t| - t.integer "wiki_content_id", :null => false - t.integer "page_id", :null => false - t.integer "author_id" - t.binary "data", :limit => 2147483647 - t.string "compression", :limit => 6, :default => "" - t.string "comments", :default => "" - t.datetime "updated_on", :null => false - t.integer "version", :null => false - end - - add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on" - add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid" - - create_table "wiki_contents", :force => true do |t| - t.integer "page_id", :null => false - t.integer "author_id" - t.text "text", :limit => 2147483647 - t.string "comments", :default => "" - t.datetime "updated_on", :null => false - t.integer "version", :null => false - end - - add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id" - add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id" - - create_table "wiki_pages", :force => true do |t| - t.integer "wiki_id", :null => false - t.string "title", :null => false - t.datetime "created_on", :null => false - t.boolean "protected", :default => false, :null => false - t.integer "parent_id" - end - - add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id" - add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title" - add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id" - - create_table "wiki_redirects", :force => true do |t| - t.integer "wiki_id", :null => false - t.string "title" - t.string "redirects_to" - t.datetime "created_on", :null => false - end - - add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title" - add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id" - - create_table "wikis", :force => true do |t| - t.integer "project_id", :null => false - t.string "start_page", :null => false - t.integer "status", :default => 1, :null => false - end - - add_index "wikis", ["project_id"], :name => "wikis_project_id" - - create_table "workflows", :force => true do |t| - t.integer "tracker_id", :default => 0, :null => false - t.integer "old_status_id", :default => 0, :null => false - t.integer "new_status_id", :default => 0, :null => false - t.integer "role_id", :default => 0, :null => false - t.boolean "assignee", :default => false, :null => false - t.boolean "author", :default => false, :null => false - t.string "type", :limit => 30 - t.string "field_name", :limit => 30 - t.string "rule", :limit => 30 - end - - add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id" - add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id" - add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status" - add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id" - - create_table "works_categories", :force => true do |t| - t.string "category" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "zip_packs", :force => true do |t| - t.integer "user_id" - t.integer "homework_id" - t.string "file_digest" - t.string "file_path" - t.integer "pack_times", :default => 1 - t.integer "pack_size", :default => 0 - t.text "file_digests" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - -end +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended to check this file into your version control system. + +ActiveRecord::Schema.define(:version => 20151124032319) do + + create_table "activities", :force => true do |t| + t.integer "act_id", :null => false + t.string "act_type", :null => false + t.integer "user_id", :null => false + t.integer "activity_container_id" + t.string "activity_container_type", :default => "" + t.datetime "created_at" + end + + add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type" + add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type" + add_index "activities", ["user_id"], :name => "index_activities_on_user_id" + + create_table "activity_notifies", :force => true do |t| + t.integer "activity_container_id" + t.string "activity_container_type" + t.integer "activity_id" + t.string "activity_type" + t.integer "notify_to" + t.datetime "created_on" + t.integer "is_read" + end + + add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id" + add_index "activity_notifies", ["created_on"], :name => "index_an_created_on" + add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to" + + create_table "api_keys", :force => true do |t| + t.string "access_token" + t.datetime "expires_at" + t.integer "user_id" + t.boolean "active", :default => true + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token" + add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id" + + create_table "applied_projects", :force => true do |t| + t.integer "project_id", :null => false + t.integer "user_id", :null => false + end + + create_table "apply_project_masters", :force => true do |t| + t.integer "user_id" + t.string "apply_type" + t.integer "apply_id" + t.integer "status" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "attachments", :force => true do |t| + t.integer "container_id" + t.string "container_type", :limit => 30 + t.string "filename", :default => "", :null => false + t.string "disk_filename", :default => "", :null => false + t.integer "filesize", :default => 0, :null => false + t.string "content_type", :default => "" + t.string "digest", :limit => 40, :default => "", :null => false + t.integer "downloads", :default => 0, :null => false + t.integer "author_id", :default => 0, :null => false + t.datetime "created_on" + t.string "description" + t.string "disk_directory" + t.integer "attachtype", :default => 1 + t.integer "is_public", :default => 1 + t.integer "copy_from" + t.integer "quotes" + end + + add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id" + add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type" + add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on" + + create_table "attachmentstypes", :force => true do |t| + t.integer "typeId", :null => false + t.string "typeName", :limit => 50 + end + + create_table "auth_sources", :force => true do |t| + t.string "type", :limit => 30, :default => "", :null => false + t.string "name", :limit => 60, :default => "", :null => false + t.string "host", :limit => 60 + t.integer "port" + t.string "account" + t.string "account_password", :default => "" + t.string "base_dn" + t.string "attr_login", :limit => 30 + t.string "attr_firstname", :limit => 30 + t.string "attr_lastname", :limit => 30 + t.string "attr_mail", :limit => 30 + t.boolean "onthefly_register", :default => false, :null => false + t.boolean "tls", :default => false, :null => false + t.string "filter" + t.integer "timeout" + end + + add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type" + + create_table "biding_projects", :force => true do |t| + t.integer "project_id" + t.integer "bid_id" + t.integer "user_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "reward" + end + + create_table "bids", :force => true do |t| + t.string "name" + t.string "budget", :null => false + t.integer "author_id" + t.date "deadline" + t.text "description" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + t.integer "commit" + t.integer "reward_type" + t.integer "homework_type" + t.integer "parent_id" + t.string "password" + t.integer "is_evaluation" + t.integer "proportion", :default => 60 + t.integer "comment_status", :default => 0 + t.integer "evaluation_num", :default => 3 + t.integer "open_anonymous_evaluation", :default => 1 + end + + create_table "blog_comments", :force => true do |t| + t.integer "blog_id", :null => false + t.integer "parent_id" + t.string "title", :default => "", :null => false + t.text "content" + t.integer "author_id" + t.integer "comments_count", :default => 0, :null => false + t.integer "last_comment_id" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + t.boolean "locked", :default => false + t.integer "sticky", :default => 0 + t.integer "reply_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "blogs", :force => true do |t| + t.string "name", :default => "", :null => false + t.text "description" + t.integer "position", :default => 1 + t.integer "article_count", :default => 0, :null => false + t.integer "comments_count", :default => 0, :null => false + t.integer "last_comments_id" + t.integer "parent_id" + t.integer "author_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "boards", :force => true do |t| + t.integer "project_id", :null => false + t.string "name", :default => "", :null => false + t.string "description" + t.integer "position", :default => 1 + t.integer "topics_count", :default => 0, :null => false + t.integer "messages_count", :default => 0, :null => false + t.integer "last_message_id" + t.integer "parent_id" + t.integer "course_id" + end + + add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id" + add_index "boards", ["project_id"], :name => "boards_project_id" + + create_table "bug_to_osps", :force => true do |t| + t.integer "osp_id" + t.integer "relative_memo_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "changes", :force => true do |t| + t.integer "changeset_id", :null => false + t.string "action", :limit => 1, :default => "", :null => false + t.text "path", :null => false + t.text "from_path" + t.string "from_revision" + t.string "revision" + t.string "branch" + end + + add_index "changes", ["changeset_id"], :name => "changesets_changeset_id" + + create_table "changeset_parents", :id => false, :force => true do |t| + t.integer "changeset_id", :null => false + t.integer "parent_id", :null => false + end + + add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids" + add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids" + + create_table "changesets", :force => true do |t| + t.integer "repository_id", :null => false + t.string "revision", :null => false + t.string "committer" + t.datetime "committed_on", :null => false + t.text "comments" + t.date "commit_date" + t.string "scmid" + t.integer "user_id" + end + + add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on" + add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true + add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid" + add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id" + add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id" + + create_table "changesets_issues", :id => false, :force => true do |t| + t.integer "changeset_id", :null => false + t.integer "issue_id", :null => false + end + + add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true + + create_table "code_review_assignments", :force => true do |t| + t.integer "issue_id" + t.integer "change_id" + t.integer "attachment_id" + t.string "file_path" + t.string "rev" + t.string "rev_to" + t.string "action_type" + t.integer "changeset_id" + end + + create_table "code_review_project_settings", :force => true do |t| + t.integer "project_id" + t.integer "tracker_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "updated_by" + t.boolean "hide_code_review_tab", :default => false + t.integer "auto_relation", :default => 1 + t.integer "assignment_tracker_id" + t.text "auto_assign" + t.integer "lock_version", :default => 0, :null => false + t.boolean "tracker_in_review_dialog", :default => false + end + + create_table "code_review_user_settings", :force => true do |t| + t.integer "user_id", :default => 0, :null => false + t.integer "mail_notification", :default => 0, :null => false + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "code_reviews", :force => true do |t| + t.integer "project_id" + t.integer "change_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "line" + t.integer "updated_by_id" + t.integer "lock_version", :default => 0, :null => false + t.integer "status_changed_from" + t.integer "status_changed_to" + t.integer "issue_id" + t.string "action_type" + t.string "file_path" + t.string "rev" + t.string "rev_to" + t.integer "attachment_id" + t.integer "file_count", :default => 0, :null => false + t.boolean "diff_all" + end + + create_table "comments", :force => true do |t| + t.string "commented_type", :limit => 30, :default => "", :null => false + t.integer "commented_id", :default => 0, :null => false + t.integer "author_id", :default => 0, :null => false + t.text "comments" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + end + + add_index "comments", ["author_id"], :name => "index_comments_on_author_id" + add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type" + + create_table "contest_notifications", :force => true do |t| + t.text "title" + t.text "content" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "contesting_projects", :force => true do |t| + t.integer "project_id" + t.string "contest_id" + t.integer "user_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "reward" + end + + create_table "contesting_softapplications", :force => true do |t| + t.integer "softapplication_id" + t.integer "contest_id" + t.integer "user_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "reward" + end + + create_table "contestnotifications", :force => true do |t| + t.integer "contest_id" + t.string "title" + t.string "summary" + t.text "description" + t.integer "author_id" + t.integer "notificationcomments_count" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "contests", :force => true do |t| + t.string "name" + t.string "budget", :default => "" + t.integer "author_id" + t.date "deadline" + t.string "description" + t.integer "commit" + t.string "password" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + end + + create_table "course_activities", :force => true do |t| + t.integer "user_id" + t.integer "course_id" + t.integer "course_act_id" + t.string "course_act_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "course_attachments", :force => true do |t| + t.string "filename" + t.string "disk_filename" + t.integer "filesize" + t.string "content_type" + t.string "digest" + t.integer "downloads" + t.string "author_id" + t.string "integer" + t.string "description" + t.string "disk_directory" + t.integer "attachtype" + t.integer "is_public" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "container_id", :default => 0 + end + + create_table "course_groups", :force => true do |t| + t.string "name" + t.integer "course_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "course_infos", :force => true do |t| + t.integer "course_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "course_messages", :force => true do |t| + t.integer "user_id" + t.integer "course_id" + t.integer "course_message_id" + t.string "course_message_type" + t.integer "viewed" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "content" + t.integer "status" + end + + create_table "course_statuses", :force => true do |t| + t.integer "changesets_count" + t.integer "watchers_count" + t.integer "course_id" + t.float "grade", :default => 0.0 + t.integer "course_ac_para", :default => 0 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "courses", :force => true do |t| + t.integer "tea_id" + t.string "name" + t.integer "state" + t.string "code" + t.integer "time" + t.string "extra" + 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" + t.integer "school_id" + t.text "description" + t.integer "status", :default => 1 + t.integer "attachmenttype", :default => 2 + t.integer "lft" + t.integer "rgt" + t.integer "is_public", :limit => 1, :default => 1 + t.integer "inherit_members", :limit => 1, :default => 1 + t.integer "open_student", :default => 0 + t.integer "outline", :default => 0 + t.integer "publish_resource", :default => 0 + end + + create_table "custom_fields", :force => true do |t| + t.string "type", :limit => 30, :default => "", :null => false + t.string "name", :limit => 30, :default => "", :null => false + t.string "field_format", :limit => 30, :default => "", :null => false + t.text "possible_values" + t.string "regexp", :default => "" + t.integer "min_length", :default => 0, :null => false + t.integer "max_length", :default => 0, :null => false + t.boolean "is_required", :default => false, :null => false + t.boolean "is_for_all", :default => false, :null => false + t.boolean "is_filter", :default => false, :null => false + t.integer "position", :default => 1 + t.boolean "searchable", :default => false + t.text "default_value" + t.boolean "editable", :default => true + t.boolean "visible", :default => true, :null => false + t.boolean "multiple", :default => false + end + + add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type" + + create_table "custom_fields_projects", :id => false, :force => true do |t| + t.integer "custom_field_id", :default => 0, :null => false + t.integer "project_id", :default => 0, :null => false + end + + add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true + + create_table "custom_fields_trackers", :id => false, :force => true do |t| + t.integer "custom_field_id", :default => 0, :null => false + t.integer "tracker_id", :default => 0, :null => false + end + + add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true + + create_table "custom_values", :force => true do |t| + t.string "customized_type", :limit => 30, :default => "", :null => false + t.integer "customized_id", :default => 0, :null => false + t.integer "custom_field_id", :default => 0, :null => false + t.text "value" + end + + add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" + add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" + + create_table "delayed_jobs", :force => true do |t| + t.integer "priority", :default => 0, :null => false + t.integer "attempts", :default => 0, :null => false + t.text "handler", :null => false + t.text "last_error" + t.datetime "run_at" + t.datetime "locked_at" + t.datetime "failed_at" + t.string "locked_by" + t.string "queue" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" + + create_table "discuss_demos", :force => true do |t| + t.string "title" + t.text "body" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "documents", :force => true do |t| + t.integer "project_id", :default => 0, :null => false + t.integer "category_id", :default => 0, :null => false + t.string "title", :limit => 60, :default => "", :null => false + t.text "description" + t.datetime "created_on" + t.integer "user_id", :default => 0 + t.integer "is_public", :default => 1 + end + + add_index "documents", ["category_id"], :name => "index_documents_on_category_id" + add_index "documents", ["created_on"], :name => "index_documents_on_created_on" + add_index "documents", ["project_id"], :name => "documents_project_id" + + create_table "dts", :primary_key => "Num", :force => true do |t| + t.string "Defect", :limit => 50 + t.string "Category", :limit => 50 + t.string "File" + t.string "Method" + t.string "Module", :limit => 20 + t.string "Variable", :limit => 50 + t.integer "StartLine" + t.integer "IPLine" + t.string "IPLineCode", :limit => 200 + t.string "Judge", :limit => 15 + t.integer "Review", :limit => 1 + t.string "Description" + t.text "PreConditions", :limit => 2147483647 + t.text "TraceInfo", :limit => 2147483647 + t.text "Code", :limit => 2147483647 + t.integer "project_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "id", :null => false + end + + create_table "enabled_modules", :force => true do |t| + t.integer "project_id" + t.string "name", :null => false + t.integer "course_id" + end + + add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id" + + create_table "enumerations", :force => true do |t| + t.string "name", :limit => 30, :default => "", :null => false + t.integer "position", :default => 1 + t.boolean "is_default", :default => false, :null => false + t.string "type" + t.boolean "active", :default => true, :null => false + t.integer "project_id" + t.integer "parent_id" + t.string "position_name", :limit => 30 + end + + add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" + add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" + + create_table "exercise_answers", :force => true do |t| + t.integer "user_id" + t.integer "exercise_question_id" + t.integer "exercise_choice_id" + t.text "answer_text" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_choices", :force => true do |t| + t.integer "exercise_question_id" + t.text "choice_text" + t.integer "choice_position" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_questions", :force => true do |t| + t.string "question_title" + t.integer "question_type" + t.integer "question_number" + t.integer "exercise_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "question_score" + end + + create_table "exercise_standard_answers", :force => true do |t| + t.integer "exercise_question_id" + t.integer "exercise_choice_id" + t.text "answer_text" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_users", :force => true do |t| + t.integer "user_id" + t.integer "exercise_id" + t.integer "score" + t.datetime "start_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.datetime "end_at" + t.integer "status" + end + + create_table "exercises", :force => true do |t| + t.string "exercise_name" + t.text "exercise_description" + t.integer "course_id" + t.integer "exercise_status" + t.integer "user_id" + t.integer "time" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.datetime "publish_time" + t.datetime "end_time" + t.integer "show_result" + end + + create_table "first_pages", :force => true do |t| + t.string "web_title" + t.string "title" + t.text "description" + t.string "page_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "sort_type" + t.integer "image_width", :default => 107 + t.integer "image_height", :default => 63 + t.integer "show_course", :default => 1 + t.integer "show_contest", :default => 1 + end + + create_table "forge_activities", :force => true do |t| + t.integer "user_id" + t.integer "project_id" + t.integer "forge_act_id" + t.string "forge_act_type" + t.integer "org_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id" + + create_table "forge_messages", :force => true do |t| + t.integer "user_id" + t.integer "project_id" + t.integer "forge_message_id" + t.string "forge_message_type" + t.integer "viewed" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "secret_key" + t.integer "status" + end + + create_table "forums", :force => true do |t| + t.string "name", :null => false + t.text "description" + t.integer "topic_count", :default => 0 + t.integer "memo_count", :default => 0 + t.integer "last_memo_id", :default => 0 + t.integer "creator_id", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "sticky" + t.integer "locked" + end + + create_table "groups_users", :id => false, :force => true do |t| + t.integer "group_id", :null => false + t.integer "user_id", :null => false + end + + add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true + + create_table "homework_attaches", :force => true do |t| + t.integer "bid_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "reward" + t.string "name" + t.text "description" + t.integer "state" + t.integer "project_id", :default => 0 + t.float "score", :default => 0.0 + t.integer "is_teacher_score", :default => 0 + end + + add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id" + + create_table "homework_commons", :force => true do |t| + t.string "name" + t.integer "user_id" + t.text "description" + t.date "publish_time" + t.date "end_time" + t.integer "homework_type", :default => 1 + t.string "late_penalty" + t.integer "course_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "teacher_priority", :default => 1 + t.integer "anonymous_comment", :default => 0 + end + + create_table "homework_detail_manuals", :force => true do |t| + t.float "ta_proportion" + t.integer "comment_status" + t.date "evaluation_start" + t.date "evaluation_end" + t.integer "evaluation_num" + t.integer "absence_penalty", :default => 1 + t.integer "homework_common_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "homework_detail_programings", :force => true do |t| + t.string "language" + t.text "standard_code", :limit => 2147483647 + t.integer "homework_common_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.float "ta_proportion", :default => 0.1 + t.integer "question_id" + end + + create_table "homework_evaluations", :force => true do |t| + t.string "user_id" + t.string "homework_attach_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "homework_for_courses", :force => true do |t| + t.integer "course_id" + t.integer "bid_id" + end + + add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id" + add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id" + + create_table "homework_tests", :force => true do |t| + t.text "input" + t.text "output" + t.integer "homework_common_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "result" + t.text "error_msg" + end + + create_table "homework_users", :force => true do |t| + t.string "homework_attach_id" + t.string "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "invite_lists", :force => true do |t| + t.integer "project_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "mail" + end + + create_table "issue_categories", :force => true do |t| + t.integer "project_id", :default => 0, :null => false + t.string "name", :limit => 30, :default => "", :null => false + t.integer "assigned_to_id" + end + + add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id" + 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 "delay" + end + + add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true + add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id" + add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id" + + create_table "issue_statuses", :force => true do |t| + t.string "name", :limit => 30, :default => "", :null => false + t.boolean "is_closed", :default => false, :null => false + t.boolean "is_default", :default => false, :null => false + t.integer "position", :default => 1 + t.integer "default_done_ratio" + end + + add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed" + add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default" + add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position" + + create_table "issues", :force => true do |t| + t.integer "tracker_id", :null => false + t.integer "project_id", :null => false + t.string "subject", :default => "", :null => false + t.text "description" + t.date "due_date" + t.integer "category_id" + t.integer "status_id", :null => false + t.integer "assigned_to_id" + t.integer "priority_id", :null => false + t.integer "fixed_version_id" + t.integer "author_id", :null => false + t.integer "lock_version", :default => 0, :null => false + t.datetime "created_on" + t.datetime "updated_on" + t.date "start_date" + t.integer "done_ratio", :default => 0, :null => false + t.float "estimated_hours" + t.integer "parent_id" + t.integer "root_id" + t.integer "lft" + t.integer "rgt" + t.boolean "is_private", :default => false, :null => false + t.datetime "closed_on" + t.integer "project_issues_index" + end + + add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id" + add_index "issues", ["author_id"], :name => "index_issues_on_author_id" + add_index "issues", ["category_id"], :name => "index_issues_on_category_id" + add_index "issues", ["created_on"], :name => "index_issues_on_created_on" + add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id" + add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id" + add_index "issues", ["project_id"], :name => "issues_project_id" + add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt" + add_index "issues", ["status_id"], :name => "index_issues_on_status_id" + add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id" + + create_table "join_in_competitions", :force => true do |t| + t.integer "user_id" + t.integer "competition_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "join_in_contests", :force => true do |t| + t.integer "user_id" + t.integer "bid_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "journal_details", :force => true do |t| + t.integer "journal_id", :default => 0, :null => false + t.string "property", :limit => 30, :default => "", :null => false + t.string "prop_key", :limit => 30, :default => "", :null => false + t.text "old_value" + t.text "value" + end + + add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" + + create_table "journal_replies", :id => false, :force => true do |t| + t.integer "journal_id" + t.integer "user_id" + t.integer "reply_id" + end + + add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id" + add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id" + add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id" + + create_table "journals", :force => true do |t| + t.integer "journalized_id", :default => 0, :null => false + t.string "journalized_type", :limit => 30, :default => "", :null => false + t.integer "user_id", :default => 0, :null => false + t.text "notes" + t.datetime "created_on", :null => false + t.boolean "private_notes", :default => false, :null => false + end + + add_index "journals", ["created_on"], :name => "index_journals_on_created_on" + add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id" + add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id" + add_index "journals", ["user_id"], :name => "index_journals_on_user_id" + + create_table "journals_for_messages", :force => true do |t| + t.integer "jour_id" + t.string "jour_type" + t.integer "user_id" + t.text "notes" + t.integer "status" + t.integer "reply_id" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + t.string "m_parent_id" + t.boolean "is_readed" + t.integer "m_reply_count" + t.integer "m_reply_id" + t.integer "is_comprehensive_evaluation" + end + + create_table "kindeditor_assets", :force => true do |t| + t.string "asset" + t.integer "file_size" + t.string "file_type" + t.integer "owner_id" + t.string "asset_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "owner_type", :default => 0 + end + + create_table "member_roles", :force => true do |t| + t.integer "member_id", :null => false + t.integer "role_id", :null => false + t.integer "inherited_from" + end + + add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id" + add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id" + + create_table "members", :force => true do |t| + t.integer "user_id", :default => 0, :null => false + t.integer "project_id", :default => 0 + t.datetime "created_on" + t.boolean "mail_notification", :default => false, :null => false + t.integer "course_id", :default => -1 + t.integer "course_group_id", :default => 0 + end + + add_index "members", ["project_id"], :name => "index_members_on_project_id" + add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true + add_index "members", ["user_id"], :name => "index_members_on_user_id" + + create_table "memo_messages", :force => true do |t| + t.integer "user_id" + t.integer "forum_id" + t.integer "memo_id" + t.string "memo_type" + t.integer "viewed" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "memos", :force => true do |t| + t.integer "forum_id", :null => false + t.integer "parent_id" + t.string "subject", :null => false + t.text "content", :null => false + t.integer "author_id", :null => false + t.integer "replies_count", :default => 0 + t.integer "last_reply_id" + t.boolean "lock", :default => false + t.boolean "sticky", :default => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "viewed_count", :default => 0 + end + + create_table "message_alls", :force => true do |t| + t.integer "user_id" + t.integer "message_id" + t.string "message_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "messages", :force => true do |t| + t.integer "board_id", :null => false + t.integer "parent_id" + t.string "subject", :default => "", :null => false + t.text "content" + t.integer "author_id" + t.integer "replies_count", :default => 0, :null => false + t.integer "last_reply_id" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + t.boolean "locked", :default => false + t.integer "sticky", :default => 0 + t.integer "reply_id" + end + + add_index "messages", ["author_id"], :name => "index_messages_on_author_id" + add_index "messages", ["board_id"], :name => "messages_board_id" + add_index "messages", ["created_on"], :name => "index_messages_on_created_on" + add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" + add_index "messages", ["parent_id"], :name => "messages_parent_id" + + create_table "news", :force => true do |t| + t.integer "project_id" + t.string "title", :limit => 60, :default => "", :null => false + t.string "summary", :default => "" + t.text "description" + t.integer "author_id", :default => 0, :null => false + t.datetime "created_on" + t.integer "comments_count", :default => 0, :null => false + t.integer "course_id" + t.integer "sticky", :default => 0 + end + + add_index "news", ["author_id"], :name => "index_news_on_author_id" + add_index "news", ["created_on"], :name => "index_news_on_created_on" + add_index "news", ["project_id"], :name => "news_project_id" + + create_table "no_uses", :force => true do |t| + t.integer "user_id", :null => false + t.string "no_use_type" + t.integer "no_use_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "notificationcomments", :force => true do |t| + t.string "notificationcommented_type" + t.integer "notificationcommented_id" + t.integer "author_id" + t.text "notificationcomments" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "onclick_times", :force => true do |t| + t.integer "user_id" + t.datetime "onclick_time" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "open_id_authentication_associations", :force => true do |t| + t.integer "issued" + t.integer "lifetime" + t.string "handle" + t.string "assoc_type" + t.binary "server_url" + t.binary "secret" + end + + create_table "open_id_authentication_nonces", :force => true do |t| + t.integer "timestamp", :null => false + t.string "server_url" + t.string "salt", :null => false + end + + create_table "open_source_projects", :force => true do |t| + t.string "name" + t.text "description" + t.integer "commit_count", :default => 0 + t.integer "code_line", :default => 0 + t.integer "users_count", :default => 0 + t.date "last_commit_time" + t.string "url" + t.date "date_collected" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "option_numbers", :force => true do |t| + t.integer "user_id" + t.integer "memo" + t.integer "messages_for_issues" + t.integer "issues_status" + t.integer "replay_for_message" + t.integer "replay_for_memo" + t.integer "follow" + t.integer "tread" + t.integer "praise_by_one" + t.integer "praise_by_two" + t.integer "praise_by_three" + t.integer "tread_by_one" + t.integer "tread_by_two" + t.integer "tread_by_three" + t.integer "changeset" + t.integer "document" + t.integer "attachment" + t.integer "issue_done_ratio" + t.integer "post_issue" + t.integer "score_type" + t.integer "total_score" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "project_id" + end + + create_table "org_activities", :force => true do |t| + t.integer "user_id" + t.integer "org_act_id" + t.string "org_act_type" + t.integer "container_id" + t.string "container_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "org_courses", :force => true do |t| + t.integer "organization_id" + t.integer "course_id" + t.datetime "created_at" + end + + create_table "org_document_comments", :force => true do |t| + t.text "title" + t.text "content" + t.integer "organization_id" + t.integer "creator_id" + t.integer "parent_id" + t.integer "reply_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.boolean "locked", :default => false + t.integer "sticky", :default => 0 + end + + create_table "org_member_roles", :force => true do |t| + t.integer "org_member_id" + t.integer "role_id" + end + + create_table "org_members", :force => true do |t| + t.integer "user_id" + t.integer "organization_id" + t.string "role" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "org_projects", :force => true do |t| + t.integer "organization_id" + t.integer "project_id" + t.datetime "created_at" + end + + create_table "organizations", :force => true do |t| + t.string "name" + t.text "description" + t.integer "creator_id" + t.integer "home_id" + t.string "domain" + t.boolean "is_public" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "phone_app_versions", :force => true do |t| + t.string "version" + t.text "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_answers", :force => true do |t| + t.integer "poll_question_id" + t.text "answer_text" + t.integer "answer_position" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_questions", :force => true do |t| + t.string "question_title" + t.integer "question_type" + t.integer "is_necessary" + t.integer "poll_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "question_number" + end + + create_table "poll_users", :force => true do |t| + t.integer "user_id" + t.integer "poll_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_votes", :force => true do |t| + t.integer "user_id" + t.integer "poll_question_id" + t.integer "poll_answer_id" + t.text "vote_text" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "polls", :force => true do |t| + t.string "polls_name" + t.string "polls_type" + t.integer "polls_group_id" + t.integer "polls_status" + t.integer "user_id" + t.datetime "published_at" + t.datetime "closed_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.text "polls_description" + t.integer "show_result", :default => 1 + end + + create_table "praise_tread_caches", :force => true do |t| + t.integer "object_id", :null => false + t.string "object_type" + t.integer "praise_num" + t.integer "tread_num" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "praise_treads", :force => true do |t| + t.integer "user_id", :null => false + t.integer "praise_tread_object_id" + t.string "praise_tread_object_type" + t.integer "praise_or_tread" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "principal_activities", :force => true do |t| + t.integer "user_id" + t.integer "principal_id" + t.integer "principal_act_id" + t.string "principal_act_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "project_infos", :force => true do |t| + t.integer "project_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "project_scores", :force => true do |t| + t.string "project_id" + t.integer "score" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "issue_num", :default => 0 + t.integer "issue_journal_num", :default => 0 + t.integer "news_num", :default => 0 + t.integer "documents_num", :default => 0 + t.integer "changeset_num", :default => 0 + t.integer "board_message_num", :default => 0 + end + + create_table "project_statuses", :force => true do |t| + t.integer "changesets_count" + t.integer "watchers_count" + t.integer "project_id" + t.integer "project_type" + t.float "grade", :default => 0.0 + t.integer "course_ac_para", :default => 0 + end + + add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade" + + create_table "projecting_softapplictions", :force => true do |t| + t.integer "user_id" + t.integer "softapplication_id" + t.integer "project_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "projects", :force => true do |t| + t.string "name", :default => "", :null => false + t.text "description" + t.string "homepage", :default => "" + t.boolean "is_public", :default => true, :null => false + t.integer "parent_id" + t.datetime "created_on" + t.datetime "updated_on" + t.string "identifier" + t.integer "status", :default => 1, :null => false + t.integer "lft" + t.integer "rgt" + t.boolean "inherit_members", :default => false, :null => false + t.integer "project_type" + t.boolean "hidden_repo", :default => false, :null => false + t.integer "attachmenttype", :default => 1 + t.integer "user_id" + t.integer "dts_test", :default => 0 + t.string "enterprise_name" + t.integer "organization_id" + t.integer "project_new_type" + t.integer "gpid" + end + + add_index "projects", ["lft"], :name => "index_projects_on_lft" + add_index "projects", ["rgt"], :name => "index_projects_on_rgt" + + create_table "projects_trackers", :id => false, :force => true do |t| + t.integer "project_id", :default => 0, :null => false + t.integer "tracker_id", :default => 0, :null => false + end + + add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true + add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" + + create_table "queries", :force => true do |t| + t.integer "project_id" + t.string "name", :default => "", :null => false + t.text "filters" + t.integer "user_id", :default => 0, :null => false + t.boolean "is_public", :default => false, :null => false + t.text "column_names" + t.text "sort_criteria" + t.string "group_by" + t.string "type" + end + + add_index "queries", ["project_id"], :name => "index_queries_on_project_id" + add_index "queries", ["user_id"], :name => "index_queries_on_user_id" + + create_table "relative_memo_to_open_source_projects", :force => true do |t| + t.integer "osp_id" + t.integer "relative_memo_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "relative_memos", :force => true do |t| + t.integer "osp_id" + t.integer "parent_id" + t.string "subject", :null => false + t.text "content", :limit => 16777215, :null => false + t.integer "author_id" + t.integer "replies_count", :default => 0 + t.integer "last_reply_id" + t.boolean "lock", :default => false + t.boolean "sticky", :default => false + t.boolean "is_quote", :default => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "viewed_count_crawl", :default => 0 + t.integer "viewed_count_local", :default => 0 + t.string "url" + t.string "username" + t.string "userhomeurl" + t.date "date_collected" + t.string "topic_resource" + end + + 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.string "type" + 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 "hidden", :default => false + end + + add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id" + + create_table "rich_rich_files", :force => true do |t| + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "rich_file_file_name" + t.string "rich_file_content_type" + t.integer "rich_file_file_size" + t.datetime "rich_file_updated_at" + t.string "owner_type" + t.integer "owner_id" + t.text "uri_cache" + t.string "simplified_type", :default => "file" + end + + create_table "roles", :force => true do |t| + t.string "name", :limit => 30, :default => "", :null => false + t.integer "position", :default => 1 + t.boolean "assignable", :default => true + t.integer "builtin", :default => 0, :null => false + t.text "permissions" + t.string "issues_visibility", :limit => 30, :default => "default", :null => false + end + + create_table "schools", :force => true do |t| + t.string "name" + t.string "province" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "logo_link" + t.string "pinyin" + 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 + t.integer "is_teacher_score", :default => 0 + end + + create_table "settings", :force => true do |t| + t.string "name", :default => "", :null => false + t.text "value" + t.datetime "updated_on" + end + + add_index "settings", ["name"], :name => "index_settings_on_name" + + create_table "shares", :force => true do |t| + t.date "created_on" + t.string "url" + t.string "title" + t.integer "share_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "project_id" + t.integer "user_id" + t.string "description" + end + + create_table "softapplications", :force => true do |t| + t.string "name" + t.text "description" + t.integer "app_type_id" + t.string "app_type_name" + t.string "android_min_version_available" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "contest_id" + t.integer "softapplication_id" + t.integer "is_public" + t.string "application_developers" + t.string "deposit_project_url" + t.string "deposit_project" + t.integer "project_id" + end + + create_table "student_work_tests", :force => true do |t| + t.integer "student_work_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "status", :default => 9 + t.text "results" + t.text "src" + end + + create_table "student_works", :force => true do |t| + t.string "name" + t.text "description", :limit => 2147483647 + t.integer "homework_common_id" + t.integer "user_id" + t.float "final_score" + t.float "teacher_score" + t.float "student_score" + t.float "teaching_asistant_score" + t.integer "project_id", :default => 0 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "late_penalty", :default => 0 + t.integer "absence_penalty", :default => 0 + t.float "system_score", :default => 0.0 + t.boolean "is_test", :default => false + end + + create_table "student_works_evaluation_distributions", :force => true do |t| + t.integer "student_work_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "student_works_scores", :force => true do |t| + t.integer "student_work_id" + t.integer "user_id" + t.integer "score" + t.text "comment" + t.integer "reviewer_role" + 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" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id" + add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id" + + create_table "system_messages", :force => true do |t| + t.integer "user_id" + t.string "content" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.text "description" + t.string "subject" + end + + create_table "taggings", :force => true do |t| + t.integer "tag_id" + t.integer "taggable_id" + t.string "taggable_type" + t.integer "tagger_id" + t.string "tagger_type" + t.string "context", :limit => 128 + t.datetime "created_at" + end + + add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" + add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context" + add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type" + + create_table "tags", :force => true do |t| + t.string "name" + end + + create_table "teachers", :force => true do |t| + t.string "tea_name" + t.string "location" + t.integer "couurse_time" + t.integer "course_code" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "extra" + end + + create_table "time_entries", :force => true do |t| + t.integer "project_id", :null => false + t.integer "user_id", :null => false + t.integer "issue_id" + t.float "hours", :null => false + t.string "comments" + t.integer "activity_id", :null => false + t.date "spent_on", :null => false + t.integer "tyear", :null => false + t.integer "tmonth", :null => false + t.integer "tweek", :null => false + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + end + + add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id" + add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on" + add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id" + add_index "time_entries", ["project_id"], :name => "time_entries_project_id" + add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" + + 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.datetime "created_on", :null => false + end + + add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id" + add_index "tokens", ["value"], :name => "tokens_value", :unique => true + + create_table "trackers", :force => true do |t| + t.string "name", :limit => 30, :default => "", :null => false + t.boolean "is_in_chlog", :default => false, :null => false + t.integer "position", :default => 1 + t.boolean "is_in_roadmap", :default => true, :null => false + t.integer "fields_bits", :default => 0 + end + + create_table "user_activities", :force => true do |t| + t.string "act_type" + t.integer "act_id" + t.string "container_type" + t.integer "container_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "user_id" + end + + create_table "user_extensions", :force => true do |t| + t.integer "user_id", :null => false + t.date "birthday" + t.string "brief_introduction" + t.integer "gender" + t.string "location" + t.string "occupation" + t.integer "work_experience" + 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 "student_id" + t.string "teacher_realname" + t.string "student_realname" + t.string "location_city" + t.integer "school_id" + t.string "description", :default => "" + end + + create_table "user_feedback_messages", :force => true do |t| + t.integer "user_id" + t.integer "journals_for_message_id" + t.string "journals_for_message_type" + t.integer "viewed" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "user_grades", :force => true do |t| + t.integer "user_id", :null => false + t.integer "project_id", :null => false + t.float "grade", :default => 0.0 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade" + add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id" + add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id" + + create_table "user_levels", :force => true do |t| + t.integer "user_id" + t.integer "level" + end + + create_table "user_preferences", :force => true do |t| + t.integer "user_id", :default => 0, :null => false + t.text "others" + t.boolean "hide_mail", :default => false + t.string "time_zone" + end + + add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id" + + create_table "user_score_details", :force => true do |t| + t.integer "current_user_id" + t.integer "target_user_id" + t.string "score_type" + t.string "score_action" + t.integer "user_id" + t.integer "old_score" + t.integer "new_score" + t.integer "current_user_level" + t.integer "target_user_level" + t.integer "score_changeable_obj_id" + t.string "score_changeable_obj_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "user_scores", :force => true do |t| + t.integer "user_id", :null => false + t.integer "collaboration" + t.integer "influence" + t.integer "skill" + t.integer "active" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "user_statuses", :force => true do |t| + t.integer "changesets_count" + t.integer "watchers_count" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.float "grade", :default => 0.0 + end + + add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count" + 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 "users", :force => true do |t| + t.string "login", :default => "", :null => false + t.string "hashed_password", :limit => 40, :default => "", :null => false + t.string "firstname", :limit => 30, :default => "", :null => false + t.string "lastname", :default => "", :null => false + t.string "mail", :limit => 60, :default => "", :null => false + t.boolean "admin", :default => false, :null => false + t.integer "status", :default => 1, :null => false + t.datetime "last_login_on" + t.string "language", :limit => 5, :default => "" + t.integer "auth_source_id" + t.datetime "created_on" + t.datetime "updated_on" + t.string "type" + t.string "identity_url" + t.string "mail_notification", :default => "", :null => false + t.string "salt", :limit => 64 + t.integer "gid" + end + + add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id" + add_index "users", ["id", "type"], :name => "index_users_on_id_and_type" + add_index "users", ["type"], :name => "index_users_on_type" + + create_table "versions", :force => true do |t| + t.integer "project_id", :default => 0, :null => false + t.string "name", :default => "", :null => false + t.string "description", :default => "" + t.date "effective_date" + t.datetime "created_on" + t.datetime "updated_on" + t.string "wiki_page_title" + t.string "status", :default => "open" + t.string "sharing", :default => "none", :null => false + end + + add_index "versions", ["project_id"], :name => "versions_project_id" + add_index "versions", ["sharing"], :name => "index_versions_on_sharing" + + create_table "visitors", :force => true do |t| + t.integer "user_id" + t.integer "master_id" + t.datetime "updated_on" + t.datetime "created_on" + end + + add_index "visitors", ["master_id"], :name => "index_visitors_master_id" + add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on" + add_index "visitors", ["user_id"], :name => "index_visitors_user_id" + + create_table "watchers", :force => true do |t| + t.string "watchable_type", :default => "", :null => false + t.integer "watchable_id", :default => 0, :null => false + t.integer "user_id" + end + + add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type" + add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id" + add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type" + + create_table "web_footer_companies", :force => true do |t| + t.string "name" + t.string "logo_size" + t.string "url" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "web_footer_oranizers", :force => true do |t| + t.string "name" + t.text "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "wiki_content_versions", :force => true do |t| + t.integer "wiki_content_id", :null => false + t.integer "page_id", :null => false + t.integer "author_id" + t.binary "data", :limit => 2147483647 + t.string "compression", :limit => 6, :default => "" + t.string "comments", :default => "" + t.datetime "updated_on", :null => false + t.integer "version", :null => false + end + + add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on" + add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid" + + create_table "wiki_contents", :force => true do |t| + t.integer "page_id", :null => false + t.integer "author_id" + t.text "text", :limit => 2147483647 + t.string "comments", :default => "" + t.datetime "updated_on", :null => false + t.integer "version", :null => false + end + + add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id" + add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id" + + create_table "wiki_pages", :force => true do |t| + t.integer "wiki_id", :null => false + t.string "title", :null => false + t.datetime "created_on", :null => false + t.boolean "protected", :default => false, :null => false + t.integer "parent_id" + end + + add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id" + add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title" + add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id" + + create_table "wiki_redirects", :force => true do |t| + t.integer "wiki_id", :null => false + t.string "title" + t.string "redirects_to" + t.datetime "created_on", :null => false + end + + add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title" + add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id" + + create_table "wikis", :force => true do |t| + t.integer "project_id", :null => false + t.string "start_page", :null => false + t.integer "status", :default => 1, :null => false + end + + add_index "wikis", ["project_id"], :name => "wikis_project_id" + + create_table "workflows", :force => true do |t| + t.integer "tracker_id", :default => 0, :null => false + t.integer "old_status_id", :default => 0, :null => false + t.integer "new_status_id", :default => 0, :null => false + t.integer "role_id", :default => 0, :null => false + t.boolean "assignee", :default => false, :null => false + t.boolean "author", :default => false, :null => false + t.string "type", :limit => 30 + t.string "field_name", :limit => 30 + t.string "rule", :limit => 30 + end + + add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id" + add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id" + add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status" + add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id" + + create_table "works_categories", :force => true do |t| + t.string "category" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "zip_packs", :force => true do |t| + t.integer "user_id" + t.integer "homework_id" + t.string "file_digest" + t.string "file_path" + t.integer "pack_times", :default => 1 + t.integer "pack_size", :default => 0 + t.text "file_digests" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + +end From 3e0609afe3a0e8f85d0dc7779dd5e41bc41203b1 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 25 Nov 2015 10:24:46 +0800 Subject: [PATCH 237/285] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E6=97=B6=E9=95=BF?= =?UTF-8?q?=E5=92=8C=E9=A2=98=E7=9B=AE=E5=88=86=E6=95=B0=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise_form.html.erb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index cabd0b5e4..6b8e93bd0 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -87,6 +87,8 @@ var standard_ans = $.trim($("#question_standard_ans").val()); if(title.length == 0 || score.length == 0){ alert("题目标题/分数不能为空"); + }else if(!/^[1-9][0-9]*$/.test(score)) { + alert("分数必须是非零开头的数字"); }else if(quest_type !=3 && standard_ans.length == 0) { alert("标准答案不能为空"); }else{ @@ -100,6 +102,8 @@ var standard_ans = $.trim($("#poll_question_standard_answer_" + id).val()); if(title.length == 0 || score.length == 0){ alert("题目标题/分数不能为空"); + }else if(!/^[1-9][0-9]*$/.test(score)) { + alert("分数必须是非零开头的数字"); }else if(quest_type !=3 && standard_ans.length == 0) { alert("标准答案不能为空"); }else{ @@ -116,6 +120,8 @@ alert("截止时间不能为空"); } else if(Date.parse($("#exercise_end_time").val()) < Date.now()) { alert("截止时间不能小于当前时间"); + } else if($.trim($("#exercise_time").val()) !="" && !/^[1-9][0-9]*$/.test($.trim($("#exercise_time").val()))) { + alert("测验时长必须为非零开头的数字"); } else { doc.parent().parent().parent().submit(); From 7fb78e48162f0e7bba877f54a019379f371438fb Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 25 Nov 2015 10:38:43 +0800 Subject: [PATCH 238/285] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=B5=8B=E9=AA=8C?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E7=AD=89=E5=86=85=E5=AE=B9=E6=97=B6=20?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=96=E6=B6=88=E5=BA=94=E8=BF=98=E5=8E=9F?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A1=86=E4=B8=AD=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_edit_head.html.erb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb index 6c357130c..c8ba0c4d7 100644 --- a/app/views/exercise/_edit_head.html.erb +++ b/app/views/exercise/_edit_head.html.erb @@ -3,9 +3,6 @@
        - <%# if edit_mode %> - - <%# end %>
        "/> @@ -23,10 +20,20 @@ 保存 - + <%= l(:button_cancel)%>
        -<% end %> \ No newline at end of file +<% end %> + \ No newline at end of file From bd7ee66e77f4227c6b4588482462dc78ce9e5e8f Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 25 Nov 2015 15:02:32 +0800 Subject: [PATCH 239/285] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=B5=8B=E9=AA=8C?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise.html.erb | 122 +++++++++--------- app/views/exercise/_exercises_list.html.erb | 48 ++++---- app/views/exercise/index.html.erb | 129 ++++++++++---------- 3 files changed, 153 insertions(+), 146 deletions(-) diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb index f5896c5e3..40654d327 100644 --- a/app/views/exercise/_exercise.html.erb +++ b/app/views/exercise/_exercise.html.erb @@ -1,61 +1,63 @@ -<%# has_commit = has_commit_poll?(poll.id ,User.current)%> -<% exercise_name = exercise.exercise_name.empty? ? l(:label_poll_new) : exercise.exercise_name%> -<% if @is_teacher%> -
      • -
        - <%# if has_commit %> - <%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%> - <%# else %> - <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %> - <%# end %> - <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %> -
        -
        • - - <% if exercise.exercise_status == 1%> -
      • 统计结果
        • - <% else %> -
      • <%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fl ml10"%>
        • - <% end%> - - <% if exercise.exercise_status == 1 %> -
      • 发布试卷
        • - <% elsif exercise.exercise_status == 2%> -
      • 取消发布
        • - <% else%> -
      • 发布试卷
        • - <% end%> - - <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10") %> - - <% if exercise.exercise_status == 1 %> -
      • <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%>
        • - <% else%> -
      • 编辑
        • - <% end%> - - <%# if exercise.exercise_status == 2 %> - - <%# else %> - - <%# end%> - - <%# if exercise.exercise_status == 1%> - - <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %> - - <%# end%> - - -
      • <%= format_date exercise.created_at.to_date%>
        • -<% else%> - <% if exercise.exercise_status == 2%> - <%# if has_commit%> - - <%#else%> - <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%> - <%#end%> - <% end%> -
      • <%= format_date exercise.created_at.to_date%>
        • +<%# has_commit = has_commit_poll?(poll.id ,User.current)%> +<% exercise_name = exercise.exercise_name.empty? ? l(:label_poll_new) : exercise.exercise_name%> +<% if @is_teacher%> +
      • +
        + <%# if has_commit %> + <%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%> + <%# else %> + <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %> + <%# end %> + <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %> +
        +
        • + + <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10") %> + + <% if exercise.exercise_status == 1 %> +
      • <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%>
        • + <% else%> +
      • 编辑
        • + <% end%> + + <%# if exercise.exercise_status == 2 %> + + <%# else %> + + <%# end%> + + <%# if exercise.exercise_status == 1%> + + <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %> + + <%# end%> + + +
      • <%= format_date exercise.created_at.to_date%>
        • + + + <% if exercise.exercise_status == 1 %> +
      • 发布试卷
        • + <% elsif exercise.exercise_status == 2%> +
      • 取消发布
        • + <% else%> +
      • 发布试卷
        • + <% end%> + + <% if exercise.exercise_status == 1%> +
      • 统计结果
        • + <% else %> +
      • <%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%>
        • + <% end%> + +<% else%> + <% if exercise.exercise_status == 2%> + <%# if has_commit%> + + <%#else%> + <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%> + <%#end%> + <% end%> +
      • <%= format_date exercise.created_at.to_date%>
        • <% end%> \ No newline at end of file diff --git a/app/views/exercise/_exercises_list.html.erb b/app/views/exercise/_exercises_list.html.erb index d1774f637..f277ebdf5 100644 --- a/app/views/exercise/_exercises_list.html.erb +++ b/app/views/exercise/_exercises_list.html.erb @@ -1,25 +1,25 @@ -
        -

        所有试卷 - （<%= @obj_count%>） -

        - <% if @is_teacher%> - <%#= link_to "导入", other_poll_poll_index_path(:polls_group_id => @course.id), :remote=>true,:class => "newbtn"%> - <%= link_to "新建试卷 ", new_exercise_path(:course_id => @course.id), :class => "newbtn" %> - <% end%> -
        -
        -
        - - <% @exercises.each do |exercise|%> -
          - <%= render :partial => 'exercise', :locals => {:exercise => exercise} %> -
        -
        - <% end%> - -
          - <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> -
        - -
        +
        +

        所有试卷 + （<%= @obj_count%>） +

        + <% if @is_teacher%> + <%#= link_to "导入", other_poll_poll_index_path(:polls_group_id => @course.id), :remote=>true,:class => "newbtn"%> + <%= link_to "新建试卷 ", new_exercise_path(:course_id => @course.id), :class => "newbtn" %> + <% end%> +
        +
        +
        + + <% @exercises.each do |exercise|%> +
          + <%= render :partial => 'exercise', :locals => {:exercise => exercise} %> +
        +
        + <% end%> + +
          + <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
        + +
        \ No newline at end of file diff --git a/app/views/exercise/index.html.erb b/app/views/exercise/index.html.erb index 3cff84e1c..aacc79950 100644 --- a/app/views/exercise/index.html.erb +++ b/app/views/exercise/index.html.erb @@ -1,63 +1,68 @@ -<%= stylesheet_link_tag 'polls', :media => 'all' %> - -
        - <%= render :partial => 'exercises_list'%> +<%= stylesheet_link_tag 'polls', :media => 'all' %> + +
        + <%= render :partial => 'exercises_list'%>
        \ No newline at end of file From c8b1cae947121ac5d6546551c89509cbcb4367a2 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 25 Nov 2015 15:16:33 +0800 Subject: [PATCH 240/285] =?UTF-8?q?=E5=BB=BA=E7=AB=8B=E8=B4=A1=E7=8C=AE?= =?UTF-8?q?=E6=A6=9C=E8=A1=A8=E5=8F=8A=E7=9B=B8=E5=85=B3=E5=85=B3=E8=81=94?= =?UTF-8?q?=20=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=20=E6=8C=89=E6=80=BB?= =?UTF-8?q?=E5=88=86=E6=8E=92=E5=BA=8F=EF=BC=88=E8=8B=B1=E9=9B=84=E6=A6=9C?= =?UTF-8?q?=EF=BC=89=20=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=EF=BC=88?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/courses_helper.rb | 19 ++++++ app/models/course.rb | 4 +- app/models/course_contributor_score.rb | 5 ++ app/models/user.rb | 2 + app/views/layouts/base_courses.html.erb | 51 ++++++++++++++ ...064914_create_course_contributor_scores.rb | 16 +++++ db/schema.rb | 67 ++++++++++++++++++- public/stylesheets/courses.css | 2 +- spec/factories/course_contributor_scores.rb | 13 ++++ spec/models/course_contributor_score_spec.rb | 5 ++ 10 files changed, 181 insertions(+), 3 deletions(-) create mode 100644 app/models/course_contributor_score.rb create mode 100644 db/migrate/20151125064914_create_course_contributor_scores.rb create mode 100644 spec/factories/course_contributor_scores.rb create mode 100644 spec/models/course_contributor_score_spec.rb diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 7c1831d56..d07001215 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -738,3 +738,22 @@ module CoursesHelper desc.html_safe end end + +# 学生按作业总分排序，取前8个 +def hero_homework_score(course, score_sort_by) + sql_select = "SELECT members.*,( + SELECT SUM(student_works.final_score) + FROM student_works,homework_commons + WHERE student_works.homework_common_id = homework_commons.id + AND homework_commons.course_id = #{course.id} + AND student_works.user_id = members.user_id + ) AS score + FROM members + JOIN students_for_courses + ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id + WHERE members.course_id = #{course.id} ORDER BY score #{score_sort_by} limit 9" + sql = ActiveRecord::Base.connection() + homework_scores = Member.find_by_sql(sql_select) + sql.close() + homework_scores +end diff --git a/app/models/course.rb b/app/models/course.rb index 1350b8cf7..ec1afd611 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -40,8 +40,10 @@ class Course < ActiveRecord::Base has_many :course_activities # 课程消息 - has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy + has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy has_many :exercises, :dependent => :destroy + # 课程贡献榜 + has_many :course_contributor_scores, :dependent => :destroy acts_as_taggable acts_as_nested_set :order => 'name', :dependent => :destroy diff --git a/app/models/course_contributor_score.rb b/app/models/course_contributor_score.rb new file mode 100644 index 000000000..598b8e014 --- /dev/null +++ b/app/models/course_contributor_score.rb @@ -0,0 +1,5 @@ +class CourseContributorScore < ActiveRecord::Base + attr_accessible :course_id, :journal_num, :journal_reply_num, :message_num, :message_reply_num, :news_reply_num, :resource_num, :user_id + belongs_to :course + belongs_to :user +end diff --git a/app/models/user.rb b/app/models/user.rb index 3e7bc2ddb..cd8b96d47 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -153,6 +153,8 @@ class User < Principal # 邮件邀请状态 has_many :invite_lists, :dependent => :destroy # end + # 课程贡献榜 + has_many :course_contributor_scores, :dependent => :destroy ######added by nie has_many :project_infos, :dependent => :destroy diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 8b15e67ea..4a7692405 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -200,7 +200,58 @@ <%= render 'courses/tool_expand', :locals => {:is_teacher => is_teacher, :course_file_num => course_file_num} %>
        + <%# 课程贡献榜 %>
        + +

        <%= l(:label_course_brief_introduction)%>：

        diff --git a/db/migrate/20151125064914_create_course_contributor_scores.rb b/db/migrate/20151125064914_create_course_contributor_scores.rb new file mode 100644 index 000000000..0d16ac68b --- /dev/null +++ b/db/migrate/20151125064914_create_course_contributor_scores.rb @@ -0,0 +1,16 @@ +class CreateCourseContributorScores < ActiveRecord::Migration + def change + create_table :course_contributor_scores do |t| + t.integer :course_id + t.integer :user_id + t.integer :message_num + t.integer :message_reply_num + t.integer :news_reply_num + t.integer :resource_num + t.integer :journal_num + t.integer :journal_reply_num + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 95f79b84b..64f94cc29 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151120134208) do +ActiveRecord::Schema.define(:version => 20151125064914) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -241,6 +241,58 @@ ActiveRecord::Schema.define(:version => 20151120134208) do add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true + create_table "code_review_assignments", :force => true do |t| + t.integer "issue_id" + t.integer "change_id" + t.integer "attachment_id" + t.string "file_path" + t.string "rev" + t.string "rev_to" + t.string "action_type" + t.integer "changeset_id" + end + + create_table "code_review_project_settings", :force => true do |t| + t.integer "project_id" + t.integer "tracker_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "updated_by" + t.boolean "hide_code_review_tab", :default => false + t.integer "auto_relation", :default => 1 + t.integer "assignment_tracker_id" + t.text "auto_assign" + t.integer "lock_version", :default => 0, :null => false + t.boolean "tracker_in_review_dialog", :default => false + end + + create_table "code_review_user_settings", :force => true do |t| + t.integer "user_id", :default => 0, :null => false + t.integer "mail_notification", :default => 0, :null => false + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "code_reviews", :force => true do |t| + t.integer "project_id" + t.integer "change_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "line" + t.integer "updated_by_id" + t.integer "lock_version", :default => 0, :null => false + t.integer "status_changed_from" + t.integer "status_changed_to" + t.integer "issue_id" + t.string "action_type" + t.string "file_path" + t.string "rev" + t.string "rev_to" + t.integer "attachment_id" + t.integer "file_count", :default => 0, :null => false + t.boolean "diff_all" + end + create_table "comments", :force => true do |t| t.string "commented_type", :limit => 30, :default => "", :null => false t.integer "commented_id", :default => 0, :null => false @@ -330,6 +382,19 @@ ActiveRecord::Schema.define(:version => 20151120134208) do t.integer "container_id", :default => 0 end + create_table "course_contributor_scores", :force => true do |t| + t.integer "course_id" + t.integer "user_id" + t.integer "message_num" + t.integer "message_reply_num" + t.integer "news_reply_num" + t.integer "resource_num" + t.integer "journal_num" + t.integer "journal_reply_num" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "course_groups", :force => true do |t| t.string "name" t.integer "course_id" diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index e71eb975c..7d5d66103 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1173,6 +1173,6 @@ a:hover.testEdit{ background:url(images/icons.png) -21px -272px no-repeat;} .courseMenuSetting:hover {background:url(../images/homepage_icon2.png) -190px -407px no-repeat;} .rankList {width:220px; padding:10px; background-color:#ffffff; margin-top:10px;} .rankList li {width:73px; padding:5px 0px; text-align:center; float:left; position:relative;} -.rankList li p {width:100%; overflow:hidden; white-space:normal; text-overflow:ellipsis; color:#585858;} +.rankList li p {width:100%; overflow:hidden; white-space:normal; text-overflow:ellipsis; color:#585858;word-wrap: normal; word-break: normal;} .rankPortrait {border-radius:50%; width:35px; height:35px;} .numIntro {position:absolute; text-align:left; z-index:999; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); border:1px solid #eaeaea; background-color:#ffffff; padding:3px 5px; left:15px; width:65px; color:#585858;} \ No newline at end of file diff --git a/spec/factories/course_contributor_scores.rb b/spec/factories/course_contributor_scores.rb new file mode 100644 index 000000000..2226a60d2 --- /dev/null +++ b/spec/factories/course_contributor_scores.rb @@ -0,0 +1,13 @@ +FactoryGirl.define do + factory :course_contributor_score do + course_id 1 +user_id 1 +message_num 1 +message_reply_num 1 +news_reply_num 1 +resource_num 1 +journal_num 1 +journal_reply_num 1 + end + +end diff --git a/spec/models/course_contributor_score_spec.rb b/spec/models/course_contributor_score_spec.rb new file mode 100644 index 000000000..bc3b3cb52 --- /dev/null +++ b/spec/models/course_contributor_score_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe CourseContributorScore, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end From c7cf34500ca8d3401c5ea6d35a60d7ec5ddd4723 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 25 Nov 2015 16:05:02 +0800 Subject: [PATCH 241/285] =?UTF-8?q?=E8=80=81=E5=B8=88=E8=8B=A5=E6=9C=AA?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B5=8B=E9=AA=8C=E7=9A=84=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=99=E6=8F=90=E4=BA=A4=E5=90=8E=E7=AB=8B?= =?UTF-8?q?=E5=8D=B3=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 11 +++++++++++ app/views/exercise/_exercise_form.html.erb | 7 +++++-- app/views/exercise/_exercise_submit_info.html.erb | 9 ++------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 6fcbb0c6c..2c1ad31c1 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -446,6 +446,17 @@ class ExerciseController < ApplicationController def commit_exercise # 老师不需要提交 if User.current.allowed_to?(:as_teacher,@course) + if @exercise.publish_time.nil? + @exercise.update_attributes(:show_result => params[:show_result]) + @exercise.update_attributes(:exercise_status => 2) + @exercise.update_attributes(:publish_time => Time.now) + redirect_to exercise_url(@exercise) + return + elsif Time.parse(@exercise.publish_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") > Time.now.strftime("%Y-%m-%d-%H-%M-%S") + @exercise.update_attributes(:show_result => params[:show_result]) + redirect_to exercise_url(@exercise) + return + end @exercise.update_attributes(:show_result => params[:show_result]) redirect_to exercise_url(@exercise) # REDO: 提示提交成功 diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index 6b8e93bd0..66558936a 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -122,8 +122,11 @@ alert("截止时间不能小于当前时间"); } else if($.trim($("#exercise_time").val()) !="" && !/^[1-9][0-9]*$/.test($.trim($("#exercise_time").val()))) { alert("测验时长必须为非零开头的数字"); - } - else { + } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_publish_time").val()) < Date.now()) { + alert("发布时间不能小于当前时间"); + } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_end_time").val()) <= Date.parse($("#exercise_publish_time").val())) { + alert("截止时间必须大于发布时间"); + } else { doc.parent().parent().parent().submit(); } } diff --git a/app/views/exercise/_exercise_submit_info.html.erb b/app/views/exercise/_exercise_submit_info.html.erb index 0d7e8928c..0744b4fd1 100644 --- a/app/views/exercise/_exercise_submit_info.html.erb +++ b/app/views/exercise/_exercise_submit_info.html.erb @@ -19,14 +19,9 @@ <% mc_count = exercise.exercise_questions.where("question_type=1").count %> <% mcq_count = exercise.exercise_questions.where("question_type=2").count %> <% single_count = exercise.exercise_questions.where("question_type=3").count %> -

        当前测验 - <% if question_count > 0 %>共有<%= question_count %>道题，其中<% end %> - <% if mc_count > 0 %><%= mc_count %>道单选、<% end %> - <% if mcq_count > 0 %><%= mcq_count %>道多选、<% end %> - <% if single_count > 0%><%= single_count %>道填空,<% end %> - 总分为<%=current_score %>分。 +

        当前测验<%if question_count >0%>共有<%= question_count %>道题，其中<%end%><%if mc_count > 0%><%=mc_count %>道单选、<%end%><%if mcq_count > 0%><%=mcq_count %>道多选、<%end%><%if single_count > 0%><%=single_count %>道填空，<%end%>总分为<%=current_score %>分。

        - 是否确定提交该测验？ + <% if exercise.publish_time.nil? %>点击提交后测验将立即发布，<% end %>是否确定提交该测验？

        From 6f4b6a6b67aa397877c9fe86229fe6752e729f67 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 26 Nov 2015 10:03:12 +0800 Subject: [PATCH 242/285] =?UTF-8?q?=E5=A1=AB=E7=A9=BA=E9=A2=98=E7=9A=84?= =?UTF-8?q?=E5=80=99=E9=80=89=E7=AD=94=E6=A1=88=E4=B8=8D=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E9=80=89=E6=8B=A9=E9=A2=98=E5=92=8C=E5=A1=AB?= =?UTF-8?q?=E7=A9=BA=E9=A2=98=E8=87=B3=E5=B0=91=E5=BE=97=E6=9C=89=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E9=80=89=E9=A1=B9=E6=88=96=E4=B8=80=E4=B8=AA=E5=80=99?= =?UTF-8?q?=E9=80=89=E7=AD=94=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_edit_single.html.erb | 6 +-- app/views/exercise/_exercise_form.html.erb | 20 +++++++- app/views/exercise/_new_MC.html.erb | 56 +++++++++++----------- app/views/exercise/_new_MCQ.html.erb | 56 +++++++++++----------- app/views/exercise/_new_single.html.erb | 44 +++++++++-------- app/views/exercise/_show_MC.html.erb | 4 +- app/views/exercise/_show_MCQ.html.erb | 4 +- app/views/exercise/_show_single.html.erb | 12 ++--- 8 files changed, 113 insertions(+), 89 deletions(-) diff --git a/app/views/exercise/_edit_single.html.erb b/app/views/exercise/_edit_single.html.erb index d2e4a6f2c..0ce2f0943 100644 --- a/app/views/exercise/_edit_single.html.erb +++ b/app/views/exercise/_edit_single.html.erb @@ -8,7 +8,7 @@ $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>" + "
      • " + "" + - "" + + "" + "" + "" + @@ -24,7 +24,7 @@
        • -
        +
        • @@ -35,7 +35,7 @@ <% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>
        • - +
          • diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index 66558936a..f73c15eca 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -106,6 +106,24 @@ alert("分数必须是非零开头的数字"); }else if(quest_type !=3 && standard_ans.length == 0) { alert("标准答案不能为空"); + }else if(quest_type ==3) { + var div = $("#poll_answers_" + id); + var candiate_answer = $(".candiate_answer",div); + if(candiate_answer.length > 0) { + for(i=0;i分
          -
        • - - - - -
          • -
          -
        • - - - - -
          • -
          -
        • - - - - -
          • -
          -
        • - - - - -
          • +
          +
        • + + + + +
          • +
          +
        • + + + + +
          • +
          +
        • + + + + +
          • +
          +
        • + + + + +
          • +
        • diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb index 0555b997c..c5ae81fd6 100644 --- a/app/views/exercise/_new_MCQ.html.erb +++ b/app/views/exercise/_new_MCQ.html.erb @@ -16,33 +16,35 @@ 分
          • -
        • - - - - -
          • -
          -
        • - - - - -
          • -
          -
        • - - - - -
          • -
          -
        • - - - - -
          • +
          +
        • + + + + +
          • +
          +
        • + + + + +
          • +
          +
        • + + + + +
          • +
          +
        • + + + + +
          • +
        • diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb index 08b31087a..061b053fd 100644 --- a/app/views/exercise/_new_single.html.erb +++ b/app/views/exercise/_new_single.html.erb @@ -8,7 +8,7 @@
        -
        +
        • <% score = exercise.exercise_questions.where("question_type=3").last.nil? ? "": exercise.exercise_questions.where("question_type=3").last.question_score %> @@ -16,26 +16,28 @@ 分
          • -
        • - - - - -
          • -
          -
        • - - - - -
          • -
          -
        • - - - - -
          • +
          +
        • + + + + +
          • +
          +
        • + + + + +
          • +
          +
        • + + + + +
          • +
        diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb index f6ee29266..28015a15c 100644 --- a/app/views/exercise/_show_MC.html.erb +++ b/app/views/exercise/_show_MC.html.erb @@ -53,7 +53,7 @@ '
      • '+ ''+ '分'+ - '
        • '+ + '
        '+ '
      • '+ ''+ ''+ @@ -80,7 +80,7 @@ ''+ ''+ ''+ - '
        • '+ + '
        '+ '
        '+ '
      • '+ ''+ diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb index d7a7c2b6d..8135abc51 100644 --- a/app/views/exercise/_show_MCQ.html.erb +++ b/app/views/exercise/_show_MCQ.html.erb @@ -52,7 +52,7 @@ '
      • '+ ''+ '分'+ - '
        • '+ + '
        '+ '
      • '+ ''+ ''+ @@ -79,7 +79,7 @@ ''+ ''+ ''+ - '
        • '+ + '
        '+ '
        '+ '
      • '+ ''+ diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb index a6bb5afe9..d12af23ec 100644 --- a/app/views/exercise/_show_single.html.erb +++ b/app/views/exercise/_show_single.html.erb @@ -35,32 +35,32 @@ ''+ ''+ '
        • '+ - '
        '+ + '
        '+ '
          '+ '
        • '+ ''+ '分'+ - '
          • '+ + '
          '+ '
        • '+ ''+ - ''+ + ''+ ''+ ''+ '
          • '+ '
          '+ '
        • '+ ''+ - ''+ + ''+ ''+ ''+ '
          • '+ '
          '+ '
        • '+ ''+ - ''+ + ''+ ''+ ''+ - '
          • '+ + '
          '+ '
          '+ '
        '+ '
        '+ From 6513c0afee89d65b88dcb575d84a8456cfdc4144 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 26 Nov 2015 10:11:54 +0800 Subject: [PATCH 243/285] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E9=A2=98=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_show_MC.html.erb | 2 +- app/views/exercise/_show_MCQ.html.erb | 2 +- app/views/exercise/_show_single.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb index 28015a15c..7c13bbd84 100644 --- a/app/views/exercise/_show_MC.html.erb +++ b/app/views/exercise/_show_MC.html.erb @@ -5,7 +5,7 @@
        <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number), - method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> + method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de",:title => "删除") %>
        diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb index 8135abc51..72fd049a6 100644 --- a/app/views/exercise/_show_MCQ.html.erb +++ b/app/views/exercise/_show_MCQ.html.erb @@ -4,7 +4,7 @@ (<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)
        <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number), - method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> + method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de",:title => "删除") %>
        diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb index d12af23ec..2772e43ed 100644 --- a/app/views/exercise/_show_single.html.erb +++ b/app/views/exercise/_show_single.html.erb @@ -3,7 +3,7 @@ <%= exercise_question.question_title %>
        <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number), - method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> + method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de",:title => "删除") %>
        From a0c73a5a546ed5fbe594d94a107e2f167d825bde Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 26 Nov 2015 10:27:32 +0800 Subject: [PATCH 244/285] =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_edit_MC.html.erb | 123 ++++++++------- app/views/exercise/_new_MC.html.erb | 122 +++++++-------- app/views/exercise/_show_MC.html.erb | 220 +++++++++++++-------------- public/stylesheets/polls.css | 2 +- 4 files changed, 233 insertions(+), 234 deletions(-) diff --git a/app/views/exercise/_edit_MC.html.erb b/app/views/exercise/_edit_MC.html.erb index 008c95c24..adc955dee 100644 --- a/app/views/exercise/_edit_MC.html.erb +++ b/app/views/exercise/_edit_MC.html.erb @@ -1,63 +1,62 @@ -<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%> - - - -
        -
        - - - -
        -
        -
          -
        • - - 分 -
          • -
          -
          - <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %> -
        • - - - - -
          • -
          - <% end %> -
          -
        • - - -
          • -
          -
        -
        -
        - - 保存 - - - <%= l(:button_cancel)%> - -
        -
        -
        - +<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%> + + + +
        +
        + + + +
        +
        +
          +
        • + + 分 + 标准答案：请点击正确选项前面单选按钮 +
          • +
          +
          + <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %> +
        • + + + + + +
          • +
          + <% end %> +
          +
          +
        +
        +
        + + 保存 + + + <%= l(:button_cancel)%> + +
        +
        +
        + <% end%> \ No newline at end of file diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb index 4e9376214..c0a53b2e9 100644 --- a/app/views/exercise/_new_MC.html.erb +++ b/app/views/exercise/_new_MC.html.erb @@ -1,62 +1,62 @@ -<%= form_for(ExerciseQuestion.new, - :html => { :multipart => true }, - :url=>create_exercise_question_exercise_path(exercise.id), - :remote=>true ) do |f| %> -
        -
        - - - -
        -
        -
          -
        • - <% score = exercise.exercise_questions.where("question_type=1").last.nil? ? "": exercise.exercise_questions.where("question_type=1").last.question_score %> - - 分 -
          • -
          -
          -
        • - - - - -
          • -
          -
        • - - - - -
          • -
          -
        • - - - - -
          • -
          -
        • - - - - -
          • -
          -
          -
        • - - -
          • -
          -
        -
        -
        - 保存 - 取消 -
        -
        -
        +<%= form_for(ExerciseQuestion.new, + :html => { :multipart => true }, + :url=>create_exercise_question_exercise_path(exercise.id), + :remote=>true ) do |f| %> +
        +
        + + + +
        +
        +
          +
        • + <% score = exercise.exercise_questions.where("question_type=1").last.nil? ? "": exercise.exercise_questions.where("question_type=1").last.question_score %> + + 分 + 标准答案：请选择 +
          • +
          +
          +
        • + + + + + +
          • +
          +
        • + + + + + +
          • +
          +
        • + + + + + +
          • +
          +
        • + + + + + +
          • +
          +
          +
        +
        +
        + 保存 + 取消 +
        +
        +
        <% end %> \ No newline at end of file diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb index 28015a15c..c301e0fc4 100644 --- a/app/views/exercise/_show_MC.html.erb +++ b/app/views/exercise/_show_MC.html.erb @@ -1,111 +1,111 @@ -
        -
        第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
        - <%= exercise_question.question_title %> - (<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>) -
        - - <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number), - method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> - - -
        -
        - - - <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %> - - - - <% end %> - -
        - -
        -
        -
        - -
        -
        - - \ No newline at end of file diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css index 9f7b2d021..cfc3b1b4a 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -89,7 +89,7 @@ a:hover.btn_cancel{ color:#666;} .ur_question_title{ width:534px; height:30px; border:1px solid #cbcbcb; padding-left:5px; margin-right:10px; background:#fff;} .ur_editor_title{ margin-bottom:10px;} .ur_editor_content{ } -.ur_item{ margin-bottom:5px; height:32px; } +.ur_item{ margin-bottom:5px; height:32px; line-height: 32px; vertical-align: middle; } .ur_item input{ width:324px; height:30px;border:1px solid #cbcbcb; padding-left:5px; float:left; margin-right:10px; background:#fff;} .ur_item label{ float:left;} .icon_add{ background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;} From 2a73751fd910560df911a52a05cb5fe9d57849e9 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 26 Nov 2015 10:56:24 +0800 Subject: [PATCH 245/285] =?UTF-8?q?=E5=A4=9A=E9=80=89=E9=A2=98=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_edit_MC.html.erb | 2 +- app/views/exercise/_edit_MCQ.html.erb | 121 +++--- app/views/exercise/_exercise_form.html.erb | 438 ++++++++++----------- app/views/exercise/_new_MCQ.html.erb | 122 +++--- app/views/exercise/_show_MCQ.html.erb | 10 +- 5 files changed, 345 insertions(+), 348 deletions(-) diff --git a/app/views/exercise/_edit_MC.html.erb b/app/views/exercise/_edit_MC.html.erb index adc955dee..fee35824b 100644 --- a/app/views/exercise/_edit_MC.html.erb +++ b/app/views/exercise/_edit_MC.html.erb @@ -30,7 +30,7 @@
      • 分 - 标准答案：请点击正确选项前面单选按钮 + 标准答案：请选择
        • diff --git a/app/views/exercise/_edit_MCQ.html.erb b/app/views/exercise/_edit_MCQ.html.erb index 2b900d648..66bbe8a6f 100644 --- a/app/views/exercise/_edit_MCQ.html.erb +++ b/app/views/exercise/_edit_MCQ.html.erb @@ -1,63 +1,60 @@ -<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%> - - - -
        -
        - - - -
        -
        -
          -
        • - - 分 -
          • -
          -
          - <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %> -
        • - - - - -
          • -
          - <% end %> -
          -
        • - - -
          • -
          -
        -
        -
        - - 保存 - - - <%= l(:button_cancel)%> - -
        -
        -
        - +<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%> + + + +
        +
        + + + +
        +
        +
          +
        • + + 分 + 标准答案：请选择 +
          • +
          +
          + <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %> +
        • + + + + + +
          • +
          + <% end %> +
          +
        +
        +
        + + 保存 + + + <%= l(:button_cancel)%> + +
        +
        +
        + <% end%> \ No newline at end of file diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index f73c15eca..40e68ad61 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -1,219 +1,219 @@ -<%= stylesheet_link_tag 'polls', :media => 'all' %> - -
        -
        - - -
        - <%= render :partial => 'edit_head', :locals => {:exercise => @exercise} %> -
        - <% current_score = get_current_score @exercise %> -
        " id="current_score_div">目前试卷总分：<%= current_score %> - 分
        - -
        - <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise} %> -
        - -
        - <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %> -
        - - - -
        -
        - -
        - <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %> -
        -
        - -
        -
        +<%= stylesheet_link_tag 'polls', :media => 'all' %> + +
        +
        + + +
        + <%= render :partial => 'edit_head', :locals => {:exercise => @exercise} %> +
        + <% current_score = get_current_score @exercise %> +
        " id="current_score_div">目前试卷总分：<%= current_score %> + 分
        + +
        + <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise} %> +
        + +
        + <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %> +
        + + + +
        +
        + +
        + <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %> +
        +
        + +
        +
        diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb index c5ae81fd6..eaf618c56 100644 --- a/app/views/exercise/_new_MCQ.html.erb +++ b/app/views/exercise/_new_MCQ.html.erb @@ -1,62 +1,62 @@ -<%= form_for(ExerciseQuestion.new, - :html => { :multipart => true }, - :url=>create_exercise_question_exercise_path(exercise.id), - :remote=>true ) do |f| %> -
        -
        - - - -
        -
        -
          -
        • - <% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %> - - 分 -
          • -
          -
          -
        • - - - - -
          • -
          -
        • - - - - -
          • -
          -
        • - - - - -
          • -
          -
        • - - - - -
          • -
          -
          -
        • - - -
          • -
          -
        -
        -
        - 保存 - 取消 -
        -
        -
        +<%= form_for(ExerciseQuestion.new, + :html => { :multipart => true }, + :url=>create_exercise_question_exercise_path(exercise.id), + :remote=>true ) do |f| %> +
        +
        + + + +
        +
        +
          +
        • + <% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %> + + 分 + 标准答案：请选择 +
          • +
          +
          +
        • + + + + + +
          • +
          +
        • + + + + + +
          • +
          +
        • + + + + + +
          • +
          +
        • + + + + + +
          • +
          +
          +
        +
        +
        + 保存 + 取消 +
        +
        +
        <% end %> \ No newline at end of file diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb index a477303d7..3413007ae 100644 --- a/app/views/exercise/_show_MCQ.html.erb +++ b/app/views/exercise/_show_MCQ.html.erb @@ -52,9 +52,11 @@ '
      • '+ ''+ '分'+ + '标准答案：请选择'+ '
        • '+ '
      • '+ ''+ + ''+ ''+ ''+ ''+ @@ -62,6 +64,7 @@ '
        '+ '
      • '+ ''+ + ''+ ''+ ''+ ''+ @@ -69,6 +72,7 @@ '
        '+ '
      • '+ ''+ + ''+ ''+ ''+ ''+ @@ -76,16 +80,12 @@ '
        '+ '
      • '+ ''+ + ''+ ''+ ''+ ''+ '
        • '+ '
        '+ - '
      • '+ - ''+ - ''+ - '
        • '+ - '
        '+ ''+ '
        '+ '
        '+ From 09e0e5e93dd23b06d60ee842583b11069cfaeb6b Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 26 Nov 2015 11:10:17 +0800 Subject: [PATCH 246/285] =?UTF-8?q?=E5=8D=95=E9=80=89=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_edit_MC.html.erb | 7 ++++--- app/views/exercise/_edit_MCQ.html.erb | 7 +++++-- app/views/exercise/_exercise_form.html.erb | 2 +- app/views/exercise/_new_MC.html.erb | 10 +++++----- app/views/exercise/_new_MCQ.html.erb | 10 +++++----- app/views/exercise/_show_MC.html.erb | 13 ++++++------- app/views/exercise/_show_MCQ.html.erb | 10 +++++----- 7 files changed, 31 insertions(+), 28 deletions(-) diff --git a/app/views/exercise/_edit_MC.html.erb b/app/views/exercise/_edit_MC.html.erb index fee35824b..f4ececf8f 100644 --- a/app/views/exercise/_edit_MC.html.erb +++ b/app/views/exercise/_edit_MC.html.erb @@ -8,7 +8,6 @@ $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>") $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" + "
      • " + - ""+ "" + "" + "" + @@ -30,14 +29,12 @@
      • 分 - 标准答案：请选择
        • <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
      • - @@ -45,6 +42,10 @@
        <% end %>
        • +
      • + + +
        • diff --git a/app/views/exercise/_edit_MCQ.html.erb b/app/views/exercise/_edit_MCQ.html.erb index 66bbe8a6f..18ae79d1c 100644 --- a/app/views/exercise/_edit_MCQ.html.erb +++ b/app/views/exercise/_edit_MCQ.html.erb @@ -29,14 +29,12 @@
      • 分 - 标准答案：请选择
        • <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
      • - @@ -44,6 +42,11 @@
        <% end %>
        • +
      • + + +
        • +
        diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index 40e68ad61..8de4dac38 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -162,7 +162,7 @@ //单选题 function add_single_answer(doc) { - doc.parent().after("
      • " + + doc.parent().after("
      • " + ""+ "
        • "); } diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb index c0a53b2e9..0d7350570 100644 --- a/app/views/exercise/_new_MC.html.erb +++ b/app/views/exercise/_new_MC.html.erb @@ -14,13 +14,11 @@ <% score = exercise.exercise_questions.where("question_type=1").last.nil? ? "": exercise.exercise_questions.where("question_type=1").last.question_score %> 分 - 标准答案：请选择
      • - @@ -28,7 +26,6 @@
      • - @@ -36,7 +33,6 @@
      • - @@ -44,13 +40,17 @@
      • -
        • +
      • + + +
        • +
        diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb index eaf618c56..3ea198d8f 100644 --- a/app/views/exercise/_new_MCQ.html.erb +++ b/app/views/exercise/_new_MCQ.html.erb @@ -14,13 +14,11 @@ <% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %> 分 - 标准答案：请选择
      • - @@ -28,7 +26,6 @@
      • - @@ -36,7 +33,6 @@
      • - @@ -44,13 +40,17 @@
      • -
        • +
      • + + +
        • +
        diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb index 4c382deb9..d052bd6da 100644 --- a/app/views/exercise/_show_MC.html.erb +++ b/app/views/exercise/_show_MC.html.erb @@ -5,8 +5,7 @@
        <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number), - - method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de",:title => "删除") %> + method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %>
        @@ -54,11 +53,9 @@ '
      • '+ ''+ '分'+ - '标准答案：请选择'+ '
        • '+ '
      • '+ ''+ - ''+ ''+ ''+ ''+ @@ -66,7 +63,6 @@ '
        '+ '
      • '+ ''+ - ''+ ''+ ''+ ''+ @@ -74,7 +70,6 @@ '
        '+ '
      • '+ ''+ - ''+ ''+ ''+ ''+ @@ -82,12 +77,16 @@ '
        '+ '
      • '+ ''+ - ''+ ''+ ''+ ''+ '
        • '+ '
        '+ + '
      • '+ + ''+ + ''+ + '
        • '+ + '
        '+ ''+ '
        '+ '
        '+ diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb index 3413007ae..a477303d7 100644 --- a/app/views/exercise/_show_MCQ.html.erb +++ b/app/views/exercise/_show_MCQ.html.erb @@ -52,11 +52,9 @@ '
      • '+ ''+ '分'+ - '标准答案：请选择'+ '
        • '+ '
      • '+ ''+ - ''+ ''+ ''+ ''+ @@ -64,7 +62,6 @@ '
        '+ '
      • '+ ''+ - ''+ ''+ ''+ ''+ @@ -72,7 +69,6 @@ '
        '+ '
      • '+ ''+ - ''+ ''+ ''+ ''+ @@ -80,12 +76,16 @@ '
        '+ '
      • '+ ''+ - ''+ ''+ ''+ ''+ '
        • '+ '
        '+ + '
      • '+ + ''+ + ''+ + '
        • '+ + '
        '+ ''+ '
        '+ '
        '+ From 6b72b4bb175530011fdd2b72882e800e4232d572 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 26 Nov 2015 11:22:42 +0800 Subject: [PATCH 247/285] =?UTF-8?q?=E9=9D=9E=E8=AF=BE=E7=A8=8B=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E4=BA=BA=E5=91=98=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E7=A7=81=E6=9C=89=E8=AF=BE=E7=A8=8B=E7=9A=84=E6=B5=8B=E9=AA=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 2c1ad31c1..d1df22dff 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -5,8 +5,11 @@ class ExerciseController < ApplicationController before_filter :find_course, :only => [:index,:new,:create,:student_exercise_list] include ExerciseHelper - include ExerciseHelper def index + if @course.is_public == 0 && !User.current.member_of_course?(@course) + render_403 + return + end remove_invalid_exercise(@course) @is_teacher = User.current.allowed_to?(:as_teacher,@course) if @is_teacher From f1bb1bb8c251acd5f1ad906d1589d23562adca30 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 26 Nov 2015 14:36:19 +0800 Subject: [PATCH 248/285] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=94=B9=E6=88=90?= =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=EF=BC=8C=E6=AF=8F=E4=B8=AA?= =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=90=8D=E5=AD=97=E5=89=8D=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BA=8F=E5=8F=B7=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 4 ++-- app/views/exercise/_exercise.html.erb | 11 ++++------- app/views/exercise/_exercises_list.html.erb | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index d1df22dff..0b1a035c1 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -13,9 +13,9 @@ class ExerciseController < ApplicationController remove_invalid_exercise(@course) @is_teacher = User.current.allowed_to?(:as_teacher,@course) if @is_teacher - exercises = @course.exercises + exercises = @course.exercises.order("created_at asc") else - exercises = @course.exercises.where(:exercise_status => 2) + exercises = @course.exercises.where(:exercise_status => 2).order("created_at asc") end @exercises = paginateHelper exercises,20 #分页 respond_to do |format| diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb index 40654d327..d7a457047 100644 --- a/app/views/exercise/_exercise.html.erb +++ b/app/views/exercise/_exercise.html.erb @@ -8,7 +8,7 @@ <%# else %> <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %> <%# end %> - <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %> + <%= link_to (index+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
        @@ -16,8 +16,10 @@ <% if exercise.exercise_status == 1 %>
      • <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%>
        • +
      • <%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%>
        • <% else%>
      • 编辑
        • +
      • 已发布
        • <% end%> <%# if exercise.exercise_status == 2 %> @@ -31,11 +33,6 @@ <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %> <%# end%> - - -
      • <%= format_date exercise.created_at.to_date%>
        • - - <% if exercise.exercise_status == 1 %>
      • 发布试卷
        • <% elsif exercise.exercise_status == 2%> @@ -59,5 +56,5 @@ <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%> <%#end%> <% end%> -
      • <%= format_date exercise.created_at.to_date%>
        • +
      • 截止时间：<%= format_time(exercise.end_time.to_s)%>
        • <% end%> \ No newline at end of file diff --git a/app/views/exercise/_exercises_list.html.erb b/app/views/exercise/_exercises_list.html.erb index f277ebdf5..89964f032 100644 --- a/app/views/exercise/_exercises_list.html.erb +++ b/app/views/exercise/_exercises_list.html.erb @@ -10,9 +10,9 @@
        - <% @exercises.each do |exercise|%> + <% @exercises.each_with_index do |exercise,index|%>
          - <%= render :partial => 'exercise', :locals => {:exercise => exercise} %> + <%= render :partial => 'exercise', :locals => {:exercise => exercise,:index => index} %>
        <% end%> From 5bdcdc607f1424a2e1064db32f3ccbbb34a5f214 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 26 Nov 2015 14:45:35 +0800 Subject: [PATCH 249/285] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise.html.erb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb index d7a457047..ba82fbf82 100644 --- a/app/views/exercise/_exercise.html.erb +++ b/app/views/exercise/_exercise.html.erb @@ -12,16 +12,6 @@
        - <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10") %> - - <% if exercise.exercise_status == 1 %> -
      • <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%>
        • -
      • <%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%>
        • - <% else%> -
      • 编辑
        • -
      • 已发布
        • - <% end%> - <%# if exercise.exercise_status == 2 %> <%# else %> @@ -47,6 +37,16 @@
      • <%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%>
        • <% end%> + <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10") %> + + <% if exercise.exercise_status == 1 %> +
      • <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml10"%>
        • +
      • <%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%>
        • + <% else%> +
      • 编辑
        • +
      • 已发布
        • + <% end%> + <% else%> <% if exercise.exercise_status == 2%> <%# if has_commit%> From b602e1c85d82af3774e6c4a6adf45d4d56976cae Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 26 Nov 2015 14:47:52 +0800 Subject: [PATCH 250/285] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=AD=94=E9=A2=98?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E8=AF=95=E5=8D=B7=E6=88=AA?= =?UTF-8?q?=E6=AD=A2=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise_student.html.erb | 5 ++++- app/views/exercise/_exercise_student_result.html.erb | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index 45d6ccf70..20b8a3d8c 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -42,7 +42,10 @@
        开始时间：<%=format_time(exercise_user.start_at.to_s)%> - 测验时长：<%=exercise.time %>分钟 + 截止时间：<%=format_time(exercise.end_time.to_s)%> + <% unless exercise.time == -1 %> + 测验时长：<%=exercise.time %>分钟 + <% end %> diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb index b9306b0d2..8f6ac0e54 100644 --- a/app/views/exercise/_exercise_student_result.html.erb +++ b/app/views/exercise/_exercise_student_result.html.erb @@ -11,7 +11,10 @@

        <%= exercise.exercise_name%>

        开始时间：<%=format_time(exercise_user.start_at.to_s) %> - 测验时长：<%=exercise.time %>分钟 + 截止时间：<%=format_time(exercise.end_time.to_s)%> + <% unless exercise.time == -1 %> + 测验时长：<%=exercise.time %>分钟 + <% end %> <%# time = exercise_user.end_at - exercise_user.start_at %>
        <%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%>
        From ed9cef486febc212888880a8ec569e72e9298a84 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 26 Nov 2015 15:21:46 +0800 Subject: [PATCH 251/285] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 3 +++ app/views/exercise/_exercise.html.erb | 6 +++--- app/views/exercise/index.html.erb | 8 ++++---- app/views/exercise/publish_exercise.js.erb | 2 +- app/views/exercise/republish_exercise.js.erb | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 0b1a035c1..6066ef3d0 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -302,6 +302,7 @@ class ExerciseController < ApplicationController # 发布试卷 def publish_exercise @is_teacher = User.current.allowed_to?(:as_teacher,@course) + @index = params[:index] @exercise.exercise_status = 2 @exercise.publish_time = Time.now if @exercise.save @@ -316,11 +317,13 @@ class ExerciseController < ApplicationController # 重新发布的时候会删除所有的答题 def republish_exercise @is_teacher = User.current.allowed_to?(:as_teacher,@course) + @index = params[:index] @exercise.exercise_questions.each do |exercise_question| exercise_question.exercise_answers.destroy_all end @exercise.exercise_users.destroy_all @exercise.exercise_status = 1 + @exercise.publish_time = nil @exercise.save respond_to do |format| format.js diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb index ba82fbf82..91af83aee 100644 --- a/app/views/exercise/_exercise.html.erb +++ b/app/views/exercise/_exercise.html.erb @@ -8,7 +8,7 @@ <%# else %> <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %> <%# end %> - <%= link_to (index+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %> + <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
        @@ -24,9 +24,9 @@ <%# end%> <% if exercise.exercise_status == 1 %> -
      • 发布试卷
        • +
      • 发布试卷
        • <% elsif exercise.exercise_status == 2%> -
      • 取消发布
        • +
      • 取消发布
        • <% else%>
      • 发布试卷
        • <% end%> diff --git a/app/views/exercise/index.html.erb b/app/views/exercise/index.html.erb index aacc79950..9b6961e6c 100644 --- a/app/views/exercise/index.html.erb +++ b/app/views/exercise/index.html.erb @@ -5,14 +5,14 @@ $("#homework_page_right").css("min-height",$("#LSide").height()-30); $("#Container").css("width","1000px"); }); - function republish_exercise(exercise_id) + function republish_exercise(exercise_id,index) { $('#ajax-modal').html("
        " + "
        " + "
        " + "

        取消发布后学生答题将会被清空
        是否确定取消发布该测验？

        " + "
        " + - "确  定" + + "确  定" + "取  消" + "
        " + "
        " + @@ -31,7 +31,7 @@ function clickCanel(){hideModal("#popbox02");} - function exercise_submit(exercise_id,exercise_name) + function exercise_submit(exercise_id,exercise_name,index) { if(exercise_name == 0) { @@ -44,7 +44,7 @@ "
        " + "

        测验发布后将不能对测验进行修改，
        是否确定发布该测验？

        " + "
        " + - "确  定" + + "确  定" + "取  消" + "
        " + "
        " + diff --git a/app/views/exercise/publish_exercise.js.erb b/app/views/exercise/publish_exercise.js.erb index ac2899402..c1c4a4fd5 100644 --- a/app/views/exercise/publish_exercise.js.erb +++ b/app/views/exercise/publish_exercise.js.erb @@ -1,4 +1,4 @@ -$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise}) %>"); +$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index =>@index}) %>"); $('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_memo_create_succ)}) %>"); showModal('ajax-modal', '250px'); //$('#ajax-modal').css('height','111px'); diff --git a/app/views/exercise/republish_exercise.js.erb b/app/views/exercise/republish_exercise.js.erb index b7172fe9e..2b4e67606 100644 --- a/app/views/exercise/republish_exercise.js.erb +++ b/app/views/exercise/republish_exercise.js.erb @@ -1,4 +1,4 @@ -$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise}) %>"); +$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index => @index}) %>"); $('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_poll_republish_success)}) %>"); showModal('ajax-modal', '250px'); //$('#ajax-modal').css('height','80px'); From 9c3aed802841b46ff98c25accd2b9e8c6eaf3e54 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 26 Nov 2015 16:29:50 +0800 Subject: [PATCH 252/285] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 36 +++++++ app/views/layouts/base_org.html.erb | 23 +++++ .../organizations/_join_course_menu.html.erb | 98 +++++++++++++++++++ .../organizations/join_course_menu.js.erb | 12 +++ app/views/organizations/search_courses.js.erb | 9 ++ config/routes.rb | 3 + public/stylesheets/new_user.css | 1 + public/stylesheets/org.css | 1 + 8 files changed, 183 insertions(+) create mode 100644 app/views/organizations/_join_course_menu.html.erb create mode 100644 app/views/organizations/join_course_menu.js.erb create mode 100644 app/views/organizations/search_courses.js.erb diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 0d22ab461..4277b5976 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -175,4 +175,40 @@ class OrganizationsController < ApplicationController format.js end end + + def join_course_menu + @organization = Organization.find(params[:id]) + respond_to do |format| + format.js + end + end + + def search_courses + @organization = Organization.find(params[:id]) + condition = '%%' + if !params[:name].nil? + condition = "%#{params[:name].strip}%".gsub(" ","") + end + #sql = "select courses.* from courses inner join members on courses.id = members.course_id inner join org_courses on courses.id = org_courses.course_id where org_courses.organization_id != #{@organization.id} and members.user_id = #{User.current.id} and courses.name like '#{condition}'" + sql = "select courses.* from courses inner join members on courses.id = members.course_id where members.user_id = #{User.current.id} and courses.name like '#{condition}'" + user_courses = Course.find_by_sql(sql) + @added_course_ids = @organization.courses.map(&:id) + @courses = [] + user_courses.each do |course| + if @added_course_ids.include?(course.id) + @courses << course + end + end + end + + def join_courses + @organization = Organization.find(params[:id]) + course_ids = params[:courseNames] + course_ids.each do |id| + OrgCourse.create(:organization_id => @organization.id, :course_id => id.to_i, :created_at => Time.now) + end + respond_to do |format| + format.js + end + end end diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 84edf02e1..7c55060b4 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -98,6 +98,18 @@
        课程 +
        +
          +
        • +
            + +
          • + <%= link_to "加入课程",join_course_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%> +
            • +
          +
          • +
        +
        @@ -122,9 +134,20 @@
        + + + + diff --git a/app/views/organizations/_join_course_menu.html.erb b/app/views/organizations/_join_course_menu.html.erb new file mode 100644 index 000000000..36894d92e --- /dev/null +++ b/app/views/organizations/_join_course_menu.html.erb @@ -0,0 +1,98 @@ + + + + + + + + + + + + + +
        +
        +
        请选择关联到组织的课程
        +
        +
        +
        + <%=form_tag url_for(:controller => 'organizations', :action => 'join_courses', :organization_id => organization_id),:method => 'post', :id => 'join_courses_form', :remote => true,:class=>"resourcesSearchBox" do %> + +
        +
        + 关联 +
        +
        取消
        + <% end %> +
        + +
        +
        +
        +
        +
        + + + + diff --git a/app/views/organizations/join_course_menu.js.erb b/app/views/organizations/join_course_menu.js.erb new file mode 100644 index 000000000..95b9f282f --- /dev/null +++ b/app/views/organizations/join_course_menu.js.erb @@ -0,0 +1,12 @@ +$('#topnav_course_menu').hide(); +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_course_menu', :locals => {:organization_id => @organization.id}) %>'); +$('#ajax-modal').show(); +//showModal('ajax-modal', '540px'); +//$('#ajax-modal').css('height','390px'); +////$('#ajax-modal').siblings().remove(); +////$('#ajax-modal').siblings().hide(); +//$('#ajax-modal').before("" + +// ""); +//$('#ajax-modal').parent().removeClass("alert_praise"); +//$('#ajax-modal').parent().css("top","").css("left",""); +//$('#ajax-modal').parent().addClass("alert_box"); \ No newline at end of file diff --git a/app/views/organizations/search_courses.js.erb b/app/views/organizations/search_courses.js.erb new file mode 100644 index 000000000..9e92b4b07 --- /dev/null +++ b/app/views/organizations/search_courses.js.erb @@ -0,0 +1,9 @@ +$("#search_courses_result_list").html(""); +$("#search_courses_result_list").append('
          '); + +<% @courses.each do |course|%> +link = "
          • "; +$("#search_courses_result_list").append(link ); +<%end %> +$("#search_courses_result_list").append('
        ') + diff --git a/config/routes.rb b/config/routes.rb index d137553ad..f8f0e1cc1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -39,6 +39,9 @@ RedmineApp::Application.routes.draw do get 'members' get 'more_org_projects' get 'more_org_courses' + get 'search_courses' + post 'join_course_menu' + post 'join_courses' end collection do get 'check_uniq' diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index d18dd27d8..bedfa1ceb 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -384,6 +384,7 @@ a.resourcesGrey:hover {font-size:12px; color:#269ac9;} a.uploadText {color:#ffffff; font-size:14px;} .resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:left; background-color:#ffffff;} .searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;} +.searchCourse {border:none; outline:none; background-color:#ffffff; width:184px; padding-left:10px; display:block; margin-bottom:15px;} .searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;} /*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/ .resourcesSearchBanner {width:710px; height:34px; margin-bottom:10px; margin-top:15px; margin-left:auto; margin-right:auto;} diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 914df16b5..0a578ccc3 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -44,6 +44,7 @@ a.cancelBtn:hover {background-color:#717171; color:#ffffff;} .relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} .relatedListOption {width:80px; text-align:center;} .relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} +.search_org {width:150px; max-width:200px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} /*组织列表*/ .mt28 {margin-top:28px;} From f8621cac76b3e00baeadc30843019d54723373cf Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 26 Nov 2015 16:57:51 +0800 Subject: [PATCH 253/285] =?UTF-8?q?=E6=9C=AA=E8=AE=BE=E7=BD=AE=E8=80=83?= =?UTF-8?q?=E8=AF=95=E6=97=B6=E9=95=BF=E6=97=B6=EF=BC=8C=E5=8F=AA=E8=A6=81?= =?UTF-8?q?=E8=BF=98=E6=9C=AA=E5=88=B0=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=B0=B1=E5=8F=AF=E4=BB=A5=E4=B8=80=E7=9B=B4=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E8=AF=95=E5=8D=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 19 ++++++++++----- app/views/exercise/_commit_alert.html.erb | 5 +++- app/views/exercise/_exercise.html.erb | 2 +- app/views/exercise/_exercise_form.html.erb | 6 ++--- app/views/exercise/_exercise_student.html.erb | 23 ++++++++++++------- .../_exercise_student_result.html.erb | 10 ++++---- app/views/exercise/_exercise_teacher.html.erb | 4 ++-- app/views/exercise/_show_head.html.erb | 4 ++-- app/views/exercise/commit_exercise.js.erb | 2 +- public/stylesheets/courses.css | 1 + 10 files changed, 47 insertions(+), 29 deletions(-) diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 6066ef3d0..d4050da18 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -34,17 +34,24 @@ class ExerciseController < ApplicationController render_403 return end - @can_edit_excercise = (!has_commit_exercise?(@exercise.id,User.current.id)) || User.current.admin? + exercise_end = Time.parse(format_time(@exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S") + if @exercise.time == -1 + @can_edit_excercise = exercise_end + else + @can_edit_excercise = (!has_commit_exercise?(@exercise.id,User.current.id)&& exercise_end) || User.current.admin? + end @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first # 学生点击的时候即创建关联,自动保存 #eu = ExerciseUser.create(:user_id => User.current, :exercise_id => @exercise.id, :start_at => Time.now, :status => false) # 已提交问卷的用户不能再访问该界面 +=begin if has_commit_exercise?(@exercise.id, User.current.id) && (!User.current.admin?) respond_to do |format| format.html {render :layout => 'base_courses'} end else +=end if !@is_teacher && !has_click_exercise?(@exercise.id, User.current.id) eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false) @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first @@ -55,7 +62,7 @@ class ExerciseController < ApplicationController respond_to do |format| format.html {render :layout => 'base_courses'} end - end + #end end def new @@ -82,7 +89,7 @@ class ExerciseController < ApplicationController exercise ||= Exercise.new exercise.exercise_name = params[:exercise][:exercise_name] exercise.exercise_description = params[:exercise][:exercise_description] - exercise.end_time = params[:exercise][:end_time] + exercise.end_time = Time.at(params[:exercise][:end_time].to_time.to_i + 16*60*60 -1) exercise.publish_time = params[:exercise][:publish_time] exercise.user_id = User.current.id exercise.time = params[:exercise][:time] @@ -107,7 +114,7 @@ class ExerciseController < ApplicationController @exercise.exercise_name = params[:exercise][:exercise_name] @exercise.exercise_description = params[:exercise][:exercise_description] @exercise.time = params[:exercise][:time].blank? ? -1 : params[:exercise][:time] - @exercise.end_time = params[:exercise][:end_time] + @exercise.end_time = Time.at(params[:exercise][:end_time].to_time.to_i + 16*60*60 -1) @exercise.publish_time = params[:exercise][:publish_time] @exercise.show_result = params[:exercise][:show_result].blank? ? 1 : params[:exercise][:show_result] if @exercise.save @@ -351,8 +358,8 @@ class ExerciseController < ApplicationController # 学生提交答卷，选中答案的过程中提交 def commit_answer eq = ExerciseQuestion.find(params[:exercise_question_id]) - # 已提交过的则不允许答题 - if has_commit_exercise?(@exercise.id,User.current.id) && (!User.current.admin?) + # 已提交过的且是限时的则不允许答题 + if has_commit_exercise?(@exercise.id,User.current.id) && (!User.current.admin?) && @exercise.time != -1 render :json => {:text => "failure"} return end diff --git a/app/views/exercise/_commit_alert.html.erb b/app/views/exercise/_commit_alert.html.erb index d92ca51fb..a21dbd2a7 100644 --- a/app/views/exercise/_commit_alert.html.erb +++ b/app/views/exercise/_commit_alert.html.erb @@ -1,7 +1,10 @@
        - <% if status == 0 %> + <% if status == 0 && exercise.time != -1 %>

        提交成功!您的分数是：<%=@score %>分。

        <%= link_to "确定", exercise_path(),:class => 'commit'%> + <% elsif status == 0 && Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S") %> +

        提交成功!

        + <%= link_to "确定", exercise_index_path(:course_id => @course.id),:class => 'commit'%> <% elsif status == 1 %>

        您还有尚未作答的题目请完成后再提交!

        <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%> diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb index 91af83aee..db412672c 100644 --- a/app/views/exercise/_exercise.html.erb +++ b/app/views/exercise/_exercise.html.erb @@ -53,7 +53,7 @@ <%#else%> - <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%> + <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%> <%#end%> <% end%>
      • 截止时间：<%= format_time(exercise.end_time.to_s)%>
        • diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index 8de4dac38..e283f8b0c 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -136,14 +136,14 @@ alert("测验标题不能为空"); } else if($.trim($("#exercise_end_time").val()) =="") { alert("截止时间不能为空"); - } else if(Date.parse($("#exercise_end_time").val()) < Date.now()) { + } else if((Date.parse($("#exercise_end_time").val())+(24*60*60-1)*1000) < Date.now()) { alert("截止时间不能小于当前时间"); } else if($.trim($("#exercise_time").val()) !="" && !/^[1-9][0-9]*$/.test($.trim($("#exercise_time").val()))) { alert("测验时长必须为非零开头的数字"); } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_publish_time").val()) < Date.now()) { alert("发布时间不能小于当前时间"); - } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_end_time").val()) <= Date.parse($("#exercise_publish_time").val())) { - alert("截止时间必须大于发布时间"); + } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_end_time").val()) < Date.parse($("#exercise_publish_time").val())) { + alert("截止时间不能小于发布时间"); } else { doc.parent().parent().parent().submit(); } diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index 20b8a3d8c..7010407ce 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -3,6 +3,8 @@ $("#RSide").removeAttr("id"); $("#homework_page_right").css("min-height",$("#LSide").height()-30); $("#Container").css("width","1000px"); + end_time = <%=exercise.end_time.to_i%> + getTime(end_time); /*start_time = new Date(); start_time.setFullYear(<%#=exercise_user.start_at.year%>); start_time.setMonth(<%#=exercise_user.start_at.month%>); @@ -17,11 +19,16 @@ function getTime(end_time) { //alert(end_time); now = new Date(); - var total_seconds = (now.getTime() - end_time)/1000; + var total_seconds = now.getTime()/1000 - end_time; + if (total_seconds < 0) { + $("#exercise_submit_btn").click(); + return; + } + setTimeout("getTime("+end_time+");", 1000); //start = new Date(start_time); //end_time = start_time; //var total_seconds = total_seconds - 1; - var hours = total_seconds / 60 / 60; + /*var hours = total_seconds / 60 / 60; var hoursRound = Math.floor(hours); var minutes = total_seconds /60 - (60 * hoursRound); var minutesRound = Math.floor(minutes); @@ -29,9 +36,9 @@ var secondsRound = Math.round(seconds); $("#rest_hours").html(hoursRound); $("#rest_minutes").html(minutesRound); - $("#rest_seconds").html(secondsRound); + $("#rest_seconds").html(secondsRound);*/ //if(total_seconds >0) { - setTimeout("getTime("+end_time+");", 1000); + //setTimeout("getTime("+end_time+");", 1000); //} } @@ -41,8 +48,8 @@

        <%= exercise.exercise_name%>

        - 开始时间：<%=format_time(exercise_user.start_at.to_s)%> - 截止时间：<%=format_time(exercise.end_time.to_s)%> + 开始时间：<%=Time.parse(h(exercise_user.start_at)).strftime("%Y-%m-%d %H:%M:%S")%> + 截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S")%> <% unless exercise.time == -1 %> 测验时长：<%=exercise.time %>分钟 <% end %> @@ -194,7 +201,7 @@ } - > + >
        @@ -202,7 +209,7 @@ <% end %>
        - <%= link_to l(:button_submit),commit_exercise_exercise_path(exercise), :method => :post,:class => "ur_button_submit",:style => "margin-left:80px;",:format => 'js',:remote=>true %> + <%= link_to l(:button_submit),commit_exercise_exercise_path(exercise),:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:style => "margin-left:80px;",:format => 'js',:remote=>true %>
        diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb index 8f6ac0e54..3445d6986 100644 --- a/app/views/exercise/_exercise_student_result.html.erb +++ b/app/views/exercise/_exercise_student_result.html.erb @@ -10,8 +10,8 @@

        <%= exercise.exercise_name%>

        - 开始时间：<%=format_time(exercise_user.start_at.to_s) %> - 截止时间：<%=format_time(exercise.end_time.to_s)%> + 开始时间：<%=Time.parse(h(exercise_user.start_at)).strftime("%Y-%m-%d %H:%M:%S") %> + 截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S")%> <% unless exercise.time == -1 %> 测验时长：<%=exercise.time %>分钟 <% end %> @@ -34,7 +34,7 @@ <% answer = get_user_answer(exercise_question, User.current)%> <% standard_answer = get_user_standard_answer(exercise_question, User.current)%> - <% if answer.first.exercise_choice.choice_position == standard_answer.first.exercise_choice_id %> + <% if !answer.empty? && !standard_answer.empty? && answer.first.exercise_choice.choice_position == standard_answer.first.exercise_choice_id %> √ <% else %> × @@ -73,7 +73,7 @@ <% answer = get_user_answer(exercise_question, User.current)%> <% standard_answer = get_user_standard_answer(exercise_question, User.current)%> - <% if get_mulscore(exercise_question, User.current).to_i == standard_answer.first.exercise_choice_id %> + <% if !standard_answer.empty? && get_mulscore(exercise_question, User.current).to_i == standard_answer.first.exercise_choice_id %> √ <% else %> × @@ -112,7 +112,7 @@ <% answer = get_user_answer(exercise_question, User.current)%> <% standard_answer = get_user_standard_answer(exercise_question, User.current)%> - <% if standard_answer.include?(answer.first.answer_text) %> + <% if !answer.empty? && !standard_answer.empty? && standard_answer.include?(answer.first.answer_text) %> √ <% else %> × diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb index 0a96b782b..6e00fc41d 100644 --- a/app/views/exercise/_exercise_teacher.html.erb +++ b/app/views/exercise/_exercise_teacher.html.erb @@ -11,9 +11,9 @@

        <%= exercise.exercise_name%>

        <% unless exercise.publish_time.nil? %> - 发布时间：<%=format_time(exercise.publish_time.to_s) %> + 发布时间：<%=Time.parse(h(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") %> <% end %> - 截止时间：<%=format_time(exercise.end_time.to_s) %> + 截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") %> <% if exercise.time != -1 %> 测验时长：<%=exercise.time %>分钟 <% end %> diff --git a/app/views/exercise/_show_head.html.erb b/app/views/exercise/_show_head.html.erb index 16a572583..f385e58b8 100644 --- a/app/views/exercise/_show_head.html.erb +++ b/app/views/exercise/_show_head.html.erb @@ -4,9 +4,9 @@

        <%= exercise.exercise_name%>

        <% unless exercise.publish_time.nil? %> - 发布时间：<%=Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%> + 发布时间：<%=Time.parse(h(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%> <% end %> - 截止时间：<%=Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.end_time %> + 截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.end_time %> <% if exercise.time != -1 %> 测验时长：<%= exercise.time %>分钟 <% end %> diff --git a/app/views/exercise/commit_exercise.js.erb b/app/views/exercise/commit_exercise.js.erb index 2a40df2a5..5ede8a951 100644 --- a/app/views/exercise/commit_exercise.js.erb +++ b/app/views/exercise/commit_exercise.js.erb @@ -1,4 +1,4 @@ -$('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status}) %>'); +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status,:exercise =>@exercise}) %>'); showModal('ajax-modal', '270px'); $('#ajax-modal').css('height','110px'); $('#ajax-modal').siblings().remove(); diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index b7a742994..17ed37e05 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1166,4 +1166,5 @@ a:hover.testEdit{ background:url(images/icons.png) -21px -272px no-repeat;} .questionEditContainer {border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px; margin-top:10px;} .fillInput {border:1px solid #cbcbcb; padding-left:5px; background-color:#ffffff; width:693px; height:30px; color:#888888;} .mr130 {margin-right:130px;} +.mr100 {margin-right:100px;} .ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; } \ No newline at end of file From dec5980443be5de596bf04892dcc57908afd8593 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 26 Nov 2015 17:20:17 +0800 Subject: [PATCH 254/285] =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=80=E5=88=B0=E7=AB=8B=E5=8D=B3=E6=8F=90=E4=BA=A4=E8=AF=95?= =?UTF-8?q?=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_commit_alert.html.erb | 7 +++++-- app/views/exercise/_exercise_student.html.erb | 2 +- app/views/exercise/_exercise_student_result.html.erb | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/views/exercise/_commit_alert.html.erb b/app/views/exercise/_commit_alert.html.erb index a21dbd2a7..23aee5a90 100644 --- a/app/views/exercise/_commit_alert.html.erb +++ b/app/views/exercise/_commit_alert.html.erb @@ -1,5 +1,5 @@
        - <% if status == 0 && exercise.time != -1 %> + <% if status == 0 && exercise.time != -1%>

        提交成功!您的分数是：<%=@score %>分。

        <%= link_to "确定", exercise_path(),:class => 'commit'%> <% elsif status == 0 && Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S") %> @@ -8,8 +8,11 @@ <% elsif status == 1 %>

        您还有尚未作答的题目请完成后再提交!

        <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%> - <% else %> + <% elsif status == 2 %>

        发生未知错误，请检查您的网络。

        <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%> + <% else %> +

        时间已到!您的分数是：<%=@score %>分。

        + <%= link_to "确定", exercise_path(),:class => 'commit'%> <% end %>
        diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index 7010407ce..a5c0f2a46 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -20,7 +20,7 @@ //alert(end_time); now = new Date(); var total_seconds = now.getTime()/1000 - end_time; - if (total_seconds < 0) { + if (total_seconds > 0) { $("#exercise_submit_btn").click(); return; } diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb index 3445d6986..93e52b0a1 100644 --- a/app/views/exercise/_exercise_student_result.html.erb +++ b/app/views/exercise/_exercise_student_result.html.erb @@ -39,7 +39,7 @@ <% else %> × <% end %>
        - 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %> + 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) if exercise_question.exercise_standard_answers.first %>
        @@ -117,7 +117,7 @@ <% else %> × <% end %>
        - 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %> + 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) if exercise_question.exercise_standard_answers.first %>
        From aca7684414ca58150cad002f2d00532ecf5ff75c Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 26 Nov 2015 18:22:03 +0800 Subject: [PATCH 255/285] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=E6=A6=9C=20=E5=90=84=E6=A8=A1=E5=9D=97=E5=8A=A8=E4=BD=9C=20?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E5=8A=A0=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 40 +++++++++++++++++++ app/models/attachment.rb | 16 +++++++- app/models/comment.rb | 13 +++++- app/models/journals_for_message.rb | 10 ++++- app/models/message.rb | 14 ++++++- ...1125072235_add_course_contributor_score.rb | 30 ++++++++++++++ db/schema.rb | 2 +- lib/trustie/gitlab/manage_member.rb | 3 ++ 8 files changed, 123 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20151125072235_add_course_contributor_score.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f4e0f88ff..a65ed639c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -75,6 +75,46 @@ module ApplicationHelper end end + # 更新课程英雄榜得分 + # user传过来必须是学生 + def course_member_score(course_id,user_id,type) + course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", course_id, user_id).first + case type + when "JournalForMessage" + if course_contributor_score.nil? + CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0, + :news_reply_num => 0, :resource_num => 0, :journal_num => 1, :journal_reply_num => 0) + else + score = course_contributor_score.journal_num + 1 + course_contributor_score.update_attributes(:journal_num => score) + end + when "Message" + if course_contributor_score.nil? + CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 2, :message_reply_num => 0, + :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0) + else + score = course_contributor_score.message_num + 2 + course_contributor_score.update_attributes(:message_num => score) + end + when "MessageReply" + if course_contributor_score.nil? + CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 1, + :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0) + else + score = course_contributor_score.message_reply_num + 1 + course_contributor_score.update_attributes(:message_reply_num => score) + end + when "NewReply" + if course_contributor_score.nil? + CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0, + :news_reply_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0) + else + score = course_contributor_score.news_reply_num + 1 + course_contributor_score.update_attributes(:news_reply_num => score) + end + end + end + # Added by young # Define the course menu's link class # 不是数组的转化成数组，然后判断当前menu_item是否在给定的列表 diff --git a/app/models/attachment.rb b/app/models/attachment.rb index f7fb9b1aa..22be5a42f 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -74,7 +74,7 @@ class Attachment < ActiveRecord::Base @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails") before_save :files_to_final_location,:act_as_course_activity - after_create :office_conver, :be_user_score,:act_as_forge_activity + after_create :office_conver, :be_user_score,:act_as_forge_activity, :act_as_student_score after_update :office_conver, :be_user_score after_destroy :delete_from_disk,:down_user_score @@ -560,4 +560,18 @@ class Attachment < ActiveRecord::Base self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.container_id) end end + + # 课程成员得分（英雄榜） + def act_as_student_score + unless self.author.allowed_to?(:as_teacher, self.course) + if self.parent_id.nil? + # 发帖 + course_member_score(self.course.id, self.author_id, "Message") + else + # 回帖 + course_member_score(self.course.id, self.author_id, "MessageReply") + end + end + end + end diff --git a/app/models/comment.rb b/app/models/comment.rb index bb31eb894..9de25c50d 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -35,7 +35,7 @@ class Comment < ActiveRecord::Base belongs_to :author, :class_name => 'User', :foreign_key => 'author_id' validates_presence_of :commented, :author, :comments safe_attributes 'comments' - after_create :send_mail, :act_as_system_message + after_create :send_mail, :act_as_system_message, :act_as_student_score def act_as_system_message if self.commented.course @@ -66,13 +66,24 @@ class Comment < ActiveRecord::Base def set_notify_id(notify_id) @notify_id= notify_id end + def get_notify_id() return @notify_id end + def set_notify_is_read(notify_is_read) @notify_is_read = notify_is_read end + def get_notify_is_read() return @notify_is_read end + + # 课程成员得分（英雄榜） + def act_as_student_score + unless self.author.allowed_to?(:as_teacher, self.commented.course) + course_member_score(self.commented.course.id, self.author_id, "NewReply") + end + end + end diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 5e40267cb..eaece95ce 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -64,7 +64,7 @@ class JournalsForMessage < ActiveRecord::Base has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:journals_for_message, :dependent => :destroy validates :notes, presence: true, if: :is_homework_jour? - after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message, :act_as_principal_activity + after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score after_create :reset_counters! after_destroy :reset_counters! after_save :be_user_score @@ -263,4 +263,12 @@ class JournalsForMessage < ActiveRecord::Base end end + + # 课程成员得分（英雄榜） + def act_as_student_score + unless self.user.allowed_to?(:as_teacher, self.jour) + course_member_score(self.jour_id, self.user_id, "JournalForMessage") + end + end + end diff --git a/app/models/message.rb b/app/models/message.rb index 7af59815b..21e5e1c71 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -74,7 +74,7 @@ class Message < ActiveRecord::Base after_update :update_messages_board after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets - after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail + after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score #before_save :be_user_score scope :visible, lambda {|*args| @@ -285,4 +285,16 @@ class Message < ActiveRecord::Base delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE end + # 课程成员得分（英雄榜） + def act_as_student_score + unless self.author.allowed_to?(:as_teacher, self.course) + if self.parent_id.nil? + # 发帖 + course_member_score(self.course.id, self.author_id, "Message") + else + # 回帖 + course_member_score(self.course.id, self.author_id, "MessageReply") + end + end + end end diff --git a/db/migrate/20151125072235_add_course_contributor_score.rb b/db/migrate/20151125072235_add_course_contributor_score.rb new file mode 100644 index 000000000..c3b7c3793 --- /dev/null +++ b/db/migrate/20151125072235_add_course_contributor_score.rb @@ -0,0 +1,30 @@ +class AddCourseContributorScore < ActiveRecord::Migration + def up + # course_count = Course.all.count / 30 + 1 + # transaction do + # for i in 1 ... course_count do i + Course.all.each do |course| + if course.course_activities.count > 1 + course.student.each do |s| + puts course.id + puts course.name + puts s.student_id + board_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?",s.student_id, course.id, "Message").count * 2 + message_reply_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.student_id} and me.parent_id is not null;").count * 1 + common_reply_count = Comment.find_by_sql("select cm.* from comments cm, news n where cm.author_id = #{s.student_id} and n.course_id = #{course.id} and cm.commented_id = n.id and cm.commented_type ='News'").count * 1 + attachment_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "Attachment").count * 5 + journal_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? ", s.student_id, course.id, "Course").count * 1 + # journal_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "JournalsForMessage").count * 1 + # journal_reply_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? and status =?", s.student_id, course.id, "Course",1).count * 1 + CourseContributorScore.create(:course_id => course.id, :user_id => s.student_id, :message_num => board_count, :message_reply_num => message_reply_count, + :news_reply_num => common_reply_count, :resource_num => attachment_count, :journal_num => journal_count, :journal_reply_num => 0) + end + end + end + # end + # end + end + + def down + end +end \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index 64f94cc29..51ac1ad7d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151125064914) do +ActiveRecord::Schema.define(:version => 20151125072235) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false diff --git a/lib/trustie/gitlab/manage_member.rb b/lib/trustie/gitlab/manage_member.rb index b8c2149f4..627c137ce 100644 --- a/lib/trustie/gitlab/manage_member.rb +++ b/lib/trustie/gitlab/manage_member.rb @@ -23,6 +23,9 @@ module Trustie def add_gitlab_member if isGitlabProject? @g ||= ::Gitlab.client + if self.member.user.gid.nil? + add_user(self.member.user) + end @g.add_team_member(project.gpid, self.member.user.gid, self.role.to_gitlab_role ) end end From 061a1f602a2212891634d819623d4db8d06497bb Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 26 Nov 2015 21:17:04 +0800 Subject: [PATCH 256/285] =?UTF-8?q?=E6=95=88=E6=9E=9C=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/courses_helper.rb | 22 +++++--- app/models/attachment.rb | 18 +++--- app/views/courses/_tool_expand.html.erb | 27 +++------ app/views/layouts/base_courses.html.erb | 74 ++++++++++++------------- 4 files changed, 66 insertions(+), 75 deletions(-) diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index d07001215..aa42d247e 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -737,11 +737,10 @@ module CoursesHelper end desc.html_safe end -end -# 学生按作业总分排序，取前8个 -def hero_homework_score(course, score_sort_by) - sql_select = "SELECT members.*,( + # 学生按作业总分排序，取前8个 + def hero_homework_score(course, score_sort_by) + sql_select = "SELECT members.*,( SELECT SUM(student_works.final_score) FROM student_works,homework_commons WHERE student_works.homework_common_id = homework_commons.id @@ -752,8 +751,15 @@ def hero_homework_score(course, score_sort_by) JOIN students_for_courses ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id WHERE members.course_id = #{course.id} ORDER BY score #{score_sort_by} limit 9" - sql = ActiveRecord::Base.connection() - homework_scores = Member.find_by_sql(sql_select) - sql.close() - homework_scores + sql = ActiveRecord::Base.connection() + homework_scores = Member.find_by_sql(sql_select) + sql.close() + homework_scores + end + + def contributor_course_scor(course) + + end + end + diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 22be5a42f..45d19e681 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -73,10 +73,11 @@ class Attachment < ActiveRecord::Base cattr_accessor :thumbnails_storage_path @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails") - before_save :files_to_final_location,:act_as_course_activity - after_create :office_conver, :be_user_score,:act_as_forge_activity, :act_as_student_score + before_save :files_to_final_location,:act_as_course_activity, :act_as_student_score + after_create :office_conver, :be_user_score,:act_as_forge_activity after_update :office_conver, :be_user_score after_destroy :delete_from_disk,:down_user_score + # after_save :act_as_student_score # add by nwb # 获取所有可公开的资源文件列表 @@ -563,13 +564,14 @@ class Attachment < ActiveRecord::Base # 课程成员得分（英雄榜） def act_as_student_score - unless self.author.allowed_to?(:as_teacher, self.course) - if self.parent_id.nil? - # 发帖 - course_member_score(self.course.id, self.author_id, "Message") + unless self.author.allowed_to?(:as_teacher, self.container) + course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", self.container_id, self.author_id).first + if course_contributor_score.nil? + CourseContributorScore.create(:course_id => self.container_id, :user_id => self.author_id, :message_num => 0, :message_reply_num => 0, + :news_reply_num => 0, :resource_num => 5, :journal_num => 0, :journal_reply_num => 0) else - # 回帖 - course_member_score(self.course.id, self.author_id, "MessageReply") + score = course_contributor_score.news_reply_num + 5 + course_contributor_score.update_attributes(:resource_num => score) end end end diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb index 1f793de90..01454c8a8 100644 --- a/app/views/courses/_tool_expand.html.erb +++ b/app/views/courses/_tool_expand.html.erb @@ -1,60 +1,47 @@ <% course_file_num = visable_attachemnts_incourse(@course).count%> <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> -<% if show_nav?(@course.course_activities.count) %> -
        - <%= link_to l(:label_activity), course_path(@course), :class => "f14 c_blue02" %> - - <%= link_to "(#{@course.course_activities.count})", course_path(@course), :class => "subnav_num c_orange"%> -
        -<% end %> <% if show_nav?(@course.homework_commons.count) %>
        <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%> - <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%> - <%= link_to( "+#{l(:label_course_homework_new)}", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'subnav_green c_white') if is_teacher %> + <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
        <% end %> <% if show_nav?(@course.news.count) %>
        <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %> - <%= link_to "(#{@course.news.count})", course_news_index_path(@course), :class => "subnav_num c_orange"%> - <%= link_to( "+#{l(:label_course_news_new)}", new_course_news_path(@course), :class => 'subnav_green c_white') if is_teacher %> + <%= link_to( "", new_course_news_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
        <% end %> <% if show_nav?(course_file_num) %>
        <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %> - <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %> <% if is_teacher || (@course.publish_resource == 1 && User.current.member_of_course?(@course)) %> - +上传资源 + <% end %>
        <% end %> <% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
        <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %> - <%= link_to "(#{@course.boards.first ? @course.boards.first.topics.count : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %> - <%= link_to( "+#{l(:label_message_new)}",course_boards_path(@course, :flag => true, :is_new => 1),:class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %> + <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
        <% end %> <% if show_nav?(course_feedback_count) %>
        <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %> - <%= link_to "(#{course_feedback_count})", course_feedback_path(@course), :class => "subnav_num c_orange", :id => "course_jour_count"%> + <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}", :id => "course_jour_count"%>
        <% end %> <% if show_nav?(course_poll_count) %>
        <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%> - <%= link_to "(#{course_poll_count})", poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => "subnav_num c_orange" %> - <%= link_to( "+#{l(:label_new_poll)}", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'subnav_green c_white') if is_teacher %> + <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %>
        <% end %> <% if show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %>
        <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%> - <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %> - <%= link_to( "+新建试卷", new_exercise_path(:course_id => @course.id), :class => 'subnav_green c_white') if is_teacher %> + <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %>
        <% end %> \ No newline at end of file diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 4a7692405..c214145cc 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -147,14 +147,14 @@
        <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%> <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%> - <%= link_to( "+#{l(:label_course_homework_new)}", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'subnav_green c_white') if is_teacher %> + <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
        <% end %> <% unless show_nav?(@course.news.count) %>
        <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %> <%= link_to "(#{@course.news.count})", course_news_index_path(@course), :class => "subnav_num c_orange"%> - <%= link_to( "+#{l(:label_course_news_new)}", new_course_news_path(@course), :class => 'subnav_green c_white') if is_teacher %> + <%= link_to( "", new_course_news_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
        <% end %> <% unless show_nav?(course_file_num) %> @@ -163,7 +163,7 @@ <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %> <% if is_teacher || (@course.publish_resource == 1 && User.current.member_of_course?(@course)) %> - +上传资源 + <% end %>
        <% end %> @@ -171,27 +171,28 @@
        <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %> <%= link_to "(#{@course.boards.first ? @course.boards.first.topics.count : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %> - <%= link_to( "+#{l(:label_message_new)}",course_boards_path(@course, :flag => true, :is_new => 1),:class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %> + <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
        <% end %> <% unless show_nav?(course_feedback_count) %>
        <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %> <%= link_to "(#{course_feedback_count})", course_feedback_path(@course), :class => "subnav_num c_orange", :id => "course_jour_count"%> + <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}", :id => "course_jour_count"%>
        <% end %> <% unless show_nav?(course_poll_count) %>
        <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%> <%= link_to "(#{course_poll_count})", poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => "subnav_num c_orange" %> - <%= link_to( "+#{l(:label_new_poll)}", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'subnav_green c_white') if is_teacher %> + <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %>
        <% end %> <% unless show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %>
        <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%> <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %> - <%= link_to( "+新建试卷", new_exercise_path(:course_id => @course.id), :class => 'subnav_green c_white') if is_teacher %> + <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %>
        <% end %> <%# 工具栏展开 %> @@ -204,40 +205,25 @@
          @@ -350,6 +336,16 @@ $('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').parent().addClass("popbox_polls"); } +// 鼠标经过的时候显示内容 + function message_titile_show(obj,e) + { + obj.parent().parent().next("div").show(); + obj.parent().next("div").css("top",e.pageY).css("left",e.pageX).css("position","absolute"); + } + function message_titile_hide(obj) + { + obj.parent().parent().next("div").hide(); + } From 8c83bbfff382bc243f443a13b2ec6dc2ec769ec8 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 27 Nov 2015 00:48:08 +0800 Subject: [PATCH 257/285] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=E6=A6=9C=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/courses_helper.rb | 4 +- app/views/courses/_tool_expand.html.erb | 92 ++++++------- app/views/layouts/base_courses.html.erb | 4 +- ...1125072235_add_course_contributor_score.rb | 64 +++++---- ...total_score_to_course_contributor_score.rb | 5 + db/schema.rb | 3 +- lib/trustie/gitlab/manage_member.rb | 126 +++++++++--------- 7 files changed, 155 insertions(+), 143 deletions(-) create mode 100644 db/migrate/20151126160252_add_total_score_to_course_contributor_score.rb diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index aa42d247e..022d86d9b 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -757,8 +757,8 @@ module CoursesHelper homework_scores end - def contributor_course_scor(course) - + def contributor_course_scor(course_id) + ccs = CourseContributorScore.where("course_id =?", course_id).limit(9) end end diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb index 01454c8a8..cec5311c6 100644 --- a/app/views/courses/_tool_expand.html.erb +++ b/app/views/courses/_tool_expand.html.erb @@ -1,47 +1,47 @@ -<% course_file_num = visable_attachemnts_incourse(@course).count%> -<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> -<% if show_nav?(@course.homework_commons.count) %> -
          - <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%> - <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %> -
          -<% end %> -<% if show_nav?(@course.news.count) %> -
          - <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %> - <%= link_to( "", new_course_news_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %> -
          -<% end %> -<% if show_nav?(course_file_num) %> -
          - <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %> - <% if is_teacher || (@course.publish_resource == 1 && User.current.member_of_course?(@course)) %> - - - <% end %> -
          -<% end %> -<% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %> -
          - <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %> - <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %> -
          -<% end %> -<% if show_nav?(course_feedback_count) %> -
          - <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %> - <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}", :id => "course_jour_count"%> -
          -<% end %> -<% if show_nav?(course_poll_count) %> -
          - <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%> - <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %> -
          -<% end %> -<% if show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %> -
          - <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%> - <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %> -
          +<% course_file_num = visable_attachemnts_incourse(@course).count%> +<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> +<% if show_nav?(@course.homework_commons.count) %> +
          + <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%> + <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %> +
          +<% end %> +<% if show_nav?(@course.news.count) %> +
          + <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %> + <%= link_to( "", new_course_news_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %> +
          +<% end %> +<% if show_nav?(course_file_num) %> +
          + <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %> + <% if is_teacher || (@course.publish_resource == 1 && User.current.member_of_course?(@course)) %> + + + <% end %> +
          +<% end %> +<% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %> +
          + <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %> + <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %> +
          +<% end %> +<% if show_nav?(course_feedback_count) %> +
          + <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %> + <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}", :id => "course_jour_count"%> +
          +<% end %> +<% if show_nav?(course_poll_count) %> +
          + <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%> + <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %> +
          +<% end %> +<% if show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %> +
          + <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%> + <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %> +
          <% end %> \ No newline at end of file diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index c214145cc..604bf2601 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -205,7 +205,7 @@

            课程贡献榜

            - <% hero_homework_score(@course, "desc").each do |student_score| %> + <% contributor_course_scor(@course.id).each do |student_score| %>
          • <%=link_to image_tag(url_to_avatar(student_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(student_score.user) %>

            <%=link_to student_score.user, user_path(student_score.user) %>

            @@ -213,7 +213,7 @@ :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %> - <%= student_score.score.to_i %>

            + <%= student_score.total_score.to_i %>

            - <%= link_to l(:button_submit),commit_exercise_exercise_path(exercise),:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:style => "margin-left:80px;",:format => 'js',:remote=>true %> + <%= link_to "保存",commit_exercise_exercise_path(exercise),:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:style => "margin-left:80px;",:format => 'js',:remote=>true %>
            diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb index 6e00fc41d..24687d28b 100644 --- a/app/views/exercise/_exercise_teacher.html.erb +++ b/app/views/exercise/_exercise_teacher.html.erb @@ -96,7 +96,7 @@
            第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分)
            - 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %> + 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) if exercise_question.exercise_standard_answers.first%>
            From b05708f6e8dff7c954fe2d21f5a0deba8d2c6e2c Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 27 Nov 2015 10:43:21 +0800 Subject: [PATCH 260/285] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E4=B8=89=E4=B8=AAbug:=201.=E6=96=B0=E5=BB=BA=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=97=B6=EF=BC=8C=E7=BD=AE=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=92=8C=E6=8F=8F=E8=BF=B0=E4=B8=BA=E7=A9=BA=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=EF=BC=8C=E5=8D=B4?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E2=80=9C=E6=A0=87=E9=A2=98=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E2=80=9D=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=202.=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=BB=84=E7=BB=87=EF=BC=9A=E7=82=B9=E5=87=BB=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=8C=89=E9=92=AE=E4=B8=8D=E5=BA=94=E8=AF=A5=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E8=B5=B7=E5=85=B3=E8=81=94=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=88=97=E8=A1=A8=203.=E7=BB=84=E7=BB=87=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=86=85=E5=86=8D=E7=BC=96=E8=BE=91=E7=BB=84?= =?UTF-8?q?=E7=BB=87=EF=BC=8C=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E7=9A=84=E6=8C=89=E9=92=AE=E5=90=8E=E5=8F=88=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=BF=94=E5=9B=9E=E7=BB=84=E7=BB=87=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_document_comments_controller.rb | 9 ++++++++- app/views/courses/settings/_join_org.html.erb | 3 +-- app/views/org_document_comments/_new.html.erb | 5 +++-- app/views/org_document_comments/edit.html.erb | 2 +- app/views/org_document_comments/show.html.erb | 2 +- app/views/organizations/_join_course_menu.html.erb | 3 ++- app/views/organizations/_join_project_menu.html.erb | 3 ++- app/views/organizations/_show_org_document.html.erb | 2 +- app/views/projects/settings/_join_org.html.erb | 4 +--- 9 files changed, 20 insertions(+), 13 deletions(-) diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index 61a27c433..776bd132d 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -38,12 +38,19 @@ class OrgDocumentCommentsController < ApplicationController act.update_attributes(:updated_at => @org_document.updated_at) end respond_to do |format| - format.html {redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)} + format.html { + if params[:flag] == 0 + redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id) + else + redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id) + end + } end end def edit @org_document = OrgDocumentComment.find(params[:id]) + @flag = params[:flag] @organization = Organization.find(params[:organization_id]) end diff --git a/app/views/courses/settings/_join_org.html.erb b/app/views/courses/settings/_join_org.html.erb index cd2d515cc..fff0f807c 100644 --- a/app/views/courses/settings/_join_org.html.erb +++ b/app/views/courses/settings/_join_org.html.erb @@ -68,8 +68,7 @@ }); }); function cancel_join_orgs() { - $("#search_orgs_result_list").html(""); - $("#paginator").css("display", "none") + $("#join_orgs_for_course input:checked").attr("checked", false); } function course_join_org(courseId) { $.ajax({ diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb index 3a3356c66..a7ce22548 100644 --- a/app/views/org_document_comments/_new.html.erb +++ b/app/views/org_document_comments/_new.html.erb @@ -25,13 +25,14 @@ $("#document_title").val(""); org_document_description_editor.html(""); org_document_description_editor.sync(); - $('#org_document_editor').hide(); $('#doc_title_hint').hide(); + $('#org_document_editor').hide(); + $('#doc_title_hint').hide(); } <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
            - +
            diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb index 4b50c1064..c4a74c791 100644 --- a/app/views/org_document_comments/edit.html.erb +++ b/app/views/org_document_comments/edit.html.erb @@ -17,7 +17,7 @@
            -<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id),:method => 'put', :id => 'new_org_document_form' do |f| %> +<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag),:method => 'put', :id => 'new_org_document_form' do |f| %>
            diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index 9df568e02..31e4f7e05 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -43,7 +43,7 @@ <% end %>
          • - <%= link_to "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id), :class => "postOptionLink" %> + <%= link_to "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :flag => 1), :class => "postOptionLink" %>
          • <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id), :method => 'delete', diff --git a/app/views/organizations/_join_course_menu.html.erb b/app/views/organizations/_join_course_menu.html.erb index e11ef46e0..e66d0bcce 100644 --- a/app/views/organizations/_join_course_menu.html.erb +++ b/app/views/organizations/_join_course_menu.html.erb @@ -79,7 +79,8 @@ }); }); function cancel_join_courses() { - $("#search_courses_result_list").html(""); + $("#join_courses_form input:checked").attr("checked", false); + //$("#search_courses_result_list").html(""); } function org_join_courses(orgId) { $.ajax({ diff --git a/app/views/organizations/_join_project_menu.html.erb b/app/views/organizations/_join_project_menu.html.erb index 4b77ee043..765b4b23a 100644 --- a/app/views/organizations/_join_project_menu.html.erb +++ b/app/views/organizations/_join_project_menu.html.erb @@ -75,7 +75,8 @@ }); }); function cancel_join_projects() { - $("#search_projects_result_list").html(""); + $("#join_projects_form input:checked").attr("checked", false); + //$("#search_projects_result_list").html(""); } function org_join_projects(orgId) { $.ajax({ diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 0142e6f37..888cbbf68 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -36,7 +36,7 @@ <% end %>
          • - <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :class => "postOptionLink" %> + <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 0), :class => "postOptionLink" %>
          • <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete', diff --git a/app/views/projects/settings/_join_org.html.erb b/app/views/projects/settings/_join_org.html.erb index 8b8425934..982e7b79e 100644 --- a/app/views/projects/settings/_join_org.html.erb +++ b/app/views/projects/settings/_join_org.html.erb @@ -67,9 +67,7 @@ }); }); function cancel_join_orgs() { - $("#search_orgs_result_list").html(""); - $("#paginator").html(""); - $("#paginator").css("display", "none"); + $("#join_orgs_for_project input:checked").attr("checked", false); } function join_org(projectId) { $.ajax({ From 042b1977671e99cd8180ba2120bbc4f37f8c4a4f Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 27 Nov 2015 10:49:41 +0800 Subject: [PATCH 261/285] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=E6=A6=9C=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4=20=E5=8A=A8?= =?UTF-8?q?=E4=BD=9C=E8=A7=A6=E5=8F=91=E7=9A=84=E6=97=B6=E5=80=99=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=80=BB=E5=88=86=20=E6=9B=B4=E6=8D=A2=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 20 ++++--- app/helpers/courses_helper.rb | 2 +- app/models/course_contributor_score.rb | 2 +- app/views/courses/_tool_expand.html.erb | 14 ++--- app/views/layouts/base_courses.html.erb | 58 +++++++++++-------- ...1125072235_add_course_contributor_score.rb | 36 ------------ ...1351_add_course_contributor_total_score.rb | 36 ++++++++++++ db/schema.rb | 2 +- public/stylesheets/courses.css | 2 +- 9 files changed, 94 insertions(+), 78 deletions(-) delete mode 100644 db/migrate/20151125072235_add_course_contributor_score.rb create mode 100644 db/migrate/20151127011351_add_course_contributor_total_score.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a65ed639c..046e0c5a0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -83,34 +83,38 @@ module ApplicationHelper when "JournalForMessage" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0, - :news_reply_num => 0, :resource_num => 0, :journal_num => 1, :journal_reply_num => 0) + :news_reply_num => 0, :resource_num => 0, :journal_num => 1, :journal_reply_num => 0, :total_score => 1) else score = course_contributor_score.journal_num + 1 - course_contributor_score.update_attributes(:journal_num => score) + total_score = course_contributor_score.total_score + 1 + course_contributor_score.update_attributes(:journal_num => score, :total_score => total_score) end when "Message" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 2, :message_reply_num => 0, - :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0) + :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 2) else score = course_contributor_score.message_num + 2 - course_contributor_score.update_attributes(:message_num => score) + total_score = course_contributor_score.total_score + 2 + course_contributor_score.update_attributes(:message_num => score, :total_score => total_score) end when "MessageReply" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 1, - :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0) + :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 1) else score = course_contributor_score.message_reply_num + 1 - course_contributor_score.update_attributes(:message_reply_num => score) + total_score = course_contributor_score.total_score + 1 + course_contributor_score.update_attributes(:message_reply_num => score, :total_score => total_score) end when "NewReply" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0, - :news_reply_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0) + :news_reply_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 1) else score = course_contributor_score.news_reply_num + 1 - course_contributor_score.update_attributes(:news_reply_num => score) + total_score = course_contributor_score.total_score + 1 + course_contributor_score.update_attributes(:news_reply_num => score, :total_score => total_score) end end end diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 022d86d9b..1d82d035d 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -758,7 +758,7 @@ module CoursesHelper end def contributor_course_scor(course_id) - ccs = CourseContributorScore.where("course_id =?", course_id).limit(9) + ccs = CourseContributorScore.where("course_id =?", course_id).order("total_score desc") .limit(9) end end diff --git a/app/models/course_contributor_score.rb b/app/models/course_contributor_score.rb index 598b8e014..f2b05458f 100644 --- a/app/models/course_contributor_score.rb +++ b/app/models/course_contributor_score.rb @@ -1,5 +1,5 @@ class CourseContributorScore < ActiveRecord::Base - attr_accessible :course_id, :journal_num, :journal_reply_num, :message_num, :message_reply_num, :news_reply_num, :resource_num, :user_id + attr_accessible :course_id, :journal_num, :journal_reply_num, :message_num, :message_reply_num, :news_reply_num, :resource_num, :user_id, :total_score belongs_to :course belongs_to :user end diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb index cec5311c6..9a36b8efb 100644 --- a/app/views/courses/_tool_expand.html.erb +++ b/app/views/courses/_tool_expand.html.erb @@ -2,19 +2,19 @@ <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> <% if show_nav?(@course.homework_commons.count) %>
            - <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%> + <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02 ml10"%> <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
            <% end %> <% if show_nav?(@course.news.count) %>
            - <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %> + <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02 ml10" %> <%= link_to( "", new_course_news_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
            <% end %> <% if show_nav?(course_file_num) %>
            - <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %> + <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02 ml10" %> <% if is_teacher || (@course.publish_resource == 1 && User.current.member_of_course?(@course)) %> @@ -23,25 +23,25 @@ <% end %> <% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
            - <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %> + <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02 ml10" %> <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
            <% end %> <% if show_nav?(course_feedback_count) %>
            - <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %> + <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02 ml10" %> <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}", :id => "course_jour_count"%>
            <% end %> <% if show_nav?(course_poll_count) %>
            - <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%> + <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02 ml10"%> <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %>
            <% end %> <% if show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %>
            - <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%> + <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02 ml10"%> <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %>
            <% end %> \ No newline at end of file diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 604bf2601..00c56b7ee 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -178,7 +178,7 @@
            <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %> <%= link_to "(#{course_feedback_count})", course_feedback_path(@course), :class => "subnav_num c_orange", :id => "course_jour_count"%> - <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}", :id => "course_jour_count"%> + <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_feedback)}", :id => "course_jour_count"%>
            <% end %> <% unless show_nav?(course_poll_count) %> @@ -203,41 +203,53 @@
            <%# 课程贡献榜 %>
            + <% unless contributor_course_scor(@course.id).count == 0 %> + <% end %> +

            <%= l(:label_course_brief_introduction)%>：

            diff --git a/db/migrate/20151125072235_add_course_contributor_score.rb b/db/migrate/20151125072235_add_course_contributor_score.rb deleted file mode 100644 index 99ef60cf0..000000000 --- a/db/migrate/20151125072235_add_course_contributor_score.rb +++ /dev/null @@ -1,36 +0,0 @@ -class AddCourseContributorScore < ActiveRecord::Migration - def up - # course_count = Course.all.count / 30 + 1 - # transaction do - # for i in 1 ... course_count do i - Course.all.each do |course| - if course.course_activities.count > 1 - course.student.each do |s| - puts course.id - puts course.name - puts s.student_id - # board_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?",s.student_id, course.id, "Message").count * 2 - board_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.student_id} and me.parent_id is null;").count * 2 - message_reply_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.student_id} and me.parent_id is not null").count * 1 - common_reply_count = Comment.find_by_sql("select cm.* from comments cm, news n where cm.author_id = #{s.student_id} and n.course_id = #{course.id} and cm.commented_id = n.id and cm.commented_type ='News'").count * 1 - # attachment_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "Attachment").count * 5 - attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{course.id} and author_id = #{s.student_id};").count * 5 - journal_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? ", s.student_id, course.id, "Course").count * 1 - # journal_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "JournalsForMessage").count * 1 - # journal_reply_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? and status =?", s.student_id, course.id, "Course",1).count * 1 - total = board_count + message_reply_count + common_reply_count + attachment_count + journal_count - if total !=0 - CourseContributorScore.create(:course_id => course.id, :user_id => s.student_id, :message_num => board_count, :message_reply_num => message_reply_count, - :news_reply_num => common_reply_count, :resource_num => attachment_count, :journal_num => journal_count, :journal_reply_num => 0, :total => total) - end - - end - end - end - # end - # end - end - - def down - end -end \ No newline at end of file diff --git a/db/migrate/20151127011351_add_course_contributor_total_score.rb b/db/migrate/20151127011351_add_course_contributor_total_score.rb new file mode 100644 index 000000000..2606864d8 --- /dev/null +++ b/db/migrate/20151127011351_add_course_contributor_total_score.rb @@ -0,0 +1,36 @@ +class AddCourseContributorTotalScore < ActiveRecord::Migration + def up + # course_count = Course.all.count / 30 + 1 + # transaction do + # for i in 1 ... course_count do i + Course.all.each do |course| + if course.course_activities.count > 1 + course.student.each do |s| + puts course.id + puts course.name + puts s.student_id + # board_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?",s.student_id, course.id, "Message").count * 2 + board_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.student_id} and me.parent_id is null;").count * 2 + message_reply_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.student_id} and me.parent_id is not null").count * 1 + common_reply_count = Comment.find_by_sql("select cm.* from comments cm, news n where cm.author_id = #{s.student_id} and n.course_id = #{course.id} and cm.commented_id = n.id and cm.commented_type ='News'").count * 1 + # attachment_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "Attachment").count * 5 + attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{course.id} and author_id = #{s.student_id};").count * 5 + journal_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? ", s.student_id, course.id, "Course").count * 1 + # journal_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "JournalsForMessage").count * 1 + # journal_reply_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? and status =?", s.student_id, course.id, "Course",1).count * 1 + total = board_count + message_reply_count + common_reply_count + attachment_count + journal_count + if total !=0 + CourseContributorScore.create(:course_id => course.id, :user_id => s.student_id, :message_num => board_count, :message_reply_num => message_reply_count, + :news_reply_num => common_reply_count, :resource_num => attachment_count, :journal_num => journal_count, :journal_reply_num => 0, :total_score => total) + end + + end + end + end + # end + # end + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index 8a0ec8605..8e2082b37 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151126160252) do +ActiveRecord::Schema.define(:version => 20151127011351) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 7d5d66103..bdcfbd08e 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1172,7 +1172,7 @@ a:hover.testEdit{ background:url(images/icons.png) -21px -272px no-repeat;} .courseMenuSetting {background:url(../images/homepage_icon2.png) -190px -365px no-repeat; width:15px; height:15px; margin-top:3px; float:right; margin-right:5px;} .courseMenuSetting:hover {background:url(../images/homepage_icon2.png) -190px -407px no-repeat;} .rankList {width:220px; padding:10px; background-color:#ffffff; margin-top:10px;} -.rankList li {width:73px; padding:5px 0px; text-align:center; float:left; position:relative;} +.rankList li {width:73px; padding:8px 0px 0px 0px; text-align:center; float:left; position:relative;} .rankList li p {width:100%; overflow:hidden; white-space:normal; text-overflow:ellipsis; color:#585858;word-wrap: normal; word-break: normal;} .rankPortrait {border-radius:50%; width:35px; height:35px;} .numIntro {position:absolute; text-align:left; z-index:999; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); border:1px solid #eaeaea; background-color:#ffffff; padding:3px 5px; left:15px; width:65px; color:#585858;} \ No newline at end of file From 2d14b66336007ab94e483b81e71dfbb4122f5d16 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 27 Nov 2015 10:56:46 +0800 Subject: [PATCH 262/285] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../student_work/_student_work_list.html.erb | 102 +++++++++--------- public/stylesheets/courses.css | 2 +- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index c18ec4c73..e9b056c84 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -1,52 +1,52 @@ -
            - - 作品 - - (<%= @student_work_count%>人已交) - - <% if !@is_teacher && @stundet_works.empty?%> - 您尚未提交作品 - <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%> - 您已提交且不可再修改，因为截止日期已过 - <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%> - 您已提交，您还可以修改 - <% end %> - - <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%> -
            - - -
            - <%= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty? %> - <% end%> - -
            -
            - -
            - <% if @is_evaluation && !@stundet_works.empty?%> - <%= render :partial => "evaluation_title"%> - <% else%> - <%= render :partial => "evaluation_un_title"%> - <% end%> -
            -
            - -<% @stundet_works.each do |student_work|%> - <% if @is_evaluation%> - <%= render :partial => "evaluation_work", :locals => {:student_work => student_work}%> - <% else%> - <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work}%> - <% end%> -
            -
            - <% if student_work.user == User.current && !@is_evaluation %> - <% if @homework.homework_type == 2%> - <%=render :partial => 'programing_work_show', :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %> - <% else %> - <%=render :partial => 'show' , :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %> - <% end %> - <% end %> -
            -
            +
            + + 作品 + + (<%= @student_work_count%>人已交) + + <% if !@is_teacher && @stundet_works.empty?%> + 您尚未提交作品 + <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%> + 您已提交且不可再修改，因为截止日期已过 + <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%> + 您已提交，您还可以修改 + <% end %> + + <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%> +
            + + +
            + <%= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty? %> + <% end%> + +
            +
            + +
            + <% if @is_evaluation && !@stundet_works.empty?%> + <%= render :partial => "evaluation_title"%> + <% else%> + <%= render :partial => "evaluation_un_title"%> + <% end%> +
            +
            + +<% @stundet_works.each do |student_work|%> + <% if @is_evaluation%> + <%= render :partial => "evaluation_work", :locals => {:student_work => student_work}%> + <% else%> + <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work}%> + <% end%> +
            +
            + <% if student_work.user == User.current && !@is_evaluation %> + <% if @homework.homework_type == 2%> + <%=render :partial => 'programing_work_show', :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %> + <% else %> + <%=render :partial => 'show' , :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %> + <% end %> + <% end %> +
            +
            <% end%> \ No newline at end of file diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 17ed37e05..faffee4d1 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -60,7 +60,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;} .hworkStName {width:60px; max-width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;} .hworkStID {width:80px; max-width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;} .hworkDate {max-width:150px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:14px; line-height:14px; font-size:12px; color:#888888;} -.hworkMenu {width:100px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-110px; font-size:12px; color:#888888; display:none; line-height:2;} +.hworkMenu {width:100px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-110px; font-size:12px; color:#888888; display:none; line-height:2; z-index:99;} a.hworkExport {background:url(../images/homepage_icon2.png) -10px -401px no-repeat; padding-left:23px;} a.hworkSetting {background:url(../images/homepage_icon2.png) -10px -450px no-repeat; padding-left:23px;} .hworkInfor {font-size:12px; color:#269ac9; width:80px; height:40px; vertical-align:middle; float:left; line-height:40px; text-align:center; font-weight:bold;} From 4aa827eb4a24737eeef3de96920d35efd44cabf0 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 27 Nov 2015 11:02:48 +0800 Subject: [PATCH 263/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E7=82=B9=E5=87=BB=E9=A1=B9=E7=9B=AE=E6=94=B6?= =?UTF-8?q?=E8=B5=B7=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=EF=BC=8C=E5=86=8D?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80=E5=88=97=E8=A1=A8=EF=BC=9B?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=AF=BE=E7=A8=8B=E5=90=8C=E6=A0=B7=E5=A6=82?= =?UTF-8?q?=E6=AD=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org.html.erb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index e5c238ac5..89777de01 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -85,7 +85,7 @@
            <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %>
            -
            项目 +
            项目
            • @@ -100,7 +100,7 @@
            -
            +
              <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.projects.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%> @@ -109,7 +109,7 @@
            -
            课程 +
            课程
            • @@ -124,7 +124,7 @@
            -
            +
              <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>@organization.courses.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%>
            @@ -146,8 +146,6 @@
            - - From 1115d54d9a55cd7065686f687a686cb1304054ab Mon Sep 17 00:00:00 2001 From: "Gan Yi.ang" Date: Fri, 27 Nov 2015 11:25:16 +0800 Subject: [PATCH 264/285] =?UTF-8?q?=E9=9D=9Etrustie=E7=94=A8=E6=88=B7chang?= =?UTF-8?q?esets=5Flatest=5Fcoimmit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/repositories_helper.rb | 2 +- app/views/repositories/show.html.erb | 17 ++++++++++++----- public/stylesheets/repository.css | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index ddabb5356..ff4aa61fb 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -61,7 +61,7 @@ module RepositoriesHelper def user_commit_rep(mail) user = User.find_by_mail(mail) - user.nil? ? User.find(2) : User.find_by_mail(mail) + #user.nil? ? User.find(2) : User.find_by_mail(mail) end def render_properties(properties) diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 7aac3af1d..0a95851d0 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -29,11 +29,18 @@
            <% if @changesets && !@changesets.empty? %> - <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)), :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %> -
            <%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %>
            -
            提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：
            -
            <%= @changesets_latest_coimmit.message %>
            -             + <% if !user_commit_rep(@changesets_latest_coimmit.author_email).nil? %> + <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)), :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %> +
            <%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %>
            +
            提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：
            +
            <%= @changesets_latest_coimmit.message %>
            +             + <% else %> +
            <%=@changesets_latest_coimmit.author_email %>
            +
            提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：
            +
            <%= @changesets_latest_coimmit.message %>
            +             + <%end%> <% end %> <%= @repository.branches.count %> 个分支 diff --git a/public/stylesheets/repository.css b/public/stylesheets/repository.css index 27941cb9e..2e084d61c 100644 --- a/public/stylesheets/repository.css +++ b/public/stylesheets/repository.css @@ -220,7 +220,7 @@ .vl_branch {background:url(../images/vlicon/branch_icon.png) 0px -2px no-repeat; padding-left:22px} .mt1 {margin-top:1px;} .mt2 {margin-top:2px;} -.commit_content_dec{width: 300px;overflow: hidden; white-space: nowrap;text-overflow: ellipsis;} +.commit_content_dec{width: 200px;overflow: hidden; white-space: nowrap;text-overflow: ellipsis;} /*提交信息列表*/ .col-md-10 { From e0f4050779cab8a2ba58b7589e18220634b0a00f Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 27 Nov 2015 12:34:02 +0800 Subject: [PATCH 265/285] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=B8=AD=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E5=92=8C=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E7=9A=84=E5=86=85=E5=AE=B9=E5=92=8C=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 2 +- app/views/layouts/base_org.html.erb | 57 ++++++++++--------- app/views/organizations/join_projects.js.erb | 3 + ...124032319_delete_useless_org_activities.rb | 2 +- 4 files changed, 36 insertions(+), 28 deletions(-) diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index dce472346..ba4dda939 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -225,7 +225,7 @@ class OrganizationsController < ApplicationController if !params[:name].nil? condition = "%#{params[:name].strip}%".gsub(" ","") end - sql = "select projects.* from projects inner join members on projects.id = members.course_id where members.user_id = #{User.current.id} and projects.name like '#{condition}'" + sql = "select projects.* from projects inner join members on projects.id = members.project_id where members.user_id = #{User.current.id} and projects.status != 9 and projects.name like '#{condition}'" user_projects = Course.find_by_sql(sql) @added_course_ids = @organization.projects.map(&:id) @projects = [] diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 89777de01..b89977b09 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -85,19 +85,21 @@
            <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %>
            -
            项目 -
            -
              -
            • -
                - -
              • - <%= link_to "加入项目",join_project_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%> -
                • -
              -
              • -
            -
            +
            + 项目 + <%=link_to "", join_project_menu_organization_path(@organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%> + + + + + + + + + + + +
            @@ -109,19 +111,22 @@
        -
        课程 -
        -
          -
        • -
            - -
          • - <%= link_to "加入课程",join_course_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%> -
            • -
          -
          • -
        -
        +
        + 课程 + <%=link_to "", join_course_menu_organization_path(@organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%> + <%#= link_to "关联课程",join_course_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%> + + + + + + + + + + + +
        diff --git a/app/views/organizations/join_projects.js.erb b/app/views/organizations/join_projects.js.erb index e69de29bb..b796d5f99 100644 --- a/app/views/organizations/join_projects.js.erb +++ b/app/views/organizations/join_projects.js.erb @@ -0,0 +1,3 @@ +//$("#homepageLeftMenuProjects").html(""); +//$("#homepageLeftMenuProjects").append("
          "); +//$("#homepageLeftMenuProjects").append("<%#= escape_javascript %>") \ No newline at end of file diff --git a/db/migrate/20151124032319_delete_useless_org_activities.rb b/db/migrate/20151124032319_delete_useless_org_activities.rb index 705e0dbed..57d858e7e 100644 --- a/db/migrate/20151124032319_delete_useless_org_activities.rb +++ b/db/migrate/20151124032319_delete_useless_org_activities.rb @@ -3,7 +3,7 @@ class DeleteUselessOrgActivities < ActiveRecord::Migration OrgActivity.all.each do |act| if act.container_type == 'Course' if CourseActivity.where("course_act_type=? and course_act_id =? and course_id =?", act.org_act_type, act.org_act_id, act.container_id).count == 0 - puts "course" + act.destroy end else if act.container_type == 'Project' and ForgeActivity.where("forge_act_type=? and forge_act_id =? and project_id =?", act.org_act_type, act.org_act_id, act.container_id).count == 0 From 365349878dad13ca703a9d66459155bd23312d86 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 27 Nov 2015 13:17:23 +0800 Subject: [PATCH 266/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=96=E8=80=85=E8=AF=BE=E7=A8=8B=EF=BC=8C?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E5=92=8C?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=EF=BC=9B=E5=90=8C=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=BC=B9=E7=AA=97=E7=BB=99=E5=87=BA=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_join_course_menu.html.erb | 1 + app/views/organizations/_join_project_menu.html.erb | 1 + app/views/organizations/join_courses.js.erb | 5 +++++ app/views/organizations/join_projects.js.erb | 8 +++++--- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/views/organizations/_join_course_menu.html.erb b/app/views/organizations/_join_course_menu.html.erb index e66d0bcce..a643acdcf 100644 --- a/app/views/organizations/_join_course_menu.html.erb +++ b/app/views/organizations/_join_course_menu.html.erb @@ -91,6 +91,7 @@ url: "/organizations/" + orgId + "/search_courses?name=" + $("input[name='courses']").val().trim(), type: "get" }); + alert("加入成功"); } }); } diff --git a/app/views/organizations/_join_project_menu.html.erb b/app/views/organizations/_join_project_menu.html.erb index 765b4b23a..ea5b4ce25 100644 --- a/app/views/organizations/_join_project_menu.html.erb +++ b/app/views/organizations/_join_project_menu.html.erb @@ -87,6 +87,7 @@ url: "/organizations/" + orgId + "/search_projects?name=" + $("input[name='projects']").val().trim(), type: "get" }); + alert("加入成功"); } }); } diff --git a/app/views/organizations/join_courses.js.erb b/app/views/organizations/join_courses.js.erb index e69de29bb..1c234704e 100644 --- a/app/views/organizations/join_courses.js.erb +++ b/app/views/organizations/join_courses.js.erb @@ -0,0 +1,5 @@ +$("#homepageLeftMenuCourses").html(""); +$("#homepageLeftMenuCourses").append("
            "); +$("#homepageLeftMenuCourses").append("<%= escape_javascript(render :partial => 'layouts/org_courses', + :locals=>{:courses=>@organization.courses.reorder('created_at').limit(5),:org_id=>@organization.id,:page=> 1}) %>"); +$("#homepageLeftMenuCourses").append("
          "); \ No newline at end of file diff --git a/app/views/organizations/join_projects.js.erb b/app/views/organizations/join_projects.js.erb index b796d5f99..1db8021bf 100644 --- a/app/views/organizations/join_projects.js.erb +++ b/app/views/organizations/join_projects.js.erb @@ -1,3 +1,5 @@ -//$("#homepageLeftMenuProjects").html(""); -//$("#homepageLeftMenuProjects").append("
            "); -//$("#homepageLeftMenuProjects").append("<%#= escape_javascript %>") \ No newline at end of file +$("#homepageLeftMenuProjects").html(""); +$("#homepageLeftMenuProjects").append("
              "); +$("#homepageLeftMenuProjects").append("<%= escape_javascript(render :partial => 'layouts/org_projects', + :locals=>{:projects=>@organization.projects.reorder('created_at').limit(5),:org_id=>@organization.id,:page=> 1}) %>"); +$("#homepageLeftMenuProjects").append("
            "); \ No newline at end of file From 1cc6e305ed723e3686ac9a3612eae560d488ea9f Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 27 Nov 2015 13:52:40 +0800 Subject: [PATCH 267/285] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=96=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91=EF=BC=9A=201?= =?UTF-8?q?=E3=80=81=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E6=88=90=E7=BB=A9?= =?UTF-8?q?=E5=88=99=E4=B8=8D=E6=98=BE=E7=A4=BA=202=E3=80=81=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A1=86=E5=B1=95=E5=BC=80=E6=B2=A1=E6=9C=89=E5=88=99?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 17 ++++++++ app/helpers/courses_helper.rb | 3 -- app/models/attachment.rb | 17 +------- app/views/layouts/base_courses.html.erb | 55 ++++++++++++++----------- public/stylesheets/courses.css | 2 +- 5 files changed, 49 insertions(+), 45 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index a2902e3fc..b15be4896 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -374,6 +374,9 @@ class FilesController < ApplicationController if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added') Mailer.run.attachments_added(attachments[:files]) end + # 更新课程英雄榜得分 + update_contributor_score(@course, attachments[:files].first) + # end if params[:course_attachment_type] && params[:course_attachment_type].is_a?(Array) params[:course_attachment_type].each do |type| tag_name = get_tag_name_by_type_number type @@ -423,6 +426,20 @@ class FilesController < ApplicationController end end + def update_contributor_score(course, file ) + unless file.author.allowed_to?(:as_teacher, course) + course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", course.id, file.author.id).first + if course_contributor_score.nil? + CourseContributorScore.create(:course_id => course.id, :user_id => file.author.id, :message_num => 0, :message_reply_num => 0, + :news_reply_num => 0, :resource_num => 5, :journal_num => 0, :journal_reply_num => 0, :total_score => 5) + else + score = course_contributor_score.resource_num + 5 + total_score = course_contributor_score.total_score + 5 + course_contributor_score.update_attributes(:resource_num => score, :total_score => total_score) + end + end + end + def get_tag_name_by_type_number type case type when "1" diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 1d82d035d..a1b119cb5 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -751,10 +751,7 @@ module CoursesHelper JOIN students_for_courses ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id WHERE members.course_id = #{course.id} ORDER BY score #{score_sort_by} limit 9" - sql = ActiveRecord::Base.connection() homework_scores = Member.find_by_sql(sql_select) - sql.close() - homework_scores end def contributor_course_scor(course_id) diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 45d19e681..9c6bb9cb1 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -73,11 +73,10 @@ class Attachment < ActiveRecord::Base cattr_accessor :thumbnails_storage_path @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails") - before_save :files_to_final_location,:act_as_course_activity, :act_as_student_score + before_save :files_to_final_location,:act_as_course_activity after_create :office_conver, :be_user_score,:act_as_forge_activity after_update :office_conver, :be_user_score after_destroy :delete_from_disk,:down_user_score - # after_save :act_as_student_score # add by nwb # 获取所有可公开的资源文件列表 @@ -562,18 +561,4 @@ class Attachment < ActiveRecord::Base end end - # 课程成员得分（英雄榜） - def act_as_student_score - unless self.author.allowed_to?(:as_teacher, self.container) - course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", self.container_id, self.author_id).first - if course_contributor_score.nil? - CourseContributorScore.create(:course_id => self.container_id, :user_id => self.author_id, :message_num => 0, :message_reply_num => 0, - :news_reply_num => 0, :resource_num => 5, :journal_num => 0, :journal_reply_num => 0) - else - score = course_contributor_score.news_reply_num + 5 - course_contributor_score.update_attributes(:resource_num => score) - end - end - end - end diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 00c56b7ee..603f7febb 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -196,59 +196,64 @@
        <% end %> <%# 工具栏展开 %> - - + <% if @course.homework_commons.count == 0 || @course.news.count == 0 || course_file_num == 0 || course_poll_count == 0 || @course.exercises.count == 0 || + course_feedback_count == 0 || @course.exercises.count == 0 || (@course.boards.first ? @course.boards.first.topics.count : 0) == 0 %> + + + <% end %>
        <%# 课程贡献榜 %>
        <% unless contributor_course_scor(@course.id).count == 0 %> -
          +

            课程贡献榜

            <% contributor_course_scor(@course.id).each do |contributor_score| %> + <% unless contributor_score.total_score ==0 %>
          • <%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(contributor_score.user) %>

            <%=link_to contributor_score.user, user_path(contributor_score.user), :title => contributor_score.user %>

            - <%#= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id }, - :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :onmouseover =>"message_titile_show($(this),event)", - :onmouseout => "message_titile_hide($(this))" %> <%= contributor_score.total_score.to_i %>

            • + <% end %> <% end %>
          + <% end %> + + <% hero_homework_scores = hero_homework_score(@course, "desc") %> + <% unless hero_homework_scores.map(&:score).detect{|s| s != nil}.nil? %> + <% end %> -
          diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index bdcfbd08e..f840f20cf 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1175,4 +1175,4 @@ a:hover.testEdit{ background:url(images/icons.png) -21px -272px no-repeat;} .rankList li {width:73px; padding:8px 0px 0px 0px; text-align:center; float:left; position:relative;} .rankList li p {width:100%; overflow:hidden; white-space:normal; text-overflow:ellipsis; color:#585858;word-wrap: normal; word-break: normal;} .rankPortrait {border-radius:50%; width:35px; height:35px;} -.numIntro {position:absolute; text-align:left; z-index:999; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); border:1px solid #eaeaea; background-color:#ffffff; padding:3px 5px; left:15px; width:65px; color:#585858;} \ No newline at end of file +.numIntro {position:absolute; text-align:left; z-index:999; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); border:1px solid #eaeaea; background-color:#ffffff; padding:3px 5px; left:15px; color:#585858; white-space: nowrap;} \ No newline at end of file From 25b66b5dbbd5a7b7b661c4409fbc30481d35dc68 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 27 Nov 2015 14:43:08 +0800 Subject: [PATCH 268/285] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_join_course_menu.html.erb | 1 - app/views/organizations/_join_project_menu.html.erb | 1 - 2 files changed, 2 deletions(-) diff --git a/app/views/organizations/_join_course_menu.html.erb b/app/views/organizations/_join_course_menu.html.erb index a643acdcf..e66d0bcce 100644 --- a/app/views/organizations/_join_course_menu.html.erb +++ b/app/views/organizations/_join_course_menu.html.erb @@ -91,7 +91,6 @@ url: "/organizations/" + orgId + "/search_courses?name=" + $("input[name='courses']").val().trim(), type: "get" }); - alert("加入成功"); } }); } diff --git a/app/views/organizations/_join_project_menu.html.erb b/app/views/organizations/_join_project_menu.html.erb index ea5b4ce25..765b4b23a 100644 --- a/app/views/organizations/_join_project_menu.html.erb +++ b/app/views/organizations/_join_project_menu.html.erb @@ -87,7 +87,6 @@ url: "/organizations/" + orgId + "/search_projects?name=" + $("input[name='projects']").val().trim(), type: "get" }); - alert("加入成功"); } }); } From f7ac2b0ef5e67b8bb8aa48b7bc8953455c5a6eb5 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 27 Nov 2015 15:19:13 +0800 Subject: [PATCH 269/285] =?UTF-8?q?=E8=80=81=E5=B8=88=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=9A=84=E7=AD=94=E5=8D=B7=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 29 +++++++++++++++---- app/views/exercise/_edit_head.html.erb | 5 ++-- app/views/exercise/_exercise_form.html.erb | 2 +- .../_exercise_student_result.html.erb | 20 ++++++------- app/views/exercise/_show_head.html.erb | 3 +- app/views/exercise/_student_exercise.html.erb | 8 ++++- app/views/exercise/show.html.erb | 2 +- .../exercise/show_student_result.html.erb | 1 + config/routes.rb | 1 + public/stylesheets/courses.css | 4 +-- 10 files changed, 50 insertions(+), 25 deletions(-) create mode 100644 app/views/exercise/show_student_result.html.erb diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 0a95fd025..6d6d429b6 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -1,7 +1,7 @@ class ExerciseController < ApplicationController layout "base_courses" - before_filter :find_exercise_and_course, :only => [:create_exercise_question, :edit, :update, :show, :destroy, :commit_exercise, :commit_answer,:publish_exercise,:republish_exercise] + before_filter :find_exercise_and_course, :only => [:create_exercise_question, :edit, :update, :show, :destroy, :commit_exercise, :commit_answer,:publish_exercise,:republish_exercise,:show_student_result] before_filter :find_course, :only => [:index,:new,:create,:student_exercise_list] include ExerciseHelper @@ -34,7 +34,7 @@ class ExerciseController < ApplicationController render_403 return end - exercise_end = Time.parse(format_time(@exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S") + exercise_end = @exercise.end_time > Time.now if @exercise.time == -1 @can_edit_excercise = exercise_end else @@ -59,6 +59,9 @@ class ExerciseController < ApplicationController # @percent = get_percent(@exercise,User.current) exercise_questions = @exercise.exercise_questions @exercise_questions = paginateHelper exercise_questions,5 #分页 + score = calculate_student_score(@exercise, User.current) + eu = get_exercise_user(@exercise.id, User.current.id) + eu.update_attributes(:score => score) respond_to do |format| format.html {render :layout => 'base_courses'} end @@ -342,10 +345,10 @@ class ExerciseController < ApplicationController @exercise = Exercise.find params[:id] @all_exercises = @course.exercises.where("exercise_status > 1").order("created_at desc") @exercise_count = @exercise.exercise_users.where('score is not NULL').count - if @is_teacher || (!@exercise.exercise_users.where(:user_id => User.current.id).empty? && Time.parse(@exercise.end_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S")) + if @is_teacher || (!@exercise.exercise_users.where(:user_id => User.current.id).empty? && @exercise.end_time <= Time.now) @exercise_users_list = @exercise.exercise_users.where('score is not NULL') @show_all = true; - elsif !@exercise.exercise_users.where(:user_id => User.current.id).empty? && Time.parse(@exercise.end_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") > Time.now.strftime("%Y-%m-%d-%H-%M-%S") + elsif !@exercise.exercise_users.where(:user_id => User.current.id).empty? && @exercise.end_time > Time.now @exercise_users_list = @exercise.exercise_users.where("user_id = ? and score is not NULL",User.current.id) else @exercise_users_list = [] @@ -359,7 +362,7 @@ class ExerciseController < ApplicationController def commit_answer eq = ExerciseQuestion.find(params[:exercise_question_id]) # 已提交过的且是限时的则不允许答题 - if (has_commit_exercise?(@exercise.id,User.current.id) && (!User.current.admin?) && @exercise.time != -1) || Time.parse(format_time(@exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") < Time.now.strftime("%Y-%m-%d %H:%M:%S") + if (has_commit_exercise?(@exercise.id,User.current.id) && (!User.current.admin?) && @exercise.time != -1) || @exercise.end_time < Time.now render :json => {:text => "failure"} return end @@ -483,7 +486,7 @@ class ExerciseController < ApplicationController @exercise.update_attributes(:publish_time => Time.now) redirect_to exercise_url(@exercise) return - elsif Time.parse(@exercise.publish_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") > Time.now.strftime("%Y-%m-%d-%H-%M-%S") + elsif @exercise.publish_time > Time.now @exercise.update_attributes(:show_result => params[:show_result]) redirect_to exercise_url(@exercise) return @@ -521,6 +524,20 @@ class ExerciseController < ApplicationController end end + #查看学生的答卷情况 + def show_student_result + @user = User.find params[:user_id] + @can_edit_excercise = false + @exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", @user.id, @exercise.id).first + @exercise_questions = @exercise.exercise_questions + score = calculate_student_score(@exercise, @user) + eu = get_exercise_user(@exercise.id, @user.id) + eu.update_attributes(:score => score) + respond_to do |format| + format.html {render :layout => 'base_courses'} + end + end + # 计算学生得分 def calculate_student_score(exercise, user) score = 0 diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb index c8ba0c4d7..b69f52a56 100644 --- a/app/views/exercise/_edit_head.html.erb +++ b/app/views/exercise/_edit_head.html.erb @@ -30,10 +30,11 @@ \ No newline at end of file diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index e283f8b0c..f0bef74bf 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -9,7 +9,7 @@ var popWindow ; //弹出框的引用 var importPollPopWindow; //选择导入的弹出框引用 function edit_head(){ - $("#polls_description").val($("#polls_description_div").html()); + $("#exercise_description").val($("#exercise_description_div").html()); } $(function(){ //点击空白处 diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb index 93e52b0a1..529a73da3 100644 --- a/app/views/exercise/_exercise_student_result.html.erb +++ b/app/views/exercise/_exercise_student_result.html.erb @@ -32,8 +32,8 @@
          第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) - <% answer = get_user_answer(exercise_question, User.current)%> - <% standard_answer = get_user_standard_answer(exercise_question, User.current)%> + <% answer = get_user_answer(exercise_question, user)%> + <% standard_answer = get_user_standard_answer(exercise_question, user)%> <% if !answer.empty? && !standard_answer.empty? && answer.first.exercise_choice.choice_position == standard_answer.first.exercise_choice_id %> √ <% else %> @@ -49,7 +49,7 @@ @@ -71,9 +71,9 @@
          第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) - <% answer = get_user_answer(exercise_question, User.current)%> - <% standard_answer = get_user_standard_answer(exercise_question, User.current)%> - <% if !standard_answer.empty? && get_mulscore(exercise_question, User.current).to_i == standard_answer.first.exercise_choice_id %> + <% answer = get_user_answer(exercise_question, user)%> + <% standard_answer = get_user_standard_answer(exercise_question, user)%> + <% if !standard_answer.empty? && get_mulscore(exercise_question, user).to_i == standard_answer.first.exercise_choice_id %> √ <% else %> × @@ -88,7 +88,7 @@ @@ -110,8 +110,8 @@
          第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) - <% answer = get_user_answer(exercise_question, User.current)%> - <% standard_answer = get_user_standard_answer(exercise_question, User.current)%> + <% answer = get_user_answer(exercise_question, user)%> + <% standard_answer = get_user_standard_answer(exercise_question, user)%> <% if !answer.empty? && !standard_answer.empty? && standard_answer.include?(answer.first.answer_text) %> √ <% else %> @@ -126,7 +126,7 @@ <% end %>
          - > + >
          diff --git a/app/views/exercise/_show_head.html.erb b/app/views/exercise/_show_head.html.erb index f385e58b8..cfa814c2e 100644 --- a/app/views/exercise/_show_head.html.erb +++ b/app/views/exercise/_show_head.html.erb @@ -11,7 +11,6 @@ 测验时长：<%= exercise.time %>分钟 <% end %>
          -
          <%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%>
          -
          + 
          <%= exercise.exercise_description.nil? ? "" :exercise.exercise_description.html_safe%>
          \ No newline at end of file diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb index 25bf3f7cd..4e27d57cb 100644 --- a/app/views/exercise/_student_exercise.html.erb +++ b/app/views/exercise/_student_exercise.html.erb @@ -44,7 +44,13 @@
          • - <%= exercise.user.show_name%> + <% name = exercise.user.show_name %> + <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %> + <%= link_to name,show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %> + <% else %> + <%=name%> + <%#= link_to name,'',:title=>"截止日期未到，暂不能查看学生答题结果。" %> + <% end %>
          • <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%> diff --git a/app/views/exercise/show.html.erb b/app/views/exercise/show.html.erb index f47710d1c..c488ec203 100644 --- a/app/views/exercise/show.html.erb +++ b/app/views/exercise/show.html.erb @@ -5,6 +5,6 @@ <% if @can_edit_excercise %> <%=render :partial => 'exercise_student', :locals => {:exercise =>@exercise, :exercise_questions => @exercise_questions,:exercise_user => @exercise_user} %> <% else %> - <%=render :partial => 'exercise_student_result', :locals => {:exercise =>@exercise, :exercise_questions => @exercise_questions,:exercise_user => @exercise_user} %> + <%=render :partial => 'exercise_student_result', :locals => {:exercise =>@exercise, :exercise_questions => @exercise_questions,:exercise_user => @exercise_user,:user=>User.current} %> <% end %> <% end %> \ No newline at end of file diff --git a/app/views/exercise/show_student_result.html.erb b/app/views/exercise/show_student_result.html.erb new file mode 100644 index 000000000..6b32a0dd0 --- /dev/null +++ b/app/views/exercise/show_student_result.html.erb @@ -0,0 +1 @@ +<%=render :partial => 'exercise_student_result', :locals => {:exercise =>@exercise, :exercise_questions => @exercise_questions,:exercise_user => @exercise_user,:user =>@user} %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index d137553ad..cbff8558f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -168,6 +168,7 @@ RedmineApp::Application.routes.draw do get 'export_exercise' get 'publish_exercise' get 'republish_exercise' + get 'show_student_result' post 'create_exercise_question' post 'commit_answer' post 'commit_exercise' diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 17ed37e05..25ba6e488 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1166,5 +1166,5 @@ a:hover.testEdit{ background:url(images/icons.png) -21px -272px no-repeat;} .questionEditContainer {border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px; margin-top:10px;} .fillInput {border:1px solid #cbcbcb; padding-left:5px; background-color:#ffffff; width:693px; height:30px; color:#888888;} .mr130 {margin-right:130px;} -.mr100 {margin-right:100px;} -.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; } \ No newline at end of file +.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; } +.font_cus {font-family: "微软雅黑","宋体"; font-size: 12px; line-height: 1.5;} \ No newline at end of file From 3abc3f7af0c226137edf7c69893b385275d8e75c Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 27 Nov 2015 15:25:49 +0800 Subject: [PATCH 270/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E8=BF=94=E5=9B=9E=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_document_comments_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index 776bd132d..02527bdfc 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -39,7 +39,7 @@ class OrgDocumentCommentsController < ApplicationController end respond_to do |format| format.html { - if params[:flag] == 0 + if params[:flag].to_i == 0 redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id) else redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id) From e3e0f4ab3798cb2f84e6845e5a3b22c5d661cccd Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 27 Nov 2015 16:00:43 +0800 Subject: [PATCH 271/285] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E7=A7=BB=E5=8A=A8+?= =?UTF-8?q?=E5=8F=B7=E6=98=BE=E7=A4=BA=E7=95=99=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_tool_expand.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb index 9a36b8efb..e032496ea 100644 --- a/app/views/courses/_tool_expand.html.erb +++ b/app/views/courses/_tool_expand.html.erb @@ -30,7 +30,7 @@ <% if show_nav?(course_feedback_count) %>
            <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02 ml10" %> - <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}", :id => "course_jour_count"%> + <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_feedback)}", :id => "course_jour_count"%>
            <% end %> <% if show_nav?(course_poll_count) %> From 89d01679a7fe1301632fcecac25bf503c7c28981 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 27 Nov 2015 16:27:23 +0800 Subject: [PATCH 272/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=92=8C=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 45 +++++++++++--------- app/views/layouts/base_org.html.erb | 4 +- app/views/organizations/join_courses.js.erb | 2 +- app/views/organizations/join_projects.js.erb | 2 +- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index ba4dda939..b326051e6 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -161,7 +161,7 @@ class OrganizationsController < ApplicationController def more_org_projects @organization = Organization.find params[:id] @page = params[:page] - @org_projects = @organization.projects.reorder('created_at').page((params[:page].to_i || 1) +1).per(5) + @org_projects = @organization.projects.reorder('created_at').uniq.page((params[:page].to_i || 1) +1).per(5) respond_to do |format| format.js end @@ -170,7 +170,7 @@ class OrganizationsController < ApplicationController def more_org_courses @organization = Organization.find(params[:id]) @page = params[:page] - @org_courses = @organization.courses.reorder('created_at').page((params[:page].to_i || 1) + 1 ).per(5) + @org_courses = @organization.courses.reorder('created_at').uniq.page((params[:page].to_i || 1) + 1 ).per(5) respond_to do |format| format.js end @@ -189,16 +189,17 @@ class OrganizationsController < ApplicationController if !params[:name].nil? condition = "%#{params[:name].strip}%".gsub(" ","") end - #sql = "select courses.* from courses inner join members on courses.id = members.course_id inner join org_courses on courses.id = org_courses.course_id where org_courses.organization_id != #{@organization.id} and members.user_id = #{User.current.id} and courses.name like '#{condition}'" - sql = "select courses.* from courses inner join members on courses.id = members.course_id where members.user_id = #{User.current.id} and courses.name like '#{condition}'" - user_courses = Course.find_by_sql(sql) - @added_course_ids = @organization.courses.map(&:id) - @courses = [] - user_courses.each do |course| - if !@added_course_ids.include?(course.id) - @courses << course - end - end + sql = "select courses.* from courses inner join members on courses.id = members.course_id where members.user_id = #{User.current.id} and courses.name like '#{condition}'"+ + "and courses.id not in (select distinct org_courses.course_id from org_courses where org_courses.organization_id = #{@organization.id})" + #user_courses = Course.find_by_sql(sql) + @courses = Course.find_by_sql(sql) + # @added_course_ids = @organization.courses.map(&:id) + # @courses = [] + # user_courses.each do |course| + # if !@added_course_ids.include?(course.id) + # @courses << course + # end + # end end def join_courses @@ -225,15 +226,17 @@ class OrganizationsController < ApplicationController if !params[:name].nil? condition = "%#{params[:name].strip}%".gsub(" ","") end - sql = "select projects.* from projects inner join members on projects.id = members.project_id where members.user_id = #{User.current.id} and projects.status != 9 and projects.name like '#{condition}'" - user_projects = Course.find_by_sql(sql) - @added_course_ids = @organization.projects.map(&:id) - @projects = [] - user_projects.each do |project| - if !@added_course_ids.include?(project.id) - @projects << project - end - end + sql = "select projects.* from projects inner join members on projects.id = members.project_id where members.user_id = #{User.current.id} and projects.status != 9 and projects.name like '#{condition}'" + + " and projects.id not in (select org_projects.project_id from org_projects where organization_id = #{@organization.id})" + #user_projects = Course.find_by_sql(sql) + @projects = Course.find_by_sql(sql) + # @added_course_ids = @organization.projects.map(&:id) + # @projects = [] + # user_projects.each do |project| + # if !@added_course_ids.include?(project.id) + # @projects << project + # end + # end end def join_projects diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index b89977b09..b071a7c3b 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -104,7 +104,7 @@
            • - <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.projects.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%> + <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.projects.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=>1}%> @@ -131,7 +131,7 @@
            - <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>@organization.courses.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%> + <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>@organization.courses.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=>1}%>
          diff --git a/app/views/organizations/join_courses.js.erb b/app/views/organizations/join_courses.js.erb index 1c234704e..643af161f 100644 --- a/app/views/organizations/join_courses.js.erb +++ b/app/views/organizations/join_courses.js.erb @@ -1,5 +1,5 @@ $("#homepageLeftMenuCourses").html(""); $("#homepageLeftMenuCourses").append("
            "); $("#homepageLeftMenuCourses").append("<%= escape_javascript(render :partial => 'layouts/org_courses', - :locals=>{:courses=>@organization.courses.reorder('created_at').limit(5),:org_id=>@organization.id,:page=> 1}) %>"); + :locals=>{:courses=>@organization.courses.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1}) %>"); $("#homepageLeftMenuCourses").append("
          "); \ No newline at end of file diff --git a/app/views/organizations/join_projects.js.erb b/app/views/organizations/join_projects.js.erb index 1db8021bf..a39d94819 100644 --- a/app/views/organizations/join_projects.js.erb +++ b/app/views/organizations/join_projects.js.erb @@ -1,5 +1,5 @@ $("#homepageLeftMenuProjects").html(""); $("#homepageLeftMenuProjects").append("
            "); $("#homepageLeftMenuProjects").append("<%= escape_javascript(render :partial => 'layouts/org_projects', - :locals=>{:projects=>@organization.projects.reorder('created_at').limit(5),:org_id=>@organization.id,:page=> 1}) %>"); + :locals=>{:projects=>@organization.projects.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1}) %>"); $("#homepageLeftMenuProjects").append("
          "); \ No newline at end of file From 06ca4c8f4ba6c99209ac321afb5518df64e91069 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 27 Nov 2015 16:52:28 +0800 Subject: [PATCH 273/285] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index faffee4d1..00aff2195 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -64,7 +64,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;} a.hworkExport {background:url(../images/homepage_icon2.png) -10px -401px no-repeat; padding-left:23px;} a.hworkSetting {background:url(../images/homepage_icon2.png) -10px -450px no-repeat; padding-left:23px;} .hworkInfor {font-size:12px; color:#269ac9; width:80px; height:40px; vertical-align:middle; float:left; line-height:40px; text-align:center; font-weight:bold;} -.infoNi{ width:100px; padding:5px;-moz-border-radius:3px; -webkit-border-radius:3px; border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left; line-height:2; position:absolute; margin-top:-24px;margin-left: 40px;} +.infoNi{ width:100px; padding:5px;-moz-border-radius:3px; -webkit-border-radius:3px; border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left; line-height:2; position:absolute; margin-top:-24px;margin-left: 40px; z-index:99;} .problemTxt {width:660px; margin-left:10px; color:#777777; position:relative;} .rTxtTit{width:560px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#269ac9; font-size:14px;} .hworkSearchBox {border:1px solid #e6e6e6; width:185px; float:left; background-color:#ffffff;} From b130b52a23ada16fd441f5c0d8384211540865a4 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 27 Nov 2015 16:55:45 +0800 Subject: [PATCH 274/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20151127011351_add_course_contributor_total_score.rb | 2 +- db/schema.rb | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/db/migrate/20151127011351_add_course_contributor_total_score.rb b/db/migrate/20151127011351_add_course_contributor_total_score.rb index 2606864d8..28ce55ef4 100644 --- a/db/migrate/20151127011351_add_course_contributor_total_score.rb +++ b/db/migrate/20151127011351_add_course_contributor_total_score.rb @@ -14,7 +14,7 @@ class AddCourseContributorTotalScore < ActiveRecord::Migration message_reply_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.student_id} and me.parent_id is not null").count * 1 common_reply_count = Comment.find_by_sql("select cm.* from comments cm, news n where cm.author_id = #{s.student_id} and n.course_id = #{course.id} and cm.commented_id = n.id and cm.commented_type ='News'").count * 1 # attachment_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "Attachment").count * 5 - attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{course.id} and author_id = #{s.student_id};").count * 5 + attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{course.id} and author_id = #{s.student_id} and container_type ='Course'").count * 5 journal_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? ", s.student_id, course.id, "Course").count * 1 # journal_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "JournalsForMessage").count * 1 # journal_reply_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? and status =?", s.student_id, course.id, "Course",1).count * 1 diff --git a/db/schema.rb b/db/schema.rb index 603ca6857..87342bf9c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -605,7 +605,7 @@ ActiveRecord::Schema.define(:version => 20151127011351) do end create_table "exercise_questions", :force => true do |t| - t.string "question_title" + t.text "question_title" t.integer "question_type" t.integer "question_number" t.integer "exercise_id" @@ -634,7 +634,7 @@ ActiveRecord::Schema.define(:version => 20151127011351) do end create_table "exercises", :force => true do |t| - t.string "exercise_name" + t.text "exercise_name" t.text "exercise_description" t.integer "course_id" t.integer "exercise_status" @@ -1151,10 +1151,6 @@ ActiveRecord::Schema.define(:version => 20151127011351) do create_table "org_members", :force => true do |t| t.integer "user_id" t.integer "organization_id" -<<<<<<< HEAD - t.string "role" -======= ->>>>>>> 1ae514ca4857d7e2ad53b338731c1e01f899fb4d t.datetime "created_at", :null => false t.datetime "updated_at", :null => false end From cb910b8d4ab85c7df743af3de1b5578d79f0e670 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 27 Nov 2015 17:02:37 +0800 Subject: [PATCH 275/285] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index da649663d..c2b1b509f 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -411,7 +411,9 @@ <% if ma.course_message_type == "Course" %>
            -
            • +
          • + +
          • 系统提示 ">您成功创建了课程： @@ -443,7 +445,7 @@ <% end %> <% if ma.course_message_type == "JoinCourseRequest" %>
              -
              • +
            • 系统提示 ">您有了新的课程成员申请： @@ -482,7 +484,7 @@ <% end %> <% if ma.course_message_type == "CourseRequestDealResult" %>
                -
                • +
              • 系统提示 "> @@ -548,7 +550,7 @@ <% if ma.course_message_type == "JoinCourse" and ma.status == 1 %>
                • - +
                • 系统提示 From 634e11d0ecf6852bdbbf1ddc814b476e52e7a2a1 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 27 Nov 2015 17:15:51 +0800 Subject: [PATCH 276/285] 0 --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 87342bf9c..55a97ee20 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151127011351) do +ActiveRecord::Schema.define(:version => 20151126160252) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false From 879dee0cd6f4ee97b8f43fa6429a991bc187e73d Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 27 Nov 2015 17:27:55 +0800 Subject: [PATCH 277/285] =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E6=88=96=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=EF=BC=8C=E5=88=B7=E6=96=B0=E6=95=B4=E4=B8=AA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_join_course_menu.html.erb | 1 + app/views/organizations/_join_project_menu.html.erb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/views/organizations/_join_course_menu.html.erb b/app/views/organizations/_join_course_menu.html.erb index e66d0bcce..d875550de 100644 --- a/app/views/organizations/_join_course_menu.html.erb +++ b/app/views/organizations/_join_course_menu.html.erb @@ -13,6 +13,7 @@ $(".resourcePopupClose").click(function(){ + location.reload(); $(".resourceSharePopup").css("display","none"); }); }); diff --git a/app/views/organizations/_join_project_menu.html.erb b/app/views/organizations/_join_project_menu.html.erb index 765b4b23a..e13e1416e 100644 --- a/app/views/organizations/_join_project_menu.html.erb +++ b/app/views/organizations/_join_project_menu.html.erb @@ -13,6 +13,7 @@ $(".resourcePopupClose").click(function(){ + location.reload(); $(".resourceSharePopup").css("display","none"); }); }); From 6f9c89d67b7c88b82b8ae5414bd53406df426e65 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 30 Nov 2015 16:04:43 +0800 Subject: [PATCH 278/285] =?UTF-8?q?1.=E6=9B=B4=E6=94=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BD=9C?= =?UTF-8?q?=E8=80=85=E7=AD=89=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=A6=96=E9=A1=B5=E3=80=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E3=80=81=E5=88=A0=E9=99=A4=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=AD=89=E5=8A=9F=E8=83=BD=EF=BC=9B=202.=E5=A2=9E=E5=8A=A0edit?= =?UTF-8?q?or=5Fof=5Fdocuments=E8=A1=A8=EF=BC=8C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=BC=96=E8=BE=91=E7=9A=84=E4=BD=9C=E8=80=85?= =?UTF-8?q?=E3=80=81=E6=97=B6=E9=97=B4=E7=AD=89=EF=BC=8C=E5=B9=B6=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=A6=96=E9=A1=B5=E7=9A=84=E6=9C=80=E5=90=8E=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=BA=BA=EF=BC=9B=203.=E5=9C=A8=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=96=87=E7=AB=A0=E5=90=8E=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A6=96=E9=A1=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org_document_comments_controller.rb | 15 ++-- app/controllers/organizations_controller.rb | 6 ++ app/models/editor_of_document.rb | 4 ++ app/models/org_document_comment.rb | 2 +- .../org_document_comments/index.html.erb | 2 +- app/views/org_document_comments/show.html.erb | 2 +- .../organizations/_org_activities.html.erb | 2 +- .../organizations/_show_home_page.html.erb | 69 +++++++++++++++++++ .../organizations/_show_org_document.html.erb | 10 +-- .../organizations/cancel_homepage.js.erb | 1 + app/views/organizations/show.html.erb | 4 +- config/routes.rb | 1 + ...20151130032658_create_org_docume_editor.rb | 12 ++++ ...ument_created_at_for_editor_of_document.rb | 12 ++++ 14 files changed, 124 insertions(+), 18 deletions(-) create mode 100644 app/models/editor_of_document.rb create mode 100644 app/views/organizations/_show_home_page.html.erb create mode 100644 app/views/organizations/cancel_homepage.js.erb create mode 100644 db/migrate/20151130032658_create_org_docume_editor.rb create mode 100644 db/migrate/20151130064556_copy_document_created_at_for_editor_of_document.rb diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index 02527bdfc..29b728268 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -13,7 +13,7 @@ class OrgDocumentCommentsController < ApplicationController @org_document_comment.content = params[:org_document_comment][:content] if @org_document_comment.save flash.keep[:notice] = l(:notice_successful_create) - OrgActivity + EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document_comment.id, :created_at => @org_document_comment.updated_at) redirect_to organization_org_document_comments_path(@organization) else redirect_to new_org_document_comment_path(:organization_id => @organization.id) @@ -36,13 +36,18 @@ class OrgDocumentCommentsController < ApplicationController if @org_document.parent.nil? act = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", @org_document.id).first act.update_attributes(:updated_at => @org_document.updated_at) + EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document.id, :created_at => Time.now) end respond_to do |format| format.html { if params[:flag].to_i == 0 redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id) else - redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id) + if params[:flag].to_i == 1 + redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id) + else + redirect_to organization_path(@org_document.organization.id) + end end } end @@ -81,10 +86,10 @@ class OrgDocumentCommentsController < ApplicationController def destroy @org_document_comment = OrgDocumentComment.find(params[:id]) org = @org_document_comment.organization + if @org_document_comment.id == org.home_id + org.update_attributes(:home_id => nil) + end if @org_document_comment.destroy - if @org_document_comment.id == org.id - org.home_id == nil - end end respond_to do |format| format.js diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index b326051e6..70ac952ea 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -142,6 +142,12 @@ class OrganizationsController < ApplicationController # end end + def cancel_homepage + @org = Organization.find(params[:id]) + @org.home_id = nil + @org.save + end + def autocomplete_search @project = Project.find(params[:project_id]) #@flag = params[:flag] || false diff --git a/app/models/editor_of_document.rb b/app/models/editor_of_document.rb new file mode 100644 index 000000000..15d9e7e37 --- /dev/null +++ b/app/models/editor_of_document.rb @@ -0,0 +1,4 @@ +class EditorOfDocument < ActiveRecord::Base + belongs_to :user, :class_name => 'User', :foreign_key => 'editor_id' + belongs_to :org_document_comment +end \ No newline at end of file diff --git a/app/models/org_document_comment.rb b/app/models/org_document_comment.rb index 7b9f9cd75..e2ce350ce 100644 --- a/app/models/org_document_comment.rb +++ b/app/models/org_document_comment.rb @@ -3,7 +3,7 @@ class OrgDocumentComment < ActiveRecord::Base include Redmine::SafeAttributes belongs_to :organization belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id' - + has_many :editor_of_documents, :dependent => :destroy acts_as_tree :order => "#{OrgDocumentComment.table_name}.sticky asc, #{OrgDocumentComment.table_name}.created_at desc" has_many :org_acts, :class_name => 'OrgActivity',:as =>:org_act ,:dependent => :destroy after_create :document_save_as_org_activity diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb index d967c42fd..9a9f74ac6 100644 --- a/app/views/org_document_comments/index.html.erb +++ b/app/views/org_document_comments/index.html.erb @@ -19,6 +19,6 @@ init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first.id %>, null, "87%"); }); - <%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first} %> + <%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %> <% end %> <% end %> \ No newline at end of file diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index 31e4f7e05..7655f996e 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -25,7 +25,7 @@
                  发布时间：<%= format_activity_day(@document.created_at) %> <%= format_time(@document.created_at, false) %>
                  <% unless @document.content.blank? %> -
                  +
                  <%= @document.content.html_safe %>
                  <% end %> diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb index 33ac13e76..60238091f 100644 --- a/app/views/organizations/_org_activities.html.erb +++ b/app/views/organizations/_org_activities.html.erb @@ -22,7 +22,7 @@
                  <% end %> <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %> - <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act} %> + <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2} %> <% end %> <% end %> <% if act.container_type == 'Project' %> diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb new file mode 100644 index 000000000..ade3f7ba8 --- /dev/null +++ b/app/views/organizations/_show_home_page.html.erb @@ -0,0 +1,69 @@ +
                  +
                  + +
                  + +
                  <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %>
                  + + <% unless document.content.blank? %> +
                  + <%= document.content.html_safe %> +
                  + <% end %> +
                  + 发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %> +
                  +
                  +
                  + 最后编辑：<%= User.find(EditorOfDocument.where("org_document_comment_id =?", document.id).order("created_at desc").first.editor_id).realname %> +
                  + + <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id) || User.current.id == document.creator_id) %> +
                  +
                    +
                  • +
                      +
                    • + <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'cancel_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %> + 取消首页 + <% end %> +
                      • +
                    • + <%= link_to "编辑首页", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 2), :class => "postOptionLink" %> +
                      • +
                    • + <%= link_to "删除首页", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete', + :data => {:confirm => l(:text_are_you_sure)}, + :remote => true, :class => 'postOptionLink' %> +
                      • +
                    +
                    • +
                  +
                  +
                  + <% end %> +
                  +
                  + +
                  + + \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 888cbbf68..4d1393897 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -8,24 +8,20 @@ <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> TO  <%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %> | - <% if document.organization.home_id == document.id %> - 首页 - <% else %> 组织文章 - <% end %>
          <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %>
          发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
          <% unless document.content.blank? %> -
          +
          <%= document.content.html_safe %>
          <% end %> - <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id) || User.current.id == document.creator_id) %> + <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
          • @@ -36,7 +32,7 @@ <% end %>
          • - <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 0), :class => "postOptionLink" %> + <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => flag), :class => "postOptionLink" %>
          • <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete', diff --git a/app/views/organizations/cancel_homepage.js.erb b/app/views/organizations/cancel_homepage.js.erb new file mode 100644 index 000000000..bf9eb798c --- /dev/null +++ b/app/views/organizations/cancel_homepage.js.erb @@ -0,0 +1 @@ +window.location.href = "<%= organization_path(@org) %>"; \ No newline at end of file diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index e44e0778d..9e0fc365c 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -52,14 +52,14 @@
          -<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %> +<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %> <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %> - <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %> + <%= render :partial => 'show_home_page', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %> <% end %> <% if @org_activities %> <%= render :partial => 'organizations/org_activities', diff --git a/config/routes.rb b/config/routes.rb index d12a38425..bb6d7b940 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -36,6 +36,7 @@ RedmineApp::Application.routes.draw do get 'setting'#, :action => 'settings', :as => 'settings' get 'clear_org_avatar_temp' put 'set_homepage' + put 'cancel_homepage' get 'members' get 'more_org_projects' get 'more_org_courses' diff --git a/db/migrate/20151130032658_create_org_docume_editor.rb b/db/migrate/20151130032658_create_org_docume_editor.rb new file mode 100644 index 000000000..0dc9857ba --- /dev/null +++ b/db/migrate/20151130032658_create_org_docume_editor.rb @@ -0,0 +1,12 @@ +class CreateOrgDocumeEditor < ActiveRecord::Migration + def up + create_table :editor_of_documents do |t| + t.integer :editor_id + t.integer :org_document_comment_id + t.timestamp :created_at + end + end + + def down + end +end diff --git a/db/migrate/20151130064556_copy_document_created_at_for_editor_of_document.rb b/db/migrate/20151130064556_copy_document_created_at_for_editor_of_document.rb new file mode 100644 index 000000000..2361db3dd --- /dev/null +++ b/db/migrate/20151130064556_copy_document_created_at_for_editor_of_document.rb @@ -0,0 +1,12 @@ +class CopyDocumentCreatedAtForEditorOfDocument < ActiveRecord::Migration + def up + OrgDocumentComment.all.each do |doc| + if doc.parent.nil? + EditorOfDocument.create(:editor_id => doc.creator_id, :org_document_comment_id => doc.id, :created_at => doc.updated_at) + end + end + end + + def down + end +end From 3750a49b6541b4201146129f905a2b66d36f6392 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 30 Nov 2015 16:10:29 +0800 Subject: [PATCH 279/285] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B8=8B=E6=8B=89=E6=A1=86=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_show_home_page.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb index ade3f7ba8..3628b4929 100644 --- a/app/views/organizations/_show_home_page.html.erb +++ b/app/views/organizations/_show_home_page.html.erb @@ -20,7 +20,7 @@ - <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id) || User.current.id == document.creator_id) %> + <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
          • From 0aba11f175e767f186890f7ec5bcc9c3f0f02b79 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 1 Dec 2015 11:28:33 +0800 Subject: [PATCH 280/285] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=9C=A8360=E6=B5=8F=E8=A7=88=E5=99=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=BC=E5=AE=B9=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/setting.html.erb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index 82b28fb8a..96fef706a 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -45,13 +45,11 @@ <%= render :partial=>"new_org_avatar_form",:locals=> {source:@organization} %> -
            * 组织名称： - +
            * 组织名称：
            -
            组织描述： - +
            组织描述：
            From 95b071a8f727080e5f67cc27952d4a54098f88f3 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 2 Dec 2015 16:48:49 +0800 Subject: [PATCH 281/285] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_document_comments/add_reply.js.erb | 2 +- app/views/organizations/_show_org_document.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/org_document_comments/add_reply.js.erb b/app/views/org_document_comments/add_reply.js.erb index 40ed2eeb2..1906cae95 100644 --- a/app/views/org_document_comments/add_reply.js.erb +++ b/app/views/org_document_comments/add_reply.js.erb @@ -1,3 +1,3 @@ -$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document, :act => @act}) %>"); +$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>"); init_activity_KindEditor_data(<%= @act.id %>,"","87%"); \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 4d1393897..7588c7f6f 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -88,7 +88,7 @@
            - <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id, :act_id => act.id), :method => "post", :remote => true) do |f| %> + <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %> From 9baeb850a3ac9a099c2dcab0cca715428a519cf8 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 2 Dec 2015 17:34:21 +0800 Subject: [PATCH 282/285] =?UTF-8?q?=E5=9C=A8=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=AD=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=9A=84=E7=BC=96=E8=BE=91=E5=92=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 13 +++ app/views/organizations/destroy.js.erb | 0 app/views/organizations/edit.html.erb | 108 ++++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 app/views/organizations/destroy.js.erb create mode 100644 app/views/organizations/edit.html.erb diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 70ac952ea..85f57917b 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -37,6 +37,19 @@ class OrganizationsController < ApplicationController @organization = Organization.new render :layout => 'new_base' end + + def edit + @organization = Organization.find(params[:id]) + end + + def destroy + @organization = Organization.find(params[:id]) + @organization.destroy + respond_to do |format| + format.html{ redirect_to admin_organization_path } + end + end + def create @organization = Organization.new @organization.name = params[:organization][:name] diff --git a/app/views/organizations/destroy.js.erb b/app/views/organizations/destroy.js.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/organizations/edit.html.erb b/app/views/organizations/edit.html.erb new file mode 100644 index 000000000..c2e918708 --- /dev/null +++ b/app/views/organizations/edit.html.erb @@ -0,0 +1,108 @@ + +<% @nav_dispaly_organization_label = 1 + @nav_dispaly_forum_label = 1 %> +<%= error_messages_for 'organization' %> +
            +

            编辑组织

            +
            +
            + + + <%#= form_for( @organization,{:controller => 'organizations',:action => 'update',:id=>@organization,:html=>{:id=>'update_org_form',:method=>'put'}}) do %> + <%= labelled_form_for @organization, :html => {:id => "edit_organization_#{@organization.id}"} do |f|%> + <%= render :partial=>"new_org_avatar_form",:locals=> {source:@organization} %> + + +
            * 组织名称： +
            +
            +
            +
            组织描述： +
            +
            +
            + + + + + + + + +
            公开 : + class="ml3" /> +
            + 保存 + <% end %> +
            +
            + +<% html_title(l(:label_organization_new)) -%> + + + From cf41b13f3ab81c5b25a4ae6ffe1bf8875c245425 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 2 Dec 2015 17:38:41 +0800 Subject: [PATCH 283/285] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E8=A1=A8=E5=92=8C=E7=BB=84=E7=BB=87=E8=AF=BE=E7=A8=8B=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E5=85=B3=E8=81=94=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/course.rb | 2 +- app/models/organization.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/course.rb b/app/models/course.rb index ec1afd611..143358abe 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -18,7 +18,7 @@ class Course < ActiveRecord::Base :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})" has_many :principals, :through => :member_principals, :source => :principal has_many :users, :through => :members - has_many :org_courses + has_many :org_courses, :dependent => :destroy has_many :organizations, :through => :org_courses # has_many :homeworks, :through => :homework_for_courses, :source => :bid, :dependent => :destroy has_many :journals_for_messages, :as => :jour, :dependent => :destroy diff --git a/app/models/organization.rb b/app/models/organization.rb index d3755b5ee..a35f68c26 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -5,7 +5,7 @@ class Organization < ActiveRecord::Base has_many :projects,:through => :org_projects has_many :courses, :through => :org_courses has_many :org_document_comments, :dependent => :destroy - has_many :org_courses + has_many :org_courses, :dependent => :destroy has_many :users, :through => :org_members validates_uniqueness_of :name after_create :save_as_org_activity From 2855c0e409e104d66ef612fb88056e117442e5c7 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 4 Dec 2015 10:59:09 +0800 Subject: [PATCH 284/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8A=A8=E6=80=81=EF=BC=8C=E4=BD=BF=E5=85=B6=E4=B8=8E=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=8A=A8=E6=80=81=E5=8F=8A=E4=B8=AA=E4=BA=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=B8=80=E8=87=B4=EF=BC=8C?= =?UTF-8?q?=E5=8C=85=E6=8B=AC=E6=9C=89=E5=9B=9E=E5=A4=8D=E6=A1=86=E3=80=81?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=8F=9C=E5=8D=95=E3=80=81=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E3=80=81=E9=97=B4=E8=B7=9D=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/messages_controller.rb | 5 + app/controllers/projects_controller.rb | 13 +- app/models/forge_activity.rb | 6 +- app/views/comments/create.js.erb | 5 +- app/views/layouts/base_projects.html.erb | 2 +- app/views/projects/_attachment_acts.html.erb | 35 +++++ .../projects/_project_activities.html.erb | 102 ++++++++++++ app/views/projects/_project_create.html.erb | 38 +++++ app/views/projects/_project_news.html.erb | 106 +++++++++++++ app/views/projects/show.html.erb | 145 ++++-------------- app/views/projects/show.js.erb | 1 + 11 files changed, 340 insertions(+), 118 deletions(-) create mode 100644 app/views/projects/_attachment_acts.html.erb create mode 100644 app/views/projects/_project_activities.html.erb create mode 100644 app/views/projects/_project_create.html.erb create mode 100644 app/views/projects/_project_news.html.erb create mode 100644 app/views/projects/show.js.erb diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 9b090de9a..6f173b7c2 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -169,6 +169,11 @@ class MessagesController < ApplicationController course_activity.updated_at = Time.now course_activity.save end + forge_activity = ForgeActivity.where("forge_act_type='Message' and forge_act_id=#{@topic.id}").first + if forge_activity + forge_activity.updated_at = Time.now + forge_activity.save + end user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first if user_activity user_activity.updated_at = Time.now diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 715f56d3d..200bd4d69 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -320,9 +320,20 @@ class ProjectsController < ApplicationController @activity.scope_select {|t| !has["show_#{t}"].nil?} =end + @page = params[:page] ? params[:page].to_i + 1 : 0 # 根据私密性，取出符合条件的所有数据 if User.current.member_of?(@project) || User.current.admin? - @events_pages = ForgeActivity.where("project_id = ? and forge_act_type != ?",@project, "Document" ).order("created_at desc").page(params['page'|| 1]).per(20); + case params[:type] + when nil + @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo')",@project).order("updated_at desc").limit(10).offset(@page * 10) + when 'issue' + @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Issue'",@project).order("updated_at desc").limit(10).offset(@page * 10) + when 'news' + @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'News'",@project).order("updated_at desc").limit(10).offset(@page * 10) + when 'message' + @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Message'",@project).order("updated_at desc").limit(10).offset(@page * 10) + end + #events = @activity.events(@date_from, @date_to) else @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb index bb5f30442..115575289 100644 --- a/app/models/forge_activity.rb +++ b/app/models/forge_activity.rb @@ -48,8 +48,10 @@ class ForgeActivity < ActiveRecord::Base def add_org_activity if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil? org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.forge_act.parent.id}").first - org_activity.created_at = self.created_at - org_activity.save + if org_activity + org_activity.created_at = self.created_at + org_activity.save + end else OrgActivity.create(:user_id => self.user_id, :org_act_id => self.forge_act_id, diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb index ea904a63f..b0354b53f 100644 --- a/app/views/comments/create.js.erb +++ b/app/views/comments/create.js.erb @@ -1,3 +1,6 @@ +<% if @course %> $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>"); - +<% else %> +$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>"); +<% end %> init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%"); diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 9e9bd688f..1d68c9fa0 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -12,7 +12,7 @@ <%= favicon %> <%= javascript_heads %> <%= heads_for_theme %> - <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header','repository' %> + <%= stylesheet_link_tag 'public', 'pleft', 'project','courses','prettify','jquery/jquery-ui-1.9.2','header','repository' %> <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %> <%= call_hook :view_layouts_base_html_head %> diff --git a/app/views/projects/_attachment_acts.html.erb b/app/views/projects/_attachment_acts.html.erb new file mode 100644 index 000000000..2baa8791a --- /dev/null +++ b/app/views/projects/_attachment_acts.html.erb @@ -0,0 +1,35 @@ +
            +
            +
            + <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %> +
            +
            +
            + <% if activity.try(:author).try(:realname) == ' ' %> + <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% else %> + <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% end %> TO + <%= link_to activity.project.name.to_s+" | 项目附件", project_news_index_path(activity.project), :class => "newsBlue ml15" %> +
            + +
            +
            + 发布时间：<%= format_time(activity.created_on) %> +
            +

            <%= textAreailizable act, :description %>

            +
            +
            + <%#= activity.description.html_safe %> +
            +
            +
            + +
            +
            +
            + +
            \ No newline at end of file diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb new file mode 100644 index 000000000..f97646d3c --- /dev/null +++ b/app/views/projects/_project_activities.html.erb @@ -0,0 +1,102 @@ +<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %> + +<% unless forge_acts.empty? %> + <% forge_acts.each do |activity| -%> + + + <% case activity.forge_act_type %> + <% when "ProjectCreateInfo" %> + <%= render :partial => 'projects/project_create', :locals => {:activity => activity, :user_activity_id => activity.id} %> + + <% when "Issue" %> + <%= render :partial => 'users/project_issue', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id} %> + + + <% when "Message" %> + <%= render :partial => 'users/project_message', :locals => {:activity => activity.forge_act,:user_activity_id =>activity.id} %> + + <% when "News" %> + <% if !activity.forge_act.nil? and activity.forge_act.project %> + <%= render :partial => 'projects/project_news', :locals => {:activity=>activity.forge_act, :user_activity_id=>activity.id} %> + <% end %> + + <% when "Attachment" %> + <%= render :partial => 'projects/attachment_acts', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %> + + + + + + + + + <%#= link_to format_activity_title("#{l(:label_attachment)}: #{act.filename}"), {:controller => 'attachments', :action => 'show', :id => act.id}, :class => "problem_tit fl fb" %> + + + + + + + + + <% end %> + <% end %> +<% end %> + +<% if forge_acts.count == 10 %> +
            展开更多<%= link_to "", project_path(@project.id, :type => type, :page => page), :id => "more_forge_activities_link", :remote => "true", :class => "none" %>
            +<% end %> + + \ No newline at end of file diff --git a/app/views/projects/_project_create.html.erb b/app/views/projects/_project_create.html.erb new file mode 100644 index 000000000..d966d8e18 --- /dev/null +++ b/app/views/projects/_project_create.html.erb @@ -0,0 +1,38 @@ +<% project = Project.find(activity.project_id) %> +<% user = User.find(project.user_id)%> +
            +
            +
            + <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %> +
            +
            +
            + <% if user.try(:realname) == ' ' %> + <%= link_to user, user_path(user), :class => "newsBlue mr15" %> + <% else %> + <%= link_to user.try(:realname), user_path(user), :class => "newsBlue mr15" %> + <% end %> + TO + <%= link_to project.to_s+" | 项目", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %> +
            +
            + <%= link_to project.name, project_path(project.id,:host=>Setting.host_course), :class => "postGrey" %> +
            +
            + 创建时间：<%= format_time(project.created_on) %> +
            + +
            +
            +
            +
            \ No newline at end of file diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb new file mode 100644 index 000000000..919abc11e --- /dev/null +++ b/app/views/projects/_project_news.html.erb @@ -0,0 +1,106 @@ +
            +
            +
            + <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %> +
            +
            +
            + <% if activity.try(:author).try(:realname) == ' ' %> + <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% else %> + <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% end %> TO + <%= link_to activity.project.name.to_s+" | 项目新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %> +
            + + <% if activity.sticky == 1%> + 置顶 + <% end%> +
            +
            + 发布时间：<%= format_time(activity.created_on) %> +
            +
            +
            + <%= activity.description.html_safe %> +
            +
            +
            + + +
            +
            +
            +
            + <% count=activity.comments.count %> +
            +
            +
            +
            + 回复（<%= count %>） +
            +
            <%#= format_date(activity.updated_on) %>
            + <%if count>3 %> +
            + + 展开更多 + +
            + <% end %> +
            + + <% replies_all_i = 0 %> + <% if count > 0 %> +
            +
              + <% activity.comments.reorder("created_on desc").each do |comment| %> + + <% replies_all_i = replies_all_i + 1 %> +
            • +
              + <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %> +
              +
              +
              + <% if comment.try(:author).try(:realname) == ' ' %> + <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_time(comment.created_on) %> +
              +
              + <%= comment.comments.html_safe %>
              +
              +
              +
              • + <% end %> +
            +
            + <% end %> + +
            +
            <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
            +
            +
            + <%= form_for('new_form',:url => {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%> + + +
            + +
            +

            + <% end%> +
            +
            +
            +
            +
            +
            +
            \ No newline at end of file diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index a3a2845f8..a58aeb281 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -1,114 +1,33 @@ -<%= javascript_include_tag "jquery.infinitescroll.js" %> -
            -

            <%= l(:label_activity) %>

            -
            - -<% unless @events_pages.empty? %> - <% @events_pages.each do |e| -%> - - <% if e.forge_act_type == "ProjectCreateInfo"%> -
            - <%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %> -
            - <%= link_to e.user, user_path(e.user), :class => "problem_name c_orange fl" %> <%= l(:label_project_create) %> ： - <%= link_to e.project.name,{} ,:class => "problem_tit fl fb" %>
            -


            <%= l :label_create_time %> ：<%= format_time(e.project.created_on) %>

            -
            -
            -
            - <% end %> - <% next if e.forge_act_type.safe_constantize.nil? - act = e.forge_act; - next if act.nil? %> - - <% if e.forge_act_type == "Issue" %> -
            - <%= image_tag(url_to_avatar(act.author), :width => "42", :height => "42") %> -
            - - <%= h(e.project) if @project.nil? || @project.id != e.project_id %> - <%= link_to act.author, user_path(act.author), :class => "problem_name c_orange fl" %> <%= l(:label_new_activity) %> ： - <%= link_to format_activity_title("#{act.source_from}##{act.project_issues_index} (#{act.status}): #{act.tracker.name} #{act.subject}"), - {:controller => 'issues', - :action => 'show', - :id => act.id}, - :class => "problem_tit fl fb " %> -
            -

            <%= act.description.html_safe %>
            - <%= l :label_activity_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %> -

            -
            -
            -
            - - <% elsif e.forge_act_type == "Journal" %> -
            - <%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %> -
            - - <%= h(e.project) if @project.nil? || @project.id != e.project_id %> - <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %> <%= l(:label_new_activity) %> ： - <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"), - {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"}, :class => "problem_tit fl fb" %> -
            -

            <%= act.notes.html_safe %>
            - <%= l :label_activity_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %>

            -
            -
            -
            - - <% elsif e.forge_act_type == "Message" %> -
            - <%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %> -
            - - <%= h(e.project) if @project.nil? || @project.id != e.project_id %> - <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %> <%= l(:label_new_activity) %> ： +<%#= stylesheet_link_tag 'courses' %> + + +
            +
            +
            项目动态
            +
              +
            • +
                +
              • +
                  +
                • <%= link_to "全部动态", {:controller => "projects", :action => "show", :type => nil}, :class => "homepagePostTypeAll postTypeGrey" %>
                  • +
                • <%= link_to "问题动态", {:controller => "projects", :action => "show", :type => "issue"}, :class => "homepagePostTypeMessage postTypeGrey" %>
                  • + +
                • <%= link_to "新闻动态", {:controller => "projects", :action => "show", :type => "news"}, :class => "homepagePostTypeNotice postTypeGrey" %>
                  • + +
                • <%= link_to "讨论区动态", {:controller => "projects", :action => "show", :type => "message"}, :class => "homepagePostTypeForum postTypeGrey" %>
                  • + +
                +
                • +
              +
              • +
            + - <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), - project_boards_path(@project,:topic_id => act.id), - :class => "problem_tit fl fb " %> -
            -

            <%= textAreailizable act,:content %>
            -

            - <%= l :label_create_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %>

            -
            -
            -
            - - <% elsif e.forge_act_type == "News" %> -
            - <%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %> -
            - - <%= h(e.project) if @project.nil? || @project.id != e.project_id %> - <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %> <%= l(:label_new_activity) %> ： - - <% unless act.nil? %> - <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id}, :class => "problem_tit fl fb " %> - <% end %> -
            -

            <%= textAreailizable act,:description %>
            - <%= l :label_create_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %>

            -
            -
            -
            - - - <% elsif e.forge_act_type == "Attachment" %> -
            - <%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %> -
            - - <%= h(e.project) if @project.nil? || @project.id != e.project_id %> - <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %> <%= l(:label_new_activity) %> ： - <%= link_to format_activity_title("#{l(:label_attachment)}: #{act.filename}"), {:controller => 'attachments', :action => 'show', :id => act.id}, :class => "problem_tit fl fb" %>
            -

            <%= textAreailizable act,:description %>
            - <%= l :label_create_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %>

            -
            -
            -
            - <% end %> - <% end %> -<% end %> -<%= paginate @events_pages, :left => 3, :right => 3 %> +
            + <%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %> +
            \ No newline at end of file diff --git a/app/views/projects/show.js.erb b/app/views/projects/show.js.erb new file mode 100644 index 000000000..384c111d1 --- /dev/null +++ b/app/views/projects/show.js.erb @@ -0,0 +1 @@ +$("#show_more_forge_activities").replaceWith("<%= escape_javascript( render :partial => 'projects/project_activities',:locals => {:forge_acts => @events_pages, :page => @page,:type => @type} )%>"); From ab4d0e46785d92818b0f5771426d72f3f7787b4d Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 4 Dec 2015 17:34:48 +0800 Subject: [PATCH 285/285] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../javascripts/org_subfields.js.coffee | 3 + app/assets/stylesheets/org_subfields.css.scss | 3 + app/controllers/org_subfields_controller.rb | 19 ++++++ app/helpers/org_subfields_helper.rb | 2 + app/models/org_subfield.rb | 3 + app/models/organization.rb | 1 + app/views/layouts/base_org.html.erb | 55 +---------------- app/views/org_subfields/create.js.erb | 4 ++ app/views/org_subfields/destroy.js.erb | 4 ++ app/views/org_subfields/update.js.erb | 1 + .../_org_left_subfield_list.html.erb | 60 +++++++++++++++++++ .../organizations/_subfield_list.html.erb | 51 ++++++++++++++++ app/views/organizations/setting.html.erb | 27 ++++++++- config/routes.rb | 4 ++ .../20151204030143_create_org_subfields.rb | 13 ++++ public/stylesheets/org.css | 12 +++- .../org_subfields_controller_spec.rb | 5 ++ 17 files changed, 211 insertions(+), 56 deletions(-) create mode 100644 app/assets/javascripts/org_subfields.js.coffee create mode 100644 app/assets/stylesheets/org_subfields.css.scss create mode 100644 app/controllers/org_subfields_controller.rb create mode 100644 app/helpers/org_subfields_helper.rb create mode 100644 app/models/org_subfield.rb create mode 100644 app/views/org_subfields/create.js.erb create mode 100644 app/views/org_subfields/destroy.js.erb create mode 100644 app/views/org_subfields/update.js.erb create mode 100644 app/views/organizations/_org_left_subfield_list.html.erb create mode 100644 app/views/organizations/_subfield_list.html.erb create mode 100644 db/migrate/20151204030143_create_org_subfields.rb create mode 100644 spec/controllers/org_subfields_controller_spec.rb diff --git a/app/assets/javascripts/org_subfields.js.coffee b/app/assets/javascripts/org_subfields.js.coffee new file mode 100644 index 000000000..761567942 --- /dev/null +++ b/app/assets/javascripts/org_subfields.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/org_subfields.css.scss b/app/assets/stylesheets/org_subfields.css.scss new file mode 100644 index 000000000..19263385e --- /dev/null +++ b/app/assets/stylesheets/org_subfields.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the org_subfields controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb new file mode 100644 index 000000000..da20b6fcf --- /dev/null +++ b/app/controllers/org_subfields_controller.rb @@ -0,0 +1,19 @@ +class OrgSubfieldsController < ApplicationController + def create + @subfield = OrgSubfield.create(:name => params[:name]) + @organization = Organization.find(params[:organization_id]) + @organization.org_subfields << @subfield + @subfield.update_attributes(:priority => @subfield.id) + end + + def destroy + @subfield = OrgSubfield.find(params[:id]) + @organization = Organization.find(@subfield.organization_id) + @subfield.destroy + end + + def update + @subfield = OrgSubfield.find(params[:id]) + @subfield.update_attributes(:name => params[:name]) + end +end diff --git a/app/helpers/org_subfields_helper.rb b/app/helpers/org_subfields_helper.rb new file mode 100644 index 000000000..a9f8a396f --- /dev/null +++ b/app/helpers/org_subfields_helper.rb @@ -0,0 +1,2 @@ +module OrgSubfieldsHelper +end diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb new file mode 100644 index 000000000..1660310f8 --- /dev/null +++ b/app/models/org_subfield.rb @@ -0,0 +1,3 @@ +class OrgSubfield < ActiveRecord::Base + belongs_to :organization, :foreign_key => :organization_id +end \ No newline at end of file diff --git a/app/models/organization.rb b/app/models/organization.rb index a35f68c26..350dc3080 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -6,6 +6,7 @@ class Organization < ActiveRecord::Base has_many :courses, :through => :org_courses has_many :org_document_comments, :dependent => :destroy has_many :org_courses, :dependent => :destroy + has_many :org_subfields, :dependent => :destroy has_many :users, :through => :org_members validates_uniqueness_of :name after_create :save_as_org_activity diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index b071a7c3b..aa46c35ee 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -81,59 +81,8 @@ <%= link_to '成员', members_organization_path(@organization.id) %> （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
            -
            -
            - <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %> -
            -
            - 项目 - <%=link_to "", join_project_menu_organization_path(@organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%> - - - - - - - - - - - - - -
            -
            -
              - <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.projects.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=>1}%> - - - - -
            -
            -
            - 课程 - <%=link_to "", join_course_menu_organization_path(@organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%> - <%#= link_to "关联课程",join_course_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%> - - - - - - - - - - - - - -
            -
            -
              - <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>@organization.courses.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=>1}%> -
            -
            +
            + <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
            diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb new file mode 100644 index 000000000..8a676e93e --- /dev/null +++ b/app/views/org_subfields/create.js.erb @@ -0,0 +1,4 @@ +$("#org_subfield_list").html(""); +$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',:locals => {:subfields => @organization.org_subfields }) %>"); +$("#sub_field_left_lists").html(""); +$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>"); \ No newline at end of file diff --git a/app/views/org_subfields/destroy.js.erb b/app/views/org_subfields/destroy.js.erb new file mode 100644 index 000000000..8a676e93e --- /dev/null +++ b/app/views/org_subfields/destroy.js.erb @@ -0,0 +1,4 @@ +$("#org_subfield_list").html(""); +$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',:locals => {:subfields => @organization.org_subfields }) %>"); +$("#sub_field_left_lists").html(""); +$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>"); \ No newline at end of file diff --git a/app/views/org_subfields/update.js.erb b/app/views/org_subfields/update.js.erb new file mode 100644 index 000000000..2def5c5f8 --- /dev/null +++ b/app/views/org_subfields/update.js.erb @@ -0,0 +1 @@ +$("#subfield_show_<%= @subfield.id %>").html("<%= @subfield.name %>"); \ No newline at end of file diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb new file mode 100644 index 000000000..7c30aa600 --- /dev/null +++ b/app/views/organizations/_org_left_subfield_list.html.erb @@ -0,0 +1,60 @@ +
            + <%= link_to "动态",organization_path(organization), :class => "homepageMenuText" %> +
            +
            + 项目 + <%=link_to "", join_project_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%> + + + + + + + + + + + + + +
            +
            +
              + <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>organization.projects.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%> + + + + +
            +
            +
            + 课程 + <%=link_to "", join_course_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%> + <%#= link_to "关联课程",join_course_menu_organization_path(organization),:remote => true,:class => "menuGrey",:method => "post"%> + + + + + + + + + + + + + +
            +
            +
              + <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>organization.courses.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%> +
            +
            +<% organization.org_subfields.each do |field| %> +
            + <%= field.name %> + <%=link_to "", :title => "关联#{field.name}"%> +
            +
            +
            +<% end %> \ No newline at end of file diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb new file mode 100644 index 000000000..f148fc561 --- /dev/null +++ b/app/views/organizations/_subfield_list.html.erb @@ -0,0 +1,51 @@ + +
              +
            • 已有栏目
              • +
            • 状态
              • +
              +
            +
              +
            • 动态
              • +
            • 默认
              • +
              +
            +
              +
            • 项目
              • +
            • 默认
              • +
              +
            +
              +
            • 课程
              • +
            • 默认
              • +
              +
            + <% subfields.each do |field| %> +
              +
            • <%= field.name %>
              • +
            • 新增
              • + <%= link_to "删除",org_subfield_path(field), :method => 'delete',:remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr5" %> + 编辑 +
              +
            + <% end %> + + \ No newline at end of file diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index 96fef706a..138a7993a 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -2,7 +2,7 @@ function g(o){return document.getElementById(o);} function HoverLi(n){ //如果有N个标签,就将i<=N; - for(var i=1;i<=2;i++){ + for(var i=1;i<=3;i++){ g('orgSetting_'+i).className='orgSettingOp'; g('orgContent_'+i).className='undis';} g('orgContent_'+n).className='dis ml15 mr15'; @@ -34,6 +34,7 @@
            • 信息
            • 成员
              • +
            • 分栏
            @@ -104,4 +105,26 @@
            -
          \ No newline at end of file +
          +
          + <%= render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields } %> +
          +
          +
          +

          新增栏目

          + <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %> + +
          + 确定 + <% end %> +
          +
          +
          +
          +
          + \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index bb6d7b940..27e9d7861 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -70,6 +70,10 @@ RedmineApp::Application.routes.draw do end end + resources :org_subfields do + + end + resources :org_document_comments do member do post 'add_reply' diff --git a/db/migrate/20151204030143_create_org_subfields.rb b/db/migrate/20151204030143_create_org_subfields.rb new file mode 100644 index 000000000..2727cdef0 --- /dev/null +++ b/db/migrate/20151204030143_create_org_subfields.rb @@ -0,0 +1,13 @@ +class CreateOrgSubfields < ActiveRecord::Migration + def up + create_table :org_subfields do |t| + t.integer :organization_id + t.integer :priority + t.string :name + t.timestamps + end + end + + def down + end +end diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index a0118b263..897eb8734 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -54,4 +54,14 @@ a.cancelBtn:hover {background-color:#717171; color:#ffffff;} /*关联项目弹窗*/ .projectRelate {float:left; max-height:118px;margin-right:16px;margin-bottom:10px; overflow:auto; overflow-x:hidden; width:288px;} -.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;} \ No newline at end of file +.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;} + +/*组织首页新151204Tim*/ +.orgNav {width:1000px; height:30px; background-color:#cfcfcf; margin:0 auto;} +.orgContainer {width:100%; margin:0 auto; background-color:#cfcfcf;} +.navOrgLogo {width:21px; height:30px; margin-left:2px; margin-right:15px;} +.navOrgMenu {display:inline-block;height:30px; line-height:30px; vertical-align:middle;} +a.linkGrey8 {color:#888888;} +a.linkGrey8:hover {color:#585858;} +.orgBorder {width:583px; height:21px; border-bottom:3px solid #e4e4e4; float:left;} +.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px; color:#555555;} \ No newline at end of file diff --git a/spec/controllers/org_subfields_controller_spec.rb b/spec/controllers/org_subfields_controller_spec.rb new file mode 100644 index 000000000..4bc89dae0 --- /dev/null +++ b/spec/controllers/org_subfields_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgSubfieldsController, :type => :controller do + +end