svn commit: r638063 - in /ofbiz/trunk/framework/webtools: servicedef/services.xml src/org/ofbiz/webtools/WebToolsServices.java webapp/webtools/service/ServiceForms.xml widget/ServiceScreens.xml

[jacopoc]

Author: jacopoc
Date: Mon Mar 17 14:01:52 2008
New Revision: 638063

URL: http://svn.apache.org/viewvc?rev=638063&view=rev
Log:
Misc enhancements to the 'find job' screen.

Modified:
    ofbiz/trunk/framework/webtools/servicedef/services.xml
    ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
    ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml
    ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml

Modified: ofbiz/trunk/framework/webtools/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/servicedef/services.xml?rev=638063&r1=638062&r2=638063&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/servicedef/services.xml (original)
+++ ofbiz/trunk/framework/webtools/servicedef/services.xml Mon Mar 17 14:01:52 2008
@@ -121,6 +121,8 @@
             location="org.ofbiz.webtools.WebToolsServices" invoke="findJobs" auth="true" use-transaction="false">
         <description>Find Jobs</description>
         <attribute name="serviceName" type="String" mode="IN" optional="true"/>
+        <attribute name="jobId" type="String" mode="IN" optional="true"/>
+        <attribute name="jobName" type="String" mode="IN" optional="true"/>
         <attribute name="VIEW_INDEX" type="String" mode="IN" optional="true"/>
         <attribute name="VIEW_SIZE" type="String" mode="IN" optional="true"/>
         <attribute name="showAll" type="String" mode="IN" optional="true"/>

Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?rev=638063&r1=638062&r2=638063&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Mon Mar 17 14:01:52 2008
@@ -902,6 +902,8 @@
         Map result = ServiceUtil.returnSuccess();
         GenericDelegator delegator = dctx.getDelegator();
         String serviceName = (String) context.get("serviceName");
+        String jobId = (String) context.get("jobId");
+        String jobName = (String) context.get("jobName");
         
         // set the page parameters
         int viewIndex = 0;
@@ -939,6 +941,14 @@
             if (UtilValidate.isNotEmpty(serviceName)) {
                 paramList.add("serviceName=" + serviceName);
                 conditions.add(new EntityExpr("serviceName", true, EntityOperator.LIKE, "%"+serviceName+"%", true));
+            }
+            if (UtilValidate.isNotEmpty(jobId)) {
+                paramList.add("jobId=" + jobId);
+                conditions.add(new EntityExpr("jobId", true, EntityOperator.LIKE, "%"+jobId+"%", true));
+            }
+            if (UtilValidate.isNotEmpty(jobName)) {
+                paramList.add("jobName=" + jobName);
+                conditions.add(new EntityExpr("jobName", true, EntityOperator.LIKE, "%"+jobName+"%", true));
             }
             List filterExprs = FastList.newInstance();
             String filterJobPending = (String) context.get("filterJobsWithPendingStatus");

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml?rev=638063&r1=638062&r2=638063&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml Mon Mar 17 14:01:52 2008
@@ -58,19 +58,15 @@
         header-row-style="header-row" default-table-style="basic-table">
         <!--field name="lookupFlag"><hidden value="Y"/></field-->
         <field name="serviceName" title="${uiLabelMap.WebtoolsServiceName}"><text/></field>
-        <field name="serviceName" title="${uiLabelMap.WebtoolsServiceName}" use-when="&quot;${parameters.hideFields}&quot;.equals(&quot;Y&quot;)"><ignored/></field>
+        <field name="jobId" title="${uiLabelMap.CommonId}"><text/></field>
+        <field name="jobName" title="${uiLabelMap.WebtoolsJob}"><text/></field>
         <field name="filterJobsWithRunningStatus" title="${uiLabelMap.WebtoolsJobFilterOn} ${uiLabelMap.WebtoolsRunningStatus}"><check/></field>
-        <field name="filterJobsWithRunningStatus" title="${uiLabelMap.WebtoolsJobFilterOn} ${uiLabelMap.WebtoolsRunningStatus}" use-when="&quot;${parameters.hideFields}&quot;.equals(&quot;Y&quot;)"><ignored/></field>
         <field name="filterJobsWithPendingStatus" title="${uiLabelMap.WebtoolsJobFilterOn} ${uiLabelMap.WebtoolsPendingStatus}"><check/></field>
-        <field name="filterJobsWithPendingStatus" title="${uiLabelMap.WebtoolsJobFilterOn} ${uiLabelMap.WebtoolsPendingStatus}" use-when="&quot;${parameters.hideFields}&quot;.equals(&quot;Y&quot;)"><ignored/></field>
         <field name="filterJobsWithFinishedStatus" title="${uiLabelMap.WebtoolsJobFilterOn} ${uiLabelMap.WebtoolsFinishedStatus}"><check/></field>
-        <field name="filterJobsWithFinishedStatus" title="${uiLabelMap.WebtoolsJobFilterOn} ${uiLabelMap.WebtoolsFinishedStatus}" use-when="&quot;${parameters.hideFields}&quot;.equals(&quot;Y&quot;)"><ignored/></field>
         <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonFind}" use-when="&quot;${parameters.hideFields}&quot;.equals(&quot;Y&quot;)"><ignored/></field>
         <field name="" widget-style="buttontext">
             <hyperlink target="jobList?showAll=Y&amp;hideFields=Y&amp;lookupFlag=Y" description="${uiLabelMap.CommonShowAllRecords}"/>
         </field>
-        <field name="" widget-style="buttontext" use-when="&quot;${parameters.hideFields}&quot;.equals(&quot;Y&quot;)"><ignored/></field>
     </form>
     
     <form name="JobList" title="" target="" type="list" list-name="jobs"

Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=638063&r1=638062&r2=638063&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Mon Mar 17 14:01:52 2008
@@ -84,7 +84,14 @@
                         <container style="screenlet">
                             <include-menu location="component://webtools/widget/WebToolsMenus.xml" name="FindJobsTitleBar"/>
                             <container style="screenlet-body">
-                                <include-form name="findJob" location="component://webtools/webapp/webtools/service/ServiceForms.xml"/>
+                                <section>
+                                    <condition>
+                                        <if-compare field-name="parameters.hideFields" operator="not-equals" value="Y"/>
+                                    </condition>
+                                    <widgets>
+                                        <include-form name="findJob" location="component://webtools/webapp/webtools/service/ServiceForms.xml"/>
+                                    </widgets>
+                                </section>
                             </container>
                         </container>
                         <container style="screenlet">