diff options
Diffstat (limited to 'Software')
24 files changed, 2253 insertions, 1173 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs index 8a75c526f..cc1bba0e7 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs @@ -34,6 +34,10 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels public event EventHandler SaveTestResults; #region Properties + + public List<WashingTestMaterial> WashingTestMaterials { get; set; } + + private SynchronizedObservableCollection<RmlExtensionTestResult> _selectedTestResults; public SynchronizedObservableCollection<RmlExtensionTestResult> SelectedTestResults @@ -269,15 +273,21 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels } _active_context = ObservablesContext.CreateDefault(); ResultTabs.Clear(); - LogManager.Log("Loading selected test results..."); + + if(WashingTestMaterials == null) + WashingTestMaterials = _active_context.WashingTestMaterials.ToList(); + + LogManager.Log("Loading selected test results..."); using (_notification.PushTaskItem("Loading Test Results Parameters ...")) { - var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().BuildAsync(); + var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().WithWashingTestResults().BuildAsync(); SelectedTestResults = testResults.OrderBy(x => x.ResultIndex).ToSynchronizedObservableCollection(); foreach (var result in SelectedTestResults) { - ResultTabs.Add(new TestResultViewVM(_notification, _actionLogManager) { TestResult = result, ThreadName = ThreadName }); + var testResultViewVM = new TestResultViewVM(_notification, _actionLogManager) { TestResult = result, ThreadName = ThreadName }; + CreateWashingResult(testResultViewVM); + ResultTabs.Add(testResultViewVM); if (result.ResultIndex == 1) { SelectedTab = ResultTabs[ResultTabs.Count - 1]; @@ -324,9 +334,28 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels tensileresults.Add(new TensileResult() { RmlExtensionTestResultsGuid = newtab.TestResult.Guid, TestResultColor = TestResultColors.WHITE, ColorPercent = null }); newtab.TestResult.TensileResults = tensileresults; + CreateWashingResult(newtab); + return newtab; } + private void CreateWashingResult(TestResultViewVM testresultViewVM) + { + if(testresultViewVM.TestResult.RmlExtensionTestWashingResults != null) + return; + + var whashingresults = new SynchronizedObservableCollection<RmlExtensionTestWashingResult>(); + foreach (var material in WashingTestMaterials) + { + foreach (WashingResultColor color in Enum.GetValues(typeof(WashingResultColor))) + { + whashingresults.Add(new RmlExtensionTestWashingResult() { RmlExtensionTestResultsGuid = testresultViewVM.TestResult.Guid, WashingTestMaterialsGuid = material.Guid, Color = (int)color }); + } + } + testresultViewVM.TestResult.RmlExtensionTestWashingResults = whashingresults; + + } + #endregion #region Save diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml index f6262b52d..0aceebc9a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml @@ -255,57 +255,148 @@ <Border Padding="10 10 20 10" Grid.ColumnSpan="2" Grid.Row="0" BorderBrush="Transparent" BorderThickness="1" > <ScrollViewer VerticalScrollBarVisibility="Auto" > - <Grid HorizontalAlignment="Left"> - <Grid.ColumnDefinitions> - <ColumnDefinition Width="1*"></ColumnDefinition> - <ColumnDefinition Width="1*"></ColumnDefinition> - </Grid.ColumnDefinitions> - <Grid.RowDefinitions> - <RowDefinition Height="Auto"/> - <RowDefinition Height="Auto"/> - <RowDefinition Height="1*"/> - </Grid.RowDefinitions> + <Grid HorizontalAlignment="Left"> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="1*"></ColumnDefinition> + <ColumnDefinition Width="1*"></ColumnDefinition> + </Grid.ColumnDefinitions> + <StackPanel Orientation="Vertical" Grid.Column="0"> <Border> - <StackPanel x:Name="DryerTempPanel" HorizontalAlignment="Stretch" Grid.Column="0" Grid.Row="0" > - <DockPanel Margin="0 10 0 0"> - <Button DockPanel.Dock="Right" Margin="0 0 40 0" HorizontalAlignment="Left" Padding="0" Width="200" Command="{Binding ApplyToProcessParametersCommand}" ToolTip="Apply to Process Parameters" VerticalContentAlignment="Center"> - <TextBlock FontSize="14" Background="Transparent" VerticalAlignment="Center" Margin="0 2 0 0">Apply to Process Parameters</TextBlock> - </Button> - <TextBlock HorizontalAlignment="Center" FontSize="21" Margin="180 10 0 0"> Process Parameters</TextBlock> - </DockPanel> + <StackPanel x:Name="DryerTempPanel" HorizontalAlignment="Stretch" Grid.Column="0" > + <DockPanel Margin="0 10 0 0"> + <Button DockPanel.Dock="Right" Margin="0 0 40 0" HorizontalAlignment="Left" Padding="0" Width="200" Command="{Binding ApplyToProcessParametersCommand}" ToolTip="Apply to Process Parameters" VerticalContentAlignment="Center"> + <TextBlock FontSize="14" Background="Transparent" VerticalAlignment="Center" Margin="0 2 0 0">Apply to Process Parameters</TextBlock> + </Button> + <TextBlock HorizontalAlignment="Center" FontSize="21" Margin="180 10 0 0"> Process Parameters</TextBlock> + </DockPanel> <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="20 10 40 10"> - <UniformGrid Columns="2" HorizontalAlignment="Left" MinWidth="{ Binding ElementName=RubbingResultsGrid, Path= ActualWidth }" > - <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Dryer temperature</TextBlock> - </Border> - <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Left" Minimum="0" Maximum="300" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" Value="{Binding SelectedTab.TestResult.DryerTemperature, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown> - </Border> - <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Tunnel temperature</TextBlock> - </Border> - <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="False" Minimum="0" Maximum="400" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.TunnelTemperature,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown> - </Border> - <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Tunnel flow</TextBlock> - </Border> - <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="20" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.TunnelFlow,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown> - </Border> - <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Tunnel AVG temperature</TextBlock> - </Border> - <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="400" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.TunnelAvgTemperature,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown> - </Border> - </UniformGrid> - </Border> - </StackPanel></Border> - <StackPanel x:Name="RubbingResultsPanel" Grid.Column="0" Grid.Row="1" Margin="0 5 0 0"> - <TextBlock HorizontalAlignment="Center" FontSize="21"> Rubbing results</TextBlock> + <UniformGrid Columns="2" HorizontalAlignment="Left" MinWidth="{ Binding ElementName=RubbingResultsGrid, Path= ActualWidth }" > + <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> + <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Dryer temperature</TextBlock> + </Border> + <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> + <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Left" Minimum="0" Maximum="300" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" Value="{Binding SelectedTab.TestResult.DryerTemperature, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown> + </Border> + <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> + <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Tunnel temperature</TextBlock> + </Border> + <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> + <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="False" Minimum="0" Maximum="400" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.TunnelTemperature,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown> + </Border> + <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> + <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Tunnel flow</TextBlock> + </Border> + <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> + <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="20" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.TunnelFlow,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown> + </Border> + <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> + <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Tunnel AVG temperature</TextBlock> + </Border> + <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> + <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="400" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.TunnelAvgTemperature,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown> + </Border> + </UniformGrid> + </Border> + </StackPanel> + </Border> + <StackPanel x:Name="RubbingResultsPanel" Grid.Column="0" Margin="0 5 0 0"> + <TextBlock HorizontalAlignment="Center" FontSize="21"> Rubbing results</TextBlock> + + <DataGrid x:Name="RubbingResultsGrid" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="280" RowHeight="26" Padding="0" SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding SelectedTab.TestResult.RubbingResults}" Margin="20 10 40 10" FontSize="16"> + <DataGrid.ColumnHeaderStyle > + <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}"> + <Setter Property="FontSize" Value="16"/> + <Setter Property="HorizontalAlignment" Value="Left"/> + <Setter Property="Margin" Value="2 0 0 0"/> + <Setter Property="Padding" Value="0 5"/> + <Setter Property="FrameworkElement.HorizontalAlignment" Value="Stretch"/> + <Setter Property="HorizontalContentAlignment" Value="Left"/> + </Style> + </DataGrid.ColumnHeaderStyle> + <DataGrid.CellStyle> + <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}"> + <Setter Property="BorderThickness" Value="0"/> + <Setter Property="FocusVisualStyle" Value="{x:Null}"/> + <Setter Property="VerticalContentAlignment" Value="Center"></Setter> + <Setter Property="Padding" Value="0"></Setter> + <Setter Property="Margin" Value="0 0 0 0"></Setter> + </Style> + </DataGrid.CellStyle> + <DataGrid.Columns> + <DataGridTemplateColumn Header="Color" Width="80"> + <DataGridTemplateColumn.CellTemplate> + <DataTemplate> + <Border BorderThickness="0" Background="{Binding TestResultColor, Converter={StaticResource ColorNameToBrushConverter}}"> + <TextBlock Text="{Binding TestResultColor, Converter={StaticResource EnumToDescriptionConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10 0 0 0"></TextBlock> + </Border> + </DataTemplate> + </DataGridTemplateColumn.CellTemplate> + </DataGridTemplateColumn> + + <mahapps:DataGridNumericUpDownColumn Header="DeltaE CIE 100%" Minimum="0" Maximum="100" Binding="{Binding DeltaeCie100, StringFormat={}{0:F2}}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" /> - <DataGrid x:Name="RubbingResultsGrid" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="280" RowHeight="26" Padding="0" SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding SelectedTab.TestResult.RubbingResults}" Margin="20 10 40 10" FontSize="16"> + + <DataGridTemplateColumn Header="GS 100%" Width="1*"> + <DataGridTemplateColumn.CellTemplate> + <DataTemplate> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> + <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/> + </StackPanel> + </DataTemplate> + </DataGridTemplateColumn.CellTemplate> + </DataGridTemplateColumn> + + <mahapps:DataGridNumericUpDownColumn Header="DeltaE CIE 200%" Minimum="0" Maximum="100" Binding="{Binding DeltaeCie200}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" FontSize="16"/> + + <DataGridTemplateColumn Header="GS 200%" Width="1*"> + <DataGridTemplateColumn.CellTemplate> + <DataTemplate> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> + <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding Gs200,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/> + </StackPanel> + </DataTemplate> + </DataGridTemplateColumn.CellTemplate> + </DataGridTemplateColumn> + </DataGrid.Columns> + </DataGrid> + + </StackPanel> + <StackPanel x:Name="UniformityPanel" HorizontalAlignment="Center" Grid.Column="0" Grid.Row="2" > + <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0" FontSize="21"> Uniformity</TextBlock> + <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="20 10 40 10"> + <UniformGrid Columns="2" HorizontalAlignment="Left" MinWidth="{ Binding ElementName=RubbingResultsGrid, Path= ActualWidth }" > + <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> + <TextBlock FontWeight="Light" Margin="5 0 0 0" VerticalAlignment="Center">Uniformity</TextBlock> + </Border> + <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> + <TextBlock FontWeight="Light" VerticalAlignment="Center" Margin="5 0 0 0">Severity</TextBlock> + </Border> + <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}" > + <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Zone 1</TextBlock> + </Border> + <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> + <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding SelectedTab.TestResult.SeverityZone1Min,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" FontSize="16" MinWidth="26"></mahapps:NumericUpDown> + <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">-</TextBlock> + <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.SeverityZone1Max,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0 0 0 0" Width="Auto" FontSize="16" StringFormat="{}{0:F1}" ></mahapps:NumericUpDown> + </StackPanel> + </Border> + <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> + <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Zone 2</TextBlock> + </Border> + <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> + <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding SelectedTab.TestResult.SeverityZone2Min,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0" MaxWidth="20" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" FontSize="16" MinWidth="26"></mahapps:NumericUpDown> + <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">-</TextBlock> + <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.SeverityZone2Max,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0 0 0 0" Width="Auto" FontSize="16" StringFormat="{}{0:F1}" ></mahapps:NumericUpDown> + </StackPanel> + </Border> + </UniformGrid> + </Border> + </StackPanel> + <StackPanel x:Name="WashingTestResultsPanel" Grid.Column="0" Grid.Row="3" Margin="0 5 0 0"> + <TextBlock HorizontalAlignment="Center" FontSize="21"> Washing results</TextBlock> + <DataGrid x:Name="WashingTestResultsGrid" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="280" RowHeight="26" Padding="0" SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding SelectedTab.TestResult.RubbingResults}" Margin="20 10 40 10" FontSize="16"> <DataGrid.ColumnHeaderStyle > <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}"> <Setter Property="FontSize" Value="16"/> @@ -318,7 +409,6 @@ </DataGrid.ColumnHeaderStyle> <DataGrid.CellStyle> <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}"> - <Setter Property="BorderThickness" Value="0"/> <Setter Property="FocusVisualStyle" Value="{x:Null}"/> <Setter Property="VerticalContentAlignment" Value="Center"></Setter> <Setter Property="Padding" Value="0"></Setter> @@ -326,32 +416,46 @@ </Style> </DataGrid.CellStyle> <DataGrid.Columns> - <DataGridTemplateColumn Header="Color" Width="80"> + <DataGridTemplateColumn Header="Material" Width="80"> <DataGridTemplateColumn.CellTemplate> <DataTemplate> - <Border BorderThickness="0" Background="{Binding TestResultColor, Converter={StaticResource ColorNameToBrushConverter}}"> - <TextBlock Text="{Binding TestResultColor, Converter={StaticResource EnumToDescriptionConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10 0 0 0"></TextBlock> + <Border BorderThickness="0.4"> + <TextBlock Text="{Binding TestResultColor, Converter={StaticResource EnumToDescriptionConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10 0 1 0" Padding="0.4"></TextBlock> </Border> </DataTemplate> </DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn> - <mahapps:DataGridNumericUpDownColumn Header="DeltaE CIE 100%" Minimum="0" Maximum="100" Binding="{Binding DeltaeCie100, StringFormat={}{0:F2}}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" /> - + <DataGridTemplateColumn Header="Color" Width="1*"> + <DataGridTemplateColumn.CellTemplate> + <DataTemplate> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> + <mahapps:NumericUpDown HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/> + </StackPanel> + </DataTemplate> + </DataGridTemplateColumn.CellTemplate> + </DataGridTemplateColumn> - <DataGridTemplateColumn Header="GS 100%" Width="1*"> + <DataGridTemplateColumn Header="Color" Width="1*"> <DataGridTemplateColumn.CellTemplate> <DataTemplate> <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> - <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/> + <mahapps:NumericUpDown HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/> </StackPanel> </DataTemplate> </DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn> - <mahapps:DataGridNumericUpDownColumn Header="DeltaE CIE 200%" Minimum="0" Maximum="100" Binding="{Binding DeltaeCie200}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" FontSize="16"/> - - <DataGridTemplateColumn Header="GS 200%" Width="1*"> + <DataGridTemplateColumn Header="Color" Width="1*"> + <DataGridTemplateColumn.CellTemplate> + <DataTemplate> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> + <mahapps:NumericUpDown HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/> + </StackPanel> + </DataTemplate> + </DataGridTemplateColumn.CellTemplate> + </DataGridTemplateColumn> + <DataGridTemplateColumn Header="Color" Width="1*"> <DataGridTemplateColumn.CellTemplate> <DataTemplate> <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> @@ -360,29 +464,49 @@ </DataTemplate> </DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn> + <DataGridTemplateColumn Header="Color" Width="1*"> + <DataGridTemplateColumn.CellTemplate> + <DataTemplate> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> + <mahapps:NumericUpDown HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/> + </StackPanel> + </DataTemplate> + </DataGridTemplateColumn.CellTemplate> + </DataGridTemplateColumn> + <DataGridTemplateColumn Header="Color" Width="1*"> + <DataGridTemplateColumn.CellTemplate> + <DataTemplate> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> + <mahapps:NumericUpDown HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/> + </StackPanel> + </DataTemplate> + </DataGridTemplateColumn.CellTemplate> + </DataGridTemplateColumn> </DataGrid.Columns> </DataGrid> </StackPanel> + </StackPanel> + <StackPanel Orientation="Vertical" Grid.Column="1"> <StackPanel x:Name="TensionresultsPanel" Grid.Column="1" Grid.Row="0" Margin="0 20 0 0" > <TextBlock HorizontalAlignment="Center" FontSize="21"> Tension through the thread path</TextBlock> <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="0 10 20 10" > <UniformGrid Columns="4" Background="{StaticResource TransparentBackgroundBrush}" HorizontalAlignment="Left" MinWidth="{ Binding ElementName=MechanicalPropertiesGrid, Path= ActualWidth }" > <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> <TextBlock FontWeight="Light" Margin="5 0 0 0" VerticalAlignment="Center">Tension in Zone</TextBlock> - </Border> + </Border> <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <TextBlock FontWeight="Light" Margin="5 0 0 0" VerticalAlignment="Center">Tensiometer (gr)</TextBlock> - </Border> + <TextBlock FontWeight="Light" Margin="5 0 0 0" VerticalAlignment="Center">Tensiometer (gr)</TextBlock> + </Border> <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> <TextBlock FontWeight="Light" Margin="5 0 0 0" VerticalAlignment="Center">Tension in Zone</TextBlock> - </Border> + </Border> <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> <TextBlock FontWeight="Light" Margin="5 0 0 0" VerticalAlignment="Center">MS</TextBlock> - </Border> + </Border> <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <TextBlock Margin="5 0 0 0">Head</TextBlock> - </Border> + <TextBlock Margin="5 0 0 0">Head</TextBlock> + </Border> <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> <StackPanel Orientation="Horizontal"> <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.TensionHeadMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/> @@ -392,7 +516,7 @@ </Border> <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> <TextBlock Margin="5 0 0 0">BTSR</TextBlock> - </Border> + </Border> <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> <StackPanel Orientation="Horizontal"> <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.BtsrMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/> @@ -402,7 +526,7 @@ </Border> <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> <TextBlock Margin="5 0 0 0">After dryer</TextBlock> - </Border> + </Border> <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> <StackPanel Orientation="Horizontal"> <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.TensionAfterDryerMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/> @@ -412,7 +536,7 @@ </Border> <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> <TextBlock Margin="5 0 0 0" >Puller tension</TextBlock> - </Border> + </Border> <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> <StackPanel Orientation="Horizontal"> <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.PullerTensionMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/> @@ -422,7 +546,7 @@ </Border> <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> <TextBlock Margin="5 0 0 0">Winder</TextBlock> - </Border> + </Border> <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> <StackPanel Orientation="Horizontal"> <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.TensionWinderMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/> @@ -441,7 +565,7 @@ </StackPanel> </Border> </UniformGrid> - </Border> + </Border> </StackPanel> <StackPanel x:Name="MechanicalPropertiesPanel" Grid.Column="1" Grid.Row="1" Margin="0 5 0 0"> <TextBlock HorizontalAlignment="Center" FontSize="21" >Mechanical properties</TextBlock> @@ -499,9 +623,9 @@ </mahapps:DataGridNumericUpDownColumn> <mahapps:DataGridNumericUpDownColumn Header="Percentage 
Strain at 
Maximum Load" Minimum="0" Maximum="100" Binding="{Binding StrainMaxLoad, UpdateSourceTrigger=PropertyChanged}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" StringFormat="{}{0:F2}" > - + </mahapps:DataGridNumericUpDownColumn> - + <mahapps:DataGridNumericUpDownColumn Header="STDEV" Minimum="0" Maximum="100" Binding="{Binding StdevStrainMaxLoad}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" StringFormat="{}{0:F2}" /> <mahapps:DataGridNumericUpDownColumn Header="% Change" Minimum="-100" Maximum="100" Binding="{Binding PercentChangeStrain, UpdateSourceTrigger=PropertyChanged}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDownWithTrigger}" StringFormat="{}{0:F2}"> @@ -515,45 +639,12 @@ </Style.Triggers> </Style> </mahapps:DataGridNumericUpDownColumn.CellStyle> - </mahapps:DataGridNumericUpDownColumn> + </mahapps:DataGridNumericUpDownColumn> </DataGrid.Columns> </DataGrid> </StackPanel> - <StackPanel x:Name="UniformityPanel" HorizontalAlignment="Center" Grid.Column="0" Grid.Row="2" > - <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0" FontSize="21"> Uniformity</TextBlock> - <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="20 10 40 10"> - <UniformGrid Columns="2" HorizontalAlignment="Left" MinWidth="{ Binding ElementName=RubbingResultsGrid, Path= ActualWidth }" > - <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <TextBlock FontWeight="Light" Margin="5 0 0 0" VerticalAlignment="Center">Uniformity</TextBlock> - </Border> - <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <TextBlock FontWeight="Light" VerticalAlignment="Center" Margin="5 0 0 0">Severity</TextBlock> - </Border> - <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}" > - <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Zone 1</TextBlock> - </Border> - <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> - <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding SelectedTab.TestResult.SeverityZone1Min,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" FontSize="16" MinWidth="26"></mahapps:NumericUpDown> - <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">-</TextBlock> - <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.SeverityZone1Max,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0 0 0 0" Width="Auto" FontSize="16" StringFormat="{}{0:F1}" ></mahapps:NumericUpDown> - </StackPanel> - </Border> - <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Zone 2</TextBlock> - </Border> - <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}"> - <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> - <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding SelectedTab.TestResult.SeverityZone2Min,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0" MaxWidth="20" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" FontSize="16" MinWidth="26"></mahapps:NumericUpDown> - <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">-</TextBlock> - <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding SelectedTab.TestResult.SeverityZone2Max,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0 0 0 0" Width="Auto" FontSize="16" StringFormat="{}{0:F1}" ></mahapps:NumericUpDown> - </StackPanel> - </Border> - </UniformGrid> - </Border> - </StackPanel> <StackPanel x:Name="COFPanel" HorizontalAlignment="Center" Grid.Column="1" Grid.Row="2" > <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0" FontSize="21"> COF</TextBlock> <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="0 10 20 10" > @@ -599,12 +690,13 @@ <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding SelectedTab.TestResult.ThreadLub,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0" MaxWidth="20" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" FontSize="16"></mahapps:NumericUpDown> </Border> </UniformGrid> - </Border> + </Border> </StackPanel> - </Grid> + </StackPanel> + </Grid> </ScrollViewer> - </Border> - + </Border> + <Grid Grid.Row="1" Grid.Column="1" Margin="0 0 20 20"> <Grid.ColumnDefinitions> <ColumnDefinition Width="120"/> diff --git a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs index 2b962d56b..19c027976 100644 --- a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs +++ b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs @@ -64,5 +64,21 @@ namespace Tango.BL.Builders } }); } + + public virtual RMLExtensionTestResultsCollectionBuilder WithWashingTestResults() + { + return AddStep(4, () => + { + foreach (var result in Entities.ToList()) + { + var tests = Context.RmlExtensionTestWashingResults.Where(x => x.RmlExtensionTestResultsGuid == result.Guid).ToList(); + foreach( var test in tests) + { + test.WashingTestMaterials = Context.WashingTestMaterials.FirstOrDefault(x => x.Guid == test.WashingTestMaterialsGuid); + } + + } + }); + } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTO.cs new file mode 100644 index 000000000..1e15767c8 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTO.cs @@ -0,0 +1,14 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.DTO +{ + public class RmlExtensionTestWashingResultDTO : RmlExtensionTestWashingResultDTOBase + { + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs new file mode 100644 index 000000000..9f98d4aa9 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs @@ -0,0 +1,57 @@ + +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; + +namespace Tango.BL.DTO +{ + public abstract class RmlExtensionTestWashingResultDTOBase : ObservableEntityDTO<RmlExtensionTestWashingResultDTO, RmlExtensionTestWashingResult> + { + + /// <summary> + /// rml extension test results guid + /// </summary> + public String RmlExtensionTestResultsGuid + { + get; set; + } + + /// <summary> + /// washing test materials guid + /// </summary> + public String WashingTestMaterialsGuid + { + get; set; + } + + /// <summary> + /// color + /// </summary> + public Int32 Color + { + get; set; + } + + /// <summary> + /// washing value + /// </summary> + public Nullable<Double> WashingValue + { + get; set; + } + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTO.cs new file mode 100644 index 000000000..f2c9ec25d --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTO.cs @@ -0,0 +1,14 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.DTO +{ + public class WashingTestMaterialDTO : WashingTestMaterialDTOBase + { + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTOBase.cs new file mode 100644 index 000000000..8c9bc0ff1 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTOBase.cs @@ -0,0 +1,33 @@ + +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; + +namespace Tango.BL.DTO +{ + public abstract class WashingTestMaterialDTOBase : ObservableEntityDTO<WashingTestMaterialDTO, WashingTestMaterial> + { + + /// <summary> + /// name + /// </summary> + public String Name + { + get; set; + } + + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs index 7f6804039..c53b14327 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs @@ -91,9 +91,11 @@ namespace Tango.BL.Entities public event EventHandler<SynchronizedObservableCollection<TensileResult>> TensileResultsChanged; + public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestResultsFile>> RmlExtensionTestResultsFilesChanged; + public event EventHandler<Machine> MachineChanged; - public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestResultsFile>> RmlExtensionTestResultsFilesChanged; + public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestWashingResult>> RmlExtensionTestWashingResultsChanged; public event EventHandler<SynchronizedObservableCollection<RubbingResult>> RubbingResultsChanged; @@ -1016,6 +1018,31 @@ namespace Tango.BL.Entities } } + protected SynchronizedObservableCollection<RmlExtensionTestResultsFile> _rmlextensiontestresultsfiles; + + /// <summary> + /// Gets or sets the rmlextensiontestresultbase rml extension test results files. + /// </summary> + + public virtual SynchronizedObservableCollection<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles + { + get + { + return _rmlextensiontestresultsfiles; + } + + set + { + if (_rmlextensiontestresultsfiles != value) + { + _rmlextensiontestresultsfiles = value; + + OnRmlExtensionTestResultsFilesChanged(value); + + } + } + } + protected Machine _machine; /// <summary> @@ -1048,26 +1075,26 @@ namespace Tango.BL.Entities } } - protected SynchronizedObservableCollection<RmlExtensionTestResultsFile> _rmlextensiontestresultsfiles; + protected SynchronizedObservableCollection<RmlExtensionTestWashingResult> _rmlextensiontestwashingresults; /// <summary> - /// Gets or sets the rmlextensiontestresultbase rml extension test results files. + /// Gets or sets the rmlextensiontestresultbase rml extension test washing results. /// </summary> - public virtual SynchronizedObservableCollection<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles + public virtual SynchronizedObservableCollection<RmlExtensionTestWashingResult> RmlExtensionTestWashingResults { get { - return _rmlextensiontestresultsfiles; + return _rmlextensiontestwashingresults; } set { - if (_rmlextensiontestresultsfiles != value) + if (_rmlextensiontestwashingresults != value) { - _rmlextensiontestresultsfiles = value; + _rmlextensiontestwashingresults = value; - OnRmlExtensionTestResultsFilesChanged(value); + OnRmlExtensionTestWashingResultsChanged(value); } } @@ -1387,6 +1414,15 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the RmlExtensionTestResultsFiles has changed. + /// </summary> + protected virtual void OnRmlExtensionTestResultsFilesChanged(SynchronizedObservableCollection<RmlExtensionTestResultsFile> rmlextensiontestresultsfiles) + { + RmlExtensionTestResultsFilesChanged?.Invoke(this, rmlextensiontestresultsfiles); + RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + } + + /// <summary> /// Called when the Machine has changed. /// </summary> protected virtual void OnMachineChanged(Machine machine) @@ -1396,12 +1432,12 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the RmlExtensionTestResultsFiles has changed. + /// Called when the RmlExtensionTestWashingResults has changed. /// </summary> - protected virtual void OnRmlExtensionTestResultsFilesChanged(SynchronizedObservableCollection<RmlExtensionTestResultsFile> rmlextensiontestresultsfiles) + protected virtual void OnRmlExtensionTestWashingResultsChanged(SynchronizedObservableCollection<RmlExtensionTestWashingResult> rmlextensiontestwashingresults) { - RmlExtensionTestResultsFilesChanged?.Invoke(this, rmlextensiontestresultsfiles); - RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + RmlExtensionTestWashingResultsChanged?.Invoke(this, rmlextensiontestwashingresults); + RaisePropertyChanged(nameof(RmlExtensionTestWashingResults)); } /// <summary> @@ -1423,6 +1459,8 @@ namespace Tango.BL.Entities RmlExtensionTestResultsFiles = new SynchronizedObservableCollection<RmlExtensionTestResultsFile>(); + RmlExtensionTestWashingResults = new SynchronizedObservableCollection<RmlExtensionTestWashingResult>(); + RubbingResults = new SynchronizedObservableCollection<RubbingResult>(); } diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs new file mode 100644 index 000000000..af8858e64 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.Entities +{ + public class RmlExtensionTestWashingResult: RmlExtensionTestWashingResultBase + { + public RmlExtensionTestWashingResult(): base() + { + + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs new file mode 100644 index 000000000..0927baa04 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs @@ -0,0 +1,251 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; + +namespace Tango.BL.Entities +{ + [Table("RML_EXTENSION_TEST_WASHING_RESULTS")] + public abstract class RmlExtensionTestWashingResultBase : ObservableEntity<RmlExtensionTestWashingResult> + { + + public event EventHandler<Int32> ColorChanged; + + public event EventHandler<Nullable<Double>> WashingValueChanged; + + public event EventHandler<RmlExtensionTestResult> RmlExtensionTestResultsChanged; + + public event EventHandler<WashingTestMaterial> WashingTestMaterialsChanged; + + protected String _rmlextensiontestresultsguid; + + /// <summary> + /// Gets or sets the rmlextensiontestwashingresultbase rml extension test results guid. + /// </summary> + + [Column("RML_EXTENSION_TEST_RESULTS_GUID")] + [ForeignKey("RmlExtensionTestResults")] + + public String RmlExtensionTestResultsGuid + { + get + { + return _rmlextensiontestresultsguid; + } + + set + { + if (_rmlextensiontestresultsguid != value) + { + _rmlextensiontestresultsguid = value; + + } + } + } + + protected String _washingtestmaterialsguid; + + /// <summary> + /// Gets or sets the rmlextensiontestwashingresultbase washing test materials guid. + /// </summary> + + [Column("WASHING_TEST_MATERIALS_GUID")] + [ForeignKey("WashingTestMaterials")] + + public String WashingTestMaterialsGuid + { + get + { + return _washingtestmaterialsguid; + } + + set + { + if (_washingtestmaterialsguid != value) + { + _washingtestmaterialsguid = value; + + } + } + } + + protected Int32 _color; + + /// <summary> + /// Gets or sets the rmlextensiontestwashingresultbase color. + /// </summary> + + [Column("COLOR")] + + public Int32 Color + { + get + { + return _color; + } + + set + { + if (_color != value) + { + _color = value; + + OnColorChanged(value); + + } + } + } + + protected Nullable<Double> _washingvalue; + + /// <summary> + /// Gets or sets the rmlextensiontestwashingresultbase washing value. + /// </summary> + + [Column("WASHING_VALUE")] + + public Nullable<Double> WashingValue + { + get + { + return _washingvalue; + } + + set + { + if (_washingvalue != value) + { + _washingvalue = value; + + OnWashingValueChanged(value); + + } + } + } + + protected RmlExtensionTestResult _rmlextensiontestresults; + + /// <summary> + /// Gets or sets the rmlextensiontestwashingresultbase rml extension test results. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual RmlExtensionTestResult RmlExtensionTestResults + { + get + { + return _rmlextensiontestresults; + } + + set + { + if (_rmlextensiontestresults != value) + { + _rmlextensiontestresults = value; + + if (RmlExtensionTestResults != null) + { + RmlExtensionTestResultsGuid = RmlExtensionTestResults.Guid; + } + + OnRmlExtensionTestResultsChanged(value); + + } + } + } + + protected WashingTestMaterial _washingtestmaterials; + + /// <summary> + /// Gets or sets the rmlextensiontestwashingresultbase washing test materials. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual WashingTestMaterial WashingTestMaterials + { + get + { + return _washingtestmaterials; + } + + set + { + if (_washingtestmaterials != value) + { + _washingtestmaterials = value; + + if (WashingTestMaterials != null) + { + WashingTestMaterialsGuid = WashingTestMaterials.Guid; + } + + OnWashingTestMaterialsChanged(value); + + } + } + } + + /// <summary> + /// Called when the Color has changed. + /// </summary> + protected virtual void OnColorChanged(Int32 color) + { + ColorChanged?.Invoke(this, color); + RaisePropertyChanged(nameof(Color)); + } + + /// <summary> + /// Called when the WashingValue has changed. + /// </summary> + protected virtual void OnWashingValueChanged(Nullable<Double> washingvalue) + { + WashingValueChanged?.Invoke(this, washingvalue); + RaisePropertyChanged(nameof(WashingValue)); + } + + /// <summary> + /// Called when the RmlExtensionTestResults has changed. + /// </summary> + protected virtual void OnRmlExtensionTestResultsChanged(RmlExtensionTestResult rmlextensiontestresults) + { + RmlExtensionTestResultsChanged?.Invoke(this, rmlextensiontestresults); + RaisePropertyChanged(nameof(RmlExtensionTestResults)); + } + + /// <summary> + /// Called when the WashingTestMaterials has changed. + /// </summary> + protected virtual void OnWashingTestMaterialsChanged(WashingTestMaterial washingtestmaterials) + { + WashingTestMaterialsChanged?.Invoke(this, washingtestmaterials); + RaisePropertyChanged(nameof(WashingTestMaterials)); + } + + /// <summary> + /// Initializes a new instance of the <see cref="RmlExtensionTestWashingResultBase" /> class. + /// </summary> + public RmlExtensionTestWashingResultBase() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterial.cs b/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterial.cs new file mode 100644 index 000000000..7cb6bd8e3 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterial.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.Entities +{ + public class WashingTestMaterial: WashingTestMaterialBase + { + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterialBase.cs b/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterialBase.cs new file mode 100644 index 000000000..84271403c --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterialBase.cs @@ -0,0 +1,114 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; + +namespace Tango.BL.Entities +{ + [Table("WASHING_TEST_MATERIALS")] + public abstract class WashingTestMaterialBase : ObservableEntity<WashingTestMaterial> + { + + public event EventHandler<String> NameChanged; + + public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestWashingResult>> RmlExtensionTestWashingResultsChanged; + + protected String _name; + + /// <summary> + /// Gets or sets the washingtestmaterialbase name. + /// </summary> + + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + if (_name != value) + { + _name = value; + + OnNameChanged(value); + + } + } + } + + protected SynchronizedObservableCollection<RmlExtensionTestWashingResult> _rmlextensiontestwashingresults; + + /// <summary> + /// Gets or sets the washingtestmaterialbase rml extension test washing results. + /// </summary> + + public virtual SynchronizedObservableCollection<RmlExtensionTestWashingResult> RmlExtensionTestWashingResults + { + get + { + return _rmlextensiontestwashingresults; + } + + set + { + if (_rmlextensiontestwashingresults != value) + { + _rmlextensiontestwashingresults = value; + + OnRmlExtensionTestWashingResultsChanged(value); + + } + } + } + + /// <summary> + /// Called when the Name has changed. + /// </summary> + protected virtual void OnNameChanged(String name) + { + NameChanged?.Invoke(this, name); + RaisePropertyChanged(nameof(Name)); + } + + /// <summary> + /// Called when the RmlExtensionTestWashingResults has changed. + /// </summary> + protected virtual void OnRmlExtensionTestWashingResultsChanged(SynchronizedObservableCollection<RmlExtensionTestWashingResult> rmlextensiontestwashingresults) + { + RmlExtensionTestWashingResultsChanged?.Invoke(this, rmlextensiontestwashingresults); + RaisePropertyChanged(nameof(RmlExtensionTestWashingResults)); + } + + /// <summary> + /// Initializes a new instance of the <see cref="WashingTestMaterialBase" /> class. + /// </summary> + public WashingTestMaterialBase() : base() + { + + RmlExtensionTestWashingResults = new SynchronizedObservableCollection<RmlExtensionTestWashingResult>(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs index f62ae38bd..c06af8ba5 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs @@ -167,6 +167,70 @@ namespace Tango.BL } /// <summary> + /// Gets or sets the RmlExtensionColorCalibrations. + /// </summary> + public DbSet<RmlExtensionColorCalibration> RmlExtensionColorCalibrations + { + get; set; + } + + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTests. + /// </summary> + public DbSet<RmlExtensionColorCalibrationsTest> RmlExtensionColorCalibrationsTests + { + get; set; + } + + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. + /// </summary> + public DbSet<RmlExtensionColorCalibrationsTestsLiquidData> RmlExtensionColorCalibrationsTestsLiquidData + { + get; set; + } + + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. + /// </summary> + public DbSet<RmlExtensionColorCalibrationsTestsLiquidDataPoint> RmlExtensionColorCalibrationsTestsLiquidDataPoints + { + get; set; + } + + /// <summary> + /// Gets or sets the RmlExtensionColorShades. + /// </summary> + public DbSet<RmlExtensionColorShade> RmlExtensionColorShades + { + get; set; + } + + /// <summary> + /// Gets or sets the RmlExtensionColorShadesTests. + /// </summary> + public DbSet<RmlExtensionColorShadesTest> RmlExtensionColorShadesTests + { + get; set; + } + + /// <summary> + /// Gets or sets the RmlExtensionColorShadesTestsData. + /// </summary> + public DbSet<RmlExtensionColorShadesTestsData> RmlExtensionColorShadesTestsData + { + get; set; + } + + /// <summary> + /// Gets or sets the RmlExtensionTestResultsFiles. + /// </summary> + public DbSet<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles + { + get; set; + } + + /// <summary> /// Gets or sets the ActionLogs. /// </summary> public DbSet<ActionLog> ActionLogs @@ -703,65 +767,9 @@ namespace Tango.BL } /// <summary> - /// Gets or sets the RmlExtensionColorCalibrations. - /// </summary> - public DbSet<RmlExtensionColorCalibration> RmlExtensionColorCalibrations - { - get; set; - } - - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTests. - /// </summary> - public DbSet<RmlExtensionColorCalibrationsTest> RmlExtensionColorCalibrationsTests - { - get; set; - } - - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. - /// </summary> - public DbSet<RmlExtensionColorCalibrationsTestsLiquidData> RmlExtensionColorCalibrationsTestsLiquidData - { - get; set; - } - - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. - /// </summary> - public DbSet<RmlExtensionColorCalibrationsTestsLiquidDataPoint> RmlExtensionColorCalibrationsTestsLiquidDataPoints - { - get; set; - } - - /// <summary> - /// Gets or sets the RmlExtensionColorShades. - /// </summary> - public DbSet<RmlExtensionColorShade> RmlExtensionColorShades - { - get; set; - } - - /// <summary> - /// Gets or sets the RmlExtensionColorShadesTests. - /// </summary> - public DbSet<RmlExtensionColorShadesTest> RmlExtensionColorShadesTests - { - get; set; - } - - /// <summary> - /// Gets or sets the RmlExtensionColorShadesTestsData. - /// </summary> - public DbSet<RmlExtensionColorShadesTestsData> RmlExtensionColorShadesTestsData - { - get; set; - } - - /// <summary> - /// Gets or sets the RmlExtensionTestResultsFiles. + /// Gets or sets the RmlExtensionTestWashingResults. /// </summary> - public DbSet<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles + public DbSet<RmlExtensionTestWashingResult> RmlExtensionTestWashingResults { get; set; } @@ -959,6 +967,14 @@ namespace Tango.BL } /// <summary> + /// Gets or sets the WashingTestMaterials. + /// </summary> + public DbSet<WashingTestMaterial> WashingTestMaterials + { + get; set; + } + + /// <summary> /// Gets or sets the WindingMethods. /// </summary> public DbSet<WindingMethod> WindingMethods diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs index a9d32e87d..d06377cf3 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs @@ -665,6 +665,294 @@ namespace Tango.BL } + private ObservableCollection<RmlExtensionColorCalibration> _rmlextensioncolorcalibrations; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrations. + /// </summary> + public ObservableCollection<RmlExtensionColorCalibration> RmlExtensionColorCalibrations + { + get + { + return _rmlextensioncolorcalibrations; + } + + set + { + _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationsViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrations View Source. + ///</summary> + public ICollectionView RmlExtensionColorCalibrationsViewSource + { + get + { + return _rmlextensioncolorcalibrationsViewSource; + } + + set + { + _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); + } + + } + + private ObservableCollection<RmlExtensionColorCalibrationsTest> _rmlextensioncolorcalibrationstests; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTests. + /// </summary> + public ObservableCollection<RmlExtensionColorCalibrationsTest> RmlExtensionColorCalibrationsTests + { + get + { + return _rmlextensioncolorcalibrationstests; + } + + set + { + _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTests View Source. + ///</summary> + public ICollectionView RmlExtensionColorCalibrationsTestsViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); + } + + } + + private ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> _rmlextensioncolorcalibrationstestsliquiddata; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. + /// </summary> + public ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> RmlExtensionColorCalibrationsTestsLiquidData + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddata; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source. + ///</summary> + public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddataViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); + } + + } + + private ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> _rmlextensioncolorcalibrationstestsliquiddatapoints; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. + /// </summary> + public ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> RmlExtensionColorCalibrationsTestsLiquidDataPoints + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddatapoints; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source. + ///</summary> + public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); + } + + } + + private ObservableCollection<RmlExtensionColorShade> _rmlextensioncolorshades; + /// <summary> + /// Gets or sets the RmlExtensionColorShades. + /// </summary> + public ObservableCollection<RmlExtensionColorShade> RmlExtensionColorShades + { + get + { + return _rmlextensioncolorshades; + } + + set + { + _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); + } + + } + + private ICollectionView _rmlextensioncolorshadesViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorShades View Source. + ///</summary> + public ICollectionView RmlExtensionColorShadesViewSource + { + get + { + return _rmlextensioncolorshadesViewSource; + } + + set + { + _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); + } + + } + + private ObservableCollection<RmlExtensionColorShadesTest> _rmlextensioncolorshadestests; + /// <summary> + /// Gets or sets the RmlExtensionColorShadesTests. + /// </summary> + public ObservableCollection<RmlExtensionColorShadesTest> RmlExtensionColorShadesTests + { + get + { + return _rmlextensioncolorshadestests; + } + + set + { + _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); + } + + } + + private ICollectionView _rmlextensioncolorshadestestsViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorShadesTests View Source. + ///</summary> + public ICollectionView RmlExtensionColorShadesTestsViewSource + { + get + { + return _rmlextensioncolorshadestestsViewSource; + } + + set + { + _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); + } + + } + + private ObservableCollection<RmlExtensionColorShadesTestsData> _rmlextensioncolorshadestestsdata; + /// <summary> + /// Gets or sets the RmlExtensionColorShadesTestsData. + /// </summary> + public ObservableCollection<RmlExtensionColorShadesTestsData> RmlExtensionColorShadesTestsData + { + get + { + return _rmlextensioncolorshadestestsdata; + } + + set + { + _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); + } + + } + + private ICollectionView _rmlextensioncolorshadestestsdataViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorShadesTestsData View Source. + ///</summary> + public ICollectionView RmlExtensionColorShadesTestsDataViewSource + { + get + { + return _rmlextensioncolorshadestestsdataViewSource; + } + + set + { + _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); + } + + } + + private ObservableCollection<RmlExtensionTestResultsFile> _rmlextensiontestresultsfiles; + /// <summary> + /// Gets or sets the RmlExtensionTestResultsFiles. + /// </summary> + public ObservableCollection<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles + { + get + { + return _rmlextensiontestresultsfiles; + } + + set + { + _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + } + + } + + private ICollectionView _rmlextensiontestresultsfilesViewSource; + /// <summary> + /// Gets or sets the RmlExtensionTestResultsFiles View Source. + ///</summary> + public ICollectionView RmlExtensionTestResultsFilesViewSource + { + get + { + return _rmlextensiontestresultsfilesViewSource; + } + + set + { + _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); + } + + } + private ObservableCollection<ActionLog> _actionlogs; /// <summary> /// Gets or sets the ActionLogs. @@ -3077,290 +3365,38 @@ namespace Tango.BL } - private ObservableCollection<RmlExtensionColorCalibration> _rmlextensioncolorcalibrations; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrations. - /// </summary> - public ObservableCollection<RmlExtensionColorCalibration> RmlExtensionColorCalibrations - { - get - { - return _rmlextensioncolorcalibrations; - } - - set - { - _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); - } - - } - - private ICollectionView _rmlextensioncolorcalibrationsViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrations View Source. - ///</summary> - public ICollectionView RmlExtensionColorCalibrationsViewSource - { - get - { - return _rmlextensioncolorcalibrationsViewSource; - } - - set - { - _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); - } - - } - - private ObservableCollection<RmlExtensionColorCalibrationsTest> _rmlextensioncolorcalibrationstests; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTests. - /// </summary> - public ObservableCollection<RmlExtensionColorCalibrationsTest> RmlExtensionColorCalibrationsTests - { - get - { - return _rmlextensioncolorcalibrationstests; - } - - set - { - _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); - } - - } - - private ICollectionView _rmlextensioncolorcalibrationstestsViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTests View Source. - ///</summary> - public ICollectionView RmlExtensionColorCalibrationsTestsViewSource - { - get - { - return _rmlextensioncolorcalibrationstestsViewSource; - } - - set - { - _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); - } - - } - - private ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> _rmlextensioncolorcalibrationstestsliquiddata; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. - /// </summary> - public ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> RmlExtensionColorCalibrationsTestsLiquidData - { - get - { - return _rmlextensioncolorcalibrationstestsliquiddata; - } - - set - { - _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); - } - - } - - private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source. - ///</summary> - public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource - { - get - { - return _rmlextensioncolorcalibrationstestsliquiddataViewSource; - } - - set - { - _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); - } - - } - - private ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> _rmlextensioncolorcalibrationstestsliquiddatapoints; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. - /// </summary> - public ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> RmlExtensionColorCalibrationsTestsLiquidDataPoints - { - get - { - return _rmlextensioncolorcalibrationstestsliquiddatapoints; - } - - set - { - _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); - } - - } - - private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source. - ///</summary> - public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource - { - get - { - return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; - } - - set - { - _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); - } - - } - - private ObservableCollection<RmlExtensionColorShade> _rmlextensioncolorshades; - /// <summary> - /// Gets or sets the RmlExtensionColorShades. - /// </summary> - public ObservableCollection<RmlExtensionColorShade> RmlExtensionColorShades - { - get - { - return _rmlextensioncolorshades; - } - - set - { - _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); - } - - } - - private ICollectionView _rmlextensioncolorshadesViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorShades View Source. - ///</summary> - public ICollectionView RmlExtensionColorShadesViewSource - { - get - { - return _rmlextensioncolorshadesViewSource; - } - - set - { - _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); - } - - } - - private ObservableCollection<RmlExtensionColorShadesTest> _rmlextensioncolorshadestests; - /// <summary> - /// Gets or sets the RmlExtensionColorShadesTests. - /// </summary> - public ObservableCollection<RmlExtensionColorShadesTest> RmlExtensionColorShadesTests - { - get - { - return _rmlextensioncolorshadestests; - } - - set - { - _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); - } - - } - - private ICollectionView _rmlextensioncolorshadestestsViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorShadesTests View Source. - ///</summary> - public ICollectionView RmlExtensionColorShadesTestsViewSource - { - get - { - return _rmlextensioncolorshadestestsViewSource; - } - - set - { - _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); - } - - } - - private ObservableCollection<RmlExtensionColorShadesTestsData> _rmlextensioncolorshadestestsdata; - /// <summary> - /// Gets or sets the RmlExtensionColorShadesTestsData. - /// </summary> - public ObservableCollection<RmlExtensionColorShadesTestsData> RmlExtensionColorShadesTestsData - { - get - { - return _rmlextensioncolorshadestestsdata; - } - - set - { - _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); - } - - } - - private ICollectionView _rmlextensioncolorshadestestsdataViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorShadesTestsData View Source. - ///</summary> - public ICollectionView RmlExtensionColorShadesTestsDataViewSource - { - get - { - return _rmlextensioncolorshadestestsdataViewSource; - } - - set - { - _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); - } - - } - - private ObservableCollection<RmlExtensionTestResultsFile> _rmlextensiontestresultsfiles; + private ObservableCollection<RmlExtensionTestWashingResult> _rmlextensiontestwashingresults; /// <summary> - /// Gets or sets the RmlExtensionTestResultsFiles. + /// Gets or sets the RmlExtensionTestWashingResults. /// </summary> - public ObservableCollection<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles + public ObservableCollection<RmlExtensionTestWashingResult> RmlExtensionTestWashingResults { get { - return _rmlextensiontestresultsfiles; + return _rmlextensiontestwashingresults; } set { - _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + _rmlextensiontestwashingresults = value; RaisePropertyChanged(nameof(RmlExtensionTestWashingResults)); } } - private ICollectionView _rmlextensiontestresultsfilesViewSource; + private ICollectionView _rmlextensiontestwashingresultsViewSource; /// <summary> - /// Gets or sets the RmlExtensionTestResultsFiles View Source. + /// Gets or sets the RmlExtensionTestWashingResults View Source. ///</summary> - public ICollectionView RmlExtensionTestResultsFilesViewSource + public ICollectionView RmlExtensionTestWashingResultsViewSource { get { - return _rmlextensiontestresultsfilesViewSource; + return _rmlextensiontestwashingresultsViewSource; } set { - _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); + _rmlextensiontestwashingresultsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestWashingResultsViewSource)); } } @@ -4229,6 +4265,42 @@ namespace Tango.BL } + private ObservableCollection<WashingTestMaterial> _washingtestmaterials; + /// <summary> + /// Gets or sets the WashingTestMaterials. + /// </summary> + public ObservableCollection<WashingTestMaterial> WashingTestMaterials + { + get + { + return _washingtestmaterials; + } + + set + { + _washingtestmaterials = value; RaisePropertyChanged(nameof(WashingTestMaterials)); + } + + } + + private ICollectionView _washingtestmaterialsViewSource; + /// <summary> + /// Gets or sets the WashingTestMaterials View Source. + ///</summary> + public ICollectionView WashingTestMaterialsViewSource + { + get + { + return _washingtestmaterialsViewSource; + } + + set + { + _washingtestmaterialsViewSource = value; RaisePropertyChanged(nameof(WashingTestMaterialsViewSource)); + } + + } + private ObservableCollection<WindingMethod> _windingmethods; /// <summary> /// Gets or sets the WindingMethods. @@ -4307,6 +4379,22 @@ namespace Tango.BL YarnWhiteShadesViewSource = CreateCollectionView(YarnWhiteShades); + RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations); + + RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests); + + RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData); + + RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints); + + RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades); + + RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests); + + RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData); + + RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles); + ActionLogsViewSource = CreateCollectionView(ActionLogs); AddressesViewSource = CreateCollectionView(Addresses); @@ -4441,21 +4529,7 @@ namespace Tango.BL PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions); - RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations); - - RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests); - - RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData); - - RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints); - - RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades); - - RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests); - - RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData); - - RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles); + RmlExtensionTestWashingResultsViewSource = CreateCollectionView(RmlExtensionTestWashingResults); RmlsViewSource = CreateCollectionView(Rmls); @@ -4505,6 +4579,8 @@ namespace Tango.BL UsersRolesViewSource = CreateCollectionView(UsersRoles); + WashingTestMaterialsViewSource = CreateCollectionView(WashingTestMaterials); + WindingMethodsViewSource = CreateCollectionView(WindingMethods); } diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs index e3b7a68ea..b40fbb618 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs @@ -665,6 +665,294 @@ namespace Tango.BL } + private ObservableCollection<RmlExtensionColorCalibration> _rmlextensioncolorcalibrations; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrations. + /// </summary> + public ObservableCollection<RmlExtensionColorCalibration> RmlExtensionColorCalibrations + { + get + { + return _rmlextensioncolorcalibrations; + } + + set + { + _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationsViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrations View Source. + ///</summary> + public ICollectionView RmlExtensionColorCalibrationsViewSource + { + get + { + return _rmlextensioncolorcalibrationsViewSource; + } + + set + { + _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); + } + + } + + private ObservableCollection<RmlExtensionColorCalibrationsTest> _rmlextensioncolorcalibrationstests; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTests. + /// </summary> + public ObservableCollection<RmlExtensionColorCalibrationsTest> RmlExtensionColorCalibrationsTests + { + get + { + return _rmlextensioncolorcalibrationstests; + } + + set + { + _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTests View Source. + ///</summary> + public ICollectionView RmlExtensionColorCalibrationsTestsViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); + } + + } + + private ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> _rmlextensioncolorcalibrationstestsliquiddata; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. + /// </summary> + public ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> RmlExtensionColorCalibrationsTestsLiquidData + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddata; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source. + ///</summary> + public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddataViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); + } + + } + + private ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> _rmlextensioncolorcalibrationstestsliquiddatapoints; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. + /// </summary> + public ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> RmlExtensionColorCalibrationsTestsLiquidDataPoints + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddatapoints; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source. + ///</summary> + public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); + } + + } + + private ObservableCollection<RmlExtensionColorShade> _rmlextensioncolorshades; + /// <summary> + /// Gets or sets the RmlExtensionColorShades. + /// </summary> + public ObservableCollection<RmlExtensionColorShade> RmlExtensionColorShades + { + get + { + return _rmlextensioncolorshades; + } + + set + { + _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); + } + + } + + private ICollectionView _rmlextensioncolorshadesViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorShades View Source. + ///</summary> + public ICollectionView RmlExtensionColorShadesViewSource + { + get + { + return _rmlextensioncolorshadesViewSource; + } + + set + { + _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); + } + + } + + private ObservableCollection<RmlExtensionColorShadesTest> _rmlextensioncolorshadestests; + /// <summary> + /// Gets or sets the RmlExtensionColorShadesTests. + /// </summary> + public ObservableCollection<RmlExtensionColorShadesTest> RmlExtensionColorShadesTests + { + get + { + return _rmlextensioncolorshadestests; + } + + set + { + _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); + } + + } + + private ICollectionView _rmlextensioncolorshadestestsViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorShadesTests View Source. + ///</summary> + public ICollectionView RmlExtensionColorShadesTestsViewSource + { + get + { + return _rmlextensioncolorshadestestsViewSource; + } + + set + { + _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); + } + + } + + private ObservableCollection<RmlExtensionColorShadesTestsData> _rmlextensioncolorshadestestsdata; + /// <summary> + /// Gets or sets the RmlExtensionColorShadesTestsData. + /// </summary> + public ObservableCollection<RmlExtensionColorShadesTestsData> RmlExtensionColorShadesTestsData + { + get + { + return _rmlextensioncolorshadestestsdata; + } + + set + { + _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); + } + + } + + private ICollectionView _rmlextensioncolorshadestestsdataViewSource; + /// <summary> + /// Gets or sets the RmlExtensionColorShadesTestsData View Source. + ///</summary> + public ICollectionView RmlExtensionColorShadesTestsDataViewSource + { + get + { + return _rmlextensioncolorshadestestsdataViewSource; + } + + set + { + _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); + } + + } + + private ObservableCollection<RmlExtensionTestResultsFile> _rmlextensiontestresultsfiles; + /// <summary> + /// Gets or sets the RmlExtensionTestResultsFiles. + /// </summary> + public ObservableCollection<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles + { + get + { + return _rmlextensiontestresultsfiles; + } + + set + { + _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + } + + } + + private ICollectionView _rmlextensiontestresultsfilesViewSource; + /// <summary> + /// Gets or sets the RmlExtensionTestResultsFiles View Source. + ///</summary> + public ICollectionView RmlExtensionTestResultsFilesViewSource + { + get + { + return _rmlextensiontestresultsfilesViewSource; + } + + set + { + _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); + } + + } + private ObservableCollection<ActionLog> _actionlogs; /// <summary> /// Gets or sets the ActionLogs. @@ -3077,290 +3365,38 @@ namespace Tango.BL } - private ObservableCollection<RmlExtensionColorCalibration> _rmlextensioncolorcalibrations; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrations. - /// </summary> - public ObservableCollection<RmlExtensionColorCalibration> RmlExtensionColorCalibrations - { - get - { - return _rmlextensioncolorcalibrations; - } - - set - { - _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); - } - - } - - private ICollectionView _rmlextensioncolorcalibrationsViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrations View Source. - ///</summary> - public ICollectionView RmlExtensionColorCalibrationsViewSource - { - get - { - return _rmlextensioncolorcalibrationsViewSource; - } - - set - { - _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); - } - - } - - private ObservableCollection<RmlExtensionColorCalibrationsTest> _rmlextensioncolorcalibrationstests; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTests. - /// </summary> - public ObservableCollection<RmlExtensionColorCalibrationsTest> RmlExtensionColorCalibrationsTests - { - get - { - return _rmlextensioncolorcalibrationstests; - } - - set - { - _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); - } - - } - - private ICollectionView _rmlextensioncolorcalibrationstestsViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTests View Source. - ///</summary> - public ICollectionView RmlExtensionColorCalibrationsTestsViewSource - { - get - { - return _rmlextensioncolorcalibrationstestsViewSource; - } - - set - { - _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); - } - - } - - private ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> _rmlextensioncolorcalibrationstestsliquiddata; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. - /// </summary> - public ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidData> RmlExtensionColorCalibrationsTestsLiquidData - { - get - { - return _rmlextensioncolorcalibrationstestsliquiddata; - } - - set - { - _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); - } - - } - - private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source. - ///</summary> - public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource - { - get - { - return _rmlextensioncolorcalibrationstestsliquiddataViewSource; - } - - set - { - _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); - } - - } - - private ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> _rmlextensioncolorcalibrationstestsliquiddatapoints; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. - /// </summary> - public ObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint> RmlExtensionColorCalibrationsTestsLiquidDataPoints - { - get - { - return _rmlextensioncolorcalibrationstestsliquiddatapoints; - } - - set - { - _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); - } - - } - - private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source. - ///</summary> - public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource - { - get - { - return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; - } - - set - { - _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); - } - - } - - private ObservableCollection<RmlExtensionColorShade> _rmlextensioncolorshades; - /// <summary> - /// Gets or sets the RmlExtensionColorShades. - /// </summary> - public ObservableCollection<RmlExtensionColorShade> RmlExtensionColorShades - { - get - { - return _rmlextensioncolorshades; - } - - set - { - _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); - } - - } - - private ICollectionView _rmlextensioncolorshadesViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorShades View Source. - ///</summary> - public ICollectionView RmlExtensionColorShadesViewSource - { - get - { - return _rmlextensioncolorshadesViewSource; - } - - set - { - _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); - } - - } - - private ObservableCollection<RmlExtensionColorShadesTest> _rmlextensioncolorshadestests; - /// <summary> - /// Gets or sets the RmlExtensionColorShadesTests. - /// </summary> - public ObservableCollection<RmlExtensionColorShadesTest> RmlExtensionColorShadesTests - { - get - { - return _rmlextensioncolorshadestests; - } - - set - { - _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); - } - - } - - private ICollectionView _rmlextensioncolorshadestestsViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorShadesTests View Source. - ///</summary> - public ICollectionView RmlExtensionColorShadesTestsViewSource - { - get - { - return _rmlextensioncolorshadestestsViewSource; - } - - set - { - _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); - } - - } - - private ObservableCollection<RmlExtensionColorShadesTestsData> _rmlextensioncolorshadestestsdata; - /// <summary> - /// Gets or sets the RmlExtensionColorShadesTestsData. - /// </summary> - public ObservableCollection<RmlExtensionColorShadesTestsData> RmlExtensionColorShadesTestsData - { - get - { - return _rmlextensioncolorshadestestsdata; - } - - set - { - _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); - } - - } - - private ICollectionView _rmlextensioncolorshadestestsdataViewSource; - /// <summary> - /// Gets or sets the RmlExtensionColorShadesTestsData View Source. - ///</summary> - public ICollectionView RmlExtensionColorShadesTestsDataViewSource - { - get - { - return _rmlextensioncolorshadestestsdataViewSource; - } - - set - { - _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); - } - - } - - private ObservableCollection<RmlExtensionTestResultsFile> _rmlextensiontestresultsfiles; + private ObservableCollection<RmlExtensionTestWashingResult> _rmlextensiontestwashingresults; /// <summary> - /// Gets or sets the RmlExtensionTestResultsFiles. + /// Gets or sets the RmlExtensionTestWashingResults. /// </summary> - public ObservableCollection<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles + public ObservableCollection<RmlExtensionTestWashingResult> RmlExtensionTestWashingResults { get { - return _rmlextensiontestresultsfiles; + return _rmlextensiontestwashingresults; } set { - _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + _rmlextensiontestwashingresults = value; RaisePropertyChanged(nameof(RmlExtensionTestWashingResults)); } } - private ICollectionView _rmlextensiontestresultsfilesViewSource; + private ICollectionView _rmlextensiontestwashingresultsViewSource; /// <summary> - /// Gets or sets the RmlExtensionTestResultsFiles View Source. + /// Gets or sets the RmlExtensionTestWashingResults View Source. ///</summary> - public ICollectionView RmlExtensionTestResultsFilesViewSource + public ICollectionView RmlExtensionTestWashingResultsViewSource { get { - return _rmlextensiontestresultsfilesViewSource; + return _rmlextensiontestwashingresultsViewSource; } set { - _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); + _rmlextensiontestwashingresultsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestWashingResultsViewSource)); } } @@ -4229,6 +4265,42 @@ namespace Tango.BL } + private ObservableCollection<WashingTestMaterial> _washingtestmaterials; + /// <summary> + /// Gets or sets the WashingTestMaterials. + /// </summary> + public ObservableCollection<WashingTestMaterial> WashingTestMaterials + { + get + { + return _washingtestmaterials; + } + + set + { + _washingtestmaterials = value; RaisePropertyChanged(nameof(WashingTestMaterials)); + } + + } + + private ICollectionView _washingtestmaterialsViewSource; + /// <summary> + /// Gets or sets the WashingTestMaterials View Source. + ///</summary> + public ICollectionView WashingTestMaterialsViewSource + { + get + { + return _washingtestmaterialsViewSource; + } + + set + { + _washingtestmaterialsViewSource = value; RaisePropertyChanged(nameof(WashingTestMaterialsViewSource)); + } + + } + private ObservableCollection<WindingMethod> _windingmethods; /// <summary> /// Gets or sets the WindingMethods. @@ -4307,6 +4379,22 @@ namespace Tango.BL YarnWhiteShadesViewSource = CreateCollectionView(YarnWhiteShades); + RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations); + + RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests); + + RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData); + + RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints); + + RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades); + + RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests); + + RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData); + + RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles); + ActionLogsViewSource = CreateCollectionView(ActionLogs); AddressesViewSource = CreateCollectionView(Addresses); @@ -4441,21 +4529,7 @@ namespace Tango.BL PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions); - RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations); - - RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests); - - RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData); - - RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints); - - RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades); - - RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests); - - RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData); - - RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles); + RmlExtensionTestWashingResultsViewSource = CreateCollectionView(RmlExtensionTestWashingResults); RmlsViewSource = CreateCollectionView(Rmls); @@ -4505,6 +4579,8 @@ namespace Tango.BL UsersRolesViewSource = CreateCollectionView(UsersRoles); + WashingTestMaterialsViewSource = CreateCollectionView(WashingTestMaterials); + WindingMethodsViewSource = CreateCollectionView(WindingMethods); } diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index 8bdb3b3f5..259b2ce6b 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -307,6 +307,8 @@ <Compile Include="DTO\RmlExtensionTestResultDTOBase.cs" /> <Compile Include="DTO\RmlExtensionTestResultsFileDTO.cs" /> <Compile Include="DTO\RmlExtensionTestResultsFileDTOBase.cs" /> + <Compile Include="DTO\RmlExtensionTestWashingResultDTO.cs" /> + <Compile Include="DTO\RmlExtensionTestWashingResultDTOBase.cs" /> <Compile Include="DTO\RmlsExtensionDTO.cs" /> <Compile Include="DTO\RmlsExtensionDTOBase.cs" /> <Compile Include="DTO\RmlsSpoolDTO.cs" /> @@ -357,6 +359,8 @@ <Compile Include="DTO\UserDTOBase.cs" /> <Compile Include="DTO\UsersRoleDTO.cs" /> <Compile Include="DTO\UsersRoleDTOBase.cs" /> + <Compile Include="DTO\WashingTestMaterialDTO.cs" /> + <Compile Include="DTO\WashingTestMaterialDTOBase.cs" /> <Compile Include="DTO\WindingMethodDTO.cs" /> <Compile Include="DTO\WindingMethodDTOBase.cs" /> <Compile Include="DTO\YarnApplicationDTO.cs" /> @@ -495,6 +499,8 @@ <Compile Include="Entities\RmlExtensionTestResultBase.cs" /> <Compile Include="Entities\RmlExtensionTestResultsFile.cs" /> <Compile Include="Entities\RmlExtensionTestResultsFileBase.cs" /> + <Compile Include="Entities\RmlExtensionTestWashingResult.cs" /> + <Compile Include="Entities\RmlExtensionTestWashingResultBase.cs" /> <Compile Include="Entities\RmlsExtension.cs" /> <Compile Include="Entities\RmlsExtensionBase.cs" /> <Compile Include="Entities\RmlsSpoolBase.cs" /> @@ -537,6 +543,8 @@ <Compile Include="Entities\TensileResultBase.cs" /> <Compile Include="Entities\UserBase.cs" /> <Compile Include="Entities\UsersRoleBase.cs" /> + <Compile Include="Entities\WashingTestMaterial.cs" /> + <Compile Include="Entities\WashingTestMaterialBase.cs" /> <Compile Include="Entities\WindingMethodBase.cs" /> <Compile Include="Entities\YarnApplication.cs" /> <Compile Include="Entities\YarnApplicationBase.cs" /> @@ -812,7 +820,7 @@ </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs index 5a4c082be..9f3026268 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs @@ -26,9 +26,9 @@ namespace Tango.DAL.Remote.DB public string RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID { get; set; } public string LIQUID_TYPE_GUID { get; set; } - public virtual LIQUID_TYPES LIQUID_TYPES { get; set; } public virtual RML_EXTENSION_COLOR_CALIBRATIONS_TESTS RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; } + public virtual LIQUID_TYPES LIQUID_TYPES { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs index c530978d8..e0543a58c 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs @@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB { this.TENSILE_RESULTS = new HashSet<TENSILE_RESULTS>(); this.RML_EXTENSION_TEST_RESULTS_FILES = new HashSet<RML_EXTENSION_TEST_RESULTS_FILES>(); + this.RML_EXTENSION_TEST_WASHING_RESULTS = new HashSet<RML_EXTENSION_TEST_WASHING_RESULTS>(); this.RUBBING_RESULTS = new HashSet<RUBBING_RESULTS>(); } @@ -61,9 +62,11 @@ namespace Tango.DAL.Remote.DB public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<TENSILE_RESULTS> TENSILE_RESULTS { get; set; } - public virtual MACHINE MACHINE { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<RML_EXTENSION_TEST_RESULTS_FILES> RML_EXTENSION_TEST_RESULTS_FILES { get; set; } + public virtual MACHINE MACHINE { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection<RML_EXTENSION_TEST_WASHING_RESULTS> RML_EXTENSION_TEST_WASHING_RESULTS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<RUBBING_RESULTS> RUBBING_RESULTS { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs new file mode 100644 index 000000000..c97f1ab73 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs @@ -0,0 +1,28 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class RML_EXTENSION_TEST_WASHING_RESULTS + { + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public string RML_EXTENSION_TEST_RESULTS_GUID { get; set; } + public string WASHING_TEST_MATERIALS_GUID { get; set; } + public int COLOR { get; set; } + public Nullable<double> WASHING_VALUE { get; set; } + + public virtual RML_EXTENSION_TEST_RESULTS RML_EXTENSION_TEST_RESULTS { get; set; } + public virtual WASHING_TEST_MATERIALS WASHING_TEST_MATERIALS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs index 504edd34b..a4879a500 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -43,6 +43,14 @@ namespace Tango.DAL.Remote.DB public virtual DbSet<YARN_TEXTURINGS> YARN_TEXTURINGS { get; set; } public virtual DbSet<YARN_TYPES> YARN_TYPES { get; set; } public virtual DbSet<YARN_WHITE_SHADES> YARN_WHITE_SHADES { get; set; } + public virtual DbSet<RML_EXTENSION_COLOR_CALIBRATIONS> RML_EXTENSION_COLOR_CALIBRATIONS { get; set; } + public virtual DbSet<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } + public virtual DbSet<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA { get; set; } + public virtual DbSet<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; } + public virtual DbSet<RML_EXTENSION_COLOR_SHADES> RML_EXTENSION_COLOR_SHADES { get; set; } + public virtual DbSet<RML_EXTENSION_COLOR_SHADES_TESTS> RML_EXTENSION_COLOR_SHADES_TESTS { get; set; } + public virtual DbSet<RML_EXTENSION_COLOR_SHADES_TESTS_DATA> RML_EXTENSION_COLOR_SHADES_TESTS_DATA { get; set; } + public virtual DbSet<RML_EXTENSION_TEST_RESULTS_FILES> RML_EXTENSION_TEST_RESULTS_FILES { get; set; } public virtual DbSet<ACTION_LOGS> ACTION_LOGS { get; set; } public virtual DbSet<ADDRESS> ADDRESSES { get; set; } public virtual DbSet<APPLICATION_DISPLAY_PANEL_VERSIONS> APPLICATION_DISPLAY_PANEL_VERSIONS { get; set; } @@ -110,14 +118,7 @@ namespace Tango.DAL.Remote.DB public virtual DbSet<PROCESS_PARAMETERS_TABLES_GROUPS> PROCESS_PARAMETERS_TABLES_GROUPS { get; set; } public virtual DbSet<PUBLISHED_PROCEDURE_PROJECTS> PUBLISHED_PROCEDURE_PROJECTS { get; set; } public virtual DbSet<PUBLISHED_PROCEDURE_PROJECTS_VERSIONS> PUBLISHED_PROCEDURE_PROJECTS_VERSIONS { get; set; } - public virtual DbSet<RML_EXTENSION_COLOR_CALIBRATIONS> RML_EXTENSION_COLOR_CALIBRATIONS { get; set; } - public virtual DbSet<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } - public virtual DbSet<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA { get; set; } - public virtual DbSet<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; } - public virtual DbSet<RML_EXTENSION_COLOR_SHADES> RML_EXTENSION_COLOR_SHADES { get; set; } - public virtual DbSet<RML_EXTENSION_COLOR_SHADES_TESTS> RML_EXTENSION_COLOR_SHADES_TESTS { get; set; } - public virtual DbSet<RML_EXTENSION_COLOR_SHADES_TESTS_DATA> RML_EXTENSION_COLOR_SHADES_TESTS_DATA { get; set; } - public virtual DbSet<RML_EXTENSION_TEST_RESULTS_FILES> RML_EXTENSION_TEST_RESULTS_FILES { get; set; } + public virtual DbSet<RML_EXTENSION_TEST_WASHING_RESULTS> RML_EXTENSION_TEST_WASHING_RESULTS { get; set; } public virtual DbSet<RML> RMLS { get; set; } public virtual DbSet<RMLS_SPOOLS> RMLS_SPOOLS { get; set; } public virtual DbSet<ROLE> ROLES { get; set; } @@ -142,6 +143,7 @@ namespace Tango.DAL.Remote.DB public virtual DbSet<TECH_VALVES> TECH_VALVES { get; set; } public virtual DbSet<USER> USERS { get; set; } public virtual DbSet<USERS_ROLES> USERS_ROLES { get; set; } + public virtual DbSet<WASHING_TEST_MATERIALS> WASHING_TEST_MATERIALS { get; set; } public virtual DbSet<WINDING_METHODS> WINDING_METHODS { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index ed6e629ac..f367a5aa0 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -1230,6 +1230,18 @@ <Property Name="FILE_NAME" Type="nvarchar" MaxLength="100" Nullable="false" /> <Property Name="FILE_PATH" Type="nvarchar(max)" Nullable="false" /> </EntityType> + <EntityType Name="RML_EXTENSION_TEST_WASHING_RESULTS"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" /> + <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" /> + <Property Name="RML_EXTENSION_TEST_RESULTS_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="WASHING_TEST_MATERIALS_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="COLOR" Type="int" Nullable="false" /> + <Property Name="WASHING_VALUE" Type="float" /> + </EntityType> <EntityType Name="RMLS"> <Key> <PropertyRef Name="GUID" /> @@ -1653,6 +1665,15 @@ <Property Name="USER_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="ROLE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> </EntityType> + <EntityType Name="WASHING_TEST_MATERIALS"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" /> + <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" /> + <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> + </EntityType> <EntityType Name="WINDING_METHODS"> <Key> <PropertyRef Name="GUID" /> @@ -2841,6 +2862,34 @@ </Dependent> </ReferentialConstraint> </Association> + <Association Name="FK_RML_EXTENSION_TEST_WASHING_RESULTS_RML_EXTENSION_TEST_RESULTS"> + <End Role="RML_EXTENSION_TEST_RESULTS" Type="Self.RML_EXTENSION_TEST_RESULTS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Role="RML_EXTENSION_TEST_WASHING_RESULTS" Type="Self.RML_EXTENSION_TEST_WASHING_RESULTS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="RML_EXTENSION_TEST_RESULTS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RML_EXTENSION_TEST_WASHING_RESULTS"> + <PropertyRef Name="RML_EXTENSION_TEST_RESULTS_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_RML_EXTENSION_TEST_WASHING_RESULTS_WASHING_TEST_MATERIALS"> + <End Role="WASHING_TEST_MATERIALS" Type="Self.WASHING_TEST_MATERIALS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Role="RML_EXTENSION_TEST_WASHING_RESULTS" Type="Self.RML_EXTENSION_TEST_WASHING_RESULTS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="WASHING_TEST_MATERIALS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RML_EXTENSION_TEST_WASHING_RESULTS"> + <PropertyRef Name="WASHING_TEST_MATERIALS_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> <Association Name="FK_RML_FIBER_SHAPES"> <End Role="FIBER_SHAPES" Type="Self.FIBER_SHAPES" Multiplicity="1" /> <End Role="RMLS" Type="Self.RMLS" Multiplicity="*" /> @@ -3499,6 +3548,7 @@ <EntitySet Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" EntityType="Self.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Schema="dbo" store:Type="Tables" /> <EntitySet Name="RML_EXTENSION_TEST_RESULTS" EntityType="Self.RML_EXTENSION_TEST_RESULTS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="RML_EXTENSION_TEST_RESULTS_FILES" EntityType="Self.RML_EXTENSION_TEST_RESULTS_FILES" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="RML_EXTENSION_TEST_WASHING_RESULTS" EntityType="Self.RML_EXTENSION_TEST_WASHING_RESULTS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="RMLS" EntityType="Self.RMLS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="RMLS_EXTENSIONS" EntityType="Self.RMLS_EXTENSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="RMLS_SPOOLS" EntityType="Self.RMLS_SPOOLS" Schema="dbo" store:Type="Tables" /> @@ -3526,6 +3576,7 @@ <EntitySet Name="TENSILE_RESULTS" EntityType="Self.TENSILE_RESULTS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="USERS" EntityType="Self.USERS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="USERS_ROLES" EntityType="Self.USERS_ROLES" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="WASHING_TEST_MATERIALS" EntityType="Self.WASHING_TEST_MATERIALS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="WINDING_METHODS" EntityType="Self.WINDING_METHODS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="YARN_APPLICATIONS" EntityType="Self.YARN_APPLICATIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="YARN_BRANDS" EntityType="Self.YARN_BRANDS" Schema="dbo" store:Type="Tables" /> @@ -3862,6 +3913,14 @@ <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" /> <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" /> </AssociationSet> + <AssociationSet Name="FK_RML_EXTENSION_TEST_WASHING_RESULTS_RML_EXTENSION_TEST_RESULTS" Association="Self.FK_RML_EXTENSION_TEST_WASHING_RESULTS_RML_EXTENSION_TEST_RESULTS"> + <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" /> + <End Role="RML_EXTENSION_TEST_WASHING_RESULTS" EntitySet="RML_EXTENSION_TEST_WASHING_RESULTS" /> + </AssociationSet> + <AssociationSet Name="FK_RML_EXTENSION_TEST_WASHING_RESULTS_WASHING_TEST_MATERIALS" Association="Self.FK_RML_EXTENSION_TEST_WASHING_RESULTS_WASHING_TEST_MATERIALS"> + <End Role="WASHING_TEST_MATERIALS" EntitySet="WASHING_TEST_MATERIALS" /> + <End Role="RML_EXTENSION_TEST_WASHING_RESULTS" EntitySet="RML_EXTENSION_TEST_WASHING_RESULTS" /> + </AssociationSet> <AssociationSet Name="FK_RML_FIBER_SHAPES" Association="Self.FK_RML_FIBER_SHAPES"> <End Role="FIBER_SHAPES" EntitySet="FIBER_SHAPES" /> <End Role="RMLS" EntitySet="RMLS" /> @@ -4126,6 +4185,46 @@ <End Role="YARN_WHITE_SHADES" EntitySet="YARN_WHITE_SHADES" /> <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" /> </AssociationSet> + <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS" EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS" /> + <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" /> + <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" /> + <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" /> + <EntitySet Name="RML_EXTENSION_COLOR_SHADES" EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES" /> + <EntitySet Name="RML_EXTENSION_COLOR_SHADES_TESTS" EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS" /> + <EntitySet Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" /> + <EntitySet Name="RML_EXTENSION_TEST_RESULTS_FILES" EntityType="RemoteModel.RML_EXTENSION_TEST_RESULTS_FILES" /> + <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS"> + <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" /> + <End Role="RML_EXTENSION_COLOR_CALIBRATIONS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS" /> + </AssociationSet> + <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS"> + <End Role="RML_EXTENSION_COLOR_CALIBRATIONS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS" /> + <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" /> + </AssociationSet> + <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> + <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" /> + <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" /> + </AssociationSet> + <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> + <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" /> + <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" /> + </AssociationSet> + <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1" Association="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1"> + <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" /> + <End Role="RML_EXTENSION_COLOR_SHADES" EntitySet="RML_EXTENSION_COLOR_SHADES" /> + </AssociationSet> + <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES" Association="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES"> + <End Role="RML_EXTENSION_COLOR_SHADES" EntitySet="RML_EXTENSION_COLOR_SHADES" /> + <End Role="RML_EXTENSION_COLOR_SHADES_TESTS" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS" /> + </AssociationSet> + <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS" Association="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS"> + <End Role="RML_EXTENSION_COLOR_SHADES_TESTS" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS" /> + <End Role="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" /> + </AssociationSet> + <AssociationSet Name="FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS" Association="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS"> + <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" /> + <End Role="RML_EXTENSION_TEST_RESULTS_FILES" EntitySet="RML_EXTENSION_TEST_RESULTS_FILES" /> + </AssociationSet> <EntitySet Name="ACTION_LOGS" EntityType="RemoteModel.ACTION_LOGS" /> <EntitySet Name="ADDRESSES" EntityType="RemoteModel.ADDRESS" /> <EntitySet Name="APPLICATION_DISPLAY_PANEL_VERSIONS" EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" /> @@ -4193,14 +4292,7 @@ <EntitySet Name="PROCESS_PARAMETERS_TABLES_GROUPS" EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" /> <EntitySet Name="PUBLISHED_PROCEDURE_PROJECTS" EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" /> <EntitySet Name="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" /> - <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS" EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS" /> - <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" /> - <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" /> - <EntitySet Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" EntityType="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" /> - <EntitySet Name="RML_EXTENSION_COLOR_SHADES" EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES" /> - <EntitySet Name="RML_EXTENSION_COLOR_SHADES_TESTS" EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS" /> - <EntitySet Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" EntityType="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" /> - <EntitySet Name="RML_EXTENSION_TEST_RESULTS_FILES" EntityType="RemoteModel.RML_EXTENSION_TEST_RESULTS_FILES" /> + <EntitySet Name="RML_EXTENSION_TEST_WASHING_RESULTS" EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" /> <EntitySet Name="RMLS" EntityType="RemoteModel.RML" /> <EntitySet Name="RMLS_SPOOLS" EntityType="RemoteModel.RMLS_SPOOLS" /> <EntitySet Name="ROLES" EntityType="RemoteModel.ROLE" /> @@ -4225,6 +4317,7 @@ <EntitySet Name="TECH_VALVES" EntityType="RemoteModel.TECH_VALVES" /> <EntitySet Name="USERS" EntityType="RemoteModel.USER" /> <EntitySet Name="USERS_ROLES" EntityType="RemoteModel.USERS_ROLES" /> + <EntitySet Name="WASHING_TEST_MATERIALS" EntityType="RemoteModel.WASHING_TEST_MATERIALS" /> <EntitySet Name="WINDING_METHODS" EntityType="RemoteModel.WINDING_METHODS" /> <AssociationSet Name="FK_ACTION_LOGS_USERS" Association="RemoteModel.FK_ACTION_LOGS_USERS"> <End Role="USER" EntitySet="USERS" /> @@ -4578,42 +4671,18 @@ <End Role="PUBLISHED_PROCEDURE_PROJECTS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS" /> <End Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" /> </AssociationSet> - <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS"> - <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" /> - <End Role="RML_EXTENSION_COLOR_CALIBRATIONS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS" /> - </AssociationSet> - <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS"> - <End Role="RML_EXTENSION_COLOR_CALIBRATIONS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS" /> - <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" /> - </AssociationSet> - <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> - <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" /> - <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" /> - </AssociationSet> - <AssociationSet Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Association="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> - <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" /> - <End Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" EntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" /> - </AssociationSet> - <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1" Association="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1"> - <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" /> - <End Role="RML_EXTENSION_COLOR_SHADES" EntitySet="RML_EXTENSION_COLOR_SHADES" /> - </AssociationSet> - <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES" Association="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES"> - <End Role="RML_EXTENSION_COLOR_SHADES" EntitySet="RML_EXTENSION_COLOR_SHADES" /> - <End Role="RML_EXTENSION_COLOR_SHADES_TESTS" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS" /> - </AssociationSet> - <AssociationSet Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS" Association="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS"> - <End Role="RML_EXTENSION_COLOR_SHADES_TESTS" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS" /> - <End Role="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" /> - </AssociationSet> - <AssociationSet Name="FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS" Association="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS"> + <AssociationSet Name="FK_RML_EXTENSION_TEST_WASHING_RESULTS_RML_EXTENSION_TEST_RESULTS" Association="RemoteModel.FK_RML_EXTENSION_TEST_WASHING_RESULTS_RML_EXTENSION_TEST_RESULTS"> <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" /> - <End Role="RML_EXTENSION_TEST_RESULTS_FILES" EntitySet="RML_EXTENSION_TEST_RESULTS_FILES" /> + <End Role="RML_EXTENSION_TEST_WASHING_RESULTS" EntitySet="RML_EXTENSION_TEST_WASHING_RESULTS" /> </AssociationSet> <AssociationSet Name="FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS" Association="RemoteModel.FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS"> <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" /> <End Role="RUBBING_RESULTS" EntitySet="RUBBING_RESULTS" /> </AssociationSet> + <AssociationSet Name="FK_RML_EXTENSION_TEST_WASHING_RESULTS_WASHING_TEST_MATERIALS" Association="RemoteModel.FK_RML_EXTENSION_TEST_WASHING_RESULTS_WASHING_TEST_MATERIALS"> + <End Role="WASHING_TEST_MATERIALS" EntitySet="WASHING_TEST_MATERIALS" /> + <End Role="RML_EXTENSION_TEST_WASHING_RESULTS" EntitySet="RML_EXTENSION_TEST_WASHING_RESULTS" /> + </AssociationSet> <AssociationSet Name="FK_RMLS_EXTENSIONS_RMLS" Association="RemoteModel.FK_RMLS_EXTENSIONS_RMLS"> <End Role="RML" EntitySet="RMLS" /> <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" /> @@ -4769,8 +4838,9 @@ <Property Name="THREAD_LUB" Type="Double" /> <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_RMLS_EXTENSIONS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RMLS_EXTENSIONS" /> <NavigationProperty Name="TENSILE_RESULTS" Relationship="RemoteModel.FK_TENSILE_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="TENSILE_RESULTS" /> - <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_MACHINES" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="MACHINE" /> <NavigationProperty Name="RML_EXTENSION_TEST_RESULTS_FILES" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RML_EXTENSION_TEST_RESULTS_FILES" /> + <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_MACHINES" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="MACHINE" /> + <NavigationProperty Name="RML_EXTENSION_TEST_WASHING_RESULTS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_WASHING_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RML_EXTENSION_TEST_WASHING_RESULTS" /> <NavigationProperty Name="RUBBING_RESULTS" Relationship="RemoteModel.FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RUBBING_RESULTS" /> </EntityType> <EntityType Name="RMLS_EXTENSIONS"> @@ -5141,6 +5211,231 @@ </Dependent> </ReferentialConstraint> </Association> + <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="RMLS_EXTENSIONS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS" ToRole="RMLS_EXTENSIONS" /> + <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" /> + <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_MACHINES" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS" ToRole="MACHINE" /> + </EntityType> + <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> + <Property Name="RML_EXTENSION_COLOR_CALIBRATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS" /> + <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" /> + </EntityType> + <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" /> + <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" /> + <NavigationProperty Name="LIQUID_TYPES" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_LIQUID_TYPES" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" ToRole="LIQUID_TYPES" /> + </EntityType> + <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="INK" Type="Double" Nullable="false" /> + <Property Name="L" Type="Double" Nullable="false" /> + <Property Name="A" Type="Double" Nullable="false" /> + <Property Name="B" Type="Double" Nullable="false" /> + <Property Name="CALCULATED_POINT" Type="Double" Nullable="false" /> + <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" /> + </EntityType> + <EntityType Name="RML_EXTENSION_COLOR_SHADES"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="RMLS_EXTENSIONS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1" FromRole="RML_EXTENSION_COLOR_SHADES" ToRole="RMLS_EXTENSIONS" /> + <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES_TESTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES" FromRole="RML_EXTENSION_COLOR_SHADES" ToRole="RML_EXTENSION_COLOR_SHADES_TESTS" /> + <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_MACHINES" FromRole="RML_EXTENSION_COLOR_SHADES" ToRole="MACHINE" /> + </EntityType> + <EntityType Name="RML_EXTENSION_COLOR_SHADES_TESTS"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="RML_EXTENSION_COLOR_SHADES_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" /> + <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES" FromRole="RML_EXTENSION_COLOR_SHADES_TESTS" ToRole="RML_EXTENSION_COLOR_SHADES" /> + <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS" FromRole="RML_EXTENSION_COLOR_SHADES_TESTS" ToRole="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" /> + </EntityType> + <EntityType Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="COLOR_NUM" Type="Int32" Nullable="false" /> + <Property Name="L" Type="Double" Nullable="false" /> + <Property Name="A" Type="Double" Nullable="false" /> + <Property Name="B" Type="Double" Nullable="false" /> + <Property Name="C" Type="Double" /> + <Property Name="M" Type="Double" /> + <Property Name="Y" Type="Double" /> + <Property Name="K" Type="Double" /> + <Property Name="TI" Type="Double" /> + <Property Name="L_RES" Type="Double" Nullable="false" /> + <Property Name="A_RES" Type="Double" Nullable="false" /> + <Property Name="B_RES" Type="Double" Nullable="false" /> + <Property Name="DELTA_E" Type="Double" Nullable="false" /> + <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES_TESTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS" FromRole="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" ToRole="RML_EXTENSION_COLOR_SHADES_TESTS" /> + </EntityType> + <EntityType Name="RML_EXTENSION_TEST_RESULTS_FILES"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="RML_EXTENSION_TEST_RESULTS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="FILE_NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" /> + <Property Name="FILE_PATH" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" /> + <NavigationProperty Name="RML_EXTENSION_TEST_RESULTS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS_FILES" ToRole="RML_EXTENSION_TEST_RESULTS" /> + </EntityType> + <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS"> + <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS" Role="RML_EXTENSION_COLOR_CALIBRATIONS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="RMLS_EXTENSIONS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS"> + <PropertyRef Name="RMLS_EXTENSIONS_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS"> + <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS" Role="RML_EXTENSION_COLOR_CALIBRATIONS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="RML_EXTENSION_COLOR_CALIBRATIONS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> + <PropertyRef Name="RML_EXTENSION_COLOR_CALIBRATION_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> + <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> + <PropertyRef Name="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> + <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS"> + <PropertyRef Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1"> + <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES" Role="RML_EXTENSION_COLOR_SHADES" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="RMLS_EXTENSIONS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RML_EXTENSION_COLOR_SHADES"> + <PropertyRef Name="RMLS_EXTENSIONS_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES"> + <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES" Role="RML_EXTENSION_COLOR_SHADES" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS" Role="RML_EXTENSION_COLOR_SHADES_TESTS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="RML_EXTENSION_COLOR_SHADES"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RML_EXTENSION_COLOR_SHADES_TESTS"> + <PropertyRef Name="RML_EXTENSION_COLOR_SHADES_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS"> + <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS" Role="RML_EXTENSION_COLOR_SHADES_TESTS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Role="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="RML_EXTENSION_COLOR_SHADES_TESTS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RML_EXTENSION_COLOR_SHADES_TESTS_DATA"> + <PropertyRef Name="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS"> + <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS" Role="RML_EXTENSION_TEST_RESULTS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS_FILES" Role="RML_EXTENSION_TEST_RESULTS_FILES" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="RML_EXTENSION_TEST_RESULTS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RML_EXTENSION_TEST_RESULTS_FILES"> + <PropertyRef Name="RML_EXTENSION_TEST_RESULTS_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> <EntityType Name="ACTION_LOGS"> <Key> <PropertyRef Name="GUID" /> @@ -6325,108 +6620,7 @@ <Property Name="PROJECT_JSON_STRING" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" /> <NavigationProperty Name="PUBLISHED_PROCEDURE_PROJECTS" Relationship="RemoteModel.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" FromRole="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" ToRole="PUBLISHED_PROCEDURE_PROJECTS" /> </EntityType> - <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS"> - <Key> - <PropertyRef Name="GUID" /> - </Key> - <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> - <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> - <Property Name="RMLS_EXTENSIONS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_MACHINES" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS" ToRole="MACHINE" /> - <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS" ToRole="RMLS_EXTENSIONS" /> - <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" /> - </EntityType> - <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> - <Key> - <PropertyRef Name="GUID" /> - </Key> - <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> - <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> - <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> - <Property Name="RML_EXTENSION_COLOR_CALIBRATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS" /> - <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" /> - </EntityType> - <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> - <Key> - <PropertyRef Name="GUID" /> - </Key> - <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> - <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> - <Property Name="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <NavigationProperty Name="LIQUID_TYPES" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_LIQUID_TYPES" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" ToRole="LIQUID_TYPES" /> - <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" /> - <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" /> - </EntityType> - <EntityType Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS"> - <Key> - <PropertyRef Name="GUID" /> - </Key> - <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> - <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> - <Property Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="INK" Type="Double" Nullable="false" /> - <Property Name="L" Type="Double" Nullable="false" /> - <Property Name="A" Type="Double" Nullable="false" /> - <Property Name="B" Type="Double" Nullable="false" /> - <Property Name="CALCULATED_POINT" Type="Double" Nullable="false" /> - <NavigationProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" FromRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" ToRole="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" /> - </EntityType> - <EntityType Name="RML_EXTENSION_COLOR_SHADES"> - <Key> - <PropertyRef Name="GUID" /> - </Key> - <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> - <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> - <Property Name="RMLS_EXTENSIONS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_MACHINES" FromRole="RML_EXTENSION_COLOR_SHADES" ToRole="MACHINE" /> - <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1" FromRole="RML_EXTENSION_COLOR_SHADES" ToRole="RMLS_EXTENSIONS" /> - <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES_TESTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES" FromRole="RML_EXTENSION_COLOR_SHADES" ToRole="RML_EXTENSION_COLOR_SHADES_TESTS" /> - </EntityType> - <EntityType Name="RML_EXTENSION_COLOR_SHADES_TESTS"> - <Key> - <PropertyRef Name="GUID" /> - </Key> - <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> - <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> - <Property Name="RML_EXTENSION_COLOR_SHADES_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" /> - <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES" FromRole="RML_EXTENSION_COLOR_SHADES_TESTS" ToRole="RML_EXTENSION_COLOR_SHADES" /> - <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS" FromRole="RML_EXTENSION_COLOR_SHADES_TESTS" ToRole="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" /> - </EntityType> - <EntityType Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA"> - <Key> - <PropertyRef Name="GUID" /> - </Key> - <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> - <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> - <Property Name="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="COLOR_NUM" Type="Int32" Nullable="false" /> - <Property Name="L" Type="Double" Nullable="false" /> - <Property Name="A" Type="Double" Nullable="false" /> - <Property Name="B" Type="Double" Nullable="false" /> - <Property Name="C" Type="Double" /> - <Property Name="M" Type="Double" /> - <Property Name="Y" Type="Double" /> - <Property Name="K" Type="Double" /> - <Property Name="TI" Type="Double" /> - <Property Name="L_RES" Type="Double" Nullable="false" /> - <Property Name="A_RES" Type="Double" Nullable="false" /> - <Property Name="B_RES" Type="Double" Nullable="false" /> - <Property Name="DELTA_E" Type="Double" Nullable="false" /> - <NavigationProperty Name="RML_EXTENSION_COLOR_SHADES_TESTS" Relationship="RemoteModel.FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS" FromRole="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" ToRole="RML_EXTENSION_COLOR_SHADES_TESTS" /> - </EntityType> - <EntityType Name="RML_EXTENSION_TEST_RESULTS_FILES"> + <EntityType Name="RML_EXTENSION_TEST_WASHING_RESULTS"> <Key> <PropertyRef Name="GUID" /> </Key> @@ -6434,9 +6628,11 @@ <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> <Property Name="RML_EXTENSION_TEST_RESULTS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="FILE_NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" /> - <Property Name="FILE_PATH" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" /> - <NavigationProperty Name="RML_EXTENSION_TEST_RESULTS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS_FILES" ToRole="RML_EXTENSION_TEST_RESULTS" /> + <Property Name="WASHING_TEST_MATERIALS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="COLOR" Type="Int32" Nullable="false" /> + <Property Name="WASHING_VALUE" Type="Double" /> + <NavigationProperty Name="RML_EXTENSION_TEST_RESULTS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_WASHING_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_WASHING_RESULTS" ToRole="RML_EXTENSION_TEST_RESULTS" /> + <NavigationProperty Name="WASHING_TEST_MATERIALS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_WASHING_RESULTS_WASHING_TEST_MATERIALS" FromRole="RML_EXTENSION_TEST_WASHING_RESULTS" ToRole="WASHING_TEST_MATERIALS" /> </EntityType> <EntityType Name="RML"> <Key> @@ -6859,6 +7055,16 @@ <NavigationProperty Name="ROLE" Relationship="RemoteModel.FK_USERS_ROLES_ROLES" FromRole="USERS_ROLES" ToRole="ROLE" /> <NavigationProperty Name="USER" Relationship="RemoteModel.FK_USERS_ROLES_USERS" FromRole="USERS_ROLES" ToRole="USER" /> </EntityType> + <EntityType Name="WASHING_TEST_MATERIALS"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> + <NavigationProperty Name="RML_EXTENSION_TEST_WASHING_RESULTS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_WASHING_RESULTS_WASHING_TEST_MATERIALS" FromRole="WASHING_TEST_MATERIALS" ToRole="RML_EXTENSION_TEST_WASHING_RESULTS" /> + </EntityType> <EntityType Name="WINDING_METHODS"> <Key> <PropertyRef Name="GUID" /> @@ -8019,129 +8225,45 @@ </Dependent> </ReferentialConstraint> </Association> - <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_RMLS_EXTENSIONS"> - <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="1"> - <OnDelete Action="Cascade" /> - </End> - <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS" Role="RML_EXTENSION_COLOR_CALIBRATIONS" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="RMLS_EXTENSIONS"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS"> - <PropertyRef Name="RMLS_EXTENSIONS_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_RML_EXTENSION_COLOR_CALIBRATIONS"> - <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS" Role="RML_EXTENSION_COLOR_CALIBRATIONS" Multiplicity="1"> - <OnDelete Action="Cascade" /> - </End> - <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="RML_EXTENSION_COLOR_CALIBRATIONS"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> - <PropertyRef Name="RML_EXTENSION_COLOR_CALIBRATION_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> - <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS" Multiplicity="1"> - <OnDelete Action="Cascade" /> - </End> - <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> - <PropertyRef Name="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS_RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> - <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA" Multiplicity="1"> - <OnDelete Action="Cascade" /> - </End> - <End Type="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS"> - <PropertyRef Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_RML_EXTENSION_COLOR_SHADES_RMLS_EXTENSIONS1"> - <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="1"> - <OnDelete Action="Cascade" /> - </End> - <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES" Role="RML_EXTENSION_COLOR_SHADES" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="RMLS_EXTENSIONS"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="RML_EXTENSION_COLOR_SHADES"> - <PropertyRef Name="RMLS_EXTENSIONS_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_RML_EXTENSION_COLOR_SHADES"> - <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES" Role="RML_EXTENSION_COLOR_SHADES" Multiplicity="1"> - <OnDelete Action="Cascade" /> - </End> - <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS" Role="RML_EXTENSION_COLOR_SHADES_TESTS" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="RML_EXTENSION_COLOR_SHADES"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="RML_EXTENSION_COLOR_SHADES_TESTS"> - <PropertyRef Name="RML_EXTENSION_COLOR_SHADES_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_RML_EXTENSION_COLOR_SHADES_TESTS_DATA_RML_EXTENSION_COLOR_SHADES_TESTS"> - <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS" Role="RML_EXTENSION_COLOR_SHADES_TESTS" Multiplicity="1"> + <Association Name="FK_RML_EXTENSION_TEST_WASHING_RESULTS_RML_EXTENSION_TEST_RESULTS"> + <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS" Role="RML_EXTENSION_TEST_RESULTS" Multiplicity="1"> <OnDelete Action="Cascade" /> </End> - <End Type="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Role="RML_EXTENSION_COLOR_SHADES_TESTS_DATA" Multiplicity="*" /> + <End Type="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Role="RML_EXTENSION_TEST_WASHING_RESULTS" Multiplicity="*" /> <ReferentialConstraint> - <Principal Role="RML_EXTENSION_COLOR_SHADES_TESTS"> + <Principal Role="RML_EXTENSION_TEST_RESULTS"> <PropertyRef Name="GUID" /> </Principal> - <Dependent Role="RML_EXTENSION_COLOR_SHADES_TESTS_DATA"> - <PropertyRef Name="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" /> + <Dependent Role="RML_EXTENSION_TEST_WASHING_RESULTS"> + <PropertyRef Name="RML_EXTENSION_TEST_RESULTS_GUID" /> </Dependent> </ReferentialConstraint> </Association> - <Association Name="FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS"> + <Association Name="FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS"> <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS" Role="RML_EXTENSION_TEST_RESULTS" Multiplicity="1"> <OnDelete Action="Cascade" /> </End> - <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS_FILES" Role="RML_EXTENSION_TEST_RESULTS_FILES" Multiplicity="*" /> + <End Type="RemoteModel.RUBBING_RESULTS" Role="RUBBING_RESULTS" Multiplicity="*" /> <ReferentialConstraint> <Principal Role="RML_EXTENSION_TEST_RESULTS"> <PropertyRef Name="GUID" /> </Principal> - <Dependent Role="RML_EXTENSION_TEST_RESULTS_FILES"> + <Dependent Role="RUBBING_RESULTS"> <PropertyRef Name="RML_EXTENSION_TEST_RESULTS_GUID" /> </Dependent> </ReferentialConstraint> </Association> - <Association Name="FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS"> - <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS" Role="RML_EXTENSION_TEST_RESULTS" Multiplicity="1"> + <Association Name="FK_RML_EXTENSION_TEST_WASHING_RESULTS_WASHING_TEST_MATERIALS"> + <End Type="RemoteModel.WASHING_TEST_MATERIALS" Role="WASHING_TEST_MATERIALS" Multiplicity="1"> <OnDelete Action="Cascade" /> </End> - <End Type="RemoteModel.RUBBING_RESULTS" Role="RUBBING_RESULTS" Multiplicity="*" /> + <End Type="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Role="RML_EXTENSION_TEST_WASHING_RESULTS" Multiplicity="*" /> <ReferentialConstraint> - <Principal Role="RML_EXTENSION_TEST_RESULTS"> + <Principal Role="WASHING_TEST_MATERIALS"> <PropertyRef Name="GUID" /> </Principal> - <Dependent Role="RUBBING_RESULTS"> - <PropertyRef Name="RML_EXTENSION_TEST_RESULTS_GUID" /> + <Dependent Role="RML_EXTENSION_TEST_WASHING_RESULTS"> + <PropertyRef Name="WASHING_TEST_MATERIALS_GUID" /> </Dependent> </ReferentialConstraint> </Association> @@ -8603,6 +8725,111 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> + <EntitySetMapping Name="RML_EXTENSION_COLOR_CALIBRATIONS"> + <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS"> + <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_CALIBRATIONS"> + <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" /> + <ScalarProperty Name="RMLS_EXTENSIONS_GUID" ColumnName="RMLS_EXTENSIONS_GUID" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> + <EntitySetMapping Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> + <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> + <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> + <ScalarProperty Name="RML_EXTENSION_COLOR_CALIBRATION_GUID" ColumnName="RML_EXTENSION_COLOR_CALIBRATION_GUID" /> + <ScalarProperty Name="NAME" ColumnName="NAME" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> + <EntitySetMapping Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> + <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> + <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> + <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" /> + <ScalarProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" ColumnName="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> + <EntitySetMapping Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS"> + <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS"> + <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS"> + <ScalarProperty Name="CALCULATED_POINT" ColumnName="CALCULATED_POINT" /> + <ScalarProperty Name="B" ColumnName="B" /> + <ScalarProperty Name="A" ColumnName="A" /> + <ScalarProperty Name="L" ColumnName="L" /> + <ScalarProperty Name="INK" ColumnName="INK" /> + <ScalarProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" ColumnName="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> + <EntitySetMapping Name="RML_EXTENSION_COLOR_SHADES"> + <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_SHADES"> + <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_SHADES"> + <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" /> + <ScalarProperty Name="RMLS_EXTENSIONS_GUID" ColumnName="RMLS_EXTENSIONS_GUID" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> + <EntitySetMapping Name="RML_EXTENSION_COLOR_SHADES_TESTS"> + <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS"> + <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_SHADES_TESTS"> + <ScalarProperty Name="NAME" ColumnName="NAME" /> + <ScalarProperty Name="RML_EXTENSION_COLOR_SHADES_GUID" ColumnName="RML_EXTENSION_COLOR_SHADES_GUID" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> + <EntitySetMapping Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA"> + <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS_DATA"> + <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_SHADES_TESTS_DATA"> + <ScalarProperty Name="DELTA_E" ColumnName="DELTA_E" /> + <ScalarProperty Name="B_RES" ColumnName="B_RES" /> + <ScalarProperty Name="A_RES" ColumnName="A_RES" /> + <ScalarProperty Name="L_RES" ColumnName="L_RES" /> + <ScalarProperty Name="TI" ColumnName="TI" /> + <ScalarProperty Name="K" ColumnName="K" /> + <ScalarProperty Name="Y" ColumnName="Y" /> + <ScalarProperty Name="M" ColumnName="M" /> + <ScalarProperty Name="C" ColumnName="C" /> + <ScalarProperty Name="B" ColumnName="B" /> + <ScalarProperty Name="A" ColumnName="A" /> + <ScalarProperty Name="L" ColumnName="L" /> + <ScalarProperty Name="COLOR_NUM" ColumnName="COLOR_NUM" /> + <ScalarProperty Name="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" ColumnName="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> + <EntitySetMapping Name="RML_EXTENSION_TEST_RESULTS_FILES"> + <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_TEST_RESULTS_FILES"> + <MappingFragment StoreEntitySet="RML_EXTENSION_TEST_RESULTS_FILES"> + <ScalarProperty Name="FILE_PATH" ColumnName="FILE_PATH" /> + <ScalarProperty Name="FILE_NAME" ColumnName="FILE_NAME" /> + <ScalarProperty Name="RML_EXTENSION_TEST_RESULTS_GUID" ColumnName="RML_EXTENSION_TEST_RESULTS_GUID" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> <EntitySetMapping Name="ACTION_LOGS"> <EntityTypeMapping TypeName="RemoteModel.ACTION_LOGS"> <MappingFragment StoreEntitySet="ACTION_LOGS"> @@ -9716,104 +9943,12 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="RML_EXTENSION_COLOR_CALIBRATIONS"> - <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS"> - <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_CALIBRATIONS"> - <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" /> - <ScalarProperty Name="RMLS_EXTENSIONS_GUID" ColumnName="RMLS_EXTENSIONS_GUID" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> - <EntitySetMapping Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> - <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> - <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS"> - <ScalarProperty Name="RML_EXTENSION_COLOR_CALIBRATION_GUID" ColumnName="RML_EXTENSION_COLOR_CALIBRATION_GUID" /> - <ScalarProperty Name="NAME" ColumnName="NAME" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> - <EntitySetMapping Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> - <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> - <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA"> - <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" /> - <ScalarProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" ColumnName="RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> - <EntitySetMapping Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS"> - <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS"> - <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS"> - <ScalarProperty Name="CALCULATED_POINT" ColumnName="CALCULATED_POINT" /> - <ScalarProperty Name="B" ColumnName="B" /> - <ScalarProperty Name="A" ColumnName="A" /> - <ScalarProperty Name="L" ColumnName="L" /> - <ScalarProperty Name="INK" ColumnName="INK" /> - <ScalarProperty Name="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" ColumnName="RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_GUID" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> - <EntitySetMapping Name="RML_EXTENSION_COLOR_SHADES"> - <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_SHADES"> - <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_SHADES"> - <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" /> - <ScalarProperty Name="RMLS_EXTENSIONS_GUID" ColumnName="RMLS_EXTENSIONS_GUID" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> - <EntitySetMapping Name="RML_EXTENSION_COLOR_SHADES_TESTS"> - <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS"> - <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_SHADES_TESTS"> - <ScalarProperty Name="NAME" ColumnName="NAME" /> - <ScalarProperty Name="RML_EXTENSION_COLOR_SHADES_GUID" ColumnName="RML_EXTENSION_COLOR_SHADES_GUID" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> - <EntitySetMapping Name="RML_EXTENSION_COLOR_SHADES_TESTS_DATA"> - <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_COLOR_SHADES_TESTS_DATA"> - <MappingFragment StoreEntitySet="RML_EXTENSION_COLOR_SHADES_TESTS_DATA"> - <ScalarProperty Name="DELTA_E" ColumnName="DELTA_E" /> - <ScalarProperty Name="B_RES" ColumnName="B_RES" /> - <ScalarProperty Name="A_RES" ColumnName="A_RES" /> - <ScalarProperty Name="L_RES" ColumnName="L_RES" /> - <ScalarProperty Name="TI" ColumnName="TI" /> - <ScalarProperty Name="K" ColumnName="K" /> - <ScalarProperty Name="Y" ColumnName="Y" /> - <ScalarProperty Name="M" ColumnName="M" /> - <ScalarProperty Name="C" ColumnName="C" /> - <ScalarProperty Name="B" ColumnName="B" /> - <ScalarProperty Name="A" ColumnName="A" /> - <ScalarProperty Name="L" ColumnName="L" /> - <ScalarProperty Name="COLOR_NUM" ColumnName="COLOR_NUM" /> - <ScalarProperty Name="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" ColumnName="RML_EXTENSION_COLOR_SHADES_TESTS_GUID" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> - <EntitySetMapping Name="RML_EXTENSION_TEST_RESULTS_FILES"> - <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_TEST_RESULTS_FILES"> - <MappingFragment StoreEntitySet="RML_EXTENSION_TEST_RESULTS_FILES"> - <ScalarProperty Name="FILE_PATH" ColumnName="FILE_PATH" /> - <ScalarProperty Name="FILE_NAME" ColumnName="FILE_NAME" /> + <EntitySetMapping Name="RML_EXTENSION_TEST_WASHING_RESULTS"> + <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS"> + <MappingFragment StoreEntitySet="RML_EXTENSION_TEST_WASHING_RESULTS"> + <ScalarProperty Name="WASHING_VALUE" ColumnName="WASHING_VALUE" /> + <ScalarProperty Name="COLOR" ColumnName="COLOR" /> + <ScalarProperty Name="WASHING_TEST_MATERIALS_GUID" ColumnName="WASHING_TEST_MATERIALS_GUID" /> <ScalarProperty Name="RML_EXTENSION_TEST_RESULTS_GUID" ColumnName="RML_EXTENSION_TEST_RESULTS_GUID" /> <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> <ScalarProperty Name="GUID" ColumnName="GUID" /> @@ -10207,6 +10342,16 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> + <EntitySetMapping Name="WASHING_TEST_MATERIALS"> + <EntityTypeMapping TypeName="RemoteModel.WASHING_TEST_MATERIALS"> + <MappingFragment StoreEntitySet="WASHING_TEST_MATERIALS"> + <ScalarProperty Name="NAME" ColumnName="NAME" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> <EntitySetMapping Name="WINDING_METHODS"> <EntityTypeMapping TypeName="RemoteModel.WINDING_METHODS"> <MappingFragment StoreEntitySet="WINDING_METHODS"> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index 27f6a9fa1..2cc7da5b5 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,98 +5,100 @@ <!-- Diagram content (shape and connector positions) --> <edmx:Diagrams> <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="87"> - <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="43.875" /> - <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="57.75" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="72" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="77.875" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="74.875" /> - <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="0.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="51.25" /> + <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="73.125" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="60" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="63" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="40.125" /> + <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="2.75" PointY="7.75" /> <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="16.875" /> - <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="20.875" /> - <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="33.5" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3.75" PointY="44.5" /> - <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="20.5" /> - <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="13.5" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="5.25" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="5.75" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="4.5" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="16.375" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="2.75" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="24.5" /> - <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="74.625" /> - <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="61.875" /> - <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="11.875" /> - <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="77.75" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="1.5" PointY="91" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3.75" PointY="90.5" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="69" /> + <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="33.5" /> + <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="20.875" /> + <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="34.625" /> + <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="16.5" /> + <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="16.375" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="91.25" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="85.75" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="84.5" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="20.375" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="8.75" PointY="8.75" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="27.875" /> + <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="45.625" /> + <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="77.125" /> + <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="24.75" /> + <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="60.125" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="96.75" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="96.125" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="65.875" /> <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="41.875" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="36.5" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="30.5" /> - <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="32.125" /> - <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="4.75" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="99.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="86" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="95.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="82" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="10.5" PointY="90.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12.75" PointY="82.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="1.5" PointY="85.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3.75" PointY="80" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="8.5" PointY="74.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="10.75" PointY="74.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="7.5" PointY="90.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9.75" PointY="82" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="80.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="7.5" PointY="94.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9.75" PointY="86.125" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3.75" PointY="41.25" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="6" PointY="42.25" /> - <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="30.5" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="24.625" /> + <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="36.875" /> + <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="10.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="101.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="65" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="105.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="69.125" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="101.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="73.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="61.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="66" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="109.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="73.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="90.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="69.125" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="68.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="81.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="65.25" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="43.875" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="28" /> + <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="12.75" PointY="0.75" /> <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="16.75" /> - <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="27.625" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="10.125" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="16.625" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="14.75" PointY="9.75" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="28.5" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="65.75" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="66" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="50.25" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="24.625" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="10.375" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="16.75" /> - <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3.75" PointY="37.875" /> - <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="59.75" /> - <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="9.25" /> + <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="10.375" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="2.5" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="20.625" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="11.75" PointY="9.75" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="47.5" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="81" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="48.125" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="43.25" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="36.5" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="13.25" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="27.625" /> + <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="11.5" /> + <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="54" /> + <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="12.75" /> <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="47.5" /> <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="50.5" /> - <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="8.75" PointY="1" /> - <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="11" PointY="1.125" /> + <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="5.75" PointY="5" /> + <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="8" PointY="5.125" /> + <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="8" PointY="1" /> <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.875" /> - <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="20.375" /> - <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="13.25" /> - <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="13.25" /> - <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="15.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="16.375" /> + <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="28.625" /> + <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="28.75" /> + <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="14.75" PointY="0.75" /> <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="20.5" /> <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="20.75" /> <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="30.5" /> - <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="13.25" /> + <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="8.25" PointY="57.5" /> <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="24.875" /> - <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="16.625" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="6" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="39.375" /> - <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="15.75" PointY="4.75" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="16.75" PointY="7.75" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="46.375" /> - <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="16.75" PointY="12.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="17.75" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="17.75" PointY="3.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="18.75" PointY="6.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="11.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="19.75" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="28" /> - <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="29.25" /> - <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="33.75" /> + <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="24.875" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="10.75" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="32" /> + <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="13.75" PointY="9.75" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="14.75" PointY="4.75" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="11.25" PointY="55.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="14.75" PointY="12.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="15.75" PointY="9.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="16.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="16.75" PointY="3.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="16.75" PointY="12.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="13.75" PointY="16.75" /> + <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="31.375" /> + <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="32.75" /> + <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="5.75" PointY="1.375" /> + <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="12.625" /> <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" /> @@ -179,6 +181,7 @@ <AssociationConnector Association="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_PROCESS_PARAMETERS_TABLES_GROUPS" /> <AssociationConnector Association="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_GROUPS_RMLS" /> <AssociationConnector Association="RemoteModel.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" /> + <AssociationConnector Association="RemoteModel.FK_RML_EXTENSION_TEST_WASHING_RESULTS_WASHING_TEST_MATERIALS" /> <AssociationConnector Association="RemoteModel.FK_RMLS_SPOOLS_RMLS" /> <AssociationConnector Association="RemoteModel.FK_SITES_RMLS_RMLS" /> <AssociationConnector Association="RemoteModel.FK_RMLS_SPOOLS_SPOOL_TYPES" /> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs new file mode 100644 index 000000000..62f08e111 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs @@ -0,0 +1,31 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class WASHING_TEST_MATERIALS + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public WASHING_TEST_MATERIALS() + { + this.RML_EXTENSION_TEST_WASHING_RESULTS = new HashSet<RML_EXTENSION_TEST_WASHING_RESULTS>(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public string NAME { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection<RML_EXTENSION_TEST_WASHING_RESULTS> RML_EXTENSION_TEST_WASHING_RESULTS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj index e58f7fd5b..79beff832 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -327,6 +327,9 @@ <Compile Include="DB\RML_EXTENSION_TEST_RESULTS_FILES.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> + <Compile Include="DB\RML_EXTENSION_TEST_WASHING_RESULTS.cs"> + <DependentUpon>RemoteADO.tt</DependentUpon> + </Compile> <Compile Include="DB\ROLE.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> @@ -399,6 +402,9 @@ <Compile Include="DB\USERS_ROLES.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> + <Compile Include="DB\WASHING_TEST_MATERIALS.cs"> + <DependentUpon>RemoteADO.tt</DependentUpon> + </Compile> <Compile Include="DB\WINDING_METHODS.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> @@ -485,7 +491,7 @@ </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file |