M3 2 Update

This commit is contained in:
S170H
2023-11-15 19:09:52 +01:00
parent 72ecc1e836
commit 8994cc40d6
18 changed files with 401 additions and 58 deletions

8
.idea/modules.xml generated
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/DBWT-Praktika.iml" filepath="$PROJECT_DIR$/.idea/DBWT-Praktika.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml generated
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

8
M1/.idea/.gitignore generated vendored
View File

@@ -1,8 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

8
M1/.idea/M1.iml generated
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

19
M1/.idea/php.xml generated
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="MessDetectorOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PHPCSFixerOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PHPCodeSnifferOptionsConfiguration">
<option name="highlightLevel" value="WARNING" />
<option name="transferred" value="true" />
</component>
<component name="PhpStanOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PsalmOptionsConfiguration">
<option name="transferred" value="true" />
</component>
</project>

8
M2/.idea/.gitignore generated vendored
View File

@@ -1,8 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@@ -0,0 +1,210 @@
Index: ../M1/.idea/vcs.xml
===================================================================
diff --git a/../M1/.idea/vcs.xml b/../M1/.idea/vcs.xml
deleted file mode 100644
--- a/../M1/.idea/vcs.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
- </component>
-</project>
\ No newline at end of file
Index: ../M1/.idea/.gitignore
===================================================================
diff --git a/../M1/.idea/.gitignore b/../M1/.idea/.gitignore
deleted file mode 100644
--- a/../M1/.idea/.gitignore (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
Index: ../.idea/modules.xml
===================================================================
diff --git a/../.idea/modules.xml b/../.idea/modules.xml
deleted file mode 100644
--- a/../.idea/modules.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/DBWT-Praktika.iml" filepath="$PROJECT_DIR$/.idea/DBWT-Praktika.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
Index: ../M1/.idea/M1.iml
===================================================================
diff --git a/../M1/.idea/M1.iml b/../M1/.idea/M1.iml
deleted file mode 100644
--- a/../M1/.idea/M1.iml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
- <component name="NewModuleRootManager">
- <content url="file://$MODULE_DIR$" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
Index: ../.idea/php.xml
===================================================================
diff --git a/../.idea/php.xml b/../.idea/php.xml
deleted file mode 100644
--- a/../.idea/php.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="MessDetectorOptionsConfiguration">
- <option name="transferred" value="true" />
- </component>
- <component name="PHPCSFixerOptionsConfiguration">
- <option name="transferred" value="true" />
- </component>
- <component name="PHPCodeSnifferOptionsConfiguration">
- <option name="highlightLevel" value="WARNING" />
- <option name="transferred" value="true" />
- </component>
- <component name="PhpProjectSharedConfiguration" php_language_level="8.2" />
- <component name="PhpStanOptionsConfiguration">
- <option name="transferred" value="true" />
- </component>
- <component name="PsalmOptionsConfiguration">
- <option name="transferred" value="true" />
- </component>
-</project>
\ No newline at end of file
Index: ../.idea/DBWT-Praktika.iml
===================================================================
diff --git a/../.idea/DBWT-Praktika.iml b/../.idea/DBWT-Praktika.iml
deleted file mode 100644
--- a/../.idea/DBWT-Praktika.iml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
- <component name="NewModuleRootManager">
- <content url="file://$MODULE_DIR$" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
Index: ../M1/.idea/php.xml
===================================================================
diff --git a/../M1/.idea/php.xml b/../M1/.idea/php.xml
deleted file mode 100644
--- a/../M1/.idea/php.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="MessDetectorOptionsConfiguration">
- <option name="transferred" value="true" />
- </component>
- <component name="PHPCSFixerOptionsConfiguration">
- <option name="transferred" value="true" />
- </component>
- <component name="PHPCodeSnifferOptionsConfiguration">
- <option name="highlightLevel" value="WARNING" />
- <option name="transferred" value="true" />
- </component>
- <component name="PhpStanOptionsConfiguration">
- <option name="transferred" value="true" />
- </component>
- <component name="PsalmOptionsConfiguration">
- <option name="transferred" value="true" />
- </component>
-</project>
\ No newline at end of file
Index: ../.idea/.gitignore
===================================================================
diff --git a/../.idea/.gitignore b/../.idea/.gitignore
deleted file mode 100644
--- a/../.idea/.gitignore (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
Index: .idea/.gitignore
===================================================================
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
--- a/.idea/.gitignore (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
Index: ../M1/.idea/modules.xml
===================================================================
diff --git a/../M1/.idea/modules.xml b/../M1/.idea/modules.xml
deleted file mode 100644
--- a/../M1/.idea/modules.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/M1.iml" filepath="$PROJECT_DIR$/.idea/M1.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
Index: ../.idea/vcs.xml
===================================================================
diff --git a/../.idea/vcs.xml b/../.idea/vcs.xml
deleted file mode 100644
--- a/../.idea/vcs.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
Index: .idea/php.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"MessDetectorOptionsConfiguration\">\r\n <option name=\"transferred\" value=\"true\" />\r\n </component>\r\n <component name=\"PHPCSFixerOptionsConfiguration\">\r\n <option name=\"transferred\" value=\"true\" />\r\n </component>\r\n <component name=\"PHPCodeSnifferOptionsConfiguration\">\r\n <option name=\"highlightLevel\" value=\"WARNING\" />\r\n <option name=\"transferred\" value=\"true\" />\r\n </component>\r\n <component name=\"PhpProjectSharedConfiguration\" php_language_level=\"8.0\" />\r\n <component name=\"PhpStanOptionsConfiguration\">\r\n <option name=\"transferred\" value=\"true\" />\r\n </component>\r\n <component name=\"PsalmOptionsConfiguration\">\r\n <option name=\"transferred\" value=\"true\" />\r\n </component>\r\n</project>
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.idea/php.xml b/.idea/php.xml
--- a/.idea/php.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ b/.idea/php.xml (date 1700047317911)
@@ -10,7 +10,6 @@
<option name="highlightLevel" value="WARNING" />
<option name="transferred" value="true" />
</component>
- <component name="PhpProjectSharedConfiguration" php_language_level="8.0" />
<component name="PhpStanOptionsConfiguration">
<option name="transferred" value="true" />
</component>

View File

@@ -0,0 +1,4 @@
<changelist name="Uncommitted_changes_before_Checkout_at_15_11_2023_12_24_[Changes]" date="1700047474245" recycled="true" deleted="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Checkout at 15.11.2023 12:24 [Changes]" />
</changelist>

74
M2/.idea/workspace.xml generated Normal file
View File

@@ -0,0 +1,74 @@
<?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="3addb60f-b39d-430d-91ac-acb76c147edc" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/../.idea/.gitignore" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../.idea/DBWT-Praktika.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../.idea/modules.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../.idea/php.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../.idea/vcs.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../M1/.idea/.gitignore" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../M1/.idea/M1.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../M1/.idea/modules.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../M1/.idea/php.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../M1/.idea/vcs.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="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">
<execution />
</component>
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$/.." value="dev/m2_safak" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="PhpWorkspaceProjectConfiguration" interpreter_name="C:\Program Files\php-8.2.11-Win32-vs16-x64\php.exe" />
<component name="ProjectColorInfo">{
&quot;associatedIndex&quot;: 8
}</component>
<component name="ProjectId" id="2YD5QUlQAhlJaWMg3ierW7DDTbq" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"git-widget-placeholder": "dev/m3__safak",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"vue.rearranger.settings.migration": "true"
}
}]]></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="3addb60f-b39d-430d-91ac-acb76c147edc" name="Changes" comment="" />
<created>1700047295160</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1700047295160</updated>
<workItem from="1700047298386" duration="519000" />
<workItem from="1700071102317" duration="365000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
</project>

