Remove bond from planning in planner

Author: Shemplo

src/main/java/ru/shemplo/tbs/gfx/TBBSPlannerTool.java

@@ -15,6 +15,7 @@
 import com.panemu.tiwulfx.control.NumberField;
 
 import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.ListChangeListener;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -50,6 +51,7 @@
 import ru.shemplo.tbs.entity.IPlanningBond;
 import ru.shemplo.tbs.entity.ITBSProfile;
 import ru.shemplo.tbs.gfx.table.TBSEditTableCell;
+import ru.tinkoff.invest.openapi.model.rest.Currency;
 
 
 public class TBBSPlannerTool extends HBox {
@@ -261,6 +263,7 @@ private TableView <IPlanningBond> makeTable () {
 
         final var grThreshold = TBSStyles.<IPlanningBond, Number> threshold (0.0, 1e-6);
         final var sameMonth = TBSStyles.<IPlanningBond> sameMonth (NOW);
+        final var linkIcon = TBSStyles.<IPlanningBond> linkIcon ();
 
         table.getColumns ().add (TBSUIUtils.<IPlanningBond, Integer> buildTBSTableColumn ()
             .name ("#").tooltip (null)
@@ -283,6 +286,15 @@ private TableView <IPlanningBond> makeTable () {
             .propertyFetcher (bond -> bond.getRWProperty ("code", () -> "")).converter ((r, v) -> v)
             .highlighter (null)
             .build ());
+        table.getColumns ().add (TBSUIUtils.<IPlanningBond, Currency> buildTBSTableColumn ()
+            .name ("Currency").tooltip (null)
+            .alignment (Pos.BASELINE_LEFT).minWidth (80.0).sortable (false)
+            .propertyFetcher (bond -> new MappingROProperty <> (
+                bond.getRWProperty ("code", () -> ""), 
+                TBSBondManager::getBondCurrency
+            ))
+            .highlighter (null).converter ((r, v) -> String.valueOf (v))
+            .build ());
         table.getColumns ().add (TBSUIUtils.<IPlanningBond, Number> buildTBSTableColumn ()
             .name ("👝").tooltip ("Number of lots in your portfolio (sum by all your accounts)")
             .alignment (Pos.BASELINE_LEFT).minWidth (50.0).sortable (false)
@@ -335,6 +347,12 @@ bond.<Integer> getRWProperty ("customValue", () -> null),
             .fieldSupplier (this::makeCustomLotsValueField)
             .converter (null).highlighter (null)
             .build ());
+        table.getColumns ().add (TBSUIUtils.<IPlanningBond, LinkedSymbolOrImage> buildTBSIconTableColumn ()
+            .name ("🗑").tooltip (null).minWidth (30.0).sortable (false)
+            .propertyFetcher (b -> new SimpleObjectProperty <> (LinkedSymbolOrImage.symbol ("⌫", b.getCode ())))
+            .onClick ((me, cell) -> TBSPlanner.getInstance ().removeBond (cell.getItem ().getLink ()))
+            .highlighter (linkIcon)
+            .build ());
 
         return table;
     }

src/main/java/ru/shemplo/tbs/gfx/TBSUIUtils.java

@@ -21,38 +21,6 @@
 
 public class TBSUIUtils {
 
-    /*
-    public static <F, S> TableColumn <F, F> makeTBSTableColumn (
-        String name, String tooltip, BiFunction <TableRow <F>, F, S> converter, boolean sortable, 
-        double minWidth, Pos alignment, BiConsumer <TBSTableCell <F, S>, S> highlighter
-    ) {
-        final var column = new TableColumn <F, F> (name);
-        column.setCellFactory (__ -> {
-            final var cell = new TBSTableCell <> (converter, highlighter, alignment);
-            TBSUtils.doIfNN (tooltip, t -> cell.setTooltip (new Tooltip (t)));
-            return cell;
-        });
-        column.setCellValueFactory (cell -> {
-            return new SimpleObjectProperty <> (cell.getValue ());
-        });
-        column.setPrefWidth (minWidth);
-        column.setSortable (sortable);
-        column.setMinWidth (minWidth);
-        
-        return column;
-    }
-    
-    public static <F, S> TableColumn <F, F> makeTBSTableColumn (
-        String name, String tooltip, Function <F, S> converter, boolean sortable, 
-        double minWidth, Pos alignment, BiConsumer <TBSTableCell <F, S>, S> highlighter
-    ) {
-        return makeTBSTableColumn (name, tooltip, 
-            (r, f) -> TBSUtils.mapIfNN (converter, c -> c.apply (f), null), 
-            sortable, minWidth, alignment, highlighter
-        );
-    }
-    */
-    
     @Builder (builderMethodName = "buildTBSTableColumn")
     public static <F, S> TableColumn <F, S> makeTBSTableColumn (
         String name, String tooltip, boolean sortable, double minWidth, Pos alignment,