From 24b111a20ba81b3832b0f905f29be892ec131816 Mon Sep 17 00:00:00 2001
From: Laura Radaelli <laura.radaelli.85@gmail.com>
Date: Wed, 14 Jun 2017 19:15:13 +0300
Subject: [PATCH] voting questions flow fixed (removed button cancel)

---
 .../voting/gui/controllersFX/VotingController.java       | 9 +++++++++
 voting-booth-gui/src/main/resources/views/voting.fxml    | 3 +--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/VotingController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/VotingController.java
index 261a1f6..edd431f 100644
--- a/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/VotingController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/VotingController.java
@@ -34,6 +34,14 @@ public class VotingController {
     @FXML private Text question;
     @FXML private Pane questionPane;
 
+    @FXML
+    public void initialize() {
+        questions = command.getQuestions();
+        answerGroup = new ToggleGroup();
+        showQuestion();
+    }
+
+
     @FXML
     private void nextQuestion() {
         if (questions.size()==0) {
@@ -75,6 +83,7 @@ public class VotingController {
 
     @FXML
     private void doCancel() throws VoterCancelThrowable{
+        // TODO: 6/14/2017 check flow and decide what to do...
         VoterCancelThrowable e = new VoterCancelThrowable();
         command.getCallback().onFailure(e);
         //see what is done in the original (basically need to call the callback of the command onFailure()
diff --git a/voting-booth-gui/src/main/resources/views/voting.fxml b/voting-booth-gui/src/main/resources/views/voting.fxml
index 38789ea..bc11ae0 100644
--- a/voting-booth-gui/src/main/resources/views/voting.fxml
+++ b/voting-booth-gui/src/main/resources/views/voting.fxml
@@ -4,12 +4,11 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Text?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.controllersFX.VotingController">
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.controllersFX.VotingController">
    <children>
       <Button layoutX="469.0" layoutY="343.0" mnemonicParsing="false" onMousePressed="#nextQuestion" text="Next" />
       <Text fx:id="question" layoutX="84.0" layoutY="89.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Click 'Next' to see the first question." wrappingWidth="431.3046875" />
       <Pane fx:id="questionPane" layoutX="84.0" layoutY="97.0" prefHeight="234.0" prefWidth="422.0" />
-      <Button layoutX="275.0" layoutY="343.0" mnemonicParsing="false" onMousePressed="#doCancel" text="Cancel" />
       <Button layoutX="84.0" layoutY="343.0" mnemonicParsing="false" onMousePressed="#goBack" text="Back" />
    </children>
 </Pane>