This commit is contained in:
Robert
2024-01-12 13:42:12 +01:00
parent 92eb1b5363
commit 57a4470de3
13 changed files with 645 additions and 114 deletions

View File

@@ -1365,8 +1365,8 @@
<CollationName>utf8mb3_general_ci</CollationName>
</schema>
<schema id="512" parent="1" name="emensawerbeseite">
<IntrospectionTimestamp>2023-11-24.21:00:41</IntrospectionTimestamp>
<LocalIntrospectionTimestamp>2023-11-24.19:00:41</LocalIntrospectionTimestamp>
<IntrospectionTimestamp>2024-01-10.13:43:49</IntrospectionTimestamp>
<LocalIntrospectionTimestamp>2024-01-10.11:43:49</LocalIntrospectionTimestamp>
<CollationName>latin1_swedish_ci</CollationName>
</schema>
<user id="513" parent="1" name="mariadb.sys">
@@ -1388,220 +1388,482 @@
<Engine>InnoDB</Engine>
<CollationName>latin1_swedish_ci</CollationName>
</table>
<table id="519" parent="512" name="besucher_counter">
<table id="519" parent="512" name="benutzer">
<Engine>InnoDB</Engine>
<CollationName>latin1_swedish_ci</CollationName>
</table>
<table id="520" parent="512" name="gericht">
<table id="520" parent="512" name="besucher_counter">
<Engine>InnoDB</Engine>
<CollationName>latin1_swedish_ci</CollationName>
</table>
<table id="521" parent="512" name="gericht_hat_allergen">
<table id="521" parent="512" name="ersteller">
<Engine>InnoDB</Engine>
<CollationName>latin1_swedish_ci</CollationName>
</table>
<table id="522" parent="512" name="gericht_hat_kategorie">
<table id="522" parent="512" name="gericht">
<Engine>InnoDB</Engine>
<CollationName>latin1_swedish_ci</CollationName>
</table>
<table id="523" parent="512" name="kategorie">
<table id="523" parent="512" name="gericht_hat_allergen">
<Engine>InnoDB</Engine>
<CollationName>latin1_swedish_ci</CollationName>
</table>
<column id="524" parent="518" name="code">
<table id="524" parent="512" name="gericht_hat_kategorie">
<Engine>InnoDB</Engine>
<CollationName>latin1_swedish_ci</CollationName>
</table>
<table id="525" parent="512" name="kategorie">
<Engine>InnoDB</Engine>
<CollationName>latin1_swedish_ci</CollationName>
</table>
<table id="526" parent="512" name="wunschgericht">
<Engine>InnoDB</Engine>
<CollationName>latin1_swedish_ci</CollationName>
</table>
<view id="527" parent="512" name="view_anmeldungen">
<Definer>root@localhost</Definer>
<SourceTextLength>225</SourceTextLength>
</view>
<view id="528" parent="512" name="view_kategoriegerichte_vegetarisch">
<Definer>root@localhost</Definer>
<SourceTextLength>343</SourceTextLength>
</view>
<view id="529" parent="512" name="view_suppengerichte">
<Definer>root@localhost</Definer>
<SourceTextLength>587</SourceTextLength>
</view>
<column id="530" parent="518" name="code">
<DasType>char(4)|0s</DasType>
<NotNull>1</NotNull>
<Position>1</Position>
</column>
<column id="525" parent="518" name="name">
<column id="531" parent="518" name="name">
<DasType>varchar(300)|0s</DasType>
<NotNull>1</NotNull>
<Position>2</Position>
</column>
<column id="526" parent="518" name="typ">
<column id="532" parent="518" name="typ">
<DasType>varchar(20)|0s</DasType>
<NotNull>1</NotNull>
<Position>3</Position>
</column>
<index id="527" parent="518" name="PRIMARY">
<index id="533" parent="518" name="PRIMARY">
<ColNames>code</ColNames>
<Type>btree</Type>
<Unique>1</Unique>
</index>
<key id="528" parent="518" name="PRIMARY">
<key id="534" parent="518" name="PRIMARY">
<NameSurrogate>1</NameSurrogate>
<Primary>1</Primary>
<UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
</key>
<column id="529" parent="519" name="id">
<DasType>int(11)|0s</DasType>
<column id="535" parent="519" name="id">
<AutoIncrement>2</AutoIncrement>
<DasType>bigint(20)|0s</DasType>
<NotNull>1</NotNull>
<Position>1</Position>
</column>
<column id="530" parent="519" name="besucher">
<DasType>bigint(20)|0s</DasType>
<column id="536" parent="519" name="name">
<DasType>varchar(200)|0s</DasType>
<NotNull>1</NotNull>
<Position>2</Position>
</column>
<index id="531" parent="519" name="PRIMARY">
<column id="537" parent="519" name="email">
<DasType>varchar(100)|0s</DasType>
<NotNull>1</NotNull>
<Position>3</Position>
</column>
<column id="538" parent="519" name="passwort">
<DasType>varchar(200)|0s</DasType>
<NotNull>1</NotNull>
<Position>4</Position>
</column>
<column id="539" parent="519" name="admin">
<DasType>tinyint(1)|0s</DasType>
<DefaultExpression>0</DefaultExpression>
<NotNull>1</NotNull>
<Position>5</Position>
</column>
<column id="540" parent="519" name="anzahlfehler">
<DasType>int(11)|0s</DasType>
<DefaultExpression>0</DefaultExpression>
<NotNull>1</NotNull>
<Position>6</Position>
</column>
<column id="541" parent="519" name="anzahlanmeldungen">
<DasType>int(11)|0s</DasType>
<DefaultExpression>0</DefaultExpression>
<NotNull>1</NotNull>
<Position>7</Position>
</column>
<column id="542" parent="519" name="letzteanmeldung">
<DasType>datetime|0s</DasType>
<Position>8</Position>
</column>
<column id="543" parent="519" name="letzterfehler">
<DasType>datetime|0s</DasType>
<Position>9</Position>
</column>
<index id="544" parent="519" name="PRIMARY">
<ColNames>id</ColNames>
<Type>btree</Type>
<Unique>1</Unique>
</index>
<key id="532" parent="519" name="PRIMARY">
<index id="545" parent="519" name="email">
<ColNames>email</ColNames>
<Type>btree</Type>
<Unique>1</Unique>
</index>
<key id="546" parent="519" name="PRIMARY">
<NameSurrogate>1</NameSurrogate>
<Primary>1</Primary>
<UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
</key>
<column id="533" parent="520" name="id">
<key id="547" parent="519" name="email">
<UnderlyingIndexName>email</UnderlyingIndexName>
</key>
<column id="548" parent="520" name="id">
<DasType>int(11)|0s</DasType>
<NotNull>1</NotNull>
<Position>1</Position>
</column>
<column id="549" parent="520" name="besucher">
<DasType>bigint(20)|0s</DasType>
<Position>2</Position>
</column>
<index id="550" parent="520" name="PRIMARY">
<ColNames>id</ColNames>
<Type>btree</Type>
<Unique>1</Unique>
</index>
<key id="551" parent="520" name="PRIMARY">
<NameSurrogate>1</NameSurrogate>
<Primary>1</Primary>
<UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
</key>
<column id="552" parent="521" name="EMail">
<DasType>varchar(255)|0s</DasType>
<NotNull>1</NotNull>
<Position>1</Position>
</column>
<column id="553" parent="521" name="Name">
<DasType>varchar(255)|0s</DasType>
<DefaultExpression>&apos;anonym&apos;</DefaultExpression>
<Position>2</Position>
</column>
<index id="554" parent="521" name="PRIMARY">
<ColNames>EMail</ColNames>
<Type>btree</Type>
<Unique>1</Unique>
</index>
<key id="555" parent="521" name="PRIMARY">
<NameSurrogate>1</NameSurrogate>
<Primary>1</Primary>
<UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
</key>
<column id="556" parent="522" name="id">
<AutoIncrement>21</AutoIncrement>
<DasType>bigint(20)|0s</DasType>
<NotNull>1</NotNull>
<Position>1</Position>
</column>
<column id="534" parent="520" name="name">
<column id="557" parent="522" name="name">
<DasType>varchar(80)|0s</DasType>
<NotNull>1</NotNull>
<Position>2</Position>
</column>
<column id="535" parent="520" name="beschreibung">
<column id="558" parent="522" name="beschreibung">
<DasType>varchar(80)|0s</DasType>
<NotNull>1</NotNull>
<Position>3</Position>
</column>
<column id="536" parent="520" name="erfasst_am">
<column id="559" parent="522" name="erfasst_am">
<DasType>date|0s</DasType>
<NotNull>1</NotNull>
<Position>4</Position>
</column>
<column id="537" parent="520" name="vegetarisch">
<column id="560" parent="522" name="vegetarisch">
<DasType>tinyint(1)|0s</DasType>
<NotNull>1</NotNull>
<Position>5</Position>
</column>
<column id="538" parent="520" name="vegan">
<column id="561" parent="522" name="vegan">
<DasType>tinyint(1)|0s</DasType>
<NotNull>1</NotNull>
<Position>6</Position>
</column>
<column id="539" parent="520" name="preisintern">
<column id="562" parent="522" name="preisintern">
<DasType>double|0s</DasType>
<NotNull>1</NotNull>
<Position>7</Position>
</column>
<column id="540" parent="520" name="preisextern">
<column id="563" parent="522" name="preisextern">
<DasType>double|0s</DasType>
<NotNull>1</NotNull>
<Position>8</Position>
</column>
<index id="541" parent="520" name="PRIMARY">
<column id="564" parent="522" name="bildname">
<DasType>varchar(200)|0s</DasType>
<Position>9</Position>
</column>
<index id="565" parent="522" name="PRIMARY">
<ColNames>id</ColNames>
<Type>btree</Type>
<Unique>1</Unique>
</index>
<index id="542" parent="520" name="name">
<index id="566" parent="522" name="name">
<ColNames>name</ColNames>
<Type>btree</Type>
<Unique>1</Unique>
</index>
<key id="543" parent="520" name="PRIMARY">
<index id="567" parent="522" name="idx_name">
<ColNames>name</ColNames>
<Type>btree</Type>
</index>
<key id="568" parent="522" name="PRIMARY">
<NameSurrogate>1</NameSurrogate>
<Primary>1</Primary>
<UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
</key>
<key id="544" parent="520" name="name">
<key id="569" parent="522" name="name">
<UnderlyingIndexName>name</UnderlyingIndexName>
</key>
<column id="545" parent="521" name="code">
<column id="570" parent="523" name="code">
<DasType>char(4)|0s</DasType>
<Position>1</Position>
</column>
<column id="546" parent="521" name="gericht_id">
<column id="571" parent="523" name="gericht_id">
<DasType>bigint(20)|0s</DasType>
<NotNull>1</NotNull>
<Position>2</Position>
</column>
<foreign-key id="547" parent="521" name="gericht_hat_allergen_ibfk_1">
<foreign-key id="572" parent="523" name="gericht_hat_allergen_ibfk_1_new">
<ColNames>code</ColNames>
<OnUpdate>cascade</OnUpdate>
<RefColNames>code</RefColNames>
<RefTableName>allergen</RefTableName>
</foreign-key>
<foreign-key id="548" parent="521" name="gericht_hat_allergen_ibfk_2">
<foreign-key id="573" parent="523" name="gericht_hat_allergen_ibfk_2_new">
<ColNames>gericht_id</ColNames>
<OnDelete>cascade</OnDelete>
<RefColNames>id</RefColNames>
<RefTableName>gericht</RefTableName>
</foreign-key>
<index id="549" parent="521" name="code">
<index id="574" parent="523" name="gericht_hat_allergen_ibfk_1_new">
<ColNames>code</ColNames>
<Type>btree</Type>
</index>
<index id="550" parent="521" name="gericht_id">
<index id="575" parent="523" name="gericht_hat_allergen_ibfk_2_new">
<ColNames>gericht_id</ColNames>
<Type>btree</Type>
</index>
<column id="551" parent="522" name="gericht_id">
<column id="576" parent="524" name="gericht_id">
<DasType>bigint(20)|0s</DasType>
<NotNull>1</NotNull>
<Position>1</Position>
</column>
<column id="552" parent="522" name="kategorie_id">
<column id="577" parent="524" name="kategorie_id">
<DasType>bigint(20)|0s</DasType>
<NotNull>1</NotNull>
<Position>2</Position>
</column>
<foreign-key id="553" parent="522" name="gericht_hat_kategorie_ibfk_1">
<foreign-key id="578" parent="524" name="gericht_hat_kategorie_ibfk_1_new">
<ColNames>gericht_id</ColNames>
<OnDelete>cascade</OnDelete>
<RefColNames>id</RefColNames>
<RefTableName>gericht</RefTableName>
</foreign-key>
<foreign-key id="554" parent="522" name="gericht_hat_kategorie_ibfk_2">
<foreign-key id="579" parent="524" name="fk_gericht_hat_kategorie_kategorie_id">
<ColNames>kategorie_id</ColNames>
<RefColNames>id</RefColNames>
<RefTableName>kategorie</RefTableName>
</foreign-key>
<index id="555" parent="522" name="gericht_id">
<ColNames>gericht_id</ColNames>
<foreign-key id="580" parent="524" name="gericht_hat_kategorie_ibfk_2">
<ColNames>kategorie_id</ColNames>
<RefColNames>id</RefColNames>
<RefTableName>kategorie</RefTableName>
</foreign-key>
<index id="581" parent="524" name="PRIMARY">
<ColNames>gericht_id
kategorie_id</ColNames>
<Type>btree</Type>
<Unique>1</Unique>
</index>
<index id="556" parent="522" name="kategorie_id">
<index id="582" parent="524" name="gericht_kategorie_unique">
<ColNames>gericht_id
kategorie_id</ColNames>
<Type>btree</Type>
<Unique>1</Unique>
</index>
<index id="583" parent="524" name="fk_gericht_hat_kategorie_kategorie_id">
<ColNames>kategorie_id</ColNames>
<Type>btree</Type>
</index>
<column id="557" parent="523" name="id">
<key id="584" parent="524" name="PRIMARY">
<NameSurrogate>1</NameSurrogate>
<Primary>1</Primary>
<UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
</key>
<key id="585" parent="524" name="gericht_kategorie_unique">
<UnderlyingIndexName>gericht_kategorie_unique</UnderlyingIndexName>
</key>
<column id="586" parent="525" name="id">
<DasType>bigint(20)|0s</DasType>
<NotNull>1</NotNull>
<Position>1</Position>
</column>
<column id="558" parent="523" name="name">
<column id="587" parent="525" name="name">
<DasType>varchar(80)|0s</DasType>
<NotNull>1</NotNull>
<Position>2</Position>
</column>
<column id="559" parent="523" name="eltern_id">
<column id="588" parent="525" name="eltern_id">
<DasType>bigint(20)|0s</DasType>
<Position>3</Position>
</column>
<column id="560" parent="523" name="bildname">
<column id="589" parent="525" name="bildname">
<DasType>varchar(200)|0s</DasType>
<Position>4</Position>
</column>
<foreign-key id="561" parent="523" name="kategorie_ibfk_1">
<foreign-key id="590" parent="525" name="fk_kategorie_eltern_id">
<ColNames>eltern_id</ColNames>
<RefColNames>id</RefColNames>
<RefTableName>kategorie</RefTableName>
</foreign-key>
<index id="562" parent="523" name="PRIMARY">
<foreign-key id="591" parent="525" name="kategorie_ibfk_1">
<ColNames>eltern_id</ColNames>
<RefColNames>id</RefColNames>
<RefTableName>kategorie</RefTableName>
</foreign-key>
<index id="592" parent="525" name="PRIMARY">
<ColNames>id</ColNames>
<Type>btree</Type>
<Unique>1</Unique>
</index>
<index id="563" parent="523" name="eltern_id">
<index id="593" parent="525" name="fk_kategorie_eltern_id">
<ColNames>eltern_id</ColNames>
<Type>btree</Type>
</index>
<key id="564" parent="523" name="PRIMARY">
<key id="594" parent="525" name="PRIMARY">
<NameSurrogate>1</NameSurrogate>
<Primary>1</Primary>
<UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
</key>
<column id="595" parent="526" name="ID">
<AutoIncrement>1</AutoIncrement>
<DasType>int(11)|0s</DasType>
<NotNull>1</NotNull>
<Position>1</Position>
</column>
<column id="596" parent="526" name="Name">
<DasType>varchar(255)|0s</DasType>
<NotNull>1</NotNull>
<Position>2</Position>
</column>
<column id="597" parent="526" name="Beschreibung">
<DasType>text|0s</DasType>
<Position>3</Position>
</column>
<column id="598" parent="526" name="Erstellungsdatum">
<DasType>date|0s</DasType>
<NotNull>1</NotNull>
<Position>4</Position>
</column>
<column id="599" parent="526" name="Ersteller_EMail">
<DasType>varchar(255)|0s</DasType>
<NotNull>1</NotNull>
<Position>5</Position>
</column>
<foreign-key id="600" parent="526" name="wunschgericht_ibfk_1">
<ColNames>Ersteller_EMail</ColNames>
<RefColNames>EMail</RefColNames>
<RefTableName>ersteller</RefTableName>
</foreign-key>
<index id="601" parent="526" name="PRIMARY">
<ColNames>ID</ColNames>
<Type>btree</Type>
<Unique>1</Unique>
</index>
<index id="602" parent="526" name="Ersteller_EMail">
<ColNames>Ersteller_EMail</ColNames>
<Type>btree</Type>
</index>
<key id="603" parent="526" name="PRIMARY">
<NameSurrogate>1</NameSurrogate>
<Primary>1</Primary>
<UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
</key>
<column id="604" parent="527" name="name">
<DasType>varchar(200)|0s</DasType>
<NotNull>1</NotNull>
<Position>1</Position>
</column>
<column id="605" parent="527" name="anzahlanmeldungen">
<DasType>int(11)|0s</DasType>
<NotNull>1</NotNull>
<Position>2</Position>
</column>
<column id="606" parent="528" name="Kategorie">
<DasType>varchar(80)|0s</DasType>
<NotNull>1</NotNull>
<Position>1</Position>
</column>
<column id="607" parent="528" name="id">
<DasType>bigint(20)|0s</DasType>
<NotNull>1</NotNull>
<Position>2</Position>
</column>
<column id="608" parent="528" name="gericht_id">
<DasType>bigint(20)|0s</DasType>
<Position>3</Position>
</column>
<column id="609" parent="528" name="name">
<DasType>varchar(80)|0s</DasType>
<Position>4</Position>
</column>
<column id="610" parent="529" name="id">
<DasType>bigint(20)|0s</DasType>
<NotNull>1</NotNull>
<Position>1</Position>
</column>
<column id="611" parent="529" name="name">
<DasType>varchar(80)|0s</DasType>
<NotNull>1</NotNull>
<Position>2</Position>
</column>
<column id="612" parent="529" name="beschreibung">
<DasType>varchar(80)|0s</DasType>
<NotNull>1</NotNull>
<Position>3</Position>
</column>
<column id="613" parent="529" name="erfasst_am">
<DasType>date|0s</DasType>
<NotNull>1</NotNull>
<Position>4</Position>
</column>
<column id="614" parent="529" name="vegetarisch">
<DasType>tinyint(1)|0s</DasType>
<NotNull>1</NotNull>
<Position>5</Position>
</column>
<column id="615" parent="529" name="vegan">
<DasType>tinyint(1)|0s</DasType>
<NotNull>1</NotNull>
<Position>6</Position>
</column>
<column id="616" parent="529" name="preisintern">
<DasType>double|0s</DasType>
<NotNull>1</NotNull>
<Position>7</Position>
</column>
<column id="617" parent="529" name="preisextern">
<DasType>double|0s</DasType>
<NotNull>1</NotNull>
<Position>8</Position>
</column>
<column id="618" parent="529" name="bildname">
<DasType>varchar(200)|0s</DasType>
<Position>9</Position>
</column>
</database-model>
</dataSource>

View File

@@ -1,2 +1,2 @@
#n:emensawerbeseite
!<md> [1700856041000, 0, null, null, -2147483648, -2147483648]
!<md> [1704890629000, 0, null, null, -2147483648, -2147483648]

13
.idea/php.xml generated
View File

@@ -10,6 +10,19 @@
<option name="highlightLevel" value="WARNING" />
<option name="transferred" value="true" />
</component>
<component name="PhpIncludePathManager">
<include_path>
<path value="$PROJECT_DIR$/M5/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/M5/vendor/psr/log" />
<path value="$PROJECT_DIR$/M5/vendor/composer" />
<path value="$PROJECT_DIR$/M4/emensa/vendor/eftec/bladeone" />
<path value="$PROJECT_DIR$/M4/emensa/vendor/composer" />
<path value="$PROJECT_DIR$/M5/emensa/vendor/eftec/bladeone" />
<path value="$PROJECT_DIR$/M5/emensa/vendor/composer" />
<path value="$PROJECT_DIR$/M5/emensa/vendor/psr/log" />
<path value="$PROJECT_DIR$/M5/emensa/vendor/monolog/monolog" />
</include_path>
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="7.4">
<option name="suggestChangeDefaultLanguageLevel" value="false" />
</component>

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,4 @@
<changelist name="Uncommitted_changes_before_Update_at_10_01_2024_10_45_[Changes]" date="1704879962459" recycled="true" deleted="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_10_01_2024_10_45_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 10.01.2024 10:45 [Changes]" />
</changelist>

78
.idea/workspace.xml generated
View File

@@ -5,23 +5,28 @@
</component>
<component name="ChangeListManager">
<list default="true" id="6dcbe3e4-9d68-41d8-8c39-5cfbe5cd4a21" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.meta" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M5/Dossier/.$Aufgabe1.drawio.bkp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/M5/Dossier/.$Aufgabe1.drawio.dtmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/M5/Dossier/Aufgabe1.drawio" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/M5/Dossier/ERD M4-1-1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/M5/Dossier/M4.md" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/M5/M4.pdf" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/M5/emensa/config/db.php" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/config/db.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M5/emensa/controllers/MainController.php" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/controllers/MainController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M5/emensa/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/routes/web.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M5/gerichte.zip" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/M5/emensa/models/gerichte_main.php" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/models/gerichte_main.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M5/emensa/views/main/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/views/main/index.blade.php" 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="ComposerSettings">
<component name="ComposerConfigs">
<option name="configs">
<option value="$PROJECT_DIR$/M4/emensa/composer.json" />
<option value="$PROJECT_DIR$/M5/emensa/composer.json" />
</option>
</component>
<component name="ComposerSettings" synchronizationState="SYNCHRONIZE">
<pharConfigPath>$PROJECT_DIR$/M5/composer.json</pharConfigPath>
<execution />
</component>
<component name="Git.Settings">
@@ -35,7 +40,19 @@
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="PhpWorkspaceProjectConfiguration" interpreter_name="Xampp" />
<component name="PhpWorkspaceProjectConfiguration" interpreter_name="Xampp">
<include_path>
<path value="$PROJECT_DIR$/M5/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/M5/vendor/psr/log" />
<path value="$PROJECT_DIR$/M5/vendor/composer" />
<path value="$PROJECT_DIR$/M4/emensa/vendor/eftec/bladeone" />
<path value="$PROJECT_DIR$/M4/emensa/vendor/composer" />
<path value="$PROJECT_DIR$/M5/emensa/vendor/eftec/bladeone" />
<path value="$PROJECT_DIR$/M5/emensa/vendor/composer" />
<path value="$PROJECT_DIR$/M5/emensa/vendor/psr/log" />
<path value="$PROJECT_DIR$/M5/emensa/vendor/monolog/monolog" />
</include_path>
</component>
<component name="ProjectColorInfo">{
&quot;customColor&quot;: &quot;&quot;,
&quot;associatedIndex&quot;: 0
@@ -45,28 +62,28 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"database.data.extractors.current.export.id": "Comma-separated (CSV)_id",
"git-widget-placeholder": "dev/m5__safak",
"last_opened_file_path": "C:/Users/rober/Documents/GitHub/DBWT-Praktika/M4/emensa/public/img",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"settings.editor.selected.configurable": "preferences.pluginManager",
"vue.rearranger.settings.migration": "true"
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
&quot;database.data.extractors.current.export.id&quot;: &quot;Comma-separated (CSV)_id&quot;,
&quot;git-widget-placeholder&quot;: &quot;dev/m5__safak&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/Users/rober/Documents/GitHub/DBWT-Praktika/M4/emensa/public/img&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
},
"keyToStringList": {
"DatabaseDriversLRU": [
"mariadb"
&quot;keyToStringList&quot;: {
&quot;DatabaseDriversLRU&quot;: [
&quot;mariadb&quot;
]
}
}]]></component>
}</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\rober\Documents\GitHub\DBWT-Praktika\M4\emensa\public\img" />
@@ -83,6 +100,9 @@
<updated>1700736495450</updated>
<workItem from="1700736497007" duration="15223000" />
<workItem from="1702027267170" duration="12429000" />
<workItem from="1704879915312" duration="5579000" />
<workItem from="1704901745332" duration="7535000" />
<workItem from="1705063082944" duration="126000" />
</task>
<servers />
</component>

