svn commit: r524389 - in /ofbiz/trunk/applications/manufacturing: config/ManufacturingUiLabels.properties webapp/manufacturing/mrp/MrpForms.xml widget/manufacturing/MrpScreens.xml

[jacopoc]

Author: jacopoc
Date: Sat Mar 31 01:03:27 2007
New Revision: 524389

URL: http://svn.apache.org/viewvc?view=rev&rev=524389
Log:
Added mrp job information to the mrp log screen:
- the last mrp job is shown
- scheduled and running mrp jobs are shown
- if an mrp job is running, no log will be shown

Modified:
    ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.xml
    ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml

Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties?view=diff&rev=524389&r1=524388&r2=524389
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties Sat Mar 31 01:03:27 2007
@@ -128,6 +128,9 @@
 ManufacturingManufacturingRules=Manufacturing Rules
 ManufacturingMaterials=Materials
 ManufacturingMrp=MRP
+ManufacturingMrpJobLastExecuted=Last Job
+ManufacturingMrpJobIsRunning=An Mrp Job is Running
+ManufacturingMrpJobScheduledOrRunning=Scheduled or Running Jobs
 ManufacturingMrpInitialisation=IEP init.
 ManufacturingNewCalendar=New calendar
 ManufacturingNewCalendarWeek=New Week

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.xml?view=diff&rev=524389&r1=524388&r2=524389
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.xml Sat Mar 31 01:03:27 2007
@@ -37,4 +37,39 @@
             <submit button-type="button"/>
         </field>
     </form>
+    
+    <form name="ListRunningMrpJobs" list-name="mrpActiveJobs" title="" type="list">
+        <auto-fields-entity entity-name="JobSandbox" default-field-type="display"/>
+        <field name="statusId">
+            <display-entity entity-name="StatusItem" description="${description}"></display-entity>
+        </field>
+        <field name="poolId"><hidden/></field>
+        <field name="parentJobId"><hidden/></field>
+        <field name="previousJobId"><hidden/></field>
+        <field name="loaderName"><hidden/></field>
+        <field name="runAsUser"><hidden/></field>
+        <field name="runByInstanceId"><hidden/></field>
+        <field name="runtimeDataId"><hidden/></field>
+        <field name="recurrenceInfoId"><hidden/></field>
+        <field name="serviceName"><hidden/></field>
+        <field name="startDateTime"><hidden/></field>
+        <field name="finishDateTime"><hidden/></field>
+        <field name="cancelDateTime"><hidden/></field>
+    </form>
+    <form name="ListFinishedMrpJobs" list-name="lastFinishedJobs" title="" type="list">
+        <auto-fields-entity entity-name="JobSandbox" default-field-type="display"/>
+        <field name="statusId">
+            <display-entity entity-name="StatusItem" description="${description}"></display-entity>
+        </field>
+        <field name="poolId"><hidden/></field>
+        <field name="parentJobId"><hidden/></field>
+        <field name="previousJobId"><hidden/></field>
+        <field name="loaderName"><hidden/></field>
+        <field name="runAsUser"><hidden/></field>
+        <field name="runByInstanceId"><hidden/></field>
+        <field name="runtimeDataId"><hidden/></field>
+        <field name="recurrenceInfoId"><hidden/></field>
+        <field name="serviceName"><hidden/></field>
+    </form>
+
 </forms>

Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml?view=diff&rev=524389&r1=524388&r2=524389
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml Sat Mar 31 01:03:27 2007
@@ -81,14 +81,61 @@
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
 
+                <entity-condition entity-name="JobSandbox" list-name="mrpActiveJobs">
+                    <condition-list combine="and">
+                        <condition-expr field-name="serviceName" value="executeMrp"/>
+                        <condition-list combine="or">
+                            <condition-expr field-name="statusId" value="SERVICE_PENDING"/>
+                            <condition-expr field-name="statusId" value="SERVICE_QUEUED"/>
+                            <condition-expr field-name="statusId" value="SERVICE_RUNNING"/>
+                        </condition-list>
+                    </condition-list>
+                    <order-by field-name="-createdStamp"/>
+                </entity-condition>
+                <entity-condition entity-name="JobSandbox" list-name="mrpRunningJobs">
+                    <condition-list combine="and">
+                        <condition-expr field-name="serviceName" value="executeMrp"/>
+                        <condition-expr field-name="statusId" value="SERVICE_RUNNING"/>
+                    </condition-list>
+                    <order-by field-name="-createdStamp"/>
+                </entity-condition>
+                <entity-condition entity-name="JobSandbox" list-name="mrpFinishedJobs">
+                    <condition-list combine="and">
+                        <condition-expr field-name="serviceName" value="executeMrp"/>
+                        <condition-list combine="or">
+                            <condition-expr field-name="statusId" value="SERVICE_FINISHED"/>
+                            <condition-expr field-name="statusId" value="SERVICE_FAILED"/>
+                            <condition-expr field-name="statusId" value="SERVICE_CRASHED"/>
+                            <condition-expr field-name="statusId" value="SERVICE_CANCELLED"/>
+                        </condition-list>
+                    </condition-list>
+                    <order-by field-name="-finishDateTime"/>
+                </entity-condition>
+                <set field="lastFinishedJob" from-field="mrpFinishedJobs[0]"/>
+                <set field="lastFinishedJobs[]" from-field="lastFinishedJob"/>
+                
                 <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/findInventoryEventPlan.bsh"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonMrpDecorator">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl"/></html>
-                        </platform-specific>
+                        <label style="head2">${uiLabelMap.ManufacturingMrpJobLastExecuted}</label>
+                        <include-form name="ListFinishedMrpJobs" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/>
+                        <label style="head2">${uiLabelMap.ManufacturingMrpJobScheduledOrRunning}</label>
+                        <include-form name="ListRunningMrpJobs" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/>
+                        <section>
+                            <condition>
+                                <if-empty field-name="mrpRunningJobs"/>
+                            </condition>
+                            <widgets>
+                                <platform-specific>
+                                    <html><html-template location="component://manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl"/></html>
+                                </platform-specific>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="head1">${uiLabelMap.ManufacturingMrpJobIsRunning}</label>
+                            </fail-widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>