Author: jacopoc
Date: Sun Mar 11 01:40:47 2007
New Revision: 516876
URL: http://svn.apache.org/viewvc?view=rev&rev=516876
Log:
Misc ui refactorings for the 'Edit production run' screen:
added new screen to manage the fixed assets assigned to production runs tasks.
Added:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.bsh
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl
Removed:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunComponents.ftl
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/EditProductionRun.bsh
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.bsh
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTabBar.ftl
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/EditProductionRun.bsh
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/EditProductionRun.bsh?view=diff&rev=516876&r1=516875&r2=516876
==============================================================================
---
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/EditProductionRun.bsh
(original)
+++
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/EditProductionRun.bsh
Sun Mar 11 01:40:47 2007
@@ -149,44 +149,12 @@
List productionRunComponentsData =
productionRun.getProductionRunComponents();
context.put("productionRunComponents", productionRunComponentsData);
- //------------------------
- // Machines (fixed assets)
- //------------------------
- // Fixed asset add sub-screen
- if (actionForm.equals("AddFixedAsset")) {
- Map fixedAssetData = UtilMisc.toMap("productionRunId",
productionRunId);
- HtmlFormWrapper editProdRunFixedAssetWrapper = new
HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml",
"EditProductionRunTaskFixedAsset", request, response);
- editProdRunFixedAssetWrapper.putInContext("fixedAssetData",
fixedAssetData);
- editProdRunFixedAssetWrapper.putInContext("actionForm",
"addFixedAsset");
- editProdRunFixedAssetWrapper.putInContext("actionIsAdd", "Y");
- // the declarationScreen variable tells us whether we are in the
EditProductionRun screen
- // or in the ProductionRunDeclaration screen
- editProdRunFixedAssetWrapper.putInContext("declarationScreen",
"N");
- context.put("editProdRunFixedAssetWrapper",
editProdRunFixedAssetWrapper);
- }
- // Fixed asset update sub-screen
- workEffortId = request.getParameter("workEffortId");
- fixedAssetId = request.getParameter("fixedAssetId");
- fromDate = request.getParameter("fromDate");
- if (workEffortId != null && fixedAssetId != null && fromDate!= null &&
actionForm.equals("UpdateFixedAsset")) {
- GenericValue fixedAsset =
delegator.findByPrimaryKey("WorkEffortFixedAssetAssign",
-
UtilMisc.toMap("workEffortId", workEffortId, "fixedAssetId", fixedAssetId,
"fromDate", fromDate));
- Map fixedAssetData = fixedAsset.getAllFields();
- fixedAssetData.put("productionRunId", productionRunId);
- HtmlFormWrapper editProdRunFixedAssetWrapper = new
HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml",
"EditProductionRunTaskFixedAsset", request, response);
- editProdRunFixedAssetWrapper.putInContext("fixedAssetData",
fixedAssetData);
- editProdRunFixedAssetWrapper.putInContext("actionForm",
"updateFixedAsset");
- editProdRunFixedAssetWrapper.putInContext("actionIsAdd",
"null");
- editProdRunFixedAssetWrapper.putInContext("declarationScreen",
"N");
- context.put("editProdRunFixedAssetWrapper",
editProdRunFixedAssetWrapper);
- context.put("fixedAssetId", fixedAssetId);
- }
// Fixed assets list
List productionRunFixedAssetsData = new LinkedList();
for (Iterator tasksIt = productionRunRoutingTasks.iterator();
tasksIt.hasNext();) {
- GenericValue prodRunTask = (GenericValue)tasksIt.next();
- List taskFixedAssets =
prodRunTask.getRelated("WorkEffortFixedAssetAssign");
- productionRunFixedAssetsData.addAll(taskFixedAssets);
+ GenericValue prodRunTask = (GenericValue)tasksIt.next();
+ List taskFixedAssets =
prodRunTask.getRelated("WorkEffortFixedAssetAssign");
+ productionRunFixedAssetsData.addAll(taskFixedAssets);
}
context.put("productionRunFixedAssetsData",
productionRunFixedAssetsData);
}
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.bsh
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.bsh?view=diff&rev=516876&r1=516875&r2=516876
==============================================================================
---
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.bsh
(original)
+++
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.bsh
Sun Mar 11 01:40:47 2007
@@ -33,14 +33,14 @@
productionRunId = request.getParameter("workEffortId");
}
-List taskComponents = new ArrayList();
+List taskInfos = new ArrayList();
List tasks = delegator.findByAnd("WorkEffort",
UtilMisc.toMap("workEffortParentId", productionRunId),
UtilMisc.toList("workEffortId"));
Iterator tasksIt = tasks.iterator();
while (tasksIt.hasNext()) {
GenericValue task = (GenericValue)tasksIt.next();
- List components = delegator.findByAnd("WorkEffortGoodStandard",
UtilMisc.toMap("workEffortId", task.getString("workEffortId")));
- HtmlFormWrapper taskComponentsForm = new
HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml",
"ProductionRunTaskComponents", request, response);
- taskComponentsForm.putInContext("taskComponents", components);
- taskComponents.add(UtilMisc.toMap("task", task, "componentsForm",
taskComponentsForm));
+ List records = delegator.findByAnd("WorkEffortGoodStandard",
UtilMisc.toMap("workEffortId", task.getString("workEffortId")));
+ HtmlFormWrapper taskForm = new
HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml",
"ProductionRunTaskComponents", request, response);
+ taskForm.putInContext("records", records);
+ taskInfos.add(UtilMisc.toMap("task", task, "taskForm", taskForm));
}
-context.put("taskComponents", taskComponents);
+context.put("taskInfos", taskInfos);
Added:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.bsh
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.bsh?view=auto&rev=516876
==============================================================================
---
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.bsh
(added)
+++
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.bsh
Sun Mar 11 01:40:47 2007
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.List;
+import java.util.Iterator;
+import java.util.ArrayList;
+
+import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.widget.html.HtmlFormWrapper;
+
+
+productionRunId = request.getParameter("productionRunId");
+if (UtilValidate.isEmpty(productionRunId)) {
+ productionRunId = request.getParameter("workEffortId");
+}
+
+List taskInfos = new ArrayList();
+List tasks = delegator.findByAnd("WorkEffort",
UtilMisc.toMap("workEffortParentId", productionRunId),
UtilMisc.toList("workEffortId"));
+Iterator tasksIt = tasks.iterator();
+while (tasksIt.hasNext()) {
+ GenericValue task = (GenericValue)tasksIt.next();
+ List records = task.getRelated("WorkEffortFixedAssetAssign");
+ HtmlFormWrapper taskForm = new
HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml",
"ProductionRunTaskFixedAssets", request, response);
+ taskForm.putInContext("records", records);
+ taskInfos.add(UtilMisc.toMap("task", task, "taskForm", taskForm));
+}
+context.put("taskInfos", taskInfos);
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?view=diff&rev=516876&r1=516875&r2=516876
==============================================================================
---
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
Sun Mar 11 01:40:47 2007
@@ -511,6 +511,28 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="ProductionRunCosts"/>
</request-map>
+ <request-map uri="ProductionRunFixedAssets">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ProductionRunFixedAssets"/>
+ </request-map>
+ <request-map uri="createWorkEffortFixedAssetAssign">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createWorkEffortFixedAssetAssign"/>
+ <response name="success" type="view" value="ProductionRunFixedAssets"/>
+ <response name="error" type="view" value="ProductionRunFixedAssets"/>
+ </request-map>
+ <request-map uri="updateWorkEffortFixedAssetAssign">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateWorkEffortFixedAssetAssign"/>
+ <response name="success" type="view" value="ProductionRunFixedAssets"/>
+ <response name="error" type="view" value="ProductionRunFixedAssets"/>
+ </request-map>
+ <request-map uri="removeWorkEffortFixedAssetAssign">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="removeWorkEffortFixedAssetAssign"/>
+ <response name="success" type="view" value="ProductionRunFixedAssets"/>
+ <response name="error" type="view" value="ProductionRunFixedAssets"/>
+ </request-map>
<request-map uri="ProductionRunComponents">
<security https="true" auth="true"/>
<response name="success" type="view" value="ProductionRunComponents"/>
@@ -555,13 +577,6 @@
<response name="success" type="view" value="EditProductionRun"/>
<response name="error" type="view" value="EditProductionRun"/>
</request-map>
- <request-map uri="removeProductionRunFixedAsset">
- <security https="true" auth="true"/>
- <event type="simple"
path="org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml"
invoke="removeProductionRunFixedAsset" />
- <response name="docs_not_printed" type="view"
value="EditProductionRun" />
- <response name="docs_printed" type="view"
value="ProductionRunDeclaration" />
- <response name="error" type="view" value="EditProductionRun" />
- </request-map>
<!-- Production Run Declaration -->
<request-map uri="changeProductionRunStatusToPrinted">
<security https="true" auth="true"/>
@@ -752,6 +767,7 @@
<view-map name="ProductionRunDeclaration"
page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunDeclaration"
type="screen"/>
<view-map name="ProductionRunCosts"
page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunCosts"
type="screen"/>
<view-map name="ProductionRunComponents"
page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunComponents"
type="screen"/>
+ <view-map name="ProductionRunFixedAssets"
page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunFixedAssets"
type="screen"/>
<view-map name="ProductionRunAssocs"
page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunAssocs"
type="screen"/>
<view-map name="WorkWithShipmentPlans"
page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#WorkWithShipmentPlans"
type="screen"/>
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl?view=diff&rev=516876&r1=516875&r2=516876
==============================================================================
---
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl
(original)
+++
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl
Sun Mar 11 01:40:47 2007
@@ -123,26 +123,6 @@
</table>
</td>
</#if>
- <#-- Fixed Asset assign sub-screen Update or Add -->
- <#if fixedAssetId?has_content || actionForm=="AddFixedAsset">
- <td> </td>
- <td>
- <table border="0" width="100%" cellspacing="0" cellpadding="0"
class="boxoutside">
- <tr><td>
- <table width="100%" border="0" cellspacing="0"
cellpadding="0" class="boxtop">
- <tr>
- <#if fixedAssetId?has_content> <#-- Fixed Asset
Assign Update -->
- <td><div
class="boxhead">${uiLabelMap.CommonEdit} ${uiLabelMap.ManufacturingProductionRunFixedAssetAssign}</div></td>
- <#else> <#-- Fixed Asset Assign Add -->
- <td><div
class="boxhead">${uiLabelMap.ManufacturingAddProductionRunFixedAssetAssign}</div></td>
- </#if>
- </tr>
- </table>
-
${editProdRunFixedAssetWrapper.renderFormString(context)}
- </td></tr>
- </table>
- </td>
- </#if>
</tr>
</table>
<br/>
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?view=diff&rev=516876&r1=516875&r2=516876
==============================================================================
---
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
Sun Mar 11 01:40:47 2007
@@ -27,7 +27,7 @@
<field name="facilityId">
<drop-down allow-empty="false">
<entity-options entity-name="Facility"
description="${facilityName} [${facilityId}]">
- <entity-constraint name="facilityTypeId"
value="WAREHOUSE"/>
+ <!--<entity-constraint name="facilityTypeId"
value="WAREHOUSE"/>-->
</entity-options>
</drop-down>
</field>
@@ -54,7 +54,7 @@
<field name="facilityId" title="${uiLabelMap.ProductFacilityId}">
<drop-down allow-empty="true">
<entity-options entity-name="Facility"
key-field-name="facilityId" description="${facilityName} [${facilityId}]">
- <entity-constraint name="facilityTypeId"
value="WAREHOUSE"/>
+ <!--<entity-constraint name="facilityTypeId"
value="WAREHOUSE"/>-->
</entity-options>
</drop-down>
</field>
@@ -351,6 +351,22 @@
<hyperlink
target="/facility/control/EditInventoryItem?inventoryItemId=${inventoryItemId}"
description="${inventoryItemId}" also-hidden="false" target-type="inter-app"/>
</field>
</form>
+ <form name="ProductionRunTaskFixedAssets" type="list"
target="updateWorkEffortFixedAssetAssign" paginate-target="" title=""
list-name="records">
+ <auto-fields-entity entity-name="WorkEffortFixedAssetAssign"
default-field-type="edit" />
+ <field name="productionRunId"><hidden/></field>
+ <field name="workEffortId"><hidden/></field>
+ <field name="statusId"><hidden/></field>
+ <field name="fromDate"><display/></field>
+ <field name="fixedAssetId">
+ <display-entity entity-name="FixedAsset"
description="${fixedAssetName} [${fixedAssetId}]" />
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="deleteLink" title="" widget-style="smallSubmit"
+
use-when="!"${declarationScreen}".equals("Y")">
+ <hyperlink description="${uiLabelMap.CommonDelete}"
also-hidden="false"
+
target="removeWorkEffortFixedAssetAssign?workEffortId=${workEffortId}&fixedAssetId=${fixedAssetId}&fromDate=${fromDate}&productionRunId=${productionRunId}"
/>
+ </field>
+ </form>
<form name="ListProductionRunTaskFixedAssets" type="list" title=""
list-name="productionRunFixedAssetsData">
<auto-fields-entity entity-name="WorkEffortFixedAssetAssign"
default-field-type="display" />
<field name="workEffortId">
@@ -362,16 +378,6 @@
<field name="statusId">
<display-entity entity-name="StatusItem" />
</field>
- <field name="editLink" title="" widget-style="smallSubmit"
-
use-when="!"${declarationScreen}".equals("Y")">
- <hyperlink description="${uiLabelMap.CommonEdit}"
also-hidden="false"
-
target="EditProductionRun?actionForm=UpdateFixedAsset&workEffortId=${workEffortId}&fixedAssetId=${fixedAssetId}&fromDate=${fromDate}&productionRunId=${productionRunId}"
/>
- </field>
- <field name="deleteLink" title="" widget-style="smallSubmit"
-
use-when="!"${declarationScreen}".equals("Y")">
- <hyperlink description="${uiLabelMap.CommonDelete}"
also-hidden="false"
-
target="removeProductionRunFixedAsset?workEffortId=${workEffortId}&fixedAssetId=${fixedAssetId}&fromDate=${fromDate}&productionRunId=${productionRunId}"
/>
- </field>
</form>
<form name="EditProductionRunTaskFixedAsset" type="single"
target="EditProductionRun" title="" default-map-name="fixedAssetData">
<alt-target use-when="declarationScreen.equals("Y")"
target="ProductionRunDeclaration" />
@@ -413,6 +419,36 @@
<submit button-type="button" />
</field>
</form>
+ <form name="AddProductionRunTaskFixedAsset" type="single"
target="createWorkEffortFixedAssetAssign" title="">
+ <auto-fields-service service-name="createWorkEffortFixedAssetAssign" />
+ <field name="productionRunId"><hidden /></field>
+ <field name="workEffortId">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="WorkEffort"
description="[${workEffortId}] ${workEffortName}">
+ <entity-constraint name="workEffortParentId"
value="${productionRunId}" />
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="fixedAssetId">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="FixedAsset"
description="${fixedAssetName} [${fixedAssetId}]" />
+ </drop-down>
+ </field>
+ <field name="statusId">
+ <!-- Statuses are not yet defined for the
WorkEffortFixedAssetAssign entity
+ so this field will be hidden meanwhile
+ <drop-down>
+ <entity-options entity-name="StatusItem"
description="${description}">
+ <entity-constraint name="statusTypeId"
value="WORK_EFF_ASSET_STTS" />
+ </entity-options>
+ </drop-down> -->
+ <hidden />
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}">
+ <submit button-type="button"/>
+ </field>
+ </form>
+
<!-- ******************* -->
<!-- Shipment Plan Forms -->
<!-- ******************* -->
@@ -534,7 +570,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ProductionRunTaskComponents" type="list"
target="updateProductionRunComponent" paginate-target="ProductionRunComponents"
title="" list-name="taskComponents">
+ <form name="ProductionRunTaskComponents" type="list"
target="updateProductionRunComponent" paginate-target="ProductionRunComponents"
title="" list-name="records">
<field name="productId"><display/></field>
<field name="internalName" entry-name="productId">
<display-entity entity-name="Product" key-field-name="productId"
description="${internalName}"/>
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTabBar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTabBar.ftl?view=diff&rev=516876&r1=516875&r2=516876
==============================================================================
---
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTabBar.ftl
(original)
+++
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTabBar.ftl
Sun Mar 11 01:40:47 2007
@@ -29,6 +29,7 @@
<a
href="<@ofbizUrl>ProductionRunCosts?productionRunId=${productionRunId}</@ofbizUrl>"
class="${selectedClassMap.costs?default(unselectedClassName)}">${uiLabelMap.ManufacturingActualCosts}</a>
</#if>
<a
href="<@ofbizUrl>ProductionRunComponents?productionRunId=${productionRunId}</@ofbizUrl>"
class="${selectedClassMap.components?default(unselectedClassName)}">${uiLabelMap.ManufacturingMaterials}</a>
+ <a
href="<@ofbizUrl>ProductionRunFixedAssets?productionRunId=${productionRunId}</@ofbizUrl>"
class="${selectedClassMap.fixedAssets?default(unselectedClassName)}">${uiLabelMap.AccountingFixedAssets}</a>
<a
href="<@ofbizUrl>ProductionRunAssocs?productionRunId=${productionRunId}</@ofbizUrl>"
class="${selectedClassMap.assocs?default(unselectedClassName)}">${uiLabelMap.ManufacturingProductionRunAssocs}</a>
</#if>
</div>
Added:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl?view=auto&rev=516876
==============================================================================
---
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl
(added)
+++
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl
Sun Mar 11 01:40:47 2007
@@ -0,0 +1,29 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<br/>
+<#list taskInfos as taskInfo>
+ <#assign task = taskInfo.task>
+ <#assign taskForm = taskInfo.taskForm>
+ <div>
+ <span class="head2">${task.workEffortName?if_exists}
[${task.workEffortId}]</span>
+ </div>
+ ${taskForm.renderFormString(context)}
+ <br/>
+</#list>
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?view=diff&rev=516876&r1=516875&r2=516876
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
Sun Mar 11 01:40:47 2007
@@ -105,9 +105,6 @@
<container>
<label
style="head2">${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}</label>
</container>
- <container>
- <link
target="EditProductionRun?productionRunId=${productionRunId}&actionForm=AddFixedAsset"
text="${uiLabelMap.ManufacturingAddProductionRunFixedAssetAssign}"
style="buttontext"/>
- </container>
<include-form name="ListProductionRunTaskFixedAssets"
location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -226,7 +223,38 @@
</container>
<include-form name="AddProductionRunComponent"
location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
<platform-specific>
- <html><html-template
location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunComponents.ftl"/></html>
+ <html><html-template
location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl"/></html>
+ </platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="ProductionRunFixedAssets">
+ <section>
+ <actions>
+ <set field="title" value="Production Run Fixed Assets"/>
+ <set field="titleProperty"
value="ManufacturingProductionRunFixedAssets"/>
+ <set field="tabButtonItem" value="fixedAssets"/>
+ <set field="headerItem" value="jobshop"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX"
type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE"
type="Integer" default-value="500"/>
+
+ <set field="productionRunId"
from-field="parameters.productionRunId"/>
+ <entity-one entity-name="WorkEffort"
value-name="productionRun">
+ <field-map field-name="workEffortId"
env-name="productionRunId"/>
+ </entity-one>
+ <script
location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonJobshopDecorator">
+ <decorator-section name="body">
+ <container>
+ <label
style="head2">${uiLabelMap.ManufacturingTaskFixedAssets}</label>
+ </container>
+ <include-form name="AddProductionRunTaskFixedAsset"
location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ <platform-specific>
+ <html><html-template
location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
