From 758fc181b53ce176600cf53586f753d73a827a92 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 11 十一月 2024 18:33:20 +0800
Subject: [PATCH] 调整全年计划报表的页面布局

---
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pRibbon.def                                           |   16 +
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_bCreateBaseData_OnClick#480.def              |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations#529.def                               |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers#568.def                                    |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelProduct_OnCreated.def       |   16 +
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhComparisonData_OnDataChanged.def |   16 +
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pRibbonUp.def                                         |   60 +++++
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_393_dhMQBMLB_OnCreated.def                     |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainPanel.def                                        |   16 +
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMQBMLB#393.def                                       |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_480_dhPowers_OnCreated.def                      |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dsStartDate_OnChanged#648.def              |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu319#1.def                              |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pProductAttributeFilter#791.def                       |   17 +
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor.def                                      |   20 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB#925.def                                    |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dhAsyncFlag_OnDataChanged.def              |   12 +
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_480_dhCheckPowers_OnDataChanged.def             |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_rbgTimeUnit_OnUserChanged#836.def            |   16 +
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dhStartDate_OnCreated#368.def              |   16 +
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_dhTimeUnit_OnCreated#338.def                 |   16 +
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_812_dhCheckGenerations_OnDataChanged.def   |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan#439.def                               |   24 +-
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pRibbonDown.def                                       |   94 +++++++
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedEntitys_OnDataChanged.def |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_bExport_OnClick.def                        |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage245#1.def                            |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_dhXMLDataListener_OnDataChanged.def        |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison.def           |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainRight.def                                        |   15 +
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu623#1.def                              |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport#870.def                                       |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListPowers_568_OnClick.def                             |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelEntitys_OnCreated.def       |   16 +
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_bCreateFullTable_OnClick#393.def             |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_393_dhCheckMQBMLB_OnDataChanged.def            |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage963#1.def                            |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison.def         |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration#812.def                                   |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_812_dhGenerations_OnCreated.def            |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListMQBMLB_925_OnClick.def                             |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedProduct_OnDataChanged.def |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dsEndDate_OnChanged#957.def                |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainLeft.def                                         |   16 +
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/_ROOT_Component_FormAnnualPlanReport.def                        |    4 
 /dev/null                                                                                                                  |   16 -
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu687#1.def                              |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pPower#480.def                                        |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListGenerations_529_OnClick.def                        |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage519#1.def                            |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dhEndDate_OnCreated#141.def                |   16 +
 51 files changed, 554 insertions(+), 134 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def"
similarity index 81%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def"
index ba6ddfc..a374678 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component ListGenerations
+Component ListGenerations id:ListGenerations_529
 {
-  #keys: '[414996.1.190631965]'
+  #keys: '[414996.1.209190762]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor989
     {
-      #keys: '[414996.1.190631966]'
+      #keys: '[414996.1.209190763]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -17,14 +17,14 @@
         Transformation: 'Elements'
       ]
     }
