Fix frontend speisekarte1

Add admin login
Add current kunde usage
2025-09-08 08:48:46 +02:00 · 2023-06-26 09:49:51 +02:00 · 2023-06-26 09:41:13 +02:00 · 2023-06-25 21:10:00 +02:00 · 2023-06-25 21:06:53 +02:00 · 2023-06-25 20:19:03 +02:00
14 changed files with 59 additions and 115 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 ## files generated by popular Visual Studio add-ons.

 # User-specific files
-.vscode
 .vs
 */.vs
 *.suo
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Yummy4Friends ist eine benutzerfreundliche und visuell ansprechende Webapp zur O

 ## Description (English)

-Yummy4Friends is a user-friendly and visually appealing WebApp for ordering food or other things online. Food or other stuff gets dynamically fetched from a customer and food database while also taking into account special requests. To attract customers, one can also offer limited-time sales and coupons, order in advance, and have the option to choose the preferred pickup time.  
+Yummy4Friends is a user friendly and visually appealing WebApp for ordering food or other things online. Food or other stuff get dynamically fetched from a customer and food database while also taking into account special requests. To attract customers one can also offer limeted time sales/coupons, ordering in advance as well as being able to choosing their preferred pickup time.  

 ## Tech Stack

--- a/src/WebApi/Data/WebApiContext.cs
+++ b/src/WebApi/Data/WebApiContext.cs
@@ -221,8 +221,8 @@ public partial class WebApiContext : DbContext

 			entity.ToTable("bestellungsposition_has_menuitem");

-			entity.Property(e => e.Bestellungsposition_IDBestellung).HasColumnType("int(11)").HasColumnName("Bestellungsposition_IDBestellung");
-			entity.Property(e => e.MenuItem_IDMenuItem).HasColumnType("int(11)").HasColumnName("MenuItem_IDMenuItem");
+			entity.Property(e => e.Bestellungsposition_IDBestellung).HasColumnType("int(11)").HasColumnName("bestellungsposition_IDBestellung");
+			entity.Property(e => e.MenuItem_IDMenuItem).HasColumnType("int(11)").HasColumnName("menuItem_IDMenuItem");
 		});

 		modelBuilder.Entity<MenuitemHasAllergie>(entity =>
--- a/src/y4f/Pages/Index.razor
+++ b/src/y4f/Pages/Index.razor
@@ -6,7 +6,6 @@
@inject NavigationManager _navigationManager
@inject IJSRuntime JSRuntime;

-
 <PageTitle>Yummy4Friends</PageTitle>

 <body style='--blazor-load-percentage: 100%; --blazor-load-percentage-text: "100%"; background-color:#C7FFD5;'>
@@ -34,7 +33,6 @@
 			{
 				localStorage.SetItem("kunde", kunde);
 				_navigationManager.NavigateTo("/speisekarte");
-
 				return;
 			}
 		}
@@ -44,7 +42,6 @@
 	protected override async Task OnInitializedAsync()
 	{
 		kunden = await Http.GetFromJsonAsync<List<Kunde>>("https://localhost:7076/api/kunden");
-
 		// if already logged in navigate to speisekarte
 		if (localStorage.ContainKey("kunde"))
 		{
@@ -52,7 +49,6 @@
 		}


-
 	}

 	public class Kunde
@@ -64,3 +60,6 @@


 }
+
+
+
--- a/src/y4f/Pages/Speisekarte.razor
+++ b/src/y4f/Pages/Speisekarte.razor
@@ -135,4 +135,3 @@
 		public int Treuepunkte { get; set; }
 	}
 }
-
--- a/src/y4f/Pages/SpeisekarteCnDetails.razor
+++ b/src/y4f/Pages/SpeisekarteCnDetails.razor
@@ -137,6 +137,7 @@

 		allergien = await Http.GetFromJsonAsync<List<Allergie>>("https://localhost:7076/api/allergien");
 		bestellungspositions = await Http.GetFromJsonAsync<List<Bestellungsposition>>("https://localhost:7076/api/bestellungspositionen");
+		kunden = await Http.GetFromJsonAsync<List<Kunde>>("https://localhost:7076/api/kunden");
 		menuitems = await Http.GetFromJsonAsync<List<Menuitem>>("https://localhost:7076/api/Menuitems");
 		menuitemkategories = await Http.GetFromJsonAsync<List<Menuitemkategorie>>("https://localhost:7076/api/Menuitemkategories");
 		menuitemueberkategories = await Http.GetFromJsonAsync<List<Menuitemueberkategorie>>("https://localhost:7076/api/Menuitemueberkategories");
