This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2c65f7d Improved: Improved: Added UI labels for success/error
messages for scrum component. (OFBIZ-7696) Thanks Deepak Nigam for reporting
and Sourabh Punyani for the patch.
2c65f7d is described below
commit 2c65f7d17bcdbccd7d166701365c56bca40d2f2d
Author: Suraj Khurana <suraj.khur...@hotwax.co>
AuthorDate: Sun May 24 13:09:47 2020 +0530
Improved: Improved: Added UI labels for success/error messages for scrum
component.
(OFBIZ-7696)
Thanks Deepak Nigam for reporting and Sourabh Punyani for the patch.
---
scrum/config/scrumUiLabels.xml | 75 ++++++++++++++++++++++++++++++++++++
scrum/minilang/ScrumEvents.xml | 82 ++++++++++++++++++++--------------------
scrum/minilang/ScrumServices.xml | 4 +-
3 files changed, 118 insertions(+), 43 deletions(-)
diff --git a/scrum/config/scrumUiLabels.xml b/scrum/config/scrumUiLabels.xml
index 53ef6d2..4de727a 100644
--- a/scrum/config/scrumUiLabels.xml
+++ b/scrum/config/scrumUiLabels.xml
@@ -1007,6 +1007,75 @@ under the License.
<value xml:lang="zh">预计小时数</value>
<value xml:lang="zh-TW">預計小時數</value>
</property>
+ <property key="ScrumEventAlreadyExistPartyIdAndRoleTypeId">
+ <value xml:lang="en">There are partyId : ${parameters.partyId} and
roleTypeId : ${parameters.roleTypeId} already exist.</value>
+ </property>
+ <property key="ScrumEventAlreadyExistPartyIdAndRoleTypeIdAndUserLoginId">
+ <value xml:lang="en">There are partyId : ${parameters.partyId} ,
userLoginId : ${userLoginId} and roleTypeId : ${roleTypeMap.description}
already exist.</value>
+ </property>
+ <property key="ScrumEventCannotAssignMember">
+ <value xml:lang="en">Cannot assign member to this sprint because there
is no member from last sprint</value>
+ </property>
+ <property key="ScrumEventCannotAssignTask">
+ <value xml:lang="en">Can not assign task to partyId :
${parameters.partyId} because this partyId dose not have the SCRUM_TEAM
roleTypeId</value>
+ </property>
+ <property key="ScrumEventCannotAssignTaskToParty">
+ <value xml:lang="en">Can not assign task to partyId :
${userLogin.partyId} because this partyId dose not have the SCRUM_TEAM
roleTypeId</value>
+ </property>
+ <property key="ScrumEventCannotInsertData">
+ <value xml:lang="en">Cannot insert the data.</value>
+ </property>
+ <property key="ScrumEventEmptyNoteInfo">
+ <value xml:lang="en">Can not empty noteInfo</value>
+ </property>
+ <property key="ScrumEventMissingProductBacklogItem">
+ <value xml:lang="en">There Product Backlog Item is missing, Please
add.</value>
+ </property>
+ <property key="ScrumEventMissingProductId">
+ <value xml:lang="en">Can not empty productId</value>
+ </property>
+ <property key="ScrumEventMissingStartDate">
+ <value xml:lang="en">Start Date is missing</value>
+ </property>
+ <property key="ScrumEventMissingStartName">
+ <value xml:lang="en">Sprint Name is missing.</value>
+ </property>
+ <property key="ScrumEventMissingTaskName">
+ <value xml:lang="en">Task name is empty, please enter task
name.</value>
+ </property>
+ <property key="ScrumEventMissingUploadFile">
+ <value xml:lang="en">Upload file is missing...</value>
+ </property>
+ <property key="ScrumEventMoreSprintBacklogs">
+ <value xml:lang="en">Number of sprint backlogs are too much. Please
enter the number equal or less than ${parameters.maxNum}.</value>
+ </property>
+ <property key="ScrumEventNoPermissionToCreateCategory">
+ <value xml:lang="en">You don't have permission to create
category.</value>
+ </property>
+ <property key="ScrumEventNoProductBacklog">
+ <value xml:lang="en">There is no product backlogs in the system.
Please create the product backlogs before perform this action.</value>
+ </property>
+ <property key="ScrumEventPartyAlreadyAssigned">
+ <value xml:lang="en">Party : ${parameters.partyId} is already assigned
to work effort Id : ${parameters.workEffortId} , not adding again</value>
+ </property>
+ <property key="ScrumEventPermissionError">
+ <value xml:lang="en">Permission Error</value>
+ </property>
+ <property key="ScrumEventSelectBacklogItem">
+ <value xml:lang="en">Please select backlog type.</value>
+ </property>
+ <property key="ScrumEventSpecifyCategoryId">
+ <value xml:lang="en">You have to specify category's ID</value>
+ </property>
+ <property key="ScrumEventSpecifyCategoryName">
+ <value xml:lang="en">You have to specify category's name</value>
+ </property>
+ <property key="ScrumEventSpecifyProductId">
+ <value xml:lang="en">You have to specify product's ID</value>
+ </property>
+ <property key="ScrumEventSprintBacklogs">
+ <value xml:lang="en">Number of sprint backlogs must greater than 0
(zero)</value>
+ </property>
<property key="ScrumFindByPrimaryKeyError">
<value xml:lang="en">Find by primary key error:</value>
</property>
@@ -1773,6 +1842,12 @@ under the License.
<value xml:lang="zh">选择日期</value>
<value xml:lang="zh-TW">選擇日期</value>
</property>
+ <property key="ScrumServiceNoParty">
+ <value xml:lang="en">There is no party in this company</value>
+ </property>
+ <property key="ScrumServiceNoTimeEntryItem">
+ <value xml:lang="en">No timeentry items found</value>
+ </property>
<property key="ScrumSeq">
<value xml:lang="en">Seq</value>
<value xml:lang="ja">連番</value>
diff --git a/scrum/minilang/ScrumEvents.xml b/scrum/minilang/ScrumEvents.xml
index 9202ea3..ae12f88 100644
--- a/scrum/minilang/ScrumEvents.xml
+++ b/scrum/minilang/ScrumEvents.xml
@@ -38,22 +38,22 @@
<!-- Error Filtering -->
<if-compare operator="less-equals" value="0"
field="parameters.maxNum">
<add-error error-list-name="_error_message_list_">
- <fail-message message="There is no product backlogs
in the system. Please create the product backlogs before perform this action."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventNoProductBacklog"/>
</add-error>
</if-compare>
<if-compare-field field="parameters.sprintBacklogs"
operator="greater" to-field="parameters.maxNum" type="Integer">
<add-error error-list-name="_error_message_list_">
- <fail-message message="Number of sprint backlogs are
too much. Please enter the number equal or less than ${parameters.maxNum}."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMoreSprintBacklogs"/>
</add-error>
</if-compare-field>
<if-compare operator="less-equals" value="0"
field="parameters.sprintBacklogs" type="Integer">
<add-error error-list-name="_error_message_list_">
- <fail-message message="Number of sprint backlogs must
greater than 0 (zero)"/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventSprintBacklogs"/>
</add-error>
</if-compare>
<if-empty field="parameters.sprintEstimatedStart">
<add-error error-list-name="_error_message_list_">
- <fail-message message="Start Date is missing"/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMissingStartDate"/>
</add-error>
</if-empty>
@@ -213,12 +213,12 @@
<!-- Error Filltering -->
<if-empty field="parameters.workEffortName">
<add-error error-list-name="_error_message_list_">
- <fail-message message="Sprint Name is missing."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMissingStartName"/>
</add-error>
</if-empty>
<if-empty field="parameters.actualStartDate">
<add-error error-list-name="_error_message_list_">
- <fail-message message="Start Date is missing."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMissingStartDate"/>
</add-error>
</if-empty>
<if-not-empty field="_error_message_list_">
@@ -916,7 +916,7 @@
</if-compare>
<if-empty field="parameters.description">
<add-error >
- <fail-message message="There Product Backlog Item is
missing, Please add."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMissingProductBacklogItem"/>
</add-error>
<check-errors/>
</if-empty>
@@ -1273,7 +1273,7 @@
<field-map field-name="roleTypeId"
from-field="parameters.roleTypeId"/>
</entity-one>
<add-error>
- <fail-message message="There are partyId :
${parameters.partyId} , userLoginId : ${userLoginId} and roleTypeId :
${roleTypeMap.description} already exist."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventAlreadyExistPartyIdAndRoleTypeIdAndUserLoginId"/>
</add-error>
<check-errors/>
</else>
@@ -1325,7 +1325,7 @@
</condition>
<then>
<add-error>
- <fail-message message="Start Date isn't in Sprint
Duration."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMissingStartDate"/>
</add-error>
</then>
</if>
@@ -1334,7 +1334,7 @@
<check-errors/>
<if-empty field="formInput.formInput.workEffortName">
<add-error >
- <fail-message message="Task name is empty, please enter task
name."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMissingTaskName"/>
</add-error>
</if-empty>
<check-errors/>
@@ -1443,7 +1443,7 @@
</if-not-empty>
<!-- for contents -->
<if-not-empty field="formInput.imageFileName">
- <add-error><fail-message message="Upload file is
missing..."/></add-error>
+ <add-error><fail-property resource="scrumUiLabels"
property="ScrumEventMissingUploadFile"/></add-error>
<set field="parameters.imageFileName"
from-field="formInput.imageFileName"/>
<!-- Create Data Resource -->
@@ -1638,7 +1638,7 @@
<set field="update.custRequestId"
from-field="parameters.custRequestId"/>
<if-empty field="parameters.description">
<add-error >
- <fail-message message="There Product Backlog Item is
missing, Please add."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMissingProductBacklogItem"/>
</add-error>
<check-errors/>
</if-empty>
@@ -2165,7 +2165,7 @@
</if-empty>
<if-empty field="parameters.noteInfo">
<add-error>
- <fail-message message="Can not empty noteInfo"/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventEmptyNoteInfo"/>
</add-error>
<check-errors/>
<else>
@@ -2309,13 +2309,13 @@
<field-to-request field="sprintId"/>
<field-to-request field="custRequestId"/>
<add-error>
- <fail-message message="Please insert the Task Name"/>
- </add-error>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMissingTaskName"/>
+ </add-error>
<check-errors/>
</else>
</if-not-empty>
<if-not-empty field="formInput.imageFileName">
- <add-error><fail-message message="Upload file is
missing..."/></add-error>
+ <add-error><fail-property resource="scrumUiLabels"
property="ScrumEventMissingUploadFile"/></add-error>
<set field="parameters.imageFileName"
from-field="formInput.imageFileName"/>
<!-- Create Data Resource -->
@@ -2576,10 +2576,10 @@
<simple-method method-name="createProductBacklogCategory"
short-description="Create a product backlog's category">
<if-empty field="parameters.productId">
- <add-error><fail-message message="You have to specify
product's ID"/></add-error>
+ <add-error><fail-property resource="scrumUiLabels"
property="ScrumEventSpecifyProductId"/></add-error>
</if-empty>
<if-empty field="parameters.custRequestName">
- <add-error><fail-message message="You have to specify
category's name"/></add-error>
+ <add-error><fail-property resource="scrumUiLabels"
property="ScrumEventSpecifyCategoryName"/></add-error>
</if-empty>
<check-errors/>
<if>
@@ -2608,24 +2608,24 @@
</call-service>
</then>
<else>
- <add-error><fail-message message="You don't have permission to
create category"/></add-error>
+ <add-error><fail-property resource="scrumUiLabels"
property="ScrumEventNoPermissionToCreateCategory"/></add-error>
<check-errors/>
</else>
</if>
<add-error>
- <fail-message message="Permission Error"/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventPermissionError"/>
</add-error>
</simple-method>
<simple-method method-name="updateProductBacklogCategory"
short-description="Update a product backlog's category">
<if-empty field="parameters.productId">
- <add-error><fail-message message="You have to specify product's
ID"/></add-error>
+ <add-error><fail-property resource="scrumUiLabels"
property="ScrumEventSpecifyProductId"/></add-error>
</if-empty>
<if-empty field="parameters.custRequestName">
- <add-error><fail-message message="You have to specify category's
name"/></add-error>
+ <add-error><fail-property resource="scrumUiLabels"
property="ScrumEventSpecifyCategoryName"/></add-error>
</if-empty>
<if-empty field="parameters.custRequestId">
- <add-error><fail-message message="You have to specify category's
ID"/></add-error>
+ <add-error><fail-property resource="scrumUiLabels"
property="ScrumEventSpecifyCategoryId"/></add-error>
</if-empty>
<check-errors/>
<!-- update cust request -->
@@ -2680,7 +2680,7 @@
</if>
<else>
<add-error>
- <fail-message message="Task name is missing,Please
add."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMissingTaskName"/>
</add-error>
<check-errors/>
</else>
@@ -2688,7 +2688,7 @@
</then>
<else>
<add-error>
- <fail-message message="Permission Error"/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventPermissionError"/>
</add-error>
<check-errors/>
</else>
@@ -2740,7 +2740,7 @@
</if-not-empty>
<else>
<add-error>
- <fail-message message="Task name is missing,Please
add."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMissingTaskName"/>
</add-error>
<check-errors/>
</else>
@@ -2748,7 +2748,7 @@
</then>
<else>
<add-error>
- <fail-message message="Permission Error"/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventPermissionError"/>
</add-error>
<check-errors/>
</else>
@@ -2790,7 +2790,7 @@
</if-not-empty>
<else>
<add-error>
- <fail-message message="Cannot insert the data."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventCannotInsertData"/>
</add-error>
<check-errors/>
</else>
@@ -2900,7 +2900,7 @@
</if-empty>
<if-empty field="formInput.formInput.productId">
<add-error>
- <fail-message message="Can not empty productId"/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMissingProductId"/>
</add-error>
<check-errors/>
<else>
@@ -2959,7 +2959,7 @@
</if-empty>
<if-empty field="parameters.noteInfo">
<add-error>
- <fail-message message="Can not empty noteInfo"/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventEmptyNoteInfo"/>
</add-error>
<check-errors/>
<else>
@@ -3003,7 +3003,7 @@
</condition>
<then>
<add-error>
- <fail-message message="Content Id or Upload file is
missing."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMissingUploadFile"/>
</add-error>
</then>
</if>
@@ -3195,7 +3195,7 @@
</if-not-empty>
</then>
<else>
- <add-error><fail-message message="You are has no permission to
perform this action."/></add-error>
+ <add-error><fail-property resource="scrumUiLabels"
property="ScrumEventPermissionError"/></add-error>
</else>
</if>
</simple-method>
@@ -3235,7 +3235,7 @@
</entity-condition>
<if-empty field="sprintRoles">
<add-error>
- <fail-message message="Can not assign task to partyId :
${parameters.partyId} because this partyId dose not have the SCRUM_TEAM
roleTypeId"/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventCannotAssignTask"/>
</add-error>
<check-errors/>
</if-empty>
@@ -3251,7 +3251,7 @@
<call-service service-name="assignPartyToWorkEffort"
in-map-name="newAssign"/>
<else>
<add-error>
- <fail-message message="Party : ${parameters.partyId} is
already assigned to work effort Id : ${parameters.workEffortId} , not adding
again"/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventPartyAlreadyAssigned"/>
</add-error>
<check-errors/>
</else>
@@ -3278,7 +3278,7 @@
<set field="workEffortId"
from-field="parameters.workEffortId"/>
<else>
<add-error>
- <fail-message message="Can not assign task to
partyId : ${userLogin.partyId} because this partyId dose not have the
SCRUM_TEAM roleTypeId"/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventCannotAssignTaskToParty"/>
</add-error>
<check-errors/>
</else>
@@ -3301,7 +3301,7 @@
</entity-condition>
<if-empty field="sprintRoles">
<add-error>
- <fail-message message="Can not assign task to
partyId : ${parameters.partyId} because this partyId dose not have the
SCRUM_TEAM roleTypeId"/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventCannotAssignTask"/>
</add-error>
<check-errors/>
</if-empty>
@@ -3370,7 +3370,7 @@
<field-to-request field="projectId"/>
<field-to-request field="sprintId"/>
<add-error>
- <fail-message message="Cannot assign member to this
sprint because there is no member from last sprint"/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventCannotAssignMember"/>
</add-error>
<check-errors/>
@@ -3491,7 +3491,7 @@
</then>
<else>
<add-error>
- <fail-message message="You are has no permission to
perform this action."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventPermissionError"/>
</add-error>
<check-errors/>
</else>
@@ -3502,13 +3502,13 @@
<call-simple-method method-name="getWebSiteId"/>
<if-empty field="parameters.description">
<add-error>
- <fail-message message="There is no Product Backlog Item."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventMissingProductBacklogItem"/>
</add-error>
<check-errors/>
</if-empty>
<if-empty field="parameters.unplanned">
<add-error>
- <fail-message message="Please select backlog type."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventSelectBacklogItem"/>
</add-error>
<check-errors/>
</if-empty>
@@ -4338,7 +4338,7 @@
<create-value value-field="productRoleMap"/>
<else>
<add-error>
- <fail-message message="There are partyId :
${parameters.partyId} and roleTypeId : ${parameters.roleTypeId} already
exist."/>
+ <fail-property resource="scrumUiLabels"
property="ScrumEventAlreadyExistPartyIdAndRoleTypeId"/>
</add-error>
<check-errors/>
</else>
diff --git a/scrum/minilang/ScrumServices.xml b/scrum/minilang/ScrumServices.xml
index ab8333c..b503eda 100644
--- a/scrum/minilang/ScrumServices.xml
+++ b/scrum/minilang/ScrumServices.xml
@@ -1249,7 +1249,7 @@
</iterate>
<if-empty field="partyIdAllInCompany">
<add-error>
- <fail-message message="There is no party in this company" />
+ <fail-property resource="scrumUiLabels"
property="ScrumServiceNoParty"/>
</add-error>
<check-errors />
</if-empty>
@@ -1300,7 +1300,7 @@
<set field="isAddAll" value="${groovy:tasks.addAll(unplannedTasks)}"/>
<if-empty field="tasks">
<add-error>
- <fail-message message="No timeentry items found" />
+ <fail-property resource="scrumUiLabels"
property="ScrumServiceNoTimeEntryItem"/>
</add-error>
<check-errors />
</if-empty>
