Merge branch 'master' into aws-eb-master

Energy-Sparks · Jan 23, 2025 · c5b80ba · c5b80ba
2 parents 44da65f + d7db495
commit c5b80ba
Show file tree

Hide file tree

Showing 154 changed files with 6,516 additions and 1,030 deletions.
diff --git a/.ebextensions/cronjob.config b/.ebextensions/cronjob.config
@@ -47,25 +47,20 @@ files:
             55 3 * * * root run-webapp-job data_feeds:meteostat_back_fill
             35 3 * * * root run-webapp-job data_feeds:solar_pv_tuos_back_fill
             #
-            # Import CSV files
-            #
-            30 4 * * * root run-webapp-job amr:asl_copy
-            15 5,22 * * * root run-webapp-job amr:import_all
-            20 4 * * * root run-webapp-job solar:import_rtone_variant_readings
-            #
-            # Import Solar Edge data
+            # Solar Imports
             #
             15 4 * * * root run-webapp-job solar:import_solar_edge_readings
+            20 4 * * * root run-webapp-job solar:import_rtone_variant_readings
+            25 4 * * * root run-webapp-job solar:import_solis_cloud_readings
+            5  5 * * * root run-webapp-job solar:import_low_carbon_hub_readings
             #
-            # Import Low carbon hub data
-            #
-            5 5 * * * root run-webapp-job solar:import_low_carbon_hub_readings
-            #
-            # Import n3rgy readings
+            # AMR Imports
             #
-            0 14 * * * root run-webapp-job amr:import_n3rgy_readings
-            10 14 * * * root run-webapp-job amr:import_n3rgy_tariffs
-            5 3 * * * root run-webapp-job amr:import_perse_readings
+            5  3    * * * root run-webapp-job amr:import_perse_readings
+            30 4    * * * root run-webapp-job amr:asl_copy
+            15 5,22 * * * root run-webapp-job amr:import_all
+            0  14   * * * root run-webapp-job amr:import_n3rgy_readings
+            10 14   * * * root run-webapp-job amr:import_n3rgy_tariffs
             #
             # Start daily regeneration jobs
             #

diff --git a/Gemfile b/Gemfile
@@ -15,6 +15,7 @@ gem 'rack'
 gem 'rack-attack'
 gem 'rack-canonical-host' # Redirect www to root
 gem 'rexml' # ruby 3 related - seems like should be a dependency of bootsnap
+gem 'ruby-limiter'
 gem 'sprockets'
 gem 'stateful_enum' # extends ActiveRecord::Enum with state
 gem 'wisper' # publish subscribe for ruby objects

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -147,20 +147,20 @@ GEM
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1033.0)
-    aws-sdk-core (3.214.1)
+    aws-partitions (1.1040.0)
+    aws-sdk-core (3.216.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-kms (1.97.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.177.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.178.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     backports (3.24.1)
     base64 (0.2.0)
@@ -227,7 +227,7 @@ GEM
     closed_struct (1.0.0)
     cocoon (1.2.15)
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
     connection_pool (2.5.0)
     crack (1.0.0)
       bigdecimal
@@ -260,7 +260,7 @@ GEM
       dotenv (= 3.1.7)
       railties (>= 6.1)
     drb (2.2.1)
-    erb_lint (0.8.0)
+    erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
@@ -377,7 +377,7 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
@@ -483,18 +483,18 @@ GEM
     netrc (0.11.0)
     nio4r (2.7.4)
     nkf (0.2.0)
-    nokogiri (1.18.1)
+    nokogiri (1.18.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.1-aarch64-linux-gnu)
+    nokogiri (1.18.2-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.1-arm-linux-gnu)
+    nokogiri (1.18.2-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.1-arm64-darwin)
+    nokogiri (1.18.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-darwin)
+    nokogiri (1.18.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-linux-gnu)
+    nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -511,7 +511,7 @@ GEM
     packable (1.3.18)
     pagy (9.3.3)
     parallel (1.26.3)
-    parser (3.3.6.0)
+    parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.9)
@@ -665,7 +665,7 @@ GEM
     rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.28.0)
