Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/controllers/attachments_controller.rb

@@ -62,6 +62,18 @@ class AttachmentsController < ApplicationController
     end
   end
 
+  #更新资源文件类型
+  def updateType
+    @attachment = Attachment.find(params[:attachmentid])
+    if  @attachment != nil
+      @attachment.attachtype =  params[:newtype]
+      @attachment.save
+      render :text =>'success'
+    else
+      render :text=>'error'
+    end
+  end
+
   def thumbnail
     if @attachment.thumbnailable? && thumbnail = @attachment.thumbnail(:size => params[:size])
       if stale?(:etag => thumbnail)

app/controllers/bids_controller.rb

@@ -718,13 +718,14 @@ class BidsController < ApplicationController
   
   def update
     @bid = Bid.find(params[:id])
+    @project = @bid.courses.first#Project.find(params[:course_id])
     if @bid.update_attributes(params[:bid])
       flash[:notice] = l(:label_update_homework_succeed)
-      @project = Project.find(params[:course_id])
+      #@project = Project.find(params[:course_id])
       redirect_to project_homework_path(@project)
     else
       @bid.safe_attributes = params[:bid]
-      render :action => 'edit'
+      render :action => 'edit', :layout =>'base_courses'
     end
   end
 

app/controllers/files_controller.rb

@@ -19,8 +19,8 @@ class FilesController < ApplicationController
   layout 'base_projects'#by young
   menu_item :files
 
-  before_filter :find_project_by_project_id
-  before_filter :authorize
+  before_filter :find_project_by_project_id#, :except => [:getattachtype]
+  before_filter :authorize, :except => [:getattachtype]
 
   helper :sort
   include SortHelper
@@ -53,7 +53,7 @@ class FilesController < ApplicationController
 
   def create
     container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
-    attachments = Attachment.attach_files(container, params[:attachments])
+    attachments = Attachment.attach_filesex(container, params[:attachments],params[:attachment_type])
     render_attachment_warning_if_needed(container)
 
     if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
@@ -61,4 +61,23 @@ class FilesController < ApplicationController
     end
     redirect_to project_files_path(@project)
   end
+
+  # 返回制定资源类型的资源列表
+  def getattachtype
+    sort_init 'created_on', 'desc' 
+    sort_update   'created_on' => "#{Attachment.table_name}.created_on", 
+                  'filename' => "#{Attachment.table_name}.filename",
+                  'size' => "#{Attachment.table_name}.filesize",
+                  'downloads' => "#{Attachment.table_name}.downloads"
+   
+    @containers = [ Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)]     #modify by Long Jun
+    @containers += @project.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
+   
+    @attachtype = params[:type].to_i
+    @contenttype = params[:contentType].to_s
+
+    respond_to do |format|
+      format.js
+    end
+  end
 end

app/controllers/messages_controller.rb

@@ -43,7 +43,7 @@ class MessagesController < ApplicationController
     @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
     @replies =  @topic.children.
       includes(:author, :attachments, {:board => :project}).
-      reorder("#{Message.table_name}.created_on ASC").
+      reorder("#{Message.table_name}.created_on DESC").
       limit(@reply_pages.per_page).
       offset(@reply_pages.offset).
       all

app/controllers/projects_controller.rb

@@ -198,7 +198,7 @@ class ProjectsController < ApplicationController
     @project_type = params[:project_type]
     @school_id = params[:school_id]
     per_page_option = 10
-    if @school_id == "0" or @school.nil?
+    if @school_id == "0" or @school_id.nil?
       @projects_all = Project.active.visible.
                         joins("LEFT JOIN #{ProjectStatus.table_name} ON #{Project.table_name}.id = #{ProjectStatus.table_name}.project_id").
                         where("#{Project.table_name}.project_type = ? ", Project::ProjectType_course)    
@@ -295,8 +295,12 @@ class ProjectsController < ApplicationController
     project_type = params[:project_type].to_i
     projects_all = (project_type.eql? Project::ProjectType_course) ? Project.course_entities : Project.project_entities
     @projects = projects_all.visible
-    @projects_all = @projects.visible.like(params[:name]) if params[:name].present? 
-
+    #@projects_all = @projects.visible.like(params[:name]) if params[:name].present?
+    if params[:name].present?
+      @projects_all = @projects.visible.like(params[:name])
+    else
+      @projects_all =  @projects;
+    end
         @project_count = @projects_all.count
     @project_pages = Paginator.new @project_count, per_page_option, params['page']
     

