Compare commits
7 Commits
main
...
Richards_B
Author | SHA1 | Date | |
---|---|---|---|
3ca6aa017a | |||
f5ca04983c | |||
646d63c6c0 | |||
e4eb47aa05 | |||
ba3b92b3c4 | |||
54c3b9f3f5 | |||
2c387cda0d |
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,7 +8,6 @@ target/
|
|||||||
.idea/jarRepositories.xml
|
.idea/jarRepositories.xml
|
||||||
.idea/compiler.xml
|
.idea/compiler.xml
|
||||||
.idea/libraries/
|
.idea/libraries/
|
||||||
.idea
|
|
||||||
*.iws
|
*.iws
|
||||||
*.iml
|
*.iml
|
||||||
*.ipr
|
*.ipr
|
||||||
|
3
.idea/.gitignore
generated
vendored
3
.idea/.gitignore
generated
vendored
@ -1,3 +0,0 @@
|
|||||||
# Default ignored files
|
|
||||||
/shelf/
|
|
||||||
/workspace.xml
|
|
7
.idea/encodings.xml
generated
7
.idea/encodings.xml
generated
@ -1,7 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="Encoding">
|
|
||||||
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
12
.idea/misc.xml
generated
12
.idea/misc.xml
generated
@ -1,12 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
|
||||||
<component name="MavenProjectsManager">
|
|
||||||
<option name="originalFiles">
|
|
||||||
<list>
|
|
||||||
<option value="$PROJECT_DIR$/pom.xml" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="openjdk-19" project-jdk-type="JavaSDK" />
|
|
||||||
</project>
|
|
4
.idea/misc_.xml
generated
Normal file
4
.idea/misc_.xml
generated
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="openjdk-19" project-jdk-type="JavaSDK" />
|
||||||
|
</project>
|
File diff suppressed because one or more lines are too long
@ -1,4 +0,0 @@
|
|||||||
<changelist name="Uncommitted_changes_before_Update_at_30_01_2023_14_48_[Changes]" date="1675086496793" recycled="true" deleted="true">
|
|
||||||
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48_[Changes]/shelved.patch" />
|
|
||||||
<option name="DESCRIPTION" value="Uncommitted changes before Update at 30.01.2023 14:48 [Changes]" />
|
|
||||||
</changelist>
|
|
124
.idea/uiDesigner.xml
generated
124
.idea/uiDesigner.xml
generated
@ -1,124 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="Palette2">
|
|
||||||
<group name="Swing">
|
|
||||||
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
|
|
||||||
<initial-values>
|
|
||||||
<property name="text" value="Button" />
|
|
||||||
</initial-values>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
|
||||||
<initial-values>
|
|
||||||
<property name="text" value="RadioButton" />
|
|
||||||
</initial-values>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
|
||||||
<initial-values>
|
|
||||||
<property name="text" value="CheckBox" />
|
|
||||||
</initial-values>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
|
|
||||||
<initial-values>
|
|
||||||
<property name="text" value="Label" />
|
|
||||||
</initial-values>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
|
||||||
<preferred-size width="150" height="-1" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
|
||||||
<preferred-size width="150" height="-1" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
|
||||||
<preferred-size width="150" height="-1" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
|
||||||
<preferred-size width="200" height="200" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
|
||||||
<preferred-size width="200" height="200" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
|
|
||||||
<preferred-size width="-1" height="20" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
|
|
||||||
</item>
|
|
||||||
</group>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
2
.idea/vcs.xml → .idea/vcs_.xml
generated
2
.idea/vcs.xml → .idea/vcs_.xml
generated
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
147
.idea/workspace.xml
generated
147
.idea/workspace.xml
generated
@ -1,147 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="AutoImportSettings">
|
|
||||||
<option name="autoReloadType" value="SELECTIVE" />
|
|
||||||
</component>
|
|
||||||
<component name="ChangeListManager">
|
|
||||||
<list default="true" id="be8f30d3-089d-4d1c-bba3-da21b0466111" name="Changes" comment="Variablen und Attributen auf englisch umbennent">
|
|
||||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/SettingsController.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/database.db" beforeDir="false" afterPath="$PROJECT_DIR$/database.db" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/AccountMgr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/AccountMgr.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/ParentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/ParentController.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/User.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/child-view.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/child-view.fxml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/hello-view.fxml" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/parentMenue-view.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/parentMenue-view.fxml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/settingsMenue.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/settingsMenue.fxml" afterDir="false" />
|
|
||||||
</list>
|
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
||||||
</component>
|
|
||||||
<component name="FileTemplateManagerImpl">
|
|
||||||
<option name="RECENT_TEMPLATES">
|
|
||||||
<list>
|
|
||||||
<option value="Class" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="Git.Settings">
|
|
||||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
|
||||||
<map>
|
|
||||||
<entry key="$PROJECT_DIR$" value="Richards_Branch" />
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
||||||
</component>
|
|
||||||
<component name="HighlightingSettingsPerFile">
|
|
||||||
<setting file="file://$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml" root0="FORCE_HIGHLIGHTING" />
|
|
||||||
</component>
|
|
||||||
<component name="MarkdownSettingsMigration">
|
|
||||||
<option name="stateVersion" value="1" />
|
|
||||||
</component>
|
|
||||||
<component name="MavenImportPreferences">
|
|
||||||
<option name="generalSettings">
|
|
||||||
<MavenGeneralSettings>
|
|
||||||
<option name="mavenHome" value="Use Maven wrapper" />
|
|
||||||
<option name="useMavenConfig" value="true" />
|
|
||||||
</MavenGeneralSettings>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="ProjectId" id="2L2y55tSt0XlzQa7s1gkzyAgxgu" />
|
|
||||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
||||||
<component name="ProjectViewState">
|
|
||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
|
||||||
<option name="showLibraryContents" value="true" />
|
|
||||||
</component>
|
|
||||||
<component name="PropertiesComponent">{
|
|
||||||
"keyToString": {
|
|
||||||
"ASKED_ADD_EXTERNAL_FILES": "true",
|
|
||||||
"ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
|
||||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true"
|
|
||||||
}
|
|
||||||
}</component>
|
|
||||||
<component name="RunManager">
|
|
||||||
<configuration name="SuperMain" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
|
||||||
<option name="MAIN_CLASS_NAME" value="com.bib.essensbestellungsverwaltung.SuperMain" />
|
|
||||||
<module name="Essensbestellungsverwaltung" />
|
|
||||||
<extension name="coverage">
|
|
||||||
<pattern>
|
|
||||||
<option name="PATTERN" value="com.bib.essensbestellungsverwaltung.*" />
|
|
||||||
<option name="ENABLED" value="true" />
|
|
||||||
</pattern>
|
|
||||||
</extension>
|
|
||||||
<method v="2">
|
|
||||||
<option name="Make" enabled="true" />
|
|
||||||
</method>
|
|
||||||
</configuration>
|
|
||||||
<recent_temporary>
|
|
||||||
<list>
|
|
||||||
<item itemvalue="Application.SuperMain" />
|
|
||||||
<item itemvalue="Application.SuperMain" />
|
|
||||||
</list>
|
|
||||||
</recent_temporary>
|
|
||||||
</component>
|
|
||||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
|
||||||
<component name="TaskManager">
|
|
||||||
<task active="true" id="Default" summary="Default task">
|
|
||||||
<changelist id="be8f30d3-089d-4d1c-bba3-da21b0466111" name="Changes" comment="" />
|
|
||||||
<created>1675083287293</created>
|
|
||||||
<option name="number" value="Default" />
|
|
||||||
<option name="presentableId" value="Default" />
|
|
||||||
<updated>1675083287293</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00001" summary="StartViewApplication ist die Startpunkt des Projekt">
|
|
||||||
<created>1675083679870</created>
|
|
||||||
<option name="number" value="00001" />
|
|
||||||
<option name="presentableId" value="LOCAL-00001" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1675083679870</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00002" summary="StartViewApplication ist die Startpunkt des Projekt">
|
|
||||||
<created>1675083693484</created>
|
|
||||||
<option name="number" value="00002" />
|
|
||||||
<option name="presentableId" value="LOCAL-00002" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1675083693484</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00003" summary="singup mit Datebase verbunden und new Adresse">
|
|
||||||
<created>1675241335793</created>
|
|
||||||
<option name="number" value="00003" />
|
|
||||||
<option name="presentableId" value="LOCAL-00003" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1675241335793</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00004" summary="Variablen und Attributen auf englisch umbennent">
|
|
||||||
<created>1675606671743</created>
|
|
||||||
<option name="number" value="00004" />
|
|
||||||
<option name="presentableId" value="LOCAL-00004" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1675606671743</updated>
|
|
||||||
</task>
|
|
||||||
<option name="localTasksCounter" value="5" />
|
|
||||||
<servers />
|
|
||||||
</component>
|
|
||||||
<component name="Vcs.Log.Tabs.Properties">
|
|
||||||
<option name="TAB_STATES">
|
|
||||||
<map>
|
|
||||||
<entry key="MAIN">
|
|
||||||
<value>
|
|
||||||
<State />
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="VcsManagerConfiguration">
|
|
||||||
<MESSAGE value="StartViewApplication ist die Startpunkt des Projekt" />
|
|
||||||
<MESSAGE value="singup mit Datebase verbunden" />
|
|
||||||
<MESSAGE value="singup mit Datebase verbunden und new Adresse" />
|
|
||||||
<MESSAGE value="Variablen und Attributen auf englisch umbennent" />
|
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="Variablen und Attributen auf englisch umbennent" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
BIN
database.db
BIN
database.db
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
# Essensbestellungsverwaltung
|
# Essensbestellungsverwaltung
|
||||||
|
|
||||||
stable ist der neue main
|
test
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
|
@author Malte Schulze Hobeling
|
||||||
|
*/
|
||||||
|
|
||||||
import javax.crypto.SecretKeyFactory;
|
import javax.crypto.SecretKeyFactory;
|
||||||
import javax.crypto.spec.PBEKeySpec;
|
import javax.crypto.spec.PBEKeySpec;
|
||||||
@ -10,20 +13,12 @@ import java.util.ArrayList;
|
|||||||
import java.util.Base64;
|
import java.util.Base64;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
|
||||||
* A collection of functions loosely related to account management
|
|
||||||
* Acts as an abstraction layer to the database
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public class AccountMgr {
|
public class AccountMgr {
|
||||||
|
protected static double price = 5.0;
|
||||||
static User currentUser = null;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* creates a user with createUser(...) and adds its id to the 'worker' table
|
* creates a user with createUser(...) and adds its id to the 'worker' table
|
||||||
* @param worker the worker to be created
|
|
||||||
* @return userid or -1
|
* @return userid or -1
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static long createWorker(Worker worker){
|
protected static long createWorker(Worker worker){
|
||||||
long id = createUser(worker);
|
long id = createUser(worker);
|
||||||
@ -34,9 +29,7 @@ public class AccountMgr {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* creates a user with createUser(...) and adds its id to the 'parent' table
|
* creates a user with createUser(...) and adds its id to the 'parent' table
|
||||||
* @param parent the parent to be created
|
|
||||||
* @return userid or -1
|
* @return userid or -1
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static long createParent(Parent parent){
|
protected static long createParent(Parent parent){
|
||||||
long id = createUser(parent);
|
long id = createUser(parent);
|
||||||
@ -47,9 +40,7 @@ public class AccountMgr {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* adds a user to the database
|
* adds a user to the database
|
||||||
* @param user the user to be created
|
|
||||||
* @return userid or -1
|
* @return userid or -1
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static long createUser(User user) {
|
protected static long createUser(User user) {
|
||||||
String[] userH = {"name", "firstname", "addressid", "password", "email"};
|
String[] userH = {"name", "firstname", "addressid", "password", "email"};
|
||||||
@ -65,12 +56,6 @@ public class AccountMgr {
|
|||||||
return Database.insert("user", userH, userD);
|
return Database.insert("user", userH, userD);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* adds an address to the database
|
|
||||||
* @param address the address to be created
|
|
||||||
* @return id or -1
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
protected static long createAddress(Address address){
|
protected static long createAddress(Address address){
|
||||||
String[] addressH = {"street", "number", "plz", "city"};
|
String[] addressH = {"street", "number", "plz", "city"};
|
||||||
String[] addressD = {address.getStreet(),address.getNumber(),address.getPlz(),address.getCity()};
|
String[] addressD = {address.getStreet(),address.getNumber(),address.getPlz(),address.getCity()};
|
||||||
@ -79,9 +64,7 @@ public class AccountMgr {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* adds a child and allergies to the database
|
* adds a child and allergies to the database
|
||||||
* @param child the child to be created
|
|
||||||
* @return id of child or -1
|
* @return id of child or -1
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static long createChild(Child child){
|
protected static long createChild(Child child){
|
||||||
String[] childH = {"name","firstname","addressid"};
|
String[] childH = {"name","firstname","addressid"};
|
||||||
@ -98,17 +81,8 @@ public class AccountMgr {
|
|||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* returns a User(Worker | Parent) for a given id or null if no unique id was found
|
|
||||||
* @param id id of the User
|
|
||||||
* @return User(Worker | Parent) or null
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
protected static User getUserById(long id){
|
protected static User getUserById(long id){
|
||||||
List<String> entry = Database.getEntryById("user",id);
|
List<String> entry = Database.getEntryById("user",id);
|
||||||
if(entry.size() != 1){
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
String[] parts = entry.get(0).split(":");
|
String[] parts = entry.get(0).split(":");
|
||||||
Address address = getAddressById(id);
|
Address address = getAddressById(id);
|
||||||
if(isWorker(String.valueOf(id))){
|
if(isWorker(String.valueOf(id))){
|
||||||
@ -126,17 +100,8 @@ public class AccountMgr {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* returns a Child for a given id or null if no unique id was found
|
|
||||||
* @param id id of child
|
|
||||||
* @return Child or null
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
protected static Child getChildById(long id){
|
protected static Child getChildById(long id){
|
||||||
List<String> entry = Database.getEntryById("child",id);
|
List<String> entry = Database.getEntryById("child",id);
|
||||||
if(entry.size() != 1){
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
String[] parts = entry.get(0).split(":");
|
String[] parts = entry.get(0).split(":");
|
||||||
String[] child_allergyH = {"childid"};
|
String[] child_allergyH = {"childid"};
|
||||||
String[] child_allergyD = {String.valueOf(id)};
|
String[] child_allergyD = {String.valueOf(id)};
|
||||||
@ -152,17 +117,8 @@ public class AccountMgr {
|
|||||||
return new Child(id,parts[1],parts[2],getAddressById(Long.parseLong(parts[3])),allergySeverities);
|
return new Child(id,parts[1],parts[2],getAddressById(Long.parseLong(parts[3])),allergySeverities);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* returns an Address for a given id or null if no unique id was found
|
|
||||||
* @param id id of the address
|
|
||||||
* @return Address or null
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
protected static Address getAddressById(long id){
|
protected static Address getAddressById(long id){
|
||||||
List<String> entry = Database.getEntryById("address",id);
|
List<String> entry = Database.getEntryById("address",id);
|
||||||
if(entry.size() != 1){
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
String[] parts = entry.get(0).split(":");
|
String[] parts = entry.get(0).split(":");
|
||||||
return new Address(Long.parseLong(parts[0]),parts[1],parts[2],parts[3],parts[4]);
|
return new Address(Long.parseLong(parts[0]),parts[1],parts[2],parts[3],parts[4]);
|
||||||
}
|
}
|
||||||
@ -172,7 +128,6 @@ public class AccountMgr {
|
|||||||
* @param parentId id of parent
|
* @param parentId id of parent
|
||||||
* @param childId id of child
|
* @param childId id of child
|
||||||
* @return id of parent_child or -1
|
* @return id of parent_child or -1
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static long matchParentChild(String parentId, String childId){
|
protected static long matchParentChild(String parentId, String childId){
|
||||||
String[] parent_childH = {"parentuserid","childid"};
|
String[] parent_childH = {"parentuserid","childid"};
|
||||||
@ -185,7 +140,6 @@ public class AccountMgr {
|
|||||||
* @param email email
|
* @param email email
|
||||||
* @param pw password
|
* @param pw password
|
||||||
* @return id or -1
|
* @return id or -1
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static long login(String email, String pw){
|
protected static long login(String email, String pw){
|
||||||
String[] pwH = {"email"};
|
String[] pwH = {"email"};
|
||||||
@ -204,38 +158,11 @@ public class AccountMgr {
|
|||||||
String[] userD = {email,hashAndSalt(pw,salt)};
|
String[] userD = {email,hashAndSalt(pw,salt)};
|
||||||
return Database.getSingleId("user",userH,userD);
|
return Database.getSingleId("user",userH,userD);
|
||||||
}
|
}
|
||||||
/**
|
|
||||||
* update password in User table
|
|
||||||
* @param password User
|
|
||||||
* @return update password
|
|
||||||
* @author Reshad Meher
|
|
||||||
*/
|
|
||||||
protected static long updatePassword( User password) {
|
|
||||||
|
|
||||||
String[] pwH = {"password"};
|
|
||||||
String[] pwD = {password.getPassword()};
|
|
||||||
long updates = Database.update("user",pwH,pwD);
|
|
||||||
return updates;
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* update adress in User table
|
|
||||||
* @param address Adresss
|
|
||||||
* @return update Adrssse
|
|
||||||
* @author Reshad Meher
|
|
||||||
*/
|
|
||||||
protected static long updateAdreess(Address address ){
|
|
||||||
String[] adH = {"stree","numbrt","plz","city"};
|
|
||||||
String[] adD = {address.getStreet(),address.getNumber(),address.getPlz(),address.getCity()};
|
|
||||||
long updates = Database.update("user",adH,adD);
|
|
||||||
return updates;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* checks if id is in worker table
|
* checks if id is in worker table
|
||||||
* @param id userid
|
* @param id userid
|
||||||
* @return true if id is in worker table
|
* @return true if id is in worker table
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static boolean isWorker(String id){
|
protected static boolean isWorker(String id){
|
||||||
String[] workerH = {"userid"};
|
String[] workerH = {"userid"};
|
||||||
@ -248,7 +175,6 @@ public class AccountMgr {
|
|||||||
* checks if id is in parent table
|
* checks if id is in parent table
|
||||||
* @param id userid
|
* @param id userid
|
||||||
* @return true if id is in parent table
|
* @return true if id is in parent table
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static boolean isParent(String id){
|
protected static boolean isParent(String id){
|
||||||
String[] parentH = {"userid"};
|
String[] parentH = {"userid"};
|
||||||
@ -261,7 +187,6 @@ public class AccountMgr {
|
|||||||
* returns a hashed and salted password
|
* returns a hashed and salted password
|
||||||
* @param pw the password to hash
|
* @param pw the password to hash
|
||||||
* @return hashed and salted password
|
* @return hashed and salted password
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
private static String hashAndSalt(String pw, String salt){
|
private static String hashAndSalt(String pw, String salt){
|
||||||
Base64.Decoder dec = Base64.getDecoder();
|
Base64.Decoder dec = Base64.getDecoder();
|
||||||
@ -280,11 +205,6 @@ public class AccountMgr {
|
|||||||
return hashedPw;
|
return hashedPw;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* generates a secure random salt, Base64 encoded
|
|
||||||
* @return String Base64 encoded
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
private static String getSalt(){
|
private static String getSalt(){
|
||||||
SecureRandom sec = new SecureRandom();
|
SecureRandom sec = new SecureRandom();
|
||||||
byte[] salt = new byte[16];
|
byte[] salt = new byte[16];
|
||||||
@ -298,15 +218,11 @@ public class AccountMgr {
|
|||||||
* @param date YYYY-MM the month
|
* @param date YYYY-MM the month
|
||||||
* @param childId id of child
|
* @param childId id of child
|
||||||
* @return the invoice as a List
|
* @return the invoice as a List
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static List<String> getInvoice(String date, String childId){
|
protected static List<String> getInvoice(String date, String childId){
|
||||||
List<String> invoice = new ArrayList<>();
|
List<String> invoice = new ArrayList<>();
|
||||||
List<String> child = Database.getEntryById("child", Long.parseLong(childId));
|
|
||||||
if(child.size() != 1){
|
|
||||||
return invoice;
|
|
||||||
}
|
|
||||||
invoice.add("Monatsabrechnung " + date);
|
invoice.add("Monatsabrechnung " + date);
|
||||||
|
List<String> child = Database.getEntryById("child", Long.parseLong(childId));
|
||||||
String[] childParts = child.get(0).split(":");
|
String[] childParts = child.get(0).split(":");
|
||||||
invoice.add(childParts[1] + ", " + childParts[2]);
|
invoice.add(childParts[1] + ", " + childParts[2]);
|
||||||
String[] food_planH = {"date"};
|
String[] food_planH = {"date"};
|
||||||
@ -325,29 +241,18 @@ public class AccountMgr {
|
|||||||
invoice.add(line);
|
invoice.add(line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
double price = getPrice();
|
|
||||||
invoice.add("Total: " + (invoice.size()-2) + " X " + price + "€ = " + ((invoice.size()-2)*price) + "€");
|
invoice.add("Total: " + (invoice.size()-2) + " X " + price + "€ = " + ((invoice.size()-2)*price) + "€");
|
||||||
return invoice;
|
return invoice;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
protected static void getPriceFromDb(){
|
||||||
* gets the price per meal from the database and converts it to double
|
|
||||||
* @return double price
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
protected static double getPrice(){
|
|
||||||
List<String> priceEntry = Database.getEntryById("price",1);
|
List<String> priceEntry = Database.getEntryById("price",1);
|
||||||
return Double.parseDouble(priceEntry.get(0).split(":")[1])/100.0;
|
price = Double.parseDouble(priceEntry.get(0).split(":")[1])/100.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
protected static void setPriceInDb(){
|
||||||
* converts the price per meal to integer and updates it in the database
|
|
||||||
* @param price double
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
protected static void setPrice(double price){
|
|
||||||
String[] priceH = {"id","price"};
|
String[] priceH = {"id","price"};
|
||||||
String[] priceD = {"1", String.valueOf((int)(price*100))};
|
String[] priceD = {"1", String.valueOf(price*100)};
|
||||||
Database.update("price",priceH,priceD);
|
Database.update("price",priceH,priceD);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
/**
|
@author Malte Schulze Hobeling
|
||||||
* An Address, used by User and Child and intended as a way to identify a child if you want to match it to another parent
|
|
||||||
* one constructor is used for creating new addresses the other is used to create existing addresses from database
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class Address {
|
public class Address {
|
||||||
private long id;
|
private long id;
|
||||||
private String street;
|
private String street;
|
||||||
@ -46,5 +44,4 @@ public class Address {
|
|||||||
this.plz = plz;
|
this.plz = plz;
|
||||||
this.city = city;
|
this.city = city;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
/**
|
@author Malte Schulze Hobeling
|
||||||
* An Allergy, used by Food and AllergySeverity, not intended to be changed
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class Allergy {
|
public class Allergy {
|
||||||
private final long id;
|
private final long id;
|
||||||
private final String name;
|
private final String name;
|
||||||
@ -26,5 +25,4 @@ public class Allergy {
|
|||||||
public String getHandle() {
|
public String getHandle() {
|
||||||
return handle;
|
return handle;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
/**
|
@author Malte Schulze Hobeling
|
||||||
* Matching an Allergy to a Severity, used by Child
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class AllergySeverity {
|
public class AllergySeverity {
|
||||||
private Allergy allergy;
|
private Allergy allergy;
|
||||||
private long severityId;
|
private long severityId;
|
||||||
|
@ -1,12 +1,10 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
|
@author Malte Schulze Hobeling
|
||||||
|
*/
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
|
||||||
* A Child, used by Parent
|
|
||||||
* one constructor is used to create new children the other is used to create existing children from database
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public class Child {
|
public class Child {
|
||||||
private long id;
|
private long id;
|
||||||
private String name;
|
private String name;
|
||||||
|
@ -1,13 +1,12 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
|
@author Malte Schulze Hobeling
|
||||||
|
*/
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Scanner;
|
import java.util.Scanner;
|
||||||
|
|
||||||
/**
|
|
||||||
* library for cli functions
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public class ConsoleLib {
|
public class ConsoleLib {
|
||||||
public static void createWorkerPrompt(){
|
public static void createWorkerPrompt(){
|
||||||
Scanner sc = new Scanner(System.in);
|
Scanner sc = new Scanner(System.in);
|
||||||
@ -321,6 +320,7 @@ public class ConsoleLib {
|
|||||||
Scanner sc = new Scanner(System.in);
|
Scanner sc = new Scanner(System.in);
|
||||||
double price = sc.nextDouble();
|
double price = sc.nextDouble();
|
||||||
sc.nextLine();
|
sc.nextLine();
|
||||||
AccountMgr.setPrice(price);
|
AccountMgr.price = price;
|
||||||
|
AccountMgr.setPriceInDb();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,10 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
|
@author Malte Schulze Hobeling
|
||||||
|
*/
|
||||||
|
|
||||||
import java.util.Scanner;
|
import java.util.Scanner;
|
||||||
|
|
||||||
/**
|
|
||||||
* simple cli showcase of the implemented functionality
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public class ConsoleMain {
|
public class ConsoleMain {
|
||||||
static User currentUser = null;
|
static User currentUser = null;
|
||||||
static boolean running = true;
|
static boolean running = true;
|
||||||
@ -16,7 +15,7 @@ public class ConsoleMain {
|
|||||||
Database.fillDb();
|
Database.fillDb();
|
||||||
ConsoleLib.createWorkerPrompt();
|
ConsoleLib.createWorkerPrompt();
|
||||||
}
|
}
|
||||||
AccountMgr.getPrice();
|
AccountMgr.getPriceFromDb();
|
||||||
while (running){
|
while (running){
|
||||||
if(currentUser == null){
|
if(currentUser == null){
|
||||||
defaultMenu();
|
defaultMenu();
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
|
@author Malte Schulze Hobeling
|
||||||
|
*/
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@ -7,19 +10,13 @@ import java.sql.*;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
|
||||||
* Basic operations on the database
|
|
||||||
* Use init() -> createDb() -> fillDb() to create the skeleton with some default values
|
|
||||||
* Provides select, insert, update, delete, count operations and more
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public class Database {
|
public class Database {
|
||||||
private static final String dbLocation = "jdbc:sqlite:"+Path.of("").toAbsolutePath()+"/database.db";
|
private static final String dbLocation = "jdbc:sqlite:"+Path.of("").toAbsolutePath()+"/database.db";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* creates new database.db if it doesn't exist
|
* creates new database.db if it doesn't exist
|
||||||
* @return true if a new database has been created
|
* @return true if a new database has been created
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static boolean init(){
|
protected static boolean init(){
|
||||||
File db = new File(Path.of("").toAbsolutePath()+"/database.db");
|
File db = new File(Path.of("").toAbsolutePath()+"/database.db");
|
||||||
@ -33,7 +30,6 @@ public class Database {
|
|||||||
/**
|
/**
|
||||||
* connects to the database
|
* connects to the database
|
||||||
* @return Connection to the database
|
* @return Connection to the database
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static Connection connect(){
|
protected static Connection connect(){
|
||||||
Connection conn = null;
|
Connection conn = null;
|
||||||
@ -47,7 +43,6 @@ public class Database {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* creates the initial structure of the db
|
* creates the initial structure of the db
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static void createDb(){
|
protected static void createDb(){
|
||||||
String[] sql = new String[15];
|
String[] sql = new String[15];
|
||||||
@ -178,7 +173,6 @@ public class Database {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* inserts fixed values into the database
|
* inserts fixed values into the database
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static void fillDb(){
|
protected static void fillDb(){
|
||||||
List<String> sqls = new ArrayList<>();
|
List<String> sqls = new ArrayList<>();
|
||||||
@ -280,12 +274,11 @@ public class Database {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* inserts data into table and returns its id
|
* inserts data into table and returns its id
|
||||||
* simple duplication check
|
* does not insert if the exact set already exists
|
||||||
* @param table name of the database table
|
* @param table name of the database table
|
||||||
* @param header String[] order should match with values
|
* @param header String[] order should match with values
|
||||||
* @param values String[] order should match with header
|
* @param values String[] order should match with header
|
||||||
* @return id of dataset or -1
|
* @return id of dataset or -1
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static long insert(String table, String[] header, String[] values){
|
protected static long insert(String table, String[] header, String[] values){
|
||||||
long id = -1;
|
long id = -1;
|
||||||
@ -327,7 +320,6 @@ public class Database {
|
|||||||
* @param header the header of the table, order should match with values
|
* @param header the header of the table, order should match with values
|
||||||
* @param values the data you want the id of, order should match witch values
|
* @param values the data you want the id of, order should match witch values
|
||||||
* @return one id matching the given data or -1 if no match has been found
|
* @return one id matching the given data or -1 if no match has been found
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static long getSingleId(String table, String[] header, String[] values){
|
protected static long getSingleId(String table, String[] header, String[] values){
|
||||||
long id = -1;
|
long id = -1;
|
||||||
@ -380,7 +372,6 @@ public class Database {
|
|||||||
* deletes an entry from table with matching id
|
* deletes an entry from table with matching id
|
||||||
* @param table the table that contains the entry you want to delete
|
* @param table the table that contains the entry you want to delete
|
||||||
* @param id the id of the entry you want to delete
|
* @param id the id of the entry you want to delete
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static void delete(String table, long id){
|
protected static void delete(String table, long id){
|
||||||
String sql = "DELETE FROM " + table + " WHERE id = ?;";
|
String sql = "DELETE FROM " + table + " WHERE id = ?;";
|
||||||
@ -392,21 +383,6 @@ public class Database {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* its a query builder it builds queries
|
|
||||||
* exists: checks if an entry with the given parameters exists in table
|
|
||||||
* selectMatch: returns all matching rows from table
|
|
||||||
* insert: inserts or ignores into table
|
|
||||||
* count: counts exact matches from table
|
|
||||||
* update: updates table, header/values[0] is used as WHERE, using id is recommended header/values[1+] are used
|
|
||||||
* as SET
|
|
||||||
* @param type exists, selectMatch, insert, count, update
|
|
||||||
* @param table table
|
|
||||||
* @param header header
|
|
||||||
* @param values values
|
|
||||||
* @return sql statement as String
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
private static String queryBuilder(String type,String table, String[] header, String[] values){
|
private static String queryBuilder(String type,String table, String[] header, String[] values){
|
||||||
String sql;
|
String sql;
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
@ -503,7 +479,6 @@ public class Database {
|
|||||||
* returns a list of all entries
|
* returns a list of all entries
|
||||||
* @param table the table you want
|
* @param table the table you want
|
||||||
* @return a list of all entries as String with the fields separated by ":"
|
* @return a list of all entries as String with the fields separated by ":"
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static List<String> getTable(String table){
|
protected static List<String> getTable(String table){
|
||||||
List<String> data = new ArrayList<>();
|
List<String> data = new ArrayList<>();
|
||||||
@ -535,7 +510,6 @@ public class Database {
|
|||||||
* @param header header for the WHERE portion, order should match with values
|
* @param header header for the WHERE portion, order should match with values
|
||||||
* @param values values for the WHERE portion, order should match with header
|
* @param values values for the WHERE portion, order should match with header
|
||||||
* @return a list of the matching data as String separated by ":"
|
* @return a list of the matching data as String separated by ":"
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static List<String> select(String table,String[] header, String[] values){
|
protected static List<String> select(String table,String[] header, String[] values){
|
||||||
List<String> data = new ArrayList<>();
|
List<String> data = new ArrayList<>();
|
||||||
@ -567,7 +541,6 @@ public class Database {
|
|||||||
* @param table the table you want the entry from
|
* @param table the table you want the entry from
|
||||||
* @param id the id of the entry you want
|
* @param id the id of the entry you want
|
||||||
* @return a list of String separated by ":"
|
* @return a list of String separated by ":"
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static List<String> getEntryById(String table, long id){
|
protected static List<String> getEntryById(String table, long id){
|
||||||
List<String> data = new ArrayList<>();
|
List<String> data = new ArrayList<>();
|
||||||
@ -601,7 +574,6 @@ public class Database {
|
|||||||
* @param header the properties you want to count on
|
* @param header the properties you want to count on
|
||||||
* @param values the values for the properties
|
* @param values the values for the properties
|
||||||
* @return the number of found rows
|
* @return the number of found rows
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static int count(String table,String[] header,String[] values){
|
protected static int count(String table,String[] header,String[] values){
|
||||||
String sql = queryBuilder("count",table,header,values);
|
String sql = queryBuilder("count",table,header,values);
|
||||||
@ -620,7 +592,6 @@ public class Database {
|
|||||||
* @param header [0] is used as WHERE, everything else in SET
|
* @param header [0] is used as WHERE, everything else in SET
|
||||||
* @param values [0] is used as WHERE, everything else in SET
|
* @param values [0] is used as WHERE, everything else in SET
|
||||||
* @return number of rows affected or -1 on error
|
* @return number of rows affected or -1 on error
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
protected static int update(String table,String[] header,String[] values){
|
protected static int update(String table,String[] header,String[] values){
|
||||||
try(Connection conn = connect()) {
|
try(Connection conn = connect()) {
|
||||||
|
@ -1,12 +1,10 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
|
@author Malte Schulze Hobeling
|
||||||
|
*/
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
|
||||||
* Food, used by FoodPlan
|
|
||||||
* one constructor is used to create new foods the other is used to create existing foods from database
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public class Food {
|
public class Food {
|
||||||
private long id;
|
private long id;
|
||||||
private String name;
|
private String name;
|
||||||
|
@ -1,19 +1,16 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
|
@author Malte Schulze Hobeling
|
||||||
|
*/
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
|
||||||
* A collection of functions loosely related to food management
|
|
||||||
* Acts as an abstraction layer to the database
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public class FoodMgr {
|
public class FoodMgr {
|
||||||
/**
|
/**
|
||||||
* inserts a food int to the database and creates the food_restriction entries
|
* inserts a food int to the database and creates the food_restriction entries
|
||||||
* @param food the food to be created
|
|
||||||
* @return id of food or -1
|
* @return id of food or -1
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
public static long createFood(Food food){
|
public static long createFood(Food food){
|
||||||
String[] foodH = {"name","description","isDessert","food_typeid"};
|
String[] foodH = {"name","description","isDessert","food_typeid"};
|
||||||
@ -32,9 +29,7 @@ public class FoodMgr {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* inserts a food_plan into the database
|
* inserts a food_plan into the database
|
||||||
* @param foodPlan the foodPlan to be created
|
|
||||||
* @return id of food_plan or -1
|
* @return id of food_plan or -1
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
public static long createFood_plan(FoodPlan foodPlan){
|
public static long createFood_plan(FoodPlan foodPlan){
|
||||||
String[] food_planH = {"date","food1","food2","dessert1","dessert2"};
|
String[] food_planH = {"date","food1","food2","dessert1","dessert2"};
|
||||||
@ -50,7 +45,6 @@ public class FoodMgr {
|
|||||||
* returns all non desserts or all desserts
|
* returns all non desserts or all desserts
|
||||||
* @param isDessert true for only desserts false for non desserts
|
* @param isDessert true for only desserts false for non desserts
|
||||||
* @return a list of all non desserts or all desserts
|
* @return a list of all non desserts or all desserts
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
public static List<Food> getFood(boolean isDessert){
|
public static List<Food> getFood(boolean isDessert){
|
||||||
String[] foodH = {"isDessert"};
|
String[] foodH = {"isDessert"};
|
||||||
@ -68,7 +62,6 @@ public class FoodMgr {
|
|||||||
* getFood but returns only vegan food
|
* getFood but returns only vegan food
|
||||||
* @param isDessert true for only desserts false for non desserts
|
* @param isDessert true for only desserts false for non desserts
|
||||||
* @return a list of all vegan non desserts or all vegan desserts
|
* @return a list of all vegan non desserts or all vegan desserts
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
public static List<Food> getVeganFood(boolean isDessert){
|
public static List<Food> getVeganFood(boolean isDessert){
|
||||||
String[] foodH = {"isDessert","food_typeid"};
|
String[] foodH = {"isDessert","food_typeid"};
|
||||||
@ -86,7 +79,6 @@ public class FoodMgr {
|
|||||||
* returns a food_plan for a day
|
* returns a food_plan for a day
|
||||||
* @param date YYYY-MM-DD one day
|
* @param date YYYY-MM-DD one day
|
||||||
* @return food_plan for date
|
* @return food_plan for date
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
public static FoodPlan getFoodPlan(String date){
|
public static FoodPlan getFoodPlan(String date){
|
||||||
String[] food_planH = {"date"};
|
String[] food_planH = {"date"};
|
||||||
@ -101,17 +93,8 @@ public class FoodMgr {
|
|||||||
return new FoodPlan(Long.parseLong(parts[0]),date,foodVegan,foodSecond,dessertVegan,dessertSecond,isSent);
|
return new FoodPlan(Long.parseLong(parts[0]),date,foodVegan,foodSecond,dessertVegan,dessertSecond,isSent);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* returns a FoodPlan for a given id or null if no unique id was found
|
|
||||||
* @param id id of the FoodPlan
|
|
||||||
* @return FoodPlan or null
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public static FoodPlan getFoodPlanById(long id){
|
public static FoodPlan getFoodPlanById(long id){
|
||||||
List<String> entry = Database.getEntryById("food_plan",id);
|
List<String> entry = Database.getEntryById("food_plan",id);
|
||||||
if(entry.size() != 1){
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
String[] parts = entry.get(0).split(":");
|
String[] parts = entry.get(0).split(":");
|
||||||
Food foodVegan = getFoodById(Long.parseLong(parts[2]));
|
Food foodVegan = getFoodById(Long.parseLong(parts[2]));
|
||||||
Food foodSecond = getFoodById(Long.parseLong(parts[3]));
|
Food foodSecond = getFoodById(Long.parseLong(parts[3]));
|
||||||
@ -121,17 +104,8 @@ public class FoodMgr {
|
|||||||
return new FoodPlan(id,parts[1], foodVegan,foodSecond,dessertVegan,dessertSecond,isSent);
|
return new FoodPlan(id,parts[1], foodVegan,foodSecond,dessertVegan,dessertSecond,isSent);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* returns a Food for a given id or null if no unique id was found
|
|
||||||
* @param id id of the Food
|
|
||||||
* @return Food or null
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public static Food getFoodById(long id){
|
public static Food getFoodById(long id){
|
||||||
List<String> entry = Database.getEntryById("food",id);
|
List<String> entry = Database.getEntryById("food",id);
|
||||||
if(entry.size() != 1){
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
String[] parts = entry.get(0).split(":");
|
String[] parts = entry.get(0).split(":");
|
||||||
String name = parts[1];
|
String name = parts[1];
|
||||||
String description = parts[2];
|
String description = parts[2];
|
||||||
@ -142,44 +116,20 @@ public class FoodMgr {
|
|||||||
return new Food(id,name,description,isDessert,foodType,allergies);
|
return new Food(id,name,description,isDessert,foodType,allergies);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* returns a FoodType for a given id or null if no unique id was found
|
|
||||||
* @param id id of the FoodType
|
|
||||||
* @return FoodType or null
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public static FoodType getFoodTypeById(long id){
|
public static FoodType getFoodTypeById(long id){
|
||||||
List<String> entry = Database.getEntryById("food_type",id);
|
List<String> entry = Database.getEntryById("food_type",id);
|
||||||
if(entry.size() != 1){
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
String[] typeParts = entry.get(0).split(":");
|
String[] typeParts = entry.get(0).split(":");
|
||||||
return new FoodType(Long.parseLong(typeParts[0]),typeParts[1]);
|
return new FoodType(Long.parseLong(typeParts[0]),typeParts[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* returns an Allergy for a given id or null if no unique id was found
|
|
||||||
* @param id id of the Allergy
|
|
||||||
* @return Allergy or null
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public static Allergy getAllergyById(long id){
|
public static Allergy getAllergyById(long id){
|
||||||
String[] allergyH = {"id"};
|
String[] allergyH = {"id"};
|
||||||
String[] allergyD = {String.valueOf(id)};
|
String[] allergyD = {String.valueOf(id)};
|
||||||
List<String> entry = Database.select("allergy",allergyH,allergyD);
|
List<String> allergies = Database.select("allergy",allergyH,allergyD);
|
||||||
if(entry.size() != 1){
|
String[] allergyParts = allergies.get(0).split(":");
|
||||||
return null;
|
|
||||||
}
|
|
||||||
String[] allergyParts = entry.get(0).split(":");
|
|
||||||
return new Allergy(id,allergyParts[1],allergyParts[2]);
|
return new Allergy(id,allergyParts[1],allergyParts[2]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* returns all Allergies for a given foodId
|
|
||||||
* @param foodId the foodId you want the allergies from
|
|
||||||
* @return a List of Allergy, can be empty
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public static List<Allergy> getAllergies(long foodId){
|
public static List<Allergy> getAllergies(long foodId){
|
||||||
List<Allergy> allergies = new ArrayList<>();
|
List<Allergy> allergies = new ArrayList<>();
|
||||||
String[] restrictionsH = {"foodid"};
|
String[] restrictionsH = {"foodid"};
|
||||||
@ -196,12 +146,11 @@ public class FoodMgr {
|
|||||||
* inserts the selected food into food_Selection if the food_plan has not been sent
|
* inserts the selected food into food_Selection if the food_plan has not been sent
|
||||||
* @param food_selectionData childid, food_planid, foodid
|
* @param food_selectionData childid, food_planid, foodid
|
||||||
* @return id or -1
|
* @return id or -1
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
public static long createFood_selection(String[] food_selectionData){
|
public static long createFood_selection(String[] food_selectionData){
|
||||||
String[] food_selectionH = {"childid","food_planid","foodid"};
|
String[] food_selectionH = {"childid","food_planid","foodid"};
|
||||||
FoodPlan food_plan = getFoodPlanById(Long.parseLong(food_selectionData[1]));
|
FoodPlan food_plan = getFoodPlanById(Long.parseLong(food_selectionData[1]));
|
||||||
if(food_plan != null && !food_plan.isSent()){
|
if(!food_plan.isSent()){
|
||||||
return Database.insert("food_selection",food_selectionH,food_selectionData);
|
return Database.insert("food_selection",food_selectionH,food_selectionData);
|
||||||
}else {
|
}else {
|
||||||
return -1;
|
return -1;
|
||||||
@ -212,7 +161,6 @@ public class FoodMgr {
|
|||||||
* accumulates the selected food for a given day and locks the corresponding food_plan
|
* accumulates the selected food for a given day and locks the corresponding food_plan
|
||||||
* @param date YYYY-MM-DD day
|
* @param date YYYY-MM-DD day
|
||||||
* @return the accumulated orders
|
* @return the accumulated orders
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
public static List<String> getDayOrder(String date){
|
public static List<String> getDayOrder(String date){
|
||||||
List<String> orders = new ArrayList<>();
|
List<String> orders = new ArrayList<>();
|
||||||
|
@ -1,10 +1,5 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
|
||||||
/**
|
|
||||||
* FoodPlan
|
|
||||||
* one constructor is used to create new foodPlans the other is used to create existing foodPlans from database
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public class FoodPlan {
|
public class FoodPlan {
|
||||||
private long id;
|
private long id;
|
||||||
private String date;
|
private String date;
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
/**
|
@author Malte Schulze Hobeling
|
||||||
* FoodType used by Food, not intended to be changed
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class FoodType {
|
public class FoodType {
|
||||||
private long id;
|
private long id;
|
||||||
private String name;
|
private String name;
|
||||||
@ -20,5 +19,4 @@ public class FoodType {
|
|||||||
public String getName() {
|
public String getName() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,34 @@
|
|||||||
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
|
||||||
|
import javafx.fxml.FXML;
|
||||||
|
import javafx.scene.control.Alert;
|
||||||
|
import javafx.scene.control.Label;
|
||||||
|
import javafx.scene.control.TextField;
|
||||||
|
|
||||||
|
public class HelloController {
|
||||||
|
/**
|
||||||
|
* @autor: Reshad Meher
|
||||||
|
* Username, Passwort , login
|
||||||
|
*/
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private TextField unsernameEingabe;
|
||||||
|
@FXML
|
||||||
|
private TextField passwortEingabe;
|
||||||
|
@FXML
|
||||||
|
private Label lblAusgabe;
|
||||||
|
@FXML
|
||||||
|
protected void onLoginButtonClick() {
|
||||||
|
String benutzerEingabe = unsernameEingabe.getText();
|
||||||
|
String kennwortEingabe = passwortEingabe.getText();
|
||||||
|
if(benutzerEingabe.contains("Reshad") && kennwortEingabe.contains("test123")){
|
||||||
|
lblAusgabe.setText("Herzlich Willkommen, " + benutzerEingabe + "!");
|
||||||
|
}else {
|
||||||
|
Alert alert = new Alert(Alert.AlertType.ERROR,
|
||||||
|
"Die Benutzername oder Passwort ist falsch");
|
||||||
|
alert.showAndWait();
|
||||||
|
}
|
||||||
|
unsernameEingabe.setText("");
|
||||||
|
passwortEingabe.setText("");
|
||||||
|
}
|
||||||
|
}
|
@ -1,4 +1,3 @@
|
|||||||
/*Reshad Meher*/
|
|
||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
@ -7,8 +6,10 @@ import javafx.scene.Scene;
|
|||||||
import javafx.scene.control.Alert;
|
import javafx.scene.control.Alert;
|
||||||
import javafx.scene.control.PasswordField;
|
import javafx.scene.control.PasswordField;
|
||||||
import javafx.scene.control.TextField;
|
import javafx.scene.control.TextField;
|
||||||
import java.io.IOException;
|
import javafx.stage.Stage;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.HashMap;
|
||||||
|
|
||||||
public class LoginController {
|
public class LoginController {
|
||||||
@FXML
|
@FXML
|
||||||
@ -16,27 +17,27 @@ public class LoginController {
|
|||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private PasswordField pfPassword;
|
private PasswordField pfPassword;
|
||||||
|
|
||||||
|
HashMap<String,String> benutzerMap = new HashMap<String,String>();
|
||||||
@FXML
|
@FXML
|
||||||
protected void onBtLoginClick() throws IOException {
|
protected void onBtLoginClick() throws IOException {
|
||||||
|
benutzerMap.put("Reshad","1234");
|
||||||
String email = tfEmail.getText();
|
String email = tfEmail.getText();
|
||||||
String password = pfPassword.getText();
|
String password = pfPassword.getText();
|
||||||
long loginPruefen = AccountMgr.login(email,password);
|
if(benutzerMap.containsKey(email) && benutzerMap.containsValue(password)){
|
||||||
if(loginPruefen > 0){
|
// if user is worker: StartViewApplication.changeScene("workerMenu-view.fxml");
|
||||||
FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("menue-view.fxml"));
|
StartViewApplication.changeScene("parentMenu-view.fxml");
|
||||||
Scene scene = new Scene(fxmlLoader.load(), 950,700);
|
|
||||||
StartViewApplication.primary.setScene(scene);
|
|
||||||
}else {
|
}else {
|
||||||
Alert alert = new Alert(Alert.AlertType.ERROR,"Email oder Passwort ist falsch");
|
Alert alert = new Alert(Alert.AlertType.ERROR,"Email oder Passwort ist falsch");
|
||||||
alert.showAndWait();
|
alert.showAndWait();
|
||||||
}
|
}
|
||||||
|
|
||||||
tfEmail.setText("");
|
tfEmail.setText("");
|
||||||
pfPassword.setText("");
|
pfPassword.setText("");
|
||||||
}
|
}
|
||||||
@FXML
|
@FXML
|
||||||
protected void onBtSingnupClick() throws IOException {
|
protected void changeToSignUp() throws IOException {
|
||||||
FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("signUp-view.fxml"));
|
StartViewApplication.changeScene("signUp-view.fxml");
|
||||||
Scene scene = new Scene(fxmlLoader.load(), 950,700);
|
|
||||||
StartViewApplication.primary.setScene(scene);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
|
@author Malte Schulze Hobeling
|
||||||
|
*/
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
|
||||||
* one constructor is used to create new parents the other is used to create existing parents from database
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public class Parent extends User{
|
public class Parent extends User{
|
||||||
List<Child> children;
|
List<Child> children;
|
||||||
|
|
||||||
|
@ -1,78 +1,6 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
|
||||||
import javafx.fxml.FXML;
|
|
||||||
import javafx.fxml.FXMLLoader;
|
|
||||||
import javafx.scene.control.Button;
|
|
||||||
import javafx.scene.layout.BorderPane;
|
|
||||||
import org.w3c.dom.events.MouseEvent;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
public class ParentController{
|
public class ParentController{
|
||||||
|
|
||||||
@FXML
|
|
||||||
BorderPane contentView;
|
|
||||||
@FXML
|
|
||||||
Button essensplanButton;
|
|
||||||
@FXML
|
|
||||||
Button kinderButton;
|
|
||||||
@FXML
|
|
||||||
Button bestellungButton;
|
|
||||||
@FXML
|
|
||||||
Button einstellungenButton;
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
public void initialize() {
|
|
||||||
changePage("menue-view.fxml");
|
|
||||||
setButtonActive(essensplanButton);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
public void onEssensplanClick(MouseEvent mouseEvent) {
|
|
||||||
setButtonActive(essensplanButton);
|
|
||||||
changePage("menue-view.fxml");
|
|
||||||
}
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
public void onKinderClick(MouseEvent mouseEvent) {
|
|
||||||
setButtonActive(kinderButton);
|
|
||||||
changePage("child-view.fxml");
|
|
||||||
}
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
public void onBestellungClick(MouseEvent mouseEvent) {
|
|
||||||
setButtonActive(bestellungButton);
|
|
||||||
changePage("orderHistory-view.fxml");
|
|
||||||
}
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
public void onEinstellungenClick(MouseEvent mouseEvent) {
|
|
||||||
setButtonActive(einstellungenButton);
|
|
||||||
changePage("SettingsMenue.fxml");
|
|
||||||
}
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
public void onAusloggenClick(MouseEvent mouseEvent) throws IOException {
|
|
||||||
AccountMgr.currentUser = null;
|
|
||||||
StartViewApplication.changeScene("login-view.fxml");
|
|
||||||
}
|
|
||||||
|
|
||||||
private void changePage(String page) {
|
|
||||||
try {
|
|
||||||
Parent root = FXMLLoader.load(getClass().getResource(page));
|
|
||||||
//contentView.setCenter(root);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setButtonActive(Button b) {
|
|
||||||
einstellungenButton.getStyleClass().remove("active");
|
|
||||||
kinderButton.getStyleClass().remove("active");
|
|
||||||
bestellungButton.getStyleClass().remove("active");
|
|
||||||
essensplanButton.getStyleClass().remove("active");
|
|
||||||
b.getStyleClass().add("active");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
@ -0,0 +1,12 @@
|
|||||||
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
|
||||||
|
import javafx.fxml.FXMLLoader;
|
||||||
|
import javafx.scene.Parent;
|
||||||
|
import javafx.scene.Scene;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
public class SceneController {
|
||||||
|
|
||||||
|
}
|
@ -1,144 +1,4 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
/**
|
|
||||||
* @autor Reshad Meher
|
|
||||||
*/
|
|
||||||
|
|
||||||
import javafx.fxml.FXML;
|
|
||||||
import javafx.fxml.FXMLLoader;
|
|
||||||
import javafx.scene.Scene;
|
|
||||||
import javafx.scene.control.Alert;
|
|
||||||
import javafx.scene.control.TextField;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
public class SettingsController {
|
public class SettingsController {
|
||||||
|
|
||||||
@FXML
|
|
||||||
private TextField tfOldPassword;
|
|
||||||
@FXML
|
|
||||||
private TextField tfNewPassword;
|
|
||||||
@FXML
|
|
||||||
private TextField tfConfirmNewPasword;
|
|
||||||
@FXML
|
|
||||||
private TextField tfPostCode;
|
|
||||||
@FXML
|
|
||||||
private TextField tfStreet;
|
|
||||||
@FXML
|
|
||||||
private TextField tfCity;
|
|
||||||
@FXML
|
|
||||||
private TextField tfHousNumber;
|
|
||||||
|
|
||||||
Alert alert;
|
|
||||||
@FXML
|
|
||||||
private void onPasswordChangClick(){
|
|
||||||
String oldPassword = tfOldPassword.getText();
|
|
||||||
String newPassword = tfNewPassword.getText();
|
|
||||||
String confirmNewPassword = tfConfirmNewPasword.getText();
|
|
||||||
if(!oldPassword.isEmpty() && !newPassword.isEmpty() && !confirmNewPassword.isEmpty()){
|
|
||||||
if(!newPassword.equals(confirmNewPassword)){
|
|
||||||
alert = new Alert(Alert.AlertType.WARNING);
|
|
||||||
alert.setTitle("Passwort");
|
|
||||||
alert.setHeaderText("Ihre neue Passwort und Bestätigung passt nicht. Nochmal versuchen");
|
|
||||||
alert.showAndWait();
|
|
||||||
}else {
|
|
||||||
User userPassword = new User(newPassword);
|
|
||||||
long UpdateUserPassword = AccountMgr.updatePassword(userPassword);
|
|
||||||
if (UpdateUserPassword > 0){
|
|
||||||
alert.setTitle("Passwort");
|
|
||||||
alert.setHeaderText("Ihre Passwort erfolgreich geändert");
|
|
||||||
alert.showAndWait();
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
alert.setTitle("Passwort");
|
|
||||||
alert.setHeaderText("nei");
|
|
||||||
alert.showAndWait();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tfOldPassword.setText("");
|
|
||||||
tfNewPassword.setText("");
|
|
||||||
tfConfirmNewPasword.setText("");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if(oldPassword.isEmpty()){
|
|
||||||
alert = new Alert(Alert.AlertType.WARNING);
|
|
||||||
alert.setTitle("Passwort");
|
|
||||||
alert.setHeaderText("Ihre aktuelles Passwort ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
}else if(newPassword.isEmpty()){
|
|
||||||
alert = new Alert(Alert.AlertType.WARNING);
|
|
||||||
alert.setTitle("Passwort");
|
|
||||||
alert.setHeaderText("Ihre neues Passwort ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
}if(confirmNewPassword.isEmpty()){
|
|
||||||
alert = new Alert(Alert.AlertType.WARNING);
|
|
||||||
alert.setTitle("Passwort");
|
|
||||||
alert.setHeaderText("Ihre neue Passwort Bestätigung ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
}else{
|
|
||||||
alert = new Alert(Alert.AlertType.WARNING);
|
|
||||||
alert.setTitle("Passwort");
|
|
||||||
alert.setHeaderText("Ihre Passwort wurde nicht geändert");
|
|
||||||
alert.showAndWait();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
private void onChangAdressClick(){
|
|
||||||
String postCode = tfPostCode.getText();
|
|
||||||
String street = tfStreet.getText();
|
|
||||||
String city = tfCity.getText();
|
|
||||||
String housNumber = tfHousNumber.getText();
|
|
||||||
if (!postCode.isEmpty() && !street.isEmpty() && !city.isEmpty() && !housNumber.isEmpty()) {
|
|
||||||
Address userAdress = new Address(street,housNumber,postCode,city);
|
|
||||||
long UpdateUserAdress = AccountMgr.updateAdreess(userAdress);
|
|
||||||
if (UpdateUserAdress > 0) {
|
|
||||||
alert.setTitle("Adresse");
|
|
||||||
alert.setHeaderText("Ihre Adresse erfolgreich geändert");
|
|
||||||
alert.showAndWait();
|
|
||||||
|
|
||||||
tfPostCode.setText("");
|
|
||||||
tfStreet.setText("");
|
|
||||||
tfCity.setText("");
|
|
||||||
tfHousNumber.setText("");
|
|
||||||
}
|
|
||||||
|
|
||||||
}else {
|
|
||||||
if (postCode.isEmpty()) {
|
|
||||||
alert = new Alert(Alert.AlertType.WARNING);
|
|
||||||
alert.setTitle("Adresse");
|
|
||||||
alert.setHeaderText("Postleitzahl ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
} else if (street.isEmpty()) {
|
|
||||||
alert = new Alert(Alert.AlertType.WARNING);
|
|
||||||
alert.setTitle("Adresse");
|
|
||||||
alert.setHeaderText("Straß ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
} else if (city.isEmpty()) {
|
|
||||||
alert = new Alert(Alert.AlertType.WARNING);
|
|
||||||
alert.setTitle("Adresse");
|
|
||||||
alert.setHeaderText("Statd ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
} else if (housNumber.isEmpty()) {
|
|
||||||
alert = new Alert(Alert.AlertType.WARNING);
|
|
||||||
alert.setTitle("Adresse");
|
|
||||||
alert.setHeaderText("Hausnumer ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
} else {
|
|
||||||
alert = new Alert(Alert.AlertType.WARNING);
|
|
||||||
alert.setTitle("Adresse");
|
|
||||||
alert.setHeaderText("Ihre Adresse wurde nicht geändert");
|
|
||||||
alert.showAndWait();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@FXML
|
|
||||||
private void onLogOutBtClick() throws IOException{
|
|
||||||
|
|
||||||
FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
|
|
||||||
Scene scene = new Scene(fxmlLoader.load(), 950,700);
|
|
||||||
StartViewApplication.primary.setScene(scene);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,95 +1,27 @@
|
|||||||
|
/** Reshad Meher*/
|
||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.fxml.FXMLLoader;
|
import javafx.fxml.FXMLLoader;
|
||||||
import javafx.scene.Scene;
|
import javafx.scene.Scene;
|
||||||
import javafx.scene.control.Alert;
|
import javafx.scene.control.Alert;
|
||||||
import javafx.scene.control.PasswordField;
|
import javafx.scene.control.PasswordField;
|
||||||
import javafx.scene.control.TextField;
|
import javafx.scene.control.TextField;
|
||||||
|
import javafx.stage.Stage;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.HashMap;
|
||||||
|
|
||||||
public class SingUpController {
|
public class SingUpController {
|
||||||
@FXML
|
|
||||||
private TextField tfLastName;
|
|
||||||
@FXML
|
|
||||||
private TextField tfFirstName;
|
|
||||||
@FXML
|
|
||||||
private TextField tfEmail;
|
|
||||||
@FXML
|
|
||||||
private PasswordField pfPassword;
|
|
||||||
@FXML
|
|
||||||
private TextField tfPostCode;
|
|
||||||
@FXML
|
|
||||||
private TextField tfCity;
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
private TextField tfStreet;
|
|
||||||
@FXML
|
|
||||||
private TextField tfHousNumber;
|
|
||||||
@FXML
|
@FXML
|
||||||
private void onKontoErstellenBtClick(){
|
private void onKontoErstellenBtClick(){
|
||||||
String lastName = tfLastName.getText();
|
|
||||||
String firstNanme = tfFirstName.getText();
|
|
||||||
String email = tfEmail.getText();
|
|
||||||
String password = pfPassword.getText();
|
|
||||||
String postCode = tfPostCode.getText();
|
|
||||||
String city = tfCity.getText();
|
|
||||||
String street = tfStreet.getText();
|
|
||||||
String housNumber = tfHousNumber.getText();
|
|
||||||
Alert alert;
|
|
||||||
if(lastName.isEmpty() || firstNanme.isEmpty() || email.isEmpty() || password.isEmpty() || postCode.isEmpty() ||
|
|
||||||
city.isEmpty() || street.isEmpty() || housNumber.isEmpty()){
|
|
||||||
|
|
||||||
if(lastName.isEmpty()){
|
|
||||||
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Name' ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
} else if (firstNanme.isEmpty()) {
|
|
||||||
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Vorname' ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
} else if (email.isEmpty()) {
|
|
||||||
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'E-Mail' ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
} else if (password.isEmpty()) {
|
|
||||||
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Passwort' ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
} else if (postCode.isEmpty()) {
|
|
||||||
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Postleitzahl' ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
} else if (city.isEmpty()) {
|
|
||||||
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Stadt' ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
} else if (street.isEmpty()) {
|
|
||||||
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Straße' ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
}else {
|
|
||||||
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Hausnummer' ist leer.");
|
|
||||||
alert.showAndWait();
|
|
||||||
}
|
|
||||||
|
|
||||||
}else {
|
|
||||||
Address newAdresse = new Address(street,housNumber,postCode,city);
|
|
||||||
User newUser = new User(lastName,firstNanme,password,email,newAdresse);
|
|
||||||
long creatNewUser = AccountMgr.createUser(newUser);
|
|
||||||
if (creatNewUser > 0){
|
|
||||||
alert = new Alert(Alert.AlertType.CONFIRMATION,"Ihrer Daten wurde gespeichert.");
|
|
||||||
alert.showAndWait();
|
|
||||||
}
|
|
||||||
tfLastName.setText("");
|
|
||||||
tfFirstName.setText("");
|
|
||||||
tfEmail.setText("");
|
|
||||||
pfPassword.setText("");
|
|
||||||
tfPostCode.setText("");
|
|
||||||
tfCity.setText("");
|
|
||||||
tfStreet.setText("");
|
|
||||||
tfHousNumber.setText("");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private void onAnmeldenBtClick() throws IOException {
|
private void onAnmeldenBtClick() throws IOException {
|
||||||
FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
|
|
||||||
Scene scene = new Scene(fxmlLoader.load(), 950,700);
|
|
||||||
StartViewApplication.primary.setScene(scene);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
|
||||||
|
public class StartPageController {
|
||||||
|
}
|
@ -15,12 +15,11 @@ import java.io.IOException;
|
|||||||
|
|
||||||
public class StartViewApplication extends Application {
|
public class StartViewApplication extends Application {
|
||||||
public static Stage primary;
|
public static Stage primary;
|
||||||
public static boolean firstLaunch;
|
|
||||||
@Override
|
@Override
|
||||||
public void start(Stage stage) throws IOException {
|
public void start(Stage stage) throws IOException {
|
||||||
//FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource((firstLaunch) ? "signUp-view.fxml" : "login-view.fxml"));
|
FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
|
||||||
FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource((firstLaunch) ? "settingsMenue.fxml" : "settingsMenue.fxml"));
|
Scene scene = new Scene(fxmlLoader.load(), 1200, 750);
|
||||||
Scene scene = new Scene(fxmlLoader.load(), 1220, 790);
|
|
||||||
primary = stage;
|
primary = stage;
|
||||||
stage.setTitle("Essen Bestellung im Kindergarten");
|
stage.setTitle("Essen Bestellung im Kindergarten");
|
||||||
stage.setScene(scene);
|
stage.setScene(scene);
|
||||||
@ -28,7 +27,6 @@ public class StartViewApplication extends Application {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
firstLaunch = Database.init();
|
|
||||||
Database.init();
|
Database.init();
|
||||||
Database.createDb();
|
Database.createDb();
|
||||||
Database.fillDb();
|
Database.fillDb();
|
||||||
@ -37,7 +35,7 @@ public class StartViewApplication extends Application {
|
|||||||
launch();
|
launch();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void changeScene(String scene) throws IOException{
|
public static void changeScene(String scene) throws IOException {
|
||||||
Parent p = FXMLLoader.load(StartViewApplication.class.getResource(scene));
|
Parent p = FXMLLoader.load(StartViewApplication.class.getResource(scene));
|
||||||
primary.getScene().setRoot(p);
|
primary.getScene().setRoot(p);
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,5 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
|
||||||
/**
|
|
||||||
* Acts as a launcher required to make it a .jar
|
|
||||||
* It is also used to select either the cli or the gui depending on starting arguments
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
|
||||||
public class SuperMain {
|
public class SuperMain {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
if(args.length > 0){
|
if(args.length > 0){
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
/**
|
@author Malte Schulze Hobeling
|
||||||
* one constructor is used to create new users the other is used to create existing users from database
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class User {
|
public class User {
|
||||||
private long id;
|
private long id;
|
||||||
private String name;
|
private String name;
|
||||||
@ -28,9 +27,6 @@ public class User {
|
|||||||
this.email = email;
|
this.email = email;
|
||||||
this.address = address;
|
this.address = address;
|
||||||
}
|
}
|
||||||
public User (String password){
|
|
||||||
this.password = password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public long getId() {
|
public long getId() {
|
||||||
return id;
|
return id;
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
package com.bib.essensbestellungsverwaltung;
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
/*
|
||||||
/**
|
@author Malte Schulze Hobeling
|
||||||
* one constructor is used to create new worker the other is used to create existing worker from database
|
|
||||||
* @author Malte Schulze Hobeling
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class Worker extends User{
|
public class Worker extends User{
|
||||||
public Worker(long id, String name, String firstname, String password, String email, Address address) {
|
public Worker(long id, String name, String firstname, String password, String email, Address address) {
|
||||||
super(id, name, firstname, password, email, address);
|
super(id, name, firstname, password, email, address);
|
||||||
|
@ -0,0 +1,95 @@
|
|||||||
|
package com.bib.essensbestellungsverwaltung;
|
||||||
|
|
||||||
|
import javafx.fxml.FXML;
|
||||||
|
import javafx.fxml.FXMLLoader;
|
||||||
|
import javafx.scene.Parent;
|
||||||
|
import javafx.scene.control.Button;
|
||||||
|
import javafx.scene.input.MouseEvent;
|
||||||
|
import javafx.scene.layout.BorderPane;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
public class WorkerMenuController {
|
||||||
|
@FXML
|
||||||
|
public BorderPane contentView;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
Button tagesbestellungButton;
|
||||||
|
@FXML
|
||||||
|
Button wochenplanButton;
|
||||||
|
@FXML
|
||||||
|
Button monatsabrechnungButton;
|
||||||
|
@FXML
|
||||||
|
Button mitarbeiterButton;
|
||||||
|
@FXML
|
||||||
|
Button mahlzeitButton;
|
||||||
|
@FXML
|
||||||
|
Button einstellungenButton;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public void initialize() {
|
||||||
|
changePage("menue-view.fxml");
|
||||||
|
setButtonActive(tagesbestellungButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public void onTagesbestellungenClick(MouseEvent mouseEvent) {
|
||||||
|
changePage("menue-view.fxml");
|
||||||
|
setButtonActive(tagesbestellungButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public void onWochenplanClick(MouseEvent mouseEvent) {
|
||||||
|
changePage("createFoodplan-view.fxml");
|
||||||
|
setButtonActive(wochenplanButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public void onMonatsabrechnungClick(MouseEvent mouseEvent) {
|
||||||
|
changePage("invoice-view.fxml");
|
||||||
|
setButtonActive(monatsabrechnungButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public void onMitarbeiterClick(MouseEvent mouseEvent) {
|
||||||
|
changePage("createCoworker-view.fxml");
|
||||||
|
setButtonActive(mitarbeiterButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public void onMahlzeitClick(MouseEvent mouseEvent) {
|
||||||
|
changePage("createFood-view.fxml");
|
||||||
|
setButtonActive(mahlzeitButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void onEinstellungenClick(MouseEvent mouseEvent) {
|
||||||
|
setButtonActive(einstellungenButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public void onAusloggenClick(MouseEvent mouseEvent) throws IOException {
|
||||||
|
StartViewApplication.changeScene("parentMenu-view.fxml");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void changePage(String page) {
|
||||||
|
try {
|
||||||
|
Parent root = FXMLLoader.load(getClass().getResource(page));
|
||||||
|
contentView.setCenter(root);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setButtonActive(Button b) {
|
||||||
|
tagesbestellungButton.getStyleClass().remove("active");
|
||||||
|
monatsabrechnungButton.getStyleClass().remove("active");
|
||||||
|
wochenplanButton.getStyleClass().remove("active");
|
||||||
|
mahlzeitButton.getStyleClass().remove("active");
|
||||||
|
mitarbeiterButton.getStyleClass().remove("active");
|
||||||
|
einstellungenButton.getStyleClass().remove("active");
|
||||||
|
b.getStyleClass().add("active");
|
||||||
|
}
|
||||||
|
}
|
@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
<?import javafx.geometry.Insets?>
|
<?import javafx.geometry.Insets?>
|
||||||
<?import javafx.scene.control.Button?>
|
<?import javafx.scene.control.Button?>
|
||||||
<?import javafx.scene.control.CheckBox?>
|
<?import javafx.scene.control.ComboBox?>
|
||||||
<?import javafx.scene.control.ChoiceBox?>
|
<?import javafx.scene.control.DatePicker?>
|
||||||
<?import javafx.scene.control.Label?>
|
<?import javafx.scene.control.ListView?>
|
||||||
<?import javafx.scene.control.TextField?>
|
<?import javafx.scene.control.TextField?>
|
||||||
<?import javafx.scene.layout.AnchorPane?>
|
<?import javafx.scene.layout.AnchorPane?>
|
||||||
<?import javafx.scene.layout.HBox?>
|
<?import javafx.scene.layout.HBox?>
|
||||||
@ -19,20 +19,30 @@
|
|||||||
<Font size="58.0" />
|
<Font size="58.0" />
|
||||||
</font>
|
</font>
|
||||||
</Text>
|
</Text>
|
||||||
<HBox id="contentContainer" alignment="CENTER" layoutX="8.0" layoutY="165.0" prefHeight="127.0" prefWidth="937.0">
|
<HBox id="contentContainer" alignment="CENTER" layoutX="48.0" layoutY="244.0" prefHeight="250.0" prefWidth="770.0">
|
||||||
<children>
|
<children>
|
||||||
<VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
|
<VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
|
||||||
<children>
|
<children>
|
||||||
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Vorname">
|
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Name">
|
||||||
<VBox.margin>
|
<VBox.margin>
|
||||||
<Insets bottom="15.0" top="15.0" />
|
<Insets bottom="15.0" top="15.0" />
|
||||||
</VBox.margin>
|
</VBox.margin>
|
||||||
</Text>
|
</Text>
|
||||||
<TextField fx:id="firstName" prefWidth="97.0">
|
<TextField prefWidth="97.0">
|
||||||
<VBox.margin>
|
<VBox.margin>
|
||||||
<Insets bottom="15.0" top="15.0" />
|
<Insets bottom="15.0" top="15.0" />
|
||||||
</VBox.margin>
|
</VBox.margin>
|
||||||
</TextField>
|
</TextField>
|
||||||
|
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Geburtsdatum">
|
||||||
|
<VBox.margin>
|
||||||
|
<Insets bottom="15.0" top="15.0" />
|
||||||
|
</VBox.margin>
|
||||||
|
</Text>
|
||||||
|
<DatePicker prefHeight="26.0" prefWidth="226.0">
|
||||||
|
<VBox.margin>
|
||||||
|
<Insets top="13.0" />
|
||||||
|
</VBox.margin>
|
||||||
|
</DatePicker>
|
||||||
</children>
|
</children>
|
||||||
<HBox.margin>
|
<HBox.margin>
|
||||||
<Insets left="15.0" right="15.0" />
|
<Insets left="15.0" right="15.0" />
|
||||||
@ -40,16 +50,44 @@
|
|||||||
</VBox>
|
</VBox>
|
||||||
<VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
|
<VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
|
||||||
<children>
|
<children>
|
||||||
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Nachname">
|
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Alter">
|
||||||
<VBox.margin>
|
<VBox.margin>
|
||||||
<Insets bottom="15.0" top="15.0" />
|
<Insets bottom="15.0" top="15.0" />
|
||||||
</VBox.margin>
|
</VBox.margin>
|
||||||
</Text>
|
</Text>
|
||||||
<TextField fx:id="lastName" prefWidth="97.0">
|
<TextField prefWidth="97.0">
|
||||||
<VBox.margin>
|
<VBox.margin>
|
||||||
<Insets bottom="15.0" top="15.0" />
|
<Insets bottom="15.0" top="15.0" />
|
||||||
</VBox.margin>
|
</VBox.margin>
|
||||||
</TextField>
|
</TextField>
|
||||||
|
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Gruppe">
|
||||||
|
<VBox.margin>
|
||||||
|
<Insets bottom="15.0" top="15.0" />
|
||||||
|
</VBox.margin>
|
||||||
|
</Text>
|
||||||
|
<ComboBox prefHeight="26.0" prefWidth="230.0">
|
||||||
|
<VBox.margin>
|
||||||
|
<Insets top="13.0" />
|
||||||
|
</VBox.margin>
|
||||||
|
</ComboBox>
|
||||||
|
</children>
|
||||||
|
<HBox.margin>
|
||||||
|
<Insets left="15.0" right="15.0" />
|
||||||
|
</HBox.margin>
|
||||||
|
</VBox>
|
||||||
|
<VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
|
||||||
|
<children>
|
||||||
|
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Allergien">
|
||||||
|
<VBox.margin>
|
||||||
|
<Insets bottom="15.0" top="15.0" />
|
||||||
|
</VBox.margin>
|
||||||
|
</Text>
|
||||||
|
<ListView prefHeight="101.0" prefWidth="227.0" />
|
||||||
|
<TextField id="tfAddAllergy" promptText="Allergie hinzufügen">
|
||||||
|
<VBox.margin>
|
||||||
|
<Insets top="15.0" />
|
||||||
|
</VBox.margin>
|
||||||
|
</TextField>
|
||||||
</children>
|
</children>
|
||||||
<HBox.margin>
|
<HBox.margin>
|
||||||
<Insets left="15.0" right="15.0" />
|
<Insets left="15.0" right="15.0" />
|
||||||
@ -57,19 +95,6 @@
|
|||||||
</VBox>
|
</VBox>
|
||||||
</children>
|
</children>
|
||||||
</HBox>
|
</HBox>
|
||||||
<Button id="btAddChild" fx:id="kindHinzufügenButton" layoutX="779.0" layoutY="646.0" mnemonicParsing="false" onAction="#onKindHinzufügen" prefHeight="26.0" prefWidth="125.0" text="Kind hinzufügen" />
|
<Button id="btAddChild" layoutX="360.0" layoutY="592.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="146.0" text="Kind hinzufügen" />
|
||||||
<ChoiceBox fx:id="childChoiceBox" layoutX="704.0" layoutY="62.0" onAction="#onSelectChild" prefWidth="150.0" />
|
|
||||||
<Label layoutX="704.0" layoutY="44.0" text="Kind" />
|
|
||||||
<VBox id="contentContainer" layoutX="493.0" layoutY="330.0" prefHeight="250.0" prefWidth="256.0" spacing="20.0">
|
|
||||||
<children>
|
|
||||||
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Allergien">
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets bottom="15.0" top="15.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
</Text>
|
|
||||||
<CheckBox fx:id="allergienComboBox" prefHeight="18.0" prefWidth="200.0" />
|
|
||||||
</children>
|
|
||||||
</VBox>
|
|
||||||
<Button id="btAddChild" fx:id="kindLoeschenButton" layoutX="621.0" layoutY="646.0" mnemonicParsing="false" onAction="#onKindLoeschen" prefHeight="26.0" prefWidth="125.0" text="Kind löschen" />
|
|
||||||
</children>
|
</children>
|
||||||
</AnchorPane>
|
</AnchorPane>
|
||||||
|
@ -23,5 +23,4 @@
|
|||||||
<Button id="btDeletConfim" layoutX="390.0" layoutY="315.0" mnemonicParsing="false" prefHeight="53.0" prefWidth="141.0" text="Bestätigen" />
|
<Button id="btDeletConfim" layoutX="390.0" layoutY="315.0" mnemonicParsing="false" prefHeight="53.0" prefWidth="141.0" text="Bestätigen" />
|
||||||
<Button id="btDeleteDeny" layoutX="71.0" layoutY="315.0" mnemonicParsing="false" prefHeight="53.0" prefWidth="141.0" text="zurück" />
|
<Button id="btDeleteDeny" layoutX="71.0" layoutY="315.0" mnemonicParsing="false" prefHeight="53.0" prefWidth="141.0" text="zurück" />
|
||||||
</children>
|
</children>
|
||||||
|
|
||||||
</AnchorPane>
|
</AnchorPane>
|
||||||
|
@ -0,0 +1,30 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<?import javafx.geometry.Insets?>
|
||||||
|
<?import javafx.scene.control.Label?>
|
||||||
|
<?import javafx.scene.control.Button?>
|
||||||
|
<?import javafx.scene.control.TextField?>
|
||||||
|
<?import javafx.scene.layout.GridPane?>
|
||||||
|
<?import javafx.scene.control.PasswordField?>
|
||||||
|
<GridPane hgap="10.0" vgap="10.0"
|
||||||
|
xmlns:fx="http://javafx.com/fxml/1"
|
||||||
|
xmlns="http://javafx.com/javafx/11.0.2"
|
||||||
|
fx:controller="com.bib.essensbestellungsverwaltung.HelloController">
|
||||||
|
<padding>
|
||||||
|
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
|
||||||
|
</padding>
|
||||||
|
<Label text="Bitte geben Sie Ihre Anmeldedaten ein."
|
||||||
|
GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="0" />
|
||||||
|
<Label text="Benutzername:"
|
||||||
|
GridPane.columnIndex="0" GridPane.rowIndex="1" />
|
||||||
|
<TextField fx:id="unsernameEingabe"
|
||||||
|
GridPane.columnIndex="1" GridPane.rowIndex="1"/>
|
||||||
|
<Label text="Passwort:"
|
||||||
|
GridPane.columnIndex="0" GridPane.rowIndex="2" />
|
||||||
|
<PasswordField fx:id="passwortEingabe"
|
||||||
|
GridPane.columnIndex="1" GridPane.rowIndex="2"/>
|
||||||
|
<Button text="LOGIN" onAction="#onLoginButtonClick"
|
||||||
|
GridPane.columnIndex="1" GridPane.rowIndex="3" />
|
||||||
|
<Label fx:id="lblAusgabe"
|
||||||
|
GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="4"/>
|
||||||
|
</GridPane>
|
@ -56,7 +56,7 @@
|
|||||||
<font>
|
<font>
|
||||||
<Font name="Microsoft Tai Le Bold" size="12.0" />
|
<Font name="Microsoft Tai Le Bold" size="12.0" />
|
||||||
</font></Button>
|
</font></Button>
|
||||||
<Button id="btSignUp" mnemonicParsing="false" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Sign up" textFill="#7c7b7b" underline="true" onAction="#onBtSingnupClick" />
|
<Button id="btSignUp" mnemonicParsing="false" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Sign up" textFill="#7c7b7b" underline="true" onAction="#changeToSignUp" />
|
||||||
</children>
|
</children>
|
||||||
</HBox>
|
</HBox>
|
||||||
</children>
|
</children>
|
||||||
|
@ -32,9 +32,9 @@
|
|||||||
</Label>
|
</Label>
|
||||||
<VBox prefHeight="200.0" prefWidth="100.0">
|
<VBox prefHeight="200.0" prefWidth="100.0">
|
||||||
<children>
|
<children>
|
||||||
<Button id="btFoodChoice" fx:id="btFirstMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 1" />
|
<Button id="btFoodChoice" fx:id="btFirstMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
|
||||||
<Button id="btFoodChoice" fx:id="btSecondMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 2" />
|
<Button id="btFoodChoice" fx:id="btSecondMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
|
||||||
<Button id="btFoodChoice" fx:id="btNoMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" text="Keine Mahlzeit">
|
<Button id="btFoodChoice" fx:id="btNoMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
|
||||||
<VBox.margin>
|
<VBox.margin>
|
||||||
<Insets bottom="20.0" />
|
<Insets bottom="20.0" />
|
||||||
</VBox.margin>
|
</VBox.margin>
|
||||||
|
@ -1,33 +1,10 @@
|
|||||||
#btFoodChoice{
|
.sidebar-nav_button {
|
||||||
-fx-background-color: transparent;
|
-fx-background-color: #69b6ff;
|
||||||
|
-fx-text-fill: #123;
|
||||||
|
-fx-border-color: #000;
|
||||||
|
-fx-border-radius: 20;
|
||||||
|
}
|
||||||
|
.sidebar-nav_button.active {
|
||||||
|
-fx-background-color: #4e92b4;
|
||||||
}
|
}
|
||||||
|
|
||||||
#btFoodChoice:hover{
|
|
||||||
-fx-underline: true;
|
|
||||||
-fx-text-fill: black;
|
|
||||||
}
|
|
||||||
#btPlaceOrder{
|
|
||||||
-fx-background-color: lightblue;
|
|
||||||
-fx-text-fill: white;
|
|
||||||
-fx-background-radius: 25;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#btPlaceOrder:hover{
|
|
||||||
-fx-border-width: 0;
|
|
||||||
-fx-text-fill: black;
|
|
||||||
-fx-underline: true;
|
|
||||||
}
|
|
||||||
|
|
||||||
#cbChooseChild{
|
|
||||||
-fx-background-color: lightgray;
|
|
||||||
}
|
|
||||||
.btFood{
|
|
||||||
-fx-background-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btFood.active{
|
|
||||||
-fx-background-color: rgba(97, 97, 232, 0.3);
|
|
||||||
-fx-background-radius: 25;
|
|
||||||
}
|
|
@ -9,93 +9,74 @@
|
|||||||
<?import javafx.scene.layout.VBox?>
|
<?import javafx.scene.layout.VBox?>
|
||||||
<?import javafx.scene.text.Font?>
|
<?import javafx.scene.text.Font?>
|
||||||
|
|
||||||
<?import javafx.scene.layout.BorderPane?>
|
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" stylesheets="parentMenue.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
|
||||||
<?import javafx.scene.layout.Region?>
|
|
||||||
<BorderPane fx:id="contentView" prefHeight="750.0" prefWidth="1200.0" stylesheets="@menue.css"
|
|
||||||
xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1"
|
|
||||||
fx:controller="com.bib.essensbestellungsverwaltung.ParentMenuController">
|
|
||||||
<left>
|
|
||||||
<VBox alignment="TOP_CENTER" prefHeight="750.0" prefWidth="350.0" spacing="10.0"
|
|
||||||
style="-fx-background-color: #69b6ff; -fx-padding: 20;" BorderPane.alignment="CENTER">
|
|
||||||
<children>
|
<children>
|
||||||
<Button fx:id="essensplanButton" alignment="CENTER_LEFT" mnemonicParsing="false"
|
<VBox id="contentContainer" layoutY="-14.0" prefHeight="814.0" prefWidth="333.0" stylesheets="@parentMenue.css">
|
||||||
onMouseClicked="#onEssensplanClick" prefHeight="60.0" prefWidth="250.0"
|
<children>
|
||||||
styleClass="sidebar-nav_button" text="Essensplan">
|
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="327.0">
|
||||||
<font>
|
<children>
|
||||||
<Font size="20.0"/>
|
<ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
|
||||||
</font>
|
|
||||||
<graphic>
|
|
||||||
<ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
|
|
||||||
<image>
|
<image>
|
||||||
<Image url="@pics/menu.png"/>
|
<Image url="@pics/menu.png" />
|
||||||
</image>
|
</image>
|
||||||
</ImageView>
|
</ImageView>
|
||||||
</graphic>
|
<Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="260.0" text="Essensplan">
|
||||||
</Button>
|
|
||||||
<Button fx:id="kinderButton" alignment="CENTER_LEFT" mnemonicParsing="false"
|
|
||||||
onMouseClicked="#onKinderClick" prefHeight="60.0" prefWidth="250.0"
|
|
||||||
styleClass="sidebar-nav_button" text="Kinder">
|
|
||||||
<font>
|
<font>
|
||||||
<Font size="20.0"/>
|
<Font size="25.0" />
|
||||||
</font>
|
</font>
|
||||||
<graphic>
|
|
||||||
<ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
|
|
||||||
<image>
|
|
||||||
<Image url="@pics/little-kid.png"/>
|
|
||||||
</image>
|
|
||||||
</ImageView>
|
|
||||||
</graphic>
|
|
||||||
</Button>
|
|
||||||
<Button fx:id="bestellungButton" alignment="CENTER_LEFT" mnemonicParsing="false"
|
|
||||||
onMouseClicked="#onBestellungClick" prefHeight="60.0" prefWidth="250.0"
|
|
||||||
styleClass="sidebar-nav_button" text="Bestellung">
|
|
||||||
<font>
|
|
||||||
<Font size="20.0"/>
|
|
||||||
</font>
|
|
||||||
<graphic>
|
|
||||||
<ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
|
|
||||||
<image>
|
|
||||||
<Image url="@pics/shopping-list.png"/>
|
|
||||||
</image>
|
|
||||||
</ImageView>
|
|
||||||
</graphic>
|
|
||||||
</Button>
|
|
||||||
<Region VBox.vgrow="ALWAYS"/>
|
|
||||||
<Button fx:id="einstellungenButton" alignment="CENTER_LEFT" layoutX="10.0" layoutY="130.0"
|
|
||||||
mnemonicParsing="false" onMouseClicked="#onEinstellungenClick" prefHeight="60.0"
|
|
||||||
prefWidth="250.0" styleClass="sidebar-nav_button" text="Einstellungen">
|
|
||||||
<font>
|
|
||||||
<Font size="20.0"/>
|
|
||||||
</font>
|
|
||||||
<graphic>
|
|
||||||
<ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
|
|
||||||
<image>
|
|
||||||
<Image url="@pics/setting.png"/>
|
|
||||||
</image>
|
|
||||||
</ImageView>
|
|
||||||
</graphic>
|
|
||||||
</Button>
|
</Button>
|
||||||
</children>
|
</children>
|
||||||
</VBox>
|
</HBox>
|
||||||
</left>
|
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
|
||||||
<top>
|
|
||||||
<HBox alignment="CENTER_RIGHT" prefHeight="50.0" prefWidth="1200.0" style="-fx-background-color: #69b6ff;"
|
|
||||||
BorderPane.alignment="CENTER">
|
|
||||||
<children>
|
<children>
|
||||||
<Button mnemonicParsing="false" onMouseClicked="#onAusloggenClick" styleClass="sidebar-nav_button"
|
<ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
|
||||||
text="Ausloggen">
|
<image>
|
||||||
<opaqueInsets>
|
<Image url="@pics/little-kid.png" />
|
||||||
<Insets/>
|
</image>
|
||||||
</opaqueInsets>
|
</ImageView>
|
||||||
|
<Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="260.0" text="Kind">
|
||||||
|
<font>
|
||||||
|
<Font size="25.0" />
|
||||||
|
</font>
|
||||||
</Button>
|
</Button>
|
||||||
</children>
|
</children>
|
||||||
|
</HBox>
|
||||||
|
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
|
||||||
|
<children>
|
||||||
|
<ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
|
||||||
|
<image>
|
||||||
|
<Image url="@pics/shopping-list.png" />
|
||||||
|
</image>
|
||||||
|
</ImageView>
|
||||||
|
<Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="52.0" prefWidth="260.0" text="Bestellung">
|
||||||
|
<font>
|
||||||
|
<Font size="25.0" />
|
||||||
|
</font>
|
||||||
|
</Button>
|
||||||
|
</children>
|
||||||
|
</HBox>
|
||||||
|
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
|
||||||
|
<children>
|
||||||
|
<ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
|
||||||
|
<image>
|
||||||
|
<Image url="@pics/setting.png" />
|
||||||
|
</image>
|
||||||
|
</ImageView>
|
||||||
|
<Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="52.0" prefWidth="260.0" text="Nutzereinstellungen">
|
||||||
|
<font>
|
||||||
|
<Font size="25.0" />
|
||||||
|
</font>
|
||||||
|
</Button>
|
||||||
|
</children>
|
||||||
|
</HBox>
|
||||||
|
</children>
|
||||||
<padding>
|
<padding>
|
||||||
<Insets right="20.0"/>
|
<Insets top="50.0" />
|
||||||
</padding>
|
</padding></VBox>
|
||||||
|
<HBox id="contentContainer2" alignment="CENTER_RIGHT" prefHeight="40.0" prefWidth="1200.0" stylesheets="@parentMenue.css">
|
||||||
|
<children>
|
||||||
|
<Button id="btLogOut" mnemonicParsing="false" stylesheets="@parentMenue.css" text="Abmelden" />
|
||||||
|
</children>
|
||||||
</HBox>
|
</HBox>
|
||||||
</top>
|
</children>
|
||||||
<center>
|
</AnchorPane>
|
||||||
<AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER"/>
|
|
||||||
</center>
|
|
||||||
</BorderPane>
|
|
||||||
|
|
||||||
|
@ -1,183 +1,14 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<?import javafx.geometry.Insets?>
|
<?import java.lang.*?>
|
||||||
<?import javafx.scene.control.Button?>
|
<?import java.util.*?>
|
||||||
<?import javafx.scene.control.Label?>
|
<?import javafx.scene.*?>
|
||||||
<?import javafx.scene.control.TextField?>
|
<?import javafx.scene.control.*?>
|
||||||
<?import javafx.scene.image.Image?>
|
<?import javafx.scene.layout.*?>
|
||||||
<?import javafx.scene.image.ImageView?>
|
|
||||||
<?import javafx.scene.layout.AnchorPane?>
|
<AnchorPane xmlns="http://javafx.com/javafx"
|
||||||
<?import javafx.scene.layout.HBox?>
|
xmlns:fx="http://javafx.com/fxml"
|
||||||
<?import javafx.scene.layout.VBox?>
|
fx:controller="com.bib.essensbestellungsverwaltung.SettingsController"
|
||||||
<?import javafx.scene.text.Font?>
|
prefHeight="400.0" prefWidth="600.0">
|
||||||
|
|
||||||
<AnchorPane prefHeight="800.0" prefWidth="1205.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.SettingsController">
|
|
||||||
<children>
|
|
||||||
<VBox id="contentContainer" layoutY="-14.0" prefHeight="814.0" prefWidth="333.0" stylesheets="@parentMenue.css">
|
|
||||||
<children>
|
|
||||||
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="327.0">
|
|
||||||
<children>
|
|
||||||
<ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
|
|
||||||
<image>
|
|
||||||
<Image url="@pics/menu.png" />
|
|
||||||
</image>
|
|
||||||
</ImageView>
|
|
||||||
<Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="260.0" text="Essensplan">
|
|
||||||
<font>
|
|
||||||
<Font size="25.0" />
|
|
||||||
</font>
|
|
||||||
</Button>
|
|
||||||
</children>
|
|
||||||
</HBox>
|
|
||||||
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
|
|
||||||
<children>
|
|
||||||
<ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
|
|
||||||
<image>
|
|
||||||
<Image url="@pics/little-kid.png" />
|
|
||||||
</image>
|
|
||||||
</ImageView>
|
|
||||||
<Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="260.0" text="Kind">
|
|
||||||
<font>
|
|
||||||
<Font size="25.0" />
|
|
||||||
</font>
|
|
||||||
</Button>
|
|
||||||
</children>
|
|
||||||
</HBox>
|
|
||||||
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
|
|
||||||
<children>
|
|
||||||
<ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
|
|
||||||
<image>
|
|
||||||
<Image url="@pics/shopping-list.png" />
|
|
||||||
</image>
|
|
||||||
</ImageView>
|
|
||||||
<Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="52.0" prefWidth="260.0" text="Bestellung">
|
|
||||||
<font>
|
|
||||||
<Font size="25.0" />
|
|
||||||
</font>
|
|
||||||
</Button>
|
|
||||||
</children>
|
|
||||||
</HBox>
|
|
||||||
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
|
|
||||||
<children>
|
|
||||||
<ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
|
|
||||||
<image>
|
|
||||||
<Image url="@pics/setting.png" />
|
|
||||||
</image>
|
|
||||||
</ImageView>
|
|
||||||
<Button fx:id="BtSetting" alignment="BASELINE_LEFT" mnemonicParsing="false" onAction="#onSettingBtClick" prefHeight="52.0" prefWidth="260.0" text="Nutzereinstellungen">
|
|
||||||
<font>
|
|
||||||
<Font size="25.0" />
|
|
||||||
</font>
|
|
||||||
</Button>
|
|
||||||
</children>
|
|
||||||
</HBox>
|
|
||||||
</children>
|
|
||||||
<padding>
|
|
||||||
<Insets top="50.0" />
|
|
||||||
</padding></VBox>
|
|
||||||
<HBox id="contentContainer2" alignment="CENTER_RIGHT" prefHeight="40.0" prefWidth="1200.0" stylesheets="@parentMenue.css">
|
|
||||||
<children>
|
|
||||||
<Button mnemonicParsing="false" onAction="#onLogOutBtClick" text="Abmelden" />
|
|
||||||
</children>
|
|
||||||
</HBox>
|
|
||||||
<HBox fx:id="UserSetting" layoutX="343.0" layoutY="48.0" prefHeight="355.0" prefWidth="856.0" style="-fx-border-width: 1 1 1 1; -fx-border-color: lightblue;" AnchorPane.topAnchor="230.0">
|
|
||||||
<children>
|
|
||||||
<VBox prefHeight="353.0" prefWidth="260.0">
|
|
||||||
<children>
|
|
||||||
<Label text="Elterndaten">
|
|
||||||
<font>
|
|
||||||
<Font name="Microsoft Tai Le Bold" size="24.0" />
|
|
||||||
</font>
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets bottom="25.0" left="25.0" right="25.0" top="10.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
</Label>
|
|
||||||
<TextField prefHeight="36.0" prefWidth="274.0" promptText="aktuelles Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets bottom="25.0" left="20.0" right="25.0" top="5.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
<font>
|
|
||||||
<Font name="Microsoft Tai Le Bold" size="16.0" />
|
|
||||||
</font>
|
|
||||||
</TextField>
|
|
||||||
<TextField promptText="neues Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets left="20.0" right="25.0" top="5.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
<font>
|
|
||||||
<Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
|
|
||||||
</font>
|
|
||||||
</TextField>
|
|
||||||
<TextField promptText="passwort bestätigen " style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets bottom="25.0" left="20.0" right="25.0" top="25.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
<font>
|
|
||||||
<Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
|
|
||||||
</font>
|
|
||||||
</TextField>
|
|
||||||
<Button alignment="BASELINE_LEFT" contentDisplay="TOP" mnemonicParsing="false" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Passowrt ändern" textFill="WHITE">
|
|
||||||
<font>
|
|
||||||
<Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
|
|
||||||
</font>
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets left="80.0" top="25.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
</Button>
|
|
||||||
</children>
|
|
||||||
</VBox>
|
|
||||||
<VBox prefHeight="353.0" prefWidth="245.0">
|
|
||||||
<children>
|
|
||||||
<TextField prefHeight="35.0" prefWidth="102.0" promptText="PLZ" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets bottom="25.0" left="20.0" right="25.0" top="75.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
<font>
|
|
||||||
<Font name="Microsoft Tai Le Bold" size="16.0" />
|
|
||||||
</font>
|
|
||||||
</TextField>
|
|
||||||
<TextField promptText="Straße" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
|
||||||
<font>
|
|
||||||
<Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
|
|
||||||
</font>
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets bottom="25.0" left="20.0" right="25.0" top="5.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
</TextField>
|
|
||||||
</children>
|
|
||||||
<HBox.margin>
|
|
||||||
<Insets left="80.0" />
|
|
||||||
</HBox.margin>
|
|
||||||
</VBox>
|
|
||||||
<VBox prefHeight="411.0" prefWidth="225.0">
|
|
||||||
<children>
|
|
||||||
<TextField promptText="Stadt" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets left="20.0" right="25.0" top="75.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
<font>
|
|
||||||
<Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
|
|
||||||
</font>
|
|
||||||
</TextField>
|
|
||||||
<TextField promptText="Hausnummer" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
|
||||||
<font>
|
|
||||||
<Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
|
|
||||||
</font>
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets left="25.0" right="25.0" top="25.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
</TextField>
|
|
||||||
<Button alignment="BASELINE_LEFT" contentDisplay="TOP" mnemonicParsing="false" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Adresse ändern" textFill="WHITE">
|
|
||||||
<font>
|
|
||||||
<Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
|
|
||||||
</font>
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets left="60.0" top="120.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
</Button>
|
|
||||||
</children>
|
|
||||||
</VBox>
|
|
||||||
</children>
|
|
||||||
</HBox>
|
|
||||||
</children>
|
|
||||||
</AnchorPane>
|
</AnchorPane>
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
<Circle fill="#93c4f23d" layoutY="258.0" radius="106.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
|
<Circle fill="#93c4f23d" layoutY="258.0" radius="106.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
|
||||||
<VBox layoutX="262.0" prefHeight="400.0" prefWidth="364.0" style="-fx-background-color: white;">
|
<VBox layoutX="262.0" prefHeight="400.0" prefWidth="364.0" style="-fx-background-color: white;">
|
||||||
<children>
|
<children>
|
||||||
<TextField fx:id="tfLastName" alignment="TOP_LEFT" prefHeight="26.0" prefWidth="282.0" promptText="Name" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
<TextField fx:id="tfEmail" alignment="TOP_LEFT" prefHeight="26.0" prefWidth="282.0" promptText="Name" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
||||||
<effect>
|
<effect>
|
||||||
<Blend />
|
<Blend />
|
||||||
</effect>
|
</effect>
|
||||||
@ -42,7 +42,7 @@
|
|||||||
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
||||||
</VBox.margin>
|
</VBox.margin>
|
||||||
</TextField>
|
</TextField>
|
||||||
<TextField fx:id="tfFirstName" promptText="Vorname" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
<TextField fx:id="tfBestätigungEmail" promptText="Vorname" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
||||||
<effect>
|
<effect>
|
||||||
<Blend />
|
<Blend />
|
||||||
</effect>
|
</effect>
|
||||||
@ -53,18 +53,21 @@
|
|||||||
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
||||||
</VBox.margin>
|
</VBox.margin>
|
||||||
</TextField>
|
</TextField>
|
||||||
<TextField fx:id="tfEmail" promptText="Email" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
<PasswordField fx:id="pfPasswort" accessibleRole="TEXT_FIELD" promptText="Email" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
||||||
<effect>
|
|
||||||
<Blend />
|
|
||||||
</effect>
|
|
||||||
<font>
|
<font>
|
||||||
<Font name="Microsoft Tai Le Bold" size="12.0" />
|
<Font name="Microsoft Tai Le Bold" size="12.0" />
|
||||||
</font>
|
</font>
|
||||||
|
<opaqueInsets>
|
||||||
|
<Insets />
|
||||||
|
</opaqueInsets>
|
||||||
|
<effect>
|
||||||
|
<Blend />
|
||||||
|
</effect>
|
||||||
<VBox.margin>
|
<VBox.margin>
|
||||||
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
||||||
</VBox.margin>
|
</VBox.margin>
|
||||||
</TextField>
|
</PasswordField>
|
||||||
<PasswordField fx:id="pfPassword" accessibleRole="TEXT_FIELD" promptText="Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
<PasswordField fx:id="pfBestätigungPassowrt" promptText="Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
||||||
<font>
|
<font>
|
||||||
<Font name="Microsoft Tai Le Bold" size="12.0" />
|
<Font name="Microsoft Tai Le Bold" size="12.0" />
|
||||||
</font>
|
</font>
|
||||||
@ -80,7 +83,7 @@
|
|||||||
</PasswordField>
|
</PasswordField>
|
||||||
<HBox prefHeight="100.0" prefWidth="200.0">
|
<HBox prefHeight="100.0" prefWidth="200.0">
|
||||||
<children>
|
<children>
|
||||||
<TextField fx:id="tfPostCode" prefHeight="35.0" prefWidth="92.0" promptText="PLZ" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
<TextField prefHeight="35.0" prefWidth="92.0" promptText="PLZ" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
||||||
<HBox.margin>
|
<HBox.margin>
|
||||||
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
||||||
</HBox.margin>
|
</HBox.margin>
|
||||||
@ -88,7 +91,7 @@
|
|||||||
<Font name="Microsoft Tai Le Bold" size="12.0" />
|
<Font name="Microsoft Tai Le Bold" size="12.0" />
|
||||||
</font>
|
</font>
|
||||||
</TextField>
|
</TextField>
|
||||||
<TextField fx:id="tfCity" prefHeight="35.0" prefWidth="182.0" promptText="Stadt" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
<TextField prefHeight="35.0" prefWidth="182.0" promptText="Stadt" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
||||||
<HBox.margin>
|
<HBox.margin>
|
||||||
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
||||||
</HBox.margin>
|
</HBox.margin>
|
||||||
@ -100,7 +103,7 @@
|
|||||||
</HBox>
|
</HBox>
|
||||||
<HBox prefHeight="100.0" prefWidth="200.0">
|
<HBox prefHeight="100.0" prefWidth="200.0">
|
||||||
<children>
|
<children>
|
||||||
<TextField fx:id="tfStreet" prefHeight="27.0" prefWidth="134.0" promptText="Straße" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
<TextField prefHeight="27.0" prefWidth="134.0" promptText="Straße" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
||||||
<HBox.margin>
|
<HBox.margin>
|
||||||
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
||||||
</HBox.margin>
|
</HBox.margin>
|
||||||
@ -108,7 +111,7 @@
|
|||||||
<Font name="Microsoft Tai Le Bold" size="12.0" />
|
<Font name="Microsoft Tai Le Bold" size="12.0" />
|
||||||
</font>
|
</font>
|
||||||
</TextField>
|
</TextField>
|
||||||
<TextField fx:id="tfHousNumber" prefHeight="27.0" prefWidth="99.0" promptText="Hausnummer" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
<TextField prefHeight="27.0" prefWidth="99.0" promptText="Hausnummer" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
|
||||||
<HBox.margin>
|
<HBox.margin>
|
||||||
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
|
||||||
</HBox.margin>
|
</HBox.margin>
|
||||||
|
Loading…
Reference in New Issue
Block a user