Jw admin epic

app/controllers/portal/protocols_controller.rb

@@ -101,6 +101,9 @@ def update_protocol_type
     @protocol_type = params[:protocol][:type]
     if @protocol.update_attribute(:type, @protocol_type)
       if params[:sub_service_request_id]
+        if @protocol_type = "Study" && @protocol.selected_for_epic == nil
+          @protocol.update_attribute(:study_type_question_group_id, StudyTypeQuestionGroup.active.pluck(:id).first)
+        end
         @sub_service_request = SubServiceRequest.find(params[:sub_service_request_id])
         redirect_to portal_admin_sub_service_request_path(@sub_service_request)
       else

app/controllers/portal/sub_service_requests_controller.rb

@@ -82,7 +82,14 @@ def update_from_project_study_information
       Hash.new
     end
 
-    if @protocol.update_attributes(attrs.merge(study_type_question_group_id: StudyTypeQuestionGroup.active.pluck(:id).first))
+    @protocol_question_group_id = @protocol.study_type_question_group_id
+
+    if @protocol.update_attributes(attrs)
+      if @protocol_question_group_id == StudyTypeQuestionGroup.active.pluck(:id).first
+        @protocol.update_attribute(:study_type_question_group_id, StudyTypeQuestionGroup.active.pluck(:id).first)
+      else
+        @protocol.update_attribute(:study_type_question_group_id, StudyTypeQuestionGroup.inactive.pluck(:id).first)
+      end
       redirect_to portal_admin_sub_service_request_path(@sub_service_request)
     else
       @user_toasts = @user.received_toast_messages.select {|x| x.sending_class == 'SubServiceRequest'}