From 5f553d74d41e76adb4bba217cba126e051673c0c Mon Sep 17 00:00:00 2001
From: Plotnikov Andrey <shemplo@outlook.com>
Date: Thu, 13 Jan 2022 15:08:35 +0300
Subject: [PATCH] Fix credits order in balance view + some more emitters added

---
 emitters.bin                                  | Bin 8161 -> 8271 bytes
 .../ru/shemplo/tbs/TBSBalanceController.java  |  11 +++++++----
 .../ru/shemplo/tbs/gfx/TBSBalanceControl.java |   4 +---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/emitters.bin b/emitters.bin
index b0d4f71b479b5817d2e0a402440bf2038dcff6e9..c6d4b9b329ec135589d22893df463e30ed58393d 100644
GIT binary patch
delta 248
zcmaE8f8Jrj7k0*S76t}J#*M$<vul(v@L!mJVZw!Z3Q8B|Tv&8rp;9439fL?Qh!iX5
z0II7CcGfni*!+>Bl-a(7LG8jk5Cp28d||_d?HBf6Y`C!R!XAYSyMWyN7j|510@Ay&
z84_Gwu{oEgfSvLF<a@%QK+;5Hv*3MXi~K%Io|^naWI9l8f@lGdWE7hLBxi|jWxT&R
zKs=Ta$XO==)Vi5PatjlXvs2m&NV3Q{0!cTSJfOr@8E%loK{<aQDJZ{@v3T-2d1C-$
C>tx6P

delta 155
zcmX@_@X&t37j}kn76t}JhK;}9vrlg15Mhi2k(*68gPA8ca*J%f%#+N{czd$BNGOo(
z71=B(P+Z7R#~@bD0n}CJ(-s*rIZ$*uQ0}E@0g#Lmn*k(0i*04Ry?Ld0EF+M^E(z4S
qIaYED6Obb$;{_yRWgLOze3?9;1fMK7NJ2{9A4q1&Z=7tPAP)d)<ThRa

diff --git a/src/main/java/ru/shemplo/tbs/TBSBalanceController.java b/src/main/java/ru/shemplo/tbs/TBSBalanceController.java
index 83324b4..ea5ee37 100644
--- 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
index 19182b1..241bf85 100644
--- 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 ()