Merge branch 'qa'

camsys · Jul 15, 2024 · f0be3dd · f0be3dd
2 parents 3725a2c + cb2a67f
commit f0be3dd
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 14 deletions.
diff --git a/app/models/concerns/table_preferences.rb b/app/models/concerns/table_preferences.rb
@@ -269,7 +269,9 @@ def delete_table_prefs table_code
         scheduled_replacement_year_as_fiscal_year: 'scheduled_replacement_year',
         scheduled_replacement_cost: 'scheduled_replacement_cost',
         rebuild_rehab_description: 'rebuild_rehab_events.comments',
-        rebuild_rehab_date: 'rebuild_rehab_events.event_date'
+        rebuild_rehab_date: 'rebuild_rehab_events.event_date',
+        replacement_status_type: 'replacement_status_types.name',
+        min_service_life_months: 'policy_asset_subtype_rules.min_service_life_months'
       },
     guideway: 
       { 
@@ -301,7 +303,9 @@ def delete_table_prefs table_code
         scheduled_replacement_year_as_fiscal_year: 'scheduled_replacement_year',
         scheduled_replacement_cost: 'scheduled_replacement_cost',
         rebuild_rehab_description: 'rebuild_rehab_events.comments',
-        rebuild_rehab_date: 'rebuild_rehab_events.event_date'
+        rebuild_rehab_date: 'rebuild_rehab_events.event_date',
+        replacement_status_type: 'replacement_status_types.name',
+        min_service_life_months: 'policy_asset_subtype_rules.min_service_life_months'
       },
     power_signal:
       { 
@@ -332,7 +336,9 @@ def delete_table_prefs table_code
         scheduled_replacement_year_as_fiscal_year: 'scheduled_replacement_year',
         scheduled_replacement_cost: 'scheduled_replacement_cost',
         rebuild_rehab_description: 'rebuild_rehab_events.comments',
-        rebuild_rehab_date: 'rebuild_rehab_events.event_date'
+        rebuild_rehab_date: 'rebuild_rehab_events.event_date',
+        replacement_status_type: 'replacement_status_types.name',
+        min_service_life_months: 'policy_asset_subtype_rules.min_service_life_months'
       },
     capital_equipment:
       { 
@@ -360,7 +366,9 @@ def delete_table_prefs table_code
         scheduled_replacement_year_as_fiscal_year: 'transam_assets.scheduled_replacement_year',
         scheduled_replacement_cost: 'transam_assets.scheduled_replacement_cost',
         rebuild_rehab_description: 'rebuild_rehab_events.comments',
-        rebuild_rehab_date: 'rebuild_rehab_events.event_date'
+        rebuild_rehab_date: 'rebuild_rehab_events.event_date',
+        replacement_status_type: 'replacement_status_types.name',
+        min_service_life_months: 'policy_asset_subtype_rules.min_service_life_months'
       },
     service_vehicle:
       { 
@@ -389,7 +397,9 @@ def delete_table_prefs table_code
         scheduled_replacement_year_as_fiscal_year: 'scheduled_replacement_year',
         scheduled_replacement_cost: 'scheduled_replacement_cost',
         rebuild_rehab_description: 'rebuild_rehab_events.comments',
-        rebuild_rehab_date: 'rebuild_rehab_events.event_date'
+        rebuild_rehab_date: 'rebuild_rehab_events.event_date',
+        replacement_status_type: 'replacement_status_types.name',
+        min_service_life_months: 'policy_asset_subtype_rules.min_service_life_months'
       },
     bus:
       { 
@@ -427,7 +437,10 @@ def delete_table_prefs table_code
         scheduled_replacement_year_as_fiscal_year: 'scheduled_replacement_year',
         scheduled_replacement_cost: 'scheduled_replacement_cost',
         rebuild_rehab_description: 'rebuild_rehab_events.comments',
-        rebuild_rehab_date: 'rebuild_rehab_events.event_date'
+        rebuild_rehab_date: 'rebuild_rehab_events.event_date',
+        replacement_status_type: 'replacement_status_types.name',
+        min_service_life_months: 'policy_asset_subtype_rules.min_service_life_months',
+        min_service_life_miles: 'policy_asset_subtype_rules.min_service_life_miles'
       },
     rail_car: { 
         asset_id: 'asset_tag',
@@ -464,7 +477,10 @@ def delete_table_prefs table_code
         scheduled_replacement_year_as_fiscal_year: 'scheduled_replacement_year',
         scheduled_replacement_cost: 'scheduled_replacement_cost',
         rebuild_rehab_description: 'rebuild_rehab_events.comments',
-        rebuild_rehab_date: 'rebuild_rehab_events.event_date'
+        rebuild_rehab_date: 'rebuild_rehab_events.event_date',
+        replacement_status_type: 'replacement_status_types.name',
+        min_service_life_months: 'policy_asset_subtype_rules.min_service_life_months',
+        min_service_life_miles: 'policy_asset_subtype_rules.min_service_life_miles'
       },
     ferry: { 
         asset_id: 'asset_tag',
@@ -501,7 +517,10 @@ def delete_table_prefs table_code
         scheduled_replacement_year_as_fiscal_year: 'scheduled_replacement_year',
         scheduled_replacement_cost: 'scheduled_replacement_cost',
         rebuild_rehab_description: 'rebuild_rehab_events.comments',
-        rebuild_rehab_date: 'rebuild_rehab_events.event_date'
+        rebuild_rehab_date: 'rebuild_rehab_events.event_date',
+        replacement_status_type: 'replacement_status_types.name',
+        min_service_life_months: 'policy_asset_subtype_rules.min_service_life_months',
+        min_service_life_miles: 'policy_asset_subtype_rules.min_service_life_miles'
       },
     other_passenger_vehicle: 
       { 
@@ -539,7 +558,10 @@ def delete_table_prefs table_code
         scheduled_replacement_year_as_fiscal_year: 'scheduled_replacement_year',
         scheduled_replacement_cost: 'scheduled_replacement_cost',
         rebuild_rehab_description: 'rebuild_rehab_events.comments',
-        rebuild_rehab_date: 'rebuild_rehab_events.event_date'
+        rebuild_rehab_date: 'rebuild_rehab_events.event_date',
+        replacement_status_type: 'replacement_status_types.name',
+        min_service_life_months: 'policy_asset_subtype_rules.min_service_life_months',
+        min_service_life_miles: 'policy_asset_subtype_rules.min_service_life_miles'
       },
     passenger_facility:
       { 
@@ -564,7 +586,9 @@ def delete_table_prefs table_code
         scheduled_replacement_year_as_fiscal_year: 'scheduled_replacement_year',
         scheduled_replacement_cost: 'scheduled_replacement_cost',
         rebuild_rehab_description: 'rebuild_rehab_events.comments',
-        rebuild_rehab_date: 'rebuild_rehab_events.event_date'
+        rebuild_rehab_date: 'rebuild_rehab_events.event_date',
+        replacement_status_type: 'replacement_status_types.name',
+        min_service_life_months: 'policy_asset_subtype_rules.min_service_life_months'
       },
     admin_facility:
       { 
@@ -589,7 +613,9 @@ def delete_table_prefs table_code
         scheduled_replacement_year_as_fiscal_year: 'scheduled_replacement_year',
         scheduled_replacement_cost: 'scheduled_replacement_cost',
         rebuild_rehab_description: 'rebuild_rehab_events.comments',
-        rebuild_rehab_date: 'rebuild_rehab_events.event_date'
+        rebuild_rehab_date: 'rebuild_rehab_events.event_date',
+        replacement_status_type: 'replacement_status_types.name',
+        min_service_life_months: 'policy_asset_subtype_rules.min_service_life_months'
       },
     parking_facility:
       { 
@@ -614,7 +640,9 @@ def delete_table_prefs table_code
         scheduled_replacement_year_as_fiscal_year: 'scheduled_replacement_year',
         scheduled_replacement_cost: 'scheduled_replacement_cost',
         rebuild_rehab_description: 'rebuild_rehab_events.comments',
-        rebuild_rehab_date: 'rebuild_rehab_events.event_date'
+        rebuild_rehab_date: 'rebuild_rehab_events.event_date',
+        replacement_status_type: 'replacement_status_types.name',
+        min_service_life_months: 'policy_asset_subtype_rules.min_service_life_months'
       },
     maintenance_facility:
       { 
@@ -639,7 +667,9 @@ def delete_table_prefs table_code
         scheduled_replacement_year_as_fiscal_year: 'scheduled_replacement_year',
         scheduled_replacement_cost: 'scheduled_replacement_cost',
         rebuild_rehab_description: 'rebuild_rehab_events.comments',
-        rebuild_rehab_date: 'rebuild_rehab_events.event_date'
+        rebuild_rehab_date: 'rebuild_rehab_events.event_date',
+        replacement_status_type: 'replacement_status_types.name',
+        min_service_life_months: 'policy_asset_subtype_rules.min_service_life_months'
       },
     users:
       { 

diff --git a/lib/transam_core/version.rb b/lib/transam_core/version.rb
@@ -1,3 +1,3 @@
 module TransamCore
-  VERSION = "2.43.0"
+  VERSION = "2.44.0"
 end