diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-17 10:45:25 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-17 10:45:25 +0100 |
commit | b3bf32a21e4dfc43737f50f15d3f258c16d0cf83 (patch) | |
tree | 37daa7d7725d3676115eea2c4d4a215bdd95c06d /app/lib/admin/metrics/measure/resolved_reports_measure.rb | |
parent | 430d4427916b44e6a7c16db1899dfef2eec140fc (diff) | |
parent | 14f436c457560862fafabd753eb314c8b8a8e674 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system.
Diffstat (limited to 'app/lib/admin/metrics/measure/resolved_reports_measure.rb')
-rw-r--r-- | app/lib/admin/metrics/measure/resolved_reports_measure.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/lib/admin/metrics/measure/resolved_reports_measure.rb b/app/lib/admin/metrics/measure/resolved_reports_measure.rb index 0dcecbbad..00cb24f7e 100644 --- a/app/lib/admin/metrics/measure/resolved_reports_measure.rb +++ b/app/lib/admin/metrics/measure/resolved_reports_measure.rb @@ -6,11 +6,11 @@ class Admin::Metrics::Measure::ResolvedReportsMeasure < Admin::Metrics::Measure: end def total - Report.resolved.where(updated_at: time_period).count + Report.resolved.where(action_taken_at: time_period).count end def previous_total - Report.resolved.where(updated_at: previous_time_period).count + Report.resolved.where(action_taken_at: previous_time_period).count end def data @@ -19,8 +19,7 @@ class Admin::Metrics::Measure::ResolvedReportsMeasure < Admin::Metrics::Measure: WITH resolved_reports AS ( SELECT reports.id FROM reports - WHERE action_taken - AND date_trunc('day', reports.updated_at)::date = axis.period + WHERE date_trunc('day', reports.action_taken_at)::date = axis.period ) SELECT count(*) FROM resolved_reports ) AS value |