diff --git a/src/main/java/lodge/TestMainFxView.java b/src/main/java/lodge/TestMainFxView.java index 15def00..7d5d303 100644 --- a/src/main/java/lodge/TestMainFxView.java +++ b/src/main/java/lodge/TestMainFxView.java @@ -26,12 +26,12 @@ public class TestMainFxView { @FXML private void initialize() { - + rows.add(new Address("10 wilco ave", "wilco", "WY", "82801")); rows.add(new Address("30 Amstadam ave", "New York", "NY", "12010")); rows.add(new Address("400 hotel ave", "Maryland City", "MD", "20723")); rows.add(new Address("160 Canal Road", "South Bethany", "Delaware", "19930")); - + TableColumn tcStreet = new TableColumn<>("Street"); TableColumn tcCity = new TableColumn<>("City"); TableColumn tcState = new TableColumn<>("State"); @@ -39,14 +39,13 @@ public class TestMainFxView { List> columns = new ArrayList<>(); - - tcStreet.setPrefWidth( 100.0d ); + tcStreet.setPrefWidth(100.0d); tcStreet.setMinWidth(100.0d); - tcCity.setPrefWidth( 100.0d ); - tcState.setPrefWidth( 100.0d ); - tcZip.setPrefWidth( 100.0d ); + tcCity.setPrefWidth(100.0d); + tcState.setPrefWidth(100.0d); + tcZip.setPrefWidth(100.0d); - tcStreet.setCellValueFactory(new PropertyValueFactory("street")); + tcStreet.setCellValueFactory(new PropertyValueFactory("street")); tcCity.setCellValueFactory(new PropertyValueFactory("city")); tcState.setCellValueFactory(new PropertyValueFactory("state")); tcZip.setCellValueFactory(new PropertyValueFactory("zip")); @@ -59,13 +58,13 @@ public class TestMainFxView { columns.add(tcZip); tvInventory.getColumns().addAll(columns); - tvInventory.itemsProperty().bind( new SimpleObjectProperty<>(rows) ); + tvInventory.itemsProperty().bind(new SimpleObjectProperty<>(rows)); btnAdd.setOnAction((ev) -> { TestMainFxCommandDialog accomodationDialog = new TestMainFxCommandDialog(); - Optional result = accomodationDialog.showAndWait(); + Optional
result = accomodationDialog.showAndWait(); if (result.isPresent()) { System.out.println("result is present."); diff --git a/src/resources/db/acc-A07421233.json b/src/resources/db/acc-A07421233.json index a8b7844..f154675 100644 --- a/src/resources/db/acc-A07421233.json +++ b/src/resources/db/acc-A07421233.json @@ -1 +1,41 @@ -{ "Account":{"account_number": "A07421233","phone_number": "301-356-3890","mailing_address": { "Address":{"street": "30 Amstadam ave","city": "New York","state": "NY","zip": "12010"}},"email_address": { "EmailAddress":{"email": "newbee952@aol.com"}},"reservations":[{"HotelReservation":{"reservation_number":"R0123087344"}},{"CabinReservation":{"reservation_number":"R2042828431"}},{"CabinReservation":{"reservation_number":"R0535276622"}},{"HouseReservation":{"reservation_number":"R0499811708"}}]}} \ No newline at end of file +{ + "Account": { + "account_number": "A07421233", + "phone_number": "301-356-3890", + "mailing_address": { + "Address": { + "street": "30 Amstadam ave", + "city": "New York", + "state": "NY", + "zip": "12010" + } + }, + "email_address": { + "EmailAddress": { + "email": "newbee952@aol.com" + } + }, + "reservations": [ + { + "HotelReservation": { + "reservation_number": "R0123087344" + } + }, + { + "CabinReservation": { + "reservation_number": "R2042828431" + } + }, + { + "CabinReservation": { + "reservation_number": "R0535276622" + } + }, + { + "HouseReservation": { + "reservation_number": "R0499811708" + } + } + ] + } +} \ No newline at end of file diff --git a/src/resources/media/dialogCommandAddress.fxml b/src/resources/media/dialogCommandAddress.fxml index 3c0c7ca..7e5f1b5 100644 --- a/src/resources/media/dialogCommandAddress.fxml +++ b/src/resources/media/dialogCommandAddress.fxml @@ -9,7 +9,7 @@ - + diff --git a/src/resources/media/mainViewModel.fxml b/src/resources/media/mainViewModel.fxml index a84ea5b..25c7eb1 100644 --- a/src/resources/media/mainViewModel.fxml +++ b/src/resources/media/mainViewModel.fxml @@ -47,7 +47,7 @@ - +