[OFBiz] SVN: r5043 - in
trunk/applications/workeffort/webapp/workeffort:
WEB-INF/actions/requirement WEB-INF/pagedefs/requirement requirement
jacopo at svn.ofbiz.org
jacopo at svn.ofbiz.org
Fri May 27 07:24:52 EDT 2005
Author: jacopo
Date: 2005-05-27 06:24:39 -0500 (Fri, 27 May 2005)
New Revision: 5043
Removed:
trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/requirement/requirementlist.bsh
trunk/applications/workeffort/webapp/workeffort/WEB-INF/pagedefs/requirement/requirementlist.xml
trunk/applications/workeffort/webapp/workeffort/requirement/requirement.jsp
trunk/applications/workeffort/webapp/workeffort/requirement/requirementlist.ftl
Log:
Removed the no more used stuff related to Requirements
Deleted: trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/requirement/requirementlist.bsh
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/requirement/requirementlist.bsh 2005-05-27 11:21:41 UTC (rev 5042)
+++ trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/requirement/requirementlist.bsh 2005-05-27 11:24:39 UTC (rev 5043)
@@ -1,11 +0,0 @@
-import java.util.*;
-import org.ofbiz.security.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.service.*;
-import org.ofbiz.workeffort.workeffort.*;
-
-delegator = request.getAttribute("delegator");
-
-Collection requirements = delegator.findAll("Requirement", UtilMisc.toList("requirementTypeId", "requiredByDate"));
-if (requirements != null && requirements.size() > 0) context.put("requirements", requirements);
Deleted: trunk/applications/workeffort/webapp/workeffort/WEB-INF/pagedefs/requirement/requirementlist.xml
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/WEB-INF/pagedefs/requirement/requirementlist.xml 2005-05-27 11:21:41 UTC (rev 5042)
+++ trunk/applications/workeffort/webapp/workeffort/WEB-INF/pagedefs/requirement/requirementlist.xml 2005-05-27 11:24:39 UTC (rev 5043)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<page>
- <template>main</template>
- <property name="title">Requirements List</property>
- <property name="headerItem">requirement</property>
- <content-action name="/requirement/requirementlist.bsh"/>
-</page>
\ No newline at end of file
Deleted: trunk/applications/workeffort/webapp/workeffort/requirement/requirement.jsp
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/requirement/requirement.jsp 2005-05-27 11:21:41 UTC (rev 5042)
+++ trunk/applications/workeffort/webapp/workeffort/requirement/requirement.jsp 2005-05-27 11:24:39 UTC (rev 5043)
@@ -1,265 +0,0 @@
-<%
-/**
- * Title: Requirement List Page
- * Description: None
- * Copyright (c) 2002 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Andy Zeneski
- *@created July 25, 2002
- *@version 1.0
- */
-%>
-
-<%@ page import="java.util.*" %>
-<%@ page import="org.ofbiz.security.*, org.ofbiz.entity.*, org.ofbiz.base.util.*, org.ofbiz.webapp.pseudotag.*" %>
-
-<%@ taglib uri="ofbizTags" prefix="ofbiz" %>
-<jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" />
-
-<%
- GenericValue requirement = null;
- String donePage = request.getParameter("donePage");
- String requirementId = request.getParameter("requirementId");
- String custRequestId = request.getParameter("custRequestId");
- String custRequestItemSeqId = request.getParameter("custRequestItemSeqId");
- if (requirementId == null) requirementId = (String) request.getAttribute("requirementId");
- if (requirementId != null) {
- requirement = delegator.findByPrimaryKey("Requirement", UtilMisc.toMap("requirementId", requirementId));
- pageContext.setAttribute("requirementId", requirementId);
- pageContext.setAttribute("tryEntity", new Boolean(true));
- } else {
- pageContext.setAttribute("tryEntity", new Boolean(false));
- }
- if (requirement != null) pageContext.setAttribute("requirement", requirement);
- if (donePage == null) donePage = "requirement";
-
- if (requirement != null && custRequestId == null && custRequestItemSeqId == null) {
- List reqRequests = delegator.findByAnd("RequirementCustRequest", UtilMisc.toMap("requirementId", requirementId));
- if (reqRequests != null) pageContext.setAttribute("requirementRequests", reqRequests);
- }
-
- Collection requirementTypes = delegator.findAll("RequirementType", UtilMisc.toList("description", "requirementTypeId"));
- if (requirementTypes != null && requirementTypes.size() > 0) pageContext.setAttribute("requirementTypes", requirementTypes);
-%>
-
-<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
- <TR>
- <TD width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
- <tr>
- <TD align="left" width='40%' >
- <div class='boxhead'> Requirement Detail</div>
- </TD>
- <TD align="right" width='60%'>
- <A href='<ofbiz:url>/requirementlist</ofbiz:url>' class='lightbuttontext'>[Requirement List]</A>
- <ofbiz:if name="requirement">
- <A href='<ofbiz:url>/workefforts?requirementId=<%=requirementId%></ofbiz:url>' class='lightbuttontext'>[Requirement Tasks]</A>
- <A href='<ofbiz:url>/task?requirementId=<%=requirementId%></ofbiz:url>' class='lightbuttontext'>[Add Task]</A>
- </ofbiz:if>
- <ofbiz:unless name="requirement">
- <span class="lightbuttontextdisabled">[Requirement Tasks]</span>
- <span class="lightbuttontextdisabled">[Add Task]</span>
- </ofbiz:unless>
- </TD>
- </tr>
- </table>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
- <tr>
- <td>
- <ofbiz:if name="requirement">
- <form name="requirementForm" action="<ofbiz:url>/updaterequirement/<%=donePage%></ofbiz:url>" method="post" style='margin: 0;'>
- <table border='0' cellpadding='2' cellspacing='0'>
- <input type='hidden' name='requirementId' value='<ofbiz:print attribute="requirementId"/>'>
- </ofbiz:if>
- <ofbiz:unless name="requirement">
- <form name="requirementForm" action="<ofbiz:url>/createrequirement/<%=donePage%></ofbiz:url>" method="post" style='margin: 0;'>
- <table border='0' cellpadding='2' cellspacing='0'>
- <ofbiz:if name="requirementId">
- <DIV class='tabletext'>ERROR: Could not find Requirement with ID "<ofbiz:print attribute="requirementId"/>"</DIV>
- </ofbiz:if>
- </ofbiz:unless>
-
- <% if (custRequestId != null && custRequestItemSeqId != null) { %>
- <input type="hidden" name="custRequestId" value="<%=custRequestId%>">
- <input type="hidden" name="custRequestItemSeqId" value="<%=custRequestItemSeqId%>">
- <% } %>
-
- <ofbiz:if name="requirement">
- <tr>
- <td width='26%' align="right"><div class='tabletext'>Requirement ID</div></td>
- <td> </td>
- <td width='74%'><span class="tabletext"><b><ofbiz:print attribute="requirementId"/></b></span></td>
- </tr>
- </ofbiz:if>
-
- <tr>
- <td width='26%' align="right"><div class='tabletext'>Type</div></td>
- <td> </td>
- <td width='74%'>
- <select name="requirementTypeId" class="selectBox">
- <ofbiz:iterator name="requirementType" property="requirementTypes">
- <option value="<%=requirementType.getString("requirementTypeId")%>"><%=requirementType.getString("description")%></option>
- </ofbiz:iterator>
- </select>
- </td>
- </tr>
-
- <tr>
- <td width='26%' align="right"><div class='tabletext'>Description</div></td>
- <td> </td>
- <td width='74%'><input type='text' class='inputBox' size='40' maxlength='255' name='description' value='<ofbiz:inputvalue field="description" entityAttr="requirement"/>'></td>
- </tr>
-
- <tr>
- <td width='26%' align="right"><div class='tabletext'>Facility ID</div></td>
- <td> </td>
- <td width='74%'><input type='text' class='inputBox' size='20' maxlength='20' name='facilityId' value='<ofbiz:inputvalue field="facilityId" entityAttr="requirement"/>'></td>
- </tr>
-
- <tr>
- <td width='26%' align="right"><div class='tabletext'>Product ID</div></td>
- <td> </td>
- <td width='74%'><input type='text' class='inputBox' size='20' maxlength='20' name='productId' value='<ofbiz:inputvalue field="productId" entityAttr="requirement" tryEntityAttr="tryEntity"/>'></td>
- </tr>
-
- <tr>
- <td width='26%' align="right"><div class='tabletext'>Use Case</div></td>
- <td> </td>
- <td width='74%'><textarea name='story' class='textAreaBox' cols='50' rows='10'><ofbiz:inputvalue field="useCase" entityAttr="requirement"/></TEXTAREA>
- </tr>
-
- <tr>
- <td width='26%' align="right"><div class='tabletext'>Reason</div></td>
- <td> </td>
- <td width='74%'><input type='text' class='inputBox' size='50' maxlength='255' name='reason' value='<ofbiz:inputvalue field="reason" entityAttr="requirement"/>'></td>
- </tr>
-
- <tr>
- <td width='26%' align="right"><div class='tabletext'>Required By Date/Time</div></td>
- <td> </td>
- <td width='74%'>
- <input type='text' class='inputBox' size='30' maxlength='30' name='requiredByDate' value='<ofbiz:inputvalue field="requiredByDate" entityAttr="requirement"/>'>
- <a href="javascript:call_cal(document.requirementForm.requiredByDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a>
- </td>
- </tr>
-
- <ofbiz:if name="requirement">
- <tr>
- <td width='26%' align="right"><div class='tabletext'>Created Date/Time</div></td>
- <td> </td>
- <td width='74%'><span class="tabletext"><ofbiz:inputvalue field="createdDate" entityAttr="requirement"/></span></td>
- </tr>
- </ofbiz:if>
-
- <tr>
- <td width='26%' align="right"><div class='tabletext'>Estimated Budget</div></td>
- <td> </td>
- <td width='74%'><input type='text' class='inputBox' size='10' maxlength='30' name='estimatedBudget' value='<ofbiz:inputvalue field="estimatedBudget" entityAttr="requirement"/>'></td>
- </tr>
-
- <tr>
- <td width='26%' align="right"><div class='tabletext'>Quantity</div></td>
- <td> </td>
- <td width='74%'><input type='text' class='inputBox' size='5' maxlength='30' name='quantity' value='<ofbiz:inputvalue field="quantity" entityAttr="requirement" tryEntityAttr="tryEntity"/>'></td>
- </tr>
-
- <tr>
- <td width='26%' align="right">
- <ofbiz:if name="requirement"><input type="submit" name="Update" value="Update"></ofbiz:if>
- <ofbiz:unless name="requirement"><input type="submit" name="Create" value="Create"></ofbiz:unless>
- </td>
- <td> </td>
- <td width='74%'><div class='tabletext'> </div></td>
- </tr>
- </table>
- </form>
-
- </td>
- </tr>
- </table>
- </TD>
- </TR>
-</TABLE>
-
-<ofbiz:if name="requirementRequests">
-<br/>
-<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
- <TR>
- <TD width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
- <tr>
- <TD align="left" width='40%' >
- <div class='boxhead'> Requirement Requests</div>
- </TD>
- </tr>
- </table>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
- <tr>
- <td>
- <TABLE width='100%' cellpadding='2' cellspacing='0' border='0'>
- <TR>
- <TD>
- <table width="100%" cellpadding="2" cellspacing="0" border="0">
- <tr>
- <td><div class="tableheadtext">RequestID</div></td>
- <td><div class="tableheadtext">Request Type</div></td>
- <td><div class="tableheadtext">Priority</div></td>
- <td><div class="tableheadtext">Status</div></td>
- <td><div class="tableheadtext">Request Name</div></td>
- <td><div class="tableheadtext">Description</div></td>
- <td><div class="tableheadtext">Requested Date</div></td>
- <td> </td>
- </tr>
- <tr>
- <td colspan="8"><hr class="sepbar"></td>
- </tr>
- <ofbiz:iterator name="reqReq" property="requirementRequests">
- <% GenericValue custRequest = reqReq.getRelatedOne("CustRequest"); %>
- <tr>
- <td><div class="tabletext"><%=custRequest.getString("custRequestId")%></div></td>
- <td><div class="tabletext"><%=UtilFormatOut.checkNull(custRequest.getString("custRequestTypeId"))%></div></td>
- <td><div class="tabletext"><%=UtilFormatOut.checkNull(custRequest.getString("priority"))%></div></td>
- <td><div class="tabletext"><%=UtilFormatOut.checkNull(custRequest.getString("statusId"))%></div></td>
- <td><div class="tabletext"><%=UtilFormatOut.checkNull(custRequest.getString("custRequestName"))%></div></td>
- <td><div class="tabletext"><%=UtilFormatOut.checkNull(custRequest.getString("description"))%></div></td>
- <td><div class="tabletext"><%=UtilFormatOut.checkNull(custRequest.getString("custRequestDate"))%></div></td>
- <td align="right"><div class="tabletext"><a href="<ofbiz:url>/request?custRequestId=<%=custRequest.getString("custRequestId")%>&custRequestItemSeqId=<%=reqReq.getString("custRequestItemSeqId")%></ofbiz:url>" class="buttontext">[View]</a></td>
- </tr>
- </ofbiz:iterator>
- </table>
- </TD>
- </TR>
- </TABLE>
- </td>
- </tr>
- </table>
- </TD>
- </TR>
-</TABLE>
-</ofbiz:if>
\ No newline at end of file
Deleted: trunk/applications/workeffort/webapp/workeffort/requirement/requirementlist.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/requirement/requirementlist.ftl 2005-05-27 11:21:41 UTC (rev 5042)
+++ trunk/applications/workeffort/webapp/workeffort/requirement/requirementlist.ftl 2005-05-27 11:24:39 UTC (rev 5043)
@@ -1,81 +0,0 @@
-<#--
- * Description: None
- * Copyright (c) 2002 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Johan Isacsson (conversion of jsp created by Andy Zeneski)
- *@author Eric.Barbier at nereide.biz (migration to uiLabelMap)
- *@version $Rev$
- *@since 2.1
--->
-<#assign uiLabelMap = requestAttributes.uiLabelMap>
-
-<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
- <TR>
- <TD width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
- <tr>
- <TD align="left" width='40%' >
- <div class='boxhead'>${uiLabelMap.WorkEffortRequirementList}</div>
- </TD>
- <TD align="right" width='60%'>
- <A href='<@ofbizUrl>/requirementlist</@ofbizUrl>' class='lightbuttontextdisabled'>[${uiLabelMap.WorkEffortRequirementList}]</A>
- <A href='<@ofbizUrl>/requirement</@ofbizUrl>' class='lightbuttontext'>[${uiLabelMap.WorkEffortNewRequirement}]</A>
- </TD>
- </tr>
- </table>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
- <tr>
- <td>
- <TABLE width='100%' cellpadding='2' cellspacing='0' border='0'>
- <TR>
- <TD><DIV class='tabletext'><b>${uiLabelMap.WorkEffortRequirementType}</b></DIV></TD>
- <TD><DIV class='tabletext'><b>${uiLabelMap.CommonDescription}</b></DIV></TD>
- <TD><DIV class='tabletext'><b>${uiLabelMap.WorkEffortRequiredBy}</b></DIV></TD>
- <TD><DIV class='tabletext'><b>${uiLabelMap.WorkEffortEstmatedBudget}</b></DIV></TD>
- <TD align="right"><DIV class='tabletext'><b>${uiLabelMap.WorkEffortViewTasksEdit}</b></DIV></TD>
- </TR>
- <TR><TD colspan='5'><HR class='sepbar'></TD></TR>
- <#if requirements?has_content>
- <#list requirements as requirement>
- <#assign requirementType = requirement.getRelatedOne("RequirementType")>
- <TR>
- <TD><DIV class='tabletext'>${(requirementType.description)?if_exists}</DIV></TD>
- <TD><DIV class='tabletext'>${requirement.description?if_exists}</DIV></TD>
- <TD><DIV class='tabletext'>${requirement.requiredByDate?if_exists}</DIV></TD>
- <TD><DIV class='tabletext'>${requirement.estimatedBudget?default(0)}</DIV></TD>
- <TD align="right" NOWRAP><A class="buttontext" href="<@ofbizUrl>/workefforts?requirementId=${requirement.requirementId}</@ofbizUrl>">${uiLabelMap.WorkEffortTasks}</a> / <A class='buttontext' href='<@ofbizUrl>/requirement?requirementId=${requirement.requirementId}</@ofbizUrl>'>
- ${uiLabelMap.CommonEdit}[${requirement.requirementId?if_exists}]</a></DIV></TD>
- </TR>
- </#list>
- <#else>
- <div class="tabletext">${uiLabelMap.WorkEffortNoOpenRequirementsFound}.</div>
- </#if>
- </TABLE>
- </td>
- </tr>
- </table>
- </TD>
- </TR>
-</TABLE>
More information about the Svn
mailing list