From 93be864bd3a09637db9063efc5608100c65a8021 Mon Sep 17 00:00:00 2001 From: reinjens Date: Tue, 24 Sep 2024 15:29:01 +0200 Subject: [PATCH] initial commit v3 --- lib/main.dart | 96 +--- .../domain/entity/baumarten/baumarten.dart | 21 +- .../domain/entity/baumarten/baumarten.g.dart | 490 +++++++++--------- lib/src/domain/entity/file/file_part.dart | 18 +- lib/src/domain/entity/file/file_part.g.dart | 193 ++++--- lib/src/domain/entity/file/thumbnails.dart | 3 +- lib/src/domain/entity/file/thumbnails.g.dart | 18 +- .../domain/entity/massnahme/massnahme.dart | 20 + lib/src/packages/ambito_api/base.dart | 1 + lib/src/packages/ambito_api/restclient.dart | 2 +- lib/src/packages/ambito_db/base_db.dart | 2 +- lib/src/pages/actions/actions_page.dart | 221 ++++---- lib/src/pages/start/start_page.dart | 85 +++ .../widgets/cards/card_massnahmen_list.dart | 1 + lib/src/widgets/form/dropdown_menu.dart | 49 ++ pubspec.lock | 69 +-- pubspec.yaml | 1 + 17 files changed, 677 insertions(+), 613 deletions(-) create mode 100644 lib/src/pages/start/start_page.dart create mode 100644 lib/src/widgets/cards/card_massnahmen_list.dart create mode 100644 lib/src/widgets/form/dropdown_menu.dart diff --git a/lib/main.dart b/lib/main.dart index 2511dd6..1f8c7e3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,7 @@ import 'package:ambito/src/domain/entity/baumarten/baumarten.dart'; import 'package:ambito/src/domain/entity/massnahme/massnahme.dart'; import 'package:ambito/src/packages/ambito_api/base.dart'; -import 'package:ambito/src/pages/actions/actions_page.dart'; +import 'package:ambito/src/pages/start/start_page.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_i18n/flutter_i18n.dart'; @@ -9,7 +9,7 @@ import 'package:get/get_navigation/src/root/get_material_app.dart'; import 'package:isar/isar.dart'; import 'package:logger/logger.dart'; -final String AmbitoToken = 'TFxO7vzBLVRCu9I3VMoHmTuCvSu8aCDi'; +const String ambitoToken = 'TFxO7vzBLVRCu9I3VMoHmTuCvSu8aCDi'; final Logger logger = Logger( printer: PrettyPrinter(), @@ -20,11 +20,6 @@ late Isar isar; void main() async { WidgetsFlutterBinding.ensureInitialized(); - /*Isar.open( - schemas: [BaumartenSchema, IdValueColorSchema, IdValueSchema], - directory: '', - );*/ - await Isar.initialize(); const dir = Isar.sqliteInMemory; const engine = kIsWeb ? IsarEngine.sqlite : IsarEngine.isar; @@ -59,7 +54,9 @@ class Ambito extends StatelessWidget { basePath: 'i18n', ), missingTranslationHandler: (key, locale) { - print("--- Missing Key: $key, languageCode: $locale"); + if (kDebugMode) { + print("--- Missing Key: $key, languageCode: $locale"); + } }, ), ], @@ -70,88 +67,7 @@ class Ambito extends StatelessWidget { scaffoldBackgroundColor: Colors.white, useMaterial3: true, ), - home: const MyHomePage(), - ); - } -} - -class MyHomePage extends StatefulWidget { - const MyHomePage({super.key}); - - @override - State createState() => _MyHomePageState(); -} - -class _MyHomePageState extends State { - String activeLink = ''; - - @override - void initState() { - activeLink = 'start'; - super.initState(); - } - - @override - Widget build(BuildContext context) { - double fontSize = 16; - return Scaffold( - body: Column( - children: [ - SizedBox(height: 50), - Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - LinkButton('start'), - LinkButton('database'), - LinkButton('designer'), - Image.asset( - 'images/logo.png', - scale: 1.3, - ), - LinkButton('service'), - LinkButton('network'), - LinkButton('contact'), - ], - ), - SizedBox(height: 50), - Expanded( - child: getContent(), - ), - ], - )); - } - - Widget getContent() { - if (activeLink == 'database') { - return ActionsPage(); - } - return Text(activeLink); - } - - Widget LinkButton(String link) { - double fontSize = 16; - return TextButton( - style: ButtonStyle( - overlayColor: MaterialStateProperty.resolveWith( - (Set states) { - return Colors.white; - }), - ), - onPressed: () { - setState(() { - activeLink = link; - }); - }, - child: Text( - context.translate('page.start.links.$link.title'), - style: TextStyle( - fontSize: fontSize, - fontWeight: FontWeight.bold, - color: (activeLink == link) - ? Colors.grey.shade400 - : Colors.grey.shade800, - ), - ), + home: const StartPage(), ); } } diff --git a/lib/src/domain/entity/baumarten/baumarten.dart b/lib/src/domain/entity/baumarten/baumarten.dart index 014a5b2..ae2d709 100644 --- a/lib/src/domain/entity/baumarten/baumarten.dart +++ b/lib/src/domain/entity/baumarten/baumarten.dart @@ -45,13 +45,20 @@ class Baumarten extends BaseEntity { String? waterlevel; @JsonKey(name: 'Bodenfeuchte') List? humidity; - String? Lichtzahl; - String? Temperaturzahl; - String? Feuchtezahl; - String? Reaktionszahl; - String? Stickstoffzahl; - List? Region; - String? Anmerkung; + @JsonKey(name: 'Lichtzahl') + String? valueLight; + @JsonKey(name: 'Temperaturzahl') + String? valueTemperature; + @JsonKey(name: 'Feuchtezahl') + String? valueHumidity; + @JsonKey(name: 'Reaktionszahl') + String? valueReaction; + @JsonKey(name: 'Stickstoffzahl') + String? valueNitrogen; + @JsonKey(name: 'Region') + List? region; + @JsonKey(name: 'Anmerkung') + String? note; @JsonKey(name: "Wild/Kulturart") String? typeOfCulture; @JsonKey(name: 'Gebiet 1') diff --git a/lib/src/domain/entity/baumarten/baumarten.g.dart b/lib/src/domain/entity/baumarten/baumarten.g.dart index 0416d05..8daea42 100644 --- a/lib/src/domain/entity/baumarten/baumarten.g.dart +++ b/lib/src/domain/entity/baumarten/baumarten.g.dart @@ -94,32 +94,32 @@ const BaumartenSchema = IsarGeneratedSchema( target: 'IdValueColor', ), IsarPropertySchema( - name: 'Lichtzahl', + name: 'valueLight', type: IsarType.string, ), IsarPropertySchema( - name: 'Temperaturzahl', + name: 'valueTemperature', type: IsarType.string, ), IsarPropertySchema( - name: 'Feuchtezahl', + name: 'valueHumidity', type: IsarType.string, ), IsarPropertySchema( - name: 'Reaktionszahl', + name: 'valueReaction', type: IsarType.string, ), IsarPropertySchema( - name: 'Stickstoffzahl', + name: 'valueNitrogen', type: IsarType.string, ), IsarPropertySchema( - name: 'Region', + name: 'region', type: IsarType.objectList, target: 'IdValueColor', ), IsarPropertySchema( - name: 'Anmerkung', + name: 'note', type: IsarType.string, ), IsarPropertySchema( @@ -347,7 +347,7 @@ int serializeBaumarten(IsarWriter writer, Baumarten object) { } } { - final value = object.Lichtzahl; + final value = object.valueLight; if (value == null) { IsarCore.writeNull(writer, 17); } else { @@ -355,7 +355,7 @@ int serializeBaumarten(IsarWriter writer, Baumarten object) { } } { - final value = object.Temperaturzahl; + final value = object.valueTemperature; if (value == null) { IsarCore.writeNull(writer, 18); } else { @@ -363,7 +363,7 @@ int serializeBaumarten(IsarWriter writer, Baumarten object) { } } { - final value = object.Feuchtezahl; + final value = object.valueHumidity; if (value == null) { IsarCore.writeNull(writer, 19); } else { @@ -371,7 +371,7 @@ int serializeBaumarten(IsarWriter writer, Baumarten object) { } } { - final value = object.Reaktionszahl; + final value = object.valueReaction; if (value == null) { IsarCore.writeNull(writer, 20); } else { @@ -379,7 +379,7 @@ int serializeBaumarten(IsarWriter writer, Baumarten object) { } } { - final value = object.Stickstoffzahl; + final value = object.valueNitrogen; if (value == null) { IsarCore.writeNull(writer, 21); } else { @@ -387,7 +387,7 @@ int serializeBaumarten(IsarWriter writer, Baumarten object) { } } { - final list = object.Region; + final list = object.region; if (list == null) { IsarCore.writeNull(writer, 22); } else { @@ -404,7 +404,7 @@ int serializeBaumarten(IsarWriter writer, Baumarten object) { } } { - final value = object.Anmerkung; + final value = object.note; if (value == null) { IsarCore.writeNull(writer, 23); } else { @@ -660,17 +660,17 @@ Baumarten deserializeBaumarten(IsarReader reader) { } } } - object.Lichtzahl = IsarCore.readString(reader, 17); - object.Temperaturzahl = IsarCore.readString(reader, 18); - object.Feuchtezahl = IsarCore.readString(reader, 19); - object.Reaktionszahl = IsarCore.readString(reader, 20); - object.Stickstoffzahl = IsarCore.readString(reader, 21); + object.valueLight = IsarCore.readString(reader, 17); + object.valueTemperature = IsarCore.readString(reader, 18); + object.valueHumidity = IsarCore.readString(reader, 19); + object.valueReaction = IsarCore.readString(reader, 20); + object.valueNitrogen = IsarCore.readString(reader, 21); { final length = IsarCore.readList(reader, 22, IsarCore.readerPtrPtr); { final reader = IsarCore.readerPtr; if (reader.isNull) { - object.Region = null; + object.region = null; } else { final list = List.filled(length, IdValueColor(), growable: true); @@ -687,11 +687,11 @@ Baumarten deserializeBaumarten(IsarReader reader) { } } IsarCore.freeReader(reader); - object.Region = list; + object.region = list; } } } - object.Anmerkung = IsarCore.readString(reader, 23); + object.note = IsarCore.readString(reader, 23); object.typeOfCulture = IsarCore.readString(reader, 24); object.region1 = IsarCore.readString(reader, 25); object.region2 = IsarCore.readString(reader, 26); @@ -1019,12 +1019,12 @@ sealed class _BaumartenUpdate { String? minSize, String? maxSize, String? waterlevel, - String? Lichtzahl, - String? Temperaturzahl, - String? Feuchtezahl, - String? Reaktionszahl, - String? Stickstoffzahl, - String? Anmerkung, + String? valueLight, + String? valueTemperature, + String? valueHumidity, + String? valueReaction, + String? valueNitrogen, + String? note, String? typeOfCulture, String? region1, String? region2, @@ -1051,12 +1051,12 @@ class _BaumartenUpdateImpl implements _BaumartenUpdate { Object? minSize = ignore, Object? maxSize = ignore, Object? waterlevel = ignore, - Object? Lichtzahl = ignore, - Object? Temperaturzahl = ignore, - Object? Feuchtezahl = ignore, - Object? Reaktionszahl = ignore, - Object? Stickstoffzahl = ignore, - Object? Anmerkung = ignore, + Object? valueLight = ignore, + Object? valueTemperature = ignore, + Object? valueHumidity = ignore, + Object? valueReaction = ignore, + Object? valueNitrogen = ignore, + Object? note = ignore, Object? typeOfCulture = ignore, Object? region1 = ignore, Object? region2 = ignore, @@ -1076,12 +1076,12 @@ class _BaumartenUpdateImpl implements _BaumartenUpdate { if (minSize != ignore) 5: minSize as String?, if (maxSize != ignore) 6: maxSize as String?, if (waterlevel != ignore) 15: waterlevel as String?, - if (Lichtzahl != ignore) 17: Lichtzahl as String?, - if (Temperaturzahl != ignore) 18: Temperaturzahl as String?, - if (Feuchtezahl != ignore) 19: Feuchtezahl as String?, - if (Reaktionszahl != ignore) 20: Reaktionszahl as String?, - if (Stickstoffzahl != ignore) 21: Stickstoffzahl as String?, - if (Anmerkung != ignore) 23: Anmerkung as String?, + if (valueLight != ignore) 17: valueLight as String?, + if (valueTemperature != ignore) 18: valueTemperature as String?, + if (valueHumidity != ignore) 19: valueHumidity as String?, + if (valueReaction != ignore) 20: valueReaction as String?, + if (valueNitrogen != ignore) 21: valueNitrogen as String?, + if (note != ignore) 23: note as String?, if (typeOfCulture != ignore) 24: typeOfCulture as String?, if (region1 != ignore) 25: region1 as String?, if (region2 != ignore) 26: region2 as String?, @@ -1105,12 +1105,12 @@ sealed class _BaumartenUpdateAll { String? minSize, String? maxSize, String? waterlevel, - String? Lichtzahl, - String? Temperaturzahl, - String? Feuchtezahl, - String? Reaktionszahl, - String? Stickstoffzahl, - String? Anmerkung, + String? valueLight, + String? valueTemperature, + String? valueHumidity, + String? valueReaction, + String? valueNitrogen, + String? note, String? typeOfCulture, String? region1, String? region2, @@ -1137,12 +1137,12 @@ class _BaumartenUpdateAllImpl implements _BaumartenUpdateAll { Object? minSize = ignore, Object? maxSize = ignore, Object? waterlevel = ignore, - Object? Lichtzahl = ignore, - Object? Temperaturzahl = ignore, - Object? Feuchtezahl = ignore, - Object? Reaktionszahl = ignore, - Object? Stickstoffzahl = ignore, - Object? Anmerkung = ignore, + Object? valueLight = ignore, + Object? valueTemperature = ignore, + Object? valueHumidity = ignore, + Object? valueReaction = ignore, + Object? valueNitrogen = ignore, + Object? note = ignore, Object? typeOfCulture = ignore, Object? region1 = ignore, Object? region2 = ignore, @@ -1160,12 +1160,12 @@ class _BaumartenUpdateAllImpl implements _BaumartenUpdateAll { if (minSize != ignore) 5: minSize as String?, if (maxSize != ignore) 6: maxSize as String?, if (waterlevel != ignore) 15: waterlevel as String?, - if (Lichtzahl != ignore) 17: Lichtzahl as String?, - if (Temperaturzahl != ignore) 18: Temperaturzahl as String?, - if (Feuchtezahl != ignore) 19: Feuchtezahl as String?, - if (Reaktionszahl != ignore) 20: Reaktionszahl as String?, - if (Stickstoffzahl != ignore) 21: Stickstoffzahl as String?, - if (Anmerkung != ignore) 23: Anmerkung as String?, + if (valueLight != ignore) 17: valueLight as String?, + if (valueTemperature != ignore) 18: valueTemperature as String?, + if (valueHumidity != ignore) 19: valueHumidity as String?, + if (valueReaction != ignore) 20: valueReaction as String?, + if (valueNitrogen != ignore) 21: valueNitrogen as String?, + if (note != ignore) 23: note as String?, if (typeOfCulture != ignore) 24: typeOfCulture as String?, if (region1 != ignore) 25: region1 as String?, if (region2 != ignore) 26: region2 as String?, @@ -1193,12 +1193,12 @@ sealed class _BaumartenQueryUpdate { String? minSize, String? maxSize, String? waterlevel, - String? Lichtzahl, - String? Temperaturzahl, - String? Feuchtezahl, - String? Reaktionszahl, - String? Stickstoffzahl, - String? Anmerkung, + String? valueLight, + String? valueTemperature, + String? valueHumidity, + String? valueReaction, + String? valueNitrogen, + String? note, String? typeOfCulture, String? region1, String? region2, @@ -1225,12 +1225,12 @@ class _BaumartenQueryUpdateImpl implements _BaumartenQueryUpdate { Object? minSize = ignore, Object? maxSize = ignore, Object? waterlevel = ignore, - Object? Lichtzahl = ignore, - Object? Temperaturzahl = ignore, - Object? Feuchtezahl = ignore, - Object? Reaktionszahl = ignore, - Object? Stickstoffzahl = ignore, - Object? Anmerkung = ignore, + Object? valueLight = ignore, + Object? valueTemperature = ignore, + Object? valueHumidity = ignore, + Object? valueReaction = ignore, + Object? valueNitrogen = ignore, + Object? note = ignore, Object? typeOfCulture = ignore, Object? region1 = ignore, Object? region2 = ignore, @@ -1248,12 +1248,12 @@ class _BaumartenQueryUpdateImpl implements _BaumartenQueryUpdate { if (minSize != ignore) 5: minSize as String?, if (maxSize != ignore) 6: maxSize as String?, if (waterlevel != ignore) 15: waterlevel as String?, - if (Lichtzahl != ignore) 17: Lichtzahl as String?, - if (Temperaturzahl != ignore) 18: Temperaturzahl as String?, - if (Feuchtezahl != ignore) 19: Feuchtezahl as String?, - if (Reaktionszahl != ignore) 20: Reaktionszahl as String?, - if (Stickstoffzahl != ignore) 21: Stickstoffzahl as String?, - if (Anmerkung != ignore) 23: Anmerkung as String?, + if (valueLight != ignore) 17: valueLight as String?, + if (valueTemperature != ignore) 18: valueTemperature as String?, + if (valueHumidity != ignore) 19: valueHumidity as String?, + if (valueReaction != ignore) 20: valueReaction as String?, + if (valueNitrogen != ignore) 21: valueNitrogen as String?, + if (note != ignore) 23: note as String?, if (typeOfCulture != ignore) 24: typeOfCulture as String?, if (region1 != ignore) 25: region1 as String?, if (region2 != ignore) 26: region2 as String?, @@ -1288,12 +1288,12 @@ class _BaumartenQueryBuilderUpdateImpl implements _BaumartenQueryUpdate { Object? minSize = ignore, Object? maxSize = ignore, Object? waterlevel = ignore, - Object? Lichtzahl = ignore, - Object? Temperaturzahl = ignore, - Object? Feuchtezahl = ignore, - Object? Reaktionszahl = ignore, - Object? Stickstoffzahl = ignore, - Object? Anmerkung = ignore, + Object? valueLight = ignore, + Object? valueTemperature = ignore, + Object? valueHumidity = ignore, + Object? valueReaction = ignore, + Object? valueNitrogen = ignore, + Object? note = ignore, Object? typeOfCulture = ignore, Object? region1 = ignore, Object? region2 = ignore, @@ -1313,12 +1313,12 @@ class _BaumartenQueryBuilderUpdateImpl implements _BaumartenQueryUpdate { if (minSize != ignore) 5: minSize as String?, if (maxSize != ignore) 6: maxSize as String?, if (waterlevel != ignore) 15: waterlevel as String?, - if (Lichtzahl != ignore) 17: Lichtzahl as String?, - if (Temperaturzahl != ignore) 18: Temperaturzahl as String?, - if (Feuchtezahl != ignore) 19: Feuchtezahl as String?, - if (Reaktionszahl != ignore) 20: Reaktionszahl as String?, - if (Stickstoffzahl != ignore) 21: Stickstoffzahl as String?, - if (Anmerkung != ignore) 23: Anmerkung as String?, + if (valueLight != ignore) 17: valueLight as String?, + if (valueTemperature != ignore) 18: valueTemperature as String?, + if (valueHumidity != ignore) 19: valueHumidity as String?, + if (valueReaction != ignore) 20: valueReaction as String?, + if (valueNitrogen != ignore) 21: valueNitrogen as String?, + if (note != ignore) 23: note as String?, if (typeOfCulture != ignore) 24: typeOfCulture as String?, if (region1 != ignore) 25: region1 as String?, if (region2 != ignore) 26: region2 as String?, @@ -2915,20 +2915,20 @@ extension BaumartenQueryFilter }); } - QueryBuilder lichtzahlIsNull() { + QueryBuilder valueLightIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const IsNullCondition(property: 17)); }); } QueryBuilder - lichtzahlIsNotNull() { + valueLightIsNotNull() { return QueryBuilder.apply(not(), (query) { return query.addFilterCondition(const IsNullCondition(property: 17)); }); } - QueryBuilder lichtzahlEqualTo( + QueryBuilder valueLightEqualTo( String? value, { bool caseSensitive = true, }) { @@ -2944,7 +2944,7 @@ extension BaumartenQueryFilter } QueryBuilder - lichtzahlGreaterThan( + valueLightGreaterThan( String? value, { bool caseSensitive = true, }) { @@ -2960,7 +2960,7 @@ extension BaumartenQueryFilter } QueryBuilder - lichtzahlGreaterThanOrEqualTo( + valueLightGreaterThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -2975,7 +2975,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder lichtzahlLessThan( + QueryBuilder valueLightLessThan( String? value, { bool caseSensitive = true, }) { @@ -2991,7 +2991,7 @@ extension BaumartenQueryFilter } QueryBuilder - lichtzahlLessThanOrEqualTo( + valueLightLessThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3006,7 +3006,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder lichtzahlBetween( + QueryBuilder valueLightBetween( String? lower, String? upper, { bool caseSensitive = true, @@ -3023,7 +3023,8 @@ extension BaumartenQueryFilter }); } - QueryBuilder lichtzahlStartsWith( + QueryBuilder + valueLightStartsWith( String value, { bool caseSensitive = true, }) { @@ -3038,7 +3039,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder lichtzahlEndsWith( + QueryBuilder valueLightEndsWith( String value, { bool caseSensitive = true, }) { @@ -3053,7 +3054,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder lichtzahlContains( + QueryBuilder valueLightContains( String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { @@ -3067,7 +3068,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder lichtzahlMatches( + QueryBuilder valueLightMatches( String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { @@ -3081,7 +3082,8 @@ extension BaumartenQueryFilter }); } - QueryBuilder lichtzahlIsEmpty() { + QueryBuilder + valueLightIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const EqualCondition( @@ -3093,7 +3095,7 @@ extension BaumartenQueryFilter } QueryBuilder - lichtzahlIsNotEmpty() { + valueLightIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const GreaterCondition( @@ -3105,21 +3107,21 @@ extension BaumartenQueryFilter } QueryBuilder - temperaturzahlIsNull() { + valueTemperatureIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const IsNullCondition(property: 18)); }); } QueryBuilder - temperaturzahlIsNotNull() { + valueTemperatureIsNotNull() { return QueryBuilder.apply(not(), (query) { return query.addFilterCondition(const IsNullCondition(property: 18)); }); } QueryBuilder - temperaturzahlEqualTo( + valueTemperatureEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3135,7 +3137,7 @@ extension BaumartenQueryFilter } QueryBuilder - temperaturzahlGreaterThan( + valueTemperatureGreaterThan( String? value, { bool caseSensitive = true, }) { @@ -3151,7 +3153,7 @@ extension BaumartenQueryFilter } QueryBuilder - temperaturzahlGreaterThanOrEqualTo( + valueTemperatureGreaterThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3167,7 +3169,7 @@ extension BaumartenQueryFilter } QueryBuilder - temperaturzahlLessThan( + valueTemperatureLessThan( String? value, { bool caseSensitive = true, }) { @@ -3183,7 +3185,7 @@ extension BaumartenQueryFilter } QueryBuilder - temperaturzahlLessThanOrEqualTo( + valueTemperatureLessThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3199,7 +3201,7 @@ extension BaumartenQueryFilter } QueryBuilder - temperaturzahlBetween( + valueTemperatureBetween( String? lower, String? upper, { bool caseSensitive = true, @@ -3217,7 +3219,7 @@ extension BaumartenQueryFilter } QueryBuilder - temperaturzahlStartsWith( + valueTemperatureStartsWith( String value, { bool caseSensitive = true, }) { @@ -3233,7 +3235,7 @@ extension BaumartenQueryFilter } QueryBuilder - temperaturzahlEndsWith( + valueTemperatureEndsWith( String value, { bool caseSensitive = true, }) { @@ -3249,7 +3251,7 @@ extension BaumartenQueryFilter } QueryBuilder - temperaturzahlContains(String value, {bool caseSensitive = true}) { + valueTemperatureContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( ContainsCondition( @@ -3262,7 +3264,7 @@ extension BaumartenQueryFilter } QueryBuilder - temperaturzahlMatches(String pattern, {bool caseSensitive = true}) { + valueTemperatureMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( MatchesCondition( @@ -3275,7 +3277,7 @@ extension BaumartenQueryFilter } QueryBuilder - temperaturzahlIsEmpty() { + valueTemperatureIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const EqualCondition( @@ -3287,7 +3289,7 @@ extension BaumartenQueryFilter } QueryBuilder - temperaturzahlIsNotEmpty() { + valueTemperatureIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const GreaterCondition( @@ -3299,20 +3301,21 @@ extension BaumartenQueryFilter } QueryBuilder - feuchtezahlIsNull() { + valueHumidityIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const IsNullCondition(property: 19)); }); } QueryBuilder - feuchtezahlIsNotNull() { + valueHumidityIsNotNull() { return QueryBuilder.apply(not(), (query) { return query.addFilterCondition(const IsNullCondition(property: 19)); }); } - QueryBuilder feuchtezahlEqualTo( + QueryBuilder + valueHumidityEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3328,7 +3331,7 @@ extension BaumartenQueryFilter } QueryBuilder - feuchtezahlGreaterThan( + valueHumidityGreaterThan( String? value, { bool caseSensitive = true, }) { @@ -3344,7 +3347,7 @@ extension BaumartenQueryFilter } QueryBuilder - feuchtezahlGreaterThanOrEqualTo( + valueHumidityGreaterThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3359,7 +3362,8 @@ extension BaumartenQueryFilter }); } - QueryBuilder feuchtezahlLessThan( + QueryBuilder + valueHumidityLessThan( String? value, { bool caseSensitive = true, }) { @@ -3375,7 +3379,7 @@ extension BaumartenQueryFilter } QueryBuilder - feuchtezahlLessThanOrEqualTo( + valueHumidityLessThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3390,7 +3394,8 @@ extension BaumartenQueryFilter }); } - QueryBuilder feuchtezahlBetween( + QueryBuilder + valueHumidityBetween( String? lower, String? upper, { bool caseSensitive = true, @@ -3408,7 +3413,7 @@ extension BaumartenQueryFilter } QueryBuilder - feuchtezahlStartsWith( + valueHumidityStartsWith( String value, { bool caseSensitive = true, }) { @@ -3423,7 +3428,8 @@ extension BaumartenQueryFilter }); } - QueryBuilder feuchtezahlEndsWith( + QueryBuilder + valueHumidityEndsWith( String value, { bool caseSensitive = true, }) { @@ -3438,9 +3444,8 @@ extension BaumartenQueryFilter }); } - QueryBuilder feuchtezahlContains( - String value, - {bool caseSensitive = true}) { + QueryBuilder + valueHumidityContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( ContainsCondition( @@ -3452,9 +3457,8 @@ extension BaumartenQueryFilter }); } - QueryBuilder feuchtezahlMatches( - String pattern, - {bool caseSensitive = true}) { + QueryBuilder + valueHumidityMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( MatchesCondition( @@ -3467,7 +3471,7 @@ extension BaumartenQueryFilter } QueryBuilder - feuchtezahlIsEmpty() { + valueHumidityIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const EqualCondition( @@ -3479,7 +3483,7 @@ extension BaumartenQueryFilter } QueryBuilder - feuchtezahlIsNotEmpty() { + valueHumidityIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const GreaterCondition( @@ -3491,21 +3495,21 @@ extension BaumartenQueryFilter } QueryBuilder - reaktionszahlIsNull() { + valueReactionIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const IsNullCondition(property: 20)); }); } QueryBuilder - reaktionszahlIsNotNull() { + valueReactionIsNotNull() { return QueryBuilder.apply(not(), (query) { return query.addFilterCondition(const IsNullCondition(property: 20)); }); } QueryBuilder - reaktionszahlEqualTo( + valueReactionEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3521,7 +3525,7 @@ extension BaumartenQueryFilter } QueryBuilder - reaktionszahlGreaterThan( + valueReactionGreaterThan( String? value, { bool caseSensitive = true, }) { @@ -3537,7 +3541,7 @@ extension BaumartenQueryFilter } QueryBuilder - reaktionszahlGreaterThanOrEqualTo( + valueReactionGreaterThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3553,7 +3557,7 @@ extension BaumartenQueryFilter } QueryBuilder - reaktionszahlLessThan( + valueReactionLessThan( String? value, { bool caseSensitive = true, }) { @@ -3569,7 +3573,7 @@ extension BaumartenQueryFilter } QueryBuilder - reaktionszahlLessThanOrEqualTo( + valueReactionLessThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3585,7 +3589,7 @@ extension BaumartenQueryFilter } QueryBuilder - reaktionszahlBetween( + valueReactionBetween( String? lower, String? upper, { bool caseSensitive = true, @@ -3603,7 +3607,7 @@ extension BaumartenQueryFilter } QueryBuilder - reaktionszahlStartsWith( + valueReactionStartsWith( String value, { bool caseSensitive = true, }) { @@ -3619,7 +3623,7 @@ extension BaumartenQueryFilter } QueryBuilder - reaktionszahlEndsWith( + valueReactionEndsWith( String value, { bool caseSensitive = true, }) { @@ -3635,7 +3639,7 @@ extension BaumartenQueryFilter } QueryBuilder - reaktionszahlContains(String value, {bool caseSensitive = true}) { + valueReactionContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( ContainsCondition( @@ -3648,7 +3652,7 @@ extension BaumartenQueryFilter } QueryBuilder - reaktionszahlMatches(String pattern, {bool caseSensitive = true}) { + valueReactionMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( MatchesCondition( @@ -3661,7 +3665,7 @@ extension BaumartenQueryFilter } QueryBuilder - reaktionszahlIsEmpty() { + valueReactionIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const EqualCondition( @@ -3673,7 +3677,7 @@ extension BaumartenQueryFilter } QueryBuilder - reaktionszahlIsNotEmpty() { + valueReactionIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const GreaterCondition( @@ -3685,21 +3689,21 @@ extension BaumartenQueryFilter } QueryBuilder - stickstoffzahlIsNull() { + valueNitrogenIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const IsNullCondition(property: 21)); }); } QueryBuilder - stickstoffzahlIsNotNull() { + valueNitrogenIsNotNull() { return QueryBuilder.apply(not(), (query) { return query.addFilterCondition(const IsNullCondition(property: 21)); }); } QueryBuilder - stickstoffzahlEqualTo( + valueNitrogenEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3715,7 +3719,7 @@ extension BaumartenQueryFilter } QueryBuilder - stickstoffzahlGreaterThan( + valueNitrogenGreaterThan( String? value, { bool caseSensitive = true, }) { @@ -3731,7 +3735,7 @@ extension BaumartenQueryFilter } QueryBuilder - stickstoffzahlGreaterThanOrEqualTo( + valueNitrogenGreaterThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3747,7 +3751,7 @@ extension BaumartenQueryFilter } QueryBuilder - stickstoffzahlLessThan( + valueNitrogenLessThan( String? value, { bool caseSensitive = true, }) { @@ -3763,7 +3767,7 @@ extension BaumartenQueryFilter } QueryBuilder - stickstoffzahlLessThanOrEqualTo( + valueNitrogenLessThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3779,7 +3783,7 @@ extension BaumartenQueryFilter } QueryBuilder - stickstoffzahlBetween( + valueNitrogenBetween( String? lower, String? upper, { bool caseSensitive = true, @@ -3797,7 +3801,7 @@ extension BaumartenQueryFilter } QueryBuilder - stickstoffzahlStartsWith( + valueNitrogenStartsWith( String value, { bool caseSensitive = true, }) { @@ -3813,7 +3817,7 @@ extension BaumartenQueryFilter } QueryBuilder - stickstoffzahlEndsWith( + valueNitrogenEndsWith( String value, { bool caseSensitive = true, }) { @@ -3829,7 +3833,7 @@ extension BaumartenQueryFilter } QueryBuilder - stickstoffzahlContains(String value, {bool caseSensitive = true}) { + valueNitrogenContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( ContainsCondition( @@ -3842,7 +3846,7 @@ extension BaumartenQueryFilter } QueryBuilder - stickstoffzahlMatches(String pattern, {bool caseSensitive = true}) { + valueNitrogenMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( MatchesCondition( @@ -3855,7 +3859,7 @@ extension BaumartenQueryFilter } QueryBuilder - stickstoffzahlIsEmpty() { + valueNitrogenIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const EqualCondition( @@ -3867,7 +3871,7 @@ extension BaumartenQueryFilter } QueryBuilder - stickstoffzahlIsNotEmpty() { + valueNitrogenIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const GreaterCondition( @@ -3904,20 +3908,19 @@ extension BaumartenQueryFilter }); } - QueryBuilder anmerkungIsNull() { + QueryBuilder noteIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const IsNullCondition(property: 23)); }); } - QueryBuilder - anmerkungIsNotNull() { + QueryBuilder noteIsNotNull() { return QueryBuilder.apply(not(), (query) { return query.addFilterCondition(const IsNullCondition(property: 23)); }); } - QueryBuilder anmerkungEqualTo( + QueryBuilder noteEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3932,8 +3935,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder - anmerkungGreaterThan( + QueryBuilder noteGreaterThan( String? value, { bool caseSensitive = true, }) { @@ -3949,7 +3951,7 @@ extension BaumartenQueryFilter } QueryBuilder - anmerkungGreaterThanOrEqualTo( + noteGreaterThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3964,7 +3966,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder anmerkungLessThan( + QueryBuilder noteLessThan( String? value, { bool caseSensitive = true, }) { @@ -3980,7 +3982,7 @@ extension BaumartenQueryFilter } QueryBuilder - anmerkungLessThanOrEqualTo( + noteLessThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -3995,7 +3997,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder anmerkungBetween( + QueryBuilder noteBetween( String? lower, String? upper, { bool caseSensitive = true, @@ -4012,7 +4014,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder anmerkungStartsWith( + QueryBuilder noteStartsWith( String value, { bool caseSensitive = true, }) { @@ -4027,7 +4029,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder anmerkungEndsWith( + QueryBuilder noteEndsWith( String value, { bool caseSensitive = true, }) { @@ -4042,7 +4044,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder anmerkungContains( + QueryBuilder noteContains( String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { @@ -4056,7 +4058,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder anmerkungMatches( + QueryBuilder noteMatches( String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { @@ -4070,7 +4072,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder anmerkungIsEmpty() { + QueryBuilder noteIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const EqualCondition( @@ -4081,8 +4083,7 @@ extension BaumartenQueryFilter }); } - QueryBuilder - anmerkungIsNotEmpty() { + QueryBuilder noteIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const GreaterCondition( @@ -5660,7 +5661,7 @@ extension BaumartenQuerySortBy on QueryBuilder { }); } - QueryBuilder sortByLichtzahl( + QueryBuilder sortByValueLight( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy( @@ -5670,7 +5671,7 @@ extension BaumartenQuerySortBy on QueryBuilder { }); } - QueryBuilder sortByLichtzahlDesc( + QueryBuilder sortByValueLightDesc( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy( @@ -5681,7 +5682,7 @@ extension BaumartenQuerySortBy on QueryBuilder { }); } - QueryBuilder sortByTemperaturzahl( + QueryBuilder sortByValueTemperature( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy( @@ -5691,7 +5692,7 @@ extension BaumartenQuerySortBy on QueryBuilder { }); } - QueryBuilder sortByTemperaturzahlDesc( + QueryBuilder sortByValueTemperatureDesc( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy( @@ -5702,7 +5703,7 @@ extension BaumartenQuerySortBy on QueryBuilder { }); } - QueryBuilder sortByFeuchtezahl( + QueryBuilder sortByValueHumidity( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy( @@ -5712,7 +5713,7 @@ extension BaumartenQuerySortBy on QueryBuilder { }); } - QueryBuilder sortByFeuchtezahlDesc( + QueryBuilder sortByValueHumidityDesc( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy( @@ -5723,7 +5724,7 @@ extension BaumartenQuerySortBy on QueryBuilder { }); } - QueryBuilder sortByReaktionszahl( + QueryBuilder sortByValueReaction( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy( @@ -5733,7 +5734,7 @@ extension BaumartenQuerySortBy on QueryBuilder { }); } - QueryBuilder sortByReaktionszahlDesc( + QueryBuilder sortByValueReactionDesc( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy( @@ -5744,7 +5745,7 @@ extension BaumartenQuerySortBy on QueryBuilder { }); } - QueryBuilder sortByStickstoffzahl( + QueryBuilder sortByValueNitrogen( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy( @@ -5754,7 +5755,7 @@ extension BaumartenQuerySortBy on QueryBuilder { }); } - QueryBuilder sortByStickstoffzahlDesc( + QueryBuilder sortByValueNitrogenDesc( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy( @@ -5765,7 +5766,7 @@ extension BaumartenQuerySortBy on QueryBuilder { }); } - QueryBuilder sortByAnmerkung( + QueryBuilder sortByNote( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy( @@ -5775,7 +5776,7 @@ extension BaumartenQuerySortBy on QueryBuilder { }); } - QueryBuilder sortByAnmerkungDesc( + QueryBuilder sortByNoteDesc( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy( @@ -6058,84 +6059,84 @@ extension BaumartenQuerySortThenBy }); } - QueryBuilder thenByLichtzahl( + QueryBuilder thenByValueLight( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy(17, caseSensitive: caseSensitive); }); } - QueryBuilder thenByLichtzahlDesc( + QueryBuilder thenByValueLightDesc( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy(17, sort: Sort.desc, caseSensitive: caseSensitive); }); } - QueryBuilder thenByTemperaturzahl( + QueryBuilder thenByValueTemperature( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy(18, caseSensitive: caseSensitive); }); } - QueryBuilder thenByTemperaturzahlDesc( + QueryBuilder thenByValueTemperatureDesc( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy(18, sort: Sort.desc, caseSensitive: caseSensitive); }); } - QueryBuilder thenByFeuchtezahl( + QueryBuilder thenByValueHumidity( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy(19, caseSensitive: caseSensitive); }); } - QueryBuilder thenByFeuchtezahlDesc( + QueryBuilder thenByValueHumidityDesc( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy(19, sort: Sort.desc, caseSensitive: caseSensitive); }); } - QueryBuilder thenByReaktionszahl( + QueryBuilder thenByValueReaction( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy(20, caseSensitive: caseSensitive); }); } - QueryBuilder thenByReaktionszahlDesc( + QueryBuilder thenByValueReactionDesc( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy(20, sort: Sort.desc, caseSensitive: caseSensitive); }); } - QueryBuilder thenByStickstoffzahl( + QueryBuilder thenByValueNitrogen( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy(21, caseSensitive: caseSensitive); }); } - QueryBuilder thenByStickstoffzahlDesc( + QueryBuilder thenByValueNitrogenDesc( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy(21, sort: Sort.desc, caseSensitive: caseSensitive); }); } - QueryBuilder thenByAnmerkung( + QueryBuilder thenByNote( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy(23, caseSensitive: caseSensitive); }); } - QueryBuilder thenByAnmerkungDesc( + QueryBuilder thenByNoteDesc( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addSortBy(23, sort: Sort.desc, caseSensitive: caseSensitive); @@ -6304,42 +6305,42 @@ extension BaumartenQueryWhereDistinct }); } - QueryBuilder distinctByLichtzahl( + QueryBuilder distinctByValueLight( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addDistinctBy(17, caseSensitive: caseSensitive); }); } - QueryBuilder distinctByTemperaturzahl( + QueryBuilder distinctByValueTemperature( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addDistinctBy(18, caseSensitive: caseSensitive); }); } - QueryBuilder distinctByFeuchtezahl( + QueryBuilder distinctByValueHumidity( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addDistinctBy(19, caseSensitive: caseSensitive); }); } - QueryBuilder distinctByReaktionszahl( + QueryBuilder distinctByValueReaction( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addDistinctBy(20, caseSensitive: caseSensitive); }); } - QueryBuilder distinctByStickstoffzahl( + QueryBuilder distinctByValueNitrogen( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addDistinctBy(21, caseSensitive: caseSensitive); }); } - QueryBuilder distinctByAnmerkung( + QueryBuilder distinctByNote( {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addDistinctBy(23, caseSensitive: caseSensitive); @@ -6512,44 +6513,44 @@ extension BaumartenQueryProperty1 }); } - QueryBuilder LichtzahlProperty() { + QueryBuilder valueLightProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(17); }); } - QueryBuilder TemperaturzahlProperty() { + QueryBuilder valueTemperatureProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(18); }); } - QueryBuilder FeuchtezahlProperty() { + QueryBuilder valueHumidityProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(19); }); } - QueryBuilder ReaktionszahlProperty() { + QueryBuilder valueReactionProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(20); }); } - QueryBuilder StickstoffzahlProperty() { + QueryBuilder valueNitrogenProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(21); }); } QueryBuilder?, QAfterProperty> - RegionProperty() { + regionProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(22); }); } - QueryBuilder AnmerkungProperty() { + QueryBuilder noteProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(23); }); @@ -6722,47 +6723,48 @@ extension BaumartenQueryProperty2 }); } - QueryBuilder LichtzahlProperty() { + QueryBuilder valueLightProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(17); }); } QueryBuilder - TemperaturzahlProperty() { + valueTemperatureProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(18); }); } - QueryBuilder FeuchtezahlProperty() { + QueryBuilder + valueHumidityProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(19); }); } QueryBuilder - ReaktionszahlProperty() { + valueReactionProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(20); }); } QueryBuilder - StickstoffzahlProperty() { + valueNitrogenProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(21); }); } QueryBuilder?), QAfterProperty> - RegionProperty() { + regionProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(22); }); } - QueryBuilder AnmerkungProperty() { + QueryBuilder noteProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(23); }); @@ -6939,48 +6941,48 @@ extension BaumartenQueryProperty3 }); } - QueryBuilder LichtzahlProperty() { + QueryBuilder valueLightProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(17); }); } QueryBuilder - TemperaturzahlProperty() { + valueTemperatureProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(18); }); } QueryBuilder - FeuchtezahlProperty() { + valueHumidityProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(19); }); } QueryBuilder - ReaktionszahlProperty() { + valueReactionProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(20); }); } QueryBuilder - StickstoffzahlProperty() { + valueNitrogenProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(21); }); } QueryBuilder?), QOperations> - RegionProperty() { + regionProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(22); }); } - QueryBuilder AnmerkungProperty() { + QueryBuilder noteProperty() { return QueryBuilder.apply(this, (query) { return query.addProperty(23); }); @@ -7084,15 +7086,15 @@ Baumarten _$BaumartenFromJson(Map json) => Baumarten() ..humidity = (json['Bodenfeuchte'] as List?) ?.map((e) => IdValueColor.fromJson(e as Map)) .toList() - ..Lichtzahl = json['Lichtzahl'] as String? - ..Temperaturzahl = json['Temperaturzahl'] as String? - ..Feuchtezahl = json['Feuchtezahl'] as String? - ..Reaktionszahl = json['Reaktionszahl'] as String? - ..Stickstoffzahl = json['Stickstoffzahl'] as String? - ..Region = (json['Region'] as List?) + ..valueLight = json['Lichtzahl'] as String? + ..valueTemperature = json['Temperaturzahl'] as String? + ..valueHumidity = json['Feuchtezahl'] as String? + ..valueReaction = json['Reaktionszahl'] as String? + ..valueNitrogen = json['Stickstoffzahl'] as String? + ..region = (json['Region'] as List?) ?.map((e) => IdValueColor.fromJson(e as Map)) .toList() - ..Anmerkung = json['Anmerkung'] as String? + ..note = json['Anmerkung'] as String? ..typeOfCulture = json['Wild/Kulturart'] as String? ..region1 = json['Gebiet 1'] as String? ..region2 = json['Gebiet 2'] as String? @@ -7123,13 +7125,13 @@ Map _$BaumartenToJson(Baumarten instance) => { 'Dürre': instance.drought?.toJson(), 'Bodenwasser': instance.waterlevel, 'Bodenfeuchte': instance.humidity?.map((e) => e.toJson()).toList(), - 'Lichtzahl': instance.Lichtzahl, - 'Temperaturzahl': instance.Temperaturzahl, - 'Feuchtezahl': instance.Feuchtezahl, - 'Reaktionszahl': instance.Reaktionszahl, - 'Stickstoffzahl': instance.Stickstoffzahl, - 'Region': instance.Region?.map((e) => e.toJson()).toList(), - 'Anmerkung': instance.Anmerkung, + 'Lichtzahl': instance.valueLight, + 'Temperaturzahl': instance.valueTemperature, + 'Feuchtezahl': instance.valueHumidity, + 'Reaktionszahl': instance.valueReaction, + 'Stickstoffzahl': instance.valueNitrogen, + 'Region': instance.region?.map((e) => e.toJson()).toList(), + 'Anmerkung': instance.note, 'Wild/Kulturart': instance.typeOfCulture, 'Gebiet 1': instance.region1, 'Gebiet 2': instance.region2, diff --git a/lib/src/domain/entity/file/file_part.dart b/lib/src/domain/entity/file/file_part.dart index 2245259..6b4571a 100644 --- a/lib/src/domain/entity/file/file_part.dart +++ b/lib/src/domain/entity/file/file_part.dart @@ -11,14 +11,20 @@ class FilePart { String? url; Thumbnails? thumbnails; - String? visible_name; + @JsonKey(name: 'visible_name') + String? visibleName; String? name; int? size; - String? mime_type; - bool? is_image; - int? image_width; - int? image_height; - String? uploaded_at; + @JsonKey(name: 'mime_type') + String? mimeType; + @JsonKey(name: 'is_image') + bool? isImage; + @JsonKey(name: 'image_width') + int? imageWidth; + @JsonKey(name: 'image_height') + int? imageHeight; + @JsonKey(name: 'uploaded_at') + String? uploadedAt; factory FilePart.fromJson(Map json) => _$FilePartFromJson(json); diff --git a/lib/src/domain/entity/file/file_part.g.dart b/lib/src/domain/entity/file/file_part.g.dart index 5032489..d41bdcc 100644 --- a/lib/src/domain/entity/file/file_part.g.dart +++ b/lib/src/domain/entity/file/file_part.g.dart @@ -25,7 +25,7 @@ const FilePartSchema = IsarGeneratedSchema( target: 'Thumbnails', ), IsarPropertySchema( - name: 'visible_name', + name: 'visibleName', type: IsarType.string, ), IsarPropertySchema( @@ -37,23 +37,23 @@ const FilePartSchema = IsarGeneratedSchema( type: IsarType.long, ), IsarPropertySchema( - name: 'mime_type', + name: 'mimeType', type: IsarType.string, ), IsarPropertySchema( - name: 'is_image', + name: 'isImage', type: IsarType.bool, ), IsarPropertySchema( - name: 'image_width', + name: 'imageWidth', type: IsarType.long, ), IsarPropertySchema( - name: 'image_height', + name: 'imageHeight', type: IsarType.long, ), IsarPropertySchema( - name: 'uploaded_at', + name: 'uploadedAt', type: IsarType.string, ), ], @@ -86,7 +86,7 @@ int serializeFilePart(IsarWriter writer, FilePart object) { } } { - final value = object.visible_name; + final value = object.visibleName; if (value == null) { IsarCore.writeNull(writer, 3); } else { @@ -103,7 +103,7 @@ int serializeFilePart(IsarWriter writer, FilePart object) { } IsarCore.writeLong(writer, 5, object.size ?? -9223372036854775808); { - final value = object.mime_type; + final value = object.mimeType; if (value == null) { IsarCore.writeNull(writer, 6); } else { @@ -111,17 +111,17 @@ int serializeFilePart(IsarWriter writer, FilePart object) { } } { - final value = object.is_image; + final value = object.isImage; if (value == null) { IsarCore.writeNull(writer, 7); } else { IsarCore.writeBool(writer, 7, value); } } - IsarCore.writeLong(writer, 8, object.image_width ?? -9223372036854775808); - IsarCore.writeLong(writer, 9, object.image_height ?? -9223372036854775808); + IsarCore.writeLong(writer, 8, object.imageWidth ?? -9223372036854775808); + IsarCore.writeLong(writer, 9, object.imageHeight ?? -9223372036854775808); { - final value = object.uploaded_at; + final value = object.uploadedAt; if (value == null) { IsarCore.writeNull(writer, 10); } else { @@ -145,7 +145,7 @@ FilePart deserializeFilePart(IsarReader reader) { object.thumbnails = embedded; } } - object.visible_name = IsarCore.readString(reader, 3); + object.visibleName = IsarCore.readString(reader, 3); object.name = IsarCore.readString(reader, 4); { final value = IsarCore.readLong(reader, 5); @@ -155,31 +155,31 @@ FilePart deserializeFilePart(IsarReader reader) { object.size = value; } } - object.mime_type = IsarCore.readString(reader, 6); + object.mimeType = IsarCore.readString(reader, 6); { if (IsarCore.readNull(reader, 7)) { - object.is_image = null; + object.isImage = null; } else { - object.is_image = IsarCore.readBool(reader, 7); + object.isImage = IsarCore.readBool(reader, 7); } } { final value = IsarCore.readLong(reader, 8); if (value == -9223372036854775808) { - object.image_width = null; + object.imageWidth = null; } else { - object.image_width = value; + object.imageWidth = value; } } { final value = IsarCore.readLong(reader, 9); if (value == -9223372036854775808) { - object.image_height = null; + object.imageHeight = null; } else { - object.image_height = value; + object.imageHeight = value; } } - object.uploaded_at = IsarCore.readString(reader, 10); + object.uploadedAt = IsarCore.readString(reader, 10); return object; } @@ -383,20 +383,20 @@ extension FilePartQueryFilter }); } - QueryBuilder visible_nameIsNull() { + QueryBuilder visibleNameIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const IsNullCondition(property: 3)); }); } QueryBuilder - visible_nameIsNotNull() { + visibleNameIsNotNull() { return QueryBuilder.apply(not(), (query) { return query.addFilterCondition(const IsNullCondition(property: 3)); }); } - QueryBuilder visible_nameEqualTo( + QueryBuilder visibleNameEqualTo( String? value, { bool caseSensitive = true, }) { @@ -412,7 +412,7 @@ extension FilePartQueryFilter } QueryBuilder - visible_nameGreaterThan( + visibleNameGreaterThan( String? value, { bool caseSensitive = true, }) { @@ -428,7 +428,7 @@ extension FilePartQueryFilter } QueryBuilder - visible_nameGreaterThanOrEqualTo( + visibleNameGreaterThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -443,7 +443,7 @@ extension FilePartQueryFilter }); } - QueryBuilder visible_nameLessThan( + QueryBuilder visibleNameLessThan( String? value, { bool caseSensitive = true, }) { @@ -459,7 +459,7 @@ extension FilePartQueryFilter } QueryBuilder - visible_nameLessThanOrEqualTo( + visibleNameLessThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -474,7 +474,7 @@ extension FilePartQueryFilter }); } - QueryBuilder visible_nameBetween( + QueryBuilder visibleNameBetween( String? lower, String? upper, { bool caseSensitive = true, @@ -491,8 +491,7 @@ extension FilePartQueryFilter }); } - QueryBuilder - visible_nameStartsWith( + QueryBuilder visibleNameStartsWith( String value, { bool caseSensitive = true, }) { @@ -507,7 +506,7 @@ extension FilePartQueryFilter }); } - QueryBuilder visible_nameEndsWith( + QueryBuilder visibleNameEndsWith( String value, { bool caseSensitive = true, }) { @@ -522,7 +521,7 @@ extension FilePartQueryFilter }); } - QueryBuilder visible_nameContains( + QueryBuilder visibleNameContains( String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { @@ -536,7 +535,7 @@ extension FilePartQueryFilter }); } - QueryBuilder visible_nameMatches( + QueryBuilder visibleNameMatches( String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { @@ -550,8 +549,7 @@ extension FilePartQueryFilter }); } - QueryBuilder - visible_nameIsEmpty() { + QueryBuilder visibleNameIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const EqualCondition( @@ -563,7 +561,7 @@ extension FilePartQueryFilter } QueryBuilder - visible_nameIsNotEmpty() { + visibleNameIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const GreaterCondition( @@ -852,19 +850,19 @@ extension FilePartQueryFilter }); } - QueryBuilder mime_typeIsNull() { + QueryBuilder mimeTypeIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const IsNullCondition(property: 6)); }); } - QueryBuilder mime_typeIsNotNull() { + QueryBuilder mimeTypeIsNotNull() { return QueryBuilder.apply(not(), (query) { return query.addFilterCondition(const IsNullCondition(property: 6)); }); } - QueryBuilder mime_typeEqualTo( + QueryBuilder mimeTypeEqualTo( String? value, { bool caseSensitive = true, }) { @@ -879,7 +877,7 @@ extension FilePartQueryFilter }); } - QueryBuilder mime_typeGreaterThan( + QueryBuilder mimeTypeGreaterThan( String? value, { bool caseSensitive = true, }) { @@ -895,7 +893,7 @@ extension FilePartQueryFilter } QueryBuilder - mime_typeGreaterThanOrEqualTo( + mimeTypeGreaterThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -910,7 +908,7 @@ extension FilePartQueryFilter }); } - QueryBuilder mime_typeLessThan( + QueryBuilder mimeTypeLessThan( String? value, { bool caseSensitive = true, }) { @@ -926,7 +924,7 @@ extension FilePartQueryFilter } QueryBuilder - mime_typeLessThanOrEqualTo( + mimeTypeLessThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -941,7 +939,7 @@ extension FilePartQueryFilter }); } - QueryBuilder mime_typeBetween( + QueryBuilder mimeTypeBetween( String? lower, String? upper, { bool caseSensitive = true, @@ -958,7 +956,7 @@ extension FilePartQueryFilter }); } - QueryBuilder mime_typeStartsWith( + QueryBuilder mimeTypeStartsWith( String value, { bool caseSensitive = true, }) { @@ -973,7 +971,7 @@ extension FilePartQueryFilter }); } - QueryBuilder mime_typeEndsWith( + QueryBuilder mimeTypeEndsWith( String value, { bool caseSensitive = true, }) { @@ -988,7 +986,7 @@ extension FilePartQueryFilter }); } - QueryBuilder mime_typeContains( + QueryBuilder mimeTypeContains( String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { @@ -1002,7 +1000,7 @@ extension FilePartQueryFilter }); } - QueryBuilder mime_typeMatches( + QueryBuilder mimeTypeMatches( String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { @@ -1016,7 +1014,7 @@ extension FilePartQueryFilter }); } - QueryBuilder mime_typeIsEmpty() { + QueryBuilder mimeTypeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const EqualCondition( @@ -1027,8 +1025,7 @@ extension FilePartQueryFilter }); } - QueryBuilder - mime_typeIsNotEmpty() { + QueryBuilder mimeTypeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const GreaterCondition( @@ -1039,19 +1036,19 @@ extension FilePartQueryFilter }); } - QueryBuilder is_imageIsNull() { + QueryBuilder isImageIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const IsNullCondition(property: 7)); }); } - QueryBuilder is_imageIsNotNull() { + QueryBuilder isImageIsNotNull() { return QueryBuilder.apply(not(), (query) { return query.addFilterCondition(const IsNullCondition(property: 7)); }); } - QueryBuilder is_imageEqualTo( + QueryBuilder isImageEqualTo( bool? value, ) { return QueryBuilder.apply(this, (query) { @@ -1064,20 +1061,20 @@ extension FilePartQueryFilter }); } - QueryBuilder image_widthIsNull() { + QueryBuilder imageWidthIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const IsNullCondition(property: 8)); }); } QueryBuilder - image_widthIsNotNull() { + imageWidthIsNotNull() { return QueryBuilder.apply(not(), (query) { return query.addFilterCondition(const IsNullCondition(property: 8)); }); } - QueryBuilder image_widthEqualTo( + QueryBuilder imageWidthEqualTo( int? value, ) { return QueryBuilder.apply(this, (query) { @@ -1090,8 +1087,7 @@ extension FilePartQueryFilter }); } - QueryBuilder - image_widthGreaterThan( + QueryBuilder imageWidthGreaterThan( int? value, ) { return QueryBuilder.apply(this, (query) { @@ -1105,7 +1101,7 @@ extension FilePartQueryFilter } QueryBuilder - image_widthGreaterThanOrEqualTo( + imageWidthGreaterThanOrEqualTo( int? value, ) { return QueryBuilder.apply(this, (query) { @@ -1118,7 +1114,7 @@ extension FilePartQueryFilter }); } - QueryBuilder image_widthLessThan( + QueryBuilder imageWidthLessThan( int? value, ) { return QueryBuilder.apply(this, (query) { @@ -1132,7 +1128,7 @@ extension FilePartQueryFilter } QueryBuilder - image_widthLessThanOrEqualTo( + imageWidthLessThanOrEqualTo( int? value, ) { return QueryBuilder.apply(this, (query) { @@ -1145,7 +1141,7 @@ extension FilePartQueryFilter }); } - QueryBuilder image_widthBetween( + QueryBuilder imageWidthBetween( int? lower, int? upper, ) { @@ -1160,20 +1156,20 @@ extension FilePartQueryFilter }); } - QueryBuilder image_heightIsNull() { + QueryBuilder imageHeightIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const IsNullCondition(property: 9)); }); } QueryBuilder - image_heightIsNotNull() { + imageHeightIsNotNull() { return QueryBuilder.apply(not(), (query) { return query.addFilterCondition(const IsNullCondition(property: 9)); }); } - QueryBuilder image_heightEqualTo( + QueryBuilder imageHeightEqualTo( int? value, ) { return QueryBuilder.apply(this, (query) { @@ -1187,7 +1183,7 @@ extension FilePartQueryFilter } QueryBuilder - image_heightGreaterThan( + imageHeightGreaterThan( int? value, ) { return QueryBuilder.apply(this, (query) { @@ -1201,7 +1197,7 @@ extension FilePartQueryFilter } QueryBuilder - image_heightGreaterThanOrEqualTo( + imageHeightGreaterThanOrEqualTo( int? value, ) { return QueryBuilder.apply(this, (query) { @@ -1214,7 +1210,7 @@ extension FilePartQueryFilter }); } - QueryBuilder image_heightLessThan( + QueryBuilder imageHeightLessThan( int? value, ) { return QueryBuilder.apply(this, (query) { @@ -1228,7 +1224,7 @@ extension FilePartQueryFilter } QueryBuilder - image_heightLessThanOrEqualTo( + imageHeightLessThanOrEqualTo( int? value, ) { return QueryBuilder.apply(this, (query) { @@ -1241,7 +1237,7 @@ extension FilePartQueryFilter }); } - QueryBuilder image_heightBetween( + QueryBuilder imageHeightBetween( int? lower, int? upper, ) { @@ -1256,20 +1252,20 @@ extension FilePartQueryFilter }); } - QueryBuilder uploaded_atIsNull() { + QueryBuilder uploadedAtIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const IsNullCondition(property: 10)); }); } QueryBuilder - uploaded_atIsNotNull() { + uploadedAtIsNotNull() { return QueryBuilder.apply(not(), (query) { return query.addFilterCondition(const IsNullCondition(property: 10)); }); } - QueryBuilder uploaded_atEqualTo( + QueryBuilder uploadedAtEqualTo( String? value, { bool caseSensitive = true, }) { @@ -1284,8 +1280,7 @@ extension FilePartQueryFilter }); } - QueryBuilder - uploaded_atGreaterThan( + QueryBuilder uploadedAtGreaterThan( String? value, { bool caseSensitive = true, }) { @@ -1301,7 +1296,7 @@ extension FilePartQueryFilter } QueryBuilder - uploaded_atGreaterThanOrEqualTo( + uploadedAtGreaterThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -1316,7 +1311,7 @@ extension FilePartQueryFilter }); } - QueryBuilder uploaded_atLessThan( + QueryBuilder uploadedAtLessThan( String? value, { bool caseSensitive = true, }) { @@ -1332,7 +1327,7 @@ extension FilePartQueryFilter } QueryBuilder - uploaded_atLessThanOrEqualTo( + uploadedAtLessThanOrEqualTo( String? value, { bool caseSensitive = true, }) { @@ -1347,7 +1342,7 @@ extension FilePartQueryFilter }); } - QueryBuilder uploaded_atBetween( + QueryBuilder uploadedAtBetween( String? lower, String? upper, { bool caseSensitive = true, @@ -1364,7 +1359,7 @@ extension FilePartQueryFilter }); } - QueryBuilder uploaded_atStartsWith( + QueryBuilder uploadedAtStartsWith( String value, { bool caseSensitive = true, }) { @@ -1379,7 +1374,7 @@ extension FilePartQueryFilter }); } - QueryBuilder uploaded_atEndsWith( + QueryBuilder uploadedAtEndsWith( String value, { bool caseSensitive = true, }) { @@ -1394,7 +1389,7 @@ extension FilePartQueryFilter }); } - QueryBuilder uploaded_atContains( + QueryBuilder uploadedAtContains( String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { @@ -1408,7 +1403,7 @@ extension FilePartQueryFilter }); } - QueryBuilder uploaded_atMatches( + QueryBuilder uploadedAtMatches( String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { @@ -1422,7 +1417,7 @@ extension FilePartQueryFilter }); } - QueryBuilder uploaded_atIsEmpty() { + QueryBuilder uploadedAtIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const EqualCondition( @@ -1434,7 +1429,7 @@ extension FilePartQueryFilter } QueryBuilder - uploaded_atIsNotEmpty() { + uploadedAtIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition( const GreaterCondition( @@ -1465,24 +1460,24 @@ FilePart _$FilePartFromJson(Map json) => FilePart() ..thumbnails = json['thumbnails'] == null ? null : Thumbnails.fromJson(json['thumbnails'] as Map) - ..visible_name = json['visible_name'] as String? + ..visibleName = json['visible_name'] as String? ..name = json['name'] as String? ..size = (json['size'] as num?)?.toInt() - ..mime_type = json['mime_type'] as String? - ..is_image = json['is_image'] as bool? - ..image_width = (json['image_width'] as num?)?.toInt() - ..image_height = (json['image_height'] as num?)?.toInt() - ..uploaded_at = json['uploaded_at'] as String?; + ..mimeType = json['mime_type'] as String? + ..isImage = json['is_image'] as bool? + ..imageWidth = (json['image_width'] as num?)?.toInt() + ..imageHeight = (json['image_height'] as num?)?.toInt() + ..uploadedAt = json['uploaded_at'] as String?; Map _$FilePartToJson(FilePart instance) => { 'url': instance.url, 'thumbnails': instance.thumbnails?.toJson(), - 'visible_name': instance.visible_name, + 'visible_name': instance.visibleName, 'name': instance.name, 'size': instance.size, - 'mime_type': instance.mime_type, - 'is_image': instance.is_image, - 'image_width': instance.image_width, - 'image_height': instance.image_height, - 'uploaded_at': instance.uploaded_at, + 'mime_type': instance.mimeType, + 'is_image': instance.isImage, + 'image_width': instance.imageWidth, + 'image_height': instance.imageHeight, + 'uploaded_at': instance.uploadedAt, }; diff --git a/lib/src/domain/entity/file/thumbnails.dart b/lib/src/domain/entity/file/thumbnails.dart index 275427a..e465528 100644 --- a/lib/src/domain/entity/file/thumbnails.dart +++ b/lib/src/domain/entity/file/thumbnails.dart @@ -11,7 +11,8 @@ class Thumbnails { Thumbnail? tiny; Thumbnail? small; - Thumbnail? card_cover; + @JsonKey(name: 'card_cover') + Thumbnail? cardCover; factory Thumbnails.fromJson(Map json) => _$ThumbnailsFromJson(json); diff --git a/lib/src/domain/entity/file/thumbnails.g.dart b/lib/src/domain/entity/file/thumbnails.g.dart index 51421bd..ba040eb 100644 --- a/lib/src/domain/entity/file/thumbnails.g.dart +++ b/lib/src/domain/entity/file/thumbnails.g.dart @@ -26,7 +26,7 @@ const ThumbnailsSchema = IsarGeneratedSchema( target: 'Thumbnail', ), IsarPropertySchema( - name: 'card_cover', + name: 'cardCover', type: IsarType.object, target: 'Thumbnail', ), @@ -62,7 +62,7 @@ int serializeThumbnails(IsarWriter writer, Thumbnails object) { } } { - final value = object.card_cover; + final value = object.cardCover; if (value == null) { IsarCore.writeNull(writer, 3); } else { @@ -100,11 +100,11 @@ Thumbnails deserializeThumbnails(IsarReader reader) { { final objectReader = IsarCore.readObject(reader, 3); if (objectReader.isNull) { - object.card_cover = null; + object.cardCover = null; } else { final embedded = deserializeThumbnail(objectReader); IsarCore.freeReader(objectReader); - object.card_cover = embedded; + object.cardCover = embedded; } } return object; @@ -137,14 +137,14 @@ extension ThumbnailsQueryFilter } QueryBuilder - card_coverIsNull() { + cardCoverIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const IsNullCondition(property: 3)); }); } QueryBuilder - card_coverIsNotNull() { + cardCoverIsNotNull() { return QueryBuilder.apply(not(), (query) { return query.addFilterCondition(const IsNullCondition(property: 3)); }); @@ -167,7 +167,7 @@ extension ThumbnailsQueryObject }); } - QueryBuilder card_cover( + QueryBuilder cardCover( FilterQuery q) { return QueryBuilder.apply(this, (query) { return query.object(q, 3); @@ -186,7 +186,7 @@ Thumbnails _$ThumbnailsFromJson(Map json) => Thumbnails() ..small = json['small'] == null ? null : Thumbnail.fromJson(json['small'] as Map) - ..card_cover = json['card_cover'] == null + ..cardCover = json['card_cover'] == null ? null : Thumbnail.fromJson(json['card_cover'] as Map); @@ -194,5 +194,5 @@ Map _$ThumbnailsToJson(Thumbnails instance) => { 'tiny': instance.tiny?.toJson(), 'small': instance.small?.toJson(), - 'card_cover': instance.card_cover?.toJson(), + 'card_cover': instance.cardCover?.toJson(), }; diff --git a/lib/src/domain/entity/massnahme/massnahme.dart b/lib/src/domain/entity/massnahme/massnahme.dart index d3ede7b..2d758df 100644 --- a/lib/src/domain/entity/massnahme/massnahme.dart +++ b/lib/src/domain/entity/massnahme/massnahme.dart @@ -1,6 +1,8 @@ import 'package:ambito/src/domain/entity/base_entity.dart'; import 'package:ambito/src/domain/entity/id_value/id_value.dart'; import 'package:ambito/src/domain/entity/id_value_color/id_value_color.dart'; +import 'package:cached_network_image/cached_network_image.dart'; +import 'package:flutter/material.dart'; import 'package:isar/isar.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -150,3 +152,21 @@ class Massnahme extends BaseEntity { Map toJson() => _$MassnahmeToJson(this); } + +extension MassnahmenExtension on Massnahme { + + CachedNetworkImage? getThumbnail() { + CachedNetworkImage? image; + if (files != null && files!.isNotEmpty) { + if (files![0].thumbnails?.cardCover?.url != null) { + image = CachedNetworkImage( + imageUrl:files![0].thumbnails!.cardCover!.url!, + placeholder: (context, url) => const CircularProgressIndicator(), + errorWidget: (context, url, error) => const Icon(Icons.error), + ); + } + } + return image; + } + +} \ No newline at end of file diff --git a/lib/src/packages/ambito_api/base.dart b/lib/src/packages/ambito_api/base.dart index 1bf6855..01be017 100644 --- a/lib/src/packages/ambito_api/base.dart +++ b/lib/src/packages/ambito_api/base.dart @@ -46,6 +46,7 @@ class BaseApi { break; case 'massnahmen': for (var massnahme in json['results']) { + logger.d(massnahme); BaseDB.put(Massnahme.fromJson(massnahme)); isar.write((isar) { isar.massnahmes.put(Massnahme.fromJson(massnahme)); diff --git a/lib/src/packages/ambito_api/restclient.dart b/lib/src/packages/ambito_api/restclient.dart index bdf0b3a..bc5fb5d 100644 --- a/lib/src/packages/ambito_api/restclient.dart +++ b/lib/src/packages/ambito_api/restclient.dart @@ -19,7 +19,7 @@ class RestClient { var headers = { "Content-Type": contentType, "Accept": accept, - "Authorization": "Token $AmbitoToken", + "Authorization": "Token $ambitoToken", }; return headers; } diff --git a/lib/src/packages/ambito_db/base_db.dart b/lib/src/packages/ambito_db/base_db.dart index dd274b6..9d65c10 100644 --- a/lib/src/packages/ambito_db/base_db.dart +++ b/lib/src/packages/ambito_db/base_db.dart @@ -6,7 +6,7 @@ import '../../../main.dart'; class BaseDB { static put(var entity) { - switch (entity.runtimeType) { + switch (entity.runtimeType.toString()) { case 'Baumarten': isar.write((isar) { isar.baumartens.put(entity); diff --git a/lib/src/pages/actions/actions_page.dart b/lib/src/pages/actions/actions_page.dart index 0c535af..d75afd6 100644 --- a/lib/src/pages/actions/actions_page.dart +++ b/lib/src/pages/actions/actions_page.dart @@ -1,5 +1,6 @@ import 'package:ambito/src/domain/entity/massnahme/massnahme.dart'; import 'package:ambito/src/packages/ambito_db/base_db.dart'; +import 'package:ambito/src/widgets/form/dropdown_menu.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:expandable_text/expandable_text.dart'; import 'package:flutter/material.dart'; @@ -7,84 +8,94 @@ import 'package:flutter/material.dart'; import '../../../main.dart'; class ActionsPage extends StatefulWidget { + const ActionsPage({super.key}); + @override State createState() => ActionsPageState(); } class ActionsPageState extends State { final GlobalKey _keyType = GlobalKey(); + final TextEditingController _controllerType = TextEditingController(); final GlobalKey _keyAreaType = GlobalKey(); + final TextEditingController _controllerAreaType = TextEditingController(); + final GlobalKey _keySupport = GlobalKey(); + final TextEditingController _controllerSupport = TextEditingController(); Map visible = {}; List effort = []; List effect = []; - List type = []; + Set type = {}; String? filterType; - List areaType = []; + Set areaType = {}; String? filterAreaType; List region = []; - List support = []; + String? filterSupport; + Set support = {}; @override void initState() { + super.initState(); effort = []; effect = []; - type = []; - areaType = []; + type = {}; + areaType = {}; region = []; - support = []; + support = {}; } @override Widget build(BuildContext context) { List massnahmen = BaseDB.getAll('Maßnahme'); + Set updatedTypes = {}; + Set updatedAreaTypes = {}; + Set updatedSupports = {}; - List actionCards = []; for (var massnahme in massnahmen) { - //logger.d(massnahme.toJson()); - if (massnahme.actionGroup != null && - !type.contains(massnahme.actionGroup!.value)) { - setState(() { - type.add(massnahme.actionGroup!.value!); - }); + if (massnahme.actionGroup != null) { + updatedTypes.add(massnahme.actionGroup!.value!); } if (massnahme.factsheetAreaType != null) { for (var aType in massnahme.factsheetAreaType!) { - if (!areaType.contains(aType.value)) { - setState(() { - areaType.add(aType.value!); - }); - } + updatedAreaTypes.add(aType.value!); + } + } + if (massnahme.fundingPrograms != null) { + for (var aType in massnahme.fundingPrograms!) { + updatedSupports.add(aType.value!); } } } - for (var massnahme in massnahmen) { - bool myVisibility = true; - if (filterType != null) { - if (massnahme.actionGroup == null || - massnahme.actionGroup!.value != filterType) { - myVisibility = false; - } - } - if (filterAreaType != null) { - if (massnahme.factsheetAreaType != null) { - myVisibility = false; - for (var aType in massnahme.factsheetAreaType!) { - if (aType.value == filterAreaType) { - myVisibility = true; - } - } - } - } + setState(() { + type.addAll(updatedTypes); + areaType.addAll(updatedAreaTypes); + support.addAll(updatedSupports); + }); + + List actionCards = massnahmen.map((massnahme) { + bool typeMatches = filterType == null || + (massnahme.actionGroup != null && + massnahme.actionGroup!.value == filterType); + + bool areaTypeMatches = filterAreaType == null || + (massnahme.factsheetAreaType + ?.any((aType) => aType.value == filterAreaType) ?? + false); + + bool supportMatches = filterSupport == null || + (massnahme.fundingPrograms + ?.any((aType) => aType.value == filterSupport) ?? + false); + + // Update visibility based on the matches setState(() { - visible[massnahme.id] = myVisibility; + visible[massnahme.id] = + typeMatches && areaTypeMatches && supportMatches; }); - actionCards.add(getCard(context, massnahme)); - } - logger.d(visible); - //logger.d(areaType); + return getCard(context, massnahme); + }).toList(); return Padding( padding: const EdgeInsets.only(left: 32, right: 32), @@ -123,98 +134,80 @@ class ActionsPageState extends State { Widget getFilter(BuildContext context) { return Row( + mainAxisAlignment: MainAxisAlignment.start, children: [ - DropdownMenu( - key: _keyAreaType, - initialSelection: filterAreaType, - leadingIcon: (filterAreaType != null) - ? IconButton( - onPressed: () { - _keyAreaType.currentState!.didChange(null); - _keyAreaType.currentState!.reset(); - setState(() { - filterAreaType = null; - }); - }, - icon: const Icon(Icons.delete), - ) - : null, + DropdownMenuWidget( + formKey: _keyAreaType, + label: 'Ort der Maßnahme', + controller: _controllerAreaType, + filterValue: filterAreaType, + onClear: () { + setState(() { + filterAreaType = null; + }); + _controllerAreaType.clear(); + }, onSelected: (String? selection) { setState(() { filterAreaType = selection; }); }, - dropdownMenuEntries: - areaType.map>((String entry) { - return DropdownMenuEntry( - value: entry, - label: entry, - ); - }).toList(), + entries: areaType.toList(), ), - DropdownMenu( - key: _keyType, - leadingIcon: (filterType != null) - ? IconButton( - onPressed: () { - setState(() { - filterType = null; - }); - _keyType.currentState!.reset(); - }, - icon: const Icon(Icons.delete), - ) - : null, + DropdownMenuWidget( + formKey: _keyType, + label: 'Art der Maßnahme', + controller: _controllerType, + filterValue: filterType, + onClear: () { + setState(() { + filterType = null; + }); + _controllerType.clear(); + }, onSelected: (String? selection) { setState(() { filterType = selection; }); }, - dropdownMenuEntries: - type.map>((String entry) { - return DropdownMenuEntry( - value: entry, - label: entry, - ); - }).toList(), + entries: type.toList(), + ), + DropdownMenuWidget( + formKey: _keySupport, + label: 'Förderprogramm', + controller: _controllerSupport, + filterValue: filterSupport, + onClear: () { + setState(() { + filterSupport = null; + }); + _controllerSupport.clear(); + }, + onSelected: (String? selection) { + setState(() { + filterSupport = selection; + }); + }, + entries: support.toList(), ), ], ); } Widget getCard(BuildContext context, Massnahme massnahme) { - Color background = Colors.white; - switch (massnahme.actionGroup?.value) { - case 'Baulelemente': - background = const Color(0xffFFD269); - break; - case 'Begrünung': - background = const Color(0xff40DD74); - break; - case 'Bewirtschaftung': - background = const Color(0xffBF72ED); - break; - case 'Nisthilfe': - background = const Color(0xffDAE3FD); - break; - case 'Pflanzung': - background = const Color(0xff40D6E9); - break; - case 'Sondermaßnahmen': - background = const Color(0xff689EF1); - break; - } + final Map actionGroupColors = { + 'Baulelemente': const Color(0xffFFD269), + 'Begrünung': const Color(0xff40DD74), + 'Bewirtschaftung': const Color(0xffBF72ED), + 'Nisthilfe': const Color(0xffDAE3FD), + 'Pflanzung': const Color(0xff40D6E9), + 'Sondermaßnahmen': const Color(0xff689EF1), + }; - var image; - if (massnahme.files != null && massnahme.files!.isNotEmpty) { - if (massnahme.files![0].thumbnails?.card_cover?.url != null) { - image = CachedNetworkImage( - imageUrl: massnahme.files![0].thumbnails!.card_cover!.url!, - placeholder: (context, url) => const CircularProgressIndicator(), - errorWidget: (context, url, error) => const Icon(Icons.error), - ); - } - } + Color background = + actionGroupColors[massnahme.actionGroup?.value] ?? Colors.white; + + CachedNetworkImage? image = massnahme.getThumbnail(); return Visibility( visible: visible[massnahme.id] ?? false, diff --git a/lib/src/pages/start/start_page.dart b/lib/src/pages/start/start_page.dart new file mode 100644 index 0000000..cc34e26 --- /dev/null +++ b/lib/src/pages/start/start_page.dart @@ -0,0 +1,85 @@ +import 'package:ambito/main.dart'; +import 'package:flutter/material.dart'; + +import '../actions/actions_page.dart'; + +class StartPage extends StatefulWidget { + const StartPage({super.key}); + + @override + State createState() => StartPageState(); +} + +class StartPageState extends State { + String activeLink = ''; + + @override + void initState() { + activeLink = 'start'; + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + const SizedBox(height: 50), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + _linkButton('start'), + _linkButton('database'), + _linkButton('designer'), + Image.asset( + 'images/logo.png', + scale: 1.3, + ), + _linkButton('service'), + _linkButton('network'), + _linkButton('contact'), + ], + ), + const SizedBox(height: 50), + Expanded( + child: getContent(), + ), + ], + )); + } + + Widget getContent() { + if (activeLink == 'database') { + return const ActionsPage(); + } + return Text(activeLink); + } + + Widget _linkButton(String link) { + double fontSize = 16; + return TextButton( + style: ButtonStyle( + overlayColor: + WidgetStateProperty.resolveWith((Set states) { + return Colors.white; + }), + ), + onPressed: () { + setState(() { + activeLink = link; + }); + }, + child: Text( + context.translate('page.start.links.$link.title'), + style: TextStyle( + fontSize: fontSize, + fontWeight: FontWeight.bold, + color: (activeLink == link) + ? Colors.grey.shade400 + : Colors.grey.shade800, + ), + ), + ); + } +} diff --git a/lib/src/widgets/cards/card_massnahmen_list.dart b/lib/src/widgets/cards/card_massnahmen_list.dart new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/lib/src/widgets/cards/card_massnahmen_list.dart @@ -0,0 +1 @@ + diff --git a/lib/src/widgets/form/dropdown_menu.dart b/lib/src/widgets/form/dropdown_menu.dart new file mode 100644 index 0000000..374f898 --- /dev/null +++ b/lib/src/widgets/form/dropdown_menu.dart @@ -0,0 +1,49 @@ +import 'package:flutter/material.dart'; + +class DropdownMenuWidget extends StatelessWidget { + final Key formKey; + final String label; + final TextEditingController controller; + final String? filterValue; + final VoidCallback onClear; + final void Function(String?) onSelected; + final List entries; + + const DropdownMenuWidget({ + super.key, + required this.formKey, + required this.label, + required this.controller, + required this.filterValue, + required this.onClear, + required this.onSelected, + required this.entries, + }); + + @override + Widget build(BuildContext context) { + return DropdownMenu( + key: formKey, + label: Text(label), + controller: controller, + initialSelection: filterValue, + leadingIcon: (filterValue != null) + ? IconButton( + onPressed: onClear, + icon: const Icon(Icons.cancel_outlined), + ) + : const Icon( + Icons.cancel_outlined, + color: Colors.transparent, + ), + onSelected: onSelected, + dropdownMenuEntries: + entries.map>((String entry) { + return DropdownMenuEntry( + value: entry, + label: entry, + ); + }).toList(), + ); + } +} diff --git a/pubspec.lock b/pubspec.lock index 63e259a..5b36393 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,23 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 + sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" url: "https://pub.dev" source: hosted - version: "72.0.0" - _macros: - dependency: transitive - description: dart - source: sdk - version: "0.3.2" + version: "67.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 + sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" url: "https://pub.dev" source: hosted - version: "6.7.0" + version: "6.4.1" args: dependency: transitive description: @@ -90,18 +85,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04 + sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" url: "https://pub.dev" source: hosted - version: "2.4.12" + version: "2.4.11" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 + sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe url: "https://pub.dev" source: hosted - version: "7.3.2" + version: "7.3.1" built_collection: dependency: transitive description: @@ -226,10 +221,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" + sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" url: "https://pub.dev" source: hosted - version: "2.3.7" + version: "2.3.6" dio: dependency: transitive description: @@ -459,7 +454,7 @@ packages: source: hosted version: "2.3.2" http: - dependency: transitive + dependency: "direct main" description: name: http sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 @@ -566,18 +561,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: @@ -618,14 +613,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" - macros: - dependency: transitive - description: - name: macros - sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" - url: "https://pub.dev" - source: hosted - version: "0.1.2-main.4" maps_toolkit: dependency: "direct main" description: @@ -646,18 +633,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.12.0" mgrs_dart: dependency: transitive description: @@ -939,10 +926,10 @@ packages: dependency: transitive description: name: sqflite_common - sha256: "4058172e418eb7e7f2058dcb7657d451a8fc264afa0dea4dbd0f304a57131611" + sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4" url: "https://pub.dev" source: hosted - version: "2.5.4+3" + version: "2.5.4" stack_trace: dependency: transitive description: @@ -979,10 +966,10 @@ packages: dependency: transitive description: name: synchronized - sha256: "51b08572b9f091f8c3eb4d9d4be253f196ff0075d5ec9b10a884026d5b55d7bc" + sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" url: "https://pub.dev" source: hosted - version: "3.3.0+2" + version: "3.1.0+1" term_glyph: dependency: transitive description: @@ -995,10 +982,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.0" timing: dependency: transitive description: @@ -1051,10 +1038,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.2.1" watcher: dependency: transitive description: @@ -1128,5 +1115,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.5.0 <4.0.0" + dart: ">=3.4.4 <4.0.0" flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 1cf1595..02aab9a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,6 +36,7 @@ dependencies: expandable_text: ^2.3.0 path_provider: ^2.1.4 cached_network_image: ^3.4.1 + http: ^1.2.2 dev_dependencies: