diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-07 16:06:38 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-07 16:06:38 +0200 |
| commit | e111c33bc87acf40202f9e5423e21b087a366f07 (patch) | |
| tree | fac6d85ec3589620b1daea9a9f740a2120b0ca10 /Software/Visual_Studio | |
| parent | 6da42fd28ffbb680d85bb9e695520713ff51022a (diff) | |
| download | Tango-e111c33bc87acf40202f9e5423e21b087a366f07.tar.gz Tango-e111c33bc87acf40202f9e5423e21b087a366f07.zip | |
Added new events !!!
Diffstat (limited to 'Software/Visual_Studio')
89 files changed, 2258 insertions, 4244 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs deleted file mode 100644 index b33259e3e..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Data; -using Tango.BL.Entities; -using Tango.MachineStudio.DB.ViewModels; - -namespace Tango.MachineStudio.DB.Converters -{ - /// <summary> - /// Converts an event type action to string representation. - /// </summary> - /// <seealso cref="System.Windows.Data.IValueConverter" /> - public class EventTypeActionsToStringConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - if (value == null) return ""; - - if (value is IEnumerable<EventTypesAction>) - { - IEnumerable<EventTypesAction> eventActions = value as IEnumerable<EventTypesAction>; - return String.Join(", ", eventActions.Select(x => x.ActionType.Name)); - } - else - { - IEnumerable<MultiComboVM<ActionType>> eventActions = value as IEnumerable<MultiComboVM<ActionType>>; - return String.Join(", ", eventActions.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/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj index e719464f8..da427f4d8 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 @@ -80,13 +80,11 @@ </Compile> <Compile Include="Converters\ByteArrayToFileSizeConverter.cs" /> <Compile Include="Converters\EntityFieldNameToFriendlyStringConverter.cs" /> - <Compile Include="Converters\EventTypeActionsToStringConverter.cs" /> <Compile Include="Converters\LiquidTypeRmlsToStringConverter.cs" /> <Compile Include="Converters\RolesPermissionsToStringConverter.cs" /> <Compile Include="DBModule.cs" /> <Compile Include="Messages\CloseEntityEditViewMessage.cs" /> <Compile Include="Messages\OpenEntityEditViewMessage.cs" /> - <Compile Include="ViewModels\ActionTypesViewVM.cs" /> <Compile Include="ViewModels\AddressesViewVM.cs" /> <Compile Include="ViewModels\ApplicationDisplayPanelVersionsViewVM.cs" /> <Compile Include="ViewModels\ApplicationFirmwareVersionsViewVM.cs" /> @@ -96,13 +94,11 @@ <Compile Include="ViewModels\CctsViewVM.cs" /> <Compile Include="ViewModels\ConfigurationsViewVM.cs" /> <Compile Include="ViewModels\ContactsViewVM.cs" /> - <Compile Include="ViewModels\EventTypesGroupsViewVM.cs" /> <Compile Include="ViewModels\HardwareDancerTypesViewVM.cs" /> <Compile Include="ViewModels\DbTableViewModel.cs" /> <Compile Include="ViewModels\DialogOpenMode.cs" /> <Compile Include="ViewModels\DispenserTypesViewVM.cs" /> <Compile Include="ViewModels\EmbeddedFirmwareVersionsViewVM.cs" /> - <Compile Include="ViewModels\EventTypesViewVM.cs" /> <Compile Include="ViewModels\FiberShapesViewVM.cs" /> <Compile Include="ViewModels\FiberSynthsViewVM.cs" /> <Compile Include="ViewModels\HardwareVersionsViewVM.cs" /> @@ -132,24 +128,12 @@ <Compile Include="ViewModels\EntityViewModel.cs" /> <Compile Include="ViewModels\MainViewVM.cs" /> <Compile Include="ViewModelLocator.cs" /> - <Compile Include="Views\DBViews\ActionTypesView.xaml.cs"> - <DependentUpon>ActionTypesView.xaml</DependentUpon> - </Compile> - <Compile Include="Views\DBViews\ActionTypeView.xaml.cs"> - <DependentUpon>ActionTypeView.xaml</DependentUpon> - </Compile> <Compile Include="Views\DBViews\SpoolTypesView.xaml.cs"> <DependentUpon>SpoolTypesView.xaml</DependentUpon> </Compile> <Compile Include="Views\DBViews\SpoolTypeView.xaml.cs"> <DependentUpon>SpoolTypeView.xaml</DependentUpon> </Compile> - <Compile Include="Views\DBViews\EventTypesGroupsView.xaml.cs"> - <DependentUpon>EventTypesGroupsView.xaml</DependentUpon> - </Compile> - <Compile Include="Views\DBViews\EventTypesGroupView.xaml.cs"> - <DependentUpon>EventTypesGroupView.xaml</DependentUpon> - </Compile> <Compile Include="Views\DBViews\HardwarePidControlTypesView.xaml.cs"> <DependentUpon>HardwarePidControlTypesView.xaml</DependentUpon> </Compile> @@ -354,18 +338,12 @@ <Compile Include="Views\DBViews\OrganizationView.xaml.cs"> <DependentUpon>OrganizationView.xaml</DependentUpon> </Compile> - <Compile Include="Views\DBViews\EventTypesView.xaml.cs"> - <DependentUpon>EventTypesView.xaml</DependentUpon> - </Compile> <Compile Include="Views\DBViews\LiquidTypesRmlsView.xaml.cs"> <DependentUpon>LiquidTypesRmlsView.xaml</DependentUpon> </Compile> <Compile Include="Views\DBViews\UsersView.xaml.cs"> <DependentUpon>UsersView.xaml</DependentUpon> </Compile> - <Compile Include="Views\DBViews\EventTypeView.xaml.cs"> - <DependentUpon>EventTypeView.xaml</DependentUpon> - </Compile> <Compile Include="Views\DBViews\LiquidTypesRmlView.xaml.cs"> <DependentUpon>LiquidTypesRmlView.xaml</DependentUpon> </Compile> @@ -387,14 +365,6 @@ <Compile Include="CustomAttributes\DBViewAttribute.cs" /> <Compile Include="Managers\RegisteredView.cs" /> <Compile Include="Managers\ViewsManager.cs" /> - <Page Include="Views\DBViews\ActionTypesView.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> - <Page Include="Views\DBViews\ActionTypeView.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> <Page Include="Views\DBViews\SpoolTypesView.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> @@ -403,14 +373,6 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Page Include="Views\DBViews\EventTypesGroupsView.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> - <Page Include="Views\DBViews\EventTypesGroupView.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> <Page Include="Views\DBViews\HardwarePidControlTypesView.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> @@ -683,10 +645,6 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Page Include="Views\DBViews\EventTypesView.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> <Page Include="Views\DBViews\LiquidTypesRmlsView.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> @@ -695,10 +653,6 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Page Include="Views\DBViews\EventTypeView.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> <Page Include="Views\DBViews\LiquidTypesRmlView.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> @@ -780,7 +734,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs index 409b66e12..736682e07 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs @@ -37,8 +37,6 @@ namespace Tango.MachineStudio.DB TangoIOC.Default.Register<CartridgeTypesViewVM>(); TangoIOC.Default.Register<MidTankTypesViewVM>(); - TangoIOC.Default.Register<EventTypesViewVM>(); - TangoIOC.Default.Register<ActionTypesViewVM>(); TangoIOC.Default.Register<ContactsViewVM>(); @@ -62,8 +60,6 @@ namespace Tango.MachineStudio.DB TangoIOC.Default.Register<HardwareDancerTypesViewVM>(); TangoIOC.Default.Register<HardwarePidControlTypesViewVM>(); - TangoIOC.Default.Register<EventTypesGroupsViewVM>(); - TangoIOC.Default.Register<SpoolTypesViewVM>(); } @@ -211,22 +207,6 @@ namespace Tango.MachineStudio.DB } } - public static EventTypesViewVM EventTypesViewVM - { - get - { - return TangoIOC.Default.GetInstance<EventTypesViewVM>(); - } - } - - public static ActionTypesViewVM ActionTypesViewVM - { - get - { - return TangoIOC.Default.GetInstance<ActionTypesViewVM>(); - } - } - public static ContactsViewVM ContactsViewVM { get @@ -379,14 +359,6 @@ namespace Tango.MachineStudio.DB } } - public static EventTypesGroupsViewVM EventTypesGroupsViewVM - { - get - { - return TangoIOC.Default.GetInstance<EventTypesGroupsViewVM>(); - } - } - public static SpoolTypesViewVM SpoolTypesViewVM { get diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs deleted file mode 100644 index 69092a70d..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.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.BL.Entities; -using Tango.MachineStudio.Common.Notifications; - -namespace Tango.MachineStudio.DB.ViewModels -{ - public class ActionTypesViewVM : DbTableViewModel<ActionType> - { - public ActionTypesViewVM(INotificationProvider notification) : base(notification) - { - - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesGroupsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesGroupsViewVM.cs deleted file mode 100644 index abdb00e32..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesGroupsViewVM.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; -using Tango.MachineStudio.Common.Notifications; - -namespace Tango.MachineStudio.DB.ViewModels -{ - public class EventTypesGroupsViewVM : DbTableViewModel<EventTypesGroup> - { - public EventTypesGroupsViewVM(INotificationProvider notification) : base(notification) - { - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs deleted file mode 100644 index 6702b720f..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; -using Tango.MachineStudio.Common.Notifications; - -namespace Tango.MachineStudio.DB.ViewModels -{ - public class EventTypesViewVM : DbTableViewModel<EventType> - { - public EventTypesViewVM(INotificationProvider notification) : base(notification) - { - SelectedActions = new ObservableCollection<MultiComboVM<ActionType>>(); - } - - private ObservableCollection<MultiComboVM<ActionType>> _selectedActions; - public ObservableCollection<MultiComboVM<ActionType>> SelectedActions - { - get { return _selectedActions; } - set { _selectedActions = value; RaisePropertyChangedAuto(); } - } - - protected override void OnEdit() - { - SelectedActions = Adapter.ActionTypes.Select(x => new MultiComboVM<ActionType>(x, () => RaisePropertyChanged(nameof(SelectedActions)))).ToObservableCollection(); - - foreach (var actionType in SelectedActions) - { - if (SelectedEntity.EventTypesActions.ToList().Exists(x => x.ActionType == actionType.Entity)) - { - actionType.IsSelected = true; - } - } - - base.OnEdit(); - } - - protected override void OnAdd() - { - SelectedActions = Adapter.ActionTypes.Select(x => new MultiComboVM<ActionType>(x, () => RaisePropertyChanged(nameof(SelectedActions)))).ToObservableCollection(); - - base.OnAdd(); - } - - protected override void OnBeforeEntitySave(DialogOpenMode mode, EventType eventType) - { - base.OnBeforeEntitySave(mode, eventType); - - - - Adapter.Context.EventTypesActions.RemoveRange(eventType.EventTypesActions); - - foreach (var actionType in SelectedActions) - { - if (actionType.IsSelected) - { - eventType.EventTypesActions.Add(new EventTypesAction() - { - ActionType = actionType.Entity, - EventType = eventType, - ActionTypeGuid = actionType.Entity.Guid, - EventTypeGuid = eventType.Guid - }); - } - } - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml deleted file mode 100644 index 11a472edb..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml +++ /dev/null @@ -1,31 +0,0 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.ActionTypeView" - 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:ActionTypesViewVM, 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="Code:" FontWeight="Bold"></TextBlock> - <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Code,Mode=TwoWay}"></mahapps:NumericUpDown> - <TextBlock Text="Name:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.Name,Mode=TwoWay}"></TextBox> - <TextBlock Text="Description:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.Description,Mode=TwoWay}"></TextBox> - </controls:TableGrid> - </Grid> -</UserControl> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml.cs deleted file mode 100644 index 05a56fb89..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.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 ActionTypeView : UserControl - { - public ActionTypeView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml deleted file mode 100644 index a9a14fb0c..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml +++ /dev/null @@ -1,25 +0,0 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.ActionTypesView" - 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.ActionTypesViewVM}"> - <Grid> - <controls:DbTableView> - <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.ActionTypesViewSource}" 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="Code" Binding="{Binding Code}"></DataGridTextColumn> - <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn> - <DataGridTextColumn Header="Description" Binding="{Binding Description}"></DataGridTextColumn> - </DataGrid.Columns> - </DataGrid> - </controls:DbTableView> - </Grid> -</UserControl> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml.cs deleted file mode 100644 index aad79c87a..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.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 ActionTypesView : UserControl - { - public ActionTypesView() : base() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml deleted file mode 100644 index 4c1111ed7..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml +++ /dev/null @@ -1,55 +0,0 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.EventTypeView" - 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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" - xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" - xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls" - xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters" - xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews" - mc:Ignorable="d" - d:DesignHeight="300" d:DesignWidth="300"> - - <UserControl.Resources> - <converters:EventTypeActionsToStringConverter x:Key="EventTypeActionsToStringConverter"></converters:EventTypeActionsToStringConverter> - </UserControl.Resources> - - <Grid> - <controls:TableGrid> - <TextBlock Text="ID:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True" IsEnabled="False"></TextBox> - <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True" IsEnabled="False"></TextBox> - <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True" IsEnabled="False"></TextBox> - <TextBlock Text="Code:" FontWeight="Bold"></TextBlock> - <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Code,Mode=TwoWay}"></mahapps:NumericUpDown> - <TextBlock Text="Name:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.Name,Mode=TwoWay}"></TextBox> - <TextBlock Text="Description:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.Description,Mode=TwoWay}"></TextBox> - <TextBlock Text="Category:" FontWeight="Bold"></TextBlock> - <ComboBox ItemsSource="{Binding Adapter.EventTypesCategories}" SelectedItem="{Binding EditEntity.EventTypesCategory,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox> - <TextBlock Text="Group:" FontWeight="Bold"></TextBlock> - <ComboBox ItemsSource="{Binding Adapter.EventTypesGroups}" SelectedItem="{Binding EditEntity.EventTypesGroup,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox> - <TextBlock Text="Requires User Intervention:" FontWeight="Bold"></TextBlock> - <ToggleButton HorizontalAlignment="Right" IsChecked="{Binding EditEntity.RequiresUserIntervention}" /> - <TextBlock Text="Resolvable:" FontWeight="Bold"></TextBlock> - <ToggleButton HorizontalAlignment="Right" IsChecked="{Binding EditEntity.Resolvable}" /> - <TextBlock Text="HTML Page:" FontWeight="Bold"></TextBlock> - <ComboBox ItemsSource="{Binding Adapter.HtmlPages}" SelectedItem="{Binding EditEntity.HtmlPage,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox> - <TextBlock Text="Actions:" FontWeight="Bold"></TextBlock> - <ComboBox x:Name="comboActions" SelectionChanged="comboRoles_SelectionChanged" ItemsSource="{Binding SelectedActions}" materialDesign:HintAssist.Hint="{Binding SelectedActions,Converter={StaticResource EventTypeActionsToStringConverter},UpdateSourceTrigger=PropertyChanged}"> - <ComboBox.ItemTemplate> - <DataTemplate> - <StackPanel Orientation="Horizontal"> - <CheckBox IsChecked="{Binding IsSelected}" Width="20"/> - <TextBlock Text="{Binding Entity.Name}" MinWidth="100" /> - </StackPanel> - </DataTemplate> - </ComboBox.ItemTemplate> - </ComboBox> - </controls:TableGrid> - </Grid> -</UserControl> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml.cs deleted file mode 100644 index 6294b14e7..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.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.DB.Views.DBViews -{ - /// <summary> - /// Interaction logic for UserView.xaml - /// </summary> - public partial class EventTypeView : UserControl - { - public EventTypeView() - { - InitializeComponent(); - } - - private void comboRoles_SelectionChanged(object sender, SelectionChangedEventArgs e) - { - comboActions.SelectedItem = null; - comboActions.Text = "Press to select"; - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml deleted file mode 100644 index 8f8ec1eae..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml +++ /dev/null @@ -1,31 +0,0 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.EventTypesGroupView" - 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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" - xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" - xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls" - xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters" - xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews" - mc:Ignorable="d" - d:DesignHeight="300" d:DesignWidth="300"> - - - <Grid> - <controls:TableGrid> - <TextBlock Text="ID:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True" IsEnabled="False"></TextBox> - <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True" IsEnabled="False"></TextBox> - <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True" IsEnabled="False"></TextBox> - <TextBlock Text="Code:" FontWeight="Bold"></TextBlock> - <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Code,Mode=TwoWay}"></mahapps:NumericUpDown> - <TextBlock Text="Name:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.Name,Mode=TwoWay}"></TextBox> - <TextBlock Text="Description:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.Description,Mode=TwoWay}"></TextBox> - </controls:TableGrid> - </Grid> -</UserControl> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml.cs deleted file mode 100644 index e164fa171..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.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 UserView.xaml - /// </summary> - public partial class EventTypesGroupView : UserControl - { - public EventTypesGroupView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml deleted file mode 100644 index e6dff7f8a..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml +++ /dev/null @@ -1,26 +0,0 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.EventTypesGroupsView" - 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:controls="clr-namespace:Tango.MachineStudio.DB.Controls" - xmlns:global="clr-namespace:Tango.MachineStudio.DB" - xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews" - mc:Ignorable="d" - d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.EventTypesGroupsViewVM}"> - - <Grid> - <controls:DbTableView> - <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.EventTypesGroupsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" IsReadOnly="True"> - <DataGrid.Columns> - <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn> - <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn> - <DataGridTextColumn Header="Code" Binding="{Binding Code}"></DataGridTextColumn> - <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn> - <DataGridTextColumn Header="Description" Binding="{Binding Description}"></DataGridTextColumn> - </DataGrid.Columns> - </DataGrid> - </controls:DbTableView> - </Grid> -</UserControl> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml.cs deleted file mode 100644 index c11aeccc4..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.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.DB.CustomAttributes; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// <summary> - /// Interaction logic for UsersView.xaml - /// </summary> - [DBView] - public partial class EventTypesGroupsView : UserControl - { - public EventTypesGroupsView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml deleted file mode 100644 index 19700c976..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml +++ /dev/null @@ -1,38 +0,0 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.EventTypesView" - 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:controls="clr-namespace:Tango.MachineStudio.DB.Controls" - xmlns:global="clr-namespace:Tango.MachineStudio.DB" - xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters" - xmlns:sharedConverters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews" - mc:Ignorable="d" - d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.EventTypesViewVM}"> - - <UserControl.Resources> - <converters:EventTypeActionsToStringConverter x:Key="EventTypeActionsToStringConverter"></converters:EventTypeActionsToStringConverter> - <sharedConverters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" /> - </UserControl.Resources> - - <Grid> - <controls:DbTableView> - <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.EventTypesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" IsReadOnly="True"> - <DataGrid.Columns> - <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn> - <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn> - <DataGridTextColumn Header="Code" Binding="{Binding Code}"></DataGridTextColumn> - <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn> - <DataGridTextColumn Header="Description" Binding="{Binding Description}"></DataGridTextColumn> - <DataGridTextColumn Header="Category" Binding="{Binding EventTypesCategory.Name}"></DataGridTextColumn> - <DataGridTextColumn Header="Group" Binding="{Binding EventTypesGroup.Name}"></DataGridTextColumn> - <DataGridTextColumn Header="Requires User Intervention" Binding="{Binding RequiresUserIntervention,Converter={StaticResource BooleanToYesNoConverter}}"></DataGridTextColumn> - <DataGridTextColumn Header="Resolvable" Binding="{Binding Resolvable,Converter={StaticResource BooleanToYesNoConverter}}"></DataGridTextColumn> - <DataGridTextColumn Header="HTML Page" Binding="{Binding HtmlPageGuid}"></DataGridTextColumn> - <DataGridTextColumn Header="Actions" Binding="{Binding EventTypesActions,Converter={StaticResource EventTypeActionsToStringConverter}}"></DataGridTextColumn> - </DataGrid.Columns> - </DataGrid> - </controls:DbTableView> - </Grid> -</UserControl> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml.cs deleted file mode 100644 index 3c197b7f2..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.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.DB.CustomAttributes; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// <summary> - /// Interaction logic for UsersView.xaml - /// </summary> - [DBView] - public partial class EventTypesView : UserControl - { - public EventTypesView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs index 9876dca9e..3d282367a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs @@ -377,7 +377,7 @@ namespace Tango.MachineStudio.DataCapture.ViewModels using (_notification.PushTaskItem("Starting Recording...")) { Recorder.Start(); - _eventLogger.Log(EventTypes.RecordingStarted, "Recording Started..."); + _eventLogger.Log(EventTypes.RECORDING_STARTED, "Recording Started..."); _recordingBarItem.Push(); } @@ -393,7 +393,7 @@ namespace Tango.MachineStudio.DataCapture.ViewModels await Recorder.Stop(); _recordingBarItem.Pop(); - _eventLogger.Log(EventTypes.RecordingStopped, "Recording Stopped..."); + _eventLogger.Log(EventTypes.RECORDING_STOPPED, "Recording Stopped..."); } String recordingName = _notification.ShowTextInput("Enter recording name", "Recording name"); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index 8b0a89336..8ac8e6acd 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -738,8 +738,8 @@ namespace Tango.MachineStudio.Developer.ViewModels RemoveBrushStopCommand = new RelayCommand(RemoveSelectedBrushStops, () => SelectedBrushStop != null && CanWork); SaveJobCommand = new RelayCommand(SaveActiveJob, () => SelectedMachine != null && CanWork); DiscardJobCommand = new RelayCommand(BackToJobs, () => SelectedMachine != null && CanWork); - StartJobCommand = new RelayCommand(() => StartJob(), () => ActiveJob != null && CanWork && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.ActionTypes.Contains(BL.Enumerations.ActionTypes.PreventJobExecution))); - StartJobAndRecordCommand = new RelayCommand(StartJobAndRecord, () => _dataCaptureVM != null && !_dataCaptureVM.Recorder.IsRecording && !_dataCaptureVM.Player.IsPlaying && ActiveJob != null && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.ActionTypes.Contains(BL.Enumerations.ActionTypes.PreventJobExecution))); + StartJobCommand = new RelayCommand(() => StartJob(), () => ActiveJob != null && CanWork && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.Actions.Contains(BL.Enumerations.EventTypeActions.PreventJob))); + StartJobAndRecordCommand = new RelayCommand(StartJobAndRecord, () => _dataCaptureVM != null && !_dataCaptureVM.Recorder.IsRecording && !_dataCaptureVM.Player.IsPlaying && ActiveJob != null && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.Actions.Contains(BL.Enumerations.EventTypeActions.PreventJob))); StopJobCommand = new RelayCommand(StopJob, () => IsJobRunning && CanWork); CloseJobCompletionStatusCommand = new RelayCommand(CloseJobCompletionStatusBar); LoadJobCommand = new RelayCommand(() => LoadSelectedJob(), () => SelectedMachineJob != null && CanWork); @@ -1052,7 +1052,7 @@ namespace Tango.MachineStudio.Developer.ViewModels { _speech.SpeakError(events.Last().EventType.Name); - if (events.ToList().Exists(x => x.ActionTypes.Contains(BL.Enumerations.ActionTypes.AbortRunningJob))) + if (events.ToList().Exists(x => x.Actions.Contains(BL.Enumerations.EventTypeActions.StopJob))) { if (JobHandler != null) { @@ -1209,7 +1209,7 @@ namespace Tango.MachineStudio.Developer.ViewModels private void OnSelectedJobEventChanged() { - if (SelectedJobEvent != null && SelectedJobEvent.Type != BL.Enumerations.EventTypes.ApplicationStarted && !_dialog_shown) + if (SelectedJobEvent != null && SelectedJobEvent.Type != BL.Enumerations.EventTypes.APPLICATION_STARTED && !_dialog_shown) { _dialog_shown = true; _notification.ShowModalDialog<EventDetailsViewVM, EventDetailsView>(new EventDetailsViewVM(SelectedJobEvent), (x) => @@ -1333,7 +1333,7 @@ namespace Tango.MachineStudio.Developer.ViewModels if (status.Message != null) { // TODO: Write to db when shlomo is not sending test messages anymore. - _eventLogger.Log(BL.Enumerations.EventTypes.JobStatus, status.Message, false); + _eventLogger.Log(BL.Enumerations.EventTypes.JOB_STATUS, status.Message, false); } } }; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs index 1f93a96dc..c813e9752 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs @@ -140,8 +140,6 @@ namespace Tango.MachineStudio.Logging.ViewModels _db = ObservablesContext.CreateDefault(); _db.EventTypes.Load(); - _db.EventTypesCategories.Load(); - _db.EventTypesGroups.Load(); DateTime now = DateTime.UtcNow.AddMonths(-1); @@ -183,7 +181,7 @@ namespace Tango.MachineStudio.Logging.ViewModels private void OnSelectedEventChanged() { - if (SelectedEvent != null && SelectedEvent.Type != BL.Enumerations.EventTypes.ApplicationStarted && !_dialog_shown) + if (SelectedEvent != null && SelectedEvent.Type != BL.Enumerations.EventTypes.APPLICATION_STARTED && !_dialog_shown) { _dialog_shown = true; _notification.ShowModalDialog<EventDetailsViewVM, EventDetailsView>(new EventDetailsViewVM(SelectedEvent), (x) => @@ -198,7 +196,7 @@ namespace Tango.MachineStudio.Logging.ViewModels private void DisplayTimeline(MachinesEvent ev) { - var events = Events.OrderBy(x => x.DateTime).SkipWhile(x => x != ev).Skip(1).TakeWhile(x => x.DateTime > ev.DateTime && x.Type != BL.Enumerations.EventTypes.ApplicationStarted).ToObservableCollection(); + var events = Events.OrderBy(x => x.DateTime).SkipWhile(x => x != ev).Skip(1).TakeWhile(x => x.DateTime > ev.DateTime && x.Type != BL.Enumerations.EventTypes.APPLICATION_STARTED).ToObservableCollection(); events.Insert(0, ev); TimelineViewVM.Initialize(events.ToList()); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml index c75ef41ee..2dda7d342 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml @@ -73,9 +73,9 @@ <controls:TableGrid RowHeight="30"> <TextBlock Text="Category:" FontWeight="SemiBold" /> - <TextBlock Text="{Binding Event.EventType.EventTypesCategory.Name}"></TextBlock> + <TextBlock Text="{Binding Event.EventType.Category}"></TextBlock> <TextBlock Text="Group:" FontWeight="SemiBold" /> - <TextBlock Text="{Binding Event.EventType.EventTypesGroup.Name}"></TextBlock> + <TextBlock Text="{Binding Event.EventType.Group}"></TextBlock> </controls:TableGrid> </UniformGrid> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml index 196b6f930..846ea1fe2 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml @@ -136,7 +136,7 @@ <Trigger Property="IsFocused" Value="True"> <Setter Property="Background" Value="Transparent"></Setter> </Trigger> - <DataTrigger Binding="{Binding Type}" Value="ApplicationStarted"> + <DataTrigger Binding="{Binding Type}" Value="APPLICATION_STARTED"> <Setter Property="Background" Value="{StaticResource AccentColorBrush}"></Setter> <Setter Property="Foreground" Value="White" /> <Setter Property="FontWeight" Value="SemiBold"></Setter> @@ -154,7 +154,7 @@ <Trigger Property="IsSelected" Value="True"> <Setter Property="Background" Value="Transparent"></Setter> </Trigger> - <DataTrigger Binding="{Binding Type}" Value="ApplicationStarted"> + <DataTrigger Binding="{Binding Type}" Value="APPLICATION_STARTED"> <Setter Property="Background" Value="{StaticResource AccentColorBrush}"></Setter> <Setter Property="Foreground" Value="White" /> <Setter Property="FontWeight" Value="SemiBold"></Setter> @@ -188,7 +188,7 @@ <Setter Property="Kind" Value="BellPlus"></Setter> <Setter Property="Foreground" Value="Red"></Setter> </DataTrigger> - <DataTrigger Binding="{Binding Type}" Value="ApplicationStarted"> + <DataTrigger Binding="{Binding Type}" Value="APPLICATION_STARTED"> <Setter Property="Kind" Value="ClockFast"></Setter> <Setter Property="Foreground" Value="White"></Setter> </DataTrigger> @@ -202,7 +202,7 @@ <DataGridTextColumn Header="DATE TIME" Binding="{Binding DateTime,Converter={StaticResource DateTimeUTCToStringConverter},ConverterParameter='MM/dd/yyyy HH:mm:ss.fff'}" /> <DataGridTextColumn Header="HOST" Binding="{Binding HostName}" /> <DataGridTextColumn Header="USER" Binding="{Binding User.Contact.FullName,Mode=OneTime}" /> - <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.EventTypesGroup.Name}" /> + <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.Group}" /> <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Name}" /> <DataGridTemplateColumn Header="MESSAGE" Width="1*"> <DataGridTemplateColumn.CellTemplate> @@ -219,7 +219,7 @@ <Style TargetType="ContentControl"> <Setter Property="ContentTemplate" Value="{x:Null}"></Setter> <Style.Triggers> - <DataTrigger Binding="{Binding Type}" Value="ApplicationStarted"> + <DataTrigger Binding="{Binding Type}" Value="APPLICATION_STARTED"> <Setter Property="ContentTemplate"> <Setter.Value> <DataTemplate> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs index e634de824..8347c3144 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs @@ -82,10 +82,6 @@ namespace Tango.MachineStudio.Common.EventLogging { _db = ObservablesContext.CreateDefault(); - _db.ActionTypes.ToList(); - _db.EventTypesActions.ToList(); - _db.EventTypesCategories.ToList(); - _db.EventTypesGroups.ToList(); _db.EventTypes.ToList(); foreach (var type in _db.EventTypes) @@ -140,7 +136,7 @@ namespace Tango.MachineStudio.Common.EventLogging /// <param name="message">The message.</param> private void Machine_RequestSent(object sender, IMessage message) { - Log(EventTypes.RequestSent, String.Format("Sending request '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString())); + Log(EventTypes.REQUEST_SENT, String.Format("Sending request '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString())); } /// <summary> @@ -150,7 +146,7 @@ namespace Tango.MachineStudio.Common.EventLogging /// <param name="e">The <see cref="RequestFailedEventArgs"/> instance containing the event data.</param> private void Machine_RequestFailed(object sender, RequestFailedEventArgs e) { - Log(EventTypes.RequestFailed, String.Format("Request failed '{0}'...{1}{2}{1}{3}", e.Message.GetType().Name, Environment.NewLine, e.Message.ToJsonString(), e.Exception.ToString())); + Log(EventTypes.REQUEST_FAILED, String.Format("Request failed '{0}'...{1}{2}{1}{3}", e.Message.GetType().Name, Environment.NewLine, e.Message.ToJsonString(), e.Exception.ToString())); } /// <summary> @@ -160,7 +156,7 @@ namespace Tango.MachineStudio.Common.EventLogging /// <param name="message">The message.</param> private void Machine_ResponseReceived(object sender, IMessage message) { - Log(EventTypes.ResponseReceived, String.Format("Response received '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString())); + Log(EventTypes.RESPONSE_RECEIVED, String.Format("Response received '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString())); } /// <summary> @@ -271,7 +267,7 @@ namespace Tango.MachineStudio.Common.EventLogging /// <param name="exception">The exception.</param> public void Log(Exception exception) { - Log(EventTypes.ApplicationException, exception.ToString()); + Log(EventTypes.APPLICATION_EXCEPTION, exception.ToString()); } /// <summary> @@ -281,7 +277,7 @@ namespace Tango.MachineStudio.Common.EventLogging /// <param name="description"></param> public void Log(Exception exception, string description) { - Log(EventTypes.ApplicationException, description + Environment.NewLine + exception.ToString()); + Log(EventTypes.APPLICATION_EXCEPTION, description + Environment.NewLine + exception.ToString()); } /// <summary> @@ -290,7 +286,7 @@ namespace Tango.MachineStudio.Common.EventLogging /// <param name="message">The message.</param> public void Log(String message) { - Log(EventTypes.ApplicationInformation, message); + Log(EventTypes.APPLICATION_INFORMATION, message); } /// <summary> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Html/IHtmlPresenter.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Html/IHtmlPresenter.cs deleted file mode 100644 index 549022050..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Html/IHtmlPresenter.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.BL.Entities; - -namespace Tango.MachineStudio.Common.Html -{ - public interface IHtmlPresenter - { - bool DisplayHtml(HtmlPage html); - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj index 704223d17..2d83fdec4 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj @@ -101,7 +101,6 @@ <Compile Include="ExtensionMethods\CommonDialogExtensions.cs" /> <Compile Include="ExtensionMethods\TangoIOCExtensions.cs" /> <Compile Include="FirmwareUpgrade\IFirmwareUpgrader.cs" /> - <Compile Include="Html\IHtmlPresenter.cs" /> <None Include="Helpers\GraphsHelper.cs" /> <Compile Include="IStudioViewModel.cs" /> <Compile Include="MachineStudioSettings.cs" /> @@ -312,7 +311,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/DefaultHtmlPresenter.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/DefaultHtmlPresenter.cs deleted file mode 100644 index eff8c98a0..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/DefaultHtmlPresenter.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using Tango.BL.Entities; -using Tango.MachineStudio.Common.Html; -using Tango.MachineStudio.UI.Windows; - -namespace Tango.MachineStudio.UI.Html -{ - public class DefaultHtmlPresenter : IHtmlPresenter - { - public bool DisplayHtml(HtmlPage html) - { - HtmlWindow dialog = new HtmlWindow(html); - dialog.Owner = Application.Current.MainWindow; - MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible; - var result = dialog.ShowDialog(); - MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden; - return result.Value; - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HTML Templates/Thread Break.html b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HTML Templates/Thread Break.html deleted file mode 100644 index 5c620fc83..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HTML Templates/Thread Break.html +++ /dev/null @@ -1,48 +0,0 @@ -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <meta http-equiv="X-UA-Compatible" content="IE=edge" /> - <style> - html { - overflow: hidden; - padding: 0; - margin: 0; - font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; - } - - body { - padding: 0; - margin: 0; - /* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#eeeeee+0,eeeeee+100;Grey+Flat */ - background: rgb(238,238,238); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(238,238,238,1) 0%, rgba(238,238,238,1) 100%); /* FF3.6-15 */ - background: -webkit-linear-gradient(top, rgba(238,238,238,1) 0%,rgba(238,238,238,1) 100%); /* Chrome10-25,Safari5.1-6 */ - background: linear-gradient(to bottom, rgba(238,238,238,1) 0%,rgba(238,238,238,1) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */ - } - - .header { - font-size: 25pt; - background: #414141; - color: white; - padding: 15px; - } - - li { - margin:30px 10px; - padding:10px; - background:#C3C3C3; - max-width:500px; - border-radius:5px; - } - </style> -</head> -<body> - <div class="header">Thread Break</div> - <ol> - <li>Open the cover.</li> - <li>Connect the broken thread.</li> - <li>Close the cover.</li> - <li>Press 'OK' when done.</li> - </ol> -</body> -</html>
\ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml deleted file mode 100644 index f984a985f..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml +++ /dev/null @@ -1,37 +0,0 @@ -<Window x:Class="Tango.MachineStudio.UI.Html.HtmlWindow" - xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" - xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" - xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:local="clr-namespace:Tango.MachineStudio.UI.Windows" - mc:Ignorable="d" - Title="Machine Studio" Height="500" Width="800" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" Background="Transparent"> - <Grid> - <Grid> - <Border Background="White" BorderThickness="1" BorderBrush="{StaticResource AccentColorBrush}"> - <Border.Effect> - <DropShadowEffect ShadowDepth="0" BlurRadius="10"></DropShadowEffect> - </Border.Effect> - - <Grid> - <DockPanel> - <Grid DockPanel.Dock="Bottom"> - <Button Margin="10" Width="140" HorizontalAlignment="Right" Click="OKClicked">RESOLVE</Button> - </Grid> - <WebBrowser x:Name="webBrowser" - OverridesDefaultStyle="False" - ScrollViewer.CanContentScroll="False" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" - ScrollViewer.VerticalScrollBarVisibility="Hidden"></WebBrowser> - </DockPanel> - - <Button Click="CloseClicked" HorizontalAlignment="Right" VerticalAlignment="Top" Width="20" Height="20" Margin="0 -6 -4 0" Padding="0" Style="{StaticResource MaterialDesignFlatButton}" Foreground="Black"> - <materialDesign:PackIcon Kind="Close" Width="16" Height="16"></materialDesign:PackIcon> - </Button> - </Grid> - </Border> - </Grid> - </Grid> -</Window> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs deleted file mode 100644 index 9f37eba06..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs +++ /dev/null @@ -1,48 +0,0 @@ -using MahApps.Metro.Controls; -using MaterialDesignThemes.Wpf; -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.BL.Entities; -using Tango.Core.Commands; - -namespace Tango.MachineStudio.UI.Html -{ - /// <summary> - /// Interaction logic for DialogWindow.xaml - /// </summary> - public partial class HtmlWindow : Window - { - public HtmlWindow(HtmlPage html) - { - InitializeComponent(); - - webBrowser.Loaded += (_, __) => - { - webBrowser.NavigateToString(html.Html); - }; - } - - private void OKClicked(object sender, RoutedEventArgs e) - { - DialogResult = true; - Close(); - } - - private void CloseClicked(object sender, RoutedEventArgs e) - { - DialogResult = false; - Close(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs index baa550017..1612eb36c 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs @@ -265,7 +265,7 @@ namespace Tango.MachineStudio.UI.StudioApplication var eventLogger = TangoIOC.Default.GetInstance<IEventLogger>(); if (eventLogger != null) { - eventLogger.Log(EventTypes.ApplicationTerminated, "Application Terminated!"); + eventLogger.Log(EventTypes.APPLICATION_TERMINATED, "Application Terminated!"); eventLogger.FlushAll(); } 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 fb84d64bd..706b1c8f7 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 @@ -144,10 +144,6 @@ </Compile> <Compile Include="Console\ConsoleWindowVM.cs" /> <Compile Include="FirmwareUpgrade\DefaultFirmwareUpgrader.cs" /> - <Compile Include="Html\DefaultHtmlPresenter.cs" /> - <Compile Include="Html\HtmlWindow.xaml.cs"> - <DependentUpon>HtmlWindow.xaml</DependentUpon> - </Compile> <Compile Include="Messages\ForcedUpdateMessage.cs" /> <Compile Include="Modules\DefaultStudioModuleLoader.cs" /> <Compile Include="Notifications\TextInputBoxWindow.xaml.cs"> @@ -243,10 +239,6 @@ <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> - <Page Include="Html\HtmlWindow.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> <Page Include="MainWindow.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> @@ -536,7 +528,6 @@ <Link>Tango.Embroidery.dll</Link> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> - <Content Include="Html\HTML Templates\Thread Break.html" /> <Resource Include="machine.ico" /> <Resource Include="Images\bug-resolved.png" /> <EmbeddedResource Include="Properties\Resources.resx"> @@ -618,7 +609,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(Ta </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" /> + <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs index 3c548855d..b0a3a8c11 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs @@ -7,7 +7,6 @@ using Tango.MachineStudio.Common.Authentication; using Tango.MachineStudio.Common.Diagnostics; using Tango.MachineStudio.Common.EventLogging; using Tango.MachineStudio.Common.FirmwareUpgrade; -using Tango.MachineStudio.Common.Html; using Tango.MachineStudio.Common.Modules; using Tango.MachineStudio.Common.Navigation; using Tango.MachineStudio.Common.Notifications; @@ -18,7 +17,6 @@ using Tango.MachineStudio.Common.Video; using Tango.MachineStudio.UI.Authentication; using Tango.MachineStudio.UI.Console; using Tango.MachineStudio.UI.FirmwareUpgrade; -using Tango.MachineStudio.UI.Html; using Tango.MachineStudio.UI.Modules; using Tango.MachineStudio.UI.Navigation; using Tango.MachineStudio.UI.Notifications; @@ -67,7 +65,6 @@ namespace Tango.MachineStudio.UI TangoIOC.Default.Unregister<IDiagnosticsFrameProvider>(); TangoIOC.Default.Unregister<IEventLogger>(); TangoIOC.Default.Unregister<ISpeechProvider>(); - TangoIOC.Default.Unregister<IHtmlPresenter>(); TangoIOC.Default.Unregister<ITeamFoundationServiceClient>(); TangoIOC.Default.Unregister<IDispatcherProvider>(); TangoIOC.Default.Unregister<IFirmwareUpgrader>(); @@ -84,7 +81,6 @@ namespace Tango.MachineStudio.UI TangoIOC.Default.Register<IDiagnosticsFrameProvider, DefaultDiagnosticsFrameProvider>(); TangoIOC.Default.Register<IEventLogger, DefaultEventLogger>(); TangoIOC.Default.Register<ISpeechProvider, DefaultSpeechProvider>(); - TangoIOC.Default.Register<IHtmlPresenter, DefaultHtmlPresenter>(); TangoIOC.Default.Register<IFirmwareUpgrader, DefaultFirmwareUpgrader>(); TangoIOC.Default.Register<TeamFoundationServiceExtendedClient>(new TeamFoundationServiceExtendedClient("https://twinetfs.visualstudio.com", String.Empty, "szzfokrceo4rhd4eqi5qpmxn3pa5iwl3q7tlqd36l2m7smz2ynoa")); diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs index 492e23963..4ebf3d96d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs @@ -141,7 +141,7 @@ namespace Tango.MachineStudio.UI.ViewModels _authenticationProvider.Login(Email, Password); - _eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!"); + _eventLogger.Log(EventTypes.APPLICATION_STARTED, "Application Started!"); _navigationManager.NavigateTo(NavigationView.MainView); diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs index e3a8b4e7c..c13c7379a 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -20,7 +20,6 @@ using Tango.MachineStudio.Common; using Tango.MachineStudio.Common.Authentication; using Tango.MachineStudio.Common.Diagnostics; using Tango.MachineStudio.Common.EventLogging; -using Tango.MachineStudio.Common.Html; using Tango.MachineStudio.Common.Messages; using Tango.MachineStudio.Common.Modules; using Tango.MachineStudio.Common.Navigation; @@ -54,7 +53,6 @@ namespace Tango.MachineStudio.UI.ViewModels private bool _isDisconnecting; private Thread _updateCheckThread; private IEventLogger _eventLogger; - private IHtmlPresenter _htmlPresenter; private MachineStudioSettings _settings; /// <summary> @@ -282,7 +280,7 @@ namespace Tango.MachineStudio.UI.ViewModels IEventLogger eventLogger, IDiagnosticsFrameProvider frameProvider, ISpeechProvider speechProvider, - IHtmlPresenter htmlPresenter, TeamFoundationServiceExtendedClient tfs) : base() + TeamFoundationServiceExtendedClient tfs) : base() { TFSClient = tfs; _eventLogger = eventLogger; @@ -293,7 +291,6 @@ namespace Tango.MachineStudio.UI.ViewModels ApplicationManager = applicationManager; DiagnosticsFrameProvider = frameProvider; SpeechProvider = speechProvider; - _htmlPresenter = htmlPresenter; _settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>(); @@ -782,21 +779,7 @@ namespace Tango.MachineStudio.UI.ViewModels /// <param name="machineEvent">The HTML page.</param> private async void ResolveMachineEvent(MachinesEvent machineEvent) { - if (machineEvent.EventType.HtmlPage != null) - { - if (_htmlPresenter.DisplayHtml(machineEvent.EventType.HtmlPage)) - { - if (ApplicationManager.ConnectedMachine != null && machineEvent.EventType.Resolvable) - { - _eventLogger.Log(String.Format("Event '{0}' resolved by user.", machineEvent.EventType.Name)); - await ApplicationManager.ConnectedMachine.ResolveEvent((PMR.Diagnostics.EventType)machineEvent.Type); - } - } - } - else - { - _notificationProvider.ShowWarning("Could not locate guidance content for the specified event."); - } + } /// <summary> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs index 81b6e5942..dd8b8041d 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs @@ -60,11 +60,11 @@ namespace Tango.PPC.Events.ViewModels { InvokeUI(() => { - if (ev.Group != EventTypesGroups.Transport) + if (ev.Group != EventTypeGroups.Transport) { CurrentEvents.Insert(0, ev); - if (ev.Group != EventTypesGroups.Application && ev.Group != EventTypesGroups.Transport) + if (ev.Group != EventTypeGroups.Application && ev.Group != EventTypeGroups.Transport) { var notificationItem = new MessageNotificationItem(); notificationItem.CanClose = false; @@ -78,16 +78,16 @@ namespace Tango.PPC.Events.ViewModels switch (ev.Category) { - case EventTypesCategories.Info: + case EventTypeCategories.Info: notificationItem.MessageType = MessageNotificationItem.MessageNotificationItemTypes.Info; break; - case EventTypesCategories.Warning: + case EventTypeCategories.Warning: notificationItem.MessageType = MessageNotificationItem.MessageNotificationItemTypes.Warning; break; - case EventTypesCategories.Error: + case EventTypeCategories.Error: notificationItem.MessageType = MessageNotificationItem.MessageNotificationItemTypes.Error; break; - case EventTypesCategories.Critical: + case EventTypeCategories.Critical: notificationItem.MessageType = MessageNotificationItem.MessageNotificationItemTypes.Critical; break; } @@ -103,11 +103,11 @@ namespace Tango.PPC.Events.ViewModels { InvokeUI(() => { - if (ev.Group != EventTypesGroups.Transport) + if (ev.Group != EventTypeGroups.Transport) { CurrentEvents.Remove(ev); - if (ev.Group != EventTypesGroups.Application && ev.Group != EventTypesGroups.Transport) + if (ev.Group != EventTypeGroups.Application && ev.Group != EventTypeGroups.Transport) { if (_notifications.ContainsKey(ev.EventType.Type)) { diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs index 5162bc532..8e1f7c722 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs @@ -88,10 +88,6 @@ namespace Tango.PPC.Common.EventLogging { _db = ObservablesContext.CreateDefault(); - _db.ActionTypes.ToList(); - _db.EventTypesActions.ToList(); - _db.EventTypesCategories.ToList(); - _db.EventTypesGroups.ToList(); _db.EventTypes.ToList(); foreach (var type in _db.EventTypes) @@ -143,7 +139,7 @@ namespace Tango.PPC.Common.EventLogging /// <param name="message">The message.</param> private void Machine_RequestSent(object sender, IMessage message) { - Log(EventTypes.RequestSent, String.Format("Sending request '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString())); + Log(EventTypes.REQUEST_SENT, String.Format("Sending request '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString())); } /// <summary> @@ -153,7 +149,7 @@ namespace Tango.PPC.Common.EventLogging /// <param name="e">The <see cref="RequestFailedEventArgs"/> instance containing the event data.</param> private void Machine_RequestFailed(object sender, RequestFailedEventArgs e) { - Log(EventTypes.RequestFailed, String.Format("Request failed '{0}'...{1}{2}{1}{3}", e.Message.GetType().Name, Environment.NewLine, e.Message.ToJsonString(), e.Exception.ToString())); + Log(EventTypes.REQUEST_FAILED, String.Format("Request failed '{0}'...{1}{2}{1}{3}", e.Message.GetType().Name, Environment.NewLine, e.Message.ToJsonString(), e.Exception.ToString())); } /// <summary> @@ -163,7 +159,7 @@ namespace Tango.PPC.Common.EventLogging /// <param name="message">The message.</param> private void Machine_ResponseReceived(object sender, IMessage message) { - Log(EventTypes.ResponseReceived, String.Format("Response received '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString())); + Log(EventTypes.RESPONSE_RECEIVED, String.Format("Response received '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString())); } /// <summary> @@ -273,7 +269,7 @@ namespace Tango.PPC.Common.EventLogging /// <param name="exception">The exception.</param> public void Log(Exception exception) { - Log(EventTypes.ApplicationException, exception.ToString()); + Log(EventTypes.APPLICATION_EXCEPTION, exception.ToString()); } /// <summary> @@ -283,7 +279,7 @@ namespace Tango.PPC.Common.EventLogging /// <param name="description"></param> public void Log(Exception exception, string description) { - Log(EventTypes.ApplicationException, description + Environment.NewLine + exception.ToString()); + Log(EventTypes.APPLICATION_EXCEPTION, description + Environment.NewLine + exception.ToString()); } /// <summary> @@ -292,7 +288,7 @@ namespace Tango.PPC.Common.EventLogging /// <param name="message">The message.</param> public void Log(String message) { - Log(EventTypes.ApplicationInformation, message); + Log(EventTypes.APPLICATION_INFORMATION, message); } /// <summary> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs index f9830940b..3916d6345 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs @@ -216,7 +216,7 @@ namespace Tango.PPC.UI.PPCApplication { LogManager.Log($"Raising {nameof(ApplicationStarted)} event..."); - _eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!"); + _eventLogger.Log(EventTypes.APPLICATION_STARTED, "Application Started!"); ApplicationStarted?.Invoke(this, new EventArgs()); LogManager.Log("Invoking PPC view models OnApplicationStarted methods..."); diff --git a/Software/Visual_Studio/Resources/Events-old-old.xlsx b/Software/Visual_Studio/Resources/Events-old-old.xlsx Binary files differnew file mode 100644 index 000000000..53aa042a2 --- /dev/null +++ b/Software/Visual_Studio/Resources/Events-old-old.xlsx diff --git a/Software/Visual_Studio/Resources/Events-old.xlsx b/Software/Visual_Studio/Resources/Events-old.xlsx Binary files differnew file mode 100644 index 000000000..99d2c4a5c --- /dev/null +++ b/Software/Visual_Studio/Resources/Events-old.xlsx diff --git a/Software/Visual_Studio/Resources/Events.xlsx b/Software/Visual_Studio/Resources/Events.xlsx Binary files differindex 99d2c4a5c..da9110f8b 100644 --- a/Software/Visual_Studio/Resources/Events.xlsx +++ b/Software/Visual_Studio/Resources/Events.xlsx diff --git a/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs b/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs deleted file mode 100644 index a5f6f9f4d..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public partial class ActionType : ActionTypeBase - { - /// <summary> - /// Initializes a new instance of the <see cref="ActionType" /> class. - /// </summary> - public ActionType() : base() - { - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/ActionTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ActionTypeBase.cs deleted file mode 100644 index 48357ed4d..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/ActionTypeBase.cs +++ /dev/null @@ -1,188 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; - -namespace Tango.BL.Entities -{ - [Table("ACTION_TYPES")] - public abstract class ActionTypeBase : ObservableEntity<ActionType> - { - - public event EventHandler<Int32> CodeChanged; - - public event EventHandler<String> NameChanged; - - public event EventHandler<String> DescriptionChanged; - - public event EventHandler<SynchronizedObservableCollection<EventTypesAction>> EventTypesActionsChanged; - - protected Int32 _code; - - /// <summary> - /// Gets or sets the actiontypebase code. - /// </summary> - - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - if (_code != value) - { - _code = value; - - OnCodeChanged(value); - - } - } - } - - protected String _name; - - /// <summary> - /// Gets or sets the actiontypebase name. - /// </summary> - - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - if (_name != value) - { - _name = value; - - OnNameChanged(value); - - } - } - } - - protected String _description; - - /// <summary> - /// Gets or sets the actiontypebase description. - /// </summary> - - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - if (_description != value) - { - _description = value; - - OnDescriptionChanged(value); - - } - } - } - - protected SynchronizedObservableCollection<EventTypesAction> _eventtypesactions; - - /// <summary> - /// Gets or sets the actiontypebase event types actions. - /// </summary> - - public virtual SynchronizedObservableCollection<EventTypesAction> EventTypesActions - { - get - { - return _eventtypesactions; - } - - set - { - if (_eventtypesactions != value) - { - _eventtypesactions = value; - - OnEventTypesActionsChanged(value); - - } - } - } - - /// <summary> - /// Called when the Code has changed. - /// </summary> - protected virtual void OnCodeChanged(Int32 code) - { - CodeChanged?.Invoke(this, code); - RaisePropertyChanged(nameof(Code)); - } - - /// <summary> - /// Called when the Name has changed. - /// </summary> - protected virtual void OnNameChanged(String name) - { - NameChanged?.Invoke(this, name); - RaisePropertyChanged(nameof(Name)); - } - - /// <summary> - /// Called when the Description has changed. - /// </summary> - protected virtual void OnDescriptionChanged(String description) - { - DescriptionChanged?.Invoke(this, description); - RaisePropertyChanged(nameof(Description)); - } - - /// <summary> - /// Called when the EventTypesActions has changed. - /// </summary> - protected virtual void OnEventTypesActionsChanged(SynchronizedObservableCollection<EventTypesAction> eventtypesactions) - { - EventTypesActionsChanged?.Invoke(this, eventtypesactions); - RaisePropertyChanged(nameof(EventTypesActions)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="ActionTypeBase" /> class. - /// </summary> - public ActionTypeBase() : base() - { - - EventTypesActions = new SynchronizedObservableCollection<EventTypesAction>(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs b/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs index 91d84a666..591ae2155 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs @@ -29,7 +29,15 @@ namespace Tango.BL.Entities public event EventHandler<Double> NlPerPulseChanged; - public event EventHandler<Byte[]> DataChanged; + public event EventHandler<String> PartNumberChanged; + + public event EventHandler<String> PcbSerialChanged; + + public event EventHandler<String> PcbVersionChanged; + + public event EventHandler<Nullable<DateTime>> ProductionDateChanged; + + public event EventHandler<Byte[]> CalibrationDataChanged; public event EventHandler<DispenserType> DispenserTypeChanged; @@ -114,28 +122,136 @@ namespace Tango.BL.Entities } } - protected Byte[] _data; + protected String _partnumber; + + /// <summary> + /// Gets or sets the dispenserbase part number. + /// </summary> + + [Column("PART_NUMBER")] + + public String PartNumber + { + get + { + return _partnumber; + } + + set + { + if (_partnumber != value) + { + _partnumber = value; + + OnPartNumberChanged(value); + + } + } + } + + protected String _pcbserial; + + /// <summary> + /// Gets or sets the dispenserbase pcb serial. + /// </summary> + + [Column("PCB_SERIAL")] + + public String PcbSerial + { + get + { + return _pcbserial; + } + + set + { + if (_pcbserial != value) + { + _pcbserial = value; + + OnPcbSerialChanged(value); + + } + } + } + + protected String _pcbversion; + + /// <summary> + /// Gets or sets the dispenserbase pcb version. + /// </summary> + + [Column("PCB_VERSION")] + + public String PcbVersion + { + get + { + return _pcbversion; + } + + set + { + if (_pcbversion != value) + { + _pcbversion = value; + + OnPcbVersionChanged(value); + + } + } + } + + protected Nullable<DateTime> _productiondate; + + /// <summary> + /// Gets or sets the dispenserbase production date. + /// </summary> + + [Column("PRODUCTION_DATE")] + + public Nullable<DateTime> ProductionDate + { + get + { + return _productiondate; + } + + set + { + if (_productiondate != value) + { + _productiondate = value; + + OnProductionDateChanged(value); + + } + } + } + + protected Byte[] _calibrationdata; /// <summary> - /// Gets or sets the dispenserbase data. + /// Gets or sets the dispenserbase calibration data. /// </summary> - [Column("DATA")] + [Column("CALIBRATION_DATA")] - public Byte[] Data + public Byte[] CalibrationData { get { - return _data; + return _calibrationdata; } set { - if (_data != value) + if (_calibrationdata != value) { - _data = value; + _calibrationdata = value; - OnDataChanged(value); + OnCalibrationDataChanged(value); } } @@ -212,12 +328,48 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the Data has changed. + /// Called when the PartNumber has changed. + /// </summary> + protected virtual void OnPartNumberChanged(String partnumber) + { + PartNumberChanged?.Invoke(this, partnumber); + RaisePropertyChanged(nameof(PartNumber)); + } + + /// <summary> + /// Called when the PcbSerial has changed. + /// </summary> + protected virtual void OnPcbSerialChanged(String pcbserial) + { + PcbSerialChanged?.Invoke(this, pcbserial); + RaisePropertyChanged(nameof(PcbSerial)); + } + + /// <summary> + /// Called when the PcbVersion has changed. + /// </summary> + protected virtual void OnPcbVersionChanged(String pcbversion) + { + PcbVersionChanged?.Invoke(this, pcbversion); + RaisePropertyChanged(nameof(PcbVersion)); + } + + /// <summary> + /// Called when the ProductionDate has changed. + /// </summary> + protected virtual void OnProductionDateChanged(Nullable<DateTime> productiondate) + { + ProductionDateChanged?.Invoke(this, productiondate); + RaisePropertyChanged(nameof(ProductionDate)); + } + + /// <summary> + /// Called when the CalibrationData has changed. /// </summary> - protected virtual void OnDataChanged(Byte[] data) + protected virtual void OnCalibrationDataChanged(Byte[] calibrationdata) { - DataChanged?.Invoke(this, data); - RaisePropertyChanged(nameof(Data)); + CalibrationDataChanged?.Invoke(this, calibrationdata); + RaisePropertyChanged(nameof(CalibrationData)); } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventType.cs b/Software/Visual_Studio/Tango.BL/Entities/EventType.cs index 0c1e9fa76..e6e63d616 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EventType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EventType.cs @@ -19,6 +19,52 @@ namespace Tango.BL.Entities set { Code = (int)value; } } + [NotMapped] + [JsonIgnore] + public EventTypeCategories Category + { + get { return (EventTypeCategories)EventCategory; } + set { EventCategory = value.ToInt32(); } + } + + [NotMapped] + [JsonIgnore] + public EventTypeGroups Group + { + get { return (EventTypeGroups)EventGroup; } + set { EventGroup = value.ToInt32(); } + } + + [NotMapped] + [JsonIgnore] + public EventTypeNotificationTimes NotificationTime + { + get { return (EventTypeNotificationTimes)EventNotificationTime; } + set { EventNotificationTime = value.ToInt32(); } + } + + [NotMapped] + [JsonIgnore] + public List<EventTypeActions> Actions + { + get + { + try + { + return EventActions.ToEnumValues<EventTypeActions>(','); + } + catch (Exception ex) + { + LogManager.Log(ex, "Could not parse event type action types!"); + return new List<EventTypeActions>(); + } + } + set + { + EventActions = String.Join(",", value.Select(x => x.ToInt32())); + } + } + /// <summary> /// Initializes a new instance of the <see cref="EventType" /> class. /// </summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs index 751309db8..bd5d39536 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs @@ -21,6 +21,11 @@ using Tango.Core; namespace Tango.BL.Entities { + + /// <summary> + /// + /// </summary> + [Table("EVENT_TYPES")] public abstract class EventTypeBase : ObservableEntity<EventType> { @@ -29,19 +34,23 @@ namespace Tango.BL.Entities public event EventHandler<String> NameChanged; + public event EventHandler<String> TitleChanged; + public event EventHandler<String> DescriptionChanged; - public event EventHandler<Boolean> RequiresUserInterventionChanged; + public event EventHandler<String> TechnicalDescriptionChanged; + + public event EventHandler<Int32> ComponentIndexChanged; - public event EventHandler<Boolean> ResolvableChanged; + public event EventHandler<Int32> EventCategoryChanged; - public event EventHandler<EventTypesGroup> EventTypesGroupChanged; + public event EventHandler<Int32> EventGroupChanged; - public event EventHandler<EventTypesCategory> EventTypesCategoryChanged; + public event EventHandler<Int32> EventNotificationTimeChanged; - public event EventHandler<HtmlPage> HtmlPageChanged; + public event EventHandler<String> EventActionsChanged; - public event EventHandler<SynchronizedObservableCollection<EventTypesAction>> EventTypesActionsChanged; + public event EventHandler<Boolean> RequiresUserInterventionChanged; public event EventHandler<SynchronizedObservableCollection<MachinesEvent>> MachinesEventsChanged; @@ -99,263 +108,264 @@ namespace Tango.BL.Entities } } - protected String _description; + protected String _title; /// <summary> - /// Gets or sets the eventtypebase description. + /// Gets or sets the eventtypebase title. /// </summary> - [Column("DESCRIPTION")] + [Column("TITLE")] - public String Description + public String Title { get { - return _description; + return _title; } set { - if (_description != value) + if (_title != value) { - _description = value; + _title = value; - OnDescriptionChanged(value); + OnTitleChanged(value); } } } - protected String _eventtypescategoryguid; + protected String _description; /// <summary> - /// Gets or sets the eventtypebase event types category guid. + /// Gets or sets the eventtypebase description. /// </summary> - [Column("EVENT_TYPES_CATEGORY_GUID")] - [ForeignKey("EventTypesCategory")] + [Column("DESCRIPTION")] - public String EventTypesCategoryGuid + public String Description { get { - return _eventtypescategoryguid; + return _description; } set { - if (_eventtypescategoryguid != value) + if (_description != value) { - _eventtypescategoryguid = value; - } - } - } - - protected String _eventtypesgroupguid; - - /// <summary> - /// Gets or sets the eventtypebase event types group guid. - /// </summary> - - [Column("EVENT_TYPES_GROUP_GUID")] - [ForeignKey("EventTypesGroup")] + _description = value; - public String EventTypesGroupGuid - { - get - { - return _eventtypesgroupguid; - } + OnDescriptionChanged(value); - set - { - if (_eventtypesgroupguid != value) - { - _eventtypesgroupguid = value; } } } - protected Boolean _requiresuserintervention; + protected String _technicaldescription; /// <summary> - /// Gets or sets the eventtypebase requires user intervention. + /// Gets or sets the eventtypebase technical description. /// </summary> - [Column("REQUIRES_USER_INTERVENTION")] + [Column("TECHNICAL_DESCRIPTION")] - public Boolean RequiresUserIntervention + public String TechnicalDescription { get { - return _requiresuserintervention; + return _technicaldescription; } set { - if (_requiresuserintervention != value) + if (_technicaldescription != value) { - _requiresuserintervention = value; + _technicaldescription = value; - OnRequiresUserInterventionChanged(value); + OnTechnicalDescriptionChanged(value); } } } - protected String _htmlpageguid; + protected Int32 _componentindex; /// <summary> - /// Gets or sets the eventtypebase html page guid. + /// Gets or sets the eventtypebase component index. /// </summary> - [Column("HTML_PAGE_GUID")] - [ForeignKey("HtmlPage")] + [Column("COMPONENT_INDEX")] - public String HtmlPageGuid + public Int32 ComponentIndex { get { - return _htmlpageguid; + return _componentindex; } set { - if (_htmlpageguid != value) + if (_componentindex != value) { - _htmlpageguid = value; + _componentindex = value; + + OnComponentIndexChanged(value); + } } } - protected Boolean _resolvable; + protected Int32 _eventcategory; /// <summary> - /// Gets or sets the eventtypebase resolvable. + /// 0 = Info + /// 1 = Warning + /// 2 = Error + /// 3 = Critical + /// 4 = Safety /// </summary> - [Column("RESOLVABLE")] + [Column("EVENT_CATEGORY")] - public Boolean Resolvable + public Int32 EventCategory { get { - return _resolvable; + return _eventcategory; } set { - if (_resolvable != value) + if (_eventcategory != value) { - _resolvable = value; + _eventcategory = value; - OnResolvableChanged(value); + OnEventCategoryChanged(value); } } } - protected EventTypesGroup _eventtypesgroup; + protected Int32 _eventgroup; /// <summary> - /// Gets or sets the eventtypebase event types groups. + /// 0 = Dispensers + /// 1 = Dryer + /// 2 = Dyeing Head + /// 3 = Electrical Cabinet + /// 4 = General Hardware + /// 5 = Ink Delivery System + /// 6 = Ink Filling System + /// 7 = Mixer + /// 8 = Thread Feeding System + /// 9 = Waste Handling System + /// 10 = Application + /// 11 = Transport + /// + /// /// </summary> - [XmlIgnore] - [JsonIgnore] - public virtual EventTypesGroup EventTypesGroup + [Column("EVENT_GROUP")] + + public Int32 EventGroup { get { - return _eventtypesgroup; + return _eventgroup; } set { - if (_eventtypesgroup != value) + if (_eventgroup != value) { - _eventtypesgroup = value; + _eventgroup = value; - OnEventTypesGroupChanged(value); + OnEventGroupChanged(value); } } } - protected EventTypesCategory _eventtypescategory; + protected Int32 _eventnotificationtime; /// <summary> - /// Gets or sets the eventtypebase event types categories. + /// 0 = None + /// 1 = Immidiate + /// 2 = Post Job /// </summary> - [XmlIgnore] - [JsonIgnore] - public virtual EventTypesCategory EventTypesCategory + [Column("EVENT_NOTIFICATION_TIME")] + + public Int32 EventNotificationTime { get { - return _eventtypescategory; + return _eventnotificationtime; } set { - if (_eventtypescategory != value) + if (_eventnotificationtime != value) { - _eventtypescategory = value; + _eventnotificationtime = value; - OnEventTypesCategoryChanged(value); + OnEventNotificationTimeChanged(value); } } } - protected HtmlPage _htmlpage; + protected String _eventactions; /// <summary> - /// Gets or sets the eventtypebase html pages. + /// 0 = Prevent Job + /// 1 = Stop Job /// </summary> - [XmlIgnore] - [JsonIgnore] - public virtual HtmlPage HtmlPage + [Column("EVENT_ACTIONS")] + + public String EventActions { get { - return _htmlpage; + return _eventactions; } set { - if (_htmlpage != value) + if (_eventactions != value) { - _htmlpage = value; + _eventactions = value; - OnHtmlPageChanged(value); + OnEventActionsChanged(value); } } } - protected SynchronizedObservableCollection<EventTypesAction> _eventtypesactions; + protected Boolean _requiresuserintervention; /// <summary> - /// Gets or sets the eventtypebase event types actions. + /// Gets or sets the eventtypebase requires user intervention. /// </summary> - public virtual SynchronizedObservableCollection<EventTypesAction> EventTypesActions + [Column("REQUIRES_USER_INTERVENTION")] + + public Boolean RequiresUserIntervention { get { - return _eventtypesactions; + return _requiresuserintervention; } set { - if (_eventtypesactions != value) + if (_requiresuserintervention != value) { - _eventtypesactions = value; + _requiresuserintervention = value; - OnEventTypesActionsChanged(value); + OnRequiresUserInterventionChanged(value); } } @@ -405,6 +415,15 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the Title has changed. + /// </summary> + protected virtual void OnTitleChanged(String title) + { + TitleChanged?.Invoke(this, title); + RaisePropertyChanged(nameof(Title)); + } + + /// <summary> /// Called when the Description has changed. /// </summary> protected virtual void OnDescriptionChanged(String description) @@ -414,57 +433,66 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the RequiresUserIntervention has changed. + /// Called when the TechnicalDescription has changed. /// </summary> - protected virtual void OnRequiresUserInterventionChanged(Boolean requiresuserintervention) + protected virtual void OnTechnicalDescriptionChanged(String technicaldescription) { - RequiresUserInterventionChanged?.Invoke(this, requiresuserintervention); - RaisePropertyChanged(nameof(RequiresUserIntervention)); + TechnicalDescriptionChanged?.Invoke(this, technicaldescription); + RaisePropertyChanged(nameof(TechnicalDescription)); } /// <summary> - /// Called when the Resolvable has changed. + /// Called when the ComponentIndex has changed. /// </summary> - protected virtual void OnResolvableChanged(Boolean resolvable) + protected virtual void OnComponentIndexChanged(Int32 componentindex) { - ResolvableChanged?.Invoke(this, resolvable); - RaisePropertyChanged(nameof(Resolvable)); + ComponentIndexChanged?.Invoke(this, componentindex); + RaisePropertyChanged(nameof(ComponentIndex)); } /// <summary> - /// Called when the EventTypesGroup has changed. + /// Called when the EventCategory has changed. /// </summary> - protected virtual void OnEventTypesGroupChanged(EventTypesGroup eventtypesgroup) + protected virtual void OnEventCategoryChanged(Int32 eventcategory) { - EventTypesGroupChanged?.Invoke(this, eventtypesgroup); - RaisePropertyChanged(nameof(EventTypesGroup)); + EventCategoryChanged?.Invoke(this, eventcategory); + RaisePropertyChanged(nameof(EventCategory)); } /// <summary> - /// Called when the EventTypesCategory has changed. + /// Called when the EventGroup has changed. /// </summary> - protected virtual void OnEventTypesCategoryChanged(EventTypesCategory eventtypescategory) + protected virtual void OnEventGroupChanged(Int32 eventgroup) { - EventTypesCategoryChanged?.Invoke(this, eventtypescategory); - RaisePropertyChanged(nameof(EventTypesCategory)); + EventGroupChanged?.Invoke(this, eventgroup); + RaisePropertyChanged(nameof(EventGroup)); } /// <summary> - /// Called when the HtmlPage has changed. + /// Called when the EventNotificationTime has changed. /// </summary> - protected virtual void OnHtmlPageChanged(HtmlPage htmlpage) + protected virtual void OnEventNotificationTimeChanged(Int32 eventnotificationtime) { - HtmlPageChanged?.Invoke(this, htmlpage); - RaisePropertyChanged(nameof(HtmlPage)); + EventNotificationTimeChanged?.Invoke(this, eventnotificationtime); + RaisePropertyChanged(nameof(EventNotificationTime)); } /// <summary> - /// Called when the EventTypesActions has changed. + /// Called when the EventActions has changed. /// </summary> - protected virtual void OnEventTypesActionsChanged(SynchronizedObservableCollection<EventTypesAction> eventtypesactions) + protected virtual void OnEventActionsChanged(String eventactions) { - EventTypesActionsChanged?.Invoke(this, eventtypesactions); - RaisePropertyChanged(nameof(EventTypesActions)); + EventActionsChanged?.Invoke(this, eventactions); + RaisePropertyChanged(nameof(EventActions)); + } + + /// <summary> + /// Called when the RequiresUserIntervention has changed. + /// </summary> + protected virtual void OnRequiresUserInterventionChanged(Boolean requiresuserintervention) + { + RequiresUserInterventionChanged?.Invoke(this, requiresuserintervention); + RaisePropertyChanged(nameof(RequiresUserIntervention)); } /// <summary> @@ -482,8 +510,6 @@ namespace Tango.BL.Entities public EventTypeBase() : base() { - EventTypesActions = new SynchronizedObservableCollection<EventTypesAction>(); - MachinesEvents = new SynchronizedObservableCollection<MachinesEvent>(); } diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs deleted file mode 100644 index 4b2bed316..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public partial class EventTypesAction : EventTypesActionBase - { - /// <summary> - /// Initializes a new instance of the <see cref="EventTypesAction" /> class. - /// </summary> - public EventTypesAction() : base() - { - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesActionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesActionBase.cs deleted file mode 100644 index 64b3f8101..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesActionBase.cs +++ /dev/null @@ -1,161 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; - -namespace Tango.BL.Entities -{ - [Table("EVENT_TYPES_ACTIONS")] - public abstract class EventTypesActionBase : ObservableEntity<EventTypesAction> - { - - public event EventHandler<ActionType> ActionTypeChanged; - - public event EventHandler<EventType> EventTypeChanged; - - protected String _eventtypeguid; - - /// <summary> - /// Gets or sets the eventtypesactionbase event type guid. - /// </summary> - - [Column("EVENT_TYPE_GUID")] - [ForeignKey("EventType")] - - public String EventTypeGuid - { - get - { - return _eventtypeguid; - } - - set - { - if (_eventtypeguid != value) - { - _eventtypeguid = value; - } - } - } - - protected String _actiontypeguid; - - /// <summary> - /// Gets or sets the eventtypesactionbase action type guid. - /// </summary> - - [Column("ACTION_TYPE_GUID")] - [ForeignKey("ActionType")] - - public String ActionTypeGuid - { - get - { - return _actiontypeguid; - } - - set - { - if (_actiontypeguid != value) - { - _actiontypeguid = value; - } - } - } - - protected ActionType _actiontype; - - /// <summary> - /// Gets or sets the eventtypesactionbase action types. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual ActionType ActionType - { - get - { - return _actiontype; - } - - set - { - if (_actiontype != value) - { - _actiontype = value; - - OnActionTypeChanged(value); - - } - } - } - - protected EventType _eventtype; - - /// <summary> - /// Gets or sets the eventtypesactionbase event types. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual EventType EventType - { - get - { - return _eventtype; - } - - set - { - if (_eventtype != value) - { - _eventtype = value; - - OnEventTypeChanged(value); - - } - } - } - - /// <summary> - /// Called when the ActionType has changed. - /// </summary> - protected virtual void OnActionTypeChanged(ActionType actiontype) - { - ActionTypeChanged?.Invoke(this, actiontype); - RaisePropertyChanged(nameof(ActionType)); - } - - /// <summary> - /// Called when the EventType has changed. - /// </summary> - protected virtual void OnEventTypeChanged(EventType eventtype) - { - EventTypeChanged?.Invoke(this, eventtype); - RaisePropertyChanged(nameof(EventType)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="EventTypesActionBase" /> class. - /// </summary> - public EventTypesActionBase() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs deleted file mode 100644 index 742147a5d..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public partial class EventTypesCategory : EventTypesCategoryBase - { - /// <summary> - /// Initializes a new instance of the <see cref="EventTypesCategory" /> class. - /// </summary> - public EventTypesCategory() : base() - { - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategoryBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategoryBase.cs deleted file mode 100644 index 6faed476f..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategoryBase.cs +++ /dev/null @@ -1,188 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; - -namespace Tango.BL.Entities -{ - [Table("EVENT_TYPES_CATEGORIES")] - public abstract class EventTypesCategoryBase : ObservableEntity<EventTypesCategory> - { - - public event EventHandler<Int32> CodeChanged; - - public event EventHandler<String> NameChanged; - - public event EventHandler<String> DescriptionChanged; - - public event EventHandler<SynchronizedObservableCollection<EventType>> EventTypesChanged; - - protected Int32 _code; - - /// <summary> - /// Gets or sets the eventtypescategorybase code. - /// </summary> - - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - if (_code != value) - { - _code = value; - - OnCodeChanged(value); - - } - } - } - - protected String _name; - - /// <summary> - /// Gets or sets the eventtypescategorybase name. - /// </summary> - - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - if (_name != value) - { - _name = value; - - OnNameChanged(value); - - } - } - } - - protected String _description; - - /// <summary> - /// Gets or sets the eventtypescategorybase description. - /// </summary> - - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - if (_description != value) - { - _description = value; - - OnDescriptionChanged(value); - - } - } - } - - protected SynchronizedObservableCollection<EventType> _eventtypes; - - /// <summary> - /// Gets or sets the eventtypescategorybase event types. - /// </summary> - - public virtual SynchronizedObservableCollection<EventType> EventTypes - { - get - { - return _eventtypes; - } - - set - { - if (_eventtypes != value) - { - _eventtypes = value; - - OnEventTypesChanged(value); - - } - } - } - - /// <summary> - /// Called when the Code has changed. - /// </summary> - protected virtual void OnCodeChanged(Int32 code) - { - CodeChanged?.Invoke(this, code); - RaisePropertyChanged(nameof(Code)); - } - - /// <summary> - /// Called when the Name has changed. - /// </summary> - protected virtual void OnNameChanged(String name) - { - NameChanged?.Invoke(this, name); - RaisePropertyChanged(nameof(Name)); - } - - /// <summary> - /// Called when the Description has changed. - /// </summary> - protected virtual void OnDescriptionChanged(String description) - { - DescriptionChanged?.Invoke(this, description); - RaisePropertyChanged(nameof(Description)); - } - - /// <summary> - /// Called when the EventTypes has changed. - /// </summary> - protected virtual void OnEventTypesChanged(SynchronizedObservableCollection<EventType> eventtypes) - { - EventTypesChanged?.Invoke(this, eventtypes); - RaisePropertyChanged(nameof(EventTypes)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="EventTypesCategoryBase" /> class. - /// </summary> - public EventTypesCategoryBase() : base() - { - - EventTypes = new SynchronizedObservableCollection<EventType>(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs deleted file mode 100644 index 3e7a737d0..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public partial class EventTypesGroup : EventTypesGroupBase - { - /// <summary> - /// Initializes a new instance of the <see cref="EventTypesGroup" /> class. - /// </summary> - public EventTypesGroup() : base() - { - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroupBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroupBase.cs deleted file mode 100644 index f234d0d89..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroupBase.cs +++ /dev/null @@ -1,188 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; - -namespace Tango.BL.Entities -{ - [Table("EVENT_TYPES_GROUPS")] - public abstract class EventTypesGroupBase : ObservableEntity<EventTypesGroup> - { - - public event EventHandler<Int32> CodeChanged; - - public event EventHandler<String> NameChanged; - - public event EventHandler<String> DescriptionChanged; - - public event EventHandler<SynchronizedObservableCollection<EventType>> EventTypesChanged; - - protected Int32 _code; - - /// <summary> - /// Gets or sets the eventtypesgroupbase code. - /// </summary> - - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - if (_code != value) - { - _code = value; - - OnCodeChanged(value); - - } - } - } - - protected String _name; - - /// <summary> - /// Gets or sets the eventtypesgroupbase name. - /// </summary> - - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - if (_name != value) - { - _name = value; - - OnNameChanged(value); - - } - } - } - - protected String _description; - - /// <summary> - /// Gets or sets the eventtypesgroupbase description. - /// </summary> - - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - if (_description != value) - { - _description = value; - - OnDescriptionChanged(value); - - } - } - } - - protected SynchronizedObservableCollection<EventType> _eventtypes; - - /// <summary> - /// Gets or sets the eventtypesgroupbase event types. - /// </summary> - - public virtual SynchronizedObservableCollection<EventType> EventTypes - { - get - { - return _eventtypes; - } - - set - { - if (_eventtypes != value) - { - _eventtypes = value; - - OnEventTypesChanged(value); - - } - } - } - - /// <summary> - /// Called when the Code has changed. - /// </summary> - protected virtual void OnCodeChanged(Int32 code) - { - CodeChanged?.Invoke(this, code); - RaisePropertyChanged(nameof(Code)); - } - - /// <summary> - /// Called when the Name has changed. - /// </summary> - protected virtual void OnNameChanged(String name) - { - NameChanged?.Invoke(this, name); - RaisePropertyChanged(nameof(Name)); - } - - /// <summary> - /// Called when the Description has changed. - /// </summary> - protected virtual void OnDescriptionChanged(String description) - { - DescriptionChanged?.Invoke(this, description); - RaisePropertyChanged(nameof(Description)); - } - - /// <summary> - /// Called when the EventTypes has changed. - /// </summary> - protected virtual void OnEventTypesChanged(SynchronizedObservableCollection<EventType> eventtypes) - { - EventTypesChanged?.Invoke(this, eventtypes); - RaisePropertyChanged(nameof(EventTypes)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="EventTypesGroupBase" /> class. - /// </summary> - public EventTypesGroupBase() : base() - { - - EventTypes = new SynchronizedObservableCollection<EventType>(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs b/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs deleted file mode 100644 index ea57d5cf7..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public partial class HtmlPage : HtmlPageBase - { - /// <summary> - /// Initializes a new instance of the <see cref="HtmlPage" /> class. - /// </summary> - public HtmlPage() : base() - { - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/HtmlPageBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HtmlPageBase.cs deleted file mode 100644 index c955f8d0a..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/HtmlPageBase.cs +++ /dev/null @@ -1,226 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; - -namespace Tango.BL.Entities -{ - [Table("HTML_PAGES")] - public abstract class HtmlPageBase : ObservableEntity<HtmlPage> - { - - public event EventHandler<Int32> CodeChanged; - - public event EventHandler<String> NameChanged; - - public event EventHandler<String> DescriptionChanged; - - public event EventHandler<String> HtmlChanged; - - public event EventHandler<SynchronizedObservableCollection<EventType>> EventTypesChanged; - - protected Int32 _code; - - /// <summary> - /// Gets or sets the htmlpagebase code. - /// </summary> - - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - if (_code != value) - { - _code = value; - - OnCodeChanged(value); - - } - } - } - - protected String _name; - - /// <summary> - /// Gets or sets the htmlpagebase name. - /// </summary> - - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - if (_name != value) - { - _name = value; - - OnNameChanged(value); - - } - } - } - - protected String _description; - - /// <summary> - /// Gets or sets the htmlpagebase description. - /// </summary> - - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - if (_description != value) - { - _description = value; - - OnDescriptionChanged(value); - - } - } - } - - protected String _html; - - /// <summary> - /// Gets or sets the htmlpagebase html. - /// </summary> - - [Column("HTML")] - - public String Html - { - get - { - return _html; - } - - set - { - if (_html != value) - { - _html = value; - - OnHtmlChanged(value); - - } - } - } - - protected SynchronizedObservableCollection<EventType> _eventtypes; - - /// <summary> - /// Gets or sets the htmlpagebase event types. - /// </summary> - - public virtual SynchronizedObservableCollection<EventType> EventTypes - { - get - { - return _eventtypes; - } - - set - { - if (_eventtypes != value) - { - _eventtypes = value; - - OnEventTypesChanged(value); - - } - } - } - - /// <summary> - /// Called when the Code has changed. - /// </summary> - protected virtual void OnCodeChanged(Int32 code) - { - CodeChanged?.Invoke(this, code); - RaisePropertyChanged(nameof(Code)); - } - - /// <summary> - /// Called when the Name has changed. - /// </summary> - protected virtual void OnNameChanged(String name) - { - NameChanged?.Invoke(this, name); - RaisePropertyChanged(nameof(Name)); - } - - /// <summary> - /// Called when the Description has changed. - /// </summary> - protected virtual void OnDescriptionChanged(String description) - { - DescriptionChanged?.Invoke(this, description); - RaisePropertyChanged(nameof(Description)); - } - - /// <summary> - /// Called when the Html has changed. - /// </summary> - protected virtual void OnHtmlChanged(String html) - { - HtmlChanged?.Invoke(this, html); - RaisePropertyChanged(nameof(Html)); - } - - /// <summary> - /// Called when the EventTypes has changed. - /// </summary> - protected virtual void OnEventTypesChanged(SynchronizedObservableCollection<EventType> eventtypes) - { - EventTypesChanged?.Invoke(this, eventtypes); - RaisePropertyChanged(nameof(EventTypes)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="HtmlPageBase" /> class. - /// </summary> - public HtmlPageBase() : base() - { - - EventTypes = new SynchronizedObservableCollection<EventType>(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs index cee3448cb..a7ba29c2a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs @@ -27,14 +27,7 @@ namespace Tango.BL.Entities { try { - if (!String.IsNullOrWhiteSpace(TargetJobTypes)) - { - return TargetJobTypes.Split(',').Select(x => (JobTypes)int.Parse(x)).ToList(); - } - else - { - return new List<JobTypes>(); - } + return TargetJobTypes.ToEnumValues<JobTypes>(','); } catch (Exception ex) { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs index a81de795e..f3eb2680c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs @@ -52,27 +52,33 @@ namespace Tango.BL.Entities } [NotMapped] - public EventTypesCategories Category + public EventTypes Type { - get { return (EventTypesCategories)EventType.EventTypesCategory.Code; } + get { return EventType.Type; } } [NotMapped] - public EventTypesGroups Group + public EventTypeCategories Category { - get { return (EventTypesGroups)EventType.EventTypesGroup.Code; } + get { return (EventTypeCategories)EventType.EventCategory; } } [NotMapped] - public EventTypes Type + public EventTypeGroups Group + { + get { return (EventTypeGroups)EventType.EventGroup; } + } + + [NotMapped] + public EventTypeNotificationTimes NotificationTime { - get { return (EventTypes)EventType.Code; } + get { return EventType.NotificationTime; } } [NotMapped] - public List<ActionTypes> ActionTypes + public List<EventTypeActions> Actions { - get { return EventType.EventTypesActions.Select(x => (ActionTypes)x.ActionType.Code).Distinct().ToList(); } + get { return EventType.Actions; } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/ActionTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/ActionTypes.cs deleted file mode 100644 index 4742e5d99..000000000 --- a/Software/Visual_Studio/Tango.BL/Enumerations/ActionTypes.cs +++ /dev/null @@ -1,53 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.BL.Enumerations -{ - public enum ActionTypes - { - - /// <summary> - /// (Stops the heaters funcionality) - /// </summary> - [Description("Stops the heaters funcionality")] - StopHeaters = 2, - - /// <summary> - /// (Prevents the user from executing jobs) - /// </summary> - [Description("Prevents the user from executing jobs")] - PreventJobExecution = 0, - - /// <summary> - /// (Displays a graceful notification to the user) - /// </summary> - [Description("Displays a graceful notification to the user")] - SoftVisualNotification = 4, - - /// <summary> - /// (System Shutdown) - /// </summary> - [Description("System Shutdown")] - OverallPowerDown = 3, - - /// <summary> - /// (Abort a running job if is in progress) - /// </summary> - [Description("Abort a running job if is in progress")] - AbortRunningJob = 1, - - } -} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Actions.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Actions.cs deleted file mode 100644 index f6a5d3997..000000000 --- a/Software/Visual_Studio/Tango.BL/Enumerations/Actions.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.BL.Entities -{ - public enum Actions - { - } -} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeActions.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeActions.cs new file mode 100644 index 000000000..a7efc7cd5 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeActions.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.Enumerations +{ + public enum EventTypeActions + { + PreventJob = 0, + StopJob = 1, + } +} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypesCategories.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeCategories.cs index 2d0488430..48301ece0 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypesCategories.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeCategories.cs @@ -16,32 +16,21 @@ using System.ComponentModel; namespace Tango.BL.Enumerations { - public enum EventTypesCategories + public enum EventTypeCategories { - - /// <summary> - /// (General information) - /// </summary> - [Description("General information")] + [Description("Information")] Info = 0, - /// <summary> - /// (Hardware or software warning) - /// </summary> - [Description("Hardware or software warning")] + [Description("Warning")] Warning = 1, - /// <summary> - /// (Hardware or software error) - /// </summary> - [Description("Hardware or software error")] + [Description("Error")] Error = 2, - /// <summary> - /// (Critical hardware or software error) - /// </summary> - [Description("Critical hardware or software error")] + [Description("Critical")] Critical = 3, + [Description("Safety")] + Safety = 4, } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeGroups.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeGroups.cs new file mode 100644 index 000000000..e6fc435d1 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeGroups.cs @@ -0,0 +1,46 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.BL.Enumerations +{ + public enum EventTypeGroups + { + [Description("Dispensers")] + Dispensers = 0, + [Description("Dryer")] + Dryer = 1, + [Description("Dyeing Head")] + DyeingHead = 2, + [Description("Electrical Cabinet")] + ElectricalCabinet = 3, + [Description("General Hardware")] + GeneralHardware = 4, + [Description("Ink Delivery System")] + InkDeliverySystem = 5, + [Description("Ink Filling System")] + InkFillingSystem = 6, + [Description("Mixer")] + Mixer = 7, + [Description("Thread Feeding System")] + ThreadFeedingSystem = 8, + [Description("Waste Handling System")] + WasteHandlingSystem = 9, + [Description("Application")] + Application = 10, + [Description("Transport")] + Transport = 11 + } +} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeNotificationTimes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeNotificationTimes.cs new file mode 100644 index 000000000..312c1f3f1 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeNotificationTimes.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.Enumerations +{ + public enum EventTypeNotificationTimes + { + None = 0, + Immediate = 1, + PostJob = 2 + } +} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs index b4fc2b82a..50ccd20c2 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs @@ -20,958 +20,1300 @@ namespace Tango.BL.Enumerations { /// <summary> - /// (None) + /// (Could not complete power-up BIT. ) /// </summary> - [Description("None")] - None = 0, + [Description("Could not complete power-up BIT. ")] + POWER_UP_BIT_FAILURE = 1, /// <summary> - /// ( Thread Break) + /// (Emergency button pressed) /// </summary> - [Description(" Thread Break")] - ThreadBreak = 1, + [Description("Emergency button pressed")] + EMERGENCY_PUSH_BUTTON_PRESSED = 2, /// <summary> - /// ( Thread Tension Control Failure) + /// (Front cover 1 open ) /// </summary> - [Description(" Thread Tension Control Failure")] - ThreadTensionControlFailure = 2, + [Description("Front cover 1 open ")] + FRONT_COVER_1_OPEN = 3, /// <summary> - /// ( Feeder Cone Insufficiant) + /// (Front cover 2 open ) /// </summary> - [Description(" Feeder Cone Insufficiant")] - FeederConeInsufficiant = 3, + [Description("Front cover 2 open ")] + FRONT_COVER_2_OPEN = 4, /// <summary> - /// ( Winder General Error) + /// (Front cover 3 open ) /// </summary> - [Description(" Winder General Error")] - WinderGeneralError = 4, + [Description("Front cover 3 open ")] + FRONT_COVER_3_OPEN = 5, /// <summary> - /// ( Winder Cone Not Exists) + /// (Front cover 4 open ) /// </summary> - [Description(" Winder Cone Not Exists")] - WinderConeNotExists = 5, + [Description("Front cover 4 open ")] + FRONT_COVER_4_OPEN = 6, /// <summary> - /// ( Thread Feeding General Error) + /// (Cartridges cover open ) /// </summary> - [Description(" Thread Feeding General Error")] - ThreadFeedingGeneralError = 6, + [Description("Cartridges cover open ")] + CARTRIDGES_COVER_OPEN = 7, /// <summary> - /// ( Dyeing Head 1 Over Temperature) + /// (Rear cover open ) /// </summary> - [Description(" Dyeing Head 1 Over Temperature")] - DyeingHead1OverTemperature = 7, + [Description("Rear cover open ")] + REAR_COVER_OPEN = 8, /// <summary> - /// ( Dyeing Head 2 Over Temperature) + /// (Overtemperature in machine intern) /// </summary> - [Description(" Dyeing Head 2 Over Temperature")] - DyeingHead2OverTemperature = 8, + [Description("Overtemperature in machine intern")] + MACHINE_INTERNAL_OVERTEMPERATURE = 9, /// <summary> - /// ( Dyeing Head 3 Over Temperature) + /// (Internal fans RPM too low) /// </summary> - [Description(" Dyeing Head 3 Over Temperature")] - DyeingHead3OverTemperature = 9, + [Description("Internal fans RPM too low")] + MACHINE_FANS_RPM_TOO_LOW = 10, /// <summary> - /// ( Dyeing Head 4 Over Temperature) + /// (Internal fans stopped) /// </summary> - [Description(" Dyeing Head 4 Over Temperature")] - DyeingHead4OverTemperature = 10, + [Description("Internal fans stopped")] + MACHINE_FANS_STOPPED = 11, /// <summary> - /// ( Dyeing Head 5 Over Temperature) + /// (Thread break) /// </summary> - [Description(" Dyeing Head 5 Over Temperature")] - DyeingHead5OverTemperature = 11, + [Description("Thread break")] + THREAD_BREAK = 12, /// <summary> - /// ( Dyeing Head 6 Over Temperature) + /// (Thread tension control faiure) /// </summary> - [Description(" Dyeing Head 6 Over Temperature")] - DyeingHead6OverTemperature = 12, + [Description("Thread tension control faiure")] + THREAD_TENSION_CONTROL_FAILURE = 13, /// <summary> - /// ( Dyeing Head Thermal Cutoff) + /// (No cone in winder) /// </summary> - [Description(" Dyeing Head Thermal Cutoff")] - DyeingHeadThermalCutoff = 13, + [Description("No cone in winder")] + WINDER_CONE_DOES_NOT_EXIST = 14, /// <summary> - /// ( Dryer Over Temperature) + /// (Overcurrent in feeder motor) /// </summary> - [Description(" Dryer Over Temperature")] - DryerOverTemperature = 14, + [Description("Overcurrent in feeder motor")] + FEEDER_MOTOR_OVERCURRENT = 15, /// <summary> - /// ( Dryer Thermal Cutoff) + /// (Overcurrent in right loader motor) /// </summary> - [Description(" Dryer Thermal Cutoff")] - DryerThermalCutoff = 15, + [Description("Overcurrent in right loader motor")] + RIGHT_LOADER_MOTOR_OVERCURRENT = 16, /// <summary> - /// ( Dyeing Head Heaters Current Out Of Range) + /// (Overcurrent in puller motor) /// </summary> - [Description(" Dyeing Head Heaters Current Out Of Range")] - DyeingHeadHeatersCurrentOutOfRange = 16, + [Description("Overcurrent in puller motor")] + PULLER_MOTOR_OVERCURRENT = 17, /// <summary> - /// ( Dryer Heaters Current Out Of Range) + /// (Overcurrent in left loader motor) /// </summary> - [Description(" Dryer Heaters Current Out Of Range")] - DryerHeatersCurrentOutOfRange = 17, + [Description("Overcurrent in left loader motor")] + LEFT_LOADER_MOTOR_OVERCURRENT = 18, /// <summary> - /// ( Dryer Dying Head Cover Open) + /// (Overcurrent in winder motor) /// </summary> - [Description(" Dryer Dying Head Cover Open")] - DryerDHeadCoverOpen = 18, + [Description("Overcurrent in winder motor")] + WINDER_MOTOR_OVERCURRENT = 19, /// <summary> - /// ( Air Filter Clogged) + /// (Overcurrent in screw motor) /// </summary> - [Description(" Air Filter Clogged")] - AirFilterClogged = 19, + [Description("Overcurrent in screw motor")] + SCREW_MOTOR_OVERCURRENT = 20, /// <summary> - /// ( Air Filter Not Installed) + /// (Overcurrent in loading arm motor) /// </summary> - [Description(" Air Filter Not Installed")] - AirFilterNotInstalled = 20, + [Description("Overcurrent in loading arm motor")] + LOADING_ARM_MOTOR_OVERCURRENT = 21, /// <summary> - /// ( WHS Failure) + /// (Overtemperature in feeder motor) /// </summary> - [Description(" WHS Failure")] - WHSFailure = 21, + [Description("Overtemperature in feeder motor")] + FEEDER_MOTOR_OVERTEMPERATURE = 22, /// <summary> - /// ( Waste Container Is Almost Full) + /// (Overtemperature in right loader motor) /// </summary> - [Description(" Waste Container Is Almost Full")] - WasteContainerIsAlmostFull = 22, + [Description("Overtemperature in right loader motor")] + RIGHT_LOADER_MOTOR_OVERTEMPERATURE = 23, /// <summary> - /// ( Waste Container Is Full) + /// (Overtemperature in puller motor) /// </summary> - [Description(" Waste Container Is Full")] - WasteContainerIsFull = 23, + [Description("Overtemperature in puller motor")] + PULLER_MOTOR_OVERTEMPERATURE = 24, /// <summary> - /// ( Dispenser 1 Empty) + /// (Overtemperature in left loader motor) /// </summary> - [Description(" Dispenser 1 Empty")] - Dispenser1Empty = 24, + [Description("Overtemperature in left loader motor")] + LEFT_LOADER_MOTOR_OVERTEMPERATURE = 25, /// <summary> - /// ( Dispenser 2 Empty) + /// (Overtemperature in winder motor) /// </summary> - [Description(" Dispenser 2 Empty")] - Dispenser2Empty = 25, + [Description("Overtemperature in winder motor")] + WINDER_MOTOR_OVERTEMPERATURE = 26, /// <summary> - /// ( Dispenser 3 Empty) + /// (Overtemperature in screw motor) /// </summary> - [Description(" Dispenser 3 Empty")] - Dispenser3Empty = 26, + [Description("Overtemperature in screw motor")] + SCREW_MOTOR_OVERTEMPERATURE = 27, /// <summary> - /// ( Dispenser 4 Empty) + /// (Overtemperature in loading arm motor) /// </summary> - [Description(" Dispenser 4 Empty")] - Dispenser4Empty = 27, + [Description("Overtemperature in loading arm motor")] + LOADING_ARM_MOTOR_OVERTEMPERATURE = 28, /// <summary> - /// ( Dispenser 5 Empty) + /// (Feeder motor stalled) /// </summary> - [Description(" Dispenser 5 Empty")] - Dispenser5Empty = 28, + [Description("Feeder motor stalled")] + FEEDER_MOTOR_STALL = 29, /// <summary> - /// ( Dispenser 6 Empty) + /// (Right loader motor stalled) /// </summary> - [Description(" Dispenser 6 Empty")] - Dispenser6Empty = 29, + [Description("Right loader motor stalled")] + RIGHT_LOADER_MOTOR_STALL = 30, /// <summary> - /// ( Dispenser 7 Empty) + /// (Puller motor stalled) /// </summary> - [Description(" Dispenser 7 Empty")] - Dispenser7Empty = 30, + [Description("Puller motor stalled")] + PULLER_MOTOR_STALL = 31, /// <summary> - /// ( Dispenser 8 Empty) + /// (Left loader motor stalled) /// </summary> - [Description(" Dispenser 8 Empty")] - Dispenser8Empty = 31, + [Description("Left loader motor stalled")] + LEFT_LOADER_MOTOR_STALL = 32, /// <summary> - /// ( Dispenser 1 Low Level) + /// (Winder motor stalled) /// </summary> - [Description(" Dispenser 1 Low Level")] - Dispenser1LowLevel = 32, + [Description("Winder motor stalled")] + WINDER_MOTOR_STALL = 33, /// <summary> - /// ( Dispenser 2 Low Level) + /// (Screw motor stalled) /// </summary> - [Description(" Dispenser 2 Low Level")] - Dispenser2LowLevel = 33, + [Description("Screw motor stalled")] + SCREW_MOTOR_STALL = 34, /// <summary> - /// ( Dispenser 3 Low Level) + /// (Loading arm motor stalled) /// </summary> - [Description(" Dispenser 3 Low Level")] - Dispenser3LowLevel = 34, + [Description("Loading arm motor stalled")] + LOADING_ARM_MOTOR_STALL = 35, /// <summary> - /// ( Dispenser 4 Low Level) + /// (Undervoltage in feeder motor) /// </summary> - [Description(" Dispenser 4 Low Level")] - Dispenser4LowLevel = 35, + [Description("Undervoltage in feeder motor")] + FEEDER_MOTOR_UNDERVOLTAGE = 36, /// <summary> - /// ( Dispenser 5 Low Level) + /// (Undervoltage in right loader motor) /// </summary> - [Description(" Dispenser 5 Low Level")] - Dispenser5LowLevel = 36, + [Description("Undervoltage in right loader motor")] + RIGHT_LOADER_MOTOR_UNDERVOLTAGE = 37, /// <summary> - /// ( Dispenser 6 Low Level) + /// (Undervoltage in puller motor) /// </summary> - [Description(" Dispenser 6 Low Level")] - Dispenser6LowLevel = 37, + [Description("Undervoltage in puller motor")] + PULLER_MOTOR_UNDERVOLTAGE = 38, /// <summary> - /// ( Dispenser 7 Low Level) + /// (Undervoltage in left loader motor) /// </summary> - [Description(" Dispenser 7 Low Level")] - Dispenser7LowLevel = 38, + [Description("Undervoltage in left loader motor")] + LEFT_LOADER_MOTOR_UNDERVOLTAGE = 39, /// <summary> - /// ( Dispenser 8 Low Level) + /// (Undervoltage in winder motor) /// </summary> - [Description(" Dispenser 8 Low Level")] - Dispenser8LowLevel = 39, + [Description("Undervoltage in winder motor")] + WINDER_MOTOR_UNDERVOLTAGE = 40, /// <summary> - /// ( Dispenser 1 Refill Failure) + /// (Undervoltage in screw motor) /// </summary> - [Description(" Dispenser 1 Refill Failure")] - Dispenser1RefillFailure = 40, + [Description("Undervoltage in screw motor")] + SCREW_MOTOR_UNDERVOLTAGE = 41, /// <summary> - /// ( Dispenser 2 Refill Failure) + /// (Undervoltage in loading arm motor) /// </summary> - [Description(" Dispenser 2 Refill Failure")] - Dispenser2RefillFailure = 41, + [Description("Undervoltage in loading arm motor")] + LOADING_ARM_MOTOR_UNDERVOLTAGE = 42, /// <summary> - /// ( Dispenser 3 Refill Failure) + /// (LTFU up failure) /// </summary> - [Description(" Dispenser 3 Refill Failure")] - Dispenser3RefillFailure = 42, + [Description("LTFU up failure")] + LTFU_UP_TIMEOUT = 43, /// <summary> - /// ( Dispenser 4 Refill Failure) + /// (LTFU down failure) /// </summary> - [Description(" Dispenser 4 Refill Failure")] - Dispenser4RefillFailure = 43, + [Description("LTFU down failure")] + LTFU_DOWN_TIMEOUT = 44, /// <summary> - /// ( Dispenser 5 Refill Failure) + /// (RTFU up failure) /// </summary> - [Description(" Dispenser 5 Refill Failure")] - Dispenser5RefillFailure = 44, + [Description("RTFU up failure")] + RTFU_UP_TIMEOUT = 45, /// <summary> - /// ( Dispenser 6 Refill Failure) + /// (RTFU down failure) /// </summary> - [Description(" Dispenser 6 Refill Failure")] - Dispenser6RefillFailure = 45, + [Description("RTFU down failure")] + RTFU_DOWN_TIMEOUT = 46, /// <summary> - /// ( Dispenser 7 Refill Failure) + /// (Screw travel failure) /// </summary> - [Description(" Dispenser 7 Refill Failure")] - Dispenser7RefillFailure = 46, + [Description("Screw travel failure")] + SCREW_MOTOR_LIMIT_TIMEOUT = 47, /// <summary> - /// ( Dispenser 8 Refill Failure) + /// (Overcurrent in dryer motor) /// </summary> - [Description(" Dispenser 8 Refill Failure")] - Dispenser8RefillFailure = 47, + [Description("Overcurrent in dryer motor")] + DRYER_MOTOR_OVERCURRENT = 48, /// <summary> - /// ( Dispenser 1 Pressure) + /// (Overtemperature in dryer motor) /// </summary> - [Description(" Dispenser 1 Pressure")] - Dispenser1Pressure = 48, + [Description("Overtemperature in dryer motor")] + DRYER_MOTOR_OVERTEMPERATURE = 49, /// <summary> - /// ( Dispenser 2 Pressure) + /// (Dryer motor stalled) /// </summary> - [Description(" Dispenser 2 Pressure")] - Dispenser2Pressure = 49, + [Description("Dryer motor stalled")] + DRYER_MOTOR_STALL = 50, /// <summary> - /// ( Dispenser 3 Pressure) + /// (Undervoltage in dryer motor) /// </summary> - [Description(" Dispenser 3 Pressure")] - Dispenser3Pressure = 50, + [Description("Undervoltage in dryer motor")] + DRYER_MOTOR_UNDERVOLTAGE = 51, /// <summary> - /// ( Dispenser 4 Pressure) + /// (Dryer door open) /// </summary> - [Description(" Dispenser 4 Pressure")] - Dispenser4Pressure = 51, + [Description("Dryer door open")] + DRYER_DOOR_OPEN = 52, /// <summary> - /// ( Dispenser 5 Pressure) + /// (Overtemperature in dryer zone 1) /// </summary> - [Description(" Dispenser 5 Pressure")] - Dispenser5Pressure = 52, + [Description("Overtemperature in dryer zone 1")] + DRYER_ZONE_1_OVERTEMPERATURE = 53, /// <summary> - /// ( Dispenser 6 Pressure) + /// (Overtemperature in dryer zone 2) /// </summary> - [Description(" Dispenser 6 Pressure")] - Dispenser6Pressure = 53, + [Description("Overtemperature in dryer zone 2")] + DRYER_ZONE_2_OVERTEMPERATURE = 54, /// <summary> - /// ( Dispenser 7 Pressure) + /// (Undertemperature in dryer zone 1) /// </summary> - [Description(" Dispenser 7 Pressure")] - Dispenser7Pressure = 54, + [Description("Undertemperature in dryer zone 1")] + DRYER_ZONE_1_UNDERTEMPERATURE_A = 55, /// <summary> - /// ( Dispenser 8 Pressure) + /// (Undertemperature in dryer zone 2) /// </summary> - [Description(" Dispenser 8 Pressure")] - Dispenser8Pressure = 55, + [Description("Undertemperature in dryer zone 2")] + DRYER_ZONE_2_UNDERTEMPERATURE_A = 56, /// <summary> - /// ( Mid Tank 1 Empty) + /// (Undertemperature in dryer zone 1) /// </summary> - [Description(" Mid Tank 1 Empty")] - MidTank1Empty = 56, + [Description("Undertemperature in dryer zone 1")] + DRYER_ZONE_1_UNDERTEMPERATURE_B = 57, /// <summary> - /// ( Mid Tank 2 Empty) + /// (Undertemperature in dryer zone 2) /// </summary> - [Description(" Mid Tank 2 Empty")] - MidTank2Empty = 57, + [Description("Undertemperature in dryer zone 2")] + DRYER_ZONE_2_UNDERTEMPERATURE_B = 58, /// <summary> - /// ( Mid Tank 3 Empty) + /// (Overheating in dryer) /// </summary> - [Description(" Mid Tank 3 Empty")] - MidTank3Empty = 58, + [Description("Overheating in dryer")] + DRYER_THERMAL_CUTOFF = 59, /// <summary> - /// ( Mid Tank 4 Empty) + /// (Dryer zone 1 current out of range) /// </summary> - [Description(" Mid Tank 4 Empty")] - MidTank4Empty = 59, + [Description("Dryer zone 1 current out of range")] + DRYER_HEATERS_ZONE_1_CURRENT_OUT_OF_RANGE = 60, /// <summary> - /// ( Mid Tank 5 Empty) + /// (Dryer zone 2 current out of range) /// </summary> - [Description(" Mid Tank 5 Empty")] - MidTank5Empty = 60, + [Description("Dryer zone 2 current out of range")] + DRYER_HEATERS_ZONE_2_CURRENT_OUT_OF_RANGE = 61, /// <summary> - /// ( Mid Tank 6 Empty) + /// (Dryer zone 1 current loop break) /// </summary> - [Description(" Mid Tank 6 Empty")] - MidTank6Empty = 61, + [Description("Dryer zone 1 current loop break")] + DRYER_HEATERS_ZONE_1_CURRENT_LOOP_BREAK = 62, /// <summary> - /// ( Mid Tank 7 Empty) + /// (Dryer zone 2 current loop break) /// </summary> - [Description(" Mid Tank 7 Empty")] - MidTank7Empty = 62, + [Description("Dryer zone 2 current loop break")] + DRYER_HEATERS_ZONE_2_CURRENT_LOOP_BREAK = 63, /// <summary> - /// ( Mid Tank 8 Empty) + /// (Dryer fans RPM too low) /// </summary> - [Description(" Mid Tank 8 Empty")] - MidTank8Empty = 63, + [Description("Dryer fans RPM too low")] + DRYER_FAN_RPM_TOO_LOW = 64, /// <summary> - /// ( Mid Tank 1 Lowlevel) + /// (Dryer fan stopped) /// </summary> - [Description(" Mid Tank 1 Lowlevel")] - MidTank1Lowlevel = 64, + [Description("Dryer fan stopped")] + DRYER_FAN_STOPPED = 65, /// <summary> - /// ( Mid Tank 2 Lowlevel) + /// (Overtemperature in dyeing head zone 1) /// </summary> - [Description(" Mid Tank 2 Lowlevel")] - MidTank2Lowlevel = 65, + [Description("Overtemperature in dyeing head zone 1")] + DYEING_HEAD_ZONE_1_OVERTEMPERATURE = 66, /// <summary> - /// ( Mid Tank 3 Lowlevel) + /// (Overtemperature in dyeing head zone 2) /// </summary> - [Description(" Mid Tank 3 Lowlevel")] - MidTank3Lowlevel = 66, + [Description("Overtemperature in dyeing head zone 2")] + DYEING_HEAD_ZONE_2_OVERTEMPERATURE = 67, /// <summary> - /// ( Mid Tank 4 Lowlevel) + /// (Overtemperature in dyeing head zone 3) /// </summary> - [Description(" Mid Tank 4 Lowlevel")] - MidTank4Lowlevel = 67, + [Description("Overtemperature in dyeing head zone 3")] + DYEING_HEAD_ZONE_3_OVERTEMPERATURE = 68, /// <summary> - /// ( Mid Tank 5 Lowlevel) + /// (Overtemperature in dyeing head zone 4) /// </summary> - [Description(" Mid Tank 5 Lowlevel")] - MidTank5Lowlevel = 68, + [Description("Overtemperature in dyeing head zone 4")] + DYEING_HEAD_ZONE_4_OVERTEMPERATURE = 69, /// <summary> - /// ( Mid Tank 6 Lowlevel) + /// (Overtemperature in dyeing head zone 5) /// </summary> - [Description(" Mid Tank 6 Lowlevel")] - MidTank6Lowlevel = 69, + [Description("Overtemperature in dyeing head zone 5")] + DYEING_HEAD_ZONE_5_OVERTEMPERATURE = 70, /// <summary> - /// ( Mid Tank 7 Lowlevel) + /// (Overtemperature in dyeing head zone 6) /// </summary> - [Description(" Mid Tank 7 Lowlevel")] - MidTank7Lowlevel = 70, + [Description("Overtemperature in dyeing head zone 6")] + DYEING_HEAD_ZONE_6_OVERTEMPERATURE = 71, /// <summary> - /// ( Mid Tank 8 Lowlevel) + /// (Undertemperature in dyeing head zone 1) /// </summary> - [Description(" Mid Tank 8 Lowlevel")] - MidTank8Lowlevel = 71, + [Description("Undertemperature in dyeing head zone 1")] + DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_A = 72, /// <summary> - /// ( Mid Tank 1 Not In Place) + /// (Undertemperature in dyeing head zone 2) /// </summary> - [Description(" Mid Tank 1 Not In Place")] - MidTank1NotInPlace = 72, + [Description("Undertemperature in dyeing head zone 2")] + DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_A = 73, /// <summary> - /// ( Mid Tank 2 Not In Place) + /// (Undertemperature in dyeing head zone 3) /// </summary> - [Description(" Mid Tank 2 Not In Place")] - MidTank2NotInPlace = 73, + [Description("Undertemperature in dyeing head zone 3")] + DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_A = 74, /// <summary> - /// ( Mid Tank 3 Not In Place) + /// (Undertemperature in dyeing head zone 4) /// </summary> - [Description(" Mid Tank 3 Not In Place")] - MidTank3NotInPlace = 74, + [Description("Undertemperature in dyeing head zone 4")] + DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_A = 75, /// <summary> - /// ( Mid Tank 4 Not In Place) + /// (Undertemperature in dyeing head zone 5) /// </summary> - [Description(" Mid Tank 4 Not In Place")] - MidTank4NotInPlace = 75, + [Description("Undertemperature in dyeing head zone 5")] + DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_A = 76, /// <summary> - /// ( Mid Tank 5 Not In Place) + /// (Undertemperature in dyeing head zone 6) /// </summary> - [Description(" Mid Tank 5 Not In Place")] - MidTank5NotInPlace = 76, + [Description("Undertemperature in dyeing head zone 6")] + DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_A = 77, /// <summary> - /// ( Mid Tank 6 Not In Place) + /// (Undertemperature in dyeing head zone 1) /// </summary> - [Description(" Mid Tank 6 Not In Place")] - MidTank6NotInPlace = 77, + [Description("Undertemperature in dyeing head zone 1")] + DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_B = 78, /// <summary> - /// ( Mid Tank 7 Not In Place) + /// (Undertemperature in dyeing head zone 2) /// </summary> - [Description(" Mid Tank 7 Not In Place")] - MidTank7NotInPlace = 78, + [Description("Undertemperature in dyeing head zone 2")] + DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_B = 79, /// <summary> - /// ( Mid Tank 8 Not In Place) + /// (Undertemperature in dyeing head zone 3) /// </summary> - [Description(" Mid Tank 8 Not In Place")] - MidTank8NotInPlace = 79, + [Description("Undertemperature in dyeing head zone 3")] + DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_B = 80, /// <summary> - /// ( System Built In Test Fail) + /// (Undertemperature in dyeing head zone 4) /// </summary> - [Description(" System Built In Test Fail")] - SystemBITFail = 80, + [Description("Undertemperature in dyeing head zone 4")] + DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_B = 81, /// <summary> - /// ( General Internal Over Temperature) + /// (Undertemperature in dyeing head zone 5) /// </summary> - [Description(" General Internal Over Temperature")] - GeneralInternalOverTemperature = 81, + [Description("Undertemperature in dyeing head zone 5")] + DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_B = 82, /// <summary> - /// ( Machine Cover Open) + /// (Undertemperature in dyeing head zone 6) /// </summary> - [Description(" Machine Cover Open")] - MachineCoverOpen = 82, + [Description("Undertemperature in dyeing head zone 6")] + DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_B = 83, /// <summary> - /// ( Emergency Push Button Pressed) + /// (Dyeing head zone 1 current out of range) /// </summary> - [Description(" Emergency Push Button Pressed")] - EmergencyPushButtonPressed = 83, + [Description("Dyeing head zone 1 current out of range")] + DYEING_HEAD_ZONE_1_CURRENT_OUT_OF_RANGE = 84, /// <summary> - /// ( System General Error) + /// (Dyeing head zone 2 current out of range) /// </summary> - [Description(" System General Error")] - SystemGeneralError = 84, + [Description("Dyeing head zone 2 current out of range")] + DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE = 85, /// <summary> - /// ( Motor Dryer Over Current) + /// (Dyeing head zone 3 current out of range) /// </summary> - [Description(" Motor Dryer Over Current")] - MotorDryerOverCurrent = 93, + [Description("Dyeing head zone 3 current out of range")] + DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE = 86, /// <summary> - /// ( Motor Feeder Over Current) + /// (Dyeing head zone 4 current out of range) /// </summary> - [Description(" Motor Feeder Over Current")] - MotorFeederOverCurrent = 94, + [Description("Dyeing head zone 4 current out of range")] + DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE = 87, /// <summary> - /// ( Motor Right Loader Over Current) + /// (Dyeing head zones 5 and 6 current out of range) /// </summary> - [Description(" Motor Right Loader Over Current")] - MotorRLoaderOverCurrent = 95, + [Description("Dyeing head zones 5 and 6 current out of range")] + DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE = 88, /// <summary> - /// ( Motor Pooler Over Current) + /// (Dyeing head zone 1 current loop break) /// </summary> - [Description(" Motor Pooler Over Current")] - MotorPoolerOverCurrent = 96, + [Description("Dyeing head zone 1 current loop break")] + DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK = 89, /// <summary> - /// ( Motor Left Loader Over Current) + /// (Dyeing head zone 2 current loop break) /// </summary> - [Description(" Motor Left Loader Over Current")] - MotorLLoaderOverCurrent = 97, + [Description("Dyeing head zone 2 current loop break")] + DYEING_HEAD_ZONE_2_CURRENT_LOOP_BREAK = 90, /// <summary> - /// ( Motor Winder Over Current) + /// (Dyeing head zone 3 current loop break) /// </summary> - [Description(" Motor Winder Over Current")] - MotorWinderOverCurrent = 98, + [Description("Dyeing head zone 3 current loop break")] + DYEING_HEAD_ZONE_3_CURRENT_LOOP_BREAK = 91, /// <summary> - /// ( Motor Screw Over Current) + /// (Dyeing head zone 4 current loop break) /// </summary> - [Description(" Motor Screw Over Current")] - MotorScrewOverCurrent = 99, + [Description("Dyeing head zone 4 current loop break")] + DYEING_HEAD_ZONE_4_CURRENT_LOOP_BREAK = 92, /// <summary> - /// ( Motor Loading Arm Over Current) + /// (Dyeing head zone 5 and 6 current loop break) /// </summary> - [Description(" Motor Loading Arm Over Current")] - MotorLoadingArmOverCurrent = 100, + [Description("Dyeing head zone 5 and 6 current loop break")] + DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK = 93, /// <summary> - /// ( Motor Dispenser 1 Over Current) + /// (Overheating in dyeing head) /// </summary> - [Description(" Motor Dispenser 1 Over Current")] - MotorDispenser1OverCurrent = 101, + [Description("Overheating in dyeing head")] + DYEING_HEAD_THERMAL_CUTOFF = 94, /// <summary> - /// ( Motor Dispenser 2 Over Current) + /// (Could not open dyeing head cover) /// </summary> - [Description(" Motor Dispenser 2 Over Current")] - MotorDispenser2OverCurrent = 102, + [Description("Could not open dyeing head cover")] + DYEING_HEAD_COVER_OPEN_TIMEOUT = 95, /// <summary> - /// ( Motor Dispenser 3 Over Current) + /// (Could not close dyeing head cover ) /// </summary> - [Description(" Motor Dispenser 3 Over Current")] - MotorDispenser3OverCurrent = 103, + [Description("Could not close dyeing head cover ")] + DYEING_HEAD_COVER_CLOSE_TIMEOUT = 96, /// <summary> - /// ( Motor Dispenser 4 Over Current) + /// (Overtemperature in mixer) /// </summary> - [Description(" Motor Dispenser 4 Over Current")] - MotorDispenser4OverCurrent = 104, + [Description("Overtemperature in mixer")] + MIXER_OVERTEMPERATURE = 97, /// <summary> - /// ( Motor Dispenser 5 Over Current) + /// (Undertemperature in mixer) /// </summary> - [Description(" Motor Dispenser 5 Over Current")] - MotorDispenser5OverCurrent = 105, + [Description("Undertemperature in mixer")] + MIXER_UNDERTEMPERATURE_A = 98, /// <summary> - /// ( Motor Dispenser 6 Over Current) + /// (Undertemperature in mixer) /// </summary> - [Description(" Motor Dispenser 6 Over Current")] - MotorDispenser6OverCurrent = 106, + [Description("Undertemperature in mixer")] + MIXER_UNDERTEMPERATURE_B = 99, /// <summary> - /// ( Motor Dispenser 7 Over Current) + /// (Overheating in mixer) /// </summary> - [Description(" Motor Dispenser 7 Over Current")] - MotorDispenser7OverCurrent = 107, + [Description("Overheating in mixer")] + MIXER_THERMAL_CUTOFF = 100, /// <summary> - /// ( Motor Dispenser 8 Over Current) + /// (Mixer current out of range) /// </summary> - [Description(" Motor Dispenser 8 Over Current")] - MotorDispenser8OverCurrent = 108, + [Description("Mixer current out of range")] + MIXER_CURRENT_OUT_OF_RANGE = 101, /// <summary> - /// ( Motor Dryer Over Temperature) + /// (Mixer current loop break) /// </summary> - [Description(" Motor Dryer Over Temperature")] - MotorDryerOverTemperature = 109, + [Description("Mixer current loop break")] + MIXER_CURRENT_LOOP_BREAK = 102, /// <summary> - /// ( Motor Feeder Over Temperature) + /// (Overpressure in dispenser 1) /// </summary> - [Description(" Motor Feeder Over Temperature")] - MotorFeederOverTemperature = 110, + [Description("Overpressure in dispenser 1")] + DISPENSER_1_OVERPRESSURE = 103, /// <summary> - /// ( Motor Right Loader Over Temperature) + /// (Overpressure in dispenser 2) /// </summary> - [Description(" Motor Right Loader Over Temperature")] - MotorRLoaderOverTemperature = 111, + [Description("Overpressure in dispenser 2")] + DISPENSER_2_OVERPRESSURE = 104, /// <summary> - /// ( Motor Pooler Over Temperature) + /// (Overpressure in dispenser 3) /// </summary> - [Description(" Motor Pooler Over Temperature")] - MotorPoolerOverTemperature = 112, + [Description("Overpressure in dispenser 3")] + DISPENSER_3_OVERPRESSURE = 105, /// <summary> - /// ( Motor Left Loader Over Temperature) + /// (Overpressure in dispenser 4) /// </summary> - [Description(" Motor Left Loader Over Temperature")] - MotorLLoaderOverTemperature = 113, + [Description("Overpressure in dispenser 4")] + DISPENSER_4_OVERPRESSURE = 106, /// <summary> - /// ( Motor Winder Over Temperature) + /// (Overpressure in dispenser 5) /// </summary> - [Description(" Motor Winder Over Temperature")] - MotorWinderOverTemperature = 114, + [Description("Overpressure in dispenser 5")] + DISPENSER_5_OVERPRESSURE = 107, /// <summary> - /// ( Motor Screw Over Temperature) + /// (Overpressure in dispenser 6) /// </summary> - [Description(" Motor Screw Over Temperature")] - MotorScrewOverTemperature = 115, + [Description("Overpressure in dispenser 6")] + DISPENSER_6_OVERPRESSURE = 108, /// <summary> - /// ( Motor Loading Arm Over Temperature) + /// (Overpressure in dispenser 7) /// </summary> - [Description(" Motor Loading Arm Over Temperature")] - MotorLoadingArmOverTemperature = 116, + [Description("Overpressure in dispenser 7")] + DISPENSER_7_OVERPRESSURE = 109, /// <summary> - /// ( Motor Dispenser 1 Over Temperature) + /// (Overpressure in dispenser 8) /// </summary> - [Description(" Motor Dispenser 1 Over Temperature")] - MotorDispenser1OverTemperature = 117, + [Description("Overpressure in dispenser 8")] + DISPENSER_8_OVERPRESSURE = 110, /// <summary> - /// ( Motor Dispenser 2 Over Temperature) + /// (Underpressure in dispenser 1) /// </summary> - [Description(" Motor Dispenser 2 Over Temperature")] - MotorDispenser2OverTemperature = 118, + [Description("Underpressure in dispenser 1")] + DISPENSER_1_UNDERPRESSURE = 111, /// <summary> - /// ( Motor Dispenser 3 Over Temperature) + /// (Underpressure in dispenser 2) /// </summary> - [Description(" Motor Dispenser 3 Over Temperature")] - MotorDispenser3OverTemperature = 119, + [Description("Underpressure in dispenser 2")] + DISPENSER_2_UNDERPRESSURE = 112, /// <summary> - /// ( Motor Dispenser 4 Over Temperature) + /// (Underpressure in dispenser 3) /// </summary> - [Description(" Motor Dispenser 4 Over Temperature")] - MotorDispenser4OverTemperature = 120, + [Description("Underpressure in dispenser 3")] + DISPENSER_3_UNDERPRESSURE = 113, /// <summary> - /// ( Motor Dispenser 5 Over Temperature) + /// (Underpressure in dispenser 4) /// </summary> - [Description(" Motor Dispenser 5 Over Temperature")] - MotorDispenser5OverTemperature = 121, + [Description("Underpressure in dispenser 4")] + DISPENSER_4_UNDERPRESSURE = 114, /// <summary> - /// ( Motor Dispenser 6 Over Temperature) + /// (Underpressure in dispenser 5) /// </summary> - [Description(" Motor Dispenser 6 Over Temperature")] - MotorDispenser6OverTemperature = 122, + [Description("Underpressure in dispenser 5")] + DISPENSER_5_UNDERPRESSURE = 115, /// <summary> - /// ( Motor Dispenser 7 Over Temperature) + /// (Underpressure in dispenser 6) /// </summary> - [Description(" Motor Dispenser 7 Over Temperature")] - MotorDispenser7OverTemperature = 123, + [Description("Underpressure in dispenser 6")] + DISPENSER_6_UNDERPRESSURE = 116, /// <summary> - /// ( Motor Dispenser 8 Over Temperature) + /// (Underpressure in dispenser 7) /// </summary> - [Description(" Motor Dispenser 8 Over Temperature")] - MotorDispenser8OverTemperature = 124, + [Description("Underpressure in dispenser 7")] + DISPENSER_7_UNDERPRESSURE = 117, /// <summary> - /// ( Motor Dryer Stall) + /// (Underpressure in dispenser 8) /// </summary> - [Description(" Motor Dryer Stall")] - MotorDryerStall = 125, + [Description("Underpressure in dispenser 8")] + DISPENSER_8_UNDERPRESSURE = 118, /// <summary> - /// ( Motor Feeder Stall) + /// (Dispenser 1 empty) /// </summary> - [Description(" Motor Feeder Stall")] - MotorFeederStall = 126, + [Description("Dispenser 1 empty")] + DISPENSER_1_EMPTY = 119, /// <summary> - /// ( Motor Right Loader Stall) + /// (Dispenser 2 empty) /// </summary> - [Description(" Motor Right Loader Stall")] - MotorRLoaderStall = 127, + [Description("Dispenser 2 empty")] + DISPENSER_2_EMPTY = 120, /// <summary> - /// ( Motor Pooler Stall) + /// (Dispenser 3 empty) /// </summary> - [Description(" Motor Pooler Stall")] - MotorPoolerStall = 128, + [Description("Dispenser 3 empty")] + DISPENSER_3_EMPTY = 121, /// <summary> - /// ( Motor Left Loader Stall) + /// (Dispenser 4 empty) /// </summary> - [Description(" Motor Left Loader Stall")] - MotorLLoaderStall = 129, + [Description("Dispenser 4 empty")] + DISPENSER_4_EMPTY = 122, /// <summary> - /// ( Motor Winder Stall) + /// (Dispenser 5 empty) /// </summary> - [Description(" Motor Winder Stall")] - MotorWinderStall = 130, + [Description("Dispenser 5 empty")] + DISPENSER_5_EMPTY = 123, /// <summary> - /// ( Motor Screw Stall) + /// (Dispenser 6 empty) /// </summary> - [Description(" Motor Screw Stall")] - MotorScrewStall = 131, + [Description("Dispenser 6 empty")] + DISPENSER_6_EMPTY = 124, /// <summary> - /// ( Motor Loading Arm Stall) + /// (Dispenser 7 empty) /// </summary> - [Description(" Motor Loading Arm Stall")] - MotorLoadingArmStall = 132, + [Description("Dispenser 7 empty")] + DISPENSER_7_EMPTY = 125, /// <summary> - /// ( Motor Dispenser 1 Stall) + /// (Dispenser 8 empty) /// </summary> - [Description(" Motor Dispenser 1 Stall")] - MotorDispenser1Stall = 133, + [Description("Dispenser 8 empty")] + DISPENSER_8_EMPTY = 126, /// <summary> - /// ( Motor Dispenser 2 Stall) + /// (Failed to refill dispenser 1) /// </summary> - [Description(" Motor Dispenser 2 Stall")] - MotorDispenser2Stall = 134, + [Description("Failed to refill dispenser 1")] + DISPENSER_1_REFILL_FAILURE = 127, /// <summary> - /// ( Motor Dispenser 3 Stall) + /// (Failed to refill dispenser 2) /// </summary> - [Description(" Motor Dispenser 3 Stall")] - MotorDispenser3Stall = 135, + [Description("Failed to refill dispenser 2")] + DISPENSER_2_REFILL_FAILURE = 128, /// <summary> - /// ( Motor Dispenser 4 Stall) + /// (Failed to refill dispenser 3) /// </summary> - [Description(" Motor Dispenser 4 Stall")] - MotorDispenser4Stall = 136, + [Description("Failed to refill dispenser 3")] + DISPENSER_3_REFILL_FAILURE = 129, /// <summary> - /// ( Motor Dispenser 5 Stall) + /// (Failed to refill dispenser 4) /// </summary> - [Description(" Motor Dispenser 5 Stall")] - MotorDispenser5Stall = 137, + [Description("Failed to refill dispenser 4")] + DISPENSER_4_REFILL_FAILURE = 130, /// <summary> - /// ( Motor Dispenser 6 Stall) + /// (Failed to refill dispenser 5) /// </summary> - [Description(" Motor Dispenser 6 Stall")] - MotorDispenser6Stall = 138, + [Description("Failed to refill dispenser 5")] + DISPENSER_5_REFILL_FAILURE = 131, /// <summary> - /// ( Motor Dispenser 7 Stall) + /// (Failed to refill dispenser 6) /// </summary> - [Description(" Motor Dispenser 7 Stall")] - MotorDispenser7Stall = 139, + [Description("Failed to refill dispenser 6")] + DISPENSER_6_REFILL_FAILURE = 132, /// <summary> - /// ( Motor Dispenser 8 Stall) + /// (Failed to refill dispenser 7) /// </summary> - [Description(" Motor Dispenser 8 Stall")] - MotorDispenser8Stall = 140, + [Description("Failed to refill dispenser 7")] + DISPENSER_7_REFILL_FAILURE = 133, /// <summary> - /// ( Motor Dryer Under Voltage) + /// (Failed to refill dispenser 8) /// </summary> - [Description(" Motor Dryer Under Voltage")] - MotorDryerUnderVoltage = 141, + [Description("Failed to refill dispenser 8")] + DISPENSER_8_REFILL_FAILURE = 134, /// <summary> - /// ( Motor Feeder Under Voltage) + /// (Overcurrent in dispenser 1 motor) /// </summary> - [Description(" Motor Feeder Under Voltage")] - MotorFeederUnderVoltage = 142, + [Description("Overcurrent in dispenser 1 motor")] + DISPENSER_1_MOTOR_OVERCURRENT = 135, /// <summary> - /// ( Motor Right Loader Under Voltage) + /// (Overcurrent in dispenser 2 motor) /// </summary> - [Description(" Motor Right Loader Under Voltage")] - MotorRLoaderUnderVoltage = 143, + [Description("Overcurrent in dispenser 2 motor")] + DISPENSER_2_MOTOR_OVERCURRENT = 136, /// <summary> - /// ( Motor Pooler Under Voltage) + /// (Overcurrent in dispenser 3 motor) /// </summary> - [Description(" Motor Pooler Under Voltage")] - MotorPoolerUnderVoltage = 144, + [Description("Overcurrent in dispenser 3 motor")] + DISPENSER_3_MOTOR_OVERCURRENT = 137, /// <summary> - /// ( Motor Left Loader Under Voltage) + /// (Overcurrent in dispenser 4 motor) /// </summary> - [Description(" Motor Left Loader Under Voltage")] - MotorLLoaderUnderVoltage = 145, + [Description("Overcurrent in dispenser 4 motor")] + DISPENSER_4_MOTOR_OVERCURRENT = 138, /// <summary> - /// ( Motor Winder Under Voltage) + /// (Overcurrent in dispenser 5 motor) /// </summary> - [Description(" Motor Winder Under Voltage")] - MotorWinderUnderVoltage = 146, + [Description("Overcurrent in dispenser 5 motor")] + DISPENSER_5_MOTOR_OVERCURRENT = 139, /// <summary> - /// ( Motor Screw Under Voltage) + /// (Overcurrent in dispenser 6 motor) /// </summary> - [Description(" Motor Screw Under Voltage")] - MotorScrewUnderVoltage = 147, + [Description("Overcurrent in dispenser 6 motor")] + DISPENSER_6_MOTOR_OVERCURRENT = 140, /// <summary> - /// ( Motor Loading Arm Under Voltage) + /// (Overcurrent in dispenser 7 motor) /// </summary> - [Description(" Motor Loading Arm Under Voltage")] - MotorLoadingArmUnderVoltage = 148, + [Description("Overcurrent in dispenser 7 motor")] + DISPENSER_7_MOTOR_OVERCURRENT = 141, /// <summary> - /// ( Motor Dispenser 1 Under Voltage) + /// (Overcurrent in dispenser 8 motor) /// </summary> - [Description(" Motor Dispenser 1 Under Voltage")] - MotorDispenser1UnderVoltage = 149, + [Description("Overcurrent in dispenser 8 motor")] + DISPENSER_8_MOTOR_OVERCURRENT = 142, /// <summary> - /// ( Motor Dispenser 2 Under Voltage) + /// (Overtemperature in dispenser 1 motor) /// </summary> - [Description(" Motor Dispenser 2 Under Voltage")] - MotorDispenser2UnderVoltage = 150, + [Description("Overtemperature in dispenser 1 motor")] + DISPENSER_1_MOTOR_OVERTEMPERATURE = 143, /// <summary> - /// ( Motor Dispenser 3 Under Voltage) + /// (Overtemperature in dispenser 2 motor) /// </summary> - [Description(" Motor Dispenser 3 Under Voltage")] - MotorDispenser3UnderVoltage = 151, + [Description("Overtemperature in dispenser 2 motor")] + DISPENSER_2_MOTOR_OVERTEMPERATURE = 144, /// <summary> - /// ( Motor Dispenser 4 Under Voltage) + /// (Overtemperature in dispenser 3 motor) /// </summary> - [Description(" Motor Dispenser 4 Under Voltage")] - MotorDispenser4UnderVoltage = 152, + [Description("Overtemperature in dispenser 3 motor")] + DISPENSER_3_MOTOR_OVERTEMPERATURE = 145, /// <summary> - /// ( Motor Dispenser 5 Under Voltage) + /// (Overtemperature in dispenser 4 motor) /// </summary> - [Description(" Motor Dispenser 5 Under Voltage")] - MotorDispenser5UnderVoltage = 153, + [Description("Overtemperature in dispenser 4 motor")] + DISPENSER_4_MOTOR_OVERTEMPERATURE = 146, /// <summary> - /// ( Motor Dispenser 6 Under Voltage) + /// (Overtemperature in dispenser 5 motor) /// </summary> - [Description(" Motor Dispenser 6 Under Voltage")] - MotorDispenser6UnderVoltage = 154, + [Description("Overtemperature in dispenser 5 motor")] + DISPENSER_5_MOTOR_OVERTEMPERATURE = 147, /// <summary> - /// ( Motor Dispenser 7 Under Voltage) + /// (Overtemperature in dispenser 6 motor) /// </summary> - [Description(" Motor Dispenser 7 Under Voltage")] - MotorDispenser7UnderVoltage = 155, + [Description("Overtemperature in dispenser 6 motor")] + DISPENSER_6_MOTOR_OVERTEMPERATURE = 148, /// <summary> - /// ( Motor Dispenser 8 Under Voltage) + /// (Overtemperature in dispenser 7 motor) /// </summary> - [Description(" Motor Dispenser 8 Under Voltage")] - MotorDispenser8UnderVoltage = 156, + [Description("Overtemperature in dispenser 7 motor")] + DISPENSER_7_MOTOR_OVERTEMPERATURE = 149, + + /// <summary> + /// (Overtemperature in dispenser 8 motor) + /// </summary> + [Description("Overtemperature in dispenser 8 motor")] + DISPENSER_8_MOTOR_OVERTEMPERATURE = 150, + + /// <summary> + /// (Dispenser 1 motor stalled) + /// </summary> + [Description("Dispenser 1 motor stalled")] + DISPENSER_1_MOTOR_STALL = 151, + + /// <summary> + /// (Dispenser 2 motor stalled) + /// </summary> + [Description("Dispenser 2 motor stalled")] + DISPENSER_2_MOTOR_STALL = 152, + + /// <summary> + /// (Dispenser 3 motor stalled) + /// </summary> + [Description("Dispenser 3 motor stalled")] + DISPENSER_3_MOTOR_STALL = 153, + + /// <summary> + /// (Dispenser 4 motor stalled) + /// </summary> + [Description("Dispenser 4 motor stalled")] + DISPENSER_4_MOTOR_STALL = 154, + + /// <summary> + /// (Dispenser 5 motor stalled) + /// </summary> + [Description("Dispenser 5 motor stalled")] + DISPENSER_5_MOTOR_STALL = 155, + + /// <summary> + /// (Dispenser 6 motor stalled) + /// </summary> + [Description("Dispenser 6 motor stalled")] + DISPENSER_6_MOTOR_STALL = 156, + + /// <summary> + /// (Dispenser 7 motor stalled) + /// </summary> + [Description("Dispenser 7 motor stalled")] + DISPENSER_7_MOTOR_STALL = 157, + + /// <summary> + /// (Dispenser 8 motor stalled) + /// </summary> + [Description("Dispenser 8 motor stalled")] + DISPENSER_8_MOTOR_STALL = 158, + + /// <summary> + /// (Undervoltage in dispenser 1 motor) + /// </summary> + [Description("Undervoltage in dispenser 1 motor")] + DISPENSER_1_MOTOR_UNDERVOLTAGE = 159, + + /// <summary> + /// (Undervoltage in dispenser 2 motor) + /// </summary> + [Description("Undervoltage in dispenser 2 motor")] + DISPENSER_2_MOTOR_UNDERVOLTAGE = 160, + + /// <summary> + /// (Undervoltage in dispenser 3 motor) + /// </summary> + [Description("Undervoltage in dispenser 3 motor")] + DISPENSER_3_MOTOR_UNDERVOLTAGE = 161, + + /// <summary> + /// (Undervoltage in dispenser 4 motor) + /// </summary> + [Description("Undervoltage in dispenser 4 motor")] + DISPENSER_4_MOTOR_UNDERVOLTAGE = 162, + + /// <summary> + /// (Undervoltage in dispenser 5 motor) + /// </summary> + [Description("Undervoltage in dispenser 5 motor")] + DISPENSER_5_MOTOR_UNDERVOLTAGE = 163, + + /// <summary> + /// (Undervoltage in dispenser 6 motor) + /// </summary> + [Description("Undervoltage in dispenser 6 motor")] + DISPENSER_6_MOTOR_UNDERVOLTAGE = 164, + + /// <summary> + /// (Undervoltage in dispenser 7 motor) + /// </summary> + [Description("Undervoltage in dispenser 7 motor")] + DISPENSER_7_MOTOR_UNDERVOLTAGE = 165, + + /// <summary> + /// (Undervoltage in dispenser 8 motor) + /// </summary> + [Description("Undervoltage in dispenser 8 motor")] + DISPENSER_8_MOTOR_UNDERVOLTAGE = 166, + + /// <summary> + /// (Low level in mid-tank 1) + /// </summary> + [Description("Low level in mid-tank 1")] + MID_TANK_1_LOW_LEVEL = 167, + + /// <summary> + /// (Low level in mid-tank 2) + /// </summary> + [Description("Low level in mid-tank 2")] + MID_TANK_2_LOW_LEVEL = 168, + + /// <summary> + /// (Low level in mid-tank 3) + /// </summary> + [Description("Low level in mid-tank 3")] + MID_TANK_3_LOW_LEVEL = 169, + + /// <summary> + /// (Low level in mid-tank 4) + /// </summary> + [Description("Low level in mid-tank 4")] + MID_TANK_4_LOW_LEVEL = 170, + + /// <summary> + /// (Low level in mid-tank 5) + /// </summary> + [Description("Low level in mid-tank 5")] + MID_TANK_5_LOW_LEVEL = 171, + + /// <summary> + /// (Low level in mid-tank 6) + /// </summary> + [Description("Low level in mid-tank 6")] + MID_TANK_6_LOW_LEVEL = 172, + + /// <summary> + /// (Low level in mid-tank 7) + /// </summary> + [Description("Low level in mid-tank 7")] + MID_TANK_7_LOW_LEVEL = 173, + + /// <summary> + /// (Low level in mid-tank 8) + /// </summary> + [Description("Low level in mid-tank 8")] + MID_TANK_8_LOW_LEVEL = 174, + + /// <summary> + /// (Mid-tank 1 empty) + /// </summary> + [Description("Mid-tank 1 empty")] + MID_TANK_1_EMPTY = 175, + + /// <summary> + /// (Mid-tank 2 empty) + /// </summary> + [Description("Mid-tank 2 empty")] + MID_TANK_2_EMPTY = 176, + + /// <summary> + /// (Mid-tank 3 empty) + /// </summary> + [Description("Mid-tank 3 empty")] + MID_TANK_3_EMPTY = 177, + + /// <summary> + /// (Mid-tank 4 empty) + /// </summary> + [Description("Mid-tank 4 empty")] + MID_TANK_4_EMPTY = 178, + + /// <summary> + /// (Mid-tank 5 empty) + /// </summary> + [Description("Mid-tank 5 empty")] + MID_TANK_5_EMPTY = 179, + + /// <summary> + /// (Mid-tank 6 empty) + /// </summary> + [Description("Mid-tank 6 empty")] + MID_TANK_6_EMPTY = 180, + + /// <summary> + /// (Mid-tank 7 empty) + /// </summary> + [Description("Mid-tank 7 empty")] + MID_TANK_7_EMPTY = 181, + + /// <summary> + /// (Mid-tank 8 empty) + /// </summary> + [Description("Mid-tank 8 empty")] + MID_TANK_8_EMPTY = 182, + + /// <summary> + /// (Overflow in mid-tank 1) + /// </summary> + [Description("Overflow in mid-tank 1")] + MID_TANK_1_OVERFLOW = 183, + + /// <summary> + /// (Overflow in mid-tank 2) + /// </summary> + [Description("Overflow in mid-tank 2")] + MID_TANK_2_OVERFLOW = 184, + + /// <summary> + /// (Overflow in mid-tank 3) + /// </summary> + [Description("Overflow in mid-tank 3")] + MID_TANK_3_OVERFLOW = 185, + + /// <summary> + /// (Overflow in mid-tank 4) + /// </summary> + [Description("Overflow in mid-tank 4")] + MID_TANK_4_OVERFLOW = 186, + + /// <summary> + /// (Overflow in mid-tank 5) + /// </summary> + [Description("Overflow in mid-tank 5")] + MID_TANK_5_OVERFLOW = 187, + + /// <summary> + /// (Overflow in mid-tank 6) + /// </summary> + [Description("Overflow in mid-tank 6")] + MID_TANK_6_OVERFLOW = 188, + + /// <summary> + /// (Overflow in mid-tank 7) + /// </summary> + [Description("Overflow in mid-tank 7")] + MID_TANK_7_OVERFLOW = 189, + + /// <summary> + /// (Overflow in mid-tank 8) + /// </summary> + [Description("Overflow in mid-tank 8")] + MID_TANK_8_OVERFLOW = 190, + + /// <summary> + /// (Air filter not present) + /// </summary> + [Description("Air filter not present")] + AIR_FILTER_NOT_INSTALLED = 191, + + /// <summary> + /// (Air filter clogged) + /// </summary> + [Description("Air filter clogged")] + AIR_FILTER_CLOGGED = 192, + + /// <summary> + /// (Waste emptying failure) + /// </summary> + [Description("Waste emptying failure")] + WASTE_CONTAINER_EMPTYING_TIMEOUT = 193, + + /// <summary> + /// (No air pressure) + /// </summary> + [Description("No air pressure")] + NO_AIR_PRESSURE = 194, + + /// <summary> + /// (Overflow in waste container) + /// </summary> + [Description("Overflow in waste container")] + WASTE_CONTAINER_OVERFLOW = 195, + + /// <summary> + /// () + /// </summary> + [Description("")] + VOC_SENSOR_ALARM = 196, + + /// <summary> + /// (Chiller malfunction) + /// </summary> + [Description("Chiller malfunction")] + CHILLER_DRY_CONTACT = 197, + + /// <summary> + /// (Insufficient air flow) + /// </summary> + [Description("Insufficient air flow")] + INSUFFICIENT_AIR_FLOW = 198, + + /// <summary> + /// (Ink cartridge presence failure) + /// </summary> + [Description("Ink cartridge presence failure")] + INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT = 199, + + /// <summary> + /// (Ink cartridge identification failure) + /// </summary> + [Description("Ink cartridge identification failure")] + INK_CARTRIDGE_RFID_TIMEOUT = 200, + + /// <summary> + /// (No waste cartridge available) + /// </summary> + [Description("No waste cartridge available")] + NO_WASTE_CARTRIDGE_AVAILABLE = 201, + + /// <summary> + /// (All waste cartridges are full) + /// </summary> + [Description("All waste cartridges are full")] + ALL_WASTE_CARTRIDGES_FULL = 202, + + /// <summary> + /// (Waste cartridge presence failure) + /// </summary> + [Description("Waste cartridge presence failure")] + WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT = 203, + + /// <summary> + /// (Waste cartridge identification failure) + /// </summary> + [Description("Waste cartridge identification failure")] + WASTE_CARTRIDGE_RFID_TIMEOUT = 204, + + /// <summary> + /// (Electrical cabinet fans RPM too low) + /// </summary> + [Description("Electrical cabinet fans RPM too low")] + ELECTRICAL_CABINET_FANS_RPM_TOO_LOW = 205, + + /// <summary> + /// (Electrical cabinet fans stopped) + /// </summary> + [Description("Electrical cabinet fans stopped")] + ELECTRICAL_CABINET_FANS_STOPPED = 206, /// <summary> /// (Occurs a request has been sent to the machine or external bridge service) /// </summary> [Description("Occurs a request has been sent to the machine or external bridge service")] - RequestSent = 1000, + REQUEST_SENT = 1000, /// <summary> /// (Occures when a response has been received) /// </summary> [Description("Occures when a response has been received")] - ResponseReceived = 1001, + RESPONSE_RECEIVED = 1001, /// <summary> /// (Occures when a request to the machine has failed) /// </summary> [Description("Occures when a request to the machine has failed")] - RequestFailed = 1002, + REQUEST_FAILED = 1002, /// <summary> /// (Occures when the application has encountered some error) /// </summary> [Description("Occures when the application has encountered some error")] - ApplicationException = 1003, + APPLICATION_EXCEPTION = 1003, /// <summary> /// (General application event logs) /// </summary> [Description("General application event logs")] - ApplicationInformation = 1004, + APPLICATION_INFORMATION = 1004, /// <summary> /// (Notifies about application succesfully started) /// </summary> [Description("Notifies about application succesfully started")] - ApplicationStarted = 1005, + APPLICATION_STARTED = 1005, /// <summary> /// (Notifies about application termination) /// </summary> [Description("Notifies about application termination")] - ApplicationTerminated = 1006, + APPLICATION_TERMINATED = 1006, /// <summary> /// (Occures when a diagnostics recording has been started) /// </summary> [Description("Occures when a diagnostics recording has been started")] - RecordingStarted = 1007, + RECORDING_STARTED = 1007, /// <summary> /// (Occures when a diagnostics recording has been stopped) /// </summary> [Description("Occures when a diagnostics recording has been stopped")] - RecordingStopped = 1008, + RECORDING_STOPPED = 1008, /// <summary> /// (Occures when a job status message has been received from the embedded device) /// </summary> [Description("Occures when a job status message has been received from the embedded device")] - JobStatus = 1009, + JOB_STATUS = 1009, } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypesGroups.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypesGroups.cs deleted file mode 100644 index f13f432f0..000000000 --- a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypesGroups.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.BL.Enumerations -{ - public enum EventTypesGroups - { - - /// <summary> - /// (Thread Feeding System) - /// </summary> - [Description("Thread Feeding System")] - ThreadFeedingSystem = 0, - - /// <summary> - /// (Dryer Head) - /// </summary> - [Description("Dryer Head")] - DryerHead = 1, - - /// <summary> - /// (Dryer) - /// </summary> - [Description("Dryer")] - Dryer = 2, - - /// <summary> - /// (Waste Handling System (WHS)) - /// </summary> - [Description("Waste Handling System (WHS)")] - WasteHandlingSystem = 3, - - /// <summary> - /// (Ink Delivery System (IDS)) - /// </summary> - [Description("Ink Delivery System (IDS)")] - InkDeliverySystem = 4, - - /// <summary> - /// (General Hardware) - /// </summary> - [Description("General Hardware")] - GeneralHardware = 5, - - /// <summary> - /// (Application related events) - /// </summary> - [Description("Application related events")] - Application = 6, - - /// <summary> - /// (Messages exchange to and from the machine) - /// </summary> - [Description("Messages exchange to and from the machine")] - Transport = 7, - - } -} diff --git a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs index bee94552e..b59ba8925 100644 --- a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs +++ b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs @@ -381,6 +381,10 @@ Maybe you have deleted an entity that was no yet inserted into database?", LogCa return GetDbContextFromEntity(this); } + #endregion + + #region Serialization + public virtual EntitySerializationStrategy GetDefaultSerializationStrategy(EntitySerializationFlags flags) { EntitySerializationStrategy st = new EntitySerializationStrategy(); @@ -474,35 +478,26 @@ Maybe you have deleted an entity that was no yet inserted into database?", LogCa return ToJson(new EntitySerializationStrategy(), EntitySerializationFlags.IgnoreReferenceTypes | EntitySerializationFlags.Indented); } - public void PopulateFromJson(string json) + public void PopulateFromJson(string json, EntitySerializationStrategy serializationStrategy, EntitySerializationFlags flags) { - //JsonCobnve - - //JObject from = JObject.Parse(json); - //JObject entity = new JObject(this); - //from.Merge() - - //Person p = new Person() - //{ - // Age = 30, - // Name = "Roy", - //}; + var settings = new JsonSerializerSettings() + { + ContractResolver = new SerializableEntityContractResolver(serializationStrategy, flags), + }; - //Person p2 = new Person(); - //p2.Adderess = new Address() - //{ - // City = "Gan Yavne", - // Street = "Yohanan" - //}; + if (flags.HasFlag(EntitySerializationFlags.PreserveReferencesHandling)) + { + settings.PreserveReferencesHandling = PreserveReferencesHandling.All; + } - //String j1 = JsonConvert.SerializeObject(p); - //String j2 = JsonConvert.SerializeObject(p2); + settings.Converters.Add(new StringEnumConverter { CamelCaseText = false }); - //JsonConvert.PopulateObject(j2, p, new JsonSerializerSettings() - //{ - // NullValueHandling = NullValueHandling.Ignore, + JsonConvert.PopulateObject(json, this, settings); + } - //}); + public void PopulateFromJson(string json) + { + PopulateFromJson(json, new EntitySerializationStrategy(), EntitySerializationFlags.PreserveReferencesHandling); } #endregion diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs index 917755d09..27e4ee6a7 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs @@ -31,14 +31,6 @@ namespace Tango.BL } /// <summary> - /// Gets or sets the ActionTypes. - /// </summary> - public DbSet<ActionType> ActionTypes - { - get; set; - } - - /// <summary> /// Gets or sets the Addresses. /// </summary> public DbSet<Address> Addresses @@ -175,30 +167,6 @@ namespace Tango.BL } /// <summary> - /// Gets or sets the EventTypesActions. - /// </summary> - public DbSet<EventTypesAction> EventTypesActions - { - get; set; - } - - /// <summary> - /// Gets or sets the EventTypesCategories. - /// </summary> - public DbSet<EventTypesCategory> EventTypesCategories - { - get; set; - } - - /// <summary> - /// Gets or sets the EventTypesGroups. - /// </summary> - public DbSet<EventTypesGroup> EventTypesGroups - { - get; set; - } - - /// <summary> /// Gets or sets the FiberShapes. /// </summary> public DbSet<FiberShape> FiberShapes @@ -335,14 +303,6 @@ namespace Tango.BL } /// <summary> - /// Gets or sets the HtmlPages. - /// </summary> - public DbSet<HtmlPage> HtmlPages - { - get; set; - } - - /// <summary> /// Gets or sets the IdsPackFormulas. /// </summary> public DbSet<IdsPackFormula> IdsPackFormulas diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs index 9c787cd0b..947d27565 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs @@ -174,21 +174,8 @@ namespace Tango.BL SpoolTypes = Context.SpoolTypes.ToObservableCollection(); - ActionTypes = Context.ActionTypes.ToObservableCollection(); - - EventTypesCategories = Context.EventTypesCategories.ToObservableCollection(); - - EventTypesGroups = Context.EventTypesGroups.ToObservableCollection(); - - EventTypesActions = Context.EventTypesActions.ToObservableCollection(); - EventTypes = Context.EventTypes.ToObservableCollection(); - foreach (var eventType in EventTypes) - { - eventType.EventTypesActions = eventType.EventTypesActions.ToSynchronizedObservableCollection(); - } - MediaMaterials = Context.MediaMaterials.ToObservableCollection(); MediaColors = Context.MediaColors.ToObservableCollection(); @@ -264,8 +251,6 @@ namespace Tango.BL HardwareBreakSensors = Context.HardwareBreakSensors.ToObservableCollection(); - HtmlPages = Context.HtmlPages.ToObservableCollection(); - Customers = Context.Customers.ToObservableCollection(); _dispatcher = Application.Current.Dispatcher; diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs index 6eea6ee9a..57f01105e 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs @@ -53,42 +53,6 @@ namespace Tango.BL } - private ObservableCollection<ActionType> _actiontypes; - /// <summary> - /// Gets or sets the ActionTypes. - /// </summary> - public ObservableCollection<ActionType> ActionTypes - { - get - { - return _actiontypes; - } - - set - { - _actiontypes = value; RaisePropertyChanged(nameof(ActionTypes)); - } - - } - - private ICollectionView _actiontypesViewSource; - /// <summary> - /// Gets or sets the ActionTypes View Source. - ///</summary> - public ICollectionView ActionTypesViewSource - { - get - { - return _actiontypesViewSource; - } - - set - { - _actiontypesViewSource = value; RaisePropertyChanged(nameof(ActionTypesViewSource)); - } - - } - private ObservableCollection<Address> _addresses; /// <summary> /// Gets or sets the Addresses. @@ -701,114 +665,6 @@ namespace Tango.BL } - private ObservableCollection<EventTypesAction> _eventtypesactions; - /// <summary> - /// Gets or sets the EventTypesActions. - /// </summary> - public ObservableCollection<EventTypesAction> EventTypesActions - { - get - { - return _eventtypesactions; - } - - set - { - _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); - } - - } - - private ICollectionView _eventtypesactionsViewSource; - /// <summary> - /// Gets or sets the EventTypesActions View Source. - ///</summary> - public ICollectionView EventTypesActionsViewSource - { - get - { - return _eventtypesactionsViewSource; - } - - set - { - _eventtypesactionsViewSource = value; RaisePropertyChanged(nameof(EventTypesActionsViewSource)); - } - - } - - private ObservableCollection<EventTypesCategory> _eventtypescategories; - /// <summary> - /// Gets or sets the EventTypesCategories. - /// </summary> - public ObservableCollection<EventTypesCategory> EventTypesCategories - { - get - { - return _eventtypescategories; - } - - set - { - _eventtypescategories = value; RaisePropertyChanged(nameof(EventTypesCategories)); - } - - } - - private ICollectionView _eventtypescategoriesViewSource; - /// <summary> - /// Gets or sets the EventTypesCategories View Source. - ///</summary> - public ICollectionView EventTypesCategoriesViewSource - { - get - { - return _eventtypescategoriesViewSource; - } - - set - { - _eventtypescategoriesViewSource = value; RaisePropertyChanged(nameof(EventTypesCategoriesViewSource)); - } - - } - - private ObservableCollection<EventTypesGroup> _eventtypesgroups; - /// <summary> - /// Gets or sets the EventTypesGroups. - /// </summary> - public ObservableCollection<EventTypesGroup> EventTypesGroups - { - get - { - return _eventtypesgroups; - } - - set - { - _eventtypesgroups = value; RaisePropertyChanged(nameof(EventTypesGroups)); - } - - } - - private ICollectionView _eventtypesgroupsViewSource; - /// <summary> - /// Gets or sets the EventTypesGroups View Source. - ///</summary> - public ICollectionView EventTypesGroupsViewSource - { - get - { - return _eventtypesgroupsViewSource; - } - - set - { - _eventtypesgroupsViewSource = value; RaisePropertyChanged(nameof(EventTypesGroupsViewSource)); - } - - } - private ObservableCollection<FiberShape> _fibershapes; /// <summary> /// Gets or sets the FiberShapes. @@ -1421,42 +1277,6 @@ namespace Tango.BL } - private ObservableCollection<HtmlPage> _htmlpages; - /// <summary> - /// Gets or sets the HtmlPages. - /// </summary> - public ObservableCollection<HtmlPage> HtmlPages - { - get - { - return _htmlpages; - } - - set - { - _htmlpages = value; RaisePropertyChanged(nameof(HtmlPages)); - } - - } - - private ICollectionView _htmlpagesViewSource; - /// <summary> - /// Gets or sets the HtmlPages View Source. - ///</summary> - public ICollectionView HtmlPagesViewSource - { - get - { - return _htmlpagesViewSource; - } - - set - { - _htmlpagesViewSource = value; RaisePropertyChanged(nameof(HtmlPagesViewSource)); - } - - } - private ObservableCollection<IdsPackFormula> _idspackformulas; /// <summary> /// Gets or sets the IdsPackFormulas. @@ -2797,8 +2617,6 @@ namespace Tango.BL SyncConfigurationsViewSource = CreateCollectionView(SyncConfigurations); - ActionTypesViewSource = CreateCollectionView(ActionTypes); - AddressesViewSource = CreateCollectionView(Addresses); ApplicationDisplayPanelVersionsViewSource = CreateCollectionView(ApplicationDisplayPanelVersions); @@ -2833,12 +2651,6 @@ namespace Tango.BL EventTypesViewSource = CreateCollectionView(EventTypes); - EventTypesActionsViewSource = CreateCollectionView(EventTypesActions); - - EventTypesCategoriesViewSource = CreateCollectionView(EventTypesCategories); - - EventTypesGroupsViewSource = CreateCollectionView(EventTypesGroups); - FiberShapesViewSource = CreateCollectionView(FiberShapes); FiberSynthsViewSource = CreateCollectionView(FiberSynths); @@ -2873,8 +2685,6 @@ namespace Tango.BL HardwareWindersViewSource = CreateCollectionView(HardwareWinders); - HtmlPagesViewSource = CreateCollectionView(HtmlPages); - IdsPackFormulasViewSource = CreateCollectionView(IdsPackFormulas); IdsPacksViewSource = CreateCollectionView(IdsPacks); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs index fb02494dd..a4b36b739 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs @@ -65,11 +65,7 @@ namespace Tango.BL ColorSpaces = db.ColorSpaces.ToObservableCollection(); SpoolTypes = db.SpoolTypes.ToObservableCollection(); - ActionTypes = db.ActionTypes.ToObservableCollection(); EventTypes = db.EventTypes.ToObservableCollection(); - EventTypesActions = db.EventTypesActions.ToObservableCollection(); - EventTypesCategories = db.EventTypesCategories.ToObservableCollection(); - EventTypesGroups = db.EventTypesGroups.ToObservableCollection(); HardwareBlowerTypes = db.HardwareBlowerTypes.ToObservableCollection(); HardwareBlowers = db.HardwareBlowers.ToObservableCollection(); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs index 4de477ebb..096cd2687 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs @@ -53,42 +53,6 @@ namespace Tango.BL } - private ObservableCollection<ActionType> _actiontypes; - /// <summary> - /// Gets or sets the ActionTypes. - /// </summary> - public ObservableCollection<ActionType> ActionTypes - { - get - { - return _actiontypes; - } - - set - { - _actiontypes = value; RaisePropertyChanged(nameof(ActionTypes)); - } - - } - - private ICollectionView _actiontypesViewSource; - /// <summary> - /// Gets or sets the ActionTypes View Source. - ///</summary> - public ICollectionView ActionTypesViewSource - { - get - { - return _actiontypesViewSource; - } - - set - { - _actiontypesViewSource = value; RaisePropertyChanged(nameof(ActionTypesViewSource)); - } - - } - private ObservableCollection<Address> _addresses; /// <summary> /// Gets or sets the Addresses. @@ -701,114 +665,6 @@ namespace Tango.BL } - private ObservableCollection<EventTypesAction> _eventtypesactions; - /// <summary> - /// Gets or sets the EventTypesActions. - /// </summary> - public ObservableCollection<EventTypesAction> EventTypesActions - { - get - { - return _eventtypesactions; - } - - set - { - _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); - } - - } - - private ICollectionView _eventtypesactionsViewSource; - /// <summary> - /// Gets or sets the EventTypesActions View Source. - ///</summary> - public ICollectionView EventTypesActionsViewSource - { - get - { - return _eventtypesactionsViewSource; - } - - set - { - _eventtypesactionsViewSource = value; RaisePropertyChanged(nameof(EventTypesActionsViewSource)); - } - - } - - private ObservableCollection<EventTypesCategory> _eventtypescategories; - /// <summary> - /// Gets or sets the EventTypesCategories. - /// </summary> - public ObservableCollection<EventTypesCategory> EventTypesCategories - { - get - { - return _eventtypescategories; - } - - set - { - _eventtypescategories = value; RaisePropertyChanged(nameof(EventTypesCategories)); - } - - } - - private ICollectionView _eventtypescategoriesViewSource; - /// <summary> - /// Gets or sets the EventTypesCategories View Source. - ///</summary> - public ICollectionView EventTypesCategoriesViewSource - { - get - { - return _eventtypescategoriesViewSource; - } - - set - { - _eventtypescategoriesViewSource = value; RaisePropertyChanged(nameof(EventTypesCategoriesViewSource)); - } - - } - - private ObservableCollection<EventTypesGroup> _eventtypesgroups; - /// <summary> - /// Gets or sets the EventTypesGroups. - /// </summary> - public ObservableCollection<EventTypesGroup> EventTypesGroups - { - get - { - return _eventtypesgroups; - } - - set - { - _eventtypesgroups = value; RaisePropertyChanged(nameof(EventTypesGroups)); - } - - } - - private ICollectionView _eventtypesgroupsViewSource; - /// <summary> - /// Gets or sets the EventTypesGroups View Source. - ///</summary> - public ICollectionView EventTypesGroupsViewSource - { - get - { - return _eventtypesgroupsViewSource; - } - - set - { - _eventtypesgroupsViewSource = value; RaisePropertyChanged(nameof(EventTypesGroupsViewSource)); - } - - } - private ObservableCollection<FiberShape> _fibershapes; /// <summary> /// Gets or sets the FiberShapes. @@ -1421,42 +1277,6 @@ namespace Tango.BL } - private ObservableCollection<HtmlPage> _htmlpages; - /// <summary> - /// Gets or sets the HtmlPages. - /// </summary> - public ObservableCollection<HtmlPage> HtmlPages - { - get - { - return _htmlpages; - } - - set - { - _htmlpages = value; RaisePropertyChanged(nameof(HtmlPages)); - } - - } - - private ICollectionView _htmlpagesViewSource; - /// <summary> - /// Gets or sets the HtmlPages View Source. - ///</summary> - public ICollectionView HtmlPagesViewSource - { - get - { - return _htmlpagesViewSource; - } - - set - { - _htmlpagesViewSource = value; RaisePropertyChanged(nameof(HtmlPagesViewSource)); - } - - } - private ObservableCollection<IdsPackFormula> _idspackformulas; /// <summary> /// Gets or sets the IdsPackFormulas. @@ -2797,8 +2617,6 @@ namespace Tango.BL SyncConfigurationsViewSource = CreateCollectionView(SyncConfigurations); - ActionTypesViewSource = CreateCollectionView(ActionTypes); - AddressesViewSource = CreateCollectionView(Addresses); ApplicationDisplayPanelVersionsViewSource = CreateCollectionView(ApplicationDisplayPanelVersions); @@ -2833,12 +2651,6 @@ namespace Tango.BL EventTypesViewSource = CreateCollectionView(EventTypes); - EventTypesActionsViewSource = CreateCollectionView(EventTypesActions); - - EventTypesCategoriesViewSource = CreateCollectionView(EventTypesCategories); - - EventTypesGroupsViewSource = CreateCollectionView(EventTypesGroups); - FiberShapesViewSource = CreateCollectionView(FiberShapes); FiberSynthsViewSource = CreateCollectionView(FiberSynths); @@ -2873,8 +2685,6 @@ namespace Tango.BL HardwareWindersViewSource = CreateCollectionView(HardwareWinders); - HtmlPagesViewSource = CreateCollectionView(HtmlPages); - IdsPackFormulasViewSource = CreateCollectionView(IdsPackFormulas); IdsPacksViewSource = CreateCollectionView(IdsPacks); diff --git a/Software/Visual_Studio/Tango.BL/Serialization/SerializableEntityContractResolver.cs b/Software/Visual_Studio/Tango.BL/Serialization/SerializableEntityContractResolver.cs index 0150a6b5f..d07cf6cf0 100644 --- a/Software/Visual_Studio/Tango.BL/Serialization/SerializableEntityContractResolver.cs +++ b/Software/Visual_Studio/Tango.BL/Serialization/SerializableEntityContractResolver.cs @@ -47,6 +47,13 @@ namespace Tango.BL.Serialization || (include_props.Exists(y => y.DeclaringType.IsAssignableFrom(mi.DeclaringType) && y.ToString() == mi.ToString())); }; + property.ShouldDeserialize = (x) => + { + MemberInfo mi = member; + return (!ignore_props.Exists(y => y.DeclaringType.IsAssignableFrom(mi.DeclaringType) && y.ToString() == mi.ToString())) + || + (include_props.Exists(y => y.DeclaringType.IsAssignableFrom(mi.DeclaringType) && y.ToString() == mi.ToString())); + }; return property; } } diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index 931f1f94a..dd5122ec2 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -110,7 +110,6 @@ <Compile Include="Dispensing\LubricantDispensingCalc.cs" /> <Compile Include="Dispensing\StandardColorDispensingCalc.cs" /> <Compile Include="Dispensing\TransparentLiquidDispensingCalc.cs" /> - <Compile Include="Entities\ActionTypeBase.cs" /> <Compile Include="Entities\AddressBase.cs" /> <Compile Include="Entities\ApplicationDisplayPanelVersionBase.cs" /> <Compile Include="Entities\ApplicationFirmwareVersionBase.cs" /> @@ -130,11 +129,6 @@ <Compile Include="Entities\DispenserTypeBase.cs" /> <Compile Include="Entities\EmbeddedFirmwareVersionBase.cs" /> <Compile Include="Entities\EventTypeBase.cs" /> - <Compile Include="Entities\EventTypesActionBase.cs" /> - <Compile Include="Entities\EventTypesCategory.cs" /> - <Compile Include="Entities\EventTypesCategoryBase.cs" /> - <Compile Include="Entities\EventTypesGroup.cs" /> - <Compile Include="Entities\EventTypesGroupBase.cs" /> <Compile Include="Entities\FiberShapeBase.cs" /> <Compile Include="Entities\FiberSynthBase.cs" /> <Compile Include="Entities\HardwareBlower.cs" /> @@ -158,8 +152,6 @@ <Compile Include="Entities\HardwareVersionBase.cs" /> <Compile Include="Entities\HardwareWinderBase.cs" /> <Compile Include="Entities\HardwareWinderTypeBase.cs" /> - <Compile Include="Entities\HtmlPage.cs" /> - <Compile Include="Entities\HtmlPageBase.cs" /> <Compile Include="Entities\IdsPackBase.cs" /> <Compile Include="Entities\IdsPackFormulaBase.cs" /> <Compile Include="Entities\JobBase.cs" /> @@ -204,13 +196,14 @@ <Compile Include="Entities\UserBase.cs" /> <Compile Include="Entities\UsersRoleBase.cs" /> <Compile Include="Entities\WindingMethodBase.cs" /> - <Compile Include="Enumerations\ActionTypes.cs" /> <Compile Include="Enumerations\ColorCatalogs.cs" /> <Compile Include="Enumerations\DancerTypes.cs" /> <Compile Include="Enumerations\EditingStates.cs" /> + <Compile Include="Enumerations\EventTypeNotificationTimes.cs" /> + <Compile Include="Enumerations\EventTypeActions.cs" /> <Compile Include="Enumerations\EventTypes.cs" /> - <Compile Include="Enumerations\EventTypesCategories.cs" /> - <Compile Include="Enumerations\EventTypesGroups.cs" /> + <Compile Include="Enumerations\EventTypeCategories.cs" /> + <Compile Include="Enumerations\EventTypeGroups.cs" /> <Compile Include="Enumerations\FiberSynthes.cs" /> <Compile Include="Enumerations\FiberSynths.cs" /> <Compile Include="Enumerations\FineTuningStatuses.cs" /> @@ -245,7 +238,6 @@ <Compile Include="ExtensionMethods\ColorConversionSuggestionExtensions.cs" /> <Compile Include="ExtensionMethods\ColorSpacesExtensions.cs" /> <Compile Include="LiquidVolume.cs" /> - <Compile Include="Entities\ActionType.cs" /> <Compile Include="Entities\Address.cs" /> <Compile Include="Entities\ApplicationDisplayPanelVersion.cs" /> <Compile Include="Entities\ApplicationFirmwareVersion.cs" /> @@ -261,7 +253,6 @@ <Compile Include="Entities\DispenserType.cs" /> <Compile Include="Entities\EmbeddedFirmwareVersion.cs" /> <Compile Include="Entities\EventType.cs" /> - <Compile Include="Entities\EventTypesAction.cs" /> <Compile Include="Entities\FiberShape.cs" /> <Compile Include="Entities\FiberSynth.cs" /> <Compile Include="Entities\HardwareDancer.cs" /> @@ -305,7 +296,6 @@ <Compile Include="Entities\User.cs" /> <Compile Include="Entities\UsersRole.cs" /> <Compile Include="Entities\WindingMethod.cs" /> - <Compile Include="Enumerations\Actions.cs" /> <Compile Include="Enumerations\CartridgeTypes.cs" /> <Compile Include="Enumerations\ColorSpaces.cs" /> <Compile Include="Enumerations\DispenserTypes.cs" /> @@ -414,7 +404,7 @@ </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Core/ExtensionMethods/StringExtensions.cs b/Software/Visual_Studio/Tango.Core/ExtensionMethods/StringExtensions.cs index f03bcb647..7a03b8ae4 100644 --- a/Software/Visual_Studio/Tango.Core/ExtensionMethods/StringExtensions.cs +++ b/Software/Visual_Studio/Tango.Core/ExtensionMethods/StringExtensions.cs @@ -233,4 +233,16 @@ public static class StringExtensions { return String.IsNullOrEmpty(str) ? null : str; } + + public static List<T> ToEnumValues<T>(this String str, char splitChar) where T : struct + { + if (!String.IsNullOrWhiteSpace(str)) + { + return str.Split(splitChar).Select(x => (T)Convert.ChangeType(int.Parse(x),typeof(T))).ToList(); + } + else + { + return new List<T>(); + } + } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs deleted file mode 100644 index 6a864f024..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs +++ /dev/null @@ -1,33 +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 ACTION_TYPES - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public ACTION_TYPES() - { - this.EVENT_TYPES_ACTIONS = new HashSet<EVENT_TYPES_ACTIONS>(); - } - - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public int CODE { get; set; } - public string NAME { get; set; } - public string DESCRIPTION { get; set; } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection<EVENT_TYPES_ACTIONS> EVENT_TYPES_ACTIONS { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs index 769657e6f..d6c015d7a 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs @@ -26,7 +26,11 @@ namespace Tango.DAL.Remote.DB public string SERIAL_NUMBER { get; set; } public string DISPENSER_TYPE_GUID { get; set; } public double NL_PER_PULSE { get; set; } - public byte[] DATA { get; set; } + public string PART_NUMBER { get; set; } + public string PCB_SERIAL { get; set; } + public string PCB_VERSION { get; set; } + public Nullable<System.DateTime> PRODUCTION_DATE { get; set; } + public byte[] CALIBRATION_DATA { get; set; } public virtual DISPENSER_TYPES DISPENSER_TYPES { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs index 15e848b1e..737f22965 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public EVENT_TYPES() { - this.EVENT_TYPES_ACTIONS = new HashSet<EVENT_TYPES_ACTIONS>(); this.MACHINES_EVENTS = new HashSet<MACHINES_EVENTS>(); } @@ -26,18 +25,16 @@ namespace Tango.DAL.Remote.DB public System.DateTime LAST_UPDATED { get; set; } public int CODE { get; set; } public string NAME { get; set; } + public string TITLE { get; set; } public string DESCRIPTION { get; set; } - public string EVENT_TYPES_CATEGORY_GUID { get; set; } - public string EVENT_TYPES_GROUP_GUID { get; set; } + public string TECHNICAL_DESCRIPTION { get; set; } + public int COMPONENT_INDEX { get; set; } + public int EVENT_CATEGORY { get; set; } + public int EVENT_GROUP { get; set; } + public int EVENT_NOTIFICATION_TIME { get; set; } + public string EVENT_ACTIONS { get; set; } public bool REQUIRES_USER_INTERVENTION { get; set; } - public string HTML_PAGE_GUID { get; set; } - public bool RESOLVABLE { get; set; } - public virtual EVENT_TYPES_GROUPS EVENT_TYPES_GROUPS { get; set; } - public virtual EVENT_TYPES_CATEGORIES EVENT_TYPES_CATEGORIES { get; set; } - public virtual HTML_PAGES HTML_PAGES { get; set; } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection<EVENT_TYPES_ACTIONS> EVENT_TYPES_ACTIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<MACHINES_EVENTS> MACHINES_EVENTS { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs deleted file mode 100644 index 3ce891623..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.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 EVENT_TYPES_ACTIONS - { - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public string EVENT_TYPE_GUID { get; set; } - public string ACTION_TYPE_GUID { get; set; } - - public virtual ACTION_TYPES ACTION_TYPES { get; set; } - public virtual EVENT_TYPES EVENT_TYPES { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_CATEGORIES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_CATEGORIES.cs deleted file mode 100644 index d8c1c14c9..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_CATEGORIES.cs +++ /dev/null @@ -1,33 +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 EVENT_TYPES_CATEGORIES - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public EVENT_TYPES_CATEGORIES() - { - this.EVENT_TYPES = new HashSet<EVENT_TYPES>(); - } - - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public int CODE { get; set; } - public string NAME { get; set; } - public string DESCRIPTION { get; set; } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection<EVENT_TYPES> EVENT_TYPES { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_GROUPS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_GROUPS.cs deleted file mode 100644 index 921c0c0df..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_GROUPS.cs +++ /dev/null @@ -1,33 +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 EVENT_TYPES_GROUPS - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public EVENT_TYPES_GROUPS() - { - this.EVENT_TYPES = new HashSet<EVENT_TYPES>(); - } - - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public int CODE { get; set; } - public string NAME { get; set; } - public string DESCRIPTION { get; set; } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection<EVENT_TYPES> EVENT_TYPES { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HTML_PAGES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HTML_PAGES.cs deleted file mode 100644 index f0b1932c1..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/HTML_PAGES.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 HTML_PAGES - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public HTML_PAGES() - { - this.EVENT_TYPES = new HashSet<EVENT_TYPES>(); - } - - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public int CODE { get; set; } - public string NAME { get; set; } - public string DESCRIPTION { get; set; } - public string HTML { get; set; } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection<EVENT_TYPES> EVENT_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 a266b618d..c103a6bba 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -26,7 +26,6 @@ namespace Tango.DAL.Remote.DB } public virtual DbSet<SYNC_CONFIGURATIONS> SYNC_CONFIGURATIONS { get; set; } - public virtual DbSet<ACTION_TYPES> ACTION_TYPES { get; set; } public virtual DbSet<ADDRESS> ADDRESSES { get; set; } public virtual DbSet<APPLICATION_DISPLAY_PANEL_VERSIONS> APPLICATION_DISPLAY_PANEL_VERSIONS { get; set; } public virtual DbSet<APPLICATION_FIRMWARE_VERSIONS> APPLICATION_FIRMWARE_VERSIONS { get; set; } @@ -44,9 +43,6 @@ namespace Tango.DAL.Remote.DB public virtual DbSet<DISPENSER> DISPENSERS { get; set; } public virtual DbSet<EMBEDDED_FIRMWARE_VERSIONS> EMBEDDED_FIRMWARE_VERSIONS { get; set; } public virtual DbSet<EVENT_TYPES> EVENT_TYPES { get; set; } - public virtual DbSet<EVENT_TYPES_ACTIONS> EVENT_TYPES_ACTIONS { get; set; } - public virtual DbSet<EVENT_TYPES_CATEGORIES> EVENT_TYPES_CATEGORIES { get; set; } - public virtual DbSet<EVENT_TYPES_GROUPS> EVENT_TYPES_GROUPS { get; set; } public virtual DbSet<FIBER_SHAPES> FIBER_SHAPES { get; set; } public virtual DbSet<FIBER_SYNTHS> FIBER_SYNTHS { get; set; } public virtual DbSet<HARDWARE_BLOWER_TYPES> HARDWARE_BLOWER_TYPES { get; set; } @@ -64,7 +60,6 @@ namespace Tango.DAL.Remote.DB public virtual DbSet<HARDWARE_VERSIONS> HARDWARE_VERSIONS { get; set; } public virtual DbSet<HARDWARE_WINDER_TYPES> HARDWARE_WINDER_TYPES { get; set; } public virtual DbSet<HARDWARE_WINDERS> HARDWARE_WINDERS { get; set; } - public virtual DbSet<HTML_PAGES> HTML_PAGES { get; set; } public virtual DbSet<IDS_PACK_FORMULAS> IDS_PACK_FORMULAS { get; set; } public virtual DbSet<IDS_PACKS> IDS_PACKS { get; set; } public virtual DbSet<JOB_RUNS> JOB_RUNS { 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 1f5e0b4fe..2ac5ff6b7 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -5,17 +5,6 @@ <!-- SSDL content --> <edmx:StorageModels> <Schema Namespace="RemoteModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl"> - <EntityType Name="ACTION_TYPES"> - <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="CODE" Type="int" Nullable="false" /> - <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> - <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="100" Nullable="false" /> - </EntityType> <EntityType Name="ADDRESSES"> <Key> <PropertyRef Name="GUID" /> @@ -237,7 +226,11 @@ <Property Name="SERIAL_NUMBER" Type="varchar" MaxLength="50" Nullable="false" /> <Property Name="DISPENSER_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="NL_PER_PULSE" Type="float" Nullable="false" /> - <Property Name="DATA" Type="image" /> + <Property Name="PART_NUMBER" Type="varchar" MaxLength="50" /> + <Property Name="PCB_SERIAL" Type="varchar" MaxLength="100" /> + <Property Name="PCB_VERSION" Type="varchar" MaxLength="30" /> + <Property Name="PRODUCTION_DATE" Type="datetime2" Precision="3" /> + <Property Name="CALIBRATION_DATA" Type="image" /> </EntityType> <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS"> <Key> @@ -257,45 +250,16 @@ <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" /> <Property Name="CODE" Type="int" Nullable="false" /> - <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> - <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="100" Nullable="false" /> - <Property Name="EVENT_TYPES_CATEGORY_GUID" Type="varchar" MaxLength="36" Nullable="false" /> - <Property Name="EVENT_TYPES_GROUP_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" /> + <Property Name="TITLE" Type="nvarchar" MaxLength="100" Nullable="false" /> + <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="200" /> + <Property Name="TECHNICAL_DESCRIPTION" Type="nvarchar(max)" /> + <Property Name="COMPONENT_INDEX" Type="int" Nullable="false" /> + <Property Name="EVENT_CATEGORY" Type="int" Nullable="false" /> + <Property Name="EVENT_GROUP" Type="int" Nullable="false" /> + <Property Name="EVENT_NOTIFICATION_TIME" Type="int" Nullable="false" /> + <Property Name="EVENT_ACTIONS" Type="varchar" MaxLength="50" /> <Property Name="REQUIRES_USER_INTERVENTION" Type="bit" Nullable="false" /> - <Property Name="HTML_PAGE_GUID" Type="varchar" MaxLength="36" /> - <Property Name="RESOLVABLE" Type="bit" Nullable="false" /> - </EntityType> - <EntityType Name="EVENT_TYPES_ACTIONS"> - <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="EVENT_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> - <Property Name="ACTION_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> - </EntityType> - <EntityType Name="EVENT_TYPES_CATEGORIES"> - <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="CODE" Type="int" Nullable="false" /> - <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> - <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="100" Nullable="false" /> - </EntityType> - <EntityType Name="EVENT_TYPES_GROUPS"> - <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="CODE" Type="int" Nullable="false" /> - <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> - <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="100" Nullable="false" /> </EntityType> <EntityType Name="FIBER_SHAPES"> <Key> @@ -543,18 +507,6 @@ <Property Name="MILLIMETER_PER_ROTATION" Type="int" Nullable="false" /> <Property Name="ACTIVE" Type="bit" Nullable="false" /> </EntityType> - <EntityType Name="HTML_PAGES"> - <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="CODE" Type="int" Nullable="false" /> - <Property Name="NAME" Type="varchar" MaxLength="50" Nullable="false" /> - <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" /> - <Property Name="HTML" Type="nvarchar(max)" /> - </EntityType> <EntityType Name="IDS_PACK_FORMULAS"> <Key> <PropertyRef Name="GUID" /> @@ -1306,70 +1258,6 @@ </Dependent> </ReferentialConstraint> </Association> - <Association Name="FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES"> - <End Role="EVENT_TYPES_GROUPS" Type="Self.EVENT_TYPES_GROUPS" Multiplicity="1" /> - <End Role="EVENT_TYPES" Type="Self.EVENT_TYPES" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="EVENT_TYPES_GROUPS"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="EVENT_TYPES"> - <PropertyRef Name="EVENT_TYPES_GROUP_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES1"> - <End Role="EVENT_TYPES_CATEGORIES" Type="Self.EVENT_TYPES_CATEGORIES" Multiplicity="1" /> - <End Role="EVENT_TYPES" Type="Self.EVENT_TYPES" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="EVENT_TYPES_CATEGORIES"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="EVENT_TYPES"> - <PropertyRef Name="EVENT_TYPES_CATEGORY_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_EVENT_TYPES_HTML_PAGES"> - <End Role="HTML_PAGES" Type="Self.HTML_PAGES" Multiplicity="0..1" /> - <End Role="EVENT_TYPES" Type="Self.EVENT_TYPES" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="HTML_PAGES"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="EVENT_TYPES"> - <PropertyRef Name="HTML_PAGE_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_EVENTS_ACTIONS_ACTIONS"> - <End Role="ACTION_TYPES" Type="Self.ACTION_TYPES" Multiplicity="1"> - <OnDelete Action="Cascade" /> - </End> - <End Role="EVENT_TYPES_ACTIONS" Type="Self.EVENT_TYPES_ACTIONS" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="ACTION_TYPES"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="EVENT_TYPES_ACTIONS"> - <PropertyRef Name="ACTION_TYPE_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_EVENTS_ACTIONS_EVENTS"> - <End Role="EVENT_TYPES" Type="Self.EVENT_TYPES" Multiplicity="1"> - <OnDelete Action="Cascade" /> - </End> - <End Role="EVENT_TYPES_ACTIONS" Type="Self.EVENT_TYPES_ACTIONS" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="EVENT_TYPES"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="EVENT_TYPES_ACTIONS"> - <PropertyRef Name="EVENT_TYPE_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> <Association Name="FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES"> <End Role="HARDWARE_BLOWER_TYPES" Type="Self.HARDWARE_BLOWER_TYPES" Multiplicity="1"> <OnDelete Action="Cascade" /> @@ -2177,7 +2065,6 @@ </ReferentialConstraint> </Association> <EntityContainer Name="RemoteModelStoreContainer"> - <EntitySet Name="ACTION_TYPES" EntityType="Self.ACTION_TYPES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="ADDRESSES" EntityType="Self.ADDRESSES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="APPLICATION_DISPLAY_PANEL_VERSIONS" EntityType="Self.APPLICATION_DISPLAY_PANEL_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="Self.APPLICATION_FIRMWARE_VERSIONS" Schema="dbo" store:Type="Tables" /> @@ -2195,9 +2082,6 @@ <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="EVENT_TYPES" EntityType="Self.EVENT_TYPES" Schema="dbo" store:Type="Tables" /> - <EntitySet Name="EVENT_TYPES_ACTIONS" EntityType="Self.EVENT_TYPES_ACTIONS" Schema="dbo" store:Type="Tables" /> - <EntitySet Name="EVENT_TYPES_CATEGORIES" EntityType="Self.EVENT_TYPES_CATEGORIES" Schema="dbo" store:Type="Tables" /> - <EntitySet Name="EVENT_TYPES_GROUPS" EntityType="Self.EVENT_TYPES_GROUPS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="FIBER_SHAPES" EntityType="Self.FIBER_SHAPES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="FIBER_SYNTHS" EntityType="Self.FIBER_SYNTHS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="HARDWARE_BLOWER_TYPES" EntityType="Self.HARDWARE_BLOWER_TYPES" Schema="dbo" store:Type="Tables" /> @@ -2215,7 +2099,6 @@ <EntitySet Name="HARDWARE_VERSIONS" EntityType="Self.HARDWARE_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="HARDWARE_WINDER_TYPES" EntityType="Self.HARDWARE_WINDER_TYPES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="HARDWARE_WINDERS" EntityType="Self.HARDWARE_WINDERS" Schema="dbo" store:Type="Tables" /> - <EntitySet Name="HTML_PAGES" EntityType="Self.HTML_PAGES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="IDS_PACK_FORMULAS" EntityType="Self.IDS_PACK_FORMULAS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="IDS_PACKS" EntityType="Self.IDS_PACKS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="JOB_RUNS" EntityType="Self.JOB_RUNS" Schema="dbo" store:Type="Tables" /> @@ -2318,26 +2201,6 @@ <End Role="DISPENSER_TYPES" EntitySet="DISPENSER_TYPES" /> <End Role="DISPENSERS" EntitySet="DISPENSERS" /> </AssociationSet> - <AssociationSet Name="FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES" Association="Self.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES"> - <End Role="EVENT_TYPES_GROUPS" EntitySet="EVENT_TYPES_GROUPS" /> - <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> - </AssociationSet> - <AssociationSet Name="FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES1" Association="Self.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES1"> - <End Role="EVENT_TYPES_CATEGORIES" EntitySet="EVENT_TYPES_CATEGORIES" /> - <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> - </AssociationSet> - <AssociationSet Name="FK_EVENT_TYPES_HTML_PAGES" Association="Self.FK_EVENT_TYPES_HTML_PAGES"> - <End Role="HTML_PAGES" EntitySet="HTML_PAGES" /> - <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> - </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" /> - </AssociationSet> - <AssociationSet Name="FK_EVENTS_ACTIONS_EVENTS" Association="Self.FK_EVENTS_ACTIONS_EVENTS"> - <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> - <End Role="EVENT_TYPES_ACTIONS" EntitySet="EVENT_TYPES_ACTIONS" /> - </AssociationSet> <AssociationSet Name="FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES" Association="Self.FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES"> <End Role="HARDWARE_BLOWER_TYPES" EntitySet="HARDWARE_BLOWER_TYPES" /> <End Role="HARDWARE_BLOWERS" EntitySet="HARDWARE_BLOWERS" /> @@ -2593,7 +2456,6 @@ <Schema Namespace="RemoteModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm"> <EntityContainer Name="RemoteDB" annotation:LazyLoadingEnabled="true"> <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="RemoteModel.SYNC_CONFIGURATIONS" /> - <EntitySet Name="ACTION_TYPES" EntityType="RemoteModel.ACTION_TYPES" /> <EntitySet Name="ADDRESSES" EntityType="RemoteModel.ADDRESS" /> <EntitySet Name="APPLICATION_DISPLAY_PANEL_VERSIONS" EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" /> <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" /> @@ -2611,9 +2473,6 @@ <EntitySet Name="DISPENSERS" EntityType="RemoteModel.DISPENSER" /> <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" /> <EntitySet Name="EVENT_TYPES" EntityType="RemoteModel.EVENT_TYPES" /> - <EntitySet Name="EVENT_TYPES_ACTIONS" EntityType="RemoteModel.EVENT_TYPES_ACTIONS" /> - <EntitySet Name="EVENT_TYPES_CATEGORIES" EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" /> - <EntitySet Name="EVENT_TYPES_GROUPS" EntityType="RemoteModel.EVENT_TYPES_GROUPS" /> <EntitySet Name="FIBER_SHAPES" EntityType="RemoteModel.FIBER_SHAPES" /> <EntitySet Name="FIBER_SYNTHS" EntityType="RemoteModel.FIBER_SYNTHS" /> <EntitySet Name="HARDWARE_BLOWER_TYPES" EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" /> @@ -2631,7 +2490,6 @@ <EntitySet Name="HARDWARE_VERSIONS" EntityType="RemoteModel.HARDWARE_VERSIONS" /> <EntitySet Name="HARDWARE_WINDER_TYPES" EntityType="RemoteModel.HARDWARE_WINDER_TYPES" /> <EntitySet Name="HARDWARE_WINDERS" EntityType="RemoteModel.HARDWARE_WINDERS" /> - <EntitySet Name="HTML_PAGES" EntityType="RemoteModel.HTML_PAGES" /> <EntitySet Name="IDS_PACK_FORMULAS" EntityType="RemoteModel.IDS_PACK_FORMULAS" /> <EntitySet Name="IDS_PACKS" EntityType="RemoteModel.IDS_PACKS" /> <EntitySet Name="JOB_RUNS" EntityType="RemoteModel.JOB_RUNS" /> @@ -2669,10 +2527,6 @@ <EntitySet Name="USERS" EntityType="RemoteModel.USER" /> <EntitySet Name="USERS_ROLES" EntityType="RemoteModel.USERS_ROLES" /> <EntitySet Name="WINDING_METHODS" EntityType="RemoteModel.WINDING_METHODS" /> - <AssociationSet Name="FK_EVENTS_ACTIONS_ACTIONS" Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS"> - <End Role="ACTION_TYPES" EntitySet="ACTION_TYPES" /> - <End Role="EVENT_TYPES_ACTIONS" EntitySet="EVENT_TYPES_ACTIONS" /> - </AssociationSet> <AssociationSet Name="FK_ORGANIZATIONS_ADDRESSES" Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES"> <End Role="ADDRESS" EntitySet="ADDRESSES" /> <End Role="ORGANIZATION" EntitySet="ORGANIZATIONS" /> @@ -2777,22 +2631,6 @@ <End Role="DISPENSER" EntitySet="DISPENSERS" /> <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> </AssociationSet> - <AssociationSet Name="FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES" Association="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES"> - <End Role="EVENT_TYPES_GROUPS" EntitySet="EVENT_TYPES_GROUPS" /> - <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> - </AssociationSet> - <AssociationSet Name="FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES1" Association="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES1"> - <End Role="EVENT_TYPES_CATEGORIES" EntitySet="EVENT_TYPES_CATEGORIES" /> - <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> - </AssociationSet> - <AssociationSet Name="FK_EVENT_TYPES_HTML_PAGES" Association="RemoteModel.FK_EVENT_TYPES_HTML_PAGES"> - <End Role="HTML_PAGES" EntitySet="HTML_PAGES" /> - <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> - </AssociationSet> - <AssociationSet Name="FK_EVENTS_ACTIONS_EVENTS" Association="RemoteModel.FK_EVENTS_ACTIONS_EVENTS"> - <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> - <End Role="EVENT_TYPES_ACTIONS" EntitySet="EVENT_TYPES_ACTIONS" /> - </AssociationSet> <AssociationSet Name="FK_MACHINES_EVENTS_EVENTS" Association="RemoteModel.FK_MACHINES_EVENTS_EVENTS"> <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> <End Role="MACHINES_EVENTS" EntitySet="MACHINES_EVENTS" /> @@ -3010,18 +2848,6 @@ <Property Name="TABLE_NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" /> <Property Name="SYNC_TYPE" Type="Int32" Nullable="false" /> </EntityType> - <EntityType Name="ACTION_TYPES"> - <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="CODE" Type="Int32" Nullable="false" /> - <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> - <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" /> - <NavigationProperty Name="EVENT_TYPES_ACTIONS" Relationship="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" FromRole="ACTION_TYPES" ToRole="EVENT_TYPES_ACTIONS" /> - </EntityType> <EntityType Name="ADDRESS"> <Key> <PropertyRef Name="GUID" /> @@ -3274,7 +3100,11 @@ <Property Name="SERIAL_NUMBER" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="DISPENSER_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="NL_PER_PULSE" Type="Double" Nullable="false" /> - <Property Name="DATA" Type="Binary" MaxLength="Max" FixedLength="false" /> + <Property Name="PART_NUMBER" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> + <Property Name="PCB_SERIAL" Type="String" MaxLength="100" FixedLength="false" Unicode="false" /> + <Property Name="PCB_VERSION" Type="String" MaxLength="30" FixedLength="false" Unicode="false" /> + <Property Name="PRODUCTION_DATE" Type="DateTime" Precision="3" /> + <Property Name="CALIBRATION_DATA" Type="Binary" MaxLength="Max" FixedLength="false" /> <NavigationProperty Name="DISPENSER_TYPES" Relationship="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES" FromRole="DISPENSER" ToRole="DISPENSER_TYPES" /> <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_IDS_PACKS_DISPENSERS" FromRole="DISPENSER" ToRole="IDS_PACKS" /> </EntityType> @@ -3297,55 +3127,18 @@ <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="CODE" Type="Int32" Nullable="false" /> - <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> - <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" /> - <Property Name="EVENT_TYPES_CATEGORY_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="EVENT_TYPES_GROUP_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" /> + <Property Name="TITLE" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" /> + <Property Name="DESCRIPTION" Type="String" MaxLength="200" FixedLength="false" Unicode="true" /> + <Property Name="TECHNICAL_DESCRIPTION" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" /> + <Property Name="COMPONENT_INDEX" Type="Int32" Nullable="false" /> + <Property Name="EVENT_CATEGORY" Type="Int32" Nullable="false" /> + <Property Name="EVENT_GROUP" Type="Int32" Nullable="false" /> + <Property Name="EVENT_NOTIFICATION_TIME" Type="Int32" Nullable="false" /> + <Property Name="EVENT_ACTIONS" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="REQUIRES_USER_INTERVENTION" Type="Boolean" Nullable="false" /> - <Property Name="HTML_PAGE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="RESOLVABLE" Type="Boolean" Nullable="false" /> - <NavigationProperty Name="EVENT_TYPES_GROUPS" Relationship="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES" FromRole="EVENT_TYPES" ToRole="EVENT_TYPES_GROUPS" /> - <NavigationProperty Name="EVENT_TYPES_CATEGORIES" Relationship="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES1" FromRole="EVENT_TYPES" ToRole="EVENT_TYPES_CATEGORIES" /> - <NavigationProperty Name="HTML_PAGES" Relationship="RemoteModel.FK_EVENT_TYPES_HTML_PAGES" FromRole="EVENT_TYPES" ToRole="HTML_PAGES" /> - <NavigationProperty Name="EVENT_TYPES_ACTIONS" Relationship="RemoteModel.FK_EVENTS_ACTIONS_EVENTS" FromRole="EVENT_TYPES" ToRole="EVENT_TYPES_ACTIONS" /> <NavigationProperty Name="MACHINES_EVENTS" Relationship="RemoteModel.FK_MACHINES_EVENTS_EVENTS" FromRole="EVENT_TYPES" ToRole="MACHINES_EVENTS" /> </EntityType> - <EntityType Name="EVENT_TYPES_ACTIONS"> - <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="EVENT_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="ACTION_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <NavigationProperty Name="ACTION_TYPES" Relationship="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" FromRole="EVENT_TYPES_ACTIONS" ToRole="ACTION_TYPES" /> - <NavigationProperty Name="EVENT_TYPES" Relationship="RemoteModel.FK_EVENTS_ACTIONS_EVENTS" FromRole="EVENT_TYPES_ACTIONS" ToRole="EVENT_TYPES" /> - </EntityType> - <EntityType Name="EVENT_TYPES_CATEGORIES"> - <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="CODE" Type="Int32" Nullable="false" /> - <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> - <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" /> - <NavigationProperty Name="EVENT_TYPES" Relationship="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES1" FromRole="EVENT_TYPES_CATEGORIES" ToRole="EVENT_TYPES" /> - </EntityType> - <EntityType Name="EVENT_TYPES_GROUPS"> - <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="CODE" Type="Int32" Nullable="false" /> - <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> - <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" /> - <NavigationProperty Name="EVENT_TYPES" Relationship="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES" FromRole="EVENT_TYPES_GROUPS" ToRole="EVENT_TYPES" /> - </EntityType> <EntityType Name="FIBER_SHAPES"> <Key> <PropertyRef Name="GUID" /> @@ -3623,19 +3416,6 @@ <NavigationProperty Name="HARDWARE_VERSIONS" Relationship="RemoteModel.FK_HARDWARE_WINDERS_HARDWARE_VERSIONS" FromRole="HARDWARE_WINDERS" ToRole="HARDWARE_VERSIONS" /> <NavigationProperty Name="HARDWARE_WINDER_TYPES" Relationship="RemoteModel.FK_HARDWARE_WINDERS_HARDWARE_WINDER_TYPES" FromRole="HARDWARE_WINDERS" ToRole="HARDWARE_WINDER_TYPES" /> </EntityType> - <EntityType Name="HTML_PAGES"> - <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="CODE" Type="Int32" Nullable="false" /> - <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" /> - <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" /> - <Property Name="HTML" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" /> - <NavigationProperty Name="EVENT_TYPES" Relationship="RemoteModel.FK_EVENT_TYPES_HTML_PAGES" FromRole="HTML_PAGES" ToRole="EVENT_TYPES" /> - </EntityType> <EntityType Name="IDS_PACK_FORMULAS"> <Key> <PropertyRef Name="GUID" /> @@ -4265,20 +4045,6 @@ <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" /> <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_WINDING_METHODS" FromRole="WINDING_METHODS" ToRole="JOB" /> </EntityType> - <Association Name="FK_EVENTS_ACTIONS_ACTIONS"> - <End Type="RemoteModel.ACTION_TYPES" Role="ACTION_TYPES" Multiplicity="1"> - <OnDelete Action="Cascade" /> - </End> - <End Type="RemoteModel.EVENT_TYPES_ACTIONS" Role="EVENT_TYPES_ACTIONS" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="ACTION_TYPES"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="EVENT_TYPES_ACTIONS"> - <PropertyRef Name="ACTION_TYPE_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> <Association Name="FK_ORGANIZATIONS_ADDRESSES"> <End Type="RemoteModel.ADDRESS" Role="ADDRESS" Multiplicity="1"> <OnDelete Action="Cascade" /> @@ -4615,56 +4381,6 @@ </Dependent> </ReferentialConstraint> </Association> - <Association Name="FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES"> - <End Type="RemoteModel.EVENT_TYPES_GROUPS" Role="EVENT_TYPES_GROUPS" Multiplicity="1" /> - <End Type="RemoteModel.EVENT_TYPES" Role="EVENT_TYPES" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="EVENT_TYPES_GROUPS"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="EVENT_TYPES"> - <PropertyRef Name="EVENT_TYPES_GROUP_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES1"> - <End Type="RemoteModel.EVENT_TYPES_CATEGORIES" Role="EVENT_TYPES_CATEGORIES" Multiplicity="1" /> - <End Type="RemoteModel.EVENT_TYPES" Role="EVENT_TYPES" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="EVENT_TYPES_CATEGORIES"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="EVENT_TYPES"> - <PropertyRef Name="EVENT_TYPES_CATEGORY_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_EVENT_TYPES_HTML_PAGES"> - <End Type="RemoteModel.HTML_PAGES" Role="HTML_PAGES" Multiplicity="0..1" /> - <End Type="RemoteModel.EVENT_TYPES" Role="EVENT_TYPES" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="HTML_PAGES"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="EVENT_TYPES"> - <PropertyRef Name="HTML_PAGE_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> - <Association Name="FK_EVENTS_ACTIONS_EVENTS"> - <End Type="RemoteModel.EVENT_TYPES" Role="EVENT_TYPES" Multiplicity="1"> - <OnDelete Action="Cascade" /> - </End> - <End Type="RemoteModel.EVENT_TYPES_ACTIONS" Role="EVENT_TYPES_ACTIONS" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="EVENT_TYPES"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="EVENT_TYPES_ACTIONS"> - <PropertyRef Name="EVENT_TYPE_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> <Association Name="FK_MACHINES_EVENTS_EVENTS"> <End Type="RemoteModel.EVENT_TYPES" Role="EVENT_TYPES" Multiplicity="1"> <OnDelete Action="Cascade" /> @@ -5354,18 +5070,6 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="ACTION_TYPES"> - <EntityTypeMapping TypeName="RemoteModel.ACTION_TYPES"> - <MappingFragment StoreEntitySet="ACTION_TYPES"> - <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> - <ScalarProperty Name="NAME" ColumnName="NAME" /> - <ScalarProperty Name="CODE" ColumnName="CODE" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> <EntitySetMapping Name="ADDRESSES"> <EntityTypeMapping TypeName="RemoteModel.ADDRESS"> <MappingFragment StoreEntitySet="ADDRESSES"> @@ -5594,7 +5298,11 @@ <EntitySetMapping Name="DISPENSERS"> <EntityTypeMapping TypeName="RemoteModel.DISPENSER"> <MappingFragment StoreEntitySet="DISPENSERS"> - <ScalarProperty Name="DATA" ColumnName="DATA" /> + <ScalarProperty Name="CALIBRATION_DATA" ColumnName="CALIBRATION_DATA" /> + <ScalarProperty Name="PRODUCTION_DATE" ColumnName="PRODUCTION_DATE" /> + <ScalarProperty Name="PCB_VERSION" ColumnName="PCB_VERSION" /> + <ScalarProperty Name="PCB_SERIAL" ColumnName="PCB_SERIAL" /> + <ScalarProperty Name="PART_NUMBER" ColumnName="PART_NUMBER" /> <ScalarProperty Name="NL_PER_PULSE" ColumnName="NL_PER_PULSE" /> <ScalarProperty Name="DISPENSER_TYPE_GUID" ColumnName="DISPENSER_TYPE_GUID" /> <ScalarProperty Name="SERIAL_NUMBER" ColumnName="SERIAL_NUMBER" /> @@ -5618,47 +5326,15 @@ <EntitySetMapping Name="EVENT_TYPES"> <EntityTypeMapping TypeName="RemoteModel.EVENT_TYPES"> <MappingFragment StoreEntitySet="EVENT_TYPES"> - <ScalarProperty Name="RESOLVABLE" ColumnName="RESOLVABLE" /> - <ScalarProperty Name="HTML_PAGE_GUID" ColumnName="HTML_PAGE_GUID" /> <ScalarProperty Name="REQUIRES_USER_INTERVENTION" ColumnName="REQUIRES_USER_INTERVENTION" /> - <ScalarProperty Name="EVENT_TYPES_GROUP_GUID" ColumnName="EVENT_TYPES_GROUP_GUID" /> - <ScalarProperty Name="EVENT_TYPES_CATEGORY_GUID" ColumnName="EVENT_TYPES_CATEGORY_GUID" /> - <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> - <ScalarProperty Name="NAME" ColumnName="NAME" /> - <ScalarProperty Name="CODE" ColumnName="CODE" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> - <EntitySetMapping Name="EVENT_TYPES_ACTIONS"> - <EntityTypeMapping TypeName="RemoteModel.EVENT_TYPES_ACTIONS"> - <MappingFragment StoreEntitySet="EVENT_TYPES_ACTIONS"> - <ScalarProperty Name="ACTION_TYPE_GUID" ColumnName="ACTION_TYPE_GUID" /> - <ScalarProperty Name="EVENT_TYPE_GUID" ColumnName="EVENT_TYPE_GUID" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> - <EntitySetMapping Name="EVENT_TYPES_CATEGORIES"> - <EntityTypeMapping TypeName="RemoteModel.EVENT_TYPES_CATEGORIES"> - <MappingFragment StoreEntitySet="EVENT_TYPES_CATEGORIES"> - <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> - <ScalarProperty Name="NAME" ColumnName="NAME" /> - <ScalarProperty Name="CODE" ColumnName="CODE" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> - <EntitySetMapping Name="EVENT_TYPES_GROUPS"> - <EntityTypeMapping TypeName="RemoteModel.EVENT_TYPES_GROUPS"> - <MappingFragment StoreEntitySet="EVENT_TYPES_GROUPS"> + <ScalarProperty Name="EVENT_ACTIONS" ColumnName="EVENT_ACTIONS" /> + <ScalarProperty Name="EVENT_NOTIFICATION_TIME" ColumnName="EVENT_NOTIFICATION_TIME" /> + <ScalarProperty Name="EVENT_GROUP" ColumnName="EVENT_GROUP" /> + <ScalarProperty Name="EVENT_CATEGORY" ColumnName="EVENT_CATEGORY" /> + <ScalarProperty Name="COMPONENT_INDEX" ColumnName="COMPONENT_INDEX" /> + <ScalarProperty Name="TECHNICAL_DESCRIPTION" ColumnName="TECHNICAL_DESCRIPTION" /> <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> + <ScalarProperty Name="TITLE" ColumnName="TITLE" /> <ScalarProperty Name="NAME" ColumnName="NAME" /> <ScalarProperty Name="CODE" ColumnName="CODE" /> <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> @@ -5930,19 +5606,6 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="HTML_PAGES"> - <EntityTypeMapping TypeName="RemoteModel.HTML_PAGES"> - <MappingFragment StoreEntitySet="HTML_PAGES"> - <ScalarProperty Name="HTML" ColumnName="HTML" /> - <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> - <ScalarProperty Name="NAME" ColumnName="NAME" /> - <ScalarProperty Name="CODE" ColumnName="CODE" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> <EntitySetMapping Name="IDS_PACK_FORMULAS"> <EntityTypeMapping TypeName="RemoteModel.IDS_PACK_FORMULAS"> <MappingFragment StoreEntitySet="IDS_PACK_FORMULAS"> 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 68bdf4f21..7c45c1dda 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,83 +5,77 @@ <!-- Diagram content (shape and connector positions) --> <edmx:Diagrams> <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1"> - <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="11.25" PointY="12" /> - <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="61.125" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="52.375" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="45.125" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="42.25" /> - <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="12.75" PointY="28.75" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="13" PointY="15.625" /> - <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="10.5" PointY="27" /> - <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="19.125" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="10.5" PointY="35.625" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6" PointY="34.75" /> - <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="45" /> - <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="57" /> - <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="6" PointY="59.625" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="10.75" PointY="1.25" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="13" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="39.25" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="11.25" PointY="7.125" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="13.5" PointY="8" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="9" PointY="7.875" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="9" PointY="4.875" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="29.75" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="23.125" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="0.75" PointY="69.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3" PointY="50.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="63.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="9" PointY="45.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.75" PointY="41.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12" PointY="43.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="10.75" PointY="57.5" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="13" PointY="49.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="7.75" PointY="67.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="10" PointY="49.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.75" PointY="73.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="4" PointY="55.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="48.125" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="0.75" PointY="65.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3" PointY="41.5" /> - <EntityTypeShape EntityType="RemoteModel.HTML_PAGES" Width="1.5" PointX="9" PointY="11" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="13" PointY="19.375" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="15.25" PointY="29.625" /> - <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="10.5" PointY="19" /> - <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="8.25" PointY="19.5" /> - <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="15.625" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="9" PointY="14.75" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="11.25" PointY="22.875" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="8.25" PointY="37.5" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3" PointY="12" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="5.25" PointY="23.375" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="13.5" PointY="24.5" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="26.5" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="35.625" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="18.5" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="32.75" /> - <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="13" PointY="38.25" /> - <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="59.25" /> - <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="65.875" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="49.375" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51" /> - <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="20" /> - <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="61.75" /> - <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="61.875" /> - <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="10.5" PointY="31.625" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="15.875" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="7.5" PointY="30.625" /> - <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="2.75" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="15.25" PointY="20.125" /> - <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="2.75" PointY="2.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="4.75" PointY="2.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="0.75" PointY="6.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="2.75" PointY="6.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="4.75" PointY="5.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="5.75" PointY="10.75" /> - <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="6" PointY="38.75" /> - <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="41.75" /> - <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="6" PointY="45.375" /> - <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" /> + <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="0.75" PointY="53.875" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="46.375" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="13.25" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="16.5" /> + <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="13" PointY="28.125" /> + <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="13.25" PointY="41.125" /> + <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="10.5" PointY="22.75" /> + <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="49.375" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="10.75" PointY="39" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="3" PointY="19.75" /> + <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="8.375" /> + <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="0.75" PointY="49.875" /> + <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="5.25" PointY="36.25" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="11" PointY="45.625" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="13.25" PointY="45" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="43.375" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="11.25" PointY="17.375" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="33.875" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="27.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="3.75" PointY="58.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6" PointY="4.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="3.75" PointY="62.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6" PointY="8.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="6.75" PointY="43.125" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="5.75" PointY="14.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="8" PointY="14.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="6.75" PointY="60.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9" PointY="6.875" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="0.75" PointY="61.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3" PointY="13.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="8.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="0.75" PointY="58.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3" PointY="4.625" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="13.25" PointY="13.625" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="15.5" PointY="28" /> + <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="9.75" PointY="34.625" /> + <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="7.5" PointY="23.5" /> + <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="30.875" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="8.25" PointY="38.75" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="10.25" PointY="26.875" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="7.5" PointY="34.75" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3" PointY="43.25" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="5.25" PointY="24.375" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="13.5" PointY="23.625" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="19.75" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="39.75" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="23" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="36.75" /> + <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="13.25" PointY="38" /> + <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3" PointY="52" /> + <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="8.25" PointY="64" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="53.375" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="55.125" /> + <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="24.125" /> + <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="8.25" PointY="46.875" /> + <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="10.5" PointY="49" /> + <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="9.75" PointY="31.125" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="39.125" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="13.5" PointY="19.75" /> + <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="11.75" PointY="6.75" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="15.5" PointY="33.875" /> + <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="11.75" PointY="9.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="13.75" PointY="6.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="13.75" PointY="9.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="6.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="15.75" PointY="11.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="15.75" PointY="16.75" /> + <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="5.25" PointY="18.875" /> + <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="10.5" PointY="13.875" /> + <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="5.25" PointY="33.125" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" /> @@ -108,10 +102,6 @@ <AssociationConnector Association="RemoteModel.FK_JOBS_CUSTOMERS" /> <AssociationConnector Association="RemoteModel.FK_DISPENSERS_DISPENSER_TYPES" /> <AssociationConnector Association="RemoteModel.FK_IDS_PACKS_DISPENSERS" /> - <AssociationConnector Association="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES" /> - <AssociationConnector Association="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES1" /> - <AssociationConnector Association="RemoteModel.FK_EVENT_TYPES_HTML_PAGES" /> - <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_EVENTS" /> <AssociationConnector Association="RemoteModel.FK_MACHINES_EVENTS_EVENTS" /> <AssociationConnector Association="RemoteModel.FK_RML_FIBER_SHAPES" /> <AssociationConnector Association="RemoteModel.FK_RML_FIBER_SYNTHESIS" /> 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 d958046d0..6938b6eca 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -66,9 +66,6 @@ <Compile Include="..\Versioning\GlobalVersionInfo.cs"> <Link>GlobalVersionInfo.cs</Link> </Compile> - <Compile Include="DB\ACTION_TYPES.cs"> - <DependentUpon>RemoteADO.tt</DependentUpon> - </Compile> <Compile Include="DB\ADDRESS.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> @@ -120,15 +117,6 @@ <Compile Include="DB\EVENT_TYPES.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> - <Compile Include="DB\EVENT_TYPES_ACTIONS.cs"> - <DependentUpon>RemoteADO.tt</DependentUpon> - </Compile> - <Compile Include="DB\EVENT_TYPES_CATEGORIES.cs"> - <DependentUpon>RemoteADO.tt</DependentUpon> - </Compile> - <Compile Include="DB\EVENT_TYPES_GROUPS.cs"> - <DependentUpon>RemoteADO.tt</DependentUpon> - </Compile> <Compile Include="DB\FIBER_SHAPES.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> @@ -180,9 +168,6 @@ <Compile Include="DB\HARDWARE_WINDER_TYPES.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> - <Compile Include="DB\HTML_PAGES.cs"> - <DependentUpon>RemoteADO.tt</DependentUpon> - </Compile> <Compile Include="DB\IDS_PACKS.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> @@ -362,7 +347,7 @@ </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs index cafee9719..11f7d7c09 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs @@ -22,99 +22,163 @@ namespace Tango.PMR.Diagnostics { static EventTypeReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cg9FdmVudFR5cGUucHJvdG8SFVRhbmdvLlBNUi5EaWFnbm9zdGljcyrbHwoJ", - "RXZlbnRUeXBlEggKBE5vbmUQABIPCgtUaHJlYWRCcmVhaxABEh8KG1RocmVh", - "ZFRlbnNpb25Db250cm9sRmFpbHVyZRACEhoKFkZlZWRlckNvbmVJbnN1ZmZp", - "Y2lhbnQQAxIWChJXaW5kZXJHZW5lcmFsRXJyb3IQBBIXChNXaW5kZXJDb25l", - "Tm90RXhpc3RzEAUSHQoZVGhyZWFkRmVlZGluZ0dlbmVyYWxFcnJvchAGEh4K", - "GkR5ZWluZ0hlYWQxT3ZlclRlbXBlcmF0dXJlEAcSHgoaRHllaW5nSGVhZDJP", - "dmVyVGVtcGVyYXR1cmUQCBIeChpEeWVpbmdIZWFkM092ZXJUZW1wZXJhdHVy", - "ZRAJEh4KGkR5ZWluZ0hlYWQ0T3ZlclRlbXBlcmF0dXJlEAoSHgoaRHllaW5n", - "SGVhZDVPdmVyVGVtcGVyYXR1cmUQCxIeChpEeWVpbmdIZWFkNk92ZXJUZW1w", - "ZXJhdHVyZRAMEhsKF0R5ZWluZ0hlYWRUaGVybWFsQ3V0b2ZmEA0SGAoURHJ5", - "ZXJPdmVyVGVtcGVyYXR1cmUQDhIWChJEcnllclRoZXJtYWxDdXRvZmYQDxIm", - "CiJEeWVpbmdIZWFkSGVhdGVyc0N1cnJlbnRPdXRPZlJhbmdlEBASIQodRHJ5", - "ZXJIZWF0ZXJzQ3VycmVudE91dE9mUmFuZ2UQERIXChNEcnllckRIZWFkQ292", - "ZXJPcGVuEBISFAoQQWlyRmlsdGVyQ2xvZ2dlZBATEhkKFUFpckZpbHRlck5v", - "dEluc3RhbGxlZBAUEg4KCldIU0ZhaWx1cmUQFRIeChpXYXN0ZUNvbnRhaW5l", - "cklzQWxtb3N0RnVsbBAWEhgKFFdhc3RlQ29udGFpbmVySXNGdWxsEBcSEwoP", - "RGlzcGVuc2VyMUVtcHR5EBgSEwoPRGlzcGVuc2VyMkVtcHR5EBkSEwoPRGlz", - "cGVuc2VyM0VtcHR5EBoSEwoPRGlzcGVuc2VyNEVtcHR5EBsSEwoPRGlzcGVu", - "c2VyNUVtcHR5EBwSEwoPRGlzcGVuc2VyNkVtcHR5EB0SEwoPRGlzcGVuc2Vy", - "N0VtcHR5EB4SEwoPRGlzcGVuc2VyOEVtcHR5EB8SFgoSRGlzcGVuc2VyMUxv", - "d0xldmVsECASFgoSRGlzcGVuc2VyMkxvd0xldmVsECESFgoSRGlzcGVuc2Vy", - "M0xvd0xldmVsECISFgoSRGlzcGVuc2VyNExvd0xldmVsECMSFgoSRGlzcGVu", - "c2VyNUxvd0xldmVsECQSFgoSRGlzcGVuc2VyNkxvd0xldmVsECUSFgoSRGlz", - "cGVuc2VyN0xvd0xldmVsECYSFgoSRGlzcGVuc2VyOExvd0xldmVsECcSGwoX", - "RGlzcGVuc2VyMVJlZmlsbEZhaWx1cmUQKBIbChdEaXNwZW5zZXIyUmVmaWxs", - "RmFpbHVyZRApEhsKF0Rpc3BlbnNlcjNSZWZpbGxGYWlsdXJlECoSGwoXRGlz", - "cGVuc2VyNFJlZmlsbEZhaWx1cmUQKxIbChdEaXNwZW5zZXI1UmVmaWxsRmFp", - "bHVyZRAsEhsKF0Rpc3BlbnNlcjZSZWZpbGxGYWlsdXJlEC0SGwoXRGlzcGVu", - "c2VyN1JlZmlsbEZhaWx1cmUQLhIbChdEaXNwZW5zZXI4UmVmaWxsRmFpbHVy", - "ZRAvEhYKEkRpc3BlbnNlcjFQcmVzc3VyZRAwEhYKEkRpc3BlbnNlcjJQcmVz", - "c3VyZRAxEhYKEkRpc3BlbnNlcjNQcmVzc3VyZRAyEhYKEkRpc3BlbnNlcjRQ", - "cmVzc3VyZRAzEhYKEkRpc3BlbnNlcjVQcmVzc3VyZRA0EhYKEkRpc3BlbnNl", - "cjZQcmVzc3VyZRA1EhYKEkRpc3BlbnNlcjdQcmVzc3VyZRA2EhYKEkRpc3Bl", - "bnNlcjhQcmVzc3VyZRA3EhEKDU1pZFRhbmsxRW1wdHkQOBIRCg1NaWRUYW5r", - "MkVtcHR5EDkSEQoNTWlkVGFuazNFbXB0eRA6EhEKDU1pZFRhbms0RW1wdHkQ", - "OxIRCg1NaWRUYW5rNUVtcHR5EDwSEQoNTWlkVGFuazZFbXB0eRA9EhEKDU1p", - "ZFRhbms3RW1wdHkQPhIRCg1NaWRUYW5rOEVtcHR5ED8SFAoQTWlkVGFuazFM", - "b3dsZXZlbBBAEhQKEE1pZFRhbmsyTG93bGV2ZWwQQRIUChBNaWRUYW5rM0xv", - "d2xldmVsEEISFAoQTWlkVGFuazRMb3dsZXZlbBBDEhQKEE1pZFRhbms1TG93", - "bGV2ZWwQRBIUChBNaWRUYW5rNkxvd2xldmVsEEUSFAoQTWlkVGFuazdMb3ds", - "ZXZlbBBGEhQKEE1pZFRhbms4TG93bGV2ZWwQRxIWChJNaWRUYW5rMU5vdElu", - "UGxhY2UQSBIWChJNaWRUYW5rMk5vdEluUGxhY2UQSRIWChJNaWRUYW5rM05v", - "dEluUGxhY2UQShIWChJNaWRUYW5rNE5vdEluUGxhY2UQSxIWChJNaWRUYW5r", - "NU5vdEluUGxhY2UQTBIWChJNaWRUYW5rNk5vdEluUGxhY2UQTRIWChJNaWRU", - "YW5rN05vdEluUGxhY2UQThIWChJNaWRUYW5rOE5vdEluUGxhY2UQTxIRCg1T", - "eXN0ZW1CSVRGYWlsEFASIgoeR2VuZXJhbEludGVybmFsT3ZlclRlbXBlcmF0", - "dXJlEFESFAoQTWFjaGluZUNvdmVyT3BlbhBSEh4KGkVtZXJnZW5jeVB1c2hC", - "dXR0b25QcmVzc2VkEFMSFgoSU3lzdGVtR2VuZXJhbEVycm9yEFQSGQoVTW90", - "b3JEcnllck92ZXJDdXJyZW50EF0SGgoWTW90b3JGZWVkZXJPdmVyQ3VycmVu", - "dBBeEhsKF01vdG9yUkxvYWRlck92ZXJDdXJyZW50EF8SGgoWTW90b3JQb29s", - "ZXJPdmVyQ3VycmVudBBgEhsKF01vdG9yTExvYWRlck92ZXJDdXJyZW50EGES", - "GgoWTW90b3JXaW5kZXJPdmVyQ3VycmVudBBiEhkKFU1vdG9yU2NyZXdPdmVy", - "Q3VycmVudBBjEh4KGk1vdG9yTG9hZGluZ0FybU92ZXJDdXJyZW50EGQSHgoa", - "TW90b3JEaXNwZW5zZXIxT3ZlckN1cnJlbnQQZRIeChpNb3RvckRpc3BlbnNl", - "cjJPdmVyQ3VycmVudBBmEh4KGk1vdG9yRGlzcGVuc2VyM092ZXJDdXJyZW50", - "EGcSHgoaTW90b3JEaXNwZW5zZXI0T3ZlckN1cnJlbnQQaBIeChpNb3RvckRp", - "c3BlbnNlcjVPdmVyQ3VycmVudBBpEh4KGk1vdG9yRGlzcGVuc2VyNk92ZXJD", - "dXJyZW50EGoSHgoaTW90b3JEaXNwZW5zZXI3T3ZlckN1cnJlbnQQaxIeChpN", - "b3RvckRpc3BlbnNlcjhPdmVyQ3VycmVudBBsEh0KGU1vdG9yRHJ5ZXJPdmVy", - "VGVtcGVyYXR1cmUQbRIeChpNb3RvckZlZWRlck92ZXJUZW1wZXJhdHVyZRBu", - "Eh8KG01vdG9yUkxvYWRlck92ZXJUZW1wZXJhdHVyZRBvEh4KGk1vdG9yUG9v", - "bGVyT3ZlclRlbXBlcmF0dXJlEHASHwobTW90b3JMTG9hZGVyT3ZlclRlbXBl", - "cmF0dXJlEHESHgoaTW90b3JXaW5kZXJPdmVyVGVtcGVyYXR1cmUQchIdChlN", - "b3RvclNjcmV3T3ZlclRlbXBlcmF0dXJlEHMSIgoeTW90b3JMb2FkaW5nQXJt", - "T3ZlclRlbXBlcmF0dXJlEHQSIgoeTW90b3JEaXNwZW5zZXIxT3ZlclRlbXBl", - "cmF0dXJlEHUSIgoeTW90b3JEaXNwZW5zZXIyT3ZlclRlbXBlcmF0dXJlEHYS", - "IgoeTW90b3JEaXNwZW5zZXIzT3ZlclRlbXBlcmF0dXJlEHcSIgoeTW90b3JE", - "aXNwZW5zZXI0T3ZlclRlbXBlcmF0dXJlEHgSIgoeTW90b3JEaXNwZW5zZXI1", - "T3ZlclRlbXBlcmF0dXJlEHkSIgoeTW90b3JEaXNwZW5zZXI2T3ZlclRlbXBl", - "cmF0dXJlEHoSIgoeTW90b3JEaXNwZW5zZXI3T3ZlclRlbXBlcmF0dXJlEHsS", - "IgoeTW90b3JEaXNwZW5zZXI4T3ZlclRlbXBlcmF0dXJlEHwSEwoPTW90b3JE", - "cnllclN0YWxsEH0SFAoQTW90b3JGZWVkZXJTdGFsbBB+EhUKEU1vdG9yUkxv", - "YWRlclN0YWxsEH8SFQoQTW90b3JQb29sZXJTdGFsbBCAARIWChFNb3RvckxM", - "b2FkZXJTdGFsbBCBARIVChBNb3RvcldpbmRlclN0YWxsEIIBEhQKD01vdG9y", - "U2NyZXdTdGFsbBCDARIZChRNb3RvckxvYWRpbmdBcm1TdGFsbBCEARIZChRN", - "b3RvckRpc3BlbnNlcjFTdGFsbBCFARIZChRNb3RvckRpc3BlbnNlcjJTdGFs", - "bBCGARIZChRNb3RvckRpc3BlbnNlcjNTdGFsbBCHARIZChRNb3RvckRpc3Bl", - "bnNlcjRTdGFsbBCIARIZChRNb3RvckRpc3BlbnNlcjVTdGFsbBCJARIZChRN", - "b3RvckRpc3BlbnNlcjZTdGFsbBCKARIZChRNb3RvckRpc3BlbnNlcjdTdGFs", - "bBCLARIZChRNb3RvckRpc3BlbnNlcjhTdGFsbBCMARIbChZNb3RvckRyeWVy", - "VW5kZXJWb2x0YWdlEI0BEhwKF01vdG9yRmVlZGVyVW5kZXJWb2x0YWdlEI4B", - "Eh0KGE1vdG9yUkxvYWRlclVuZGVyVm9sdGFnZRCPARIcChdNb3RvclBvb2xl", - "clVuZGVyVm9sdGFnZRCQARIdChhNb3RvckxMb2FkZXJVbmRlclZvbHRhZ2UQ", - "kQESHAoXTW90b3JXaW5kZXJVbmRlclZvbHRhZ2UQkgESGwoWTW90b3JTY3Jl", - "d1VuZGVyVm9sdGFnZRCTARIgChtNb3RvckxvYWRpbmdBcm1VbmRlclZvbHRh", - "Z2UQlAESIAobTW90b3JEaXNwZW5zZXIxVW5kZXJWb2x0YWdlEJUBEiAKG01v", - "dG9yRGlzcGVuc2VyMlVuZGVyVm9sdGFnZRCWARIgChtNb3RvckRpc3BlbnNl", - "cjNVbmRlclZvbHRhZ2UQlwESIAobTW90b3JEaXNwZW5zZXI0VW5kZXJWb2x0", - "YWdlEJgBEiAKG01vdG9yRGlzcGVuc2VyNVVuZGVyVm9sdGFnZRCZARIgChtN", - "b3RvckRpc3BlbnNlcjZVbmRlclZvbHRhZ2UQmgESIAobTW90b3JEaXNwZW5z", - "ZXI3VW5kZXJWb2x0YWdlEJsBEiAKG01vdG9yRGlzcGVuc2VyOFVuZGVyVm9s", - "dGFnZRCcAUIhCh9jb20udHdpbmUudGFuZ28ucG1yLmRpYWdub3N0aWNzYgZw", - "cm90bzM=")); + "Cg9FdmVudFR5cGUucHJvdG8SFVRhbmdvLlBNUi5EaWFnbm9zdGljcyq5NgoJ", + "RXZlbnRUeXBlEggKBE5vbmUQABIYChRQT1dFUl9VUF9CSVRfRkFJTFVSRRAB", + "EiEKHUVNRVJHRU5DWV9QVVNIX0JVVFRPTl9QUkVTU0VEEAISFgoSRlJPTlRf", + "Q09WRVJfMV9PUEVOEAMSFgoSRlJPTlRfQ09WRVJfMl9PUEVOEAQSFgoSRlJP", + "TlRfQ09WRVJfM19PUEVOEAUSFgoSRlJPTlRfQ09WRVJfNF9PUEVOEAYSGQoV", + "Q0FSVFJJREdFU19DT1ZFUl9PUEVOEAcSEwoPUkVBUl9DT1ZFUl9PUEVOEAgS", + "JAogTUFDSElORV9JTlRFUk5BTF9PVkVSVEVNUEVSQVRVUkUQCRIcChhNQUNI", + "SU5FX0ZBTlNfUlBNX1RPT19MT1cQChIYChRNQUNISU5FX0ZBTlNfU1RPUFBF", + "RBALEhAKDFRIUkVBRF9CUkVBSxAMEiIKHlRIUkVBRF9URU5TSU9OX0NPTlRS", + "T0xfRkFJTFVSRRANEh4KGldJTkRFUl9DT05FX0RPRVNfTk9UX0VYSVNUEA4S", + "HAoYRkVFREVSX01PVE9SX09WRVJDVVJSRU5UEA8SIgoeUklHSFRfTE9BREVS", + "X01PVE9SX09WRVJDVVJSRU5UEBASHAoYUFVMTEVSX01PVE9SX09WRVJDVVJS", + "RU5UEBESIQodTEVGVF9MT0FERVJfTU9UT1JfT1ZFUkNVUlJFTlQQEhIcChhX", + "SU5ERVJfTU9UT1JfT1ZFUkNVUlJFTlQQExIbChdTQ1JFV19NT1RPUl9PVkVS", + "Q1VSUkVOVBAUEiEKHUxPQURJTkdfQVJNX01PVE9SX09WRVJDVVJSRU5UEBUS", + "IAocRkVFREVSX01PVE9SX09WRVJURU1QRVJBVFVSRRAWEiYKIlJJR0hUX0xP", + "QURFUl9NT1RPUl9PVkVSVEVNUEVSQVRVUkUQFxIgChxQVUxMRVJfTU9UT1Jf", + "T1ZFUlRFTVBFUkFUVVJFEBgSJQohTEVGVF9MT0FERVJfTU9UT1JfT1ZFUlRF", + "TVBFUkFUVVJFEBkSIAocV0lOREVSX01PVE9SX09WRVJURU1QRVJBVFVSRRAa", + "Eh8KG1NDUkVXX01PVE9SX09WRVJURU1QRVJBVFVSRRAbEiUKIUxPQURJTkdf", + "QVJNX01PVE9SX09WRVJURU1QRVJBVFVSRRAcEhYKEkZFRURFUl9NT1RPUl9T", + "VEFMTBAdEhwKGFJJR0hUX0xPQURFUl9NT1RPUl9TVEFMTBAeEhYKElBVTExF", + "Ul9NT1RPUl9TVEFMTBAfEhsKF0xFRlRfTE9BREVSX01PVE9SX1NUQUxMECAS", + "FgoSV0lOREVSX01PVE9SX1NUQUxMECESFQoRU0NSRVdfTU9UT1JfU1RBTEwQ", + "IhIbChdMT0FESU5HX0FSTV9NT1RPUl9TVEFMTBAjEh0KGUZFRURFUl9NT1RP", + "Ul9VTkRFUlZPTFRBR0UQJBIjCh9SSUdIVF9MT0FERVJfTU9UT1JfVU5ERVJW", + "T0xUQUdFECUSHQoZUFVMTEVSX01PVE9SX1VOREVSVk9MVEFHRRAmEiIKHkxF", + "RlRfTE9BREVSX01PVE9SX1VOREVSVk9MVEFHRRAnEh0KGVdJTkRFUl9NT1RP", + "Ul9VTkRFUlZPTFRBR0UQKBIcChhTQ1JFV19NT1RPUl9VTkRFUlZPTFRBR0UQ", + "KRIiCh5MT0FESU5HX0FSTV9NT1RPUl9VTkRFUlZPTFRBR0UQKhITCg9MVEZV", + "X1VQX1RJTUVPVVQQKxIVChFMVEZVX0RPV05fVElNRU9VVBAsEhMKD1JURlVf", + "VVBfVElNRU9VVBAtEhUKEVJURlVfRE9XTl9USU1FT1VUEC4SHQoZU0NSRVdf", + "TU9UT1JfTElNSVRfVElNRU9VVBAvEhsKF0RSWUVSX01PVE9SX09WRVJDVVJS", + "RU5UEDASHwobRFJZRVJfTU9UT1JfT1ZFUlRFTVBFUkFUVVJFEDESFQoRRFJZ", + "RVJfTU9UT1JfU1RBTEwQMhIcChhEUllFUl9NT1RPUl9VTkRFUlZPTFRBR0UQ", + "MxITCg9EUllFUl9ET09SX09QRU4QNBIgChxEUllFUl9aT05FXzFfT1ZFUlRF", + "TVBFUkFUVVJFEDUSIAocRFJZRVJfWk9ORV8yX09WRVJURU1QRVJBVFVSRRA2", + "EiMKH0RSWUVSX1pPTkVfMV9VTkRFUlRFTVBFUkFUVVJFX0EQNxIjCh9EUllF", + "Ul9aT05FXzJfVU5ERVJURU1QRVJBVFVSRV9BEDgSIwofRFJZRVJfWk9ORV8x", + "X1VOREVSVEVNUEVSQVRVUkVfQhA5EiMKH0RSWUVSX1pPTkVfMl9VTkRFUlRF", + "TVBFUkFUVVJFX0IQOhIYChREUllFUl9USEVSTUFMX0NVVE9GRhA7Ei0KKURS", + "WUVSX0hFQVRFUlNfWk9ORV8xX0NVUlJFTlRfT1VUX09GX1JBTkdFEDwSLQop", + "RFJZRVJfSEVBVEVSU19aT05FXzJfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQPRIr", + "CidEUllFUl9IRUFURVJTX1pPTkVfMV9DVVJSRU5UX0xPT1BfQlJFQUsQPhIr", + "CidEUllFUl9IRUFURVJTX1pPTkVfMl9DVVJSRU5UX0xPT1BfQlJFQUsQPxIZ", + "ChVEUllFUl9GQU5fUlBNX1RPT19MT1cQQBIVChFEUllFUl9GQU5fU1RPUFBF", + "RBBBEiYKIkRZRUlOR19IRUFEX1pPTkVfMV9PVkVSVEVNUEVSQVRVUkUQQhIm", + "CiJEWUVJTkdfSEVBRF9aT05FXzJfT1ZFUlRFTVBFUkFUVVJFEEMSJgoiRFlF", + "SU5HX0hFQURfWk9ORV8zX09WRVJURU1QRVJBVFVSRRBEEiYKIkRZRUlOR19I", + "RUFEX1pPTkVfNF9PVkVSVEVNUEVSQVRVUkUQRRImCiJEWUVJTkdfSEVBRF9a", + "T05FXzVfT1ZFUlRFTVBFUkFUVVJFEEYSJgoiRFlFSU5HX0hFQURfWk9ORV82", + "X09WRVJURU1QRVJBVFVSRRBHEikKJURZRUlOR19IRUFEX1pPTkVfMV9VTkRF", + "UlRFTVBFUkFUVVJFX0EQSBIpCiVEWUVJTkdfSEVBRF9aT05FXzJfVU5ERVJU", + "RU1QRVJBVFVSRV9BEEkSKQolRFlFSU5HX0hFQURfWk9ORV8zX1VOREVSVEVN", + "UEVSQVRVUkVfQRBKEikKJURZRUlOR19IRUFEX1pPTkVfNF9VTkRFUlRFTVBF", + "UkFUVVJFX0EQSxIpCiVEWUVJTkdfSEVBRF9aT05FXzVfVU5ERVJURU1QRVJB", + "VFVSRV9BEEwSKQolRFlFSU5HX0hFQURfWk9ORV82X1VOREVSVEVNUEVSQVRV", + "UkVfQRBNEikKJURZRUlOR19IRUFEX1pPTkVfMV9VTkRFUlRFTVBFUkFUVVJF", + "X0IQThIpCiVEWUVJTkdfSEVBRF9aT05FXzJfVU5ERVJURU1QRVJBVFVSRV9C", + "EE8SKQolRFlFSU5HX0hFQURfWk9ORV8zX1VOREVSVEVNUEVSQVRVUkVfQhBQ", + "EikKJURZRUlOR19IRUFEX1pPTkVfNF9VTkRFUlRFTVBFUkFUVVJFX0IQURIp", + "CiVEWUVJTkdfSEVBRF9aT05FXzVfVU5ERVJURU1QRVJBVFVSRV9CEFISKQol", + "RFlFSU5HX0hFQURfWk9ORV82X1VOREVSVEVNUEVSQVRVUkVfQhBTEisKJ0RZ", + "RUlOR19IRUFEX1pPTkVfMV9DVVJSRU5UX09VVF9PRl9SQU5HRRBUEisKJ0RZ", + "RUlOR19IRUFEX1pPTkVfMl9DVVJSRU5UX09VVF9PRl9SQU5HRRBVEisKJ0RZ", + "RUlOR19IRUFEX1pPTkVfM19DVVJSRU5UX09VVF9PRl9SQU5HRRBWEisKJ0RZ", + "RUlOR19IRUFEX1pPTkVfNF9DVVJSRU5UX09VVF9PRl9SQU5HRRBXEi0KKURZ", + "RUlOR19IRUFEX1pPTkVfNV82X0NVUlJFTlRfT1VUX09GX1JBTkdFEFgSKQol", + "RFlFSU5HX0hFQURfWk9ORV8xX0NVUlJFTlRfTE9PUF9CUkVBSxBZEikKJURZ", + "RUlOR19IRUFEX1pPTkVfMl9DVVJSRU5UX0xPT1BfQlJFQUsQWhIpCiVEWUVJ", + "TkdfSEVBRF9aT05FXzNfQ1VSUkVOVF9MT09QX0JSRUFLEFsSKQolRFlFSU5H", + "X0hFQURfWk9ORV80X0NVUlJFTlRfTE9PUF9CUkVBSxBcEisKJ0RZRUlOR19I", + "RUFEX1pPTkVfNV82X0NVUlJFTlRfTE9PUF9CUkVBSxBdEh4KGkRZRUlOR19I", + "RUFEX1RIRVJNQUxfQ1VUT0ZGEF4SIgoeRFlFSU5HX0hFQURfQ09WRVJfT1BF", + "Tl9USU1FT1VUEF8SIwofRFlFSU5HX0hFQURfQ09WRVJfQ0xPU0VfVElNRU9V", + "VBBgEhkKFU1JWEVSX09WRVJURU1QRVJBVFVSRRBhEhwKGE1JWEVSX1VOREVS", + "VEVNUEVSQVRVUkVfQRBiEhwKGE1JWEVSX1VOREVSVEVNUEVSQVRVUkVfQhBj", + "EhgKFE1JWEVSX1RIRVJNQUxfQ1VUT0ZGEGQSHgoaTUlYRVJfQ1VSUkVOVF9P", + "VVRfT0ZfUkFOR0UQZRIcChhNSVhFUl9DVVJSRU5UX0xPT1BfQlJFQUsQZhIc", + "ChhESVNQRU5TRVJfMV9PVkVSUFJFU1NVUkUQZxIcChhESVNQRU5TRVJfMl9P", + "VkVSUFJFU1NVUkUQaBIcChhESVNQRU5TRVJfM19PVkVSUFJFU1NVUkUQaRIc", + "ChhESVNQRU5TRVJfNF9PVkVSUFJFU1NVUkUQahIcChhESVNQRU5TRVJfNV9P", + "VkVSUFJFU1NVUkUQaxIcChhESVNQRU5TRVJfNl9PVkVSUFJFU1NVUkUQbBIc", + "ChhESVNQRU5TRVJfN19PVkVSUFJFU1NVUkUQbRIcChhESVNQRU5TRVJfOF9P", + "VkVSUFJFU1NVUkUQbhIdChlESVNQRU5TRVJfMV9VTkRFUlBSRVNTVVJFEG8S", + "HQoZRElTUEVOU0VSXzJfVU5ERVJQUkVTU1VSRRBwEh0KGURJU1BFTlNFUl8z", + "X1VOREVSUFJFU1NVUkUQcRIdChlESVNQRU5TRVJfNF9VTkRFUlBSRVNTVVJF", + "EHISHQoZRElTUEVOU0VSXzVfVU5ERVJQUkVTU1VSRRBzEh0KGURJU1BFTlNF", + "Ul82X1VOREVSUFJFU1NVUkUQdBIdChlESVNQRU5TRVJfN19VTkRFUlBSRVNT", + "VVJFEHUSHQoZRElTUEVOU0VSXzhfVU5ERVJQUkVTU1VSRRB2EhUKEURJU1BF", + "TlNFUl8xX0VNUFRZEHcSFQoRRElTUEVOU0VSXzJfRU1QVFkQeBIVChFESVNQ", + "RU5TRVJfM19FTVBUWRB5EhUKEURJU1BFTlNFUl80X0VNUFRZEHoSFQoRRElT", + "UEVOU0VSXzVfRU1QVFkQexIVChFESVNQRU5TRVJfNl9FTVBUWRB8EhUKEURJ", + "U1BFTlNFUl83X0VNUFRZEH0SFQoRRElTUEVOU0VSXzhfRU1QVFkQfhIeChpE", + "SVNQRU5TRVJfMV9SRUZJTExfRkFJTFVSRRB/Eh8KGkRJU1BFTlNFUl8yX1JF", + "RklMTF9GQUlMVVJFEIABEh8KGkRJU1BFTlNFUl8zX1JFRklMTF9GQUlMVVJF", + "EIEBEh8KGkRJU1BFTlNFUl80X1JFRklMTF9GQUlMVVJFEIIBEh8KGkRJU1BF", + "TlNFUl81X1JFRklMTF9GQUlMVVJFEIMBEh8KGkRJU1BFTlNFUl82X1JFRklM", + "TF9GQUlMVVJFEIQBEh8KGkRJU1BFTlNFUl83X1JFRklMTF9GQUlMVVJFEIUB", + "Eh8KGkRJU1BFTlNFUl84X1JFRklMTF9GQUlMVVJFEIYBEiIKHURJU1BFTlNF", + "Ul8xX01PVE9SX09WRVJDVVJSRU5UEIcBEiIKHURJU1BFTlNFUl8yX01PVE9S", + "X09WRVJDVVJSRU5UEIgBEiIKHURJU1BFTlNFUl8zX01PVE9SX09WRVJDVVJS", + "RU5UEIkBEiIKHURJU1BFTlNFUl80X01PVE9SX09WRVJDVVJSRU5UEIoBEiIK", + "HURJU1BFTlNFUl81X01PVE9SX09WRVJDVVJSRU5UEIsBEiIKHURJU1BFTlNF", + "Ul82X01PVE9SX09WRVJDVVJSRU5UEIwBEiIKHURJU1BFTlNFUl83X01PVE9S", + "X09WRVJDVVJSRU5UEI0BEiIKHURJU1BFTlNFUl84X01PVE9SX09WRVJDVVJS", + "RU5UEI4BEiYKIURJU1BFTlNFUl8xX01PVE9SX09WRVJURU1QRVJBVFVSRRCP", + "ARImCiFESVNQRU5TRVJfMl9NT1RPUl9PVkVSVEVNUEVSQVRVUkUQkAESJgoh", + "RElTUEVOU0VSXzNfTU9UT1JfT1ZFUlRFTVBFUkFUVVJFEJEBEiYKIURJU1BF", + "TlNFUl80X01PVE9SX09WRVJURU1QRVJBVFVSRRCSARImCiFESVNQRU5TRVJf", + "NV9NT1RPUl9PVkVSVEVNUEVSQVRVUkUQkwESJgohRElTUEVOU0VSXzZfTU9U", + "T1JfT1ZFUlRFTVBFUkFUVVJFEJQBEiYKIURJU1BFTlNFUl83X01PVE9SX09W", + "RVJURU1QRVJBVFVSRRCVARImCiFESVNQRU5TRVJfOF9NT1RPUl9PVkVSVEVN", + "UEVSQVRVUkUQlgESHAoXRElTUEVOU0VSXzFfTU9UT1JfU1RBTEwQlwESHAoX", + "RElTUEVOU0VSXzJfTU9UT1JfU1RBTEwQmAESHAoXRElTUEVOU0VSXzNfTU9U", + "T1JfU1RBTEwQmQESHAoXRElTUEVOU0VSXzRfTU9UT1JfU1RBTEwQmgESHAoX", + "RElTUEVOU0VSXzVfTU9UT1JfU1RBTEwQmwESHAoXRElTUEVOU0VSXzZfTU9U", + "T1JfU1RBTEwQnAESHAoXRElTUEVOU0VSXzdfTU9UT1JfU1RBTEwQnQESHAoX", + "RElTUEVOU0VSXzhfTU9UT1JfU1RBTEwQngESIwoeRElTUEVOU0VSXzFfTU9U", + "T1JfVU5ERVJWT0xUQUdFEJ8BEiMKHkRJU1BFTlNFUl8yX01PVE9SX1VOREVS", + "Vk9MVEFHRRCgARIjCh5ESVNQRU5TRVJfM19NT1RPUl9VTkRFUlZPTFRBR0UQ", + "oQESIwoeRElTUEVOU0VSXzRfTU9UT1JfVU5ERVJWT0xUQUdFEKIBEiMKHkRJ", + "U1BFTlNFUl81X01PVE9SX1VOREVSVk9MVEFHRRCjARIjCh5ESVNQRU5TRVJf", + "Nl9NT1RPUl9VTkRFUlZPTFRBR0UQpAESIwoeRElTUEVOU0VSXzdfTU9UT1Jf", + "VU5ERVJWT0xUQUdFEKUBEiMKHkRJU1BFTlNFUl84X01PVE9SX1VOREVSVk9M", + "VEFHRRCmARIZChRNSURfVEFOS18xX0xPV19MRVZFTBCnARIZChRNSURfVEFO", + "S18yX0xPV19MRVZFTBCoARIZChRNSURfVEFOS18zX0xPV19MRVZFTBCpARIZ", + "ChRNSURfVEFOS180X0xPV19MRVZFTBCqARIZChRNSURfVEFOS181X0xPV19M", + "RVZFTBCrARIZChRNSURfVEFOS182X0xPV19MRVZFTBCsARIZChRNSURfVEFO", + "S183X0xPV19MRVZFTBCtARIZChRNSURfVEFOS184X0xPV19MRVZFTBCuARIV", + "ChBNSURfVEFOS18xX0VNUFRZEK8BEhUKEE1JRF9UQU5LXzJfRU1QVFkQsAES", + "FQoQTUlEX1RBTktfM19FTVBUWRCxARIVChBNSURfVEFOS180X0VNUFRZELIB", + "EhUKEE1JRF9UQU5LXzVfRU1QVFkQswESFQoQTUlEX1RBTktfNl9FTVBUWRC0", + "ARIVChBNSURfVEFOS183X0VNUFRZELUBEhUKEE1JRF9UQU5LXzhfRU1QVFkQ", + "tgESGAoTTUlEX1RBTktfMV9PVkVSRkxPVxC3ARIYChNNSURfVEFOS18yX09W", + "RVJGTE9XELgBEhgKE01JRF9UQU5LXzNfT1ZFUkZMT1cQuQESGAoTTUlEX1RB", + "TktfNF9PVkVSRkxPVxC6ARIYChNNSURfVEFOS181X09WRVJGTE9XELsBEhgK", + "E01JRF9UQU5LXzZfT1ZFUkZMT1cQvAESGAoTTUlEX1RBTktfN19PVkVSRkxP", + "VxC9ARIYChNNSURfVEFOS184X09WRVJGTE9XEL4BEh0KGEFJUl9GSUxURVJf", + "Tk9UX0lOU1RBTExFRBC/ARIXChJBSVJfRklMVEVSX0NMT0dHRUQQwAESJQog", + "V0FTVEVfQ09OVEFJTkVSX0VNUFRZSU5HX1RJTUVPVVQQwQESFAoPTk9fQUlS", + "X1BSRVNTVVJFEMIBEh0KGFdBU1RFX0NPTlRBSU5FUl9PVkVSRkxPVxDDARIV", + "ChBWT0NfU0VOU09SX0FMQVJNEMQBEhgKE0NISUxMRVJfRFJZX0NPTlRBQ1QQ", + "xQESGgoVSU5TVUZGSUNJRU5UX0FJUl9GTE9XEMYBEioKJUlOS19DQVJUUklE", + "R0VfUFJFU0VOQ0VfU0VOU09SX1RJTUVPVVQQxwESHwoaSU5LX0NBUlRSSURH", + "RV9SRklEX1RJTUVPVVQQyAESIQocTk9fV0FTVEVfQ0FSVFJJREdFX0FWQUlM", + "QUJMRRDJARIeChlBTExfV0FTVEVfQ0FSVFJJREdFU19GVUxMEMoBEiwKJ1dB", + "U1RFX0NBUlRSSURHRV9QUkVTRU5DRV9TRU5TT1JfVElNRU9VVBDLARIhChxX", + "QVNURV9DQVJUUklER0VfUkZJRF9USU1FT1VUEMwBEigKI0VMRUNUUklDQUxf", + "Q0FCSU5FVF9GQU5TX1JQTV9UT09fTE9XEM0BEiQKH0VMRUNUUklDQUxfQ0FC", + "SU5FVF9GQU5TX1NUT1BQRUQQzgESEQoMUkVRVUVTVF9TRU5UEOgHEhYKEVJF", + "U1BPTlNFX1JFQ0VJVkVEEOkHEhMKDlJFUVVFU1RfRkFJTEVEEOoHEhoKFUFQ", + "UExJQ0FUSU9OX0VYQ0VQVElPThDrBxIcChdBUFBMSUNBVElPTl9JTkZPUk1B", + "VElPThDsBxIYChNBUFBMSUNBVElPTl9TVEFSVEVEEO0HEhsKFkFQUExJQ0FU", + "SU9OX1RFUk1JTkFURUQQ7gcSFgoRUkVDT1JESU5HX1NUQVJURUQQ7wcSFgoR", + "UkVDT1JESU5HX1NUT1BQRUQQ8AcSDwoKSk9CX1NUQVRVUxDxB0IhCh9jb20u", + "dHdpbmUudGFuZ28ucG1yLmRpYWdub3N0aWNzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Diagnostics.EventType), }, null)); @@ -125,601 +189,873 @@ namespace Tango.PMR.Diagnostics { #region Enums public enum EventType { /// <summary> - ///None (Group = Application, Category = Info, Actions = ) + ///Must contain a 0 value /// </summary> [pbr::OriginalName("None")] None = 0, /// <summary> - /// Thread Break (Group = Thread Feeding System, Category = Error, Actions = ) + ///Could not complete power-up BIT. (Group = GeneralHardware, Category = Error) /// </summary> - [pbr::OriginalName("ThreadBreak")] ThreadBreak = 1, + [pbr::OriginalName("POWER_UP_BIT_FAILURE")] PowerUpBitFailure = 1, /// <summary> - /// Thread Tension Control Failure (Group = Thread Feeding System, Category = Error, Actions = ) + ///Emergency button pressed (Group = GeneralHardware, Category = Safety) /// </summary> - [pbr::OriginalName("ThreadTensionControlFailure")] ThreadTensionControlFailure = 2, + [pbr::OriginalName("EMERGENCY_PUSH_BUTTON_PRESSED")] EmergencyPushButtonPressed = 2, /// <summary> - /// Feeder Cone Insufficiant (Group = Thread Feeding System, Category = Warning, Actions = ) + ///Front cover 1 open (Group = GeneralHardware, Category = Error) /// </summary> - [pbr::OriginalName("FeederConeInsufficiant")] FeederConeInsufficiant = 3, + [pbr::OriginalName("FRONT_COVER_1_OPEN")] FrontCover1Open = 3, /// <summary> - /// Winder General Error (Group = Thread Feeding System, Category = Error, Actions = ) + ///Front cover 2 open (Group = GeneralHardware, Category = Error) /// </summary> - [pbr::OriginalName("WinderGeneralError")] WinderGeneralError = 4, + [pbr::OriginalName("FRONT_COVER_2_OPEN")] FrontCover2Open = 4, /// <summary> - /// Winder Cone Not Exists (Group = Thread Feeding System, Category = Warning, Actions = ) + ///Front cover 3 open (Group = GeneralHardware, Category = Error) /// </summary> - [pbr::OriginalName("WinderConeNotExists")] WinderConeNotExists = 5, + [pbr::OriginalName("FRONT_COVER_3_OPEN")] FrontCover3Open = 5, /// <summary> - /// Thread Feeding General Error (Group = Thread Feeding System, Category = Error, Actions = ) + ///Front cover 4 open (Group = GeneralHardware, Category = Error) /// </summary> - [pbr::OriginalName("ThreadFeedingGeneralError")] ThreadFeedingGeneralError = 6, + [pbr::OriginalName("FRONT_COVER_4_OPEN")] FrontCover4Open = 6, /// <summary> - /// Dyeing Head 1 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) + ///Cartridges cover open (Group = GeneralHardware, Category = Warning) /// </summary> - [pbr::OriginalName("DyeingHead1OverTemperature")] DyeingHead1OverTemperature = 7, + [pbr::OriginalName("CARTRIDGES_COVER_OPEN")] CartridgesCoverOpen = 7, /// <summary> - /// Dyeing Head 2 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) + ///Rear cover open (Group = GeneralHardware, Category = Error) /// </summary> - [pbr::OriginalName("DyeingHead2OverTemperature")] DyeingHead2OverTemperature = 8, + [pbr::OriginalName("REAR_COVER_OPEN")] RearCoverOpen = 8, /// <summary> - /// Dyeing Head 3 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) + ///Overtemperature in machine intern (Group = GeneralHardware, Category = Error) /// </summary> - [pbr::OriginalName("DyeingHead3OverTemperature")] DyeingHead3OverTemperature = 9, + [pbr::OriginalName("MACHINE_INTERNAL_OVERTEMPERATURE")] MachineInternalOvertemperature = 9, /// <summary> - /// Dyeing Head 4 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) + ///Internal fans RPM too low (Group = GeneralHardware, Category = Warning) /// </summary> - [pbr::OriginalName("DyeingHead4OverTemperature")] DyeingHead4OverTemperature = 10, + [pbr::OriginalName("MACHINE_FANS_RPM_TOO_LOW")] MachineFansRpmTooLow = 10, /// <summary> - /// Dyeing Head 5 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) + ///Internal fans stopped (Group = GeneralHardware, Category = Error) /// </summary> - [pbr::OriginalName("DyeingHead5OverTemperature")] DyeingHead5OverTemperature = 11, + [pbr::OriginalName("MACHINE_FANS_STOPPED")] MachineFansStopped = 11, /// <summary> - /// Dyeing Head 6 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) + ///Thread break (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("DyeingHead6OverTemperature")] DyeingHead6OverTemperature = 12, + [pbr::OriginalName("THREAD_BREAK")] ThreadBreak = 12, /// <summary> - /// Dyeing Head Thermal Cutoff (Group = Dryer Head, Category = Critical, Actions = ) + ///Thread tension control faiure (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("DyeingHeadThermalCutoff")] DyeingHeadThermalCutoff = 13, + [pbr::OriginalName("THREAD_TENSION_CONTROL_FAILURE")] ThreadTensionControlFailure = 13, /// <summary> - /// Dryer Over Temperature (Group = Dryer, Category = Critical, Actions = ) + ///No cone in winder (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("DryerOverTemperature")] DryerOverTemperature = 14, + [pbr::OriginalName("WINDER_CONE_DOES_NOT_EXIST")] WinderConeDoesNotExist = 14, /// <summary> - /// Dryer Thermal Cutoff (Group = Dryer, Category = Critical, Actions = ) + ///Overcurrent in feeder motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("DryerThermalCutoff")] DryerThermalCutoff = 15, + [pbr::OriginalName("FEEDER_MOTOR_OVERCURRENT")] FeederMotorOvercurrent = 15, /// <summary> - /// Dyeing Head Heaters Current Out Of Range (Group = Dryer Head, Category = Error, Actions = ) + ///Overcurrent in right loader motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("DyeingHeadHeatersCurrentOutOfRange")] DyeingHeadHeatersCurrentOutOfRange = 16, + [pbr::OriginalName("RIGHT_LOADER_MOTOR_OVERCURRENT")] RightLoaderMotorOvercurrent = 16, /// <summary> - /// Dryer Heaters Current Out Of Range (Group = Dryer, Category = Error, Actions = ) + ///Overcurrent in puller motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("DryerHeatersCurrentOutOfRange")] DryerHeatersCurrentOutOfRange = 17, + [pbr::OriginalName("PULLER_MOTOR_OVERCURRENT")] PullerMotorOvercurrent = 17, /// <summary> - /// Dryer Dying Head Cover Open (Group = Dryer, Category = Error, Actions = ) + ///Overcurrent in left loader motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("DryerDHeadCoverOpen")] DryerDheadCoverOpen = 18, + [pbr::OriginalName("LEFT_LOADER_MOTOR_OVERCURRENT")] LeftLoaderMotorOvercurrent = 18, /// <summary> - /// Air Filter Clogged (Group = Waste Handling System, Category = Error, Actions = ) + ///Overcurrent in winder motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("AirFilterClogged")] AirFilterClogged = 19, + [pbr::OriginalName("WINDER_MOTOR_OVERCURRENT")] WinderMotorOvercurrent = 19, /// <summary> - /// Air Filter Not Installed (Group = Waste Handling System, Category = Error, Actions = ) + ///Overcurrent in screw motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("AirFilterNotInstalled")] AirFilterNotInstalled = 20, + [pbr::OriginalName("SCREW_MOTOR_OVERCURRENT")] ScrewMotorOvercurrent = 20, /// <summary> - /// WHS Failure (Group = Waste Handling System, Category = Error, Actions = ) + ///Overcurrent in loading arm motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("WHSFailure")] Whsfailure = 21, + [pbr::OriginalName("LOADING_ARM_MOTOR_OVERCURRENT")] LoadingArmMotorOvercurrent = 21, /// <summary> - /// Waste Container Is Almost Full (Group = Waste Handling System, Category = Warning, Actions = ) + ///Overtemperature in feeder motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("WasteContainerIsAlmostFull")] WasteContainerIsAlmostFull = 22, + [pbr::OriginalName("FEEDER_MOTOR_OVERTEMPERATURE")] FeederMotorOvertemperature = 22, /// <summary> - /// Waste Container Is Full (Group = Waste Handling System, Category = Error, Actions = ) + ///Overtemperature in right loader motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("WasteContainerIsFull")] WasteContainerIsFull = 23, + [pbr::OriginalName("RIGHT_LOADER_MOTOR_OVERTEMPERATURE")] RightLoaderMotorOvertemperature = 23, /// <summary> - /// Dispenser 1 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in puller motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser1Empty")] Dispenser1Empty = 24, + [pbr::OriginalName("PULLER_MOTOR_OVERTEMPERATURE")] PullerMotorOvertemperature = 24, /// <summary> - /// Dispenser 2 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in left loader motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser2Empty")] Dispenser2Empty = 25, + [pbr::OriginalName("LEFT_LOADER_MOTOR_OVERTEMPERATURE")] LeftLoaderMotorOvertemperature = 25, /// <summary> - /// Dispenser 3 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in winder motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser3Empty")] Dispenser3Empty = 26, + [pbr::OriginalName("WINDER_MOTOR_OVERTEMPERATURE")] WinderMotorOvertemperature = 26, /// <summary> - /// Dispenser 4 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in screw motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser4Empty")] Dispenser4Empty = 27, + [pbr::OriginalName("SCREW_MOTOR_OVERTEMPERATURE")] ScrewMotorOvertemperature = 27, /// <summary> - /// Dispenser 5 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in loading arm motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser5Empty")] Dispenser5Empty = 28, + [pbr::OriginalName("LOADING_ARM_MOTOR_OVERTEMPERATURE")] LoadingArmMotorOvertemperature = 28, /// <summary> - /// Dispenser 6 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Feeder motor stalled (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser6Empty")] Dispenser6Empty = 29, + [pbr::OriginalName("FEEDER_MOTOR_STALL")] FeederMotorStall = 29, /// <summary> - /// Dispenser 7 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Right loader motor stalled (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser7Empty")] Dispenser7Empty = 30, + [pbr::OriginalName("RIGHT_LOADER_MOTOR_STALL")] RightLoaderMotorStall = 30, /// <summary> - /// Dispenser 8 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Puller motor stalled (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser8Empty")] Dispenser8Empty = 31, + [pbr::OriginalName("PULLER_MOTOR_STALL")] PullerMotorStall = 31, /// <summary> - /// Dispenser 1 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Left loader motor stalled (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser1LowLevel")] Dispenser1LowLevel = 32, + [pbr::OriginalName("LEFT_LOADER_MOTOR_STALL")] LeftLoaderMotorStall = 32, /// <summary> - /// Dispenser 2 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Winder motor stalled (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser2LowLevel")] Dispenser2LowLevel = 33, + [pbr::OriginalName("WINDER_MOTOR_STALL")] WinderMotorStall = 33, /// <summary> - /// Dispenser 3 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Screw motor stalled (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser3LowLevel")] Dispenser3LowLevel = 34, + [pbr::OriginalName("SCREW_MOTOR_STALL")] ScrewMotorStall = 34, /// <summary> - /// Dispenser 4 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Loading arm motor stalled (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser4LowLevel")] Dispenser4LowLevel = 35, + [pbr::OriginalName("LOADING_ARM_MOTOR_STALL")] LoadingArmMotorStall = 35, /// <summary> - /// Dispenser 5 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Undervoltage in feeder motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser5LowLevel")] Dispenser5LowLevel = 36, + [pbr::OriginalName("FEEDER_MOTOR_UNDERVOLTAGE")] FeederMotorUndervoltage = 36, /// <summary> - /// Dispenser 6 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Undervoltage in right loader motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser6LowLevel")] Dispenser6LowLevel = 37, + [pbr::OriginalName("RIGHT_LOADER_MOTOR_UNDERVOLTAGE")] RightLoaderMotorUndervoltage = 37, /// <summary> - /// Dispenser 7 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Undervoltage in puller motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser7LowLevel")] Dispenser7LowLevel = 38, + [pbr::OriginalName("PULLER_MOTOR_UNDERVOLTAGE")] PullerMotorUndervoltage = 38, /// <summary> - /// Dispenser 8 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Undervoltage in left loader motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser8LowLevel")] Dispenser8LowLevel = 39, + [pbr::OriginalName("LEFT_LOADER_MOTOR_UNDERVOLTAGE")] LeftLoaderMotorUndervoltage = 39, /// <summary> - /// Dispenser 1 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undervoltage in winder motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser1RefillFailure")] Dispenser1RefillFailure = 40, + [pbr::OriginalName("WINDER_MOTOR_UNDERVOLTAGE")] WinderMotorUndervoltage = 40, /// <summary> - /// Dispenser 2 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undervoltage in screw motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser2RefillFailure")] Dispenser2RefillFailure = 41, + [pbr::OriginalName("SCREW_MOTOR_UNDERVOLTAGE")] ScrewMotorUndervoltage = 41, /// <summary> - /// Dispenser 3 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undervoltage in loading arm motor (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser3RefillFailure")] Dispenser3RefillFailure = 42, + [pbr::OriginalName("LOADING_ARM_MOTOR_UNDERVOLTAGE")] LoadingArmMotorUndervoltage = 42, /// <summary> - /// Dispenser 4 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///LTFU up failure (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser4RefillFailure")] Dispenser4RefillFailure = 43, + [pbr::OriginalName("LTFU_UP_TIMEOUT")] LtfuUpTimeout = 43, /// <summary> - /// Dispenser 5 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///LTFU down failure (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser5RefillFailure")] Dispenser5RefillFailure = 44, + [pbr::OriginalName("LTFU_DOWN_TIMEOUT")] LtfuDownTimeout = 44, /// <summary> - /// Dispenser 6 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///RTFU up failure (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser6RefillFailure")] Dispenser6RefillFailure = 45, + [pbr::OriginalName("RTFU_UP_TIMEOUT")] RtfuUpTimeout = 45, /// <summary> - /// Dispenser 7 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///RTFU down failure (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser7RefillFailure")] Dispenser7RefillFailure = 46, + [pbr::OriginalName("RTFU_DOWN_TIMEOUT")] RtfuDownTimeout = 46, /// <summary> - /// Dispenser 8 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Screw travel failure (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser8RefillFailure")] Dispenser8RefillFailure = 47, + [pbr::OriginalName("SCREW_MOTOR_LIMIT_TIMEOUT")] ScrewMotorLimitTimeout = 47, /// <summary> - /// Dispenser 1 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Overcurrent in dryer motor (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser1Pressure")] Dispenser1Pressure = 48, + [pbr::OriginalName("DRYER_MOTOR_OVERCURRENT")] DryerMotorOvercurrent = 48, /// <summary> - /// Dispenser 2 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Overtemperature in dryer motor (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser2Pressure")] Dispenser2Pressure = 49, + [pbr::OriginalName("DRYER_MOTOR_OVERTEMPERATURE")] DryerMotorOvertemperature = 49, /// <summary> - /// Dispenser 3 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Dryer motor stalled (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser3Pressure")] Dispenser3Pressure = 50, + [pbr::OriginalName("DRYER_MOTOR_STALL")] DryerMotorStall = 50, /// <summary> - /// Dispenser 4 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Undervoltage in dryer motor (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser4Pressure")] Dispenser4Pressure = 51, + [pbr::OriginalName("DRYER_MOTOR_UNDERVOLTAGE")] DryerMotorUndervoltage = 51, /// <summary> - /// Dispenser 5 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Dryer door open (Group = Dryer, Category = Safety) /// </summary> - [pbr::OriginalName("Dispenser5Pressure")] Dispenser5Pressure = 52, + [pbr::OriginalName("DRYER_DOOR_OPEN")] DryerDoorOpen = 52, /// <summary> - /// Dispenser 6 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Overtemperature in dryer zone 1 (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser6Pressure")] Dispenser6Pressure = 53, + [pbr::OriginalName("DRYER_ZONE_1_OVERTEMPERATURE")] DryerZone1Overtemperature = 53, /// <summary> - /// Dispenser 7 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Overtemperature in dryer zone 2 (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser7Pressure")] Dispenser7Pressure = 54, + [pbr::OriginalName("DRYER_ZONE_2_OVERTEMPERATURE")] DryerZone2Overtemperature = 54, /// <summary> - /// Dispenser 8 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Undertemperature in dryer zone 1 (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("Dispenser8Pressure")] Dispenser8Pressure = 55, + [pbr::OriginalName("DRYER_ZONE_1_UNDERTEMPERATURE_A")] DryerZone1UndertemperatureA = 55, /// <summary> - /// Mid Tank 1 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dryer zone 2 (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("MidTank1Empty")] MidTank1Empty = 56, + [pbr::OriginalName("DRYER_ZONE_2_UNDERTEMPERATURE_A")] DryerZone2UndertemperatureA = 56, /// <summary> - /// Mid Tank 2 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dryer zone 1 (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("MidTank2Empty")] MidTank2Empty = 57, + [pbr::OriginalName("DRYER_ZONE_1_UNDERTEMPERATURE_B")] DryerZone1UndertemperatureB = 57, /// <summary> - /// Mid Tank 3 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dryer zone 2 (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("MidTank3Empty")] MidTank3Empty = 58, + [pbr::OriginalName("DRYER_ZONE_2_UNDERTEMPERATURE_B")] DryerZone2UndertemperatureB = 58, /// <summary> - /// Mid Tank 4 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overheating in dryer (Group = Dryer, Category = Safety) /// </summary> - [pbr::OriginalName("MidTank4Empty")] MidTank4Empty = 59, + [pbr::OriginalName("DRYER_THERMAL_CUTOFF")] DryerThermalCutoff = 59, /// <summary> - /// Mid Tank 5 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Dryer zone 1 current out of range (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("MidTank5Empty")] MidTank5Empty = 60, + [pbr::OriginalName("DRYER_HEATERS_ZONE_1_CURRENT_OUT_OF_RANGE")] DryerHeatersZone1CurrentOutOfRange = 60, /// <summary> - /// Mid Tank 6 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Dryer zone 2 current out of range (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("MidTank6Empty")] MidTank6Empty = 61, + [pbr::OriginalName("DRYER_HEATERS_ZONE_2_CURRENT_OUT_OF_RANGE")] DryerHeatersZone2CurrentOutOfRange = 61, /// <summary> - /// Mid Tank 7 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Dryer zone 1 current loop break (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("MidTank7Empty")] MidTank7Empty = 62, + [pbr::OriginalName("DRYER_HEATERS_ZONE_1_CURRENT_LOOP_BREAK")] DryerHeatersZone1CurrentLoopBreak = 62, /// <summary> - /// Mid Tank 8 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Dryer zone 2 current loop break (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("MidTank8Empty")] MidTank8Empty = 63, + [pbr::OriginalName("DRYER_HEATERS_ZONE_2_CURRENT_LOOP_BREAK")] DryerHeatersZone2CurrentLoopBreak = 63, /// <summary> - /// Mid Tank 1 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Dryer fans RPM too low (Group = Dryer, Category = Warning) /// </summary> - [pbr::OriginalName("MidTank1Lowlevel")] MidTank1Lowlevel = 64, + [pbr::OriginalName("DRYER_FAN_RPM_TOO_LOW")] DryerFanRpmTooLow = 64, /// <summary> - /// Mid Tank 2 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Dryer fan stopped (Group = Dryer, Category = Error) /// </summary> - [pbr::OriginalName("MidTank2Lowlevel")] MidTank2Lowlevel = 65, + [pbr::OriginalName("DRYER_FAN_STOPPED")] DryerFanStopped = 65, /// <summary> - /// Mid Tank 3 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overtemperature in dyeing head zone 1 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank3Lowlevel")] MidTank3Lowlevel = 66, + [pbr::OriginalName("DYEING_HEAD_ZONE_1_OVERTEMPERATURE")] DyeingHeadZone1Overtemperature = 66, /// <summary> - /// Mid Tank 4 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overtemperature in dyeing head zone 2 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank4Lowlevel")] MidTank4Lowlevel = 67, + [pbr::OriginalName("DYEING_HEAD_ZONE_2_OVERTEMPERATURE")] DyeingHeadZone2Overtemperature = 67, /// <summary> - /// Mid Tank 5 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overtemperature in dyeing head zone 3 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank5Lowlevel")] MidTank5Lowlevel = 68, + [pbr::OriginalName("DYEING_HEAD_ZONE_3_OVERTEMPERATURE")] DyeingHeadZone3Overtemperature = 68, /// <summary> - /// Mid Tank 6 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overtemperature in dyeing head zone 4 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank6Lowlevel")] MidTank6Lowlevel = 69, + [pbr::OriginalName("DYEING_HEAD_ZONE_4_OVERTEMPERATURE")] DyeingHeadZone4Overtemperature = 69, /// <summary> - /// Mid Tank 7 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overtemperature in dyeing head zone 5 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank7Lowlevel")] MidTank7Lowlevel = 70, + [pbr::OriginalName("DYEING_HEAD_ZONE_5_OVERTEMPERATURE")] DyeingHeadZone5Overtemperature = 70, /// <summary> - /// Mid Tank 8 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overtemperature in dyeing head zone 6 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank8Lowlevel")] MidTank8Lowlevel = 71, + [pbr::OriginalName("DYEING_HEAD_ZONE_6_OVERTEMPERATURE")] DyeingHeadZone6Overtemperature = 71, /// <summary> - /// Mid Tank 1 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 1 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank1NotInPlace")] MidTank1NotInPlace = 72, + [pbr::OriginalName("DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_A")] DyeingHeadZone1UndertemperatureA = 72, /// <summary> - /// Mid Tank 2 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 2 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank2NotInPlace")] MidTank2NotInPlace = 73, + [pbr::OriginalName("DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_A")] DyeingHeadZone2UndertemperatureA = 73, /// <summary> - /// Mid Tank 3 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 3 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank3NotInPlace")] MidTank3NotInPlace = 74, + [pbr::OriginalName("DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_A")] DyeingHeadZone3UndertemperatureA = 74, /// <summary> - /// Mid Tank 4 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 4 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank4NotInPlace")] MidTank4NotInPlace = 75, + [pbr::OriginalName("DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_A")] DyeingHeadZone4UndertemperatureA = 75, /// <summary> - /// Mid Tank 5 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 5 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank5NotInPlace")] MidTank5NotInPlace = 76, + [pbr::OriginalName("DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_A")] DyeingHeadZone5UndertemperatureA = 76, /// <summary> - /// Mid Tank 6 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 6 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank6NotInPlace")] MidTank6NotInPlace = 77, + [pbr::OriginalName("DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_A")] DyeingHeadZone6UndertemperatureA = 77, /// <summary> - /// Mid Tank 7 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 1 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank7NotInPlace")] MidTank7NotInPlace = 78, + [pbr::OriginalName("DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_B")] DyeingHeadZone1UndertemperatureB = 78, /// <summary> - /// Mid Tank 8 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 2 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MidTank8NotInPlace")] MidTank8NotInPlace = 79, + [pbr::OriginalName("DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_B")] DyeingHeadZone2UndertemperatureB = 79, /// <summary> - /// System Built In Test Fail (Group = General Hardware, Category = Critical, Actions = ) + ///Undertemperature in dyeing head zone 3 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("SystemBITFail")] SystemBitfail = 80, + [pbr::OriginalName("DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_B")] DyeingHeadZone3UndertemperatureB = 80, /// <summary> - /// General Internal Over Temperature (Group = General Hardware, Category = Critical, Actions = ) + ///Undertemperature in dyeing head zone 4 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("GeneralInternalOverTemperature")] GeneralInternalOverTemperature = 81, + [pbr::OriginalName("DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_B")] DyeingHeadZone4UndertemperatureB = 81, /// <summary> - /// Machine Cover Open (Group = General Hardware, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 5 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MachineCoverOpen")] MachineCoverOpen = 82, + [pbr::OriginalName("DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_B")] DyeingHeadZone5UndertemperatureB = 82, /// <summary> - /// Emergency Push Button Pressed (Group = General Hardware, Category = Critical, Actions = ) + ///Undertemperature in dyeing head zone 6 (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("EmergencyPushButtonPressed")] EmergencyPushButtonPressed = 83, + [pbr::OriginalName("DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_B")] DyeingHeadZone6UndertemperatureB = 83, /// <summary> - /// System General Error (Group = General Hardware, Category = Error, Actions = ) + ///Dyeing head zone 1 current out of range (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("SystemGeneralError")] SystemGeneralError = 84, + [pbr::OriginalName("DYEING_HEAD_ZONE_1_CURRENT_OUT_OF_RANGE")] DyeingHeadZone1CurrentOutOfRange = 84, /// <summary> - /// Motor Dryer Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 2 current out of range (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MotorDryerOverCurrent")] MotorDryerOverCurrent = 93, + [pbr::OriginalName("DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE")] DyeingHeadZone2CurrentOutOfRange = 85, /// <summary> - /// Motor Feeder Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 3 current out of range (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MotorFeederOverCurrent")] MotorFeederOverCurrent = 94, + [pbr::OriginalName("DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE")] DyeingHeadZone3CurrentOutOfRange = 86, /// <summary> - /// Motor Right Loader Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 4 current out of range (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MotorRLoaderOverCurrent")] MotorRloaderOverCurrent = 95, + [pbr::OriginalName("DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE")] DyeingHeadZone4CurrentOutOfRange = 87, /// <summary> - /// Motor Pooler Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zones 5 and 6 current out of range (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MotorPoolerOverCurrent")] MotorPoolerOverCurrent = 96, + [pbr::OriginalName("DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE")] DyeingHeadZone56CurrentOutOfRange = 88, /// <summary> - /// Motor Left Loader Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 1 current loop break (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MotorLLoaderOverCurrent")] MotorLloaderOverCurrent = 97, + [pbr::OriginalName("DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK")] DyeingHeadZone1CurrentLoopBreak = 89, /// <summary> - /// Motor Winder Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 2 current loop break (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MotorWinderOverCurrent")] MotorWinderOverCurrent = 98, + [pbr::OriginalName("DYEING_HEAD_ZONE_2_CURRENT_LOOP_BREAK")] DyeingHeadZone2CurrentLoopBreak = 90, /// <summary> - /// Motor Screw Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 3 current loop break (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MotorScrewOverCurrent")] MotorScrewOverCurrent = 99, + [pbr::OriginalName("DYEING_HEAD_ZONE_3_CURRENT_LOOP_BREAK")] DyeingHeadZone3CurrentLoopBreak = 91, /// <summary> - /// Motor Loading Arm Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 4 current loop break (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MotorLoadingArmOverCurrent")] MotorLoadingArmOverCurrent = 100, + [pbr::OriginalName("DYEING_HEAD_ZONE_4_CURRENT_LOOP_BREAK")] DyeingHeadZone4CurrentLoopBreak = 92, /// <summary> - /// Motor Dispenser 1 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Dyeing head zone 5 and 6 current loop break (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser1OverCurrent")] MotorDispenser1OverCurrent = 101, + [pbr::OriginalName("DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK")] DyeingHeadZone56CurrentLoopBreak = 93, /// <summary> - /// Motor Dispenser 2 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overheating in dyeing head (Group = DyeingHead, Category = Safety) /// </summary> - [pbr::OriginalName("MotorDispenser2OverCurrent")] MotorDispenser2OverCurrent = 102, + [pbr::OriginalName("DYEING_HEAD_THERMAL_CUTOFF")] DyeingHeadThermalCutoff = 94, /// <summary> - /// Motor Dispenser 3 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Could not open dyeing head cover (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser3OverCurrent")] MotorDispenser3OverCurrent = 103, + [pbr::OriginalName("DYEING_HEAD_COVER_OPEN_TIMEOUT")] DyeingHeadCoverOpenTimeout = 95, /// <summary> - /// Motor Dispenser 4 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Could not close dyeing head cover (Group = DyeingHead, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser4OverCurrent")] MotorDispenser4OverCurrent = 104, + [pbr::OriginalName("DYEING_HEAD_COVER_CLOSE_TIMEOUT")] DyeingHeadCoverCloseTimeout = 96, /// <summary> - /// Motor Dispenser 5 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in mixer (Group = Mixer, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser5OverCurrent")] MotorDispenser5OverCurrent = 105, + [pbr::OriginalName("MIXER_OVERTEMPERATURE")] MixerOvertemperature = 97, /// <summary> - /// Motor Dispenser 6 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Undertemperature in mixer (Group = Mixer, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser6OverCurrent")] MotorDispenser6OverCurrent = 106, + [pbr::OriginalName("MIXER_UNDERTEMPERATURE_A")] MixerUndertemperatureA = 98, /// <summary> - /// Motor Dispenser 7 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Undertemperature in mixer (Group = Mixer, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser7OverCurrent")] MotorDispenser7OverCurrent = 107, + [pbr::OriginalName("MIXER_UNDERTEMPERATURE_B")] MixerUndertemperatureB = 99, /// <summary> - /// Motor Dispenser 8 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overheating in mixer (Group = Mixer, Category = Safety) /// </summary> - [pbr::OriginalName("MotorDispenser8OverCurrent")] MotorDispenser8OverCurrent = 108, + [pbr::OriginalName("MIXER_THERMAL_CUTOFF")] MixerThermalCutoff = 100, /// <summary> - /// Motor Dryer Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Mixer current out of range (Group = Mixer, Category = Error) /// </summary> - [pbr::OriginalName("MotorDryerOverTemperature")] MotorDryerOverTemperature = 109, + [pbr::OriginalName("MIXER_CURRENT_OUT_OF_RANGE")] MixerCurrentOutOfRange = 101, /// <summary> - /// Motor Feeder Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Mixer current loop break (Group = Mixer, Category = Error) /// </summary> - [pbr::OriginalName("MotorFeederOverTemperature")] MotorFeederOverTemperature = 110, + [pbr::OriginalName("MIXER_CURRENT_LOOP_BREAK")] MixerCurrentLoopBreak = 102, /// <summary> - /// Motor Right Loader Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overpressure in dispenser 1 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorRLoaderOverTemperature")] MotorRloaderOverTemperature = 111, + [pbr::OriginalName("DISPENSER_1_OVERPRESSURE")] Dispenser1Overpressure = 103, /// <summary> - /// Motor Pooler Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overpressure in dispenser 2 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorPoolerOverTemperature")] MotorPoolerOverTemperature = 112, + [pbr::OriginalName("DISPENSER_2_OVERPRESSURE")] Dispenser2Overpressure = 104, /// <summary> - /// Motor Left Loader Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overpressure in dispenser 3 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorLLoaderOverTemperature")] MotorLloaderOverTemperature = 113, + [pbr::OriginalName("DISPENSER_3_OVERPRESSURE")] Dispenser3Overpressure = 105, /// <summary> - /// Motor Winder Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overpressure in dispenser 4 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorWinderOverTemperature")] MotorWinderOverTemperature = 114, + [pbr::OriginalName("DISPENSER_4_OVERPRESSURE")] Dispenser4Overpressure = 106, /// <summary> - /// Motor Screw Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overpressure in dispenser 5 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorScrewOverTemperature")] MotorScrewOverTemperature = 115, + [pbr::OriginalName("DISPENSER_5_OVERPRESSURE")] Dispenser5Overpressure = 107, /// <summary> - /// Motor Loading Arm Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overpressure in dispenser 6 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorLoadingArmOverTemperature")] MotorLoadingArmOverTemperature = 116, + [pbr::OriginalName("DISPENSER_6_OVERPRESSURE")] Dispenser6Overpressure = 108, /// <summary> - /// Motor Dispenser 1 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overpressure in dispenser 7 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser1OverTemperature")] MotorDispenser1OverTemperature = 117, + [pbr::OriginalName("DISPENSER_7_OVERPRESSURE")] Dispenser7Overpressure = 109, /// <summary> - /// Motor Dispenser 2 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overpressure in dispenser 8 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser2OverTemperature")] MotorDispenser2OverTemperature = 118, + [pbr::OriginalName("DISPENSER_8_OVERPRESSURE")] Dispenser8Overpressure = 110, /// <summary> - /// Motor Dispenser 3 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Underpressure in dispenser 1 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser3OverTemperature")] MotorDispenser3OverTemperature = 119, + [pbr::OriginalName("DISPENSER_1_UNDERPRESSURE")] Dispenser1Underpressure = 111, /// <summary> - /// Motor Dispenser 4 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Underpressure in dispenser 2 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser4OverTemperature")] MotorDispenser4OverTemperature = 120, + [pbr::OriginalName("DISPENSER_2_UNDERPRESSURE")] Dispenser2Underpressure = 112, /// <summary> - /// Motor Dispenser 5 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Underpressure in dispenser 3 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser5OverTemperature")] MotorDispenser5OverTemperature = 121, + [pbr::OriginalName("DISPENSER_3_UNDERPRESSURE")] Dispenser3Underpressure = 113, /// <summary> - /// Motor Dispenser 6 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Underpressure in dispenser 4 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser6OverTemperature")] MotorDispenser6OverTemperature = 122, + [pbr::OriginalName("DISPENSER_4_UNDERPRESSURE")] Dispenser4Underpressure = 114, /// <summary> - /// Motor Dispenser 7 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Underpressure in dispenser 5 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser7OverTemperature")] MotorDispenser7OverTemperature = 123, + [pbr::OriginalName("DISPENSER_5_UNDERPRESSURE")] Dispenser5Underpressure = 115, /// <summary> - /// Motor Dispenser 8 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Underpressure in dispenser 6 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser8OverTemperature")] MotorDispenser8OverTemperature = 124, + [pbr::OriginalName("DISPENSER_6_UNDERPRESSURE")] Dispenser6Underpressure = 116, /// <summary> - /// Motor Dryer Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Underpressure in dispenser 7 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDryerStall")] MotorDryerStall = 125, + [pbr::OriginalName("DISPENSER_7_UNDERPRESSURE")] Dispenser7Underpressure = 117, /// <summary> - /// Motor Feeder Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Underpressure in dispenser 8 (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorFeederStall")] MotorFeederStall = 126, + [pbr::OriginalName("DISPENSER_8_UNDERPRESSURE")] Dispenser8Underpressure = 118, /// <summary> - /// Motor Right Loader Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dispenser 1 empty (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorRLoaderStall")] MotorRloaderStall = 127, + [pbr::OriginalName("DISPENSER_1_EMPTY")] Dispenser1Empty = 119, /// <summary> - /// Motor Pooler Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dispenser 2 empty (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorPoolerStall")] MotorPoolerStall = 128, + [pbr::OriginalName("DISPENSER_2_EMPTY")] Dispenser2Empty = 120, /// <summary> - /// Motor Left Loader Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dispenser 3 empty (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorLLoaderStall")] MotorLloaderStall = 129, + [pbr::OriginalName("DISPENSER_3_EMPTY")] Dispenser3Empty = 121, /// <summary> - /// Motor Winder Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dispenser 4 empty (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorWinderStall")] MotorWinderStall = 130, + [pbr::OriginalName("DISPENSER_4_EMPTY")] Dispenser4Empty = 122, /// <summary> - /// Motor Screw Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dispenser 5 empty (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorScrewStall")] MotorScrewStall = 131, + [pbr::OriginalName("DISPENSER_5_EMPTY")] Dispenser5Empty = 123, /// <summary> - /// Motor Loading Arm Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dispenser 6 empty (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorLoadingArmStall")] MotorLoadingArmStall = 132, + [pbr::OriginalName("DISPENSER_6_EMPTY")] Dispenser6Empty = 124, /// <summary> - /// Motor Dispenser 1 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Dispenser 7 empty (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser1Stall")] MotorDispenser1Stall = 133, + [pbr::OriginalName("DISPENSER_7_EMPTY")] Dispenser7Empty = 125, /// <summary> - /// Motor Dispenser 2 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Dispenser 8 empty (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser2Stall")] MotorDispenser2Stall = 134, + [pbr::OriginalName("DISPENSER_8_EMPTY")] Dispenser8Empty = 126, /// <summary> - /// Motor Dispenser 3 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Failed to refill dispenser 1 (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("MotorDispenser3Stall")] MotorDispenser3Stall = 135, + [pbr::OriginalName("DISPENSER_1_REFILL_FAILURE")] Dispenser1RefillFailure = 127, /// <summary> - /// Motor Dispenser 4 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Failed to refill dispenser 2 (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("MotorDispenser4Stall")] MotorDispenser4Stall = 136, + [pbr::OriginalName("DISPENSER_2_REFILL_FAILURE")] Dispenser2RefillFailure = 128, /// <summary> - /// Motor Dispenser 5 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Failed to refill dispenser 3 (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("MotorDispenser5Stall")] MotorDispenser5Stall = 137, + [pbr::OriginalName("DISPENSER_3_REFILL_FAILURE")] Dispenser3RefillFailure = 129, /// <summary> - /// Motor Dispenser 6 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Failed to refill dispenser 4 (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("MotorDispenser6Stall")] MotorDispenser6Stall = 138, + [pbr::OriginalName("DISPENSER_4_REFILL_FAILURE")] Dispenser4RefillFailure = 130, /// <summary> - /// Motor Dispenser 7 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Failed to refill dispenser 5 (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("MotorDispenser7Stall")] MotorDispenser7Stall = 139, + [pbr::OriginalName("DISPENSER_5_REFILL_FAILURE")] Dispenser5RefillFailure = 131, /// <summary> - /// Motor Dispenser 8 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Failed to refill dispenser 6 (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("MotorDispenser8Stall")] MotorDispenser8Stall = 140, + [pbr::OriginalName("DISPENSER_6_REFILL_FAILURE")] Dispenser6RefillFailure = 132, /// <summary> - /// Motor Dryer Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Failed to refill dispenser 7 (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("MotorDryerUnderVoltage")] MotorDryerUnderVoltage = 141, + [pbr::OriginalName("DISPENSER_7_REFILL_FAILURE")] Dispenser7RefillFailure = 133, /// <summary> - /// Motor Feeder Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Failed to refill dispenser 8 (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("MotorFeederUnderVoltage")] MotorFeederUnderVoltage = 142, + [pbr::OriginalName("DISPENSER_8_REFILL_FAILURE")] Dispenser8RefillFailure = 134, /// <summary> - /// Motor Right Loader Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overcurrent in dispenser 1 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorRLoaderUnderVoltage")] MotorRloaderUnderVoltage = 143, + [pbr::OriginalName("DISPENSER_1_MOTOR_OVERCURRENT")] Dispenser1MotorOvercurrent = 135, /// <summary> - /// Motor Pooler Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overcurrent in dispenser 2 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorPoolerUnderVoltage")] MotorPoolerUnderVoltage = 144, + [pbr::OriginalName("DISPENSER_2_MOTOR_OVERCURRENT")] Dispenser2MotorOvercurrent = 136, /// <summary> - /// Motor Left Loader Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overcurrent in dispenser 3 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorLLoaderUnderVoltage")] MotorLloaderUnderVoltage = 145, + [pbr::OriginalName("DISPENSER_3_MOTOR_OVERCURRENT")] Dispenser3MotorOvercurrent = 137, /// <summary> - /// Motor Winder Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overcurrent in dispenser 4 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorWinderUnderVoltage")] MotorWinderUnderVoltage = 146, + [pbr::OriginalName("DISPENSER_4_MOTOR_OVERCURRENT")] Dispenser4MotorOvercurrent = 138, /// <summary> - /// Motor Screw Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overcurrent in dispenser 5 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorScrewUnderVoltage")] MotorScrewUnderVoltage = 147, + [pbr::OriginalName("DISPENSER_5_MOTOR_OVERCURRENT")] Dispenser5MotorOvercurrent = 139, /// <summary> - /// Motor Loading Arm Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overcurrent in dispenser 6 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorLoadingArmUnderVoltage")] MotorLoadingArmUnderVoltage = 148, + [pbr::OriginalName("DISPENSER_6_MOTOR_OVERCURRENT")] Dispenser6MotorOvercurrent = 140, /// <summary> - /// Motor Dispenser 1 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overcurrent in dispenser 7 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser1UnderVoltage")] MotorDispenser1UnderVoltage = 149, + [pbr::OriginalName("DISPENSER_7_MOTOR_OVERCURRENT")] Dispenser7MotorOvercurrent = 141, /// <summary> - /// Motor Dispenser 2 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overcurrent in dispenser 8 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser2UnderVoltage")] MotorDispenser2UnderVoltage = 150, + [pbr::OriginalName("DISPENSER_8_MOTOR_OVERCURRENT")] Dispenser8MotorOvercurrent = 142, /// <summary> - /// Motor Dispenser 3 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in dispenser 1 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser3UnderVoltage")] MotorDispenser3UnderVoltage = 151, + [pbr::OriginalName("DISPENSER_1_MOTOR_OVERTEMPERATURE")] Dispenser1MotorOvertemperature = 143, /// <summary> - /// Motor Dispenser 4 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in dispenser 2 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser4UnderVoltage")] MotorDispenser4UnderVoltage = 152, + [pbr::OriginalName("DISPENSER_2_MOTOR_OVERTEMPERATURE")] Dispenser2MotorOvertemperature = 144, /// <summary> - /// Motor Dispenser 5 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in dispenser 3 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser5UnderVoltage")] MotorDispenser5UnderVoltage = 153, + [pbr::OriginalName("DISPENSER_3_MOTOR_OVERTEMPERATURE")] Dispenser3MotorOvertemperature = 145, /// <summary> - /// Motor Dispenser 6 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in dispenser 4 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser6UnderVoltage")] MotorDispenser6UnderVoltage = 154, + [pbr::OriginalName("DISPENSER_4_MOTOR_OVERTEMPERATURE")] Dispenser4MotorOvertemperature = 146, /// <summary> - /// Motor Dispenser 7 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in dispenser 5 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser7UnderVoltage")] MotorDispenser7UnderVoltage = 155, + [pbr::OriginalName("DISPENSER_5_MOTOR_OVERTEMPERATURE")] Dispenser5MotorOvertemperature = 147, /// <summary> - /// Motor Dispenser 8 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in dispenser 6 motor (Group = Dispensers, Category = Error) /// </summary> - [pbr::OriginalName("MotorDispenser8UnderVoltage")] MotorDispenser8UnderVoltage = 156, + [pbr::OriginalName("DISPENSER_6_MOTOR_OVERTEMPERATURE")] Dispenser6MotorOvertemperature = 148, + /// <summary> + ///Overtemperature in dispenser 7 motor (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_7_MOTOR_OVERTEMPERATURE")] Dispenser7MotorOvertemperature = 149, + /// <summary> + ///Overtemperature in dispenser 8 motor (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_8_MOTOR_OVERTEMPERATURE")] Dispenser8MotorOvertemperature = 150, + /// <summary> + ///Dispenser 1 motor stalled (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_1_MOTOR_STALL")] Dispenser1MotorStall = 151, + /// <summary> + ///Dispenser 2 motor stalled (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_2_MOTOR_STALL")] Dispenser2MotorStall = 152, + /// <summary> + ///Dispenser 3 motor stalled (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_3_MOTOR_STALL")] Dispenser3MotorStall = 153, + /// <summary> + ///Dispenser 4 motor stalled (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_4_MOTOR_STALL")] Dispenser4MotorStall = 154, + /// <summary> + ///Dispenser 5 motor stalled (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_5_MOTOR_STALL")] Dispenser5MotorStall = 155, + /// <summary> + ///Dispenser 6 motor stalled (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_6_MOTOR_STALL")] Dispenser6MotorStall = 156, + /// <summary> + ///Dispenser 7 motor stalled (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_7_MOTOR_STALL")] Dispenser7MotorStall = 157, + /// <summary> + ///Dispenser 8 motor stalled (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_8_MOTOR_STALL")] Dispenser8MotorStall = 158, + /// <summary> + ///Undervoltage in dispenser 1 motor (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_1_MOTOR_UNDERVOLTAGE")] Dispenser1MotorUndervoltage = 159, + /// <summary> + ///Undervoltage in dispenser 2 motor (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_2_MOTOR_UNDERVOLTAGE")] Dispenser2MotorUndervoltage = 160, + /// <summary> + ///Undervoltage in dispenser 3 motor (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_3_MOTOR_UNDERVOLTAGE")] Dispenser3MotorUndervoltage = 161, + /// <summary> + ///Undervoltage in dispenser 4 motor (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_4_MOTOR_UNDERVOLTAGE")] Dispenser4MotorUndervoltage = 162, + /// <summary> + ///Undervoltage in dispenser 5 motor (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_5_MOTOR_UNDERVOLTAGE")] Dispenser5MotorUndervoltage = 163, + /// <summary> + ///Undervoltage in dispenser 6 motor (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_6_MOTOR_UNDERVOLTAGE")] Dispenser6MotorUndervoltage = 164, + /// <summary> + ///Undervoltage in dispenser 7 motor (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_7_MOTOR_UNDERVOLTAGE")] Dispenser7MotorUndervoltage = 165, + /// <summary> + ///Undervoltage in dispenser 8 motor (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_8_MOTOR_UNDERVOLTAGE")] Dispenser8MotorUndervoltage = 166, + /// <summary> + ///Low level in mid-tank 1 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_1_LOW_LEVEL")] MidTank1LowLevel = 167, + /// <summary> + ///Low level in mid-tank 2 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_2_LOW_LEVEL")] MidTank2LowLevel = 168, + /// <summary> + ///Low level in mid-tank 3 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_3_LOW_LEVEL")] MidTank3LowLevel = 169, + /// <summary> + ///Low level in mid-tank 4 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_4_LOW_LEVEL")] MidTank4LowLevel = 170, + /// <summary> + ///Low level in mid-tank 5 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_5_LOW_LEVEL")] MidTank5LowLevel = 171, + /// <summary> + ///Low level in mid-tank 6 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_6_LOW_LEVEL")] MidTank6LowLevel = 172, + /// <summary> + ///Low level in mid-tank 7 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_7_LOW_LEVEL")] MidTank7LowLevel = 173, + /// <summary> + ///Low level in mid-tank 8 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_8_LOW_LEVEL")] MidTank8LowLevel = 174, + /// <summary> + ///Mid-tank 1 empty (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_1_EMPTY")] MidTank1Empty = 175, + /// <summary> + ///Mid-tank 2 empty (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_2_EMPTY")] MidTank2Empty = 176, + /// <summary> + ///Mid-tank 3 empty (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_3_EMPTY")] MidTank3Empty = 177, + /// <summary> + ///Mid-tank 4 empty (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_4_EMPTY")] MidTank4Empty = 178, + /// <summary> + ///Mid-tank 5 empty (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_5_EMPTY")] MidTank5Empty = 179, + /// <summary> + ///Mid-tank 6 empty (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_6_EMPTY")] MidTank6Empty = 180, + /// <summary> + ///Mid-tank 7 empty (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_7_EMPTY")] MidTank7Empty = 181, + /// <summary> + ///Mid-tank 8 empty (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_8_EMPTY")] MidTank8Empty = 182, + /// <summary> + ///Overflow in mid-tank 1 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_1_OVERFLOW")] MidTank1Overflow = 183, + /// <summary> + ///Overflow in mid-tank 2 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_2_OVERFLOW")] MidTank2Overflow = 184, + /// <summary> + ///Overflow in mid-tank 3 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_3_OVERFLOW")] MidTank3Overflow = 185, + /// <summary> + ///Overflow in mid-tank 4 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_4_OVERFLOW")] MidTank4Overflow = 186, + /// <summary> + ///Overflow in mid-tank 5 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_5_OVERFLOW")] MidTank5Overflow = 187, + /// <summary> + ///Overflow in mid-tank 6 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_6_OVERFLOW")] MidTank6Overflow = 188, + /// <summary> + ///Overflow in mid-tank 7 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_7_OVERFLOW")] MidTank7Overflow = 189, + /// <summary> + ///Overflow in mid-tank 8 (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_8_OVERFLOW")] MidTank8Overflow = 190, + /// <summary> + ///Air filter not present (Group = WasteHandlingSystem, Category = Safety) + /// </summary> + [pbr::OriginalName("AIR_FILTER_NOT_INSTALLED")] AirFilterNotInstalled = 191, + /// <summary> + ///Air filter clogged (Group = WasteHandlingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("AIR_FILTER_CLOGGED")] AirFilterClogged = 192, + /// <summary> + ///Waste emptying failure (Group = WasteHandlingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("WASTE_CONTAINER_EMPTYING_TIMEOUT")] WasteContainerEmptyingTimeout = 193, + /// <summary> + ///No air pressure (Group = WasteHandlingSystem, Category = Safety) + /// </summary> + [pbr::OriginalName("NO_AIR_PRESSURE")] NoAirPressure = 194, + /// <summary> + ///Overflow in waste container (Group = WasteHandlingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("WASTE_CONTAINER_OVERFLOW")] WasteContainerOverflow = 195, + /// <summary> + /// (Group = WasteHandlingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("VOC_SENSOR_ALARM")] VocSensorAlarm = 196, + /// <summary> + ///Chiller malfunction (Group = WasteHandlingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("CHILLER_DRY_CONTACT")] ChillerDryContact = 197, + /// <summary> + ///Insufficient air flow (Group = WasteHandlingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("INSUFFICIENT_AIR_FLOW")] InsufficientAirFlow = 198, + /// <summary> + ///Ink cartridge presence failure (Group = InkFillingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT")] InkCartridgePresenceSensorTimeout = 199, + /// <summary> + ///Ink cartridge identification failure (Group = InkFillingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("INK_CARTRIDGE_RFID_TIMEOUT")] InkCartridgeRfidTimeout = 200, + /// <summary> + ///No waste cartridge available (Group = InkFillingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("NO_WASTE_CARTRIDGE_AVAILABLE")] NoWasteCartridgeAvailable = 201, + /// <summary> + ///All waste cartridges are full (Group = InkFillingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("ALL_WASTE_CARTRIDGES_FULL")] AllWasteCartridgesFull = 202, + /// <summary> + ///Waste cartridge presence failure (Group = InkFillingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT")] WasteCartridgePresenceSensorTimeout = 203, + /// <summary> + ///Waste cartridge identification failure (Group = InkFillingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("WASTE_CARTRIDGE_RFID_TIMEOUT")] WasteCartridgeRfidTimeout = 204, + /// <summary> + ///Electrical cabinet fans RPM too low (Group = ElectricalCabinet, Category = Warning) + /// </summary> + [pbr::OriginalName("ELECTRICAL_CABINET_FANS_RPM_TOO_LOW")] ElectricalCabinetFansRpmTooLow = 205, + /// <summary> + ///Electrical cabinet fans stopped (Group = ElectricalCabinet, Category = Error) + /// </summary> + [pbr::OriginalName("ELECTRICAL_CABINET_FANS_STOPPED")] ElectricalCabinetFansStopped = 206, + /// <summary> + ///Occurs a request has been sent to the machine or external bridge service (Group = Transport, Category = Info) + /// </summary> + [pbr::OriginalName("REQUEST_SENT")] RequestSent = 1000, + /// <summary> + ///Occures when a response has been received (Group = Transport, Category = Info) + /// </summary> + [pbr::OriginalName("RESPONSE_RECEIVED")] ResponseReceived = 1001, + /// <summary> + ///Occures when a request to the machine has failed (Group = Transport, Category = Error) + /// </summary> + [pbr::OriginalName("REQUEST_FAILED")] RequestFailed = 1002, + /// <summary> + ///Occures when the application has encountered some error (Group = Application, Category = Error) + /// </summary> + [pbr::OriginalName("APPLICATION_EXCEPTION")] ApplicationException = 1003, + /// <summary> + ///General application event logs (Group = Application, Category = Info) + /// </summary> + [pbr::OriginalName("APPLICATION_INFORMATION")] ApplicationInformation = 1004, + /// <summary> + ///Notifies about application succesfully started (Group = Application, Category = Info) + /// </summary> + [pbr::OriginalName("APPLICATION_STARTED")] ApplicationStarted = 1005, + /// <summary> + ///Notifies about application termination (Group = Application, Category = Info) + /// </summary> + [pbr::OriginalName("APPLICATION_TERMINATED")] ApplicationTerminated = 1006, + /// <summary> + ///Occures when a diagnostics recording has been started (Group = Application, Category = Info) + /// </summary> + [pbr::OriginalName("RECORDING_STARTED")] RecordingStarted = 1007, + /// <summary> + ///Occures when a diagnostics recording has been stopped (Group = Application, Category = Info) + /// </summary> + [pbr::OriginalName("RECORDING_STOPPED")] RecordingStopped = 1008, + /// <summary> + ///Occures when a job status message has been received from the embedded device (Group = Application, Category = Info) + /// </summary> + [pbr::OriginalName("JOB_STATUS")] JobStatus = 1009, } #endregion diff --git a/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs index 02862350f..994ef4172 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs @@ -65,7 +65,7 @@ namespace Tango.UnitTesting { using (ObservablesContext db = ObservablesContext.CreateDefault(@"D:\Development\Tango\Software\DB\Tango.db", DataSourceType.SQLite)) { - var actions = db.ActionTypes.ToList(); + var actions = db.EventTypes.ToList(); } } } diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs index 2c58be781..51b619b46 100644 --- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs +++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs @@ -203,7 +203,7 @@ namespace Tango.DBObservablesGenerator.CLI if (descriptionProp != null) { - field.Description = descriptionProp.GetValue(row).ToString(); + field.Description = descriptionProp.GetValue(row).ToStringSafe(); } else { @@ -218,7 +218,10 @@ namespace Tango.DBObservablesGenerator.CLI File.WriteAllText(Path.Combine(enumerationsPath, enumFile.Name + ".cs"), code); } } - catch { } + catch (Exception ex) + { + + } } } //Generate Enumerations... diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs index e85a3e2ad..418e52139 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs @@ -18,15 +18,21 @@ namespace Tango.EventsTypesGenerator { public String Code { get; set; } public String Name { get; set; } + public String Title { get; set; } public String Description { get; set; } + public String TechnicalDescription { get; set; } + public String Index { get; set; } public String Category { get; set; } public String Group { get; set; } public String UserInterventionRequired { get; set; } - public String Resolvable { get; set; } + public String ActionsUI { get; set; } + public String ActionsEmbedded { get; set; } + public String NotificationTime { get; set; } + public String Guidance { get; set; } public override string ToString() { - return String.Format("{0}, {1}, {2}, {3}, {4}, {5}, {6}", Code, Name, Description, Category, Group, UserInterventionRequired, Resolvable); + return this.ToJsonString(); } } @@ -35,23 +41,12 @@ namespace Tango.EventsTypesGenerator Console.WriteLine("Generating hardware event types..."); ExcelReader reader = new ExcelReader(PathHelper.GetStartupPath() + "\\Events.xlsx"); - var results = reader.GetDataByIndex<ExcelEventType>("Events", 2); - - Console.WriteLine("Clearing all previous hardware events..."); + var results = reader.GetDataByIndex<ExcelEventType>("ALARM EVENTS HANDLING", 2); using (ObservablesContext db = ObservablesContext.CreateDefault()) { - var eventTypes = db.EventTypes.Include(x => x.EventTypesCategory).Include(x => x.EventTypesGroup).ToList(); - - foreach (var evType in eventTypes) - { - EventTypesGroups group = (EventTypesGroups)evType.EventTypesGroup.Code; - - if (group != EventTypesGroups.Application && group != EventTypesGroups.Transport) - { - db.EventTypes.Remove(evType); - } - } + Console.WriteLine("Clearing all event types..."); + db.Database.ExecuteSqlCommand("DELETE FROM EVENT_TYPES"); Console.WriteLine("Inserting new events..."); @@ -62,11 +57,18 @@ namespace Tango.EventsTypesGenerator EventType newEvent = new EventType(); newEvent.Code = int.Parse(evType.Code); newEvent.Name = evType.Name; + newEvent.Title = evType.Title; newEvent.Description = evType.Description; - newEvent.EventTypesCategory = db.EventTypesCategories.SingleOrDefault(x => x.Name == evType.Category); - newEvent.EventTypesGroup = db.EventTypesGroups.SingleOrDefault(x => x.Name == evType.Group); - newEvent.RequiresUserIntervention = evType.UserInterventionRequired == "Yes" ? true : false; - newEvent.Resolvable = evType.Resolvable == "Yes" ? true : false; + newEvent.TechnicalDescription = evType.TechnicalDescription; + newEvent.ComponentIndex = evType.Index != null ? int.Parse(evType.Index) : 0; + newEvent.Category = (EventTypeCategories)Enum.Parse(typeof(EventTypeCategories), evType.Category.Replace(" ", ""), true); + newEvent.Group = (EventTypeGroups)Enum.Parse(typeof(EventTypeGroups), evType.Group.Replace(" ", ""), true); + newEvent.NotificationTime = (EventTypeNotificationTimes)Enum.Parse(typeof(EventTypeNotificationTimes), evType.NotificationTime.Replace(" ", ""), true); + + //TODO: Do this when Nadav fixes the excel. + //newEvent.Actions = evType.ActionsUI.Split('\n').Select(x => (EventTypeActions)Enum.Parse(typeof(EventTypeActions), x.Replace(" ", ""), true)).ToList(); + + newEvent.RequiresUserIntervention = evType.UserInterventionRequired == "Yes"; db.EventTypes.Add(newEvent); } diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs index 849dd5cde..b5442e72b 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs @@ -88,9 +88,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwareMotorType", "HardwareMotorType")); - foreach (var prop in typeof(HardwareMotor).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwareMotorBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareMotor>(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareMotorBase>(prop))); } String enumString = enumFile.GenerateCode(); @@ -127,9 +127,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwareDancerType", "HardwareDancerType")); - foreach (var prop in typeof(HardwareDancer).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwareDancerBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareDancer>(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareDancerBase>(prop))); } String enumString = enumFile.GenerateCode(); @@ -166,9 +166,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwarePidControlType", "HardwarePidControlType")); - foreach (var prop in typeof(HardwarePidControl).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwarePidControlBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwarePidControl>(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwarePidControlBase>(prop))); } String enumString = enumFile.GenerateCode(); @@ -206,19 +206,19 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("Index", "int32")); - foreach (var prop in typeof(DispenserType).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) + foreach (var prop in typeof(DispenserTypeBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) { if (prop.Name != "Name" && prop.Name != "Code") { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<DispenserType>(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<DispenserTypeBase>(prop))); } } - foreach (var prop in typeof(Dispenser).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) + foreach (var prop in typeof(DispenserBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) { if (prop.Name != nameof(Dispenser.IsInstalled)) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<DispenserType>(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<DispenserBase>(prop))); } } @@ -255,9 +255,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwareWinderType", "HardwareWinderType")); - foreach (var prop in typeof(HardwareWinder).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwareWinderBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareWinder>(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareWinderBase>(prop))); } String enumString = enumFile.GenerateCode(); @@ -293,9 +293,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwareSpeedSensorType", "HardwareSpeedSensorType")); - foreach (var prop in typeof(HardwareSpeedSensor).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwareSpeedSensorBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareSpeedSensor>(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareSpeedSensorBase>(prop))); } String enumString = enumFile.GenerateCode(); @@ -331,9 +331,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwareBlowerType", "HardwareBlowerType")); - foreach (var prop in typeof(HardwareBlower).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwareBlowerBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareBlower>(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareBlowerBase>(prop))); } String enumString = enumFile.GenerateCode(); @@ -369,9 +369,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwareBreakSensorType", "HardwareBreakSensorType")); - foreach (var prop in typeof(HardwareBreakSensor).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwareBreakSensorBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareBreakSensor>(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareBreakSensorBase>(prop))); } String enumString = enumFile.GenerateCode(); @@ -534,7 +534,7 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("JobSpoolType", "JobSpoolType")); - foreach (var prop in typeof(SpoolType).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) + foreach (var prop in typeof(SpoolTypeBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) { if (prop.Name != "Name" && prop.Name != "Code") { @@ -542,7 +542,7 @@ namespace Tango.PMRGenerator.CLI } } - foreach (var prop in typeof(Spool).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) + foreach (var prop in typeof(SpoolBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) { messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType))); } @@ -561,9 +561,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Name = "ProcessParameters"; messageFile.Package = "Tango.PMR.Printing"; - foreach (var prop in typeof(ProcessParametersTable).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) + foreach (var prop in typeof(ProcessParametersTableBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<ProcessParametersTable>(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<ProcessParametersTableBase>(prop))); } String messageString = messageFile.GenerateCode(); @@ -704,12 +704,19 @@ namespace Tango.PMRGenerator.CLI enumFile.Name = "EventType"; enumFile.Package = "Tango.PMR.Diagnostics"; - foreach (var field in db.EventTypes.ToList().Where(x => x.Code < 1000).OrderBy(x => x.Code)) + enumFile.Fields.Add(new EnumerationField() + { + Name = "None", + Description = "Must contain a 0 value", + Value = 0, + }); + + foreach (var field in db.EventTypes.ToList().OrderBy(x => x.Code)) { enumFile.Fields.Add(new EnumerationField() { Name = field.Name.Replace(" ", ""), - Description = field.Description + String.Format(" (Group = {0}, Category = {1}, Actions = {2})", field.EventTypesGroup.Name, field.EventTypesCategory.Name, String.Join(", ", field.EventTypesActions.Select(x => x.ActionType.Name))), + Description = field.Description + String.Format(" (Group = {0}, Category = {1})", field.Group.ToString(), field.Category.ToString()), Value = field.Code, }); } |