Author: clee
Date: 2007-03-08 22:31:24 -0800 (Thu, 08 Mar 2007)
New Revision: 3684
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3684
Modified:
trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/CompareMetricsFormPrepareAction.java
trunk/web/js/functions.js
trunk/web/js/listWidget.js
trunk/web/resource/common/monitor/visibility/ChildResourcesCurrentHealthByType.jsp
trunk/web/resource/common/monitor/visibility/CompareMetrics.jsp
Log:
[HQ-561]
Fix problem with not differentiating checkboxes in different sections, Javascript error
with compare metrics page, and preparing the display range inputs
Modified: trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/CompareMetricsFormPrepareAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/CompareMetricsFormPrepareAction.java 2007-03-09 01:23:56 UTC (rev 3683)
+++ trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/CompareMetricsFormPrepareAction.java 2007-03-09 06:31:24 UTC (rev 3684)
@@ -26,6 +26,7 @@
package org.hyperic.hq.ui.action.resource.common.monitor.visibility;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -139,14 +140,31 @@
form.setRn((Integer) pref.get(MonitorUtils.LASTN));
form.setRu((Integer) pref.get(MonitorUtils.UNIT));
+ Long begin, end;
+
if (range != null) {
- form.setRb(range.getBegin());
- form.setRe(range.getEnd());
+ begin = range.getBegin();
+ end = range.getEnd();
}
else {
- form.setRb((Long) pref.get(MonitorUtils.BEGIN));
- form.setRe((Long) pref.get(MonitorUtils.END));
+ begin = (Long) pref.get(MonitorUtils.BEGIN);
+ end = (Long) pref.get(MonitorUtils.END);
}
+
+ form.setRb(begin);
+ form.setRe(end);
+
+ form.populateStartDate(new Date(begin.longValue()),
+ request.getLocale());
+ form.populateEndDate(new Date(end.longValue()), request.getLocale());
+
+ Boolean readOnly = (Boolean) pref.get(MonitorUtils.RO);
+ if (readOnly.booleanValue()) {
+ form.setA(MetricDisplayRangeForm.ACTION_DATE_RANGE);
+ }
+ else {
+ form.setA(MetricDisplayRangeForm.ACTION_LASTN);
+ }
}
private static Map mapCategorizedMetrics(Map metrics) {
Modified: trunk/web/js/functions.js
===================================================================
--- trunk/web/js/functions.js 2007-03-09 01:23:56 UTC (rev 3683)
+++ trunk/web/js/functions.js 2007-03-09 06:31:24 UTC (rev 3684)
@@ -56,6 +56,7 @@
widgetProperties["numFromSelected"] = 0; //for add/remove widgets
widgetProperties["numToSelected"] = 0; //for add/remove widgets
widgetProperties["numSelected"] = 0; //for list widgets
+ widgetProperties["subGroup"] = "availableListMember"; //for list widgets
pageData[widgetInstanceName] = widgetProperties;
}
Modified: trunk/web/js/listWidget.js
===================================================================
--- trunk/web/js/listWidget.js 2007-03-09 01:23:56 UTC (rev 3683)
+++ trunk/web/js/listWidget.js 2007-03-09 06:31:24 UTC (rev 3684)
@@ -278,8 +278,8 @@
btnFunction);
}
-function ToggleAllCompare(e, widgetProperties) {
- subGroup="availableListMember";
+function ToggleAllCompare(e, widgetProperties, subGroup) {
+ subGroup = widgetProperties["subGroup"];
if (isIE)
e = event.srcElement;
Modified: trunk/web/resource/common/monitor/visibility/ChildResourcesCurrentHealthByType.jsp
===================================================================
--- trunk/web/resource/common/monitor/visibility/ChildResourcesCurrentHealthByType.jsp 2007-03-09 01:23:56 UTC (rev 3683)
+++ trunk/web/resource/common/monitor/visibility/ChildResourcesCurrentHealthByType.jsp 2007-03-09 06:31:24 UTC (rev 3684)
@@ -36,6 +36,7 @@
<script type="text/javascript">
initializeWidgetProperties('<c:out value="${chbtWidget}"/>');
chbtWidgetProps = getWidgetProperties('<c:out value="${chbtWidget}"/>');
+chbtWidgetProps['subGroup'] = 'chbtListMember';
</script>
<tiles:importAttribute name="summaries" ignore="true"/>
@@ -85,7 +86,7 @@
orderValue="so" order="${param.so}" sortValue="sc" sort="${param.sc}" pageValue="pn"
page="${param.pn}" pageSizeValue="ps" pageSize="${param.ps}" >
<display:column width="1%" property="resourceId" title="<input type=\"checkbox\" onclick=\"ToggleAllCompare(this, chbtWidgetProps)\" name=\"listToggleAll\">" isLocalizedTitle="false" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox">
- <display:checkboxdecorator name="r" onclick="ToggleSelectionCompare(this, chbtWidgetProps);" styleClass="availableListMember"/>
+ <display:checkboxdecorator name="r" onclick="ToggleSelectionCompare(this, chbtWidgetProps);" styleClass="chbtListMember"/>
</display:column>
<display:column width="50%" property="resourceName" title="${ChildTH}" isLocalizedTitle="false" sort="true" sortAttr="5" defaultSort="true" styleClass="ListCell"
href="/resource/${summary.resourceEntityTypeName}/monitor/Visibility.do?mode=currentHealth&type=${summary.resourceTypeId}" paramId="rid" paramProperty="resourceId" nowrap="true"/>
@@ -123,5 +124,5 @@
<input type="hidden" id="privateChildResource">
<script type="text/javascript">
- testCheckboxes("ToggleButtonsCompare", '<c:out value="${chbtWidget}"/>', "privateChildResource", "availableListMember");
+ testCheckboxes("ToggleButtonsCompare", '<c:out value="${chbtWidget}"/>', "privateChildResource", "chbtListMember");
</script>
Modified: trunk/web/resource/common/monitor/visibility/CompareMetrics.jsp
===================================================================
--- trunk/web/resource/common/monitor/visibility/CompareMetrics.jsp 2007-03-09 01:23:56 UTC (rev 3683)
+++ trunk/web/resource/common/monitor/visibility/CompareMetrics.jsp 2007-03-09 06:31:24 UTC (rev 3684)
@@ -41,6 +41,7 @@
var pageData = new Array();
</script>
+<script src="<html:rewrite page="/js/rico.js"/>" type="text/javascript"></script>
<script language="JavaScript" src="<html:rewrite page="/js/listWidget.js"/>" type="text/javascript"></script>
<c:set var="widgetInstanceName" value="compareMetrics"/>
<script type="text/javascript">
@@ -103,14 +104,10 @@
<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"><fmt:message
key="resource.common.monitor.visibility.CompareMetricsReturnLink">
<fmt:param value="${CompareMetricsForm.name}"/></fmt:message></html:link>
+<div id="listDiv" style="padding-top: 24px; padding-bottom: 24px;">
<tiles:insert definition=".header.tab">
<tiles:put name="tabKey" value="resource.common.monitor.visibility.CompareMetricsTab"/>
</tiles:insert>
-<tiles:insert definition=".resource.common.monitor.visibility.metricsDisplayControlForm">
- <tiles:put name="form" beanName="CompareMetricsForm"/>
- <tiles:put name="formName" value="CompareMetricsForm"/>
-</tiles:insert>
-<div id="listDiv">
<table width="100%" cellpadding="0" cellspacing="0" border="0" id="listTable">
<c:forEach var="category" items="${CompareMetricsForm.metrics}">
<c:choose>
@@ -218,11 +215,17 @@
</c:forEach>
</table>
+<tiles:insert definition=".resource.common.monitor.visibility.metricsDisplayControlForm">
+ <tiles:put name="form" beanName="CompareMetricsForm"/>
+ <tiles:put name="formName" value="CompareMetricsForm"/>
+</tiles:insert>
+
<tiles:insert definition=".resource.common.monitor.visibility.metricsToolbar">
<tiles:put name="widgetInstanceName" beanName="widgetInstanceName"/>
<tiles:put name="useCurrentButton" value="true"/>
</tiles:insert>
</div>
+
<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"><fmt:message
key="resource.common.monitor.visibility.CompareMetricsReturnLink">
<fmt:param value="${CompareMetricsForm.name}"/></fmt:message></html:link>
|
