From b984ac29e1f9d13c854d96dd3016649df0f802f1 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Tue, 4 Jul 2023 17:00:49 +0300
Subject: Add “,” to long numbers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PPC/Tango.PPC.UI/Views/MachineStatusView.xaml  | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
index b80c245de..4dec7d481 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -481,10 +481,10 @@
                                         <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
                                             <TextBlock.Style>
                                                 <Style TargetType="{x:Type TextBlock}">
-                                                    <Setter Property="Text" Value="{Binding Job.LengthIncludingNumberOfUnitsAndSpools, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
+                                                    <Setter Property="Text" Value="{Binding Job.LengthIncludingNumberOfUnitsAndSpools, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
                                                     <Style.Triggers>
                                                         <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
-                                                            <Setter Property="Text" Value="{Binding Job.LengthIncludingNumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
+                                                            <Setter Property="Text" Value="{Binding Job.LengthIncludingNumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
                                                         </DataTrigger>
                                                     </Style.Triggers>
                                                 </Style>
@@ -499,10 +499,10 @@
                                         <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
                                             <TextBlock.Style>
                                                 <Style TargetType="{x:Type TextBlock}">
-                                                    <Setter Property="Text" Value="{Binding Job.WeightIncludingNumberOfUnitsAndSpools, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
+                                                    <Setter Property="Text" Value="{Binding Job.WeightIncludingNumberOfUnitsAndSpools, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
                                                     <Style.Triggers>
                                                         <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
-                                                            <Setter Property="Text" Value="{Binding Job.WeightIncludingNumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
+                                                            <Setter Property="Text" Value="{Binding Job.WeightIncludingNumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
                                                         </DataTrigger>
                                                     </Style.Triggers>
                                                 </Style>
@@ -517,10 +517,10 @@
                                         <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
                                             <TextBlock.Style>
                                                 <Style TargetType="{x:Type TextBlock}">
-                                                    <Setter Property="Text" Value="{Binding Job.NumberOfUnitsMultipliedBySpools, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
+                                                    <Setter Property="Text" Value="{Binding Job.NumberOfUnitsMultipliedBySpools, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
                                                     <Style.Triggers>
                                                         <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
-                                                            <Setter Property="Text" Value="{Binding Job.NumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
+                                                            <Setter Property="Text" Value="{Binding Job.NumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.#'}" />
                                                         </DataTrigger>
                                                     </Style.Triggers>
                                                 </Style>
@@ -620,7 +620,7 @@
                                                 <StackPanel Orientation="Horizontal" Margin="0 15 0 0" HorizontalAlignment="Center"  Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                                     <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center">
                                                         <TextBlock.Text>
-                                                            <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
+                                                            <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="#,0." TargetNullValue='-' FallbackValue='0' Mode="OneWay">
                                                                 <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" />
                                                                 <Binding Path="IsSpoolView"/>
                                                                 <Binding Path="RunningJobStatus.ProgressMinusSettingUp" />
@@ -630,7 +630,7 @@
                                                     <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center" Text="/"></TextBlock>
                                                     <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center">
                                                         <TextBlock.Text>
-                                                            <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
+                                                            <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="#,0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
                                                                 <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/>
                                                                 <Binding Path="IsSpoolView"/>
                                                             </MultiBinding>
@@ -642,7 +642,7 @@
                                                 <StackPanel Orientation="Horizontal" Margin="0 10 0 0" HorizontalAlignment="Center" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityConverter}}">
                                                     <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center">
                                                         <TextBlock.Text>
-                                                            <MultiBinding Converter="{StaticResource ProgressWeightSpoolConverter}" StringFormat="0.00" TargetNullValue='-' FallbackValue='0'>
+                                                            <MultiBinding Converter="{StaticResource ProgressWeightSpoolConverter}" StringFormat="#,0.00" TargetNullValue='-' FallbackValue='0'>
                                                                 <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" />
                                                                 <Binding Path="IsSpoolView"/>
                                                                 <Binding Path="RunningJobStatus.ProgressMinusSettingUp" />
@@ -653,7 +653,7 @@
                                                     <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center" Text="/"></TextBlock>
                                                     <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center">
                                                         <TextBlock.Text>
-                                                            <MultiBinding Converter="{StaticResource ProgressWeightSpoolConverter}" StringFormat="0.#" TargetNullValue='-' FallbackValue='0' >
+                                                            <MultiBinding Converter="{StaticResource ProgressWeightSpoolConverter}" StringFormat="#,0.#" TargetNullValue='-' FallbackValue='0' >
                                                                 <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/>
                                                                 <Binding Path="IsSpoolView"/>
                                                                 <Binding Path="Job.GramPerLength" Mode="OneWay"/>
@@ -744,7 +744,7 @@
                                         <TextBlock x:Name="ProgressLength"  VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length (m)</TextBlock>
                                         <TextBlock FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
                                             <TextBlock.Text>
-                                                <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
+                                                <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="#,0" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
                                                     <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
                                                     <Binding Path="Job.Spools" Mode="OneWay"/>
                                                 </MultiBinding>
@@ -758,7 +758,7 @@
                                         <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight (g)</TextBlock>
                                         <TextBlock   FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
                                             <TextBlock.Text>
-                                                <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
+                                                <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="#,0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
                                                     <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
                                                     <Binding Path="Job.GramPerLength" Mode="OneWay"/>
                                                     <Binding Path="Job.Spools" Mode="OneWay"/>
@@ -971,7 +971,7 @@
                                 <Image Margin="0 2 0 0" Source="../Images/Job Issues/job_length.png" Stretch="Uniform" VerticalAlignment="Top" HorizontalAlignment="Left" Width="Auto" Height="32" />
                                 <TextBlock Margin="20 5 0 0" Width="Auto"  FontWeight="SemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"  VerticalAlignment="Top">
                                     <TextBlock.Text>
-                                        <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
+                                        <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="#,0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
                                             <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
                                             <Binding Path="Job.Spools" Mode="OneWay"/>
                                         </MultiBinding>
-- 
cgit v1.3.1