Skip to content
Snippets Groups Projects
Commit f408526b authored by ArktikHunter's avatar ArktikHunter
Browse files

commented out pickupview

parent 354f07a7
No related branches found
No related tags found
No related merge requests found
......@@ -11,11 +11,6 @@
<option name="name" value="In Project Repo" />
<option name="url" value="file://C:\cmpt370\cmpt-370-group-project\SchedulerApp/lib" />
</remote-repository>
<remote-repository>
<option name="id" value="in-project" />
<option name="name" value="In Project Repo" />
<option name="url" value="file://$PROJECT_DIR$/lib" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
......@@ -26,6 +21,11 @@
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="in-project" />
<option name="name" value="In Project Repo" />
<option name="url" value="file://$PROJECT_DIR$/lib" />
</remote-repository>
<remote-repository>
<option name="id" value="in-project" />
<option name="name" value="In Project Repo" />
......
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-base:win:16">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/16/javafx-base-16-win.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/16/javafx-base-16-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/16/javafx-base-16-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-controls:win:16">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/16/javafx-controls-16-win.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/16/javafx-controls-16-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/16/javafx-controls-16-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-fxml:win:16">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/16/javafx-fxml-16-win.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/16/javafx-fxml-16-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/16/javafx-fxml-16-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-graphics:win:16">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/16/javafx-graphics-16-win.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/16/javafx-graphics-16-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/16/javafx-graphics-16-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>
\ No newline at end of file
......@@ -114,7 +114,7 @@ public class Controller {
WeeklyView weeklyView;
EmployeeView employeeView;
AvailabilityView availabilityView;
PickupView pickupView;
//PickupView pickupView;
BorderPane root;
Parent header;
Parent sideSchedulePanel;
......@@ -185,8 +185,8 @@ public class Controller {
model.addSubscriber(employeeView);
availabilityView = new AvailabilityView();
availabilityView.setModel(model);
pickupView = new PickupView();
pickupView.setModel(model);
//pickupView = new PickupView();
//pickupView.setModel(model);
model.addSubscriber(availabilityView);
//fxml views
......@@ -302,7 +302,8 @@ public class Controller {
}
// schedule -> pickups todo
public void viewPickups(){
root.setCenter(pickupView);
//root.setCenter(pickupView);
root.setCenter(null);
root.setBottom(bottomPanel);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment