svn commit: r699187 - in /ofbiz/trunk/specialpurpose/projectmgr: script/org/ofbiz/project/ProjectSimpleEvents.xml webapp/projectmgr/WEB-INF/controller.xml widget/RequestScreens.xml widget/forms/RequestForms.xml

[hansbak-2]

Author: hansbak
Date: Thu Sep 25 23:11:27 2008
New Revision: 699187

URL: http://svn.apache.org/viewvc?rev=699187&view=rev
Log:
in projectmanager be able to createcustomer request optionally create task assign to person

Added:
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml   (with props)
Modified:
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml

Added: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=699187&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (added)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Thu Sep 25 23:11:27 2008
@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
+    <simple-method method-name="CreateCustRequestAndAssignTaskToPerson" short-description="">
+        <set-service-fields service-name="createCustRequest" map-name="parameters" to-map-name="createCust"/>
+        <call-service service-name="createCustRequest" in-map-name="createCust">
+            <result-to-field result-name="custRequestId" field-name="custRequestId"/>
+        </call-service>
+    </simple-method>    
+</simple-methods>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=699187&r1=699186&r2=699187&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Thu Sep 25 23:11:27 2008
@@ -561,7 +561,7 @@
     </request-map>
     <request-map uri="createrequest">
         <security https="true" auth="true"/>
-        <event type="service" invoke="createCustRequest"/>
+        <event type="simple" invoke="CreateCustRequestAndAssignTaskToPerson" path="org/ofbiz/project/ProjectSimpleEvents.xml"/>
         <response name="success" type="request-redirect-noparam" value="requestlist"/>
         <response name="error" type="view" value="EditRequest"/>
     </request-map>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=699187&r1=699186&r2=699187&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Thu Sep 25 23:11:27 2008
@@ -28,7 +28,6 @@
                 <set field="headerItem" value="request"/>
                 <entity-and list-name="custRequests" entity-name="CustRequest">
                     <field-map field-name="statusId" value="CRQ_ACCEPTED"/>
-                    <field-map field-name="statusId" value="CRQ_CANCELLED"/>
                     <order-by field-name="lastModifiedDate"/>
                 </entity-and>
             </actions>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=699187&r1=699186&r2=699187&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Thu Sep 25 23:11:27 2008
@@ -61,6 +61,23 @@
                 <option key="1"/>
             </drop-down>
         </field>
+        <field name="workEffortName"><hidden value="${custRequestName}"/></field>
+        <field name="workEffortId"><hidden value="${custRequestId}"/></field>
+        <field name="statusId"><hidden value="PAS_ASSIGNED"/></field>
+        <field name="workEffortTypeId"><hidden value="TASK"/></field>
+        <field name="currentStatusId"><hidden value="PTS_CREATED"/></field>
+        <field name="childWorkEffortId" parameter-name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="WorkEffortAndChild" description="${workEffortName} -- ${childWorkEffortName}">
+                    <entity-constraint name="workEffortTypeId" value="PROJECT"/>    
+                    <entity-constraint name="childWorkEffortTypeId" value="PHASE"/>    
+                    <entity-order-by field-name="workEffortName"/>
+                    <entity-order-by field-name="childWorkEffortName"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="partyId" parameter-name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="roleTypeId"><hidden value="PROJECT_TEAM"/></field>
         <field name="custRequestDate" title="${uiLabelMap.OrderRequestDate}"><date-time type="timestamp"/></field>
         <field name="responseRequiredDate"><date-time type="timestamp"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -145,7 +162,7 @@
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}" key-field-name="partyId">
                 <sub-hyperlink target="viewprofile?partyId=${fromPartyId}" description="[${fromPartyId}]"/>
             </display-entity>
-        </field>
+        </field>      
         <field name="statusId">
             <display-entity also-hidden="false" entity-name="StatusItem"/>
         </field>