diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-01-16 18:23:59 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-01-16 18:23:59 +0200 |
| commit | 9695aef4cf1ac2d85d6905e73c4f4aa079cc7c1d (patch) | |
| tree | 828425426e81df727cd2e7787af8bd2c075374bf /Software | |
| parent | 1ca3d89bba12432446930e2f458264c72a01c672 (diff) | |
| download | Tango-9695aef4cf1ac2d85d6905e73c4f4aa079cc7c1d.tar.gz Tango-9695aef4cf1ac2d85d6905e73c4f4aa079cc7c1d.zip | |
Removed Dispensers & Cartridges!
Only Dispenser Type & CartridgeType now.
Diffstat (limited to 'Software')
44 files changed, 150 insertions, 1130 deletions
diff --git a/Software/DB/Tango.db b/Software/DB/Tango.db Binary files differindex 12c88039d..074b9f0c0 100644 --- a/Software/DB/Tango.db +++ b/Software/DB/Tango.db diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex ad18dec4b..3a7c3f1ba 100644 --- a/Software/DB/Tango.mdf +++ b/Software/DB/Tango.mdf diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf Binary files differindex 1f4fd74dd..60e0a3f85 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj index ca71f1897..b8b9dea44 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj @@ -100,7 +100,6 @@ <Compile Include="ViewModels\ApplicationFirmwareVersionsViewVM.cs" /> <Compile Include="ViewModels\ApplicationOsVersionsViewVM.cs" /> <Compile Include="ViewModels\ApplicationVersionsViewVM.cs" /> - <Compile Include="ViewModels\CartridgesViewVM.cs" /> <Compile Include="ViewModels\CartridgeTypesViewVM.cs" /> <Compile Include="ViewModels\CatsViewVM.cs" /> <Compile Include="ViewModels\CctsViewVM.cs" /> @@ -109,7 +108,6 @@ <Compile Include="ViewModels\DbTableViewModel.cs" /> <Compile Include="ViewModels\DialogOpenMode.cs" /> <Compile Include="ViewModels\DispenserTypesViewVM.cs" /> - <Compile Include="ViewModels\DispensersViewVM.cs" /> <Compile Include="ViewModels\EmbeddedFirmwareVersionsViewVM.cs" /> <Compile Include="ViewModels\EmbeddedSoftwareVersionsViewVM.cs" /> <Compile Include="ViewModels\EventTypesViewVM.cs" /> @@ -219,24 +217,12 @@ <Compile Include="Views\DBViews\CartridgeTypesView.xaml.cs"> <DependentUpon>CartridgeTypesView.xaml</DependentUpon> </Compile> - <Compile Include="Views\DBViews\CartridgesView.xaml.cs"> - <DependentUpon>CartridgesView.xaml</DependentUpon> - </Compile> - <Compile Include="Views\DBViews\DispensersView.xaml.cs"> - <DependentUpon>DispensersView.xaml</DependentUpon> - </Compile> <Compile Include="Views\DBViews\DispenserTypesView.xaml.cs"> <DependentUpon>DispenserTypesView.xaml</DependentUpon> </Compile> <Compile Include="Views\DBViews\CartridgeTypeView.xaml.cs"> <DependentUpon>CartridgeTypeView.xaml</DependentUpon> </Compile> - <Compile Include="Views\DBViews\CartridgeView.xaml.cs"> - <DependentUpon>CartridgeView.xaml</DependentUpon> - </Compile> - <Compile Include="Views\DBViews\DispenserView.xaml.cs"> - <DependentUpon>DispenserView.xaml</DependentUpon> - </Compile> <Compile Include="Views\DBViews\DispenserTypeView.xaml.cs"> <DependentUpon>DispenserTypeView.xaml</DependentUpon> </Compile> @@ -475,14 +461,6 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Page Include="Views\DBViews\CartridgesView.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> - <Page Include="Views\DBViews\DispensersView.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> <Page Include="Views\DBViews\DispenserTypesView.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> @@ -491,14 +469,6 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Page Include="Views\DBViews\CartridgeView.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> - <Page Include="Views\DBViews\DispenserView.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> <Page Include="Views\DBViews\DispenserTypeView.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs index 3079f8e5f..87ac26c4d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs @@ -36,10 +36,8 @@ namespace Tango.MachineStudio.DB SimpleIoc.Default.Register<HardwareVersionsViewVM>(); SimpleIoc.Default.Register<IdsPacksViewVM>(); - SimpleIoc.Default.Register<DispensersViewVM>(); SimpleIoc.Default.Register<DispenserTypesViewVM>(); SimpleIoc.Default.Register<LiquidTypesViewVM>(); - SimpleIoc.Default.Register<CartridgesViewVM>(); SimpleIoc.Default.Register<CartridgeTypesViewVM>(); SimpleIoc.Default.Register<MidTankTypesViewVM>(); @@ -197,14 +195,6 @@ namespace Tango.MachineStudio.DB } } - public static DispensersViewVM DispensersViewVM - { - get - { - return ServiceLocator.Current.GetInstance<DispensersViewVM>(); - } - } - public static DispenserTypesViewVM DispenserTypesViewVM { get @@ -221,14 +211,6 @@ namespace Tango.MachineStudio.DB } } - public static CartridgesViewVM CartridgesViewVM - { - get - { - return ServiceLocator.Current.GetInstance<CartridgesViewVM>(); - } - } - public static CartridgeTypesViewVM CartridgeTypesViewVM { get diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgesViewVM.cs deleted file mode 100644 index 8db217013..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgesViewVM.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.DAL.Observables; -using Tango.MachineStudio.Common.Notifications; - -namespace Tango.MachineStudio.DB.ViewModels -{ - public class CartridgesViewVM : DbTableViewModel<Cartridge> - { - public CartridgesViewVM(INotificationProvider notification) : base(notification) - { - - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispensersViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispensersViewVM.cs deleted file mode 100644 index 0242c1dc7..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispensersViewVM.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.DAL.Observables; -using Tango.MachineStudio.Common.Notifications; - -namespace Tango.MachineStudio.DB.ViewModels -{ - public class DispensersViewVM : DbTableViewModel<Dispenser> - { - public DispensersViewVM(INotificationProvider notification) : base(notification) - { - - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml deleted file mode 100644 index 98adef136..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml +++ /dev/null @@ -1,29 +0,0 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.CartridgeView" - xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" - xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls" - xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker" - xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" - xmlns:vm="clr-namespace:Tango.MachineStudio.DB.ViewModels" - xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews" - mc:Ignorable="d" - d:DesignHeight="400" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=vm:CartridgesViewVM, IsDesignTimeCreatable=False}"> - - <Grid> - <controls:TableGrid> - <TextBlock Text="ID:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True"></TextBox> - <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True"></TextBox> - <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True"></TextBox> - <TextBlock Text="Serial Number:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.SerialNumber}"></TextBox> - <TextBlock Text="Cartridge Type:" FontWeight="Bold"></TextBlock> - <ComboBox ItemsSource="{Binding Adapter.CartridgeTypes}" SelectedItem="{Binding EditEntity.CartridgeTypes,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox> - </controls:TableGrid> - </Grid> -</UserControl> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml.cs deleted file mode 100644 index d2402426c..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// <summary> - /// Interaction logic for MachineView.xaml - /// </summary> - public partial class CartridgeView : UserControl - { - public CartridgeView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml deleted file mode 100644 index 3fa7d0200..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml +++ /dev/null @@ -1,24 +0,0 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.CartridgesView" - xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:global="clr-namespace:Tango.MachineStudio.DB" - xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls" - xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" - xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" - mc:Ignorable="d" - d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.CartridgesViewVM}"> - <Grid> - <controls:DbTableView> - <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.CartridgesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True"> - <DataGrid.Columns> - <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn> - <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn> - <DataGridTextColumn Header="Serial Number" Binding="{Binding SerialNumber}"></DataGridTextColumn> - <DataGridTextColumn Header="Cartridge Type" Binding="{Binding CartridgeTypes.Name}"></DataGridTextColumn> - </DataGrid.Columns> - </DataGrid> - </controls:DbTableView> - </Grid> -</UserControl> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml.cs deleted file mode 100644 index 27adfa44e..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Tango.MachineStudio.DB.CustomAttributes; -using Tango.MachineStudio.DB.Managers; -using Tango.SharedUI.Controls; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// <summary> - /// Interaction logic for MachinesView.xaml - /// </summary> - [DBView] - public partial class CartridgesView : UserControl - { - public CartridgesView() : base() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml deleted file mode 100644 index 7dc4ec1ff..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml +++ /dev/null @@ -1,29 +0,0 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.DispenserView" - xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" - xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls" - xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker" - xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" - xmlns:vm="clr-namespace:Tango.MachineStudio.DB.ViewModels" - xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews" - mc:Ignorable="d" - d:DesignHeight="400" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=vm:DispensersViewVM, IsDesignTimeCreatable=False}"> - - <Grid> - <controls:TableGrid> - <TextBlock Text="ID:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True"></TextBox> - <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True"></TextBox> - <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True"></TextBox> - <TextBlock Text="Serial Number:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.SerialNumber}"></TextBox> - <TextBlock Text="Dispenser Type:" FontWeight="Bold"></TextBlock> - <ComboBox ItemsSource="{Binding Adapter.DispenserTypes}" SelectedItem="{Binding EditEntity.DispenserTypes,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox> - </controls:TableGrid> - </Grid> -</UserControl> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml.cs deleted file mode 100644 index 4ad5d74fe..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// <summary> - /// Interaction logic for MachineView.xaml - /// </summary> - public partial class DispenserView : UserControl - { - public DispenserView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml deleted file mode 100644 index 7fdb70bbe..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml +++ /dev/null @@ -1,24 +0,0 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.DispensersView" - xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:global="clr-namespace:Tango.MachineStudio.DB" - xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls" - xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" - xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" - mc:Ignorable="d" - d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.DispensersViewVM}"> - <Grid> - <controls:DbTableView> - <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.DispensersViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True"> - <DataGrid.Columns> - <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn> - <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn> - <DataGridTextColumn Header="Serial Number" Binding="{Binding SerialNumber}"></DataGridTextColumn> - <DataGridTextColumn Header="Dispenser Type" Binding="{Binding DispenserTypes.Name}"></DataGridTextColumn> - </DataGrid.Columns> - </DataGrid> - </controls:DbTableView> - </Grid> -</UserControl> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml.cs deleted file mode 100644 index d86bd2e31..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Tango.MachineStudio.DB.CustomAttributes; -using Tango.MachineStudio.DB.Managers; -using Tango.SharedUI.Controls; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// <summary> - /// Interaction logic for MachinesView.xaml - /// </summary> - [DBView] - public partial class DispensersView : UserControl - { - public DispensersView() : base() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs index d87527fa7..96b66c204 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs @@ -20,6 +20,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels { private bool _isSaving; private INotificationProvider _notification; + #region Properties @@ -190,7 +191,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels collections.Add(Adapter.EmbeddedFirmwareVersionsViewSource); collections.Add(Adapter.ApplicationOsVersionsViewSource); collections.Add(Adapter.ApplicationVersionsViewSource); - collections.Add(Adapter.DispensersViewSource); + collections.Add(Adapter.DispenserTypesViewSource); collections.Add(Adapter.CartridgeTypesViewSource); collections.Add(Adapter.LiquidTypesViewSource); collections.Add(Adapter.MidTankTypesViewSource); @@ -316,12 +317,12 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels /// <summary> /// Drops the dispenser. /// </summary> - /// <param name="dispenser">The dispenser.</param> + /// <param name="dispenserType">The dispenser.</param> /// <param name="idsPack">The ids pack.</param> - public void DropDispenser(Dispenser dispenser, IdsPack idsPack) + public void DropDispenserType(DispenserType dispenserType, IdsPack idsPack) { - idsPack.Dispenser = dispenser; - idsPack.DispenserGuid = dispenser.Guid; + idsPack.DispenserTypes = dispenserType; + idsPack.DispenserTypeGuid = dispenserType.Guid; } /// <summary> @@ -455,9 +456,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels { errors.Add(String.Format("Cartridge type is required on IDS pack '{0}'.", pack.Name)); } - if (pack.Dispenser == null) + if (pack.DispenserTypes == null) { - errors.Add(String.Format("Dispenser is required on IDS pack '{0}'.", pack.Name)); + errors.Add(String.Format("Dispenser type is required on IDS pack '{0}'.", pack.Name)); } if (pack.LiquidTypes == null) { @@ -467,15 +468,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels { errors.Add(String.Format("Mid Tank type is required on IDS pack '{0}'.", pack.Name)); } - - var taken_ids = Adapter.Machines.Where(x => x.SerialNumber.ToLower() != Machine.SerialNumber).SelectMany(x => x.MachinesConfigurations).Select(x => x.Configuration).SelectMany(x => x.IdsPacks).ToList().FirstOrDefault(x => x.Dispenser.SerialNumber.ToLower() == pack.Dispenser.SerialNumber.ToLower()); - if (taken_ids != null && taken_ids.Configuration.MachinesConfigurations.Count > 0) - { - if (!_notification.ShowQuestion(String.Format("The Dispenser '{1}' on IDS pack '{0}' is already taken by another machine ('{2}', '{3}'). Are you sure you want to assign it to this machine?", pack.Name, pack.Dispenser.SerialNumber, taken_ids.Configuration.MachinesConfigurations.First().Machine.Name, taken_ids.Configuration.MachinesConfigurations.First().Machine.SerialNumber))) - { - return; - } - } } if (errors.Count > 0) diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml index 5324959e4..8f955beea 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml @@ -189,7 +189,7 @@ <Image.Style> <Style TargetType="Image"> <Style.Triggers> - <DataTrigger Binding="{Binding Dispenser}" Value="{x:Null}"> + <DataTrigger Binding="{Binding DispenserTypes}" Value="{x:Null}"> <Setter Property="Opacity" Value="0.2"></Setter> </DataTrigger> </Style.Triggers> @@ -403,17 +403,17 @@ <StackPanel Margin="20 0 0 0"> <StackPanel Orientation="Horizontal" Margin="0 3 0 3"> <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/injection.png" Width="12" VerticalAlignment="Center"></Image> - <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Dispenser:</Run> <Run FontStyle="Italic" Text="{Binding Dispenser.SerialNumber}"></Run></TextBlock> - </StackPanel> - <StackPanel Orientation="Horizontal" Margin="0 3 0 3"> - <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/cartridge.png" Width="12" VerticalAlignment="Center"></Image> - <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Cartridge:</Run> <Run FontStyle="Italic" Text="{Binding CartridgeTypes.Name}"></Run></TextBlock> + <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Dispenser:</Run> <Run FontStyle="Italic" Text="{Binding DispenserTypes.Name}"></Run></TextBlock> </StackPanel> <StackPanel Orientation="Horizontal" Margin="0 3 0 3"> <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/tank.png" Width="12" VerticalAlignment="Center"></Image> <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Mid Tank:</Run> <Run FontStyle="Italic" Text="{Binding MidTankTypes.Name}"></Run></TextBlock> </StackPanel> <StackPanel Orientation="Horizontal" Margin="0 3 0 3"> + <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/cartridge.png" Width="12" VerticalAlignment="Center"></Image> + <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Cartridge:</Run> <Run FontStyle="Italic" Text="{Binding CartridgeTypes.Name}"></Run></TextBlock> + </StackPanel> + <StackPanel Orientation="Horizontal" Margin="0 3 0 3"> <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/liquid.png" Width="12" VerticalAlignment="Center"></Image> <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Liquid:</Run> <Run FontStyle="Italic" Text="{Binding LiquidTypes.Name}"></Run></TextBlock> </StackPanel> @@ -502,7 +502,7 @@ <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}"> <StackPanel> <Expander HorizontalAlignment="Stretch" Header="Dispensers"> - <ListBox ItemsSource="{Binding Adapter.DispensersViewSource}" HorizontalContentAlignment="Stretch"> + <ListBox ItemsSource="{Binding Adapter.DispenserTypesViewSource}" HorizontalContentAlignment="Stretch"> <ListBox.ItemContainerStyle> <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}"> <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter> @@ -516,8 +516,7 @@ <StackPanel Orientation="Horizontal" Margin="2 8"> <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/injection.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image> <StackPanel Margin="5 0 0 0" IsHitTestVisible="False"> - <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding DispenserTypes.Name}"></Run></TextBlock> - <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray" Margin="0 2 0 0"><Run Text="{Binding SerialNumber}"></Run></TextBlock> + <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock> </StackPanel> </StackPanel> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs index 44ce75c12..6d08a10e0 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs @@ -70,7 +70,7 @@ namespace Tango.MachineStudio.MachineDesigner.Views { SetHighlightRegion(gridEmbedded); } - else if (e.DataContext is Dispenser || e.DataContext is Cartridge || e.DataContext is LiquidType || e.DataContext is MidTankType) + else if (e.DataContext is DispenserType || e.DataContext is CartridgeType || e.DataContext is LiquidType || e.DataContext is MidTankType) { SetHighlightRegion(gridIds); } @@ -86,9 +86,9 @@ namespace Tango.MachineStudio.MachineDesigner.Views private void OnDropOnIdsPack(object sender, DropEventArgs e) { - if (e.Draggable.DataContext is Dispenser) + if (e.Draggable.DataContext is DispenserType) { - _vm.DropDispenser(e.Draggable.DataContext as Dispenser, e.Droppable.DataContext as IdsPack); + _vm.DropDispenserType(e.Draggable.DataContext as DispenserType, e.Droppable.DataContext as IdsPack); } else if (e.Draggable.DataContext is LiquidType) { diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE.cs deleted file mode 100644 index 23dea85e1..000000000 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// <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.Local.DB -{ - using System; - using System.Collections.Generic; - - public partial class CARTRIDGE - { - public long ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } - public string CARTRIDGE_TYPE_GUID { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs deleted file mode 100644 index dc77b198b..000000000 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs +++ /dev/null @@ -1,24 +0,0 @@ -//------------------------------------------------------------------------------ -// <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.Local.DB -{ - using System; - using System.Collections.Generic; - - public partial class DISPENSER - { - public long ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } - public string SERIAL_NUMBER { get; set; } - public string DISPENSER_TYPE_GUID { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs index 8091dd5d2..e2a9c4425 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs @@ -19,7 +19,7 @@ namespace Tango.DAL.Local.DB public System.DateTime LAST_UPDATED { get; set; } public bool DELETED { get; set; } public string CONFIGURATION_GUID { get; set; } - public string DISPENSER_GUID { get; set; } + public string DISPENSER_TYPE_GUID { get; set; } public string LIQUID_TYPE_GUID { get; set; } public string CARTRIDGE_TYPE_GUID { get; set; } public string MID_TANK_TYPE_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs index bcb01953b..2d9091e58 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs @@ -32,13 +32,11 @@ namespace Tango.DAL.Local.DB public virtual DbSet<APPLICATION_OS_VERSIONS> APPLICATION_OS_VERSIONS { get; set; } public virtual DbSet<APPLICATION_VERSIONS> APPLICATION_VERSIONS { get; set; } public virtual DbSet<CARTRIDGE_TYPES> CARTRIDGE_TYPES { get; set; } - public virtual DbSet<CARTRIDGE> CARTRIDGES { get; set; } public virtual DbSet<CAT> CATS { get; set; } public virtual DbSet<CCT> CCTS { get; set; } public virtual DbSet<CONFIGURATION> CONFIGURATIONS { get; set; } public virtual DbSet<CONTACT> CONTACTS { get; set; } public virtual DbSet<DISPENSER_TYPES> DISPENSER_TYPES { get; set; } - public virtual DbSet<DISPENSER> DISPENSERS { get; set; } public virtual DbSet<EMBEDDED_FIRMWARE_VERSIONS> EMBEDDED_FIRMWARE_VERSIONS { get; set; } public virtual DbSet<EMBEDDED_SOFTWARE_VERSIONS> EMBEDDED_SOFTWARE_VERSIONS { get; set; } public virtual DbSet<EVENT_TYPES> EVENT_TYPES { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx index 85f8c0bad..ab77e4b9b 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx @@ -88,16 +88,6 @@ <Property Name="CODE" Type="integer" Nullable="false" /> <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> </EntityType> - <EntityType Name="CARTRIDGES"> - <Key> - <PropertyRef Name="ID" /> - </Key> - <Property Name="ID" Type="integer" Nullable="false" /> - <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> - <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" /> - <Property Name="DELETED" Type="bit" Nullable="false" /> - <Property Name="CARTRIDGE_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> - </EntityType> <EntityType Name="CATS"> <Key> <PropertyRef Name="ID" /> @@ -171,17 +161,6 @@ <Property Name="CODE" Type="integer" Nullable="false" /> <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> </EntityType> - <EntityType Name="DISPENSERS"> - <Key> - <PropertyRef Name="ID" /> - </Key> - <Property Name="ID" Type="integer" Nullable="false" /> - <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> - <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" /> - <Property Name="DELETED" Type="bit" Nullable="false" /> - <Property Name="SERIAL_NUMBER" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> - <Property Name="DISPENSER_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> - </EntityType> <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS"> <Key> <PropertyRef Name="ID" /> @@ -269,7 +248,7 @@ <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" /> <Property Name="DELETED" Type="bit" Nullable="false" /> <Property Name="CONFIGURATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> - <Property Name="DISPENSER_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> + <Property Name="DISPENSER_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="LIQUID_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="CARTRIDGE_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="MID_TANK_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> @@ -534,13 +513,11 @@ <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="Self.APPLICATION_OS_VERSIONS" store:Type="Tables" /> <EntitySet Name="APPLICATION_VERSIONS" EntityType="Self.APPLICATION_VERSIONS" store:Type="Tables" /> <EntitySet Name="CARTRIDGE_TYPES" EntityType="Self.CARTRIDGE_TYPES" store:Type="Tables" /> - <EntitySet Name="CARTRIDGES" EntityType="Self.CARTRIDGES" store:Type="Tables" /> <EntitySet Name="CATS" EntityType="Self.CATS" store:Type="Tables" /> <EntitySet Name="CCTS" EntityType="Self.CCTS" store:Type="Tables" /> <EntitySet Name="CONFIGURATIONS" EntityType="Self.CONFIGURATIONS" store:Type="Tables" /> <EntitySet Name="CONTACTS" EntityType="Self.CONTACTS" store:Type="Tables" /> <EntitySet Name="DISPENSER_TYPES" EntityType="Self.DISPENSER_TYPES" store:Type="Tables" /> - <EntitySet Name="DISPENSERS" EntityType="Self.DISPENSERS" store:Type="Tables" /> <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="Self.EMBEDDED_FIRMWARE_VERSIONS" store:Type="Tables" /> <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="Self.EMBEDDED_SOFTWARE_VERSIONS" store:Type="Tables" /> <EntitySet Name="EVENT_TYPES" EntityType="Self.EVENT_TYPES" store:Type="Tables" /> @@ -582,13 +559,11 @@ <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="LocalModel.APPLICATION_OS_VERSIONS" /> <EntitySet Name="APPLICATION_VERSIONS" EntityType="LocalModel.APPLICATION_VERSIONS" /> <EntitySet Name="CARTRIDGE_TYPES" EntityType="LocalModel.CARTRIDGE_TYPES" /> - <EntitySet Name="CARTRIDGES" EntityType="LocalModel.CARTRIDGE" /> <EntitySet Name="CATS" EntityType="LocalModel.CAT" /> <EntitySet Name="CCTS" EntityType="LocalModel.CCT" /> <EntitySet Name="CONFIGURATIONS" EntityType="LocalModel.CONFIGURATION" /> <EntitySet Name="CONTACTS" EntityType="LocalModel.CONTACT" /> <EntitySet Name="DISPENSER_TYPES" EntityType="LocalModel.DISPENSER_TYPES" /> - <EntitySet Name="DISPENSERS" EntityType="LocalModel.DISPENSER" /> <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" /> <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" /> <EntitySet Name="EVENT_TYPES" EntityType="LocalModel.EVENT_TYPES" /> @@ -701,16 +676,6 @@ <Property Name="CODE" Type="Int64" Nullable="false" /> <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> </EntityType> - <EntityType Name="CARTRIDGE"> - <Key> - <PropertyRef Name="ID" /> - </Key> - <Property Name="ID" Type="Int64" Nullable="false" /> - <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> - <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" /> - <Property Name="DELETED" Type="Boolean" Nullable="false" /> - <Property Name="CARTRIDGE_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> - </EntityType> <EntityType Name="CAT"> <Key> <PropertyRef Name="ID" /> @@ -784,17 +749,6 @@ <Property Name="CODE" Type="Int64" Nullable="false" /> <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> </EntityType> - <EntityType Name="DISPENSER"> - <Key> - <PropertyRef Name="ID" /> - </Key> - <Property Name="ID" Type="Int64" Nullable="false" /> - <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> - <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" /> - <Property Name="DELETED" Type="Boolean" Nullable="false" /> - <Property Name="SERIAL_NUMBER" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> - <Property Name="DISPENSER_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> - </EntityType> <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS"> <Key> <PropertyRef Name="ID" /> @@ -882,7 +836,7 @@ <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" /> <Property Name="DELETED" Type="Boolean" Nullable="false" /> <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> - <Property Name="DISPENSER_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> + <Property Name="DISPENSER_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="CARTRIDGE_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="MID_TANK_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> @@ -1235,17 +1189,6 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="CARTRIDGES"> - <EntityTypeMapping TypeName="LocalModel.CARTRIDGE"> - <MappingFragment StoreEntitySet="CARTRIDGES"> - <ScalarProperty Name="CARTRIDGE_TYPE_GUID" ColumnName="CARTRIDGE_TYPE_GUID" /> - <ScalarProperty Name="DELETED" ColumnName="DELETED" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> <EntitySetMapping Name="CATS"> <EntityTypeMapping TypeName="LocalModel.CAT"> <MappingFragment StoreEntitySet="CATS"> @@ -1324,18 +1267,6 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="DISPENSERS"> - <EntityTypeMapping TypeName="LocalModel.DISPENSER"> - <MappingFragment StoreEntitySet="DISPENSERS"> - <ScalarProperty Name="DISPENSER_TYPE_GUID" ColumnName="DISPENSER_TYPE_GUID" /> - <ScalarProperty Name="SERIAL_NUMBER" ColumnName="SERIAL_NUMBER" /> - <ScalarProperty Name="DELETED" ColumnName="DELETED" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> <EntitySetMapping Name="EMBEDDED_FIRMWARE_VERSIONS"> <EntityTypeMapping TypeName="LocalModel.EMBEDDED_FIRMWARE_VERSIONS"> <MappingFragment StoreEntitySet="EMBEDDED_FIRMWARE_VERSIONS"> @@ -1429,7 +1360,7 @@ <ScalarProperty Name="MID_TANK_TYPE_GUID" ColumnName="MID_TANK_TYPE_GUID" /> <ScalarProperty Name="CARTRIDGE_TYPE_GUID" ColumnName="CARTRIDGE_TYPE_GUID" /> <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" /> - <ScalarProperty Name="DISPENSER_GUID" ColumnName="DISPENSER_GUID" /> + <ScalarProperty Name="DISPENSER_TYPE_GUID" ColumnName="DISPENSER_TYPE_GUID" /> <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" /> <ScalarProperty Name="DELETED" ColumnName="DELETED" /> <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram index ac5b442be..9148e84b6 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram @@ -12,41 +12,39 @@ <EntityTypeShape EntityType="LocalModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="2.75" PointY="4.75" /> <EntityTypeShape EntityType="LocalModel.APPLICATION_VERSIONS" Width="1.5" PointX="4.75" PointY="3.75" /> <EntityTypeShape EntityType="LocalModel.CARTRIDGE_TYPES" Width="1.5" PointX="6.75" PointY="0.75" /> - <EntityTypeShape EntityType="LocalModel.CARTRIDGE" Width="1.5" PointX="6.75" PointY="3.75" /> - <EntityTypeShape EntityType="LocalModel.CAT" Width="1.5" PointX="4.75" PointY="6.75" /> - <EntityTypeShape EntityType="LocalModel.CCT" Width="1.5" PointX="6.75" PointY="6.75" /> - <EntityTypeShape EntityType="LocalModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="7.75" /> - <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="8.75" PointY="0.75" /> - <EntityTypeShape EntityType="LocalModel.DISPENSER_TYPES" Width="1.5" PointX="8.75" PointY="4.75" /> - <EntityTypeShape EntityType="LocalModel.DISPENSER" Width="1.5" PointX="8.75" PointY="7.75" /> - <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="10.75" PointY="0.75" /> - <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="2.75" PointY="10.75" /> - <EntityTypeShape EntityType="LocalModel.EVENT_TYPES" Width="1.5" PointX="10.75" PointY="3.75" /> - <EntityTypeShape EntityType="LocalModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="10.75" PointY="7.75" /> - <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="8.75" PointY="10.75" /> - <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHS" Width="1.5" PointX="10.75" PointY="10.75" /> - <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.75" PointY="11.75" /> - <EntityTypeShape EntityType="LocalModel.IDS_PACKS" Width="1.5" PointX="12.75" PointY="0.75" /> - <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="12.75" PointY="4.75" /> - <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES" Width="1.5" PointX="12.75" PointY="7.75" /> - <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="12.75" PointY="11.75" /> - <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="13.75" /> - <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="6.75" PointY="13.75" /> - <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="8.75" PointY="13.75" /> - <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="14.75" PointY="0.75" /> - <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="2.75" PointY="14.75" /> - <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="14.75" PointY="4.75" /> - <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="14.75" PointY="7.75" /> - <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="14.75" PointY="10.75" /> - <EntityTypeShape EntityType="LocalModel.MID_TANK_TYPES" Width="1.5" PointX="10.75" PointY="14.75" /> - <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="12.75" PointY="14.75" /> - <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="14.75" PointY="13.75" /> - <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="16.75" PointY="0.75" /> - <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="16.75" PointY="7.75" /> - <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.75" PointY="11.75" /> - <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="16.75" PointY="14.75" /> - <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="0.75" PointY="17.75" /> - <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="2.75" PointY="17.75" /> + <EntityTypeShape EntityType="LocalModel.CAT" Width="1.5" PointX="6.75" PointY="3.75" /> + <EntityTypeShape EntityType="LocalModel.CCT" Width="1.5" PointX="0.75" PointY="7.75" /> + <EntityTypeShape EntityType="LocalModel.CONFIGURATION" Width="1.5" PointX="2.75" PointY="7.75" /> + <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="4.75" PointY="7.75" /> + <EntityTypeShape EntityType="LocalModel.DISPENSER_TYPES" Width="1.5" PointX="6.75" PointY="7.75" /> + <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="0.75" /> + <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="3.75" /> + <EntityTypeShape EntityType="LocalModel.EVENT_TYPES" Width="1.5" PointX="8.75" PointY="6.75" /> + <EntityTypeShape EntityType="LocalModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="10.75" PointY="0.75" /> + <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="10.75" PointY="3.75" /> + <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHS" Width="1.5" PointX="10.75" PointY="6.75" /> + <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="10.75" /> + <EntityTypeShape EntityType="LocalModel.IDS_PACKS" Width="1.5" PointX="8.75" PointY="10.75" /> + <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="10.75" PointY="9.75" /> + <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES" Width="1.5" PointX="12.75" PointY="0.75" /> + <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="0.75" PointY="12.75" /> + <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="2.75" PointY="12.75" /> + <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="12.75" PointY="4.75" /> + <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="12.75" PointY="8.75" /> + <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="10.75" PointY="12.75" /> + <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="12.75" PointY="11.75" /> + <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="4.75" PointY="13.75" /> + <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="14.75" PointY="0.75" /> + <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="14.75" PointY="3.75" /> + <EntityTypeShape EntityType="LocalModel.MID_TANK_TYPES" Width="1.5" PointX="14.75" PointY="6.75" /> + <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="6.75" PointY="14.75" /> + <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="14.75" PointY="10.75" /> + <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="12.75" PointY="14.75" /> + <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="14.75" PointY="14.75" /> + <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.75" PointY="0.75" /> + <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="0.75" PointY="16.75" /> + <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="2.75" PointY="16.75" /> + <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="16.75" PointY="3.75" /> </Diagram> </edmx:Diagrams> </edmx:Designer> diff --git a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj index 1770a031a..62e4f2953 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj +++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj @@ -83,9 +83,6 @@ <Compile Include="DB\APPLICATION_VERSIONS.cs"> <DependentUpon>LocalADO.tt</DependentUpon> </Compile> - <Compile Include="DB\CARTRIDGE.cs"> - <DependentUpon>LocalADO.tt</DependentUpon> - </Compile> <Compile Include="DB\CARTRIDGE_TYPES.cs"> <DependentUpon>LocalADO.tt</DependentUpon> </Compile> @@ -101,9 +98,6 @@ <Compile Include="DB\CONTACT.cs"> <DependentUpon>LocalADO.tt</DependentUpon> </Compile> - <Compile Include="DB\DISPENSER.cs"> - <DependentUpon>LocalADO.tt</DependentUpon> - </Compile> <Compile Include="DB\DISPENSER_TYPES.cs"> <DependentUpon>LocalADO.tt</DependentUpon> </Compile> diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cartridge.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cartridge.cs deleted file mode 100644 index b20022a3a..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cartridge.cs +++ /dev/null @@ -1,95 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [EntityFieldName("CARTRIDGES")] - public partial class Cartridge : ObservableEntity<CARTRIDGE> - { - - private String _serialnumber; - /// <summary> - /// Gets or sets the cartridge serial number. - /// </summary> - [EntityFieldName("SERIAL_NUMBER")] - public String SerialNumber - { - get - { - return _serialnumber; - } - - set - { - _serialnumber = value; RaisePropertyChanged(nameof(SerialNumber)); - } - - } - - private String _cartridgetypeguid; - /// <summary> - /// Gets or sets the cartridge cartridge type guid. - /// </summary> - [EntityFieldName("CARTRIDGE_TYPE_GUID")] - public String CartridgeTypeGuid - { - get - { - return _cartridgetypeguid; - } - - set - { - _cartridgetypeguid = value; RaisePropertyChanged(nameof(CartridgeTypeGuid)); - } - - } - - private CartridgeType _cartridgetypes; - /// <summary> - /// Gets or sets the cartridge cartridge types. - /// </summary> - [EntityFieldName("CARTRIDGE_TYPES")] - public CartridgeType CartridgeTypes - { - get - { - return _cartridgetypes; - } - - set - { - _cartridgetypes = value; RaisePropertyChanged(nameof(CartridgeTypes)); - } - - } - - /// <summary> - /// Initializes a new instance of the <see cref="Cartridge" /> class. - /// </summary> - public Cartridge() : base() - { - Init(); - } - - /// <summary> - /// Initializes a new instance of the <see cref="Cartridge" /> class. - /// </summary> - /// <param name="entity">The entity.</param> - public Cartridge(CARTRIDGE entity) : base(entity) - { - Init(); - MapEntityToObservable(entity, this); - } - - /// <summary> - /// Initialize complex types. - /// </summary> - private void Init() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/CartridgeType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/CartridgeType.cs index f4dbe6fb0..d870d3e29 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/CartridgeType.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/CartridgeType.cs @@ -48,25 +48,6 @@ namespace Tango.DAL.Observables } - private ObservableCollection<Cartridge> _cartridges; - /// <summary> - /// Gets or sets the cartridgetype cartridges. - /// </summary> - [EntityFieldName("CARTRIDGES")] - public ObservableCollection<Cartridge> Cartridges - { - get - { - return _cartridges; - } - - set - { - _cartridges = value; RaisePropertyChanged(nameof(Cartridges)); - } - - } - private ObservableCollection<IdsPack> _idspacks; /// <summary> /// Gets or sets the cartridgetype ids packs. @@ -110,8 +91,6 @@ namespace Tango.DAL.Observables private void Init() { - Cartridges = new ObservableCollection<Cartridge>(); - IdsPacks = new ObservableCollection<IdsPack>(); } diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Dispenser.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Dispenser.cs deleted file mode 100644 index dc0533869..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Dispenser.cs +++ /dev/null @@ -1,117 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [EntityFieldName("DISPENSERS")] - public partial class Dispenser : ObservableEntity<DISPENSER> - { - - private String _serialnumber; - /// <summary> - /// Gets or sets the dispenser serial number. - /// </summary> - [EntityFieldName("SERIAL_NUMBER")] - public String SerialNumber - { - get - { - return _serialnumber; - } - - set - { - _serialnumber = value; RaisePropertyChanged(nameof(SerialNumber)); - } - - } - - private String _dispensertypeguid; - /// <summary> - /// Gets or sets the dispenser dispenser type guid. - /// </summary> - [EntityFieldName("DISPENSER_TYPE_GUID")] - public String DispenserTypeGuid - { - get - { - return _dispensertypeguid; - } - - set - { - _dispensertypeguid = value; RaisePropertyChanged(nameof(DispenserTypeGuid)); - } - - } - - private DispenserType _dispensertypes; - /// <summary> - /// Gets or sets the dispenser dispenser types. - /// </summary> - [EntityFieldName("DISPENSER_TYPES")] - public DispenserType DispenserTypes - { - get - { - return _dispensertypes; - } - - set - { - _dispensertypes = value; RaisePropertyChanged(nameof(DispenserTypes)); - } - - } - - private ObservableCollection<IdsPack> _idspacks; - /// <summary> - /// Gets or sets the dispenser ids packs. - /// </summary> - [EntityFieldName("IDS_PACKS")] - public ObservableCollection<IdsPack> IdsPacks - { - get - { - return _idspacks; - } - - set - { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } - - } - - /// <summary> - /// Initializes a new instance of the <see cref="Dispenser" /> class. - /// </summary> - public Dispenser() : base() - { - Init(); - } - - /// <summary> - /// Initializes a new instance of the <see cref="Dispenser" /> class. - /// </summary> - /// <param name="entity">The entity.</param> - public Dispenser(DISPENSER entity) : base(entity) - { - Init(); - MapEntityToObservable(entity, this); - } - - /// <summary> - /// Initialize complex types. - /// </summary> - private void Init() - { - - IdsPacks = new ObservableCollection<IdsPack>(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs index 127bfe352..ace6c5d5d 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs @@ -48,21 +48,21 @@ namespace Tango.DAL.Observables } - private ObservableCollection<Dispenser> _dispensers; + private ObservableCollection<IdsPack> _idspacks; /// <summary> - /// Gets or sets the dispensertype dispensers. + /// Gets or sets the dispensertype ids packs. /// </summary> - [EntityFieldName("DISPENSERS")] - public ObservableCollection<Dispenser> Dispensers + [EntityFieldName("IDS_PACKS")] + public ObservableCollection<IdsPack> IdsPacks { get { - return _dispensers; + return _idspacks; } set { - _dispensers = value; RaisePropertyChanged(nameof(Dispensers)); + _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); } } @@ -91,7 +91,7 @@ namespace Tango.DAL.Observables private void Init() { - Dispensers = new ObservableCollection<Dispenser>(); + IdsPacks = new ObservableCollection<IdsPack>(); } } diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs index acc1a68d0..63703ca43 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs @@ -29,21 +29,21 @@ namespace Tango.DAL.Observables } - private String _dispenserguid; + private String _dispensertypeguid; /// <summary> - /// Gets or sets the idspack dispenser guid. + /// Gets or sets the idspack dispenser type guid. /// </summary> - [EntityFieldName("DISPENSER_GUID")] - public String DispenserGuid + [EntityFieldName("DISPENSER_TYPE_GUID")] + public String DispenserTypeGuid { get { - return _dispenserguid; + return _dispensertypeguid; } set { - _dispenserguid = value; RaisePropertyChanged(nameof(DispenserGuid)); + _dispensertypeguid = value; RaisePropertyChanged(nameof(DispenserTypeGuid)); } } @@ -181,21 +181,21 @@ namespace Tango.DAL.Observables } - private Dispenser _dispenser; + private DispenserType _dispensertypes; /// <summary> - /// Gets or sets the idspack dispenser. + /// Gets or sets the idspack dispenser types. /// </summary> - [EntityFieldName("DISPENSER")] - public Dispenser Dispenser + [EntityFieldName("DISPENSER_TYPES")] + public DispenserType DispenserTypes { get { - return _dispenser; + return _dispensertypes; } set { - _dispenser = value; RaisePropertyChanged(nameof(Dispenser)); + _dispensertypes = value; RaisePropertyChanged(nameof(DispenserTypes)); } } diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ConfigurationExtensions.cs b/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ConfigurationExtensions.cs index 655457197..c3e14bca8 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ConfigurationExtensions.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ConfigurationExtensions.cs @@ -24,7 +24,7 @@ public static class ConfigurationExtensions { IdsPack clonedPack = idsPack.CloneEntity(); clonedPack.Configuration = cloned; - clonedPack.Dispenser = idsPack.Dispenser; + clonedPack.DispenserTypes = idsPack.DispenserTypes; clonedPack.CartridgeTypes = idsPack.CartridgeTypes; clonedPack.MidTankTypes = idsPack.MidTankTypes; cloned.IdsPacks.Add(clonedPack); diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs index 4d19f7b80..53f40fd30 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs @@ -208,14 +208,10 @@ namespace Tango.DAL.Observables IdsPacks = Context.IDS_PACKS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<IdsPack>(x)).ToObservableCollection(); - Dispensers = Context.DISPENSERS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<Dispenser>(x)).ToObservableCollection(); - DispenserTypes = Context.DISPENSER_TYPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<DispenserType>(x)).ToObservableCollection(); LiquidTypes = Context.LIQUID_TYPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<LiquidType>(x)).ToObservableCollection(); - Cartridges = Context.CARTRIDGES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<Cartridge>(x)).ToObservableCollection(); - CartridgeTypes = Context.CARTRIDGE_TYPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<CartridgeType>(x)).ToObservableCollection(); MidTankTypes = Context.MID_TANK_TYPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<MidTankType>(x)).ToObservableCollection(); diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs index c42ced758..ef5309dba 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs @@ -258,42 +258,6 @@ namespace Tango.DAL.Observables } - private ObservableCollection<Cartridge> _cartridges; - /// <summary> - /// Gets or sets the Cartridges. - /// </summary> - public ObservableCollection<Cartridge> Cartridges - { - get - { - return _cartridges; - } - - set - { - _cartridges = value; RaisePropertyChanged(nameof(Cartridges)); - } - - } - - private ICollectionView _cartridgesViewSource; - /// <summary> - /// Gets or sets the Cartridges View Source. - ///</summary> - public ICollectionView CartridgesViewSource - { - get - { - return _cartridgesViewSource; - } - - set - { - _cartridgesViewSource = value; RaisePropertyChanged(nameof(CartridgesViewSource)); - } - - } - private ObservableCollection<Cat> _cats; /// <summary> /// Gets or sets the Cats. @@ -474,42 +438,6 @@ namespace Tango.DAL.Observables } - private ObservableCollection<Dispenser> _dispensers; - /// <summary> - /// Gets or sets the Dispensers. - /// </summary> - public ObservableCollection<Dispenser> Dispensers - { - get - { - return _dispensers; - } - - set - { - _dispensers = value; RaisePropertyChanged(nameof(Dispensers)); - } - - } - - private ICollectionView _dispensersViewSource; - /// <summary> - /// Gets or sets the Dispensers View Source. - ///</summary> - public ICollectionView DispensersViewSource - { - get - { - return _dispensersViewSource; - } - - set - { - _dispensersViewSource = value; RaisePropertyChanged(nameof(DispensersViewSource)); - } - - } - private ObservableCollection<EmbeddedFirmwareVersion> _embeddedfirmwareversions; /// <summary> /// Gets or sets the EmbeddedFirmwareVersions. @@ -1538,8 +1466,6 @@ namespace Tango.DAL.Observables CartridgeTypesViewSource = CreateCollectionView(CartridgeTypes); - CartridgesViewSource = CreateCollectionView(Cartridges); - CatsViewSource = CreateCollectionView(Cats); CctsViewSource = CreateCollectionView(Ccts); @@ -1550,8 +1476,6 @@ namespace Tango.DAL.Observables DispenserTypesViewSource = CreateCollectionView(DispenserTypes); - DispensersViewSource = CreateCollectionView(Dispensers); - EmbeddedFirmwareVersionsViewSource = CreateCollectionView(EmbeddedFirmwareVersions); EmbeddedSoftwareVersionsViewSource = CreateCollectionView(EmbeddedSoftwareVersions); diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj b/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj index 1952d3526..c17fcbc93 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj +++ b/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj @@ -96,11 +96,9 @@ <Compile Include="Entities\ApplicationFirmwareVersion.cs" /> <Compile Include="Entities\ApplicationOsVersion.cs" /> <Compile Include="Entities\ApplicationVersion.cs" /> - <Compile Include="Entities\Cartridge.cs" /> <Compile Include="Entities\CartridgeType.cs" /> <Compile Include="Entities\Configuration.cs" /> <Compile Include="Entities\Contact.cs" /> - <Compile Include="Entities\Dispenser.cs" /> <Compile Include="Entities\DispenserType.cs" /> <Compile Include="Entities\EmbeddedFirmwareVersion.cs" /> <Compile Include="Entities\EmbeddedSoftwareVersion.cs" /> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE.cs deleted file mode 100644 index 707510146..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// <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 CARTRIDGE - { - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } - public string SERIAL_NUMBER { get; set; } - public string CARTRIDGE_TYPE_GUID { get; set; } - - public virtual CARTRIDGE_TYPES CARTRIDGE_TYPES { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE_TYPES.cs index 5e6074c70..cfead09a2 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE_TYPES.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public CARTRIDGE_TYPES() { - this.CARTRIDGES = new HashSet<CARTRIDGE>(); this.IDS_PACKS = new HashSet<IDS_PACKS>(); } @@ -29,8 +28,6 @@ namespace Tango.DAL.Remote.DB public string NAME { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection<CARTRIDGE> CARTRIDGES { get; set; } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<IDS_PACKS> IDS_PACKS { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs deleted file mode 100644 index 60df18ed3..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs +++ /dev/null @@ -1,34 +0,0 @@ -//------------------------------------------------------------------------------ -// <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 DISPENSER - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public DISPENSER() - { - this.IDS_PACKS = new HashSet<IDS_PACKS>(); - } - - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } - public string SERIAL_NUMBER { get; set; } - public string DISPENSER_TYPE_GUID { get; set; } - - public virtual DISPENSER_TYPES DISPENSER_TYPES { get; set; } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection<IDS_PACKS> IDS_PACKS { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs index c474764b8..878d9a14d 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs @@ -17,7 +17,7 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public DISPENSER_TYPES() { - this.DISPENSERS = new HashSet<DISPENSER>(); + this.IDS_PACKS = new HashSet<IDS_PACKS>(); } public int ID { get; set; } @@ -28,6 +28,6 @@ namespace Tango.DAL.Remote.DB public string NAME { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection<DISPENSER> DISPENSERS { get; set; } + public virtual ICollection<IDS_PACKS> IDS_PACKS { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs index 140f9114a..24db64501 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs @@ -19,7 +19,7 @@ namespace Tango.DAL.Remote.DB public System.DateTime LAST_UPDATED { get; set; } public bool DELETED { get; set; } public string CONFIGURATION_GUID { get; set; } - public string DISPENSER_GUID { get; set; } + public string DISPENSER_TYPE_GUID { get; set; } public string LIQUID_TYPE_GUID { get; set; } public string CARTRIDGE_TYPE_GUID { get; set; } public string MID_TANK_TYPE_GUID { get; set; } @@ -28,7 +28,7 @@ namespace Tango.DAL.Remote.DB public virtual CARTRIDGE_TYPES CARTRIDGE_TYPES { get; set; } public virtual CONFIGURATION CONFIGURATION { get; set; } - public virtual DISPENSER DISPENSER { get; set; } + public virtual DISPENSER_TYPES DISPENSER_TYPES { get; set; } public virtual LIQUID_TYPES LIQUID_TYPES { get; set; } public virtual MID_TANK_TYPES MID_TANK_TYPES { 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 3f3549da2..fea29bf2d 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -32,13 +32,11 @@ namespace Tango.DAL.Remote.DB public virtual DbSet<APPLICATION_OS_VERSIONS> APPLICATION_OS_VERSIONS { get; set; } public virtual DbSet<APPLICATION_VERSIONS> APPLICATION_VERSIONS { get; set; } public virtual DbSet<CARTRIDGE_TYPES> CARTRIDGE_TYPES { get; set; } - public virtual DbSet<CARTRIDGE> CARTRIDGES { get; set; } public virtual DbSet<CAT> CATS { get; set; } public virtual DbSet<CCT> CCTS { get; set; } public virtual DbSet<CONFIGURATION> CONFIGURATIONS { get; set; } public virtual DbSet<CONTACT> CONTACTS { get; set; } public virtual DbSet<DISPENSER_TYPES> DISPENSER_TYPES { get; set; } - public virtual DbSet<DISPENSER> DISPENSERS { get; set; } public virtual DbSet<EMBEDDED_FIRMWARE_VERSIONS> EMBEDDED_FIRMWARE_VERSIONS { get; set; } public virtual DbSet<EMBEDDED_SOFTWARE_VERSIONS> EMBEDDED_SOFTWARE_VERSIONS { get; set; } public virtual DbSet<EVENT_TYPES> EVENT_TYPES { 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 ffed19a3f..faa13393b 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -88,17 +88,6 @@ <Property Name="CODE" Type="int" Nullable="false" /> <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> </EntityType> - <EntityType Name="CARTRIDGES"> - <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="DELETED" Type="bit" Nullable="false" /> - <Property Name="SERIAL_NUMBER" Type="nvarchar" MaxLength="50" Nullable="false" /> - <Property Name="CARTRIDGE_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> - </EntityType> <EntityType Name="CATS"> <Key> <PropertyRef Name="GUID" /> @@ -172,17 +161,6 @@ <Property Name="CODE" Type="int" Nullable="false" /> <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> </EntityType> - <EntityType Name="DISPENSERS"> - <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="DELETED" Type="bit" Nullable="false" /> - <Property Name="SERIAL_NUMBER" Type="nvarchar" MaxLength="50" Nullable="false" /> - <Property Name="DISPENSER_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> - </EntityType> <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS"> <Key> <PropertyRef Name="GUID" /> @@ -270,7 +248,7 @@ <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" /> <Property Name="DELETED" Type="bit" Nullable="false" /> <Property Name="CONFIGURATION_GUID" Type="varchar" MaxLength="36" Nullable="false" /> - <Property Name="DISPENSER_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="DISPENSER_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="LIQUID_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="CARTRIDGE_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="MID_TANK_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> @@ -527,18 +505,6 @@ <Property Name="USER_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="ROLE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> </EntityType> - <Association Name="FK_CARTRIDGES_CARTRIDGE_TYPES"> - <End Role="CARTRIDGE_TYPES" Type="Self.CARTRIDGE_TYPES" Multiplicity="1" /> - <End Role="CARTRIDGES" Type="Self.CARTRIDGES" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="CARTRIDGE_TYPES"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="CARTRIDGES"> - <PropertyRef Name="CARTRIDGE_TYPE_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> <Association Name="FK_CATS_LIQUID_TYPES"> <End Role="LIQUID_TYPES" Type="Self.LIQUID_TYPES" Multiplicity="1" /> <End Role="CATS" Type="Self.CATS" Multiplicity="*" /> @@ -623,18 +589,6 @@ </Dependent> </ReferentialConstraint> </Association> - <Association Name="FK_CONFIGURATIONS_DISPENSERS_DISPENSERS"> - <End Role="DISPENSERS" Type="Self.DISPENSERS" Multiplicity="1" /> - <End Role="IDS_PACKS" Type="Self.IDS_PACKS" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="DISPENSERS"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="IDS_PACKS"> - <PropertyRef Name="DISPENSER_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> <Association Name="FK_CONFIGURATIONS_DISPENSERS_LIQUIDS"> <End Role="LIQUID_TYPES" Type="Self.LIQUID_TYPES" Multiplicity="1" /> <End Role="IDS_PACKS" Type="Self.IDS_PACKS" Multiplicity="*" /> @@ -683,18 +637,6 @@ </Dependent> </ReferentialConstraint> </Association> - <Association Name="FK_DISPENSERS_DISPENSER_TYPES"> - <End Role="DISPENSER_TYPES" Type="Self.DISPENSER_TYPES" Multiplicity="1" /> - <End Role="DISPENSERS" Type="Self.DISPENSERS" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="DISPENSER_TYPES"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="DISPENSERS"> - <PropertyRef Name="DISPENSER_TYPE_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> <Association Name="FK_EVENTS_ACTIONS_ACTIONS"> <End Role="ACTION_TYPES" Type="Self.ACTION_TYPES" Multiplicity="1" /> <End Role="EVENT_TYPES_ACTIONS" Type="Self.EVENT_TYPES_ACTIONS" Multiplicity="*" /> @@ -745,6 +687,18 @@ </Dependent> </ReferentialConstraint> </Association> + <Association Name="FK_IDS_PACKS_DISPENSER_TYPES"> + <End Role="DISPENSER_TYPES" Type="Self.DISPENSER_TYPES" Multiplicity="1" /> + <End Role="IDS_PACKS" Type="Self.IDS_PACKS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="DISPENSER_TYPES"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="IDS_PACKS"> + <PropertyRef Name="DISPENSER_TYPE_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> <Association Name="FK_IDS_PACKS_MID_TANK_TYPES"> <End Role="MID_TANK_TYPES" Type="Self.MID_TANK_TYPES" Multiplicity="1" /> <End Role="IDS_PACKS" Type="Self.IDS_PACKS" Multiplicity="*" /> @@ -1099,13 +1053,11 @@ <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="Self.APPLICATION_OS_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="APPLICATION_VERSIONS" EntityType="Self.APPLICATION_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="CARTRIDGE_TYPES" EntityType="Self.CARTRIDGE_TYPES" Schema="dbo" store:Type="Tables" /> - <EntitySet Name="CARTRIDGES" EntityType="Self.CARTRIDGES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="CATS" EntityType="Self.CATS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="CCTS" EntityType="Self.CCTS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="CONFIGURATIONS" EntityType="Self.CONFIGURATIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="CONTACTS" EntityType="Self.CONTACTS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="DISPENSER_TYPES" EntityType="Self.DISPENSER_TYPES" Schema="dbo" store:Type="Tables" /> - <EntitySet Name="DISPENSERS" EntityType="Self.DISPENSERS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="Self.EMBEDDED_FIRMWARE_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="Self.EMBEDDED_SOFTWARE_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="EVENT_TYPES" EntityType="Self.EVENT_TYPES" Schema="dbo" store:Type="Tables" /> @@ -1134,10 +1086,6 @@ <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="Self.SYNC_CONFIGURATIONS" 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" /> - <AssociationSet Name="FK_CARTRIDGES_CARTRIDGE_TYPES" Association="Self.FK_CARTRIDGES_CARTRIDGE_TYPES"> - <End Role="CARTRIDGE_TYPES" EntitySet="CARTRIDGE_TYPES" /> - <End Role="CARTRIDGES" EntitySet="CARTRIDGES" /> - </AssociationSet> <AssociationSet Name="FK_CATS_LIQUID_TYPES" Association="Self.FK_CATS_LIQUID_TYPES"> <End Role="LIQUID_TYPES" EntitySet="LIQUID_TYPES" /> <End Role="CATS" EntitySet="CATS" /> @@ -1166,10 +1114,6 @@ <End Role="APPLICATION_VERSIONS" EntitySet="APPLICATION_VERSIONS" /> <End Role="CONFIGURATIONS" EntitySet="CONFIGURATIONS" /> </AssociationSet> - <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" Association="Self.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS"> - <End Role="DISPENSERS" EntitySet="DISPENSERS" /> - <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> - </AssociationSet> <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" Association="Self.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS"> <End Role="LIQUID_TYPES" EntitySet="LIQUID_TYPES" /> <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> @@ -1186,10 +1130,6 @@ <End Role="HARDWARE_VERSIONS" EntitySet="HARDWARE_VERSIONS" /> <End Role="CONFIGURATIONS" EntitySet="CONFIGURATIONS" /> </AssociationSet> - <AssociationSet Name="FK_DISPENSERS_DISPENSER_TYPES" Association="Self.FK_DISPENSERS_DISPENSER_TYPES"> - <End Role="DISPENSER_TYPES" EntitySet="DISPENSER_TYPES" /> - <End Role="DISPENSERS" EntitySet="DISPENSERS" /> - </AssociationSet> <AssociationSet Name="FK_EVENTS_ACTIONS_ACTIONS" Association="Self.FK_EVENTS_ACTIONS_ACTIONS"> <End Role="ACTION_TYPES" EntitySet="ACTION_TYPES" /> <End Role="EVENT_TYPES_ACTIONS" EntitySet="EVENT_TYPES_ACTIONS" /> @@ -1206,6 +1146,10 @@ <End Role="CONFIGURATIONS" EntitySet="CONFIGURATIONS" /> <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> </AssociationSet> + <AssociationSet Name="FK_IDS_PACKS_DISPENSER_TYPES" Association="Self.FK_IDS_PACKS_DISPENSER_TYPES"> + <End Role="DISPENSER_TYPES" EntitySet="DISPENSER_TYPES" /> + <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> + </AssociationSet> <AssociationSet Name="FK_IDS_PACKS_MID_TANK_TYPES" Association="Self.FK_IDS_PACKS_MID_TANK_TYPES"> <End Role="MID_TANK_TYPES" EntitySet="MID_TANK_TYPES" /> <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> @@ -1331,13 +1275,11 @@ <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="RemoteModel.APPLICATION_OS_VERSIONS" /> <EntitySet Name="APPLICATION_VERSIONS" EntityType="RemoteModel.APPLICATION_VERSIONS" /> <EntitySet Name="CARTRIDGE_TYPES" EntityType="RemoteModel.CARTRIDGE_TYPES" /> - <EntitySet Name="CARTRIDGES" EntityType="RemoteModel.CARTRIDGE" /> <EntitySet Name="CATS" EntityType="RemoteModel.CAT" /> <EntitySet Name="CCTS" EntityType="RemoteModel.CCT" /> <EntitySet Name="CONFIGURATIONS" EntityType="RemoteModel.CONFIGURATION" /> <EntitySet Name="CONTACTS" EntityType="RemoteModel.CONTACT" /> <EntitySet Name="DISPENSER_TYPES" EntityType="RemoteModel.DISPENSER_TYPES" /> - <EntitySet Name="DISPENSERS" EntityType="RemoteModel.DISPENSER" /> <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" /> <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" /> <EntitySet Name="EVENT_TYPES" EntityType="RemoteModel.EVENT_TYPES" /> @@ -1394,10 +1336,6 @@ <End Role="APPLICATION_VERSIONS" EntitySet="APPLICATION_VERSIONS" /> <End Role="CONFIGURATION" EntitySet="CONFIGURATIONS" /> </AssociationSet> - <AssociationSet Name="FK_CARTRIDGES_CARTRIDGE_TYPES" Association="RemoteModel.FK_CARTRIDGES_CARTRIDGE_TYPES"> - <End Role="CARTRIDGE_TYPES" EntitySet="CARTRIDGE_TYPES" /> - <End Role="CARTRIDGE" EntitySet="CARTRIDGES" /> - </AssociationSet> <AssociationSet Name="FK_IDS_PACKS_CARTRIDGE_TYPES" Association="RemoteModel.FK_IDS_PACKS_CARTRIDGE_TYPES"> <End Role="CARTRIDGE_TYPES" EntitySet="CARTRIDGE_TYPES" /> <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> @@ -1450,12 +1388,8 @@ <End Role="CONTACT" EntitySet="CONTACTS" /> <End Role="USER" EntitySet="USERS" /> </AssociationSet> - <AssociationSet Name="FK_DISPENSERS_DISPENSER_TYPES" Association="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES"> + <AssociationSet Name="FK_IDS_PACKS_DISPENSER_TYPES" Association="RemoteModel.FK_IDS_PACKS_DISPENSER_TYPES"> <End Role="DISPENSER_TYPES" EntitySet="DISPENSER_TYPES" /> - <End Role="DISPENSER" EntitySet="DISPENSERS" /> - </AssociationSet> - <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS"> - <End Role="DISPENSER" EntitySet="DISPENSERS" /> <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> </AssociationSet> <AssociationSet Name="FK_EVENTS_ACTIONS_EVENTS" Association="RemoteModel.FK_EVENTS_ACTIONS_EVENTS"> @@ -1640,21 +1574,8 @@ <Property Name="DELETED" Type="Boolean" Nullable="false" /> <Property Name="CODE" Type="Int32" Nullable="false" /> <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> - <NavigationProperty Name="CARTRIDGES" Relationship="RemoteModel.FK_CARTRIDGES_CARTRIDGE_TYPES" FromRole="CARTRIDGE_TYPES" ToRole="CARTRIDGE" /> <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_IDS_PACKS_CARTRIDGE_TYPES" FromRole="CARTRIDGE_TYPES" ToRole="IDS_PACKS" /> </EntityType> - <EntityType Name="CARTRIDGE"> - <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="DELETED" Type="Boolean" Nullable="false" /> - <Property Name="SERIAL_NUMBER" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> - <Property Name="CARTRIDGE_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <NavigationProperty Name="CARTRIDGE_TYPES" Relationship="RemoteModel.FK_CARTRIDGES_CARTRIDGE_TYPES" FromRole="CARTRIDGE" ToRole="CARTRIDGE_TYPES" /> - </EntityType> <EntityType Name="CAT"> <Key> <PropertyRef Name="GUID" /> @@ -1743,20 +1664,7 @@ <Property Name="DELETED" Type="Boolean" Nullable="false" /> <Property Name="CODE" Type="Int32" Nullable="false" /> <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> - <NavigationProperty Name="DISPENSERS" Relationship="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES" FromRole="DISPENSER_TYPES" ToRole="DISPENSER" /> - </EntityType> - <EntityType Name="DISPENSER"> - <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="DELETED" Type="Boolean" Nullable="false" /> - <Property Name="SERIAL_NUMBER" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> - <Property Name="DISPENSER_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <NavigationProperty Name="DISPENSER_TYPES" Relationship="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES" FromRole="DISPENSER" ToRole="DISPENSER_TYPES" /> - <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" FromRole="DISPENSER" ToRole="IDS_PACKS" /> + <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_IDS_PACKS_DISPENSER_TYPES" FromRole="DISPENSER_TYPES" ToRole="IDS_PACKS" /> </EntityType> <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS"> <Key> @@ -1854,7 +1762,7 @@ <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> <Property Name="DELETED" Type="Boolean" Nullable="false" /> <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="DISPENSER_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="DISPENSER_TYPE_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" /> <Property Name="CARTRIDGE_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="MID_TANK_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> @@ -1862,7 +1770,7 @@ <Property Name="PACK_INDEX" Type="Int32" Nullable="false" /> <NavigationProperty Name="CARTRIDGE_TYPES" Relationship="RemoteModel.FK_IDS_PACKS_CARTRIDGE_TYPES" FromRole="IDS_PACKS" ToRole="CARTRIDGE_TYPES" /> <NavigationProperty Name="CONFIGURATION" Relationship="RemoteModel.FK_IDS_PACKS_CONFIGURATIONS" FromRole="IDS_PACKS" ToRole="CONFIGURATION" /> - <NavigationProperty Name="DISPENSER" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" FromRole="IDS_PACKS" ToRole="DISPENSER" /> + <NavigationProperty Name="DISPENSER_TYPES" Relationship="RemoteModel.FK_IDS_PACKS_DISPENSER_TYPES" FromRole="IDS_PACKS" ToRole="DISPENSER_TYPES" /> <NavigationProperty Name="LIQUID_TYPES" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" FromRole="IDS_PACKS" ToRole="LIQUID_TYPES" /> <NavigationProperty Name="MID_TANK_TYPES" Relationship="RemoteModel.FK_IDS_PACKS_MID_TANK_TYPES" FromRole="IDS_PACKS" ToRole="MID_TANK_TYPES" /> </EntityType> @@ -2251,18 +2159,6 @@ </Dependent> </ReferentialConstraint> </Association> - <Association Name="FK_CARTRIDGES_CARTRIDGE_TYPES"> - <End Type="RemoteModel.CARTRIDGE_TYPES" Role="CARTRIDGE_TYPES" Multiplicity="1" /> - <End Type="RemoteModel.CARTRIDGE" Role="CARTRIDGE" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="CARTRIDGE_TYPES"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="CARTRIDGE"> - <PropertyRef Name="CARTRIDGE_TYPE_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> <Association Name="FK_IDS_PACKS_CARTRIDGE_TYPES"> <End Type="RemoteModel.CARTRIDGE_TYPES" Role="CARTRIDGE_TYPES" Multiplicity="1" /> <End Type="RemoteModel.IDS_PACKS" Role="IDS_PACKS" Multiplicity="*" /> @@ -2423,27 +2319,15 @@ </Dependent> </ReferentialConstraint> </Association> - <Association Name="FK_DISPENSERS_DISPENSER_TYPES"> + <Association Name="FK_IDS_PACKS_DISPENSER_TYPES"> <End Type="RemoteModel.DISPENSER_TYPES" Role="DISPENSER_TYPES" Multiplicity="1" /> - <End Type="RemoteModel.DISPENSER" Role="DISPENSER" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="DISPENSER_TYPES"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="DISPENSER"> - <PropertyRef Name="DISPENSER_TYPE_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_CONFIGURATIONS_DISPENSERS_DISPENSERS"> - <End Type="RemoteModel.DISPENSER" Role="DISPENSER" Multiplicity="1" /> <End Type="RemoteModel.IDS_PACKS" Role="IDS_PACKS" Multiplicity="*" /> <ReferentialConstraint> - <Principal Role="DISPENSER"> + <Principal Role="DISPENSER_TYPES"> <PropertyRef Name="GUID" /> </Principal> <Dependent Role="IDS_PACKS"> - <PropertyRef Name="DISPENSER_GUID" /> + <PropertyRef Name="DISPENSER_TYPE_GUID" /> </Dependent> </ReferentialConstraint> </Association> @@ -2825,18 +2709,6 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="CARTRIDGES"> - <EntityTypeMapping TypeName="RemoteModel.CARTRIDGE"> - <MappingFragment StoreEntitySet="CARTRIDGES"> - <ScalarProperty Name="CARTRIDGE_TYPE_GUID" ColumnName="CARTRIDGE_TYPE_GUID" /> - <ScalarProperty Name="SERIAL_NUMBER" ColumnName="SERIAL_NUMBER" /> - <ScalarProperty Name="DELETED" ColumnName="DELETED" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> <EntitySetMapping Name="CATS"> <EntityTypeMapping TypeName="RemoteModel.CAT"> <MappingFragment StoreEntitySet="CATS"> @@ -2915,18 +2787,6 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="DISPENSERS"> - <EntityTypeMapping TypeName="RemoteModel.DISPENSER"> - <MappingFragment StoreEntitySet="DISPENSERS"> - <ScalarProperty Name="DISPENSER_TYPE_GUID" ColumnName="DISPENSER_TYPE_GUID" /> - <ScalarProperty Name="SERIAL_NUMBER" ColumnName="SERIAL_NUMBER" /> - <ScalarProperty Name="DELETED" ColumnName="DELETED" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> <EntitySetMapping Name="EMBEDDED_FIRMWARE_VERSIONS"> <EntityTypeMapping TypeName="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS"> <MappingFragment StoreEntitySet="EMBEDDED_FIRMWARE_VERSIONS"> @@ -3020,7 +2880,7 @@ <ScalarProperty Name="MID_TANK_TYPE_GUID" ColumnName="MID_TANK_TYPE_GUID" /> <ScalarProperty Name="CARTRIDGE_TYPE_GUID" ColumnName="CARTRIDGE_TYPE_GUID" /> <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" /> - <ScalarProperty Name="DISPENSER_GUID" ColumnName="DISPENSER_GUID" /> + <ScalarProperty Name="DISPENSER_TYPE_GUID" ColumnName="DISPENSER_TYPE_GUID" /> <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" /> <ScalarProperty Name="DELETED" ColumnName="DELETED" /> <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> 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 a846f3364..7bb2e31b2 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,48 +5,46 @@ <!-- Diagram content (shape and connector positions) --> <edmx:Diagrams> <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1"> - <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="15.5" PointY="11.625" /> - <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3" PointY="24.875" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="25.5" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="22.375" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="28.625" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="19.25" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="17.625" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE" Width="1.5" PointX="5.25" PointY="17.625" /> - <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="9.75" PointY="13.25" /> - <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="17.25" PointY="20.125" /> - <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="7.125" /> - <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3" PointY="29.125" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="3.5" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="3.375" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="8.75" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="13" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="10.5" PointY="17.5" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="17.75" PointY="12.625" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="12.75" PointY="31" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="12.75" PointY="17.5" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="16.125" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="7.875" /> - <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="12.75" PointY="24.75" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="13.75" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="17.25" PointY="16.625" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="5.25" PointY="13.375" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="7.5" PointY="9.625" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="9.75" PointY="9.125" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="12.75" PointY="10" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="12.75" PointY="21.875" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="12.75" PointY="27.875" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="12.75" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="12.75" PointY="34.125" /> - <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="20.875" /> - <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="5.25" PointY="27" /> - <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="10.5" PointY="41.625" /> - <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="15" PointY="15" /> - <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="10.5" PointY="37.5" /> - <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="12.75" PointY="37.625" /> - <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="5.75" PointY="1.625" /> - <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="10.5" PointY="4" /> - <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="12.75" PointY="4.625" /> + <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="12.5" PointY="41.625" /> + <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3" PointY="22.875" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="9.75" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="14.125" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="23.375" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="17.25" /> + <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="12.75" PointY="11.25" /> + <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="16.25" PointY="21.25" /> + <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="8.125" /> + <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3" PointY="27.125" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3" PointY="4.625" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="26.5" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="20.375" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="7.5" PointY="20.5" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="14.75" PointY="25.625" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="11.75" PointY="28.125" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="11.75" PointY="34.125" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="29.625" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="8.875" /> + <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="11.75" PointY="25" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="14.875" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="16.25" PointY="17.75" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="5.25" PointY="14.5" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="7.5" PointY="10.625" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="9.75" PointY="10.125" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="9.75" PointY="14" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="11.75" PointY="31.25" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="11.75" PointY="21.875" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="11.75" PointY="6.75" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="11.75" PointY="18.5" /> + <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="18.75" /> + <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="5.25" PointY="25.125" /> + <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="13.5" PointY="38.25" /> + <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="14" PointY="16.125" /> + <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="13.5" PointY="2.5" /> + <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="15.75" PointY="2.625" /> + <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="5.75" PointY="2.625" /> + <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="7.5" PointY="16.125" /> + <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="15.75" PointY="12.625" /> <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" /> @@ -54,7 +52,6 @@ <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_FIRMWARE_VERSIONS" /> <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_OS_VERSIONS" /> <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_VERSIONS" /> - <AssociationConnector Association="RemoteModel.FK_CARTRIDGES_CARTRIDGE_TYPES" /> <AssociationConnector Association="RemoteModel.FK_IDS_PACKS_CARTRIDGE_TYPES" /> <AssociationConnector Association="RemoteModel.FK_CATS_LIQUID_TYPES" /> <AssociationConnector Association="RemoteModel.FK_CATS_MACHINES" /> @@ -68,8 +65,7 @@ <AssociationConnector Association="RemoteModel.FK_MACHINES_CONFIGURATIONS_CONFIGURATIONS" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_CONTACTS" /> <AssociationConnector Association="RemoteModel.FK_USERS_CONTACTS" /> - <AssociationConnector Association="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES" /> - <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" /> + <AssociationConnector Association="RemoteModel.FK_IDS_PACKS_DISPENSER_TYPES" /> <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_EVENTS" /> <AssociationConnector Association="RemoteModel.FK_MACHINES_EVENTS_EVENTS" /> <AssociationConnector Association="RemoteModel.FK_RML_FIBER_SHAPES" /> 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 986db2303..fc8d528c1 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -83,9 +83,6 @@ <Compile Include="DB\APPLICATION_VERSIONS.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> - <Compile Include="DB\CARTRIDGE.cs"> - <DependentUpon>RemoteADO.tt</DependentUpon> - </Compile> <Compile Include="DB\CARTRIDGE_TYPES.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> @@ -101,9 +98,6 @@ <Compile Include="DB\CONTACT.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> - <Compile Include="DB\DISPENSER.cs"> - <DependentUpon>RemoteADO.tt</DependentUpon> - </Compile> <Compile Include="DB\DISPENSER_TYPES.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> diff --git a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs index 3d9667676..0b4731ddf 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs +++ b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs @@ -56,8 +56,6 @@ namespace Tango.Synchronization.Remote var local_ids_packs = _localDB.IDS_PACKS.ToList(); LogManager.Log("Querying all local contacts..."); var local_contacts = _localDB.CONTACTS.ToList(); - LogManager.Log("Querying all local dispensers..."); - var local_dispensers = _localDB.DISPENSERS.ToList(); LogManager.Log("Querying all local machines..."); var local_machines = _localDB.MACHINES.Where(x => x.SERIAL_NUMBER == _machineSerial).ToList(); LogManager.Log("Querying all local machines configurations..."); @@ -115,13 +113,13 @@ namespace Tango.Synchronization.Remote remote_contacts.AddRange(remote_machines.Select(x => x.ORGANIZATION).Select(x => x.CONTACT)); remote_contacts = remote_contacts.Distinct().ToList(); - LogManager.Log("Querying all remote configurations dispensers..."); + LogManager.Log("Querying all remote IDS Packs..."); guids = remote_configurations.Select(x => x.GUID).ToList(); var remote_ids_packs = _remoteDB.IDS_PACKS.Where(x => guids.Contains(x.CONFIGURATION_GUID)).ToList(); - LogManager.Log("Querying all remote dispensers..."); - guids = remote_ids_packs.Select(x => x.DISPENSER_GUID).ToList(); - var remote_dispensers = _remoteDB.DISPENSERS.Where(x => guids.Contains(x.GUID)).ToList(); + LogManager.Log("Querying all remote dispenser types..."); + guids = remote_ids_packs.Select(x => x.DISPENSER_TYPE_GUID).ToList(); + var remote_dispensers_types = _remoteDB.DISPENSER_TYPES.Where(x => guids.Contains(x.GUID)).ToList(); LogManager.Log("Querying all remote cartridge types..."); guids = remote_ids_packs.Select(x => x.CARTRIDGE_TYPE_GUID).ToList(); @@ -150,9 +148,6 @@ namespace Tango.Synchronization.Remote LogManager.Log("Comparing contacts"); CompareCollections(remote_contacts, local_contacts, _remoteDB.CONTACTS, _localDB.CONTACTS); - LogManager.Log("Comparing dispensers"); - CompareCollections(remote_dispensers, local_dispensers, _remoteDB.DISPENSERS, _localDB.DISPENSERS); - LogManager.Log("Comparing machines"); CompareCollections(remote_machines, local_machines, _remoteDB.MACHINES, _localDB.MACHINES); |