diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-20 20:10:28 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-20 20:10:28 +0300 |
| commit | e6c909c6d72d827175f75f77b2b7ed0f3a6feb71 (patch) | |
| tree | daa8412eeb63dc20c1b2c31d5de7e335a0d571c0 /Software/Visual_Studio | |
| parent | 7c0f64ad7bc21f1a703c4aa8f77cdde999b13896 (diff) | |
| download | Tango-e6c909c6d72d827175f75f77b2b7ed0f3a6feb71.tar.gz Tango-e6c909c6d72d827175f75f77b2b7ed0f3a6feb71.zip | |
Working on PPC.
Added some fields to DB Job.
Added Customers Table.
Diffstat (limited to 'Software/Visual_Studio')
23 files changed, 734 insertions, 179 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/color-length.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/color-length.png Binary files differnew file mode 100644 index 000000000..6495c83ff --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/color-length.png diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj index dd2b5b3fc..fedac59a3 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj @@ -206,5 +206,8 @@ <ItemGroup> <Resource Include="Images\JobView\output.png" /> </ItemGroup> + <ItemGroup> + <Resource Include="Images\JobView\color-length.png" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml index f200d0382..90162f501 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml @@ -20,136 +20,142 @@ <Setter Property="Margin" Value="80 30 60 0"></Setter> </Style> </UserControl.Resources> - + <Grid Background="{StaticResource TangoMidBackgroundBrush}"> <Grid.RowDefinitions> <RowDefinition Height="Auto"/> <RowDefinition Height="1*"/> </Grid.RowDefinitions> - <Border Padding="20" Background="{StaticResource TangoPrimaryBackgroundBrush}" BorderThickness="0 0 0 1" BorderBrush="{StaticResource TangoDividerBrush}"> - <Border.Effect> - <DropShadowEffect Color="Silver" ShadowDepth="0" BlurRadius="20" Opacity="1" /> - </Border.Effect> - <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold" Text="{Binding Job.Name}"></TextBlock> - </Border> - <Grid Grid.Row="1"> - <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top" Height="57" Margin="0 -28 30 0"> - <touch:TouchButton Margin="0 0 30 0" Padding="15" Style="{StaticResource TangoRoundTouchButton}"> - <Image Source="../Images/JobView/delete.png" /> - </touch:TouchButton> - <touch:TouchButton Padding="20" Style="{StaticResource TangoRoundTouchButton}"> - <Image Source="../Images/JobView/remove.png" /> - </touch:TouchButton> - </StackPanel> + <Grid x:Name="Container"> + <touch:LightTouchScrollViewer> + <Grid Margin="10 60 10 0" VerticalAlignment="Top"> + <StackPanel> + <touch:TouchExpander Padding="20 15"> + <touch:TouchExpander.Header> + <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0 0 20 0"> + <Image Source="../Images/JobView/job-details.png" Width="39" /> + <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Job Details</TextBlock> - <Grid Margin="10 60 10 0"> - <StackPanel> - <touch:TouchExpander Padding="20 15"> - <touch:TouchExpander.Header> - <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0 0 20 0"> - <Image Source="../Images/JobView/job-details.png" Width="39" /> - <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Job Details</TextBlock> + <TextBlock FontWeight="Medium" Margin="50 0 0 0" VerticalAlignment="Center" Text="{Binding Job.Rml.Name}"></TextBlock> + </StackPanel> + </touch:TouchExpander.Header> - <TextBlock FontWeight="Medium" Margin="50 0 0 0" VerticalAlignment="Center" Text="{Binding Job.Rml.Name}"></TextBlock> - </StackPanel> - </touch:TouchExpander.Header> + <StackPanel Margin="60 30 60 20" TextElement.FontWeight="Medium"> + <controls:TableGrid RowHeight="50"> + <TextBlock>Job name:</TextBlock> + <touch:TouchTextBox Text="{Binding Job.Name,UpdateSourceTrigger=PropertyChanged}" KeyboardMode="AlphaNumeric" KeyboardAction="Next" KeyboardContainer="{Binding ElementName=Container}" /> + <TextBlock>Customer name:</TextBlock> + <touch:TouchTextBox Text="{Binding Job.Customer.Name}" KeyboardMode="AlphaNumeric" KeyboardAction="Next" KeyboardContainer="{Binding ElementName=Container}" /> + <TextBlock>Thread type:</TextBlock> + <touch:TouchComboBox SelectedItem="{Binding Job.Rml.Name}" /> + <TextBlock>Comment:</TextBlock> + <TextBox Margin="20 0 0 -42" Text="{Binding Job.Description}" FocusVisualStyle="{x:Null}" BorderBrush="{StaticResource TangoDividerBrush}" Foreground="{StaticResource TangoDarkForegroundBrush}" AcceptsReturn="True" TextWrapping="Wrap" Height="60" Padding="5"> - <StackPanel Margin="60 30 60 20" TextElement.FontWeight="Medium"> - <controls:TableGrid RowHeight="50"> - <TextBlock>Job name:</TextBlock> - <touch:TouchTextBox Text="{Binding Job.Name,UpdateSourceTrigger=PropertyChanged}" /> - <TextBlock>Customer name:</TextBlock> - <touch:TouchComboBox/> - <TextBlock>Thread type:</TextBlock> - <touch:TouchComboBox/> - <TextBlock>Comment:</TextBlock> - <TextBox Margin="20 0 0 -42" Text="{Binding Job.Description}" FocusVisualStyle="{x:Null}" BorderBrush="{StaticResource TangoDividerBrush}" Foreground="{StaticResource TangoDarkForegroundBrush}" AcceptsReturn="True" TextWrapping="Wrap" Height="60" Padding="5"> - - </TextBox> - </controls:TableGrid> + </TextBox> + </controls:TableGrid> - <Grid HorizontalAlignment="Center" Margin="0 20 0 0" TextElement.Foreground="{StaticResource TangoGrayTextBrush}"> - <Grid.ColumnDefinitions> - <ColumnDefinition Width="Auto" /> - <ColumnDefinition Width="Auto" /> - <ColumnDefinition Width="Auto" /> - <ColumnDefinition Width="Auto" /> - <ColumnDefinition Width="Auto" /> - </Grid.ColumnDefinitions> + <Grid HorizontalAlignment="Center" Margin="0 20 0 0" TextElement.Foreground="{StaticResource TangoGrayTextBrush}"> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="Auto" /> + <ColumnDefinition Width="Auto" /> + <ColumnDefinition Width="Auto" /> + <ColumnDefinition Width="Auto" /> + <ColumnDefinition Width="Auto" /> + </Grid.ColumnDefinitions> - <TextBlock HorizontalAlignment="Left"> + <TextBlock HorizontalAlignment="Left"> <Run Text="Job status:"></Run> <Run Text="{Binding Job.JobStatus}"></Run> - </TextBlock> + </TextBlock> - <Rectangle Margin="20 0" Grid.Column="1" HorizontalAlignment="Center" StrokeThickness="1" Stroke="{StaticResource TangoGrayTextBrush}" /> + <Rectangle Margin="20 0" Grid.Column="1" HorizontalAlignment="Center" StrokeThickness="1" Stroke="{StaticResource TangoGrayTextBrush}" /> - <TextBlock Grid.Column="2" HorizontalAlignment="Center"> + <TextBlock Grid.Column="2" HorizontalAlignment="Center"> <Run Text="Last updated:"></Run> <Run Text="{Binding Job.LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter},TargetNullValue=Never}"></Run> - </TextBlock> + </TextBlock> - <Rectangle Margin="20 0" Grid.Column="3" HorizontalAlignment="Center" StrokeThickness="1" Stroke="{StaticResource TangoGrayTextBrush}" /> + <Rectangle Margin="20 0" Grid.Column="3" HorizontalAlignment="Center" StrokeThickness="1" Stroke="{StaticResource TangoGrayTextBrush}" /> - <TextBlock Grid.Column="4" HorizontalAlignment="Right"> + <TextBlock Grid.Column="4" HorizontalAlignment="Right"> <Run Text="Last dye:"></Run> <Run Text="{Binding Job.LastRun,Converter={StaticResource DateTimeUTCToShortDateConverter},TargetNullValue=Never}"></Run> - </TextBlock> - </Grid> - </StackPanel> - </touch:TouchExpander> + </TextBlock> + </Grid> + </StackPanel> + </touch:TouchExpander> - <Border Style="{StaticResource TangoTouchBorder}" Margin="0 12 0 0" Padding="0 0 0 40"> - <StackPanel> - <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}"> - <Image Source="../Images/JobView/job-details.png" Width="39" /> - <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Color & Length</TextBlock> - </StackPanel> + <Border Style="{StaticResource TangoTouchBorder}" Margin="0 12 0 0" Padding="0 0 0 40"> + <StackPanel> + <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}"> + <Image Source="../Images/JobView/color-length.png" Width="39" /> + <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Color & Length</TextBlock> + </StackPanel> - <DockPanel Style="{StaticResource Level2Container}"> - <TextBlock Text="Color Catalog/Space"></TextBlock> - <touch:TouchComboBox Margin="20 0 0 0" /> - </DockPanel> + <DockPanel Style="{StaticResource Level2Container}"> + <TextBlock Text="Color Catalog/Space"></TextBlock> + <touch:TouchComboBox Margin="20 0 0 0" SelectedItem="{Binding Job.ColorSpace.Name}" /> + </DockPanel> - <StackPanel HorizontalAlignment="Right" Style="{StaticResource Level2Container}" Orientation="Horizontal"> - <touch:TouchButton FontWeight="Normal" RippleBrush="{StaticResource TangoRippleDarkBrush}" FontSize="{StaticResource TangoDefaultFontSize}" EnableDropShadow="False" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="170" CornerRadius="20" Padding="0 10" Background="Transparent" BorderThickness="2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}"> - <StackPanel Orientation="Horizontal"> - <fa:ImageAwesome Icon="Plus" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="16" Height="16" /> - <TextBlock Margin="10 0 0 0">SOLID SEGMENT</TextBlock> - </StackPanel> - </touch:TouchButton> - <touch:TouchButton FontWeight="Normal" RippleBrush="{StaticResource TangoRippleDarkBrush}" FontSize="{StaticResource TangoDefaultFontSize}" Margin="30 0 0 0" EnableDropShadow="False" Foreground="{StaticResource TangoPrimaryAccentBrush}" Padding="0 10" Width="200" CornerRadius="20" Background="Transparent" BorderThickness="2"> - <touch:TouchButton.BorderBrush> - <LinearGradientBrush> - <GradientStop Offset="0" Color="{StaticResource TangoPrimaryAccentColor}" /> - <GradientStop Offset="1" Color="#57F157" /> - </LinearGradientBrush> - </touch:TouchButton.BorderBrush> + <StackPanel HorizontalAlignment="Right" Style="{StaticResource Level2Container}" Orientation="Horizontal"> + <touch:TouchButton FontWeight="Normal" RippleBrush="{StaticResource TangoRippleDarkBrush}" FontSize="{StaticResource TangoDefaultFontSize}" EnableDropShadow="False" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="170" CornerRadius="20" Padding="0 10" Background="Transparent" BorderThickness="2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}"> + <StackPanel Orientation="Horizontal"> + <fa:ImageAwesome Icon="Plus" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="16" Height="16" /> + <TextBlock Margin="10 0 0 0">SOLID SEGMENT</TextBlock> + </StackPanel> + </touch:TouchButton> + <touch:TouchButton FontWeight="Normal" RippleBrush="{StaticResource TangoRippleDarkBrush}" FontSize="{StaticResource TangoDefaultFontSize}" Margin="30 0 0 0" EnableDropShadow="False" Foreground="{StaticResource TangoPrimaryAccentBrush}" Padding="0 10" Width="200" CornerRadius="20" Background="Transparent" BorderThickness="2"> + <touch:TouchButton.BorderBrush> + <LinearGradientBrush> + <GradientStop Offset="0" Color="{StaticResource TangoPrimaryAccentColor}" /> + <GradientStop Offset="1" Color="#57F157" /> + </LinearGradientBrush> + </touch:TouchButton.BorderBrush> - <StackPanel Orientation="Horizontal"> - <fa:ImageAwesome Icon="Plus" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="16" Height="16" /> - <TextBlock Margin="10 0 0 0">GRADIENT SEGMENT</TextBlock> + <StackPanel Orientation="Horizontal"> + <fa:ImageAwesome Icon="Plus" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="16" Height="16" /> + <TextBlock Margin="10 0 0 0">GRADIENT SEGMENT</TextBlock> + </StackPanel> + </touch:TouchButton> </StackPanel> - </touch:TouchButton> - </StackPanel> - <Rectangle Stroke="{StaticResource TangoDividerBrush}" Margin="0 30 0 0" /> + <Rectangle Stroke="{StaticResource TangoDividerBrush}" Margin="0 30 0 0" /> - <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}"> - <Image Source="../Images/JobView/output.png" Width="39" /> - <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Output</TextBlock> - </StackPanel> + <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}"> + <Image Source="../Images/JobView/output.png" Width="39" /> + <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Output</TextBlock> + </StackPanel> - <DockPanel Style="{StaticResource Level2Container}"> - <TextBlock Text="Output spool (m):"></TextBlock> - <touch:TouchComboBox SelectedItem="{Binding Job.SpoolType.Name}" Margin="40 0 0 0" /> - </DockPanel> + <DockPanel Style="{StaticResource Level2Container}"> + <TextBlock Text="Output spool (m):"></TextBlock> + <touch:TouchComboBox SelectedItem="{Binding Job.SpoolType.Name}" Margin="40 0 0 0" /> + </DockPanel> + </StackPanel> + </Border> </StackPanel> - </Border> - </StackPanel> + </Grid> + </touch:LightTouchScrollViewer> </Grid> </Grid> + + <Border Padding="20" Background="{StaticResource TangoPrimaryBackgroundBrush}" BorderThickness="0 0 0 1" BorderBrush="{StaticResource TangoDividerBrush}"> + <Border.Effect> + <DropShadowEffect Color="Silver" ShadowDepth="0" BlurRadius="20" Opacity="1" /> + </Border.Effect> + + <Grid> + <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold" Text="{Binding Job.Name}"></TextBlock> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="57" Margin="0 0 30 -45"> + <touch:TouchButton Margin="0 0 30 0" Padding="15" Style="{StaticResource TangoRoundTouchButton}"> + <Image Source="../Images/JobView/delete.png" /> + </touch:TouchButton> + <touch:TouchButton Padding="20" Style="{StaticResource TangoRoundTouchButton}"> + <Image Source="../Images/JobView/remove.png" /> + </touch:TouchButton> + </StackPanel> + </Grid> + </Border> </Grid> </UserControl> diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs index 07ae7cf39..504b40126 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs @@ -112,6 +112,25 @@ namespace Tango.BL.Entities } + protected ObservableCollection<Job> _jobs; + /// <summary> + /// Gets or sets the colorspace jobs. + /// </summary> + + public virtual ObservableCollection<Job> Jobs + { + get + { + return _jobs; + } + + set + { + _jobs = value; RaisePropertyChanged(nameof(Jobs)); + } + + } + /// <summary> /// Initializes a new instance of the <see cref="ColorSpace" /> class. /// </summary> @@ -122,6 +141,8 @@ namespace Tango.BL.Entities ColorCatalogs = new ObservableCollection<ColorCatalog>(); + Jobs = new ObservableCollection<Job>(); + } } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/Customer.cs b/Software/Visual_Studio/Tango.BL/Entities/Customer.cs new file mode 100644 index 000000000..2738122a6 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/Customer.cs @@ -0,0 +1,108 @@ +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; + +namespace Tango.BL.Entities +{ + [Table("CUSTOMERS")] + public partial class Customer : ObservableEntity<Customer> + { + + protected String _organizationguid; + /// <summary> + /// Gets or sets the customer organization guid. + /// </summary> + [Column("ORGANIZATION_GUID")] + [ForeignKey("Organization")] + + public String OrganizationGuid + { + get + { + return _organizationguid; + } + + set + { + _organizationguid = value; RaisePropertyChanged(nameof(OrganizationGuid)); + } + + } + + protected String _name; + /// <summary> + /// Gets or sets the customer name. + /// </summary> + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected Organization _organization; + /// <summary> + /// Gets or sets the customer organization. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual Organization Organization + { + get + { + return _organization; + } + + set + { + _organization = value; RaisePropertyChanged(nameof(Organization)); + } + + } + + protected ObservableCollection<Job> _jobs; + /// <summary> + /// Gets or sets the customer jobs. + /// </summary> + + public virtual ObservableCollection<Job> Jobs + { + get + { + return _jobs; + } + + set + { + _jobs = value; RaisePropertyChanged(nameof(Jobs)); + } + + } + + /// <summary> + /// Initializes a new instance of the <see cref="Customer" /> class. + /// </summary> + public Customer() : base() + { + + Jobs = new ObservableCollection<Job>(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/Job.cs b/Software/Visual_Studio/Tango.BL/Entities/Job.cs index 34454be8a..0da03f8a6 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Job.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Job.cs @@ -399,6 +399,130 @@ namespace Tango.BL.Entities } + protected String _colorspaceguid; + /// <summary> + /// Gets or sets the job color space guid. + /// </summary> + [Column("COLOR_SPACE_GUID")] + [ForeignKey("ColorSpace")] + + public String ColorSpaceGuid + { + get + { + return _colorspaceguid; + } + + set + { + _colorspaceguid = value; RaisePropertyChanged(nameof(ColorSpaceGuid)); + } + + } + + protected Int32 _numberofunits; + /// <summary> + /// Gets or sets the job number of units. + /// </summary> + [Column("NUMBER_OF_UNITS")] + + public Int32 NumberOfUnits + { + get + { + return _numberofunits; + } + + set + { + _numberofunits = value; RaisePropertyChanged(nameof(NumberOfUnits)); + } + + } + + protected Int32 _type; + /// <summary> + /// Gets or sets the job type. + /// </summary> + [Column("TYPE")] + + public Int32 Type + { + get + { + return _type; + } + + set + { + _type = value; RaisePropertyChanged(nameof(Type)); + } + + } + + protected String _customerguid; + /// <summary> + /// Gets or sets the job customer guid. + /// </summary> + [Column("CUSTOMER_GUID")] + [ForeignKey("Customer")] + + public String CustomerGuid + { + get + { + return _customerguid; + } + + set + { + _customerguid = value; RaisePropertyChanged(nameof(CustomerGuid)); + } + + } + + protected ColorSpace _colorspace; + /// <summary> + /// Gets or sets the job color spaces. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual ColorSpace ColorSpace + { + get + { + return _colorspace; + } + + set + { + _colorspace = value; RaisePropertyChanged(nameof(ColorSpace)); + } + + } + + protected Customer _customer; + /// <summary> + /// Gets or sets the job customer. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual Customer Customer + { + get + { + return _customer; + } + + set + { + _customer = value; RaisePropertyChanged(nameof(Customer)); + } + + } + protected ObservableCollection<JobRun> _jobruns; /// <summary> /// Gets or sets the job job runs. diff --git a/Software/Visual_Studio/Tango.BL/Entities/Organization.cs b/Software/Visual_Studio/Tango.BL/Entities/Organization.cs index 00a5f17ed..73749a83f 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Organization.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Organization.cs @@ -118,6 +118,25 @@ namespace Tango.BL.Entities } + protected ObservableCollection<Customer> _customers; + /// <summary> + /// Gets or sets the organization customers. + /// </summary> + + public virtual ObservableCollection<Customer> Customers + { + get + { + return _customers; + } + + set + { + _customers = value; RaisePropertyChanged(nameof(Customers)); + } + + } + protected ObservableCollection<Machine> _machines; /// <summary> /// Gets or sets the organization machines. @@ -162,6 +181,8 @@ namespace Tango.BL.Entities public Organization() : base() { + Customers = new ObservableCollection<Customer>(); + Machines = new ObservableCollection<Machine>(); Users = new ObservableCollection<User>(); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs index fcdfd9f50..545ac4263 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs @@ -125,6 +125,14 @@ namespace Tango.BL } /// <summary> + /// Gets or sets the Customers. + /// </summary> + public DbSet<Customer> Customers + { + get; set; + } + + /// <summary> /// Gets or sets the DispenserTypes. /// </summary> public DbSet<DispenserType> DispenserTypes diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs index ad5e05adf..b8736f856 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs @@ -306,6 +306,8 @@ namespace Tango.BL HtmlPages = Context.HtmlPages.ToObservableCollection(); + Customers = Context.Customers.ToObservableCollection(); + _dispatcher = Application.Current.Dispatcher; _dispatcher.Invoke(() => diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs index e4ba90e72..9da64032c 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs @@ -511,6 +511,42 @@ namespace Tango.BL } + private ObservableCollection<Customer> _customers; + /// <summary> + /// Gets or sets the Customers. + /// </summary> + public ObservableCollection<Customer> Customers + { + get + { + return _customers; + } + + set + { + _customers = value; RaisePropertyChanged(nameof(Customers)); + } + + } + + private ICollectionView _customersViewSource; + /// <summary> + /// Gets or sets the Customers View Source. + ///</summary> + public ICollectionView CustomersViewSource + { + get + { + return _customersViewSource; + } + + set + { + _customersViewSource = value; RaisePropertyChanged(nameof(CustomersViewSource)); + } + + } + private ObservableCollection<DispenserType> _dispensertypes; /// <summary> /// Gets or sets the DispenserTypes. @@ -2597,6 +2633,8 @@ namespace Tango.BL ContactsViewSource = CreateCollectionView(Contacts); + CustomersViewSource = CreateCollectionView(Customers); + DispenserTypesViewSource = CreateCollectionView(DispenserTypes); EmbeddedFirmwareVersionsViewSource = CreateCollectionView(EmbeddedFirmwareVersions); diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index 46698502f..c6a593050 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -93,6 +93,7 @@ <Compile Include="Dispensing\TransparentLiquidDispensingCalc.cs" /> <Compile Include="EntitiesExtensions\Contact.cs" /> <Compile Include="EntitiesExtensions\MachineEvent.cs" /> + <Compile Include="Entities\Customer.cs" /> <Compile Include="Entities\EventTypesCategory.cs" /> <Compile Include="Entities\EventTypesGroup.cs" /> <Compile Include="Entities\HardwareSpeedSensor.cs" /> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_SPACES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_SPACES.cs index 3d6a749fa..8df817e34 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_SPACES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_SPACES.cs @@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB { this.BRUSH_STOPS = new HashSet<BRUSH_STOPS>(); this.COLOR_CATALOGS = new HashSet<COLOR_CATALOGS>(); + this.JOBS = new HashSet<JOB>(); } public int ID { get; set; } @@ -32,5 +33,7 @@ namespace Tango.DAL.Remote.DB public virtual ICollection<BRUSH_STOPS> BRUSH_STOPS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<COLOR_CATALOGS> COLOR_CATALOGS { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection<JOB> JOBS { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CUSTOMER.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CUSTOMER.cs new file mode 100644 index 000000000..30c2009a2 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CUSTOMER.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// <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 CUSTOMER + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public CUSTOMER() + { + this.JOBS = new HashSet<JOB>(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public string ORGANIZATION_GUID { get; set; } + public string NAME { get; set; } + + public virtual ORGANIZATION ORGANIZATION { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection<JOB> JOBS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs index 90cf3df03..d1ad26e36 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs @@ -43,7 +43,13 @@ namespace Tango.DAL.Remote.DB public string EMBROIDERY_FILE_NAME { get; set; } public byte[] EMBROIDERY_JPEG { get; set; } public int STATUS { get; set; } + public string COLOR_SPACE_GUID { get; set; } + public int NUMBER_OF_UNITS { get; set; } + public int TYPE { get; set; } + public string CUSTOMER_GUID { get; set; } + public virtual COLOR_SPACES COLOR_SPACES { get; set; } + public virtual CUSTOMER CUSTOMER { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<JOB_RUNS> JOB_RUNS { get; set; } public virtual MACHINE MACHINE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs index e9837a775..0073f82ef 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs @@ -17,6 +17,7 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public ORGANIZATION() { + this.CUSTOMERS = new HashSet<CUSTOMER>(); this.MACHINES = new HashSet<MACHINE>(); this.USERS = new HashSet<USER>(); } @@ -31,6 +32,8 @@ namespace Tango.DAL.Remote.DB public virtual ADDRESS ADDRESS { get; set; } public virtual CONTACT CONTACT { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection<CUSTOMER> CUSTOMERS { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<MACHINE> MACHINES { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<USER> USERS { 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 9cd8a0449..dfd25069b 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -39,6 +39,7 @@ namespace Tango.DAL.Remote.DB public virtual DbSet<COLOR_SPACES> COLOR_SPACES { get; set; } public virtual DbSet<CONFIGURATION> CONFIGURATIONS { get; set; } public virtual DbSet<CONTACT> CONTACTS { get; set; } + public virtual DbSet<CUSTOMER> CUSTOMERS { get; set; } public virtual DbSet<DISPENSER_TYPES> DISPENSER_TYPES { get; set; } public virtual DbSet<EMBEDDED_FIRMWARE_VERSIONS> EMBEDDED_FIRMWARE_VERSIONS { get; set; } public virtual DbSet<EMBEDDED_SOFTWARE_VERSIONS> EMBEDDED_SOFTWARE_VERSIONS { 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 324036ddf..c44f2db0d 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -215,6 +215,16 @@ <Property Name="PHONE_NUMBER" Type="nvarchar" MaxLength="50" /> <Property Name="FAX" Type="nvarchar" MaxLength="50" /> </EntityType> + <EntityType Name="CUSTOMERS"> + <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="ORGANIZATION_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="NAME" Type="nvarchar" MaxLength="100" Nullable="false" /> + </EntityType> <EntityType Name="DISPENSER_TYPES"> <Key> <PropertyRef Name="GUID" /> @@ -563,6 +573,10 @@ <Property Name="EMBROIDERY_FILE_NAME" Type="nvarchar" MaxLength="100" /> <Property Name="EMBROIDERY_JPEG" Type="image" /> <Property Name="STATUS" Type="int" Nullable="false" /> + <Property Name="COLOR_SPACE_GUID" Type="varchar" MaxLength="36" /> + <Property Name="NUMBER_OF_UNITS" Type="int" Nullable="false" /> + <Property Name="TYPE" Type="int" Nullable="false" /> + <Property Name="CUSTOMER_GUID" Type="varchar" MaxLength="36" /> </EntityType> <EntityType Name="LINEAR_MASS_DENSITY_UNITS"> <Key> @@ -1180,6 +1194,20 @@ </Dependent> </ReferentialConstraint> </Association> + <Association Name="FK_CUSTOMERS_ORGANIZATIONS"> + <End Role="ORGANIZATIONS" Type="Self.ORGANIZATIONS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Role="CUSTOMERS" Type="Self.CUSTOMERS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="ORGANIZATIONS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="CUSTOMERS"> + <PropertyRef Name="ORGANIZATION_GUID" /> + </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="*" /> @@ -1454,6 +1482,30 @@ </Dependent> </ReferentialConstraint> </Association> + <Association Name="FK_JOBS_COLOR_SPACES"> + <End Role="COLOR_SPACES" Type="Self.COLOR_SPACES" Multiplicity="0..1" /> + <End Role="JOBS" Type="Self.JOBS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="COLOR_SPACES"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="JOBS"> + <PropertyRef Name="COLOR_SPACE_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_JOBS_CUSTOMERS"> + <End Role="CUSTOMERS" Type="Self.CUSTOMERS" Multiplicity="0..1" /> + <End Role="JOBS" Type="Self.JOBS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="CUSTOMERS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="JOBS"> + <PropertyRef Name="CUSTOMER_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> <Association Name="FK_JOBS_MACHINES"> <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="1"> <OnDelete Action="Cascade" /> @@ -1935,6 +1987,7 @@ <EntitySet Name="COLOR_SPACES" EntityType="Self.COLOR_SPACES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="CONFIGURATIONS" EntityType="Self.CONFIGURATIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="CONTACTS" EntityType="Self.CONTACTS" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="CUSTOMERS" EntityType="Self.CUSTOMERS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="DISPENSER_TYPES" EntityType="Self.DISPENSER_TYPES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="Self.EMBEDDED_FIRMWARE_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="Self.EMBEDDED_SOFTWARE_VERSIONS" Schema="dbo" store:Type="Tables" /> @@ -2056,6 +2109,10 @@ <End Role="HARDWARE_VERSIONS" EntitySet="HARDWARE_VERSIONS" /> <End Role="CONFIGURATIONS" EntitySet="CONFIGURATIONS" /> </AssociationSet> + <AssociationSet Name="FK_CUSTOMERS_ORGANIZATIONS" Association="Self.FK_CUSTOMERS_ORGANIZATIONS"> + <End Role="ORGANIZATIONS" EntitySet="ORGANIZATIONS" /> + <End Role="CUSTOMERS" EntitySet="CUSTOMERS" /> + </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" /> @@ -2140,6 +2197,14 @@ <End Role="JOBS" EntitySet="JOBS" /> <End Role="JOB_RUNS" EntitySet="JOB_RUNS" /> </AssociationSet> + <AssociationSet Name="FK_JOBS_COLOR_SPACES" Association="Self.FK_JOBS_COLOR_SPACES"> + <End Role="COLOR_SPACES" EntitySet="COLOR_SPACES" /> + <End Role="JOBS" EntitySet="JOBS" /> + </AssociationSet> + <AssociationSet Name="FK_JOBS_CUSTOMERS" Association="Self.FK_JOBS_CUSTOMERS"> + <End Role="CUSTOMERS" EntitySet="CUSTOMERS" /> + <End Role="JOBS" EntitySet="JOBS" /> + </AssociationSet> <AssociationSet Name="FK_JOBS_MACHINES" Association="Self.FK_JOBS_MACHINES"> <End Role="MACHINES" EntitySet="MACHINES" /> <End Role="JOBS" EntitySet="JOBS" /> @@ -2304,6 +2369,7 @@ <EntitySet Name="COLOR_SPACES" EntityType="RemoteModel.COLOR_SPACES" /> <EntitySet Name="CONFIGURATIONS" EntityType="RemoteModel.CONFIGURATION" /> <EntitySet Name="CONTACTS" EntityType="RemoteModel.CONTACT" /> + <EntitySet Name="CUSTOMERS" EntityType="RemoteModel.CUSTOMER" /> <EntitySet Name="DISPENSER_TYPES" EntityType="RemoteModel.DISPENSER_TYPES" /> <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" /> <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" /> @@ -2425,6 +2491,10 @@ <End Role="COLOR_SPACES" EntitySet="COLOR_SPACES" /> <End Role="COLOR_CATALOGS" EntitySet="COLOR_CATALOGS" /> </AssociationSet> + <AssociationSet Name="FK_JOBS_COLOR_SPACES" Association="RemoteModel.FK_JOBS_COLOR_SPACES"> + <End Role="COLOR_SPACES" EntitySet="COLOR_SPACES" /> + <End Role="JOB" EntitySet="JOBS" /> + </AssociationSet> <AssociationSet Name="FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS"> <End Role="EMBEDDED_FIRMWARE_VERSIONS" EntitySet="EMBEDDED_FIRMWARE_VERSIONS" /> <End Role="CONFIGURATION" EntitySet="CONFIGURATIONS" /> @@ -2461,6 +2531,14 @@ <End Role="CONTACT" EntitySet="CONTACTS" /> <End Role="USER" EntitySet="USERS" /> </AssociationSet> + <AssociationSet Name="FK_CUSTOMERS_ORGANIZATIONS" Association="RemoteModel.FK_CUSTOMERS_ORGANIZATIONS"> + <End Role="ORGANIZATION" EntitySet="ORGANIZATIONS" /> + <End Role="CUSTOMER" EntitySet="CUSTOMERS" /> + </AssociationSet> + <AssociationSet Name="FK_JOBS_CUSTOMERS" Association="RemoteModel.FK_JOBS_CUSTOMERS"> + <End Role="CUSTOMER" EntitySet="CUSTOMERS" /> + <End Role="JOB" EntitySet="JOBS" /> + </AssociationSet> <AssociationSet Name="FK_IDS_PACKS_DISPENSER_TYPES" Association="RemoteModel.FK_IDS_PACKS_DISPENSER_TYPES"> <End Role="DISPENSER_TYPES" EntitySet="DISPENSER_TYPES" /> <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> @@ -2850,6 +2928,7 @@ <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" /> <NavigationProperty Name="BRUSH_STOPS" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_SPACES" FromRole="COLOR_SPACES" ToRole="BRUSH_STOPS" /> <NavigationProperty Name="COLOR_CATALOGS" Relationship="RemoteModel.FK_COLOR_CATALOGS_COLOR_SPACES" FromRole="COLOR_SPACES" ToRole="COLOR_CATALOGS" /> + <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_COLOR_SPACES" FromRole="COLOR_SPACES" ToRole="JOB" /> </EntityType> <EntityType Name="CONFIGURATION"> <Key> @@ -2896,6 +2975,18 @@ <NavigationProperty Name="ORGANIZATIONS" Relationship="RemoteModel.FK_ORGANIZATIONS_CONTACTS" FromRole="CONTACT" ToRole="ORGANIZATION" /> <NavigationProperty Name="USERS" Relationship="RemoteModel.FK_USERS_CONTACTS" FromRole="CONTACT" ToRole="USER" /> </EntityType> + <EntityType Name="CUSTOMER"> + <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="ORGANIZATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" /> + <NavigationProperty Name="ORGANIZATION" Relationship="RemoteModel.FK_CUSTOMERS_ORGANIZATIONS" FromRole="CUSTOMER" ToRole="ORGANIZATION" /> + <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_CUSTOMERS" FromRole="CUSTOMER" ToRole="JOB" /> + </EntityType> <EntityType Name="DISPENSER_TYPES"> <Key> <PropertyRef Name="GUID" /> @@ -3288,6 +3379,12 @@ <Property Name="EMBROIDERY_FILE_NAME" Type="String" MaxLength="100" FixedLength="false" Unicode="true" /> <Property Name="EMBROIDERY_JPEG" Type="Binary" MaxLength="Max" FixedLength="false" /> <Property Name="STATUS" Type="Int32" Nullable="false" /> + <Property Name="COLOR_SPACE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="NUMBER_OF_UNITS" Type="Int32" Nullable="false" /> + <Property Name="TYPE" Type="Int32" Nullable="false" /> + <Property Name="CUSTOMER_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" /> + <NavigationProperty Name="COLOR_SPACES" Relationship="RemoteModel.FK_JOBS_COLOR_SPACES" FromRole="JOB" ToRole="COLOR_SPACES" /> + <NavigationProperty Name="CUSTOMER" Relationship="RemoteModel.FK_JOBS_CUSTOMERS" FromRole="JOB" ToRole="CUSTOMER" /> <NavigationProperty Name="JOB_RUNS" Relationship="RemoteModel.FK_JOB_RUNS_JOBS" FromRole="JOB" ToRole="JOB_RUNS" /> <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_JOBS_MACHINES" FromRole="JOB" ToRole="MACHINE" /> <NavigationProperty Name="RML" Relationship="RemoteModel.FK_JOBS_RMLS" FromRole="JOB" ToRole="RML" /> @@ -3483,6 +3580,7 @@ <Property Name="ADDRESS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <NavigationProperty Name="ADDRESS" Relationship="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" FromRole="ORGANIZATION" ToRole="ADDRESS" /> <NavigationProperty Name="CONTACT" Relationship="RemoteModel.FK_ORGANIZATIONS_CONTACTS" FromRole="ORGANIZATION" ToRole="CONTACT" /> + <NavigationProperty Name="CUSTOMERS" Relationship="RemoteModel.FK_CUSTOMERS_ORGANIZATIONS" FromRole="ORGANIZATION" ToRole="CUSTOMER" /> <NavigationProperty Name="MACHINES" Relationship="RemoteModel.FK_MACHINES_ORGANIZATIONS" FromRole="ORGANIZATION" ToRole="MACHINE" /> <NavigationProperty Name="USERS" Relationship="RemoteModel.FK_USERS_ORGANIZATIONS" FromRole="ORGANIZATION" ToRole="USER" /> </EntityType> @@ -3981,6 +4079,18 @@ </Dependent> </ReferentialConstraint> </Association> + <Association Name="FK_JOBS_COLOR_SPACES"> + <End Type="RemoteModel.COLOR_SPACES" Role="COLOR_SPACES" Multiplicity="0..1" /> + <End Type="RemoteModel.JOB" Role="JOB" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="COLOR_SPACES"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="JOB"> + <PropertyRef Name="COLOR_SPACE_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> <Association Name="FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS"> <End Type="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Role="EMBEDDED_FIRMWARE_VERSIONS" Multiplicity="1" /> <End Type="RemoteModel.CONFIGURATION" Role="CONFIGURATION" Multiplicity="*" /> @@ -4097,6 +4207,32 @@ </Dependent> </ReferentialConstraint> </Association> + <Association Name="FK_CUSTOMERS_ORGANIZATIONS"> + <End Type="RemoteModel.ORGANIZATION" Role="ORGANIZATION" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.CUSTOMER" Role="CUSTOMER" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="ORGANIZATION"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="CUSTOMER"> + <PropertyRef Name="ORGANIZATION_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_JOBS_CUSTOMERS"> + <End Type="RemoteModel.CUSTOMER" Role="CUSTOMER" Multiplicity="0..1" /> + <End Type="RemoteModel.JOB" Role="JOB" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="CUSTOMER"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="JOB"> + <PropertyRef Name="CUSTOMER_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> <Association Name="FK_IDS_PACKS_DISPENSER_TYPES"> <End Type="RemoteModel.DISPENSER_TYPES" Role="DISPENSER_TYPES" Multiplicity="0..1" /> <End Type="RemoteModel.IDS_PACKS" Role="IDS_PACKS" Multiplicity="*" /> @@ -4945,6 +5081,17 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> + <EntitySetMapping Name="CUSTOMERS"> + <EntityTypeMapping TypeName="RemoteModel.CUSTOMER"> + <MappingFragment StoreEntitySet="CUSTOMERS"> + <ScalarProperty Name="NAME" ColumnName="NAME" /> + <ScalarProperty Name="ORGANIZATION_GUID" ColumnName="ORGANIZATION_GUID" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> <EntitySetMapping Name="DISPENSER_TYPES"> <EntityTypeMapping TypeName="RemoteModel.DISPENSER_TYPES"> <MappingFragment StoreEntitySet="DISPENSER_TYPES"> @@ -5294,6 +5441,10 @@ <EntitySetMapping Name="JOBS"> <EntityTypeMapping TypeName="RemoteModel.JOB"> <MappingFragment StoreEntitySet="JOBS"> + <ScalarProperty Name="CUSTOMER_GUID" ColumnName="CUSTOMER_GUID" /> + <ScalarProperty Name="TYPE" ColumnName="TYPE" /> + <ScalarProperty Name="NUMBER_OF_UNITS" ColumnName="NUMBER_OF_UNITS" /> + <ScalarProperty Name="COLOR_SPACE_GUID" ColumnName="COLOR_SPACE_GUID" /> <ScalarProperty Name="STATUS" ColumnName="STATUS" /> <ScalarProperty Name="EMBROIDERY_JPEG" ColumnName="EMBROIDERY_JPEG" /> <ScalarProperty Name="EMBROIDERY_FILE_NAME" ColumnName="EMBROIDERY_FILE_NAME" /> 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 d64dabfb7..abb65e9a9 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,77 +5,78 @@ <!-- Diagram content (shape and connector positions) --> <edmx:Diagrams> <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1"> - <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="3" PointY="103.5" /> - <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="81.5" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="58.5" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="34.75" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="64.375" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="1.5" PointY="37.625" /> - <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="10.75" PointY="9.375" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="44.75" /> - <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="15.5" /> - <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="33" /> + <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="6" PointY="85.5" /> + <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="68.625" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="58.625" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="55.75" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="52.875" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="1.5" PointY="61.625" /> + <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="10.75" PointY="6.375" /> + <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="8" PointY="38.125" /> + <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="12.875" /> + <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="35.5" /> <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="8.5" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6.25" PointY="2.5" /> - <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="42.375" /> - <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="77.5" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3" PointY="1.625" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="61.375" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="67.25" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="3" PointY="88.625" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="5.25" PointY="89.5" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="0.75" PointY="92.625" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="0.75" PointY="89.625" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="22.5" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="11.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="71" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="59" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="1.5" PointY="99.875" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3.75" PointY="58.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="5.5" PointY="50" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="7.75" PointY="48.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="67" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="54.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="54.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="96" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="54.875" /> - <EntityTypeShape EntityType="RemoteModel.HTML_PAGES" Width="1.5" PointX="0.75" PointY="86.25" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="5.25" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="23" /> - <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="7.5" PointY="8.125" /> - <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="7.75" /> - <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="25.375" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="8.625" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="15.875" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="5.25" PointY="42.375" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="51.125" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="48.625" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="5.25" PointY="46.625" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="5.25" PointY="38" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="15.875" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="8.75" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="19.5" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="28.375" /> - <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="41.625" /> - <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="72.75" /> - <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="6" PointY="79.125" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="27" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="28.25" /> - <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="13.25" /> - <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="6" PointY="75" /> - <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="8.25" PointY="75.125" /> - <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="7.5" PointY="11.375" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="30.25" /> - <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="10.75" PointY="2" /> - <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="10.75" PointY="5" /> - <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="12.75" PointY="2" /> - <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="12.75" PointY="6" /> - <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="12.75" PointY="9" /> - <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="12.75" PointY="14" /> - <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="14.75" PointY="2" /> - <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3" PointY="22.125" /> - <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="8.25" PointY="23" /> - <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="3" PointY="27.125" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="3" PointY="5.25" /> + <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="50.75" /> + <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="64.5" /> + <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="3" PointY="26.875" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="8" PointY="63.125" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="43.125" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="49.875" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="6" PointY="80.625" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="8.25" PointY="81.5" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="3.75" PointY="81.625" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="3.75" PointY="84.75" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="29.875" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="21" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="7.5" PointY="59.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9.75" PointY="45.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="1.5" PointY="39.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3.75" PointY="43.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="4.5" PointY="63.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6.75" PointY="44.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="6.5" PointY="67.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="8.75" PointY="51.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="46" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="59.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="41.375" /> + <EntityTypeShape EntityType="RemoteModel.HTML_PAGES" Width="1.5" PointX="3.75" PointY="78.25" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="8" PointY="74.5" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10.25" PointY="27.875" /> + <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="7.5" PointY="28.875" /> + <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="14.5" /> + <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="13.125" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="4.125" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="17.125" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="5.25" PointY="10" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="39.75" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="53.75" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="8.25" PointY="55.25" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="8.25" PointY="34" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="9.875" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="24" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="26.875" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="17.375" /> + <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="8" PointY="71.375" /> + <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="66.75" /> + <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="9" PointY="67.125" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="22.25" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="23.5" /> + <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.5" /> + <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="9" PointY="42" /> + <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="11.25" PointY="42.125" /> + <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="7.5" PointY="8.375" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="30" /> + <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="10.75" PointY="3.25" /> + <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="12.75" PointY="3.25" /> + <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="12.75" PointY="6.25" /> + <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="12.75" PointY="10.25" /> + <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="13.75" PointY="13.25" /> + <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="14.75" PointY="3.25" /> + <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="14.75" PointY="8.25" /> + <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3" PointY="9.125" /> + <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="11.25" PointY="14" /> + <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="3" PointY="23.75" /> <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" /> @@ -92,6 +93,7 @@ <AssociationConnector Association="RemoteModel.FK_CATS_RMLS" /> <AssociationConnector Association="RemoteModel.FK_CCTS_RMLS" /> <AssociationConnector Association="RemoteModel.FK_COLOR_CATALOGS_COLOR_SPACES" /> + <AssociationConnector Association="RemoteModel.FK_JOBS_COLOR_SPACES" /> <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" /> <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_SOFTWARE_VERSIONS" /> <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_HARDWARE_VERSIONS" /> @@ -101,6 +103,8 @@ <AssociationConnector Association="RemoteModel.FK_MACHINES_CONFIGURATIONS_CONFIGURATIONS" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_CONTACTS" /> <AssociationConnector Association="RemoteModel.FK_USERS_CONTACTS" /> + <AssociationConnector Association="RemoteModel.FK_CUSTOMERS_ORGANIZATIONS" /> + <AssociationConnector Association="RemoteModel.FK_JOBS_CUSTOMERS" /> <AssociationConnector Association="RemoteModel.FK_IDS_PACKS_DISPENSER_TYPES" /> <AssociationConnector Association="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES" /> <AssociationConnector Association="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES1" /> 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 da79b0882..cd2187e34 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -108,6 +108,9 @@ <Compile Include="DB\CONTACT.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> + <Compile Include="DB\CUSTOMER.cs"> + <DependentUpon>RemoteADO.tt</DependentUpon> + </Compile> <Compile Include="DB\DISPENSER_TYPES.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchComboBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchComboBox.cs index 13dc0cf48..20b9e3048 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchComboBox.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchComboBox.cs @@ -105,12 +105,6 @@ namespace Tango.Touch.Controls System.Windows.Input.Keyboard.Focus(this); } - protected override void OnGotFocus(RoutedEventArgs e) - { - base.OnGotFocus(e); - ShowSelectionOnTouchPanel(); - } - private void ShowSelectionOnTouchPanel() { TouchPanel touchPanel = this.FindAncestor<TouchPanel>(); diff --git a/Software/Visual_Studio/Tango.Touch/Keyboard/KeyboardView.cs b/Software/Visual_Studio/Tango.Touch/Keyboard/KeyboardView.cs index 821270282..c4e158b3d 100644 --- a/Software/Visual_Studio/Tango.Touch/Keyboard/KeyboardView.cs +++ b/Software/Visual_Studio/Tango.Touch/Keyboard/KeyboardView.cs @@ -156,7 +156,7 @@ namespace Tango.Touch.Keyboard double requiredMargin = (relativeLocation.Y + (element.ActualHeight / 2)) - centerViewPort; ThicknessAnimation ani = new ThicknessAnimation(); - ani.To = new Thickness(0, -requiredMargin, 0, requiredMargin); + ani.To = new Thickness(0, -requiredMargin, 0, 0); ani.Duration = TimeSpan.FromSeconds(0.2); GetContainer(element).BeginAnimation(FrameworkElement.MarginProperty, ani); } diff --git a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs index 43a368358..92ab04ddf 100644 --- a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs @@ -27,6 +27,8 @@ namespace Tango.SQLiteGenerator.CLI sqlitePath = Path.GetFullPath(sqlitePath); + Console.WriteLine("Generating " + sqlitePath + "..."); + bool completed = false; String connectionString = SettingsManager.Default.GetOrCreate<CoreSettings>().DataBaseSource; diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/WindowInfo.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/WindowInfo.cs index 535ee7ce1..f9681ea31 100644 --- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/WindowInfo.cs +++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/WindowInfo.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices; using System.Text; @@ -27,6 +28,19 @@ namespace Tango.BuildExtensions [DllImport("user32.dll")] private static extern bool SetForegroundWindow(IntPtr hWnd); + [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] + static extern IntPtr SendMessageTimeout(IntPtr windowHandle, uint Msg, IntPtr wParam, IntPtr lParam, SendMessageTimeoutFlags flags, uint timeout, out IntPtr result); + + [Flags] + enum SendMessageTimeoutFlags : uint + { + SMTO_NORMAL = 0x0, + SMTO_BLOCK = 0x1, + SMTO_ABORTIFHUNG = 0x2, + SMTO_NOTIMEOUTIFNOTHUNG = 0x8, + SMTO_ERRORONEXIT = 0x20 + } + private static List<IntPtr> GetAllChildrenHandles(IntPtr hParent, int maxCount) { List<IntPtr> result = new List<IntPtr>(); @@ -35,6 +49,7 @@ namespace Tango.BuildExtensions IntPtr currChild = IntPtr.Zero; while (true && ct < maxCount) { + Debug.WriteLine("FindWindowEx: " + hParent); currChild = FindWindowEx(hParent, prevChild, null, null); if (currChild == IntPtr.Zero) break; result.Add(currChild); @@ -48,9 +63,9 @@ namespace Tango.BuildExtensions { // helper for GetCaptionText uint WM_GETTEXTLENGTH = 0x000E; - int result = SendMessage(hTextBox, WM_GETTEXTLENGTH, - 0, 0); - return result; + IntPtr result = IntPtr.Zero; + SendMessageTimeout(hTextBox, WM_GETTEXTLENGTH, IntPtr.Zero, IntPtr.Zero, SendMessageTimeoutFlags.SMTO_ABORTIFHUNG, 1000, out result); + return (int)result; } private static string GetCaptionText(IntPtr hTextBox) @@ -102,7 +117,14 @@ namespace Tango.BuildExtensions desktop.Parent = null; windows.Add(desktop); - FillWindows(desktop, desktop.Children); + try + { + FillWindows(desktop, desktop.Children); + } + catch (Exception ex) + { + Debug.WriteLine(ex.ToString()); + } return windows; } @@ -140,6 +162,7 @@ namespace Tango.BuildExtensions if (child.Caption != null) { + Debug.WriteLine(parent.Caption + " | " + child.Caption); windows.Add(child); } |
