From 17f3c4bb2dd94ddbdb3aa5719d21334a2f8ca37b Mon Sep 17 00:00:00 2001 From: Jonas Braus Date: Fri, 29 Nov 2024 12:51:05 +0100 Subject: [PATCH] durchschnitt design angepasst --- lib/modules/builderTodayAverage.dart | 73 ++++++++++++++++------------ 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/lib/modules/builderTodayAverage.dart b/lib/modules/builderTodayAverage.dart index 483a63b..73a282d 100644 --- a/lib/modules/builderTodayAverage.dart +++ b/lib/modules/builderTodayAverage.dart @@ -3,26 +3,41 @@ import 'package:mensaappbackend/modules/ratingCard.dart'; class BuilderTodayAverage { static Widget _getRatingWidget( - var q1, var q2, var page, var essen, var ratingNames) { - Widget card = Container( - decoration: BoxDecoration(boxShadow: [ - BoxShadow( - color: Colors.grey.withOpacity(0.5), - spreadRadius: 5, - blurRadius: 7, - offset: const Offset(0, 3)) - ]), - child: RatingCard( - rating1: q1, - rating2: q2, - title: ratingNames[page]["title"] + (essen == -1 ? "" : "$essen"), - rating1Title: ratingNames[page]["q1"], - rating2Title: ratingNames[page]["q2"], - text: "", - ), + var q1, var q2, var page, var essen, var ratingNames, var context) { + Widget card = Column( + children: [ + Container( + padding: const EdgeInsets.all(15), + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 5, + blurRadius: 7, + offset: const Offset(0, 3)) + ], + borderRadius: BorderRadius.circular(15), + color: Theme.of(context).colorScheme.surface.withOpacity(0.8)), + child: RatingCard( + rating1: q1, + rating2: q2, + title: ratingNames[page]["title"] + (essen == -1 ? "" : "$essen"), + rating1Title: ratingNames[page]["q1"], + rating2Title: ratingNames[page]["q2"], + text: "", + ), + ), + const SizedBox( + height: 20, + ) + ], ); - return card; + if (q1 != 0) { + return card; + } else { + return Container(); + } } static Widget build(var context, var snapshot, var ratingNames) { @@ -46,8 +61,7 @@ class BuilderTodayAverage { for (var map in data) { var ratings = map["ratings"]; - ratings["page1"]["food"] = ratings["page1"]["food"] - .toString(); + ratings["page1"]["food"] = ratings["page1"]["food"].toString(); print(ratings["page1"]["food"]); @@ -101,20 +115,19 @@ class BuilderTodayAverage { const SizedBox( height: 20, ), - Wrap( - runSpacing: 10, - spacing: 10, - crossAxisAlignment: WrapCrossAlignment.center, - alignment: WrapAlignment.center, + Column( + crossAxisAlignment: CrossAxisAlignment.center, children: [ _getRatingWidget(avgP1F1[0], avgP1F1[1], "page1", - foodNameMap.keys.elementAtOrNull(0), ratingNames), + foodNameMap.keys.elementAtOrNull(0), ratingNames, context), _getRatingWidget(avgP1F2[0], avgP1F2[1], "page1", - foodNameMap.keys.elementAtOrNull(1), ratingNames), + foodNameMap.keys.elementAtOrNull(1), ratingNames, context), _getRatingWidget(avgP1F3[0], avgP1F3[1], "page1", - foodNameMap.keys.elementAtOrNull(2), ratingNames), - _getRatingWidget(avgP2[0], avgP2[1], "page2", -1, ratingNames), - _getRatingWidget(avgP3[0], avgP3[1], "page3", -1, ratingNames) + foodNameMap.keys.elementAtOrNull(2), ratingNames, context), + _getRatingWidget( + avgP2[0], avgP2[1], "page2", -1, ratingNames, context), + _getRatingWidget( + avgP3[0], avgP3[1], "page3", -1, ratingNames, context) ], ) ],