Yet more MainWnd, MainSeq, etc. changes,ver. 3.1.1811

2021-11-18 14:53:12 +01:00
parent 587f6dffd0
commit 0494054171
10 changed files with 259 additions and 209 deletions
@@ -44,7 +44,7 @@ namespace Results

 		public static BatchResults NewFromProcedure(int batchNr, int benchId, string benchName, string a1, string a2, string a3, string a4, string a5,
                                                    string user, int userNr, string programVer, Config.Entities.Procedure procedure,
-                                                    WaterMeterData[] waterMeterDatas, int[] waterMeterParts, string variant, string order,
+                                                    WaterMeterData[] waterMeterDatas, int[] waterMeterParts, string variant, string order, string workflow,
                                                    double realDensity, double atTemperature, double buoyancy)
 		{
 			BatchResults d = new BatchResults(waterMeterDatas.Length);
@@ -66,8 +66,9 @@ namespace Results
 					UserNumber = userNr,
 					ProcedureName = procedure.Name,
 					ProcedureDescription = procedure.Description,
-					WatermetersStr = variant,
+                    WatermetersStr = (variant != null) ? variant : string.Empty,
                    PurchaseOrder = order,
+                    Workflow = workflow,
 					ProcedureRevision = procedure.Revision,
 					StartTime = DateTime.Now,
                    SampleDensity = realDensity,