RESKC-1428, RESKC-1430: Fix PHS 3.1 supplemental issues.

kuali · Jun 22, 2016 · 8664fa4 · 8664fa4
1 parent 0c84a86
commit 8664fa4
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...g/kuali/coeus/s2sgen/impl/generate/support/PHS398FellowshipSupplementalV3_1Generator.java b/...g/kuali/coeus/s2sgen/impl/generate/support/PHS398FellowshipSupplementalV3_1Generator.java
@@ -155,6 +155,7 @@ public class PHS398FellowshipSupplementalV3_1Generator extends PHS398FellowshipS
 
     private static final String ANSWER_YES = "Yes";
     private static final String ANSWER_NO = "No";
+    public static final String TEMPORARY_VISA_ALSO_APPLIED_FOR_PERMANENT_RESIDENT_STATUS = "Temporary Visa also applied for permanent resident status";
 
     @Value("http://apply.grants.gov/forms/PHS_Fellowship_Supplemental_3_1-V3.1")
     private String namespace;
@@ -204,9 +205,6 @@ private void setOtherResearchTrainingPlanVertebrate(PHSFellowshipSupplemental31
                 Integer questionId = question.getQuestionSeqId();
                 if (answer != null) {
                     switch (questionId) {
-                        case WILL_VERTEBRATE_ANIMALS_BE_USED:
-                            // Will vertebrate animals be used in this project?
-                            otherResearchTrainingPlan.setVertebrateAnimalsUsed(getYesNoEnum(answer));
                         case VERT:
                             // will the inclusion of vertebrate animals use be indefinite
                             otherResearchTrainingPlan.setVertebrateAnimalsIndefinite(getYesNoEnum(answer));
@@ -828,6 +826,9 @@ protected void setHumanSubjectInvolvedAndVertebrateAnimalUsed(OtherResearchTrain
                 case 1:
                     researchTrainingPlan.setHumanSubjectsInvolved(YesNoDataType.Y_YES);
                     break;
+                case 2:
+                    researchTrainingPlan.setVertebrateAnimalsUsed(YesNoDataType.Y_YES);
+                    break;
                 default:
                     break;
             }
@@ -865,17 +866,20 @@ private void setCitizenshipAndAlternatePhoneNumber(AdditionalInformation additio
                 CitizenshipType citizenShip = s2SProposalPersonService.getCitizenship(proposalPerson);
                 if(citizenShip!=null && StringUtils.isNotBlank(citizenShip.getCitizenShip())){
                     if (citizenShip.getCitizenShip().trim().equals(CitizenshipDataType.NON_U_S_CITIZEN_WITH_TEMPORARY_VISA.toString())) {
+                        additionalInformation.setUSCitizen(YesNoDataType.N_NO);
                         additionalInformation.setNonUSCitizen(NonUSCitizenDataType.WITH_A_TEMPORARY_U_S_VISA);
                     }
                     else if (citizenShip.getCitizenShip().trim().equals(CitizenshipDataType.PERMANENT_RESIDENT_OF_U_S.toString())) {
+                        additionalInformation.setUSCitizen(YesNoDataType.N_NO);
                         additionalInformation.setNonUSCitizen(NonUSCitizenDataType.WITH_A_PERMANENT_U_S_RESIDENT_VISA);
                     }
                     else if (citizenShip.getCitizenShip().trim().equals(
                             CitizenshipDataType.U_S_CITIZEN_OR_NONCITIZEN_NATIONAL.toString())) {
                         additionalInformation.setUSCitizen(YesNoDataType.Y_YES);
                     }
                     else if (citizenShip.getCitizenShip().trim().equals(
-                            CitizenshipDataType.PERMANENT_RESIDENT_OF_U_S_PENDING.toString())) {
+                            TEMPORARY_VISA_ALSO_APPLIED_FOR_PERMANENT_RESIDENT_STATUS)) {
+                        additionalInformation.setUSCitizen(YesNoDataType.N_NO);
                         additionalInformation.setNonUSCitizen(NonUSCitizenDataType.WITH_A_TEMPORARY_U_S_VISA);
                         additionalInformation.setPermanentResidentByAwardIndicator(YesNoDataType.Y_YES);
                     }