From 40bdbf2c5aa135a78b9e24e382c6325f444593e5 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 22 Dec 2023 19:07:54 +0100 Subject: [PATCH] Merge --- .../a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml | 2626 +++++++++-------- .../_src_/schema/emensawerbeseite.YLWk-w.meta | 2 +- .../_src_/schema/emensawerbeseite.YLWk-w.zip | Bin 0 -> 2870 bytes .idea/workspace.xml | 11 +- M5/Dossier/.$Aufgabe1.drawio.bkp | 19 - M5/Dossier/.$Aufgabe1.drawio.dtmp | 91 - M5/Dossier/AlterAndUpdate.txt | 15 + M5/Dossier/Aufgabe1.drawio | 91 - M5/Dossier/ERD M4-1-1.png | Bin 57262 -> 0 bytes M5/Dossier/M5_4.sql | 10 + M5/emensa/routes/web.php | 7 +- ...fd41d095952aa184fb3fc764d18878732cb.bladec | 25 + ...7ed4c60110a1408ee88be08af7da169ae61.bladec | 51 + ...1c8d2863f98b9f307af886814b8305ccb32.bladec | 21 + ...3da07664813b96b9705f586eaa04a44db3c.bladec | 11 + 15 files changed, 1589 insertions(+), 1391 deletions(-) create mode 100644 .idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.zip delete mode 100644 M5/Dossier/.$Aufgabe1.drawio.bkp delete mode 100644 M5/Dossier/.$Aufgabe1.drawio.dtmp create mode 100644 M5/Dossier/AlterAndUpdate.txt delete mode 100644 M5/Dossier/Aufgabe1.drawio delete mode 100644 M5/Dossier/ERD M4-1-1.png create mode 100644 M5/Dossier/M5_4.sql create mode 100644 M5/emensa/storage/cache/m5_a1.anmeldung_01c45fd41d095952aa184fb3fc764d18878732cb.bladec create mode 100644 M5/emensa/storage/cache/m5_a1.anmeldung_verifizieren_9871f7ed4c60110a1408ee88be08af7da169ae61.bladec create mode 100644 M5/emensa/storage/cache/m5_a1.layout_anmeldung_1d2201c8d2863f98b9f307af886814b8305ccb32.bladec diff --git a/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml b/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml index cec5a4e..fdfa664 100644 --- a/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml +++ b/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml @@ -162,1450 +162,1708 @@ |root||root|robert-pc|grant option|G 11.1.3 - - big5 + + armscii8 + + + armscii8 1 - - big5 + + armscii8 - - big5 + + armscii8 - - big5 + + ascii - - dec8 - 1 - - - dec8 - - - dec8 - - - dec8 - - - cp850 - 1 - - - cp850 - - - cp850 - - - cp850 - - - hp8 - 1 - - - hp8 - - - hp8 - - - hp8 - - - koi8r - 1 - - - koi8r - - - koi8r - - - koi8r - - - latin1 - - - latin1 - 1 - - - latin1 - - - latin1 - - - latin1 - - - latin1 - - - latin1 - - - latin1 - - - latin1 - - - latin1 - - - latin2 - - - latin2 - 1 - - - latin2 - - - latin2 - - - latin2 - - - latin2 - - - latin2 - - - swe7 - 1 - - - swe7 - - - swe7 - - - swe7 - - + ascii 1 - + ascii - + ascii - - ascii + + big5 - - ujis + + big5 1 - - ujis + + big5 - - ujis + + big5 - - ujis - - - sjis + + binary 1 - - sjis + + cp1250 - - sjis + + cp1250 - - sjis + + cp1250 - - hebrew + + cp1250 1 - - hebrew + + cp1250 - - hebrew + + cp1250 - - hebrew + + cp1250 - - tis620 + + cp1251 + + + cp1251 + + + cp1251 1 - - tis620 + + cp1251 - - tis620 + + cp1251 - - tis620 + + cp1251 + + + cp1251 + + + cp1256 + + + cp1256 + 1 + + + cp1256 + + + cp1256 + + + cp1257 + + + cp1257 + 1 + + + cp1257 + + + cp1257 + + + cp1257 + + + cp850 + + + cp850 + 1 + + + cp850 + + + cp850 + + + cp852 + + + cp852 + 1 + + + cp852 + + + cp852 + + + cp866 + + + cp866 + 1 + + + cp866 + + + cp866 + + + cp932 + + + cp932 + 1 + + + cp932 + + + cp932 + + + dec8 + + + dec8 + + + dec8 + 1 + + + dec8 + + + eucjpms + + + eucjpms + 1 + + + eucjpms + + + eucjpms + + + euckr euckr 1 - + euckr - + euckr - - euckr + + gb2312 - - koi8u - 1 - - - koi8u - - - koi8u - - - koi8u - - + gb2312 1 - + gb2312 - + gb2312 - - gb2312 + + gbk - - greek - 1 - - - greek - - - greek - - - greek - - - cp1250 - 1 - - - cp1250 - - - cp1250 - - - cp1250 - - - cp1250 - - - cp1250 - - - cp1250 - - + gbk 1 - + gbk - + gbk - - gbk + + geostd8 - - latin5 - 1 - - - latin5 - - - latin5 - - - latin5 - - - armscii8 - 1 - - - armscii8 - - - armscii8 - - - armscii8 - - - utf8mb3 - 1 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - utf8mb3 - - - ucs2 - 1 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - cp866 - 1 - - - cp866 - - - cp866 - - - cp866 - - - keybcs2 - 1 - - - keybcs2 - - - keybcs2 - - - keybcs2 - - - macce - 1 - - - macce - - - macce - - - macce - - - macroman - 1 - - - macroman - - - macroman - - - macroman - - - cp852 - 1 - - - cp852 - - - cp852 - - - cp852 - - - latin7 - - - latin7 - 1 - - - latin7 - - - latin7 - - - latin7 - - - latin7 - - - utf8mb4 - 1 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - cp1251 - - - cp1251 - - - cp1251 - - - cp1251 - 1 - - - cp1251 - - - cp1251 - - - cp1251 - - - utf16 - 1 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16le - 1 - - - utf16le - - - utf16le - - - utf16le - - - cp1256 - 1 - - - cp1256 - - - cp1256 - - - cp1256 - - - cp1257 - - - cp1257 - - - cp1257 - 1 - - - cp1257 - - - cp1257 - - - utf32 - 1 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - binary - 1 - - + geostd8 1 - + geostd8 - + geostd8 - - geostd8 + + greek - - cp932 + + greek 1 - - cp932 + + greek - - cp932 + + greek - - cp932 + + hebrew - - eucjpms + + hebrew 1 - - eucjpms + + hebrew - - eucjpms + + hebrew - - eucjpms + + hp8 - - utf8mb3_general_ci - - + + hp8 + 1 + + + hp8 + + + hp8 + + + keybcs2 + + + keybcs2 + 1 + + + keybcs2 + + + keybcs2 + + + koi8r + + + koi8r + 1 + + + koi8r + + + koi8r + + + koi8u + + + koi8u + 1 + + + koi8u + + + koi8u + + + latin1 + + + latin1 + + + latin1 + + + latin1 + + + latin1 + + + latin1 + + + latin1 + + + latin1 + + + latin1 + 1 + + + latin1 + + + latin2 + + + latin2 + + + latin2 + + + latin2 + 1 + + + latin2 + + + latin2 + + + latin2 + + + latin5 + + + latin5 + + + latin5 + 1 + + + latin5 + + + latin7 + + + latin7 + + + latin7 + 1 + + + latin7 + + + latin7 + + + latin7 + + + macce + + + macce + 1 + + + macce + + + macce + + + macroman + + + macroman + 1 + + + macroman + + + macroman + + + sjis + + + sjis + 1 + + + sjis + + + sjis + + + swe7 + + + swe7 + + + swe7 + 1 + + + swe7 + + + tis620 + + + tis620 + + + tis620 + 1 + + + tis620 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + 1 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ujis + + + ujis + 1 + + + ujis + + + ujis + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + 1 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16le + + + utf16le + 1 + + + utf16le + + + utf16le + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + 1 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + 1 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb3 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + 1 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + 2023-12-21.15:53:25 + 2023-12-21.13:53:25 latin1_swedish_ci - + utf8mb3_general_ci - - utf8mb3_general_ci - - - 2023-12-21.12:39:09 - 2023-12-21.10:39:09 + latin1_swedish_ci + + utf8mb3_general_ci + + + utf8mb3_general_ci + localhost - localhost - - - robert-pc - - 127.0.0.1 - + ::1 - + + localhost + + + robert-pc + +
InnoDBlatin1_swedish_ci
- +
InnoDBlatin1_swedish_ci
- +
InnoDBlatin1_swedish_ci
- +
InnoDBlatin1_swedish_ci
- +
InnoDBlatin1_swedish_ci
- +
InnoDBlatin1_swedish_ci
- + + InnoDB + latin1_swedish_ci +
+ + InnoDB + latin1_swedish_ci +
+ + InnoDB + latin1_swedish_ci +
+ + root@localhost + 225 + + + root@localhost + 317 + + + root@localhost + 587 + + char(4)|0s 1 1 - + varchar(300)|0s 1 2 - + varchar(20)|0s 1 3 - + code btree 1 - + 1 1 PRIMARY - - int(11)|0s + + 2 + bigint(20)|0s 1 1 - - bigint(20)|0s + + varchar(200)|0s + 1 2 - + + varchar(100)|0s + 1 + 3 + + + varchar(200)|0s + 1 + 4 + + + tinyint(1)|0s + 0 + 1 + 5 + + + int(11)|0s + 0 + 1 + 6 + + + int(11)|0s + 0 + 1 + 7 + + + datetime|0s + 8 + + + datetime|0s + 9 + + id btree 1 - + + email + btree + 1 + + 1 1 PRIMARY - + + email + + + int(11)|0s + 1 + 1 + + + bigint(20)|0s + 2 + + + id + btree + 1 + + + 1 + 1 + PRIMARY + + + varchar(255)|0s + 1 + 1 + + + varchar(255)|0s + 'anonym' + 2 + + + EMail + btree + 1 + + + 1 + 1 + PRIMARY + + 21 bigint(20)|0s 1 1 - + varchar(80)|0s 1 2 - + varchar(80)|0s 1 3 - + date|0s 1 4 - + tinyint(1)|0s 1 5 - + tinyint(1)|0s 1 6 - + double|0s 1 7 - + double|0s 1 8 - + varchar(200)|0s 9 - + id btree 1 - + name btree 1 - + + name + btree + + 1 1 PRIMARY - + name - + char(4)|0s 1 - + bigint(20)|0s 1 2 - + code + cascade code allergen - + gericht_id + cascade id gericht - + code btree - + gericht_id btree - + bigint(20)|0s 1 1 - + bigint(20)|0s 1 2 - + gericht_id + cascade id gericht - + kategorie_id id kategorie - - gericht_id + + kategorie_id + id + kategorie + + + gericht_id +kategorie_id btree + 1 - + + gericht_id +kategorie_id + btree + 1 + + kategorie_id btree - + + 1 + 1 + PRIMARY + + + gericht_kategorie_unique + + bigint(20)|0s 1 1 - + varchar(80)|0s 1 2 - + bigint(20)|0s 3 - + varchar(200)|0s 4 - + eltern_id id kategorie - + + eltern_id + id + kategorie + + id btree 1 - + eltern_id btree - + 1 1 PRIMARY + + 1 + int(11)|0s + 1 + 1 + + + varchar(255)|0s + 1 + 2 + + + text|0s + 3 + + + date|0s + 1 + 4 + + + varchar(255)|0s + 1 + 5 + + + Ersteller_EMail + EMail + ersteller + + + ID + btree + 1 + + + Ersteller_EMail + btree + + + 1 + 1 + PRIMARY + + + varchar(200)|0s + 1 + 1 + + + int(11)|0s + 1 + 2 + + + varchar(80)|0s + 1 + 1 + + + bigint(20)|0s + 1 + 2 + + + bigint(20)|0s + 3 + + + varchar(80)|0s + 4 + + + bigint(20)|0s + 1 + 1 + + + varchar(80)|0s + 1 + 2 + + + varchar(80)|0s + 1 + 3 + + + date|0s + 1 + 4 + + + tinyint(1)|0s + 1 + 5 + + + tinyint(1)|0s + 1 + 6 + + + double|0s + 1 + 7 + + + double|0s + 1 + 8 + + + varchar(200)|0s + 9 + \ No newline at end of file diff --git a/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.meta b/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.meta index 05a2391..95ebede 100644 --- a/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.meta +++ b/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.meta @@ -1,2 +1,2 @@ #n:emensawerbeseite -! [1703158749000, 0, null, null, -2147483648, -2147483648] +! [1703170405000, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.zip b/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.zip new file mode 100644 index 0000000000000000000000000000000000000000..5660b922d0eaf9676a67b77bcd9f2dae2a340fc1 GIT binary patch literal 2870 zcmbVO&2G~`5Ke!Ed_tl}4qKpVE18fuN!?J2h{UBTg(40;R3&zjNn+yI?b>OfZ@>W+ z4n6V=+&Lg2ap1rU^uP%Tao`aUV#bc`b?PJzj%Jh0?tb&l?zgkv-JY41GW7iEo$noA z*Z$i0o2-a-=h%P~uc>x)7g{zqpatBhw_T_n<4;%ThEs26mB&xOu4KFDxM|&`S)(UN zi}$*X`)uFpnWoHc7nOWoEh@^o%=Xoi%*cxQT-X#2u%jxohcbKWwHxTb?%aX28%yBr z!p9%)r!pC`!ha;-9GP_vm?~>P)3AWEO~!58ePG&k-E7;A%P2Xo8J!{19mxR`>Mqkd zT2{04E@-UsjA`4!N@}v-Wi}GR>9QBLVX>saL8P|sMhW6Xq$M%`u`RaZ^2JSxciuVz+bg`a(e+k}Zy9H<9uL`l8Mf_Pz#I&pibmDyF}O z{ujy7laCziZIUDe4Ba}_+ollSSMFuEug8&SlFb`iYLN<+->j$6 z1X29XmF(~7Oor@M8j2IiBA&w-W%L)rKU{(;NE3M6Mk*qj>zB1)dOAHtv$00i+Z>D< z9#mgRF;7Ykz?-_`xK+KYArayrcv4~rml=W(hUiHTqFcnld-@>gNjd!xSHdwY7dU~? zbkQ>j2)rBw>3dRw)C{u`?JO|~J;M)nu&vTb8#p8$>R?E49hyc5*z%I6+ofgiKu=9C zWQM - - - + + + + + +