svn commit: r663785 - in /ofbiz/trunk/specialpurpose/as
Locked
 
|
Author: adrianc
Date: Thu Jun 5 16:36:48 2008 New Revision: 663785 URL: http://svn.apache.org/viewvc?rev=663785&view=rev Log: More UI work on Asset Maintenance. Better re-use of existing screens. Removed: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/viewCalendar.bsh ofbiz/trunk/specialpurpose/assetmaint/widget/AssetMaintTrees.xml ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml Modified: ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Modified: ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml?rev=663785&r1=663784&r2=663785&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml Thu Jun 5 16:36:48 2008 @@ -28,16 +28,6 @@ <author>None</author> <version>1.0</version> - <view-entity entity-name="FixedAssetAndMaint" package-name="org.ofbiz.assetmaint" - title="FixedAsset and FixedAssetMaint View Entity"> - <member-entity entity-alias="FA" entity-name="FixedAsset"/> - <member-entity entity-alias="FAM" entity-name="FixedAssetMaint"/> - <alias-all entity-alias="FA"/> - <alias-all entity-alias="FAM"/> - <view-link entity-alias="FA" rel-entity-alias="FAM"> - <key-map field-name="fixedAssetId"/> - </view-link> - </view-entity> <view-entity entity-name="FixedAssetAndIdent" package-name="org.ofbiz.assetmaint" title="FixedAsset and FixedAssetIdent View Entity"> <member-entity entity-alias="FA" entity-name="FixedAsset"/> @@ -50,12 +40,17 @@ </view-entity> <view-entity entity-name="FixedAssetMaintWorkEffort" package-name="org.ofbiz.assetmaint" title="FixedAssetMaint and WorkEffort View Entity"> + <member-entity entity-alias="FA" entity-name="FixedAsset"/> <member-entity entity-alias="FAM" entity-name="FixedAssetMaint"/> <member-entity entity-alias="WE" entity-name="WorkEffort"/> + <alias-all entity-alias="FA"/> <alias-all entity-alias="FAM"/> <alias-all entity-alias="WE"> <exclude field="fixedAssetId"/> </alias-all> + <view-link entity-alias="FAM" rel-entity-alias="FA"> + <key-map field-name="fixedAssetId"/> + </view-link> <view-link entity-alias="FAM" rel-entity-alias="WE"> <key-map field-name="scheduleWorkEffortId" rel-field-name="workEffortId"/> </view-link> Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml?rev=663785&r1=663784&r2=663785&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml Thu Jun 5 16:36:48 2008 @@ -184,10 +184,6 @@ <view-map name="LookupPartsProduct" type="screen" page="component://assetmaint/widget/ProductScreens.xml#LookupPartsProduct"/> <view-map name="LookupWorkEffortShort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffortShort"/> - <!-- Asset Maint Calendar screens --> - <view-map name="day" type="screen" page="component://assetmaint/widget/FixedAssetScreens.xml#CalendarDay"/> - <view-map name="week" type="screen" page="component://assetmaint/widget/FixedAssetScreens.xml#CalendarWeek"/> - <view-map name="month" type="screen" page="component://assetmaint/widget/FixedAssetScreens.xml#CalendarMonth"/> <view-map name="EditWorkEffort" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditFixedAssetMaint"/> <view-map name="WorkEffortSummary" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditFixedAssetMaint"/> <!-- end of view mappings --> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=663785&r1=663784&r2=663785&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Thu Jun 5 16:36:48 2008 @@ -51,6 +51,7 @@ <set field="headerItem" value="fixedAssetMaints"/> <set field="titleProperty" value="PageTitleFindFixedAssetMaints"/> <set field="labelTitleProperty" value="AccountingFixedAssetMaint"/> + <set field="noConditionFind" value="Y"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?rev=663785&r1=663784&r2=663785&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Thu Jun 5 16:36:48 2008 @@ -60,18 +60,5 @@ <link target="FindFacilityTransfers?facilityId=${facilityId}"/> </menu-item> </menu> - - <menu name="CalendarTabBar" selected-menuitem-context-field-name="parameters.viewMode" - type="simple" default-selected-style="selected" menu-container-style="button-bar tab-bar"> - <menu-item name="D" title="${uiLabelMap.CommonDay}"> - <link target="day?fixedAssetId=${fixedAssetId}"/> - </menu-item> - <menu-item name="W" title="${uiLabelMap.CommonWeek}"> - <link target="week?fixedAssetId=${fixedAssetId}"/> - </menu-item> - <menu-item name="M" title="${uiLabelMap.CommonMonth}"> - <link target="month?fixedAssetId=${fixedAssetId}"/> - </menu-item> - </menu> </menus> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?rev=663785&r1=663784&r2=663785&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Thu Jun 5 16:36:48 2008 @@ -37,87 +37,33 @@ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> - <!-- list all assets in a tabular format --> - <form name="ListFixedAssets" type="list" list-name="listIt" paginate-target="findFixedAsset" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> - <field-map field-name="entityName" value="FixedAsset"/> - <field-map field-name="orderBy" value="fixedAssetId"/> - </service> - </actions> - <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" widget-style="linktext"> - <hyperlink also-hidden="false" description="${fixedAssetId}" target="EditFixedAsset?fixedAssetId=${fixedAssetId}"/> - </field> - <field name="partyId" title="${uiLabelMap.FormFieldTitle_manufacturerPartyId}"> - <display/> - </field> - <field title="${uiLabelMap.AccountingInstanceOfProductId}" name="instanceOfProductId"> - <display/> - </field> - <field name="classEnumId" title="${uiLabelMap.AccountingFixedAssetClassEnumId}"> - <display-entity entity-name="Enumeration" description="${description}" key-field-name="enumId" /> - </field> - <field name="fixedAssetName" title="${uiLabelMap.AccountingFixedAssetName}"><display/></field> - <field name="serialNumber"><display/></field> - <!--field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity entity-name="FixedAssetType"/></field> - <field name="parentFixedAssetId" title="${uiLabelMap.AccountingFixedAssetParent}"> - <display-entity entity-name="FixedAsset" key-field-name="fixedAssetId" description="${fixedAssetName}"> - <sub-hyperlink target="EditFixedAsset?fixedAssetId=${parentFixedAssetId}" description="${parentFixedAssetId}" link-style="buttontext"/> - </display-entity> - </field--> - </form> - - <!-- create and update a Equipment --> - <form name="EditFixedAsset" type="single" target="updateFixedAsset" title="${uiLabelMap.AccountingFixedAsset}" default-map-name="fixedAsset" + <!-- Maintences Search Options form --> + <form name="FindFixedAssetMaint" default-map-name="timesheet" target="findFixedAssetMaints" type="single" header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="fixedAsset==null" target="createFixedAsset"/> - <auto-fields-service service-name="updateFixedAsset" map-name="fixedAsset"/> - - <field use-when="fixedAsset!=null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="fixedAsset==null&&fixedAssetId==null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="20" maxlength="20"/></field> - <field use-when="fixedAsset==null&&fixedAssetId!=null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonCannotBeFound}:[${fixedAssetId}]"><text size="20" maxlength="20"/></field> - - <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"> - <drop-down allow-empty="false"> - <entity-options entity-name="FixedAssetType" description="${description}"> - <entity-order-by field-name="description"/> + <field name="fixedAssetId"><text-find default-option="contains" ignore-case="true"/></field> + <field name="maintHistSeqId"><text-find default-option="contains" ignore-case="true"/></field> + <field name="productMaintTypeId" title="${uiLabelMap.AccountingFixedAssetMaintType}"> + <drop-down allow-empty="true"> + <entity-options description="${description}" entity-name="ProductMaintType"> + <entity-order-by field-name="productMaintTypeId"/> </entity-options> </drop-down> </field> - <field name="parentFixedAssetId" title="${uiLabelMap.AccountingFixedAssetParent}"><lookup target-form-name="LookupFixedAsset"/></field> - <field name="instanceOfProductId" title="${uiLabelMap.AccountingInstanceOfProductId}"><lookup target-form-name="LookupProduct"/></field> - <field name="classEnumId" title="${uiLabelMap.AccountingFixedAssetClassEnumId}"> + <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> - <entity-constraint name="enumTypeId" operator="equals" value="FXAST_CLASS"/> - <entity-order-by field-name="description"/> + <entity-options description="${description}" entity-name="StatusItem"> + <entity-constraint name="statusTypeId" operator="equals" value="FIXEDAST_MNT_STATUS"/> + <entity-order-by field-name="sequenceId"/> </entity-options> </drop-down> </field> - <field name="partyId" title="${uiLabelMap.FormFieldTitle_manufacturerPartyId}"><lookup target-form-name="LookupPartyGroup"/></field> - <field name="fixedAssetName" title="${uiLabelMap.AccountingFixedAssetName}"><text size="30" maxlength="30"/></field> - <field name="roleTypeId"><hidden/></field> - <field name="uomId"><hidden/></field> - <field name="calendarId"><hidden/></field> - <field name="productionCapacity"><hidden/></field> - <field name="locatedAtFacilityId" title="${uiLabelMap.AccountingFacilityId}"><lookup target-form-name="LookupFacility"/></field> - <field name="locatedAtLocationSeqId"><hidden/></field> - <field name="submitButton" use-when="fixedAssetId!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="submitButton" use-when="fixedAssetId==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> - </form> - - <form name="FindFixedAssetMaint" default-map-name="timesheet" target="findFixedAssetMaints" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <field name="fixedAssetId"><text-find default-option="contains" ignore-case="true"/></field> - <field name="maintHistSeqId"><text-find default-option="contains" ignore-case="true"/></field> - <field name="statusId"><text-find default-option="contains" ignore-case="true"/></field> <field name="actualStartDate"><date-find/></field> - <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> + + <!-- Special version of the same form in Accounting. This one lists all maintenances, not just + maintenances for a specific fixed asset. --> <form name="ListFixedAssetMaints" target="" title="" type="list" list-name="listIt" paginate-target="findFixedAssetMaints" paginate="true" header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> @@ -127,78 +73,25 @@ <field-map field-name="orderBy" value="-actualStartDate"/> </service> </actions> - <field title="${uiLabelMap.AccountingFixedAssetId}" name="fixedAssetId"><display/></field> <field name="maintHistSeqId"><hidden/></field> <field name="maintHistSeqIdLink" title="${uiLabelMap.AccountingFixedAssetMaintSeqId}" widget-style="linktext"> <hyperlink also-hidden="false" description="${maintHistSeqId}" target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}&maintHistSeqId=${maintHistSeqId}"/> </field> + <field name="fixedAssetName" title="${uiLabelMap.AccountingFixedAssetName}"><display/></field> + <field name="productMaintTypeId" title="${uiLabelMap.AccountingFixedAssetMaintType}"><display-entity entity-name="ProductMaintType"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field> - <field name="productMaintTypeId" ><display-entity entity-name="ProductMaintType"/></field> + <field name="intervalMeterTypeId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}"><display/></field> <field name="intervalQuantity" title="${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}"><display/></field> + <field name="intervalUomId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalUom}"><display/></field> <field name="actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display/></field> <field name="actualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display/></field> - <field name="intervalUomId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalUom}"><display/></field> - <field name="intervalMeterTypeId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}"><display/></field> </form> - <form name="EditFixedAssetMaint" type="single" default-map-name="fixedAssetMaint" target="updateFixedAssetMaintAndWorkEffort" - header-row-style="header-row" default-table-style="basic-table"> + <form name="EditFixedAssetMaint" extends="EditFixedAssetMaint" extends-resource="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml" target="updateFixedAssetMaintAndWorkEffort"> <alt-target use-when="fixedAssetMaint==null" target="createFixedAssetMaintUpdateWorkEffort"/> <field name="fixedAssetId" use-when="fixedAssetMaint==null" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupFixedAsset"/></field> - <field name="dummy" use-when="fixedAssetMaint !=null" title="${uiLabelMap.AccountingFixedAssetId}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${fixedAssetMaint.fixedAssetId}" target="EditFixedAsset?fixedAssetId=${fixedAssetMaint.fixedAssetId}"/> - </field> - <field use-when="fixedAssetMaint!=null" title="${uiLabelMap.AccountingFixedAssetMaintSeqId}" name="fixedAssetId"><hidden/></field> - <field use-when="fixedAssetMaint==null" title="${uiLabelMap.AccountingFixedAssetMaintSeqId}" name="maintHistSeqId"><ignored/></field> - <field use-when="fixedAssetMaint!=null" title="${uiLabelMap.AccountingFixedAssetMaintSeqId}" name="maintHistSeqId"><display/></field> - <field use-when="fixedAssetMaint!=null" title="Created On " name="createdStamp"><display/></field> - <field name="statusId" title="${uiLabelMap.CommonStatus}" position="1"> - <drop-down allow-empty="false"> - <entity-options description="${description}" entity-name="StatusItem"> - <entity-constraint name="statusTypeId" operator="equals" value="FIXEDAST_MNT_STATUS"/> - <entity-order-by field-name="sequenceId"/> - </entity-options> - </drop-down> - </field> - <field name="productMaintSeqId" position="1" title="Product Maintenance" tooltip="Only use if applicable, can use Maintenance Type instead"> - <drop-down allow-empty="true" > - <entity-options description="${maintName}" entity-name="ProductMaint"> - <entity-constraint name="productId" operator="equals" value="${fixedAsset.instanceOfProductId}"/> - <entity-order-by field-name="productMaintSeqId"/> - </entity-options> - </drop-down> - </field> - <field name="productMaintTypeId" title="${uiLabelMap.AccountingFixedAssetMaintType}" tooltip="If the Product Maintenance is specified, this will be set/reset automatically"> - <drop-down> - <entity-options description="${productMaintTypeId}-${description}" entity-name="ProductMaintType"> - <entity-order-by field-name="productMaintTypeId"/> - </entity-options> - </drop-down> - </field> - <field name="intervalQuantity" position="1" title="${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}" tooltip="${uiLabelMap.CommonRequired}"><text size="10"/></field> - <field name="intervalMeterTypeId" position="1" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}"> - <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="ProductMeterType" key-field-name="productMeterTypeId"> - <entity-order-by field-name="productMeterTypeId"/> - </entity-options> - </drop-down> - </field> - <field name="intervalUomId" position="2" title="${uiLabelMap.AccountingFixedAssetMaintIntervalUom}"> - <drop-down allow-empty="true"> - <entity-options description="Time: ${description}" entity-name="Uom" key-field-name="uomId"> - <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/> - <entity-order-by field-name="description"/> - </entity-options> - <entity-options description="Distance: ${description}" entity-name="Uom" key-field-name="uomId"> - <entity-constraint name="uomTypeId" value="LENGTH_MEASURE"/> - <entity-order-by field-name="description"/> - </entity-options> - </drop-down> - </field> <field name="scheduleWorkEffortId"><hidden/></field> - <!-- field name="scheduleWorkEffortId" position="1" title="${uiLabelMap.WorkEffortWorkEffort}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${fixedAssetMaint.scheduleWorkEffortId}" target="EditWorkEffort?workEffortId=${fixedAssetMaint.scheduleWorkEffortId}"/> - </field --> + <field name="submitButton" ><ignored/></field> <field map-name="workEffort" title="${uiLabelMap.WorkEffortEstimatedStartDate}" position="1" name="estimatedStartDate"><date-time/></field> <field map-name="workEffort" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}" position="2" name="estimatedCompletionDate"><date-time/></field> <field map-name="workEffort" title="${uiLabelMap.WorkEffortActualStartDate}" position="1" name="actualStartDate"><date-time/></field> @@ -206,12 +99,11 @@ <field name="quickAssignPartyId" title="${uiLabelMap.PartyPartyId}" use-when="fixedAssetMaint == null" field-name="partyId"> <lookup target-form-name="LookupPerson"/> </field> - <field name="purchaseOrderId"><text/></field> - <field name="submitButton" use-when="fixedAssetMaint!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="submitButton" use-when="fixedAssetMaint==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> + <field name="submitButton2" use-when="fixedAssetMaint!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> + <field name="submitButton2" use-when="fixedAssetMaint==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - <form name="AddItemIssuance" target="issueInventoryItemToFixedAssetMaint" title="PageTitleFixedAssetMaintItemIssuance" default-map-name="newIssuanceItem" type="single" + <form name="AddItemIssuance" target="issueInventoryItemToFixedAssetMaint" title="PageTitleFixedAssetMaintItemIssuance" default-map-name="newIssuanceItem" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="facilityId"> <drop-down> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |