Fix credits order in balance view + some more emitters added

Shemplo · Jan 13, 2022 · 5f553d7 · 5f553d7
1 parent ee370b0
commit 5f553d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/emitters.bin b/emitters.bin
diff --git a/src/main/java/ru/shemplo/tbs/TBSBalanceController.java b/src/main/java/ru/shemplo/tbs/TBSBalanceController.java
@@ -2,6 +2,7 @@
 
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -71,7 +72,11 @@ public void updateBalance () {
 
  while (!current.isAfter (to)) {
  final var stub = new DateCredit (current);
- credits.add (date2credits.getOrDefault (current, stub));
+
+ final var dateCredits = date2credits.getOrDefault (current, stub);
+ dateCredits.sort (Comparator.comparing (Credit::getCreditDate));
+ credits.add (dateCredits);
+
  current = getNextPeriodDate (current);
  }
 
@@ -215,9 +220,7 @@ public ObservableList <ICredit> makeTableRowsList () {
  list.clear ();
 
  for (int i = offset, rowIndex = 1; i < credits.size (); i++) {
- final var dateCredit = credits.get (i);
-
- for (final var credit : dateCredit) { 
+ for (final var credit : credits.get (i)) { 
  final var prop = credit.getProperty (ICredit.INDEX_PROPERTY, () -> 0, false);
  prop.set (rowIndex++);
 

diff --git a/src/main/java/ru/shemplo/tbs/gfx/TBSBalanceControl.java b/src/main/java/ru/shemplo/tbs/gfx/TBSBalanceControl.java
@@ -217,9 +217,7 @@ private TableView <ICredit> makeBottomTable () {
  table.getColumns ().add (TBSUIUtils.<ICredit, LocalDate> buildTBSTableColumn ()
  .name ("Date").tooltip (null)
  .alignment (Pos.BASELINE_LEFT).minWidth (90.0).sortable (false)
- .propertyFetcher (credit -> new SimpleObjectProperty <> (
- controller.getScaledDate (credit.getCreditDate ())
- ))
+ .propertyFetcher (credit -> new SimpleObjectProperty <> (credit.getCreditDate ()))
  .highlighter (sameMonth).converter ((c, v) -> String.valueOf (v))
  .build ());
  table.getColumns ().add (TBSUIUtils.<ICredit, String> buildTBSTableColumn ()