From a87269298457474cc5e27d01644b9d6f1d6f4462 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 11 Aug 2015 14:49:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BAactivities=E8=A1=A8=E6=B7=BB=E5=8A=A0c?=
 =?UTF-8?q?reated=5Fat=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/projects/en.yml                |  6 +++---
 ...0810064247_add_created_at_to_activities.rb |  8 +++++++
 .../20150811010817_update_activities_data.rb  | 21 +++++++++++++++++++
 db/schema.rb                                  | 21 +++++++------------
 4 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 db/migrate/20150810064247_add_created_at_to_activities.rb
 create mode 100644 db/migrate/20150811010817_update_activities_data.rb

diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml
index b142c6ca8..703e0878e 100644
--- a/config/locales/projects/en.yml
+++ b/config/locales/projects/en.yml
@@ -42,10 +42,10 @@ en:
   
   label_member: "Members"
   project_module_attachments: "Resources"
-   label_project_mail_attachments: Project Resources
-    label_project_mail_upload: had uploaded project resources
+  label_project_mail_attachments: "Project Resources"
+  label_project_mail_upload: "had uploaded project resources"
 
-  label_invite: Invitation
+  label_invite: "Invitation"
   label_invite_new_user: "Send email to invite new user"
   label_invite_trustie_user: "Invite the Trustie registered user"
 
diff --git a/db/migrate/20150810064247_add_created_at_to_activities.rb b/db/migrate/20150810064247_add_created_at_to_activities.rb
new file mode 100644
index 000000000..864ed82d6
--- /dev/null
+++ b/db/migrate/20150810064247_add_created_at_to_activities.rb
@@ -0,0 +1,8 @@
+class AddCreatedAtToActivities < ActiveRecord::Migration
+  def up
+  	add_column :activities, :created_at, :timestamp
+  end
+  def end
+  	remove_column :activities, :created_at	
+  end
+end
diff --git a/db/migrate/20150811010817_update_activities_data.rb b/db/migrate/20150811010817_update_activities_data.rb
new file mode 100644
index 000000000..de4a080f2
--- /dev/null
+++ b/db/migrate/20150811010817_update_activities_data.rb
@@ -0,0 +1,21 @@
+class UpdateActivitiesData < ActiveRecord::Migration
+  def up 	
+  	count = Activity.all.count / 10 + 1
+    transaction do
+      for i in 1 ... count do i
+        Activity.all.each do |activity|
+          type = activity.act_type
+          if type=='Contest' || type=='Message' || type=='News'|| type=='Journal'|| type=='Issue'|| type=='Principal'||type=='JournalsForMessage'
+            activity.created_at = activity.act.created_on if activity.act
+          elsif type=='Contestnotification' || type=='HomeworkCommon' || type=='Poll'
+            activity.created_at = activity.act.created_at if activity.act
+          end
+          activity.save
+	  	  end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 30ca29d12..db9b9ff9b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,14 +11,15 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150801034945) do
+ActiveRecord::Schema.define(:version => 20150810064247) 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.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"
@@ -454,13 +455,6 @@ ActiveRecord::Schema.define(:version => 20150801034945) do
 
   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
@@ -863,6 +857,7 @@ ActiveRecord::Schema.define(:version => 20150801034945) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
+    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"