Various reports fixes (#1240)

* Show less months in the dropdown * A bit less top padding for charts * tests for to_s * Adjust month formatting to Mon-Year * Update standard, apply fixes that can auto apply * Ensure we call super so parent classes can initialize This is required to make the latest version of standard happy See rubocop/ruby-style-guide#809 and rubocop/rubocop#8376 for context * More linting fixes * Bump cache versions Just incase the date formatting change happens to mess w/ our cache keys * Fix the keys to match the new period formatting * Updated overview card chart spacing Co-authored-by: claudiovallejo <hola@claudiovallejo.mx>
simpledotorg · Aug 24, 2020 · 33f2a87 · 33f2a87
1 parent 9a262c5
commit 33f2a87
Show file tree

Hide file tree

Showing 38 changed files with 75 additions and 44 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -51,7 +51,7 @@ GEM
     airbrussh (1.4.0)
       sshkit (>= 1.6.1, != 1.7.0)
     arel (9.0.0)
-    ast (2.4.0)
+    ast (2.4.1)
     auto_strip_attributes (2.6.0)
       activerecord (>= 4.0)
     autoprefixer-rails (9.7.6)
@@ -270,11 +270,11 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     orm_adapter (0.5.0)
-    parallel (1.19.1)
+    parallel (1.19.2)
     parallel_tests (2.32.0)
       parallel
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     passenger (6.0.4)
       rack
       rake (>= 0.8.1)
@@ -419,15 +419,19 @@ GEM
     rswag-ui (1.6.0)
       actionpack (>= 3.1, < 6.0)
       railties (>= 3.1, < 6.0)
-    rubocop (0.83.0)
+    rubocop (0.89.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
+    rubocop-performance (1.7.1)
+      rubocop (>= 0.82.0)
     ruby-graphviz (1.2.5)
       rexml
     ruby-progressbar (1.10.1)
@@ -481,9 +485,9 @@ GEM
       net-ssh (>= 2.8.0)
     sshkit-interactive (0.3.0)
       sshkit (~> 1.12)
-    standard (0.4.2)
-      rubocop (~> 0.83.0)
-      rubocop-performance (~> 1.5.2)
+    standard (0.5.1)
+      rubocop (~> 0.89.1)
+      rubocop-performance (~> 1.7.1)
     strong_password (0.0.8)
     thor (0.20.3)
     thread_safe (0.3.6)

diff --git a/app/assets/javascripts/reports.js b/app/assets/javascripts/reports.js
@@ -206,7 +206,7 @@ function createGraphOptions(isStacked, stepSize, suggestedMax, tickCallbackFunct
       padding: {
         left: 0,
         right: 0,
-        top: 48,
+        top: 20,
         bottom: 0
       }
     },
@@ -235,7 +235,7 @@ function createGraphOptions(isStacked, stepSize, suggestedMax, tickCallbackFunct
           maxRotation: 0,
           minRotation: 0,
           autoSkip: true,
-          maxTicksLimit: 10 
+          maxTicksLimit: 10
         }
       }],
       yAxes: [{
@@ -270,7 +270,7 @@ function createGraphOptions(isStacked, stepSize, suggestedMax, tickCallbackFunct
       xPadding: 10,
       yPadding: 10,
       itemSort: function (a, b) {
-        return b.datasetIndex - a.datasetIndex;         
+        return b.datasetIndex - a.datasetIndex;
       },
       callbacks: {
         label: function (tooltipItem, data) {

diff --git a/app/assets/stylesheets/partials/_reports.scss b/app/assets/stylesheets/partials/_reports.scss
@@ -49,6 +49,7 @@
 .pt-4px { padding-top: 4px; }
 .pt-20px { padding-top: 20px; }
 .pt-24px { padding-top: 24px; }
+.pb-4px { padding-bottom: 4px; }
 .pb-8px { padding-bottom: 8px; }
 .pl-16px { padding-left: 16px; }
 .px-1px { padding-right: 1px; padding-left: 1px; }

diff --git a/app/jobs/anonymized_data_download_job.rb b/app/jobs/anonymized_data_download_job.rb
@@ -4,12 +4,12 @@ class AnonymizedDataDownloadJob < ApplicationJob
 
   def perform(recipient_name, recipient_email, model_params_map, model_type)
     case model_type
-    when "district" then
+    when "district"
       AnonymizedData::DownloadService.new.run_for_district(recipient_name,
         recipient_email,
         model_params_map[:district_name],
         model_params_map[:organization_id])
-    when "facility" then
+    when "facility"
       AnonymizedData::DownloadService.new.run_for_facility(recipient_name,
         recipient_email,
         model_params_map[:facility_id])

diff --git a/app/policies/cohort_report/facility_group_policy.rb b/app/policies/cohort_report/facility_group_policy.rb
@@ -3,6 +3,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/cohort_report/facility_policy.rb b/app/policies/cohort_report/facility_policy.rb
@@ -35,6 +35,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/cohort_report/organization_policy.rb b/app/policies/cohort_report/organization_policy.rb
@@ -7,6 +7,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/cohort_report/user_policy.rb b/app/policies/cohort_report/user_policy.rb
@@ -3,6 +3,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/manage/admin/facility_group_policy.rb b/app/policies/manage/admin/facility_group_policy.rb
@@ -3,6 +3,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/manage/admin/facility_policy.rb b/app/policies/manage/admin/facility_policy.rb
@@ -3,6 +3,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/manage/admin/organization_policy.rb b/app/policies/manage/admin/organization_policy.rb
@@ -3,6 +3,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/manage/admin/user_policy.rb b/app/policies/manage/admin/user_policy.rb
@@ -47,6 +47,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/manage/facility/facility_group_policy.rb b/app/policies/manage/facility/facility_group_policy.rb
@@ -9,6 +9,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/manage/facility/facility_policy.rb b/app/policies/manage/facility/facility_policy.rb
@@ -55,6 +55,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/manage/facility/organization_policy.rb b/app/policies/manage/facility/organization_policy.rb
@@ -3,6 +3,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/manage/facility_group_policy.rb b/app/policies/manage/facility_group_policy.rb
@@ -49,6 +49,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/manage/organization_policy.rb b/app/policies/manage/organization_policy.rb
@@ -45,6 +45,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/manage/protocol_drug_policy.rb b/app/policies/manage/protocol_drug_policy.rb
@@ -33,6 +33,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/manage/protocol_policy.rb b/app/policies/manage/protocol_policy.rb
@@ -31,6 +31,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/manage/user/facility_policy.rb b/app/policies/manage/user/facility_policy.rb
@@ -3,6 +3,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/manage/user/user_policy.rb b/app/policies/manage/user/user_policy.rb
@@ -41,6 +41,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/overdue_list/appointment_policy.rb b/app/policies/overdue_list/appointment_policy.rb
@@ -19,6 +19,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/overdue_list/facility_policy.rb b/app/policies/overdue_list/facility_policy.rb
@@ -11,6 +11,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/overdue_list/patient_policy.rb b/app/policies/overdue_list/patient_policy.rb
@@ -7,6 +7,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/policies/overdue_list/patient_summary_policy.rb b/app/policies/overdue_list/patient_summary_policy.rb
@@ -7,6 +7,7 @@ class Scope < Scope
     attr_reader :user, :scope
 
     def initialize(user, scope)
+      super
       @user = user
       @scope = scope
     end

diff --git a/app/queries/my_facilities/missed_visits_query.rb b/app/queries/my_facilities/missed_visits_query.rb
@@ -85,9 +85,9 @@ def total_registrations
 
   def period_list(period, last_n)
     case period
-    when :quarter then
+    when :quarter
       last_n_quarters(n: last_n, inclusive: false)
-    when :month then
+    when :month
       last_n_months(n: last_n, inclusive: false)
         .map { |month| [month.year, month.month] }
     end

diff --git a/app/queries/my_facilities/registrations_query.rb b/app/queries/my_facilities/registrations_query.rb
@@ -35,12 +35,12 @@ def total_registrations
 
   def period_list(period, last_n)
     case period
-      when :quarter then
+      when :quarter
         last_n_quarters(n: last_n, inclusive: true)
-      when :month then
+      when :month
         last_n_months(n: last_n, inclusive: true)
           .map { |month| [month.year, month.month] }
-      when :day then
+      when :day
         last_n_days(n: last_n)
     end
   end

diff --git a/app/services/control_rate_service.rb b/app/services/control_rate_service.rb
@@ -1,5 +1,5 @@
 class ControlRateService
-  CACHE_VERSION = 7
+  CACHE_VERSION = 8
 
   # Can be initialized with _either_ a Period range or a single Period to calculate
   # control rates. We need to handle a single period for calculating point in time benchmarks.

diff --git a/app/services/region_report_service.rb b/app/services/region_report_service.rb
@@ -1,7 +1,7 @@
 class RegionReportService
   include SQLHelpers
   MAX_MONTHS_OF_DATA = 24
-  CACHE_VERSION = 7
+  CACHE_VERSION = 8
 
   def initialize(region:, period:, current_user:, top_region_benchmarks_enabled: false)
     @current_user = current_user

diff --git a/app/views/reports/regions/_header.html.erb b/app/views/reports/regions/_header.html.erb
@@ -49,7 +49,7 @@
         <%= form_for(@period, url: request.params, method: :get, enforce_utf8: false) do |f| %>
           <%= f.hidden_field :type, { id: "dropdown-period-type" } %>
 
-          <% (1..13).each do |num|
+          <% (1..6).each do |num|
               selected = false
               date = Date.current.beginning_of_month.advance(months: -num)
               period = Period.new(type: :month, value: date)