From 0840f21361eca83e2e106ce22b23591cae348726 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 1 May 2024 00:53:31 +0200 Subject: [PATCH] removed datumS's. But got an db error --- Todo.txt | 4 +-- fforte_data/.~lock.fforte_2023_08_15.xlsx# | 1 + lib/addCam/add_cam_main.dart | 27 +++++------------ lib/addCam/cam_widgets.dart | 34 +++++++++++++--------- 4 files changed, 32 insertions(+), 34 deletions(-) create mode 100644 fforte_data/.~lock.fforte_2023_08_15.xlsx# diff --git a/Todo.txt b/Todo.txt index 1a5641b..782c3a2 100644 --- a/Todo.txt +++ b/Todo.txt @@ -1,6 +1,5 @@ todo: -im englischen abändern -redesign datenansicht +Primary key(s) ändern ausvon und ausbis fixen (falsches datum übergeben (20000-01-01)) zurückfeld in datenansicht maybe auch vorschläge aus templates in dropdown menüs anzeigen @@ -17,6 +16,7 @@ eintrg in db wenn http response (in sent column) not to do: +redesign datenansicht möglichkeit einfügen um nicht gesendete einträge zu senden save option einfügen nur zum speichern maybe auch vorschläge aus templates in dropdown menüs anzeigen diff --git a/fforte_data/.~lock.fforte_2023_08_15.xlsx# b/fforte_data/.~lock.fforte_2023_08_15.xlsx# new file mode 100644 index 0000000..b398597 --- /dev/null +++ b/fforte_data/.~lock.fforte_2023_08_15.xlsx# @@ -0,0 +1 @@ +,nico,nico-end,01.05.2024 00:11,file:///home/nico/.config/libreoffice/7.3.1; \ No newline at end of file diff --git a/lib/addCam/add_cam_main.dart b/lib/addCam/add_cam_main.dart index bce0bc9..d6e4b80 100644 --- a/lib/addCam/add_cam_main.dart +++ b/lib/addCam/add_cam_main.dart @@ -71,10 +71,6 @@ class _AddCamMainState extends State { altitudeAccuracy: 0.0, headingAccuracy: 0.0); - String datumS = DateFormat('yyyy-MM-dd').format(DateTime.now()); - String kontDatS = DateFormat('yyyy-MM-dd').format(DateTime.now()); - String abbauDatS = DateFormat('yyyy-MM-dd').format(DateTime(2000)); - String protoAmS = DateFormat('yyyy-MM-dd').format(DateTime.now()); DateTime? abbauDat; DateTime datum = DateTime.now(); DateTime kontDat = DateTime.now(); @@ -84,7 +80,7 @@ class _AddCamMainState extends State { Map place = { 'CID': id.text, 'Rudel': rudelC.text, - 'Datum': datumS, + 'Datum': datum.toString().split(" ").first, 'Adresse1': adresse1C.text, 'Adresse2': adresse2C.text, 'Adresse3': adresse3C.text, @@ -100,8 +96,8 @@ class _AddCamMainState extends State { 'Platzung': selectedPlatzung, 'KSchloNr': kSchloNrC.text, 'Bearsafe': selectedBearsafe, - 'KontDat': kontDatS, - 'AbbauDat': abbauDatS, + 'KontDat': kontDat.toString().split(" ").first, + 'AbbauDat': abbauDat.toString().split(" ").first.replaceAll("null", ""), 'Auftrag': auftragC.text, 'KontAbsp': kontAbspC.text, 'SonstBem': sonstBemC.text, @@ -111,7 +107,7 @@ class _AddCamMainState extends State { 'Standort': standortC.text, 'KTage1': kTage1C.text, 'KTage2': kTage2C.text, - 'ProtoAm': protoAmS, + 'ProtoAm': protoAm.toString().split(" ").first, 'IntKomm': intKommC.text, 'Betreuung': betreuungC.text, 'DECLNG': currentPosition.longitude, @@ -190,9 +186,9 @@ class _AddCamMainState extends State { selectedPlatzung = widget.existingData!['Platzung']; kSchloNrC.text = widget.existingData!['KSchloNr']; selectedBearsafe = widget.existingData!['Bearsafe']; - datumS = widget.existingData!['Datum']; - kontDatS = widget.existingData!['KontDat']; - abbauDatS = widget.existingData!['AbbauDat']; + datum = widget.existingData!['Datum']; + kontDat = widget.existingData!['KontDat']; + abbauDat = widget.existingData!['AbbauDat']; auftragC.text = widget.existingData!['Auftrag']; kontAbspC.text = widget.existingData!['KontAbsp']; sonstBemC.text = widget.existingData!['SonstBem']; @@ -202,7 +198,7 @@ class _AddCamMainState extends State { standortC.text = widget.existingData!['Standort']; kTage1C.text = widget.existingData!['KTage1'].toString(); kTage2C.text = widget.existingData!['KTage2'].toString(); - protoAmS = widget.existingData!['ProtoAm']; + protoAm = widget.existingData!['ProtoAm']; intKommC.text = widget.existingData!['IntKomm']; betreuungC.text = widget.existingData!['Betreuung']; } @@ -708,13 +704,6 @@ class _AddCamMainState extends State { Row( children: [ AbbauDat(abbauDat: abbauDat), - ElevatedButton( - onPressed: () { - setState(() { - abbauDat = null; - }); - }, - child: const Text("X")) ], ), const SizedBox( diff --git a/lib/addCam/cam_widgets.dart b/lib/addCam/cam_widgets.dart index 69f7d36..0e3217a 100644 --- a/lib/addCam/cam_widgets.dart +++ b/lib/addCam/cam_widgets.dart @@ -11,7 +11,6 @@ import 'package:geocoding/geocoding.dart'; // * Collection of All widgets displayed in the add_cam section - class VarTextField extends StatefulWidget { final TextEditingController textController; final String localization; @@ -95,7 +94,9 @@ class _VarTextFieldState extends State { : const UnderlineInputBorder( borderSide: BorderSide(color: Colors.grey))), )), - const SizedBox(width: 15,), + const SizedBox( + width: 15, + ), Expanded( flex: 1, child: Align( @@ -106,7 +107,11 @@ class _VarTextFieldState extends State { AsyncSnapshot>> snapshot) { if (snapshot.hasData) { // Filtern der Daten, um sicherzustellen, dass keine 'null' Werte für den Schlüssel dbName vorhanden sind - var filteredData = snapshot.data!.where((item) => item[widget.dbName] != null && item[widget.dbName] != "" ).toList(); + var filteredData = snapshot.data! + .where((item) => + item[widget.dbName] != null && + item[widget.dbName] != "") + .toList(); return PopupMenuButton( onSelected: (String value) { setState(() { @@ -142,8 +147,6 @@ class _VarTextFieldState extends State { ); } - - // Karte // ! completely new page @@ -170,9 +173,6 @@ class KarteState extends State { Position? updatedPosition; bool saveVisible = false; - - - @override void initState() { super.initState(); @@ -200,13 +200,12 @@ class KarteState extends State { Text(AppLocalizations.of(context)!.saveMap), TextButton( onPressed: () async { - - List placemarks = await placemarkFromCoordinates(selectedPosition!.latitude, selectedPosition!.longitude); + List placemarks = await placemarkFromCoordinates( + selectedPosition!.latitude, + selectedPosition!.longitude); if (selectedPosition != null) { - setState(() { - widget.beiOrtC.text = placemarks.first.locality!; updatedPosition = Position( @@ -352,7 +351,6 @@ class _DatumState extends State { } } - // Status class Status extends StatefulWidget { @@ -882,6 +880,16 @@ class _AbbauDatState extends State { return Text(AppLocalizations.of(context)!.nichts); } }), + const SizedBox( + width: 10, + ), + ElevatedButton( + onPressed: () { + setState(() { + abbauDat = null; + }); + }, + child: const Text("X")) ]), ], );