Separated return information fields

src/main/java/rocks/zipcode/atm/CashMachine.java

@@ -1,5 +1,6 @@
 package rocks.zipcode.atm;
 
+import com.sun.javafx.binding.StringFormatter;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import rocks.zipcode.atm.bank.AccountData;
@@ -25,6 +26,24 @@ public class CashMachine {
 
     }
 
+    public int getId() {
+        return accountData.getId();
+    }
+
+    public String getName() {
+        return accountData.getName();
+    }
+
+    public String getEmail() {
+        return accountData.getEmail();
+    }
+
+
+    public Float getBalance() {
+
+        return accountData.getBalance();
+    }
+
     private Consumer<AccountData> update = data -> {
         accountData = data;
     };
@@ -72,6 +91,7 @@ public class CashMachine {
                     () -> bank.withdraw(accountData, amount),
                     update
             );
+
         }
     }
 

src/main/java/rocks/zipcode/atm/CashMachineApp.java

@@ -36,11 +36,64 @@ public class CashMachineApp extends Application {
 
     private Parent createContent() {
         VBox vbox = new VBox(10);
-        vbox.setPrefSize(600, 600);
-        vbox.setStyle("-fx-background-color: mediumaquamarine; -fx-padding: 20; -fx-font-size: 20;");
+        vbox.setPrefSize(600, 750);
+        vbox.setStyle("-fx-background-color: lightslategray; -fx-padding: 20; -fx-font-size: 20;");
 
-        TextArea areaInfo = new TextArea();
 
+        TextField areaAccountId = new TextField();
+        areaAccountId.setStyle("-fx-background-color: lightsteelblue;");
+        areaAccountId.setManaged(false);
+
+        Label accountId = new Label("Account ID:");
+        accountId.setManaged(false);
+
+       // HBox accountIdInfo = new HBox(5);
+        //accountIdInfo.getChildren().addAll(accountId, areaAccountId);
+
+        TextField areaAccountName = new TextField();
+        areaAccountName.setManaged(false);
+        areaAccountName.setStyle("-fx-background-color: lightsteelblue;");
+
+        Label accountName = new Label("Account Holder:");
+        accountName.setManaged(false);
+
+        //HBox nameInfo = new HBox(5);
+        //nameInfo.getChildren().addAll(accountName, areaAccountName);
+
+        TextField areaAccountEmail = new TextField();
+        areaAccountEmail.setManaged(false);
+        areaAccountEmail.setStyle("-fx-background-color: lightsteelblue;");
+
+        Label accountEmail = new Label("Email:");
+        accountEmail.setManaged(false);
+
+        //HBox accountEmailInfo = new HBox(5);
+        //accountEmailInfo.getChildren().addAll(accountEmail, areaAccountEmail);
+
+        TextField areaAccountAmount = new TextField();
+        areaAccountAmount.setManaged(false);
+        areaAccountAmount.setStyle("-fx-background-color: mediumturquoise;");
+
+        Label accountBalance = new Label("Balance:");
+        accountBalance.setManaged(false);
+
+        /*
+        HBox accountBalanceInfo = new HBox(5);
+        accountBalanceInfo.getChildren().addAll(accountBalance, areaAccountAmount);
+
+        accountIdInfo.setPrefSize(100, 100);
+        accountIdInfo.setStyle("-fx-background-color: mediumaquamarine; -fx-padding: 20; -fx-font-size: 20;");
+        */
+
+        field2.setManaged(false);
+
+        Label fieldLabel2 = new Label("Amount:");
+        fieldLabel2.setManaged(false);
+        Label fieldLabel = new Label("Select Your Account Number:");
+
+        field.setStyle("-fx-background-color: lightgrey;");
+        field2.setStyle("-fx-background-color: lightgrey;");
+        Label passwordLabel = new Label("Password:");
 
 
         //Make Button Do something.
@@ -53,56 +106,109 @@ public class CashMachineApp extends Application {
 */
 
         Button btnDeposit = new Button("Deposit");
-        btnDeposit.setDisable(true);
+        btnDeposit.setManaged(false);
         btnDeposit.setOnAction(e -> {
             float amount = Float.parseFloat(field2.getText());
             cashMachine.deposit(amount);
 
-            areaInfo.setText(cashMachine.toString());
+            areaAccountAmount.setText(Float.toString(cashMachine.getBalance()));
         });
 
 
         Button btnWithdraw = new Button("Withdraw");
-        btnWithdraw.setDisable(true);
+        btnWithdraw.setManaged(false);
         btnWithdraw.setOnAction(e -> {
             float amount = Float.parseFloat(field2.getText());
             cashMachine.withdraw(amount);
-            areaInfo.setText(cashMachine.toString());
+            areaAccountAmount.setText(Float.toString(cashMachine.getBalance()));
         });
 
         Button btnResetPassword = new Button("Reset Password");
-        btnResetPassword.setDisable(true);
+        btnResetPassword.setManaged(false);
         btnResetPassword.setOnAction(e -> {
             int id = Integer.parseInt(accountNumbers.getValue().toString());
             String password = field.getText();
             cashMachine.resetPassword(id, password);
-            areaInfo.setText(cashMachine.message("Password Reset."));
+            passwordLabel.setText(cashMachine.message("Password Reset."));
         });
 
         Button btnExit = new Button("Log Out");
+        btnExit.setManaged(false);
         btnExit.setOnAction(e -> {
             cashMachine.exit();
             field.clear();
             field2.clear();
-            areaInfo.clear();
-            btnDeposit.setDisable(true);
-            btnWithdraw.setDisable(true);
-            btnResetPassword.setDisable(true);
+            areaAccountAmount.clear();
+            areaAccountEmail.clear();
+            areaAccountId.clear();
+            areaAccountName.clear();
+            passwordLabel.setText("Password:");
+
+
+            field2.setVisible(false);
+            fieldLabel2.setVisible(false);
+            btnDeposit.setVisible(false);
+            btnWithdraw.setVisible(false);
+            btnExit.setVisible(false);
+            btnResetPassword.setVisible(false);
+
+            areaAccountAmount.setVisible(false);
+            areaAccountEmail.setVisible(false);
+            areaAccountId.setVisible(false);
+            areaAccountName.setVisible(false);
+
+            accountBalance.setVisible(false);
+            accountEmail.setVisible(false);
+            accountId.setVisible(false);
+            accountName.setVisible(false);
         });
 
         Button btnSubmit = new Button("Enter");
         btnSubmit.setOnAction(e -> {
             int id = Integer.parseInt(accountNumbers.getValue().toString());
-            String password = field.getText();
-            if(cashMachine.checkPassword(id, password)) {
+            String passwordInput = field.getText();
+            if(cashMachine.checkPassword(id, passwordInput)) {
                 cashMachine.login(id);
-                areaInfo.setText(cashMachine.toString());
-                btnDeposit.setDisable(false);
-                btnWithdraw.setDisable(false);
-                btnResetPassword.setDisable(false);
-                password = "New Password:";
+                areaAccountAmount.setText(Float.toString(cashMachine.getBalance()));
+                areaAccountEmail.setText(cashMachine.getEmail());
+                areaAccountId.setText(Integer.toString(cashMachine.getId()));
+                areaAccountName.setText(cashMachine.getName());
+                areaAccountAmount.setManaged(true);
+                areaAccountEmail.setManaged(true);
+                areaAccountId.setManaged(true);
+                areaAccountName.setManaged(true);
+                accountId.setManaged(true);
+                accountName.setManaged(true);
+                accountEmail.setManaged(true);
+                accountBalance.setManaged(true);
+                passwordLabel.setText("New Password:");
+                btnDeposit.setManaged(true);
+                btnWithdraw.setManaged(true);
+                btnExit.setManaged(true);
+                btnResetPassword.setManaged(true);
+                accountId.setManaged(true);
+                field2.setManaged(true);
+                fieldLabel2.setManaged(true);
+
+                field2.setVisible(true);
+                fieldLabel2.setVisible(true);
+                btnDeposit.setVisible(true);
+                btnWithdraw.setVisible(true);
+                btnExit.setVisible(true);
+                btnResetPassword.setVisible(true);
+
+                areaAccountAmount.setVisible(true);
+                areaAccountEmail.setVisible(true);
+                areaAccountId.setVisible(true);
+                areaAccountName.setVisible(true);
+
+                accountBalance.setVisible(true);
+                accountEmail.setVisible(true);
+                accountId.setVisible(true);
+                accountName.setVisible(true);
+
             } else {
-                areaInfo.setText(cashMachine.message("Incorrect Password.  Try Again."));
+                areaAccountId.setText(cashMachine.message("Incorrect Password.  Try Again."));
             }
         });
 
@@ -125,14 +231,8 @@ public class CashMachineApp extends Application {
         flowpane2.getChildren().add(btnDeposit);
         flowpane2.getChildren().add(btnWithdraw);
         flowpane2.getChildren().add(btnExit);
-        Label fieldLabel2 = new Label("Amount:");
-        Label accountInfo2 = new Label("Account Info:");
 
-        field.setStyle("-fx-background-color: lightgrey;");
-        field2.setStyle("-fx-background-color: lightgrey;");
-        Label fieldLabel = new Label("Account Number:");
-        Label password = new Label("Password:");
-        vbox.getChildren().addAll(fieldLabel, accountNumbers, password, field, flowpane, fieldLabel2, field2, flowpane2, accountInfo2, areaInfo);
+        vbox.getChildren().addAll(fieldLabel, accountNumbers, passwordLabel, field, flowpane, fieldLabel2, field2, flowpane2, accountId, areaAccountId, accountName, areaAccountName, accountEmail, areaAccountEmail, accountBalance, areaAccountAmount);
 
 
 

src/main/java/rocks/zipcode/atm/bank/AccountData.java

@@ -36,7 +36,7 @@ public final class AccountData {
 
     @Override
     public String toString() {
-        return "Account id: " + id + '\n' +
+        return "Account ID: " + id + '\n' +
                 "Name: " + name + '\n' +
                 "Email: " + email + '\n' +
                 "Balance: $" + String.format("%,.2f", balance);

src/main/java/rocks/zipcode/atm/bank/Bank.java

@@ -81,7 +81,7 @@ public class Bank {
         passwords.put(1900, "password");
 
         accounts.put(2000, new PremiumAccount(new AccountData(
-                2000, "Frankie Smit", "frank@gmail.com", 2040
+                2000, "Frankie Smith", "frank@gmail.com", 2040
         )));
 
         passwords.put(2000, "password");
@@ -148,7 +148,6 @@ public class Bank {
     public ActionResult<AccountData> withdraw(AccountData accountData, float amount) {
         Account account = accounts.get(accountData.getId());
         boolean ok = account.withdraw(amount);
-
         if (ok) {
             return ActionResult.success(account.getAccountData());
         } else {