fanwuyang
/
SENG301
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Story 7 is done

Browse Source
main
Fan-Wu Yang 9 years ago
parent f0fe89be00
commit 434017c558
17 changed files with 212 additions and 13 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/controllers/BaseController.java
Unescape View File

@ -37,6 +37,10 @@ public class BaseController extends Controller {
changeScene(SceneCode.MY_STOPS);
}
public void searchStops() throws Exception{
changeScene(SceneCode.SEARCH_STOPS);
}
public void addRoute() throws Exception{
changeScene(SceneCode.ADD_ROUTE);
}

60
src/main/java/controllers/SearchStopsController.java
Unescape View File

@ -0,0 +1,60 @@
package controllers;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.control.ListView;
import javafx.scene.control.TextField;
import model.Stop;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* Created by Gondr on 1/06/2017.
*/
public class SearchStopsController extends Controller {
@FXML
ListView<Stop> stopsList;
@FXML
TextField stopAddress;
@FXML
TextField stopSuburb;
private List<Stop> listOfAllStops;
private ObservableList<Stop> shownStops;
public void search(){
shownStops.remove(0, shownStops.size());
Pattern addressPattern = Pattern.compile(".*", Pattern.CASE_INSENSITIVE);
if (stopAddress.getText() != "" && stopAddress.getText() != null){
addressPattern = Pattern.compile(".*"+stopAddress.getText()+".*", Pattern.CASE_INSENSITIVE);
}
for (Stop stop:listOfAllStops){
if (addressPattern.matcher(stop.getAddress()).matches()){
shownStops.add(stop);
}
}
}
@Override
public void runLater() {
listOfAllStops = new ArrayList<>(parent.getSession().getDataManager().getStops());
shownStops = FXCollections.observableArrayList(listOfAllStops);
stopsList.setItems(shownStops);
stopAddress.textProperty().addListener(e->{
search();
});
}
@Override
public void initialize(URL location, ResourceBundle resources) {
}
}

41
src/main/java/controllers/SharedTripsController.java
Unescape View File

@ -7,12 +7,15 @@ import javafx.fxml.FXML;
import javafx.scene.control.ComboBox;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import javafx.scene.control.TextField;
import model.SharedTrip;
import model.Stop;
import model.TripStop;
import java.net.URL;
import java.util.HashMap;
import java.util.ResourceBundle;
import java.util.regex.Pattern;
/**
* Created by Gondr on 28/05/2017.
@ -28,25 +31,38 @@ public class SharedTripsController extends Controller{
@FXML
private TableColumn<SharedTrip, String> daysColumn;
@FXML
private ComboBox<Stop> stopsFilter;
private ComboBox<TripStop> stopsFilter;
@FXML
private ObservableList<SharedTrip> sharedTrips;
@FXML
private TextField stopName;
public void resetSearch(){
stopsFilter.getSelectionModel().select(0);
}
public void search(){
sharedTrips.removeAll();
sharedTrips.remove(0, sharedTrips.size());
boolean ignoreStopFilter = stopsFilter.getSelectionModel().getSelectedIndex() == 0;
boolean ignoreStopNameSearch = stopName.getText().equals("") || stopName.getText() == null;
Pattern stopNamePattern = Pattern.compile(".*"+stopName.getText()+".*", Pattern.CASE_INSENSITIVE);
for(SharedTrip sharedTrip: parent.getSession().getDataManager().getSharedTrips()){
//stops are equal
boolean added = false;
for (TripStop stop: sharedTrip.route){
if (stop.equals(stopsFilter.getValue())){
for (TripStop stop : sharedTrip.route) {
if (stop.equals(stopsFilter.getValue()) || ignoreStopFilter) {
sharedTrips.add(sharedTrip);
added = true;
break;
}
if (stopNamePattern.matcher(stop.getName()).matches()){
sharedTrips.add(sharedTrip);
added = true;
break;
}
}
if (added){
continue;
continue;//for other filters later
}
}
}
@ -58,10 +74,23 @@ public class SharedTripsController extends Controller{
tripNameColumn.setCellValueFactory(p -> new SimpleStringProperty(p.getValue().name));
directionColumn.setCellValueFactory(p -> new SimpleStringProperty(p.getValue().direction));
daysColumn.setCellValueFactory(p -> new SimpleStringProperty(p.getValue().getDays()));
stopsFilter.setItems(parent.getSession().getDataManager().getStops());
//add all stops that have shared trips with them. TODO only display visible ones.
ObservableList<TripStop> stops = FXCollections.observableArrayList();
stops.add(new TripStop("None", ""));
HashMap<TripStop, Boolean> stopAdded = new HashMap<>();
for (SharedTrip trip:sharedTrips){
for(TripStop stop: trip.route){
if (!stopAdded.containsKey(stop)) {
stops.add(stop);
stopAdded.put(stop, true);
}
}
}
stopsFilter.setItems(stops);
stopsFilter.valueProperty().addListener( e ->{
search();
});
stopName.textProperty().addListener(e-> search());
}
@Override

2
src/main/java/model/SceneCode.java
Unescape View File

@ -15,7 +15,7 @@ public enum SceneCode {
MAIN("main", false), BASE("base", false),
//screens after login
HOME("home"),ADD_RIDE("addride"),MY_RIDES("myrides"), ADD_STOPS("addstops"), MY_STOPS("mystops"), ADD_ROUTE("addroute"),
MY_ROUTES("myroutes"), ADD_TRIP("addtrip"), MY_TRIPS("mytrips"), SHARED_RIDES("sharedtrips");
MY_ROUTES("myroutes"), ADD_TRIP("addtrip"), MY_TRIPS("mytrips"), SHARED_RIDES("sharedtrips"), SEARCH_STOPS("searchstops");
private String path;
private boolean loadMenu;

4
src/main/java/model/TripStop.java
Unescape View File

@ -58,4 +58,8 @@ public class TripStop{
time = new SimpleStringProperty(serialiseTime);
name = new SimpleStringProperty(serialiseName);
}
public String toString(){
return getName();
}
}

5
src/main/resources/scenes/base.fxml
Unescape View File

@ -57,6 +57,11 @@
<Button mnemonicParsing="false" onAction="#sharedRides" text="Shared Rides" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
</children>
</AnchorPane>
<AnchorPane prefHeight="200.0" prefWidth="200.0">
<children>
<Button mnemonicParsing="false" onAction="#searchStops" text="Search Stops" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
</children>
</AnchorPane>
</children>
</VBox>
</children>

6
src/main/resources/scenes/mystops.fxml
Unescape View File

@ -10,15 +10,17 @@
<GridPane layoutX="213.0" layoutY="99.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="50.0" minHeight="50.0" prefHeight="50.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="348.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<ListView fx:id="stopsList" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1" />
<Label text="My Stops" GridPane.columnSpan="2" GridPane.halignment="CENTER">
<ListView fx:id="stopsList" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" GridPane.columnSpan="2" GridPane.rowIndex="1" />
<Label text="My Stops" GridPane.columnSpan="4" GridPane.halignment="CENTER">
<font>
<Font size="18.0" />
</font>

36
src/main/resources/scenes/searchstops.fxml
Unescape View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.text.*?>
<?import javafx.scene.control.*?>
<?import java.lang.*?>
<?import javafx.scene.layout.*?>
<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.SearchStopsController">
<children>
<GridPane layoutX="213.0" layoutY="99.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="50.0" minHeight="50.0" prefHeight="50.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="348.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<ListView fx:id="stopsList" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" GridPane.columnSpan="2" GridPane.rowIndex="2" />
<Label text="Search Stops" GridPane.columnSpan="4" GridPane.halignment="CENTER">
<font>
<Font size="18.0" />
</font>
</Label>
<Label text="Address" GridPane.rowIndex="1" />
<TextField fx:id="stopAddress" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Label text="Suburb:" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<TextField fx:id="stopSuburb" GridPane.columnIndex="3" GridPane.rowIndex="1" />
</children>
</GridPane>
</children>
</AnchorPane>

10
src/main/resources/scenes/sharedtrips.fxml
Unescape View File

@ -22,6 +22,7 @@
<RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="5.0" minHeight="5.0" prefHeight="5.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="348.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
@ -30,7 +31,7 @@
<Font size="18.0" />
</font>
</Label>
<TableView fx:id="sharedTripsTable" prefHeight="200.0" prefWidth="200.0" GridPane.columnSpan="6" GridPane.rowIndex="4">
<TableView fx:id="sharedTripsTable" prefHeight="200.0" prefWidth="200.0" GridPane.columnSpan="6" GridPane.rowIndex="5">
<columns>
<TableColumn fx:id="tripNameColumn" prefWidth="75.0" text="Trip Name" />
<TableColumn fx:id="directionColumn" prefWidth="75.0" text="Direction" />
@ -41,6 +42,13 @@
<Separator prefWidth="200.0" GridPane.columnSpan="6" GridPane.rowIndex="2" />
<Label text="Stops:" GridPane.rowIndex="3" />
<ComboBox fx:id="stopsFilter" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<Label text="Stop Name:" GridPane.columnIndex="2" GridPane.rowIndex="3" />
<TextField fx:id="stopName" GridPane.columnIndex="3" GridPane.rowIndex="3" />
<AnchorPane GridPane.columnIndex="2" GridPane.columnSpan="2" GridPane.rowIndex="4">
<children>
<Button fx:id="resetSearch" mnemonicParsing="false" text="Reset Search" AnchorPane.bottomAnchor="8.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="7.0" GridPane.columnIndex="2" GridPane.columnSpan="2" GridPane.rowIndex="4" GridPane.valignment="CENTER" />
</children>
</AnchorPane>
</children>
</GridPane>
</children>

BIN
target/classes/controllers/BaseController.class
View File

Binary file not shown.

BIN
target/classes/controllers/SearchStopsController.class
View File

Binary file not shown.

BIN
target/classes/controllers/SharedTripsController.class
View File

Binary file not shown.

BIN
target/classes/model/SceneCode.class
View File

Binary file not shown.

5
target/classes/scenes/base.fxml
Unescape View File

@ -57,6 +57,11 @@
<Button mnemonicParsing="false" onAction="#sharedRides" text="Shared Rides" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
</children>
</AnchorPane>
<AnchorPane prefHeight="200.0" prefWidth="200.0">
<children>
<Button mnemonicParsing="false" onAction="#searchStops" text="Search Stops" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
</children>
</AnchorPane>
</children>
</VBox>
</children>

6
target/classes/scenes/mystops.fxml
Unescape View File

@ -10,15 +10,17 @@
<GridPane layoutX="213.0" layoutY="99.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="50.0" minHeight="50.0" prefHeight="50.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="348.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<ListView fx:id="stopsList" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1" />
<Label text="My Stops" GridPane.columnSpan="2" GridPane.halignment="CENTER">
<ListView fx:id="stopsList" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" GridPane.columnSpan="2" GridPane.rowIndex="1" />
<Label text="My Stops" GridPane.columnSpan="4" GridPane.halignment="CENTER">
<font>
<Font size="18.0" />
</font>

36
target/classes/scenes/searchstops.fxml
Unescape View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.text.*?>
<?import javafx.scene.control.*?>
<?import java.lang.*?>
<?import javafx.scene.layout.*?>
<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.SearchStopsController">
<children>
<GridPane layoutX="213.0" layoutY="99.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="300.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="50.0" minHeight="50.0" prefHeight="50.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="348.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<ListView fx:id="stopsList" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" GridPane.columnSpan="2" GridPane.rowIndex="2" />
<Label text="Search Stops" GridPane.columnSpan="4" GridPane.halignment="CENTER">
<font>
<Font size="18.0" />
</font>
</Label>
<Label text="Address" GridPane.rowIndex="1" />
<TextField fx:id="stopAddress" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Label text="Suburb:" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<TextField fx:id="stopSuburb" GridPane.columnIndex="3" GridPane.rowIndex="1" />
</children>
</GridPane>
</children>
</AnchorPane>

10
target/classes/scenes/sharedtrips.fxml
Unescape View File

@ -22,6 +22,7 @@
<RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="5.0" minHeight="5.0" prefHeight="5.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="348.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
@ -30,7 +31,7 @@
<Font size="18.0" />
</font>
</Label>
<TableView fx:id="sharedTripsTable" prefHeight="200.0" prefWidth="200.0" GridPane.columnSpan="6" GridPane.rowIndex="4">
<TableView fx:id="sharedTripsTable" prefHeight="200.0" prefWidth="200.0" GridPane.columnSpan="6" GridPane.rowIndex="5">
<columns>
<TableColumn fx:id="tripNameColumn" prefWidth="75.0" text="Trip Name" />
<TableColumn fx:id="directionColumn" prefWidth="75.0" text="Direction" />
@ -41,6 +42,13 @@
<Separator prefWidth="200.0" GridPane.columnSpan="6" GridPane.rowIndex="2" />
<Label text="Stops:" GridPane.rowIndex="3" />
<ComboBox fx:id="stopsFilter" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<Label text="Stop Name:" GridPane.columnIndex="2" GridPane.rowIndex="3" />
<TextField fx:id="stopName" GridPane.columnIndex="3" GridPane.rowIndex="3" />
<AnchorPane GridPane.columnIndex="2" GridPane.columnSpan="2" GridPane.rowIndex="4">
<children>
<Button fx:id="resetSearch" mnemonicParsing="false" text="Reset Search" AnchorPane.bottomAnchor="8.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="7.0" GridPane.columnIndex="2" GridPane.columnSpan="2" GridPane.rowIndex="4" GridPane.valignment="CENTER" />
</children>
</AnchorPane>
</children>
</GridPane>
</children>

Write Preview
Loading…
Cancel
Save