svn commit: r663782 - in /ofbiz/trunk: applications/accounting/webapp
Locked
 
|
Author: adrianc
Date: Thu Jun 5 16:32:24 2008 New Revision: 663782 URL: http://svn.apache.org/viewvc?rev=663782&view=rev Log: More UI work on Fixed Assets. Removed: ofbiz/trunk/framework/images/webapp/images/calendarTable.css Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml ofbiz/trunk/applications/accounting/widget/Menus.xml Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=663782&r1=663781&r2=663782&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Thu Jun 5 16:32:24 2008 @@ -879,6 +879,18 @@ <security https="true" auth="true" /> <response name="success" type="view" value="LookupOrderHeader" /> </request-map> + <request-map uri="FixedAssetDay"> + <security https="true" auth="true" /> + <response name="success" type="view" value="FixedAssetDay" /> + </request-map> + <request-map uri="FixedAssetWeek"> + <security https="true" auth="true" /> + <response name="success" type="view" value="FixedAssetWeek" /> + </request-map> + <request-map uri="FixedAssetMonth"> + <security https="true" auth="true" /> + <response name="success" type="view" value="FixedAssetMonth" /> + </request-map> <!-- FixedAssetMaintenance Order --> <request-map uri="EditFixedAssetMaintOrders"> <security https="true" auth="true"/> @@ -1909,6 +1921,9 @@ <view-map name="ListFixedAssetMaints" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetMaints"/> <view-map name="EditFixedAssetMaintMeters" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAssetMaintMeters"/> <view-map name="EditFixedAssetMaintOrders" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAssetMaintOrders"/> + <view-map name="FixedAssetDay" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#CalendarDay"/> + <view-map name="FixedAssetWeek" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#CalendarWeek"/> + <view-map name="FixedAssetMonth" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#CalendarMonth"/> <!-- Depreciation Calculation --> <view-map name="ShowFixedAssetDepreciation" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ShowFixedAssetDepreciation"/> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?rev=663782&r1=663781&r2=663782&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Thu Jun 5 16:32:24 2008 @@ -43,6 +43,7 @@ </field> <on-event-update-area event-type="paginate" area-id="search-results" area-target="FixedAssetSearchResults"/> </form> + <form name="FindFixedAssetOptions" extends="lookupFixedAsset" extends-resource="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" target="ListFixedAssets"> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -287,33 +288,34 @@ <field name="govAgencyPartyId" title="${uiLabelMap.AccountingFixedAssetGovAgencyPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> + <!-- list all Fixed Asset Maintenance--> - <form name="ListFixedAssetMaints" type="list" list-name="fixedAssetMaints" + <form name="ListFixedAssetMaints" type="list" list-name="listIt" paginate-target="ListFixedAssetMaints" paginate="true" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <entity-condition entity-name="FixedAssetMaint"> - <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/> - <order-by field-name="maintHistSeqId" /> - </entity-condition> + <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="FixedAssetMaint"/> + <field-map field-name="orderBy" value="-maintHistSeqId"/> + </service> </actions> - <auto-fields-entity entity-name="FixedAssetMaint" default-field-type="display"/> - <field name="fixedAssetId"><hidden/></field> - <field name="maintHistSeqId" widget-style="linktext"> + <field name="maintHistSeqId"> <hyperlink also-hidden="false" description="${maintHistSeqId}" target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}&maintHistSeqId=${maintHistSeqId}"/> </field> - <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field> <field name="productMaintTypeId" ><display-entity entity-name="ProductMaintType"/></field> + <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></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="intervalMeterTypeId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}"><display/></field> </form> + <form name="EditFixedAssetMaint" type="single" default-map-name="fixedAssetMaint" target="updateFixedAssetMaint" title="" header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="fixedAssetMaint==null" target="createFixedAssetMaint"/> - <auto-fields-service service-name="updateFixedAssetMaint"/> <field name="fixedAssetId"><hidden/></field> <field use-when="fixedAssetMaint==null" name="maintHistSeqId"><ignored/></field> <field use-when="fixedAssetMaint!=null" name="maintHistSeqId"><display/></field> + <field use-when="fixedAssetMaint!=null" title="${uiLabelMap.CommonCreated}" name="createdStamp"><display/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="false"> <entity-options description="${description}" entity-name="StatusItem"> @@ -322,6 +324,13 @@ </entity-options> </drop-down> </field> + <field name="productMaintTypeId" title="${uiLabelMap.AccountingFixedAssetMaintType}" tooltip="${uiLabelMap.AccountingFixedAssetMaintMessage1}"> + <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="productMaintSeqId" tooltip="${uiLabelMap.AccountingFixedAssetMaintMessage2}"> <drop-down allow-empty="true" > <entity-options description="${maintName}" entity-name="ProductMaint"> @@ -330,18 +339,18 @@ </entity-options> </drop-down> </field> - <field name="productMaintTypeId" title="${uiLabelMap.AccountingFixedAssetMaintType}" tooltip="${uiLabelMap.AccountingFixedAssetMaintMessage1}"> + <field name="maintTemplateWorkEffortId" use-when="fixedAssetMaint==null" title="${uiLabelMap.AccountingFixedAssetMaintenanceTemplate}" tooltip="${uiLabelMap.AccountingFixedAssetMaintMessage3}"> + <lookup target-form-name="LookupWorkEffort"/> + </field> + <field name="intervalMeterTypeId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="ProductMaintType"> - <entity-order-by field-name="productMaintTypeId"/> + <entity-options description="${description}" entity-name="ProductMeterType" key-field-name="productMeterTypeId"> + <entity-order-by field-name="productMeterTypeId"/> </entity-options> </drop-down> </field> - <field name="maintTemplateWorkEffortId" use-when="fixedAssetMaint==null" title="${uiLabelMap.AccountingFixedAssetMaintenanceTemplate}" tooltip="${uiLabelMap.AccountingFixedAssetMaintMessage3}"> - <lookup target-form-name="LookupWorkEffort"/> - </field> <field name="intervalQuantity" title="${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}"><text size="10"/></field> - <field name="intervalUomId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalUom}"> + <field name="intervalUomId" position="2" title="${uiLabelMap.AccountingFixedAssetMaintIntervalUom}"> <drop-down allow-empty="true"> <entity-options description="${uiLabelMap.CommonTime}: ${description}" entity-name="Uom" key-field-name="uomId"> <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/> @@ -353,13 +362,6 @@ </entity-options> </drop-down> </field> - <field name="intervalMeterTypeId" 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="scheduleWorkEffortId" title="${uiLabelMap.WorkEffortWorkEffort}" widget-style="buttontext"> <hyperlink target="/workeffort/control/WorkEffortSummary?workEffortId=${fixedAssetMaint.scheduleWorkEffortId}" also-hidden="false" description="${fixedAssetMaint.scheduleWorkEffortId}" target-type="inter-app"/> </field> @@ -503,4 +505,4 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=663782&r1=663781&r2=663782&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Thu Jun 5 16:32:24 2008 @@ -111,6 +111,7 @@ <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <set field="noConditionFind" value="Y"/> </actions> <widgets> <include-form name="ListFixedAssets" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> @@ -178,42 +179,72 @@ </screen> <!-- provide a calendar to show occupation--> - <screen name="ListFixedAssetCalendar"> + <screen name="CommonCalendarDecorator"> <section> <actions> - <set field="layoutSettings.styleSheets[]" value="/images/calendarTable.css" global="true"/> - <set field="titleProperty" value="PageTitleListFixedAssetCalendar"/> <set field="tabButtonItem" value="ListFixedAssetCalendar"/> - <set field="labelTitleProperty" value="AccountingFixedAssetCalendar"/> - <set field="fixedAssetId" from-field="parameters.fixedAssetId"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/fixedasset/ViewCalendar.groovy"/> <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/fixedasset/month.groovy"/> </actions> <widgets> - <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> + <decorator-screen name="CommonFixedAssetDecorator" location="component://accounting/widget/FixedAssetScreens.xml"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListFixedAssetCalendar}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container style="button-bar"> - <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}&month=-3" text="${uiLabelMap.CommonPrevious} ${uiLabelMap.CommonQuarter}" style="buttontext"/> - <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}&month=-1" text="${uiLabelMap.CommonPrevious} ${uiLabelMap.CommonMonth}" style="buttontext"/> - <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}" text="${uiLabelMap.CommonThis} ${uiLabelMap.CommonMonth}" style="buttontext"/> - <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}&month=1" text="${uiLabelMap.CommonNext} ${uiLabelMap.CommonMonth}" style="buttontext"/> - <link target="ListFixedAssetCalendar?productId=${parameters.productId}&fixedAssetId=${fixedAssetId}&month=3" text="${uiLabelMap.CommonNext} ${uiLabelMap.CommonQuarter}" style="buttontext"/> - </container> - <include-form name="listFixedAssetCalendar" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - <label text="${uiLabelMap.AccountingFixedAssetMessage1}"></label> - </widgets> - </section> - </container> - </container> + <include-menu name="FixedAssetCalendarTabBar" location="component://accounting/widget/Menus.xml"/> + <decorator-section-include name="body"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="CalendarDay"> + <section> + <actions> + <set field="titleProperty" value="PageTitleCalendarDay"/> + <set field="parameters.viewMode" value="D"/> + </actions> + <widgets> + <decorator-screen name="CommonCalendarDecorator"> + <decorator-section name="body"> + <platform-specific> + <html><html-template location="component://workeffort/webapp/workeffort/calendar/day.ftl"/></html> + </platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="CalendarWeek"> + <section> + <actions> + <set field="titleProperty" value="PageTitleCalendarWeek"/> + <set field="parameters.viewMode" value="W"/> + </actions> + <widgets> + <decorator-screen name="CommonCalendarDecorator"> + <decorator-section name="body"> + <platform-specific> + <html><html-template location="component://workeffort/webapp/workeffort/calendar/week.ftl"/></html> + </platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="CalendarMonth"> + <section> + <actions> + <set field="titleProperty" value="PageTitleCalendarMonth"/> + <set field="parameters.viewMode" value="M"/> + </actions> + <widgets> + <decorator-screen name="CommonCalendarDecorator"> + <decorator-section name="body"> + <platform-specific> + <html><html-template location="component://workeffort/webapp/workeffort/calendar/month.ftl"/></html> + </platform-specific> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=663782&r1=663781&r2=663782&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/Menus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/Menus.xml Thu Jun 5 16:32:24 2008 @@ -358,6 +358,7 @@ <link target="printChecks.pdf?paymentId=${payment.paymentId}"/> </menu-item> </menu> + <menu name="FixedAssetMaintTabBar" selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint" default-menu-item-name="EditFixedAssetMaint" menu-container-style="button-bar tab-bar" type="simple"> <menu-item name="EditFixedAssetMaint" title="${uiLabelMap.AccountingFixedAssetMaint}"> @@ -369,7 +370,8 @@ <menu-item name="EditFixedAssetMaintOrders" title="${uiLabelMap.AccountingFixedAssetMaintOrders}"> <link target="EditFixedAssetMaintOrders?fixedAssetId=${fixedAssetMaint.fixedAssetId}&maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/> </menu-item> - </menu> + </menu> + <menu name="FixedAssetTabBar" default-menu-item-name="EditFixedAsset" default-selected-style="selected" menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="EditFixedAsset" title="${uiLabelMap.AccountingFixedAsset}"> @@ -382,7 +384,7 @@ <link target="ListFixedAssetProducts?fixedAssetId=${fixedAssetId}"/> </menu-item> <menu-item name="ListFixedAssetCalendar" title="${uiLabelMap.AccountingFixedAssetCalendar}"> - <link target="ListFixedAssetCalendar?fixedAssetId=${fixedAssetId}"/> + <link target="FixedAssetMonth?fixedAssetId=${fixedAssetId}"/> </menu-item> <menu-item name="EditFixedAssetStdCosts" title="${uiLabelMap.AccountingFixedAssetStdCosts}"> <link target="EditFixedAssetStdCosts?fixedAssetId=${fixedAssetId}"/> @@ -402,9 +404,21 @@ <menu-item name="FixedAssetDepreciation" title="${uiLabelMap.AccountingFixedAssetDepreciation}"> <link target="showFixedAssetDepreciation?fixedAssetId=${fixedAssetId}"/> </menu-item> - </menu> + <menu name="FixedAssetCalendarTabBar" 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="FixedAssetDay?fixedAssetId=${fixedAssetId}"/> + </menu-item> + <menu-item name="W" title="${uiLabelMap.CommonWeek}"> + <link target="FixedAssetWeek?fixedAssetId=${fixedAssetId}"/> + </menu-item> + <menu-item name="M" title="${uiLabelMap.CommonMonth}"> + <link target="FixedAssetMonth?fixedAssetId=${fixedAssetId}"/> + </menu-item> + </menu> + <menu name="FinAccountTabBar" default-menu-item-name="EditFinAccount" default-selected-style="selected" menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="EditFinAccount" title="${uiLabelMap.AccountingFinAccount}"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |