From fc1689cf2e8e0fe02608588f1aa59618d838e5bf Mon Sep 17 00:00:00 2001 From: Du Peng Date: Wed, 27 Sep 2023 12:39:04 +0200 Subject: [PATCH 1/2] (bug) unable to generate stats --- CHANGELOG.md | 4 ++++ app/services/statistics/builder_service.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index caa42abbc..4fbc0728b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog Fab-manager +- Fix a bug: unable to generate statistic +- [TODO DEPLOY] `rails fablab:es:build_stats` +- [TODO DEPLOY] `rails fablab:maintenance:regenerate_statistics[2023,6]` + ## v6.1.0 2023 September 25 - improves api/notification controller to avoid failing when there is a notification with wrong notification_type in db diff --git a/app/services/statistics/builder_service.rb b/app/services/statistics/builder_service.rb index 9e84eb697..60fcc57d2 100644 --- a/app/services/statistics/builder_service.rb +++ b/app/services/statistics/builder_service.rb @@ -17,7 +17,7 @@ class Statistics::BuilderService private def default_options - yesterday = Time.current + yesterday = 1.day.ago { start_date: yesterday.beginning_of_day, end_date: yesterday.end_of_day From 13ff17cdea352b156a75409719630dd659f840c2 Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 27 Sep 2023 15:36:00 +0200 Subject: [PATCH 2/2] (ui) Fix projects grid button --- app/frontend/src/stylesheets/modules/projects/projects.scss | 4 ++++ app/frontend/templates/projects/index.html | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/frontend/src/stylesheets/modules/projects/projects.scss b/app/frontend/src/stylesheets/modules/projects/projects.scss index b8ce90a45..cc69f474c 100644 --- a/app/frontend/src/stylesheets/modules/projects/projects.scss +++ b/app/frontend/src/stylesheets/modules/projects/projects.scss @@ -39,6 +39,10 @@ grid-template-columns: repeat(auto-fill, minmax(290px, 1fr)); gap: 3.2rem; & > span { grid-column: 1/-1;} + & > a { + grid-column: 1/-1; + justify-self: center; + } } @media (min-width: 1200px) { diff --git a/app/frontend/templates/projects/index.html b/app/frontend/templates/projects/index.html index fde57a138..b2bde70ed 100644 --- a/app/frontend/templates/projects/index.html +++ b/app/frontend/templates/projects/index.html @@ -126,8 +126,7 @@

{{project.name}}

{{ project.app_name }} - - {{ 'app.public.projects_list.load_next_projects' }} + {{ 'app.public.projects_list.load_next_projects' }}