View File

@@ -2,7 +2,7 @@
return [
'host' => 'localhost', // 'localhost' or '127.0.0.1'
'user' => 'root', // '<yourusername>'
'password' => 'wm#32', // '<yourpassword>'
'password' => 'admin', // '<yourpassword>'
'database' => 'emensawerbeseite',
// optionally: set port below if it differs from the default 3306
// 'port' => 13306 // !! this is not your webserver port, but the mariadb port

View File

@@ -10,8 +10,7 @@ class MainController
so dass Sie die Aufgabe löst
*/
$log = logger('werbeseite_log', '../storage/logs');
$log->info('werbeseite aufgerufen!');
$data = db_gericht_select_karte();

View File

@@ -9,8 +9,8 @@ function db_gericht_select_karte()
$sql_gerichte = "SELECT * FROM gericht ORDER BY RAND() LIMIT 5";
$result_sql_gerichte = mysqli_query($link, $sql_gerichte);
$result_sql_gerichte1 = mysqli_query($link, $sql_gerichte);
$tabelle = "<table class=\"speisen\"><tr class=\"speisen\"> <td>Gerichte</td><td>Preis intern</td><td>Preis extern</td><td>Bild</td></tr>";
$verwendete_allergene_code = [];
$verwendete_allergene_string = "";
@@ -30,42 +30,20 @@ function db_gericht_select_karte()
}
}
// Preise in EUR
$preisintern = number_format($row_gerichte['preisintern'], 2, ',', '.');
$preisextern = number_format($row_gerichte['preisextern'], 2, ',', '.');
//Bildname
$bildname = $row_gerichte['bildname'];
if($bildname == Null){
$bildname = "00_image_missing.jpg";
}
$bildname = "/img/gerichte/" . $bildname;
// Ausgabe des aktuellen Gerichts
$tabelle .= "<tr class=\"speisen\"><td>" . htmlspecialchars($row_gerichte['name']) . " <sup>" . htmlspecialchars($allergene) . "</sup></td><td>" . htmlspecialchars($preisintern) . "€</td><td>" . htmlspecialchars($preisextern) . "€</td><td> <img src=\"".$bildname ."\" alt =\"Bild vom Gericht\" width= \"10\" height=\"10\"> </td></tr>";
}
$tabelle .= "</table>";
// Abfrage der Allergen Code und Name
$sql_allergen = "SELECT code, name FROM allergen";
$result_sql_allergen = mysqli_query($link, $sql_allergen);
while ($row_allergen = mysqli_fetch_assoc($result_sql_allergen)) {
if (in_array($row_allergen['code'], $verwendete_allergene_code)) {
$verwendete_allergene_string .= "<sup>" . htmlspecialchars($row_allergen['code']) . "</sup> " . htmlspecialchars($row_allergen['name']) . ", ";
}
}
$data = [
"gericht" => $tabelle,
"allergene" => $verwendete_allergene_string
"allergene" => $verwendete_allergene_string,
"result_sql_allergen" => $result_sql_allergen,
"verwendete_allergene_code" => $verwendete_allergene_code,
"result_sql_gerichte" => $result_sql_gerichte1,
"allergene1" => $allergene
];

