Merge pull request #2014 from olga-jane/Morozova_PipeStatus

Fix ordering pipe #PRISM-287 Fixed

Author: demmy

src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditViewModel.cs

@@ -896,17 +896,24 @@ public bool CheckStatus()
         /// </summary>
         public void ChangePipeStatus(List<string> testsResults)
         {
-            if(testsResults.Contains(PipeTestResultStatus.Rejected.ToString())
-                || testsResults.Contains(PipeTestResultStatus.Scheduled.ToString())
-                || testsResults.Contains(PipeTestResultStatus.Repair.ToString())
-                )
+            if (Pipe.Status != PipeMillStatus.ReadyToShip && Pipe.Status != PipeMillStatus.Shipped)
             {
-                Pipe.Status = PipeMillStatus.Produced;
-            }
-            else
-            {
-                Pipe.Status = PipeMillStatus.Stocked;
+                if (testsResults.Count > 0)
+                {
+                    if (testsResults.Contains(PipeTestResultStatus.Rejected.ToString())
+                   || testsResults.Contains(PipeTestResultStatus.Scheduled.ToString())
+                   || testsResults.Contains(PipeTestResultStatus.Repair.ToString())
+                   )
+                    {
+                        Pipe.Status = PipeMillStatus.Produced;
+                    }
+                    else
+                    {
+                        Pipe.Status = PipeMillStatus.Stocked;
+                    }
+                }
             }
+           
             RaisePropertyChanged("PipeStatus");
         }
 
@@ -1214,15 +1221,5 @@ public PipeMillSubStatus UpdateSubStatus(List<PipeTestResult> allResults, List<s
 
             return result;
         }
-
-        public void UpdatePipe() 
-        {
-            if (Pipe.Id != Guid.Empty)
-            {
-                Pipe = repoMill.RepoPipe.GetByNumber(this.Pipe.Number);
-                RaisePropertyChanged("Railcar");
-                RaisePropertyChanged("PipeStatus");
-            }
-        }
     }
 }

src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.cs

@@ -992,7 +992,7 @@ private void AddInspection(BindingList<PipeTest> tests, IList<Inspector> inspect
                 if (addForm.ShowDialog() == System.Windows.Forms.DialogResult.OK)
                 {
                     addForm.viewModel.TestResult.Pipe = viewModel.Pipe;
-                    addForm.viewModel.TestResult.Order = viewModel.PipeTestResultsMaxOrder();
+                    addForm.viewModel.TestResult.Order = viewModel.PipeTestResults.Max(test => test.Order) + 1;
                     viewModel.PipeTestResults.Add(addForm.viewModel.TestResult);
                     IsModified = true;
                     inspections.RefreshDataSource();
@@ -1159,7 +1159,8 @@ private void AddRepeatedInspections(PipeTestResult pipeTestResult)
                 {
                     Pipe = viewModel.Pipe,
                     Status = PipeTestResultStatus.Scheduled,
-                    Operation = pipeTestResult.Operation
+                    Operation = pipeTestResult.Operation,
+                    Order = viewModel.PipeTestResultsMaxOrder()+1
                 });
 
                 foreach (var operation in pipeTestResult.Operation.RepeatedInspections.Where<PipeTest>(x => x.IsActive))
@@ -1171,7 +1172,8 @@ private void AddRepeatedInspections(PipeTestResult pipeTestResult)
                         {
                             Pipe = viewModel.Pipe,
                             Status = PipeTestResultStatus.Scheduled,
-                            Operation = operation
+                            Operation = operation,
+                            Order = viewModel.PipeTestResultsMaxOrder() + 1
                         });
                     }
                 }
@@ -1218,7 +1220,6 @@ private void MillPipeNewEditXtraForm_Activated(object sender, EventArgs e)
              if (viewModel != null)
              {
                  bool previousState = viewModel.ModifiableView.IsModified;
-                 viewModel.UpdatePipe();
                  viewModel.CheckStatus();
                  viewModel.ModifiableView.IsModified = previousState;
              }

src/PrizmMainProject/Forms/ReleaseNote/NewEdit/ReleaseNoteNewEditXtraForm.cs

@@ -211,7 +211,6 @@ private void removePipe_Click(object sender, EventArgs e)
                 if (pipe != null)
                 {
                     viewModel.RemovePipe(pipe);
-                    pipe.PipeStatus = PipeMillStatus.Stocked;
                     pipesList.RefreshDataSource();
                     pipeNumberLookUp.Properties.DataSource = viewModel.AllPipesToAdd;
                     IsModified = true;