Not Broken

Added 2 popups for Overdrawn, Insufficient
Trying to disable/ enable buttons

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

@@ -23,6 +23,7 @@ public class CashMachine {
     };
 
     public void login(int id) {
+
         tryCall(
                 () -> bank.getAccountById(id),
                 update
@@ -51,11 +52,22 @@ public class CashMachine {
         if (accountData != null) {
             accountData = null;
         }
+
+    }
+
+    public boolean isValidId(int id){
+        if (bank.isValidId(id)) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     @Override
     public String toString() {
-        return accountData != null ? accountData.toString() : "Try account 1000 or 2000 and click submit.";
+//
+        // if (accountData != null){isValidId();}
+        return accountData != null ? accountData.toString() : "Try account 1000, 2000, 6666, 7337\n and click submit.";
     }
 
     private <T> void tryCall(Supplier<ActionResult<T> > action, Consumer<T> postAction) {

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

@@ -10,35 +10,38 @@ import javafx.scene.control.Button;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
 import javafx.stage.Stage;
+import javafx.scene.paint.Color;
 
 /**
  * @author ZipCodeWilmington
  */
 public class CashMachineApp extends Application {
+    Color blue = Color.rgb(0,0,255);
+    // Color green = Color.rgb(0,255,255);
 
     private CashMachine cashMachine = new CashMachine(new Bank());
 
     private TextField setAccountIdField = new TextField();
-    // private TextField setDeposit = new TextField();
-    // private TextField setAccountIdField = new TextField();
-    // private TextField setAccountIdField = new TextField();
+    private TextField setDepositField = new TextField();
+    private TextField setWithdrawField = new TextField();
 
     private Parent createContent() {
-        setAccountIdField.setMinSize(220, 40);
-        // seDeposit.setMinSize(220, 40);
-        // setAccountIdField.setMinSize(220, 40);
-        // setAccountIdField.setMinSize(220, 40);
-        
+        setAccountIdField.setMinSize(250, 40);
+        setDepositField.setMinSize(250, 40);
+        setWithdrawField.setMinSize(250, 40);
+
         GridPane gridPane = new GridPane();
-        gridPane.setPrefSize(600, 400);
-        gridPane.setAlignment(Pos.BASELINE_LEFT);
+        gridPane.setPrefSize(500, 400);
+        gridPane.setAlignment(Pos.CENTER);
+        gridPane.setStyle("-fx-background-color: Green;");
 
         TextArea areaInfo = new TextArea();
-        areaInfo.setMaxSize(220, 160);
+        areaInfo.setMaxSize(250, 160);
 
 
         Button btnSubmit = new Button("Set Account ID");
-        btnSubmit.setMinSize(220, 40);
+        btnSubmit.setMinSize(250, 40);
+        btnSubmit.setTextFill(blue);
         btnSubmit.setOnAction(e -> {
             int id = Integer.parseInt(setAccountIdField.getText());
             cashMachine.login(id);
@@ -47,25 +50,29 @@ public class CashMachineApp extends Application {
         });
 
         Button btnDeposit = new Button("Deposit");
-        btnDeposit.setMinSize(220, 40);
+        btnDeposit.setMinSize(250, 40);
+        btnDeposit.setTextFill(blue);
+//
+        // btnDeposit.setDisable(true);
         btnDeposit.setOnAction(e -> {
-            int amount = Integer.parseInt(setAccountIdField.getText());
+            int amount = Integer.parseInt(setDepositField.getText());
             cashMachine.deposit(amount);
-
             areaInfo.setText(cashMachine.toString());
         });
 
         Button btnWithdraw = new Button("Withdraw");
-        btnWithdraw.setMinSize(220, 40);
+        btnWithdraw.setMinSize(250, 40);
+        btnWithdraw.setTextFill(blue);
         btnWithdraw.setOnAction(e -> {
-            int amount = Integer.parseInt(setAccountIdField.getText());
+            int amount = Integer.parseInt(setWithdrawField.getText());
             cashMachine.withdraw(amount);
 
             areaInfo.setText(cashMachine.toString());
         });
 
         Button btnExit = new Button("Exit");
-        btnExit.setMinSize(220, 40);
+        btnExit.setMinSize(250, 160);
+        btnExit.setTextFill(blue);
         btnExit.setOnAction(e -> {
             cashMachine.exit();
 
@@ -78,17 +85,30 @@ public class CashMachineApp extends Application {
         GridPane.setConstraints(btnWithdraw, 0, 2);
         GridPane.setConstraints(btnExit, 0, 3);
         GridPane.setConstraints(setAccountIdField, 1, 0);
-        GridPane.setConstraints(areaInfo, 1, 4);
-        gridPane.getChildren().addAll(btnSubmit, btnDeposit, btnWithdraw, btnExit, setAccountIdField, areaInfo);
+        GridPane.setConstraints(setDepositField, 1, 1);
+        GridPane.setConstraints(setWithdrawField,1, 2);
+        GridPane.setConstraints(areaInfo, 1, 3);
+        gridPane.getChildren().addAll(btnSubmit, btnDeposit, btnWithdraw, btnExit,
+                setAccountIdField, setDepositField, setWithdrawField, areaInfo);
         return gridPane;
     }
 
     @Override
     public void start(Stage stage) throws Exception {
         stage.setScene(new Scene(createContent()));
+        stage.setTitle("Zip Code ATM");
         stage.show();
     }
 
+    public boolean isValidId(int id){
+        if (cashMachine.isValidId(id)) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
     public static void main(String[] args) {
         launch(args);
     }

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

@@ -1,6 +1,8 @@
 package rocks.zipcode.atm.bank;
 
 import rocks.zipcode.atm.ActionResult;
+import rocks.zipcode.atm.CashMachine;
+import rocks.zipcode.atm.CashMachineApp;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -32,11 +34,10 @@ public class Bank {
 
     public ActionResult<AccountData> getAccountById(int id) {
         Account account = accounts.get(id);
-
         if (account != null) {
             return ActionResult.success(account.getAccountData());
         } else {
-            return ActionResult.fail("No account with id: " + id + "\nTry account 1000 or 2000");
+            return ActionResult.fail("No account with id: " + id + "\nTry account 1000, 2000, 6666, 7337");
         }
     }
 
@@ -61,4 +62,14 @@ public class Bank {
             return ActionResult.fail("Withdraw failed: " + amount + ". Account has: " + account.getBalance());
         }
     }
+
+    public boolean isValidId(int id){
+        Account account = accounts.get(id);
+        if (account != null) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
 }