View File

@@ -0,0 +1,30 @@
<!doctype html>
<html class="no-js" lang="DE">
<head>
<meta charset="utf-8">
<title><?php echo \htmlentities($title??'', ENT_QUOTES, 'UTF-8', false); ?></title>
<?php echo $this->yieldContent("header"); ?>
<!-- good developers check the markup ;) -->
</head>
<body>
<?php echo $this->yieldContent("nav"); ?>
<hr>
<div class="grid">
<div></div>
<div>
<?php echo $this->yieldContent("text"); ?>
<?php echo $this->yieldContent("gerichte"); ?>
</div>
<div></div>
</div>
<footer>
<table class="fusszeile">
<?php echo $this->yieldContent("footer"); ?>
</table>
</footer>
</body>
</html>

View File

@@ -0,0 +1,112 @@
<?php $_shouldextend[1]=1; ?>
<?php $this->startSection("header"); ?>
<link rel="stylesheet" href="/css/style.css">
<?php $this->stopSection(); ?>
<?php $this->startSection("nav"); ?>
<div class="grid">
<div>
<img src="/img/fh-logo.jpg" alt="FH-Logo">
</div>
<div>
<a href="#ankündigung">Ankündigung</a>
<a href="#speisen">Speisen</a>
<a href="#zahlen">Zahlen</a>
<a href="#kontakt">Kontakt</a>
<a href="#wichtig">Wichtig für uns</a>
</div>
<div>
<?php if(($_SESSION['login'] ?? NULL) == 0): ?>
<a href="/anmeldung">Anmelden</a>
<?php else: ?>
Angemeldet als:<br>
<div><?php echo \htmlentities($_SESSION['name']??'', ENT_QUOTES, 'UTF-8', false); ?></div>
<a href="/abmeldung">Abmelden</a>
<?php endif; ?>
</div>
</div>
<?php $this->stopSection(); ?>
<?php $this->startSection("text"); ?>
<img src="/img/mensa21.jpg" alt="Essen">
<h1 id="ankündigung">Bald gibt es auch Essen online ;)</h1>
<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et
dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet,
consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no
sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
<h1 id="speisen">Köstlichkeiten die Sie erwarten</h1>
<?php $this->stopSection(); ?>
<?php $this->startSection("gerichte"); ?>
<?php if(isset($data['error'])): ?>
<h1>Es gab ein Problem mit der Datenbankverbindung</h1>
<p>Fehlermeldung</p>
<pre> <?php echo \htmlentities($data['beschreibung']??'', ENT_QUOTES, 'UTF-8', false); ?></pre>
<?php else: ?>
<?php
$result_sql_allergen = $data["result_sql_allergen"];
$verwendete_allergene_code = $data["verwendete_allergene_code"];
$result_sql_gerichte = $data["result_sql_gerichte"];
$verwendete_allergene_string = $data["allergene"];
$allergene = $data["allergene1"];
$tabelle = "<table class=\"speisen\"><tr class=\"speisen\"> <td>Gerichte</td><td>Preis intern</td><td>Preis extern</td><td>Bild</td></tr>";
while ($row_gerichte = mysqli_fetch_assoc($result_sql_gerichte)) {
$preisintern = number_format($row_gerichte['preisintern'], 2, ',', '.');
$preisextern = number_format($row_gerichte['preisextern'], 2, ',', '.');
$bildname = $row_gerichte['bildname'];
if ($bildname == Null) {
$bildname = "00_image_missing.jpg";
}
$bildname = "/img/gerichte/" . $bildname;
$tabelle .= "<tr class=\"speisen\"><td>" . htmlspecialchars($row_gerichte['name']) . " <sup>" . htmlspecialchars($allergene) . "</sup></td><td>" . htmlspecialchars($preisintern) . "€</td><td>" . htmlspecialchars($preisextern) . "€</td><td> <img src=\"" . $bildname . "\" alt =\"Bild vom Gericht\" width= \"10\" height=\"10\"> </td></tr>";
}
$tabelle .= "</table>";
while ($row_allergen = mysqli_fetch_assoc($result_sql_allergen)) {
if (in_array($row_allergen['code'], $verwendete_allergene_code)) {
$verwendete_allergene_string .= "<sup>" . htmlspecialchars($row_allergen['code']) . "</sup> " . htmlspecialchars($row_allergen['name']) . ", ";
}
}
echo $tabelle;
echo $verwendete_allergene_string;
?>
<?php endif; ?>
<?php $this->stopSection(); ?>
<?php $this->startSection("footer"); ?>
<tr>
<td>(c) E-Mensa GmbH</td>
<td>Şafak Hazinedar & Robert Joel</td>
<td><a href="">Impressum</a></td>
</tr>
<?php $this->stopSection(); ?>
<?php if (isset($_shouldextend[1])) { echo $this->runChild("layouts.main_layout", ['title' => "E-Mensa"]); } ?>