--- a/src/y4f/Pages/SpeisekarteDrDetails.razor
+++ b/src/y4f/Pages/SpeisekarteDrDetails.razor
@@ -143,6 +143,7 @@

 		allergien = await Http.GetFromJsonAsync<List<Allergie>>("https://localhost:7076/api/allergien");
 		bestellungspositions = await Http.GetFromJsonAsync<List<Bestellungsposition>>("https://localhost:7076/api/bestellungspositionen");
+		kunden = await Http.GetFromJsonAsync<List<Kunde>>("https://localhost:7076/api/kunden");
 		menuitems = await Http.GetFromJsonAsync<List<Menuitem>>("https://localhost:7076/api/Menuitems");
 		menuitemkategories = await Http.GetFromJsonAsync<List<Menuitemkategorie>>("https://localhost:7076/api/Menuitemkategories");
 		menuitemueberkategories = await Http.GetFromJsonAsync<List<Menuitemueberkategorie>>("https://localhost:7076/api/Menuitemueberkategories");
--- a/src/y4f/Pages/SpeisekarteEtcDetails.razor
+++ b/src/y4f/Pages/SpeisekarteEtcDetails.razor
@@ -93,6 +93,11 @@
 	</div>
 </div>

+
+
+
+
+
@code {
 	private List<Kunde> kunden = new List<Kunde>();
 	private Kunde kunde = new Kunde();
@@ -137,9 +142,9 @@
 		{
 			menuitemIds = localStorage.GetItem<Dictionary<int, int>>("MenuItemIds");
 		}
-
 		allergien = await Http.GetFromJsonAsync<List<Allergie>>("https://localhost:7076/api/allergien");
 		bestellungspositions = await Http.GetFromJsonAsync<List<Bestellungsposition>>("https://localhost:7076/api/bestellungspositionen");
+		kunden = await Http.GetFromJsonAsync<List<Kunde>>("https://localhost:7076/api/kunden");
 		menuitems = await Http.GetFromJsonAsync<List<Menuitem>>("https://localhost:7076/api/Menuitems");
 		menuitemkategories = await Http.GetFromJsonAsync<List<Menuitemkategorie>>("https://localhost:7076/api/Menuitemkategories");
 		menuitemueberkategories = await Http.GetFromJsonAsync<List<Menuitemueberkategorie>>("https://localhost:7076/api/Menuitemueberkategories");
--- a/src/y4f/Pages/SpeisekarteJpDetails.razor
+++ b/src/y4f/Pages/SpeisekarteJpDetails.razor
@@ -132,13 +132,14 @@
 		if (kunde != null && !kunden.Any(k => k.Code == kunde.Code))
 			_navigationManager.NavigateTo("/");
 		// kunde login end
+
 		if (localStorage.GetItem<Dictionary<int, int>>("MenuItemIds") != null)
 		{
 			menuitemIds = localStorage.GetItem<Dictionary<int, int>>("MenuItemIds");
 		}
-
 		allergien = await Http.GetFromJsonAsync<List<Allergie>>("https://localhost:7076/api/allergien");
 		bestellungspositions = await Http.GetFromJsonAsync<List<Bestellungsposition>>("https://localhost:7076/api/bestellungspositionen");
+		kunden = await Http.GetFromJsonAsync<List<Kunde>>("https://localhost:7076/api/kunden");
 		menuitems = await Http.GetFromJsonAsync<List<Menuitem>>("https://localhost:7076/api/Menuitems");
 		menuitemkategories = await Http.GetFromJsonAsync<List<Menuitemkategorie>>("https://localhost:7076/api/Menuitemkategories");
 		menuitemueberkategories = await Http.GetFromJsonAsync<List<Menuitemueberkategorie>>("https://localhost:7076/api/Menuitemueberkategories");
--- a/src/y4f/Shared/Bestellabschluss.razor
+++ b/src/y4f/Shared/Bestellabschluss.razor
@@ -89,13 +89,12 @@
 		{
 			localStorage.SetItem("RabattEinloesen", false);
 			localStorage.SetItem("Summe", summe);
+			// if summe > 8€ add treuepunkte
 			if (summe >= 8)
 			{
-				if (kunde.Treuepunkte < 10)
-				{
-					kunde.Treuepunkte++;
-					Http.PutAsJsonAsync("https://localhost:7076/api/kunden/" + kunde.Idkunde, kunde);
-				}
+				kunde.Treuepunkte++;
+				// add treuepunkte to API
+				Http.PutAsJsonAsync("https://localhost:7076/api/kunden/" + kunde.Idkunde, kunde);
 			}
 		}

@@ -139,20 +138,12 @@

 			Http.PostAsJsonAsync("https://localhost:7076/api/bestellungspositionen", bestellungsposition);

-			////Add menuitems to bestellungspositionHasMenuItem
-			//BestellungspositionHasMenuitem bestellungspositionHasMenuItem = new BestellungspositionHasMenuitem();
-			//bestellungspositionHasMenuItem.Bestellungsposition_IDBestellung = bestellungsposition.Idbestellung;
-			//bestellungspositionHasMenuItem.MenuItem_IDMenuItem = item.Key;
+			//Add menuitems to bestellungspositionHasMenuItem
+			BestellungspositionHasMenuitem bestellungspositionHasMenuItem = new BestellungspositionHasMenuitem();
+			bestellungspositionHasMenuItem.Bestellungsposition_IDBestellung = bestellungsposition.Idbestellung;
+			bestellungspositionHasMenuItem.MenuItem_IDMenuItem = item.Key;

-			//Http.PostAsJsonAsync("https://localhost:7076/api/bestellungspositionhasmenuitems", bestellungspositionHasMenuItem);
-
-			var newBestellungsposition = new BestellungspositionHasMenuitem()
-				{
-					Bestellungsposition_IDBestellung = bestellungsposition.Idbestellung,
-					MenuItem_IDMenuItem = item.Key
-				};
-
-			Http.PostAsJsonAsync("https://localhost:7076/api/bestellungspositionhasmenuitems", newBestellungsposition);
+			Http.PostAsJsonAsync("https://localhost:7076/api/bestellungspositionhasmenuitems", bestellungspositionHasMenuItem);
 		}


