Merge pull request #1605 from leoherbie/RESKC-1227

RESKC-1227: Multiple fixes for PHS398CoverPageSupplement 3.0.

Author: blackcathacker

coeus-db/coeus-db-sql/src/main/resources/co/kuali/coeus/data/migration/sql/mysql/kc/bootstrap/V1603_014__fix_new_form_support.sql

@@ -0,0 +1,28 @@
+--
+-- Kuali Coeus, a comprehensive research administration system for higher education.
+--
+-- Copyright 2005-2016 Kuali, Inc.
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+
+update questionnaire_questions set parent_question_number = 0, condition_flag = 'N', CONDITION_TYPE  = null, CONDITION_VALUE = null where
+QUESTIONNAIRE_REF_ID_FK = (select QUESTIONNAIRE_REF_ID from questionnaire where QUESTIONNAIRE_ID = -1) and
+QUESTION_REF_ID_FK in (select QUESTION_REF_ID from question where QUESTION_ID in (5));
+
+update question set question_id = '149' where question_id = '142' and MAX_ANSWERS = 200;
+
+update questionnaire_questions set parent_question_number = 8, condition_flag = 'Y', CONDITION_TYPE  = '4', CONDITION_VALUE = 'Y' where
+  QUESTIONNAIRE_REF_ID_FK = (select QUESTIONNAIRE_REF_ID from questionnaire where QUESTIONNAIRE_ID = -1) and
+  QUESTION_REF_ID_FK in (select QUESTION_REF_ID from question where QUESTION_ID in (149));

coeus-db/coeus-db-sql/src/main/resources/co/kuali/coeus/data/migration/sql/oracle/kc/bootstrap/V1603_014__fix_new_form_support.sql

@@ -0,0 +1,28 @@
+--
+-- Kuali Coeus, a comprehensive research administration system for higher education.
+--
+-- Copyright 2005-2016 Kuali, Inc.
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+
+update questionnaire_questions set parent_question_number = 0, condition_flag = 'N', CONDITION_TYPE  = null, CONDITION_VALUE = null where
+QUESTIONNAIRE_REF_ID_FK = (select QUESTIONNAIRE_REF_ID from questionnaire where QUESTIONNAIRE_ID = -1) and
+QUESTION_REF_ID_FK in (select QUESTION_REF_ID from question where QUESTION_ID in (5));
+
+update question set question_id = '149' where question_id = '142' and MAX_ANSWERS = 200;
+
+update questionnaire_questions set parent_question_number = 8, condition_flag = 'Y', CONDITION_TYPE  = '4', CONDITION_VALUE = 'Y' where
+  QUESTIONNAIRE_REF_ID_FK = (select QUESTIONNAIRE_REF_ID from questionnaire where QUESTIONNAIRE_ID = -1) and
+  QUESTION_REF_ID_FK in (select QUESTION_REF_ID from question where QUESTION_ID in (149));

coeus-it/src/test/java/org/kuali/coeus/s2sgen/impl/generate/support/PHS398CoverPageSupplement_3_0V3_0GeneratorTest.java

@@ -146,7 +146,7 @@ protected void saveAnswers(ProposalDevelopmentDocument document) {
                         answer.setAnswer("Y");
                     } else if (6 == answer.getQuestion().getQuestionSeqId()) {
                         answer.setAnswer("1234");
-                    } else if (142 == answer.getQuestion().getQuestionSeqId()) {
+                    } else if (149 == answer.getQuestion().getQuestionSeqId()) {
                         answer.setAnswer("Y");
                     } else if (118 == answer.getQuestion().getQuestionSeqId()) {
                         answer.setAnswer("Y");

pom.xml

@@ -68,7 +68,7 @@
         <cas-client-core.version>3.3.3</cas-client-core.version>
         <cglib.version>3.1</cglib.version>
         <coeus-api-all.version>1602.0001</coeus-api-all.version>
-        <coeus-s2sgen.version>1603.0006</coeus-s2sgen.version>
+        <coeus-s2sgen.version>1603.0007</coeus-s2sgen.version>
         <commons-beanutils.version>1.8.3-kuali-4</commons-beanutils.version>
         <commons-codec.version>1.10</commons-codec.version>
         <commons-collections.version>3.2.2</commons-collections.version>