Voomra/trader
Archived
0
Fork 0
Code Activity

- update paths layout

Browse Source 
- add top routers
- add orders button
This commit is contained in:
iMoHax
2014-08-19 17:20:30 +04:00
parent 2604939f96
commit 14c2021e0c
16 changed files with 419 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/resources/view/offers.fxml
View File

@@ -11,7 +11,7 @@
<?import ru.trader.view.support.cells.DoubleCell?>
<HBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.OffersController">
<TitledPane text="Станции" minWidth="260" prefHeight="500" collapsible="false">
<TitledPane text="Станции" minWidth="250" prefHeight="510" collapsible="false">
<ListView fx:id="vendors" />
</TitledPane>

28
client/src/main/resources/view/paths.fxml
View File

@@ -12,34 +12,38 @@
<?import ru.trader.view.support.cells.PathRouteCell?>
<HBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.PathsController" styleClass="dialog"
prefWidth="900">
prefWidth="1050">
<TableView fx:id="tblPaths" editable="true">
<columns>
<TableColumn minWidth="640.0" text="Путь">
<TableColumn minWidth="600.0" text="Путь">
<cellFactory><PathRouteCell /></cellFactory>
</TableColumn>
<TableColumn minWidth="60.0" text="Заправок">
<cellValueFactory><PropertyValueFactory property="refuels"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="60.0" text="Прыжков">
<TableColumn minWidth="70.0" text="Прыжков">
<cellValueFactory><PropertyValueFactory property="jumps"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="60.0" text="Дистанция">
<TableColumn minWidth="70.0" text="Заправок">
<cellValueFactory><PropertyValueFactory property="refuels"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="70.0" text="Посадок">
<cellValueFactory><PropertyValueFactory property="lands"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Дистанция">
<cellFactory><DoubleCell format="\%.2f LY"/></cellFactory>
<cellValueFactory><PropertyValueFactory property="distance"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="profit" minWidth="80.0" text="Прибыль" sortType="DESCENDING">
<TableColumn minWidth="70.0" text="Прибыль">
<cellValueFactory><PropertyValueFactory property="totalProfit"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="avgProfit" minWidth="70.0" text="Ср." sortType="DESCENDING">
<cellFactory><DoubleCell format="\%.0f"/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgProfit"/></cellValueFactory>
</TableColumn>
</columns>
<columnResizePolicy>
<TableView fx:constant="UNCONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy>
<sortOrder>
<fx:reference source="profit"/>
<fx:reference source="avgProfit"/>
</sortOrder>
</TableView>
</HBox>

83
client/src/main/resources/view/routers.fxml
View File

@@ -22,13 +22,13 @@
<ColumnConstraints minWidth="90" maxWidth="90"/>
</columnConstraints>
<Label text="Баланс:"/>
<NumberField fx:id="balance" value="1000" GridPane.columnIndex="1" />
<NumberField fx:id="balance" GridPane.columnIndex="1" />
<Label text="Трюм:" GridPane.rowIndex="1" />
<NumberField fx:id="cargo" value="4" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<NumberField fx:id="cargo" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Label text="Запас топлива(LY):" GridPane.rowIndex="2" />
<NumberField fx:id="tank" value="30" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<NumberField fx:id="tank" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Label text="Дистанция прыжка(LY):" GridPane.rowIndex="3" />
<NumberField fx:id="distance" value="7" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<NumberField fx:id="distance" GridPane.columnIndex="1" GridPane.rowIndex="3" />
</GridPane>
</TitledPane>
<TitledPane text="Параметры маршрута" minHeight="250" collapsible="false">
@@ -42,18 +42,22 @@
<Label text="До:" GridPane.rowIndex="1"/>
<ComboBox fx:id="target" prefWidth="160" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
<Label text="Прыжков:" GridPane.rowIndex="2" />
<NumberField fx:id="jumps" value="4" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<NumberField fx:id="jumps" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Separator GridPane.columnSpan="2" GridPane.rowIndex="3" GridPane.margin="$separator_margin"/>
<VBox GridPane.columnSpan="2" GridPane.rowIndex="4" spacing="20">
<VBox GridPane.columnSpan="2" GridPane.rowIndex="4" spacing="5">
<HBox alignment="CENTER" spacing="5">
<Button fx:id="add" text="Добавить" onAction="#addOrders"/>
<Button text="Удалить" onAction="#removeSelected"/>
<Button text="Очистить" onAction="#removeAll" />
</HBox>
<HBox alignment="CENTER" spacing="5">
<Button prefWidth="80" text="Заказы" onAction="#showOrders" />
<Button text="TOP 100" onAction="#showTopOrders" />
<Button text="Маршруты" onAction="#showRoutes" />
</HBox>
<HBox alignment="CENTER" spacing="5">
<Button prefWidth="80" text="Маршруты" onAction="#showRoutes" />
<Button text="TOP 100" onAction="#showTopRoutes" />
</HBox>
</VBox>
</GridPane>
@@ -72,35 +76,38 @@
</GridPane>
</TitledPane>
</VBox>
<TableView fx:id="tblOrders" HBox.hgrow="ALWAYS">
<columns>
<TableColumn minWidth="210.0" text="Продавец">
<cellValueFactory><PropertyValueFactory property="vendor"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="180.0" text="Товар">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Цена">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Кол-во">
<cellValueFactory><PropertyValueFactory property="count"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="120.0" text="Покупатель">
<cellValueFactory><OfferCellValueImpl property="buyer"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Дистанция">
<cellFactory><DoubleCell format="\%.2f LY"/></cellFactory>
<cellValueFactory><PropertyValueFactory property="distance"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Прибыль">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
</TableColumn>
</columns>
<columnResizePolicy>
<TableView fx:constant="UNCONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy>
</TableView>
<VBox HBox.hgrow="ALWAYS">
<TableView fx:id="tblOrders" VBox.vgrow="ALWAYS">
<columns>
<TableColumn minWidth="210.0" text="Продавец">
<cellValueFactory><PropertyValueFactory property="vendor"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="180.0" text="Товар">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Цена">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Кол-во">
<cellValueFactory><PropertyValueFactory property="count"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="120.0" text="Покупатель">
<cellValueFactory><OfferCellValueImpl property="buyer"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Дистанция">
<cellFactory><DoubleCell format="\%.2f LY"/></cellFactory>
<cellValueFactory><PropertyValueFactory property="distance"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Прибыль">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
</TableColumn>
</columns>
<columnResizePolicy>
<TableView fx:constant="UNCONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy>
</TableView>
<ScrollPane fx:id="path" styleClass="path-pane" minHeight="100" fitToHeight="true"/>
</VBox>
</HBox>

36
client/src/main/resources/view/style.css
View File

@@ -48,3 +48,39 @@ HBox.fields-group hbox-margin{
.center {
-fx-alignment: center;
}
/* Path */
.path {
-fx-alignment: center-left;
-fx-spacing: 5px;
-fx-fill-height: true;
}
.path-vendor {
-fx-alignment: center-left;
-fx-text-alignment: left;
}
.path-icons {
-fx-alignment: center;
}
.path-track {
-fx-padding: 0 8;
-fx-alignment: center;
}
.path-track .text {
-fx-font-size: 16pt;
}
.path-track-text {
-fx-font-size: 7pt;
}
.path-pane {
-fx-padding: 10;
-fx-alignment: center-left;
}