From eb23deebdc60fdbc48cf95c13ee10f70a1f7c92f Mon Sep 17 00:00:00 2001
From: Gayathri Athreya <gathreya@email.arizona.edu>
Date: Wed, 16 Mar 2016 13:28:02 -0700
Subject: [PATCH] RESKC-1219: Fixing online review and assign reviewers for
 protocol.

Online Review tab does not display after a protocol is submitted and assigned reviewers.
Steps
Create protocol
Submit protocol as Exempt
Select committee but not a schedule
-Issue One Result: You should be able to select reviewers but they are not appearing as part of the submit screen unless you have selected a schedule.
-Expected: A schedule should not be required for selecting reviewers if the review type is exempt (or expedited). Expedited is behaving correctly.
Submit the protocol without the schedule
Then assign a reviewer via Assign Reviewers action
-Issue Two result: The review assignment is saved but the Review tab does not appear. See screen shot
-Expected: The protocol review tab should appear
Note: If you add a schedule via Modify Submission Request at this point, then the OLR tab will appear
---
 .../org/kuali/kra/irb/ProtocolOnlineReviewDocument.java    | 7 ++-----
 .../irb/onlinereview/ProtocolOnlineReviewServiceImpl.java  | 3 ++-
 .../WEB-INF/tags/irb/action/modifySubmissionAction.tag     | 1 -
 coeus-webapp/src/main/webapp/scripts/kuali_application.js  | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/coeus-impl/src/main/java/org/kuali/kra/irb/ProtocolOnlineReviewDocument.java b/coeus-impl/src/main/java/org/kuali/kra/irb/ProtocolOnlineReviewDocument.java
index fbb0b360569..773a3df67d4 100644
--- a/coeus-impl/src/main/java/org/kuali/kra/irb/ProtocolOnlineReviewDocument.java
+++ b/coeus-impl/src/main/java/org/kuali/kra/irb/ProtocolOnlineReviewDocument.java
@@ -75,7 +75,7 @@ public class ProtocolOnlineReviewDocument  extends ProtocolOnlineReviewDocumentB
 
 	public ProtocolOnlineReviewDocument() { 
         super();
-        protocolOnlineReviewList = new ArrayList<ProtocolOnlineReview>();
+        protocolOnlineReviewList = new ArrayList<>();
         ProtocolOnlineReview newProtocolReview = new ProtocolOnlineReview();
         newProtocolReview.setProtocolOnlineReviewDocument(this);
         protocolOnlineReviewList.add(newProtocolReview);
@@ -149,10 +149,7 @@ public List buildListOfDeletionAwareLists() {
     
     @Override
     protected List<RolePersons> getAllRolePersons() {
-        KcAuthorizationService kraAuthService =
-               (KcAuthorizationService) KcServiceLocator.getService(KcAuthorizationService.class);
-        //return kraAuthService.getAllRolePersons(getProtocolOnlineReview());
-        return new ArrayList<RolePersons>();
+        return new ArrayList<>();
     }
     
     public String getDocumentTypeCode() {
diff --git a/coeus-impl/src/main/java/org/kuali/kra/irb/onlinereview/ProtocolOnlineReviewServiceImpl.java b/coeus-impl/src/main/java/org/kuali/kra/irb/onlinereview/ProtocolOnlineReviewServiceImpl.java
index 682b4790308..edffb617634 100644
--- a/coeus-impl/src/main/java/org/kuali/kra/irb/onlinereview/ProtocolOnlineReviewServiceImpl.java
+++ b/coeus-impl/src/main/java/org/kuali/kra/irb/onlinereview/ProtocolOnlineReviewServiceImpl.java
@@ -49,11 +49,12 @@ public class ProtocolOnlineReviewServiceImpl extends ProtocolOnlineReviewService
     @Override
     public boolean isProtocolInStateToBeReviewed(ProtocolBase protocol) {
         boolean isReviewable = false;
-        ProtocolSubmission submission = (ProtocolSubmission)((Protocol) protocol).getProtocolSubmission();
+        ProtocolSubmission submission = ((Protocol) protocol).getProtocolSubmission();
         if (submission != null) {
             try {
                 isReviewable = StringUtils.isNotEmpty(submission.getScheduleId())  
                         || ProtocolReviewType.EXPEDITED_REVIEW_TYPE_CODE.equals(submission.getProtocolReviewTypeCode())
+                        || ProtocolReviewType.EXEMPT_STUDIES_REVIEW_TYPE_CODE.equals(submission.getProtocolReviewTypeCode())
                         || (ProtocolReviewType.FYI_TYPE_CODE.equalsIgnoreCase(submission.getProtocolReviewTypeCode()) && 
                             ProtocolSubmissionType.NOTIFY_IRB.equalsIgnoreCase(submission.getProtocolSubmissionType().getSubmissionTypeCode())); 
                 isReviewable &= (StringUtils.equals(submission.getSubmissionStatusCode(), ProtocolSubmissionStatus.SUBMITTED_TO_COMMITTEE) 
diff --git a/coeus-webapp/src/main/webapp/WEB-INF/tags/irb/action/modifySubmissionAction.tag b/coeus-webapp/src/main/webapp/WEB-INF/tags/irb/action/modifySubmissionAction.tag
index f7455e42103..04e0706302f 100644
--- a/coeus-webapp/src/main/webapp/WEB-INF/tags/irb/action/modifySubmissionAction.tag
+++ b/coeus-webapp/src/main/webapp/WEB-INF/tags/irb/action/modifySubmissionAction.tag
@@ -22,7 +22,6 @@
 <c:set var="acsAttributes" value="${DataDictionary.ProtocolAssignCmtSchedBean.attributes}" />
 <c:set var="expeditedAttributes" value="${DataDictionary.ExpeditedReviewCheckListItem.attributes}" />
 <c:set var="exemptAttributes" value="${DataDictionary.ExemptStudiesCheckListItem.attributes}" />
-<%--<c:set var="reviewerAttributes" value="${DataDictionary.ProtocolReviewerBean.attributes}" /> --%>
 <c:set var="action" value="modifySubmissionAction" />
 
 <kra:permission value="${KualiForm.actionHelper.canModifyProtocolSubmission}">
diff --git a/coeus-webapp/src/main/webapp/scripts/kuali_application.js b/coeus-webapp/src/main/webapp/scripts/kuali_application.js
index f8484467b3a..e8f0c0308f7 100644
--- a/coeus-webapp/src/main/webapp/scripts/kuali_application.js
+++ b/coeus-webapp/src/main/webapp/scripts/kuali_application.js
@@ -1810,7 +1810,7 @@ function displayReviewers(protocolId) {
     var protocolReviewTypeCode = dwr.util.getValue('actionHelper.protocolSubmitAction.protocolReviewTypeCode');
     
     // we suppress the reviewer display if a committee is not selected, or if a schedule is not selected in case of a non-expedited review type
-    if ( ((scheduleId === "") && (protocolReviewTypeCode != '2')) || (committeeId === "") ) {
+    if ( ((scheduleId === "") && (protocolReviewTypeCode != '2' && protocolReviewTypeCode != '3')) || (committeeId === "") ) {
     	document.getElementById("reviewers").style.display = 'none';
     }
     else {