From 9695aef4cf1ac2d85d6905e73c4f4aa079cc7c1d Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 16 Jan 2018 18:23:59 +0200
Subject: Removed Dispensers & Cartridges! Only Dispenser Type & CartridgeType
 now.

---
 .../Views/DBViews/CartridgeView.xaml               | 29 --------------------
 .../Views/DBViews/CartridgeView.xaml.cs            | 28 -------------------
 .../Views/DBViews/CartridgesView.xaml              | 24 ----------------
 .../Views/DBViews/CartridgesView.xaml.cs           | 32 ----------------------
 .../Views/DBViews/DispenserView.xaml               | 29 --------------------
 .../Views/DBViews/DispenserView.xaml.cs            | 28 -------------------
 .../Views/DBViews/DispensersView.xaml              | 24 ----------------
 .../Views/DBViews/DispensersView.xaml.cs           | 32 ----------------------
 8 files changed, 226 deletions(-)
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml.cs
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml.cs
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml.cs
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml.cs

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews')

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();
-        }
-    }
-}
-- 
cgit v1.3.1