From c86af5f483e66f624ebdeb89f4650f796526a1bb Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 4 Apr 2014 11:17:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8Eshow=5Fapplication=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E7=9A=84=E6=89=80=E6=9C=89=E5=86=85=E5=AE=B9=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?show=5Fsoftapplication=EF=BC=8C=E4=BB=A5=E9=98=B2=E5=92=8C?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=AD=E7=9A=84application=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/contests_controller.rb        |   6 +-
 app/views/contests/_application_list.html.erb |  15 --
 app/views/contests/show_application.html.erb  |  67 -------
 app/views/layouts/base_newcontest.html.erb    |   2 +-
 app/views/welcome/contest.html.erb            |   2 +-
 config/routes.rb                              |   5 +-
 db/schema.rb                                  | 175 +++++++++++-------
 lib/redmine.rb                                |   2 +-
 8 files changed, 118 insertions(+), 156 deletions(-)
 delete mode 100644 app/views/contests/_application_list.html.erb
 delete mode 100644 app/views/contests/show_application.html.erb

diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb
index 39e9a2053..f65686628 100644
--- a/app/controllers/contests_controller.rb
+++ b/app/controllers/contests_controller.rb
@@ -3,8 +3,8 @@
 class ContestsController < ApplicationController
   menu_item :respond                
   menu_item :project, :only => :show_project
