diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index 31de6b1..8ec7612 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"qr_code_scanner","path":"C:\\\\Users\\\\thoma\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\qr_code_scanner-1.0.1\\\\","native_build":true,"dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\thoma\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-2.0.3+1\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"qr_code_scanner","path":"C:\\\\Users\\\\thoma\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\qr_code_scanner-1.0.1\\\\","native_build":true,"dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\thoma\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-2.0.3+1\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\thoma\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-2.0.3+1\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"qr_code_scanner","dependencies":[]},{"name":"sqflite","dependencies":[]}],"date_created":"2022-09-17 22:40:40.100790","version":"3.0.3"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"qr_code_scanner","path":"C:\\\\Users\\\\thoma\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\qr_code_scanner-1.0.1\\\\","native_build":true,"dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\thoma\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-2.0.3+1\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"qr_code_scanner","path":"C:\\\\Users\\\\thoma\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\qr_code_scanner-1.0.1\\\\","native_build":true,"dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\thoma\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-2.0.3+1\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\thoma\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-2.0.3+1\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"qr_code_scanner","dependencies":[]},{"name":"sqflite","dependencies":[]}],"date_created":"2022-09-29 18:26:21.662024","version":"3.0.3"} \ No newline at end of file diff --git a/lib/Screens/Article/article.dart b/lib/Screens/Article/article.dart index 2fcbba9..70cf880 100644 --- a/lib/Screens/Article/article.dart +++ b/lib/Screens/Article/article.dart @@ -219,21 +219,35 @@ class _ArticlePageState extends State { if(sectionDTO == null || articleDTO == null) { await DatabaseHelper.instance.queryWithColumnId(DatabaseTableType.sections, articleId).then((value) async { setState(() { - sectionDTO = DatabaseHelper.instance.getSectionFromDB(value.first); + if(value.isNotEmpty) { + sectionDTO = DatabaseHelper.instance.getSectionFromDB(value.first); + } else { + print("EMPTY SECTION"); + } if(sectionDTO!.type == SectionType.Article) { articleDTO = ArticleDTO.fromJson(jsonDecode(sectionDTO!.data!)); } }); if(sectionDTO!.imageId != null) { await DatabaseHelper.instance.queryWithColumnId(DatabaseTableType.resources, sectionDTO!.imageId!).then((value) { - resourcesModel.add(DatabaseHelper.instance.getResourceFromDB(value.first)); + if(value.isNotEmpty) { + resourcesModel.add(DatabaseHelper.instance.getResourceFromDB(value.first)); + } else { + print("EMPTY resourcesModel - first"); + } }); } if(articleDTO!.images!.isNotEmpty) { for (var image in articleDTO!.images!) { - await DatabaseHelper.instance.queryWithColumnId(DatabaseTableType.resources, image.resourceId!).then((value) { - resourcesModel.add(DatabaseHelper.instance.getResourceFromDB(value.first)); - }); + if(image.resourceId != null) { + await DatabaseHelper.instance.queryWithColumnId(DatabaseTableType.resources, image.resourceId!).then((value) { + if(value.isNotEmpty) { + resourcesModel.add(DatabaseHelper.instance.getResourceFromDB(value.first)); + } else { + print("EMPTY resourcesModel - second"); + } + }); + } } /*if(mainResource == null && resourcesModel.isNotEmpty) { diff --git a/lib/app_context.dart b/lib/app_context.dart index 1ddf58a..3617414 100644 --- a/lib/app_context.dart +++ b/lib/app_context.dart @@ -6,7 +6,7 @@ import 'Models/visitContext.dart'; class AppContext with ChangeNotifier { VisitAppContext _visitContext; - Client clientAPI = Client("http://192.168.31.140:8089"); // Replace by https://api.mymuseum.be + Client clientAPI = Client("https://api.mymuseum.be"); // Replace by https://api.mymuseum.be //http://192.168.31.140:8089 AppContext(this._visitContext); diff --git a/lib/main.dart b/lib/main.dart index a3533bb..55b6d1e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -49,7 +49,7 @@ class _MyAppState extends State { create: (_) => AppContext(widget.visitAppContext), child: MaterialApp( debugShowCheckedModeBanner: false, - title: 'MyVisit App Demo', + title: 'Fort Saint Héribert', initialRoute: widget.initialRoute, localizationsDelegates: const [ AppLocalizations.delegate,