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

Changes for Xylem Nanjing, ver. 3.1.1676

Browse Source
This commit is contained in:
Milan Hanajik
2021-06-18 15:35:46 +02:00
parent f1ef16e1a3
commit 827a9f7c58
837 changed files with 46518 additions and 5851 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Settings/BenchesDlg.cs
+17 -16
View File
@@ -3,6 +3,7 @@
///
using System;
using System.Windows.Forms;
using Common;
using TBF.Resources;
namespace TBF.UI.Settings
@@ -63,10 +64,10 @@ namespace TBF.UI.Settings
/// </summary>
private void addButton_Click(object sender, EventArgs e)
{
Config.DatabaseSettings bench = new Config.DatabaseSettings();
DatabaseSettingsDlg dlg = new DatabaseSettingsDlg(bench, Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString,
Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString,
Config.Data.CurrentBench.EventsDBSettings.ConnectionString);
DatabaseSettings bench = new DatabaseSettings();
DatabaseSettingsDlg dlg = new DatabaseSettingsDlg(bench, Data.CurrentBench.ProceduresDBSettings.ConnectionString,
Data.CurrentBench.WaterMetersDBSettings.ConnectionString,
Data.CurrentBench.EventsDBSettings.ConnectionString);
DialogResult dr = dlg.ShowDialog();
CurrentDBChanged |= dlg.CurrentDBChanged;
if (dr == DialogResult.OK)
@@ -76,12 +77,12 @@ namespace TBF.UI.Settings
if (nrBenches == 0)
{
localSettings.TestBenches = new Config.DatabaseSettings[1];
localSettings.TestBenches = new DatabaseSettings[1];
localSettings.TestBenches[0] = bench;
}
else
{
Config.DatabaseSettings[] newTestBenches = new Config.DatabaseSettings[nrBenches + 1];
DatabaseSettings[] newTestBenches = new DatabaseSettings[nrBenches + 1];
for (int i = 0; i < nrBenches; i++)
{
newTestBenches[i] = localSettings.TestBenches[i];
@@ -102,12 +103,12 @@ namespace TBF.UI.Settings
{
if (testBenchesListBox.SelectedIndex >= 0)
{
Config.DatabaseSettings ori = localSettings.TestBenches[testBenchesListBox.SelectedIndex];
Config.DatabaseSettings bench = (Config.DatabaseSettings)ori.Clone();
DatabaseSettings ori = localSettings.TestBenches[testBenchesListBox.SelectedIndex];
DatabaseSettings bench = (DatabaseSettings)ori.Clone();
DatabaseSettingsDlg dlg = new DatabaseSettingsDlg(bench, Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString,
Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString,
Config.Data.CurrentBench.EventsDBSettings.ConnectionString);
DatabaseSettingsDlg dlg = new DatabaseSettingsDlg(bench, Data.CurrentBench.ProceduresDBSettings.ConnectionString,
Data.CurrentBench.WaterMetersDBSettings.ConnectionString,
Data.CurrentBench.EventsDBSettings.ConnectionString);
DialogResult dr = dlg.ShowDialog();
CurrentDBChanged |= dlg.CurrentDBChanged;
if (dr == DialogResult.OK)
@@ -115,7 +116,7 @@ namespace TBF.UI.Settings
int nrBenches =
(localSettings.TestBenches == null) ? 0 : localSettings.TestBenches.GetLength(0);
Config.DatabaseSettings[] newTestBenches = new Config.DatabaseSettings[nrBenches + 1];
DatabaseSettings[] newTestBenches = new DatabaseSettings[nrBenches + 1];
for (int i = 0; i < nrBenches; i++)
{
newTestBenches[i] = localSettings.TestBenches[i];
@@ -136,9 +137,9 @@ namespace TBF.UI.Settings
if (testBenchesListBox.SelectedIndex >= 0)
{
DatabaseSettingsDlg dlg = new DatabaseSettingsDlg(localSettings.TestBenches[testBenchesListBox.SelectedIndex],
Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString,
Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString,
Config.Data.CurrentBench.EventsDBSettings.ConnectionString);
Data.CurrentBench.ProceduresDBSettings.ConnectionString,
Data.CurrentBench.WaterMetersDBSettings.ConnectionString,
Data.CurrentBench.EventsDBSettings.ConnectionString);
DialogResult dr = dlg.ShowDialog();
CurrentDBChanged |= dlg.CurrentDBChanged;
if (dr == DialogResult.OK)
@@ -167,7 +168,7 @@ namespace TBF.UI.Settings
}
else
{
Config.DatabaseSettings[] newTestBenches = new Config.DatabaseSettings[nrBenches - 1];
DatabaseSettings[] newTestBenches = new DatabaseSettings[nrBenches - 1];
for (int i = 0; i < selectedIx; i++)
{
newTestBenches[i] = localSettings.TestBenches[i];
TBF/UI/Settings/DatabaseSettingsDlg.cs
+27 -26
View File
@@ -6,6 +6,7 @@ using System.Drawing;
using System.IO;
using System.Windows.Forms;
using log4net;
using Common;
using TBF.Resources;
namespace TBF.UI.Settings
@@ -20,7 +21,7 @@ namespace TBF.UI.Settings
const string CredFileName = "tempfile";
// Reference to bench DB settins (not a local copy)
Config.DatabaseSettings bench;
Common.DatabaseSettings bench;
string currentConfigDBConnStr; /// Initialized in constructor by the parent
string currentResultsDBConnStr; /// Initialized in constructor by the parent
@@ -32,7 +33,7 @@ namespace TBF.UI.Settings
/// Constructor
/// </summary>
/// <param name="bench">Test bench database settings</param>
public DatabaseSettingsDlg(Config.DatabaseSettings bench, string currentConfigDBConnStr, string currentResultsDBConnStr, string currentEventsDBConnStr)
public DatabaseSettingsDlg(DatabaseSettings bench, string currentConfigDBConnStr, string currentResultsDBConnStr, string currentEventsDBConnStr)
{
this.bench = bench;
this.currentConfigDBConnStr = currentConfigDBConnStr;
@@ -80,9 +81,9 @@ namespace TBF.UI.Settings
realBenchCheckBox.Checked = bench.IsRealBench;
/// Initialize 'Database type' combo-boxes
for (int i = 0; i < (int)Users.Entities.DBType.Count; i++)
for (int i = 0; i < (int)DBType.Count; i++)
{
Users.Entities.DBType dbType = (Users.Entities.DBType)i;
DBType dbType = (DBType)i;
configDbTypeComboBox.Items.Add(dbType);
resultsDbTypeComboBox.Items.Add(dbType);
eventsDbTypeComboBox.Items.Add(dbType);
@@ -121,10 +122,10 @@ namespace TBF.UI.Settings
bench.EventsDBSettings.ConnectionString = eventsDbConnectionStringTextBox.Text;
bench.UsersDBSettings.ConnectionString = usersDbConnectionStringTextBox.Text;
bench.ProceduresDBSettings.DbType = (Users.Entities.DBType)configDbTypeComboBox.SelectedIndex;
bench.WaterMetersDBSettings.DbType = (Users.Entities.DBType)resultsDbTypeComboBox.SelectedIndex;
bench.EventsDBSettings.DbType = (Users.Entities.DBType)eventsDbTypeComboBox.SelectedIndex;
bench.UsersDBSettings.DbType = (Users.Entities.DBType)usersDbTypeComboBox.SelectedIndex;
bench.ProceduresDBSettings.DbType = (DBType)configDbTypeComboBox.SelectedIndex;
bench.WaterMetersDBSettings.DbType = (DBType)resultsDbTypeComboBox.SelectedIndex;
bench.EventsDBSettings.DbType = (DBType)eventsDbTypeComboBox.SelectedIndex;
bench.UsersDBSettings.DbType = (DBType)usersDbTypeComboBox.SelectedIndex;
return true;
}
@@ -176,9 +177,9 @@ namespace TBF.UI.Settings
try
{
string connectionString = bench.ProceduresDBSettings.ConnectionString;
string databaseName = Config.Utils.GetDBName(connectionString);
string userName = Config.Utils.GetDBUser(connectionString);
string password = Config.Utils.GetDBPassword(connectionString); /// TODO: Use password
string databaseName = Common.DatabaseSettings.GetDBName(connectionString);
string userName = Common.DatabaseSettings.GetDBUser(connectionString);
string password = Common.DatabaseSettings.GetDBPassword(connectionString); /// TODO: Use password
if (connectionString == currentConfigDBConnStr || connectionString == currentResultsDBConnStr || connectionString == currentEventsDBConnStr)
{
@@ -223,9 +224,9 @@ namespace TBF.UI.Settings
try
{
string connectionString = bench.WaterMetersDBSettings.ConnectionString;
string databaseName = Config.Utils.GetDBName(connectionString);
string userName = Config.Utils.GetDBUser(connectionString);
string password = Config.Utils.GetDBPassword(connectionString); /// TODO: Use password
string databaseName = Common.DatabaseSettings.GetDBName(connectionString);
string userName = Common.DatabaseSettings.GetDBUser(connectionString);
string password = Common.DatabaseSettings.GetDBPassword(connectionString); /// TODO: Use password
if (connectionString == currentConfigDBConnStr || connectionString == currentResultsDBConnStr || connectionString == currentEventsDBConnStr)
{
@@ -272,9 +273,9 @@ namespace TBF.UI.Settings
try
{
string connectionString = bench.EventsDBSettings.ConnectionString;
string databaseName = Config.Utils.GetDBName(connectionString);
string userName = Config.Utils.GetDBUser(connectionString);
string password = Config.Utils.GetDBPassword(connectionString); /// TODO: Use password
string databaseName = Common.DatabaseSettings.GetDBName(connectionString);
string userName = Common.DatabaseSettings.GetDBUser(connectionString);
string password = Common.DatabaseSettings.GetDBPassword(connectionString); /// TODO: Use password
if (connectionString == currentConfigDBConnStr || connectionString == currentResultsDBConnStr || connectionString == currentEventsDBConnStr)
{
@@ -286,9 +287,9 @@ namespace TBF.UI.Settings
log.ErrorFormat("Going to create an empty events database '{0}'", databaseName);
ExecuteMySqlCmd(string.Format("DROP DATABASE `{0}`;", databaseName), userName, password);
ExecuteMySqlCmd(string.Format("CREATE DATABASE `{0}` CHARACTER SET utf8 COLLATE utf8_unicode_ci;", databaseName), userName, password);
global::Events.DB.DbType = (Events.Entities.DBType)bench.EventsDBSettings.DbType;
global::Events.DB.ConnectionString = connectionString;
global::Events.DB.CreateEmptyDB();
SharedDatabase.EventsDB.DbType = (DBType)bench.EventsDBSettings.DbType;
SharedDatabase.EventsDB.ConnectionString = connectionString;
SharedDatabase.EventsDB.CreateEmptyDB();
log.ErrorFormat("An empty events database '{0}' was created", databaseName);
MessageBox.Show(Strings.DB_was_successfully_created, Strings.Notification);
@@ -319,7 +320,7 @@ namespace TBF.UI.Settings
string connectionString = bench.ProceduresDBSettings.ConnectionString;
string server = Config.Utils.GetDBServer(connectionString);
string server = Common.DatabaseSettings.GetDBServer(connectionString);
if ((server != "localhost") && (server != "127.0.0.1"))
{
MessageBox.Show(Strings.Remote_database_cannot_be_imported, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -352,7 +353,7 @@ namespace TBF.UI.Settings
string connectionString = bench.WaterMetersDBSettings.ConnectionString;
string server = Config.Utils.GetDBServer(connectionString);
string server = Common.DatabaseSettings.GetDBServer(connectionString);
if ((server != "localhost") && (server != "127.0.0.1"))
{
MessageBox.Show(Strings.Remote_database_cannot_be_imported, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -382,7 +383,7 @@ namespace TBF.UI.Settings
string connectionString = bench.EventsDBSettings.ConnectionString;
string server = Config.Utils.GetDBServer(connectionString);
string server = Common.DatabaseSettings.GetDBServer(connectionString);
if ((server != "localhost") && (server != "127.0.0.1"))
{
MessageBox.Show(Strings.Remote_database_cannot_be_imported, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -444,9 +445,9 @@ namespace TBF.UI.Settings
/// <param name="outputFileName">Output file name</param>
void ImportDatabase(string connectionString, string inputFileName)
{
string databaseName = Config.Utils.GetDBName(connectionString);
string userName = Config.Utils.GetDBUser(connectionString);
string password = Config.Utils.GetDBPassword(connectionString); /// TODO: Use password
string databaseName = Common.DatabaseSettings.GetDBName(connectionString);
string userName = Common.DatabaseSettings.GetDBUser(connectionString);
string password = Common.DatabaseSettings.GetDBPassword(connectionString); /// TODO: Use password
try
{
TBF/UI/Settings/GroupTableRow.cs
+2 -2
View File
@@ -6,10 +6,10 @@ namespace TBF.UI.Settings
public class GroupTableRow
{
public int GroupId;
public Users.Entities.GID Gid;
public Common.GID Gid;
public int UserId;
public GroupTableRow(int groupId, Users.Entities.GID gid, int userId)
public GroupTableRow(int groupId, Common.GID gid, int userId)
{
GroupId = groupId;
Gid = gid;
TBF/UI/Settings/UpgradeSelectionDlg.cs
+17 -16
View File
@@ -3,15 +3,16 @@
///
using System;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
using System.Collections.Generic;
using log4net;
using MySql.Data.MySqlClient;
using NHibernate;
using Common;
using Results;
using Results.Entities;
using TBF.Resources;
using System.Text;
namespace TBF.UI.Settings
{
@@ -116,7 +117,7 @@ namespace TBF.UI.Settings
try
{
session = Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config);
session = Config.FluentCommon.CreateSession(DBKind.Config);
var testParams = session.QueryOver<Config.Entities.ComponentTest>()
.Where(x => (x.CmpntName == errorFlagsCmpntName))
@@ -176,7 +177,7 @@ namespace TBF.UI.Settings
ActivityStart();
if (!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString), commands))
if (!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Common.Data.CurrentBench.ProceduresDBSettings.ConnectionString), commands))
{
ActivityEnd();
MessageBox.Show("DB succesfully upgraded", "Confirmation", MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -226,7 +227,7 @@ namespace TBF.UI.Settings
ActivityStart();
if ((!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString), configDbCommands)) &&
if ((!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Common.Data.CurrentBench.ProceduresDBSettings.ConnectionString), configDbCommands)) &&
(!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(DB.ConnectionString), resultsDbCommands)))
{
ActivityEnd();
@@ -285,12 +286,12 @@ namespace TBF.UI.Settings
ActivityStart();
if ((!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString), configDbCommands)) &&
if ((!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Common.Data.CurrentBench.ProceduresDBSettings.ConnectionString), configDbCommands)) &&
(!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(DB.ConnectionString), resultsDbCommands)))
{
if (upgradeConfigDBCheckBox.Checked)
{
MySqlConnection dbConn = new MySqlConnection(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString);
MySqlConnection dbConn = new MySqlConnection(Common.Data.CurrentBench.ProceduresDBSettings.ConnectionString);
try
{
dbConn.Open();
@@ -409,12 +410,12 @@ namespace TBF.UI.Settings
ActivityStart();
if ((!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString), configDbCommands)) &&
if ((!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Common.Data.CurrentBench.ProceduresDBSettings.ConnectionString), configDbCommands)) &&
(!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(DB.ConnectionString), resultsDbCommands)))
{
if (upgradeConfigDBCheckBox.Checked)
{
MySqlConnection dbConn = new MySqlConnection(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString);
MySqlConnection dbConn = new MySqlConnection(Common.Data.CurrentBench.ProceduresDBSettings.ConnectionString);
try
{
dbConn.Open();
@@ -614,7 +615,7 @@ namespace TBF.UI.Settings
ActivityStart();
if (!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString), commands))
if (!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Common.Data.CurrentBench.ProceduresDBSettings.ConnectionString), commands))
{
ActivityEnd();
MessageBox.Show("DB succesfully upgraded", "Confirmation", MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -785,7 +786,7 @@ namespace TBF.UI.Settings
if (upgradeConfigDBCheckBox.Checked)
{
success = success && ExecuteCommands(new MySqlConnection(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString), configDbCommands);
success = success && ExecuteCommands(new MySqlConnection(Common.Data.CurrentBench.ProceduresDBSettings.ConnectionString), configDbCommands);
if (!string.IsNullOrEmpty(errorFlagsComponentsTextBox.Text))
{
@@ -824,7 +825,7 @@ namespace TBF.UI.Settings
try
{
dbConn = new MySqlConnection(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString);
dbConn = new MySqlConnection(Common.Data.CurrentBench.ProceduresDBSettings.ConnectionString);
dbConn.Open();
cmd = dbConn.CreateCommand();
@@ -839,7 +840,7 @@ namespace TBF.UI.Settings
cmd.ExecuteNonQuery();
cmd.Dispose();
int[] groupIdsToKeep = new int[(int)Users.Entities.GID.NrOfGroups];
int[] groupIdsToKeep = new int[(int)Common.GID.NrOfGroups];
IList<GroupTableRow> groupTable = new List<GroupTableRow>();
cmd = dbConn.CreateCommand();
@@ -848,12 +849,12 @@ namespace TBF.UI.Settings
while (dr.Read())
{
int groupId = dr.GetInt32(0);
Users.Entities.GID gid = (Users.Entities.GID)dr.GetInt32(1);
Common.GID gid = (Common.GID)dr.GetInt32(1);
int userId = dr.GetInt32(2);
groupTable.Add(new GroupTableRow(groupId, gid, userId));
if ((gid >= 0) && (gid < Users.Entities.GID.NrOfGroups) && (groupIdsToKeep[(int)gid] == 0))
if ((gid >= 0) && (gid < Common.GID.NrOfGroups) && (groupIdsToKeep[(int)gid] == 0))
{
groupIdsToKeep[(int)gid] = groupId;
}
@@ -965,7 +966,7 @@ namespace TBF.UI.Settings
ActivityStart();
if ((!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString), configDbCommands)) &&
if ((!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Common.Data.CurrentBench.ProceduresDBSettings.ConnectionString), configDbCommands)) &&
(!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(DB.ConnectionString), resultsDbCommands)))
{
ActivityEnd();
@@ -1049,7 +1050,7 @@ namespace TBF.UI.Settings
try
{
var session = Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config);
var session = Config.FluentCommon.CreateSession(DBKind.Config);
var components = session.QueryOver<Config.Entities.Component>()
.List();