From 1c4f7f99e829d732ea06c0d996f4f5cc3b4bb2a6 Mon Sep 17 00:00:00 2001
From: baiyu <1554253403@qq.com>
Date: Sun, 22 Sep 2013 16:11:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BF=AE=E8=AE=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/bids_controller.rb          | 24 ++++++++++++++++++++-
 app/views/bids/homework_statistics.html.erb |  4 ++++
 app/views/layouts/base_homework.html.erb    |  1 +
 config/locales/zh.yml                       |  3 ++-
 config/routes.rb                            |  1 +
 5 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 app/views/bids/homework_statistics.html.erb

diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index d8f5e15dd..83af48ae4 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -4,12 +4,14 @@ class BidsController < ApplicationController
   menu_item :respond
   menu_item :project, :only => :show_project
   menu_item :homework_respond, :only => :homework_respond
+  menu_item :homework_statistics, :only => :homework_statistics
   #Ended by young
-  before_filter :find_bid, :only => [:show, :show_project, :create, :destroy, :more, :back, :add, :new, :homework_respond, :add_homework]
+  before_filter :find_bid, :only => [:show, :show_project, :create, :destroy, :more, :back, :add, :new, :homework_respond, :add_homework, :homework_statistics]
 
   helper :watchers
   helper :attachments
   include AttachmentsHelper
+  
   def index
     # Modified by nie
     # @requirement_title = "4"
@@ -365,6 +367,26 @@ class BidsController < ApplicationController
     
   end
   
+  # 作业统计
+  def homework_statistics
+    @course = @bid.courses.first
+    @member = []
+    @course.memberships.each do |member|
+      unless (member.roles && Role.where('id = ? ', 3)).empty?
+        @member.push member
+      end
+    end
+    if @bid.homework_type = 1    
+      @student = User.where("id in (select DISTINCT user_id from #{HomeworkAttach.table_name} where bid_id = ? )", @bid.id)
+      @homework_type = true
+    else
+      
+      @homework_type = false
+    end
+    @user = @bid.author
+    render :layout => 'base_homework'
+  end
+  
   def homework_respond
     @user = @bid.author
     render :layout => 'base_homework'
diff --git a/app/views/bids/homework_statistics.html.erb b/app/views/bids/homework_statistics.html.erb
new file mode 100644
index 000000000..9f98364cc
--- /dev/null
+++ b/app/views/bids/homework_statistics.html.erb
@@ -0,0 +1,4 @@
+未交作业人数（
+<% %>）
+
+已交作业人数
\ No newline at end of file
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index 2762a0978..2b7fa7552 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -121,6 +121,7 @@
 								<ul>									
 									<li><%= link_to l(:label_question_student), { :controller => 'bids', :action => 'show' },:class => link_class(:respond)%></li>									
 									<li><%= link_to l(:label_homework_commit), { :controller => 'bids', :action => 'show_project' },:class => link_class(:project)%></li>
+									<!-- <li><%= link_to l(:label_homework_statistics), { :controller => 'bids', :action => 'homework_statistics' },:class => link_class(:homework_statistics)%></li> -->
 									<!-- <li><%= link_to l(:label_homework_respond), { :controller => 'bids', :action => 'homework_respond' },:class => link_class(:homework_respond)%></li>
 								 --><ul>
 							</div>							
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 161b0c5d9..33485a182 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1496,4 +1496,5 @@ zh:
   label_course_new_homework: 新建作业
   label_course_homework_list: 作业列表
   label_course_homework_new: 发布作业
-  label_course_data: 资料
\ No newline at end of file
+  label_course_data: 资料
+  label_homework_statistics: 作业统计
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 4ea23e2b4..f3c5c6701 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -443,6 +443,7 @@ RedmineApp::Application.routes.draw do
   match 'calls/create_bid', :to => 'bids#create_bid'
   match 'calls/create_homework', :to => 'bids#create_homework'
   match 'calls/:id/homework_respond', :to => 'bids#homework_respond'
+  match 'calls/:id/homework_statistics', :to => 'bids#homework_statistics'
   
   post 'join_in/join', :to => 'courses#join', :as => 'join'
   delete 'join_in/join', :to => 'courses#unjoin'