diff --git a/ResultsBrowser/Forms/CustomQuerySpecificationForm.Designer.cs b/ResultsBrowser/Forms/CustomQuerySpecificationForm.Designer.cs index d02b1c298..216582521 100644 --- a/ResultsBrowser/Forms/CustomQuerySpecificationForm.Designer.cs +++ b/ResultsBrowser/Forms/CustomQuerySpecificationForm.Designer.cs @@ -181,7 +181,7 @@ // // parameterValueTextBox // - this.parameterValueTextBox.Location = new System.Drawing.Point(325, 14); + this.parameterValueTextBox.Location = new System.Drawing.Point(612, 13); this.parameterValueTextBox.Name = "parameterValueTextBox"; this.parameterValueTextBox.Size = new System.Drawing.Size(68, 20); this.parameterValueTextBox.TabIndex = 1; @@ -189,7 +189,7 @@ // parameterNameLabel // this.parameterNameLabel.AutoSize = true; - this.parameterNameLabel.Location = new System.Drawing.Point(128, 17); + this.parameterNameLabel.Location = new System.Drawing.Point(121, 17); this.parameterNameLabel.Name = "parameterNameLabel"; this.parameterNameLabel.Size = new System.Drawing.Size(0, 13); this.parameterNameLabel.TabIndex = 0; diff --git a/ResultsBrowser/Forms/CustomQuerySpecificationForm.cs b/ResultsBrowser/Forms/CustomQuerySpecificationForm.cs index 932ccec0f..7ad330645 100644 --- a/ResultsBrowser/Forms/CustomQuerySpecificationForm.cs +++ b/ResultsBrowser/Forms/CustomQuerySpecificationForm.cs @@ -83,7 +83,7 @@ namespace ResultsBrowser.Forms else if (CQCriteria == CQCriteria.BenchAndBatchNr) { parameterGroupBox.Enabled = true; - parameterNameLabel.Text = "Test bench number (e.g. 10 for WR10)"; + parameterNameLabel.Text = "wr10=5, wr11=6, wr13=8, wr14=10, wr15=9, wr18=11, wr19=12, wr20=13, wr21=14"; } else { diff --git a/ResultsBrowser/ResultsBrowserWnd.cs b/ResultsBrowser/ResultsBrowserWnd.cs index 093e0c9a9..15a5f3414 100644 --- a/ResultsBrowser/ResultsBrowserWnd.cs +++ b/ResultsBrowser/ResultsBrowserWnd.cs @@ -743,28 +743,28 @@ namespace ResultsBrowser /// SUEZ specific switch (testId) { - case -2: oraD.AdjErrA4 = error; break; - case -1: oraD.AdjErr = error; break; - case 1: oraD.Q1LrErr = error; break; - case 2: oraD.Q2acLrErr = error; break; - case 3: oraD.Q2LrErr = error; break; - case 5: oraD.Q3LrErr = error; break; - case 6: oraD.Q1RlErr = error; break; - case 7: oraD.Q2acRlErr = error; break; - case 8: oraD.Q2RlErr = error; break; - case 10: oraD.Q3RlErr = error; break; + case -2: oraD.AdjErrA4 = error; break; + case -1: oraD.AdjErr = error; break; + case 1: oraD.Q1LrErr = error; break; + case 2: oraD.Q2acLrErr = error; break; + case 3: oraD.Q2LrErr = error; break; + case 5: oraD.Q3LrErr = error; break; + case 6: oraD.Q1RlErr = error; break; + case 7: oraD.Q2acRlErr = error; break; + case 8: oraD.Q2RlErr = error; break; + case 10: oraD.Q3RlErr = error; break; default: break; } #else /// DEWA specific switch (testId) { - case -1: oraD.AdjErr = error; break; - case 1: oraD.Q1Err = error; break; - case 2: oraD.Q2Err = error; break; - case 3: oraD.Q2AdjErr = error; break; - case 4: oraD.Q3Err = error; break; - case 5: oraD.Q4Err = error; break; + case -1: oraD.AdjErr = error; break; + case 1: oraD.Q1Err = error; break; + case 2: oraD.Q2Err = error; break; + case 3: oraD.Q2AdjErr = error; break; + case 4: oraD.Q3Err = error; break; + case 5: oraD.Q4Err = error; break; default: break; } #endif @@ -779,15 +779,27 @@ namespace ResultsBrowser { switch (dlg.IntParameter) { - case 10: Results.DB.ConnectionString = "SERVER=10.42.130.69; DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; - case 11: Results.DB.ConnectionString = "SERVER=10.42.129.27; DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; - case 13: Results.DB.ConnectionString = "SERVER=10.42.130.52; DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; - case 15: Results.DB.ConnectionString = "SERVER=10.42.130.71; DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; - case 14: Results.DB.ConnectionString = "SERVER=10.42.130.72; DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; - case 18: Results.DB.ConnectionString = "SERVER=10.42.130.165; DATABASE=st-wr18-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; - case 19: Results.DB.ConnectionString = "SERVER=10.42.128.159; DATABASE=st-wr19-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; - case 20: Results.DB.ConnectionString = "SERVER=10.42.130.76; DATABASE=st-wr20-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; - case 21: Results.DB.ConnectionString = "SERVER=10.42.128.201; DATABASE=st-wr21-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; +#if LOCAL + case 5: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr10-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break; + case 6: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr11-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break; + case 8: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr13-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break; + case 9: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr15-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break; + case 10: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr14-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break; + case 11: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr18-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break; + case 12: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr19-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break; + case 13: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr20-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break; + case 14: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr21-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break; +#else + case 5: Results.DB.ConnectionString = "SERVER=10.42.130.69; DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; + case 6: Results.DB.ConnectionString = "SERVER=10.42.129.27; DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; + case 8: Results.DB.ConnectionString = "SERVER=10.42.130.52; DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; + case 9: Results.DB.ConnectionString = "SERVER=10.42.130.71; DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; + case 10: Results.DB.ConnectionString = "SERVER=10.42.130.72; DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; + case 11: Results.DB.ConnectionString = "SERVER=10.42.130.165; DATABASE=st-wr18-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; + case 12: Results.DB.ConnectionString = "SERVER=10.42.128.159; DATABASE=st-wr19-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; + case 13: Results.DB.ConnectionString = "SERVER=10.42.130.76; DATABASE=st-wr20-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; + case 14: Results.DB.ConnectionString = "SERVER=10.42.128.201; DATABASE=st-wr21-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; +#endif default: Results.DB.ConnectionString = string.Empty; break; } Results.DB.DbType = Users.Entities.DBType.MySql; @@ -860,14 +872,14 @@ namespace ResultsBrowser counter = 0; foreach (var testBenchId in testBenches) { - if (testBenchId == 4) + if (testBenchId == 4 || (dlg.CQCriteria == CQCriteria.BenchAndBatchNr && testBenchId != dlg.IntParameter)) { - /// Skip WR9 + /// Skip WR9 or other test benches continue; } consoleTextBox.Text += string.Format("{0}\r\n", GetBenchName(testBenchId)); -#if false +#if LOCAL /// Local database copies switch (testBenchId) { @@ -886,10 +898,10 @@ namespace ResultsBrowser /// Test bench databases switch (testBenchId) { - case 5: Results.DB.ConnectionString = "SERVER=10.42.130.69; DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; - case 6: Results.DB.ConnectionString = "SERVER=10.42.129.27; DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; - case 8: Results.DB.ConnectionString = "SERVER=10.42.130.52; DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; - case 9: Results.DB.ConnectionString = "SERVER=10.42.130.71; DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; + case 5: Results.DB.ConnectionString = "SERVER=10.42.130.69; DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; + case 6: Results.DB.ConnectionString = "SERVER=10.42.129.27; DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; + case 8: Results.DB.ConnectionString = "SERVER=10.42.130.52; DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; + case 9: Results.DB.ConnectionString = "SERVER=10.42.130.71; DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; case 10: Results.DB.ConnectionString = "SERVER=10.42.130.72; DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; case 11: Results.DB.ConnectionString = "SERVER=10.42.130.165; DATABASE=st-wr18-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; case 12: Results.DB.ConnectionString = "SERVER=10.42.128.159; DATABASE=st-wr19-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break; @@ -1041,11 +1053,11 @@ namespace ResultsBrowser { switch (testBenchId) { - case 4: return "WR9"; - case 5: return "WR10"; - case 6: return "WR11"; - case 8: return "WR13"; - case 9: return "WR15"; + case 4: return "WR9"; + case 5: return "WR10"; + case 6: return "WR11"; + case 8: return "WR13"; + case 9: return "WR15"; case 10: return "WR14"; case 11: return "WR18"; case 12: return "WR19";