From aa32da9c0b038fba626e3d8548088496e794a852 Mon Sep 17 00:00:00 2001 From: Nico Date: Sun, 22 Dec 2024 18:20:03 +0100 Subject: [PATCH] finished rudel textfield --- fforte_data/.obsidian/workspace.json | 6 +++--- lib/#main.dart# | 1 - lib/l10n/app_en.arb | 3 +++ lib/methods/db_helper.dart | 3 +-- lib/screens/Excursion/excursion_main.dart | 3 ++- lib/screens/addCam/cam_widgets.dart | 2 -- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fforte_data/.obsidian/workspace.json b/fforte_data/.obsidian/workspace.json index 707900b..2b94621 100644 --- a/fforte_data/.obsidian/workspace.json +++ b/fforte_data/.obsidian/workspace.json @@ -4,11 +4,11 @@ "type": "split", "children": [ { - "id": "02f726eda2793346", + "id": "524912d7b8aa7373", "type": "tabs", "children": [ { - "id": "b96c0f812d470abc", + "id": "130c930f06ca4839", "type": "leaf", "state": { "type": "empty", @@ -158,7 +158,7 @@ "command-palette:Open command palette": false } }, - "active": "b96c0f812d470abc", + "active": "130c930f06ca4839", "lastOpenFiles": [ "exkursion_2024_11_15.csv", "Lupus - Tabelle exkursion -.pdf", diff --git a/lib/#main.dart# b/lib/#main.dart# index 66fbc74..0d83054 100644 --- a/lib/#main.dart# +++ b/lib/#main.dart# @@ -3,7 +3,6 @@ import 'package:fforte/screens/addCam/add_cam_main.dart'; import 'package:fforte/screens/intro_screen.dart'; import 'package:fforte/screens/settings.dart'; import 'package:fforte/screens/viewCam/view_cams.dart'; -import 'package:flutter/material.dart'; import 'package:flex_color_scheme/flex_color_scheme.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 8391d8f..85db2f9 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -498,9 +498,12 @@ "@excursion": { "description": "no test" }, + "dateandtime": "Date and Time", "@dateandtime": { "description": "date and time step header" } + + } \ No newline at end of file diff --git a/lib/methods/db_helper.dart b/lib/methods/db_helper.dart index 727bb65..bcd8681 100644 --- a/lib/methods/db_helper.dart +++ b/lib/methods/db_helper.dart @@ -34,8 +34,7 @@ class DBHelper { await placeDB.execute( 'CREATE TABLE templates (ID INTEGER PRIMARY KEY AUTOINCREMENT, CID TEXT, Standort TEXT, Rudel TEXT, Datum DATE, Adresse1 TEXT, Adresse2 TEXT, Adresse3 TEXT, BLand TEXT, Lkr TEXT, BeiOrt TEXT, OrtInfo TEXT, Status TEXT, FFTyp TEXT, FotoFilm TEXT, MEZ TEXT, Platzung TEXT, KSchloNr TEXT, KontDat DATE, Betreuung TEXT, AbbauDat DATE, Auftrag TEXT, KontAbsp TEXT, SonstBem TEXT, FKontakt1 TEXT, FKontakt2 TEXT, FKontakt3 TEXT, KTage1 INTEGER, KTage2 INTEGER, ProtoAm DATE, IntKomm TEXT, DECLNG DECIMALS(4,8), DECLAT DECIMALS(4,8))'); await placeDB.execute( - 'CREATE TABLE excursion (ID INTEGER PRIMARY KEY AUTOINCREMENT)' - ); + 'CREATE TABLE excursion (ID INTEGER PRIMARY KEY AUTOINCREMENT, Datum TEXT, Rudel TEXT, Teilnehmer TEXT, Jahr TEXT, Mjahr TEXT, Monat INTEGER, Saison TEXT, Dauer TEXT, BLjahr TEXT, BLand, TEXT, Lkr TEXT, BeiOrt TEXT, Wetter TEXT, Temperat TEXT, RegenVor TEXT, KmAuto TEXT, KmFuss TEXT, KmRad TEXT, KmTotal TEXT, KmAuProf TEXT, KmFuProz TEXT, KmRaProz TEXT, SpGut TEXT, SpSchlecht TEXT, SpurFund TEXT, SpurLang TEXT, SpurTiere Text, SpSicher TEXT, WelpenSp TEXT, WelpenAnz TEXT, WpSicher TEXT, LosungGes TEXT, LosunAnz TEXT, LosunGen TEXT, UrinAnz TEXT, UrinGen TEXT, OestrAnz TEXT, OestrGen TEXT, HaarAnz TEXT, HaarGen TEXT, LosungKm TEXT, GenetiKm TEXT, Hinweise TEXT, Bemerk TEXT, IntKomm TEXT, BimaNr TEXT, BimaName TEXT, BimaNutzer TEXT, BimaAGV TEXT, FallNum INTEGER, MHund TEXT, MLeine TEXT, LogDat TEXT)'); } // Function to add a finished entry and return its ID diff --git a/lib/screens/Excursion/excursion_main.dart b/lib/screens/Excursion/excursion_main.dart index f0a7f32..77fb667 100644 --- a/lib/screens/Excursion/excursion_main.dart +++ b/lib/screens/Excursion/excursion_main.dart @@ -4,6 +4,7 @@ import 'package:fforte/screens/sharedWidgets/var_text_field.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; + class ExcursionMain extends StatefulWidget { const ExcursionMain({super.key}); @@ -38,7 +39,7 @@ class _ExcursionMainState extends State { }), const SizedBox(height: 10,), - VarTextField(textController: getTextFields()["Rudel"], localization: localization, dbName: dbName, required: required) + VarTextField(textController: getTextFields()["Rudel"]!, localization: AppLocalizations.of(context)!.rudel, dbName: "Rudel", required: true) ], )), const Step(title: Text("step2"), content: Text("data")) diff --git a/lib/screens/addCam/cam_widgets.dart b/lib/screens/addCam/cam_widgets.dart index 66637a0..843fd73 100644 --- a/lib/screens/addCam/cam_widgets.dart +++ b/lib/screens/addCam/cam_widgets.dart @@ -1,11 +1,9 @@ -import 'package:fforte/methods/db_helper.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:geolocator/geolocator.dart'; import 'package:latlong2/latlong.dart'; -import 'package:shared_preferences/shared_preferences.dart'; import 'package:geocoding/geocoding.dart';