hernik/opencanteen
1
0
Fork 0
Code Issues 7 Pull requests 2 Projects Releases 7 Wiki Activity

feat: vylepšit oznámení o neobjednaném jídle

Browse source
This commit is contained in:
Matyáš Caras 2022-09-12 17:13:12 +02:00
parent 28eba7d9ab
commit ce9eb97ac9
4 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/lang/lang.dart
View file

@ -91,6 +91,8 @@ abstract class Languages {
String get signOutWarn; String get signOutWarn;
String get jump;
// Uvítací obrazovka // Uvítací obrazovka
String get welcome; String get welcome;

3
lib/lang/lang_cz.dart
View file

@ -231,4 +231,7 @@ class LanguageCz extends Languages {
@override @override
String get signOutWarn => "Opravdu se chcete odhlásit?"; String get signOutWarn => "Opravdu se chcete odhlásit?";
@override
String get jump => "Přeskočit";
} }

3
lib/lang/lang_en.dart
View file

@ -229,4 +229,7 @@ class LanguageEn extends Languages {
@override @override
String get signOutWarn => "Do you really want to sign out?"; String get signOutWarn => "Do you really want to sign out?";
@override
String get jump => "Jump";
} }

41
lib/okna/jidelnicek.dart
View file

@ -35,18 +35,31 @@ class _JidelnicekPageState extends State<JidelnicekPage> {
var prefs = await SharedPreferences.getInstance(); var prefs = await SharedPreferences.getInstance();
if (prefs.getBool("tyden") ?? false) { if (prefs.getBool("tyden") ?? false) {
// Zjistit jestli je objednáno na přístí týden // Zjistit jestli je objednáno na přístí týden
var pristi = den.add(const Duration(days: 7)); var pristi = den.add(const Duration(days: 6));
var jidelnicek = await widget.canteen.jidelnicekDen(den: pristi); for (var i = 0; i < 5; i++) {
if (jidelnicek.jidla.isNotEmpty && var jidelnicek = await widget.canteen
!jidelnicek.jidla.any((element) => element.objednano == true)) { .jidelnicekDen(den: pristi.add(Duration(days: i + 1)));
if (!mounted) return; if (jidelnicek.jidla.isNotEmpty &&
ScaffoldMessenger.of(context).hideCurrentSnackBar(); !jidelnicek.jidla.any((element) => element.objednano == true)) {
ScaffoldMessenger.of(context).showSnackBar( if (!mounted) break;
SnackBar( ScaffoldMessenger.of(context).hideCurrentSnackBar();
content: Text(Languages.of(context)!.noOrder), ScaffoldMessenger.of(context).showSnackBar(
duration: const Duration(seconds: 5), SnackBar(
), content: Text(Languages.of(context)!.noOrder),
); duration: const Duration(seconds: 5),
action: SnackBarAction(
onPressed: () => setState(
() {
den = pristi.add(Duration(days: i + 1));
nactiJidlo();
},
),
label: Languages.of(context)!.jump,
),
),
);
break;
}
} }
} }
} }
@ -294,7 +307,6 @@ class _JidelnicekPageState extends State<JidelnicekPage> {
); );
} }
} }
kontrolaTyden(context);
}); });
}); });
}).catchError((o) { }).catchError((o) {
@ -343,6 +355,9 @@ class _JidelnicekPageState extends State<JidelnicekPage> {
void nactiNastaveni() async { void nactiNastaveni() async {
var prefs = await SharedPreferences.getInstance(); var prefs = await SharedPreferences.getInstance();
_skipWeekend = prefs.getBool("skip") ?? false; _skipWeekend = prefs.getBool("skip") ?? false;
print(mounted);
if (!mounted) return;
kontrolaTyden(context);
} }
/// uložení jídelníčku pro dnešek offline /// uložení jídelníčku pro dnešek offline