Skip to content

Commit a6c5eaf

Browse files
committed
Minor fixes
1 parent f165525 commit a6c5eaf

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/main/java/ru/shemplo/tbs/entity/OperationTypeCategory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public enum OperationTypeCategory {
1717
* -MapperUtils.moneyValueToBigDecimal (op.getPrice ()).doubleValue ()),
1818
BOND_COUPON ("Coupons", op -> MapperUtils.moneyValueToBigDecimal (op.getPayment ()).doubleValue ()),
1919
BOND_REPAYMENT ("Repayment", op -> MapperUtils.moneyValueToBigDecimal (op.getPayment ()).doubleValue ()),
20-
BOND_SELL ("Sell", op -> MapperUtils.moneyValueToBigDecimal (op.getPrice ()).doubleValue ());
20+
BOND_SELL ("Sell", op -> (op.getQuantity () - op.getQuantityRest ())
21+
* MapperUtils.moneyValueToBigDecimal (op.getPrice ()).doubleValue ());
2122

2223
private final String text;
2324

src/main/java/ru/shemplo/tbs/gfx/launcher/TBSCouponsCalendar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private Parent makePendingCouponsLayout () {
147147
.converter (null).highlighter (grThreshold)
148148
.build ());
149149
table.getColumns ().add (TBSUIUtils.<PendingCoupons, Number> buildTBSTableColumn ()
150-
.name ("Amount").tooltip ("Excected income according to published data and number of lots")
150+
.name ("Income").tooltip ("Excected income according to published data and number of lots")
151151
.alignment (Pos.BASELINE_LEFT).minWidth (100.0).sortable (false)
152152
.propertyFetcher (data -> new SimpleObjectProperty <> (data.amount ()))
153153
.converter (null).highlighter (grThreshold)

0 commit comments

Comments
 (0)