Merge pull request #33 from offthread/development

Fixing events and including show time
offthread · Jun 11, 2016 · dd74d63 · dd74d63
2 parents 78cd9a3 + d1980e1
commit dd74d63
Show file tree

Hide file tree

Showing 6 changed files with 217 additions and 131 deletions.
diff --git a/app/controllers/telegram_webhooks_controller.rb b/app/controllers/telegram_webhooks_controller.rb
@@ -167,6 +167,9 @@ def getShowsFormatted(shows, dateFormatted)
       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/en.yml b/config/locales/en.yml
@@ -5,6 +5,7 @@ en:
   event_title          : "-> %{eventTitle}\n"
   event_confirmed      : "- Event confirmed: %{eventConfirmed}\n"
   event_band_info      : "- Band info: %{moreInfo}\n"
+  event_time           : "- Estimated time: %{eventTime}\n\n"
 
   confirmed            : "Yes"
   not_confirmed        : "No"

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

diff --git a/db/migrate/20160515171902_create_shows.rb b/db/migrate/20160515171902_create_shows.rb
@@ -2,7 +2,7 @@ class CreateShows < ActiveRecord::Migration
   def change
     create_table :shows do |t|
 	  t.string :name
-      t.date :date
+      t.datetime :date
       t.boolean :is_confirmed
       t.string :link_band
 

diff --git a/db/schema.rb b/db/schema.rb
@@ -15,7 +15,7 @@
 
   create_table "shows", force: :cascade do |t|
     t.string   "name"
-    t.date     "date"
+    t.datetime "date"
     t.boolean  "is_confirmed"
     t.string   "link_band"
     t.datetime "created_at",   null: false