From 4118b7b18728dde216d94a0416b14f968de604ac Mon Sep 17 00:00:00 2001 From: Brendan Dao <55561018+BrendanDao@users.noreply.github.com> Date: Tue, 3 Dec 2019 12:40:04 -0500 Subject: [PATCH 1/2] Update MainV5.java --- MainV5.java | 232 ++++++++++++++++------------------------------------ 1 file changed, 71 insertions(+), 161 deletions(-) diff --git a/MainV5.java b/MainV5.java index 26cac95..6cb82e7 100644 --- a/MainV5.java +++ b/MainV5.java @@ -1,5 +1,4 @@ -//package application; import java.awt.Color; import java.util.ArrayList; @@ -35,8 +34,9 @@ import javafx.stage.Stage; public class MainV5 extends Application implements EventHandler { - static Timeslot timeSlot = new Timeslot(); - static Speaker speaker = new Speaker(); + Timeslot timeSlot = new Timeslot(); + Speaker speaker = new Speaker(); + Stage window; Label mainTitleLabel = labelMaker("Boston Code Camp Desktop Application"); String styleSet = "-fx-padding: 10;" + "-fx-border-style: solid inside;" + "-fx-border-width: 2;" @@ -68,15 +68,15 @@ public void start(Stage primaryStage) throws Exception { title.setAlignment(Pos.TOP_CENTER); Separator separator = new Separator(Orientation.HORIZONTAL); - ListView timeSlot_List = new ListView<>(getTimeSlotItems()); - timeSlot_List.setCellFactory(param -> new ListCell() { - protected void updateItem(timeSlotItem item, boolean empty) { + ListView timeSlot_List = new ListView<>(getTimeSlotItems(IFront.addToList(new Timeslot()))); + timeSlot_List.setCellFactory(param -> new ListCell() { + protected void updateItem(DB_Object item, boolean empty) { super.updateItem(item, empty); - if (empty || item == null || item.getTime() == null) { + if (empty || item == null || item.getClass().toString() == null) { setText(null); } else { - setText(item.getTime()); + setText(item.getClass().toString()); } } }); @@ -87,7 +87,7 @@ protected void updateItem(timeSlotItem item, boolean empty) { public void handle(ActionEvent event) { final int timeSlot_RemoveIndex = timeSlot_List.getSelectionModel().getSelectedIndex(); if (timeSlot_RemoveIndex != -1) { - Object timeSlot_ItemToRemove = timeSlot_List.getSelectionModel().getSelectedItem(); + DB_Object timeSlot_ItemToRemove = timeSlot_List.getSelectionModel().getSelectedItem(); final int timeSlot_RemoveNewIndex = (timeSlot_RemoveIndex == timeSlot_List.getItems().size() - 1) ? timeSlot_RemoveIndex - 1 : timeSlot_RemoveIndex; @@ -98,16 +98,16 @@ public void handle(ActionEvent event) { } }); - ListView speaker_List = new ListView<>(getSpeakers()); - speaker_List.setCellFactory(param -> new ListCell() { + ListView speaker_List = new ListView<>(getSpeakers(IFront.addToList(new Speaker()))); + speaker_List.setCellFactory(param -> new ListCell() { @Override - protected void updateItem(speakerPerson item, boolean empty) { + protected void updateItem(DB_Object item, boolean empty) { super.updateItem(item, empty); - if (empty || item == null || item.getFirstName() == null) { + if (empty || item == null || item.getClass().toString() == null) { setText(null); } else { - setText(item.getFullName()); + setText(item.getClass().toString()); } } }); @@ -117,7 +117,7 @@ protected void updateItem(speakerPerson item, boolean empty) { public void handle(ActionEvent event) { final int speaker_RemoveIndex = speaker_List.getSelectionModel().getSelectedIndex(); if (speaker_RemoveIndex != -1) { - speakerPerson speaker_ItemToRemove = speaker_List.getSelectionModel().getSelectedItem(); + DB_Object speaker_ItemToRemove = speaker_List.getSelectionModel().getSelectedItem(); final int speaker_RemoveNewIndex = (speaker_RemoveIndex == speaker_List.getItems().size() - 1) ? speaker_RemoveIndex - 1 @@ -129,17 +129,17 @@ public void handle(ActionEvent event) { } }); - ListView room_List = new ListView<>(getRoomAndCapacity()); - room_List.setItems(getRoomAndCapacity()); - room_List.setCellFactory(param -> new ListCell() { + ListView room_List = new ListView<>(getRoomAndCapacity(IFront.addToList(new Room()))); + room_List.setItems(getRoomAndCapacity(IFront.addToList(new Room()))); + room_List.setCellFactory(param -> new ListCell() { @Override - protected void updateItem(roomCap item, boolean empty) { + protected void updateItem(DB_Object item, boolean empty) { super.updateItem(item, empty); - if (empty || item == null || item.getRoomName() == null) { + if (empty || item == null || item.toString() == null) { setText(null); } else { - setText(item.getRoomName()); + setText(item.getClass().toString()); } } }); @@ -150,7 +150,7 @@ protected void updateItem(roomCap item, boolean empty) { public void handle(ActionEvent event) { final int room_RemoveIndex = room_List.getSelectionModel().getSelectedIndex(); if (room_RemoveIndex != -1) { - roomCap room_ItemToRemove = room_List.getSelectionModel().getSelectedItem(); + DB_Object room_ItemToRemove = room_List.getSelectionModel().getSelectedItem(); final int room_RemoveNewIndex = (room_RemoveIndex == room_List.getItems().size() - 1) ? room_RemoveIndex - 1 @@ -162,16 +162,16 @@ public void handle(ActionEvent event) { } }); - ListView session_List = new ListView<>(getSessions()); - session_List.setCellFactory(param -> new ListCell() { + ListView session_List = new ListView<>(getSessions(IFront.addToList(new Session()))); + session_List.setCellFactory(param -> new ListCell() { @Override - protected void updateItem(sessionItem item, boolean empty) { + protected void updateItem(DB_Object item, boolean empty) { super.updateItem(item, empty); - if (empty || item == null || item.getName() == null) { + if (empty || item == null || item.getClass().toString() == null) { setText(null); } else { - setText(item.getName()); + setText(item.getClass().toString()); } } }); @@ -182,7 +182,7 @@ protected void updateItem(sessionItem item, boolean empty) { public void handle(ActionEvent event) { final int session_RemoveIndex = session_List.getSelectionModel().getSelectedIndex(); if (session_RemoveIndex != -1) { - sessionItem session_ItemToRemove = session_List.getSelectionModel().getSelectedItem(); + DB_Object session_ItemToRemove = session_List.getSelectionModel().getSelectedItem(); final int session_RemoveNewIndex = (session_RemoveIndex == session_List.getItems().size() - 1) ? session_RemoveIndex - 1 @@ -268,7 +268,7 @@ public void handle(ActionEvent event) { // -Time Slot // Page-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - +/* Label timeSlotAdd_TitleLabel = mainTitleLabel; timeSlotAdd_TitleLabel.setStyle("-fx-font: 24 arial;"); timeSlotAdd_TitleLabel.setAlignment(Pos.TOP_CENTER); @@ -277,7 +277,7 @@ public void handle(ActionEvent event) { Button timeSlotAdd_AddButton = buttonMaker("Add"); Button timeSlotAdd_HomeButton = buttonMaker("Home"); - ListView timeSlotAdd_List = new ListView<>(getTimeSlotItems(Timeslot.getTimeSlotList())); + ListView timeSlotAdd_List = new ListView<>(getTimeSlotItems(Timeslot.getTimeSlotList))); timeSlotAdd_List.setCellFactory(param -> new ListCell() { protected void updateItem(timeSlotItem item, boolean empty) { super.updateItem(item, empty); @@ -352,10 +352,11 @@ protected void updateItem(timeSlotItem item, boolean empty) { }); Scene timeSlotAdd_Scene = new Scene(timeSlotAdd_Page, 900, 400); - +*/ // -Speaker // Page-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - + /////SHOULD WORK MAYBE///// + Label speakerAdd_TitleLabel = mainTitleLabel; speakerAdd_TitleLabel.setStyle("-fx-font: 24 arial;"); speakerAdd_TitleLabel.setAlignment(Pos.TOP_CENTER); @@ -364,20 +365,19 @@ protected void updateItem(timeSlotItem item, boolean empty) { Button speakerAdd_AddButton = buttonMaker("Add"); Button speakerAdd_HomeButton = buttonMaker("Home"); - TableView speakerAdd_Table = new TableView<>(); + TableView speakerAdd_Table = new TableView<>(); speakerAdd_Table.setEditable(true); - TableColumn speakerAdd_FirstNameColumn = new TableColumn<>("First Name"); - speakerAdd_FirstNameColumn.setCellValueFactory(new PropertyValueFactory<>("firstName")); - TableColumn speakerAdd_LastNameColumn = new TableColumn<>("Last Name"); - speakerAdd_LastNameColumn.setCellValueFactory(new PropertyValueFactory<>("lastName")); - TableColumn speakerAdd_EmailColumn = new TableColumn<>("Email"); - speakerAdd_EmailColumn.setCellValueFactory(new PropertyValueFactory<>("email")); + TableColumn speakerAdd_FirstNameColumn = new TableColumn<>("First Name"); + speakerAdd_FirstNameColumn.setCellValueFactory(new PropertyValueFactory<>("speakerFName")); + TableColumn speakerAdd_LastNameColumn = new TableColumn<>("Last Name"); + speakerAdd_LastNameColumn.setCellValueFactory(new PropertyValueFactory<>("speakerLName")); + TableColumn speakerAdd_EmailColumn = new TableColumn<>("Email"); + speakerAdd_EmailColumn.setCellValueFactory(new PropertyValueFactory<>("speakerEmail")); - speakerAdd_Table.setItems(getSpeakers(Speaker.getSpeakerList())); + speakerAdd_Table.setItems(getSpeakers(IFront.addToList(new Speaker()))); - speakerAdd_Table.getColumns().addAll(speakerAdd_FirstNameColumn, speakerAdd_LastNameColumn, - speakerAdd_EmailColumn); + speakerAdd_Table.getColumns().addAll(speakerAdd_FirstNameColumn, speakerAdd_LastNameColumn, speakerAdd_EmailColumn); speakerAdd_Table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY); Label speakerAdd_Title = labelMaker("Speaker Information"); @@ -413,18 +413,18 @@ protected void updateItem(timeSlotItem item, boolean empty) { String inputSpeakerAdd_FirstName = speakerAdd_FirstNameText.getText(); String inputSpeakerAdd_LastName = speakerAdd_LastNameText.getText(); String inputSpeakerAdd_Email = speakerAdd_EmailText.getText(); - Speaker temp = new Speaker(inputSpeakerAdd_FirstName, inputSpeakerAdd_LastName, "", + Speaker temp = new Speaker(-1, inputSpeakerAdd_FirstName, inputSpeakerAdd_LastName, inputSpeakerAdd_Email); - ArrayList toAdd = Speaker.addToList(temp); + ArrayList toAdd = IFront.addToList(temp); speakerAdd_Table.setItems(getSpeakers(toAdd)); }); Scene speakerAdd_Scene = new Scene(speakerAdd_Page, 900, 400); - + // -Room // Page-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - +/* Label roomAdd_TitleLabel = mainTitleLabel; roomAdd_TitleLabel.setStyle("-fx-font: 24 arial;"); roomAdd_TitleLabel.setAlignment(Pos.TOP_CENTER); @@ -438,7 +438,7 @@ protected void updateItem(timeSlotItem item, boolean empty) { TableColumn roomAdd_CapacityColumn = new TableColumn<>("Capacity"); roomAdd_CapacityColumn.setCellValueFactory(new PropertyValueFactory<>("roomCapacity")); - roomAdd_Table.setItems(getRoomAndCapacity(Room.getRoomList())); + roomAdd_Table.setItems(getRoomAndCapacity(IFront.addToList(new Room()))); roomAdd_Table.getColumns().addAll(roomAdd_NameColumn, roomAdd_CapacityColumn); roomAdd_Table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY); @@ -462,8 +462,8 @@ protected void updateItem(timeSlotItem item, boolean empty) { // back } else { // Would call addToList to add a new entry to the database - Room temp = new Room(inputRoomName, inputRoomCapacity); - ArrayList toAdd = Room.addToList(temp); + Room temp = new Room(-1, inputRoomName, inputRoomCapacity); + ArrayList toAdd = IFront.addToList(temp); roomAdd_Table.setItems(getRoomAndCapacity(toAdd)); } @@ -501,10 +501,10 @@ protected void updateItem(timeSlotItem item, boolean empty) { Button sessionAdd_AddButton = buttonMaker("Add"); Button sessionAdd_HomeButton = buttonMaker("Home"); - ListView sessionAdd_List = new ListView<>(getSessions()); - sessionAdd_List.setCellFactory(param -> new ListCell() { + ListView sessionAdd_List = new ListView<>(getSessions()); + sessionAdd_List.setCellFactory(param -> new ListCell() { @Override - protected void updateItem(sessionItem item, boolean empty) { + protected void updateItem(Session item, boolean empty) { super.updateItem(item, empty); if (empty || item == null || item.getName() == null) { @@ -563,9 +563,9 @@ protected void updateItem(sessionItem item, boolean empty) { sessionAdd_Page.setStyle(styleSet); Scene sessionAdd_Scene = new Scene(sessionAdd_Page, 900, 400); - +*/ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - +/* Label timeSlotEdit_TitleLabel = mainTitleLabel; timeSlotEdit_TitleLabel.setStyle("-fx-font: 24 arial;"); timeSlotEdit_TitleLabel.setAlignment(Pos.TOP_CENTER); @@ -654,7 +654,7 @@ protected void updateItem(timeSlotItem item, boolean empty) { Button speakerEdit_DoneButton = buttonMaker("Done"); Button speakerEdit_HomeButton = buttonMaker("Home"); - TableView speakerEdit_Table = new TableView<>(); + TableView speakerEdit_Table = new TableView<>(); speakerEdit_Table.setEditable(true); TableColumn speakerEdit_FirstNameColumn = new TableColumn<>("First Name"); @@ -713,9 +713,9 @@ protected void updateItem(timeSlotItem item, boolean empty) { TableView roomEdit_Table = new TableView<>(); roomEdit_Table.setEditable(true); - TableColumn roomEdit_Name = new TableColumn("Name"); + TableColumn roomEdit_Name = new TableColumn("Name"); roomEdit_Name.setCellValueFactory(new PropertyValueFactory<>("roomName")); - TableColumn roomEdit_Capacity = new TableColumn("Capacity"); + TableColumn roomEdit_Capacity = new TableColumn("Capacity"); roomEdit_Capacity.setCellValueFactory(new PropertyValueFactory<>("roomCapacity")); roomEdit_Table.setItems(getRoomAndCapacity()); @@ -823,9 +823,9 @@ protected void updateItem(sessionItem item, boolean empty) { sessionEdit_Page.setStyle(styleSet); Scene sessionEdit_Scene = new Scene(sessionEdit_Page, 900, 400); - +*/ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - +/* timeSlotAdd.setOnAction(e -> window.setScene(timeSlotAdd_Scene)); speakerAdd.setOnAction(e -> window.setScene(speakerAdd_Scene)); roomAdd.setOnAction(e -> window.setScene(roomAdd_Scene)); @@ -879,129 +879,39 @@ protected void updateItem(sessionItem item, boolean empty) { sessionEdit_HomeButton.setOnAction(e -> window.setScene(sceneHome)); speakerEdit_HomeButton.setOnAction(e -> window.setScene(sceneHome)); timeSlotEdit_HomeButton.setOnAction(e -> window.setScene(sceneHome)); - +*/ } catch (Exception e) { e.printStackTrace(); } } - public class roomCap { - private String roomName; - private String roomCapacity; - - public roomCap() { - this.roomName = ""; - this.roomCapacity = ""; - } - - public roomCap(String roomName, String roomCapacity) { - this.roomName = roomName; - this.roomCapacity = roomCapacity; - } - - public String getRoomName() { - return roomName; - } - - public void setRoomName(String roomName) { - this.roomName = roomName; - } - - public String getRoomCapacity() { - return roomCapacity; - } - - public void setRoomCapacity(String roomCapacity) { - this.roomCapacity = roomCapacity; - } - } - - public ObservableList getTimeSlotItems(ArrayList temp) { - ObservableList timeSlotList = FXCollections.observableArrayList(); + public ObservableList getTimeSlotItems(ArrayList temp) { + ObservableList timeSlotList = FXCollections.observableArrayList(); timeSlotList = addItem(timeSlotList, temp); return timeSlotList; } - public ObservableList getSpeakers(ArrayList temp) { - ObservableList speakers = FXCollections.observableArrayList(); + public ObservableList getSpeakers(ArrayList temp) { + ObservableList speakers = FXCollections.observableArrayList(); speakers = addItem(speakers, temp); return speakers; } - public ObservableList getRoomAndCapacity(ArrayList temp) { - ObservableList roomsAndCapacities = FXCollections.observableArrayList(); + public ObservableList getRoomAndCapacity(ArrayList temp) { + ObservableList roomsAndCapacities = FXCollections.observableArrayList(); roomsAndCapacities = addItem(roomsAndCapacities, temp); return roomsAndCapacities; } - public ObservableList getSessions(ArrayList temp) { - ObservableList sessions = FXCollections.observableArrayList(); + public ObservableList getSessions(ArrayList temp) { + ObservableList sessions = FXCollections.observableArrayList(); sessions = addItem(sessions, temp); return sessions; } - public class timeSlotItem { - private int startHour; - private int startMinute; - private int endHour; - private int endMinute; - - public timeSlotItem() { - this.startHour = 0; - this.startMinute = 0; - this.endHour = 0; - this.endHour = 0; - } - - public timeSlotItem(int startHour, int startMinute, int endHour, int endMinute) { - this.startHour = startHour; - this.startMinute = startMinute; - this.endHour = endHour; - this.endMinute = endMinute; - } - - public int getStartHour() { - return startHour; - } - - public void setStartHour(int startHour) { - this.startHour = startHour; - } - - public int getStartMinute() { - return startMinute; - } - - public void setStartMinute(int startMinute) { - this.startMinute = startMinute; - } - - public int getEndHour() { - return endHour; - } - - public void setEndHour(int endHour) { - this.endHour = endHour; - } - - public int getEndMinute() { - return endMinute; - } - - public void setEndMinute(int endMinute) { - this.endMinute = endMinute; - } - - public String getTime() { - return startHour + ":" + startMinute + " - " + endHour + ":" + endMinute; - } - } - - public ObservableList addItem(ObservableList viewableList, ArrayList DBList) { - for (int i = 0; i < DBList.size(); i++) { - viewableList.add(DBList.indexOf(i)); - } + public ObservableList addItem(ObservableList viewableList, ArrayList DBList) { + viewableList.addAll(DBList); return viewableList; } @@ -1013,4 +923,4 @@ public Button buttonMaker(String buttonName) { return new Button(buttonName); } -} \ No newline at end of file +} From faa38c3d51869e1d4d6c129a945687dc058cd8ab Mon Sep 17 00:00:00 2001 From: Brendan Dao <55561018+BrendanDao@users.noreply.github.com> Date: Wed, 4 Dec 2019 19:41:40 -0500 Subject: [PATCH 2/2] Update MainV5.java --- MainV5.java | 109 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 46 deletions(-) diff --git a/MainV5.java b/MainV5.java index 6cb82e7..eab9623 100644 --- a/MainV5.java +++ b/MainV5.java @@ -1,8 +1,8 @@ -import java.awt.Color; +import java.lang.reflect.Array; import java.util.ArrayList; -import java.util.List; + import javafx.application.Application; import javafx.collections.FXCollections; import javafx.collections.ObservableList; @@ -16,27 +16,26 @@ import javafx.scene.control.Label; import javafx.scene.control.ListCell; import javafx.scene.control.ListView; -import javafx.scene.control.RadioButton; import javafx.scene.control.Separator; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; -import javafx.scene.control.TextArea; import javafx.scene.control.TextField; -import javafx.scene.control.TextInputControl; -import javafx.scene.control.ToggleGroup; import javafx.scene.control.cell.PropertyValueFactory; -import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; -import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import javafx.scene.text.Font; -import javafx.scene.text.Text; import javafx.stage.Stage; public class MainV5 extends Application implements EventHandler { - Timeslot timeSlot = new Timeslot(); - Speaker speaker = new Speaker(); - + Timeslot emptyTimeSlot = new Timeslot(); + Speaker emptySpeaker = new Speaker(); + Room emptyRoom = new Room(); + Session emptySession = new Session(); + ArrayList nullTimeslot = IFront.addToList(emptyTimeSlot); + ArrayList nullSpeaker = IFront.addToList(emptySpeaker); + ArrayList nullRoom = IFront.addToList(emptyRoom); + ArrayList nullSession = IFront.addToList(emptySession); + Stage window; Label mainTitleLabel = labelMaker("Boston Code Camp Desktop Application"); String styleSet = "-fx-padding: 10;" + "-fx-border-style: solid inside;" + "-fx-border-width: 2;" @@ -68,7 +67,7 @@ public void start(Stage primaryStage) throws Exception { title.setAlignment(Pos.TOP_CENTER); Separator separator = new Separator(Orientation.HORIZONTAL); - ListView timeSlot_List = new ListView<>(getTimeSlotItems(IFront.addToList(new Timeslot()))); + ListView timeSlot_List = new ListView<>(getTimeSlotItems(nullTimeslot)); timeSlot_List.setCellFactory(param -> new ListCell() { protected void updateItem(DB_Object item, boolean empty) { super.updateItem(item, empty); @@ -98,7 +97,7 @@ public void handle(ActionEvent event) { } }); - ListView speaker_List = new ListView<>(getSpeakers(IFront.addToList(new Speaker()))); + ListView speaker_List = new ListView<>(getSpeakers(nullSpeaker)); speaker_List.setCellFactory(param -> new ListCell() { @Override protected void updateItem(DB_Object item, boolean empty) { @@ -129,7 +128,7 @@ public void handle(ActionEvent event) { } }); - ListView room_List = new ListView<>(getRoomAndCapacity(IFront.addToList(new Room()))); + ListView room_List = new ListView<>(getRoomAndCapacity(nullRoom)); room_List.setItems(getRoomAndCapacity(IFront.addToList(new Room()))); room_List.setCellFactory(param -> new ListCell() { @Override @@ -162,7 +161,7 @@ public void handle(ActionEvent event) { } }); - ListView session_List = new ListView<>(getSessions(IFront.addToList(new Session()))); + ListView session_List = new ListView<>(getSessions(nullSpeaker)); session_List.setCellFactory(param -> new ListCell() { @Override protected void updateItem(DB_Object item, boolean empty) { @@ -268,7 +267,7 @@ public void handle(ActionEvent event) { // -Time Slot // Page-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -/* + Label timeSlotAdd_TitleLabel = mainTitleLabel; timeSlotAdd_TitleLabel.setStyle("-fx-font: 24 arial;"); timeSlotAdd_TitleLabel.setAlignment(Pos.TOP_CENTER); @@ -277,15 +276,15 @@ public void handle(ActionEvent event) { Button timeSlotAdd_AddButton = buttonMaker("Add"); Button timeSlotAdd_HomeButton = buttonMaker("Home"); - ListView timeSlotAdd_List = new ListView<>(getTimeSlotItems(Timeslot.getTimeSlotList))); - timeSlotAdd_List.setCellFactory(param -> new ListCell() { - protected void updateItem(timeSlotItem item, boolean empty) { + ListView timeSlotAdd_List = new ListView<>(getTimeSlotItems(nullTimeslot)); + timeSlotAdd_List.setCellFactory(param -> new ListCell() { + protected void updateItem(DB_Object item, boolean empty) { super.updateItem(item, empty); - if (empty || item == null || item.getTime() == null) { + if (empty || item == null || item.getClass().toString() == null) { setText(null); } else { - setText(item.getTime()); + setText(item.getClass().toString()); } } }); @@ -344,15 +343,15 @@ protected void updateItem(timeSlotItem item, boolean empty) { int timeSlotStartMinute = Integer.parseInt(timeSlotAdd_StartMinute.getValue()); int timeSlotEndHour = Integer.parseInt(timeSlotAdd_EndHour.getValue()); int timeSlotEndMinute = Integer.parseInt(timeSlotAdd_EndMinute.getValue()); - Timeslot temp = new Timeslot(timeSlotStartHour, timeSlotStartMinute, timeSlotEndHour, + Timeslot temp = new Timeslot(-1, timeSlotStartHour, timeSlotStartMinute, timeSlotEndHour, timeSlotEndMinute); - ArrayList toAdd = Timeslot.addToList(temp); + ArrayList toAdd = IFront.addToList(temp); timeSlotAdd_List.setItems(getTimeSlotItems(toAdd)); }); Scene timeSlotAdd_Scene = new Scene(timeSlotAdd_Page, 900, 400); -*/ + // -Speaker // Page-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////SHOULD WORK MAYBE///// @@ -375,7 +374,7 @@ protected void updateItem(timeSlotItem item, boolean empty) { TableColumn speakerAdd_EmailColumn = new TableColumn<>("Email"); speakerAdd_EmailColumn.setCellValueFactory(new PropertyValueFactory<>("speakerEmail")); - speakerAdd_Table.setItems(getSpeakers(IFront.addToList(new Speaker()))); + speakerAdd_Table.setItems(getSpeakers(nullSpeaker)); speakerAdd_Table.getColumns().addAll(speakerAdd_FirstNameColumn, speakerAdd_LastNameColumn, speakerAdd_EmailColumn); speakerAdd_Table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY); @@ -424,21 +423,21 @@ protected void updateItem(timeSlotItem item, boolean empty) { // -Room // Page-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -/* + Label roomAdd_TitleLabel = mainTitleLabel; roomAdd_TitleLabel.setStyle("-fx-font: 24 arial;"); roomAdd_TitleLabel.setAlignment(Pos.TOP_CENTER); Separator roomAdd_Separator = new Separator(Orientation.HORIZONTAL); - TableView roomAdd_Table = new TableView<>(); + TableView roomAdd_Table = new TableView<>(); roomAdd_Table.setEditable(false); - TableColumn roomAdd_NameColumn = new TableColumn<>("Name"); + TableColumn roomAdd_NameColumn = new TableColumn<>("Name"); roomAdd_NameColumn.setCellValueFactory(new PropertyValueFactory<>("roomName")); - TableColumn roomAdd_CapacityColumn = new TableColumn<>("Capacity"); - roomAdd_CapacityColumn.setCellValueFactory(new PropertyValueFactory<>("roomCapacity")); + TableColumn roomAdd_CapacityColumn = new TableColumn<>("Capacity"); + roomAdd_CapacityColumn.setCellValueFactory(new PropertyValueFactory<>("capacity")); - roomAdd_Table.setItems(getRoomAndCapacity(IFront.addToList(new Room()))); + roomAdd_Table.setItems(getRoomAndCapacity(nullRoom)); roomAdd_Table.getColumns().addAll(roomAdd_NameColumn, roomAdd_CapacityColumn); roomAdd_Table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY); @@ -460,6 +459,7 @@ protected void updateItem(timeSlotItem item, boolean empty) { if (inputRoomName == "" || inputRoomCapacity == null) { // Want to call addToList with null in order to get every entry from database // back + roomAdd_Table.setItems(getRoomAndCapacity(nullRoom)); } else { // Would call addToList to add a new entry to the database Room temp = new Room(-1, inputRoomName, inputRoomCapacity); @@ -501,16 +501,15 @@ protected void updateItem(timeSlotItem item, boolean empty) { Button sessionAdd_AddButton = buttonMaker("Add"); Button sessionAdd_HomeButton = buttonMaker("Home"); - ListView sessionAdd_List = new ListView<>(getSessions()); - sessionAdd_List.setCellFactory(param -> new ListCell() { - @Override - protected void updateItem(Session item, boolean empty) { + ListView sessionAdd_List = new ListView<>(getSessions(nullSession)); + sessionAdd_List.setCellFactory(param -> new ListCell() { + protected void updateItem(DB_Object item, boolean empty) { super.updateItem(item, empty); - if (empty || item == null || item.getName() == null) { + if (empty || item == null || item.getClass().toString() == null) { setText(null); } else { - setText(item.getName()); + setText(item.getClass().toString()); } } }); @@ -526,18 +525,18 @@ protected void updateItem(Session item, boolean empty) { TextField sessionAdd_NameText = new TextField(); ComboBox sessionAdd_TimeSlotCombo = new ComboBox(); - for (Object ts : getTimeSlotItems()) { - sessionAdd_TimeSlotCombo.getItems().add(ts.getTime()); + for (DB_Object ts : getTimeSlotItems(nullTimeslot)) { + sessionAdd_TimeSlotCombo.getItems().add(ts.getClass().toString()); } ComboBox sessionAdd_SpeakerCombo = new ComboBox(); - for (speakerPerson s : getSpeakers()) { - sessionAdd_SpeakerCombo.getItems().add(s.getFullName()); + for (DB_Object s : getSpeakers(nullSpeaker)) { + sessionAdd_SpeakerCombo.getItems().add(s.getClass().toString()); } ComboBox sessionAdd_RoomCombo = new ComboBox(); - for (roomCap r : getRoomAndCapacity()) { - sessionAdd_RoomCombo.getItems().add(r.getRoomName()); + for (DB_Object r : getRoomAndCapacity(nullRoom)) { + sessionAdd_RoomCombo.getItems().add(r.getClass().toString()); } sessionAdd_AddButton.setOnAction(e -> { @@ -545,7 +544,16 @@ protected void updateItem(Session item, boolean empty) { String inputSessionTimeSlot = sessionAdd_TimeSlotCombo.getValue(); String inputSessionSpeaker = sessionAdd_SpeakerCombo.getValue(); String inputSessionRoom = sessionAdd_RoomCombo.getValue(); - // sessionList.add(new sessionItem(inputSessionName)); + if(inputSessionName == "" && inputSessionTimeSlot == null && inputSessionRoom == "" && inputSessionSpeaker == ""){ + sessionAdd_List.setItems(getSessions(nullSession)); + } + else{ + DB_Object tempTimeslot = findObject(nullTimeslot, inputSessionTimeSlot); + DB_Object tempSpeaker = findObject(nullSpeaker, inputSessionTimeSlot); + DB_Object tempRoom = findObject(nullRoom, inputSessionTimeSlot); + ArrayList temp = IFront.addToList(new Session(-1, inputSessionName, tempTimeslot, tempSpeaker, tempRoom)); + sessionAdd_List.setItems(getSessions(temp)); + } }); @@ -563,7 +571,7 @@ protected void updateItem(Session item, boolean empty) { sessionAdd_Page.setStyle(styleSet); Scene sessionAdd_Scene = new Scene(sessionAdd_Page, 900, 400); -*/ + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Label timeSlotEdit_TitleLabel = mainTitleLabel; @@ -915,6 +923,15 @@ public ObservableList addItem(ObservableList viewableList, return viewableList; } + public DB_Object findObject(ArrayList DBList, String attribute){ + for(DB_Object index: DBList){ + if(index.getClass().toString() == attribute) { + return index; + } + } + return null; + } + public Label labelMaker(String label) { return new Label(label); }