From 1919da1f3c0347d0dee170864b04b20510e27fd0 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Thu, 7 Jun 2018 14:55:04 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=20=D0=A4=D0=A1=D0=A1=20=D0=B2=20GUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../corrector1s/gui/MainController.java          | 16 +++++++++++-----
 .../dmitriymx/corrector1s/gui/single_layout.fxml |  6 ++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/ru/dmitriymx/corrector1s/gui/MainController.java b/src/main/java/ru/dmitriymx/corrector1s/gui/MainController.java
index 6ac38db..8e2ab6c 100644
--- a/src/main/java/ru/dmitriymx/corrector1s/gui/MainController.java
+++ b/src/main/java/ru/dmitriymx/corrector1s/gui/MainController.java
@@ -9,7 +9,6 @@ import javafx.scene.layout.VBox;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import ru.dmitriymx.corrector1s.Corrector1S;
 
 import java.io.*;
@@ -38,8 +37,11 @@ public class MainController {
     @FXML
     private Button btnStartCorrect;
     @FXML
-    private Spinner<Integer> gonorar;
-    private SpinnerValueFactory<Integer> gonorarValueFactory = new SpinnerValueFactory.IntegerSpinnerValueFactory(1, 100, 9);
+    private Spinner<Double> honorarium;
+    private SpinnerValueFactory<Double> honorariumValueFactory = new SpinnerValueFactory.DoubleSpinnerValueFactory(0.01d, 100.0d, 9.0d);
+    @FXML
+    private Spinner<Double> fss;
+    private SpinnerValueFactory<Double> fssValueFactory = new SpinnerValueFactory.DoubleSpinnerValueFactory(0.01d, 100.0d, 31.0d);
 
     private FileChooser buildFileChooser(TextField textField) {
         FileChooser fileChooser = new FileChooser();
@@ -105,7 +107,8 @@ public class MainController {
 
     @FXML
     public void initialize() {
-        gonorar.setValueFactory(gonorarValueFactory);
+        honorarium.setValueFactory(honorariumValueFactory);
+        fss.setValueFactory(fssValueFactory);
 
         saveAsCheckBox.selectedProperty().addListener((observable, oldValue, newValue) -> {
             saveAsFilePath.setDisable(!newValue);
@@ -140,7 +143,10 @@ public class MainController {
                 } else {
                     corrector.setTargetFile(new File(sourceFilePath.getText()));
                 }
-                corrector.setHonorarium(gonorar.getValue());
+                log.info("Honorarium: {}", honorarium.getValue());
+                corrector.setHonorarium(honorarium.getValue());
+                log.info("FSS: {}", fss.getValue());
+                corrector.setFss(fss.getValue());
 
                 progressBar.setProgress(0.14d);
 
diff --git a/src/main/resources/ru/dmitriymx/corrector1s/gui/single_layout.fxml b/src/main/resources/ru/dmitriymx/corrector1s/gui/single_layout.fxml
index 734c1aa..47c231c 100644
--- a/src/main/resources/ru/dmitriymx/corrector1s/gui/single_layout.fxml
+++ b/src/main/resources/ru/dmitriymx/corrector1s/gui/single_layout.fxml
@@ -12,7 +12,7 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="203.0" prefWidth="350.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ru.dmitriymx.corrector1s.gui.MainController">
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="203.0" prefWidth="350.0" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ru.dmitriymx.corrector1s.gui.MainController">
    <Pane fx:id="mainPane" prefHeight="203.0" prefWidth="350.0">
       <padding>
          <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
@@ -32,7 +32,9 @@
          </font>
       </Button>
       <Label layoutX="132.0" layoutY="66.0" text="Гонорар" />
-      <Spinner fx:id="gonorar" editable="true" layoutX="186.0" layoutY="62.0" prefHeight="25.0" prefWidth="77.0" />
+      <Spinner fx:id="honorarium" editable="true" layoutX="186.0" layoutY="62.0" prefHeight="25.0" prefWidth="59.0" />
+      <Label layoutX="249.0" layoutY="66.0" text="ФСС" />
+      <Spinner fx:id="fss" editable="true" layoutX="278.0" layoutY="62.0" prefHeight="25.0" prefWidth="59.0" />
    </Pane>
    <Pane fx:id="waitPane" prefHeight="203.0" prefWidth="350.0" visible="false">
       <ProgressIndicator fx:id="progressBar" layoutX="157.0" layoutY="62.0" prefHeight="50.0" prefWidth="36.0" progress="1.0" />