add missions to route entry

client/src/main/java/ru/trader/controllers/HelperController.java

@@ -12,6 +12,7 @@ import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
 import javafx.stage.Stage;
 import ru.trader.KeyBinding;
+import ru.trader.model.MissionModel;
 import ru.trader.model.OrderModel;
 import ru.trader.model.RouteEntryModel;
 import ru.trader.model.RouteModel;
@@ -36,6 +37,8 @@ public class HelperController {
     private ListView<OrderModel> buyOrders;
     @FXML
     private ListView<OrderModel> sellOrders;
+    @FXML
+    private ListView<MissionModel> missions;
 
     private Stage stage;
     private RouteModel route;
@@ -81,6 +84,7 @@ public class HelperController {
         refuel.setText(String.valueOf(entry.getRefill()));
         buyOrders.setItems(entry.orders());
         sellOrders.setItems(entry.sellOrders());
+        missions.setItems(entry.missions());
     }
 
     @FXML

client/src/main/java/ru/trader/controllers/RouteSearchController.java

@@ -82,7 +82,7 @@ public class RouteSearchController {
             Optional<RouteModel> path = Screeners.showRouters(routes);
             if (path.isPresent()){
                 RouteModel route = path.get();
-                route.addAll(missionsList.getItems());
+                route.addAll(0, missionsList.getItems());
                 Screeners.showHelper(route);
             }
         });

client/src/main/java/ru/trader/model/MissionModel.java

@@ -9,12 +9,14 @@ public class MissionModel {
     private final ItemModel item;
     private final long count;
     private final double profit;
+    private final Offer offer;
 
     public MissionModel(StationModel target, double profit) {
         this.target = target;
         this.profit = profit;
         item = null;
         count = 0;
+        offer = null;
     }
 
     public MissionModel(StationModel target, long count, double profit) {
@@ -22,6 +24,7 @@ public class MissionModel {
         this.count = count;
         this.profit = profit;
         this.item = null;
+        offer = null;
     }
 
 
@@ -30,6 +33,7 @@ public class MissionModel {
         this.item = item;
         this.count = count;
         this.profit = profit;
+        offer = SimpleOffer.fakeBuy(target.getStation(), item.getItem(), profit/count, count);
     }
 
     public StationModel getTarget() {
@@ -49,7 +53,7 @@ public class MissionModel {
     }
 
     public boolean isSupply(){
-        return item != null;
+        return offer != null;
     }
 
     public boolean isDelivery(){
@@ -72,14 +76,14 @@ public class MissionModel {
 
     public void toSpecification(CrawlerSpecificator specificator){
         if (isSupply()){
-            specificator.buy(toOffer());
+            specificator.buy(offer);
         } else
         if (isCourier() || isDelivery()){
             specificator.add(target.getStation(), true);
         }
     }
 
-    Offer toOffer(){
-        return isSupply() ? SimpleOffer.fakeBuy(target.getStation(), item.getItem(), profit/count, count) : null;
+    Offer getOffer(){
+        return offer;
     }
 }

client/src/main/java/ru/trader/model/RouteEntryModel.java

@@ -17,6 +17,7 @@ public class RouteEntryModel {
     private final DoubleProperty profit;
     private final ObservableList<OrderModel> orders;
     private final ObservableList<OrderModel> sellOrders;
+    private final ObservableList<MissionModel> missions;
 
     RouteEntryModel(RouteEntry entry, MarketModel market) {
         this.entry = entry;
@@ -24,6 +25,7 @@ public class RouteEntryModel {
         List<Order> orderList = entry.getOrders();
         orders = BindingsHelper.observableList(orderList, market.getModeler()::get);
         sellOrders = FXCollections.observableArrayList();
+        missions = FXCollections.observableArrayList();
         profit = new SimpleDoubleProperty();
         profit.bind(BindingsHelper.group(Double::sum, OrderModel::profitProperty, orders));
     }
@@ -32,6 +34,14 @@ public class RouteEntryModel {
         sellOrders.add(order);
     }
 
+    void add(MissionModel mission){
+        missions.add(mission);
+    }
+
+    void remove(MissionModel mission){
+        missions.remove(mission);
+    }
+
     public StationModel getStation() {
         return station;
     }
@@ -68,6 +78,10 @@ public class RouteEntryModel {
         return sellOrders;
     }
 
+    public ObservableList<MissionModel> missions() {
+        return missions;
+    }
+
     void refresh(MarketModel market){
         orders.clear();
         orders.addAll(BindingsHelper.observableList(entry.getOrders(), market.getModeler()::get));

client/src/main/java/ru/trader/model/RouteModel.java

@@ -121,25 +121,48 @@ public class RouteModel {
         return new RouteModel(_route, market);
     }
 
-    public void add(MissionModel mission){
+    public void add(int offset, MissionModel mission){
+        int completeIndex = -1;
         long cargo = MainController.getProfile().getShipCargo();
-        Offer offer = mission.toOffer();
+        Offer offer = mission.getOffer();
         if (offer != null){
-            RouteFiller.addOrders(_route, 0, offer, cargo);
+            completeIndex = RouteFiller.addOrders(_route, offset, offer, cargo);
             for (RouteEntryModel entry : entries) {
                 entry.sellOrders().clear();
                 entry.refresh(market);
             }
             fillSellOrders();
+        } else
+        if (mission.isDelivery()){
+            completeIndex = RouteFiller.reservedCargo(_route, offset, mission.getTarget().getStation(), mission.getCount(), cargo);
+            for (RouteEntryModel entry : entries) {
+                entry.refresh(market);
+            }
+        } else
+        if (mission.isCourier()){
+            completeIndex = _route.find(mission.getTarget().getStation(), offset);
+        }
+        if (completeIndex != -1){
+            entries.get(completeIndex).add(mission);
         }
     }
 
-    public void addAll(Collection<MissionModel> missions){
+    public void addAll(int offset, Collection<MissionModel> missions){
         long cargo = MainController.getProfile().getShipCargo();
         for (MissionModel mission : missions) {
-            Offer offer = mission.toOffer();
+            Offer offer = mission.getOffer();
+            int completeIndex = -1;
             if (offer != null){
-                RouteFiller.addOrders(_route, 0, offer, cargo);
+                completeIndex = RouteFiller.addOrders(_route, offset, offer, cargo);
+            } else
+            if (mission.isDelivery()){
+                    completeIndex = RouteFiller.reservedCargo(_route, offset, mission.getTarget().getStation(), mission.getCount(), cargo);
+            } else
+            if (mission.isCourier()){
+                completeIndex = _route.find(mission.getTarget().getStation(), offset);
+            }
+            if (completeIndex != -1){
+                entries.get(completeIndex).add(mission);
             }
         }
         for (RouteEntryModel entry : entries) {

client/src/main/resources/view/helper.fxml

@@ -14,7 +14,7 @@
     <HBox><Label text="Станция:" /><Label fx:id="station" /></HBox>
     <HBox><Label text="Время:" /><Label fx:id="time" /></HBox>
     <HBox><Label text="Заправить:" /><Label fx:id="refuel" /></HBox>
-    <HBox>
+    <HBox maxHeight="200">
         <VBox>
             <Label text="Продать:" />
             <ListView fx:id="sellOrders"/>
@@ -24,6 +24,10 @@
             <ListView fx:id="buyOrders"/>
         </VBox>
     </HBox>
+    <VBox>
+        <Label text="Сдать миссии:" />
+        <ListView fx:id="missions"/>
+    </VBox>
     <HBox>
         <Button prefWidth="30" onAction="#previous">
             <graphic><Glyph text="FontAwesome|ARROW_LEFT"/></graphic>