From 4106d684f440e1502cf4101aafe4a2a86826d89a Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Wed, 6 Apr 2016 14:31:26 +0800
Subject: [PATCH] added period

---
 app/controllers/personal_conferences_controller.rb |  4 ++++
 app/models/writing_conference.rb                   | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index 9efd224..fa1eb83 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -39,6 +39,8 @@ class PersonalConferencesController < ApplicationController
           t << {"value" => (writing_conference.send(fs).strftime("%Y/%m/%d") rescue "")}
         when "author_type"
           t << {"value" => (writing_conference.conference_author_types.collect{|cat| cat.title}.join(", ") rescue "")}
+        when "period"
+          t << {"value" => writing_conference.duration}
         else
           t << {"value" => writing_conference.send(fs)}
         end
@@ -76,6 +78,7 @@ class PersonalConferencesController < ApplicationController
       "location", 
       "period_start_date", 
       "period_end_date", 
+      "period",
       "paper_type",
       "paper_level",
       "sponsor", 
@@ -103,6 +106,7 @@ class PersonalConferencesController < ApplicationController
       "location", 
       "period_start_date", 
       "period_end_date", 
+      "period",
       "paper_type",
       "paper_level",
       "sponsor", 
diff --git a/app/models/writing_conference.rb b/app/models/writing_conference.rb
index 6a78d3a..4cfc929 100644
--- a/app/models/writing_conference.rb
+++ b/app/models/writing_conference.rb
@@ -64,6 +64,14 @@ class WritingConference
 
     title.join(', ') 
   end
+
+  def duration
+    if !self.send('period_start_date').nil? or !self.send('period_end_date').nil?
+      date = (self.send('period_start_date').strftime('%Y.%m.%d') rescue "")+' ~ '+(self.send('period_end_date').strftime('%Y.%m.%d') rescue I18n.t('personal_project.up_to_today'))
+    else
+      date = ""
+    end
+  end
   
 
   def self.get_plugin_datas_to_member(datas)
@@ -121,6 +129,8 @@ class WritingConference
               pd_data << {"data_title" => ( !p.conference_paper_levels.blank? ? p.conference_paper_levels.collect{|x| x.title}.join(', ') : "")}
             when "author_type"
               pd_data << {"data_title" => (p.conference_author_types.collect{|cat| cat.title}.join(", ") rescue "")}
+            when "period"
+              pd_data << {"data_title" => p.duration}
             else
               pd_data << { "data_title" => p.send(t) }
           end