From 92ecb46f3f2cfcae338d26cd56855018ba18b449 Mon Sep 17 00:00:00 2001
From: yanyuan <yuan.yan@capgemini.com>
Date: 星期四, 09 十一月 2023 15:20:17 +0800
Subject: [PATCH] Merge branch 'dev' into dev_yy
---
_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 8d24e23..c2a2b92 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def
@@ -7,23 +7,43 @@
Precondition:
[*
feedback := Translations::FilllingCapacity_ValidateInput();
- checkValue := not Coefficient.Text() = ''
+ checkValue := not Coefficient.Text() = '' and not PriorityFactorName.Text() = '';
- if(not 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());
-
}
-
+ if( PriorityFactorName.Text() = ''){
+ feedback := Translations::PriorityFactor_CheckNameNull();
+ }
return checkValue
*]
QuillAction
{
Body:
[*
- Form.ClickBtnOK();
+ if( NewFlag.Checked() ){
+ // New
+ repeatOne := select( MacroPlan,PriorityFactor,pf,pf.Name() = PriorityFactorName.Text());
+ if( not isnull( repeatOne )){
+ WebMessageBox::Error( Translations::PriorityFactor_CheckNameValid() );
+ }else{
+ Form.ClickBtnOK();
+ }
+ }else {
+ if (EditFlag.Checked() and PriorityFactorNameCache.Text() <>PriorityFactorName.Text()){
+ // Edit
+ repeatOne:=select(MacroPlan, PriorityFactor, pf, pf.Name() = PriorityFactorName.Text());
+ if (not isnull(repeatOne)){
+ WebMessageBox::Error (Translations::PriorityFactor_CheckNameValid () );
+ }else{
+ Form.ClickBtnOK();
+ }
+ }else{
+ Form.ClickBtnOK();
+ }
+ }
*]
GroupServerCalls: false
}
--
Gitblit v1.9.3