Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev

admin

2025-01-22 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de

Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev

 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def

@@ -17,10 +17,10 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'InterfaceDataset'
            Source: 'InterfaceDataset'
            DataType: 'structured[OfflinePlanArchiveRow]'
            Source: 'dhRows'
            Taborder: 0
            Transformation: 'OfflinePlanArchiveVersion.Row.Cell'
            Transformation: 'Elements.Cell'
          ]
        }
      ]
@@ -44,12 +44,10 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'InterfaceDataset'
            FilterArguments: 'units:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderUnit;products:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderProduct'
            FixedFilter: '( units.Size() = 0 or exists( units, Elements, unit, unit.ID() = object.ProductionLine() ) ) and ( products.Size() = 0 or exists( products, Elements, product, product.ID() = object.Name() ) )'
            Source: 'InterfaceDataset'
            DataType: 'structured[OfflinePlanArchiveRow]'
            Source: 'dhRows'
            Taborder: 0
            Transformation: 'OfflinePlanArchiveVersion.Row'
            Transformation: 'Elements'
          ]
        }
      ]
@@ -72,13 +70,13 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'InterfaceDataset'
            DataType: 'structured[OfflinePlanArchiveRow]'
            Description: '( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() ) and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
            FilterArguments: 'search:QMacroPlanner::FormOfflinePlanArchive.dhSearch'
            FixedFilter: 'object.Filter( search )'
            Source: 'InterfaceDataset'
            Source: 'dhRows'
            Taborder: 0
            Transformation: 'OfflinePlanArchiveVersion.Column'
            Transformation: 'Elements.Cell.Column'
          ]
        }
      ]

 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTable.def

@@ -6,6 +6,33 @@
  Children:
  [
    #child: MatrixEditorTable
    Component dhRows
    {
      #keys: '[730572.0.133250359]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[OfflinePlanArchiveRow]*'
      Children:
      [
        Component deRows
        {
          #keys: '[730572.0.134330656]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'InterfaceDataset'
            FilterArguments: 'units:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderUnit;products:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderProduct'
            FixedFilter: '( units.Size() = 0 or exists( units, Elements, unit, unit.ID() = object.ProductionLine() ) ) and ( products.Size() = 0 or exists( products, Elements, product, product.ID() = object.Name() ) )'
            Source: 'InterfaceDataset'
            Taborder: 0
            Transformation: 'OfflinePlanArchiveVersion.Row'
          ]
        }
      ]
      Properties:
      [
        Taborder: 1
      ]
    }
  ]
  Properties:
  [