diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs index ed52cd109..fd7253eda 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs @@ -27,12 +27,10 @@ namespace TBF.BenchControl.ResultsPrinters.Munich const int MarginTop = 7; /// Margins of the text from table lines const int MarginLeft = 4; /// Margins of the text from table lines - /// Initialized in the constructor - readonly Printer prn; - /// /// Data to print /// + readonly string docVersion; readonly Results.Entities.WaterMeter wm; string zaehlertyp; string pruefvorlage; @@ -57,11 +55,11 @@ namespace TBF.BenchControl.ResultsPrinters.Munich /// Constructor /// /// Text to be printed - public MunichPrintDocument(Printer printer, + public MunichPrintDocument(string docVersion, Results.Entities.WaterMeter wm, PageOrientation pageOrientation) { - prn = printer; + this.docVersion = docVersion; this.wm = wm; compound = wm.Compound(); @@ -141,10 +139,10 @@ namespace TBF.BenchControl.ResultsPrinters.Munich StringFormat format = new StringFormat(StringFormatFlags.LineLimit); RectangleF printArea = new RectangleF(TitleX, TitleY, 667, 50); - e.Graphics.DrawString(prn.Title, this.fontTitle, Brushes.Black, printArea); + e.Graphics.DrawString(wm.Batch.ProtocolTitle, this.fontTitle, Brushes.Black, printArea); int lineNr = FirstLineNr; - PrintAt(e, Tab1, lineNr * SpacingOne, prn.Version); + PrintAt(e, Tab1, lineNr * SpacingOne, docVersion); lineNr++; PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Prüfstand Nr :"); PrintBoldAt(e, Tab2, lineNr * SpacingOne, wm.BenchId().ToString()); diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs index 8e0236a22..24e1234d7 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs @@ -24,8 +24,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich /// Data to print Results.Entities.Batch batch; - public string Title; - public string Version { get { return printerCfg.Version; } } + public string Version { get { return printerCfg.Version; } } public Printer() @@ -47,7 +46,6 @@ namespace TBF.BenchControl.ResultsPrinters.Munich public IOperation PrintResultsOp(Results.Entities.Batch batch) { this.batch = batch; - this.Title = batch.ProtocolTitle; return this; } @@ -56,7 +54,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich { foreach (var wm in batch.WaterMeters) { - new MunichPrintDocument(this, wm, printerCfg.PageOrientation).Print(); + new MunichPrintDocument(printerCfg.Version, wm, printerCfg.PageOrientation).Print(); } } diff --git a/TestBenchFramework/Forms/PreviousResultCtrl.cs b/TestBenchFramework/Forms/PreviousResultCtrl.cs index 4b06502b1..415064ad9 100644 --- a/TestBenchFramework/Forms/PreviousResultCtrl.cs +++ b/TestBenchFramework/Forms/PreviousResultCtrl.cs @@ -45,22 +45,34 @@ namespace TBF.Forms startTimeLabel.Text = string.Format("{0} {1}", StarTime.ToShortDateString(), StarTime.ToShortTimeString()); endTimeLabel.Text = string.Format("{0} {1}", EndTime.ToShortDateString(), EndTime.ToShortTimeString()); procedureLabel.Text = ProcedureName; - purchaseOrderLabel.Text = string.Format("Obj.: {0}", PurchaseOrder); - passedCountLabel.Text = string.Format("Dobrých: {0}", PassedCount); - failedCountLabel.Text = string.Format("Zlých: {0}", FailedCount); + purchaseOrderLabel.Text = string.Format("{0}: {1}", Strings.Purchase_order, PurchaseOrder); + passedCountLabel.Text = string.Format("{0}: {1}", Strings.Passed, PassedCount); + failedCountLabel.Text = string.Format("{0}: {1}", Strings.Failed, FailedCount); - sentCheckBox.Text = Strings.Sent; - sentCheckBox.Checked = Sent; +#if MUNICH + sentCheckBox.Text = Strings.Printed; + sentCheckBox.Checked = Sent; + sendButton.Enabled = true; + sendButton.Text = Strings.Again; +#else + sentCheckBox.Text = Strings.Sent; + sentCheckBox.Checked = Sent; sendButton.Enabled = !Sent; sendButton.Text = Strings.Again; - } +#endif + } public void UpdateSentState(bool sent) { this.Sent = sent; +#if MUNICH + sentCheckBox.Checked = sent; + sendButton.Enabled = true; +#else sentCheckBox.Checked = sent; sendButton.Enabled = !sent; - } +#endif + } private void sendButton_Click(object sender, EventArgs e) { diff --git a/TestBenchFramework/Forms/PreviousResultsDlg.cs b/TestBenchFramework/Forms/PreviousResultsDlg.cs index 64d787041..c388dc5b4 100644 --- a/TestBenchFramework/Forms/PreviousResultsDlg.cs +++ b/TestBenchFramework/Forms/PreviousResultsDlg.cs @@ -109,6 +109,20 @@ namespace TBF.Forms MessageBoxButtons.OK, MessageBoxIcon.Error); } +#elif MUNICH + string docVersion = string.Empty; + foreach (var cmp in TBF.BenchControl.StateMachine.Components) + { + if (cmp.ClassName == "ResultsPrinter4Munich") + { + docVersion = (cmp as TBF.BenchControl.ResultsPrinters.Munich.Printer).Version; + break; + } + } + foreach (var wm in b.WaterMeters) + { + new TBF.BenchControl.ResultsPrinters.Munich.MunichPrintDocument(docVersion, wm, Config.Entities.PageOrientation.Portrait).Print(); + } #endif } } diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 8d34af42a..d9e25e205 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.7.298.1")] -[assembly: AssemblyFileVersion("2.7.298.1")] +[assembly: AssemblyVersion("2.7.299.1")] +[assembly: AssemblyFileVersion("2.7.299.1")] diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index d16a75173..b72d2a6a6 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -2301,6 +2301,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Printed. + /// + internal static string Printed { + get { + return ResourceManager.GetString("Printed", resourceCulture); + } + } + /// /// Looks up a localized string similar to Printer. /// diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index f312fe9f0..a5bd19dc8 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -1189,7 +1189,7 @@ Wasserzählerergebnisse drucken - wieder + Wieder Vorherige Ergebnisse @@ -1236,4 +1236,7 @@ Bedingung für das Ende + + Gedruckt + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index 60f3751fe..e5e8523f8 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -1411,4 +1411,7 @@ Saving and printing results + + Printed + \ No newline at end of file diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs index d0b6a2189..8408c5893 100644 --- a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs +++ b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs @@ -45,7 +45,7 @@ namespace TBF.Screens { InitializeComponent(); -#if MUNICH +#if !(IPERLST || IPERLST_SPECIAL || MUNICH) previousResultsButton.Visible = false; #endif