Merge pull request #86 from bmic-development/jl-finished-statuses

Jl finished statuses
bmic-development · Feb 15, 2017 · 9460289 · 9460289
2 parents 79f8788 + f01d9d6
commit 9460289
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/app/controllers/service_requests_controller.rb b/app/controllers/service_requests_controller.rb
@@ -234,7 +234,7 @@ def add_service
         li.update_attribute(:sub_service_request_id, ssr.id)
         if @service_request.status == 'first_draft'
           ssr.update_attribute(:status, 'first_draft')
-        elsif ssr.status.nil? || (ssr.can_be_edited? && ssr_has_changed?(@service_request, ssr) && (ssr.status != 'complete'))
+        elsif ssr.status.nil? || (ssr.can_be_edited? && ssr_has_changed?(@service_request, ssr))
           previous_status = ssr.status
           ssr.update_attribute(:status, 'draft')
         end
@@ -512,7 +512,7 @@ def authorize_protocol_edit_request
   def find_or_create_sub_service_request(line_item, service_request)
     organization = line_item.service.process_ssrs_organization
     service_request.sub_service_requests.each do |ssr|
-      if (ssr.organization == organization) && (ssr.status != 'complete')
+      if (ssr.organization == organization) && !ssr.is_complete?
         return ssr
       end
     end

diff --git a/app/models/service_request.rb b/app/models/service_request.rb
@@ -529,8 +529,8 @@ def audit_report( identity, start_date=self.previous_submitted_at.utc, end_date=
   end
 
   def cart_sub_service_requests
-    active    = self.sub_service_requests.where.not(status: 'complete')
-    complete  = self.sub_service_requests.where(status: 'complete')
+    active    = self.sub_service_requests.select{ |ssr| !ssr.is_complete? }
+    complete  = self.sub_service_requests.select{ |ssr| ssr.is_complete? }
 
     { active: active, complete: complete }
   end

diff --git a/app/models/sub_service_request.rb b/app/models/sub_service_request.rb
@@ -327,7 +327,7 @@ def can_be_edited?
   end
 
   def is_complete?
-    return status == 'complete'
+    return FINISHED_STATUSES.include?(status)
   end
 
   def find_editable_id(id)

diff --git a/config/application.yml.example b/config/application.yml.example
@@ -68,6 +68,7 @@ development:
   editable_statuses: { 14: ['first_draft', 'draft', 'submitted', nil, 'get_a_cost_estimate', 'awaiting_pi_approval', 'complete'],
                      48: ['draft', 'submitted', 'complete'] }
   updatable_statuses: [ 'first_draft', 'draft', 'get_a_cost_estimate', 'awaiting_pi_approval']
+  finished_statuses: ['complete', 'withdrawn']
   navbar_links: { sparc_request:              ['SPARCRequest', 'http://localhost:3000/'],
                   sparc_dashboard:            ['SPARCDashboard', 'http://localhost:3000/dashboard'],
                   sparc_fulfillment:          ['SPARCFulfillment', 'https://cwf-d.obis.musc.edu/identities/sign_in'],
@@ -114,6 +115,7 @@ test:
   editable_statuses: { 14: ['first_draft', 'draft', 'submitted', nil, 'get_a_cost_estimate', 'awaiting_pi_approval'],
                      48: ['draft', 'submitted'] }
   updatable_statuses: [ 'first_draft', 'draft', 'get_a_cost_estimate', 'awaiting_pi_approval']
+  finished_statuses: ['complete', 'withdrawn']
   navbar_links: { sparc_request:              ['SPARCRequest', 'http://localhost:3000/'],
                   sparc_dashboard:            ['SPARCDashboard', 'http://localhost:3000/dashboard'],
                   sparc_fulfillment:          ['SPARCFulfillment', 'https://cwf-d.obis.musc.edu/identities/sign_in'],

diff --git a/config/initializers/01_obis_setup.rb b/config/initializers/01_obis_setup.rb
@@ -69,6 +69,7 @@
   NO_REPLY_FROM                             = application_config['no_reply_from']
   EDITABLE_STATUSES                         = application_config['editable_statuses'] || {}
   UPDATABLE_STATUSES                        = application_config['updatable_statuses'] || []
+  FINISHED_STATUSES                         = application_config['finished_statuses'] || []
   REMOTE_SERVICE_NOTIFIER_PROTOCOL          = application_config['remote_service_notifier_protocol']
   REMOTE_SERVICE_NOTIFIER_HOST              = application_config['remote_service_notifier_host']
   REMOTE_SERVICE_NOTIFIER_PATH              = application_config['remote_service_notifier_path']