From 32047ef76afc60fe3ef533cb6847bae1573e9944 Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Tue, 11 Jan 2022 20:27:06 +0100
Subject: [PATCH] Clean-up

---
 Common/Common.csproj                | 1 -
 SharedDatabase/Forms/LoginDlg.cs    | 4 ++--
 TBF/Rig/Sequences/ProcessData.cs    | 6 +++++-
 TBF/TBF.csproj                      | 1 +
 {Common => TBF/UI}/ProcedureInfo.cs | 3 ++-
 Workplace/Workplace.csproj          | 5 +++--
 Workplace/WorkplaceDlg.cs           | 5 +++--
 7 files changed, 16 insertions(+), 9 deletions(-)
 rename {Common => TBF/UI}/ProcedureInfo.cs (98%)

diff --git a/Common/Common.csproj b/Common/Common.csproj
index 0fcbaf51a..5d608daf8 100644
--- a/Common/Common.csproj
+++ b/Common/Common.csproj
@@ -74,7 +74,6 @@
     <Compile Include="Printers\PrintersCommon.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="ProcedureInfo.cs" />
     <Compile Include="QuitAppException.cs" />
     <Compile Include="SerializableDictionary.cs" />
     <Compile Include="Telegram.cs" />
diff --git a/SharedDatabase/Forms/LoginDlg.cs b/SharedDatabase/Forms/LoginDlg.cs
index 24ec70a1f..684854fe6 100644
--- a/SharedDatabase/Forms/LoginDlg.cs
+++ b/SharedDatabase/Forms/LoginDlg.cs
@@ -74,8 +74,8 @@ namespace SharedDatabase.Forms
         {
             this.requiredGroupMembership = requiredGroupMembership;
 #if DEBUG
-            user = "MHA";
-            userNameTextBox.Text = "MHA";
+            user = "milan";
+            userNameTextBox.Text = "milan";
             passwordTextBox.Text = "kremik";
 #endif
         }
diff --git a/TBF/Rig/Sequences/ProcessData.cs b/TBF/Rig/Sequences/ProcessData.cs
index 7d12d5b7c..f643d1339 100644
--- a/TBF/Rig/Sequences/ProcessData.cs
+++ b/TBF/Rig/Sequences/ProcessData.cs
@@ -35,10 +35,14 @@ namespace TBF.Rig.Sequences
         ///
         /// Procedure related state variables
         ///
-        public static ProcedureInfo SelectedProcedure;
+        public static TBF.UI.ProcedureInfo SelectedProcedure;
         public static Common.IOrderInfo OrderInfo;
+        /// 
         public static SharedDatabase.Entities.Process Workflow;
         public static SharedDatabase.Entities.Workstep Workstep;
+        public static string PreviousStepName;
+        public static string Part1Name;
+        public static string Part2Name;
 
         ///
         /// Test related (instance) variables.
diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj
index 78c07b96d..c59390310 100644
--- a/TBF/TBF.csproj
+++ b/TBF/TBF.csproj
@@ -2225,6 +2225,7 @@
     <Compile Include="UI\MainWnd.designer.cs">
       <DependentUpon>MainWnd.cs</DependentUpon>
     </Compile>
+    <Compile Include="UI\ProcedureInfo.cs" />
     <Compile Include="UI\Procedures\IProcParamsCtrl.cs" />
     <Compile Include="UI\Procedures\ProcedureDlg.cs">
       <SubType>Form</SubType>
diff --git a/Common/ProcedureInfo.cs b/TBF/UI/ProcedureInfo.cs
similarity index 98%
rename from Common/ProcedureInfo.cs
rename to TBF/UI/ProcedureInfo.cs
index 1a682ca71..b15944ab4 100644
--- a/Common/ProcedureInfo.cs
+++ b/TBF/UI/ProcedureInfo.cs
@@ -3,8 +3,9 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 
-namespace Common
+namespace TBF.UI
 {
     /// <summary>
     /// Contains a procedure name and procedure selection source specification
diff --git a/Workplace/Workplace.csproj b/Workplace/Workplace.csproj
index 4d2ed2205..a12279aba 100644
--- a/Workplace/Workplace.csproj
+++ b/Workplace/Workplace.csproj
@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;VER3</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -31,9 +31,10 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;VER3</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>Workplace.Program</StartupObject>
diff --git a/Workplace/WorkplaceDlg.cs b/Workplace/WorkplaceDlg.cs
index d15d4fd79..e344d36d2 100644
--- a/Workplace/WorkplaceDlg.cs
+++ b/Workplace/WorkplaceDlg.cs
@@ -1182,7 +1182,7 @@ namespace Workplace
                 else if (snGenerator != null && refRecords.Count == 1) throw new Exception("A duplicit code was generated");
 
                 ReferenceRecord refRecord = (refRecords.Count == 1) ? refRecords[0]
-                    : new ReferenceRecord(CurrentOrder.POName, CurrentWorkflow.Name, komponenty[0].ScannedCode);
+                    : new ReferenceRecord(CurrentOrder.POName, CurrentWorkflow.Name, komponenty[0].Part.Name, komponenty[0].ScannedCode);
 
                 /// Handle case of a double check item - update refRecord.Code2
                 if (komponenty[0] is IDoubleCheckItem)
@@ -1318,6 +1318,7 @@ namespace Workplace
                 if (komponenty[i] is CheckItems.S640Stream)
                 {
                     /// eRegister number from data stream ... update refRecord.Code2
+                    refRecord.Name2 = komponenty[i].Part.Name;
                     refRecord.Code2 = komponenty[i].ScannedCode;
                 }
                 else
@@ -1532,7 +1533,7 @@ namespace Workplace
             string[] loadedSiliconCodes = new string[0];
             try
             {
-#if !VER3
+#if SILICON
                 SiliconBatchNumbers.SiliconBatchNumbers sbn;
                 if (null != (sbn = SiliconBatchNumbers.SiliconBatchNumbers.Load("N:\\iPERL vyroba Stara Tura\\software\\sarze silikonu\\Cfg\\silicon.xml")) ||
                     null != (sbn = SiliconBatchNumbers.SiliconBatchNumbers.Load("N:\\iPERL vyroba Stara Tura\\software\\sarze silikonu\\Cfg\\silicon.backup.xml")))