michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IperlLogger handles more then 20 tests, previous results open on current screen, etc., ver. 2.31.2016

Browse Source
This commit is contained in:
Milan Hanajik 2023-02-10 13:43:18 +01:00
parent c0e7eab3b2
commit 4ac72c6bbf
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Results/Forms/BatchResultsDlg.Designer.cs generated
View File

@ -47,6 +47,7 @@
this.ClientSize = new System.Drawing.Size(1058, 721);
this.Controls.Add(this.flowLayoutPanel);
this.Name = "BatchResultsDlg";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Results";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BatchResultsDlg_FormClosing);
this.Load += new System.EventHandler(this.BatchResultsDlg_Load);

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.31.2014.0")]
[assembly: AssemblyFileVersion("2.31.2014.0")]
[assembly: AssemblyVersion("2.31.2016.0")]
[assembly: AssemblyFileVersion("2.31.2016.0")]

2
TBF/Rig/Output/FileWriters/IperlLogger/Writer.cs
View File

@ -255,7 +255,7 @@ namespace TBF.Rig.Output.FileWriters.IperlLogger
/// Save the log file
///
logger.WriteLine("[Wasserzähler-Daten]");
logger.WriteLine(string.Format("PruefPunkte={0}", (maxPruefungsNr > 15) ? 20 : ((maxPruefungsNr > 10) ? 15 : ((maxPruefungsNr > 5) ? 10 : 5))));
logger.WriteLine(string.Format("PruefPunkte={0}", (maxPruefungsNr > 20) ? 99 : (maxPruefungsNr > 15) ? 20 : ((maxPruefungsNr > 10) ? 15 : ((maxPruefungsNr > 5) ? 10 : 5))));
logger.WriteLine(string.Format("Typ={0}", batch.ProcedureName)); /// iP 020 Q3_4 R160 A XXXX
logger.WriteLine(string.Format("MetroKlasse={0}", wmData.MetrologicalClass));
logger.WriteLine(string.Format("Zulassungszeichen={0}", wmData.ApprovalInfo));

4
TBF/Rig/Sequences/MainSeq.cs
View File

@ -1347,9 +1347,10 @@ namespace TBF.Rig.Sequences
if (!e.Contains(Event.ErrorProcessingResults))
{
/// Results successfully saved and printed => update Batch record in Results DB in MySQL
MySql.Data.MySqlClient.MySqlConnection dbConn = null;
try
{
var dbConn = new MySql.Data.MySqlClient.MySqlConnection(Results.DB.ConnectionString);
dbConn = new MySql.Data.MySqlClient.MySqlConnection(Results.DB.ConnectionString);
dbConn.Open();
var cmd = dbConn.CreateCommand();
cmd.CommandText = string.Format("UPDATE `batch` SET `RsltsSent` = '1' WHERE `batch`.`BatchNr` = {0};", ProcessData.BatchRslts.Batch.BatchNr);
@ -1367,6 +1368,7 @@ namespace TBF.Rig.Sequences
}
catch (Exception exc)
{
if (dbConn != null) dbConn.Close();
string msg = string.Format("Unable to update Batch.RsltsSent in local MySQL DB, BatchNr = {0}",
ProcessData.BatchRslts.Batch.BatchNr);
Bridge.OnError(this, msg);

1
TBF/UI/ResultsMI/PreviousResultsDlg.Designer.cs generated
View File

@ -247,6 +247,7 @@
this.MaximizeBox = false;
this.Name = "PreviousResultsDlg";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Previous results";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.PreviousResultsDlg_FormClosing);
this.Load += new System.EventHandler(this.PreviousResultsDlg_Load);