Compare commits

..

No commits in common. "c2037f28e2b384db9ce2e93829e463bfc5389ce7" and "3a5d0a90ef87227637cff2e30c007de8725babba" have entirely different histories.

2 changed files with 11 additions and 23 deletions

View File

@ -1,6 +1,5 @@
namespace EDPlayerJournal.BGS;
public class IncompleteTransaction : Transaction {
internal class IncompleteTransaction : Transaction {
public Transaction? UnderlyingTransaction { get; set; } = null;
public string Reason { get; set; } = "";

View File

@ -63,16 +63,10 @@ public partial class MainWindow : Window {
GenerateLog();
}
private void HandleEntries(List<Entry> entries) {
private void Loadentries_EntriesLoaded(List<Entry> lines) {
try {
TransactionParser parser = new TransactionParser();
List<Transaction> transactions = parser.Parse(entries);
// Log incomplete and remove them from the results.
foreach (var incomplete in transactions.OfType<IncompleteTransaction>()) {
Log(incomplete.Reason);
transactions.Remove(incomplete);
}
List<Transaction> transactions = parser.Parse(lines);
report = new Report(transactions);
this.entries.ItemsSource = report.Objectives;
@ -83,10 +77,6 @@ public partial class MainWindow : Window {
}
}
private void Loadentries_EntriesLoaded(List<Entry> lines) {
HandleEntries(lines);
}
private void Report_OnLog(string message) {
StringBuilder builder = new StringBuilder();
@ -132,7 +122,11 @@ public partial class MainWindow : Window {
.ToList()
;
HandleEntries(entries);
List<Transaction> transactions = parser.Parse(entries);
report = new Report(transactions);
this.entries.ItemsSource = report.Objectives;
GenerateLog();
} catch (Exception exception) {
Log("Something went terribly wrong while parsing the E:D player journal.");
@ -178,7 +172,7 @@ public partial class MainWindow : Window {
}
if (removed) {
RefreshView();
GenerateLog();
}
}
@ -253,11 +247,6 @@ public partial class MainWindow : Window {
};
objective.Transactions.Add(zone);
RefreshView();
}
private void RefreshView() {
entries.Items.Refresh();
GenerateLog();
}
@ -277,7 +266,7 @@ public partial class MainWindow : Window {
if (int.TryParse(adjust.Profit.Text, out int newprofit)) {
sell.Profit = newprofit;
RefreshView();
GenerateLog();
}
}