diff --git a/lib/modules/builderAverage.dart b/lib/modules/builderAverage.dart index d66de1d..430f082 100644 --- a/lib/modules/builderAverage.dart +++ b/lib/modules/builderAverage.dart @@ -68,7 +68,6 @@ class BuilderAverage { finalDic[food]["q1"] = (foodData["q1"] / foodData["counter"]).round().toInt(); finalDic[food]?["q2"] = (foodData["q2"] / foodData["counter"]).round().toInt(); } - List cards = []; if (data == null) { @@ -76,6 +75,7 @@ class BuilderAverage { } for (var title in finalDic.keys) { + List children = []; var rating = finalDic[title]; diff --git a/lib/modules/builderNormal.dart b/lib/modules/builderNormal.dart index 94a9d51..6a3bbf7 100644 --- a/lib/modules/builderNormal.dart +++ b/lib/modules/builderNormal.dart @@ -1,7 +1,9 @@ import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; import 'package:mensaappbackend/modules/ratingCard.dart'; import 'package:mensaappbackend/providers/timeProvider.dart'; import 'package:provider/provider.dart'; +import 'package:intl/intl_browser.dart'; class BuilderToday { static Widget build(var context, var snapshot, var ratingNames) { @@ -16,6 +18,10 @@ class BuilderToday { var i = 0; for (var map in data) { var ratings = map["ratings"]; + var createdAt = map["created_at"]; + + // Datum in ein lesbares Format umwandeln + var formattedDate = DateFormat('dd.MM.yyyy').format(DateTime.parse(createdAt)); List children = []; for (var key in ratings.keys) { @@ -26,8 +32,8 @@ class BuilderToday { rating1: rating["q1"], rating2: rating["q2"], text: rating["t1"], - title: ratingNames[key]!["title"]! + - (key == "page1" ? "${rating["food"]}" : ""), + title: "$formattedDate\n${ratingNames[key]!["title"]! + + (key == "page1" ? "${rating["food"]}" : "")}", rating1Title: ratingNames[key]!["q1"]!, rating2Title: ratingNames[key]!["q2"]!, ); diff --git a/lib/modules/ratingCard.dart b/lib/modules/ratingCard.dart index 63416d0..fd01b1d 100644 --- a/lib/modules/ratingCard.dart +++ b/lib/modules/ratingCard.dart @@ -32,7 +32,7 @@ class RatingCard extends StatelessWidget { ), child: Column( children: [ - Text(title, style: TextStyle(fontSize: 22),), + Text(title, style: TextStyle(fontSize: 22), textAlign: TextAlign.center,), SizedBox(height: 10,), Text("$rating1Title:", style: TextStyle(fontSize: 18),), RatingStars(initRating: rating1.toDouble()), diff --git a/lib/pages/pageDashboard.dart b/lib/pages/pageDashboard.dart index df244cf..9ca876c 100644 --- a/lib/pages/pageDashboard.dart +++ b/lib/pages/pageDashboard.dart @@ -28,7 +28,7 @@ class PageDashboard extends StatelessWidget { 3: nowMorning.subtract(const Duration(days: 30)), 4: nowMorning.subtract(const Duration(days: 365)), }; - var result = await supabase.from("ratings_database").select("ratings").gte("created_at", morningDict[timeId]!); + var result = await supabase.from("ratings_database").select("ratings, created_at").gte("created_at", morningDict[timeId]!); return result; } diff --git a/pubspec.yaml b/pubspec.yaml index 2f8288d..f6b5295 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -34,6 +34,7 @@ dependencies: supabase_flutter: ^2.8.1 flutter_login: ^5.0.0 flutter_rating_bar: ^4.0.1 + intl: ^0.20.2 # The following adds the Cupertino Icons font to your application.