From 3e3113c1cc524519ae9a865476b7402f649b8033 Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 9 May 2024 10:30:40 +0200 Subject: [PATCH] fixed empty screens when reopening an entry --- lib/addCam/add_cam_main.dart | 60 +++++++++++++++++------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/lib/addCam/add_cam_main.dart b/lib/addCam/add_cam_main.dart index 5ce6f3c..160c752 100644 --- a/lib/addCam/add_cam_main.dart +++ b/lib/addCam/add_cam_main.dart @@ -74,8 +74,8 @@ class _AddCamMainState extends State { DateTime? abbauDat; DateTime datum = DateTime.now(); - DateTime kontDat = DateTime.now(); - DateTime protoAm = DateTime.now(); + DateTime? kontDat = DateTime.now(); + DateTime? protoAm = DateTime.now(); Map getPlace() { Map place = { @@ -169,38 +169,36 @@ class _AddCamMainState extends State { // If a template is edited this fills in the existing values if (widget.isTemplate || widget.isFinished && widget.existingData != null) { - cid.text = widget.existingData!['CID']; - rudelC.text = widget.existingData!['Rudel']; - adresse1C.text = widget.existingData!['Adresse1']; - adresse2C.text = widget.existingData!['Adresse2']; - adresse3C.text = widget.existingData!['Adresse3']; - bLandC.text = widget.existingData!['BLand']; - lkrC.text = widget.existingData!['Lkr']; - beiOrtC.text = widget.existingData!['BeiOrt']; - ortInfoC.text = widget.existingData!['OrtInfo']; - selectedStatus = widget.existingData!['Status']; - ffTypC.text = widget.existingData!['FFTyp']; - selectedFotoFilm = widget.existingData!['FotoFilm']; - selectedMEZ = widget.existingData!['MEZ']; - selectedPlatzung = widget.existingData!['Platzung']; - kSchloNrC.text = widget.existingData!['KSchloNr']; + cid.text = widget.existingData!['CID'] ?? ""; + rudelC.text = widget.existingData!['Rudel'] ?? ""; + adresse1C.text = widget.existingData!['Adresse1'] ?? ""; + adresse2C.text = widget.existingData!['Adresse2'] ?? ""; + adresse3C.text = widget.existingData!['Adresse3'] ?? ""; + bLandC.text = widget.existingData!['BLand'] ?? ""; + lkrC.text = widget.existingData!['Lkr'] ?? ""; + beiOrtC.text = widget.existingData!['BeiOrt'] ?? ""; + ortInfoC.text = widget.existingData!['OrtInfo'] ?? ""; + selectedStatus = widget.existingData!['Status'] ?? ""; + ffTypC.text = widget.existingData!['FFTyp'] ?? ""; + selectedFotoFilm = widget.existingData!['FotoFilm'] ?? ""; + selectedMEZ = widget.existingData!['MEZ'] ?? ""; + selectedPlatzung = widget.existingData!['Platzung'] ?? ""; + kSchloNrC.text = widget.existingData!['KSchloNr'] ?? ""; datum = DateTime.parse(widget.existingData!['Datum']); - kontDat = DateTime.parse(widget.existingData!['KontDat']); - abbauDat = widget.existingData!['AbbauDat'] == "" - ? null - : DateTime.parse(widget.existingData!['AbbauDat']); - auftragC.text = widget.existingData!['Auftrag']; - kontAbspC.text = widget.existingData!['KontAbsp']; - sonstBemC.text = widget.existingData!['SonstBem']; - fKontakt1C.text = widget.existingData!['FKontakt1']; - fKontakt2C.text = widget.existingData!['FKontakt2']; - fKontakt3C.text = widget.existingData!['FKontakt3']; - standortC.text = widget.existingData!['Standort']; + kontDat = widget.existingData!['KontDat'] == null ? null : DateTime.parse(widget.existingData!['KontDat']); + abbauDat = widget.existingData!['AbbauDat'] == null ? null : DateTime.parse(widget.existingData!['AbbauDat']); + auftragC.text = widget.existingData!['Auftrag'] ?? ""; + kontAbspC.text = widget.existingData!['KontAbsp'] ?? ""; + sonstBemC.text = widget.existingData!['SonstBem'] ?? ""; + fKontakt1C.text = widget.existingData!['FKontakt1'] ?? ""; + fKontakt2C.text = widget.existingData!['FKontakt2'] ?? ""; + fKontakt3C.text = widget.existingData!['FKontakt3'] ?? ""; + standortC.text = widget.existingData!['Standort'] ?? ""; kTage1C.text = widget.existingData!['KTage1'].toString(); kTage2C.text = widget.existingData!['KTage2'].toString(); - protoAm = DateTime.parse(widget.existingData!['ProtoAm']); - intKommC.text = widget.existingData!['IntKomm']; - betreuungC.text = widget.existingData!['Betreuung']; + protoAm = widget.existingData!['ProtoAm'] == null ? null : DateTime.parse(widget.existingData!['ProtoAm']); + intKommC.text = widget.existingData!['IntKomm'] ?? ""; + betreuungC.text = widget.existingData!['Betreuung'] ?? ""; } }