Printed and Saved basic results output improved

TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs

@@ -190,7 +190,7 @@ namespace TBF.BenchControl.ResultsWriters.Basic
 		/// <param name="wmNr">Water meter number</param>
 		void WriteSingleWM(int wmNr)
 		{
-			/// Determin column widths
+			/// Determine column widths
 			int[] columnWidths = new int[resultItems.Count];
 			int totalWidth = 0;
 			for (int i = 0; i < resultItems.Count; i++)
@@ -205,10 +205,18 @@ namespace TBF.BenchControl.ResultsWriters.Basic
 			}
 			totalWidth += 3 * (resultItems.Count - 1);
 
-			writer.WriteLine(string.Format("Water meter {0},  s/n: {1}", wmNr + 1, results[0].Meters[wmNr].SerialNr));
+			/// Write water meter number and s/n
+			writer.Write(string.Format("Water meter {0}", wmNr + 1));
+			if (!string.IsNullOrEmpty(results[0].Meters[wmNr].SerialNr))
+			{
+				writer.Write(string.Format(",  s/n: {0}", results[0].Meters[wmNr].SerialNr));
+			}
+			writer.WriteLine(string.Empty);
 	
+			/// Horizontal line
 			writer.WriteLine(new String('-', totalWidth));
 
+			/// Write column headers
 			for (int i = 0; i < resultItems.Count; i++)
 			{
 				writer.Write(resultItems[i].ClmnHeaderText);
@@ -218,9 +226,11 @@ namespace TBF.BenchControl.ResultsWriters.Basic
 				else
 					writer.WriteLine(string.Empty);
 			}
-			
+
+			/// Horizontal line
 			writer.WriteLine(new String('-', totalWidth));
 			
+			/// Write table data
 			foreach (var tr in results)
 			{
 				for (int i = 0; i < resultItems.Count; i++)
@@ -235,7 +245,9 @@ namespace TBF.BenchControl.ResultsWriters.Basic
 				}
 			}
 
+			/// Horizontal line
 			writer.WriteLine(new String('-', totalWidth));
+
 			writer.WriteLine(string.Empty);
 			writer.WriteLine(string.Empty);
 		}