View File

12
M3/.idea/dataSources.xml generated Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="emensawerbeseite" uuid="9b92c113-bfb2-483a-8722-2d670725b7b2">
<driver-ref>mariadb</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mariadb://localhost:3306</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>
</project>

View File

@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/M1.iml" filepath="$PROJECT_DIR$/.idea/M1.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/M3.iml" filepath="$PROJECT_DIR$/.idea/M3.iml" />
</modules>
</component>
</project>

View File

7
M3/.idea/sqldialects.xml generated Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SqlDialectMappings">
<file url="file://$PROJECT_DIR$/werbeseite_daten.sql" dialect="MariaDB" />
<file url="PROJECT" dialect="MariaDB" />
</component>
</project>

View File

BIN
M3/M3.pdf Normal file

Binary file not shown.

93
M3/werbeseite_daten.sql Normal file
View File

@@ -0,0 +1,93 @@
USE emensawerbeseite;
INSERT INTO `allergen` (`code`, `name`, `typ`) VALUES
('a', 'Getreideprodukte', 'Getreide (Gluten)'),
('a1', 'Weizen', 'Allergen'),
('a2', 'Roggen', 'Allergen'),
('a3', 'Gerste', 'Allergen'),
('a4', 'Dinkel', 'Allergen'),
('a5', 'Hafer', 'Allergen'),
('a6', 'Dinkel', 'Allergen'),
('b', 'Fisch', 'Allergen'),
('c', 'Krebstiere', 'Allergen'),
('d', 'Schwefeldioxid/Sulfit', 'Allergen'),
('e', 'Sellerie', 'Allergen'),
('f', 'Milch und Laktose', 'Allergen'),
('f1', 'Butter', 'Allergen'),
('f2', 'Käse', 'Allergen'),
('f3', 'Margarine', 'Allergen'),
('g', 'Sesam', 'Allergen'),
('h', 'Nüsse', 'Allergen'),
('h1', 'Mandeln', 'Allergen'),
('h2', 'Haselnüsse', 'Allergen'),
('h3', 'Walnüsse', 'Allergen'),
('i', 'Erdnüsse', 'Allergen');
INSERT INTO `gericht` (`id`, `name`, `beschreibung`, `erfasst_am`, `vegan`, `vegetarisch`, `preisintern`, `preisextern`) VALUES
(1, 'Bratkartoffeln mit Speck und Zwiebeln', 'Kartoffeln mit Zwiebeln und gut Speck', '2020-08-25', 0, 0, 2.3, 4),
(3, 'Bratkartoffeln mit Zwiebeln', 'Kartoffeln mit Zwiebeln und ohne Speck', '2020-08-25', 1, 1, 2.3, 4),
(4, 'Grilltofu', 'Fein gewürzt und mariniert', '2020-08-25', 1, 1, 2.5, 4.5),
(5, 'Lasagne', 'Klassisch mit Bolognesesoße und Creme Fraiche', '2020-08-24', 0, 0, 2.5, 4.5),
(6, 'Lasagne vegetarisch', 'Klassisch mit Sojagranulatsoße und Creme Fraiche', '2020-08-24', 0, 1, 2.5, 4.5),
(7, 'Hackbraten', 'Nicht nur für Hacker', '2020-08-25', 0, 0, 2.5, 4),
(8, 'Gemüsepfanne', 'Gesundes aus der Region, deftig angebraten', '2020-08-25', 1, 1, 2.3, 4),
(9, 'Hühnersuppe', 'Suppenhuhn trifft Petersilie', '2020-08-25', 0, 0, 2, 3.5),
(10, 'Forellenfilet', 'mit Kartoffeln und Dilldip', '2020-08-22', 0, 0, 3.8, 5),
(11, 'Kartoffel-Lauch-Suppe', 'der klassische Bauchwärmer mit frischen Kräutern', '2020-08-22', 0, 1, 2, 3),
(12, 'Kassler mit Rosmarinkartoffeln', 'dazu Salat und Senf', '2020-08-23', 0, 0, 3.8, 5.2),
(13, 'Drei Reibekuchen mit Apfelmus', 'grob geriebene Kartoffeln aus der Region', '2020-08-23', 0, 1, 2.5, 4.5),
(14, 'Pilzpfanne', 'die legendäre Pfanne aus Pilzen der Saison', '2020-08-23', 0, 1, 3, 5),
(15, 'Pilzpfanne vegan', 'die legendäre Pfanne aus Pilzen der Saison ohne Käse', '2020-08-24', 1, 1, 3, 5),
(16, 'Käsebrötchen', 'schmeckt vor und nach dem Essen', '2020-08-24', 0, 1, 1, 1.5),
(17, 'Schinkenbrötchen', 'schmeckt auch ohne Hunger', '2020-08-25', 0, 0, 1.25, 1.75),
(18, 'Tomatenbrötchen', 'mit Schnittlauch und Zwiebeln', '2020-08-25', 1, 1, 1, 1.5),
(19, 'Mousse au Chocolat', 'sahnige schweizer Schokolade rundet jedes Essen ab', '2020-08-26', 0, 1, 1.25, 1.75),
(20, 'Suppenkreation á la Chef', 'was verschafft werden muss, gut und günstig', '2020-08-26', 0, 0, 0.5, 0.9);
INSERT INTO `gericht_hat_allergen` (`code`, `gericht_id`) VALUES
('h', 1),
('a3', 1),
('a4', 1),
('f1', 3),
('a6', 3),
('i', 3),
('a3', 4),
('f1', 4),
('a4', 4),
('h3', 4),
('d', 6),
('h1',7),
('a2', 7),
('h3', 7),
('c', 7),
('a3', 8),
('h3', 10),
('d', 10),
('f', 10),
('f2', 12),
('h1', 12),
('a5',12),
('c', 1),
('a2', 9),
('i', 14),
('f1', 1),
('a1', 15),
('a4', 15),
('i', 15),
('f3', 15),
('h3', 15);
INSERT INTO `kategorie` (`id`, `eltern_id`, `name`, `bildname`) VALUES
(1, NULL, 'Aktionen', 'kat_aktionen.png'),
(2, NULL, 'Menus', 'kat_menu.gif'),
(3, 2, 'Hauptspeisen', 'kat_menu_haupt.bmp'),
(4, 2, 'Vorspeisen', 'kat_menu_vor.svg'),
(5, 2, 'Desserts', 'kat_menu_dessert.pic'),
(6, 1, 'Mensastars', 'kat_stars.tif'),
(7, 1, 'Erstiewoche', 'kat_erties.jpg');
INSERT INTO `gericht_hat_kategorie` (`kategorie_id`, `gericht_id`) VALUES
(3, 1), (3, 3), (3, 4), (3, 5), (3, 6), (3, 7), (3, 9), (4, 16), (4, 17), (4, 18), (5, 16), (5, 17), (5, 18);