From 4c585e1bce95ca82f4c3177e87d864102d4ee4ae Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期四, 24 十月 2024 22:20:20 +0800
Subject: [PATCH] 修复成本配置界面报错的问题

---
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pActions526.def                                  |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pOvertimeMultiplierEmployeeType#700.def          |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pEmployeeType.def                                |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pActions.def                                     |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListOvertimeMultiplier_MenuEdit_OnClick.def       |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pStandardWorkingDay#687.def                      |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pEditEmployeeType.def                            |    8 +-
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pEditOvertimeMultiplier.def                      |   10 +-
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions_ButtonCalcel_OnClick.def                 |   16 ++++
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListEmployeeType_MenuEdit782_OnClick.def          |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions526_ButtonOK338_OnClick.def               |   25 ++++++
 /dev/null                                                                                                         |   20 -----
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pOvertimeMultiplier.def                          |    4 
 _Main/BL/Type_OvertimeMultiplier/Method_Edit.qbl                                                                  |   14 +++
 _Main/BL/Type_EmployeeType/Method_Edit.qbl                                                                        |   12 +++
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pStandardWorkingDay_NumberPicker287_OnChanged.def |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListEmployeeType_MenuCreate583_OnClick.def        |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions526_ButtonCalcel267_OnClick.def           |   16 ++++
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions_ButtonOK_OnClick.def                     |   26 ++++++
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListOvertimeMultiplier_MenuCreate_OnClick.def     |    5 
 _Main/BL/Type_OvertimeMultiplier/StaticMethod_Create.qbl                                                          |   14 +++
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pStandardWorkingDay_Button671_OnClick.def         |    4 
 _Main/BL/Type_EmployeeType/StaticMethod_Create.qbl                                                                |   13 +++
 _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_Panel972.def                                     |    4 
 24 files changed, 170 insertions(+), 53 deletions(-)