app/controllers/school_controller.rb

@@ -23,10 +23,15 @@ class SchoolController < ApplicationController
       
     end    
   end  
-  
+
   def upload_logo
 
   end
+
+  #获取制定学校开设的课程数
+  def course_count school_id
+     School.find(school_id).courses.count
+  end
   
   
   def index
@@ -74,7 +79,7 @@ class SchoolController < ApplicationController
     render :text => options
     
   end
-  
+
   def get_schoollist
      @school = School.where("province = ?", params[:province])
      

app/controllers/users_controller.rb

@@ -549,6 +549,14 @@ class UsersController < ApplicationController
         format.api  { render_validation_errors(@user) }
       end
     end
+
+    unless @user.id.nil?
+      #后台注册的用户默认权限为男性开发员
+      ue = UserExtensions.create(:identity => 3,
+                                  :gender => 0,
+                                 :user_id => @user.id)
+      ue.save
+    end
   end
 
   def edit

app/helpers/application_helper.rb

@@ -390,6 +390,16 @@ module ApplicationHelper
     s.html_safe
   end
 
+  #扩展的checkbox生成
+  def principals_check_box_tags_ex(name, principals)
+    s = ''
+    principals.each do |principal|
+      s << "<label>#{ check_box_tag name, principal.id, false, :id => nil } #{h principal.userInfo }</label>\n"
+    end
+    s.html_safe
+  end
+
+
   # Returns a string for users/groups option tags
   def principals_options_for_select(collection, selected=nil)
     s = ''

app/helpers/attachments_helper.rb

@@ -38,7 +38,7 @@ module AttachmentsHelper
     else
       false
     end
-    
+
   end
 
   def render_api_attachment(attachment, api)

app/helpers/courses_helper.rb

@@ -108,5 +108,7 @@ module CoursesHelper
 
     now > cTime
   end
-
+  def find_by_extra_from_project extra
+    Course.find_by_extra(try(extra))
+  end
 end

app/helpers/files_helper.rb

@@ -44,4 +44,23 @@ module FilesHelper
     File.new(zipfile_name,'w+')
   end
 
+  # 判断指定的资源时候符合类型
+  def isTypeOk(attachment, type, contentType)
+    result = false
+    if type != 0
+      if attachment.attachtype == type
+        result = true
+      end
+    else
+      result = true
+    end
+    if  result
+      if contentType != '0' && contentType != attachment.suffix_type
+        result = false
+      end
+    end
+    result
+  end
+
+
 end

app/helpers/members_helper.rb

@@ -24,7 +24,7 @@ module MembersHelper
     principal_pages = Redmine::Pagination::Paginator.new principal_count, 10, params['page'] #by young
     principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
 
-    s = content_tag('div', principals_check_box_tags('membership[user_ids][]', principals), :id => 'principals')
+    s = content_tag('div', principals_check_box_tags_ex('membership[user_ids][]', principals), :id => 'principals')
 
     links = pagination_links_full(principal_pages, principal_count, :per_page_links => false) {|text, parameters, options|
       link_to text, autocomplete_project_memberships_path(project, parameters.merge(:q => params[:q], :format => 'js')), :remote => true

app/helpers/projects_helper.rb

@@ -32,7 +32,7 @@ module ProjectsHelper
             {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_issue_category_plural},
             # {:name => 'wiki', :action => :manage_wiki, :partial => 'projects/settings/wiki', :label => :label_wiki},
             {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural},
-            {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural},
+            #{:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural},
             {:name => 'activities', :action => :manage_project_activities, :partial => 'projects/settings/activities', :label => :enumeration_activities}
             ]
     tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
@@ -62,33 +62,33 @@ module ProjectsHelper
     content_tag('div', content, :class => "tabs_enterprise")   
   end
   
-   def sort_course(state, project_type)
+   def sort_course(state, project_type, school_id)
     content = ''.html_safe
     case state
     when 0
-      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type), :school_id => school_id, :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type, :school_id => school_id)))
       # content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type, :school_id => school_id)))
       
     when 1
-      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type, :school_id => school_id)))
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type, :school_id => school_id), :class=>"selected"), :class=>"selected")
       # content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type, :school_id => school_id)))
      
     when 2
-      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type, :school_id => school_id)))
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type, :school_id => school_id)))
       # content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type), :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type, :school_id => school_id)))
     
     #gcm
     when 3
-      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type, :school_id => school_id)))
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type, :school_id => school_id)))
       # content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type, :school_id => school_id), :class=>"selected"), :class=>"selected")
     end
     #gcmend
     
