diff --git a/App.config b/App.config
index 924c79d..e124558 100644
--- a/App.config
+++ b/App.config
@@ -1,8 +1,6 @@
-
-
-
+
\ No newline at end of file
diff --git a/DBClasses.cs b/DBClasses.cs
index ccb3af4..88e1ff8 100644
--- a/DBClasses.cs
+++ b/DBClasses.cs
@@ -6,21 +6,24 @@ namespace CryptoCalc
public interface IDBClasses
{
- string DBVariables { get; set; }
+ string DBName { get; }
string DBTableName { get; }
+ string DBVariables { get; set; }
string DBSaveDataString { get; }
}
public class DBClasses : IDBClasses
{
#region Publics
- public virtual string DBVariables { get; set; }
+ public string DBName => "CryptoCalc";
public virtual string DBTableName { get; }
+ public virtual string DBVariables { get; set; }
public string DBSaveDataString => $"({Regex.Replace(DBVariables, "@", "")}) values ({DBVariables})";
public int Index { get; set; }
public long UnixTime { get; set; }
+
#endregion
#region Functions
diff --git a/DBInteraction.cs b/DBInteraction.cs
index 3a6eac9..4d27355 100644
--- a/DBInteraction.cs
+++ b/DBInteraction.cs
@@ -14,10 +14,10 @@ namespace CryptoCalc
{
if (data is null)
{
- throw new ArgumentNullException(nameof(data));
+ throw new ArgumentNullException(nameof(data), "No data passed to SQL");
}
- using IDbConnection cnn = new SQLiteConnection(Util.GetConnectionString(data.DBTableName));
+ using IDbConnection cnn = new SQLiteConnection(Util.GetConnectionString(data.DBName));
cnn.Execute($"insert into {data.DBTableName} {data.DBSaveDataString}", data);
Debug.WriteLine($"Saved {data.DBTableName} DB data");
}
@@ -25,26 +25,14 @@ namespace CryptoCalc
public class GenericDB where T : DBClasses
{
-
- public IEnumerable LoadAllData(string tableName)
+ public IEnumerable QueryData(T data, string query)
{
- if (tableName is null)
+ if (data is null)
{
- throw new ArgumentNullException(nameof(tableName));
+ throw new ArgumentNullException(nameof(data), "DBclass is null");
}
- using IDbConnection _connection = new SQLiteConnection(Util.GetConnectionString(tableName));
- return _connection.Query($"select * from {tableName}", new DynamicParameters());
- }
-
- public IEnumerable QueryData(string tableName, string query)
- {
- if (tableName is null)
- {
- throw new ArgumentNullException(nameof(query));
- }
-
- using IDbConnection _connection = new SQLiteConnection(Util.GetConnectionString(tableName));
+ using IDbConnection _connection = new SQLiteConnection(Util.GetConnectionString(data.DBName));
return _connection.Query($"{query}", new DynamicParameters());
}
}
diff --git a/MainWindow.xaml b/MainWindow.xaml
index a369759..02c105a 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -14,7 +14,7 @@
-
+
@@ -22,7 +22,7 @@
-
+
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 26d9f68..c681f9e 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -36,7 +36,8 @@ namespace CryptoCalc
private void readButton_click(object sender, RoutedEventArgs e)
{
- IEnumerable transactions = transactionDB.LoadAllData(genericT.DBTableName);
+ string query = $"select * from {genericT.DBTableName}";
+ IEnumerable transactions = transactionDB.QueryData(genericT, query);
foreach (Transaction t in transactions)
{
Debug.WriteLine($"{t.GetLocalTimeFromUnixTime(t.UnixTime)} *** {t.Currency} - {t.Amount}");
@@ -45,7 +46,7 @@ namespace CryptoCalc
private void searchButton_Click(object sender, RoutedEventArgs e)
{
string query = $"SELECT * from {genericT.DBTableName} WHERE {nameof(genericT.Currency)}=\'{currencyText.Text}\'";
- IEnumerable transactions = transactionDB.QueryData(genericT.DBTableName, query);
+ IEnumerable transactions = transactionDB.QueryData(genericT, query);
transactionsFoundListBox.Items.Clear();
foreach (Transaction x in transactions)
{
@@ -71,11 +72,11 @@ namespace CryptoCalc
w.SaveUnixTimeNow();
w.UnixTimeCreated = w.GetUnixTime(new DateTime(rand.Next(2011, DateTime.Now.Year), rand.Next(1,12), rand.Next(1, 28)));
w.Platform = "Ledger";
- w.Name = "TestWallet";
- w.Currency = "SOL";
+ w.Name = "DefaultBTCWallet";
+ w.Currency = "BTC";
w.Balance = Convert.ToSingle(30 * rand.NextDouble());
- w.DefaultWallet = 0;
- w.Note = "Test";
+ w.DefaultWallet = 1;
+ w.Note = "Main BTC Wallet";
return w;
}
@@ -85,5 +86,14 @@ namespace CryptoCalc
inputAmount.Text = inputAmount.Text.Replace(".", ",");
}
+ private void currencyText_LostFocus(object sender, RoutedEventArgs e)
+ {
+ currencyText.Text = currencyText.Text.ToUpper();
+ }
+
+ private void inputCurrency_LostFocus(object sender, RoutedEventArgs e)
+ {
+ inputCurrency.Text = inputCurrency.Text.ToUpper();
+ }
}
}