From 02145cbdd92487b73b8876fa3fadf92422dea371 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 13 十一月 2024 10:05:10 +0800
Subject: [PATCH] 修改页面布局

---
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def                                          |    2 
 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl                                                   |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def                               |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def                |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations#529.def                              |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers#568.def                                   |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def                                |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage519.def                        |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu687.def                          |    4 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def                                            |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def                             |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def                               |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def                                      |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def                                             |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def                          |    6 
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlanMDSIDsByName.def                         |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def                            |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def                                     |    2 
 _Main/Sys/ImgAttr/LocalValue.dme                                                                                          |   27 ++
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers_OnClick.def                           |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def                                |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage245.def                        |    4 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def                            |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def                                        |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def                                             |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhCheckPowers_OnDataChanged.def           |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def                   |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB#925.def                                   |    2 
 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateFullTable.qbl                                             |    5 
 _Main/UI/MacroPlannerWebApp/_ROOT_Project_MacroPlannerWebApp.qp                                                           |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def                                                        |    8 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def      |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def               |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def                             |    2 
 _Main/BL/Type_Test/StaticMethod_TestMacroPlan.qbl                                                                         |   16 +
 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_Create.qbl                                                            |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def                         |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers.def                                  |   41 ++++
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_OnClick.def                           |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def                        |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def                               |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def          |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963.def                        |    4 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def                                       |    6 
 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_AsyncCreateFullTable.qbl                                              |    5 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def                                       |    8 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter.def                     |   17 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def                           |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def                                                       |    8 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def                             |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def                                          |    8 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def                                       |    8 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def                                               |    8 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower.def                                      |   20 +-
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhPowers_OnCreated.def                    |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def                                                   |    8 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def               |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration.def                                 |   20 +-
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def                                            |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def                                           |    8 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def                                                    |    8 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def                                          |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def                             |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations.def                             |   41 ++++
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu319.def                          |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB.def                                     |   20 +-
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB.def                                  |   41 ++++
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def                                      |    8 
 /dev/null                                                                                                                 |   18 -
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu623.def                          |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def                                  |    8 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhGenerations_OnCreated.def          |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def                   |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def                                                    |    8 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def                                          |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft#545.def                               |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def                                            |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations_OnClick.def                      |    6 
 79 files changed, 365 insertions(+), 198 deletions(-)

diff --git a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateFullTable.qbl b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateFullTable.qbl
index 0d45916..074f66a 100644
--- a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateFullTable.qbl
+++ b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateFullTable.qbl
@@ -12,8 +12,9 @@
     // Akari Nov-11-2024 (created)
     AsyncFlag::Running( recycleBin,MP_Cell_ScheduleSummary::GetTableName() );
     
