v2.21.0

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-- 2.5.3
+- 2.7.6
 services:
   - mysql
 branches:

app/controllers/scenarios_controller.rb

@@ -18,7 +18,7 @@ class ScenariosController < OrganizationAwareController
   # 
   #-----------------------------------------------------------------------------
   def index
-    @fy_year = allowed_params[:fy_year] || current_fiscal_year_year
+    @fy_year = allowed_params[:fy_year] || current_planning_year_year
     @scenarios = Scenario.where(fy_year: @fy_year, organization: current_user.viewable_organizations).order(created_at: :desc)
 
     respond_to do |format|

app/models/scenario.rb

@@ -11,6 +11,11 @@ class Scenario < ApplicationRecord
   #Formatting i.e. fiscal year
   include TransamFormatHelper
 
+  #------------------------------------------------------------------------------
+  # Callbacks
+  #------------------------------------------------------------------------------
+  after_initialize :set_defaults
+
   # List of hash parameters allowed by the controller
   FORM_PARAMS = [
     :organization_id,
@@ -468,4 +473,17 @@ def self.current_fiscal_year_year
     SystemConfig.instance.fy_year
   end
 
+  #------------------------------------------------------------------------------
+  #
+  # Protected Methods
+  #
+  #------------------------------------------------------------------------------
+  protected
+
+  # Set resonable defaults for a new scenario
+  def set_defaults
+    self.fy_year ||= current_planning_year_year
+    self.ending_fy_year ||= current_planning_year_year
+    self.reviewer_organization ||= Organization.find_by(organization_type: OrganizationType.where(name: 'Grantor'))
+  end
 end

app/services/capital_project_builder.rb

@@ -228,12 +228,15 @@ def post_build_clean_up organization
       #########################################
       # Scenario Work
       #########################################
-      @scenario.draft_project_phases.each do |phase|
-        phase.set_estimated_cost
-      end
+      # If we're coming in from some route other than `build`, such as `update_asset_schedule`, then @scenario will be nil
+      if @scenario
+        @scenario.draft_project_phases.each do |phase|
+          phase.set_estimated_cost
+        end
 
-      @scenario.draft_projects.each do |project|
-        project.set_project_number
+        @scenario.draft_projects.each do |project|
+          project.set_project_number
+        end
       end
       #########################################
       ##########################################
@@ -520,7 +523,7 @@ def process_asset(asset, start_year, last_year, replacement_project_type, rehabi
   # Adds an asset to a capital project. If the project does not
   # exist it is created first. Future projects are projects generated by a
   # replacement of a replacement or rehab of a replacement -- these are dependent
-  # on the first event happening so are kept seperate and are not editab;e
+  # on the first event happening so are kept seperate and are not editable
   #-----------------------------------------------------------------------------
   def add_to_project(organization, asset, ali_code, year, project_type, sogr=true, notional=false, fuel_type_id=nil)
     Rails.logger.debug "add_to_project: asset=#{asset} ali_code=#{ali_code} year=#{year} project_type=#{project_type}"
@@ -536,7 +539,8 @@ def add_to_project(organization, asset, ali_code, year, project_type, sogr=true,
         transit_asset = asset.transit_asset 
       end
 
-      if transit_asset.id.in? @scenario.draft_project_phase_assets.pluck(:transit_asset_id)
+      # If we're coming in from some route other than `build`, such as `update_asset_schedule`, then @scenario will be nil
+      if @scenario && transit_asset.id.in?(@scenario.draft_project_phase_assets.pluck(:transit_asset_id))
         return [nil, nil]
       end
     else
@@ -562,12 +566,15 @@ def add_to_project(organization, asset, ali_code, year, project_type, sogr=true,
         #########################################
         # Scenario Work (Create Draft Project)
         #########################################
-        if asset.fuel_type_id.present?
-          phase = @scenario.draft_project_phases.where(team_ali_code: ali_code, fy_year: year, fuel_type: asset.fuel_type).first
-        else
-          phase = @scenario.draft_project_phases.where(team_ali_code: ali_code, fy_year: year).first
+        # If we're coming in from some route other than `build`, such as `update_asset_schedule`, then @scenario will be nil
+        if @scenario
+          if asset.fuel_type_id.present?
+            phase = @scenario.draft_project_phases.where(team_ali_code: ali_code, fy_year: year, fuel_type: asset.fuel_type).first
+          else
+            phase = @scenario.draft_project_phases.where(team_ali_code: ali_code, fy_year: year).first
+          end
         end
-
+        
         if phase.nil?
 
           #We don't have a phase. let's create a new project and a new phase for this asset

app/views/scenarios/new.html.haml

@@ -6,4 +6,5 @@
     =f.input :ending_fy_year, :collection => @fiscal_years, :include_blank => false, :label => "Ending Fiscal Year"
     =f.input :description
     =f.input :organization_id, collection: @organizations.collect { |o| [o.name, o.id] }
+    =f.input :reviewer_organization, as: :hidden
     =f.submit 'Save', class: 'btn btn-primary'

lib/transam_cpt/version.rb

@@ -1,3 +1,3 @@
 module TransamCpt
-  VERSION = "2.20.0"
+  VERSION = "2.21.0"
 end