-  menu_item :application, :only => :show_application
-  before_filter :find_contest, :only => [:show_contest, :show_project, :show_application, :create,:destroy,:more,:back,:add,:new,:show_results, :set_reward,
+  menu_item :application, :only => :show_softapplication
+  before_filter :find_contest, :only => [:show_contest, :show_project, :show_softapplication, :create,:destroy,:more,:back,:add,:new,:show_results, :set_reward,
                 :show_contest_project, :show_contest_user, :join_in_contest, :unjoin_in_contest, :new_join,:show_participator, :settings]
               
   # added by fq
@@ -218,7 +218,7 @@ class ContestsController < ApplicationController
   end 
   ############
   ##显示参赛的应用
-  def show_application
+  def show_softapplication
     respond_to do |format|
       format.html {
         render :layout => 'base_newcontest'
diff --git a/app/views/contests/_application_list.html.erb b/app/views/contests/_application_list.html.erb
deleted file mode 100644
index 4d79e1251..000000000
--- a/app/views/contests/_application_list.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- fq -->
-<%= render_flash_messages %>
-
-	<table width="100%" border="0" style="padding-left: 15px">
-		<td width="15%" class="font_lighter" style="font-size: 15px;"><%= l(:label_bidding_project) %></td>  <!--标注参与项目及数量-->
-		<% if User.current.logged? %>
-			<td width="85%">
-				<div class='icon icon-add'>  <!--标注我要参加及添加图标-->
-					<%= toggle_link l(:button_contesting_as_application), 'put-bid-form' %>
-				</div>
-			</td>
-		<% end %>
-	</table>
-
-<%#= render :partial=> "list_projects" %>
diff --git a/app/views/contests/show_application.html.erb b/app/views/contests/show_application.html.erb
deleted file mode 100644
index da06a7cb0..000000000
--- a/app/views/contests/show_application.html.erb
+++ /dev/null
@@ -1,67 +0,0 @@
-
-<style>
-	input[type="submit"].contest_btn {
-		vertical-align: middle;
-		width: 60px;
-		height: 30px;
-		line-height: 18px;
-		font-size: 14px;
-		color: rgb(0, 0, 0);
-		background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
-		padding: 0px 0px 4px 0px;
-		border-radius: 2px;
-		border: 1px solid rgb(148, 148, 148);
-		box-shadow: none;
-		text-shadow: none;
-		margin-top: -10px;
-		/*margin-right: -4px;*/
-	}
-	input[type="button"].contest_btn {
-		width: 60px;
-		height: 30px;
-		line-height: 18px;
-		font-size: 14px;
-		color: rgb(0, 0, 0);
-		background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
-		padding: 0px 0px 4px 0px;
-		border-radius: 2px;
-		border: 1px solid rgb(148, 148, 148);
-		box-shadow: none;
-		text-shadow: none;
-		margin-top: -10px;
-		margin-right: -2px;
-	}
-	textarea:focus {
-		border: #d5dee9 1px solid;
-	}
-</style>
-
-<script type="text/javascript" language="javascript">
-	function clearInfo(id,content) {
-		var text = $('#' + id);
-		if (text.val() == content) {
-			$('#' + id).val('');
-		}
-	}
-
-	function showInfo(id,content) {
-		var text = $('#' + id);
-		if (text.val() == '') {
-			$('#' + id).val(content);
-		}
-	}
-
-	function cancel() {
-		$("#put-bid-form").hide();
-	}
-</script>
-
-	<% if User.current.logged? %>
-<!--我要竞标弹出框-->
-		<div id = 'flash' style="float:left; width: 100%; display: none" ></div>
-
-	<% end %>
-	<div id='bidding_project_list'>
-	<%= render :partial => 'application_list' %>
-	</div>
-
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 1b3a99966..f41969ea4 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -92,7 +92,7 @@
 												<%=link_to "#{@contest.projects.where('is_public=1').count}", :controller => 'contests', :action => 'show_project' %>
 											</td>	
 											<td class="font_index">
-												<%=link_to "#{@contest.projects.where('is_public=1').count}", :controller => 'contests', :action => 'show_application' %>
+												<%=link_to "#{@contest.projects.where('is_public=1').count}", :controller => 'contests', :action => 'show_softapplication' %>
 											</td>																															
 										<tr class="font_aram">
 											<td align="center" width="70px"> <%= l(:label_participate) %></td> 										
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 222ff7dc6..cbc035b42 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -112,7 +112,7 @@
 	<div style="clear:both"></div>
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
-<h3 style="margin-left: 5px; color: #e8770d;"><strong>热门项目</strong></h3>
+<h3 style="margin-left: 5px; color: #e8770d;"><strong>热门项目</strong></h3>  
 	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", { :controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain}, :target => "_blank"  %></span>
 	<div class="d-p-projectlist-box">
 		<ul class="d-p-projectlist">
diff --git a/config/routes.rb b/config/routes.rb
index 7a782449b..181ecb0e0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,6 +16,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 RedmineApp::Application.routes.draw do
+  resources :softapplications
+
+
   ## new added by linchun #新竞赛相关
   resources :contests, only: [:index] do
     collection do
@@ -30,7 +33,7 @@ RedmineApp::Application.routes.draw do
       match 'update_contest'      , via: [:put]
       match 'show_contest'        , via: :get
       match 'show_project'        , via: :get
-      match 'show_application'    , via: :get
+      match 'show_softapplication'    , via: :get
       match 'show_participator'   , via: :get
       match 'add'                 , via: [:get, :post]
       match 'create'              , via: :post
diff --git a/db/schema.rb b/db/schema.rb
index 8c6085547..dab01aede 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,15 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140320022724) do
-
-  create_table "a_user_watchers", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "member_id"
-  end
+ActiveRecord::Schema.define(:version => 20140404030103) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -31,6 +23,11 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
   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 "andoidcontests", :force => true do |t|
+    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
@@ -165,6 +162,28 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
   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 "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 "contests", :force => true do |t|
+    t.string   "name"
+    t.integer  "budget"
+    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 "courses", :force => true do |t|
     t.integer  "tea_id"
     t.string   "name"
@@ -303,9 +322,9 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
   add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
 
   create_table "issue_relations", :force => true do |t|
-    t.integer "issue_from_id", :null => false
-    t.integer "issue_to_id",   :null => false
-    t.string  "relation_type", :null => false
+    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
 
@@ -362,6 +381,13 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
   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"
@@ -473,22 +499,6 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
   add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
 
-  create_table "messages_for_bids", :force => true do |t|
-    t.string   "message"
-    t.integer  "user_id"
-    t.integer  "bid_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "messages_for_users", :force => true do |t|
-    t.integer  "messager_id"
-    t.integer  "user_id"
-    t.string   "message"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",          :limit => 60, :default => "", :null => false
@@ -518,6 +528,19 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
     t.string  "salt",       :null => false
   end
 
+  create_table "open_source_projects", :force => true do |t|
+    t.string   "name"
+    t.string   "description",      :default => ""
+    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 "praise_tread_caches", :force => true do |t|
     t.integer  "object_id",   :null => false
     t.string   "object_type"
@@ -548,23 +571,11 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
     t.integer "watchers_count"
     t.integer "project_id"
     t.integer "project_type"
-    t.integer "gitlab_group_id",  :limit => 8
-    t.float   "grade",                         :default => 0.0
-    t.integer "course_ac_para",                :default => 0
+    t.float   "grade",            :default => 0.0
+    t.integer "course_ac_para",   :default => 0
   end
 
-  add_index "project_statuses", ["changesets_count"], :name => "index_project_statuses_on_changesets_count"
   add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
-  add_index "project_statuses", ["watchers_count"], :name => "index_project_statuses_on_watchers_count"
-
-  create_table "project_tags", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "tag_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "user_id"
-  end
 
   create_table "projects", :force => true do |t|
     t.string   "name",            :default => "",    :null => false
@@ -609,19 +620,33 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
   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_memos", :force => true do |t|
+    t.integer  "osp_id",                           :null => false
+    t.integer  "parent_id"
+    t.string   "subject",                          :null => false
+    t.text     "content",                          :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
+  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.integer "project_id",                  :default => 0,     :null => false
+    t.string  "url",                         :default => "",    :null => false
+    t.string  "login",         :limit => 60, :default => ""
+    t.string  "password",                    :default => ""
+    t.string  "root_url",                    :default => ""
     t.string  "type"
-    t.string  "path_encoding",  :limit => 64
-    t.string  "log_encoding",   :limit => 64
+    t.string  "path_encoding", :limit => 64
+    t.string  "log_encoding",  :limit => 64
     t.text    "extra_info"
     t.string  "identifier"
-    t.boolean "is_default",                   :default => false
-    t.string  "git_project_id"
+    t.boolean "is_default",                  :default => false
   end
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
@@ -642,6 +667,26 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "seems_rateable_cached_ratings", :force => true do |t|
+    t.integer  "cacheable_id",   :limit => 8
+    t.string   "cacheable_type"
+    t.float    "avg",                         :null => false
+    t.integer  "cnt",                         :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+  create_table "seems_rateable_rates", :force => true do |t|
+    t.integer  "rater_id",      :limit => 8
+    t.integer  "rateable_id"
+    t.string   "rateable_type"
+    t.float    "stars",                      :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
   create_table "settings", :force => true do |t|
     t.string   "name",       :default => "", :null => false
     t.text     "value"
@@ -652,9 +697,9 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
 
   create_table "shares", :force => true do |t|
     t.date     "created_on"
-    t.string   "title"
-    t.string   "share_type"
     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"
@@ -662,10 +707,15 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
     t.string   "description"
   end
 
-  create_table "students", :force => true do |t|
+  create_table "softapplications", :force => true do |t|
     t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.string   "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
   end
 
   create_table "students_for_courses", :force => true do |t|
@@ -726,7 +776,7 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
   create_table "tokens", :force => true do |t|
     t.integer  "user_id",                  :default => 0,  :null => false
     t.string   "action",     :limit => 30, :default => "", :null => false
-    t.string   "value",      :limit => 40
+    t.string   "value",      :limit => 40, :default => "", :null => false
     t.datetime "created_on",                               :null => false
   end
 
@@ -752,13 +802,12 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
     t.integer  "zip_code"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
-    t.integer  "identity"
     t.string   "technical_title"
+    t.integer  "identity"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
     t.string   "location_city"
-    t.string   "git_token"
   end
 
   create_table "user_grades", :force => true do |t|
@@ -795,14 +844,6 @@ ActiveRecord::Schema.define(:version => 20140320022724) do
   add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
   add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
 
-  create_table "user_tags", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "tag_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
   create_table "users", :force => true do |t|
     t.string   "login",                           :default => "",    :null => false
     t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
diff --git a/lib/redmine.rb b/lib/redmine.rb
index cce178a55..88d6f73ee 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -280,7 +280,7 @@ end
 Redmine::MenuManager.map :contest_menu do |menu|
   menu.push :respond, :show_contest_contest_path, :caption => :label_user_response
   menu.push :project, :show_project_contest_path, :caption => :label_contest_project
-  menu.push :application, :show_application_contest_path, :caption => :label_contest_application
+  menu.push :application, :show_softapplication_contest_path, :caption => :label_contest_application
   # menu.push :result,  { :controller => 'bids', :action => 'show_results' }, 
              # :caption => :label_bidding_results,:if => Proc.new{ |p| User.current.id == p } 
 end