Skip to content

P
PERFORMA_REPLICA
Commit 7ff9bb59 by Nilu
Options

J003 layout changes

parent 42d469b9
Showing with 35 additions and 40 deletions
cmsWebApp/src/performa/orm/BaseCultureCriteria.java
......@@ -176,7 +176,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
metaInfo.put ("dbcol", "importance");
metaInfo.put ("defaultValue", "Importance.DESIRABLE");
metaInfo.put ("defaultValue", "Importance.NOT_APPLICABLE");
metaInfo.put ("mandatory", "true");
metaInfo.put ("name", "Importance");
metaInfo.put ("type", "Importance");
......@@ -217,7 +217,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
super._initialiseNewObjAttributes (transaction);
_Importance = (Importance)(Importance.DESIRABLE);
_Importance = (Importance)(Importance.NOT_APPLICABLE);
}
......
cmsWebApp/src/performa/orm/CultureCriteria.java
package performa.orm;
import oneit.utils.BusinessException;
public class CultureCriteria extends BaseCultureCriteria
{
......
cmsWebApp/src/performa/orm/CultureCriteria.xml
......@@ -7,7 +7,7 @@
<TABLE name="tl_culture_criteria" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Importance" type="Importance" dbcol="importance" attribHelper="EnumeratedAttributeHelper" mandatory="true" defaultValue="Importance.DESIRABLE"/>
<ATTRIB name="Importance" type="Importance" dbcol="importance" attribHelper="EnumeratedAttributeHelper" mandatory="true" defaultValue="Importance.NOT_APPLICABLE"/>
<SINGLEREFERENCE name="CultureElement" type="CultureElement" dbcol="culture_element_id" mandatory="true" />
<SINGLEREFERENCE name="CultureElementRating" type="CultureElementRating" dbcol="culture_element_rating_id" mandatory="true" />
......
cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp
......@@ -15,17 +15,22 @@
<script type="text/javascript">
function moveImportanceSection(elementRating){
function enableElementRating(importanceRadio){
var importanceDiv = $(elementRating).closest('.criteria_section').find('.work-rating');
var radioGroup = $("[name='" + $(elementRating).attr('name') +"']");
var importanceGroup = $(importanceRadio).closest('.rate-toggle');
if(radioGroup.is(':checked')){
importanceDiv.insertAfter($("[name='" + $(elementRating).attr('name') +"']:checked").parent());
importanceDiv.show();
importanceGroup.find('li.active').removeClass("active" );
importanceGroup.find("input[type='radio']:checked").closest('li').addClass("active" );
var criteriaDiv = $(importanceRadio).closest('.criteria_section');
if(importanceGroup.find("input[type='radio']:checked").val() !== 'NOT_APPLICABLE')
{
criteriaDiv.find(".element_rating_radio").removeProp("disabled");
}
else{
importanceDiv.hide();
else
{
criteriaDiv.find(".element_rating_radio").prop("disabled",true);
}
}
......@@ -33,19 +38,11 @@
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
$(".element_rating_radio").each(function (){
moveImportanceSection(this);
});
$(".element_rating_radio").change(function(){
moveImportanceSection(this);
});
$(".importance_radio").change(function(){
var importanceGroup = $(this).closest('.rate-toggle');
importanceGroup.find('li.active').removeClass("active" );
importanceGroup.find("input[type='radio']:checked").closest('li').addClass("active" );
enableElementRating(this);
});
$(".importance_radio").each(function(){
enableElementRating(this);
});
$("select[name$='CultureTemplate']").change(function(){
......@@ -158,21 +155,6 @@
<div class="work-radio-title">
<oneit:toString value="<%= criteria.getCultureElement() %>" mode="EscapeHTML"/>
</div>
<%
for (CultureElementRating rating : criteria.getCultureElement().getRatingsSet())
{
String ratingId = String.valueOf(rating.getID().longID());
String selectedStr = (CollectionUtils.equals(ratingId, formValue) ? "checked" : "");
%>
<div class="<%= "radio radio-primary workplace-radio " %>">
<input type="radio" name="<%= optionKey %>" id="<%= ratingId %>" class="element_rating_radio" value="<%= ratingId %>" <%= selectedStr %> >
<label for="<%= ratingId %>">
<oneit:toString value="<%= rating %>" mode="EscapeHTML"/>
</label>
</div>
<%
}
%>
<div class="work-rating">
<div class="rate-background">
<span class="arrow-up-gray"></span>
......@@ -206,6 +188,21 @@
</span>
</div>
</div>
<%
for (CultureElementRating rating : criteria.getCultureElement().getRatingsSet())
{
String ratingId = String.valueOf(rating.getID().longID());
String selectedStr = (CollectionUtils.equals(ratingId, formValue) ? "checked" : "");
%>
<div class="<%= "radio radio-primary workplace-radio " %>">
<input type="radio" name="<%= optionKey %>" id="<%= ratingId %>" class="element_rating_radio" value="<%= ratingId %>" <%= selectedStr %> >
<label for="<%= ratingId %>">
<oneit:toString value="<%= rating %>" mode="EscapeHTML"/>
</label>
</div>
<%
}
%>
</div>
<div class="form-brack-line-sub"></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