View File

@@ -47,6 +47,7 @@
@section("gerichte")
@if (isset($data['error']))
<h1>Es gab ein Problem mit der Datenbankverbindung</h1>
<p>Fehlermeldung</p>
@@ -54,8 +55,46 @@
@else
<?php
echo $data["gericht"];
echo $data["allergene"];
//Daten vom Modell
$result_sql_allergen = $data["result_sql_allergen"];
$verwendete_allergene_code = $data["verwendete_allergene_code"];
$result_sql_gerichte = $data["result_sql_gerichte"];
$verwendete_allergene_string = $data["allergene"];
$allergene = $data["allergene1"];
$tabelle = "<table class=\"speisen\"><tr class=\"speisen\"> <td>Gerichte</td><td>Preis intern</td><td>Preis extern</td><td>Bild</td></tr>";
while ($row_gerichte = mysqli_fetch_assoc($result_sql_gerichte)) {
$preisintern = number_format($row_gerichte['preisintern'], 2, ',', '.');
$preisextern = number_format($row_gerichte['preisextern'], 2, ',', '.');
$bildname = $row_gerichte['bildname'];
if ($bildname == Null) {
$bildname = "00_image_missing.jpg";
}
$bildname = "/img/gerichte/" . $bildname;
$tabelle .= "<tr class=\"speisen\"><td>" . htmlspecialchars($row_gerichte['name']) . " <sup>" . htmlspecialchars($allergene) . "</sup></td><td>" . htmlspecialchars($preisintern) . "€</td><td>" . htmlspecialchars($preisextern) . "€</td><td> <img src=\"" . $bildname . "\" alt =\"Bild vom Gericht\" width= \"10\" height=\"10\"> </td></tr>";
}
$tabelle .= "</table>";
while ($row_allergen = mysqli_fetch_assoc($result_sql_allergen)) {
if (in_array($row_allergen['code'], $verwendete_allergene_code)) {
$verwendete_allergene_string .= "<sup>" . htmlspecialchars($row_allergen['code']) . "</sup> " . htmlspecialchars($row_allergen['name']) . ", ";
}
}
//Ausgabe
echo $tabelle;
echo $verwendete_allergene_string;
?>
@endif