Commit Graph

54 Commits

Author SHA1 Message Date
40cc2b002a test 2023-02-01 10:04:35 +01:00
e87bae35bc test 2023-02-01 10:04:20 +01:00
0b02c1c661 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java
#	src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java
#	src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java
2023-02-01 09:53:51 +01:00
b15b94e579 singup mit Datebase verbunden und new Adresse 2023-02-01 09:48:55 +01:00
Johannes Kantz
9b6d60a571 fix: remove debug print 2023-02-01 07:27:12 +01:00
Johannes Kantz
f567320ec3 fix: changed window size to prevent essensplan overflow 2023-02-01 07:23:43 +01:00
Johannes Kantz
324ce53bd4 add: createFoodplan 2023-02-01 07:22:09 +01:00
Johannes Kantz
f71aba3505 add: createFood 2023-02-01 07:21:59 +01:00
72c2e9da16 Childview & Elternmenue hinzugefügt 2023-01-31 15:38:08 +01:00
pbs2h21asc
8927755462 Admin Controller 2023-01-31 14:34:37 +01:00
Johannes Kantz
1c85261c7b add: change Scenes 2023-01-31 07:41:21 +01:00
Johannes Kantz
c57e65fadb fix: refactor 2023-01-31 07:18:37 +01:00
Johannes Kantz
c890819be7 fix: changed window size 2023-01-31 07:03:11 +01:00
Johannes Kantz
c981fbca19 add: Rechnung View 2023-01-31 06:01:53 +01:00
Johannes Kantz
2b5839f0ea add: workerMenu 2023-01-31 04:30:25 +01:00
Johannes Kantz
1a4d45aed4 add: parent menu 2023-01-31 04:30:09 +01:00
5447d7f238 Merge branch 'main' into WIP_Objects 2023-01-30 14:13:50 +01:00
50e0118ded small fix 2023-01-30 14:04:59 +01:00
53c603249d StartViewApplication ist die Startpunkt des Projekt 2023-01-30 14:01:19 +01:00
81bcb44d74 most Objects done 2023-01-30 04:26:30 +01:00
a0eed3ce51 Food, User 2023-01-27 15:14:36 +01:00
27710e92af Merge branch 'main' into Richards_Branch 2023-01-23 08:59:38 +01:00
a3c3ee0fe0 Login und SingUp aktuallisiert 2023-01-18 22:32:38 +01:00
pbs2h21asc
dd69909b16 Views erstellt 2023-01-18 13:22:05 +01:00
a7bcaf13ce css + png hinzugefügt 2023-01-18 02:41:25 +01:00
f8673ca92a Views hinzugefügt 2023-01-18 02:39:17 +01:00
400ffb0e98 ParetSence 2023-01-17 22:30:56 +01:00
3bb141fb52 Views & Controller erstellt 2023-01-17 15:58:22 +01:00
ec2d3b581d fixed salt 2023-01-17 13:47:24 +01:00
e245233a23 fixed the mess 2023-01-17 08:47:09 +01:00
074107752d LoginView überarbeitet 2023-01-16 23:25:58 +01:00
8634df0d6d LoginView überarbeitet 2023-01-16 23:09:16 +01:00
8ce8c027c8 test 2023-01-16 18:37:39 +01:00
1194b163fa login view
menue view
MenueController
2023-01-16 18:06:54 +01:00
f072cc9f66 Merge remote-tracking branch 'origin/main' 2023-01-16 18:02:45 +01:00
438d18e378 salz 2023-01-16 17:23:25 +01:00
7d0855be4e Merge remote-tracking branch 'origin/main' 2023-01-16 16:58:57 +01:00
c93489d014 zeile 15 wurde geändert 2023-01-16 16:58:44 +01:00
0dcec76379 von der Wiege bis zur Bahre, Kommentare, Kommentare 2023-01-16 16:35:45 +01:00
573e17161b added invoice and order collection 2023-01-07 23:14:41 +01:00
58fb02875a added missing functionality 2023-01-06 01:51:42 +01:00
89ea9ca70e basic encryption 2023-01-06 00:02:06 +01:00
c4b31bc548 did some stuff 2023-01-05 05:06:19 +01:00
e16f0342a7 frohes Neues 2023-01-01 15:03:21 +01:00
31b6b2cc39 Username und Passwort 2022-12-22 02:02:19 +01:00
0a8e052582 filled food_type and allergy
created generic insert
2022-12-19 17:31:06 +01:00
8478b80407 created tables 2022-12-15 09:26:08 +01:00
83507bef98 made program executable 2022-12-13 03:35:52 +01:00
18d812e1a2 moved dbconnection to own class 2022-12-12 14:03:49 +01:00
79aaa3fe85 db setup //runable 2022-11-29 22:45:05 +01:00