svn commit: r1230689 - in /ofbiz/trunk/applications/workeffort: script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml servicedef/services.xml

[adrianc]

Author: adrianc
Date: Thu Jan 12 18:34:06 2012
New Revision: 1230689

URL: http://svn.apache.org/viewvc?rev=1230689&view=rev
Log:
Added a workEffortTypeId parameter to the getICalWorkEfforts service.

Modified:
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
    ofbiz/trunk/applications/workeffort/servicedef/services.xml

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=1230689&r1=1230688&r2=1230689&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Thu Jan 12 18:34:06 2012
@@ -1662,6 +1662,7 @@ under the License.
                 <condition-list combine="and">
                     <condition-expr field-name="scopeEnumId" value="WES_PUBLIC"/>
                     <condition-expr field-name="workEffortTypeId" value="PUBLISH_PROPS" operator="not-equals"/>
+                    <condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/>
                     <condition-expr field-name="partyId" from-field="assignedParty.partyId"/>
                 </condition-list>
             </entity-condition>
@@ -1675,14 +1676,18 @@ under the License.
                 <condition-list combine="and">
                     <condition-expr field-name="scopeEnumId" value="WES_PUBLIC"/>
                     <condition-expr field-name="workEffortTypeId" value="PUBLISH_PROPS" operator="not-equals"/>
+                    <condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/>
                     <condition-expr field-name="fixedAssetId" from-field="assignedFixedAsset.fixedAssetId"/>
                 </condition-list>
             </entity-condition>
             <list-to-list list="resultList" to-list="workEfforts"/>
         </iterate>
-        <entity-and list="resultList" entity-name="WorkEffortAssocToView" filter-by-date="true">
-            <field-map field-name="workEffortIdFrom" from-field="workEffortId"/>
-        </entity-and>
+        <entity-condition list="resultList" entity-name="WorkEffortAssocToView" filter-by-date="true">
+            <condition-list combine="and">
+                <condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortId"/>
+                <condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/>
+            </condition-list>
+        </entity-condition>
         <list-to-list list="resultList" to-list="workEfforts"/>
         <set field="workEfforts" from-field="groovy:org.ofbiz.workeffort.workeffort.WorkEffortWorker.removeDuplicateWorkEfforts(workEfforts);" type="List"/>
         <field-to-result field="workEfforts"/>

Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=1230689&r1=1230688&r2=1230689&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Thu Jan 12 18:34:06 2012
@@ -766,6 +766,7 @@ under the License.
         <description>Get iCalendar Work Efforts</description>
         <!-- No permission checking - the servlet handles that -->
         <attribute type="String" mode="IN" name="workEffortId" optional="false"/>
+        <attribute type="String" mode="IN" name="workEffortTypeId" optional="true"/>
         <attribute type="List" mode="OUT" name="workEfforts"/>
     </service>
     <service name="getPartyICalUrl" engine="simple" auth="false"