From 018bbff7b8c0143d46cc7e730ddb5699ae8e763a Mon Sep 17 00:00:00 2001 From: Jimmy Date: Fri, 12 Mar 2021 10:38:47 -0800 Subject: [PATCH] implementation in progress --- app/controllers/conferences_controller.rb | 8 ++++++++ app/models/conference.rb | 2 +- app/models/event.rb | 2 +- config/routes.rb | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index 02d869f4..682f0858 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -112,6 +112,14 @@ class ConferencesController < ApplicationController end end + def live_events + conference = Conference.find_by(short_title: params[:conference_id]) + temp = conference.find_live_events + p "TESTTEST" + p temp.size() + p temp.to_json() + end + private def conference_finder_conditions diff --git a/app/models/conference.rb b/app/models/conference.rb index 581f4839..0b9aeded 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -784,7 +784,7 @@ class Conference < ApplicationRecord end_date < Time.current end - def find_live_events() + def find_live_events live_events = [] for event in program.events if event.is_live? diff --git a/app/models/event.rb b/app/models/event.rb index 23014f84..c418b77c 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -338,7 +338,7 @@ class Event < ApplicationRecord end def is_live? - start_time >= Time.now && Time.now <= start_time + event_type.length + time() >= Time.now && Time.now <= time() + event_type.length end private diff --git a/config/routes.rb b/config/routes.rb index e2332ce2..fdbd73b7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -154,6 +154,8 @@ Osem::Application.routes.draw do end end resources :conferences, only: [:index, :show] do + get 'live_events', to: 'conferences#live_events' + resources :booths do member do patch :withdraw