Finish Hotfix-20190412

cmsWebApp/src/performa/orm/AssessmentCriteriaAnswer.xml

@@ -24,6 +24,11 @@
             <PARAM  name="CriteriaType" type="CriteriaType" paramFilter="tl_assessment_criteria.assessment_type = ${CriteriaType}" />
         </SEARCH>
         
+        <SEARCH type="CriteriaApplication"  paramFilter="tl_assessment_criteria_answer.object_id is not null"   singleton="TRUE">
+            <PARAM name="AssessmentCriteria"    type="AssessmentCriteria"   transform="AssessmentCriteria.getObjectID ()"   paramFilter="tl_assessment_criteria_answer.assessment_criteria_id = ${AssessmentCriteria}"/>
+            <PARAM name="JobApplication"        type="JobApplication"       transform="JobApplication.getObjectID ()"       paramFilter="tl_assessment_criteria_answer.job_application_id = ${JobApplication}"/>
+        </SEARCH>
+        
     </BUSINESSCLASS>
     
 </ROOT>
\ No newline at end of file

cmsWebApp/src/performa/orm/AssessmentCriteriaAnswerPersistenceMgr.java

@@ -284,6 +284,10 @@ public class AssessmentCriteriaAnswerPersistenceMgr extends ObjectPersistenceMgr
     {
         throw new RuntimeException ("NOT implemented: executeSearchQueryCriteriaType");
     }
+    public ResultSet executeSearchQueryCriteriaApplication (SQLManager sqlMgr, AssessmentCriteria AssessmentCriteria, JobApplication JobApplication) throws SQLException
+    {
+        throw new RuntimeException ("NOT implemented: executeSearchQueryCriteriaApplication");
+    }
     
 
 
@@ -478,6 +482,68 @@ public class AssessmentCriteriaAnswerPersistenceMgr extends ObjectPersistenceMgr
                 return results;
             
         }
+        else if (searchType.equals (AssessmentCriteriaAnswer.SEARCH_CriteriaApplication))
+        {
+            // Local scope for transformed variables
+            {
+                
+                if (criteria.containsKey("AssessmentCriteria"))
+                {
+                AssessmentCriteria AssessmentCriteria = (AssessmentCriteria)(criteria.get("AssessmentCriteria"));
+                criteria.put ("AssessmentCriteria", AssessmentCriteria.getObjectID ());
+                }
+                if (criteria.containsKey("JobApplication"))
+                {
+                JobApplication JobApplication = (JobApplication)(criteria.get("JobApplication"));
+                criteria.put ("JobApplication", JobApplication.getObjectID ());
+                }
+            }
+
+
+            
+                String      orderBy = " ";
+                String      tables = " ";
+                Set<String> joinTableSet = new HashSet<String>();
+                String      filter;
+                Object[]    searchParams; // paramFilter: tl_assessment_criteria_answer.object_id is not null
+                    String preFilter = "(tl_assessment_criteria_answer.object_id is not null)"
+                                     + "  ";
+                    
+                        if (criteria.containsKey("AssessmentCriteria"))
+                        {
+                            preFilter += " AND (tl_assessment_criteria_answer.assessment_criteria_id = ${AssessmentCriteria}) ";
+                            preFilter += "";
+                            
+                        }
+                    
+                        if (criteria.containsKey("JobApplication"))
+                        {
+                            preFilter += " AND (tl_assessment_criteria_answer.job_application_id = ${JobApplication}) ";
+                            preFilter += "";
+                            
+                        }
+                    
+                    
+                    preFilter += context.getLoadingAttributes ().getCustomSQL() ;
+                    
+                    SearchParamTransform tx = new SearchParamTransform (criteria);
+                    
+                    filter = StringUtils.replaceParams (preFilter, tx);
+                    searchParams = tx.getParamsArray();
+                
+
+                Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
+                boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
+                String  query = "SELECT " + SELECT_COLUMNS +
+                                        "FROM {PREFIX}tl_assessment_criteria_answer " +  tables + tableSetToSQL(joinTableSet) +
+                                        "WHERE " + SELECT_JOINS + " " + filter + orderBy;
+                
+
+                BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, maxRows, truncateExtra);
+
+                return results;
+            
+        }
         
         else
         {

cmsWebApp/src/performa/orm/BaseAssessmentCriteriaAnswer.java

@@ -50,6 +50,7 @@ public abstract class BaseAssessmentCriteriaAnswer extends BaseBusinessClass
     // Static constants corresponding to searches
     public static final String SEARCH_All = "All";
     public static final String SEARCH_CriteriaType = "CriteriaType";
+    public static final String SEARCH_CriteriaApplication = "CriteriaApplication";
     
 
     // Static constants corresponding to attribute helpers
@@ -1427,6 +1428,93 @@ public abstract class BaseAssessmentCriteriaAnswer extends BaseBusinessClass
             .search (transaction);
         }
 
