From b6a463eebb94149dfc8bb3d3126a278473f61dcc Mon Sep 17 00:00:00 2001 From: Thomas Fransolet Date: Tue, 2 May 2023 15:26:48 +0200 Subject: [PATCH] Add reset articleRead + fix qrcode offline --- lib/Components/AdminPopup.dart | 23 ++++++++++++++++++++++- lib/Screens/Home/home.dart | 7 +++++++ lib/Screens/Visit/components/body.dart | 1 - 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/lib/Components/AdminPopup.dart b/lib/Components/AdminPopup.dart index 8e8a17b..627973a 100644 --- a/lib/Components/AdminPopup.dart +++ b/lib/Components/AdminPopup.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:mymuseum_visitapp/Components/check_input_container.dart'; +import 'package:mymuseum_visitapp/Components/rounded_button.dart'; import 'package:mymuseum_visitapp/Helpers/DatabaseHelper.dart'; import 'package:mymuseum_visitapp/Helpers/translationHelper.dart'; import 'package:mymuseum_visitapp/Models/visitContext.dart'; @@ -33,7 +34,7 @@ class _AdminPopupState extends State { return Container( width: size.width*0.7, - height: isPasswordOk ? size.height*0.45 : size.height*0.15, + height: isPasswordOk ? size.height*0.5 : size.height*0.15, margin: const EdgeInsets.all(kDefaultPadding), child: isPasswordOk ? Column( children: [ @@ -89,6 +90,26 @@ class _AdminPopupState extends State { ], ) ), + ), + SizedBox( + height: size.height*0.06, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: RoundedButton( + text: "Reset articles lu", + color: kBackgroundSecondGrey, + textColor: kBackgroundLight, + icon: Icons.refresh, + press: () { + DatabaseHelper.instance.clearTable(DatabaseTableType.articleRead); + visitAppContext!.readSections = []; + appContext.setContext(visitAppContext!); + }, + fontSize: 18, + horizontal: 20, + vertical: 5 + ), + ), ) ], ) : diff --git a/lib/Screens/Home/home.dart b/lib/Screens/Home/home.dart index 1e5fd49..95f9be3 100644 --- a/lib/Screens/Home/home.dart +++ b/lib/Screens/Home/home.dart @@ -129,6 +129,13 @@ class _HomePageState extends State with WidgetsBindingObserver { SnackBar(content: Text(TranslationHelper.getFromLocale("noInternet", appContext.getContext())), backgroundColor: kBlue2), ); + // GET ALL SECTIONIDS FOR ALL CONFIGURATION (OFFLINE) + for(var configuration in configurations) + { + var sections = List.from(await DatabaseHelper.instance.queryWithConfigurationId(DatabaseTableType.sections, configuration.id!)); + configuration.sectionIds = sections.map((e) => e.id!).toList(); + } + // GET BEACONS FROM LOCAL List beaconSections = List.from(await DatabaseHelper.instance.getData(DatabaseTableType.beaconSection)); print("GOT beaconSection from LOCAL"); diff --git a/lib/Screens/Visit/components/body.dart b/lib/Screens/Visit/components/body.dart index d4f04de..40a3560 100644 --- a/lib/Screens/Visit/components/body.dart +++ b/lib/Screens/Visit/components/body.dart @@ -6,7 +6,6 @@ import 'package:mymuseum_visitapp/Components/SearchBox.dart'; import 'package:mymuseum_visitapp/Components/SearchNumberBox.dart'; import 'package:mymuseum_visitapp/Helpers/DatabaseHelper.dart'; import 'package:mymuseum_visitapp/Helpers/translationHelper.dart'; -import 'package:mymuseum_visitapp/Models/articleRead.dart'; import 'package:mymuseum_visitapp/Models/visitContext.dart'; import 'package:mymuseum_visitapp/Screens/Article/article_page.dart'; import 'package:mymuseum_visitapp/Screens/Quizz/quizz_page.dart';