OFBiz › OFBiz - Commits

svn commit: r701868 - in /ofbiz/trunk/applications: manufacturing/webapp/manufacturing/jobshopmgt/ workeffort/config/ workeffort/data/ workeffort/entitydef/ workeffort/webapp/workeffort/WEB-INF/ workeffort/widget/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

adrianc

svn commit: r701868 - in /ofbiz/trunk/applications: manufacturing/webapp/manufacturing/jobshopmgt/ workeffort/config/ workeffort/data/ workeffort/entitydef/ workeffort/webapp/workeffort/WEB-INF/ workeffort/widget/

Author: adrianc
Date: Sun Oct 5 12:29:40 2008
New Revision: 701868

URL: http://svn.apache.org/viewvc?rev=701868&view=rev
Log:
Work Effort improvements: added fixed asset assignment. Added availability (transparency) to party and fixed asset assignments.

Internationalization note: this commit contains new UI labels.

Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml

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?rev=701868&r1=701867&r2=701868&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Sun Oct 5 12:29:40 2008
@@ -500,6 +500,14 @@
<field name="fixedAssetId">
<display-entity entity-name="FixedAsset" description="${fixedAssetName} [${fixedAssetId}]" />
</field>
+ <field name="availabilityStatusId">
+ <drop-down no-current-selected-key="WEFA_IN_USE">
+ <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+ <entity-constraint name="statusTypeId" operator="equals" value="WEFA_AVAILABLE"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"
use-when="!"${declarationScreen}".equals("Y")">
@@ -790,4 +798,4 @@
<field name="description"><text/></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/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=701868&r1=701867&r2=701868&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Sun Oct 5 12:29:40 2008
@@ -59,6 +59,9 @@
<value xml:lang="th">à¸§à¸±à¸à¸à¸µà¹à¹à¸£à¸´à¹à¸¡à¸à¸²à¸¡à¸à¸§à¸²à¸¡à¸à¸£à¸´à¸</value>
<value xml:lang="zh">å®éå¼å§æ¥æ</value>
</property>
+ <property key="FormFieldTitle_availabilityStatusId">
+ <value xml:lang="en">Availability</value>
+ </property>
<property key="FormFieldTitle_cancelDateTime">
<value xml:lang="en">Cancel Date Time</value>
<value xml:lang="it">Data/Ora Annullamento</value>
@@ -729,6 +732,9 @@
<value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸¥à¸à¸µà¹à¹à¸à¹à¸à¸²à¸à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸²à¸</value>
<value xml:lang="zh">æ·»å äººå·¥æå¡æ²éäºä»¶</value>
</property>
+ <property key="PageTitleAddWorkEffortFixedAssetAssign">
+ <value xml:lang="en">Add Work Effort Fixed Asset Assignment</value>
+ </property>
<property key="PageTitleAddWorkEffortKeyword">
<value xml:lang="en">Add Work Effort Keyword</value>
<value xml:lang="it">Aggiungi Chiave Impegno di Lavoro</value>
@@ -1044,6 +1050,9 @@
<value xml:lang="th">à¸à¸¥à¸à¸µà¹à¹à¸à¹à¸à¸²à¸à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸²à¸</value>
<value xml:lang="zh">äººå·¥æå¡æ²éäºä»¶</value>
</property>
+ <property key="PageTitleListWorkEffortFixedAssetAssigns">
+ <value xml:lang="en">Work Effort Fixed Asset Assignments</value>
+ </property>
<property key="PageTitleListWorkEffortKeyword">
<value xml:lang="en">Work Effort Keywords</value>
<value xml:lang="it">Chiavi Impegno di Lavoro</value>

Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml?rev=701868&r1=701867&r2=701868&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml Sun Oct 5 12:29:40 2008
@@ -119,6 +119,17 @@
<StatusItem description="Busy" sequenceId="02" statusCode="BUSY" statusId="WEPA_AV_BUSY" statusTypeId="WEPA_AVAILABILITY"/>
<StatusItem description="Away" sequenceId="03" statusCode="AWAY" statusId="WEPA_AV_AWAY" statusTypeId="WEPA_AVAILABILITY"/>

