- German translations,

- Results writer file creation fixed.
2014-07-28 14:07:47 +02:00 · 2014-07-28 14:07:47 +02:00 · 73d2a22f31
commit 73d2a22f31
parent aa3e19a76c
6 changed files with 1130 additions and 1075 deletions
--- a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs
+++ b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs
@ -102,7 +102,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
 			PrintAt(e, Tab1, lineNr * SpacingOne, prn.Version);
 			lineNr++;
 			PrintAt(e, Tab1, lineNr * SpacingOne, "Prüfstand Nr :");
-			PrintAt(e, Tab2, lineNr * SpacingOne, prn.BenchId.TestBenchNr.ToString());
+            PrintAt(e, Tab2, lineNr * SpacingOne, (prn.BenchId != null) ? prn.BenchId.TestBenchNr.ToString() : "");
 			PrintAt(e, Tab3, lineNr * SpacingOne, "Datum :");
 			PrintAt(e, Tab4, lineNr * SpacingOne, DateTime.Now.Date.ToString("d"));
 			lineNr++;
--- a/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs
+++ b/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs
@ -19,7 +19,6 @@ namespace TBF.BenchControl.ResultsWriters.Basic
 		/// </summary>
 		IList<Entities.TestResult> results;
 		DateTime now;
-		Stream stream;
 		StreamWriter writer;

 		public Writer(WriterCfg cfg)
@ -36,12 +35,20 @@ namespace TBF.BenchControl.ResultsWriters.Basic
 		public IOperation WriteResultsOp(IList<Entities.TestResult> results)
 		{
 			this.results = results;
-			this.now = DateTime.Now;
-			this.stream = System.IO.File.Create(string.Format("{0}Results\\{1}-{2}-{3}\\{4}-{5}.txt",
-														 Program.HomeDir,
-														 now.Year, now.Month, now.Date, 
-														 now.Hour, now.Minute));
-			this.writer = new StreamWriter(stream);
+			now = DateTime.Now;
+            try
+            {
+                string dayDirectory = string.Format("{0}Results\\{1}-{2}-{3}", Program.HomeDir,
+                                                now.Year, now.Month.ToString("D2"), now.Day.ToString("D2"));
+                string fileName = string.Format("{0}\\{1}-{2}.txt", dayDirectory,
+                                                now.Hour.ToString("D2"), now.Minute.ToString("D2"));
+                Directory.CreateDirectory(dayDirectory);
+                writer = new StreamWriter(System.IO.File.Create(fileName));
+            }
+            catch
+            {
+                writer = null;
+            }

 			return this;
 		}
@ -49,16 +56,22 @@ namespace TBF.BenchControl.ResultsWriters.Basic
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
+            if (writer == null) return;
+
 			writer.WriteLine("Staatlich anerkante Prüfstelle für Meßgeräte für Wasser WB2");
 			writer.WriteLine("");
 			writer.WriteLine(string.Format("           PROTOKOLL Nummer {0}", 0));
 			writer.WriteLine("");
 			writer.WriteLine("Ver. 3/13");
-			writer.WriteLine(string.Format("Datum / Zeit            : {0}.{1}.{2}  / {3}:{4}                      Seite : 1/ 1  /  1",
-											now.Date, now.Month, now.Year, now.Hour, now.Minute));
+			writer.WriteLine(string.Format("Datum / Zeit            : {0}.{1}.{2}  {3}:{4}                      Seite : 1/1",
+                                            now.Day.ToString("D2"),
+                                            now.Month.ToString("D2"),
+                                            now.Year.ToString("D4"),
+                                            now.Hour.ToString("D2"),
+                                            now.Minute.ToString("D2")));
 			writer.WriteLine("Wasserzähler Type       : 110338");
 			writer.WriteLine("Gerät Nr.               : 1");
-			writer.WriteLine("Benutzer                : Bauer");
+			writer.WriteLine(string.Format("Benutzer                : {0}", Entities.User.CurrentUser.Name));
 			writer.WriteLine("Impulsrate              :  1               67.422        1");
 			writer.WriteLine("Bereich                 : 22,9 °C  947 mbar  43 %");
 			writer.WriteLine("");
