Commit bec3a154 by Nilu

S12781369 # Client - Incoming Issues (raised by Client) #Please default Culture elements to On

parent c2162048
...@@ -39,18 +39,10 @@ public class ProcessCultureFP extends SaveFP ...@@ -39,18 +39,10 @@ public class ProcessCultureFP extends SaveFP
HttpServletRequest request = submission.getRequest(); HttpServletRequest request = submission.getRequest();
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
boolean fromJobMatch = request.getAttribute("fromJobMatch") != null ? (boolean) request.getAttribute("fromJobMatch"): false; boolean fromJobMatch = request.getAttribute("fromJobMatch") != null ? (boolean) request.getAttribute("fromJobMatch"): false;
boolean fromCulture = request.getAttribute("fromCulture") != null ? (boolean) request.getAttribute("fromCulture"): false;
Debug.assertion(job != null, "No job found . Call from " + getClass().getName()); Debug.assertion(job != null, "No job found . Call from " + getClass().getName());
for(CultureCriteria criteria: job.getCultureCriteriasSet())
{
if(criteria.getIsApplicable())
{
BusinessObjectParser.assertFieldCondition(criteria.getCultureElementRating() != null, criteria , CultureCriteria.SINGLEREFERENCE_CultureElementRating, "mandatory", exceptions, true, request);
BusinessObjectParser.assertFieldCondition(criteria.getImportance() != null, criteria , CultureCriteria.FIELD_Importance, "mandatory", exceptions, true, request);
}
}
if(fromJobMatch) if(fromJobMatch)
{ {
...@@ -66,5 +58,18 @@ public class ProcessCultureFP extends SaveFP ...@@ -66,5 +58,18 @@ public class ProcessCultureFP extends SaveFP
BusinessObjectParser.assertFieldCondition(job.showLevelOption(job.getLevel()), job , Job.SINGLEREFERENCE_Level, "invalid", exceptions, true, request); BusinessObjectParser.assertFieldCondition(job.showLevelOption(job.getLevel()), job , Job.SINGLEREFERENCE_Level, "invalid", exceptions, true, request);
} }
} }
if(fromCulture)
{
for(CultureCriteria criteria: job.getCultureCriteriasSet())
{
if(criteria.getIsApplicable())
{
BusinessObjectParser.assertFieldCondition(criteria.getCultureElementRating() != null, criteria , CultureCriteria.SINGLEREFERENCE_CultureElementRating, "mandatory", exceptions, true, request);
BusinessObjectParser.assertFieldCondition(criteria.getImportance() != null, criteria , CultureCriteria.FIELD_Importance, "mandatory", exceptions, true, request);
}
}
}
} }
} }
\ No newline at end of file
...@@ -199,7 +199,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -199,7 +199,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "is_applicable"); metaInfo.put ("dbcol", "is_applicable");
metaInfo.put ("defaultValue", "Boolean.FALSE"); metaInfo.put ("defaultValue", "Boolean.TRUE");
metaInfo.put ("name", "IsApplicable"); metaInfo.put ("name", "IsApplicable");
metaInfo.put ("type", "Boolean"); metaInfo.put ("type", "Boolean");
...@@ -240,7 +240,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -240,7 +240,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
_Importance = (Importance)(HELPER_Importance.initialise (_Importance)); _Importance = (Importance)(HELPER_Importance.initialise (_Importance));
_IsApplicable = (Boolean)(Boolean.FALSE); _IsApplicable = (Boolean)(Boolean.TRUE);
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<TABLE name="tl_culture_criteria" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_culture_criteria" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Importance" type="Importance" dbcol="importance" attribHelper="EnumeratedAttributeHelper" /> <ATTRIB name="Importance" type="Importance" dbcol="importance" attribHelper="EnumeratedAttributeHelper" />
<ATTRIB name="IsApplicable" type="Boolean" dbcol="is_applicable" defaultValue="Boolean.FALSE" /> <ATTRIB name="IsApplicable" type="Boolean" dbcol="is_applicable" defaultValue="Boolean.TRUE" />
<SINGLEREFERENCE name="CultureElement" type="CultureElement" dbcol="culture_element_id" mandatory="true" /> <SINGLEREFERENCE name="CultureElement" type="CultureElement" dbcol="culture_element_id" mandatory="true" />
<SINGLEREFERENCE name="CultureElementRating" type="CultureElementRating" dbcol="culture_element_rating_id" mandatory="false" /> <SINGLEREFERENCE name="CultureElementRating" type="CultureElementRating" dbcol="culture_element_rating_id" mandatory="false" />
......
...@@ -251,6 +251,7 @@ ...@@ -251,6 +251,7 @@
<oneit:button value="Review Job Details" name="processCulture" cssClass="btn btn-primary top-margin-25 largeBtn" <oneit:button value="Review Job Details" name="processCulture" cssClass="btn btn-primary top-margin-25 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("Job", job) .mapEntry("Job", job)
.mapEntry("fromCulture", true)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>" /> .toMap() %>" />
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment