V4.2 with stats and vaxtor settings changes. Fixed merge problems
This commit is contained in:
@@ -23,7 +23,7 @@ namespace AiQ_GUI
|
||||
DateTime? lastStatsRun = null;
|
||||
try
|
||||
{
|
||||
using (var cmdPeriod = new OleDbCommand("SELECT LastStatsRun FROM UniversalData", conn))
|
||||
using (OleDbCommand cmdPeriod = new OleDbCommand("SELECT LastStatsRun FROM UniversalData", conn))
|
||||
{
|
||||
object res = cmdPeriod.ExecuteScalar();
|
||||
if (res != null && res != DBNull.Value)
|
||||
@@ -136,12 +136,12 @@ namespace AiQ_GUI
|
||||
FROM DiagsStats
|
||||
WHERE [Date] >= ? AND [Date] < ?";
|
||||
|
||||
using (var diagsCmd = new OleDbCommand(diagsQuery, conn))
|
||||
using (OleDbCommand diagsCmd = new OleDbCommand(diagsQuery, conn))
|
||||
{
|
||||
diagsCmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = monthStart });
|
||||
diagsCmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = nextMonth });
|
||||
|
||||
using (var diagsAdapter = new OleDbDataAdapter(diagsCmd))
|
||||
using (OleDbDataAdapter diagsAdapter = new OleDbDataAdapter(diagsCmd))
|
||||
{
|
||||
DataTable diagsTable = new();
|
||||
diagsAdapter.Fill(diagsTable);
|
||||
@@ -195,7 +195,7 @@ namespace AiQ_GUI
|
||||
return;
|
||||
}
|
||||
|
||||
using (var tx = conn.BeginTransaction())
|
||||
using (OleDbTransaction tx = conn.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user