diff --git a/client/src/main/java/ru/trader/model/OfferModel.java b/client/src/main/java/ru/trader/model/OfferModel.java index 083e0c8..92461b3 100644 --- a/client/src/main/java/ru/trader/model/OfferModel.java +++ b/client/src/main/java/ru/trader/model/OfferModel.java @@ -199,11 +199,11 @@ public class OfferModel { return diffProperty().get(); } - public String toPString(){ + public String toStationString(){ return offer.toPString(); } - public String toIString(){ + public String toItemString(){ return offer.toIString(); } diff --git a/client/src/main/java/ru/trader/model/OrderModel.java b/client/src/main/java/ru/trader/model/OrderModel.java index 606675b..df97e42 100644 --- a/client/src/main/java/ru/trader/model/OrderModel.java +++ b/client/src/main/java/ru/trader/model/OrderModel.java @@ -94,6 +94,9 @@ public class OrderModel { this.max.setValue(max); } + public SystemModel getSystem() { + return offer.getSystem(); + } public StationModel getStation() { return offer.getStation(); diff --git a/client/src/main/java/ru/trader/model/support/ModelBindings.java b/client/src/main/java/ru/trader/model/support/ModelBindings.java index 2299954..bcf5a1d 100644 --- a/client/src/main/java/ru/trader/model/support/ModelBindings.java +++ b/client/src/main/java/ru/trader/model/support/ModelBindings.java @@ -17,11 +17,11 @@ public class ModelBindings { public static StringBinding asString(final OfferModel offer){ - return Bindings.createStringBinding(offer::toPString, offer.priceProperty(), offer.getSystem().nameProperty()); + return Bindings.createStringBinding(offer::toStationString, offer.priceProperty(), offer.getSystem().nameProperty()); } public static StringBinding asItemString(final OfferModel offer){ - return Bindings.createStringBinding(offer::toIString, offer.priceProperty(), offer.nameProperty()); + return Bindings.createStringBinding(offer::toItemString, offer.priceProperty(), offer.nameProperty()); } public static DoubleBinding price(final ObservableValue offer){ @@ -56,7 +56,7 @@ public class ModelBindings { private static StringBinding asItemString(final ObservableValue offer, final Observable... dependencies){ return Bindings.createStringBinding(() -> { OfferModel o = offer.getValue(); - return o != null ? o.toIString(): ""; + return o != null ? o.toItemString(): ""; }, dependencies); } @@ -64,7 +64,7 @@ public class ModelBindings { private static StringBinding asString(final ObservableValue offer, final Observable... dependencies){ return Bindings.createStringBinding(() -> { OfferModel o = offer.getValue(); - return o != null ? o.toPString() : ""; + return o != null ? o.toStationString() : ""; }, dependencies); } diff --git a/client/src/main/resources/lang/locale_en_US.properties b/client/src/main/resources/lang/locale_en_US.properties index 1b69a4e..d6ec54f 100644 --- a/client/src/main/resources/lang/locale_en_US.properties +++ b/client/src/main/resources/lang/locale_en_US.properties @@ -4,6 +4,7 @@ market.stations=Stations market.items=Commods market.offers=Offers market.item.name=Commodity +market.system.name=System market.station.name=Station # Offer diff --git a/client/src/main/resources/lang/locale_ru_RU.properties b/client/src/main/resources/lang/locale_ru_RU.properties index a486b79..be6658f 100644 --- a/client/src/main/resources/lang/locale_ru_RU.properties +++ b/client/src/main/resources/lang/locale_ru_RU.properties @@ -4,6 +4,7 @@ market.stations=\u0421\u0442\u0430\u043D\u0446\u0438\u0438 market.items=\u0422\u043E\u0432\u0430\u0440\u044B market.offers=\u0417\u0430\u043A\u0430\u0437\u044B market.item.name=\u0422\u043E\u0432\u0430\u0440 +market.system.name=\u0421\u0438\u0441\u0442\u0435\u043C\u0430 market.station.name=\u0421\u0442\u0430\u043D\u0446\u0438\u044F # Offer diff --git a/client/src/main/resources/view/items.fxml b/client/src/main/resources/view/items.fxml index ee23b2f..0f51c73 100644 --- a/client/src/main/resources/view/items.fxml +++ b/client/src/main/resources/view/items.fxml @@ -10,35 +10,35 @@ - + - + - + - + - + diff --git a/client/src/main/resources/view/router.fxml b/client/src/main/resources/view/router.fxml index 757021b..0dba8d4 100644 --- a/client/src/main/resources/view/router.fxml +++ b/client/src/main/resources/view/router.fxml @@ -79,10 +79,13 @@ - + + + + - + @@ -92,7 +95,7 @@ - + diff --git a/core/src/main/java/ru/trader/core/Offer.java b/core/src/main/java/ru/trader/core/Offer.java index 6fe5a0f..ddd2a39 100644 --- a/core/src/main/java/ru/trader/core/Offer.java +++ b/core/src/main/java/ru/trader/core/Offer.java @@ -38,7 +38,7 @@ public interface Offer extends Comparable { } default String toPString(){ - return String.format("%s (%.0f)", getVendor().getPlace().getName(), getPrice()); + return String.format("%.0f (%s - %s)", getPrice(), getVendor().getPlace().getName(), getVendor().getName()); } default String toIString(){