+    rubocop-rails (2.29.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
@@ -685,7 +685,7 @@ GEM
     ruby_parser (3.20.3)
       sexp_processor (~> 4.16)
     rubyvis (0.6.1)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     sanitize (6.1.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -712,9 +712,9 @@ GEM
     scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    scout_apm (5.5.0)
+    scout_apm (5.6.0)
       parser
-    selenium-webdriver (4.27.0)
+    selenium-webdriver (4.28.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -758,7 +758,7 @@ GEM
     terminal-notifier-guard (1.7.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    terser (1.2.4)
+    terser (1.2.5)
       execjs (>= 0.3.0, < 3)
     test-prof (1.4.4)
     text-table (1.2.4)
@@ -893,6 +893,7 @@ DEPENDENCIES
   rubocop-performance
   rubocop-rails
   rubocop-rspec_rails
+  ruby-limiter
   sass-rails
   sassc!
   scenic

diff --git a/app/components/adult_reminders_component/adult_reminders_component.html.erb b/app/components/adult_reminders_component/adult_reminders_component.html.erb
@@ -68,16 +68,30 @@
   <% end %>
 
   <%# i18n-tasks-use t("common.labels.view_now") %>
-  <% add_prompt(id: :audit,
-                check: last_audit&.tasks_remaining?,
-                list: list,
-                status: :neutral,
-                icon: 'laptop',
-                link: 'common.labels.view_now',
-                path: last_audit ? school_audit_path(school, last_audit) : nil) do %>
-    <p>
-      <%= Audits::Progress.new(last_audit).notification %>
-    </p>
+  <% if Flipper.enabled?(:todos, user) %>
+    <% add_prompt(id: :audit,
+                  check: last_audit&.todos_incomplete?,
+                  list: list,
+                  status: :neutral,
+                  icon: 'laptop',
+                  link: 'common.labels.view_now',
+                  path: last_audit ? school_audit_path(school, last_audit) : nil) do %>
+      <p>
+        <%= Completables::Progress.new(last_audit).notification %>
+      </p>
+    <% end %>
+  <% else %>
+    <% add_prompt(id: :audit,
+                  check: last_audit&.tasks_remaining?,
+                  list: list,
+                  status: :neutral,
+                  icon: 'laptop',
+                  link: 'common.labels.view_now',
+                  path: last_audit ? school_audit_path(school, last_audit) : nil) do %>
+      <p>
+        <%= Audits::Progress.new(last_audit).notification %>
+      </p>
+    <% end %>
   <% end %>
 
   <%# i18n-tasks-use t("schools.show.set_target") %>
@@ -128,7 +142,11 @@
                     link: 'common.labels.view_now',
                     path: programme_type_path(programme.programme_type)) do %>
         <p>
-          <%= Programmes::Progress.new(programme).notification %>
+          <% if Flipper.enabled?(:todos, user) %>
+            <%= Completables::Progress.new(programme).notification %>
+          <% else %>
+            <%= Programmes::Progress.new(programme).notification %>
+          <% end %>
         </p>
       <% end %>
     <% end %>

diff --git a/app/components/dashboard_reminders_component.rb b/app/components/dashboard_reminders_component.rb
@@ -27,7 +27,7 @@ def show_data_enabled_features?
   end
 
   def programmes_to_prompt
-    @school.programmes.last_started
+    @school.programmes.active.last_started
   end
 
   private

diff --git a/app/components/prompt_component.rb b/app/components/prompt_component.rb
@@ -21,12 +21,13 @@ class PromptComponent < ApplicationComponent
 
   attr_reader :icon, :style, :fuel_type
 
-  def initialize(id: nil, icon: nil, fuel_type: nil, status: nil, style: :full, classes: '')
+  def initialize(id: nil, icon: nil, fuel_type: nil, status: nil, style: :full, classes: '', always_render: false)
     super(id: id, classes: "#{status} #{classes}")
     @icon = icon
     @fuel_type = fuel_type
     @status = status
     @style = style
+    @always_render = always_render
     validate
   end
 
@@ -35,7 +36,7 @@ def render_icon?
   end
 
   def render?
-    content
+    content || @always_render
   end
 
   def validate

diff --git a/app/components/pupil_reminders_component/pupil_reminders_component.html.erb b/app/components/pupil_reminders_component/pupil_reminders_component.html.erb
@@ -56,7 +56,11 @@
                     link: 'common.labels.view_now',
                     path: programme_type_path(programme.programme_type)) do %>
         <p>
-          <%= Programmes::Progress.new(programme).notification %>
+          <% if Flipper.enabled?(:todos, user) %>
+            <%= Completables::Progress.new(programme).notification %>
+          <% else %>
+            <%= Programmes::Progress.new(programme).notification %>
+          <% end %>
         </p>
       <% end %>
     <% end %>

diff --git a/app/components/toggler_dropdown_component.rb b/app/components/toggler_dropdown_component.rb
@@ -0,0 +1,19 @@
+class TogglerDropdownComponent < ApplicationComponent
+  include ApplicationHelper
+
+  attr_reader :title, :hide
+
+  def initialize(title: nil, hide: true, id: nil, classes: '')
+    super(id: id, classes: classes)
+    @title = title
+    @hide = hide
+  end
+
+  def identifier
+    @identifier ||= SecureRandom.hex
+  end
+
+  def render?
+    content
+  end
+end
diff --git a/app/components/toggler_dropdown_component/toggler_dropdown_component.html.erb b/app/components/toggler_dropdown_component/toggler_dropdown_component.html.erb
@@ -0,0 +1,19 @@
+<% if hide %>
+  <div class="bg-light border rounded py-2 m-4">
+    <div class="col-12 clearfix">
+      <span data-toggle="collapse"
+            href="#target-<%= identifier %>"
+            role="button" aria-expanded="true" aria-controls="target"
+            class="px-2 toggler text-decoration-none collapsed">
+        <%= toggler %>
+        <strong><%= title %></strong>
+      </span>
+
+      <div id='target-<%= identifier %>' class='collapse p-4'>
+        <%= content %>
+      </div>
+    </div>
+  </div>
+<% else %>
+  <%= content %>
+<% end %>
diff --git a/app/controllers/admin/school_groups/users_controller.rb b/app/controllers/admin/school_groups/users_controller.rb
@@ -49,6 +49,11 @@ def produce_csv(school_group, group_admins, school_users)
           csv << [
             'School Group',
             'School',
+            'School type',
+            'School active',
+            'School data enabled',
+            'Funder',
+            'Region',
             'Name',
             'Email',
             'Role',
@@ -73,7 +78,20 @@ def produce_csv(school_group, group_admins, school_users)
       def add_user_to_csv(csv, school_group, school, user)
         csv << [
           school_group.name,
-          school.present? ? school.name : 'N/A',
+          school&.name || '',
+          school&.school_type&.humanize || '',
+          if school
+            school&.active? ? 'Yes' : 'No'
+          else
+            ''
+          end,
+          if school
+            school&.data_enabled? ? 'Yes' : 'No'
+          else
+            ''
+          end,
+          school&.funder&.name || '',
+          school&.region&.to_s&.titleize || '',
           user.name,
           user.pupil? ? 'N/A' : user.email,
           user.role.titleize,

diff --git a/app/controllers/programme_types_controller.rb b/app/controllers/programme_types_controller.rb
@@ -9,6 +9,7 @@ def index
   end
 
   def show
+    route_not_found unless @programme_type.active
   end
 
   private
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ def show_data_enabled_features? @@
       end
       def programmes_to_prompt
-        @school.programmes.last_started
+        @school.programmes.active.last_started
       end
       private
@@ Expand Down @@