From 20916ad13da50ada1f59d1b7dc061657d8776133 Mon Sep 17 00:00:00 2001 From: Stedd Date: Sun, 16 Jan 2022 02:25:41 +0100 Subject: [PATCH] Changed to unix timestamps --- DBClasses.cs | 68 +++++++++++++++++---------------------------- MainWindow.xaml.cs | 12 ++++---- data.db | Bin 32768 -> 0 bytes transactions.db | Bin 24576 -> 24576 bytes wallets.db | Bin 24576 -> 24576 bytes 5 files changed, 31 insertions(+), 49 deletions(-) delete mode 100644 data.db diff --git a/DBClasses.cs b/DBClasses.cs index 10f8db1..7836403 100644 --- a/DBClasses.cs +++ b/DBClasses.cs @@ -20,27 +20,29 @@ namespace CryptoCalc public string DBSaveDataString => $"({Regex.Replace(DBVariables, "@", "")}) values ({DBVariables})"; public int Index { get; set; } - public int Year { get; set; } - public int Month { get; set; } - public int Day { get; set; } - public int Hour { get; set; } - public int Minute { get; set; } - public int Second { get; set; } - public string DateTimeString { get; set; } + public long UnixTime { get; set; } #endregion #region Functions - public void SaveDateTime() + public void SaveUnixTimeNow() { - Year = DateTime.Now.Year; - Month = DateTime.Now.Month; - Day = DateTime.Now.Day; - Hour = DateTime.Now.Hour; - Minute = DateTime.Now.Minute; - Second = DateTime.Now.Second; - DateTimeString = DateTime.Now.ToString(); + UnixTime = (long)DateTime.UtcNow.Subtract(DateTime.UnixEpoch).TotalSeconds; + } + + public long GetUnixTime(DateTime dateTime) + { + return (long)dateTime.Subtract(DateTime.UnixEpoch).TotalSeconds; + } + + public DateTime GetUTCTimeFromUnixTime(long _unix) + { + return DateTime.UnixEpoch.AddSeconds(_unix).ToUniversalTime(); + } + public DateTime GetLocalTimeFromUnixTime(long _unix) + { + return DateTime.UnixEpoch.AddSeconds(_unix).ToLocalTime(); } #endregion @@ -70,7 +72,7 @@ namespace CryptoCalc public Transaction(string _currency, float _amount, string _type) { - SaveDateTime(); + SaveUnixTimeNow(); Currency = _currency; Amount = _amount; TransactionType = _type; @@ -83,7 +85,7 @@ namespace CryptoCalc public Transaction(string _currency, float _amount, string _type, string _feeCurrency, float _feeAmount) { - SaveDateTime(); + SaveUnixTimeNow(); Currency = _currency; Amount = _amount; TransactionType = _type; @@ -102,13 +104,7 @@ namespace CryptoCalc private void SetDBStrings() { DBVariables = - $"@{nameof(Year)}," - + $"@{nameof(Month)}," - + $"@{nameof(Day)}," - + $"@{nameof(Hour)}," - + $"@{nameof(Minute)}," - + $"@{nameof(Second)}," - + $"@{nameof(DateTimeString)}," + $"@{nameof(UnixTime)}," + $"@{nameof(Currency)}," + $"@{nameof(Amount)}," + $"@{nameof(TransactionType)}," @@ -118,7 +114,7 @@ namespace CryptoCalc + $"@{nameof(Note)}"; } - public string FullInfo => $"{ Index.ToString() } { DateTimeString } { Currency } { Amount } { TransactionType }"; + public string FullInfo => $"{ Index.ToString() } { GetLocalTimeFromUnixTime(UnixTime) } { Currency } { Amount } { TransactionType }"; #endregion } @@ -130,9 +126,7 @@ namespace CryptoCalc public override string DBVariables { get => base.DBVariables; set => base.DBVariables = value; } public override string DBTableName => "Wallets"; - public int CreationYear { get; set; } - public int CreationMonth { get; set; } - public int CreationDay { get; set; } + public long UnixTimeCreated { get; set; } public string Platform { get; set; } public string Name { get; set; } public string Currency { get; set; } @@ -148,10 +142,8 @@ namespace CryptoCalc public Wallet(int _year, int _month, int _day, string _platform, string _name, string _currency, float _balance, int _default, string _note) { - SaveDateTime(); - CreationYear = _year; - CreationMonth = _month; - CreationDay = _day; + SaveUnixTimeNow(); + UnixTimeCreated = GetUnixTime(new DateTime(_year, _month, _day)); Platform = _platform; Name = _name; Currency = _currency; @@ -169,16 +161,8 @@ namespace CryptoCalc private void SetDBStrings() { DBVariables = - $"@{nameof(Year)}," - + $"@{nameof(Month)}," - + $"@{nameof(Day)}," - + $"@{nameof(Hour)}," - + $"@{nameof(Minute)}," - + $"@{nameof(Second)}," - + $"@{nameof(DateTimeString)}," - + $"@{nameof(CreationYear)}," - + $"@{nameof(CreationMonth)}," - + $"@{nameof(CreationDay)}," + $"@{nameof(UnixTime)}," + + $"@{nameof(UnixTimeCreated)}," + $"@{nameof(Platform)}," + $"@{nameof(Name)}," + $"@{nameof(Currency)}," diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 2243c8f..bf7b6b5 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -38,7 +38,7 @@ namespace CryptoCalc transactions = DBInteraction.LoadTransactions(); foreach (Transaction x in transactions) { - Debug.WriteLine($"{x.DateTimeString} *** {x.Currency} - {x.Amount}"); + Debug.WriteLine($"{x.GetLocalTimeFromUnixTime(x.UnixTime)} *** {x.Currency} - {x.Amount}"); } } private void searchButton_Click(object sender, RoutedEventArgs e) @@ -54,7 +54,7 @@ namespace CryptoCalc private Transaction DummyTransaction() { Transaction t = new(); - t.SaveDateTime(); + t.SaveUnixTimeNow(); t.Currency = "SOL"; t.Amount = Convert.ToSingle(30 * rand.NextDouble()); t.TransactionType = "BUY"; @@ -66,12 +66,10 @@ namespace CryptoCalc private Wallet DummyWallet() { Wallet w = new(); - w.SaveDateTime(); - w.CreationYear = 2017; - w.CreationMonth = 08; - w.CreationDay = 20; + w.SaveUnixTimeNow(); + w.UnixTimeCreated = w.GetUnixTime(new DateTime(2018,10,1)); w.Platform = "Ledger"; - w.Name = "TestWalled"; + w.Name = "TestWallet"; w.Currency = "SOL"; w.Balance = Convert.ToSingle(30 * rand.NextDouble()); w.DefaultWallet = 0; diff --git a/data.db b/data.db deleted file mode 100644 index df345eb70291c4dd27a73b3a105107a9ae58cc0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeI(Z%@-e90%~$vA;0N6VnGv^irO%fD&SiKD3U4jiZCDOW31X#)(a63*AlK10R6l zF^Mn3cjBAyRq)UU-fb zf&c^{009U<00I#BM*_vNe5S6i%NMK6IXI@>)8m6Squxn-aN2%85y)2RhHe|g)?Zc) zqD@@a$Vwrvnf@XDsO3$|HnxpAv1&H4n$;?4TIOEUSmPNj>V($`BCr$q>|G+V>GTul zuY%rK71!@En#gI;PT(IVLYoeww(HRb3tj(6%iG4jEgGzZ{Sy{cdSOWY4sR)r>t4|F znU?4MtcpB4bo{Qr6I!?MeT@@I7+t1d6g7rlY_Xk$0+rjzI+Nq30*&!DgG9WfMJlunKp4~`GnUm2Oj zAJPN$ykE$w=WH=Mm?Y}WBsqV>W2KUOF^tun5BxrJqTSdeiK2ICtp1Csv75@MtE+M= zM(00U+g*CvR4Nr%oxaHF0!woI3>qL&kGW;9jnfR7?H2*uTrHZ1?lK6uS0uX=z1Rwwb2tWV=5P$## zAOL|W7Z7XtVvQdg1Rwwb2tWV=5P$##AOHafKmY<$C?MAVW#vjzu9WXn*gbR!0uX=z z1Rwwb2tWV=5P$##ATS#OT5jT{tU@|f%0;gm;Q#+;<2FDqApijgKmY;|fB*y_009U< zV73JcqWi=5|I@QAf!;#^0uX=z1Rwwb2tWV=5P$##rdI&#|I<6R=othc009U<00Izz q00bZa0SG`K78qIo&&DzAApijgKmY;|fB*y_009U<00I!0E`guIs>N%1AAxdrhhiAg!B@rK5%&Oxq@A+8D` zj!r(V3QCv?CTsC&OxEYw!4aC5SrL+%n>x9XM{F_+_ZBhUUrfAU)9p(Vfow)`RaM4z z`^o3IWf@r~zvcdgu4DV;dAu=9=Hio2@|$xtxrwoZG_?2wH6&nD%EbcoXUpUUel2;U kctdoD88L%G0f-sQMS%vIF|utEc&E>7#Lu<)qdmU@05$#G42);RB_$c#%E2auC+6g&mOw}*=O91$26icz z#7a~NpTy!4$K;aCvdof7OcRl1A*R-&*oZ8T*JzLYQZ&aRYxT{{D=kUI?Xcj~w*fhcC29FZxk{WNt`Q;N0Psu91)2iqIy(xpiBE3e*OIr4H^hiGW?=ep1Y!nr X;mLn^%{K|W(`UBi=h*zwo?ig~mI}S1 diff --git a/wallets.db b/wallets.db index b50993faa671f749e9f0e44ea3f1c1b205645735..979886ff92df9ec5933f7cd251721d87abb8c4b0 100644 GIT binary patch delta 358 zcmZoTz}Rqrae}lUCj$cm8x%7EY0Zf`#^Rg|dj7S%ynh&&c~>y;uHdWZ3*g_&zjw2s zz(0=7C7d2iT)cl6--t^~Gq!7PcH*1CsH~tAnwMD-l9`+8T$GwvlA5B#>FF2Z>h2n( z;O8Hr;1}xSGueh$eew$45MKVh3?Xc6d>~sH7$$S_=}Up^1)0{CSdy5OlNz3wlapFf z9G Pb3mQFNdTyc6|4yWG4^FF delta 223 zcmZoTz}Rqrae}lU2Ll5G8xS)CF%uB0PSi0L=U~wDujS?a!@$hDf{Awpp9LQ$Z!&N4 zW+3|acODBw#3cHxMzUP+vLD4 uz{s>&(BTXJBm-{7yFiPt@GB^DU>eHB$}G(ho|u!9T2j180H})