From c10e5fad185525821c62f52c3b6f7d7042a6ade5 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 26 六月 2024 16:47:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bDownload_OnClick#781.def                            |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def                                         |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPPA.def                                                      |   83 +++
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListCompareVersionPP_OnSelectionChanged.def        |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bExport_OnClick#723.def                              |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation#568.def                                                 |  112 +++++
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR.def                                                       |   94 ++--
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListCompareVersionPR_OnSelectionChanged#599.def    |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelectionChecks.def                                               |   75 +++
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionCurve.def                                                    |   83 +++
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DropDownListBaseVersionIDS_OnSelectionChanged.def         |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListBaseVersionPPA_OnSelectionChanged.def         |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def                                                       |   83 +++
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListBaseVersionPP_OnSelectionChanged.def           |   21 +
 _Main/BL/Type_Test/StaticMethod_Test.qbl                                                                                                    |   15 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionBudget.def                                                   |   83 +++
 _Main/Sys/Repr/Global/LocalCell_DemandComparison.qrp                                                                                        |   51 ++
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListBaseVersionBudget_OnSelectionChanged.def   |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DataExtractorOperationIDS_OnSelectionChanged.def          |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxCurve_OnChanged.def                        |   16 
 _Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl                                                                          |   26 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListBaseVersionCurve_OnSelectionChanged.def     |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListCompareVersionCurve_OnSelectionChanged.def  |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListCompareVersionBudget_OnSelectionChange.def |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionIDS.def                                                      |   83 +++
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_ButtonCompare_OnClick.def                            |   18 
 _Main/BL/Type_LocalCell_DemandComparison/StaticMethod_FillCells.qbl                                                                         |    0 
 /dev/null                                                                                                                                   |   17 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListBaseVersionPR_OnSelectionChanged#98.def        |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelDemandComparison294.def                                           |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPP_OnChanged.def                           |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPR_OnChanged.def                           |   16 
 _Main/BL/Type_LocalCell_DemandComparison/StaticMethod_GetAttributeNames.qbl                                                                 |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxIDS_OnChanged.def                          |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelection.def                                                     |   21 +
 _Main/BL/Type_LocalCell_DemandComparison/StaticMethod_FillRows.qbl                                                                          |    0 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPPA_OnChanged.def                          |   16 
 _Main/BL/Type_LocalCell_DemandComparison/StaticMethod_GenerateColumnIndex.qbl                                                               |    0 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxBudget_OnChanged.def                       |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListCompareVersionPPA_OnSelectionChanged.def      |   21 +
 40 files changed, 1,128 insertions(+), 98 deletions(-)