--- a/src/y4f/Shared/Chefin/Bestelluebersicht-Chefin.razor
+++ b/src/y4f/Shared/Chefin/Bestelluebersicht-Chefin.razor
@@ -42,20 +42,9 @@
 									month = bestellungsposition.Datum.Month;
 									year = bestellungsposition.Datum.Year;

-									@*print only if date is higher than now datum, all expired hh:mm unvisible *@
-									@*if (bestellungsposition.Datum > DateTime.Now)
-									{
-										<tr>
-											<td>
-												<p @onclick="@(()=>BDetail(@kunde.Idkunde))" class="mb-0 pb-0">
-													#@kunde.Code &nbsp;
-													@hour:@minute
-												</p>
-											</td>
-										</tr>
-									}*@
-									@*print only if date is in current day month year *@
-									if (bestellungsposition.Datum.Day == DateTime.Now.Day && bestellungsposition.Datum.Month == DateTime.Now.Month && bestellungsposition.Datum.Year == DateTime.Now.Year)
+									@*print kunde.code, hour and minute from last bestellungsposition*@
+									@*print only if date is higher than now datum *@
+									if (bestellungsposition.Datum > DateTime.Now)
 									{
 										<tr>
 											<td>
@@ -66,6 +55,7 @@
 											</td>
 										</tr>
 									}
+									@*}*@
 									firstTime = false;
 								}
 							}
@@ -75,17 +65,17 @@
 			</table>
 		</div>
 		<div class="col-lg-3">
-			@*			<p id="text" readonly>Abholzeit</p>
-			<br />
-			<form id="button" action="Bestelluebersicht">
-			<input type="submit" value="30 Min" class="btn">
-			</form>
-			<form id="button" action="Bestelluebersicht">
-			<input type="submit" value="45 Min" class="btn">
-			</form>
-			<form id="button" action="Bestelluebersicht">
-			<input type="submit" value="1 Std" class="btn">
-			</form>*@
+		<p id="text" readonly>Abholzeit</p>
+		<br />
+		<form id="button" action="Bestelluebersicht">
+		<input type="submit" value="30 Min" class="btn">
+		</form>
+		<form id="button" action="Bestelluebersicht">
+		<input type="submit" value="45 Min" class="btn">
+		</form>
+		<form id="button" action="Bestelluebersicht">
+		<input type="submit" value="1 Std" class="btn">
+		</form>

 		</div>
 	</div>
@@ -128,22 +118,6 @@
 		month = DateTime.Now.Month;
 		year = DateTime.Now.Year;

-		//sort bestellungspositions by datum
-		bestellungspositions = bestellungspositions.OrderByDescending(x => x.Datum).ToList();
-		//sort kunden by the order of bestellungspositions
-		List<Kunde> kundenSorted = new List<Kunde>();
-		foreach (var bestellungsposition in bestellungspositions)
-		{
-			foreach (var kunde in kunden)
-			{
-				if (bestellungsposition.KundeIdkunde == kunde.Idkunde && !kundenSorted.Contains(kunde))
-				{
-					kundenSorted.Add(kunde);
-				}
-			}
-		}
-		kunden = kundenSorted;
-
 	}

 	public class Bestellungsposition
--- a/src/y4f/Shared/Chefin/BestelluebersichtD-Chefin.razor
+++ b/src/y4f/Shared/Chefin/BestelluebersichtD-Chefin.razor
@@ -99,7 +99,7 @@

 					<div class="d-flex flex-column" style="align-items: center;  margin-left: 100px;">
 						@*<button class="btn_back w-75">Zurück</button>*@
