Merge branch 'main' into dependabot/bundler/sqlite3-2.8.0

Author: stefan-burke

app/controllers/pat_assessments_controller.rb

@@ -0,0 +1,5 @@
+# typed: false
+
+class PatAssessmentsController < ApplicationController
+  include AssessmentController
+end

app/models/assessments/pat_assessment.rb

@@ -0,0 +1,16 @@
+# typed: true
+# frozen_string_literal: true
+
+class Assessments::PatAssessment < ApplicationRecord
+  extend T::Sig
+  include AssessmentLogging
+  include AssessmentCompletion
+  include FormConfigurable
+  include ValidationConfigurable
+
+  self.primary_key = "inspection_id"
+
+  belongs_to :inspection
+
+  after_update :log_assessment_update, if: :saved_changes?
+end

app/models/inspection.rb

@@ -53,7 +53,8 @@ class Inspection < ApplicationRecord
 
   enum :inspection_type, {
     bouncy_castle: "BOUNCY_CASTLE",
-    bouncing_pillow: "BOUNCING_PILLOW"
+    bouncing_pillow: "BOUNCING_PILLOW",
+    pat_testable: "PAT_TESTABLE"
   }
 
   CASTLE_ASSESSMENT_TYPES = {
@@ -70,8 +71,14 @@ class Inspection < ApplicationRecord
     fan_assessment: Assessments::FanAssessment
   }.freeze
 
+  PAT_TESTABLE_ASSESSMENT_TYPES = {
+    pat_assessment: Assessments::PatAssessment
+  }.freeze
+
   ALL_ASSESSMENT_TYPES =
