Working, new account unifnished

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

@@ -1,5 +1,6 @@
 package rocks.zipcode.atm;
 
+import rocks.zipcode.atm.bank.Account;
 import rocks.zipcode.atm.bank.AccountData;
 import rocks.zipcode.atm.bank.Bank;
 
@@ -74,6 +75,16 @@ public class CashMachine {
         return bank.listAccounts();
     }
 
+    public int newBasicAccount(String name, String email, double balance) {
+        bank.addBasicAccount(name,email,balance);
+        return bank.newId();
+    }
+
+    public int newPremiumAccount(String name, String email, double balance) {
+        bank.addPremiumAccount(name,email,balance);
+        return bank.newId();
+    }
+
     @Override
     public String toString() {
         return accountData != null ? accountData.toString() : "Try account 1000 or 2000 and click submit.";

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

@@ -1,114 +0,0 @@
-package rocks.zipcode.atm;
-
-import javafx.application.Application;
-import javafx.geometry.Insets;
-import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.FlowPane;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import javafx.scene.text.Text;
-import javafx.stage.Stage;
-import rocks.zipcode.atm.bank.Bank;
-
-public class CashMachine2 extends Application {
-    CashMachine cashMachine = new CashMachine(new Bank());
-    Text account = new Text();
-    Text name = new Text();
-    Text email = new Text();
-    Text balance = new Text();
-    Button btnDeposit = new Button("Deposit");
-    Button btnWithdraw = new Button("Withdraw");
-    Button btnExit = new Button("Logout");
-    Button btnSubmit = new Button("Login");
-    Button btnClose = new Button("Exit");
-    FlowPane fp = new FlowPane();
-    FlowPane fp2 = new FlowPane();
-    GridPane gp2 = new GridPane();
-    VBox vb = new VBox();
-    VBox vb2 = new VBox();
-    private TextField field = new TextField();
-    private TextField field2 = new TextField();
-
-    public static void main(String[] args) {
-        launch(args);
-    }
-
-    @Override
-    public void start(Stage primaryStage) {
-        field.setFocusTraversable(false);
-        field.setPromptText("Enter Account ID");
-
-        Scene scene1 = new Scene(vb,300,250, Color.BURLYWOOD);
-        Scene scene2 = new Scene(vb2,300,250, Color.BURLYWOOD);
-
-        btnSubmit.setOnAction(e -> {
-            int id = Integer.parseInt(field.getText());
-            cashMachine.login(id);
-            primaryStage.setScene(scene2);
-//            account.setText(cashMachine.accountIdToString());
-//            name.setText(cashMachine.nameToString());
-//            email.setText(cashMachine.emailToString());
-//            balance.setText(cashMachine.balanceToString());
-//            btnDeposit.setVisible(true);
-//            btnWithdraw.setVisible(true);
-//            btnExit.setVisible(true);
-            //menuBar.setVisible(true);
-        });
-
-        btnDeposit.setOnAction(e -> {
-            double amount = Integer.parseInt(field2.getText());
-            cashMachine.deposit(amount);
-
-            account.setText(cashMachine.accountIdToString());
-            name.setText(cashMachine.nameToString());
-            email.setText(cashMachine.emailToString());
-            balance.setText(cashMachine.balanceToString());
-        });
-
-
-        btnWithdraw.setOnAction(e -> {
-            double amount = Integer.parseInt(field2.getText());
-            cashMachine.withdraw(amount);
-
-            account.setText(cashMachine.accountIdToString());
-            name.setText(cashMachine.nameToString());
-            email.setText(cashMachine.emailToString());
-            balance.setText(cashMachine.balanceToString());
-        });
-
-        btnExit.setOnAction(e -> {
-            cashMachine.exit();
-            primaryStage.setScene(scene1);
-        });
-
-        btnClose.setOnAction(e -> {
-            System.exit(0);
-        }); //add alert box to ask Are you sure??
-
-        gp2.setVgap(.5);
-        gp2.setPadding(new Insets(25,25,25,25));
-        gp2.setOpacity(50);
-        gp2.setStyle(" -fx-opacity: 10; -fx-padding: 2; -fx-border-color: dimgrey; -fx-border-style: solid; -fx-border-width: 2; -fx-vgap: 5");
-        //scene1 items
-        fp.getChildren().addAll(btnSubmit,btnExit);
-        vb.getChildren().addAll(field,fp);
-        //scene2items
-        fp2.getChildren().addAll(btnDeposit,btnWithdraw,btnExit);
-        gp2.add(account,1,0);
-        gp2.add(name,1,1);
-        gp2.add(email,1,2);
-        gp2.add(balance,1,3);
-        vb2.getChildren().addAll(field2,fp2,gp2);
-
-
-//        fp.getChildren().add(menuBar);
-
-
-        primaryStage.setTitle("Primary");
-        primaryStage.setScene(scene1);
-        primaryStage.show();
-    }
-}

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

@@ -1,138 +1,179 @@
-//package rocks.zipcode.atm;
-//
-//import javafx.geometry.Insets;
-//import javafx.geometry.Pos;
-//import javafx.scene.control.*;
-//import javafx.scene.layout.GridPane;
-//import javafx.scene.text.Text;
-//import rocks.zipcode.atm.bank.Bank;
-//import javafx.application.Application;
-//import javafx.scene.Parent;
-//import javafx.scene.Scene;
-//import javafx.scene.layout.VBox;
-//import javafx.stage.Stage;
-//import javafx.scene.layout.FlowPane;
-//
-//import java.util.ArrayList;
-//
-///**
-// * @author ZipCodeWilmington
-// */
-//public class CashMachineApp extends Application {
-//
-//    private TextField field = new TextField();
-//    private CashMachine cashMachine = new CashMachine(new Bank());
-//
-//    private Parent createContent() {
-//        field.setFocusTraversable(false);
-//        field.setPromptText("Enter Account ID");
-//        FlowPane flowpane = new FlowPane();
-//        VBox vbox = new VBox(10);
-//        vbox.setPrefSize(600, 600);
-//
-//        TextArea areaInfo = new TextArea();
-//
-//        GridPane gridPane = new GridPane();
-//        gridPane.setAlignment(Pos.CENTER_LEFT);
-//        gridPane.setVgap(5);
-//        gridPane.setHgap(5);
-//        Text account = new Text();
-//        Text name = new Text();
-//        Text email = new Text();
-//        Text balance = new Text();
-//
-//
-//        MenuBar menuBar = new MenuBar();
-//
-//        Button btnDeposit = new Button("Deposit");
-//        btnDeposit.setOnAction(e -> {
-//            int amount = Integer.parseInt(field.getText());
-//            cashMachine.deposit(amount);
-//
-//            account.setText(cashMachine.accountIdToString());
-//            name.setText(cashMachine.nameToString());
-//            email.setText(cashMachine.emailToString());
-//            balance.setText(cashMachine.balanceToString());
-//        });
-//
-//        Button btnWithdraw = new Button("Withdraw");
-//        btnWithdraw.setOnAction(e -> {
-//            int amount = Integer.parseInt(field.getText());
-//            cashMachine.withdraw(amount);
-//
-//            account.setText(cashMachine.accountIdToString());
-//            name.setText(cashMachine.nameToString());
-//            email.setText(cashMachine.emailToString());
-//            balance.setText(cashMachine.balanceToString());
-//        });
-//
-//        Button btnExit = new Button("Exit");
-//        btnExit.setOnAction(e -> {
-//            cashMachine.exit();
-//            account.setText(cashMachine.accountIdToString());
-//            name.setText(cashMachine.nameToString());
-//            email.setText(cashMachine.emailToString());
-//            balance.setText(cashMachine.balanceToString());
-//        });
-//
-//        Button btnSubmit = new Button("Login");
-//        btnSubmit.setOnAction(e -> {
-//            int id = Integer.parseInt(field.getText());
-//            cashMachine.login(id);
-//            account.setText(cashMachine.accountIdToString());
-//            name.setText(cashMachine.nameToString());
-//            email.setText(cashMachine.emailToString());
-//            balance.setText(cashMachine.balanceToString());
-//            btnDeposit.setVisible(true);
-//            btnWithdraw.setVisible(true);
-//            btnExit.setVisible(true);
-//            menuBar.setVisible(true);
-//
-//
-//        });
-//
-//        btnDeposit.setVisible(false);
-//        btnWithdraw.setVisible(false);
-//        btnExit.setVisible(false);
-//        menuBar.setVisible(false);
-//
-//        Menu accountMenu = new Menu("All Accounts");
-//
-//        flowpane.getChildren().add(btnSubmit);
-//        flowpane.getChildren().add(btnDeposit);
-//        flowpane.getChildren().add(btnWithdraw);
-//        flowpane.getChildren().add(btnExit);
-//        flowpane.getChildren().add(menuBar);
-//        menuBar.getMenus().add(accountMenu);
-//
-//        ArrayList<String> accountList = cashMachine.listAccounts();
-//        for(String acct : accountList){
-//            MenuItem newItem = new MenuItem(acct);
-//            newItem.setOnAction(e -> {
-//                field.clear();
-//                field.setPromptText("Enter Id and click \"Login\"");
-//            });
-//
-//            accountMenu.getItems().add(newItem);
-//
-//        }
-//
-//        gridPane.setPadding(new Insets(25,25,25,25));
-//        gridPane.add(account,0,1);
-//        gridPane.add(name,0,2);
-//        gridPane.add(email,0,3);
-//        gridPane.add(balance,0,4);
-//        vbox.getChildren().addAll(field, flowpane, gridPane);
-//        return vbox;
-//    }
-//
-//    @Override
-//    public void start(Stage stage) throws Exception {
-//        stage.setScene(new Scene(createContent()));
-//        stage.show();
-//    }
-//
-//    public static void main(String[] args) {
-//        launch(args);
-//    }
-//}
+package rocks.zipcode.atm;
+
+import javafx.application.Application;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Scene;
+import javafx.scene.control.*;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+import javafx.stage.Stage;
+import rocks.zipcode.atm.bank.Bank;
+
+import java.util.ArrayList;
+
+public class CashMachineApp extends Application {
+    CashMachine cashMachine = new CashMachine(new Bank());
+    Text account = new Text();
+    Text name = new Text();
+    Text email = new Text();
+    Text balance = new Text();
+    Button btnDeposit = new Button("Deposit");
+    Button btnWithdraw = new Button("Withdraw");
+    Button btnExit = new Button("Logout");
+    Button btnSubmit = new Button("Login");
+    Button btnClose = new Button("Exit");
+    Button btnNewAccount = new Button("New Account");
+    TextField name1 = new TextField("Name");
+    TextField email1 = new TextField("Email");
+    TextField balance1 = new TextField("Balance");
+    RadioButton basicAcct = new RadioButton("Basic Account");
+    RadioButton premAcct = new RadioButton("Premium Account");
+    Button btnSubmit2 = new Button("Create Account");
+
+    FlowPane fp = new FlowPane();
+    FlowPane fp2 = new FlowPane();
+    GridPane gp2 = new GridPane();
+    VBox vb3 = new VBox();
+    VBox vb = new VBox();
+    VBox vb2 = new VBox();
+    private TextField field = new TextField();
+    private TextField field2 = new TextField();
+
+    public static void main(String[] args) {
+        launch(args);
+    }
+
+    @Override
+    public void start(Stage primaryStage) {
+        field.setFocusTraversable(false);
+        field.setPromptText("Enter Account ID");
+        field.setPadding(new Insets(5,0,5,0));
+        field.setMaxWidth(250);
+
+        Scene scene1 = new Scene(vb,300,250, Color.BURLYWOOD);
+        Scene scene2 = new Scene(vb2,300,250, Color.BURLYWOOD);
+        Scene scene3 = new Scene(vb3,300,250, Color.BURLYWOOD);
+
+        btnSubmit.setOnAction(e -> {
+            field.clear();
+            int id = Integer.parseInt(field.getText());
+            cashMachine.login(id);
+            primaryStage.setScene(scene2);
+        });
+
+        btnDeposit.setOnAction(e -> {
+            double amount = Integer.parseInt(field2.getText());
+            cashMachine.deposit(amount);
+
+            account.setText(cashMachine.accountIdToString());
+            name.setText(cashMachine.nameToString());
+            email.setText(cashMachine.emailToString());
+            balance.setText(cashMachine.balanceToString());
+        });
+
+
+        btnWithdraw.setOnAction(e -> {
+            double amount = Integer.parseInt(field2.getText());
+            cashMachine.withdraw(amount);
+
+            account.setText(cashMachine.accountIdToString());
+            name.setText(cashMachine.nameToString());
+            email.setText(cashMachine.emailToString());
+            balance.setText(cashMachine.balanceToString());
+        });
+
+        btnNewAccount.setOnAction(e -> {
+            primaryStage.setScene(scene3);
+            field2.clear();
+            field.clear();
+        });
+
+        btnExit.setOnAction(e -> {
+            cashMachine.exit();
+            field.clear();
+            primaryStage.setScene(scene1);
+        });
+
+        btnClose.setOnAction(e -> {
+            System.exit(0);
+        }); //add alert box to ask Are you sure??
+
+        btnSubmit2.setOnAction(e ->{
+            name1.clear(); email1.clear(); balance1.clear();
+            final ToggleGroup group = new ToggleGroup();
+            basicAcct.setToggleGroup(group);
+            premAcct.setToggleGroup(group);
+            if (basicAcct.isSelected()) {
+                cashMachine.newBasicAccount(name1.getText(), email1.getText(), Double.parseDouble(balance1.getText()));
+            } else {cashMachine.newPremiumAccount(name1.getText(), email1.getText(), Double.parseDouble(balance1.getText()));
+//            TextField newId = new TextField("Your account Id is " + cashMachine.accountIdToString());
+//            newId.setVisible(true);
+//            cashMachine.login(Integer.parseInt(cashMachine.accountIdToString()));
+            btnExit.fire();
+            }
+        });
+
+        //scene1 items
+        Label zipCloud = new Label("ZipCloud Bank");
+        Label phrase = new Label("We Make It Rain");
+        zipCloud.setPrefSize(180,60);
+        zipCloud.setFont(new Font("Gotham",24));
+        zipCloud.setAlignment(Pos.TOP_CENTER);
+        phrase.setPrefSize(150,20);
+        phrase.setPadding(new Insets(0,0,20,0));
+        phrase.setAlignment(Pos.TOP_CENTER);
+
+        fp.getChildren().addAll(btnSubmit,btnClose);
+        fp.setPadding(new Insets(0,25,0,25));
+        vb.getChildren().addAll(zipCloud, phrase, field,fp);
+        vb.setAlignment(Pos.CENTER);
+        vb.setStyle("-fx-background-color: burlywood; -fx-padding: 2; -fx-border-color: dimgrey; -fx-border-style: solid; -fx-border-width: 2; -fx-vgap: 5");
+
+        //scene2items
+        Label zipCloud2 = new Label("ZipCloud Bank");
+        zipCloud2.setPrefSize(180,80);
+        zipCloud2.setFont(new Font("Gotham",24));
+        zipCloud2.setAlignment(Pos.TOP_CENTER);
+
+        Menu accountMenu = new Menu("Switch Accounts");
+        MenuBar menuBar = new MenuBar();
+        menuBar.getMenus().add(accountMenu);
+        ArrayList<String> accountList = cashMachine.listAccounts();
+        for(String acct : accountList) {
+                MenuItem newItem = new MenuItem(acct);
+                newItem.setOnAction(e -> btnExit.fire());
+                accountMenu.getItems().add(newItem);
+        }
+        fp2.getChildren().addAll(btnDeposit,btnWithdraw,btnNewAccount,btnExit, btnClose);
+        fp2.setAlignment(Pos.CENTER);
+
+        gp2.setVgap(.1);
+        gp2.setHgap(10);
+        gp2.setPadding(new Insets(25,25,25,25));
+        gp2.setOpacity(20);
+        gp2.setAlignment(Pos.BOTTOM_CENTER);
+        gp2.setPrefSize(100,50);
+        gp2.setStyle("-fx-font-size: 12; -fx-font-smoothing-type: LCD; -fx-font-family: fantasy");
+
+        gp2.add(account,0,0);
+        gp2.add(name,0,1);
+        gp2.add(email,1,0);
+        gp2.add(balance,1,1);
+        vb2.getChildren().addAll(menuBar, zipCloud2, field2,fp2,gp2);
+        vb2.setAlignment(Pos.BOTTOM_CENTER);
+        vb2.setStyle("-fx-background-color: burlywood; -fx-padding: 2; -fx-border-color: dimgrey; -fx-border-style: solid; -fx-border-width: 2; -fx-vgap: 5");
+
+        //scene3items
+        vb3.getChildren().addAll(name1,email1,balance1,basicAcct,premAcct,btnSubmit2);
+        vb3.setStyle("-fx-background-color: burlywood; -fx-padding: 2; -fx-border-color: dimgrey; -fx-border-style: solid; -fx-border-width: 2; -fx-vgap: 5");
+
+        primaryStage.setTitle("Zip Cloud Bank");
+        primaryStage.setScene(scene1);
+        primaryStage.show();
+    }
+}

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

@@ -32,6 +32,21 @@ public class Bank {
         )));
     }
 
+    public void addBasicAccount(String name, String email, double balance) {
+         accounts.put(newId(), new BasicAccount(new AccountData(newId(), name, email, balance)));
+    }
+    public void addPremiumAccount(String name, String email, double balance) {
+        accounts.put(newId(), new PremiumAccount(new AccountData(newId(), name, email, balance)));
+    }
+
+    public int newId(){
+        int highestId = 0;
+        for(Integer id : accounts.keySet()){
+            if(id>highestId) highestId = id;
+        }
+        return highestId;
+    }
+
     public ActionResult<AccountData> getAccountById(int id) {
         Account account = accounts.get(id);