@@ -145,7 +145,7 @@ module ProjectsHelper
   #Added by young
   def course_settings_tabs
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'},
-            {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural, :project_type => 1},
+            #{:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural, :project_type => 1},
             # {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural},
             {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural}
             ]

app/helpers/welcome_helper.rb

@@ -105,7 +105,31 @@ module WelcomeHelper
     # c2 = c2 - c1
     # (c1.take(max)+c2).take(sum)
   end
-  
+
+  #查找所有学校按每个学校开设课程数量降序排序
+  #page 分页查询开始条数的编号,从0开始
+  #limit 分页查询的数量
+  def find_maxmin_course_school page,limit
+    School.find_by_sql("SELECT *,(SELECT COUNT(*) FROM courses WHERE school_id = schools.id) AS a
+      FROM schools
+      ORDER BY a DESC LIMIT #{page},#{limit}")
+    #School.where(" id IN (SELECT school_id FROM courses GROUP BY school_id)").limit limit;
+    #School.order("#{School.course_count}").limit(limit).all
+    #@school = School.all.sort
+    #@school.each do |s|
+    #  s.courses.count
+    #end
+    #result = []
+    #@school = School.all.to_ary
+    #i = 1
+    #for i in  i < School.count
+    #  j = i - 1
+    #  for j in j > 0
+    #    if @school[j].courses.count >
+    #  end
+    #end
+  end
+
   def find_miracle_project(sum, max_rate)
     max = sum*(max_rate.to_f/10)
     c1 = find_new_project(sum).to_a.dup
@@ -130,6 +154,12 @@ module WelcomeHelper
     sort_course_by_hot limit
   end
 
+  def find_all_new_hot_course limit = 9
+    #sort_project_by_hot_rails 1, 'course_ac_para DESC', limit
+    time_now = Time.new.strftime("%Y");
+    Project.visible.joins(:project_status).where("#{Project.table_name}.project_type = ? and #{Project.table_name}.created_on like '%#{time_now}%'", 1).order("course_ac_para DESC").limit(limit).all
+  end
+
   def find_all_hot_bid
     sort_bid_by_hot
   end

app/models/attachment.rb

@@ -23,6 +23,7 @@ class Attachment < ActiveRecord::Base
   belongs_to :project, foreign_key: 'container_id', conditions: "attachments.container_type = 'Project'"
   belongs_to :softapplication, foreign_key: 'container_id', conditions: "attachments.container_type = 'Softapplication'"
   belongs_to :author, :class_name => "User", :foreign_key => "author_id"
+  belongs_to :attachmentstype,  :foreign_key => "attachtype",:primary_key => "id"
 
   validates_presence_of :filename, :author
   validates_length_of :filename, :maximum => 255
@@ -65,6 +66,30 @@ class Attachment < ActiveRecord::Base
     copy
   end
 
+  #获取资源的后缀类型
+  def suffix_type
+    childArr = self.filename.split('.')
+    suffix = '*'
+    if childArr.length > 1
+      suffix = childArr[childArr.length-1]
+    end
+    suffix
+  end
+
+  #获取用来显示的后缀名称
+  def show_suffix_type
+    suffix = 'other'
+    temp = self.suffix_type.downcase
+    if self.attachmentstype.suffixArr.include?(temp)
+      suffix = temp
+    end
+    suffix
+  end
+
+  def suffixArr
+    @@SuffixArr
+  end
+
   def validate_max_file_size
     if @temp_file && self.filesize > Setting.attachment_max_size.to_i.kilobytes
       errors.add(:base, l(:error_attachment_too_big, :max_size => Setting.attachment_max_size.to_i.kilobytes))
@@ -260,6 +285,13 @@ class Attachment < ActiveRecord::Base
     result
   end
 
+
+  def self.attach_filesex(obj, attachments,attachment_type)
+    result = obj.save_attachmentsex(attachments, User.current,attachment_type)
+    obj.attach_saved_attachments
+    result
+  end
+
   def self.latest_attach(attachments, filename)
     attachments.sort_by(&:created_on).reverse.detect {
       |att| att.filename.downcase == filename.downcase

app/models/attachmentstype.rb

@@ -0,0 +1,11 @@
+class Attachmentstype < ActiveRecord::Base
+  attr_accessible :typeId, :typeName
+  has_many  :attachments,  :foreign_key => "attachtype",:primary_key => "id"
+
+  # 当前使用的文件内容分类列表
+  @@SuffixArr = ['pdf','zip','doc','docx','rar','txt','jpg','bmp','xls','xlsx']
+
+  def suffixArr
+    @@SuffixArr
+  end
+end

app/models/course.rb

@@ -7,6 +7,7 @@ class Course < ActiveRecord::Base
   belongs_to :school, :class_name => 'School', :foreign_key => :school_id #定义一个方法school，该方法通过school_id来调用School表
   has_many :bid
   validates_presence_of :password, :term
+  validates_format_of  :class_period, :message => "class period can only digital!", :with =>/^[1-9]\d*$/
   safe_attributes 'extra',
   'time',
   'name',
@@ -17,7 +18,14 @@ class Course < ActiveRecord::Base
   'password',
   'term',
   'password'
- 
+
+   #自定义验证
+  def validate
+    if  !class_period.match([0-9])
+      errors.add_to_base("class period can only digital")
+    end
+  end
+
   def get_endup_time
     begin
       end_time = Time.parse(self.endup_time)
@@ -39,5 +47,4 @@ class Course < ActiveRecord::Base
       return time
     end
   end
-
 end

app/models/mailer.rb

@@ -63,7 +63,7 @@ class Mailer < ActionMailer::Base
   #   Mailer.issue_add(issue).deliver => sends an email to issue recipients
   def issue_add(issue)
     redmine_headers 'Project' => issue.project.identifier,
-                    'Issue-Id' => issue.id,
+                    'Issue-Id' => (issue.project.issues.index(issue).to_i + 1).to_s,
                     'Issue-Author' => issue.author.login
     redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
     message_id issue
@@ -85,7 +85,7 @@ class Mailer < ActionMailer::Base
   def issue_edit(journal)
     issue = journal.journalized.reload
     redmine_headers 'Project' => issue.project.identifier,
-                    'Issue-Id' => issue.id,
+                    'Issue-Id' =>  (issue.project.issues.index(issue).to_i + 1).to_s,
                     'Issue-Author' => issue.author.login
     redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
     message_id journal

app/models/project.rb

@@ -38,8 +38,7 @@ class Project < ActiveRecord::Base
                                :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})"
   has_many :users, :through => :members
   has_many :principals, :through => :member_principals, :source => :principal