diff --git a/_Main/BL/Type_ArchivePR/StaticMethod_Compared.qbl b/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl
similarity index 83%
rename from _Main/BL/Type_ArchivePR/StaticMethod_Compared.qbl
rename to _Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl
index 75469e5..d7d8942 100644
--- a/_Main/BL/Type_ArchivePR/StaticMethod_Compared.qbl
+++ b/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl
@@ -2,25 +2,25 @@
 #parent: #root
 StaticMethod Compared (
   RecycleBin recycleBin,
-  const ArchivePR baseVersion,
-  const ArchivePR compareVersion
+  String baseVersionPath,
+  String compareVersionPath
 ) as LocalTable
 {
   TextBody:
   [*
     // rislai Jun-20-2024 (created)
-    localTable := recycleBin.LocalTable( relnew,Name := baseVersion.Name() + "__" + compareVersion.Name());
+    localTable := recycleBin.LocalTable( relnew,Name := baseVersionPath + "__" + compareVersionPath);
     
     baseVersionFile := OSFile::Construct();
     compareVersionFile := OSFile::Construct();
     
     try {
-      baseVersionFile.Open( baseVersion.FilePath(), "Read", false );
-      baseVersionDataSource := GeneralExcelImportAndExportDataSource::Upload( recycleBin, baseVersionFile.ReadBinary(), baseVersion.FilePath() );
+      baseVersionFile.Open( baseVersionPath, "Read", false );
+      baseVersionDataSource := GeneralExcelImportAndExportDataSource::Upload( recycleBin, baseVersionFile.ReadBinary(), baseVersionPath );
       baseVersionDataSource.ReadStructure();
       
-      compareVersionFile.Open( compareVersion.FilePath(), "Read", false );
-      compareVersionDataSource := GeneralExcelImportAndExportDataSource::Upload( recycleBin, compareVersionFile.ReadBinary(), compareVersion.FilePath() );
+      compareVersionFile.Open( compareVersionPath, "Read", false );
+      compareVersionDataSource := GeneralExcelImportAndExportDataSource::Upload( recycleBin, compareVersionFile.ReadBinary(), compareVersionPath );
       compareVersionDataSource.ReadStructure();
       
       baseVersionTable := select( baseVersionDataSource, GeneralExcelImportAndExportDataTable, tempGEIAEDT, true );
@@ -34,14 +34,14 @@
         baseVersionRows := construct( GeneralExcelImportAndExportDataRows ,constcontent);
         compareVersionRowTree := NamedValueTree::Create();
         compareVersionRows := construct( GeneralExcelImportAndExportDataRows ,constcontent);
-        ArchivePR::FillRows( baseVersionTable,rowKeys,baseVersionRowTree,baseVersionRows );
-        ArchivePR::FillRows( compareVersionTable,rowKeys,compareVersionRowTree,compareVersionRows );
+        LocalCell_DemandComparison::FillRows( baseVersionTable,rowKeys,baseVersionRowTree,baseVersionRows );
+        LocalCell_DemandComparison::FillRows( compareVersionTable,rowKeys,compareVersionRowTree,compareVersionRows );
         
         // 鐢熸垚鍒楁暟鎹�
         columnTree := NamedValueTree::Create();
         columns := construct( LocalColumns );
-        ArchivePR::GenerateColumnIndex( baseVersionTable,localTable,columnTree,columns );
-        ArchivePR::GenerateColumnIndex( compareVersionTable,localTable,columnTree,columns );
+        LocalCell_DemandComparison::GenerateColumnIndex( baseVersionTable,localTable,columnTree,columns );
+        LocalCell_DemandComparison::GenerateColumnIndex( compareVersionTable,localTable,columnTree,columns );
         columnNames := selectvalues( columns,Elements,column,true,column.Name() );
         
         // 鐢熸垚鏁版嵁
@@ -55,8 +55,8 @@
           compareVersionCellTree := NamedValueTree::Create();
           compareVersionCells := construct( GeneralExcelImportAndExportDataCells ,constcontent);
           
-          ArchivePR::FillCells( rowKey,baseVersionRowTree,baseVersionRows,baseVersionCellTree,baseVersionCells );
-          ArchivePR::FillCells( rowKey,compareVersionRowTree,compareVersionRows,compareVersionCellTree,compareVersionCells );
+          LocalCell_DemandComparison::FillCells( rowKey,baseVersionRowTree,baseVersionRows,baseVersionCellTree,baseVersionCells );
+          LocalCell_DemandComparison::FillCells( rowKey,compareVersionRowTree,compareVersionRows,compareVersionCellTree,compareVersionCells );
           
           row := localTable.LocalRow( relnew,Index := localTable.GetRowIndexCache()  );
           
diff --git a/_Main/BL/Type_ArchivePR/StaticMethod_FillCells.qbl b/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_FillCells.qbl
similarity index 100%
rename from _Main/BL/Type_ArchivePR/StaticMethod_FillCells.qbl
rename to _Main/BL/Type_LocalCell_DemandComparison/StaticMethod_FillCells.qbl
diff --git a/_Main/BL/Type_ArchivePR/StaticMethod_FillRows.qbl b/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_FillRows.qbl
similarity index 100%
rename from _Main/BL/Type_ArchivePR/StaticMethod_FillRows.qbl
rename to _Main/BL/Type_LocalCell_DemandComparison/StaticMethod_FillRows.qbl
diff --git a/_Main/BL/Type_ArchivePR/StaticMethod_GenerateColumnIndex.qbl b/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_GenerateColumnIndex.qbl
similarity index 100%
rename from _Main/BL/Type_ArchivePR/StaticMethod_GenerateColumnIndex.qbl
rename to _Main/BL/Type_LocalCell_DemandComparison/StaticMethod_GenerateColumnIndex.qbl
diff --git a/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_GetAttributeNames.qbl b/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_GetAttributeNames.qbl
index 24a6087..c766db0 100644
--- a/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_GetAttributeNames.qbl
+++ b/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_GetAttributeNames.qbl
@@ -7,10 +7,10 @@
     // rislai Jun-21-2024 (created)
     attributeNames := construct( Strings );
     
-    attributeNames.Add( "BaseVersion" );
-    attributeNames.Add( "CompareVersion" );
     attributeNames.Add( "BaseVersionValue" );
     attributeNames.Add( "CompareVersionValue" );
+    attributeNames.Add( "BaseVersion" );
+    attributeNames.Add( "CompareVersion" );
     attributeNames.Add( "Gap" );
     
     return &attributeNames;
diff --git a/_Main/BL/Type_Test/StaticMethod_Test.qbl b/_Main/BL/Type_Test/StaticMethod_Test.qbl
index e2e3fe5..9d0c69d 100644
--- a/_Main/BL/Type_Test/StaticMethod_Test.qbl
+++ b/_Main/BL/Type_Test/StaticMethod_Test.qbl
@@ -10,20 +10,9 @@
   TextBody:
   [*
     // rislai Jun-9-2024 (created)
-    baseVersion := select( archive,ArchivePR,pr,true );
-    baseVersionFile := OSFile::Construct();
-    baseVersionFile.Open( baseVersion.FilePath(), "Read", false );
-    baseVersionBinaryData := baseVersionFile.ReadBinary();
-    baseVersionDataSource := GeneralExcelImportAndExportDataSource::Upload( recycleBin, baseVersionBinaryData, baseVersion.FilePath() );
-    baseVersionDataSource.ReadStructure();
+    archive.ArchivePR( relnew,Name := "PR72.SP_20240604_VWED.xlsx",FilePath := "C:\Excel\PR72.SP_20240604_VWED.xlsx");
     
-    baseVersionTables := selectset( baseVersionDataSource, GeneralExcelImportAndExportDataTable, tempGEIAEDT, true );
-    
-    baseVersionTable := baseVersionTables.Element( 0 );
-    
-    baseVersionRow := select( baseVersionTable, GeneralExcelImportAndExportDataRow, tempGEIAEDR, tempGEIAEDR.RowNr() = 999 );
-    
-    info( isnull( baseVersionRow ));
+    archive.ArchivePR( relnew,Name := "PR72.SP_20240605_VWED.xlsx",FilePath := "C:\Excel\PR72.SP_20240605_VWED.xlsx");
     
     
     //testTree := NamedValueTree::Create();
diff --git a/_Main/Sys/Repr/Global/LocalCell_DemandComparison.qrp b/_Main/Sys/Repr/Global/LocalCell_DemandComparison.qrp
new file mode 100644
index 0000000..3706317
--- /dev/null
+++ b/_Main/Sys/Repr/Global/LocalCell_DemandComparison.qrp
@@ -0,0 +1,51 @@
+Quintiq file version 2.0
+#parent: #root
+TypeRepresentation LocalCell_DemandComparison
+{
+  AttributeRepresentation BaseVersion
+  {
+    AttributeKey: '[412672.0.1087844728]'
+    Conditional:
+    [
+      DataRepresentation.Conditional
+      {
+        ConditionBody: 'object.LocalColumn().IsAttrbuteColumn()'
+        ConversionBody: ''
+        DefaultTextColor: false
+        InheritConversion: false
+        TextColor: 'White'
+      }
+    ]
+  }
+  AttributeRepresentation CompareVersion
+  {
+    AttributeKey: '[412672.0.1087844725]'
+    Conditional:
+    [
+      DataRepresentation.Conditional
+      {
+        ConditionBody: 'object.LocalColumn().IsAttrbuteColumn()'
+        ConversionBody: ''
+        DefaultTextColor: false
+        InheritConversion: false
+        TextColor: 'White'
+      }
+    ]
+  }
+  AttributeRepresentation Gap
+  {
+    AttributeKey: '[412672.0.1087844731]'
+    Conditional:
+    [
+      DataRepresentation.Conditional
+      {
+        ConditionBody: 'object.LocalColumn().IsAttrbuteColumn()'
+        ConversionBody: ''
+        DefaultTextColor: false
+        InheritConversion: false
+        TextColor: 'White'
+      }
+    ]
+  }
+  RelationRepresentation LocalColumn { RelationKey: '[412672.0.1084249679]' Visibility: 'Normal' }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelDemandComparison294.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelDemandComparison294.def
new file mode 100644
index 0000000..b962093
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelDemandComparison294.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component PanelDemandComparison294
+{
+  #keys: '[412672.0.1111643045]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: PanelSelection
+    #child: PanelOperation_568
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation\043568.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation\043568.def"
new file mode 100644
index 0000000..cfb9153
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation\043568.def"
@@ -0,0 +1,112 @@
+Quintiq file version 2.0
+Component PanelOperation id:PanelOperation_568
+{
+  #keys: '[412672.0.1111643154]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component ButtonCompare
+    {
+      #keys: '[412672.0.1111643161]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Label: '寮�濮嬪姣�'
+        Taborder: 4
+      ]
+    }
+    Component efBaseVersion
+    {
+      #keys: '[412672.0.1111643258]'
+      BaseType: 'WebEditField'
+      Properties:
+      [
+        Label: '鍩哄噯闇�姹傜増鏈細'
+        Taborder: 0
+      ]
+    }
+    Component efCompareVersion
+    {
+      #keys: '[412672.0.1111643271]'
+      BaseType: 'WebEditField'
+      Properties:
+      [
+        Label: '瀵规瘮闇�姹傜増鏈細'
+        Taborder: 2
+      ]
+    }
+    Component dhCompareVersionPath
+    {
+      #keys: '[412672.0.1111643374]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'String*'
+      Properties:
+      [
+        Taborder: 3
+      ]
+    }
+    Component dhBaseVersionPath
+    {
+      #keys: '[412672.0.1111643396]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'String*'
+      Properties:
+      [
+        Taborder: 1
+      ]
+    }
+    Component dhXMLDataListener id:dhXMLDataListener_906
+    {
+      #keys: '[412672.0.1109203483]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'ExportXMLManager'
+      Children:
+      [
+        Component DataExtractor510 id:DataExtractor510_532
+        {
+          #keys: '[412672.0.1109203484]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'RecycleBin'
+            FixedFilter: 'object.Name() = "LocalTableXML"'
+            Source: 'RecycleBin'
+            Taborder: 0
+            Transformation: 'ExportXMLManager'
+          ]
+        }
+      ]
+      Properties:
+      [
+        Taborder: 7
+      ]
+    }
+    Component bExport id:bExport_98
+    {
+      #keys: '[412672.0.1109203510]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Image: 'EXPORT1'
+        Label: '瀵煎嚭'
+        Taborder: 5
+      ]
+    }
+    Component bDownload id:bDownload_352
+    {
+      #keys: '[412672.0.1109203542]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Image: 'DOWNLOAD'
+        Label: '涓嬭浇'
+        Taborder: 6
+      ]
+    }
+  ]
+  Properties:
+  [
+    Orientation: 'horizontal'
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation.def
deleted file mode 100644
index eaac96e..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation.def
+++ /dev/null
@@ -1,27 +0,0 @@
-Quintiq file version 2.0
-Component PanelOperation
-{
-  #keys: '[412672.0.1085881251]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: PanelOperation11
-    Component ButtonCompare
-    {
-      #keys: '[412672.0.1085802121]'
-      BaseType: 'WebButton'
-      Properties:
-      [
-        Label: '寮�濮嬪姣�'
-        Taborder: 1
-      ]
-    }
-    #child: pOperation_715
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Orientation: 'horizontal'
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelection.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelection.def
new file mode 100644
index 0000000..51b4cfe
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelection.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+Component PanelSelection
+{
+  #keys: '[412672.0.1111643222]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pSelectionPR
+    #child: pSelectionBudget
+    #child: pSelectionPPA
+    #child: pSelectionIDS
+    #child: pSelectionCurve
+    #child: pSelectionPP
+    #child: PanelSelectionChecks
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelectionChecks.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelectionChecks.def
new file mode 100644
index 0000000..6ad0414
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelectionChecks.def
@@ -0,0 +1,75 @@
+Quintiq file version 2.0
+Component PanelSelectionChecks
+{
+  #keys: '[412672.0.1111602504]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component CheckboxPR
+    {
+      #keys: '[412672.0.1112207508]'
+      BaseType: 'WebCheckbox'
+      Properties:
+      [
+        Label: 'PR'
+        Taborder: 0
+      ]
+    }
+    Component CheckboxPP
+    {
+      #keys: '[412672.0.1112392614]'
+      BaseType: 'WebCheckbox'
+      Properties:
+      [
+        Label: 'PP'
+        Taborder: 1
+      ]
+    }
+    Component CheckboxBudget
+    {
+      #keys: '[412672.0.1112392620]'
+      BaseType: 'WebCheckbox'
+      Properties:
+      [
+        Label: 'Budget'
+        Taborder: 2
+      ]
+    }
+    Component CheckboxPPA
+    {
+      #keys: '[412672.0.1112392625]'
+      BaseType: 'WebCheckbox'
+      Properties:
+      [
+        Label: 'PPA'
+        Taborder: 3
+      ]
+    }
+    Component CheckboxIDS
+    {
+      #keys: '[412672.0.1109206606]'
+      BaseType: 'WebCheckbox'
+      Properties:
+      [
+        Label: 'IDS'
+        Taborder: 4
+      ]
+    }
+    Component CheckboxCurve
+    {
+      #keys: '[412672.0.1109206611]'
+      BaseType: 'WebCheckbox'
+      Properties:
+      [
+        Label: 'Curve'
+        Taborder: 5
+      ]
+    }
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Orientation: 'horizontal'
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pOperation\043715.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pOperation\043715.def"
deleted file mode 100644
index b50844d..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pOperation\043715.def"
+++ /dev/null
@@ -1,63 +0,0 @@
-Quintiq file version 2.0
-Component pOperation id:pOperation_715
-{
-  #keys: '[412672.0.1092111928]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    Component bExport
-    {
-      #keys: '[412672.0.1092111929]'
-      BaseType: 'WebButton'
-      Properties:
-      [
-        Image: 'EXPORT1'
-        Label: '瀵煎嚭'
-        Taborder: 0
-      ]
-    }
-    Component bDownload
-    {
-      #keys: '[412672.0.1092111930]'
-      BaseType: 'WebButton'
-      Properties:
-      [
-        Image: 'DOWNLOAD'
-        Label: '涓嬭浇'
-        Taborder: 1
-      ]
-    }
-    Component dhXMLDataListener
-    {
-      #keys: '[412672.0.1092111931]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'ExportXMLManager'
-      Children:
-      [
-        Component DataExtractor510
-        {
-          #keys: '[412672.0.1092111932]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'RecycleBin'
-            FixedFilter: 'object.Name() = "LocalTableXML"'
-            Source: 'RecycleBin'
-            Taborder: 0
-            Transformation: 'ExportXMLManager'
-          ]
-        }
-      ]
-      Properties:
-      [
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Orientation: 'horizontal'
-    Taborder: 2
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionBudget.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionBudget.def
new file mode 100644
index 0000000..01b3985
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionBudget.def
@@ -0,0 +1,83 @@
+Quintiq file version 2.0
+Component pSelectionBudget
+{
+  #keys: '[412672.0.1109211897]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component DropDownListBaseVersionBudget
+    {
+      #keys: '[412672.0.1109211898]'
+      BaseType: 'WebDropDownList'
+      Databinding: 'ArchiveBudget'
+      Children:
+      [
+        Component DataExtractorOperation221
+        {
+          #keys: '[412672.0.1109211899]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'Archive'
+            Source: 'Archive'
+            Taborder: 0
+            Transformation: 'ArchiveBudget'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: '鍩哄噯闇�姹傜増鏈細'
+        Taborder: 0
+      ]
+    }
+    Component dhBaseVersionBudget
+    {
+      #keys: '[412672.0.1109211900]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'ArchiveBudget'
+      Properties:
+      [
+        Taborder: 1
+      ]
+    }
+    Component DropDownListCompareVersionBudget
+    {
+      #keys: '[412672.0.1109211901]'
+      BaseType: 'WebDropDownList'
+      Databinding: 'ArchiveBudget'
+      Children:
+      [
+        Component DataExtractorOperation655
+        {
+          #keys: '[412672.0.1109211902]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'Archive'
+            FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersionBudget'
+            FixedFilter: 'object <> baseSelection'
+            Source: 'Archive'
+            Taborder: 0
+            Transformation: 'ArchiveBudget'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: '瀵规瘮闇�姹傜増鏈細'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Orientation: 'horizontal'
+    Taborder: 3
+    Title: 'Budget'
+    Visible: false
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionCurve.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionCurve.def
new file mode 100644
index 0000000..a5d916d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionCurve.def
@@ -0,0 +1,83 @@
+Quintiq file version 2.0
+Component pSelectionCurve
+{
+  #keys: '[412672.0.1109211963]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component DropDownListBaseVersionCurve
+    {
+      #keys: '[412672.0.1109211964]'
+      BaseType: 'WebDropDownList'
+      Databinding: 'ArchiveCurve'
+      Children:
+      [
+        Component DataExtractorOperation154
+        {
+          #keys: '[412672.0.1109211965]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'Archive'
+            Source: 'Archive'
+            Taborder: 0
+            Transformation: 'ArchiveCurve'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: '鍩哄噯闇�姹傜増鏈細'
+        Taborder: 0
+      ]
+    }
+    Component dhBaseVersionCurve
+    {
+      #keys: '[412672.0.1109211966]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'ArchiveCurve'
+      Properties:
+      [
+        Taborder: 1
+      ]
+    }
+    Component DropDownListCompareVersionCurve
+    {
+      #keys: '[412672.0.1109211967]'
+      BaseType: 'WebDropDownList'
+      Databinding: 'ArchiveCurve'
+      Children:
+      [
+        Component DataExtractorOperation687
+        {
+          #keys: '[412672.0.1109211968]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'Archive'
+            FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersionCurve'
+            FixedFilter: 'object <> baseSelection'
+            Source: 'Archive'
+            Taborder: 0
+            Transformation: 'ArchiveCurve'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: '瀵规瘮闇�姹傜増鏈細'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Orientation: 'horizontal'
+    Taborder: 6
+    Title: 'Curve'
+    Visible: false
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionIDS.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionIDS.def
new file mode 100644
index 0000000..99ebb61
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionIDS.def
@@ -0,0 +1,83 @@
+Quintiq file version 2.0
+Component pSelectionIDS
+{
+  #keys: '[412672.0.1109211941]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component DropDownListBaseVersionIDS
+    {
+      #keys: '[412672.0.1109211942]'
+      BaseType: 'WebDropDownList'
+      Databinding: 'ArchiveIDS'
+      Children:
+      [
+        Component DataExtractorOperation504
+        {
+          #keys: '[412672.0.1109211943]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'Archive'
+            Source: 'Archive'
+            Taborder: 0
+            Transformation: 'ArchiveIDS'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: '鍩哄噯闇�姹傜増鏈細'
+        Taborder: 0
+      ]
+    }
+    Component dhBaseVersionIDS
+    {
+      #keys: '[412672.0.1109211944]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'ArchiveIDS'
+      Properties:
+      [
+        Taborder: 1
+      ]
+    }
+    Component DataExtractorOperationIDS
+    {
+      #keys: '[412672.0.1109211945]'
+      BaseType: 'WebDropDownList'
+      Databinding: 'ArchiveIDS'
+      Children:
+      [
+        Component DataExtractorOperation493
+        {
+          #keys: '[412672.0.1109211946]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'Archive'
+            FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersionIDS'
+            FixedFilter: 'object <> baseSelection'
+            Source: 'Archive'
+            Taborder: 0
+            Transformation: 'ArchiveIDS'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: '瀵规瘮闇�姹傜増鏈細'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Orientation: 'horizontal'
+    Taborder: 5
+    Title: 'IDS'
+    Visible: false
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def
new file mode 100644
index 0000000..6143d29
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def
@@ -0,0 +1,83 @@
+Quintiq file version 2.0
+Component pSelectionPP
+{
+  #keys: '[412672.0.1109211874]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component DropDownListBaseVersionPP
+    {
+      #keys: '[412672.0.1109211875]'
+      BaseType: 'WebDropDownList'
+      Databinding: 'ArchivePP'
+      Children:
+      [
+        Component DataExtractorOperation267
+        {
+          #keys: '[412672.0.1109211876]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'Archive'
+            Source: 'Archive'
+            Taborder: 0
+            Transformation: 'ArchivePP'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: '鍩哄噯闇�姹傜増鏈細'
+        Taborder: 0
+      ]
+    }
+    Component dhBaseVersionPP
+    {
+      #keys: '[412672.0.1109211877]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'ArchivePP'
+      Properties:
+      [
+        Taborder: 1
+      ]
+    }
+    Component DropDownListCompareVersionPP
+    {
+      #keys: '[412672.0.1109211878]'
+      BaseType: 'WebDropDownList'
+      Databinding: 'ArchivePP'
+      Children:
+      [
+        Component DataExtractorOperation510
+        {
+          #keys: '[412672.0.1109211879]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'Archive'
+            FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersionPP'
+            FixedFilter: 'object <> baseSelection'
+            Source: 'Archive'
+            Taborder: 0
+            Transformation: 'ArchivePP'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: '瀵规瘮闇�姹傜増鏈細'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Orientation: 'horizontal'
+    Taborder: 2
+    Title: 'PP'
+    Visible: false
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPPA.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPPA.def
new file mode 100644
index 0000000..bc16673
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPPA.def
@@ -0,0 +1,83 @@
+Quintiq file version 2.0
+Component pSelectionPPA
+{
+  #keys: '[412672.0.1109211919]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component DropDownListBaseVersionPPA
+    {
+      #keys: '[412672.0.1109211920]'
+      BaseType: 'WebDropDownList'
+      Databinding: 'ArchivePPA'
+      Children:
+      [
+        Component DataExtractorOperation300
+        {
+          #keys: '[412672.0.1109211921]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'Archive'
+            Source: 'Archive'
+            Taborder: 0
+            Transformation: 'ArchivePPA'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: '鍩哄噯闇�姹傜増鏈細'
+        Taborder: 0
+      ]
+    }
+    Component dhBaseVersionPPA
+    {
+      #keys: '[412672.0.1109211922]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'ArchivePPA'
+      Properties:
+      [
+        Taborder: 1
+      ]
+    }
+    Component DropDownListCompareVersionPPA
+    {
+      #keys: '[412672.0.1109211923]'
+      BaseType: 'WebDropDownList'
+      Databinding: 'ArchivePPA'
+      Children:
+      [
+        Component DataExtractorOperation949
+        {
+          #keys: '[412672.0.1109211924]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'Archive'
+            FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersionPPA'
+            FixedFilter: 'object <> baseSelection'
+            Source: 'Archive'
+            Taborder: 0
+            Transformation: 'ArchivePPA'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: '瀵规瘮闇�姹傜増鏈細'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Orientation: 'horizontal'
+    Taborder: 4
+    Title: 'PPA'
+    Visible: false
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation11.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR.def
similarity index 73%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation11.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR.def
index 828d235..1bf0f92 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation11.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR.def
@@ -1,59 +1,20 @@
 Quintiq file version 2.0
-Component PanelOperation11
+Component pSelectionPR
 {
-  #keys: '[412672.0.1085801711]'
+  #keys: '[412672.0.1109203593]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component DropDownListCompareVersion id:DropDownListCompareVersion_85
+    Component DropDownListBaseVersionPR
     {
-      #keys: '[412672.0.1085801792]'
+      #keys: '[412672.0.1109203679]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchivePR'
       Children:
       [
-        Component DataExtractorOperation876 id:DataExtractorOperation876_293
+        Component DataExtractorOperation id:DataExtractorOperation_866
         {
-          #keys: '[412672.0.1085801793]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'Archive'
-            FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersion'
-            FixedFilter: 'object <> baseSelection'
-            Source: 'Archive'
-            Taborder: 0
-            Transformation: 'ArchivePR'
-          ]
-        }
-      ]
-      Properties:
-      [
-        DisplayField: 'Name'
-        Label: '瀵规瘮闇�姹傜増鏈細'
-        Taborder: 2
-      ]
-    }
-    Component dhBaseVersion id:dhBaseVersion_357
-    {
-      #keys: '[412672.0.1085801820]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'ArchivePR'
-      Properties:
-      [
-        Taborder: 1
-      ]
-    }
-    Component DropDownListBaseVersion id:DropDownListBaseVersion_668
-    {
-      #keys: '[412672.0.1085801851]'
-      BaseType: 'WebDropDownList'
-      Databinding: 'ArchivePR'
-      Children:
-      [
-        Component DataExtractorOperation id:DataExtractorOperation_669
-        {
-          #keys: '[412672.0.1085801852]'
+          #keys: '[412672.0.1109203680]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -71,11 +32,52 @@
         Taborder: 0
       ]
     }
+    Component dhBaseVersionPR
+    {
+      #keys: '[412672.0.1109203707]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'ArchivePR'
+      Properties:
+      [
+        Taborder: 1
+      ]
+    }
+    Component DropDownListCompareVersionPR
+    {
+      #keys: '[412672.0.1109203739]'
+      BaseType: 'WebDropDownList'
+      Databinding: 'ArchivePR'
+      Children:
+      [
+        Component DataExtractorOperation876 id:DataExtractorOperation876_784
+        {
+          #keys: '[412672.0.1109203740]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'Archive'
+            FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersionPR'
+            FixedFilter: 'object <> baseSelection'
+            Source: 'Archive'
+            Taborder: 0
+            Transformation: 'ArchivePR'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: '瀵规瘮闇�姹傜増鏈細'
+        Taborder: 2
+      ]
+    }
   ]
   Properties:
   [
     FixedSize: true
     Orientation: 'horizontal'
-    Taborder: 0
+    Taborder: 1
+    Title: 'PR'
+    Visible: false
   ]
 }
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation11_DropDownListBaseVersion_OnSelectionChanged\043168.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation11_DropDownListBaseVersion_OnSelectionChanged\043168.def"
deleted file mode 100644
index a95fc67..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation11_DropDownListBaseVersion_OnSelectionChanged\043168.def"
+++ /dev/null
@@ -1,19 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelOperation11/DropDownListBaseVersion_668
-Response OnSelectionChanged (
-  ArchivePR selection
-) id:Response_PanelOperation11_DropDownListBaseVersion_OnSelectionChanged_168
-{
-  #keys: '[412672.0.1085801849]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      dhBaseVersion.Data( selection );
-      this.Tooltip( selection.Name() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation11_DropDownListCompareVersion_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation11_DropDownListCompareVersion_OnSelectionChanged.def
deleted file mode 100644
index ba590f9..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation11_DropDownListCompareVersion_OnSelectionChanged.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelOperation11/DropDownListCompareVersion_85
-Response OnSelectionChanged (
-  ArchivePR selection
-) id:Response_PanelOperation11_DropDownListCompareVersion_OnSelectionChanged
-{
-  #keys: '[412672.0.1093350988]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      this.Tooltip( selection.Name() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_ButtonCompare_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_ButtonCompare_OnClick.def
new file mode 100644
index 0000000..e372ac2
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_ButtonCompare_OnClick.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: PanelOperation_568/ButtonCompare
+Response OnClick () id:Response_PanelOperation_568_ButtonCompare_OnClick
+{
+  #keys: '[412672.0.1111643148]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebButton_OnClick'
+  QuillAction
+  {
+    Body:
+    [*
+      
+      table := LocalCell_DemandComparison::Compared( RecycleBin,dhBaseVersionPath.Data(),dhCompareVersionPath.Data() );
+      dhComparisonData.Data( table );
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pOperation_715_bDownload_OnClick.def "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bDownload_OnClick\043781.def"
similarity index 82%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pOperation_715_bDownload_OnClick.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bDownload_OnClick\043781.def"
index 1fd2a91..798a871 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pOperation_715_bDownload_OnClick.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bDownload_OnClick\043781.def"
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pOperation_715/bDownload
-Response OnClick () id:Response_pOperation_715_bDownload_OnClick
+#parent: PanelOperation_568/bDownload_352
+Response OnClick () id:Response_pOperation_bDownload_OnClick_781
 {
-  #keys: '[412672.0.1092111926]'
+  #keys: '[412672.0.1109203541]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   Precondition:
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pOperation_715_bExport_OnClick.def "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bExport_OnClick\043723.def"
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pOperation_715_bExport_OnClick.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bExport_OnClick\043723.def"
index 02b5b31..585ba3c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pOperation_715_bExport_OnClick.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bExport_OnClick\043723.def"
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pOperation_715/bExport
-Response OnClick () id:Response_pOperation_715_bExport_OnClick
+#parent: PanelOperation_568/bExport_98
+Response OnClick () id:Response_pOperation_bExport_OnClick_723
 {
-  #keys: '[412672.0.1092111927]'
+  #keys: '[412672.0.1109203509]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_ButtonCompare_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_ButtonCompare_OnClick.def
deleted file mode 100644
index a761ea1..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_ButtonCompare_OnClick.def
+++ /dev/null
@@ -1,17 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelOperation/ButtonCompare
-Response OnClick () id:Response_PanelOperation_ButtonCompare_OnClick
-{
-  #keys: '[412672.0.1085802211]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebButton_OnClick'
-  QuillAction
-  {
-    Body:
-    [*
-      table := ArchivePR::Compared( RecycleBin,DropDownListBaseVersion.Data(),DropDownListCompareVersion.Data() );
-      dhComparisonData.Data( table );
-    *]
-    GroupServerCalls: false
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxBudget_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxBudget_OnChanged.def
new file mode 100644
index 0000000..f7b4213
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxBudget_OnChanged.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: PanelSelectionChecks/CheckboxBudget
+Response OnChanged () id:Response_PanelSelectionChecks_CheckboxBudget_OnChanged
+{
+  #keys: '[412672.0.1112392619]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      pSelectionBudget.Visible( this.Checked() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxCurve_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxCurve_OnChanged.def
new file mode 100644
index 0000000..ae34ee1
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxCurve_OnChanged.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: PanelSelectionChecks/CheckboxCurve
+Response OnChanged () id:Response_PanelSelectionChecks_CheckboxCurve_OnChanged
+{
+  #keys: '[412672.0.1109206610]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      pSelectionCurve.Visible( this.Checked() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxIDS_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxIDS_OnChanged.def
new file mode 100644
index 0000000..80822a8
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxIDS_OnChanged.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: PanelSelectionChecks/CheckboxIDS
+Response OnChanged () id:Response_PanelSelectionChecks_CheckboxIDS_OnChanged
+{
+  #keys: '[412672.0.1109206605]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      pSelectionIDS.Visible( this.Checked() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPPA_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPPA_OnChanged.def
new file mode 100644
index 0000000..f14848a
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPPA_OnChanged.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: PanelSelectionChecks/CheckboxPPA
+Response OnChanged () id:Response_PanelSelectionChecks_CheckboxPPA_OnChanged
+{
+  #keys: '[412672.0.1112392624]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      pSelectionPPA.Visible( this.Checked() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPP_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPP_OnChanged.def
new file mode 100644
index 0000000..7b148be
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPP_OnChanged.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: PanelSelectionChecks/CheckboxPP
+Response OnChanged () id:Response_PanelSelectionChecks_CheckboxPP_OnChanged
+{
+  #keys: '[412672.0.1112392613]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      pSelectionPP.Visible( this.Checked() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPR_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPR_OnChanged.def
new file mode 100644
index 0000000..c27e799
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPR_OnChanged.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: PanelSelectionChecks/CheckboxPR
+Response OnChanged () id:Response_PanelSelectionChecks_CheckboxPR_OnChanged
+{
+  #keys: '[412672.0.1112326553]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      pSelectionPR.Visible( this.Checked() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListBaseVersionBudget_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListBaseVersionBudget_OnSelectionChanged.def
new file mode 100644
index 0000000..8cfbed8
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListBaseVersionBudget_OnSelectionChanged.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pSelectionBudget/DropDownListBaseVersionBudget
+Response OnSelectionChanged (
+  ArchivePR selection
+) id:Response_pSelectionBudget_DropDownListBaseVersionBudget_OnSelectionChanged
+{
+  #keys: '[412672.0.1109211896]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      dhBaseVersionPR.Data( selection );
+      this.Tooltip( selection.Name() );
+      efBaseVersion.Text( selection.Name() );
+      dhBaseVersionPath.Data( selection.FilePath() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListCompareVersionBudget_OnSelectionChange.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListCompareVersionBudget_OnSelectionChange.def
new file mode 100644
index 0000000..2a0e750
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListCompareVersionBudget_OnSelectionChange.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pSelectionBudget/DropDownListCompareVersionBudget
+Response OnSelectionChanged (
+  ArchivePR selection
+) id:Response_pSelectionBudget_DropDownListCompareVersionBudget_OnSelectionChanged
+{
+  #keys: '[412672.0.1109211895]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      this.Tooltip( selection.Name() );
+      
+      efCompareVersion.Text( selection.Name() );
+      dhCompareVersionPath.Data( selection.FilePath() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListBaseVersionCurve_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListBaseVersionCurve_OnSelectionChanged.def
new file mode 100644
index 0000000..a220cc2
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListBaseVersionCurve_OnSelectionChanged.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pSelectionCurve/DropDownListBaseVersionCurve
+Response OnSelectionChanged (
+  ArchivePR selection
+) id:Response_pSelectionCurve_DropDownListBaseVersionCurve_OnSelectionChanged
+{
+  #keys: '[412672.0.1109211962]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      dhBaseVersionPR.Data( selection );
+      this.Tooltip( selection.Name() );
+      efBaseVersion.Text( selection.Name() );
+      dhBaseVersionPath.Data( selection.FilePath() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListCompareVersionCurve_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListCompareVersionCurve_OnSelectionChanged.def
new file mode 100644
index 0000000..a427350
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListCompareVersionCurve_OnSelectionChanged.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pSelectionCurve/DropDownListCompareVersionCurve
+Response OnSelectionChanged (
+  ArchivePR selection
+) id:Response_pSelectionCurve_DropDownListCompareVersionCurve_OnSelectionChanged
+{
+  #keys: '[412672.0.1109211961]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      this.Tooltip( selection.Name() );
+      
+      efCompareVersion.Text( selection.Name() );
+      dhCompareVersionPath.Data( selection.FilePath() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DataExtractorOperationIDS_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DataExtractorOperationIDS_OnSelectionChanged.def
new file mode 100644
index 0000000..5500771
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DataExtractorOperationIDS_OnSelectionChanged.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pSelectionIDS/DataExtractorOperationIDS
+Response OnSelectionChanged (
+  ArchivePR selection
+) id:Response_pSelectionIDS_DataExtractorOperationIDS_OnSelectionChanged
+{
+  #keys: '[412672.0.1109211939]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      this.Tooltip( selection.Name() );
+      
+      efCompareVersion.Text( selection.Name() );
+      dhCompareVersionPath.Data( selection.FilePath() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DropDownListBaseVersionIDS_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DropDownListBaseVersionIDS_OnSelectionChanged.def
new file mode 100644
index 0000000..d5d74b3
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DropDownListBaseVersionIDS_OnSelectionChanged.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pSelectionIDS/DropDownListBaseVersionIDS
+Response OnSelectionChanged (
+  ArchivePR selection
+) id:Response_pSelectionIDS_DropDownListBaseVersionIDS_OnSelectionChanged
+{
+  #keys: '[412672.0.1109211940]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      dhBaseVersionPR.Data( selection );
+      this.Tooltip( selection.Name() );
+      efBaseVersion.Text( selection.Name() );
+      dhBaseVersionPath.Data( selection.FilePath() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListBaseVersionPPA_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListBaseVersionPPA_OnSelectionChanged.def
new file mode 100644
index 0000000..3962e2c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListBaseVersionPPA_OnSelectionChanged.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pSelectionPPA/DropDownListBaseVersionPPA
+Response OnSelectionChanged (
+  ArchivePR selection
+) id:Response_pSelectionPPA_DropDownListBaseVersionPPA_OnSelectionChanged
+{
+  #keys: '[412672.0.1109211918]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      dhBaseVersionPR.Data( selection );
+      this.Tooltip( selection.Name() );
+      efBaseVersion.Text( selection.Name() );
+      dhBaseVersionPath.Data( selection.FilePath() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListCompareVersionPPA_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListCompareVersionPPA_OnSelectionChanged.def
new file mode 100644
index 0000000..eb49f2b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListCompareVersionPPA_OnSelectionChanged.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pSelectionPPA/DropDownListCompareVersionPPA
+Response OnSelectionChanged (
+  ArchivePR selection
+) id:Response_pSelectionPPA_DropDownListCompareVersionPPA_OnSelectionChanged
+{
+  #keys: '[412672.0.1109211917]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      this.Tooltip( selection.Name() );
+      
+      efCompareVersion.Text( selection.Name() );
+      dhCompareVersionPath.Data( selection.FilePath() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListBaseVersionPP_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListBaseVersionPP_OnSelectionChanged.def
new file mode 100644
index 0000000..ffcbefc
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListBaseVersionPP_OnSelectionChanged.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pSelectionPP/DropDownListBaseVersionPP
+Response OnSelectionChanged (
+  ArchivePR selection
+) id:Response_pSelectionPP_DropDownListBaseVersionPP_OnSelectionChanged
+{
+  #keys: '[412672.0.1109211873]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      dhBaseVersionPR.Data( selection );
+      this.Tooltip( selection.Name() );
+      efBaseVersion.Text( selection.Name() );
+      dhBaseVersionPath.Data( selection.FilePath() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListCompareVersionPP_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListCompareVersionPP_OnSelectionChanged.def
new file mode 100644
index 0000000..d46fc20
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListCompareVersionPP_OnSelectionChanged.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pSelectionPP/DropDownListCompareVersionPP
+Response OnSelectionChanged (
+  ArchivePR selection
+) id:Response_pSelectionPP_DropDownListCompareVersionPP_OnSelectionChanged
+{
+  #keys: '[412672.0.1109211872]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      this.Tooltip( selection.Name() );
+      
+      efCompareVersion.Text( selection.Name() );
+      dhCompareVersionPath.Data( selection.FilePath() );
+    *]
+  }
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListBaseVersionPR_OnSelectionChanged\04398.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListBaseVersionPR_OnSelectionChanged\04398.def"
new file mode 100644
index 0000000..e477b8f
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListBaseVersionPR_OnSelectionChanged\04398.def"
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pSelectionPR/DropDownListBaseVersionPR
+Response OnSelectionChanged (
+  ArchivePR selection
+) id:Response_pSelectionPR_DropDownListBaseVersionPR_OnSelectionChanged_98
+{
+  #keys: '[412672.0.1109203677]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      dhBaseVersionPR.Data( selection );
+      this.Tooltip( selection.Name() );
+      efBaseVersion.Text( selection.Name() );
+      dhBaseVersionPath.Data( selection.FilePath() );
+    *]
+  }
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListCompareVersionPR_OnSelectionChanged\043599.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListCompareVersionPR_OnSelectionChanged\043599.def"
new file mode 100644
index 0000000..10a3e31
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListCompareVersionPR_OnSelectionChanged\043599.def"
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pSelectionPR/DropDownListCompareVersionPR
+Response OnSelectionChanged (
+  ArchivePR selection
+) id:Response_pSelectionPR_DropDownListCompareVersionPR_OnSelectionChanged_599
+{
+  #keys: '[412672.0.1109203737]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      this.Tooltip( selection.Name() );
+      
+      efCompareVersion.Text( selection.Name() );
+      dhCompareVersionPath.Data( selection.FilePath() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def
index 6d79dcf..23b9386 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def
@@ -8,7 +8,7 @@
   Children:
   [
     #child: PanelDemandComparison
-    #child: PanelOperation
+    #child: PanelDemandComparison294
   ]
   Properties:
   [

--
Gitblit v1.9.3