aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/GeneralInformationView.xaml
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2023-07-25 14:18:41 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2023-07-25 14:18:41 +0300
commitabbfd75f45b636c3976f6769bbdc4615d88b16f8 (patch)
tree0acc58b5e10bd7dc6d5f28c37d38f7ce283a5b7f /Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/GeneralInformationView.xaml
parent13012a106aac961eaba844b2f525287a0e021b2d (diff)
downloadTango-abbfd75f45b636c3976f6769bbdc4615d88b16f8.tar.gz
Tango-abbfd75f45b636c3976f6769bbdc4615d88b16f8.zip
Added FirmwareVersion and arranged the about list
Related Work Items: #8638
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/GeneralInformationView.xaml')
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/GeneralInformationView.xaml145
1 files changed, 124 insertions, 21 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/GeneralInformationView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/GeneralInformationView.xaml
index 8ae0f4354..fe9875009 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/GeneralInformationView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/GeneralInformationView.xaml
@@ -6,7 +6,7 @@
xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
xmlns:local="clr-namespace:Tango.PPC.UI.Dialogs"
mc:Ignorable="d"
- Background="{StaticResource TangoPrimaryBackgroundBrush}" Width="750" Height="700" d:DataContext="{d:DesignInstance Type=local:GeneralInformationViewVM, IsDesignTimeCreatable=False}">
+ Background="{StaticResource TangoPrimaryBackgroundBrush}" Width="750" Height="1000" d:DataContext="{d:DesignInstance Type=local:GeneralInformationViewVM, IsDesignTimeCreatable=False}">
<Grid Margin="20">
<DockPanel>
@@ -16,11 +16,12 @@
<StackPanel DockPanel.Dock="Top" HorizontalAlignment="Center">
<Image Source="../Images/logo.png" RenderOptions.BitmapScalingMode="Fant" Width="157" Height="51" Stretch="Uniform" HorizontalAlignment="Center" Margin="0 10 0 10"/>
- <TextBlock VerticalAlignment="Center" Margin="0 30 0 0" FontSize="{StaticResource TangoHeaderFontSize}">General Information</TextBlock>
+
</StackPanel>
- <Grid Margin="0 30 0 0">
- <FlowDocumentScrollViewer VerticalScrollBarVisibility="Disabled" >
+ <StackPanel Margin="0 20 0 0" Orientation="Vertical">
+ <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 30 0 0" FontSize="{StaticResource TangoDialogFontSize}">Machine information:</TextBlock>
+ <FlowDocumentScrollViewer VerticalScrollBarVisibility="Disabled" Margin="0 10 0 0">
<FlowDocument>
<Table CellSpacing="0" FontFamily="{StaticResource TangoFlexoFontFamily}">
<Table.Resources>
@@ -41,6 +42,32 @@
</Table.Columns>
<TableRowGroup>
+ <TableRow>
+ <TableCell>
+ <Paragraph>
+ <TextBlock>Machine S/N:</TextBlock>
+ </Paragraph>
+ </TableCell>
+
+ <TableCell>
+ <Paragraph>
+ <TextBlock Text="{Binding MachineProvider.Machine.SerialNumber,Mode=OneWay,IsAsync=True,FallbackValue='0000'}"/>
+ </Paragraph>
+ </TableCell>
+ </TableRow>
+ <TableRow>
+ <TableCell>
+ <Paragraph>
+ <TextBlock>Site:</TextBlock>
+ </Paragraph>
+ </TableCell>
+
+ <TableCell>
+ <Paragraph>
+ <TextBlock Text="{Binding SiteName,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
+ </Paragraph>
+ </TableCell>
+ </TableRow>
<TableRow>
<TableCell>
@@ -55,31 +82,44 @@
</Paragraph>
</TableCell>
</TableRow>
+ <TableRow>
+ <TableCell>
+ <Paragraph>
+ <TextBlock>IP Address:</TextBlock>
+ </Paragraph>
+ </TableCell>
+ <TableCell>
+ <Paragraph>
+ <TextBlock Text="{Binding IPAddress,Mode=OneWay,FallbackValue=0}"></TextBlock>
+ </Paragraph>
+ </TableCell>
+ </TableRow>
<TableRow>
<TableCell>
<Paragraph>
- <TextBlock>Application Version:</TextBlock>
+ <TextBlock>Up Time:</TextBlock>
</Paragraph>
</TableCell>
<TableCell>
<Paragraph>
- <TextBlock Text="{Binding ApplicationManager.VersionAndTag,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
+ <TextBlock Text="{Binding UpTime,Mode=OneWay,StringFormat=hh\\:mm\\:ss,FallbackValue='00:00:00'}"></TextBlock>
</Paragraph>
</TableCell>
</TableRow>
+
<TableRow>
<TableCell>
<Paragraph>
- <TextBlock>Site:</TextBlock>
+ <TextBlock>Total Dye Time:</TextBlock>
</Paragraph>
</TableCell>
<TableCell>
<Paragraph>
- <TextBlock Text="{Binding SiteName,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
+ <TextBlock Text="{Binding TotalDyeTime,Mode=OneWay,FallbackValue=0}"></TextBlock>
</Paragraph>
</TableCell>
</TableRow>
@@ -87,90 +127,153 @@
<TableRow>
<TableCell>
<Paragraph>
- <TextBlock>Machine S/N:</TextBlock>
+ <TextBlock>Total Dye Meters:</TextBlock>
</Paragraph>
</TableCell>
<TableCell>
<Paragraph>
- <TextBlock Text="{Binding MachineProvider.Machine.SerialNumber,Mode=OneWay,IsAsync=True,FallbackValue='0000'}"/>
+ <TextBlock Text="{Binding TotalDyeMeters,Mode=OneWay,FallbackValue=0}"></TextBlock>
</Paragraph>
</TableCell>
</TableRow>
+ </TableRowGroup>
+ </Table>
+ </FlowDocument>
+ </FlowDocumentScrollViewer>
+ <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 20 0 0" FontSize="{StaticResource TangoDialogFontSize}">Installed Software &amp; Firmware:</TextBlock>
+ <FlowDocumentScrollViewer VerticalScrollBarVisibility="Disabled" Margin="0 10 0 0">
+ <FlowDocument>
+ <Table CellSpacing="0" FontFamily="{StaticResource TangoFlexoFontFamily}">
+ <Table.Resources>
+ <Style TargetType="{x:Type TableRowGroup}">
+ <Setter Property="FontSize" Value="{StaticResource TangoDefaultFontSize}"/>
+ </Style>
+
+ <Style TargetType="TableCell">
+ <Setter Property="BorderThickness" Value="0 0 0 1"></Setter>
+ <Setter Property="BorderBrush" Value="{StaticResource TangoGrayBrush}"></Setter>
+ <Setter Property="Padding" Value="5"></Setter>
+ </Style>
+ </Table.Resources>
+ <Table.Columns>
+ <TableColumn Width="160" />
+ <TableColumn />
+ <TableColumn />
+ </Table.Columns>
+
+ <TableRowGroup>
<TableRow>
<TableCell>
<Paragraph>
- <TextBlock>Firmware Version:</TextBlock>
+ <TextBlock>Application Version:</TextBlock>
</Paragraph>
</TableCell>
<TableCell>
<Paragraph>
- <TextBlock Text="{Binding MachineProvider.MachineOperator.DeviceInformation.Version,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
+ <TextBlock Text="{Binding ApplicationManager.VersionAndTag,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
</Paragraph>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Paragraph>
- <TextBlock>Up Time:</TextBlock>
+ <TextBlock>Main Firmware:</TextBlock>
</Paragraph>
</TableCell>
<TableCell>
<Paragraph>
- <TextBlock Text="{Binding UpTime,Mode=OneWay,StringFormat=hh\\:mm\\:ss,FallbackValue='00:00:00'}"></TextBlock>
+ <TextBlock Text="{Binding MachineProvider.MachineOperator.DeviceInformation.Version,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
</Paragraph>
</TableCell>
</TableRow>
+
<TableRow>
<TableCell>
<Paragraph>
- <TextBlock>IP Address:</TextBlock>
+ <TextBlock>Head Firmware:</TextBlock>
</Paragraph>
</TableCell>
<TableCell>
<Paragraph>
- <TextBlock Text="{Binding IPAddress,Mode=OneWay,FallbackValue=0}"></TextBlock>
+ <TextBlock Text="{Binding HeadFirmware,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
</Paragraph>
</TableCell>
</TableRow>
+ <TableRow>
+ <TableCell>
+ <Paragraph>
+ <TextBlock>Dryer Firmware:</TextBlock>
+ </Paragraph>
+ </TableCell>
+ <TableCell>
+ <Paragraph>
+ <TextBlock Text="{Binding DryerFirmware,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
+ </Paragraph>
+ </TableCell>
+ </TableRow>
<TableRow>
<TableCell>
<Paragraph>
- <TextBlock>Total Dye Time:</TextBlock>
+ <TextBlock>Mid-tanks Firmware:</TextBlock>
</Paragraph>
</TableCell>
<TableCell>
<Paragraph>
- <TextBlock Text="{Binding TotalDyeTime,Mode=OneWay,FallbackValue=0}"></TextBlock>
+ <TextBlock Text="{Binding MidtanksFirmware,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
</Paragraph>
</TableCell>
</TableRow>
+ <TableRow>
+ <TableCell>
+ <Paragraph>
+ <TextBlock>Lubricant Firmware:</TextBlock>
+ </Paragraph>
+ </TableCell>
+ <TableCell>
+ <Paragraph>
+ <TextBlock Text="{Binding LubricantFirmware,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
+ </Paragraph>
+ </TableCell>
+ </TableRow>
<TableRow>
<TableCell>
<Paragraph>
- <TextBlock>Total Dye Meters:</TextBlock>
+ <TextBlock>Dispensers Firmware:</TextBlock>
</Paragraph>
</TableCell>
<TableCell>
<Paragraph>
- <TextBlock Text="{Binding TotalDyeMeters,Mode=OneWay,FallbackValue=0}"></TextBlock>
+ <TextBlock Text="{Binding DispensersFWFirmware,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
</Paragraph>
</TableCell>
</TableRow>
+ <TableRow>
+ <TableCell>
+ <Paragraph>
+ <TextBlock>Winders Firmware:</TextBlock>
+ </Paragraph>
+ </TableCell>
+ <TableCell>
+ <Paragraph>
+ <TextBlock Text="{Binding WindersFWFirmware,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
+ </Paragraph>
+ </TableCell>
+ </TableRow>
</TableRowGroup>
</Table>
</FlowDocument>
</FlowDocumentScrollViewer>
- </Grid>
+ </StackPanel>
</DockPanel>
</Grid>
</UserControl>
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-19 20:39:20 +0000