From 2a51f05523c1397b77eca5e5188520919205638c Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 13 Dec 2017 15:19:55 +0200 Subject: Successfully separated Machine Studio to modules... --- .../Tango.MachineStudio.UI/App.config | 4 +- .../MachineStudio/Tango.MachineStudio.UI/App.xaml | 6 - .../Controls/DbTableView.xaml | 41 ---- .../Controls/DbTableView.xaml.cs | 38 ---- .../Tango.MachineStudio.UI/Controls/TableGrid.cs | 58 ------ .../Converters/UsersRolesToStringConverter.cs | 37 ---- .../CustomAttributes/DBViewAttribute.cs | 12 -- .../Managers/DialogsManager.cs | 38 ---- .../Managers/RegisteredView.cs | 54 ------ .../Managers/ViewsManager.cs | 31 --- .../Notifications/DefaultNotificationProvider.cs | 32 +++ .../Notifications/DialogWindow.xaml | 32 +++ .../Notifications/DialogWindow.xaml.cs | 58 ++++++ .../Tango.MachineStudio.UI.csproj | 98 ++-------- .../Tango.MachineStudio.UI/ViewModelLocator.cs | 41 +--- .../ViewModels/DBViewModels/AddressesViewVM.cs | 14 -- .../ViewModels/DBViewModels/DbTableViewModel.cs | 214 --------------------- .../ViewModels/DBViewModels/DialogOpenMode.cs | 14 -- .../ViewModels/DBViewModels/MachinesViewVM.cs | 21 -- .../ViewModels/DBViewModels/MultiComboVM.cs | 44 ----- .../ViewModels/DBViewModels/OrganizationsViewVM.cs | 26 --- .../ViewModels/DBViewModels/UsersViewVM.cs | 75 -------- .../ViewModels/EntityViewModel.cs | 31 --- .../Views/DBViews/AddressView.xaml | 34 ---- .../Views/DBViews/AddressView.xaml.cs | 28 --- .../Views/DBViews/AddressesView.xaml | 27 --- .../Views/DBViews/AddressesView.xaml.cs | 31 --- .../Views/DBViews/MachineView.xaml | 28 --- .../Views/DBViews/MachineView.xaml.cs | 28 --- .../Views/DBViews/MachinesView.xaml | 25 --- .../Views/DBViews/MachinesView.xaml.cs | 32 --- .../Views/DBViews/OrganizationView.xaml | 26 --- .../Views/DBViews/OrganizationView.xaml.cs | 28 --- .../Views/DBViews/OrganizationsView.xaml | 26 --- .../Views/DBViews/OrganizationsView.xaml.cs | 30 --- .../Views/DBViews/UserView.xaml | 43 ----- .../Views/DBViews/UserView.xaml.cs | 34 ---- .../Views/DBViews/UsersView.xaml | 27 --- .../Views/DBViews/UsersView.xaml.cs | 30 --- .../Tango.MachineStudio.UI/Views/MainView.xaml | 19 +- .../Windows/DialogWindow.xaml | 32 --- .../Windows/DialogWindow.xaml.cs | 58 ------ .../Tango.MachineStudio.UI/packages.config | 2 +- 43 files changed, 146 insertions(+), 1461 deletions(-) delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Controls/DbTableView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Controls/DbTableView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Controls/TableGrid.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Converters/UsersRolesToStringConverter.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/CustomAttributes/DBViewAttribute.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Managers/DialogsManager.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Managers/RegisteredView.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Managers/ViewsManager.cs create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/AddressesViewVM.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/DbTableViewModel.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/DialogOpenMode.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/MachinesViewVM.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/MultiComboVM.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/OrganizationsViewVM.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/UsersViewVM.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/EntityViewModel.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressesView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressesView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachineView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachineView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachinesView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachinesView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationsView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationsView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UserView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UserView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UsersView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UsersView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/DialogWindow.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/DialogWindow.xaml.cs (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config index 92aa00bf9..250f57a4d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config @@ -1,9 +1,9 @@  - +
- + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml index f6f2da415..6974f54be 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml @@ -2,7 +2,6 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:Tango.MachineStudio.UI" - xmlns:converters="clr-namespace:Tango.MachineStudio.UI.Converters" xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz" StartupUri="MainWindow.xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" d1p1:Ignorable="d" xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006"> @@ -78,11 +77,6 @@ - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Controls/DbTableView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Controls/DbTableView.xaml deleted file mode 100644 index be9776721..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Controls/DbTableView.xaml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Controls/DbTableView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Controls/DbTableView.xaml.cs deleted file mode 100644 index 19bee9e70..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Controls/DbTableView.xaml.cs +++ /dev/null @@ -1,38 +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.Markup; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Tango.MachineStudio.UI.Controls -{ - /// - /// Interaction logic for DbTableView.xaml - /// - [ContentProperty(nameof(MainContent))] - public partial class DbTableView : UserControl - { - public FrameworkElement MainContent - { - get { return (FrameworkElement)GetValue(MainContentProperty); } - set { SetValue(MainContentProperty, value); } - } - public static readonly DependencyProperty MainContentProperty = - DependencyProperty.Register("MainContent", typeof(FrameworkElement), typeof(DbTableView), new PropertyMetadata(null)); - - public DbTableView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Controls/TableGrid.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Controls/TableGrid.cs deleted file mode 100644 index 9b0d20362..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Controls/TableGrid.cs +++ /dev/null @@ -1,58 +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; - -namespace Tango.MachineStudio.UI.Controls -{ - public class TableGrid : Grid - { - public TableGrid() - { - ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Auto) }); - ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Star) }); - this.Loaded += TableGrid_Loaded; - } - - private void TableGrid_Loaded(object sender, RoutedEventArgs e) - { - InvalidateGrid(); - } - - protected override void OnVisualChildrenChanged(DependencyObject visualAdded, DependencyObject visualRemoved) - { - base.OnVisualChildrenChanged(visualAdded, visualRemoved); - } - - protected override Size ArrangeOverride(Size arrangeSize) - { - return base.ArrangeOverride(arrangeSize); - } - - private void InvalidateGrid() - { - RowDefinitions.Clear(); - RowDefinitions.Add(new RowDefinition() { Height = new GridLength(50, GridUnitType.Pixel) }); - - int currentRow = 0; - - for (int i = 0; i < Children.Count; i++) - { - SetRow(Children[i], currentRow); - - if (i % 2 != 0) - { - SetColumn(Children[i], 1); - (Children[i] as FrameworkElement).Margin = new Thickness(20, 0, 0, 0); - currentRow++; - RowDefinitions.Add(new RowDefinition() { Height = new GridLength(50, GridUnitType.Pixel) }); - } - - (Children[i] as FrameworkElement).VerticalAlignment = VerticalAlignment.Bottom; - } - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Converters/UsersRolesToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Converters/UsersRolesToStringConverter.cs deleted file mode 100644 index 734bc7135..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Converters/UsersRolesToStringConverter.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Data; -using Tango.DAL.Observables; -using Tango.MachineStudio.UI.ViewModels.DBViewModels; - -namespace Tango.MachineStudio.UI.Converters -{ - public class UsersRolesToStringConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - if (value == null) return ""; - - if (value is IEnumerable) - { - IEnumerable userRoles = value as IEnumerable; - return String.Join(", ", userRoles.Where(x => !x.Deleted).Select(x => x.Role.Name)); - } - else - { - IEnumerable> userRoles = value as IEnumerable>; - return String.Join(", ", userRoles.Where(x => x.IsSelected).Select(x => x.Entity.Name)); - } - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/CustomAttributes/DBViewAttribute.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/CustomAttributes/DBViewAttribute.cs deleted file mode 100644 index 39f34c4e9..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/CustomAttributes/DBViewAttribute.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.MachineStudio.UI.CustomAttributes -{ - public class DBViewAttribute : Attribute - { - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Managers/DialogsManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Managers/DialogsManager.cs deleted file mode 100644 index 4131f2a56..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Managers/DialogsManager.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using Tango.DAL.Observables; -using Tango.MachineStudio.UI.ViewModels.DBViewModels; -using Tango.MachineStudio.UI.Views.DBViews; -using Tango.MachineStudio.UI.Windows; - -namespace Tango.MachineStudio.UI.Managers -{ - public static class DialogsManager - { - public static bool ShowDialog(String title, object context) where T : FrameworkElement - { - DialogWindow dialog = new DialogWindow(Activator.CreateInstance()); - dialog.DataContext = context; - dialog.InnerTitle = title; - dialog.Owner = Application.Current.MainWindow; - return dialog.ShowDialog().Value; - } - - public static bool ShowDialog(DialogOpenMode mode, DbTableViewModel context) where T : IObservableEntity - { - Type viewType = typeof(DialogsManager).Assembly.GetType(typeof(OrganizationView).Namespace + "." + typeof(T).Name + "View"); - DialogWindow dialog = new DialogWindow(Activator.CreateInstance(viewType) as FrameworkElement); - dialog.InnerTitle = (mode == DialogOpenMode.Editing ? "Edit " : "Add New ") + typeof(T).Name; - dialog.DataContext = context; - dialog.Owner = Application.Current.MainWindow; - MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible; - bool result = dialog.ShowDialog().Value; - MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden; - return result; - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Managers/RegisteredView.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Managers/RegisteredView.cs deleted file mode 100644 index de66500b9..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Managers/RegisteredView.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using Tango.Core.Commands; - -namespace Tango.MachineStudio.UI.Managers -{ - public class RegisteredView - { - public String Header { get; set; } - public FrameworkElement View { get; set; } - public RelayCommand AddCommand { get; set; } - - public RegisteredView(String header, FrameworkElement view, Action action) - { - Header = header; - View = view; - - if (action != null) - { - AddCommand = new RelayCommand(action); - } - else - { - AddCommand = new RelayCommand(() => - { - if (!ViewsManager.DisplayedViews.Contains(this)) - { - ViewsManager.DisplayedViews.Add(this); - } - else - { - View.BringIntoView(); - View.Focus(); - } - }); - } - } - - public RegisteredView(String header, FrameworkElement view) : this(header, view, null) - { - Header = header; - View = view; - } - - public override string ToString() - { - return Header; - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Managers/ViewsManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Managers/ViewsManager.cs deleted file mode 100644 index caa1cb320..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Managers/ViewsManager.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using Tango.Core.Commands; -using Tango.MachineStudio.UI.CustomAttributes; -using Tango.MachineStudio.UI.Views.DBViews; - -namespace Tango.MachineStudio.UI.Managers -{ - public static class ViewsManager - { - public static ObservableCollection DisplayedViews { get; set; } - - public static ObservableCollection DbViews { get; set; } - - static ViewsManager() - { - DisplayedViews = new ObservableCollection(); - DbViews = new ObservableCollection(); - - foreach (var type in typeof(ViewsManager).Assembly.GetTypes().Where(x => x.CustomAttributes.Count() > 0 && x.CustomAttributes.First().AttributeType == typeof(DBViewAttribute))) - { - DbViews.Add(new RegisteredView(type.Name.Replace("View", ""), Activator.CreateInstance(type) as FrameworkElement)); - } - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs new file mode 100644 index 000000000..8e0fd2220 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using MaterialDesignThemes.Wpf; +using Tango.MachineStudio.Common.Notifications; +using Tango.MachineStudio.UI.Windows; + +namespace Tango.MachineStudio.UI.Notifications +{ + public class DefaultNotificationProvider : INotificationProvider + { + public bool ShowDialog(PackIconKind icon, string title, object context) where T : FrameworkElement + { + return ShowDialog(icon, title, Activator.CreateInstance(), context); + } + + public bool ShowDialog(PackIconKind icon, string title, FrameworkElement content, object context) + { + DialogWindow dialog = new DialogWindow(content); + dialog.DataContext = context; + dialog.InnerTitle = title; + dialog.Owner = Application.Current.MainWindow; + MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible; + bool result = dialog.ShowDialog().Value; + MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden; + return result; + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml new file mode 100644 index 000000000..f23776ec2 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml.cs new file mode 100644 index 000000000..c946d2b88 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml.cs @@ -0,0 +1,58 @@ +using MahApps.Metro.Controls; +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.Shapes; +using Tango.Core.Commands; + +namespace Tango.MachineStudio.UI.Windows +{ + /// + /// Interaction logic for DialogWindow.xaml + /// + public partial class DialogWindow : MetroWindow + { + public DialogWindow() + { + InitializeComponent(); + } + + + + public String InnerTitle + { + get { return (String)GetValue(InnerTitleProperty); } + set { SetValue(InnerTitleProperty, value); } + } + public static readonly DependencyProperty InnerTitleProperty = + DependencyProperty.Register("InnerTitle", typeof(String), typeof(DialogWindow), new PropertyMetadata(null)); + + + + public DialogWindow(FrameworkElement content) : this() + { + presenter.Content = content; + } + + private void OnOKClicked(object sender, RoutedEventArgs e) + { + DialogResult = true; + Close(); + } + + private void OnCancelClicked(object sender, RoutedEventArgs e) + { + DialogResult = false; + Close(); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj index 67e00db8d..6c008797f 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj @@ -41,10 +41,10 @@ ..\..\packages\Dragablz.0.0.3.197\lib\net45\Dragablz.dll - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll ..\..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll @@ -96,60 +96,16 @@ MSBuild:Compile Designer - - DbTableView.xaml - - - - - - - - - - - - + - - - - - AddressesView.xaml - - - AddressView.xaml - - - MachinesView.xaml - - - MachineView.xaml - - - OrganizationView.xaml - - - UsersView.xaml - - - UserView.xaml - MainView.xaml - - OrganizationsView.xaml - - + DialogWindow.xaml - - Designer - MSBuild:Compile - MSBuild:Compile Designer @@ -169,43 +125,11 @@ MSBuild:Compile Designer - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - Designer MSBuild:Compile - - Designer - MSBuild:Compile - - + Designer MSBuild:Compile @@ -266,6 +190,14 @@ {8491d07b-c1f6-4b62-a412-41b9fd2d6538} Tango.SharedUI + + {94f7acf8-55e1-4a02-b9bc-a818413fdbbf} + Tango.MachineStudio.DB + + + {cb0b0aa2-bb24-4bca-a720-45e397684e12} + Tango.MachineStudio.Common + @@ -273,9 +205,7 @@ - - - + $(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Machine Studio.lnk" diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs index 2d3492ba0..1f08e31ca 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs @@ -3,9 +3,10 @@ using GalaSoft.MvvmLight.Ioc; using Microsoft.Practices.ServiceLocation; using System; using Tango.Logging; +using Tango.MachineStudio.Common.Notifications; +using Tango.MachineStudio.UI.Notifications; using Tango.MachineStudio.UI.SupervisingController; using Tango.MachineStudio.UI.ViewModels; -using Tango.MachineStudio.UI.ViewModels.DBViewModels; using Tango.MachineStudio.UI.Views; namespace Tango.MachineStudio.UI @@ -34,11 +35,9 @@ namespace Tango.MachineStudio.UI //// SimpleIoc.Default.Register(); ////} + SimpleIoc.Default.Register(() => new DefaultNotificationProvider()); + SimpleIoc.Default.Register(); - SimpleIoc.Default.Register(); - SimpleIoc.Default.Register(); - SimpleIoc.Default.Register(); - SimpleIoc.Default.Register(); //Register View (Supervising Controller Pattern). if (!ViewModelBase.IsInDesignModeStatic) @@ -55,37 +54,5 @@ namespace Tango.MachineStudio.UI return ServiceLocator.Current.GetInstance(); } } - - public MachinesViewVM MachinesViewVM - { - get - { - return ServiceLocator.Current.GetInstance(); - } - } - - public OrganizationsViewVM OrganizationsViewVM - { - get - { - return ServiceLocator.Current.GetInstance(); - } - } - - public AddressesViewVM AddressesViewVM - { - get - { - return ServiceLocator.Current.GetInstance(); - } - } - - public UsersViewVM UsersViewVM - { - get - { - return ServiceLocator.Current.GetInstance(); - } - } } } \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/AddressesViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/AddressesViewVM.cs deleted file mode 100644 index 009de0139..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/AddressesViewVM.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.DAL.Observables; - -namespace Tango.MachineStudio.UI.ViewModels.DBViewModels -{ - public class AddressesViewVM : DbTableViewModel
- { - - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/DbTableViewModel.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/DbTableViewModel.cs deleted file mode 100644 index 2e3a6a6e1..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/DbTableViewModel.cs +++ /dev/null @@ -1,214 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.Core.Commands; -using Tango.DAL.Observables; -using Tango.MachineStudio.UI.Managers; -using Tango.SharedUI; - -namespace Tango.MachineStudio.UI.ViewModels.DBViewModels -{ - public abstract class DbTableViewModel : ViewModel where T : IObservableEntity - { - private T _editEntity; - /// - /// Gets or sets the edit entity. - /// - public T EditEntity - { - get { return _editEntity; } - set { _editEntity = value; RaisePropertyChangedAuto(); } - } - - private DialogOpenMode _dialogOpenMode; - /// - /// Gets or sets the dialog open mode. - /// - public DialogOpenMode DialogOpenMode - { - get { return _dialogOpenMode; } - set { _dialogOpenMode = value; RaisePropertyChangedAuto(); } - } - - private bool _isDialogOpen; - /// - /// Gets or sets a value indicating whether this instance is dialog open. - /// - public bool IsDialogOpen - { - get { return _isDialogOpen; } - set { _isDialogOpen = value; RaisePropertyChangedAuto(); } - } - - private ObservablesEntitiesAdapter _adapter; - /// - /// Gets or sets the DB adapter. - /// - public ObservablesEntitiesAdapter Adapter - { - get { return _adapter; } - set { _adapter = value; RaisePropertyChangedAuto(); } - } - - private T _selectedEntity; - /// - /// Gets or sets the selected entity. - /// - public T SelectedEntity - { - get { return _selectedEntity; } - set { _selectedEntity = value; RaisePropertyChangedAuto(); } - } - - private String _filter; - /// - /// Gets or sets the search filter. - /// - public String Filter - { - get { return _filter; } - set { _filter = value; RaisePropertyChangedAuto(); OnFilterChanged(value); } - } - - /// - /// Gets or sets the dialog OK command. - /// - public RelayCommand DialogOKCommand { get; set; } - - /// - /// Gets or sets the dialog cancel command. - /// - public RelayCommand DialogCancelCommand { get; set; } - - /// - /// Gets or sets the add command. - /// - public RelayCommand AddCommand { get; set; } - - /// - /// Gets or sets the edit command. - /// - public RelayCommand EditCommand { get; set; } - - /// - /// Gets or sets the delete command. - /// - public RelayCommand DeleteCommand { get; set; } - - /// - /// Initializes a new instance of the class. - /// - public DbTableViewModel() : base() - { - Adapter = App.DbAdapter; - - AddCommand = new RelayCommand(OnAdd); - EditCommand = new RelayCommand(OnEdit); - DeleteCommand = new RelayCommand(OnDelete); - DialogOKCommand = new RelayCommand(() => OnDialogOKPressed(DialogOpenMode, EditEntity)); - DialogCancelCommand = new RelayCommand(() => OnDialogCancelPressed(DialogOpenMode, EditEntity)); - - IsDialogOpen = false; - } - - /// - /// Called when delete command invoked. - /// - protected virtual void OnDelete() - { - SelectedEntity.Deleted = true; - SelectedEntity.Save(); - } - - /// - /// Called when edit command invoked. - /// - protected virtual void OnEdit() - { - DialogOpenMode = DialogOpenMode.Editing; - EditEntity = GetEditableEntity(DialogOpenMode); - DialogsManager.ShowDialog(DialogOpenMode, this); - IsDialogOpen = true; - } - - /// - /// Called when add command invoked. - /// - protected virtual void OnAdd() - { - DialogOpenMode = DialogOpenMode.Adding; - EditEntity = GetEditableEntity(DialogOpenMode); - DialogsManager.ShowDialog(DialogOpenMode, this); - IsDialogOpen = true; - } - - /// - /// Called when dialog closes with OK button. - /// - /// The mode. - protected virtual void OnDialogOKPressed(DialogOpenMode mode, T entity) - { - if (mode == DialogOpenMode.Editing) - { - entity.ShallowCopyTo(SelectedEntity); - entity = SelectedEntity; - } - - OnBeforeEntitySave(mode, entity); - - entity.Save(); - IsDialogOpen = false; - SelectedEntity = EditEntity; - } - - /// - /// Called when [before entity save]. - /// - /// The mode. - /// The entity. - protected virtual void OnBeforeEntitySave(DialogOpenMode mode,T entity) - { - - } - - /// - /// Called when dialog closes with cancel button. - /// - /// The mode. - protected virtual void OnDialogCancelPressed(DialogOpenMode mode, T entity) - { - IsDialogOpen = false; - } - - /// - /// Gets the editable entity. - /// - /// The mode. - /// - private T GetEditableEntity(DialogOpenMode mode) - { - if (mode == DialogOpenMode.Adding) - { - var newEntity = Activator.CreateInstance(); - InitializeEntity(newEntity); - return newEntity; - } - else - { - return SelectedEntity.ShallowClone(); - } - } - - protected virtual void OnFilterChanged(String filter) - { - - } - - protected virtual void InitializeEntity(T entity) - { - - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/DialogOpenMode.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/DialogOpenMode.cs deleted file mode 100644 index 9c6dbe807..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/DialogOpenMode.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.MachineStudio.UI.ViewModels.DBViewModels -{ - public enum DialogOpenMode - { - Editing, - Adding, - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/MachinesViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/MachinesViewVM.cs deleted file mode 100644 index c008f1124..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/MachinesViewVM.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.Core.Commands; -using Tango.DAL.Observables; -using Tango.SharedUI; - -namespace Tango.MachineStudio.UI.ViewModels.DBViewModels -{ - public class MachinesViewVM : DbTableViewModel - { - protected override void InitializeEntity(Machine entity) - { - base.InitializeEntity(entity); - entity.ProductionDate = DateTime.Now; - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/MultiComboVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/MultiComboVM.cs deleted file mode 100644 index 280eab923..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/MultiComboVM.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.SharedUI; - -namespace Tango.MachineStudio.UI.ViewModels.DBViewModels -{ - public class MultiComboVM : EntityViewModel - { - private Action _onSelectionChanged; - - public event EventHandler SelectionChanged; - - public MultiComboVM(T entity) : base(entity) - { - - } - - public MultiComboVM(T entity, Action onSelectionChanged) : this(entity) - { - _onSelectionChanged = onSelectionChanged; - } - - private bool _isSelected; - - public bool IsSelected - { - get { return _isSelected; } - set { _isSelected = value; RaisePropertyChangedAuto(); OnSelectionChanged(); } - } - - protected virtual void OnSelectionChanged() - { - if (_onSelectionChanged != null) - { - _onSelectionChanged(); - } - - SelectionChanged?.Invoke(this, new EventArgs()); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/OrganizationsViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/OrganizationsViewVM.cs deleted file mode 100644 index 6a2fd73df..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/OrganizationsViewVM.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.DAL.Observables; - -namespace Tango.MachineStudio.UI.ViewModels.DBViewModels -{ - public class OrganizationsViewVM : DbTableViewModel - { - public OrganizationsViewVM() : base() - { - - } - - protected override void OnFilterChanged(string filter) - { - Adapter.OrganizationsViewSource.Filter = (x) => - { - var org = x as Organization; - return org.Name.Contains(filter); - }; - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/UsersViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/UsersViewVM.cs deleted file mode 100644 index 2bf34ce7a..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/DBViewModels/UsersViewVM.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.DAL.Observables; - -namespace Tango.MachineStudio.UI.ViewModels.DBViewModels -{ - public class UsersViewVM : DbTableViewModel - { - private ObservableCollection> _selectedRoles; - public ObservableCollection> SelectedRoles - { - get { return _selectedRoles; } - set { _selectedRoles = value; RaisePropertyChangedAuto(); } - } - - public UsersViewVM() : base() - { - SelectedRoles = new ObservableCollection>(); - } - - protected override void OnEdit() - { - SelectedRoles = Adapter.Roles.Select(x => new MultiComboVM(x, () => RaisePropertyChanged(nameof(SelectedRoles)))).ToObservableCollection(); - - foreach (var role in SelectedRoles) - { - if (SelectedEntity.UsersRoles.ToList().Exists(x => x.Role == role.Entity && !x.Deleted)) - { - role.IsSelected = true; - } - } - - base.OnEdit(); - } - - protected override void OnAdd() - { - SelectedRoles = Adapter.Roles.Select(x => new MultiComboVM(x, () => RaisePropertyChanged(nameof(SelectedRoles)))).ToObservableCollection(); - - base.OnAdd(); - } - - protected override void OnBeforeEntitySave(DialogOpenMode mode, User user) - { - base.OnBeforeEntitySave(mode, user); - - foreach (var role in SelectedRoles) - { - var userRole = user.UsersRoles.SingleOrDefault(x => x.Role == role.Entity); - - if (userRole != null) - { - userRole.Deleted = !role.IsSelected; - } - else - { - if (role.IsSelected) - { - user.UsersRoles.Add(new UsersRole() - { - Role = role.Entity, - User = user, - RoleGuid = role.Entity.Guid, - UserGuid = user.Guid - }); - } - } - } - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/EntityViewModel.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/EntityViewModel.cs deleted file mode 100644 index fff03a1db..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/EntityViewModel.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.Core.Commands; -using Tango.SharedUI; - -namespace Tango.MachineStudio.UI.ViewModels -{ - public class EntityViewModel : ViewModel - { - private T _entity; - - public T Entity - { - get { return _entity; } - set { _entity = value; RaisePropertyChanged(nameof(Entity)); } - } - - public EntityViewModel() : base() - { - - } - - public EntityViewModel(T entity) : this() - { - Entity = entity; - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressView.xaml deleted file mode 100644 index 8e1bde374..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressView.xaml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressView.xaml.cs deleted file mode 100644 index 9c82b9d82..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressView.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.UI.Views.DBViews -{ - /// - /// Interaction logic for AddressView.xaml - /// - public partial class AddressView : UserControl - { - public AddressView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressesView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressesView.xaml deleted file mode 100644 index d8de4b15b..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressesView.xaml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressesView.xaml.cs deleted file mode 100644 index 793b18c82..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/AddressesView.xaml.cs +++ /dev/null @@ -1,31 +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.UI.CustomAttributes; -using Tango.SharedUI.Controls; - -namespace Tango.MachineStudio.UI.Views.DBViews -{ - /// - /// Interaction logic for MachinesView.xaml - /// - [DBView] - public partial class AddressesView : UserControl - { - public AddressesView() : base() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachineView.xaml deleted file mode 100644 index 042676b3c..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachineView.xaml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachineView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachineView.xaml.cs deleted file mode 100644 index 422268226..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachineView.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.UI.Views.DBViews -{ - /// - /// Interaction logic for MachineView.xaml - /// - public partial class MachineView : UserControl - { - public MachineView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachinesView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachinesView.xaml deleted file mode 100644 index 2c69d914f..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachinesView.xaml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachinesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachinesView.xaml.cs deleted file mode 100644 index a6a6f2b47..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/MachinesView.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.UI.CustomAttributes; -using Tango.MachineStudio.UI.Managers; -using Tango.SharedUI.Controls; - -namespace Tango.MachineStudio.UI.Views.DBViews -{ - /// - /// Interaction logic for MachinesView.xaml - /// - [DBView] - public partial class MachinesView : UserControl - { - public MachinesView() : base() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationView.xaml deleted file mode 100644 index 31be9356e..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationView.xaml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationView.xaml.cs deleted file mode 100644 index 8c17d51a7..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationView.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.UI.Views.DBViews -{ - /// - /// Interaction logic for OrganizationView.xaml - /// - public partial class OrganizationView : UserControl - { - public OrganizationView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationsView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationsView.xaml deleted file mode 100644 index ef446f01c..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationsView.xaml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationsView.xaml.cs deleted file mode 100644 index 2e955de0c..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/OrganizationsView.xaml.cs +++ /dev/null @@ -1,30 +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.UI.CustomAttributes; - -namespace Tango.MachineStudio.UI.Views.DBViews -{ - /// - /// Interaction logic for OrganizationsView.xaml - /// - [DBView] - public partial class OrganizationsView : UserControl - { - public OrganizationsView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UserView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UserView.xaml deleted file mode 100644 index 62802c5d9..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UserView.xaml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UserView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UserView.xaml.cs deleted file mode 100644 index 987c93b75..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UserView.xaml.cs +++ /dev/null @@ -1,34 +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.UI.Views.DBViews -{ - /// - /// Interaction logic for UserView.xaml - /// - public partial class UserView : UserControl - { - public UserView() - { - InitializeComponent(); - } - - private void comboRoles_SelectionChanged(object sender, SelectionChangedEventArgs e) - { - comboRoles.SelectedItem = null; - comboRoles.Text = "Press to select"; - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UsersView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UsersView.xaml deleted file mode 100644 index 9225661a0..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UsersView.xaml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UsersView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UsersView.xaml.cs deleted file mode 100644 index bc60c65cf..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/DBViews/UsersView.xaml.cs +++ /dev/null @@ -1,30 +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.UI.CustomAttributes; - -namespace Tango.MachineStudio.UI.Views.DBViews -{ - /// - /// Interaction logic for UsersView.xaml - /// - [DBView] - public partial class UsersView : UserControl - { - public UsersView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml index fbe45d36d..f8424b26d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml @@ -7,7 +7,7 @@ xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz" xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" - xmlns:managers="clr-namespace:Tango.MachineStudio.UI.Managers" + xmlns:db="clr-namespace:Tango.MachineStudio.DB.Views;assembly=Tango.MachineStudio.DB" xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views" mc:Ignorable="d" d:DesignHeight="720" d:DesignWidth="1270" Background="White" DataContext="{Binding MainViewVM, Source={StaticResource Locator}}"> @@ -59,23 +59,10 @@ - - - - - - - - - + + - - - -