From 8bff1e73875304035828b994540a4f4ac1d6a24f Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期二, 27 八月 2024 14:27:26 +0800
Subject: [PATCH] 修复Percentage必填校验
---
/dev/null | 16 --------
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Component_ListUphillRouting#943.def | 1
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Method_OnOK.def | 5 +-
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_mDelete_OnClick.def | 23 +++++++++++
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlActions_btnOk_OnClick.def | 12 +++++
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Component_listContextMenuUphillRouting#1.def | 13 ++++++
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_mCreate_OnClick.def | 4 +-
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Component_pnlContent.def | 21 ++--------
8 files changed, 55 insertions(+), 40 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Component_pnlContent.def
index ee1c756..7d93a37 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Component_pnlContent.def
@@ -54,20 +54,6 @@
Taborder: 2
]
}
- Component npPercentage
- {
- #keys: '[412672.0.1040102201]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'dhDialogData.Data.Percentage'
- Label: 'Percentage*'
- Max: '99'
- Min: '1'
- PlaceHolder: 'Percentage 涓哄繀濉」'
- Taborder: 3
- ]
- }
Component efPercentage
{
#keys: '[414996.1.29740363]'
@@ -75,10 +61,11 @@
Properties:
[
DataBinding: 'dhDialogData.Data.Percentage'
- Enabled: false
Label: 'Final Percentage'
- Taborder: 4
- Tooltip: '鏈�缁堣緭鍏ョ殑Percentage浼氬湪杩欓噷灞曠ず'
+ Mask: 'REAL'
+ PlaceHolder: 'Percentage 涓哄繀濉」'
+ Taborder: 3
+ Text: '0'
]
}
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Method_OnOK.def
index 273a671..158a675 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Method_OnOK.def
@@ -7,13 +7,12 @@
[*
if( isnull( dhDialogData.Data( ) )){
if( ddlUnit.Visible() ){
- UphillRouting::Create( ddlUnit.Data(), dsStartDate.Date(),dsEndDate.Date(),npPercentage.Number() );
+ UphillRouting::Create( ddlUnit.Data(), dsStartDate.Date(),dsEndDate.Date(),[Real]efPercentage.Text() );
}else{
- UphillRouting::Create( dhRouting.Data(), dsStartDate.Date(),dsEndDate.Date(),npPercentage.Number());
+ UphillRouting::Create( dhRouting.Data(), dsStartDate.Date(),dsEndDate.Date(),[Real]efPercentage.Text());
}
}else{
}
- info( npPercentage.Number() );
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlActions_btnOk_OnClick.def
index 2efb364..8a1fade 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlActions_btnOk_OnClick.def
@@ -7,7 +7,17 @@
GroupServerCalls: true
Precondition:
[*
- return dsStartDate.Date() < dsEndDate.Date();
+ flag := true;
+ if(([Real]efPercentage.Text()).IsNaN()){
+ flag := false;
+ feedback := "Percentage 涓哄繀濉」.";
+ }
+ if( dsStartDate.Date() >= dsEndDate.Date() ){
+ flag := false;
+ feedback := "缁撴潫鏃ユ湡蹇呴』鍦ㄥ紑濮嬫棩鏈熶箣鍚�.";
+ }
+
+ return flag;
*]
QuillAction
{
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlContent_npPercentage_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlContent_npPercentage_OnCreated.def
deleted file mode 100644
index 96f9151..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlContent_npPercentage_OnCreated.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: pnlContent/npPercentage
-Response OnCreated () id:Response_pnlContent_npPercentage_OnCreated
-{
- #keys: '[412672.0.1048031223]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebComponent_OnCreated'
- GroupServerCalls: true
- QuillAction
- {
- Body:
- [*
- if( isnull( dhDialogData.Data() )){
- this.Number( 90 );
- }
- *]
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlContent_npPercentage_OnUserChanged.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlContent_npPercentage_OnUserChanged.def
deleted file mode 100644
index 11eb8ae..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlContent_npPercentage_OnUserChanged.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: pnlContent/npPercentage
-Response OnUserChanged () id:Response_pnlContent_npPercentage_OnUserChanged
-{
- #keys: '[414996.1.28611725]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebNumberPicker_OnUserChanged'
- GroupServerCalls: true
- QuillAction
- {
- Body:
- [*
- efPercentage.Text( [String]this.Number() );
- *]
- }
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Component_ListUphillRouting\043943.def" "b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Component_ListUphillRouting\043943.def"
index 51f84d8..99c78ce 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Component_ListUphillRouting\043943.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Component_ListUphillRouting\043943.def"
@@ -37,6 +37,7 @@
]
Properties:
[
+ MinimumColumns: 3
Taborder: 0
]
ResponseDefinitions:
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Component_listContextMenuUphillRouting\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Component_listContextMenuUphillRouting\0431.def"
index 6a185d5..5b02977 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Component_listContextMenuUphillRouting\0431.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Component_listContextMenuUphillRouting\0431.def"
@@ -5,7 +5,7 @@
BaseType: 'listContextMenu'
Children:
[
- Component MenuCreate
+ Component mCreate
{
#keys: '[412672.0.1043375746]'
BaseType: 'WebMenu'
@@ -16,6 +16,17 @@
Title: 'Create...'
]
}
+ Component mDelete id:mDelete_870
+ {
+ #keys: '[414996.1.33518326]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'DELETE'
+ Taborder: 4
+ Title: 'Delete'
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_MenuCreate_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_mCreate_OnClick.def
similarity index 79%
rename from _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_MenuCreate_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_mCreate_OnClick.def
index d4902bf..3c00147 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_MenuCreate_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_mCreate_OnClick.def
@@ -1,12 +1,12 @@
Quintiq file version 2.0
#parent: ListUphillRouting_943
-Response OnClick () id:Response_ListUphillRouting_943_MenuCreate_OnClick
+Response OnClick () id:Response_ListUphillRouting_943_mCreate_OnClick
{
#keys: '[412672.0.1040123392]'
CanBindMultiple: false
DefinitionID => /ListUphillRouting_943/Responsedef_ListUphillRouting_943_WebMenu_OnClick
GroupServerCalls: true
- Initiator: 'MenuCreate'
+ Initiator: 'mCreate'
QuillAction
{
Body:
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_mDelete_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_mDelete_OnClick.def
new file mode 100644
index 0000000..db1b96f
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_mDelete_OnClick.def
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: ListUphillRouting_943
+Response OnClick (
+ structured[UphillRouting] selection
+) id:Response_ListUphillRouting_943_mDelete_OnClick
+{
+ #keys: '[414996.1.33518513]'
+ CanBindMultiple: false
+ DefinitionID => /ListUphillRouting_943/Responsedef_ListUphillRouting_943_WebMenu_OnClick
+ GroupServerCalls: true
+ Initiator: 'mDelete'
+ QuillAction
+ {
+ Body:
+ [*
+ if( WebMessageBox::Question( "纭鍒犻櫎锛�",Translations::MessageBox_YesNo() ) = 0 ){
+ traverse( selection,Elements,element ){
+ element.Delete();
+ }
+ }
+ *]
+ }
+}
--
Gitblit v1.9.3