From 103c768c3b72d5d2ad6659f5afd7d372b98f959e Mon Sep 17 00:00:00 2001 From: Jonas Braus Date: Fri, 29 Nov 2024 02:21:25 +0100 Subject: [PATCH] fix some random issues --- lib/modules/builderToday.dart | 2 +- lib/modules/builderTodayAverage.dart | 21 ++++++--------------- lib/pages/pageDashboard.dart | 4 ++-- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/lib/modules/builderToday.dart b/lib/modules/builderToday.dart index 54b967e..d026dc5 100644 --- a/lib/modules/builderToday.dart +++ b/lib/modules/builderToday.dart @@ -24,7 +24,7 @@ class BuilderToday { rating1: rating["q1"], rating2: rating["q2"], text: rating["t1"], - title: ratingNames[key]!["title"]! + (key == "page1" ? ": ${rating["food"]}" : ""), + title: ratingNames[key]!["title"]! + (key == "page1" ? "${rating["food"]}" : ""), rating1Title: ratingNames[key]!["q1"]!, rating2Title: ratingNames[key]!["q2"]!, ); diff --git a/lib/modules/builderTodayAverage.dart b/lib/modules/builderTodayAverage.dart index ef7aab1..483a63b 100644 --- a/lib/modules/builderTodayAverage.dart +++ b/lib/modules/builderTodayAverage.dart @@ -15,7 +15,7 @@ class BuilderTodayAverage { child: RatingCard( rating1: q1, rating2: q2, - title: ratingNames[page]["title"] + (essen == -1 ? "" : ": $essen"), + title: ratingNames[page]["title"] + (essen == -1 ? "" : "$essen"), rating1Title: ratingNames[page]["q1"], rating2Title: ratingNames[page]["q2"], text: "", @@ -47,12 +47,7 @@ class BuilderTodayAverage { var ratings = map["ratings"]; ratings["page1"]["food"] = ratings["page1"]["food"] - .toString() - .toLowerCase() - .replaceAll("ä", "ae") - .replaceAll("ö", "oe") - .replaceAll("ü", "ue") - .replaceAll("ß", "ss"); + .toString(); print(ratings["page1"]["food"]); @@ -79,8 +74,6 @@ class BuilderTodayAverage { avgP3[2] += page3["q1"] == 0 ? 0 : 1; } - print(foodMap[1]); - for (var i in [1, 2, 3]) { foodMap[i]?[0] = (foodMap[i]![0] / (foodMap[i]![2] == 0 ? 1 : foodMap[i]![2])).toInt(); @@ -88,12 +81,10 @@ class BuilderTodayAverage { (foodMap[i]![1] / (foodMap[i]![2] == 0 ? 1 : foodMap[i]![2])).toInt(); } - print(foodMap[1]); - - avgP2[0] = (avgP2[0] / avgP2[2]).toInt(); - avgP2[1] = (avgP2[1] / avgP2[2]).toInt(); - avgP3[0] = (avgP3[0] / avgP3[2]).toInt(); - avgP3[1] = (avgP3[1] / avgP3[2]).toInt(); + avgP2[0] = (avgP2[0] / avgP2[2] == 0 ? 1 : avgP2[2]).toInt(); + avgP2[1] = (avgP2[1] / avgP2[2] == 0 ? 1 : avgP2[2]).toInt(); + avgP3[0] = (avgP3[0] / avgP3[2] == 0 ? 1 : avgP3[2]).toInt(); + avgP3[1] = (avgP3[1] / avgP3[2] == 0 ? 1 : avgP3[2]).toInt(); return SingleChildScrollView( child: Center( diff --git a/lib/pages/pageDashboard.dart b/lib/pages/pageDashboard.dart index e53d03d..5386d2f 100644 --- a/lib/pages/pageDashboard.dart +++ b/lib/pages/pageDashboard.dart @@ -11,13 +11,13 @@ class PageDashboard extends StatelessWidget { Future> requestSupabaseToday() async { var supabase = Supabase.instance.client; var now = DateTime.now(); - var morning = DateTime(now.year, now.month, now.day, 10, 0); + var morning = DateTime(now.year, now.month, now.day, 0, 1); var result = await supabase.from("ratings_database").select("ratings").gte("created_at", morning); return result; } final ratingNames = const { - "page1": {"title": "Essen", "q1": "Geschmack", "q2": "Qualität"}, + "page1": {"title": "", "q1": "Geschmack", "q2": "Qualität"}, "page2": {"title": "Service", "q1": "Undefined", "q2": "Undefined"}, "page3": {"title": "Wünsche", "q1": "Undefined", "q2": "Undefined"} };