-						@*<button class="btn btn-danger w-75" style="border-radius: 50px; padding-top:12px; padding-bottom:12px; color:black;" @onclick="Aufloesen">Bestellung auflösen</button>*@
+						@*<button class="btn btn-danger w-75" style="border-radius: 50px; padding-top:12px; padding-bottom:12px; color:black;">Bestellung auflösen</button>*@
 						@*<button class="btn_forward w-75">Bestellung abschließen</button>*@
 					</div>

@@ -150,25 +150,6 @@
 		localStorage.Clear();
 		_navigationManager.NavigateTo("/");
 	}
-
-	//public void Aufloesen()
-	//{
-	//	foreach (var bestellungsposition in bestellungspositions)
-	//	{
-	//		foreach (var bestellungspositionHasMenuitem in bestellungspositionHasMenuitems)
-	//		{
-	//			if (bestellungsposition.Idbestellung == bestellungspositionHasMenuitem.Bestellungsposition_IDBestellung)
-	//			{
-	//				Http.DeleteAsync("https://localhost:7076/api/BestellungspositionHasMenuitems/" + bestellungspositionHasMenuitem.Bestellungsposition_IDBestellung + "/" + bestellungspositionHasMenuitem.MenuItem_IDMenuItem);
-	//			}
-	//		}
-	//		if (bestellungsposition.KundeIdkunde == kunde.Idkunde)
-	//		{
-	//			Http.DeleteAsync("https://localhost:7076/api/Bestellungspositionen/" + bestellungsposition.Idbestellung);
-	//		}
-	//	}
-	//}
-
 	protected override async Task OnInitializedAsync()
 	{
 		// get data from api
--- a/src/y4f/Shared/SurveyPrompt.razor
+++ b/src/y4f/Shared/SurveyPrompt.razor
@@ -0,0 +1,16 @@
+<div class="alert alert-secondary mt-4">
+    <span class="oi oi-pencil me-2" aria-hidden="true"></span>
+    <strong>@Title</strong>
+
+    <span class="text-nowrap">
+        Please take our
+        <a target="_blank" class="font-weight-bold link-dark" href="https://go.microsoft.com/fwlink/?linkid=2186157">brief survey</a>
+    </span>
+    and tell us what you think.
+</div>
+
+@code {
+    // Demonstrates how a parent component can supply parameters
+    [Parameter]
+    public string? Title { get; set; }
+}
--- a/src/y4f/wwwroot/css/Site.css
+++ b/src/y4f/wwwroot/css/Site.css
@@ -3,29 +3,20 @@
 html, body {
    margin: 0px;
    padding: 0px;
-    overflow: hidden;
 }

 #content {
    background-color: #C7FFD1;
+    padding: 5%;
    margin-top: 1%;
    border-radius: 10px;
    position: center;
 }
-#button1 {
-    background-color: #89F9A5;
-    border-radius: 50px;
-    margin-bottom: 15px;
-}
-h1 {
-    margin: 0px;
-    padding: 0px;
-}

 .img {
    height: auto;
    max-width: 100%;
-    margin: 5%;
+    margin: 10%;
 }

 form {
@@ -35,17 +26,3 @@ form {

 }

-p {
-    color: grey;
-}
-
-form {
-    margin-bottom: 20px;
-    margin-top: 5px;
-}
-
-.form-control {
-    border-radius: 50px;
-    margin-bottom: 5px;
-}
-
Author	SHA1	Message	Date
MET18937	314c8667e6	Fix frontend speisekarte1	2023-06-26 09:49:51 +02:00
MET18937	31a82177d5	Add admin login	2023-06-26 09:41:13 +02:00
MET18937	3356a91d47	Add current kunde usage	2023-06-25 21:10:00 +02:00
MET18937	bbbefa43b4	Add page acees only on valid kunde login	2023-06-25 21:06:53 +02:00
MET18937	8abba97ab8	Fix kunde.Idkunde access	2023-06-25 20:19:03 +02:00
MET18937	d32a517013	Update Bestelluebersicht	2023-06-25 18:34:13 +02:00
MET18937	64da182295	Update Bestelluebersicht BestelluebersichtD-Chefin	2023-06-25 18:32:34 +02:00
MET18937	72cffa664e	Add kontaktverwaltung Bestellübersicht	2023-06-25 17:16:22 +02:00
MET18937	8d4d8338aa	Add complete vorbestellungsfunktion	2023-06-25 16:42:33 +02:00
MET18937	9add5ac628	Add vorbestllungsdata into Table BestellungspositionHasMenuitem	2023-06-25 16:10:33 +02:00
MET18937	32bedc209c	Add vorbestllungsdata into Table Bestellungsposition	2023-06-25 16:05:54 +02:00
MET18937	c9f10887ee	Add Bestellabschluss link	2023-06-24 16:43:52 +02:00