Re: svn commit: r1849528 - in /ofbiz/ofbiz-framework/trunk/applications/workeffort: minilang/workeffort/WorkEffortSimpleServices.xml widget/WorkEffortForms.xml

[Jacques Le Roux]

Hi Akash,

Thanks for your (1st if Im' not wrong) contribution

We decided to use this pattern when filling a commit comment (picking the status fitting):

Improved:
Fixed:
Implemented:
Documented:
Completed:
Reverted:
(OFBIZ-)
Explanation
Thanks:

Also we try to keep our lines under 80 chars

I changed it for you in trunk (enough for history)

Cheers

Jacques

Le 22/12/2018 à 10:14, [hidden email] a écrit :

> Author: akashjain
> Date: Sat Dec 22 09:14:36 2018
> New Revision: 1849528
>
> URL: http://svn.apache.org/viewvc?rev=1849528&view=rev
> Log:
> Fixed: The child event added is not listed in the Child Work Efforts. While if we add an existing event it is listed in the WorkEffort component, applied patch from jira issue (OFBIZ-10111)
> Thanks, Rubia Elza Joshep and Pradeep Choudhary for your contribution.
>
> Modified:
>      ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
>      ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml
>
> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1849528&r1=1849527&r2=1849528&view=diff
> ==============================================================================
> --- ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original)
> +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Sat Dec 22 09:14:36 2018
> @@ -692,6 +692,8 @@ under the License.
>               </if-empty>
>               <set-service-fields service-name="createWorkEffortAssoc"  map="parameters" to-map="createWorkEffortAssocParams"/>
>               <call-service in-map-name="createWorkEffortAssocParams" service-name="createWorkEffortAssoc"/>
> +            <field-to-result field="createWorkEffortAssocParams.workEffortIdFrom" result-name="workEffortIdFrom"/>
> +            <field-to-result field="createWorkEffortAssocParams.workEffortAssocTypeId" result-name="workEffortAssocTypeId"/>
>           </else>
>           </if-not-empty>
>       </simple-method>
>
> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=1849528&r1=1849527&r2=1849528&view=diff
> ==============================================================================
> --- ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
> +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml Sat Dec 22 09:14:36 2018
> @@ -290,6 +290,7 @@ under the License.
>                the form it is extending (results in two workEffortId fields in the form)
>           <field name="workEffortId"><hidden value=""/></field>
>           -->
> +        <alt-target use-when="workEffort==null" target="createWorkEffortAndAssoc"/>
>           <field name="workEffortIdFrom"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName} [${workEffortId}]"/></field>
>           <field name="workEffortIdTo"><lookup target-form-name="LookupWorkEffort"/></field>
>           <field name="workEffortAssocTypeId">
>
>
>

[Akash Jain]

Thanks, Jacques!

Thanks and Regards
--
Akash Jain


On Sat, Dec 22, 2018 at 4:33 PM Jacques Le Roux <
[hidden email]> wrote:

> Hi Akash,
>
> Thanks for your (1st if Im' not wrong) contribution
>
> We decided to use this pattern when filling a commit comment (picking the
> status fitting):
>
> Improved:
> Fixed:
> Implemented:
> Documented:
> Completed:
> Reverted:
> (OFBIZ-)
> Explanation
> Thanks:
>
> Also we try to keep our lines under 80 chars
>
> I changed it for you in trunk (enough for history)
>
> Cheers
>
> Jacques
>
> Le 22/12/2018 à 10:14, [hidden email] a écrit :
> > Author: akashjain
> > Date: Sat Dec 22 09:14:36 2018
> > New Revision: 1849528
> >
> > URL: http://svn.apache.org/viewvc?rev=1849528&view=rev
> > Log:
> > Fixed: The child event added is not listed in the Child Work Efforts.
> While if we add an existing event it is listed in the WorkEffort component,
> applied patch from jira issue (OFBIZ-10111)
> > Thanks, Rubia Elza Joshep and Pradeep Choudhary for your contribution.
> >
> > Modified:
> >
> ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
> >
> ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml
> >
> > Modified:
> ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
> > URL:
> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1849528&r1=1849527&r2=1849528&view=diff
> >
> ==============================================================================
> > ---
> ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
> (original)
> > +++
> ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
> Sat Dec 22 09:14:36 2018
> > @@ -692,6 +692,8 @@ under the License.
> >               </if-empty>
> >               <set-service-fields service-name="createWorkEffortAssoc"
> map="parameters" to-map="createWorkEffortAssocParams"/>
> >               <call-service in-map-name="createWorkEffortAssocParams"
> service-name="createWorkEffortAssoc"/>
> > +            <field-to-result
> field="createWorkEffortAssocParams.workEffortIdFrom"
> result-name="workEffortIdFrom"/>
> > +            <field-to-result
> field="createWorkEffortAssocParams.workEffortAssocTypeId"
> result-name="workEffortAssocTypeId"/>
> >           </else>
> >           </if-not-empty>
> >       </simple-method>
> >
> > Modified:
> ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml
> > URL:
> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=1849528&r1=1849527&r2=1849528&view=diff
> >
> ==============================================================================
> > ---
> ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml
> (original)
> > +++
> ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml
> Sat Dec 22 09:14:36 2018
> > @@ -290,6 +290,7 @@ under the License.
> >                the form it is extending (results in two workEffortId
> fields in the form)
> >           <field name="workEffortId"><hidden value=""/></field>
> >           -->
> > +        <alt-target use-when="workEffort==null"
> target="createWorkEffortAndAssoc"/>
> >           <field name="workEffortIdFrom"><display-entity
> entity-name="WorkEffort" key-field-name="workEffortId"
> description="${workEffortName} [${workEffortId}]"/></field>
> >           <field name="workEffortIdTo"><lookup
> target-form-name="LookupWorkEffort"/></field>
> >           <field name="workEffortAssocTypeId">
> >
> >
> >
>