Finished with balance history

src/main/java/AccountController.java

@@ -1,12 +1,20 @@
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXTabPane;
 import com.jfoenix.controls.JFXTextArea;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.fxml.FXML;
 import javafx.scene.control.Tab;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
+import javafx.scene.control.cell.PropertyValueFactory;
 import rocks.zipcode.atm.CashMachine;
+import rocks.zipcode.atm.bank.Transaction;
 
+import java.util.Date;
+import java.util.Observable;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -35,6 +43,15 @@ public class AccountController {
                 amountField.setText(newValue.replaceAll("[^\\d]", ""));
             }
         });
+
+        table.setEditable(true);
+        typCol.setCellValueFactory(new PropertyValueFactory<Transaction, String>("credit"));
+        datCol.setCellValueFactory(new PropertyValueFactory<Transaction, Date>("date"));
+        amtCol.setCellValueFactory(new PropertyValueFactory<Transaction, Long>("amount"));
+        balCol.setCellValueFactory(new PropertyValueFactory<Transaction, Long>("balance"));
+        table.getColumns().addAll(typCol,datCol,amtCol,balCol);
+        table.setItems(data);
+
     }
 
     @FXML
@@ -58,6 +75,17 @@ public class AccountController {
     }
 
     @FXML
+    private TableView<Transaction> table;
+
+    private final ObservableList<Transaction> data =
+            FXCollections.observableArrayList();
+
+    @FXML TableColumn<Transaction, String> typCol;
+    @FXML TableColumn<Transaction, Date> datCol;
+    @FXML TableColumn<Transaction, Long> amtCol;
+    @FXML TableColumn<Transaction, Long> balCol;
+
+    @FXML
     void transactionTab(Event event) {
         if (amountField.isDisabled()) {
             amountField.setDisable(false);
@@ -72,15 +100,21 @@ public class AccountController {
     void submit(Event event) {
         int amount = Integer.parseInt(amountField.getText());
 
+        String type = "";
+
         switch (tabPane.getSelectionModel().getSelectedItem().getText())
         {
             case "Withdraw": CashMachine.INSTANCE.withdraw(amount);
+                type = "Debit";
                 break;
             case "Deposit": CashMachine.INSTANCE.deposit(amount);
+                type = "Credit";
                 break;
             default: textArea.setText("Please select a tab.");
         }
         textArea.setText(CashMachine.INSTANCE.toString());
+
+        data.add(0, new Transaction(type, Integer.parseInt(amountField.getText()), CashMachine.INSTANCE.getBalance()));
     }
 
     @FXML

src/main/java/LoginController.java

@@ -9,11 +9,20 @@ import rocks.zipcode.atm.CashMachine;
  */
 public class LoginController {
 
-    /**
-     * Event handler fired when the user requests a new vista.
-     *
-     * @param event the event that triggered the handler.
-     */
+//    /**
+//     * Event handler fired when the user requests a new vista.
+//     *
+//     * @param event the event that triggered the handler.
+//     */
+
+    @FXML
+    protected void initialize() {
+        pinEntry.textProperty().addListener((observable, oldValue, newValue) -> {
+            if (!newValue.matches("\\d*")) {
+                pinEntry.setText(newValue.replaceAll("[^\\d]", ""));
+            }
+        });
+    }
 
     @FXML
     private JFXTextField emailEntry;

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

@@ -99,4 +99,8 @@ public class CashMachine {
             System.out.println("Error: " + e.getMessage());
         }
     }
+
+    public int getBalance() {
+        return accountData.getBalance();
+    }
 }

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

@@ -0,0 +1,53 @@
+package rocks.zipcode.atm.bank;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class Transaction {
+    private String date;
+    private String credit;
+    private int amount;
+    private int balance;
+
+    public String getCurrentTime() {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd-yyyy HH:mm:ss");
+        Date now = new Date();
+        String strDate = simpleDateFormat.format(now);
+        return strDate;
+    }
+
+    public Transaction(String credit, int amount, int balance) {
+        this.date = getCurrentTime();
+        this.credit = credit;
+        this.amount = amount;
+        this.balance = balance;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public String getCredit() {
+        return credit;
+    }
+
+    public void setCredit(String credit) {
+        this.credit = credit;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public void setAmount(int amount) {
+        this.amount = amount;
+    }
+
+    public int getBalance() {
+        return balance;
+    }
+
+    public void setBalance(int balance) {
+        this.balance = balance;
+    }
+}

src/main/resources/accountview.fxml

@@ -19,59 +19,66 @@
 <!--</StackPane>-->
 
 <VBox fx:id="vista2" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="AccountController">
-  <children>
-    <JFXTabPane fx:id="tabPane" prefHeight="60.0" prefWidth="466.0">
-      <tabs>
-            <Tab fx:id="tabInfo" onSelectionChanged="#displayInfo" text="Account Info">
-              <content>
-                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
-              </content>
-            </Tab>
-        <Tab fx:id="tabWithdraw" onSelectionChanged="#transactionTab" text="Withdraw">
-          <content>
-            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
-          </content>
-        </Tab>
-        <Tab fx:id="tabDeposit" onSelectionChanged="#transactionTab" text="Deposit">
-          <content>
-            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
-          </content>
-        </Tab>
-        <Tab fx:id="tabLogout" onSelectionChanged="#logOut" text="Log Out">
-          <content>
-            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
-          </content>
-        </Tab>
-      </tabs>
-    </JFXTabPane>
-      <FlowPane fx:id="amountEntryPane" alignment="CENTER_LEFT" columnHalignment="CENTER" hgap="15.0" prefHeight="30.0" prefWidth="466.0" style="-fx-background-color: white;">
-         <children>
-            <TextField fx:id="amountField" disable="true" maxWidth="1.7976931348623157E308" prefHeight="36.0" prefWidth="121.0" text="Amount">
-               <font>
-                  <Font name="Futura Medium" size="18.0" />
-               </font>
-            </TextField>
-            <JFXButton fx:id="amountSubmit" disable="true" onAction="#submit" maxWidth="1.7976931348623157E308" ripplerFill="CORAL" text="Submit" style="-fx-background-color: coral;" textFill="WHITE">
-               <font>
-                  <Font name="Futura Bold" size="18.0" />
-               </font>
-            </JFXButton>
-         </children>
-         <padding>
-            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-         </padding>
-      </FlowPane>
-    <JFXTextArea fx:id="textArea" editable="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="180.0" prefWidth="450.0" text="TESTTESTESTTESTTESTTESTTESTTESTTESTTESTTESTTTESTTESTTESTTESTTESTTESTTESTTESTTESTTEST">
-         <font>
-            <Font name="Futura Medium" size="14.0" />
-         </font>
-         <opaqueInsets>
-            <Insets />
-         </opaqueInsets>
-         <VBox.margin>
-            <Insets left="8.0" right="8.0" />
-         </VBox.margin>
-      </JFXTextArea>
-    <JFXTreeTableView fx:id="transactionsView" prefHeight="120.0" prefWidth="466.0" />
-  </children>
+    <children>
+        <JFXTabPane fx:id="tabPane" minHeight="50.0" prefHeight="40.0" prefWidth="466.0">
+            <tabs>
+                <Tab fx:id="tabInfo" onSelectionChanged="#displayInfo" text="Account Info">
+                    <content>
+                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
+                    </content>
+                </Tab>
+                <Tab fx:id="tabWithdraw" onSelectionChanged="#transactionTab" text="Withdraw">
+                    <content>
+                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
+                    </content>
+                </Tab>
+                <Tab fx:id="tabDeposit" onSelectionChanged="#transactionTab" text="Deposit">
+                    <content>
+                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
+                    </content>
+                </Tab>
+                <Tab fx:id="tabLogout" onSelectionChanged="#logOut" text="Log Out">
+                    <content>
+                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
+                    </content>
+                </Tab>
+            </tabs>
+        </JFXTabPane>
+        <FlowPane fx:id="amountEntryPane" alignment="CENTER_LEFT" columnHalignment="CENTER" hgap="15.0" prefHeight="30.0" prefWidth="466.0" style="-fx-background-color: transparent;">
+            <children>
+                <TextField fx:id="amountField" disable="true" maxWidth="1.7976931348623157E308" prefHeight="36.0" prefWidth="121.0" text="Amount">
+                    <font>
+                        <Font name="Futura Medium" size="18.0" />
+                    </font>
+                </TextField>
+                <JFXButton fx:id="amountSubmit" disable="true" maxWidth="1.7976931348623157E308" onAction="#submit" ripplerFill="CORAL" style="-fx-background-color: coral;" text="Submit" textFill="WHITE">
+                    <font>
+                        <Font name="Futura Bold" size="18.0" />
+                    </font>
+                </JFXButton>
+            </children>
+            <padding>
+                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+            </padding>
+        </FlowPane>
+        <JFXTextArea fx:id="textArea" editable="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="110.0" prefWidth="450.0" text="TESTTESTESTTESTTESTTESTTESTTESTTESTTESTTESTTTESTTESTTESTTESTTESTTESTTESTTESTTESTTEST">
+            <font>
+                <Font name="Futura Medium" size="14.0" />
+            </font>
+            <opaqueInsets>
+                <Insets />
+            </opaqueInsets>
+            <VBox.margin>
+                <Insets left="8.0" right="8.0" />
+            </VBox.margin>
+        </JFXTextArea>
+        <TableView fx:id="table" maxHeight="1.7976931348623157E308" prefHeight="150.0" prefWidth="466.0">
+            <columns>
+                <TableColumn fx:id="typCol" prefWidth="50.0" text="Type" />
+                <TableColumn fx:id="datCol" prefWidth="125.0" text="Date" />
+                <TableColumn fx:id="amtCol" prefWidth="100.0" text="Amount" />
+                <TableColumn fx:id="balCol" prefWidth="150.0" text="Balance" />
+            </columns>
+        </TableView>
+    </children>
 </VBox>

src/main/resources/zcb.css

@@ -4,4 +4,8 @@
 
 .jfx-tab-pane:top .depth-container .tab-header-area .headers-region .tab .jfx-rippler .tab-container .tab-label .text {
     -fx-font: 18 Futura;
+}
+
+.table-view .column-header {
+    -fx-background-color: lightgray;
 }