-
-  has_many :enabled_modules, :dependent => :delete_all
+   has_many :enabled_modules, :dependent => :delete_all
   has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
   has_many :issues, :dependent => :destroy, :include => [:status, :tracker]
   has_many :issue_changes, :through => :issues, :source => :journals
@@ -159,8 +158,27 @@ class Project < ActiveRecord::Base
   def new_course
     self.where('project_type = ?', 1)
   end
-  
-  
+
+  # 获取项目的资源类型列表
+  def attachmenttypes
+    @attachmenttypes = Attachmentstype.find(:all, :conditions => ["#{Attachmentstype.table_name}.typeId= ?",self.attachmenttype ])
+  end
+
+  # 获取资源后缀名列表
+  def contenttypes
+    attachmenttypes
+    if  @attachmenttypes.length >0
+      @attachmenttypes.last().suffixArr
+    end
+  end
+
+  #自定义验证
+  def validation
+    if  !class_period.match([0-9])
+      errors.add_to_base("class period can only digital")
+    end
+  end
+
 #   项目留言   added by fq
   def self.add_jour(user, notes)
     project = Project.find('trustie')
@@ -726,7 +744,8 @@ class Project < ActiveRecord::Base
     'custom_fields',
     'tracker_ids',
     'issue_custom_field_ids',
-    'project_type'
+    'project_type',
+    'attachmenttype'
      
 
 

app/models/user.rb

@@ -190,7 +190,11 @@ class User < Principal
       where(" LOWER(concat(lastname, firstname)) LIKE :p ", :p => pattern)
     end
   }
-  
+
+  #选择项目成员时显示的用户信息文字
+  def userInfo
+   info=self.name + '   (' + self.login + ')';
+  end
   
    ###添加留言   fq
   def add_jour(user, notes, reference_user_id = 0, options = {})

app/views/attachments/_type_edit.html.erb