diff --git a/_Main/BL/Type_EmployeeType/Method_Edit.qbl b/_Main/BL/Type_EmployeeType/Method_Edit.qbl
new file mode 100644
index 0000000..2c15654
--- /dev/null
+++ b/_Main/BL/Type_EmployeeType/Method_Edit.qbl
@@ -0,0 +1,12 @@
+Quintiq file version 2.0
+#parent: #root
+Method Edit (
+  String name
+)
+{
+  TextBody:
+  [*
+    // Akari Oct-24-2024 (created)
+    this.Name( name );
+  *]
+}
diff --git a/_Main/BL/Type_EmployeeType/StaticMethod_Create.qbl b/_Main/BL/Type_EmployeeType/StaticMethod_Create.qbl
new file mode 100644
index 0000000..a14ed3c
--- /dev/null
+++ b/_Main/BL/Type_EmployeeType/StaticMethod_Create.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod Create (
+  MacroPlan owner,
+  String name
+)
+{
+  TextBody:
+  [*
+    // Akari Oct-24-2024 (created)
+    owner.EmployeeType( relnew,Name := name );
+  *]
+}
diff --git a/_Main/BL/Type_OvertimeMultiplier/Method_Edit.qbl b/_Main/BL/Type_OvertimeMultiplier/Method_Edit.qbl
new file mode 100644
index 0000000..28ccb85
--- /dev/null
+++ b/_Main/BL/Type_OvertimeMultiplier/Method_Edit.qbl
@@ -0,0 +1,14 @@
+Quintiq file version 2.0
+#parent: #root
+Method Edit (
+  String name,
+  Real multiplier
+)
+{
+  TextBody:
+  [*
+    // Akari Oct-24-2024 (created)
+    this.Name( name );
+    this.Multiplier( multiplier );
+  *]
+}
diff --git a/_Main/BL/Type_OvertimeMultiplier/StaticMethod_Create.qbl b/_Main/BL/Type_OvertimeMultiplier/StaticMethod_Create.qbl
new file mode 100644
index 0000000..d1ebccb
--- /dev/null
+++ b/_Main/BL/Type_OvertimeMultiplier/StaticMethod_Create.qbl
@@ -0,0 +1,14 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod Create (
+  MacroPlan owner,
+  String name,
+  Real multiplier
+)
+{
+  TextBody:
+  [*
+    // Akari Oct-24-2024 (created)
+    owner.OvertimeMultiplier( relnew,Name := name, Multiplier := multiplier );
+  *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_Panel972.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_Panel972.def
index 19e5ecb..bd44c8e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_Panel972.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_Panel972.def
@@ -5,8 +5,8 @@
   BaseType: 'WebPanel'
   Children:
   [
-    #child: Panel700
-    #child: PanelStandardWorkingDay
+    #child: pOvertimeMultiplierEmployeeType
+    #child: pStandardWorkingDay
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelActions.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pActions.def
similarity index 95%
rename from _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelActions.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pActions.def
index a47b227..b3ab646 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelActions.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pActions.def
@@ -1,5 +1,5 @@
 Quintiq file version 2.0
-Component PanelActions
+Component pActions
 {
   #keys: '[412672.1.3091200]'
   BaseType: 'WebPanel'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelActions526.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pActions526.def
similarity index 95%
rename from _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelActions526.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pActions526.def
index 7578258..fe285b7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelActions526.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pActions526.def
@@ -1,5 +1,5 @@
 Quintiq file version 2.0
-Component PanelActions526
+Component pActions526
 {
   #keys: '[412672.1.6984289]'
   BaseType: 'WebPanel'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelEditEmployeeType.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pEditEmployeeType.def
similarity index 79%
rename from _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelEditEmployeeType.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pEditEmployeeType.def
index 03a43fd..69d8797 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelEditEmployeeType.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pEditEmployeeType.def
@@ -1,11 +1,11 @@
 Quintiq file version 2.0
-Component PanelEditEmployeeType
+Component pEditEmployeeType
 {
   #keys: '[412672.1.6984140]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component EditFieldEditEmployeeType
+    Component efEditEmployeeType
     {
       #keys: '[412672.1.6984180]'
       BaseType: 'WebEditField'
@@ -16,12 +16,12 @@
         Taborder: 0
       ]
     }
-    #child: PanelActions526
+    #child: pActions526
     Component dhEditEmployeeType
     {
       #keys: '[412672.1.6984295]'
       BaseType: 'WebDataHolder'
-      Databinding: 'shadow[EmployeeType]*'
+      Databinding: 'EmployeeType'
       Properties:
       [
         Taborder: 1
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelEditOvertimeMultiplier.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pEditOvertimeMultiplier.def
similarity index 80%
rename from _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelEditOvertimeMultiplier.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pEditOvertimeMultiplier.def
index 5f58181..9369fbb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelEditOvertimeMultiplier.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pEditOvertimeMultiplier.def
@@ -1,11 +1,11 @@
 Quintiq file version 2.0
-Component PanelEditOvertimeMultiplier
+Component pEditOvertimeMultiplier
 {
   #keys: '[412672.1.3001087]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component EditFieldEditOvertimeMultiplier
+    Component efEditOvertimeMultiplier
     {
       #keys: '[412672.1.3001163]'
       BaseType: 'WebEditField'
@@ -16,7 +16,7 @@
         Taborder: 0
       ]
     }
-    Component NumberPickerEditOvertimeMultiplier
+    Component npEditOvertimeMultiplier
     {
       #keys: '[412672.1.3001177]'
       BaseType: 'WebNumberPicker'
@@ -34,13 +34,13 @@
     {
       #keys: '[412672.1.3001190]'
       BaseType: 'WebDataHolder'
-      Databinding: 'shadow[OvertimeMultiplier]*'
+      Databinding: 'OvertimeMultiplier'
       Properties:
       [
         Taborder: 2
       ]
     }
-    #child: PanelActions
+    #child: pActions
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelEmployeeType.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pEmployeeType.def
similarity index 75%
rename from _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelEmployeeType.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pEmployeeType.def
index 7062b6b..6f06fde 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelEmployeeType.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pEmployeeType.def
@@ -1,12 +1,12 @@
 Quintiq file version 2.0
-Component PanelEmployeeType
+Component pEmployeeType
 {
   #keys: '[412672.1.3030869]'
   BaseType: 'WebPanel'
   Children:
   [
     #child: ListEmployeeType
-    #child: PanelEditEmployeeType
+    #child: pEditEmployeeType
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelOvertimeMultiplier.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pOvertimeMultiplier.def
similarity index 73%
rename from _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelOvertimeMultiplier.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pOvertimeMultiplier.def
index 92ff091..6d20f80 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelOvertimeMultiplier.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pOvertimeMultiplier.def
@@ -1,12 +1,12 @@
 Quintiq file version 2.0
-Component PanelOvertimeMultiplier
+Component pOvertimeMultiplier
 {
   #keys: '[412672.1.3030850]'
   BaseType: 'WebPanel'
   Children:
   [
     #child: ListOvertimeMultiplier
-    #child: PanelEditOvertimeMultiplier
+    #child: pEditOvertimeMultiplier
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_Panel700.def "b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pOvertimeMultiplierEmployeeType\043700.def"
similarity index 62%
rename from _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_Panel700.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pOvertimeMultiplierEmployeeType\043700.def"
index 5766ca0..78a92a9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_Panel700.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pOvertimeMultiplierEmployeeType\043700.def"
@@ -1,12 +1,12 @@
 Quintiq file version 2.0
-Component Panel700
+Component pOvertimeMultiplierEmployeeType
 {
   #keys: '[412672.1.3030760]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: PanelEmployeeType
-    #child: PanelOvertimeMultiplier
+    #child: pEmployeeType
+    #child: pOvertimeMultiplier
   ]
   Properties:
   [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelStandardWorkingDay\043687.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pStandardWorkingDay\043687.def"
similarity index 94%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelStandardWorkingDay\043687.def"
rename to "_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pStandardWorkingDay\043687.def"
index 2579c92..3ab8f96 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_PanelStandardWorkingDay\043687.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Component_pStandardWorkingDay\043687.def"
@@ -1,5 +1,5 @@
 Quintiq file version 2.0
-Component PanelStandardWorkingDay
+Component pStandardWorkingDay
 {
   #keys: '[412672.1.3030780]'
   BaseType: 'WebPanel'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListEmployeeType_MenuCreate583_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListEmployeeType_MenuCreate583_OnClick.def
index 5ce7c23..b78b810 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListEmployeeType_MenuCreate583_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListEmployeeType_MenuCreate583_OnClick.def
@@ -11,8 +11,8 @@
   {
     Body:
     [*
-      PanelEditEmployeeType.Visible( true );
-      dhEditEmployeeType.Data( MacroPlan.EmployeeType( relshadow ));
+      pEditEmployeeType.Visible( true );
+      dhEditEmployeeType.Data( null( EmployeeType ));
     *]
   }
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListEmployeeType_MenuEdit782_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListEmployeeType_MenuEdit782_OnClick.def
index 5d53dc0..263447c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListEmployeeType_MenuEdit782_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListEmployeeType_MenuEdit782_OnClick.def
@@ -13,8 +13,8 @@
   {
     Body:
     [*
-      PanelEditEmployeeType.Visible( true );
-      dhEditEmployeeType.Data( shadow(selection) );
+      pEditEmployeeType.Visible( true );
+      dhEditEmployeeType.Data( selection );
     *]
   }
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListOvertimeMultiplier_MenuCreate_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListOvertimeMultiplier_MenuCreate_OnClick.def
index 9324150..0ef8e33 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListOvertimeMultiplier_MenuCreate_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListOvertimeMultiplier_MenuCreate_OnClick.def
@@ -11,10 +11,11 @@
   {
     Body:
     [*
-      PanelEditOvertimeMultiplier.Visible( true );
+      pEditOvertimeMultiplier.Visible( true );
       
+      dhEditOvertimeMultiplier.Data( null( OvertimeMultiplier ));
       
-      dhEditOvertimeMultiplier.Data( MacroPlan.OvertimeMultiplier( relshadow ) );
+      npEditOvertimeMultiplier.Number( 1 );
     *]
   }
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListOvertimeMultiplier_MenuEdit_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListOvertimeMultiplier_MenuEdit_OnClick.def
index 2157065..3676bd0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListOvertimeMultiplier_MenuEdit_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_ListOvertimeMultiplier_MenuEdit_OnClick.def
@@ -13,8 +13,8 @@
   {
     Body:
     [*
-      PanelEditOvertimeMultiplier.Visible( true );
-      dhEditOvertimeMultiplier.Data( shadow( selection ) );
+      pEditOvertimeMultiplier.Visible( true );
+      dhEditOvertimeMultiplier.Data( selection );
     *]
   }
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelActions526_ButtonCalcel267_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelActions526_ButtonCalcel267_OnClick.def
deleted file mode 100644
index 537b24a..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelActions526_ButtonCalcel267_OnClick.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelActions526/ButtonCalcel267
-Response OnClick () id:Response_PanelActions526_ButtonCalcel267_OnClick
-{
-  #keys: '[412672.1.6984287]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebButton_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      PanelEditEmployeeType.Visible( false );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelActions526_ButtonOK338_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelActions526_ButtonOK338_OnClick.def
deleted file mode 100644
index b5fcee3..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelActions526_ButtonOK338_OnClick.def
+++ /dev/null
@@ -1,20 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelActions526/ButtonOK338
-Response OnClick () id:Response_PanelActions526_ButtonOK338_OnClick
-{
-  #keys: '[412672.1.6984288]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebButton_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      if( not isnull( dhEditEmployeeType.Data())){
-        Form.ApplyChanges();
-        dhEditEmployeeType.Data().Commit();
-      }
-      PanelEditEmployeeType.Visible( false );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelActions_ButtonCalcel_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelActions_ButtonCalcel_OnClick.def
deleted file mode 100644
index 39c486a..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelActions_ButtonCalcel_OnClick.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelActions/ButtonCalcel
-Response OnClick () id:Response_PanelActions_ButtonCalcel_OnClick
-{
-  #keys: '[412672.1.3091500]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebButton_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      PanelEditOvertimeMultiplier.Visible( false );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelActions_ButtonOK_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelActions_ButtonOK_OnClick.def
deleted file mode 100644
index 98da954..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelActions_ButtonOK_OnClick.def
+++ /dev/null
@@ -1,20 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelActions/ButtonOK_780
-Response OnClick () id:Response_PanelActions_ButtonOK_OnClick
-{
-  #keys: '[412672.1.3091237]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebButton_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      if( not isnull( dhEditOvertimeMultiplier.Data())){
-        Form.ApplyChanges();
-        dhEditOvertimeMultiplier.Data().Commit();
-      }
-      PanelEditOvertimeMultiplier.Visible( false );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions526_ButtonCalcel267_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions526_ButtonCalcel267_OnClick.def
new file mode 100644
index 0000000..279bad8
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions526_ButtonCalcel267_OnClick.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: pActions526/ButtonCalcel267
+Response OnClick () id:Response_pActions526_ButtonCalcel267_OnClick
+{
+  #keys: '[412672.1.6984287]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebButton_OnClick'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      pEditEmployeeType.Visible( false );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions526_ButtonOK338_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions526_ButtonOK338_OnClick.def
new file mode 100644
index 0000000..f42b5cd
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions526_ButtonOK338_OnClick.def
@@ -0,0 +1,25 @@
+Quintiq file version 2.0
+#parent: pActions526/ButtonOK338
+Response OnClick () id:Response_pActions526_ButtonOK338_OnClick
+{
+  #keys: '[412672.1.6984288]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebButton_OnClick'
+  GroupServerCalls: true
+  Precondition:
+  [*
+    return efEditEmployeeType.Text() <> "";
+  *]
+  QuillAction
+  {
+    Body:
+    [*
+      if( not isnull( dhEditEmployeeType.Data())){
+        dhEditEmployeeType.Data().Edit( efEditEmployeeType.Text() );
+      }else{
+        EmployeeType::Create( MacroPlan, efEditEmployeeType.Text() );
+      }
+      pEditEmployeeType.Visible( false );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions_ButtonCalcel_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions_ButtonCalcel_OnClick.def
new file mode 100644
index 0000000..705addd
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions_ButtonCalcel_OnClick.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: pActions/ButtonCalcel
+Response OnClick () id:Response_pActions_ButtonCalcel_OnClick
+{
+  #keys: '[412672.1.3091500]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebButton_OnClick'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      pEditOvertimeMultiplier.Visible( false );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions_ButtonOK_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions_ButtonOK_OnClick.def
new file mode 100644
index 0000000..5127e7e
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pActions_ButtonOK_OnClick.def
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+#parent: pActions/ButtonOK_780
+Response OnClick () id:Response_pActions_ButtonOK_OnClick
+{
+  #keys: '[412672.1.3091237]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebButton_OnClick'
+  GroupServerCalls: true
+  Precondition:
+  [*
+    return efEditOvertimeMultiplier.Text() <> "" ;
+  *]
+  QuillAction
+  {
+    Body:
+    [*
+      if( not isnull( dhEditOvertimeMultiplier.Data())){
+        dhEditOvertimeMultiplier.Data().Edit( efEditOvertimeMultiplier.Text(), npEditOvertimeMultiplier.Number() );
+        // dhEditOvertimeMultiplier.Data().Commit();
+      }else{
+        OvertimeMultiplier::Create( MacroPlan, efEditOvertimeMultiplier.Text(), npEditOvertimeMultiplier.Number() );
+      }
+      pEditOvertimeMultiplier.Visible( false );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelStandardWorkingDay_Button671_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pStandardWorkingDay_Button671_OnClick.def
similarity index 77%
rename from _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelStandardWorkingDay_Button671_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pStandardWorkingDay_Button671_OnClick.def
index c61abf1..fe609c8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelStandardWorkingDay_Button671_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pStandardWorkingDay_Button671_OnClick.def
@@ -1,6 +1,6 @@
 Quintiq file version 2.0
-#parent: PanelStandardWorkingDay/Button671
-Response OnClick () id:Response_PanelStandardWorkingDay_Button671_OnClick
+#parent: pStandardWorkingDay/Button671
+Response OnClick () id:Response_pStandardWorkingDay_Button671_OnClick
 {
   #keys: '[412672.1.3033025]'
   CanBindMultiple: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelStandardWorkingDay_NumberPicker287_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pStandardWorkingDay_NumberPicker287_OnChanged.def
similarity index 66%
rename from _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelStandardWorkingDay_NumberPicker287_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pStandardWorkingDay_NumberPicker287_OnChanged.def
index 145c0aa..89a53a7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_PanelStandardWorkingDay_NumberPicker287_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEmployeeCost/Response_pStandardWorkingDay_NumberPicker287_OnChanged.def
@@ -1,6 +1,6 @@
 Quintiq file version 2.0
-#parent: PanelStandardWorkingDay/NumberPicker287
-Response OnChanged () id:Response_PanelStandardWorkingDay_NumberPicker287_OnChanged
+#parent: pStandardWorkingDay/NumberPicker287
+Response OnChanged () id:Response_pStandardWorkingDay_NumberPicker287_OnChanged
 {
   #keys: '[412672.1.6920929]'
   CanBindMultiple: false

--
Gitblit v1.9.3