diff --git a/.vscode/launch.json b/.vscode/launch.json index 7ecb6c5..79a779a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -21,7 +21,7 @@ "request": "launch", "mainClass": "lodge.TestMainFx", "projectName": "reservationsystem", - "vmArgs": " --module-path ${workspaceFolder}/libs/win32 --add-modules ALL-MODULE-PATH --enable-native-access=javafx.web,javafx.controls,javafx.graphics -Dcom.sun.management.jmxremote=false -Djava.awt.headless=true -XX:+DisableAttachMechanism", + "vmArgs": " --module-path ${workspaceFolder}/libs/linux --add-modules ALL-MODULE-PATH --enable-native-access=javafx.web,javafx.controls,javafx.graphics -Dcom.sun.management.jmxremote=false -Djava.awt.headless=true -XX:+DisableAttachMechanism", "cwd": "${workspaceFolder}", "console": "integratedTerminal" }, diff --git a/sdd/ui-sceen-2.png b/sdd/ui-sceen-2.png deleted file mode 100644 index e5c3123..0000000 Binary files a/sdd/ui-sceen-2.png and /dev/null differ diff --git a/sdd/ui-sceen-2.svg b/sdd/ui-sceen-2.svg deleted file mode 100644 index c37c63c..0000000 --- a/sdd/ui-sceen-2.svg +++ /dev/null @@ -1,17636 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Accounts - - - - - - - - AccountsView - - - - - - - - - - - - - - - - Update Info - - - - - - Schedule Info - - - - - - - - - - - - - - - properties - - - - - - - - Add reservation - - - - - - - - - diff --git a/sdd/ui-screen-idea-2.png b/sdd/ui-screen-idea-2.png new file mode 100644 index 0000000..601f8f4 Binary files /dev/null and b/sdd/ui-screen-idea-2.png differ diff --git a/sdd/ui-sceen-2.pptx b/sdd/ui-srceen-2.pptx similarity index 100% rename from sdd/ui-sceen-2.pptx rename to sdd/ui-srceen-2.pptx diff --git a/src/main/java/lodge/reservationsystem/AccomodationManager.java b/src/main/java/lodge/reservationsystem/AccomodationManager.java index dd0d1f2..ff8ef86 100644 --- a/src/main/java/lodge/reservationsystem/AccomodationManager.java +++ b/src/main/java/lodge/reservationsystem/AccomodationManager.java @@ -6,7 +6,6 @@ package lodge.reservationsystem; import java.io.IOException; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Collections; import java.util.List; diff --git a/src/resources/media/mainViewModel.fxml b/src/resources/media/mainViewModel.fxml index 053fe5d..a84ea5b 100644 --- a/src/resources/media/mainViewModel.fxml +++ b/src/resources/media/mainViewModel.fxml @@ -49,18 +49,10 @@ - + - @@ -81,7 +73,13 @@ -