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

[hansbak-2]

Author: hansbak
Date: Sat Dec 27 21:40:00 2008
New Revision: 729702

URL: http://svn.apache.org/viewvc?rev=729702&view=rev
Log:
remove some doubles from drop down, added some 'dated' selections and make the roletype list more accurate

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=729702&r1=729701&r2=729702&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sat Dec 27 21:40:00 2008
@@ -579,7 +579,7 @@
     <screen name="PartiesInfo">
         <section>
             <actions>
-                <entity-condition entity-name="WorkEffortPartyAssignView" list-name="clientAssigns" distinct="true">
+                <entity-condition entity-name="WorkEffortPartyAssignView" list-name="clientAssigns" distinct="true" filter-by-date="true">
                     <condition-list combine="and">
                         <condition-expr field-name="workEffortId" env-name="parameters.projectId" operator="equals"/>
                         <condition-expr field-name="roleTypeId" value="CLIENT%" operator="like"/>
@@ -595,7 +595,7 @@
                     <order-by field-name="firstName"/>
                     <order-by field-name="groupName"/>
                 </entity-condition>
-                <entity-condition entity-name="WorkEffortPartyAssignView" list-name="companyAssigns" distinct="true">
+                <entity-condition entity-name="WorkEffortPartyAssignView" list-name="companyAssigns" distinct="true" filter-by-date="true">
                     <condition-list combine="and">
                         <condition-expr field-name="workEffortId" env-name="parameters.projectId" operator="equals"/>
                         <condition-list combine="or">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=729702&r1=729701&r2=729702&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Dec 27 21:40:00 2008
@@ -432,6 +432,28 @@
     </form>
     <form name="AddWorkEffortPartyAssign" target="createWorkEffortPartyAssign" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
+        <actions>
+            <entity-condition entity-name="PartyRoleDetailAndPartyDetail" distinct="true" list-name="projectResources">
+                <condition-expr field-name="parentTypeId" operator="equals" value="PROJECT_TEAM"/>
+                <select-field field-name="partyId"/>
+                <select-field field-name="lastName"/>
+                <select-field field-name="firstName"/>
+                <select-field field-name="groupName"/>
+                <order-by field-name="lastName"/>
+                <order-by field-name="firstName"/>
+                <order-by field-name="groupName"/>
+            </entity-condition>
+            <entity-condition entity-name="WorkEffortPartyAssignView"  filter-by-date="true" distinct="true" list-name="taskResources">
+                <condition-expr field-name="workEffortId" env-name="projectId"/>
+                <select-field field-name="partyId"/>
+                <select-field field-name="lastName"/>
+                <select-field field-name="firstName"/>
+                <select-field field-name="groupName"/>
+                <order-by field-name="lastName"/>
+                <order-by field-name="firstName"/>
+                <order-by field-name="groupName"/>
+            </entity-condition>        
+        </actions>
         <alt-target use-when="workEffortId==projectId &amp;&amp; parameters.get(&quot;partyId&quot;)==null" target="ListWorkEffortPartyAssigns"/><!-- this used for project partyId not yet selected -->
         <alt-target use-when="workEffortId!=projectId &amp;&amp; parameters.get(&quot;partyId&quot;)==null" target="EditTaskPartyAssigns"/><!-- this used for tasks , partyId not yet selected-->
         <alt-target use-when="workEffortId!=projectId &amp;&amp; parameters.get(&quot;partyId&quot;)!=null" target="createTaskPartyAssign"/><!-- this used for tasks , partyId selected-->
@@ -450,27 +472,15 @@
         </field>
         <field name="partyId" use-when="workEffortId==projectId &amp;&amp; parameters.get(&quot;partyId&quot;)==null" event="onChange" action="javascript:document.AddWorkEffortPartyAssign.submit();"><!-- project level -->
             <drop-down  allow-empty="true" current="selected">
-                <entity-options entity-name="PartyRoleDetailAndPartyDetail" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                    <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
-                    <entity-order-by field-name="firstName"/>
-                    <entity-order-by field-name="lastName"/>
-                    <entity-order-by field-name="groupName"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>        
+                <list-options list-name="projectResources" key-name="partyId" description="${lastName} ${firstName} ${middleName} ${groupName}"/>
             </drop-down>
         </field>
         <field name="partyId" use-when="workEffortId!=projectId &amp;&amp; parameters.get(&quot;partyId&quot;)==null" event="onChange" action="javascript:document.AddWorkEffortPartyAssign.submit();"><!-- task level -->
             <drop-down  allow-empty="true" current="selected">
-                <entity-options entity-name="WorkEffortPartyAssignView"  filter-by-date="true" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                    <entity-constraint name="workEffortId" env-name="projectId"/>
-                    <entity-order-by field-name="firstName"/>
-                    <entity-order-by field-name="lastName"/>
-                    <entity-order-by field-name="groupName"/>
-                    <entity-order-by field-name="roleTypeId"/>
-                </entity-options>        
+                <list-options list-name="taskResources" key-name="partyId" description="${lastName} ${firstName} ${middleName} ${groupName}"/>
             </drop-down>
         </field>
-        <field entry-name="xx" name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
+        <field entry-name="xx" name="roleTypeId" use-when="workEffortId==projectId &amp;&amp; parameters.get(&quot;partyId&quot;)!=null" title="${uiLabelMap.PartyRoleType}">
             <drop-down>
                 <entity-options entity-name="PartyRoleDetailAndPartyDetail" description="${description}">
                     <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
@@ -478,6 +488,14 @@
                 </entity-options>
             </drop-down>
         </field>
+        <field entry-name="xx" name="roleTypeId" use-when="workEffortId!=projectId &amp;&amp; parameters.get(&quot;partyId&quot;)!=null" title="${uiLabelMap.PartyRoleType}">
+            <drop-down>
+                <entity-options entity-name="WorkEffortPartyAssignAndRoleType" description="${description}">
+                    <entity-constraint name="workEffortId" env-name="projectId"/>
+                    <entity-constraint name="partyId" env-name="parameters.partyId"/>
+                </entity-options>
+            </drop-down>
+        </field>
         <field entry-name="xx" name="fromDate"><date-time type="date"/></field>
         <field entry-name="xx" name="thruDate"><date-time type="date"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>