-    #child: listActionBarPage963
+    #child: listActionBarPage963_1
     Component DataSetLevel191
     {
-      #keys: '[414996.1.190631971]'
+      #keys: '[414996.1.209190765]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
-        #child: listContextMenu687
+        #child: listContextMenu687_1
       ]
       Properties:
       [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043327.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043925.def"
similarity index 81%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043327.def"
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043925.def"
index 5fe67bb..256ab51 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043327.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043925.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component ListMQBMLB
+Component ListMQBMLB id:ListMQBMLB_925
 {
-  #keys: '[414996.1.190632131]'
+  #keys: '[414996.1.209190780]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor472
     {
-      #keys: '[414996.1.190632132]'
+      #keys: '[414996.1.209190781]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -17,14 +17,14 @@
         Transformation: 'Elements'
       ]
     }
-    #child: listActionBarPage519
+    #child: listActionBarPage519_1
     Component DataSetLevel527
     {
-      #keys: '[414996.1.190632137]'
+      #keys: '[414996.1.209190783]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
-        #child: listContextMenu319
+        #child: listContextMenu319_1
       ]
       Properties:
       [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers\043568.def"
similarity index 81%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers\043568.def"
index 14ac6b9..b66b7af 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers\043568.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component ListPowers
+Component ListPowers id:ListPowers_568
 {
-  #keys: '[414996.1.190632049]'
+  #keys: '[414996.1.209190771]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor671
     {
-      #keys: '[414996.1.190632050]'
+      #keys: '[414996.1.209190772]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -17,14 +17,14 @@
         Transformation: 'Elements'
       ]
     }
-    #child: listActionBarPage245
+    #child: listActionBarPage245_1
     Component DataSetLevel995
     {
-      #keys: '[414996.1.190632055]'
+      #keys: '[414996.1.209190774]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
-        #child: listContextMenu623
+        #child: listContextMenu623_1
       ]
       Properties:
       [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor\043127.def" b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor.def
similarity index 85%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor\043127.def"
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor.def
index e9ed340..d1df979 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor\043127.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor.def
@@ -1,19 +1,19 @@
 Quintiq file version 2.0
-Component MatrixEditor id:MatrixEditor_127
+Component MatrixEditor
 {
-  #keys: '[412672.1.106503696]'
+  #keys: '[414996.1.209190963]'
   BaseType: 'WebMatrixEditor'
   Children:
   [
     Component MatrixEditorCell
     {
-      #keys: '[412672.1.106503697]'
+      #keys: '[414996.1.209190964]'
       BaseType: 'WebMatrixEditorCell'
       Children:
       [
         Component DataExtractorCells
         {
-          #keys: '[412672.1.106503698]'
+          #keys: '[414996.1.209190965]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -34,13 +34,13 @@
     }
     Component MatrixEditorRows
     {
-      #keys: '[412672.1.106503699]'
+      #keys: '[414996.1.209190966]'
       BaseType: 'WebMatrixEditorHeaderLevel'
       Children:
       [
         Component DataExtractorRows
         {
-          #keys: '[412672.1.106503700]'
+          #keys: '[414996.1.209190967]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -62,13 +62,13 @@
     }
     Component MatrixEditorColumns
     {
-      #keys: '[412672.1.106503701]'
+      #keys: '[414996.1.209190968]'
       BaseType: 'WebMatrixEditorHeaderLevel'
       Children:
       [
         Component DataExtractorColumns
         {
-          #keys: '[412672.1.106503702]'
+          #keys: '[414996.1.209190969]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -88,8 +88,8 @@
         Taborder: 2
       ]
     }
-    #child: matrixEditorActionBarPageDemandComparison_1
-    #child: matrixeditorContextMenuDemandComparison_1
+    #child: matrixEditorActionBarPageDemandComparison
+    #child: matrixeditorContextMenuDemandComparison
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan\043439.def"
similarity index 82%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan\043439.def"
index 4a3105d..3eca22c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan\043439.def"
@@ -1,20 +1,20 @@
 Quintiq file version 2.0
-Component PanelAnnualPlan
+Component PanelAnnualPlan id:PanelAnnualPlan_439
 {
-  #keys: '[412672.1.106503682]'
+  #keys: '[414996.1.209190957]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhCheckedProduct
     {
-      #keys: '[412672.1.106503684]'
+      #keys: '[414996.1.209190958]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Product_MP]*'
       Children:
       [
         Component deCheckedProduct
         {
-          #keys: '[412672.1.106503685]'
+          #keys: '[414996.1.209190959]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -32,7 +32,7 @@
     }
     Component dhFinelProduct
     {
-      #keys: '[412672.1.106503686]'
+      #keys: '[414996.1.209190960]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Product_MP]*'
       Properties:
@@ -42,14 +42,14 @@
     }
     Component dhComparisonData
     {
-      #keys: '[412672.1.106503705]'
+      #keys: '[414996.1.209190961]'
       BaseType: 'WebDataHolder'
       Databinding: 'LocalTable'
       Children:
       [
         Component deComparisonData
         {
-          #keys: '[414996.1.207643367]'
+          #keys: '[414996.1.209190962]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -66,17 +66,17 @@
         Taborder: 1
       ]
     }
-    #child: MatrixEditor_127
+    #child: MatrixEditor
     Component dhCheckedEntitys
     {
-      #keys: '[412672.1.107978890]'
+      #keys: '[414996.1.209190972]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Entity]*'
       Children:
       [
         Component deCheckedEntitys
         {
-          #keys: '[412672.1.107978891]'
+          #keys: '[414996.1.209190973]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -94,7 +94,7 @@
     }
     Component dhFinelEntitys
     {
-      #keys: '[412672.1.107978915]'
+      #keys: '[414996.1.209190974]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Entity]*'
       Properties:
@@ -105,6 +105,6 @@
   ]
   Properties:
   [
-    Taborder: 2
+    Taborder: 1
   ]
 }
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelRibbon322\043613.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelRibbon322\043613.def"
deleted file mode 100644
index af92e33..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelRibbon322\043613.def"
+++ /dev/null
@@ -1,138 +0,0 @@
-Quintiq file version 2.0
-Component PanelRibbon322 id:PanelRibbon322_613
-{
-  #keys: '[414996.1.207566016]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    Component dsStartDate
-    {
-      #keys: '[414996.1.207566017]'
-      BaseType: 'WebDateSelector'
-      Properties:
-      [
-        Label: 'Start Date'
-        Taborder: 4
-      ]
-    }
-    Component dhStartDate
-    {
-      #keys: '[414996.1.207566018]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'Date*'
-      Properties:
-      [
-        Taborder: 5
-      ]
-    }
-    Component dsEndDate
-    {
-      #keys: '[414996.1.207566019]'
-      BaseType: 'WebDateSelector'
-      Properties:
-      [
-        Date: 9999-12-31
-        Label: 'End Date'
-        Taborder: 6
-      ]
-    }
-    Component dhEndDate
-    {
-      #keys: '[414996.1.207566020]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'Date*'
-      Properties:
-      [
-        Taborder: 7
-      ]
-    }
-    Component ButtonRibbon
-    {
-      #keys: '[414996.1.207566021]'
-      BaseType: 'WebButton'
-      Properties:
-      [
-        Image: 'C_CLAMP'
-        Label: 'Create base data'
-        Taborder: 0
-      ]
-    }
-    Component ButtonRibbon682
-    {
-      #keys: '[414996.1.207566022]'
-      BaseType: 'WebButton'
-      Properties:
-      [
-        Image: 'C_CLAMP'
-        Label: 'Create full table'
-        Taborder: 1
-      ]
-    }
-    Component rbgTimeUnit
-    {
-      #keys: '[414996.1.207566023]'
-      BaseType: 'WebRadioButtonGroup'
-      Properties:
-      [
-        BoundValue: 'Day'
-        ButtonLabels: 'Day;Week;Month'
-        ButtonValues: 'Day;Week;Month'
-        Taborder: 2
-      ]
-    }
-    Component dhTimeUnit
-    {
-      #keys: '[414996.1.207566024]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'String*'
-      Properties:
-      [
-        Taborder: 3
-      ]
-    }
-    #child: pExport_437
-    Component dhAsyncFlag
-    {
-      #keys: '[414996.1.207566029]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'AsyncFlag'
-      Children:
-      [
-        Component deAsyncFlag
-        {
-          #keys: '[414996.1.207566030]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'RecycleBin'
-            FixedFilter: 'object.Name() = MP_Cell_AnnualPlanReport::GetTableName()'
-            Source: 'RecycleBin'
-            Taborder: 0
-            Transformation: 'AsyncFlag'
-          ]
-        }
-      ]
-      Properties:
-      [
-        Taborder: 9
-      ]
-    }
-    Component lAsyncFlag
-    {
-      #keys: '[414996.1.207566031]'
-      BaseType: 'WebLabel'
-      Properties:
-      [
-        DataBinding: 'dhAsyncFlag.Data.State'
-        Taborder: 10
-        Text: '杩愯鐘舵��'
-      ]
-    }
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Orientation: 'horizontal'
-    Taborder: 1
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage245\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage245\0431.def"
new file mode 100644
index 0000000..217d1e5
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage245\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage245 id:listActionBarPage245_1
+{
+  #keys: '[414996.1.209190773]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage245.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage245.def
deleted file mode 100644
index 28dec89..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage245.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage245
-{
-  #keys: '[414996.1.190632052]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage519\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage519\0431.def"
new file mode 100644
index 0000000..56e16d1
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage519\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage519 id:listActionBarPage519_1
+{
+  #keys: '[414996.1.209190782]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage519.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage519.def
deleted file mode 100644
index 8d2ef65..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage519.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage519
-{
-  #keys: '[414996.1.190632134]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage963\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage963\0431.def"
new file mode 100644
index 0000000..168986b
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage963\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage963 id:listActionBarPage963_1
+{
+  #keys: '[414996.1.209190764]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage963.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage963.def
deleted file mode 100644
index 66c60f4..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listActionBarPage963.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage963
-{
-  #keys: '[414996.1.190631968]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu319\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu319\0431.def"
new file mode 100644
index 0000000..9805f2a
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu319\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu319 id:listContextMenu319_1
+{
+  #keys: '[414996.1.209190784]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu319.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu319.def
deleted file mode 100644
index b216ce8..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu319.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu319
-{
-  #keys: '[414996.1.190632139]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu623\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu623\0431.def"
new file mode 100644
index 0000000..43547f0
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu623\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu623 id:listContextMenu623_1
+{
+  #keys: '[414996.1.209190775]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu623.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu623.def
deleted file mode 100644
index f50e560..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu623.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu623
-{
-  #keys: '[414996.1.190632057]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu687\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu687\0431.def"
new file mode 100644
index 0000000..6cc0dbe
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu687\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu687 id:listContextMenu687_1
+{
+  #keys: '[414996.1.209190766]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu687.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu687.def
deleted file mode 100644
index 0ef8113..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_listContextMenu687.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu687
-{
-  #keys: '[414996.1.190631973]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison\0431.def"
deleted file mode 100644
index 47ffbbf..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component matrixEditorActionBarPageDemandComparison id:matrixEditorActionBarPageDemandComparison_1
-{
-  #keys: '[412672.1.106503703]'
-  BaseType: 'matrixEditorActionBarPage'
-  Properties:
-  [
-    Taborder: 3
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison.def
new file mode 100644
index 0000000..0bb31c5
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component matrixEditorActionBarPageDemandComparison
+{
+  #keys: '[414996.1.209190970]'
+  BaseType: 'matrixEditorActionBarPage'
+  Properties:
+  [
+    Taborder: 3
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison\0431.def"
deleted file mode 100644
index 42d8a01..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component matrixeditorContextMenuDemandComparison id:matrixeditorContextMenuDemandComparison_1
-{
-  #keys: '[412672.1.106503704]'
-  BaseType: 'matrixeditorContextMenu'
-  Properties:
-  [
-    Taborder: 4
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison.def
new file mode 100644
index 0000000..7c0c4b4
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component matrixeditorContextMenuDemandComparison
+{
+  #keys: '[414996.1.209190971]'
+  BaseType: 'matrixeditorContextMenu'
+  Properties:
+  [
+    Taborder: 4
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport\043437.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport\043870.def"
similarity index 80%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport\043437.def"
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport\043870.def"
index 6d87796..ef6c31f 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport\043437.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport\043870.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pExport id:pExport_437
+Component pExport id:pExport_870
 {
-  #keys: '[414996.1.207566025]'
+  #keys: '[414996.1.210703208]'
   BaseType: 'WebPanel'
   Children:
   [
     Component bExport
     {
-      #keys: '[414996.1.207566026]'
+      #keys: '[414996.1.210703209]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -17,14 +17,14 @@
     }
     Component dhXMLDataListener
     {
-      #keys: '[414996.1.207566027]'
+      #keys: '[414996.1.210703210]'
       BaseType: 'WebDataHolder'
       Databinding: 'ExportXMLManager'
       Children:
       [
         Component DataExtractorRibbon
         {
-          #keys: '[414996.1.207566028]'
+          #keys: '[414996.1.210703211]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -45,6 +45,6 @@
   Properties:
   [
     FixedSize: true
-    Taborder: 8
+    Taborder: 4
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def"
similarity index 79%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def"
index c440177..7417951 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pGeneration
+Component pGeneration id:pGeneration_812
 {
-  #keys: '[414996.1.190631800]'
+  #keys: '[414996.1.209190760]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhGenerations
     {
-      #keys: '[414996.1.190632215]'
+      #keys: '[414996.1.209190761]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -15,17 +15,17 @@
         Taborder: 1
       ]
     }
-    #child: ListGenerations
+    #child: ListGenerations_529
     Component dhCheckGenerations
     {
-      #keys: '[414996.1.192863350]'
+      #keys: '[414996.1.209190767]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckGenerations
         {
-          #keys: '[414996.1.192863372]'
+          #keys: '[414996.1.209190768]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMQBMLB.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMQBMLB\043393.def"
similarity index 80%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMQBMLB.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMQBMLB\043393.def"
index 472b766..436c6f7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMQBMLB.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMQBMLB\043393.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pMQBMLB
+Component pMQBMLB id:pMQBMLB_393
 {
-  #keys: '[414996.1.190631824]'
+  #keys: '[414996.1.209190778]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhMQBMLB
     {
-      #keys: '[414996.1.190632452]'
+      #keys: '[414996.1.209190779]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -15,17 +15,17 @@
         Taborder: 1
       ]
     }
-    #child: ListMQBMLB
+    #child: ListMQBMLB_925
     Component dhCheckMQBMLB
     {
-      #keys: '[414996.1.192863416]'
+      #keys: '[414996.1.209190785]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckMQBMLB
         {
-          #keys: '[414996.1.192863417]'
+          #keys: '[414996.1.209190786]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainLeft.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainLeft.def
new file mode 100644
index 0000000..e8ae5a2
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainLeft.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pMainLeft
+{
+  #keys: '[414996.1.210702882]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pProductAttributeFilter_791
+  ]
+  Properties:
+  [
+    FixedSize: true
+    MinimumColumns: 40
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainPanel.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainPanel.def
new file mode 100644
index 0000000..6f38758
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainPanel.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pMainPanel
+{
+  #keys: '[414996.1.210624396]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pMainRight
+    #child: pMainLeft
+  ]
+  Properties:
+  [
+    Orientation: 'horizontal'
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainRight.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainRight.def
new file mode 100644
index 0000000..e271a45
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainRight.def
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+Component pMainRight
+{
+  #keys: '[414996.1.209190620]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pRibbon
+    #child: PanelAnnualPlan_439
+  ]
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pPower.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pPower\043480.def"
similarity index 80%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pPower.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pPower\043480.def"
index f6fdc01..bc748bb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pPower.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pPower\043480.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pPower
+Component pPower id:pPower_480
 {
-  #keys: '[414996.1.190631812]'
+  #keys: '[414996.1.209190769]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhPowers
     {
-      #keys: '[414996.1.190632336]'
+      #keys: '[414996.1.209190770]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -15,17 +15,17 @@
         Taborder: 1
       ]
     }
-    #child: ListPowers
+    #child: ListPowers_568
     Component dhCheckPowers
     {
-      #keys: '[414996.1.192863404]'
+      #keys: '[414996.1.209190776]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckPowers
         {
-          #keys: '[414996.1.192863405]'
+          #keys: '[414996.1.209190777]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pProductAttributeFilter\043791.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pProductAttributeFilter\043791.def"
new file mode 100644
index 0000000..cac6d85
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pProductAttributeFilter\043791.def"
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+Component pProductAttributeFilter id:pProductAttributeFilter_791
+{
+  #keys: '[414996.1.209190759]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pMQBMLB_393
+    #child: pPower_480
+    #child: pGeneration_812
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pProductAttributeFilter.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pProductAttributeFilter.def
deleted file mode 100644
index 2bd43ef..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pProductAttributeFilter.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-Component pProductAttributeFilter
-{
-  #keys: '[414996.1.190631744]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: pGeneration
-    #child: pPower
-    #child: pMQBMLB
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Orientation: 'horizontal'
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pRibbon.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pRibbon.def
new file mode 100644
index 0000000..97d1692
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pRibbon.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pRibbon
+{
+  #keys: '[414996.1.209190876]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pRibbonDown
+    #child: pRibbonUp
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pRibbonDown.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pRibbonDown.def
new file mode 100644
index 0000000..ce256c1
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pRibbonDown.def
@@ -0,0 +1,94 @@
+Quintiq file version 2.0
+Component pRibbonDown
+{
+  #keys: '[414996.1.210702896]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component dsStartDate id:dsStartDate_88
+    {
+      #keys: '[414996.1.210703089]'
+      BaseType: 'WebDateSelector'
+      Properties:
+      [
+        Label: 'Start Date'
+        Taborder: 0
+      ]
+    }
+    Component dhStartDate id:dhStartDate_21
+    {
+      #keys: '[414996.1.210703119]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'Date*'
+      Properties:
+      [
+        Taborder: 1
+      ]
+    }
+    Component dsEndDate id:dsEndDate_832
+    {
+      #keys: '[414996.1.210703145]'
+      BaseType: 'WebDateSelector'
+      Properties:
+      [
+        Date: 9999-12-31
+        Label: 'End Date'
+        Taborder: 2
+      ]
+    }
+    Component dhEndDate id:dhEndDate_778
+    {
+      #keys: '[414996.1.210703175]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'Date*'
+      Properties:
+      [
+        Taborder: 3
+      ]
+    }
+    #child: pExport_870
+    Component lAsyncFlag
+    {
+      #keys: '[414996.1.209192380]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        DataBinding: 'dhAsyncFlag.Data.State'
+        Label: '杩愯鐘舵��:'
+        Taborder: 5
+      ]
+    }
+    Component dhAsyncFlag id:dhAsyncFlag_5
+    {
+      #keys: '[414996.1.209192410]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'AsyncFlag'
+      Children:
+      [
+        Component deAsyncFlag id:deAsyncFlag_147
+        {
+          #keys: '[414996.1.209192411]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'RecycleBin'
+            FixedFilter: 'object.Name() = MP_Cell_AnnualPlanReport::GetTableName()'
+            Source: 'RecycleBin'
+            Taborder: 0
+            Transformation: 'AsyncFlag'
+          ]
+        }
+      ]
+      Properties:
+      [
+        Taborder: 6
+      ]
+    }
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Orientation: 'horizontal'
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pRibbonUp.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pRibbonUp.def
new file mode 100644
index 0000000..5790a5c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pRibbonUp.def
@@ -0,0 +1,60 @@
+Quintiq file version 2.0
+Component pRibbonUp
+{
+  #keys: '[414996.1.210863284]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component bCreateBaseData id:bCreateBaseData_529
+    {
+      #keys: '[414996.1.210702981]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Image: 'C_CLAMP'
+        Label: 'Create base data'
+        Taborder: 0
+      ]
+    }
+    Component bCreateFullTable id:bCreateFullTable_568
+    {
+      #keys: '[414996.1.210703007]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Image: 'C_CLAMP'
+        Label: 'Create full table'
+        Taborder: 1
+      ]
+    }
+    Component rbgTimeUnit id:rbgTimeUnit_925
+    {
+      #keys: '[414996.1.210703033]'
+      BaseType: 'WebRadioButtonGroup'
+      Properties:
+      [
+        BoundValue: 'Day'
+        ButtonLabels: 'Day;Week;Month'
+        ButtonValues: 'Day;Week;Month'
+        Orientation: 'horizontal'
+        Taborder: 2
+      ]
+    }
+    Component dhTimeUnit id:dhTimeUnit_71
+    {
+      #keys: '[414996.1.210703063]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'String*'
+      Properties:
+      [
+        Taborder: 3
+      ]
+    }
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Orientation: 'horizontal'
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListGenerations_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListGenerations_529_OnClick.def
similarity index 71%
copy from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListGenerations_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListGenerations_529_OnClick.def
index b6af33b..f41cfaf 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListGenerations_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListGenerations_529_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListGenerations
+#parent: ListGenerations_529
 Response OnClick (
   LocalValue selection
-) id:Response_ListGenerations_OnClick
+) id:Response_ListGenerations_529_OnClick
 {
-  #keys: '[414996.1.195221920]'
+  #keys: '[414996.1.209190753]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListGenerations_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListMQBMLB_925_OnClick.def
similarity index 73%
copy from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListGenerations_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListMQBMLB_925_OnClick.def
index b6af33b..c46c224 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListGenerations_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListMQBMLB_925_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListGenerations
+#parent: ListMQBMLB_925
 Response OnClick (
   LocalValue selection
-) id:Response_ListGenerations_OnClick
+) id:Response_ListMQBMLB_925_OnClick
 {
-  #keys: '[414996.1.195221920]'
+  #keys: '[414996.1.209190745]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListMQBMLB_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListMQBMLB_OnClick.def
deleted file mode 100644
index 2f48a9f..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListMQBMLB_OnClick.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: ListMQBMLB
-Response OnClick (
-  LocalValue selection
-) id:Response_ListMQBMLB_OnClick
-{
-  #keys: '[414996.1.197722619]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebList_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      selection.IsCheck( not selection.IsCheck() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListGenerations_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListPowers_568_OnClick.def
similarity index 73%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListGenerations_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListPowers_568_OnClick.def
index b6af33b..6bb35b7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListGenerations_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListPowers_568_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListGenerations
+#parent: ListPowers_568
 Response OnClick (
   LocalValue selection
-) id:Response_ListGenerations_OnClick
+) id:Response_ListPowers_568_OnClick
 {
-  #keys: '[414996.1.195221920]'
+  #keys: '[414996.1.209190749]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListPowers_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListPowers_OnClick.def
deleted file mode 100644
index 9c14fe0..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_ListPowers_OnClick.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: ListPowers
-Response OnClick (
-  LocalValue selection
-) id:Response_ListPowers_OnClick
-{
-  #keys: '[414996.1.197722607]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebList_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      selection.IsCheck( not selection.IsCheck() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhCheckedEntitys_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedEntitys_OnDataChanged.def
similarity index 68%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhCheckedEntitys_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedEntitys_OnDataChanged.def
index 60c93f3..149586c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhCheckedEntitys_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedEntitys_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelAnnualPlan/dhCheckedEntitys
-Response OnDataChanged () id:Response_PanelAnnualPlan_dhCheckedEntitys_OnDataChanged
+#parent: PanelAnnualPlan_439/dhCheckedEntitys
+Response OnDataChanged () id:Response_PanelAnnualPlan_439_dhCheckedEntitys_OnDataChanged
 {
-  #keys: '[412672.1.107978888]'
+  #keys: '[414996.1.209190951]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhCheckedProduct_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedProduct_OnDataChanged.def
similarity index 68%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhCheckedProduct_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedProduct_OnDataChanged.def
index 0391492..06a8fb6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhCheckedProduct_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedProduct_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelAnnualPlan/dhCheckedProduct
-Response OnDataChanged () id:Response_PanelAnnualPlan_dhCheckedProduct_OnDataChanged
+#parent: PanelAnnualPlan_439/dhCheckedProduct
+Response OnDataChanged () id:Response_PanelAnnualPlan_439_dhCheckedProduct_OnDataChanged
 {
-  #keys: '[412672.1.106503680]'
+  #keys: '[414996.1.209190956]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhComparisonData_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhComparisonData_OnDataChanged.def
new file mode 100644
index 0000000..fa698b0
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhComparisonData_OnDataChanged.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: PanelAnnualPlan_439/dhComparisonData
+Response OnDataChanged () id:Response_PanelAnnualPlan_439_dhComparisonData_OnDataChanged
+{
+  #keys: '[414996.1.209190954]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      PanelAnnualPlan.Title( this.Data().Name() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelEntitys_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelEntitys_OnCreated.def
new file mode 100644
index 0000000..a87ceab
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelEntitys_OnCreated.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: PanelAnnualPlan_439/dhFinelEntitys
+Response OnCreated () id:Response_PanelAnnualPlan_439_dhFinelEntitys_OnCreated
+{
+  #keys: '[414996.1.209190950]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      this.Data( DataHolderEntities.Data().Copy() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelProduct_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelProduct_OnCreated.def
new file mode 100644
index 0000000..93d8df5
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelProduct_OnCreated.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: PanelAnnualPlan_439/dhFinelProduct
+Response OnCreated () id:Response_PanelAnnualPlan_439_dhFinelProduct_OnCreated
+{
+  #keys: '[414996.1.209190955]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      this.Data( DataHolderProduct.Data().Copy() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhComparisonData_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhComparisonData_OnDataChanged.def
deleted file mode 100644
index 57635ff..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhComparisonData_OnDataChanged.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelAnnualPlan/dhComparisonData
-Response OnDataChanged () id:Response_PanelAnnualPlan_dhComparisonData_OnDataChanged
-{
-  #keys: '[412672.1.106503673]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      PanelAnnualPlan.Title( this.Data().Name() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhFinelEntitys_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhFinelEntitys_OnCreated.def
deleted file mode 100644
index f7f65cc..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhFinelEntitys_OnCreated.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelAnnualPlan/dhFinelEntitys
-Response OnCreated () id:Response_PanelAnnualPlan_dhFinelEntitys_OnCreated
-{
-  #keys: '[412672.1.107978913]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      this.Data( DataHolderEntities.Data().Copy() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhFinelProduct_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhFinelProduct_OnCreated.def
deleted file mode 100644
index 864b3b0..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhFinelProduct_OnCreated.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelAnnualPlan/dhFinelProduct
-Response OnCreated () id:Response_PanelAnnualPlan_dhFinelProduct_OnCreated
-{
-  #keys: '[412672.1.106503679]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      this.Data( DataHolderProduct.Data().Copy() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dhAsyncFlag_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dhAsyncFlag_OnDataChanged.def
deleted file mode 100644
index baa3fde..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dhAsyncFlag_OnDataChanged.def
+++ /dev/null
@@ -1,12 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelRibbon322_613/dhAsyncFlag
-Response OnDataChanged () id:Response_PanelRibbon322_613_dhAsyncFlag_OnDataChanged
-{
-  #keys: '[414996.1.207566004]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dhEndDate_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dhEndDate_OnCreated.def
deleted file mode 100644
index fb4eb35..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dhEndDate_OnCreated.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelRibbon322_613/dhEndDate
-Response OnCreated () id:Response_PanelRibbon322_613_dhEndDate_OnCreated
-{
-  #keys: '[414996.1.207566010]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      this.Data( Date::MaxDate() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dhStartDate_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dhStartDate_OnCreated.def
deleted file mode 100644
index 7f2ac44..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dhStartDate_OnCreated.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelRibbon322_613/dhStartDate
-Response OnCreated () id:Response_PanelRibbon322_613_dhStartDate_OnCreated
-{
-  #keys: '[414996.1.207566012]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      this.Data( Date::MinDate() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dhTimeUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dhTimeUnit_OnCreated.def
deleted file mode 100644
index e115a3e..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dhTimeUnit_OnCreated.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelRibbon322_613/dhTimeUnit
-Response OnCreated () id:Response_PanelRibbon322_613_dhTimeUnit_OnCreated
-{
-  #keys: '[414996.1.207566006]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      this.Data( "Day" );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_rbgTimeUnit_OnUserChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_rbgTimeUnit_OnUserChanged.def
deleted file mode 100644
index cbc720e..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_rbgTimeUnit_OnUserChanged.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelRibbon322_613/rbgTimeUnit
-Response OnUserChanged () id:Response_PanelRibbon322_613_rbgTimeUnit_OnUserChanged
-{
-  #keys: '[414996.1.207566007]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebRadioButtonGroup_OnUserChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      dhTimeUnit.Data( this.BoundValue() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_437_bExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_bExport_OnClick.def
similarity index 85%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_437_bExport_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_bExport_OnClick.def
index a9313e1..65294af 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_437_bExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_bExport_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pExport_437/bExport
-Response OnClick () id:Response_pExport_437_bExport_OnClick
+#parent: pExport_870/bExport
+Response OnClick () id:Response_pExport_870_bExport_OnClick
 {
-  #keys: '[414996.1.207566015]'
+  #keys: '[414996.1.210703207]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_437_dhXMLDataListener_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_dhXMLDataListener_OnDataChanged.def
similarity index 79%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_437_dhXMLDataListener_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_dhXMLDataListener_OnDataChanged.def
index 18b7a85..5c4cedc 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_437_dhXMLDataListener_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_dhXMLDataListener_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pExport_437/dhXMLDataListener
-Response OnDataChanged () id:Response_pExport_437_dhXMLDataListener_OnDataChanged
+#parent: pExport_870/dhXMLDataListener
+Response OnDataChanged () id:Response_pExport_870_dhXMLDataListener_OnDataChanged
 {
-  #keys: '[414996.1.207566014]'
+  #keys: '[414996.1.210703206]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_dhCheckGenerations_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_812_dhCheckGenerations_OnDataChanged.def
similarity index 80%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_812_dhCheckGenerations_OnDataChanged.def
index 7ec5ac4..d29110f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_812_dhCheckGenerations_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pGeneration/dhCheckGenerations
-Response OnDataChanged () id:Response_pGeneration_dhCheckGenerations_OnDataChanged
+#parent: pGeneration_812/dhCheckGenerations
+Response OnDataChanged () id:Response_pGeneration_812_dhCheckGenerations_OnDataChanged
 {
-  #keys: '[414996.1.192863654]'
+  #keys: '[414996.1.209190752]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_dhGenerations_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_812_dhGenerations_OnCreated.def
similarity index 68%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_dhGenerations_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_812_dhGenerations_OnCreated.def
index 00a870f..ba85021 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_dhGenerations_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pGeneration_812_dhGenerations_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pGeneration/dhGenerations
-Response OnCreated () id:Response_pGeneration_dhGenerations_OnCreated
+#parent: pGeneration_812/dhGenerations
+Response OnCreated () id:Response_pGeneration_812_dhGenerations_OnCreated
 {
-  #keys: '[414996.1.192824501]'
+  #keys: '[414996.1.209190755]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_393_dhCheckMQBMLB_OnDataChanged.def
similarity index 82%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_393_dhCheckMQBMLB_OnDataChanged.def
index 1102236..d40598a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_393_dhCheckMQBMLB_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pMQBMLB/dhCheckMQBMLB
-Response OnDataChanged () id:Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged
+#parent: pMQBMLB_393/dhCheckMQBMLB
+Response OnDataChanged () id:Response_pMQBMLB_393_dhCheckMQBMLB_OnDataChanged
 {
-  #keys: '[414996.1.191962173]'
+  #keys: '[414996.1.209190744]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_dhMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_393_dhMQBMLB_OnCreated.def
similarity index 70%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_dhMQBMLB_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_393_dhMQBMLB_OnCreated.def
index 5900a81..5b87918 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_dhMQBMLB_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pMQBMLB_393_dhMQBMLB_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pMQBMLB/dhMQBMLB
-Response OnCreated () id:Response_pMQBMLB_dhMQBMLB_OnCreated
+#parent: pMQBMLB_393/dhMQBMLB
+Response OnCreated () id:Response_pMQBMLB_393_dhMQBMLB_OnCreated
 {
-  #keys: '[414996.1.190691936]'
+  #keys: '[414996.1.209190747]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_dhCheckPowers_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_480_dhCheckPowers_OnDataChanged.def
similarity index 82%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_dhCheckPowers_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_480_dhCheckPowers_OnDataChanged.def
index 611553c..b7b9d87 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_dhCheckPowers_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_480_dhCheckPowers_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pPower/dhCheckPowers
-Response OnDataChanged () id:Response_pPower_dhCheckPowers_OnDataChanged
+#parent: pPower_480/dhCheckPowers
+Response OnDataChanged () id:Response_pPower_480_dhCheckPowers_OnDataChanged
 {
-  #keys: '[414996.1.191962161]'
+  #keys: '[414996.1.209190748]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_dhPowers_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_480_dhPowers_OnCreated.def
similarity index 71%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_dhPowers_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_480_dhPowers_OnCreated.def
index a00a830..ef97f98 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_dhPowers_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pPower_480_dhPowers_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pPower/dhPowers
-Response OnCreated () id:Response_pPower_dhPowers_OnCreated
+#parent: pPower_480/dhPowers
+Response OnCreated () id:Response_pPower_480_dhPowers_OnCreated
 {
-  #keys: '[414996.1.192782879]'
+  #keys: '[414996.1.209190751]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dhAsyncFlag_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dhAsyncFlag_OnDataChanged.def
new file mode 100644
index 0000000..df783c6
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dhAsyncFlag_OnDataChanged.def
@@ -0,0 +1,12 @@
+Quintiq file version 2.0
+#parent: pRibbonDown/dhAsyncFlag_5
+Response OnDataChanged () id:Response_pRibbonUp_dhAsyncFlag_OnDataChanged
+{
+  #keys: '[414996.1.209192408]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+  }
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dhEndDate_OnCreated\043141.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dhEndDate_OnCreated\043141.def"
new file mode 100644
index 0000000..5fbc55f
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dhEndDate_OnCreated\043141.def"
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: pRibbonDown/dhEndDate_778
+Response OnCreated () id:Response_pRibbon_dhEndDate_OnCreated_141
+{
+  #keys: '[414996.1.210703173]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      this.Data( Date::MaxDate() );
+    *]
+  }
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dhStartDate_OnCreated\043368.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dhStartDate_OnCreated\043368.def"
new file mode 100644
index 0000000..0ca1fce
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dhStartDate_OnCreated\043368.def"
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: pRibbonDown/dhStartDate_21
+Response OnCreated () id:Response_pRibbon_dhStartDate_OnCreated_368
+{
+  #keys: '[414996.1.210703117]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      this.Data( Date::MinDate() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dsEndDate_OnChanged.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dsEndDate_OnChanged\043957.def"
similarity index 60%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dsEndDate_OnChanged.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dsEndDate_OnChanged\043957.def"
index 8415eff..396f6d8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dsEndDate_OnChanged.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dsEndDate_OnChanged\043957.def"
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRibbon322_613/dsEndDate
-Response OnChanged () id:Response_PanelRibbon322_613_dsEndDate_OnChanged
+#parent: pRibbonDown/dsEndDate_832
+Response OnChanged () id:Response_pRibbon_dsEndDate_OnChanged_957
 {
-  #keys: '[414996.1.207566011]'
+  #keys: '[414996.1.210703144]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dsStartDate_OnChanged.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dsStartDate_OnChanged\043648.def"
similarity index 60%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dsStartDate_OnChanged.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dsStartDate_OnChanged\043648.def"
index 7e8b256..2415f8d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_dsStartDate_OnChanged.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonDown_dsStartDate_OnChanged\043648.def"
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRibbon322_613/dsStartDate
-Response OnChanged () id:Response_PanelRibbon322_613_dsStartDate_OnChanged
+#parent: pRibbonDown/dsStartDate_88
+Response OnChanged () id:Response_pRibbon_dsStartDate_OnChanged_648
 {
-  #keys: '[414996.1.207566013]'
+  #keys: '[414996.1.210703088]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_ButtonRibbon_OnClick.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_bCreateBaseData_OnClick\043480.def"
similarity index 70%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_ButtonRibbon_OnClick.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_bCreateBaseData_OnClick\043480.def"
index 2c9819c..8b3876c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_ButtonRibbon_OnClick.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_bCreateBaseData_OnClick\043480.def"
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRibbon322_613/ButtonRibbon
-Response OnClick () id:Response_PanelRibbon322_613_ButtonRibbon_OnClick
+#parent: pRibbonUp/bCreateBaseData_529
+Response OnClick () id:Response_pRibbon_bCreateBaseData_OnClick_480
 {
-  #keys: '[414996.1.207566009]'
+  #keys: '[414996.1.210702980]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_ButtonRibbon682_OnClick.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_bCreateFullTable_OnClick\043393.def"
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_ButtonRibbon682_OnClick.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_bCreateFullTable_OnClick\043393.def"
index a07fc4f..f804078 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_613_ButtonRibbon682_OnClick.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_bCreateFullTable_OnClick\043393.def"
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRibbon322_613/ButtonRibbon682
-Response OnClick () id:Response_PanelRibbon322_613_ButtonRibbon682_OnClick
+#parent: pRibbonUp/bCreateFullTable_568
+Response OnClick () id:Response_pRibbon_bCreateFullTable_OnClick_393
 {
-  #keys: '[414996.1.207566008]'
+  #keys: '[414996.1.210703006]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   QuillAction
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_dhTimeUnit_OnCreated\043338.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_dhTimeUnit_OnCreated\043338.def"
new file mode 100644
index 0000000..879cb71
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_dhTimeUnit_OnCreated\043338.def"
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: pRibbonUp/dhTimeUnit_71
+Response OnCreated () id:Response_pRibbon_dhTimeUnit_OnCreated_338
+{
+  #keys: '[414996.1.210703061]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      this.Data( "Day" );
+    *]
+  }
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_rbgTimeUnit_OnUserChanged\043836.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_rbgTimeUnit_OnUserChanged\043836.def"
new file mode 100644
index 0000000..0a6f23b
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_rbgTimeUnit_OnUserChanged\043836.def"
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: pRibbonUp/rbgTimeUnit_925
+Response OnUserChanged () id:Response_pRibbon_rbgTimeUnit_OnUserChanged_836
+{
+  #keys: '[414996.1.210703032]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebRadioButtonGroup_OnUserChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      dhTimeUnit.Data( this.BoundValue() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/_ROOT_Component_FormAnnualPlanReport.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/_ROOT_Component_FormAnnualPlanReport.def
index 7394c00..557dd8b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/_ROOT_Component_FormAnnualPlanReport.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/_ROOT_Component_FormAnnualPlanReport.def
@@ -7,9 +7,7 @@
   BaseType: 'WebForm'
   Children:
   [
-    #child: PanelAnnualPlan
-    #child: pProductAttributeFilter
-    #child: PanelRibbon322_613
+    #child: pMainPanel
   ]
   Properties:
   [

--
Gitblit v1.9.3