svn commit: r522793 [3/4] - in /ofbiz/trunk/framework/webtool
Locked
svn commit: r522793 [3/4] - in /ofbiz/trunk/framework/webtool
 
|
Added: ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl?view=auto&rev=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl (added) +++ ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl Tue Mar 27 00:04:31 2007 @@ -0,0 +1,294 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<#assign nowDate = Static["org.ofbiz.base.util.UtilDateTime"].nowDate()> + +<h1>Custom Time Period Maintenance</h1> +<br /> +<#if security.hasPermission("PERIOD_MAINT", session)> + <form method="post" action="<@ofbizUrl>EditCustomTimePeriod</@ofbizUrl>" name="setOrganizationPartyIdForm"> + <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}"> + <span class="label">Show Only Periods with Organization Party ID</span> + <input type="text" size="20" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}"> + <input type="submit" value='Update'> + </form> + + <br/> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <#if currentCustomTimePeriod?has_content> + <ul> + <h3>Current Custom Time Period</h3> + <li><a href="<@ofbizUrl>EditCustomTimePeriod?findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>">Clear Current</a></li> + </ul> + <br class="clear" /> + <#else> + <h3>Current Custom Time Period</h3> + </#if> + </div> + <#if currentCustomTimePeriod?has_content> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>ID</td> + <td>Parent ID</td> + <td>Org Party ID</td> + <td>Period Type</td> + <td>#</td> + <td>Name</td> + <td>From Date</td> + <td>Thru Date</td> + <td> </td> + </tr> + <form method="post" action="<@ofbizUrl>updateCustomTimePeriod</@ofbizUrl>" name="updateCustomTimePeriodForm"> + <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}"> + <input type="hidden" name="customTimePeriodId" value="${currentCustomTimePeriodId?if_exists}"> + <tr> + <td>${currentCustomTimePeriod.customTimePeriodId}</td> + <td> + <select name="parentPeriodId"> + <option value=''> </option> + <#list allCustomTimePeriods as allCustomTimePeriod> + <#assign allPeriodType = allCustomTimePeriod.getRelatedOneCache("PeriodType")> + <#assign isDefault = false> + <#if (currentCustomTimePeriod.parentPeriodId)?exists> + <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId> + <#assign isDefault = true> + </#if> + </#if> + <option value='${allCustomTimePeriod.customTimePeriodId}'<#if isDefault> selected="selected"</#if>> + Pty:${allCustomTimePeriod.organizationPartyId} + <#if allPeriodType != null>${allPeriodType.description}:</#if> + ${allCustomTimePeriod.periodNum} + [${allCustomTimePeriod.customTimePeriodId}] + </option> + </#list> + </select> + <#if (currentCustomTimePeriod.parentPeriodId)?exists> + <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${currentCustomTimePeriod.parentPeriodId}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'> + Set As Current</a> + </#if> + </td> + <td><input type="text" size='12' name="currentCustomTimePeriod" value="${currentCustomTimePeriod.organizationPartyId?if_exists}"></td> + <td> + <select name="periodTypeId"> + <#list periodTypes as periodType> + <#assign isDefault = false> + <#if (currentCustomTimePeriod.periodTypeId)?exists> + <#if currentCustomTimePeriod.periodTypeId = periodType.periodTypeId> + <#assign isDefault = true> + </#if> + </#if> + <option value='${periodType.periodTypeId}'<#if isDefault> selected="selected"</#if>> + ${periodType.description} [${periodType.periodTypeId}] + </option> + </#list> + </select> + </td> + <td><input type="text" size='4' name="periodNum" value="${currentCustomTimePeriod.periodNum?if_exists}"></td> + <td><input type="text" size='10' name="periodName" value="${currentCustomTimePeriod.periodName?if_exists}"></td> + <td> + <#assign hasntStarted = false> + <#assign compareDate = currentCustomTimePeriod.getDate("fromDate")> + <#if compareDate?has_content> + <#if nowDate.before(compareDate)><#assign hasntStarted = true></#if> + </#if> + <input type="text" size='13' name="fromDate" value="${currentCustomTimePeriod.fromDate?string("yyyy-MM-dd")}"<#if hasntStarted> class="alert"</#if>> + </td> + <td> + <#assign hasExpired = false> + <#assign compareDate = currentCustomTimePeriod.getDate("thruDate")> + <#if compareDate?has_content> + <#if nowDate.after(compareDate)><#assign hasExpired = true></#if> + </#if> + <input type="text" size='13' name="thruDate" value="${currentCustomTimePeriod.thruDate?string("yyyy-MM-dd")}"<#if hasntStarted> class="alert"</#if>> + </td> + <td class="button-col"> + <input type="submit" value='Update'> + <a href='<@ofbizUrl>deleteCustomTimePeriod?customTimePeriodId=${currentCustomTimePeriod.customTimePeriodId}</@ofbizUrl>'> + Delete</a> + </td> + </tr> + </form> + </table> + <#else> + <div class="screenlet-body">No Current Custom Time Period Selected; "Children" below have no Parent Period.</div> + </#if> + </div> + <br/> + + <div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>Child Periods</h3> + </div> + <#if customTimePeriods?has_content> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>ID</td> + <td>Parent ID</td> + <td>Org Party ID</td> + <td>Period Type</td> + <td>#</td> + <td>Name</td> + <td>From Date</td> + <td>Thru Date</td> + <td> </td> + </tr> + <#assign line = 0> + <#list customTimePeriods as customTimePeriod> + <#assign line = line + 1> + <#assign periodType = customTimePeriod.getRelatedOneCache("PeriodType")> + <tr> + <form method="post" action='<@ofbizUrl>updateCustomTimePeriod</@ofbizUrl>' name='lineForm${line}'> + <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}"> + <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}"> + <input type="hidden" name="customTimePeriodId" value="${customTimePeriodId?if_exists}"> + <td>${customTimePeriod.customTimePeriodId}</td> + <td> + <select name="parentPeriodId"> + <option value=''> </option> + <#list allCustomTimePeriods as allCustomTimePeriod> + <#assign allPeriodType = allCustomTimePeriod.getRelatedOneCache("PeriodType")> + <#assign isDefault = false> + <#if (currentCustomTimePeriod.parentPeriodId)?exists> + <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId> + <#assign isDefault = true> + </#if> + </#if> + <option value='${allCustomTimePeriod.customTimePeriodId}'<#if isDefault> selected="selected"</#if>> + Pty:${allCustomTimePeriod.organizationPartyId} + <#if allPeriodType != null> ${allPeriodType.description}: </#if> + ${allCustomTimePeriod.periodNum} + [${allCustomTimePeriod.customTimePeriodId}] + </option> + </#list> + </select> + </td> + <td><input type="text" class='inputBox' size='12' name="organizationPartyId" value="${customTimePeriod.organizationPartyId?if_exists}"></td> + <td> + <select name="periodTypeId"> + <#list periodTypes as periodType> + <#assign isDefault = false> + <#if (customTimePeriod.periodTypeId)?exists> + <#if customTimePeriod.periodTypeId = periodType.periodTypeId> + <#assign isDefault = true> + </#if> + </#if> + <option value='${periodType.periodTypeId}'<#if isDefault> selected="selected"</#if>>${periodType.description} [${periodType.periodTypeId}]</option> + </#list> + </select> + </td> + <td><input type="text" size='4' name="periodNum" value="${customTimePeriod.periodNum?if_exists}"></td> + <td><input type="text" size='10' name="periodName" value="${customTimePeriod.periodName?if_exists}"></td> + <td> + <#assign hasntStarted = false> + <#assign compareDate = customTimePeriod.getDate("fromDate")> + <#if compareDate?has_content> + <#if nowDate.before(compareDate)><#assign hasntStarted = true></#if> + </#if> + <input type="text" size='13' name="fromDate" value="${customTimePeriod.fromDate?if_exists}"<#if hasntStarted> class="alert"</#if>> + </td> + <td> + <#assign hasExpired = false> + <#assign compareDate = customTimePeriod.getDate("thruDate")> + <#if compareDate?has_content> + <#if nowDate.after(compareDate)><#assign hasExpired = true></#if> + </#if> + <input type="text" size='13' name="thruDate" value="${customTimePeriod.thruDate?if_exists}"<#if hasExpired> class="alert"</#if>> + </td> + <td class="button-col"> + <input type="submit" value='Update'> + <a href='<@ofbizUrl>deleteCustomTimePeriod?customTimePeriodId=${customTimePeriod.customTimePeriodId?if_exists}¤tCustomTimePeriodId=${currentCustomTimePeriodId?if_exists}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'> + Delete</a> + <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${customTimePeriod.customTimePeriodId?if_exists}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'> + Set As Current</a> + </td> + </form> + </tr> + </#list> + </table> + <#else> + <div class="screenlet-body">No child periods found</div> + </#if> + </div> + <br/> + + <div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>Add Custom Time Period</h3> + </div> + <div class="screenlet-body"> + <form method="POST" action="<@ofbizUrl>createCustomTimePeriod</@ofbizUrl>" name="createCustomTimePeriodForm"> + <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}"> + <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}"> + <input type="hidden" name="useValues" value="true"> + <div> + <span class="label">Parent Period</span> + <select name="parentPeriodId"> + <option value=''> </option> + <#list allCustomTimePeriods as allCustomTimePeriod> + <#assign allPeriodType = allCustomTimePeriod.getRelatedOneCache("PeriodType")> + <#assign isDefault = false> + <#if currentCustomTimePeriod?exists> + <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId> + <#assign isDefault = true> + </#if> + </#if> + <option value="${allCustomTimePeriod.customTimePeriodId}"<#if isDefault> selected="selected"</#if>> + Pty:${allCustomTimePeriod.organizationPartyId} + <#if (allCustomTimePeriod.parentPeriodId)?exists>Par:${allCustomTimePeriod.parentPeriodId}</#if> + <#if allPeriodType != null> ${allPeriodType.description}:</#if> + ${allCustomTimePeriod.periodNum} + [${allCustomTimePeriod.customTimePeriodId}] + </option> + </#list> + </select> + </div> + <div> + <span class="label">Organization Party ID</span> + <input type="text" size='20' name='organizationPartyId'> + <span class="label">Period Type</span> + <select name="periodTypeId"> + <#list periodTypes as periodType> + <#assign isDefault = false> + <#if newPeriodTypeId?exists> + <#if newPeriodTypeId = periodType.periodTypeId> + <#assign isDefault = true> + </#if> + </#if> + <option value="${periodType.periodTypeId}" <#if isDefault>selected="selected"</#if>>${periodType.description} [${periodType.periodTypeId}]</option> + </#list> + </select> + <span class="label">Period Number</span> + <input type="text" size='4' name='periodNum'> + <span class="label">Period Name</span> + <input type="text" size='10' name='periodName'> + </div> + <div> + <span class="label">From Date</span> + <input type="text" size='14' name='fromDate'> + <span class="label">Thru Date</span> + <input type="text" size='14' name='thruDate'> + <input type="submit" value="Add"> + </div> + </form> + </div> + </div> +<#else> + <h3>You do not have permission to view this page (PERIOD_MAINT needed).</h3> +</#if> Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.jsp URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.jsp?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.jsp (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.jsp Tue Mar 27 00:04:31 2007 @@ -1,261 +0,0 @@ -<%-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---%> - -<%@ page import="java.util.*, java.net.*" %> -<%@ page import="org.ofbiz.security.*, org.ofbiz.entity.*, org.ofbiz.base.util.*, org.ofbiz.webapp.pseudotag.*" %> - -<%@ taglib uri="ofbizTags" prefix="ofbiz" %> - -<jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /> -<jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /> - -<% - String findOrganizationPartyId = request.getParameter("findOrganizationPartyId"); - if ("".equals(findOrganizationPartyId)) findOrganizationPartyId = null; - String currentCustomTimePeriodId = request.getParameter("currentCustomTimePeriodId"); - if ("".equals(currentCustomTimePeriodId)) currentCustomTimePeriodId = null; - - GenericValue currentCustomTimePeriod = currentCustomTimePeriodId == null ? null : delegator.findByPrimaryKey("CustomTimePeriod", UtilMisc.toMap("customTimePeriodId", currentCustomTimePeriodId)); - if (currentCustomTimePeriod != null) pageContext.setAttribute("currentCustomTimePeriod", currentCustomTimePeriod); - GenericValue currentPeriodType = currentCustomTimePeriod == null ? null : currentCustomTimePeriod.getRelatedOneCache("PeriodType"); - if (currentPeriodType != null) pageContext.setAttribute("currentPeriodType", currentPeriodType); - - List customTimePeriods = delegator.findByAnd("CustomTimePeriod", - UtilMisc.toMap("organizationPartyId", findOrganizationPartyId, "parentPeriodId", currentCustomTimePeriodId), - UtilMisc.toList("periodTypeId", "periodNum", "fromDate")); - if (customTimePeriods != null) pageContext.setAttribute("customTimePeriods", customTimePeriods); - - List allCustomTimePeriods = delegator.findAll("CustomTimePeriod", UtilMisc.toList("organizationPartyId", "parentPeriodId", "periodTypeId", "periodNum", "fromDate")); - if (allCustomTimePeriods != null) pageContext.setAttribute("allCustomTimePeriods", allCustomTimePeriods); - - List periodTypes = delegator.findAllCache("PeriodType", UtilMisc.toList("description")); - if (periodTypes != null) pageContext.setAttribute("periodTypes", periodTypes); - - String newPeriodTypeId = "FISCAL_YEAR"; - if (currentCustomTimePeriod != null && "FISCAL_YEAR".equals(currentCustomTimePeriod.getString("periodTypeId"))) newPeriodTypeId = "FISCAL_QUARTER"; - if (currentCustomTimePeriod != null && "FISCAL_QUARTER".equals(currentCustomTimePeriod.getString("periodTypeId"))) newPeriodTypeId = "FISCAL_MONTH"; - if (currentCustomTimePeriod != null && "FISCAL_MONTH".equals(currentCustomTimePeriod.getString("periodTypeId"))) newPeriodTypeId = "FISCAL_WEEK"; - if (currentCustomTimePeriod != null && "FISCAL_BIWEEK".equals(currentCustomTimePeriod.getString("periodTypeId"))) newPeriodTypeId = "FISCAL_WEEK"; - if (currentCustomTimePeriod != null && "FISCAL_WEEK".equals(currentCustomTimePeriod.getString("periodTypeId"))) newPeriodTypeId = ""; -%> - -<h3 style='margin:0;'>Custom Time Period Maintenance Page</h3> - -<%if(security.hasPermission("PERIOD_MAINT", session)){%> - -<!-- - <attribute name="customTimePeriodId" type="String" mode="IN" optional="false"/> - <attribute name="parentPeriodId" type="String" mode="IN" optional="true"/> - <attribute name="organizationPartyId" type="String" mode="IN" optional="true"/> - <attribute name="periodTypeId" type="String" mode="IN" optional="false"/> - <attribute name="periodNum" type="Long" mode="IN" optional="true"/> - <attribute name="fromDate" type="Date" mode="IN" optional="true"/> - <attribute name="thruDate" type="Date" mode="IN" optional="true"/> ---> -<br/> -<FORM method="post" action='<ofbiz:url>/EditCustomTimePeriod</ofbiz:url>' name='setOrganizationPartyIdForm'> - <input type="hidden" name="currentCustomTimePeriodId" value="<%=UtilFormatOut.checkNull(currentCustomTimePeriodId)%>"> - <div class='tabletext'> - Show Only Periods with Organization Party ID: - <input type="text" class='inputBox' size="20" name="findOrganizationPartyId" value="<%=UtilFormatOut.checkNull(findOrganizationPartyId)%>"> - <INPUT type="submit" value='Update' style='font-size: x-small;'> - </div> -</FORM> -<br/> -<div class='tabletext'>Current Custom Time Period <ofbiz:if name="currentCustomTimePeriod"><a href='<ofbiz:url>/EditCustomTimePeriod<%=findOrganizationPartyId == null ? "" : "?findOrganizationPartyId=" + findOrganizationPartyId%></ofbiz:url>' class="buttontext">[Clear Current]</a></ofbiz:if></div> -<TABLE border='1' cellpadding='2' cellspacing='0'> - <TR> - <TD><div class='tabletext'>ID</div></TD> - <TD><div class='tabletext'>Parent ID</div></TD> - <TD><div class='tabletext'>Org Party ID</div></TD> - <TD><div class='tabletext'>Period Type</div></TD> - <TD><div class='tabletext'>#</div></TD> - <TD><div class='tabletext'>Name</div></TD> - <TD><div class='tabletext'>From Date</div></TD> - <TD><div class='tabletext'>Thru Date</div></TD> - <TD><div class='tabletext'> </div></TD> - <TD><div class='tabletext'> </div></TD> - </TR> - <ofbiz:if name="currentCustomTimePeriod"> - <FORM method="post" action='<ofbiz:url>/updateCustomTimePeriod</ofbiz:url>' name='updateCustomTimePeriodForm'> - <input type="hidden" name="findOrganizationPartyId" value="<%=UtilFormatOut.checkNull(findOrganizationPartyId)%>"> - <input type="hidden" name="currentCustomTimePeriodId" value="<%=UtilFormatOut.checkNull(currentCustomTimePeriodId)%>"> - <td><div class='tabletext'><ofbiz:inputvalue entityAttr="currentCustomTimePeriod" field="customTimePeriodId"/></div></td> - <td> - <select name="parentPeriodId" class='selectBox'> - <option value=''> </option> - <ofbiz:iterator name="allCustomTimePeriod" property="allCustomTimePeriods"> - <%GenericValue allPeriodType = allCustomTimePeriod.getRelatedOneCache("PeriodType");%> - <%boolean isDefault = currentCustomTimePeriod.getString("parentPeriodId") == null ? false : currentCustomTimePeriod.getString("parentPeriodId").equals(allCustomTimePeriod.getString("customTimePeriodId"));%> - <option value='<ofbiz:entityfield attribute="allCustomTimePeriod" field="customTimePeriodId"/>' <%if (isDefault) {%>selected<%}%>>Pty:<ofbiz:entityfield attribute="allCustomTimePeriod" field="organizationPartyId"/> <%=allPeriodType == null ? "" : allPeriodType.getString("description") + ":"%> <ofbiz:inputvalue entityAttr="allCustomTimePeriod" field="periodNum"/> [<ofbiz:entityfield attribute="allCustomTimePeriod" field="customTimePeriodId"/>]</option> - </ofbiz:iterator> - </select> - <%if (currentCustomTimePeriod.getString("parentPeriodId") != null) {%> - <a href='<ofbiz:url>/EditCustomTimePeriod?currentCustomTimePeriodId=<ofbiz:inputvalue entityAttr="currentCustomTimePeriod" field="parentPeriodId"/><%=findOrganizationPartyId == null ? "" : "&findOrganizationPartyId=" + findOrganizationPartyId%></ofbiz:url>' class="buttontext"> - [Set As Current]</a> - <%}%> - </td> - <td><input type="text" size='12' <ofbiz:inputvalue entityAttr="currentCustomTimePeriod" field="organizationPartyId" fullattrs="true"/> class='inputBox'></td> - <td> - <select name="periodTypeId" class='selectBox'> - <ofbiz:iterator name="periodType" property="periodTypes"> - <%boolean isDefault = currentCustomTimePeriod.getString("periodTypeId") == null ? false : currentCustomTimePeriod.getString("periodTypeId").equals(periodType.getString("periodTypeId"));%> - <option value='<ofbiz:entityfield attribute="periodType" field="periodTypeId"/>' <%if (isDefault) {%>selected<%}%>><ofbiz:entityfield attribute="periodType" field="description"/><%-- [<ofbiz:entityfield attribute="periodType" field="periodTypeId"/>]--%></option> - </ofbiz:iterator> - </select> - </td> - <td><input type="text" size='4' <ofbiz:inputvalue entityAttr="currentCustomTimePeriod" field="periodNum" fullattrs="true"/> class='inputBox' ></td> - <td><input type="text" size='10' <ofbiz:inputvalue entityAttr="currentCustomTimePeriod" field="periodName" fullattrs="true"/> class='inputBox' ></td> - <td> - <%boolean hasntStarted = false;%> - <%if (currentCustomTimePeriod.getDate("fromDate") != null && UtilDateTime.nowDate().before(currentCustomTimePeriod.getDate("fromDate"))) { hasntStarted = true; }%> - <input type="text" size='13' <ofbiz:inputvalue entityAttr="currentCustomTimePeriod" field="fromDate" fullattrs="true"/> class='inputBox' style='<%if (hasntStarted) {%> color: red;<%}%>'> - </td> - <td align="center"> - <%boolean hasExpired = false;%> - <%if (currentCustomTimePeriod.getDate("thruDate") != null && UtilDateTime.nowDate().after(currentCustomTimePeriod.getDate("thruDate"))) { hasExpired = true; }%> - <input type="text" size='13' <ofbiz:inputvalue entityAttr="currentCustomTimePeriod" field="thruDate" fullattrs="true"/> class='inputBox' style='<%if (hasExpired) {%> color: red;<%}%>'> - </td> - <td align="center"><INPUT type="submit" value='Update' style='font-size: x-small;'></td> - <td align="center"> - <a href='<ofbiz:url>/deleteCustomTimePeriod?customTimePeriodId=<ofbiz:entityfield attribute="currentCustomTimePeriod" field="customTimePeriodId"/></ofbiz:url>' class="buttontext"> - [Delete]</a> - </td> - </FORM> - </ofbiz:if> - <ofbiz:unless name="currentCustomTimePeriod"> - <TR><TD colspan="8"><div class='tabletext'>No Current Custom Time Period Selected; "Children" below have no Parent Period.</div></TD></TR> - </ofbiz:unless> -</table> - -<br/> -<div class='tabletext'>Child Periods</div> -<TABLE border='1' cellpadding='2' cellspacing='0'> - <TR> - <TD><div class='tabletext'>ID</div></TD> - <TD><div class='tabletext'>Parent ID</div></TD> - <TD><div class='tabletext'>Org Party ID</div></TD> - <TD><div class='tabletext'>Period Type</div></TD> - <TD><div class='tabletext'>#</div></TD> - <TD><div class='tabletext'>Name</div></TD> - <TD><div class='tabletext'>From Date</div></TD> - <TD><div class='tabletext'>Thru Date</div></TD> - <TD><div class='tabletext'> </div></TD> - <TD><div class='tabletext'> </div></TD> - <TD><div class='tabletext'> </div></TD> - </TR> - -<%int line = 0;%> -<ofbiz:iterator name="customTimePeriod" property="customTimePeriods"> - <%line++;%> - <%-- GenericValue periodType = customTimePeriod.getRelatedOneCache("PeriodType"); --%> - <tr valign="middle"> - <FORM method="post" action='<ofbiz:url>/updateCustomTimePeriod</ofbiz:url>' name='lineForm<%=line%>'> - <input type="hidden" name="findOrganizationPartyId" value="<%=UtilFormatOut.checkNull(findOrganizationPartyId)%>"> - <input type="hidden" name="currentCustomTimePeriodId" value="<%=UtilFormatOut.checkNull(currentCustomTimePeriodId)%>"> - <input type="hidden" <ofbiz:inputvalue entityAttr="customTimePeriod" field="customTimePeriodId" fullattrs="true"/>> - <td><div class='tabletext'><ofbiz:inputvalue entityAttr="customTimePeriod" field="customTimePeriodId"/></div></td> - <td> - <select name="parentPeriodId" class='selectBox'> - <option value=''> </option> - <ofbiz:iterator name="allCustomTimePeriod" property="allCustomTimePeriods"> - <%GenericValue allPeriodType = allCustomTimePeriod.getRelatedOneCache("PeriodType");%> - <%boolean isDefault = customTimePeriod.getString("parentPeriodId") == null ? false : customTimePeriod.getString("parentPeriodId").equals(allCustomTimePeriod.getString("customTimePeriodId"));%> - <option value='<ofbiz:entityfield attribute="allCustomTimePeriod" field="customTimePeriodId"/>' <%if (isDefault) {%>selected<%}%>>Pty:<ofbiz:entityfield attribute="allCustomTimePeriod" field="organizationPartyId"/> <%=allPeriodType == null ? "" : allPeriodType.getString("description") + ":"%> <ofbiz:inputvalue entityAttr="allCustomTimePeriod" field="periodNum"/> [<ofbiz:entityfield attribute="allCustomTimePeriod" field="customTimePeriodId"/>]</option> - </ofbiz:iterator> - </select> - </td> - <td><input type="text" class='inputBox' size='12' <ofbiz:inputvalue entityAttr="customTimePeriod" field="organizationPartyId" fullattrs="true"/>></td> - <td> - <select name="periodTypeId" class='selectBox'> - <ofbiz:iterator name="periodType" property="periodTypes"> - <%boolean isDefault = customTimePeriod.getString("periodTypeId") == null ? false : customTimePeriod.getString("periodTypeId").equals(periodType.getString("periodTypeId"));%> - <option value='<ofbiz:entityfield attribute="periodType" field="periodTypeId"/>' <%if (isDefault) {%>selected<%}%>><ofbiz:entityfield attribute="periodType" field="description"/><%-- [<ofbiz:entityfield attribute="periodType" field="periodTypeId"/>]--%></option> - </ofbiz:iterator> - </select> - </td> - <td><input type="text" size='4' <ofbiz:inputvalue entityAttr="customTimePeriod" field="periodNum" fullattrs="true"/> class='inputBox' ></td> - <td><input type="text" size='10' <ofbiz:inputvalue entityAttr="customTimePeriod" field="periodName" fullattrs="true"/> class='inputBox' ></td> - <td> - <%boolean hasntStarted = false;%> - <%if (customTimePeriod.getDate("fromDate") != null && UtilDateTime.nowDate().before(customTimePeriod.getDate("fromDate"))) { hasntStarted = true; }%> - <input type="text" size='13' <ofbiz:inputvalue entityAttr="customTimePeriod" field="fromDate" fullattrs="true"/> class='inputBox' style='<%if (hasntStarted) {%> color: red;<%}%>'> - </td> - <td align="center"> - <%boolean hasExpired = false;%> - <%if (customTimePeriod.getDate("thruDate") != null && UtilDateTime.nowDate().after(customTimePeriod.getDate("thruDate"))) { hasExpired = true; }%> - <input type="text" size='13' <ofbiz:inputvalue entityAttr="customTimePeriod" field="thruDate" fullattrs="true"/> class='inputBox' style='<%if (hasExpired) {%> color: red;<%}%>'> - </td> - <td align="center"><INPUT type="submit" value='Update' style='font-size: x-small;'></td> - <td align="center"> - <a href='<ofbiz:url>/deleteCustomTimePeriod?customTimePeriodId=<ofbiz:inputvalue entityAttr="customTimePeriod" field="customTimePeriodId"/><%=currentCustomTimePeriodId == null ? "" : "¤tCustomTimePeriodId=" + currentCustomTimePeriodId%><%=findOrganizationPartyId == null ? "" : "&findOrganizationPartyId=" + findOrganizationPartyId%></ofbiz:url>' class="buttontext"> - [Delete]</a> - </td> - <td align="center"> - <a href='<ofbiz:url>/EditCustomTimePeriod?currentCustomTimePeriodId=<ofbiz:inputvalue entityAttr="customTimePeriod" field="customTimePeriodId"/><%=findOrganizationPartyId == null ? "" : "&findOrganizationPartyId=" + findOrganizationPartyId%></ofbiz:url>' class="buttontext"> - [Set As Current]</a> - </td> - </FORM> - </tr> -</ofbiz:iterator> -</table> -<br/> -<form method="POST" action="<ofbiz:url>/createCustomTimePeriod</ofbiz:url>" style='margin: 0;' name='createCustomTimePeriodForm'> - <input type="hidden" name="findOrganizationPartyId" value="<%=UtilFormatOut.checkNull(findOrganizationPartyId)%>"> - <input type="hidden" name="currentCustomTimePeriodId" value="<%=UtilFormatOut.checkNull(currentCustomTimePeriodId)%>"> - <input type="hidden" name="useValues" value="true"> - - <div class='head2'>Add Custom Time Period:</div> - <div class='tabletext'> - Parent Period: - <select name="parentPeriodId" class='selectBox'> - <option value=''> </option> - <ofbiz:iterator name="allCustomTimePeriod" property="allCustomTimePeriods"> - <%GenericValue allPeriodType = allCustomTimePeriod.getRelatedOneCache("PeriodType");%> - <%boolean isDefault = currentCustomTimePeriod == null ? false : currentCustomTimePeriod.getString("customTimePeriodId").equals(allCustomTimePeriod.getString("customTimePeriodId"));%> - <option value='<ofbiz:entityfield attribute="allCustomTimePeriod" field="customTimePeriodId"/>' <%if (isDefault) {%>selected<%}%>>Pty:<ofbiz:entityfield attribute="allCustomTimePeriod" field="organizationPartyId"/> Par:<ofbiz:entityfield attribute="allCustomTimePeriod" field="parentPeriodId"/> <%=allPeriodType == null ? "" : allPeriodType.getString("description")%> <ofbiz:entityfield attribute="allCustomTimePeriod" field="periodNum"/> [<ofbiz:entityfield attribute="allCustomTimePeriod" field="customTimePeriodId"/>]</option> - </ofbiz:iterator> - </select> - </div> - <div class='tabletext'> - Organization Party ID: <input type="text" size='20' name='organizationPartyId' class='inputBox'> - Period Type: - <select name="periodTypeId" class='selectBox'> - <ofbiz:iterator name="periodType" property="periodTypes"> - <%boolean isDefault = newPeriodTypeId == "" ? false : newPeriodTypeId.equals(periodType.getString("periodTypeId"));%> - <option value='<ofbiz:entityfield attribute="periodType" field="periodTypeId"/>' <%if (isDefault) {%>selected<%}%>><ofbiz:entityfield attribute="periodType" field="description"/><%-- [<ofbiz:entityfield attribute="periodType" field="periodTypeId"/>]--%></option> - </ofbiz:iterator> - </select> - Period Number: <input type="text" size='4' name='periodNum' class='inputBox'> - Period Name: <input type="text" size='10' name='periodName' class='inputBox'> - </div> - <div class='tabletext'> - From Date: <input type="text" size='14' name='fromDate' class='inputBox'> - Thru Date: <input type="text" size='14' name='thruDate' class='inputBox'> - <input type="submit" value="Add" style='font-size: x-small;'> - </div> - -</form> - - -</TABLE> - -<%} else {%> - <h3>You do not have permission to view this page (PERIOD_MAINT needed).</h3> -<%}%> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml Tue Mar 27 00:04:31 2007 @@ -21,8 +21,7 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd"> - <form name="scheduleJob" type="single" target="setServiceParameters" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + <form name="scheduleJob" type="single" target="setServiceParameters"> <field name="JOB_NAME" title="${uiLabelMap.WebtoolsJob}"><text/></field> <field name="SERVICE_NAME" title="${uiLabelMap.WebtoolsService}"><text/></field> <field name="POOL_NAME" title="${uiLabelMap.WebtoolsPool}"><text/></field> @@ -43,14 +42,13 @@ <field name="SERVICE_INTERVAL" title="${uiLabelMap.WebtoolsInterval}" tooltip="${uiLabelMap.WebtoolsMessage8}"><text/></field> <field name="SERVICE_COUNT" title="${uiLabelMap.WebtoolsCount}" tooltip="${uiLabelMap.WebtoolsMessage9}"><text default-value="1"/></field> <field name="SERVICE_MAXRETRY" title="${uiLabelMap.WebtoolsMaxRetry}" tooltip="${uiLabelMap.WebtoolsMessage10}"><text/></field> - <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> - <form name="runService" type="single" target="setSyncServiceParameters" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + <form name="runService" type="single" target="setSyncServiceParameters"> <field name="SERVICE_NAME" title="${uiLabelMap.WebtoolsService}"><text/></field> <field name="POOL_NAME" title="${uiLabelMap.WebtoolsPool}"><text/></field> <field name="_RUN_SYNC_"><hidden value="Y"/></field> - <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> </forms> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl Tue Mar 27 00:04:31 2007 @@ -17,38 +17,47 @@ under the License. --> -<table cellpadding="2" cellspacing="0" border="1" width="100%"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsJob}</div></td> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsPool}</div></td> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsRunTime}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonStartDateTime}</div></td> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsService}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonEndDateTime}</div></td> - <td> </td> - </tr> - <#list jobs as job> - <tr> - <td><div class="tabletext">${job.jobName?if_exists} </td> - <td><div class="tabletext">${job.poolId?if_exists} </div></td> - <td><div class="tabletext">${job.runTime?if_exists} </div></td> - <td><div class="tabletext">${job.startDateTime?if_exists} </div></td> - <td><div class="tabletext"><a href="<@ofbizUrl>availableServices?sel_service_name=${job.serviceName?if_exists}</@ofbizUrl>" class="buttontext">${job.serviceName?if_exists}</a></div></td> - <td> - <div class="tabletext"> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.PageTitleJobList}</h3> + </div> + <table class="basic-table hover-bar" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsJob}</td> + <td>${uiLabelMap.CommonId}</td> + <td>${uiLabelMap.WebtoolsPool}</td> + <td>${uiLabelMap.WebtoolsRunTime}</td> + <td>${uiLabelMap.CommonStartDateTime}</td> + <td>${uiLabelMap.WebtoolsService}</td> + <td>${uiLabelMap.CommonEndDateTime}</td> + <td> </td> + </tr> + <#assign rowNum = "2"> + <#list jobs as job> + <tr<#if rowNum == "1"> class="alternate-row"</#if>> + <td>${job.jobName?if_exists} </td> + <td>${job.jobId?if_exists} </td> + <td>${job.poolId?if_exists} </td> + <td>${job.runTime?if_exists} </td> + <td>${job.startDateTime?if_exists} </td> + <td class="button-col"><a href="<@ofbizUrl>availableServices?sel_service_name=${job.serviceName?if_exists}</@ofbizUrl>">${job.serviceName?if_exists}</a></td> <#if job.cancelDateTime?exists> - <font color="red">${job.cancelDateTime}</font> + <td class="alert">${job.cancelDateTime} <#else> - ${job.finishDateTime?if_exists} + <td>${job.finishDateTime?if_exists} </#if> - </div> - </td> - <td align="center"> - <#if !(job.startDateTime?exists) && !(job.finishDateTime?exists) && !(job.cancelDateTime?exists)> - <a href="<@ofbizUrl>cancelJob?jobId=${job.jobId}</@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsCancelJob}</a> + </td> + <td class="button-col"> + <#if !(job.startDateTime?exists) && !(job.finishDateTime?exists) && !(job.cancelDateTime?exists)> + <a href="<@ofbizUrl>cancelJob?jobId=${job.jobId}</@ofbizUrl>">${uiLabelMap.WebtoolsCancelJob}</a> + </#if> + </td> + </tr> + <#if rowNum == "2"> + <#assign rowNum = "1"> + <#else> + <#assign rowNum = "2"> </#if> - - </td> - </tr> - </#list> -</table> + </#list> + </table> +</div> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceTabBar.ftl?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceTabBar.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceTabBar.ftl Tue Mar 27 00:04:31 2007 @@ -16,12 +16,15 @@ specific language governing permissions and limitations under the License. --> -<#assign unselectedClassName = "tabButton"> -<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}> +<#assign selected = page.tabButtonItem?default("void")> -<div class="tabContainer"> - <a href="<@ofbizUrl>serviceList</@ofbizUrl>" class="${selectedClassMap.ServiceList?default(unselectedClassName)}">${uiLabelMap.WebtoolsServiceList}</a> - <a href="<@ofbizUrl>jobList</@ofbizUrl>" class="${selectedClassMap.JobList?default(unselectedClassName)}">${uiLabelMap.WebtoolsJobList}</a> - <a href="<@ofbizUrl>threadList</@ofbizUrl>" class="${selectedClassMap.ThreadList?default(unselectedClassName)}">${uiLabelMap.WebtoolsThreadList}</a> - <a href="<@ofbizUrl>scheduleJob</@ofbizUrl>" class="${selectedClassMap.ScheduleJob?default(unselectedClassName)}">${uiLabelMap.WebtoolsScheduleJob}</a> +<div class="button-bar button-style-1"> + <ul> + <li<#if selected = "ServiceList"> class="selected"</#if>><a href="<@ofbizUrl>serviceList</@ofbizUrl>">${uiLabelMap.WebtoolsServiceList}</a></li> + <li<#if selected = "JobList"> class="selected"</#if>><a href="<@ofbizUrl>jobList</@ofbizUrl>">${uiLabelMap.WebtoolsJobList}</a></li> + <li<#if selected = "ThreadList"> class="selected"</#if>><a href="<@ofbizUrl>threadList</@ofbizUrl>">${uiLabelMap.WebtoolsThreadList}</a></li> + <li<#if selected = "ScheduleJob"> class="selected"</#if>><a href="<@ofbizUrl>scheduleJob</@ofbizUrl>">${uiLabelMap.WebtoolsScheduleJob}</a></li> + </ul> + <br class="clear" /> </div> +<br /> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/services.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/services.ftl?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/services.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/services.ftl Tue Mar 27 00:04:31 2007 @@ -17,21 +17,32 @@ under the License. --> -<table cellpadding="2" cellspacing="0" border="1" width="100%"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsServiceName}</div></td> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsDispatcherName}</div></td> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsMode}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonStartDateTime}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonEndDateTime}</div></td> - </tr> - <#list services as service> - <tr> - <td><div class="tabletext">${service.serviceName?if_exists} </div></td> - <td><div class="tabletext">${service.localName?if_exists} </div></td> - <td><div class="tabletext">${service.modeStr?default("[none]")} </div></td> - <td><div class="tabletext">${service.startTime?if_exists} </div></td> - <td><div class="tabletext">${service.endTime?default("[running]")} </div></td> - </tr> - </#list> -</table> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.PageTitleServiceList}</h3> + </div> + <table class="basic-table hover-bar" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsServiceName}</td> + <td>${uiLabelMap.WebtoolsDispatcherName}</td> + <td>${uiLabelMap.WebtoolsMode}</td> + <td>${uiLabelMap.CommonStartDateTime}</td> + <td>${uiLabelMap.CommonEndDateTime}</td> + </tr> + <#assign alt_row = false> + <#list services as service> + <tr<#if alt_row> class="alternate-row"</#if>> + <td>${service.serviceName?if_exists}</td> + <td>${service.localName?if_exists}</td> + <td>${service.modeStr?default("[none]")}</td> + <td>${service.startTime?if_exists}</td> + <td>${service.endTime?default("[running]")}</td> + </tr> + <#if alt_row> + <#assign alt_row = false> + <#else> + <#assign alt_row = true> + </#if> + </#list> + </table> +</div> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl Tue Mar 27 00:04:31 2007 @@ -20,58 +20,73 @@ <#assign isJava5 = javaVer.startsWith("1.5")/> <#if parameters.maxElements?has_content><#assign maxElements = parameters.maxElements?number/><#else><#assign maxElements = 5/></#if> -<div class="head3">Service Engine Threads</div> -<table cellpadding="2" cellspacing="0" border="1" width="100%"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsThread}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonStatus}</div></td> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsJob}</div></td> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsService}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonTime} (ms)</div></td> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>Service Engine Threads</h3> + </div> +<table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsThread}</td> + <td>${uiLabelMap.CommonStatus}</td> + <td>${uiLabelMap.WebtoolsJob}</td> + <td>${uiLabelMap.WebtoolsService}</td> + <td>${uiLabelMap.CommonTime} (ms)</td> </tr> <#list threads as thread> <tr> - <td><div class="tabletext">${thread.threadName?if_exists} </div></td> - <td><div class="tabletext">${thread.status?if_exists} </div></td> - <td><div class="tabletext">${thread.jobName?default("[${uiLabelMap.CommonNone}]")}</div></td> - <td><div class="tabletext">${thread.serviceName?default("[${uiLabelMap.CommonNone}]")}</div></td> - <td><div class="tabletext">${thread.runTime?if_exists} </div></td> + <td>${thread.threadName?if_exists}</td> + <td>${thread.status?if_exists}</td> + <td>${thread.jobName?default("[${uiLabelMap.CommonNone}]")}</td> + <td>${thread.serviceName?default("[${uiLabelMap.CommonNone}]")}</td> + <td>${thread.runTime?if_exists}</td> </tr> </#list> </table> - -<hr/> -<div class="head3">General Java Threads</div> -<div class="tabletext">Note: certain things only work in Java 5. Java Version is ${javaVer}; is Java 5? ${isJava5?string}}</div> -<table cellpadding="2" cellspacing="0" border="1" width="100%"> - <tr> - <td><div class="tableheadtext">Group</div></td> - <td><div class="tableheadtext">ID</div></td> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsThread}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonStatus}</div></td> - <td><div class="tableheadtext">Priority</div></td> - <td><div class="tableheadtext">Daemon</div></td> +</div> +<br /> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>General Java Threads</h3> + </div> +<br /> +<p>Note: certain things only work in Java 5. Java Version is ${javaVer}; is Java 5? ${isJava5?string}}<p> +<br /> +<table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>Group</td> + <td>ID</td> + <td>${uiLabelMap.WebtoolsThread}</td> + <td>${uiLabelMap.CommonStatus}</td> + <td>Priority</td> + <td>Daemon</td> </tr> <#list allThreadList as javaThread> <#if javaThread?exists> <#if isJava5><#assign stackTraceArray = javaThread.getStackTrace()/></#if> <tr> - <td><div class="tabletext">${(javaThread.getThreadGroup().getName())?if_exists} </div></td> - <td><div class="tabletext"><#if isJava5>${javaThread.getId()?string}</#if> </div></td> + <td>${(javaThread.getThreadGroup().getName())?if_exists}</td> + <td><#if isJava5>${javaThread.getId()?string}</#if></td> <td> - <div class="tableheadtext">${javaThread.getName()?if_exists} </div> + <b>${javaThread.getName()?if_exists}</b> <#if isJava5> <#list 1..maxElements as stackIdx> <#assign stackElement = stackTraceArray[stackIdx]?if_exists/> - <#if (stackElement.toString())?has_content><div class="tabletext">${stackElement.toString()} </div></#if> + <#if (stackElement.toString())?has_content>${stackElement.toString()}</#if> </#list> </#if> </td> - <td><div class="tabletext"><#if isJava5>${javaThread.getState().name()?if_exists}</#if> </div></td> - <td><div class="tabletext">${javaThread.getPriority()}</div></td> - <td><div class="tabletext">${javaThread.isDaemon()?string}<#-- /${javaThread.isAlive()?string}/${javaThread.isInterrupted()?string} --></div></td> + <td><#if isJava5>${javaThread.getState().name()?if_exists}</#if> </td> + <td>${javaThread.getPriority()}</td> + <td>${javaThread.isDaemon()?string}<#-- /${javaThread.isAlive()?string}/${javaThread.isInterrupted()?string} --></td> </tr> </#if> </#list> </table> +</div> + + + + + + Added: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl?view=auto&rev=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl (added) +++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl Tue Mar 27 00:04:31 2007 @@ -0,0 +1,77 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<!-- begin StatsBinsHistory.ftl --> +<h1>${uiLabelMap.WebtoolsStatsBinsPageTitle}</h1> +<br /> +<div class="button-bar"><a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsMainPageTitle}</a> +<a href="<@ofbizUrl>StatBinsHistory?statsId=${parameters.statsId}&type=${parameters.type}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsReloadPage}</a></div> +<p>${uiLabelMap.WebtoolsStatsCurrentTime}: ${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</p> +<br /> +<#if security.hasPermission("SERVER_STATS_VIEW", session)> + + <div id="stats-bins-history" class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.WebtoolsStatsRequestStats}</h3> + </div> + <#if requestList?has_content> + <#if (requestList?size > 2)> + <table class="basic-table light-grid hover-bar" cellspacing="0"> + <#else> + <table class="basic-table light-grid" cellspacing="0"> + </#if> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsStatsRequestId}</td> + <td>${uiLabelMap.WebtoolsStatsStart}</td> + <td>${uiLabelMap.WebtoolsStatsStop}</td> + <td>${uiLabelMap.WebtoolsStatsMinutes}</td> + <td>${uiLabelMap.WebtoolsStatsHits}</td> + <td>${uiLabelMap.WebtoolsStatsMin}</td> + <td>${uiLabelMap.WebtoolsStatsAvg}</td> + <td>${uiLabelMap.WebtoolsStatsMax}</td> + <td>${uiLabelMap.WebtoolsStatsHitsPerMin}</td> + </tr> + <#assign rowNum = "2"> + <#list requestList as requestRow> + <tr<#if rowNum == "1"> class="alternate-row"</#if>> + <td>${requestRow.requestId}</td> + <td>${requestRow.startTime}</td> + <td>${requestRow.endTime}</td> + <td>${requestRow.lengthMins}</td> + <td>${requestRow.numberHits}</td> + <td>${requestRow.minTime}</td> + <td>${requestRow.avgTime}</td> + <td>${requestRow.maxTime}</td> + <td>${requestRow.hitsPerMin}</td> + </tr> + <#if rowNum == "2"> + <#assign rowNum = "1"> + <#else> + <#assign rowNum = "2"> + </#if> + </#list> + </table> + <#else> + <div class="screenlet-body">${uiLabelMap.WebtoolsStatsBinsErrorMsg}</div> + </#if> + </div> +<#else> + <h3>${uiLabelMap.WebtoolsStatsPermissionMsg}</h3> +</#if> +<!-- end StatsBinsHistory.ftl --> Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.jsp URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.jsp?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.jsp (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.jsp Tue Mar 27 00:04:31 2007 @@ -1,101 +0,0 @@ -<%-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---%> - -<%@ page import="java.util.*, java.net.*" %> -<%@ page import="org.ofbiz.security.*, org.ofbiz.entity.*, org.ofbiz.base.util.*, org.ofbiz.webapp.pseudotag.*" %> -<%@ page import="org.ofbiz.webapp.stats.*" %> - -<%@ taglib uri="ofbizTags" prefix="ofbiz" %> -<jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /> - -<% - String id = request.getParameter("statsId"); - String typeStr = request.getParameter("type"); - int type = -1; - try { - type = Integer.parseInt(typeStr); - } catch (NumberFormatException e) { - type = -1; - } -%> -<h3 style='margin:0;'>Server Statistic Bins History Page</h3> -<div><a href="<ofbiz:url>/StatsSinceStart</ofbiz:url>" class='buttontext'>Stats Since Server Start</A></div> -<div class='tabletext'>Current Time: <%=UtilDateTime.nowTimestamp().toString()%></div> -<%if (security.hasPermission("SERVER_STATS_VIEW", session)) {%> -<% - String rowColor1 = "viewManyTR2"; - String rowColor2 = "viewManyTR1"; - String rowColor = ""; -%> - - <% - LinkedList binList = null; - if (type == ServerHitBin.REQUEST) { - binList = (LinkedList) ServerHitBin.requestHistory.get(id); - } else if (type == ServerHitBin.EVENT) { - binList = (LinkedList) ServerHitBin.eventHistory.get(id); - } else if (type == ServerHitBin.VIEW) { - binList = (LinkedList) ServerHitBin.viewHistory.get(id); - } else {%> - <h3>The type specified (<%=typeStr%>) was not valid.</h3> - <%}%> - - <%if (binList != null) {%> - <TABLE border='0' cellpadding='2' cellspacing='2'> - <TR class='viewOneTR1'> - <TD><%=ServerHitBin.typeNames[type]%> ID</TD> - <TD>Start</TD> - <TD>Stop</TD> - <TD>Mins</TD> - <TD>Hits</TD> - <TD>Min</TD> - <TD>Avg</TD> - <TD>Max</TD> - <TD>Hits/Minute</TD> - </TR> - - <%Iterator binIter = binList.iterator();%> - <%if(binIter!=null && binIter.hasNext()){%> - <%while(binIter.hasNext()){%> - <%ServerHitBin bin = (ServerHitBin) binIter.next();%> - <%rowColor=(rowColor==rowColor1?rowColor2:rowColor1);%> - <tr class="<%=rowColor%>"> - <TD><%=bin.getId()%></TD> - <TD><%=bin.getStartTimeString()%></TD> - <TD><%=bin.getEndTimeString()%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getBinLengthMinutes())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getNumberHits())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getMinTimeSeconds())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getHitsPerMinute())%></TD> - <%-- <TD><%=UtilFormatOut.formatQuantity(utilCache.getExpireTime())%></TD> --%> - </TR> - <%}%> - <%}else{%> - <%rowColor=(rowColor==rowColor1?rowColor2:rowColor1);%><tr bgcolor="<%=rowColor%>"> - <TD colspan="9">No View stats found.</TD> - </TR> - <%}%> - </TABLE> - <%}%> - -<%}else{%> - <h3>You do not have permission to view this page (SERVER_STATS_VIEW needed).</h3> -<%}%> Added: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl?view=auto&rev=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl (added) +++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl Tue Mar 27 00:04:31 2007 @@ -0,0 +1,177 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<!-- begin StatsSinceStart.ftl --> +<h1>${uiLabelMap.WebtoolsStatsMainPageTitle}</h1> +<br /> +<div class="button-bar"><a href="<@ofbizUrl>StatsSinceStart?clear=true</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsClearSince}</a> +<a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsReloadPage}</a></div> +<p>${uiLabelMap.WebtoolsStatsCurrentTime}: ${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</p> +<br /> +<#if security.hasPermission("SERVER_STATS_VIEW", session)> + <#-- Request Table --> + <div id="request-statistics" class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.WebtoolsStatsRequestStats}</h3> + </div> + <#if requestList?has_content> + <#if (requestList?size > 2)> + <table class="basic-table light-grid hover-bar" cellspacing="0"> + <#else> + <table class="basic-table light-grid" cellspacing="0"> + </#if> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsStatsRequestId}</td> + <td>${uiLabelMap.WebtoolsStatsStart}</td> + <td>${uiLabelMap.WebtoolsStatsStop}</td> + <td>${uiLabelMap.WebtoolsStatsMinutes}</td> + <td>${uiLabelMap.WebtoolsStatsHits}</td> + <td>${uiLabelMap.WebtoolsStatsMin}</td> + <td>${uiLabelMap.WebtoolsStatsAvg}</td> + <td>${uiLabelMap.WebtoolsStatsMax}</td> + <td>${uiLabelMap.WebtoolsStatsHitsPerMin}</td> + <td> </td> + </tr> + <#assign rowNum = "2"> + <#list requestList as requestRow> + <tr<#if rowNum == "1"> class="alternate-row"</#if>> + <td>${requestRow.requestId}</td> + <td>${requestRow.startTime}</td> + <td>${requestRow.endTime}</td> + <td>${requestRow.lengthMins}</td> + <td>${requestRow.numberHits}</td> + <td>${requestRow.minTime}</td> + <td>${requestRow.avgTime}</td> + <td>${requestRow.maxTime}</td> + <td>${requestRow.hitsPerMin}</td> + <td class="button-col"><a href="<@ofbizUrl>StatBinsHistory?statsId=${requestRow.requestId}&type=${requestRow.requestType}</@ofbizUrl>">${uiLabelMap.WebtoolsStatsViewBins}</a></td> + </tr> + <#if rowNum == "2"> + <#assign rowNum = "1"> + <#else> + <#assign rowNum = "2"> + </#if> + </#list> + </table> + <#else> + <div class="screenlet-body">${uiLabelMap.WebtoolsStatsNoRequests}</div> + </#if> + </div> + <br /> + <#-- Event Table --> + <div id="event-statistics" class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.WebtoolsStatsEventStats}</h3> + </div> + <#if eventList?has_content> + <#if (eventList?size > 2)> + <table class="basic-table light-grid hover-bar" cellspacing="0"> + <#else> + <table class="basic-table light-grid" cellspacing="0"> + </#if> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsStatsRequestId}</td> + <td>${uiLabelMap.WebtoolsStatsStart}</td> + <td>${uiLabelMap.WebtoolsStatsStop}</td> + <td>${uiLabelMap.WebtoolsStatsMinutes}</td> + <td>${uiLabelMap.WebtoolsStatsHits}</td> + <td>${uiLabelMap.WebtoolsStatsMin}</td> + <td>${uiLabelMap.WebtoolsStatsAvg}</td> + <td>${uiLabelMap.WebtoolsStatsMax}</td> + <td>${uiLabelMap.WebtoolsStatsHitsPerMin}</td> + <td> </td> + </tr> + <#assign rowNum = "2"> + <#list eventList as requestRow> + <tr<#if rowNum == "1"> class="alternate-row"</#if>> + <td>${requestRow.requestId}</td> + <td>${requestRow.startTime}</td> + <td>${requestRow.endTime}</td> + <td>${requestRow.lengthMins}</td> + <td>${requestRow.numberHits}</td> + <td>${requestRow.minTime}</td> + <td>${requestRow.avgTime}</td> + <td>${requestRow.maxTime}</td> + <td>${requestRow.hitsPerMin}</td> + <td class="button-col"><a href="<@ofbizUrl>StatBinsHistory?statsId=${requestRow.requestId}&type=${requestRow.requestType}</@ofbizUrl>">${uiLabelMap.WebtoolsStatsViewBins}</a></td> + </tr> + <#if rowNum == "2"> + <#assign rowNum = "1"> + <#else> + <#assign rowNum = "2"> + </#if> + </#list> + </table> + <#else> + <div class="screenlet-body">${uiLabelMap.WebtoolsStatsNoEvents}</div> + </#if> + </div> + <br /> + <#-- View Table --> + <div id="view-statistics" class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.WebtoolsStatsViewStats}</h3> + </div> + <#if viewList?has_content> + <#if (viewList?size > 2)> + <table class="basic-table light-grid hover-bar" cellspacing="0"> + <#else> + <table class="basic-table light-grid" cellspacing="0"> + </#if> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsStatsRequestId}</td> + <td>${uiLabelMap.WebtoolsStatsStart}</td> + <td>${uiLabelMap.WebtoolsStatsStop}</td> + <td>${uiLabelMap.WebtoolsStatsMinutes}</td> + <td>${uiLabelMap.WebtoolsStatsHits}</td> + <td>${uiLabelMap.WebtoolsStatsMin}</td> + <td>${uiLabelMap.WebtoolsStatsAvg}</td> + <td>${uiLabelMap.WebtoolsStatsMax}</td> + <td>${uiLabelMap.WebtoolsStatsHitsPerMin}</td> + <td> </td> + </tr> + <#assign rowNum = "2"> + <#list viewList as requestRow> + <tr<#if rowNum == "1"> class="alternate-row"</#if>> + <td>${requestRow.requestId}</td> + <td>${requestRow.startTime}</td> + <td>${requestRow.endTime}</td> + <td>${requestRow.lengthMins}</td> + <td>${requestRow.numberHits}</td> + <td>${requestRow.minTime}</td> + <td>${requestRow.avgTime}</td> + <td>${requestRow.maxTime}</td> + <td>${requestRow.hitsPerMin}</td> + <td class="button-col"><a href="<@ofbizUrl>StatBinsHistory?statsId=${requestRow.requestId}&type=${requestRow.requestType}</@ofbizUrl>">${uiLabelMap.WebtoolsStatsViewBins}</a></td> + </tr> + <#if rowNum == "2"> + <#assign rowNum = "1"> + <#else> + <#assign rowNum = "2"> + </#if> + </#list> + </table> + <#else> + <div class="screenlet-body">${uiLabelMap.WebtoolsStatsNoViews}</div> + </#if> + </div> +<#else> + <h3>${uiLabelMap.WebtoolsStatsPermissionMsg}</h3> +</#if> +<!-- end StatsSinceStart.ftl --> Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.jsp URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.jsp?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.jsp (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.jsp Tue Mar 27 00:04:31 2007 @@ -1,177 +0,0 @@ -<%-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---%> - -<%@ page import="java.util.*, java.net.*" %> -<%@ page import="org.ofbiz.security.*, org.ofbiz.entity.*, org.ofbiz.base.util.*, org.ofbiz.webapp.pseudotag.*" %> -<%@ page import="org.ofbiz.webapp.stats.*" %> - -<%@ taglib uri="ofbizTags" prefix="ofbiz" %> -<jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /> - -<% - if ("true".equals(request.getParameter("clear"))) { - ServerHitBin.requestSinceStarted.clear(); - ServerHitBin.eventSinceStarted.clear(); - ServerHitBin.viewSinceStarted.clear(); - } -%> - -<h3 style='margin:0;'>Server Statistics Since Start Page</h3> -<div><a href="<ofbiz:url>/StatsSinceStart?clear=true</ofbiz:url>" class='buttontext'>[Clear Since Start Stats]</A> -<a href="<ofbiz:url>/StatsSinceStart</ofbiz:url>" class='buttontext'>[Reload Page]</A></div> -<div class='tabletext'>Current Time: <%=UtilDateTime.nowTimestamp().toString()%></div> -<%if (security.hasPermission("SERVER_STATS_VIEW", session)) {%> -<% - String rowColor1 = "viewManyTR2"; - String rowColor2 = "viewManyTR1"; - String rowColor = ""; -%> - -<%-- REQUEST --%> - -<TABLE border='0' cellpadding='2' cellspacing='2'> - <TR class='viewOneTR1'> - <TD>Reqest ID</TD> - <TD>Start</TD> - <TD>Stop</TD> - <TD>Mins</TD> - <TD>Hits</TD> - <TD>Min</TD> - <TD>Avg</TD> - <TD>Max</TD> - <TD>Hits/Minute</TD> - <TD>View Bins</TD> - </TR> - - <%TreeSet requestIds = new TreeSet(ServerHitBin.requestSinceStarted.keySet());%> - <%Iterator requestIdIter = requestIds.iterator();%> - <%if(requestIdIter!=null && requestIdIter.hasNext()){%> - <%while(requestIdIter.hasNext()){%> - <%String statsId = (String)requestIdIter.next();%> - <%ServerHitBin bin = (ServerHitBin) ServerHitBin.requestSinceStarted.get(statsId);%> - <%rowColor=(rowColor==rowColor1?rowColor2:rowColor1);%> - <tr class="<%=rowColor%>"> - <TD><%=bin.getId()%></TD> - <TD><%=bin.getStartTimeString()%></TD> - <TD><%=bin.getEndTimeString()%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getBinLengthMinutes())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getNumberHits())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getMinTimeSeconds())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getHitsPerMinute())%></TD> - <TD><a href='<ofbiz:url>/StatBinsHistory?statsId=<%=bin.getId()%>&type=<%=bin.getType()%></ofbiz:url>' class='buttontext'>View Bins</a></TD> - </TR> - <%}%> - <%}else{%> - <%rowColor=(rowColor==rowColor1?rowColor2:rowColor1);%><tr bgcolor="<%=rowColor%>"> - <TD colspan="9">No Request stats found.</TD> - </TR> - <%}%> -</TABLE> -<BR> -<%-- EVENT --%> - -<TABLE border='0' cellpadding='2' cellspacing='2'> - <TR class='viewOneTR1'> - <TD>Event ID</TD> - <TD>Start</TD> - <TD>Stop</TD> - <TD>Mins</TD> - <TD>Hits</TD> - <TD>Min</TD> - <TD>Avg</TD> - <TD>Max</TD> - <TD>Hits/Minute</TD> - <TD>View Bins</TD> - </TR> - - <%TreeSet eventIds = new TreeSet(ServerHitBin.eventSinceStarted.keySet());%> - <%Iterator eventIdIter = eventIds.iterator();%> - <%if(eventIdIter!=null && eventIdIter.hasNext()){%> - <%while(eventIdIter.hasNext()){%> - <%String statsId = (String)eventIdIter.next();%> - <%ServerHitBin bin = (ServerHitBin) ServerHitBin.eventSinceStarted.get(statsId);%> - <%rowColor=(rowColor==rowColor1?rowColor2:rowColor1);%> - <tr class="<%=rowColor%>"> - <TD><%=bin.getId()%></TD> - <TD><%=bin.getStartTimeString()%></TD> - <TD><%=bin.getEndTimeString()%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getBinLengthMinutes())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getNumberHits())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getMinTimeSeconds())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getHitsPerMinute())%></TD> - <TD><a href='<ofbiz:url>/StatBinsHistory?statsId=<%=bin.getId()%>&type=<%=bin.getType()%></ofbiz:url>' class='buttontext'>View Bins</a></TD> - </TR> - <%}%> - <%}else{%> - <%rowColor=(rowColor==rowColor1?rowColor2:rowColor1);%><tr bgcolor="<%=rowColor%>"> - <TD colspan="9">No Event stats found.</TD> - </TR> - <%}%> -</TABLE> -<BR> -<%-- VIEW --%> - -<TABLE border='0' cellpadding='2' cellspacing='2'> - <TR class='viewOneTR1'> - <TD>View ID</TD> - <TD>Start</TD> - <TD>Stop</TD> - <TD>Mins</TD> - <TD>Hits</TD> - <TD>Min</TD> - <TD>Avg</TD> - <TD>Max</TD> - <TD>Hits/Minute</TD> - <TD>View Bins</TD> - </TR> - - <%TreeSet viewIds = new TreeSet(ServerHitBin.viewSinceStarted.keySet());%> - <%Iterator viewIdIter = viewIds.iterator();%> - <%if(viewIdIter!=null && viewIdIter.hasNext()){%> - <%while(viewIdIter.hasNext()){%> - <%String statsId = (String)viewIdIter.next();%> - <%ServerHitBin bin = (ServerHitBin) ServerHitBin.viewSinceStarted.get(statsId);%> - <%rowColor=(rowColor==rowColor1?rowColor2:rowColor1);%> - <tr class="<%=rowColor%>"> - <TD><%=bin.getId()%></TD> - <TD><%=bin.getStartTimeString()%></TD> - <TD><%=bin.getEndTimeString()%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getBinLengthMinutes())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getNumberHits())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getMinTimeSeconds())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds())%></TD> - <TD><%=UtilFormatOut.formatQuantity(bin.getHitsPerMinute())%></TD> - <TD><a href='<ofbiz:url>/StatBinsHistory?statsId=<%=bin.getId()%>&type=<%=bin.getType()%></ofbiz:url>' class='buttontext'>View Bins</a></TD> - </TR> - <%}%> - <%}else{%> - <%rowColor=(rowColor==rowColor1?rowColor2:rowColor1);%><tr bgcolor="<%=rowColor%>"> - <TD colspan="9">No View stats found.</TD> - </TR> - <%}%> -</TABLE> - -<%}else{%> - <h3>You do not have permission to view this page (SERVER_STATS_VIEW needed).</h3> -<%}%> Added: ofbiz/trunk/framework/webtools/webapp/webtools/workflow/readxpdl.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/workflow/readxpdl.ftl?view=auto&rev=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/workflow/readxpdl.ftl (added) +++ ofbiz/trunk/framework/webtools/webapp/webtools/workflow/readxpdl.ftl Tue Mar 27 00:04:31 2007 @@ -0,0 +1,68 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<h1>Read XPDL File</h1> +<br /> +<p>This page is used to read and import XPDL files into the workflow process repository.</p> +<hr/> +<#if security.hasPermission("WORKFLOW_MAINT", session)> + <form method="post" action="<@ofbizUrl>readxpdl</@ofbizUrl>"> + <table class="basic-table form-widget-table"> + <tr> + <td class="label">XPDL Filename or URL</td> + <td><input name='XPDL_LOCATION' type="text" size='60' value='${parameters.XPDL_LOCATION?if_exists}'></td> + <td><span class="label">Is URL?</span><input type="checkbox" name='XPDL_IS_URL'<#if parameters.XPDL_IS_URL?has_content> checked="checked"</#if>></td> + </tr> + <tr> + <td class="label">Import/Update to DB?</td> + <td><input type="checkbox" name='XPDL_IMPORT'></td> + <td> </td> + </tr> + <tr> + <td> </td> + <td><input type="submit" value='View'></td> + <td> </td> + </tr> + </table> + </form> + + <#if parameters.XPDL_LOCATION?has_content> + <#if messages?has_content> + <hr/> + <h1>The following occurred:</h1> + <div> + <#list messages as message> + <p>${message}</p> + </#list> + </div> + </#if> + + <#if toBeStored?has_content> + <#list toBeStored as entity> + <pre>${entity}</pre> + </#list> + <hr/> + <div>Read and printed ${toBeStored.size()} entities.</div> + <#else> + <div>No entities read.</div> + </#if> + </#if> +<#else> + <h3>You do not have permission to use this page (WORKFLOW_MAINT needed)</h3> +</#if> Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/workflow/readxpdl.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/workflow/readxpdl.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/workflow/readxpdl.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/framework/webtools/webapp/webtools/workflow/readxpdl.jsp URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/workflow/readxpdl.jsp?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/workflow/readxpdl.jsp (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/workflow/readxpdl.jsp Tue Mar 27 00:04:31 2007 @@ -1,95 +0,0 @@ -<%-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---%> - -<%@ page import="java.util.*, java.net.*" %> -<%@ page import="org.ofbiz.security.*, org.ofbiz.entity.*, org.ofbiz.base.util.*, org.ofbiz.webapp.pseudotag.*" %> -<%@ page import="org.ofbiz.workflow.definition.*, org.ofbiz.entity.util.*, org.ofbiz.entity.condition.*, org.ofbiz.entity.transaction.*" %> - -<%@ taglib uri="ofbizTags" prefix="ofbiz" %> - -<jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /> -<jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /> - -<% - List messages = new LinkedList(); - - String xpdlLoc = request.getParameter("XPDL_LOCATION"); - boolean xpdlIsUrl = request.getParameter("XPDL_IS_URL")!=null?true:false; - boolean xpdlImport = request.getParameter("XPDL_IMPORT")!=null?true:false; - - URL xpdlUrl = null; - try { xpdlUrl = xpdlIsUrl?new URL(xpdlLoc):UtilURL.fromFilename(xpdlLoc); } - catch (java.net.MalformedURLException e) { messages.add(e.getMessage()); messages.add(e.toString()); Debug.log(e); } - if (xpdlUrl == null) messages.add("Could not find file/URL: " + xpdlLoc); - - List toBeStored = null; - try { if (xpdlUrl != null) toBeStored = XpdlReader.readXpdl(xpdlUrl, delegator); } - catch (Exception e) { messages.add(e.getMessage()); messages.add(e.toString()); Debug.log(e); } - - if (toBeStored != null && xpdlImport) { - boolean beganTransaction = false; - try { - beganTransaction = TransactionUtil.begin(); - delegator.storeAll(toBeStored); - TransactionUtil.commit(beganTransaction); - messages.add("Wrote/Updated " + toBeStored.size() + " toBeStored objects to the data source."); - } catch (GenericEntityException e) { - TransactionUtil.rollback(beganTransaction, "Error storing data from XPDL file", e); - messages.add(e.getMessage()); messages.add(e.toString()); Debug.log(e); - } - } -%> -<h3>Read XPDL File</h3> -<div>This page is used to read and import XPDL files into the workflow process repository.</div> - -<%if(security.hasPermission("WORKFLOW_MAINT", session)) {%> - <FORM method="post" action='<ofbiz:url>/readxpdl</ofbiz:url>'> - XPDL Filename or URL: <INPUT name='XPDL_LOCATION' class='inputBox' type="text" size='60' value='<%=UtilFormatOut.checkNull(xpdlLoc)%>'> Is URL?:<INPUT type="checkbox" name='XPDL_IS_URL' <%=xpdlIsUrl?"checked":""%>><BR> - Import/Update to DB?:<INPUT type="checkbox" name='XPDL_IMPORT'> <INPUT type="submit" class=smallSubmit value='View'> - </FORM> - - <hr/> - - <%if(messages.size() > 0) {%> - <H4>The following occurred:</H4> - <UL> - <%Iterator errMsgIter = messages.iterator();%> - <%while(errMsgIter.hasNext()) {%> - <LI><%=errMsgIter.next()%> - <%}%> - </UL> - <hr/> - <%}%> - - <%Iterator viter = UtilMisc.toIterator(toBeStored);%> - <%while (viter != null && viter.hasNext()) {%> - <PRE><%=viter.next().toString()%></PRE> - <%}%> - - <%if (toBeStored != null) {%> - <div>Read and printed <%=toBeStored.size()%> entities.</div> - <%} else {%> - <div>No toBeStored read.</div> - <%}%> - - -<%}else{%> - <hr/> - <div>You do not have permission to use this page (WORKFLOW_MAINT needed)</div> -<%}%> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |