diff --git a/app/models/activity.rb b/app/models/activity.rb
index 225182d..3a87880 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -13,6 +13,8 @@ class Activity
field :activity_name, as: :slug_title, type: String, localize: true
field :activity_organizer, type: String, localize: true
field :activity_area, type: String, localize: true
+ field :activity_type, type: String, localize: true
+ field :participation_status, type: String, localize: true
# Basic
field :year, type: String
@@ -44,7 +46,9 @@ class Activity
fields_to_show = [
"attendee",
"activity_name",
+ "activity_type",
"activity_organizer",
+ "participation_status",
"activity_area",
"activity_start_date",
"activity_end_date"
@@ -104,6 +108,10 @@ class Activity
value = self.activity_end_date.strftime('%Y-%m-%d') rescue ''
when 'year'
value = self.year rescue ''
+ when 'activity_type'
+ value = self.activity_type rescue ''
+ when 'participation_status'
+ value = self.participation_status rescue ''
when 'note'
value = self.note rescue ''
when "file"
diff --git a/app/views/admin/activities/_form.html.erb b/app/views/admin/activities/_form.html.erb
index dc984cc..6694dc4 100644
--- a/app/views/admin/activities/_form.html.erb
+++ b/app/views/admin/activities/_form.html.erb
@@ -64,6 +64,26 @@
<% end %>
+
+
+
+
+
+
<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7a8150b..9f6b911 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -7,7 +7,9 @@ en:
participant: "Participant"
year: "Year"
activity_name: "Activity Name"
+ activity_type: "Activity Type"
activity_organizer: "Organizer"
+ participation_status: "Participation Status"
activity_area: "Area"
activity_start_date: "Start Date"
activity_end_date: "End Date"
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index a31fc1c..ca955b6 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -7,7 +7,9 @@ zh_tw:
participant: "參與人"
year: "年度"
activity_name: "活動名稱"
+ activity_type: "活動類型"
activity_organizer: "活動組織"
+ participation_status: "參與情形"
activity_area: "地點"
activity_start_date: "開始時間"
activity_end_date: "結束時間"
diff --git a/modules/personal_activity/index.html.erb b/modules/personal_activity/index.html.erb
index 6f6d760..4542a4d 100644
--- a/modules/personal_activity/index.html.erb
+++ b/modules/personal_activity/index.html.erb
@@ -4,18 +4,22 @@
| {{year}} |
{{activity_name}} |
+ {{activity_type}} |
{{activity_organizer}} |
+ {{participation_status}} |
{{activity_area}} |
{{activity_start_date}} |
{{activity_end_date}} |
- {{note}} |
+ {{note}} |
| {{year}} |
{{activity_name}} |
+ {{activity_type}} |
{{activity_organizer}} |
+ {{participation_status}} |
{{activity_area}} |
{{activity_start_date}} |
{{activity_end_date}} |