From 1a5a8be205641f5f79dd809f6c7e59fc84d76243 Mon Sep 17 00:00:00 2001 From: yunchai <yunying.chai@capgemini.com> Date: 星期日, 08 十月 2023 09:11:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev' --- _Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def index ba900bc..8d24e23 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def @@ -7,10 +7,17 @@ Precondition: [* feedback := Translations::FilllingCapacity_ValidateInput(); - checkValue := not Coefficient.Text() = '' - return checkValue; + if(not checkValue ) + { + feedback := Translations::PriorityFactor_CheckNameValid(); + editData := DataHolderEditPriorityFactor.Data(); + checkValue := not PriorityFactor::CheckNameValid( MacroPlan,editData.BusinessType(),[Real]Coefficient.Text(),PriorityFactorName.Text(),Desc.Text()); + + } + + return checkValue *] QuillAction { -- Gitblit v1.9.3