+ 
+ <StatusType description="Fixed Asset Assignment Status" hasTable="N" statusTypeId="FA_ASGN_STATUS"/>
+ <StatusItem description="Requested" sequenceId="01" statusCode="REQUESTED" statusId="FA_ASGN_REQUESTED" statusTypeId="FA_ASGN_STATUS"/>
+ <StatusItem description="Assigned" sequenceId="02" statusCode="ASSIGNED" statusId="FA_ASGN_ASSIGNED" statusTypeId="FA_ASGN_STATUS"/>
+ <StatusItem description="Request Declined" sequenceId="03" statusCode="DECLINED" statusId="FA_ASGN_DECLINED" statusTypeId="FA_ASGN_STATUS"/>
+
+ 
+ <StatusType description="Work Effort Fixed Asset Availability" hasTable="N" statusTypeId="WEFA_AVAILABILITY"/>
+ <StatusItem description="Available" sequenceId="01" statusCode="AVAILABLE" statusId="WEFA_AVAILABLE" statusTypeId="WEFA_AVAILABILITY"/>
+ <StatusItem description="In Use" sequenceId="02" statusCode="BUSY" statusId="WEFA_IN_USE" statusTypeId="WEFA_AVAILABILITY"/>
+
<WorkEffortAssocType description="Breakdown/Detail" hasTable="N" parentTypeId="" workEffortAssocTypeId="WORK_EFF_BREAKDOWN"/>
<WorkEffortAssocType description="Dependency" hasTable="N" parentTypeId="" workEffortAssocTypeId="WORK_EFF_DEPENDENCY"/>
<WorkEffortAssocType description="Concurrency" hasTable="N" parentTypeId="WORK_EFF_DEPENDENCY" workEffortAssocTypeId="WORK_EFF_CONCURRENCY"/>

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?rev=701868&r1=701867&r2=701868&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml Sun Oct 5 12:29:40 2008
@@ -532,6 +532,7 @@
<field name="statusId" type="id-ne"></field>
<field name="fromDate" type="date-time"></field>
<field name="thruDate" type="date-time"></field>
+ <field name="availabilityStatusId" type="id"><description>Points to StatusItem value with statusTypeId="WEFA_AVAILABILITY"</description></field>
<field name="allocatedCost" type="currency-amount"></field>
<field name="comments" type="comment"></field>
<prim-key field="workEffortId"/>
@@ -546,6 +547,9 @@
<relation type="one" fk-name="WKEFF_FXDAA_STTS" rel-entity-name="StatusItem">
<key-map field-name="statusId"/>
</relation>
+ <relation type="one" fk-name="WKEFF_FXDAA_AVAIL" title="Availability" rel-entity-name="StatusItem">
+ <key-map field-name="availabilityStatusId" rel-field-name="statusId"/>
+ </relation>
</entity>
<entity entity-name="WorkEffortFixedAssetStd"
package-name="org.ofbiz.workeffort.workeffort"
@@ -700,7 +704,7 @@
<field name="facilityId" type="id"></field>
<field name="comments" type="comment"></field>
<field name="mustRsvp" type="indicator"></field>
- <field name="availabilityStatusId" type="id"><description>Point to StatusItem value with statusTypeId="WEPA_AVAILABILITY"</description></field>
+ <field name="availabilityStatusId" type="id"><description>Points to StatusItem value with statusTypeId="WEPA_AVAILABILITY"</description></field>
<prim-key field="workEffortId"/>
<prim-key field="partyId"/>
<prim-key field="roleTypeId"/>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=701868&r1=701867&r2=701868&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Sun Oct 5 12:29:40 2008
@@ -123,6 +123,29 @@
<response name="error" type="view" value="ListWorkEfforts"/>
</request-map>

+ <request-map uri="ListWorkEffortFixedAssetAssigns">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ListWorkEffortFixedAssetAssigns"/>
+ </request-map>
+ <request-map uri="createWorkEffortFixedAssetAssign">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createWorkEffortFixedAssetAssign"/>
+ <response name="success" type="view" value="ListWorkEffortFixedAssetAssigns"/>
+ <response name="error" type="view" value="ListWorkEffortFixedAssetAssigns"/>
+ </request-map>
+ <request-map uri="updateWorkEffortFixedAssetAssign">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateWorkEffortFixedAssetAssign"/>
+ <response name="success" type="view" value="ListWorkEffortFixedAssetAssigns"/>
+ <response name="error" type="view" value="ListWorkEffortFixedAssetAssigns"/>
+ </request-map>
+ <request-map uri="deleteWorkEffortFixedAssetAssign">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="removeWorkEffortFixedAssetAssign"/>
+ <response name="success" type="view" value="ListWorkEffortFixedAssetAssigns"/>
+ <response name="error" type="view" value="ListWorkEffortFixedAssetAssigns"/>
+ </request-map>
+
<request-map uri="ListWorkEffortPartyAssigns"><security https="true" auth="true"/><response name="success" type="view" value="ListWorkEffortPartyAssigns"/></request-map>
<request-map uri="createWorkEffortPartyAssign">
<security https="true" auth="true"/>
@@ -641,6 +664,7 @@
<view-map name="EditWorkEffortAssoc" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditWorkEffortAssoc"/>
<view-map name="AddWorkEffortAssoc" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#AddWorkEffortAssoc"/>

