Update Weight calc on change RML

Related Work Items: #8622

2 files changed, 54 insertions, 27 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs
index 8267fd3aa..d8a71fc78 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs
@@ -130,8 +130,7 @@ namespace Tango.PPC.Jobs.Models
                 {
                     _numberofunits = value;
                     RaisePropertyChangedAuto();
-                    RaisePropertyChanged(nameof(LengthIncludingNumberOfUnits));
-                    RaisePropertyChanged(nameof(LengthIncludingNumberOfUnitsAndSpools));
+                    OnUpdateLengthhWeight();
                     RaisePropertyChanged(nameof(GetEstimatedDuration));
                 }
             }
@@ -226,6 +225,8 @@ namespace Tango.PPC.Jobs.Models
                     _rml = value;
                     RaisePropertyChangedAuto();
                     RaisePropertyChanged( nameof(GetEstimatedDuration));
+                    RaisePropertyChanged(nameof(GramPerLength));
+                    OnUpdateLengthhWeight();
                 }
             }
         }
@@ -362,8 +363,7 @@ namespace Tango.PPC.Jobs.Models
                     RaisePropertyChangedAuto();
                     OnNumberOfSpoolsChanged();
                     RaisePropertyChanged(nameof(Copies));
-                    RaisePropertyChanged(nameof(LengthIncludingNumberOfUnits));
-                    RaisePropertyChanged(nameof(LengthIncludingNumberOfUnitsAndSpools));
+                    OnUpdateLengthhWeight();
                 }
             }
         }
@@ -391,8 +391,7 @@ namespace Tango.PPC.Jobs.Models
                             _copies = coeff * NumberSpools;
                         }
                         NumberOfUnits = (int)_copies / NumberSpools;
-                        RaisePropertyChanged(nameof(LengthIncludingNumberOfUnits));
-                        RaisePropertyChanged(nameof(LengthIncludingNumberOfUnitsAndSpools));
+                        OnUpdateLengthhWeight();
                     }
                     else
                         _copies = value;
@@ -688,7 +687,35 @@ namespace Tango.PPC.Jobs.Models
                 return 0d;
             }
         }
-       
+        
+        [JsonIgnore]
+        public double WeightIncludingNumberOfUnits
+        {
+            get
+            {
+                if (Rml == null)
+                    return 0;
+
+                var gramPerlength = Rml.GetGramPer1000mLength;
+                var weight = (LengthIncludingNumberOfUnits * gramPerlength) / (1000);//(g)
+                return weight;
+            }
+        }
+        
+        [JsonIgnore]
+        public double WeightIncludingNumberOfUnitsAndSpools
+        {
+            get
+            {
+                if (NumberSpools >= 4)
+                {
+                    return WeightIncludingNumberOfUnits * NumberSpools;
+                }
+
+                return WeightIncludingNumberOfUnits;
+            }
+        }
+
         #endregion
 
         #region constructors
@@ -1071,13 +1098,20 @@ namespace Tango.PPC.Jobs.Models
                     //}
                 }
                 RaisePropertyChanged(nameof(Length));
-                RaisePropertyChanged(nameof(LengthIncludingNumberOfUnits));
-                RaisePropertyChanged(nameof(LengthIncludingNumberOfUnitsAndSpools));
+                OnUpdateLengthhWeight();
 
             }
             RaisePropertyChanged(nameof(GetEstimatedDuration)); 
         }
 
+        private void OnUpdateLengthhWeight()
+        {
+            RaisePropertyChanged(nameof(LengthIncludingNumberOfUnits));
+            RaisePropertyChanged(nameof(LengthIncludingNumberOfUnitsAndSpools));
+            RaisePropertyChanged(nameof(WeightIncludingNumberOfUnits));
+            RaisePropertyChanged(nameof(WeightIncludingNumberOfUnitsAndSpools));
+        }
+
         private void OnSelectAllChanged()
         {
             if (Segments != null )
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
index 811bd5c9a..d6163506f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
@@ -1219,13 +1219,13 @@
                                         </TextBlock>
                                         <TextBlock VerticalAlignment="Center" Margin="10 0 0 0"  FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
                                             <Run Text="Total:" FontWeight="Normal"></Run>
-                                            <Run  FontWeight="Bold">
-                                                    <Run.Text>
+                                            <Run  FontWeight="Bold" Text="{Binding JobModel.WeightIncludingNumberOfUnitsAndSpools, StringFormat='#,0.##', Mode=OneWay}">
+                                                    <!--<Run.Text >
                                                         <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="#,0.##" >
-                                                            <Binding Path="JobModel.LengthIncludingNumberOfUnitsAndSpools" Mode="OneWay"/>
-                                                             <Binding Path="JobModel.GramPerLength" Mode="OneWay"/>
+                                                            <Binding Path="JobModel.LengthIncludingNumberOfUnitsAndSpools" />
+                                                             <Binding Path="JobModel.GramPerLength" />
                                                         </MultiBinding>
-                                                    </Run.Text>
+                                                    </Run.Text>-->
                                                     </Run>
                                              <Run Text="g" FontWeight="Bold"></Run> 
                                         </TextBlock>
@@ -1284,13 +1284,13 @@
                                     </TextBlock>
                                 <TextBlock FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
                                         <Run Text="Total:" FontWeight="Normal"></Run>
-                                        <Run  FontWeight="Bold">
-                                            <Run.Text>
+                                        <Run  FontWeight="Bold" Text="{Binding  JobModel.WeightIncludingNumberOfUnitsAndSpools, StringFormat='#,0.##', Mode=OneWay}">
+                                            <!--<Run.Text>
                                                 <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="#,0.##" >
-                                                    <Binding Path="JobModel.LengthIncludingNumberOfUnitsAndSpools" Mode="OneWay"/>
-                                                     <Binding Path="JobModel.GramPerLength" Mode="OneWay"/>
+                                                    <Binding Path="JobModel.LengthIncludingNumberOfUnitsAndSpools" />
+                                                     <Binding Path="JobModel.GramPerLength" />
                                                 </MultiBinding>
-                                            </Run.Text>
+                                            </Run.Text>-->
                                             </Run>
                                         <Run Text="g" FontWeight="Bold"></Run>
                                 </TextBlock>
@@ -1312,14 +1312,7 @@
                                 </TextBlock>
                                 <TextBlock FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
                                     <Run Text="Total:" FontWeight="Normal"></Run>
-                                    <Run  FontWeight="Bold">
-                                            <Run.Text>
-                                                <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="#,0.##" >
-                                                    <Binding Path="JobModel.LengthIncludingNumberOfUnits" Mode="OneWay"/>
-                                                     <Binding Path="JobModel.GramPerLength" Mode="OneWay"/>
-                                                    </MultiBinding>
-                                            </Run.Text>
-                                            </Run>
+                                    <Run  FontWeight="Bold" Text="{Binding JobModel.WeightIncludingNumberOfUnits, Mode=OneWay, StringFormat='#,0.##'}"/>
                                      <Run Text="g" FontWeight="Bold"></Run>
                                 </TextBlock>
                             </UniformGrid>