Skip to content

P
PERFORMA_REPLICA
Commit 7ff9bb59 by Nilu
Options

J003 layout changes

parent 42d469b9
Showing with 37 additions and 42 deletions
cmsWebApp/src/performa/orm/BaseCultureCriteria.java
...@@ -176,7 +176,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -176,7 +176,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
metaInfo.put ("attribHelper", "EnumeratedAttributeHelper"); metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
metaInfo.put ("dbcol", "importance"); metaInfo.put ("dbcol", "importance");
metaInfo.put ("defaultValue", "Importance.DESIRABLE"); metaInfo.put ("defaultValue", "Importance.NOT_APPLICABLE");
metaInfo.put ("mandatory", "true"); metaInfo.put ("mandatory", "true");
metaInfo.put ("name", "Importance"); metaInfo.put ("name", "Importance");
metaInfo.put ("type", "Importance"); metaInfo.put ("type", "Importance");
...@@ -217,7 +217,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -217,7 +217,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
super._initialiseNewObjAttributes (transaction); super._initialiseNewObjAttributes (transaction);
_Importance = (Importance)(Importance.DESIRABLE); _Importance = (Importance)(Importance.NOT_APPLICABLE);
} }
......
cmsWebApp/src/performa/orm/CultureCriteria.java
package performa.orm; package performa.orm;
import oneit.utils.BusinessException;
public class CultureCriteria extends BaseCultureCriteria public class CultureCriteria extends BaseCultureCriteria
{ {
......
cmsWebApp/src/performa/orm/CultureCriteria.xml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,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" 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="CultureElement" type="CultureElement" dbcol="culture_element_id" mandatory="true" />
<SINGLEREFERENCE name="CultureElementRating" type="CultureElementRating" dbcol="culture_element_rating_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 @@ ...@@ -15,17 +15,22 @@
<script type="text/javascript"> <script type="text/javascript">
function moveImportanceSection(elementRating){ function enableElementRating(importanceRadio){
var importanceDiv = $(elementRating).closest('.criteria_section').find('.work-rating'); var importanceGroup = $(importanceRadio).closest('.rate-toggle');
var radioGroup = $("[name='" + $(elementRating).attr('name') +"']");
importanceGroup.find('li.active').removeClass("active" );
if(radioGroup.is(':checked')){ importanceGroup.find("input[type='radio']:checked").closest('li').addClass("active" );
importanceDiv.insertAfter($("[name='" + $(elementRating).attr('name') +"']:checked").parent());
importanceDiv.show(); var criteriaDiv = $(importanceRadio).closest('.criteria_section');
if(importanceGroup.find("input[type='radio']:checked").val() !== 'NOT_APPLICABLE')
{
criteriaDiv.find(".element_rating_radio").removeProp("disabled");
} }
else{ else
importanceDiv.hide(); {
criteriaDiv.find(".element_rating_radio").prop("disabled",true);
} }
} }
...@@ -33,25 +38,17 @@ ...@@ -33,25 +38,17 @@
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
$(".element_rating_radio").each(function (){
moveImportanceSection(this);
});
$(".element_rating_radio").change(function(){
moveImportanceSection(this);
});
$(".importance_radio").change(function(){ $(".importance_radio").change(function(){
var importanceGroup = $(this).closest('.rate-toggle'); enableElementRating(this);
});
importanceGroup.find('li.active').removeClass("active" ); $(".importance_radio").each(function(){
importanceGroup.find("input[type='radio']:checked").closest('li').addClass("active" ); enableElementRating(this);
}); });
$("select[name$='CultureTemplate']").change(function(){ $("select[name$='CultureTemplate']").change(function(){
$("button[name$='loadCultureFromTemplate']").click(); $("button[name$='loadCultureFromTemplate']").click();
}); });
var showError = true; var showError = true;
addPostRecalcHandler (function ($fieldThatChanged) { addPostRecalcHandler (function ($fieldThatChanged) {
if(showError) { if(showError) {
...@@ -158,21 +155,6 @@ ...@@ -158,21 +155,6 @@
<div class="work-radio-title"> <div class="work-radio-title">
<oneit:toString value="<%= criteria.getCultureElement() %>" mode="EscapeHTML"/> <oneit:toString value="<%= criteria.getCultureElement() %>" mode="EscapeHTML"/>
</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 class="work-rating"> <div class="work-rating">
<div class="rate-background"> <div class="rate-background">
<span class="arrow-up-gray"></span> <span class="arrow-up-gray"></span>
...@@ -206,6 +188,21 @@ ...@@ -206,6 +188,21 @@
</span> </span>
</div> </div>
</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>
<div class="form-brack-line-sub"></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