Skip to content

Commit

Permalink
reorganize the customerRequest view screen in project manager
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@725624 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
hansbak committed Dec 11, 2008
1 parent 507f9f9 commit bd29547
Show file tree
Hide file tree
Showing 4 changed files with 120 additions and 55 deletions.
33 changes: 8 additions & 25 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="framework/testtools/src"/>
Expand All @@ -41,7 +23,7 @@ under the License.
<classpathentry excluding="ShipmentScaleApplet.java" kind="src" path="applications/product/src"/>
<classpathentry excluding="org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java" kind="src" path="applications/securityext/src"/>
<classpathentry kind="src" path="applications/workeffort/src"/>
<classpathentry kind="src" path="framework/bi/src"/>
<classpathentry kind="src" path="framework/bi/src"/>
<classpathentry kind="src" path="framework/appserver/src"/>
<classpathentry kind="src" path="framework/catalina/src"/>
<classpathentry kind="src" path="framework/common/src"/>
Expand All @@ -66,9 +48,9 @@ under the License.
<classpathentry kind="lib" path="framework/service/lib/axis-ant.jar"/>
<classpathentry kind="lib" path="framework/service/lib/axis.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/jetty-6.1.11.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/jetty-ajp-6.1.11.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/jetty-sslengine-6.1.11.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/jetty-util-6.1.11.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/jetty-ajp-6.1.11.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/jetty-sslengine-6.1.11.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/jetty-util-6.1.11.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/jasper-runtime-5.5.15.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/jasper-compiler-5.5.15.jar"/>
<classpathentry kind="lib" path="framework/guiapp/lib/XuiCoreSwing-v3.2rc2b.jar"/>
Expand All @@ -89,7 +71,7 @@ under the License.
<classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/>
<classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/>
<classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
<classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.3-20080708-r674758.jar"/>
<classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.3-20080708-r674758.jar"/>
<classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-beta5.jar"/>
<classpathentry kind="lib" path="framework/base/lib/Tidy.jar"/>
<classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/>
Expand All @@ -98,7 +80,7 @@ under the License.
<classpathentry kind="lib" path="framework/base/lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="framework/base/lib/junitperf.jar"/>
<classpathentry kind="lib" path="framework/base/lib/junit.jar"/>
<classpathentry kind="lib" path="framework/base/lib/juel-2.1.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/juel-2.1.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/jdbm-1.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/jakarta-regexp-1.5.jar"/>
<classpathentry kind="lib" path="framework/base/lib/icu4j-3_6.jar"/>
Expand All @@ -107,7 +89,7 @@ under the License.
<classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/ant-1.7.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/ant-junit-1.7.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/ant-junit-1.7.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-net-1.4.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar"/>
Expand Down Expand Up @@ -168,5 +150,6 @@ under the License.
<classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-common-3.0.jar"/>
<classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-server-3.0.jar"/>
<classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-client-3.0.jar"/>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
<classpathentry kind="output" path="bin"/>
</classpath>
27 changes: 7 additions & 20 deletions .project
Original file line number Diff line number Diff line change
@@ -1,25 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->

<projectDescription>
<name>ofbiz</name>
<name>OFBizSvn</name>
<comment></comment>
<projects>
</projects>
Expand All @@ -29,8 +10,14 @@ under the License.
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.codehaus.groovy.eclipse.groovyBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.codehaus.groovy.eclipse.groovyNature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<#--
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.
-->
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
<li class="h3">${uiLabelMap.PageTitleRequestItems}</li>
</ul>
<br class="clear"/>
</div>
<table class="basic-table hover-bar" cellspacing="0" >
<tr class="header-row">
<td>
${uiLabelMap.CommonNbr}
</td>
<td colspan="2">
${uiLabelMap.CommonDescription}
</td>
<td>
</td>
</tr>
<#list custRequestItems as custRequestItemList>
<#if custRequestItemList.custRequestItemSeqId?has_content>
<tr class="header-row">
<td>
</td>
<td colspan="2">
</td>
<td>
</td>
</tr>
<tr>
<td>
<a href="<@ofbizUrl>requestitem?custRequestId=${custRequestItemList.custRequestId}&custRequestItemSeqId=${custRequestItemList.custRequestItemSeqId}</@ofbizUrl>" class="linktext">${custRequestItemList.custRequestItemSeqId}</a>
</td>
<td colspan="2">
<#if custRequestItemList.story?has_content>
${custRequestItemList.story}
</#if>
</td>
<td>
<a href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequestItemList.custRequestId}&custRequestItemSeqId=${custRequestItemList.custRequestItemSeqId}</@ofbizUrl>" class="linktext">${uiLabelMap.OrderAddNote}</a>
</td>
</tr>
<tr class="header-row">
<td>
</td>
<td>
${uiLabelMap.CommonNbr}
</td>
<td>
${uiLabelMap.CommonNote}
</td>
<td>
${uiLabelMap.CommonDate}
</td>
</tr>
<#list custRequestItemNoteViews as custRequestItemNoteViewList>
<#if custRequestItemNoteViewList.custRequestItemSeqId == custRequestItemList.custRequestItemSeqId>
<#if row?has_content>
<#assign row="">
<#else>
<#assign row="alternate-row">
</#if>
<tr class="${row}">
<td>
</td>
<td>
${custRequestItemNoteViewList.noteId}
</td>
<td >
${custRequestItemNoteViewList.noteInfo}
</td>
<td>
${custRequestItemNoteViewList.noteDateTime}
</td>
</tr>
</#if>
</#list>
</#if>
</#list>
</table>
</div>
17 changes: 7 additions & 10 deletions specialpurpose/projectmgr/widget/RequestScreens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ under the License.
<entity-and list-name="commEvents" entity-name="CommunicationEventAndCustRequest">
<field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
</entity-and>
<entity-and list-name="notes" entity-name="CustRequestItemNoteView">
<field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
<order-by field-name="custRequestItemSeqId"/>
</entity-and>
<entity-condition entity-name="CustRequestItemNoteView" list-name="custRequestItemNoteViews">
<condition-expr field-name="custRequestId" operator="equals" env-name="parameters.custRequestId"/>
<order-by field-name="-noteDateTime"/>
</entity-condition>
<entity-and entity-name="CustRequestContent" list-name="custRequestContents" filter-by-date="true">
<field-map field-name="custRequestId" env-name="custRequestId"/>
</entity-and>
Expand All @@ -113,12 +113,9 @@ under the License.
<screenlet title="${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}">
<include-form name="requestInfo" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleRequestItems}">
<include-form name="OverviewRequestItems" location="component://projectmgr/widget/forms/RequestForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleRequestItemNotes}">
<include-form name="ListRequestItemNotes" location="component://projectmgr/widget/forms/RequestForms.xml"/>
</screenlet>
<platform-specific>
<html><html-template location="component://projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl"/></html>
</platform-specific>
</container>
<container style="righthalf">
<platform-specific>
Expand Down

0 comments on commit bd29547

Please sign in to comment.