From e2d775e398506d506f980c26a7a977edca09fabb Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 5 Apr 2021 20:45:40 +0800 Subject: [PATCH] [temp] Add no events happening now in splashpage --- app/controllers/schedules_controller.rb | 2 +- app/views/conferences/show.html.haml | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/controllers/schedules_controller.rb b/app/controllers/schedules_controller.rb index 450dcf32..c037e3ab 100644 --- a/app/controllers/schedules_controller.rb +++ b/app/controllers/schedules_controller.rb @@ -75,7 +75,7 @@ class SchedulesController < ApplicationController respond_to do |format| format.html - format.json { render json: @events_schedules.as_json(root: false, include: :event) } + format.json { render json: @events_schedules.to_json(root: false, include: :event) } end end diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml index 8d24a439..c5529cf0 100644 --- a/app/views/conferences/show.html.haml +++ b/app/views/conferences/show.html.haml @@ -46,7 +46,11 @@ -# happening now events - if @conference.splashpage.include_happening_now - = 'test' + .row + .col-md-12 + #happening_now_panel + %h3.text-center There are no events happening now. + -# calls for content, or program - if @conference.splashpage.include_cfp = render 'call_for_content', conference: @conference, @@ -103,4 +107,9 @@ var renderTemplate = function(data) { console.log(data); console.log("template rendered"); + + for (key in data) { + event_schedule = data[key]; + console.log(event_schedule['event']); + } } \ No newline at end of file