+ <view-map name="ListWorkEffortFixedAssetAssigns" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortFixedAssetAssigns"/>
<view-map name="ListWorkEffortPartyAssigns" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortPartyAssigns"/>
<view-map name="EditWorkEffortAssignmentRates" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditWorkEffortAssignmentRates"/>
<view-map name="ListWorkEffortCommEvents" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortCommEvents"/>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=701868&r1=701867&r2=701868&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sun Oct 5 12:29:40 2008
@@ -1081,4 +1081,69 @@
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteAgreementWorkEffortAppl?agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}&workEffortId=${workEffortId}"/>
</field>
</form>
+
+ <form name="ListWorkEffortFixedAssetAssigns" type="list" target="updateWorkEffortFixedAssetAssign"
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+ <actions>
+ <entity-condition entity-name="WorkEffortFixedAssetAssign" filter-by-date="true">
+ <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>
+ <order-by field-name="-fromDate"/>
+ </entity-condition>
+ </actions>
+ <field name="workEffortId"><hidden/></field>
+ <field name="fixedAssetId" widget-style="buttontext">
+ <display-entity entity-name="FixedAsset" description="${fixedAssetName}">
+ <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="buttontext"/>
+ </display-entity>
+ </field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="statusId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals" value="FA_ASGN_STATUS"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="availabilityStatusId">
+ <drop-down no-current-selected-key="WEFA_IN_USE">
+ <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+ <entity-constraint name="statusTypeId" operator="equals" value="WEFA_AVAILABILITY"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="allocatedCost"><text/></field>
+ <field name="comments"><text size="60" maxlength="255"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <form name="EditWorkEffortFixedAssetAssign" default-map-name="workEffortFixedAssetAssign" target="updateWorkEffortFixedAssetAssign" title="" type="single"
+ header-row-style="header-row" default-table-style="basic-table">
+ <alt-target target="createWorkEffortFixedAssetAssign" use-when="workEffortFixedAssetAssign==null"/>
+ <field name="workEffortId"><hidden/></field>
+ <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
+ <field name="fromDate"><date-time/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="statusId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals" value="FA_ASGN_STATUS"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="availabilityStatusId">
+ <drop-down no-current-selected-key="WEFA_IN_USE">
+ <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+ <entity-constraint name="statusTypeId" operator="equals" value="WEFA_AVAILABILITY"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="allocatedCost"><text/></field>
+ <field name="comments"><text size="60" maxlength="255"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
</forms>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=701868&r1=701867&r2=701868&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Sun Oct 5 12:29:40 2008
@@ -98,5 +98,8 @@
<menu-item name="WorkEffortAgreementAppls" title="${uiLabelMap.WorkEffortAgreementAppls}">
<link target="EditAgreementWorkEffortAppls?workEffortId=${workEffortId}"/>
</menu-item>
+ <menu-item name="WorkEffortFixedAssetAssigns" title="${uiLabelMap.AccountingFixedAssets}">
+ <link target="ListWorkEffortFixedAssetAssigns?workEffortId=${workEffortId}"/>
+ </menu-item>
</menu>
</menus>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml?rev=701868&r1=701867&r2=701868&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml Sun Oct 5 12:29:40 2008
@@ -46,6 +46,14 @@
</entity-options>
</drop-down>
</field>
+ <field name="availabilityStatusId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+ <entity-constraint name="statusTypeId" operator="equals" value="WEPA_AVAILABILITY"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field name="expectationEnumId" title="${uiLabelMap.CommonExpectation}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
@@ -89,6 +97,14 @@
</entity-options>
</drop-down>
</field>
+ <field name="availabilityStatusId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+ <entity-constraint name="statusTypeId" operator="equals" value="WEPA_AVAILABILITY"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field name="expectationEnumId" title="${uiLabelMap.CommonExpectation}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=701868&r1=701867&r2=701868&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Sun Oct 5 12:29:40 2008
@@ -452,6 +452,28 @@
</widgets>
</section>
</screen>
+
+ <screen name="ListWorkEffortFixedAssetAssigns">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleListWorkEffortFixedAssetAssigns"/>
+ <set field="labelTitleProperty" from-field="titleProperty"/>
+ <set field="tabButtonItem" value="WorkEffortFixedAssetAssigns"/>
+ <set field="workEffortId" from-field="parameters.workEffortId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet id="AddWorkEffortFixedAssetAssign" title="${uiLabelMap.PageTitleAddWorkEffortFixedAssetAssign}" collapsible="true">
+ <include-form name="EditWorkEffortFixedAssetAssign" location="component://workeffort/widget/WorkEffortForms.xml"/>
+ </screenlet>
+ <include-form name="ListWorkEffortFixedAssetAssigns" location="component://workeffort/widget/WorkEffortForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="EditWorkEffortAssignmentRates">
<section>
<actions>