mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix data vault page issues

Browse Source
This commit is contained in:
Andrew Brown 2020-03-15 12:37:42 -05:00
parent db3e44a347
commit 08bcb53ec9
2 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/data_controller.rb
View File

@ -26,7 +26,7 @@ class DataController < ApplicationController
def discussions
@topics = Thredded::Topic.where(user_id: current_user.id)
@posts = Thredded::Post.where(user_id: current_user.id).includes(:postable)
@posts = Thredded::Post.where(user_id: current_user.id)
@private_topics = Thredded::PrivateTopic.where(user_id: current_user.id)
@private_posts = Thredded::PrivatePost.where(user_id: current_user.id)

42
app/views/data/discussions.html.erb
View File

@ -73,38 +73,33 @@
<div class="card-content grey lighten-4">
<div id="posts-this-week">
<%= area_chart [
{ name: 'New threads', data: current_user.thredded_topics.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: current_user.thredded_posts.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
{ name: 'New threads', data: @topics.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: @posts.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
], download: true
%>
</div>
<div id="posts-this-month" style="display: none">
<%= area_chart [
{ name: 'New threads', data: current_user.thredded_topics.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: current_user.thredded_posts.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
{ name: 'New threads', data: @topics.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: @posts.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
], download: true
%>
</div>
<div id="posts-this-year" style="display: none">
<%= area_chart [
{ name: 'New threads', data: current_user.thredded_topics.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: current_user.thredded_posts.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
{ name: 'New threads', data: @topics.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: @posts.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
], download: true
%>
</div>
<div id="posts-all-time" style="display: none">
<%= area_chart [
{ name: 'New threads', data: current_user.thredded_topics.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: current_user.thredded_posts.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
{ name: 'New threads', data: @topics.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: @posts.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
], download: true
%>
</div>
</div>
<div class="card-content">
<p class="grey-text">
Every field you edit on a page counts as one update. For example, editing a character's age and birthday counts as two updates, even if done at the same time.
</p>
</div>
</div>
</div>
</div>
@ -130,38 +125,33 @@
<div class="card-content grey lighten-4">
<div id="private-this-week">
<%= area_chart [
{ name: 'New threads', data: current_user.thredded_topics.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: current_user.thredded_posts.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
{ name: 'New threads', data: @private_topics.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: @private_posts.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
], download: true
%>
</div>
<div id="private-this-month" style="display: none">
<%= area_chart [
{ name: 'New threads', data: current_user.thredded_topics.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: current_user.thredded_posts.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
{ name: 'New threads', data: @private_topics.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: @private_posts.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
], download: true
%>
</div>
<div id="private-this-year" style="display: none">
<%= area_chart [
{ name: 'New threads', data: current_user.thredded_topics.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: current_user.thredded_posts.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
{ name: 'New threads', data: @private_topics.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: @private_posts.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
], download: true
%>
</div>
<div id="private-all-time" style="display: none">
<%= area_chart [
{ name: 'New threads', data: current_user.thredded_topics.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: current_user.thredded_posts.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
{ name: 'New threads', data: @private_topics.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
{ name: 'Responses', data: @private_posts.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
], download: true
%>
</div>
</div>
<div class="card-content">
<p class="grey-text">
Every field you edit on a page counts as one update. For example, editing a character's age and birthday counts as two updates, even if done at the same time.
</p>
</div>
</div>
</div>
</div>