svn commit: r794195 - in /ofbiz/trunk/specialpurpose/projectmgr/widget: ProjectScreens.xml forms/ProjectForms.xml

[hansbak-2]

Author: hansbak
Date: Wed Jul 15 08:47:29 2009
New Revision: 794195

URL: http://svn.apache.org/viewvc?rev=794195&view=rev
Log:
project create/update problem and some cleanup

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=794195&r1=794194&r2=794195&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed Jul 15 08:47:29 2009
@@ -89,7 +89,7 @@
                 <service service-name="getProject" result-map="result">
                     <field-map field-name="projectId" from-field="projectId"/>
                 </service>
-                <set field="project" from-field="result.projectInfo"/>
+                <set field="projectInfo" from-field="result.projectInfo"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=794195&r1=794194&r2=794195&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed Jul 15 08:47:29 2009
@@ -19,25 +19,25 @@
 -->
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    <form name="EditProject" type="single" target="updateProject" default-map-name="project"
+    <form name="EditProject" type="single" target="updateProject" default-map-name="projectInfo"
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
             <entity-one entity-name="PartyGroup" value-field="partyGroup">
                 <field-map field-name="partyId" from-field="partyId"/>
             </entity-one>
-            <entity-and entity-name="WorkEffortPartyAssignment" list="assigns" filter-by-date="true">
-                <field-map field-name="workEffortId" from-field="parameters.projectId"/>
+            <entity-and entity-name="WorkEffortPartyAssignment" list="workEffortPartyAssignments" filter-by-date="true">
+                <field-map field-name="workEffortId" from-field="projectInfo.projectId"/>
                 <field-map field-name="roleTypeId" value="CLIENT_BILLING"/>
             </entity-and>
-            <set field="project.clientBillingPartyId" from-field="assigns[0].partyId"/>
-            <entity-and entity-name="WorkEffortPartyAssignment" list="assignsOrg" filter-by-date="true">
-                <field-map field-name="workEffortId" from-field="parameters.projectId"/>
+            <set field="projectInfo.clientBillingPartyId" from-field="workEffortPartyAssignments[0].partyId"/>
+            <entity-and entity-name="WorkEffortPartyAssignment" list="workEffortPartyAssignments" filter-by-date="true">
+                <field-map field-name="workEffortId" from-field="projectInfo.projectId"/>
                 <field-map field-name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
             </entity-and>
-            <set field="project.organizationPartyId" from-field="assignsOrg[0].partyId"/>
+            <set field="projectInfo.organizationPartyId" from-field="workEffortPartyAssignments[0].partyId"/>
         </actions>
-        <alt-target use-when="project==null" target="createProject"/>
-        <field use-when="project==null" name="templateId">
+        <alt-target use-when="projectInfo==null" target="createProject"/>
+        <field name="templateId" use-when="projectInfo==null">
             <drop-down allow-empty="true">
                 <entity-options entity-name="WorkEffort" description="${workEffortName}" key-field-name="workEffortId">
                     <entity-constraint name="workEffortTypeId" value="PROJECT_TEMPLATE"/>
@@ -49,8 +49,8 @@
         <field name="workEffortId"><hidden value="${projectId}"/></field>
         <field name="projectName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrProjectName}*"><text/></field>
         <field name="projectDescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
-        <field use-when="project!=null" name="currentStatusId" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field use-when="project==null" name="currentStatusId"><hidden value="_NA_"/></field>
+        <field name="currentStatusId" use-when="projectInfo!=null" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="currentStatusId" use-when="projectInfo==null"><hidden value="_NA_"/></field>
         <field name="clientBillingPartyId">
             <lookup target-form-name="LookupPartyGroup">
                 <sub-hyperlink target="viewprofile" description="${partyGroup.groupName}">
@@ -80,10 +80,10 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field use-when="project!=null" name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><display description="${bsh:project.get(&quot;estimatedStartDate&quot;)!=null?project.get(&quot;estimatedStartDate&quot;).toString().substring(0,10):&quot;&quot;;}"/></field>
-        <field use-when="project!=null" name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><display description="${bsh:project.get(&quot;estimatedCompletionDate&quot;)!=null?project.get(&quot;estimatedCompletionDate&quot;).toString().substring(0,10):&quot;&quot;;}"/></field>
-        <field use-when="project!=null" name="actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display description="${bsh:project.get(&quot;actualStartDate&quot;)!=null?project.get(&quot;actualStartDate&quot;).toString().substring(0,10):&quot;&quot;;}"/></field>
-        <field use-when="project!=null" name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display description="${bsh:project.get(&quot;actualCompletionDate&quot;)!=null?project.get(&quot;actualCompletionDate&quot;).toString().substring(0,10):&quot;&quot;;}"/></field>
+        <field use-when="projectInfo!=null" name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><display type="date"/></field>
+        <field use-when="projectInfo!=null" name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><display type="date"/></field>
+        <field use-when="projectInfo!=null" name="actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
+        <field use-when="projectInfo!=null" name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display type="date"/></field>
         <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
     </form>
     <form name="AddSubProject" type="single" target="AddSubProject"