+    public static SearchCriteriaApplication SearchByCriteriaApplication () { return new SearchCriteriaApplication (); }
+
+    public static class SearchCriteriaApplication extends SearchObject<AssessmentCriteriaAnswer>
+    {
+        
+        public SearchCriteriaApplication byAssessmentCriteria (AssessmentCriteria AssessmentCriteria)
+        {
+            by ("AssessmentCriteria", AssessmentCriteria);
+            return this;
+        }
+        
+        public SearchCriteriaApplication byJobApplication (JobApplication JobApplication)
+        {
+            by ("JobApplication", JobApplication);
+            return this;
+        }
+        
+            public SearchCriteriaApplication andObjectID (QueryFilter<Long> filter)
+            {
+                filter.addFilter (context, "tl_assessment_criteria_answer.object_id", FIELD_ObjectID);
+                return this;
+            }
+
+            public SearchCriteriaApplication andObjectCreated (QueryFilter<Date> filter)
+            {
+                filter.addFilter (context, "tl_assessment_criteria_answer.object_created_date", FIELD_ObjectCreated);
+                return this;
+            }
+
+            public SearchCriteriaApplication andObjectLastModified (QueryFilter<Date> filter)
+            {
+                filter.addFilter (context, "tl_assessment_criteria_answer.object_last_updated_date", FIELD_ObjectLastModified);
+                return this;
+            }
+
+            
+            public SearchCriteriaApplication andAnswer (QueryFilter<Boolean> filter)
+            {
+                filter.addFilter (context, "tl_assessment_criteria_answer.answer", "Answer");
+                return this;
+            }
+            
+            public SearchCriteriaApplication andNotes (QueryFilter<String> filter)
+            {
+                filter.addFilter (context, "tl_assessment_criteria_answer.notes", "Notes");
+                return this;
+            }
+            
+            public SearchCriteriaApplication andAssessmentCriteria (QueryFilter<AssessmentCriteria> filter)
+            {
+                filter.addFilter (context, "tl_assessment_criteria_answer.assessment_criteria_id", "AssessmentCriteria");
+                return this;
+            }
+            
+            public SearchCriteriaApplication andJobApplication (QueryFilter<JobApplication> filter)
+            {
+                filter.addFilter (context, "tl_assessment_criteria_answer.job_application_id", "JobApplication");
+                return this;
+            }
+            
+                public AssessmentCriteriaAnswer search (ObjectTransaction transaction) throws StorageException
+        {
+            
+            
+            BaseBusinessClass[]     results = super.search (transaction, REFERENCE_AssessmentCriteriaAnswer, SEARCH_CriteriaApplication, criteria);
+            Set<AssessmentCriteriaAnswer>   typedResults = new LinkedHashSet <AssessmentCriteriaAnswer> ();
+            for (BaseBusinessClass bbcResult : results)
+            {
+                AssessmentCriteriaAnswer aResult = (AssessmentCriteriaAnswer)bbcResult;
+                
+                typedResults.add (aResult);
+            }
+            
+                    return (AssessmentCriteriaAnswer)singletonResult(ObjstoreUtils.removeDeleted(transaction, typedResults).toArray(new BaseBusinessClass[0]), "AssessmentCriteriaAnswer", "");
+                            
+        }
+    }
+
+        
+                public static AssessmentCriteriaAnswer searchCriteriaApplication (ObjectTransaction transaction, AssessmentCriteria AssessmentCriteria, JobApplication JobApplication) throws StorageException
+        {
+            return SearchByCriteriaApplication ()
+            .byAssessmentCriteria  (AssessmentCriteria)
+            .byJobApplication  (JobApplication)
+            .search (transaction);
+        }
+
 
 
     public Object getAttribute (String attribName)

cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp

@@ -192,7 +192,7 @@
                                                                                 .mapEntry("DraftLocation", DraftLocation.ASSESSMENT)
                                                                                 .mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
                                                                                 .toMap() %>"/>
-                            <oneit:button   value="Proceed to Culture"  name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
+                            <oneit:button   value="Proceed to Culture"  name="processCulture" cssClass="btn btn-primary top-margin-25 largeBtn"
                                             requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
                                                                             .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
                                                                             .mapEntry("fromAssessment", true)

cmsWebApp/webroot/extensions/applicantportal/selection_criteria.jsp

@@ -144,7 +144,7 @@
                                             String                      falseID         =   criteria.getObjectID() + "_N";
                                             String                      trueSelected    =   "";
                                             String                      falseSelected   =   "";
-                                            AssessmentCriteriaAnswer    answer          =   jobApplication.getAssessmentCriteriaAnswer(criteria);
+                                            AssessmentCriteriaAnswer    answer          =   AssessmentCriteriaAnswer.searchCriteriaApplication(objTran, criteria, jobApplication);
 
                                             if(answer != null)
                                             {