@@ -0,0 +1,14 @@
+<% edit_allowed = User.current.allowed_to?(:manage_files, @project) %>
+<% if attachmenttypes.any? %>
+    <div id="put-tag-form-<%=attachment.id%>" class="hidden">
+        <%= select_tag "attachment_type",
+                       options_from_collection_for_select(attachmenttypes, "id",
+                         "typeName",attachment.attachtype), :onchange=>"attachmenttypes_change("+attachment.id.to_s + ",this.value)"%>
+      </div>
+    <%= link_to(image_tag('edit/edit.png'), 'javascript:void(0);',:style=>"white-space:nowrap;", :id=>"edit_box"+attachment.id.to_s ,
+                :onclick =>"$('#put-tag-form-" +attachment.id.to_s+ "').show();
+                $('#attach_type_id_label" +attachment.id.to_s+ "').hide();
+                $('#edit_box" +attachment.id.to_s+ "').hide();") if edit_allowed %>
+
+<% end %>
+

app/views/bids/_bid_homework_show.html.erb

@@ -13,9 +13,11 @@
 						<span class="font_lighter"><%= l(:label_user_create_project_homework) %></span>
 					<span><%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></span>
 					<span style="float: right">
+                        <% if(User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, bid.courses.first.id).first.roles&Role.where('id = ? or id = ? or id =?',5, 10, 7)).size >0)) %>
 						<%# 提交作业按钮 %>
 						<%= link_to  l(:label_commit_homework), '#OpenWindow', rel: 'leanModal', onclick: "showSubH(#{bid.id}, '#{bid.name}');" if User.current.member_of?(@project) %>
-						<% if (User.current.admin?||User.current.id==bid.author_id) %>
+						<% end %>
+                        <% if (User.current.admin?||User.current.id==bid.author_id) %>
 						<%= link_to(
           					l(:button_edit),
           					{:action => 'edit', :controller=>'bids', :project_id =>@project.id, :bid_id => bid.id},
@@ -33,10 +35,19 @@
 			</tr>
 				<tr>
 						<td colspan="2"><span class="font_lighter">
-						<% if bid.homework_type == 1%>							
-							<%= l(:label_x_homework_project, :count => bid.homeworks.count) %>(<strong><%= link_to bid.homeworks.count, project_for_bid_path(bid.id) %></strong>)
+                          <%  @bidding_project = bid.biding_projects.all
+                              @temp = []
+                              @bidding_project.each do |pro|
+                                if pro.project && pro.project.project_status
+                                  @temp << pro
+                                end
+                                @temp
+                             end
+                          %>
+						<% if bid.homework_type == 1%>
+							<%= l(:label_x_homework_project, :count => @temp.count) %>(<strong><%= link_to @temp.count, project_for_bid_path(bid.id) %></strong>)
 						<% else %>
-							<%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></strong>)
+							<%= l(:label_x_homework_project, :count => @temp.count) %>(<strong><%= link_to @temp.count, project_for_bid_path(bid.id) %></strong>)
 						<% end %></span>
 							<span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span>
 				<span style="float: right">

app/views/bids/_list_projects.html.erb

@@ -148,11 +148,12 @@
 						</span></td>
 					</tr>
 					<tr>
-						<td>
+						<td colspan="2">
 						<% if Time.parse(@bid.deadline.to_s) < Time.parse(b_project.created_at.to_s) %>
 							<span class="required">迟交</span>
 						<% end %>
 						</td>
+                        <td align="right"><%= link_to image_tag('delete.png') %></td>
 					</tr>
 				</table>
 				</td>

app/views/bids/show.html.erb

@@ -20,10 +20,6 @@
 			<%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %>
 		<% end %>
 		</div>
-		<span id="praise_tread" style="float: right"> 
-			<%= render :partial => "/praise_tread/praise_tread",
-			:locals => {:obj => @bid,:show_flag => true,:user_id =>User.current.id}%>
-		</span>	
 	</span>
 </div>
 <div style="clear: both;"></div>
@@ -35,6 +31,6 @@
 <div class="pagination" style="float:left;">
 	<ul>
 		<%= pagination_links_full @feedback_pages %>
-		<ul>
-		</div>
+    </ul>
+</div>
 

app/views/bids/show_course.html.erb

@@ -12,7 +12,8 @@
 								<span style="float: right"><%= l(:label_homework) %> (<span class=""><%= link_to (course.homeworks.count), {:controller => 'projects', :action => 'homework', :id => course.identifier} %></span>)
 								&nbsp;&nbsp;&nbsp;
 								<%= l(:label_course_news)%> (<span style="color: #ed8924"><%= link_to (course.news.count), {:controller => 'news', :action => 'index', :project_id => course.identifier} %></span>)
-								</td>
+								</span>
+                            </td>
 						</tr>
 						<tr>
 							<td colspan="2" width="580" >