You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ta...@apache.org on 2016/08/26 11:37:52 UTC
svn commit: r1757822 - in /ofbiz/trunk/applications/workeffort:
config/WorkEffortUiLabels.xml webapp/workeffort/WEB-INF/controller.xml
widget/WorkEffortForms.xml widget/WorkEffortMenus.xml
widget/WorkEffortScreens.xml
Author: taher
Date: Fri Aug 26 11:37:52 2016
New Revision: 1757822
URL: http://svn.apache.org/viewvc?rev=1757822&view=rev
Log:
WorkEffortAttribute CRUD screens patch by Leila Mekika - OFBIZ-7973
This commit follows another commit in which the CRUD services for
WorkEffortAttribute were also submitted by Leila (thank you). I made
some minor modifications to formatting and added Arabic translation
to the submitted labels in the patch.
Modified:
ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.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/WorkEffortScreens.xml
Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1757822&r1=1757821&r2=1757822&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Fri Aug 26 11:37:52 2016
@@ -921,7 +921,13 @@
<value xml:lang="zh">添加人工服务指派费率</value>
<value xml:lang="zh-TW">新增工作投入指派費率</value>
</property>
+ <property key="PageTitleAddWorkEffortAttribute">
+ <value xml:lang="ar">اضافة سمة لمجهود العمل</value>
+ <value xml:lang="en">Add Work Effort Attribute</value>
+ <value xml:lang="fr">Ajouter un attribut à la tâche</value>
+ </property>
<property key="PageTitleAddWorkEffortCommEvent">
+ <value xml:lang="ar">اضافة اتصال لمجهود العمل</value>
<value xml:lang="de">Arbeitseinsatz Kommunikationsereignis hinzufügen</value>
<value xml:lang="en">Add Work Effort Communication Event</value>
<value xml:lang="es">Añadir evento de comunicación a esfuerzo de trabajo</value>
@@ -1436,6 +1442,11 @@
<value xml:lang="zh">人工服务指派费率</value>
<value xml:lang="zh-TW">工作投入指派費率</value>
</property>
+ <property key="PageTitleListWorkEffortAttributes">
+ <value xml:lang="ar">سمات مجهود العمل</value>
+ <value xml:lang="en">Work Effort Attributes</value>
+ <value xml:lang="fr">Attributs de la tâche</value>
+ </property>
<property key="PageTitleListWorkEffortCommEvents">
<value xml:lang="en">Work Effort Communication Events</value>
<value xml:lang="es">Eventos de comunicación</value>
@@ -1931,6 +1942,11 @@
<value xml:lang="zh">参加者</value>
<value xml:lang="zh-TW">參加者</value>
</property>
+ <property key="WorkEffortAttributes">
+ <value xml:lang="ar">سمات</value>
+ <value xml:lang="en">Attributes</value>
+ <value xml:lang="fr">Attributs</value>
+ </property>
<property key="WorkEffortBanner3">
<value xml:lang="de">Existierende Kommunikationsereignis ID unten eingeben</value>
<value xml:lang="en">Enter existing Communication Event Id below</value>
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=1757822&r1=1757821&r2=1757822&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Fri Aug 26 11:37:52 2016
@@ -268,6 +268,30 @@ under the License.
<response name="error" type="view" value="ListWorkEffortQuotes"/>
</request-map>
+ <!-- WorkEffort Attribute request mappings -->
+ <request-map uri="ListWorkEffortAttributes">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ListWorkEffortAttributes"/>
+ </request-map>
+ <request-map uri="createWorkEffortAttribute">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createWorkEffortAttribute"/>
+ <response name="success" type="view" value="ListWorkEffortAttributes"/>
+ <response name="error" type="view" value="ListWorkEffortAttributes"/>
+ </request-map>
+ <request-map uri="updateWorkEffortAttribute">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateWorkEffortAttribute"/>
+ <response name="success" type="view" value="ListWorkEffortAttributes"/>
+ <response name="error" type="view" value="ListWorkEffortAttributes"/>
+ </request-map>
+ <request-map uri="deleteWorkEffortAttribute">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="deleteWorkEffortAttribute"/>
+ <response name="success" type="view" value="ListWorkEffortAttributes"/>
+ <response name="error" type="view" value="ListWorkEffortAttributes"/>
+ </request-map>
+
<!-- WorkEffort Requirement request mappings -->
<request-map uri="ListWorkEffortRequirements"><security https="true" auth="true"/><response name="success" type="view" value="ListWorkEffortRequirements"/></request-map>
<request-map uri="createWorkEffortRequirement">
@@ -696,6 +720,7 @@ under the License.
<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="EditWorkEffortRates" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditWorkEffortRates"/>
+ <view-map name="ListWorkEffortAttributes" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortAttributes"/>
<view-map name="ListWorkEffortCommEvents" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortCommEvents"/>
<view-map name="ListWorkEffortShopLists" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortShopLists"/>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=1757822&r1=1757821&r2=1757822&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Fri Aug 26 11:37:52 2016
@@ -903,6 +903,36 @@ under the License.
<field name="submitButton" title="${uiLabelMap.PageTitleAddWorkEffortTimeToNewInvoice}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+ <!-- WorkEffort Attribute -->
+ <form name="ListWorkEffortAttributes" target="updateWorkEffortAttribute"
+ type="list" header-row-style="header-row-2" odd-row-style="alternate-row"
+ default-table-style="basic-table hover-bar">
+ <actions>
+ <entity-condition entity-name="WorkEffortAttribute">
+ <condition-expr field-name="workEffortId" from-field="workEffortId"/>
+ </entity-condition>
+ </actions>
+ <auto-fields-service service-name="updateWorkEffortAttribute" map-name="updateWorkEffortAttribute"/>
+ <field name="workEffortId"><hidden/></field>
+ <field name="attrName"><display/></field>
+ <field name="attrValue"><text/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+ <field name="deleteLink" title=" " widget-style="buttontext">
+ <hyperlink target="deleteWorkEffortAttribute" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="workEffortId"/>
+ <parameter param-name="attrName"/>
+ </hyperlink>
+ </field>
+ </form>
+
+ <form name="EditWorkEffortAttribute" type="single"
+ default-map-name="workEffortAttribute" target="createWorkEffortAttribute"
+ title="" header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-service service-name="createWorkEffortAttribute"/>
+ <field name="workEffortId"><hidden/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
+ </form>
+
<!-- WorkEffort Note -->
<form name="ListWorkEffortNotes" type="list" list-name="workEffortNotes"
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=1757822&r1=1757821&r2=1757822&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Fri Aug 26 11:37:52 2016
@@ -134,6 +134,11 @@ under the License.
<parameter param-name="workEffortId"/>
</link>
</menu-item>
+ <menu-item name="WorkEffortAttributes" title="${uiLabelMap.WorkEffortAttributes}">
+ <link target="ListWorkEffortAttributes">
+ <parameter param-name="workEffortId"/>
+ </link>
+ </menu-item>
<menu-item name="WorkEffortEventReminders" title="${uiLabelMap.WorkEffortEventReminders}">
<link target="listWorkEffortEventReminders">
<parameter param-name="workEffortId"/>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=1757822&r1=1757821&r2=1757822&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Fri Aug 26 11:37:52 2016
@@ -725,6 +725,27 @@ under the License.
</section>
</screen>
+ <screen name="ListWorkEffortAttributes">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleListWorkEffortAttributes"/>
+ <set field="labelTitleProperty" from-field="titleProperty"/>
+ <set field="tabButtonItem" value="WorkEffortAttributes"/>
+ <set field="workEffortId" from-field="parameters.workEffortId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet id="AddWorkEffortEventAttribute" title="${uiLabelMap.PageTitleAddWorkEffortAttribute}" collapsible="true">
+ <include-form name="EditWorkEffortAttribute" location="component://workeffort/widget/WorkEffortForms.xml"/>
+ </screenlet>
+ <include-form name="ListWorkEffortAttributes" location="component://workeffort/widget/WorkEffortForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="ListWorkEffortEventReminders">
<section>
<actions>
Re: svn commit: r1757822 - in /ofbiz/trunk/applications/workeffort:
config/WorkEffortUiLabels.xml webapp/workeffort/WEB-INF/controller.xml
widget/WorkEffortForms.xml widget/WorkEffortMenus.xml widget/WorkEffortScreens.xml
Posted by Taher Alkhateeb <sl...@gmail.com>.
If you provide follow up fixes I'd be flattered :) Also I'm knee deep into
the plugin system (BTW if you have thoughts I'd appreciate your input in
that thread)
On Fri, Aug 26, 2016 at 3:26 PM, Nicolas Malin <ni...@nereide.fr>
wrote:
> Yes sure I will do
>
> I prefer just advice instead of commit on your commit, source of
> frustration raise :)
>
> Nicolas
>
>
> Le 26/08/2016 à 14:17, Taher Alkhateeb a écrit :
>
>> Good advice Nicolas, would you mind also taking another look at everything
>> and committing your recommendations against OFBIZ-7973?
>>
>> On Fri, Aug 26, 2016 at 2:57 PM, Nicolas Malin <ni...@nereide.fr>
>> wrote:
>>
>> Taher,
>>> Le 26/08/2016 à 13:37, taher@apache.org a écrit :
>>>
>>> <field name="submitButton" title="${uiLabelMap.CommonCrea
>>>> te}"><submit
>>>> button-type="button"/></field>
>>>>
>>>> We can simplfy this by
>>>
>>> <field name="createButton"><submit/></field>
>>>
>>> Give the same result ;)
>>>
>>> And same for
>>>
>>> <field name="submitButton" title="${uiLabelMap.CommonUpda
>>> te}"><submit
>>> button-type="button"/></field>
>>> By
>>> <field name="updateButton"><submit/></field>
>>>
>>>
>>> Nicolas
>>>
>>>
>
Re: svn commit: r1757822 - in /ofbiz/trunk/applications/workeffort:
config/WorkEffortUiLabels.xml webapp/workeffort/WEB-INF/controller.xml
widget/WorkEffortForms.xml widget/WorkEffortMenus.xml
widget/WorkEffortScreens.xml
Posted by Nicolas Malin <ni...@nereide.fr>.
Yes sure I will do
I prefer just advice instead of commit on your commit, source of
frustration raise :)
Nicolas
Le 26/08/2016 � 14:17, Taher Alkhateeb a �crit :
> Good advice Nicolas, would you mind also taking another look at everything
> and committing your recommendations against OFBIZ-7973?
>
> On Fri, Aug 26, 2016 at 2:57 PM, Nicolas Malin <ni...@nereide.fr>
> wrote:
>
>> Taher,
>> Le 26/08/2016 � 13:37, taher@apache.org a �crit :
>>
>>> <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit
>>> button-type="button"/></field>
>>>
>> We can simplfy this by
>>
>> <field name="createButton"><submit/></field>
>>
>> Give the same result ;)
>>
>> And same for
>>
>> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit
>> button-type="button"/></field>
>> By
>> <field name="updateButton"><submit/></field>
>>
>>
>> Nicolas
>>
Re: svn commit: r1757822 - in /ofbiz/trunk/applications/workeffort:
config/WorkEffortUiLabels.xml webapp/workeffort/WEB-INF/controller.xml
widget/WorkEffortForms.xml widget/WorkEffortMenus.xml widget/WorkEffortScreens.xml
Posted by Taher Alkhateeb <sl...@gmail.com>.
Good advice Nicolas, would you mind also taking another look at everything
and committing your recommendations against OFBIZ-7973?
On Fri, Aug 26, 2016 at 2:57 PM, Nicolas Malin <ni...@nereide.fr>
wrote:
> Taher,
> Le 26/08/2016 à 13:37, taher@apache.org a écrit :
>
>> <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit
>> button-type="button"/></field>
>>
>
> We can simplfy this by
>
> <field name="createButton"><submit/></field>
>
> Give the same result ;)
>
> And same for
>
> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit
> button-type="button"/></field>
> By
> <field name="updateButton"><submit/></field>
>
>
> Nicolas
>
Re: svn commit: r1757822 - in /ofbiz/trunk/applications/workeffort:
config/WorkEffortUiLabels.xml webapp/workeffort/WEB-INF/controller.xml
widget/WorkEffortForms.xml widget/WorkEffortMenus.xml
widget/WorkEffortScreens.xml
Posted by Nicolas Malin <ni...@nereide.fr>.
Taher,
Le 26/08/2016 � 13:37, taher@apache.org a �crit :
> <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
We can simplfy this by
<field name="createButton"><submit/></field>
Give the same result ;)
And same for
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
By
<field name="updateButton"><submit/></field>
Nicolas