@ -70,35 +83,35 @@ namespace TBF.BenchControl.ResultsWriters.Basic
 			{
 				if (tr.MetersKind == Entities.MetersKind.Single)
 				{
-					writer.WriteLine(string.Format("{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11}"),
-									 tr.Name,
-									 tr.Method,
-									 tr.Meters[0].VolumeErrorPct,
-									 tr.FlowMass,
-									 tr.Time,
-									 tr.TempInAvrg,
-									 tr.TempDivAvrg,
-									 tr.DensityOut,
-									 tr.MassDiff,
-									 tr.PressInAvrg,
-									 tr.PressOutAvrg,
-									 tr.VolumeCTV);
+					writer.WriteLine(string.Format("{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11}",
+									                 tr.Name,
+									                 tr.Method,
+									                 tr.Meters[0].VolumeErrorPct,
+									                 tr.FlowMass,
+									                 tr.Time,
+									                 tr.TempInAvrg,
+									                 tr.TempDivAvrg,
+									                 tr.DensityOut,
+									                 tr.MassDiff,
+									                 tr.PressInAvrg,
+									                 tr.PressOutAvrg,
+									                 tr.VolumeCTV));
 				}
 				else if (tr.MetersKind == Entities.MetersKind.Combined)
 				{
-					writer.WriteLine(string.Format("{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11}"),
-									 tr.Name,
-									 tr.Method,
-									 tr.CombinedMeters[0].VolumeErrorPct,
-									 tr.FlowMass,
-									 tr.Time,
-									 tr.TempInAvrg,
-									 tr.TempDivAvrg,
-									 tr.DensityOut,
-									 tr.MassDiff,
-									 tr.PressInAvrg,
-									 tr.PressOutAvrg,
-									 tr.VolumeCTV);
+					writer.WriteLine(string.Format("{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11}",
+									                 tr.Name,
+									                 tr.Method,
+									                 tr.CombinedMeters[0].VolumeErrorPct,
+									                 tr.FlowMass,
+									                 tr.Time,
+									                 tr.TempInAvrg,
+									                 tr.TempDivAvrg,
+									                 tr.DensityOut,
+									                 tr.MassDiff,
+									                 tr.PressInAvrg,
+									                 tr.PressOutAvrg,
+									                 tr.VolumeCTV));
 				}
 			}
 	
@ -113,14 +126,15 @@ namespace TBF.BenchControl.ResultsWriters.Basic
 		/// <returns>Event.ResultsWritten</returns>
 		public Event Run()
 		{
-			
 			return Event.ResultsWritten;
 		}

 		/// <summary>Stop this operation</summary>
 		public void Stop()
 		{
-			writer.WriteLine("---------------------------------------------------------------------------------------------------------------------------------------");
+            if (writer == null) return;
+
+            writer.WriteLine("---------------------------------------------------------------------------------------------------------------------------------------");
 			writer.WriteLine("");
 			writer.WriteLine("Hersteller :                            Bemerkung :  M - Prüfung gegen Waage");
 			writer.WriteLine("                                                     V - Prüfung gegen MID");
@ -132,9 +146,7 @@ namespace TBF.BenchControl.ResultsWriters.Basic
 			writer.WriteLine("---------------------------------------------------------------------------------------------------------------------------------------");

 			if (writer != null) writer.Close();
-			if (stream != null) stream.Close();
 			writer = null;
-			stream = null;
 		}
 	}
 }
--- a/TestBenchFramework/ProcedureDlg.Designer.cs
+++ b/TestBenchFramework/ProcedureDlg.Designer.cs
@ -90,26 +90,29 @@
            // 
            // mainSplitContainer.Panel1
            // 
+            resources.ApplyResources(this.mainSplitContainer.Panel1, "mainSplitContainer.Panel1");
            this.mainSplitContainer.Panel1.Controls.Add(this.tabControl);
            // 
            // mainSplitContainer.Panel2
            // 
+            resources.ApplyResources(this.mainSplitContainer.Panel2, "mainSplitContainer.Panel2");
            this.mainSplitContainer.Panel2.Controls.Add(this.sharedButtons);
            // 
            // tabControl
            // 
+            resources.ApplyResources(this.tabControl, "tabControl");
            this.tabControl.Controls.Add(this.generalTabPage);
            this.tabControl.Controls.Add(this.historyTabPage);
            this.tabControl.Controls.Add(this.metrology1TabPage);
            this.tabControl.Controls.Add(this.metrology2TabPage);
            this.tabControl.Controls.Add(this.processTabPage);
-            resources.ApplyResources(this.tabControl, "tabControl");
            this.tabControl.Name = "tabControl";
            this.tabControl.SelectedIndex = 0;
            this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
            // 
            // generalTabPage
            // 
+            resources.ApplyResources(this.generalTabPage, "generalTabPage");
            this.generalTabPage.Controls.Add(this.transitionEndComboBox);
            this.generalTabPage.Controls.Add(this.transitionEndLabel);
            this.generalTabPage.Controls.Add(this.transitionStartComboBox);
@ -137,15 +140,14 @@
            this.generalTabPage.Controls.Add(this.procNameTextBox);
            this.generalTabPage.Controls.Add(this.label1);
            this.generalTabPage.ImageKey = global::TBF.Resources.Strings.String1;
-            resources.ApplyResources(this.generalTabPage, "generalTabPage");
            this.generalTabPage.Name = "generalTabPage";
            this.generalTabPage.ToolTipText = global::TBF.Resources.Strings.String1;
            this.generalTabPage.UseVisualStyleBackColor = true;
            // 
            // transitionEndComboBox
            // 
-            this.transitionEndComboBox.FormattingEnabled = true;
            resources.ApplyResources(this.transitionEndComboBox, "transitionEndComboBox");
+            this.transitionEndComboBox.FormattingEnabled = true;
            this.transitionEndComboBox.Name = "transitionEndComboBox";
            // 
            // transitionEndLabel
@ -156,8 +158,8 @@
            // 
            // transitionStartComboBox
            // 
-            this.transitionStartComboBox.FormattingEnabled = true;
            resources.ApplyResources(this.transitionStartComboBox, "transitionStartComboBox");
+            this.transitionStartComboBox.FormattingEnabled = true;
            this.transitionStartComboBox.Name = "transitionStartComboBox";
            // 
            // transitionStartLabel
@ -168,20 +170,20 @@
            // 
            // resultsWriterComboBox
            // 
-            this.resultsWriterComboBox.FormattingEnabled = true;
            resources.ApplyResources(this.resultsWriterComboBox, "resultsWriterComboBox");
+            this.resultsWriterComboBox.FormattingEnabled = true;
            this.resultsWriterComboBox.Name = "resultsWriterComboBox";
            // 
            // resultsPrinterComboBox
            // 
-            this.resultsPrinterComboBox.FormattingEnabled = true;
            resources.ApplyResources(this.resultsPrinterComboBox, "resultsPrinterComboBox");
+            this.resultsPrinterComboBox.FormattingEnabled = true;
            this.resultsPrinterComboBox.Name = "resultsPrinterComboBox";
            // 
            // dataEntryComboBox
            // 
-            this.dataEntryComboBox.FormattingEnabled = true;
            resources.ApplyResources(this.dataEntryComboBox, "dataEntryComboBox");
+            this.dataEntryComboBox.FormattingEnabled = true;
            this.dataEntryComboBox.Name = "dataEntryComboBox";
            // 
            // resultsWriterLabel
@ -292,21 +294,21 @@
            // 
            // historyTabPage
            // 
+            resources.ApplyResources(this.historyTabPage, "historyTabPage");
            this.historyTabPage.Controls.Add(this.historyListViewEx);
            this.historyTabPage.ImageKey = global::TBF.Resources.Strings.String1;
-            resources.ApplyResources(this.historyTabPage, "historyTabPage");
            this.historyTabPage.Name = "historyTabPage";
            this.historyTabPage.ToolTipText = global::TBF.Resources.Strings.String1;
            this.historyTabPage.UseVisualStyleBackColor = true;
            // 
            // historyListViewEx
            // 
+            resources.ApplyResources(this.historyListViewEx, "historyListViewEx");
            this.historyListViewEx.AllowColumnReorder = true;
            this.historyListViewEx.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
            this.changedByClmnHdr,
            this.dateClmnHdr,
            this.descriptionClmnHdr});
-            resources.ApplyResources(this.historyListViewEx, "historyListViewEx");
            this.historyListViewEx.DoubleClickActivation = false;
            this.historyListViewEx.FullRowSelect = true;
            this.historyListViewEx.GridLines = true;
@ -328,17 +330,17 @@
            // 
            // metrology1TabPage
            // 
+            resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage");
            this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx);
            this.metrology1TabPage.ImageKey = global::TBF.Resources.Strings.String1;
-            resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage");
            this.metrology1TabPage.Name = "metrology1TabPage";
            this.metrology1TabPage.ToolTipText = global::TBF.Resources.Strings.String1;
            this.metrology1TabPage.UseVisualStyleBackColor = true;
            // 
            // metrology1ListViewEx
            // 
-            this.metrology1ListViewEx.AllowColumnReorder = true;
            resources.ApplyResources(this.metrology1ListViewEx, "metrology1ListViewEx");
+            this.metrology1ListViewEx.AllowColumnReorder = true;
            this.metrology1ListViewEx.DoubleClickActivation = false;
            this.metrology1ListViewEx.FullRowSelect = true;
            this.metrology1ListViewEx.GridLines = true;
@ -349,17 +351,17 @@
            // 
            // metrology2TabPage
            // 
+            resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage");
            this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx);
            this.metrology2TabPage.ImageKey = global::TBF.Resources.Strings.String1;
-            resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage");
            this.metrology2TabPage.Name = "metrology2TabPage";
            this.metrology2TabPage.ToolTipText = global::TBF.Resources.Strings.String1;
            this.metrology2TabPage.UseVisualStyleBackColor = true;
            // 
            // metrology2ListViewEx
            // 
-            this.metrology2ListViewEx.AllowColumnReorder = true;
            resources.ApplyResources(this.metrology2ListViewEx, "metrology2ListViewEx");
+            this.metrology2ListViewEx.AllowColumnReorder = true;
            this.metrology2ListViewEx.DoubleClickActivation = false;
            this.metrology2ListViewEx.FullRowSelect = true;
            this.metrology2ListViewEx.GridLines = true;
@ -370,17 +372,17 @@
            // 
            // processTabPage
            // 
+            resources.ApplyResources(this.processTabPage, "processTabPage");
            this.processTabPage.Controls.Add(this.processListViewEx);
            this.processTabPage.ImageKey = global::TBF.Resources.Strings.String1;
-            resources.ApplyResources(this.processTabPage, "processTabPage");
            this.processTabPage.Name = "processTabPage";
            this.processTabPage.ToolTipText = global::TBF.Resources.Strings.String1;
            this.processTabPage.UseVisualStyleBackColor = true;
            // 
            // processListViewEx
            // 
-            this.processListViewEx.AllowColumnReorder = true;
            resources.ApplyResources(this.processListViewEx, "processListViewEx");
+            this.processListViewEx.AllowColumnReorder = true;
            this.processListViewEx.DoubleClickActivation = false;
            this.processListViewEx.FullRowSelect = true;
            this.processListViewEx.GridLines = true;
--- a/TestBenchFramework/ProcedureDlg.cs
+++ b/TestBenchFramework/ProcedureDlg.cs
@ -90,7 +90,10 @@ namespace TBF
 				Valves = BenchControl.GenericDevices.ValveBase.MasterValves(TbfComponents);
 				RegulValves = new List<IRegulValve>();
 				TestMethods = new List<ITestMethod>();
-				foreach (var cmpnt in TbfComponents)
+                dataEntryComboBox.Items.Add("---");
+                resultsPrinterComboBox.Items.Add("---");
+                resultsWriterComboBox.Items.Add("---");
+                foreach (var cmpnt in TbfComponents)
 				{
 					if (cmpnt is IRegulValve) RegulValves.Add(cmpnt as IRegulValve);
 					if (cmpnt is ITestMethod) TestMethods.Add(cmpnt as ITestMethod);
@ -272,9 +275,9 @@ namespace TBF
 				lastChangedOnTextBox.Text = LoadedProcedure.LastChgTime.ToShortDateString();
 			}
 			notesTextBox.Text = LoadedProcedure.LongDescription;
-			dataEntryComboBox.Text = LoadedProcedure.DataEntry;
-            resultsPrinterComboBox.Text = LoadedProcedure.ResultsPrinter;
-            resultsWriterComboBox.Text = LoadedProcedure.ResultsWriter;
+            dataEntryComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.DataEntry) ? "---" : LoadedProcedure.DataEntry;
+            resultsPrinterComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.ResultsPrinter) ? "---" : LoadedProcedure.ResultsPrinter;
+            resultsWriterComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.ResultsWriter) ? "---" : LoadedProcedure.ResultsWriter;
            transitionStartComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.TransitionStart) ? "---" : LoadedProcedure.TransitionStart;
            transitionEndComboBox.Text   = string.IsNullOrEmpty(LoadedProcedure.TransitionEnd)   ? "---" : LoadedProcedure.TransitionEnd;
 		}
@ -290,9 +293,18 @@ namespace TBF
 			LoadedProcedure.LongDescription = notesTextBox.Text;
 			LoadedProcedure.Watermeters = watermetersTextBox.Text;
 			float ppl;
-			if (dataEntryComboBox.Items.Contains(dataEntryComboBox.Text)) { LoadedProcedure.DataEntry = dataEntryComboBox.Text; }
-			if (resultsPrinterComboBox.Items.Contains(resultsPrinterComboBox.Text)) { LoadedProcedure.ResultsPrinter = resultsPrinterComboBox.Text; }
-			if (resultsWriterComboBox.Items.Contains(resultsWriterComboBox.Text)) { LoadedProcedure.ResultsWriter = resultsWriterComboBox.Text; }
+			if (dataEntryComboBox.Items.Contains(dataEntryComboBox.Text))
+            {
+                LoadedProcedure.DataEntry = dataEntryComboBox.Text.Equals("---") ? string.Empty : dataEntryComboBox.Text;
+            }
+			if (resultsPrinterComboBox.Items.Contains(resultsPrinterComboBox.Text))
+            {
+                LoadedProcedure.ResultsPrinter = resultsPrinterComboBox.Text.Equals("---") ? string.Empty : resultsPrinterComboBox.Text;
+            }
+			if (resultsWriterComboBox.Items.Contains(resultsWriterComboBox.Text))
+            {
+                LoadedProcedure.ResultsWriter = resultsWriterComboBox.Text.Equals("---") ? string.Empty : resultsWriterComboBox.Text;
+            }
            if (transitionStartComboBox.Items.Contains(transitionStartComboBox.Text))
            {
                LoadedProcedure.TransitionStart = transitionStartComboBox.Text.Equals("---") ? string.Empty : transitionStartComboBox.Text;
--- a/TestBenchFramework/ProcedureDlg.de.resx
+++ b/TestBenchFramework/ProcedureDlg.de.resx
@ -118,56 +118,74 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="tabControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>931, 409</value>
-  </data>
-  <data name="mainSplitContainer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1034, 409</value>
-  </data>
-  <data name="generalTabPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>923, 371</value>
-  </data>
-  <data name="generalTabPage.Text" xml:space="preserve">
-    <value>  Allgemein  </value>
-  </data>
  <data name="transitionEndComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>139, 325</value>
+    <value>148, 325</value>
  </data>
  <data name="transitionEndLabel.Location" type="System.Drawing.Point, System.Drawing">
    <value>24, 330</value>
  </data>
+  <data name="transitionEndLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>62, 13</value>
+  </data>
+  <data name="transitionEndLabel.Text" xml:space="preserve">
+    <value>Entwässern</value>
+  </data>
  <data name="transitionStartComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>139, 295</value>
+    <value>148, 295</value>
  </data>
  <data name="transitionStartLabel.Location" type="System.Drawing.Point, System.Drawing">
    <value>24, 300</value>
  </data>
+  <data name="transitionStartLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>45, 13</value>
+  </data>
+  <data name="transitionStartLabel.Text" xml:space="preserve">
+    <value>Befüllen</value>
+  </data>
  <data name="resultsWriterComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>139, 264</value>
+    <value>148, 264</value>
  </data>
  <data name="resultsPrinterComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>139, 233</value>
+    <value>148, 233</value>
  </data>
  <data name="dataEntryComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>139, 203</value>
+    <value>148, 203</value>
  </data>
  <data name="resultsWriterLabel.Location" type="System.Drawing.Point, System.Drawing">
    <value>24, 267</value>
  </data>
+  <data name="resultsWriterLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>122, 13</value>
+  </data>
+  <data name="resultsWriterLabel.Text" xml:space="preserve">
+    <value>Speichern auf Festplatte</value>
+  </data>
  <data name="resultsPrinterLabel.Location" type="System.Drawing.Point, System.Drawing">
    <value>24, 236</value>
  </data>
+  <data name="resultsPrinterLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>45, 13</value>
+  </data>
+  <data name="resultsPrinterLabel.Text" xml:space="preserve">
+    <value>Drucker</value>
+  </data>
  <data name="dataEntryLabel.Location" type="System.Drawing.Point, System.Drawing">
    <value>24, 206</value>
  </data>
+  <data name="dataEntryLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>112, 13</value>
+  </data>
+  <data name="dataEntryLabel.Text" xml:space="preserve">
+    <value>Zählernummereingabe</value>
+  </data>
  <data name="notesTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>348, 205</value>
+    <value>357, 205</value>
  </data>
  <data name="notesTextBox.Size" type="System.Drawing.Size, System.Drawing">
    <value>317, 141</value>
  </data>
  <data name="label18.Location" type="System.Drawing.Point, System.Drawing">
-    <value>281, 208</value>
+    <value>290, 208</value>
  </data>
  <data name="label18.Size" type="System.Drawing.Size, System.Drawing">
    <value>61, 13</value>
@ -176,7 +194,7 @@
    <value>Bemerkung</value>
  </data>
  <data name="watermetersTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>139, 162</value>
+    <value>148, 162</value>
  </data>
  <data name="watermetersTextBox.Size" type="System.Drawing.Size, System.Drawing">
    <value>526, 20</value>
@ -184,8 +202,17 @@
  <data name="watermetersLabel.Location" type="System.Drawing.Point, System.Drawing">
    <value>24, 165</value>
  </data>
+  <data name="watermetersLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>59, 13</value>
+  </data>
+  <data name="watermetersLabel.Text" xml:space="preserve">
+    <value>Information</value>
+  </data>
  <data name="lastChangedOnTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>348, 120</value>
+    <value>357, 120</value>
+  </data>
+  <data name="label15.Location" type="System.Drawing.Point, System.Drawing">
+    <value>300, 123</value>
  </data>
  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
    <value>38, 13</value>
@ -194,7 +221,7 @@
    <value>Datum</value>
  </data>
  <data name="lastChangedByTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>140, 121</value>
+    <value>149, 121</value>
  </data>
  <data name="label16.Size" type="System.Drawing.Size, System.Drawing">
    <value>102, 13</value>
@ -203,7 +230,10 @@
    <value>letzte Änderung von</value>
  </data>
  <data name="createdOnTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>348, 87</value>
+    <value>357, 87</value>
+  </data>
+  <data name="label14.Location" type="System.Drawing.Point, System.Drawing">
+    <value>300, 90</value>
  </data>
  <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
    <value>38, 13</value>
@ -211,12 +241,18 @@
  <data name="label14.Text" xml:space="preserve">
    <value>Datum</value>
  </data>
+  <data name="createdByTextBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>148, 87</value>
+  </data>
  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
    <value>62, 13</value>
  </data>
  <data name="label13.Text" xml:space="preserve">
    <value>Errstellt von</value>
  </data>
+  <data name="descriptionTextBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>148, 53</value>
+  </data>
  <data name="descriptionTextBox.Size" type="System.Drawing.Size, System.Drawing">
    <value>526, 20</value>
  </data>
@ -226,20 +262,20 @@
  <data name="label12.Text" xml:space="preserve">
    <value>Kurzbeschreibung</value>
  </data>
+  <data name="procNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>148, 21</value>
+  </data>
  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
    <value>75, 13</value>
  </data>
  <data name="label1.Text" xml:space="preserve">
    <value>Prüfungsname</value>
  </data>
-  <data name="historyTabPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>923, 406</value>
+  <data name="generalTabPage.Size" type="System.Drawing.Size, System.Drawing">
+    <value>923, 371</value>
  </data>
-  <data name="historyTabPage.Text" xml:space="preserve">
-    <value>Änderungen</value>
-  </data>
-  <data name="historyListViewEx.Size" type="System.Drawing.Size, System.Drawing">
-    <value>917, 400</value>
+  <data name="generalTabPage.Text" xml:space="preserve">
+    <value>  Allgemein  </value>
  </data>
  <data name="changedByClmnHdr.Text" xml:space="preserve">
    <value>Benutzername</value>
@ -250,57 +286,47 @@
  <data name="descriptionClmnHdr.Text" xml:space="preserve">
    <value>Kurzbeschreibung</value>
  </data>
+  <data name="historyListViewEx.Size" type="System.Drawing.Size, System.Drawing">
+    <value>917, 365</value>
+  </data>
+  <data name="historyTabPage.Size" type="System.Drawing.Size, System.Drawing">
+    <value>923, 371</value>
+  </data>
+  <data name="historyTabPage.Text" xml:space="preserve">
+    <value>Änderungen</value>
+  </data>
+  <data name="metrology1ListViewEx.Size" type="System.Drawing.Size, System.Drawing">
+    <value>917, 365</value>
+  </data>
  <data name="metrology1TabPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>923, 406</value>
+    <value>923, 371</value>
  </data>
  <data name="metrology1TabPage.Text" xml:space="preserve">
    <value> Metrologie I. </value>
  </data>
-  <data name="metrology1ListViewEx.Size" type="System.Drawing.Size, System.Drawing">
-    <value>917, 400</value>
+  <data name="metrology2ListViewEx.Size" type="System.Drawing.Size, System.Drawing">
+    <value>917, 365</value>
  </data>
  <data name="metrology2TabPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>923, 406</value>
+    <value>923, 371</value>
  </data>
  <data name="metrology2TabPage.Text" xml:space="preserve">
    <value> Metrologie II. </value>
  </data>
-  <data name="metrology2ListViewEx.Size" type="System.Drawing.Size, System.Drawing">
-    <value>917, 400</value>
+  <data name="processListViewEx.Size" type="System.Drawing.Size, System.Drawing">
+    <value>917, 365</value>
  </data>
  <data name="processTabPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>923, 406</value>
+    <value>923, 371</value>
  </data>
  <data name="processTabPage.Text" xml:space="preserve">
    <value>  Prozess  </value>
  </data>
-  <data name="processListViewEx.Size" type="System.Drawing.Size, System.Drawing">
-    <value>917, 400</value>
+  <data name="tabControl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>931, 409</value>
  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="purgeStartTabPage.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 3, 3, 3</value>
-  </data>
-  <data name="purgeStartTabPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>923, 406</value>
-  </data>
-  <data name="purgeStartTabPage.Text" xml:space="preserve">
-    <value>  Spülung - Start  </value>
-  </data>
-  <data name="purgeStartCtrl.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
-  </data>
-  <data name="purgeStartCtrl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>917, 400</value>
-  </data>
-  <data name="purgeEndTabPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>923, 406</value>
-  </data>
-  <data name="purgeEndTabPage.Text" xml:space="preserve">
-    <value>  Spülung - Ende  </value>
-  </data>
-  <data name="purgeEndCtrl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>923, 406</value>
+  <data name="mainSplitContainer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1034, 409</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
    <value>1034, 409</value>
--- a/TestBenchFramework/ProcedureDlg.resx
+++ b/TestBenchFramework/ProcedureDlg.resx