Start Filter
First step of filters for the dashboard
This commit is contained in:
+5
-1
@@ -1,5 +1,6 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:mensaappbackend/providers/pageProvider.dart';
|
import 'package:mensaappbackend/providers/pageProvider.dart';
|
||||||
|
import 'package:mensaappbackend/providers/timeProvider.dart';
|
||||||
import 'package:mensaappbackend/providers/viewProvider.dart';
|
import 'package:mensaappbackend/providers/viewProvider.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:supabase_flutter/supabase_flutter.dart';
|
import 'package:supabase_flutter/supabase_flutter.dart';
|
||||||
@@ -8,7 +9,7 @@ void main() async {
|
|||||||
WidgetsFlutterBinding.ensureInitialized();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
|
|
||||||
await Supabase.initialize(
|
await Supabase.initialize(
|
||||||
url: "http://192.168.188.29:8000",
|
url: "http://127.0.0.1:8000",
|
||||||
anonKey: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJhbm9uIiwKICAgICJpc3MiOiAic3VwYWJhc2UtZGVtbyIsCiAgICAiaWF0IjogMTY0MTc2OTIwMCwKICAgICJleHAiOiAxNzk5NTM1NjAwCn0.dc_X5iR_VP_qT0zsiyj_I_OZ2T9FtRU2BBNWN8Bu4GE"
|
anonKey: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJhbm9uIiwKICAgICJpc3MiOiAic3VwYWJhc2UtZGVtbyIsCiAgICAiaWF0IjogMTY0MTc2OTIwMCwKICAgICJleHAiOiAxNzk5NTM1NjAwCn0.dc_X5iR_VP_qT0zsiyj_I_OZ2T9FtRU2BBNWN8Bu4GE"
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -28,6 +29,9 @@ class MyApp extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
ChangeNotifierProvider(
|
ChangeNotifierProvider(
|
||||||
create: (context) => ViewProvider(),
|
create: (context) => ViewProvider(),
|
||||||
|
),
|
||||||
|
ChangeNotifierProvider(
|
||||||
|
create: (context) => TimeProvider(),
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
child: MaterialApp(
|
child: MaterialApp(
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:mensaappbackend/modules/ratingCard.dart';
|
import 'package:mensaappbackend/modules/ratingCard.dart';
|
||||||
|
import 'package:mensaappbackend/providers/timeProvider.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
|
|
||||||
class BuilderToday {
|
class BuilderToday {
|
||||||
static Widget build (var context, var snapshot, var ratingNames) {
|
static Widget build (var context, var snapshot, var ratingNames) {
|
||||||
@@ -80,14 +83,22 @@ class BuilderToday {
|
|||||||
const SizedBox(
|
const SizedBox(
|
||||||
height: 20,
|
height: 20,
|
||||||
),
|
),
|
||||||
const Text(
|
Consumer<TimeProvider>(
|
||||||
"Heute - Alle",
|
builder: (context, timeProvider, child) {
|
||||||
style: TextStyle(fontSize: 25),
|
// Dynamischer Text basierend auf TimeProvider
|
||||||
|
String text = timeProvider.selectedTime == 1
|
||||||
|
? "Heute - Alle"
|
||||||
|
: "Letzte 7 Tage - Alle";
|
||||||
|
return Text(
|
||||||
|
text,
|
||||||
|
style: const TextStyle(fontSize: 25),
|
||||||
|
);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
const SizedBox(
|
const SizedBox(
|
||||||
height: 20,
|
height: 20,
|
||||||
),
|
),
|
||||||
for (var card in cards) card
|
for (var card in cards) card,
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:mensaappbackend/modules/ratingCard.dart';
|
import 'package:mensaappbackend/modules/ratingCard.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
import 'package:mensaappbackend/providers/timeProvider.dart';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class BuilderTodayAverage {
|
class BuilderTodayAverage {
|
||||||
static Widget _getRatingWidget(
|
static Widget _getRatingWidget(
|
||||||
@@ -108,9 +112,17 @@ class BuilderTodayAverage {
|
|||||||
const SizedBox(
|
const SizedBox(
|
||||||
height: 20,
|
height: 20,
|
||||||
),
|
),
|
||||||
const Text(
|
Consumer<TimeProvider>(
|
||||||
"Heute - Durchschnitt",
|
builder: (context, timeProvider, child) {
|
||||||
style: TextStyle(fontSize: 25),
|
// Dynamischer Text basierend auf TimeProvider
|
||||||
|
String text = timeProvider.selectedTime == 1
|
||||||
|
? "Heute - Durchschnitt"
|
||||||
|
: "Letzte 7 Tage - Durchschnitt";
|
||||||
|
return Text(
|
||||||
|
text,
|
||||||
|
style: const TextStyle(fontSize: 25),
|
||||||
|
);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
const SizedBox(
|
const SizedBox(
|
||||||
height: 20,
|
height: 20,
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:mensaappbackend/modules/ratingCard.dart';
|
import 'package:mensaappbackend/modules/ratingCard.dart';
|
||||||
import 'package:mensaappbackend/providers/pageProvider.dart';
|
import 'package:mensaappbackend/providers/pageProvider.dart';
|
||||||
import 'package:mensaappbackend/providers/viewProvider.dart';
|
import 'package:mensaappbackend/providers/viewProvider.dart';
|
||||||
|
import 'package:mensaappbackend/providers/timeProvider.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:supabase_flutter/supabase_flutter.dart';
|
import 'package:supabase_flutter/supabase_flutter.dart';
|
||||||
|
|
||||||
@@ -32,18 +33,74 @@ class PageDashboard extends StatelessWidget {
|
|||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
backgroundColor: Theme.of(context).colorScheme.primary,
|
backgroundColor: Theme.of(context).colorScheme.primary,
|
||||||
title: Text(
|
title: Consumer<TimeProvider>(
|
||||||
|
builder: (context, timeProvider, child) {
|
||||||
|
return Row(
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
"Dashboard",
|
"Dashboard",
|
||||||
style: TextStyle(color: Theme.of(context).colorScheme.onPrimary),
|
style: TextStyle(color: Theme.of(context).colorScheme.onPrimary),
|
||||||
),
|
),
|
||||||
centerTitle: false,
|
SizedBox(width: 32),
|
||||||
|
Icon(Icons.watch_later, ),
|
||||||
|
SizedBox(width: 8),
|
||||||
|
SizedBox(
|
||||||
|
width: 125,
|
||||||
|
child: Center( // Add Center widget here
|
||||||
|
child: DropdownButton(
|
||||||
|
value: Provider.of<TimeProvider>(context, listen: false).selectedTime,
|
||||||
|
dropdownColor: Theme.of(context).colorScheme.secondary,
|
||||||
|
//style: TextStyle(color: Theme.of(context).colorScheme.onPrimary),
|
||||||
|
iconEnabledColor: Theme.of(context).colorScheme.onPrimary,
|
||||||
|
focusColor: Colors.transparent,
|
||||||
|
isDense: true,
|
||||||
|
isExpanded: true,
|
||||||
|
items: [
|
||||||
|
DropdownMenuItem(
|
||||||
|
value: 1,
|
||||||
|
child: Center(
|
||||||
|
child: Text("Heute", style: TextStyle(color: Theme.of(context).colorScheme.onSecondary)),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
DropdownMenuItem(
|
||||||
|
value: 2,
|
||||||
|
child: Center(
|
||||||
|
child: Text("Letzte 7 Tage"),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
selectedItemBuilder: (BuildContext context) {
|
||||||
|
return [
|
||||||
|
Center(
|
||||||
|
child: Text(
|
||||||
|
"Heute",
|
||||||
|
style: TextStyle(color: Theme.of(context).colorScheme.onPrimary), // Benutzerdefinierte Farbe für angezeigten Text
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Center(
|
||||||
|
child: Text(
|
||||||
|
"Letzte 7 Tage",
|
||||||
|
style: TextStyle(color: Theme.of(context).colorScheme.onPrimary), // Benutzerdefinierte Farbe für angezeigten Text
|
||||||
|
)
|
||||||
|
),
|
||||||
|
];
|
||||||
|
},
|
||||||
|
onChanged: (value) {
|
||||||
|
Provider.of<TimeProvider>(context, listen: false).setSelectedTime(value);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
actions: [
|
actions: [
|
||||||
TextButton.icon(
|
TextButton.icon(
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
var supabase = Supabase.instance.client;
|
var supabase = Supabase.instance.client;
|
||||||
supabase.auth.signOut();
|
supabase.auth.signOut();
|
||||||
Provider.of<PageProvider>(context, listen: false)
|
Provider.of<PageProvider>(context, listen: false).setSelectedPage(0);
|
||||||
.setSelectedPage(0);
|
|
||||||
},
|
},
|
||||||
label: Text(
|
label: Text(
|
||||||
"Logout",
|
"Logout",
|
||||||
@@ -53,9 +110,10 @@ class PageDashboard extends StatelessWidget {
|
|||||||
Icons.logout,
|
Icons.logout,
|
||||||
color: Theme.of(context).colorScheme.onPrimary,
|
color: Theme.of(context).colorScheme.onPrimary,
|
||||||
),
|
),
|
||||||
)
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|
||||||
body: FutureBuilder(
|
body: FutureBuilder(
|
||||||
future: viewDatabaseFunctions[Provider.of<ViewProvider>(context, listen: false).selectedView]!(),
|
future: viewDatabaseFunctions[Provider.of<ViewProvider>(context, listen: false).selectedView]!(),
|
||||||
builder: (context, snapshot) {
|
builder: (context, snapshot) {
|
||||||
@@ -77,7 +135,7 @@ class PageDashboard extends StatelessWidget {
|
|||||||
FilledButton.icon(
|
FilledButton.icon(
|
||||||
style: const ButtonStyle(padding: WidgetStatePropertyAll(EdgeInsets.symmetric(vertical: 20))),
|
style: const ButtonStyle(padding: WidgetStatePropertyAll(EdgeInsets.symmetric(vertical: 20))),
|
||||||
icon: const Icon(Icons.today),
|
icon: const Icon(Icons.today),
|
||||||
label: const Text("Alle - Heute"),
|
label: const Text("Alle"),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Provider.of<ViewProvider>(context, listen: false).setSelectedView(0);
|
Provider.of<ViewProvider>(context, listen: false).setSelectedView(0);
|
||||||
Navigator.pop(context);
|
Navigator.pop(context);
|
||||||
@@ -87,7 +145,7 @@ class PageDashboard extends StatelessWidget {
|
|||||||
FilledButton.icon(
|
FilledButton.icon(
|
||||||
style: const ButtonStyle(padding: WidgetStatePropertyAll(EdgeInsets.symmetric(vertical: 20))),
|
style: const ButtonStyle(padding: WidgetStatePropertyAll(EdgeInsets.symmetric(vertical: 20))),
|
||||||
icon: const Icon(Icons.today),
|
icon: const Icon(Icons.today),
|
||||||
label: const Text("Durchschnitt - Heute"),
|
label: const Text("Durchschnitt"),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Provider.of<ViewProvider>(context, listen: false).setSelectedView(1);
|
Provider.of<ViewProvider>(context, listen: false).setSelectedView(1);
|
||||||
Navigator.pop(context);
|
Navigator.pop(context);
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import 'package:flutter/cupertino.dart';
|
||||||
|
import 'package:mensaappbackend/pages/pageDashboard.dart';
|
||||||
|
import 'package:mensaappbackend/pages/pageLogin.dart';
|
||||||
|
import 'package:mensaappbackend/pages/wrongLogin.dart';
|
||||||
|
|
||||||
|
class TimeProvider extends ChangeNotifier {
|
||||||
|
var selectedTime = 1;
|
||||||
|
|
||||||
|
void setSelectedTime(var index) {
|
||||||
|
selectedTime = index;
|
||||||
|
notifyListeners();
|
||||||
|
print(selectedTime);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user