From 89d78e54018afb4624f126cad5e3363d1c352265 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 12 Dec 2024 15:28:44 +0100 Subject: [PATCH] render different reports in partials --- .../discourse_rewind/rewind/action/reading_time.rb | 4 ++-- .../discourse_rewind/rewinds/_posting-calendar.html.erb | 1 + .../discourse_rewind/rewinds/_reading-time.html.erb | 1 + app/views/discourse_rewind/rewinds/show.html.erb | 9 +-------- 4 files changed, 5 insertions(+), 10 deletions(-) create mode 100644 app/views/discourse_rewind/rewinds/_posting-calendar.html.erb create mode 100644 app/views/discourse_rewind/rewinds/_reading-time.html.erb diff --git a/app/services/discourse_rewind/rewind/action/reading_time.rb b/app/services/discourse_rewind/rewind/action/reading_time.rb index 787c59c..e70019d 100644 --- a/app/services/discourse_rewind/rewind/action/reading_time.rb +++ b/app/services/discourse_rewind/rewind/action/reading_time.rb @@ -8,7 +8,7 @@ module DiscourseRewind option :date def call - reading_time = UserVisit.where(user: user).where(visited_at: date).sum(:time_read) + reading_time = UserVisit.where(user_id: user.id).where(visited_at: date).sum(:time_read) { data: { @@ -41,7 +41,7 @@ module DiscourseRewind "And Then There Were None" => 16_200, "The Alchemist" => 10_800, "The Hitchhiker's Guide to the Galaxy" => 12_600, - } + }.symbolize_keys end def best_book_fit(reading_time) diff --git a/app/views/discourse_rewind/rewinds/_posting-calendar.html.erb b/app/views/discourse_rewind/rewinds/_posting-calendar.html.erb new file mode 100644 index 0000000..de0ffec --- /dev/null +++ b/app/views/discourse_rewind/rewinds/_posting-calendar.html.erb @@ -0,0 +1 @@ +POSTING CALENDAR diff --git a/app/views/discourse_rewind/rewinds/_reading-time.html.erb b/app/views/discourse_rewind/rewinds/_reading-time.html.erb new file mode 100644 index 0000000..fb26637 --- /dev/null +++ b/app/views/discourse_rewind/rewinds/_reading-time.html.erb @@ -0,0 +1 @@ +READING TIME diff --git a/app/views/discourse_rewind/rewinds/show.html.erb b/app/views/discourse_rewind/rewinds/show.html.erb index ca5e6a3..1bd5823 100644 --- a/app/views/discourse_rewind/rewinds/show.html.erb +++ b/app/views/discourse_rewind/rewinds/show.html.erb @@ -16,14 +16,7 @@
<%- @reports.each do |report| %> -
-
- <%= report[:identifier] %> -
-
- <%= report[:data][:count] %> -
-
+ <%= render report[:identifier] %> <%- end %>