Merge pull request #34 from offthread/development

Fixing datetime for events
offthread · Jun 12, 2016 · 4885c68 · 4885c68
2 parents dd74d63 + 71ead54
commit 4885c68
Show file tree

Hide file tree

Showing 5 changed files with 206 additions and 107 deletions.
diff --git a/app/controllers/telegram_webhooks_controller.rb b/app/controllers/telegram_webhooks_controller.rb
@@ -163,13 +163,11 @@ def getShowsFormatted(shows, dateFormatted)
     responseMessage = t(:shows_title_message, :dateFormatted => dateFormatted, :weekDay => weekDayStr)
     shows.each do |show|
       responseMessage += t(:event_title, :eventTitle => show.name)
-
+      responseMessage +=  t(:event_time, :eventTime => show.hour)
+
       eventConfirmed = show.is_confirmed ? t(:confirmed) : t(:not_confirmed)
       responseMessage +=  t(:event_confirmed, :eventConfirmed => eventConfirmed)
       responseMessage +=  t(:event_band_info, :moreInfo => show.link_band)
-
-      showTime = show.date.strftime("%H:%M")
-      responseMessage +=  t(:event_time, :eventTime => showTime)
     end
     responseMessage += END_STREAM_STRING
 

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
@@ -4,8 +4,8 @@ pt-BR:
 
   event_title          : "-> %{eventTitle}\n"
   event_confirmed      : "- Evento confirmado: %{eventConfirmed}\n"
-  event_band_info      : "- Informações da banda: %{moreInfo}\n"
-  event_time           : "- Início estimado: %{eventTime}\n\n"
+  event_band_info      : "- Informações da banda: %{moreInfo}\n\n"
+  event_time           : "- Início estimado: %{eventTime}\n"
 
   confirmed            : "Sim"
   not_confirmed        : "Não"

diff --git a/db/migrate/20160515171902_create_shows.rb b/db/migrate/20160515171902_create_shows.rb
@@ -5,7 +5,7 @@ def change
       t.datetime :date
       t.boolean :is_confirmed
       t.string :link_band
-
+      t.string :hour
       t.timestamps null: false
     end
   end

diff --git a/db/schema.rb b/db/schema.rb
@@ -18,6 +18,7 @@
     t.datetime "date"
     t.boolean  "is_confirmed"
     t.string   "link_band"
+    t.string   "hour"
     t.datetime "created_at",   null: false
     t.datetime "updated_at",   null: false
   end