-    macroPlans := stream[MacroPlan]::Success();
-    traverse( macroPlanMDSIDs,Elements,mdsid ){
+    macroPlans := MDSMacroPlan::Root( macroPlanMDSIDs.Element( 0 ) );
+    for( i := 1; i< macroPlanMDSIDs.Size(); i++ ){
+      mdsid := macroPlanMDSIDs.Element( i );
       streamMacroPlan := LocalTool::LoadMacroPlan( mdsid );
       macroPlans.Merge( streamMacroPlan );
     }
diff --git a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_AsyncCreateFullTable.qbl b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_AsyncCreateFullTable.qbl
index d1949ea..b0278c2 100644
--- a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_AsyncCreateFullTable.qbl
+++ b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_AsyncCreateFullTable.qbl
@@ -11,8 +11,9 @@
     // Akari Nov-11-2024 (created)
     AsyncFlag::Running( recycleBin,MP_Cell_AnnualPlanReport::GetTableName() );
     
-    macroPlans := stream[MacroPlan]::Success();
-    traverse( macroPlanMDSIDs,Elements,mdsid ){
+    macroPlans := MDSMacroPlan::Root( macroPlanMDSIDs.Element( 0 ) );
+    for( i := 1; i< macroPlanMDSIDs.Size(); i++ ){
+      mdsid := macroPlanMDSIDs.Element( i );
       streamMacroPlan := LocalTool::LoadMacroPlan( mdsid );
       macroPlans.Merge( streamMacroPlan );
     }
diff --git a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_Create.qbl b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_Create.qbl
index 09e1363..7cbb030 100644
--- a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_Create.qbl
+++ b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_Create.qbl
@@ -10,7 +10,7 @@
     traverse( owner,MP_Table,table,table.Name() = MP_Cell_AnnualPlanReport::GetTableName() ){
       table.Delete();
     }
-    
+    info( owner.MDSMacroPlan().Description() )
     table := owner.MP_Table( relnew,Name := MP_Cell_AnnualPlanReport::GetTableName());
     
     startDate := owner.StartOfPlanning().Date();
diff --git a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl
index b81f496..f9f9e50 100644
--- a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl
+++ b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl
@@ -38,7 +38,7 @@
        localRowIndex := guard( localRowIndexTree.Root().Child( localRowHandle ),null( NamedValue ));
        localRow := null( LocalRow );
        if( isnull( localRowIndex )){
-         info( row.ProductID() + row.ProductionLine() );
+    
          localRow := localTable.LocalRow( relnew,CustomName := row.Name(),ProductID := row.ProductID(),ProductionLine := row.ProductionLine(),Index := localTable.GetRowIndexCache() );
          localRows.Add( localRow );
          localRowIndexTree.Root().AddChild( localRowHandle,localRows.Size() - 1 );
diff --git a/_Main/BL/Type_Test/StaticMethod_TestMacroPlan.qbl b/_Main/BL/Type_Test/StaticMethod_TestMacroPlan.qbl
new file mode 100644
index 0000000..842eead
--- /dev/null
+++ b/_Main/BL/Type_Test/StaticMethod_TestMacroPlan.qbl
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod TestMacroPlan (
+  const MacroPlan macroPlan
+)
+{
+  TextBody:
+  [*
+    // Akari Nov-12-2024 (created)
+    info( macroPlan.MDSMacroPlan().Description() );
+    
+    traverse( macroPlan,MP_Table,table ){
+      info( table.Name() ); 
+    }
+  *]
+}
diff --git a/_Main/Sys/ImgAttr/LocalValue.dme b/_Main/Sys/ImgAttr/LocalValue.dme
new file mode 100644
index 0000000..e5d6c36
--- /dev/null
+++ b/_Main/Sys/ImgAttr/LocalValue.dme
@@ -0,0 +1,27 @@
+Quintiq file version 2.0
+#parent: #root
+TypeDataInterface LocalValue
+{
+  TypeKey: '[414996.1.191854789]'
+  ImageDataMember ImageIsEnable
+  {
+    #keys: '1[414996.1.215962330]'
+    ImageSpecifications:
+    [
+      ImageDataMemberImageSpecification
+      {
+        Description: 'Enable'
+        Image: 'CHECKEDCHECKBOX'
+        Quill: 'object.IsCheck()'
+        Value: 'Enable'
+      }
+      ImageDataMemberImageSpecification
+      {
+        Description: 'Disable'
+        Image: 'EMPTYCHECKBOX'
+        Quill: 'not object.IsCheck()'
+        Value: 'Disable'
+      }
+    ]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlanMDSIDsByName.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlanMDSIDsByName.def
index fda706a..ac314f0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlanMDSIDsByName.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlanMDSIDsByName.def
@@ -9,7 +9,7 @@
   [*
     macroPlanMDSIDs := construct( Keys );
     
-    macroPlanMDSIDs := selectuniquevalues( ScenarioManager,ScenarioMP,scemp,scemp.Name().LikeUserLocale( macroPlanName ) ,scemp.MDSID());
+    macroPlanMDSIDs := selectuniquevalues( ScenarioManager,ScenarioMP,scemp,scemp.Name().LikeUserLocale( macroPlanName ) ,scemp.DatasetMDSID());
     
     return &macroPlanMDSIDs
   *]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def
index a84ded0..e7810eb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component ListGenerations
 {
-  #keys: '[414996.1.211223843]'
+  #keys: '[414996.1.215964344]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor989
     {
-      #keys: '[414996.1.211223844]'
+      #keys: '[414996.1.215964345]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -20,7 +20,7 @@
     #child: listActionBarPage963
     Component DataSetLevel191
     {
-      #keys: '[414996.1.211223846]'
+      #keys: '[414996.1.215964347]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu687'
         Taborder: 2
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def
index c692844..c02a8ac 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component ListMQBMLB
 {
-  #keys: '[414996.1.211223825]'
+  #keys: '[414996.1.215964326]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor472
     {
-      #keys: '[414996.1.211223826]'
+      #keys: '[414996.1.215964327]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -20,7 +20,7 @@
     #child: listActionBarPage519
     Component DataSetLevel527
     {
-      #keys: '[414996.1.211223828]'
+      #keys: '[414996.1.215964329]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu319'
         Taborder: 2
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def
index 77587f2..1b6c9bd 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component ListPowers
 {
-  #keys: '[414996.1.211223834]'
+  #keys: '[414996.1.215964335]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor671
     {
-      #keys: '[414996.1.211223835]'
+      #keys: '[414996.1.215964336]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -20,7 +20,7 @@
     #child: listActionBarPage245
     Component DataSetLevel995
     {
-      #keys: '[414996.1.211223837]'
+      #keys: '[414996.1.215964338]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu623'
         Taborder: 2
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def
index 70b1750..1166457 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listActionBarPage245
 {
-  #keys: '[414996.1.211223836]'
+  #keys: '[414996.1.215964337]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def
index 3ef0486..d3cc383 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listActionBarPage519
 {
-  #keys: '[414996.1.211223827]'
+  #keys: '[414996.1.215964328]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def
index cbb1e9f..8b4763b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listActionBarPage963
 {
-  #keys: '[414996.1.211223845]'
+  #keys: '[414996.1.215964346]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def
index ee08f17..2252ae5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listContextMenu319
 {
-  #keys: '[414996.1.211223829]'
+  #keys: '[414996.1.215964330]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def
index a5988e5..a814d17 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listContextMenu623
 {
-  #keys: '[414996.1.211223838]'
+  #keys: '[414996.1.215964339]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def
index 1fceefe..3b8751b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listContextMenu687
 {
-  #keys: '[414996.1.211223847]'
+  #keys: '[414996.1.215964348]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def
index e77fbd3..f6a9cea 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pGeneration
 {
-  #keys: '[414996.1.211223841]'
+  #keys: '[414996.1.215964342]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhGenerations
     {
-      #keys: '[414996.1.211223842]'
+      #keys: '[414996.1.215964343]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -18,14 +18,14 @@
     #child: ListGenerations
     Component dhCheckGenerations
     {
-      #keys: '[414996.1.211223848]'
+      #keys: '[414996.1.215964349]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckGenerations
         {
-          #keys: '[414996.1.211223849]'
+          #keys: '[414996.1.215964350]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def
index 24dedd8..875d43e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pMQBMLB
 {
-  #keys: '[414996.1.211223823]'
+  #keys: '[414996.1.215964324]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhMQBMLB
     {
-      #keys: '[414996.1.211223824]'
+      #keys: '[414996.1.215964325]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -18,14 +18,14 @@
     #child: ListMQBMLB
     Component dhCheckMQBMLB
     {
-      #keys: '[414996.1.211223830]'
+      #keys: '[414996.1.215964331]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckMQBMLB
         {
-          #keys: '[414996.1.211223831]'
+          #keys: '[414996.1.215964332]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def
index 2c3f4da..139ac77 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pPower
 {
-  #keys: '[414996.1.211223832]'
+  #keys: '[414996.1.215964333]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhPowers
     {
-      #keys: '[414996.1.211223833]'
+      #keys: '[414996.1.215964334]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -18,14 +18,14 @@
     #child: ListPowers
     Component dhCheckPowers
     {
-      #keys: '[414996.1.211223839]'
+      #keys: '[414996.1.215964340]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckPowers
         {
-          #keys: '[414996.1.211223840]'
+          #keys: '[414996.1.215964341]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def
index 22877ae..8485676 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pProductAttributeFilter
 {
-  #keys: '[414996.1.211223822]'
+  #keys: '[414996.1.215964323]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: pMQBMLB
-    #child: pPower
     #child: pGeneration
+    #child: pPower
+    #child: pMQBMLB
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def
index afdff5a..f895650 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def
@@ -4,7 +4,7 @@
   LocalValue selection
 ) id:Response_ListGenerations_OnClick
 {
-  #keys: '[414996.1.211223757]'
+  #keys: '[414996.1.215964309]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def
index bdc082a..b33bc93 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def
@@ -4,7 +4,7 @@
   LocalValue selection
 ) id:Response_ListMQBMLB_OnClick
 {
-  #keys: '[414996.1.211223765]'
+  #keys: '[414996.1.215964317]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def
index 7fcdb2d..5becb69 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def
@@ -4,7 +4,7 @@
   LocalValue selection
 ) id:Response_ListPowers_OnClick
 {
-  #keys: '[414996.1.211223761]'
+  #keys: '[414996.1.215964313]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
index dfdd368..640fe57 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
@@ -2,7 +2,7 @@
 #parent: pGeneration/dhCheckGenerations
 Response OnDataChanged () id:Response_pGeneration_dhCheckGenerations_OnDataChanged
 {
-  #keys: '[414996.1.211223756]'
+  #keys: '[414996.1.215964308]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def
index e5d83d8..e278063 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: pGeneration/dhGenerations
 Response OnCreated () id:Response_pGeneration_dhGenerations_OnCreated
 {
-  #keys: '[414996.1.211223759]'
+  #keys: '[414996.1.215964311]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
index 8a54c6f..6cba547 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
@@ -2,7 +2,7 @@
 #parent: pMQBMLB/dhCheckMQBMLB
 Response OnDataChanged () id:Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged
 {
-  #keys: '[414996.1.211223764]'
+  #keys: '[414996.1.215964316]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def
index 245b2e1..748f997 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: pMQBMLB/dhMQBMLB
 Response OnCreated () id:Response_pMQBMLB_dhMQBMLB_OnCreated
 {
-  #keys: '[414996.1.211223767]'
+  #keys: '[414996.1.215964319]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def
index f8c96ab..8d24065 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def
@@ -2,7 +2,7 @@
 #parent: pPower/dhCheckPowers
 Response OnDataChanged () id:Response_pPower_dhCheckPowers_OnDataChanged
 {
-  #keys: '[414996.1.211223760]'
+  #keys: '[414996.1.215964312]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def
index f1a40cd..018bd78 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: pPower/dhPowers
 Response OnCreated () id:Response_pPower_dhPowers_OnCreated
 {
-  #keys: '[414996.1.211223763]'
+  #keys: '[414996.1.215964315]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def"
index a374678..1cabe79 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def"
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu687'
         Taborder: 2
       ]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043925.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043925.def"
index 256ab51..613d87f 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043925.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043925.def"
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu319'
         Taborder: 2
       ]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers\043568.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers\043568.def"
index b66b7af..8796385 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers\043568.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers\043568.def"
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu623'
         Taborder: 2
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def
index 6673770..1af4b5e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component ListGenerations
 {
-  #keys: '[414996.1.211223084]'
+  #keys: '[414996.1.215964234]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor989
     {
-      #keys: '[414996.1.211223085]'
+      #keys: '[414996.1.215964235]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -20,7 +20,7 @@
     #child: listActionBarPage963
     Component DataSetLevel191
     {
-      #keys: '[414996.1.211223087]'
+      #keys: '[414996.1.215964237]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu687'
         Taborder: 2
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def
index 493bb13..9bec91a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component ListMQBMLB
 {
-  #keys: '[414996.1.211223066]'
+  #keys: '[414996.1.215964216]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor472
     {
-      #keys: '[414996.1.211223067]'
+      #keys: '[414996.1.215964217]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -20,7 +20,7 @@
     #child: listActionBarPage519
     Component DataSetLevel527
     {
-      #keys: '[414996.1.211223069]'
+      #keys: '[414996.1.215964219]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu319'
         Taborder: 2
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def
index cf62e07..b99acff 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component ListPowers
 {
-  #keys: '[414996.1.211223075]'
+  #keys: '[414996.1.215964225]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor671
     {
-      #keys: '[414996.1.211223076]'
+      #keys: '[414996.1.215964226]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -20,7 +20,7 @@
     #child: listActionBarPage245
     Component DataSetLevel995
     {
-      #keys: '[414996.1.211223078]'
+      #keys: '[414996.1.215964228]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu623'
         Taborder: 2
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def
index fa7a1ce..8f0ea9c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listActionBarPage245
 {
-  #keys: '[414996.1.211223077]'
+  #keys: '[414996.1.215964227]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def
index 42071fc..63db7cb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listActionBarPage519
 {
-  #keys: '[414996.1.211223068]'
+  #keys: '[414996.1.215964218]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def
index f655583..5f48a41 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listActionBarPage963
 {
-  #keys: '[414996.1.211223086]'
+  #keys: '[414996.1.215964236]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def
index 11260c8..578c5f9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listContextMenu319
 {
-  #keys: '[414996.1.211223070]'
+  #keys: '[414996.1.215964220]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def
index 04ce6fb..3c7c0f7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listContextMenu623
 {
-  #keys: '[414996.1.211223079]'
+  #keys: '[414996.1.215964229]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def
index c136f63..f32155d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listContextMenu687
 {
-  #keys: '[414996.1.211223088]'
+  #keys: '[414996.1.215964238]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def
index ec94058..5a9e4b9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pGeneration
 {
-  #keys: '[414996.1.211223082]'
+  #keys: '[414996.1.215964232]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhGenerations
     {
-      #keys: '[414996.1.211223083]'
+      #keys: '[414996.1.215964233]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -18,14 +18,14 @@
     #child: ListGenerations
     Component dhCheckGenerations
     {
-      #keys: '[414996.1.211223089]'
+      #keys: '[414996.1.215964239]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckGenerations
         {
-          #keys: '[414996.1.211223090]'
+          #keys: '[414996.1.215964240]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def
index bc61124..7fdfd5c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pMQBMLB
 {
-  #keys: '[414996.1.211223064]'
+  #keys: '[414996.1.215964214]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhMQBMLB
     {
-      #keys: '[414996.1.211223065]'
+      #keys: '[414996.1.215964215]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -18,14 +18,14 @@
     #child: ListMQBMLB
     Component dhCheckMQBMLB
     {
-      #keys: '[414996.1.211223071]'
+      #keys: '[414996.1.215964221]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckMQBMLB
         {
-          #keys: '[414996.1.211223072]'
+          #keys: '[414996.1.215964222]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def
index 9751775..4b67aa6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pPower
 {
-  #keys: '[414996.1.211223073]'
+  #keys: '[414996.1.215964223]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhPowers
     {
-      #keys: '[414996.1.211223074]'
+      #keys: '[414996.1.215964224]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -18,14 +18,14 @@
     #child: ListPowers
     Component dhCheckPowers
     {
-      #keys: '[414996.1.211223080]'
+      #keys: '[414996.1.215964230]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckPowers
         {
-          #keys: '[414996.1.211223081]'
+          #keys: '[414996.1.215964231]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def
index e536a45..53477ed 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pProductAttributeFilter
 {
-  #keys: '[414996.1.211223063]'
+  #keys: '[414996.1.215964213]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: pMQBMLB
-    #child: pPower
     #child: pGeneration
+    #child: pPower
+    #child: pMQBMLB
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def
index ed75271..ac03d12 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def
@@ -4,7 +4,7 @@
   LocalValue selection
 ) id:Response_ListGenerations_OnClick
 {
-  #keys: '[414996.1.211222998]'
+  #keys: '[414996.1.215964199]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def
index b4b308b..a1e31e1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def
@@ -4,7 +4,7 @@
   LocalValue selection
 ) id:Response_ListMQBMLB_OnClick
 {
-  #keys: '[414996.1.211223006]'
+  #keys: '[414996.1.215964207]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def
index 0f4c94a..dd3415b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def
@@ -4,7 +4,7 @@
   LocalValue selection
 ) id:Response_ListPowers_OnClick
 {
-  #keys: '[414996.1.211223002]'
+  #keys: '[414996.1.215964203]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
index bcbdb8a..15ff268 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
@@ -2,7 +2,7 @@
 #parent: pGeneration/dhCheckGenerations
 Response OnDataChanged () id:Response_pGeneration_dhCheckGenerations_OnDataChanged
 {
-  #keys: '[414996.1.211222997]'
+  #keys: '[414996.1.215964198]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
@@ -10,15 +10,15 @@
   {
     Body:
     [*
-      products := dhFinelProduct.Data();
+      products := dhFinelProducts.Data();
       if( this.Data().Size() <> 0 ){
         products := selectset( products,Elements,product,exists( this.Data(),Elements,element,element.StringValue() = product.Generation()));
-        dhFinelProduct.Data( &products );
+        dhFinelProducts.Data( &products );
       }else{
-        if( dhCheckedProduct.Data().Size() <> 0 ){
-          dhFinelProduct.Data( dhCheckedProduct.Data().Copy() );
+        if( dhCheckedProducts.Data().Size() <> 0 ){
+          dhFinelProducts.Data( dhCheckedProducts.Data().Copy() );
         }else{
-          dhFinelProduct.Data( DataHolderProduct.Data().Copy() );
+          dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
         }
       }
     *]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def
index 3592860..c7fc370 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: pGeneration/dhGenerations
 Response OnCreated () id:Response_pGeneration_dhGenerations_OnCreated
 {
-  #keys: '[414996.1.211223000]'
+  #keys: '[414996.1.215964201]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
index 4ed4a05..922b996 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
@@ -2,7 +2,7 @@
 #parent: pMQBMLB/dhCheckMQBMLB
 Response OnDataChanged () id:Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged
 {
-  #keys: '[414996.1.211223005]'
+  #keys: '[414996.1.215964206]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
@@ -10,15 +10,15 @@
   {
     Body:
     [*
-      products := dhFinelProduct.Data();
+      products := dhFinelProducts.Data();
       if( this.Data().Size() <> 0 ){
         products := selectset( products,Elements,product,exists( this.Data(),Elements,element,element.StringValue() = product.MQBMLB()));
-        dhFinelProduct.Data( &products );
+        dhFinelProducts.Data( &products );
       }else{
-        if( dhCheckedProduct.Data().Size() <> 0 ){
-          dhFinelProduct.Data( dhCheckedProduct.Data().Copy() );
+        if( dhCheckedProducts.Data().Size() <> 0 ){
+          dhFinelProducts.Data( dhCheckedProducts.Data().Copy() );
         }else{
-          dhFinelProduct.Data( DataHolderProduct.Data().Copy() );
+          dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
         }
       }
     *]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
index 797a070..8abf0d3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: pMQBMLB/dhMQBMLB
 Response OnCreated () id:Response_pMQBMLB_dhMQBMLB_OnCreated
 {
-  #keys: '[414996.1.211223008]'
+  #keys: '[414996.1.215964209]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
index 3471296..9fe50be 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
@@ -2,7 +2,7 @@
 #parent: pPower/dhCheckPowers
 Response OnDataChanged () id:Response_pPower_dhCheckPowers_OnDataChanged
 {
-  #keys: '[414996.1.211223001]'
+  #keys: '[414996.1.215964202]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
@@ -10,15 +10,15 @@
   {
     Body:
     [*
-      products := dhFinelProduct.Data();
+      products := dhFinelProducts.Data();
       if( this.Data().Size() <> 0 ){
         products := selectset( products,Elements,product,exists( this.Data(),Elements,element,element.StringValue() = product.Power()));
-        dhFinelProduct.Data( &products );
+        dhFinelProducts.Data( &products );
       }else{
-        if( dhCheckedProduct.Data().Size() <> 0 ){
-          dhFinelProduct.Data( dhCheckedProduct.Data().Copy() );
+        if( dhCheckedProducts.Data().Size() <> 0 ){
+          dhFinelProducts.Data( dhCheckedProducts.Data().Copy() );
         }else{
-          dhFinelProduct.Data( DataHolderProduct.Data().Copy() );
+          dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
         }
       }
     *]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def
index 20ad743..70a7be6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: pPower/dhPowers
 Response OnCreated () id:Response_pPower_dhPowers_OnCreated
 {
-  #keys: '[414996.1.211223004]'
+  #keys: '[414996.1.215964205]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations.def
new file mode 100644
index 0000000..fff4067
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations.def
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+Component ListGenerations
+{
+  #keys: '[414996.1.215964122]'
+  BaseType: 'WebList'
+  Children:
+  [
+    Component DataExtractor989
+    {
+      #keys: '[414996.1.215964123]'
+      BaseType: 'WebDataExtractor'
+      Properties:
+      [
+        DataType: 'structured[LocalValue]'
+        Source: 'dhGenerations'
+        Taborder: 0
+        Transformation: 'Elements'
+      ]
+    }
+    #child: listActionBarPage963
+    Component DataSetLevel191
+    {
+      #keys: '[414996.1.215964125]'
+      BaseType: 'WebDataSetLevel'
+      Children:
+      [
+        #child: listContextMenu687
+      ]
+      Properties:
+      [
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StringValue"}}]'
+        ContextMenu: 'listContextMenu687'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations366.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations366.def
deleted file mode 100644
index 5502cb5..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations366.def
+++ /dev/null
@@ -1,41 +0,0 @@
-Quintiq file version 2.0
-Component ListGenerations366
-{
-  #keys: '[414996.1.211222181]'
-  BaseType: 'WebList'
-  Children:
-  [
-    Component DataExtractor532
-    {
-      #keys: '[414996.1.211222182]'
-      BaseType: 'WebDataExtractor'
-      Properties:
-      [
-        DataType: 'structured[LocalValue]'
-        Source: 'dhGenerations423'
-        Taborder: 0
-        Transformation: 'Elements'
-      ]
-    }
-    #child: listActionBarPage206
-    Component DataSetLevel174
-    {
-      #keys: '[414996.1.211222184]'
-      BaseType: 'WebDataSetLevel'
-      Children:
-      [
-        #child: listContextMenu936
-      ]
-      Properties:
-      [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu936'
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB.def
new file mode 100644
index 0000000..34c7bae
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB.def
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+Component ListMQBMLB
+{
+  #keys: '[414996.1.215964104]'
+  BaseType: 'WebList'
+  Children:
+  [
+    Component DataExtractor472
+    {
+      #keys: '[414996.1.215964105]'
+      BaseType: 'WebDataExtractor'
+      Properties:
+      [
+        DataType: 'structured[LocalValue]'
+        Source: 'dhMQBMLB'
+        Taborder: 0
+        Transformation: 'Elements'
+      ]
+    }
+    #child: listActionBarPage519
+    Component DataSetLevel527
+    {
+      #keys: '[414996.1.215964107]'
+      BaseType: 'WebDataSetLevel'
+      Children:
+      [
+        #child: listContextMenu319
+      ]
+      Properties:
+      [
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StringValue"}}]'
+        ContextMenu: 'listContextMenu319'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB700.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB700.def
deleted file mode 100644
index 43fa536..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB700.def
+++ /dev/null
@@ -1,41 +0,0 @@
-Quintiq file version 2.0
-Component ListMQBMLB700
-{
-  #keys: '[414996.1.211222163]'
-  BaseType: 'WebList'
-  Children:
-  [
-    Component DataExtractor687
-    {
-      #keys: '[414996.1.211222164]'
-      BaseType: 'WebDataExtractor'
-      Properties:
-      [
-        DataType: 'structured[LocalValue]'
-        Source: 'dhMQBMLB972'
-        Taborder: 0
-        Transformation: 'Elements'
-      ]
-    }
-    #child: listActionBarPage703
-    Component DataSetLevel671
-    {
-      #keys: '[414996.1.211222166]'
-      BaseType: 'WebDataSetLevel'
-      Children:
-      [
-        #child: listContextMenu245
-      ]
-      Properties:
-      [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu245'
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers.def
new file mode 100644
index 0000000..80dfc6e
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers.def
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+Component ListPowers
+{
+  #keys: '[414996.1.215964113]'
+  BaseType: 'WebList'
+  Children:
+  [
+    Component DataExtractor671
+    {
+      #keys: '[414996.1.215964114]'
+      BaseType: 'WebDataExtractor'
+      Properties:
+      [
+        DataType: 'structured[LocalValue]'
+        Source: 'dhPowers'
+        Taborder: 0
+        Transformation: 'Elements'
+      ]
+    }
+    #child: listActionBarPage245
+    Component DataSetLevel995
+    {
+      #keys: '[414996.1.215964116]'
+      BaseType: 'WebDataSetLevel'
+      Children:
+      [
+        #child: listContextMenu623
+      ]
+      Properties:
+      [
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"StringValue"}}]'
+        ContextMenu: 'listContextMenu623'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers199.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers199.def
deleted file mode 100644
index 8365707..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers199.def
+++ /dev/null
@@ -1,41 +0,0 @@
-Quintiq file version 2.0
-Component ListPowers199
-{
-  #keys: '[414996.1.211222172]'
-  BaseType: 'WebList'
-  Children:
-  [
-    Component DataExtractor707
-    {
-      #keys: '[414996.1.211222173]'
-      BaseType: 'WebDataExtractor'
-      Properties:
-      [
-        DataType: 'structured[LocalValue]'
-        Source: 'dhPowers404'
-        Taborder: 0
-        Transformation: 'Elements'
-      ]
-    }
-    #child: listActionBarPage690
-    Component DataSetLevel558
-    {
-      #keys: '[414996.1.211222175]'
-      BaseType: 'WebDataSetLevel'
-      Children:
-      [
-        #child: listContextMenu979
-      ]
-      Properties:
-      [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu979'
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage206.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage206.def
deleted file mode 100644
index 2117e88..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage206.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage206
-{
-  #keys: '[414996.1.211222183]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage245.def
similarity index 61%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage245.def
index d288e9c..b485bfc 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage245.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
-Component listActionBarPage703
+Component listActionBarPage245
 {
-  #keys: '[414996.1.211222165]'
+  #keys: '[414996.1.215964115]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage519.def
similarity index 61%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage519.def
index d288e9c..bff3437 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage519.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
-Component listActionBarPage703
+Component listActionBarPage519
 {
-  #keys: '[414996.1.211222165]'
+  #keys: '[414996.1.215964106]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def
deleted file mode 100644
index eb6b6c9..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage690
-{
-  #keys: '[414996.1.211222174]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963.def
similarity index 61%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963.def
index d288e9c..711e02d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
-Component listActionBarPage703
+Component listActionBarPage963
 {
-  #keys: '[414996.1.211222165]'
+  #keys: '[414996.1.215964124]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu319.def
similarity index 61%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu319.def
index 14c3c4d..0397cef 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu319.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
-Component listContextMenu245
+Component listContextMenu319
 {
-  #keys: '[414996.1.211222167]'
+  #keys: '[414996.1.215964108]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu623.def
similarity index 61%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu623.def
index 14c3c4d..9822e70 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu623.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
-Component listContextMenu245
+Component listContextMenu623
 {
-  #keys: '[414996.1.211222167]'
+  #keys: '[414996.1.215964117]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu687.def
similarity index 61%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu687.def
index 14c3c4d..db830c1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu687.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
-Component listContextMenu245
+Component listContextMenu687
 {
-  #keys: '[414996.1.211222167]'
+  #keys: '[414996.1.215964126]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu936.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu936.def
deleted file mode 100644
index 43d83d5..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu936.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu936
-{
-  #keys: '[414996.1.211222185]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu979.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu979.def
deleted file mode 100644
index 4fe59a9..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu979.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu979
-{
-  #keys: '[414996.1.211222176]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration208.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration.def
similarity index 67%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration208.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration.def
index 6bcde59..298d5bf 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration208.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pGeneration208
+Component pGeneration
 {
-  #keys: '[414996.1.211222179]'
+  #keys: '[414996.1.215964120]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component dhGenerations423
+    Component dhGenerations
     {
-      #keys: '[414996.1.211222180]'
+      #keys: '[414996.1.215964121]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -15,23 +15,23 @@
         Taborder: 1
       ]
     }
-    #child: ListGenerations366
-    Component dhCheckGenerations744
+    #child: ListGenerations
+    Component dhCheckGenerations
     {
-      #keys: '[414996.1.211222186]'
+      #keys: '[414996.1.215964127]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
-        Component deCheckGenerations857
+        Component deCheckGenerations
         {
-          #keys: '[414996.1.211222187]'
+          #keys: '[414996.1.215964128]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
             DataType: 'structured[LocalValue]'
             FixedFilter: 'object.IsCheck()'
-            Source: 'dhGenerations423'
+            Source: 'dhGenerations'
             Taborder: 0
             Transformation: 'Elements'
           ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB154.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB.def
similarity index 69%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB154.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB.def
index eaf5fed..194f082 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB154.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pMQBMLB154
+Component pMQBMLB
 {
-  #keys: '[414996.1.211222161]'
+  #keys: '[414996.1.215964102]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component dhMQBMLB972
+    Component dhMQBMLB
     {
-      #keys: '[414996.1.211222162]'
+      #keys: '[414996.1.215964103]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -15,23 +15,23 @@
         Taborder: 1
       ]
     }
-    #child: ListMQBMLB700
-    Component dhCheckMQBMLB319
+    #child: ListMQBMLB
+    Component dhCheckMQBMLB
     {
-      #keys: '[414996.1.211222168]'
+      #keys: '[414996.1.215964109]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
-        Component deCheckMQBMLB661
+        Component deCheckMQBMLB
         {
-          #keys: '[414996.1.211222169]'
+          #keys: '[414996.1.215964110]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
             DataType: 'structured[LocalValue]'
             FixedFilter: 'object.IsCheck()'
-            Source: 'dhMQBMLB972'
+            Source: 'dhMQBMLB'
             Taborder: 0
             Transformation: 'Elements'
           ]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def"
index 592611f..157b7ab 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def"
@@ -5,7 +5,7 @@
   BaseType: 'WebPanel'
   Children:
   [
-    #child: pProductAttributeFilter189
+    #child: pProductAttributeFilter
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower243.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower.def
similarity index 69%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower243.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower.def
index 4c8ef19..9ce5dd6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower243.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pPower243
+Component pPower
 {
-  #keys: '[414996.1.211222170]'
+  #keys: '[414996.1.215964111]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component dhPowers404
+    Component dhPowers
     {
-      #keys: '[414996.1.211222171]'
+      #keys: '[414996.1.215964112]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -15,23 +15,23 @@
         Taborder: 1
       ]
     }
-    #child: ListPowers199
-    Component dhCheckPowers354
+    #child: ListPowers
+    Component dhCheckPowers
     {
-      #keys: '[414996.1.211222177]'
+      #keys: '[414996.1.215964118]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
-        Component deCheckPowers981
+        Component deCheckPowers
         {
-          #keys: '[414996.1.211222178]'
+          #keys: '[414996.1.215964119]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
             DataType: 'structured[LocalValue]'
             FixedFilter: 'object.IsCheck()'
-            Source: 'dhPowers404'
+            Source: 'dhPowers'
             Taborder: 0
             Transformation: 'Elements'
           ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter.def
new file mode 100644
index 0000000..f59acbc
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+Component pProductAttributeFilter
+{
+  #keys: '[414996.1.215964101]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pGeneration
+    #child: pPower
+    #child: pMQBMLB
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter189.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter189.def
deleted file mode 100644
index 21aa3d2..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter189.def
+++ /dev/null
@@ -1,17 +0,0 @@
-Quintiq file version 2.0
-Component pProductAttributeFilter189
-{
-  #keys: '[414996.1.211222160]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: pMQBMLB154
-    #child: pPower243
-    #child: pGeneration208
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations366_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations366_OnClick.def
deleted file mode 100644
index 092ea75..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations366_OnClick.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: ListGenerations366
-Response OnClick (
-  LocalValue selection
-) id:Response_ListGenerations366_OnClick
-{
-  #keys: '[414996.1.211222095]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebList_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      selection.IsCheck( not selection.IsCheck() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations_OnClick.def
similarity index 73%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations_OnClick.def
index f3b51c6..5cbc4d9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB700
+#parent: ListGenerations
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB700_OnClick
+) id:Response_ListGenerations_OnClick
 {
-  #keys: '[414996.1.211222103]'
+  #keys: '[414996.1.215964087]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_OnClick.def
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_OnClick.def
index f3b51c6..a5c49f1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB700
+#parent: ListMQBMLB
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB700_OnClick
+) id:Response_ListMQBMLB_OnClick
 {
-  #keys: '[414996.1.211222103]'
+  #keys: '[414996.1.215964095]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers199_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers199_OnClick.def
deleted file mode 100644
index d999ea9..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers199_OnClick.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: ListPowers199
-Response OnClick (
-  LocalValue selection
-) id:Response_ListPowers199_OnClick
-{
-  #keys: '[414996.1.211222099]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebList_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      selection.IsCheck( not selection.IsCheck() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers_OnClick.def
similarity index 74%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers_OnClick.def
index f3b51c6..b9162e7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB700
+#parent: ListPowers
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB700_OnClick
+) id:Response_ListPowers_OnClick
 {
-  #keys: '[414996.1.211222103]'
+  #keys: '[414996.1.215964091]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhCheckGenerations744_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
similarity index 80%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhCheckGenerations744_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
index cb7087c..8ce3e48 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhCheckGenerations744_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pGeneration208/dhCheckGenerations744
-Response OnDataChanged () id:Response_pGeneration208_dhCheckGenerations744_OnDataChanged
+#parent: pGeneration/dhCheckGenerations
+Response OnDataChanged () id:Response_pGeneration_dhCheckGenerations_OnDataChanged
 {
-  #keys: '[414996.1.211222094]'
+  #keys: '[414996.1.215964086]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhGenerations423_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhGenerations_OnCreated.def
similarity index 67%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhGenerations423_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhGenerations_OnCreated.def
index 75ffbd9..cc210e7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhGenerations423_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhGenerations_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pGeneration208/dhGenerations423
-Response OnCreated () id:Response_pGeneration208_dhGenerations423_OnCreated
+#parent: pGeneration/dhGenerations
+Response OnCreated () id:Response_pGeneration_dhGenerations_OnCreated
 {
-  #keys: '[414996.1.211222097]'
+  #keys: '[414996.1.215964089]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhCheckMQBMLB319_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
similarity index 81%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhCheckMQBMLB319_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
index 2199fdb..9c4f78f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhCheckMQBMLB319_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pMQBMLB154/dhCheckMQBMLB319
-Response OnDataChanged () id:Response_pMQBMLB154_dhCheckMQBMLB319_OnDataChanged
+#parent: pMQBMLB/dhCheckMQBMLB
+Response OnDataChanged () id:Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged
 {
-  #keys: '[414996.1.211222102]'
+  #keys: '[414996.1.215964094]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhMQBMLB972_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
similarity index 70%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhMQBMLB972_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
index de14fb0..7ae7845 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhMQBMLB972_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pMQBMLB154/dhMQBMLB972
-Response OnCreated () id:Response_pMQBMLB154_dhMQBMLB972_OnCreated
+#parent: pMQBMLB/dhMQBMLB
+Response OnCreated () id:Response_pMQBMLB_dhMQBMLB_OnCreated
 {
-  #keys: '[414996.1.211222105]'
+  #keys: '[414996.1.215964097]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhCheckPowers354_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
similarity index 81%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhCheckPowers354_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
index b50ec38..9de6605 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhCheckPowers354_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pPower243/dhCheckPowers354
-Response OnDataChanged () id:Response_pPower243_dhCheckPowers354_OnDataChanged
+#parent: pPower/dhCheckPowers
+Response OnDataChanged () id:Response_pPower_dhCheckPowers_OnDataChanged
 {
-  #keys: '[414996.1.211222098]'
+  #keys: '[414996.1.215964090]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhPowers404_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhPowers_OnCreated.def
similarity index 70%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhPowers404_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhPowers_OnCreated.def
index 666ed84..2228ec8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhPowers404_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhPowers_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pPower243/dhPowers404
-Response OnCreated () id:Response_pPower243_dhPowers404_OnCreated
+#parent: pPower/dhPowers
+Response OnCreated () id:Response_pPower_dhPowers_OnCreated
 {
-  #keys: '[414996.1.211222101]'
+  #keys: '[414996.1.215964093]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/_ROOT_Project_MacroPlannerWebApp.qp b/_Main/UI/MacroPlannerWebApp/_ROOT_Project_MacroPlannerWebApp.qp
index 323d5c8..cde9965 100644
--- a/_Main/UI/MacroPlannerWebApp/_ROOT_Project_MacroPlannerWebApp.qp
+++ b/_Main/UI/MacroPlannerWebApp/_ROOT_Project_MacroPlannerWebApp.qp
@@ -5,7 +5,7 @@
   ProjectProperties
   {
     ApplicationComponentName: 'ApplicationMacroPlanner'
-    BuildVersion: '2022.3.0.48'
+    BuildVersion: '2022.3.0.74'
     Description: 'Quintiq Macro Planner'
     ProjectKind: 'WebClient'
   }

--
Gitblit v1.9.3