-    CASTLE_ASSESSMENT_TYPES.merge(PILLOW_ASSESSMENT_TYPES).freeze
+    CASTLE_ASSESSMENT_TYPES
+      .merge(PILLOW_ASSESSMENT_TYPES)
+      .merge(PAT_TESTABLE_ASSESSMENT_TYPES).freeze
 
   USER_EDITABLE_PARAMS = %i[
     has_slide
@@ -218,15 +225,19 @@ def complete?
 
   sig { returns(T::Hash[Symbol, T.class_of(ApplicationRecord)]) }
   def assessment_types
-    bouncing_pillow? ? PILLOW_ASSESSMENT_TYPES : CASTLE_ASSESSMENT_TYPES
+    case
+    when pat_testable? then PAT_TESTABLE_ASSESSMENT_TYPES
+    when bouncing_pillow? then PILLOW_ASSESSMENT_TYPES
+    else CASTLE_ASSESSMENT_TYPES
+    end
   end
 
   sig { returns(T::Hash[Symbol, T.class_of(ApplicationRecord)]) }
   def applicable_assessments
-    if bouncing_pillow?
-      pillow_applicable_assessments
-    else
-      castle_applicable_assessments
+    case
+    when pat_testable? then pat_testable_applicable_assessments
+    when bouncing_pillow? then pillow_applicable_assessments
+    else castle_applicable_assessments
     end
   end
 
@@ -253,6 +264,11 @@ def pillow_applicable_assessments
     PILLOW_ASSESSMENT_TYPES
   end
 
+  sig { returns(T::Hash[Symbol, T.class_of(ApplicationRecord)]) }
+  def pat_testable_applicable_assessments
+    PAT_TESTABLE_ASSESSMENT_TYPES
+  end
+
   public
 
   # Iterate over only applicable assessments with a block
@@ -279,7 +295,7 @@ def applicable_tabs
     applicable = applicable_assessments.keys.map { |k| k.to_s.chomp("_assessment") }
 
     # Add tabs in the correct UI order
-    ordered_tabs = %w[user_height slide structure anchorage materials fan enclosed]
+    ordered_tabs = %w[user_height slide structure anchorage materials fan enclosed pat]
     ordered_tabs.each do |tab|
       tabs << tab if applicable.include?(tab)
     end
@@ -293,10 +309,14 @@ def applicable_tabs
   # Advanced methods
   sig { returns(T::Boolean) }
   def can_be_completed?
-    unit.present? &&
+    base_requirements_met = unit.present? &&
       all_assessments_complete? &&
       !passed.nil? &&
-      inspection_date.present? &&
+      inspection_date.present?
+
+    return base_requirements_met if pat_testable?
+
+    base_requirements_met &&
       width.present? &&
       length.present? &&
       height.present? &&
@@ -396,8 +416,12 @@ def field_label(form, field)
 
   sig { returns(T::Array[Symbol]) }
   def inspection_tab_incomplete_fields
-    # Fields required for the inspection tab specifically (excludes passed which is on results tab)
+    # Excludes passed which is on results tab
     fields = REQUIRED_TO_COMPLETE_FIELDS - [:passed]
+
+    # PAT testable only needs inspection_date
+    fields = fields & [:inspection_date] if pat_testable?
+
     fields
       .reject { |f| f.end_with?("_comment") }
       .select { |f| send(f).nil? }
@@ -526,6 +550,7 @@ def assessment_validation_data
       enclosed
       fan
       materials
+      pat
       slide
       structure
       user_height

app/models/unit.rb

@@ -38,7 +38,8 @@ class Unit < ApplicationRecord
 
   enum :unit_type, {
     bouncy_castle: "BOUNCY_CASTLE",
-    bouncing_pillow: "BOUNCING_PILLOW"
+    bouncing_pillow: "BOUNCING_PILLOW",
+    pat_testable: "PAT_TESTABLE"
   }
 
   belongs_to :user

app/views/units/_form.html.erb

@@ -30,7 +30,8 @@
       <%= render 'chobble_forms/select', field: :unit_type,
           options: options_for_select([
             [t('units.unit_types.bouncy_castle'), 'bouncy_castle'],
-            [t('units.unit_types.bouncing_pillow'), 'bouncing_pillow']
+            [t('units.unit_types.bouncing_pillow'), 'bouncing_pillow'],
+            [t('units.unit_types.pat_testable'), 'pat_testable']
           ], unit.unit_type),
           required: true %>
     <% end %>

config/forms/pat_assessment.yml

@@ -0,0 +1,49 @@
+---
+form_fields:
+  - legend_i18n_key: equipment_details
+    fields:
+      - partial: :number_pass_fail_comment
+        field: :equipment_class
+        attributes:
+          min: 1
+          max: 2
+      - partial: :integer_comment
+        field: :equipment_power
+        attributes:
+          min: 0
+  - legend_i18n_key: visual_inspection
+    fields:
+      - partial: :pass_fail_comment
+        field: :visual
+      - partial: :pass_fail_comment
+        field: :appliance_plug_check
+  - legend_i18n_key: electrical_tests
+    fields:
+      - partial: :number_pass_fail_comment
+        field: :fuse_rating
+        attributes:
+          min: 0
+          max: 32
+      - partial: :number_pass_fail_comment
+        field: :earth_ohms
+        attributes:
+          min: 0
+          step: 0.01
+      - partial: :number_pass_fail_comment
+        field: :insulation_mohms
+        attributes:
+          min: 0
+      - partial: :number_pass_fail_comment
+        field: :leakage_ma
+        attributes:
+          min: 0
+          step: 0.01
+  - legend_i18n_key: functional_tests
+    fields:
+      - partial: :pass_fail_comment
+        field: :load_test
+      - partial: :number_pass_fail_comment
+        field: :rcd_trip_time_ms
+        attributes:
+          min: 0
+          step: 0.01

config/locales/forms/pat.en.yml

@@ -0,0 +1,23 @@
+---
+en:
+  forms:
+    pat:
+      header: PAT Assessment
+      sections:
+        equipment_details: Equipment Details
+        visual_inspection: Visual Inspection
+        electrical_tests: Electrical Tests
+        functional_tests: Functional Tests
+      fields:
+        equipment_class: Equipment Class (I or II)
+        equipment_power: Power Rating (W)
+        visual: Visual Inspection
+        appliance_plug_check: Plug & Cable Check
+        fuse_rating: Fuse Rating (A)
+        earth_ohms: Earth Continuity (Ω)
+        insulation_mohms: Insulation Resistance (MΩ)
+        leakage_ma: Earth Leakage (mA)
+        load_test: Load/Function Test
+        rcd_trip_time_ms: RCD Trip Time (ms)
+      submit: Save Assessment
+      submit_continue: Save & Continue

config/locales/inspections.en.yml

@@ -264,6 +264,7 @@ en:
       enclosed_incomplete: Totally Enclosed Assessment incomplete
       fan_incomplete: Fan Assessment incomplete
       materials_incomplete: Materials Assessment incomplete
+      pat_incomplete: PAT Assessment incomplete
       slide_incomplete: Slide Assessment incomplete
       structure_incomplete: Structure Assessment incomplete
       user_height_incomplete: User Height Assessment incomplete

config/locales/units.en.yml

@@ -67,6 +67,7 @@ en:
     unit_types:
       bouncy_castle: Bouncy Castle
       bouncing_pillow: Bouncing Pillow
+      pat_testable: PAT Testable Appliance
     labels:
       inspection_date: Inspection Date
       dimensions: Dimensions

db/migrate/20251204000001_create_pat_assessments.rb

@@ -0,0 +1,59 @@
+# typed: false
+# frozen_string_literal: true
+
+class CreatePatAssessments < ActiveRecord::Migration[8.0]
+  def change
+    create_table :pat_assessments, id: false do |t|
+      t.string :inspection_id, limit: 12, null: false
+      add_equipment_fields(t)
+      add_visual_fields(t)
+      add_electrical_fields(t)
+      add_functional_fields(t)
+      t.timestamps
+    end
+
+    add_index :pat_assessments, :inspection_id,
+      unique: true, name: "pat_assessments_pkey"
+    add_foreign_key :pat_assessments, :inspections
+  end
+
+  private
+
+  def add_equipment_fields(t)
+    t.integer :equipment_class
+    t.boolean :equipment_class_pass
+    t.text :equipment_class_comment
+    t.integer :equipment_power
+    t.text :equipment_power_comment
+  end
+
+  def add_visual_fields(t)
+    t.boolean :visual_pass
+    t.text :visual_comment
+    t.boolean :appliance_plug_check_pass
+    t.text :appliance_plug_check_comment
+  end
+
+  def add_electrical_fields(t)
+    t.integer :fuse_rating
+    t.boolean :fuse_rating_pass
+    t.text :fuse_rating_comment
+    t.decimal :earth_ohms, precision: 8, scale: 2
+    t.boolean :earth_ohms_pass
+    t.text :earth_ohms_comment
+    t.integer :insulation_mohms
+    t.boolean :insulation_mohms_pass
+    t.text :insulation_mohms_comment
+    t.decimal :leakage_ma, precision: 8, scale: 2
+    t.boolean :leakage_ma_pass
+    t.text :leakage_ma_comment
+  end
+
+  def add_functional_fields(t)
+    t.boolean :load_test_pass
+    t.text :load_test_comment
+    t.decimal :rcd_trip_time_ms, precision: 8, scale: 2
+    t.boolean :rcd_trip_time_ms_pass
+    t.text :rcd_trip_time_ms_comment
+  end
+end