nico/fforte
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.getmemy.coffee/nico/fforte

Browse Source
This commit is contained in:
nico
2024-05-15 17:56:52 +02:00
parent bf6b331478 51524321a3
commit 3528e2ee6c
4 changed files with 156 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
lib/addCam/add_cam_main.dart
View File

@@ -74,8 +74,8 @@ class _AddCamMainState extends State<AddCamMain> {
DateTime? abbauDat; DateTime? abbauDat;
DateTime datum = DateTime.now(); DateTime datum = DateTime.now();
DateTime kontDat = DateTime.now(); DateTime? kontDat = DateTime.now();
DateTime protoAm = DateTime.now(); DateTime? protoAm = DateTime.now();
Map<String, dynamic> getPlace() { Map<String, dynamic> getPlace() {
Map<String, dynamic> place = { Map<String, dynamic> place = {
@@ -121,14 +121,15 @@ class _AddCamMainState extends State<AddCamMain> {
// determine live position with checks for denied permission and turned off location service // determine live position with checks for denied permission and turned off location service
Future<Position> _deteterminePosition() async { Future<Position> _deteterminePosition() async {
bool locationEnabled; bool locationEnabled;
LocationPermission permissionGiven; LocationPermission permissionGiven;
locationEnabled = await Geolocator.isLocationServiceEnabled(); locationEnabled = await Geolocator.isLocationServiceEnabled();
if (!locationEnabled) { if (!locationEnabled && mounted) {
// ignore: use_build_context_synchronously
ScaffoldMessenger.of(context).showSnackBar(SnackBar( ScaffoldMessenger.of(context).showSnackBar(SnackBar(
// ignore: use_build_context_synchronously
content: Text(AppLocalizations.of(context)!.locationDisabled))); content: Text(AppLocalizations.of(context)!.locationDisabled)));
return currentPosition; return currentPosition;
} }
@@ -136,20 +137,16 @@ class _AddCamMainState extends State<AddCamMain> {
permissionGiven = await Geolocator.checkPermission(); permissionGiven = await Geolocator.checkPermission();
if (permissionGiven == LocationPermission.denied) { if (permissionGiven == LocationPermission.denied) {
permissionGiven = await Geolocator.requestPermission(); permissionGiven = await Geolocator.requestPermission();
if (permissionGiven == LocationPermission.denied) { if (permissionGiven == LocationPermission.denied && mounted) {
// ignore: use_build_context_synchronously
ScaffoldMessenger.of(context).showSnackBar(SnackBar( ScaffoldMessenger.of(context).showSnackBar(SnackBar(
// ignore: use_build_context_synchronously
content: Text(AppLocalizations.of(context)!.locationForbidden))); content: Text(AppLocalizations.of(context)!.locationForbidden)));
return currentPosition; return currentPosition;
} }
} }
if (permissionGiven == LocationPermission.deniedForever) { if (permissionGiven == LocationPermission.deniedForever && mounted) {
// ignore: use_build_context_synchronously
ScaffoldMessenger.of(context).showSnackBar(SnackBar( ScaffoldMessenger.of(context).showSnackBar(SnackBar(
// ignore: use_build_context_synchronously
content: Text(AppLocalizations.of(context)!.locationForbidden))); content: Text(AppLocalizations.of(context)!.locationForbidden)));
return currentPosition; return currentPosition;
} }
@@ -169,38 +166,42 @@ class _AddCamMainState extends State<AddCamMain> {
// If a template is edited this fills in the existing values // If a template is edited this fills in the existing values
if (widget.isTemplate || widget.isFinished && widget.existingData != null) { if (widget.isTemplate || widget.isFinished && widget.existingData != null) {
cid.text = widget.existingData!['CID']; cid.text = widget.existingData!['CID'] ?? "";
rudelC.text = widget.existingData!['Rudel']; rudelC.text = widget.existingData!['Rudel'] ?? "";
adresse1C.text = widget.existingData!['Adresse1']; adresse1C.text = widget.existingData!['Adresse1'] ?? "";
adresse2C.text = widget.existingData!['Adresse2']; adresse2C.text = widget.existingData!['Adresse2'] ?? "";
adresse3C.text = widget.existingData!['Adresse3']; adresse3C.text = widget.existingData!['Adresse3'] ?? "";
bLandC.text = widget.existingData!['BLand']; bLandC.text = widget.existingData!['BLand'] ?? "";
lkrC.text = widget.existingData!['Lkr']; lkrC.text = widget.existingData!['Lkr'] ?? "";
beiOrtC.text = widget.existingData!['BeiOrt']; beiOrtC.text = widget.existingData!['BeiOrt'] ?? "";
ortInfoC.text = widget.existingData!['OrtInfo']; ortInfoC.text = widget.existingData!['OrtInfo'] ?? "";
selectedStatus = widget.existingData!['Status']; selectedStatus = widget.existingData!['Status'] ?? "";
ffTypC.text = widget.existingData!['FFTyp']; ffTypC.text = widget.existingData!['FFTyp'] ?? "";
selectedFotoFilm = widget.existingData!['FotoFilm']; selectedFotoFilm = widget.existingData!['FotoFilm'] ?? "";
selectedMEZ = widget.existingData!['MEZ']; selectedMEZ = widget.existingData!['MEZ'] ?? "";
selectedPlatzung = widget.existingData!['Platzung']; selectedPlatzung = widget.existingData!['Platzung'] ?? "";
kSchloNrC.text = widget.existingData!['KSchloNr']; kSchloNrC.text = widget.existingData!['KSchloNr'] ?? "";
datum = DateTime.parse(widget.existingData!['Datum']); datum = DateTime.parse(widget.existingData!['Datum']);
kontDat = DateTime.parse(widget.existingData!['KontDat']); kontDat = widget.existingData!['KontDat'] == null
abbauDat = widget.existingData!['AbbauDat'] == "" ? null
: DateTime.parse(widget.existingData!['KontDat']);
abbauDat = widget.existingData!['AbbauDat'] == null
? null ? null
: DateTime.parse(widget.existingData!['AbbauDat']); : DateTime.parse(widget.existingData!['AbbauDat']);
auftragC.text = widget.existingData!['Auftrag']; auftragC.text = widget.existingData!['Auftrag'] ?? "";
kontAbspC.text = widget.existingData!['KontAbsp']; kontAbspC.text = widget.existingData!['KontAbsp'] ?? "";
sonstBemC.text = widget.existingData!['SonstBem']; sonstBemC.text = widget.existingData!['SonstBem'] ?? "";
fKontakt1C.text = widget.existingData!['FKontakt1']; fKontakt1C.text = widget.existingData!['FKontakt1'] ?? "";
fKontakt2C.text = widget.existingData!['FKontakt2']; fKontakt2C.text = widget.existingData!['FKontakt2'] ?? "";
fKontakt3C.text = widget.existingData!['FKontakt3']; fKontakt3C.text = widget.existingData!['FKontakt3'] ?? "";
standortC.text = widget.existingData!['Standort']; standortC.text = widget.existingData!['Standort'] ?? "";
kTage1C.text = widget.existingData!['KTage1'].toString(); kTage1C.text = widget.existingData!['KTage1'].toString();
kTage2C.text = widget.existingData!['KTage2'].toString(); kTage2C.text = widget.existingData!['KTage2'].toString();
protoAm = DateTime.parse(widget.existingData!['ProtoAm']); protoAm = widget.existingData!['ProtoAm'] == null
intKommC.text = widget.existingData!['IntKomm']; ? null
betreuungC.text = widget.existingData!['Betreuung']; : DateTime.parse(widget.existingData!['ProtoAm']);
intKommC.text = widget.existingData!['IntKomm'] ?? "";
betreuungC.text = widget.existingData!['Betreuung'] ?? "";
} }
} }
@@ -242,8 +243,6 @@ class _AddCamMainState extends State<AddCamMain> {
actions: [ actions: [
TextButton( TextButton(
onPressed: () async { onPressed: () async {
int errorCode = _httpRequest(); int errorCode = _httpRequest();
if (errorCode != 201) { if (errorCode != 201) {
@@ -273,7 +272,6 @@ class _AddCamMainState extends State<AddCamMain> {
onPressed: () async { onPressed: () async {
saveTemplate(); saveTemplate();
Navigator.pushNamedAndRemoveUntil( Navigator.pushNamedAndRemoveUntil(
// ignore: use_build_context_synchronously
context, context,
'/home', '/home',
(route) => false); (route) => false);
@@ -281,7 +279,6 @@ class _AddCamMainState extends State<AddCamMain> {
child: Text(AppLocalizations.of(context)!.template)), child: Text(AppLocalizations.of(context)!.template)),
TextButton( TextButton(
onPressed: () async { onPressed: () async {
int errorCode = _httpRequest(); int errorCode = _httpRequest();
if (errorCode != 201) { if (errorCode != 201) {
@@ -319,14 +316,12 @@ class _AddCamMainState extends State<AddCamMain> {
onPressed: () async { onPressed: () async {
saveData(); saveData();
saveFile(); saveFile();
// ignore: use_build_context_synchronously
}, },
child: Text(AppLocalizations.of(context)!.saveasfile)), child: Text(AppLocalizations.of(context)!.saveasfile)),
TextButton( TextButton(
onPressed: () { onPressed: () {
saveData(); saveData();
Navigator.pushNamedAndRemoveUntil( Navigator.pushNamedAndRemoveUntil(
// ignore: use_build_context_synchronously
context, context,
'/home', '/home',
(route) => false); (route) => false);
@@ -343,7 +338,6 @@ class _AddCamMainState extends State<AddCamMain> {
} }
int _httpRequest() { int _httpRequest() {
Map<String, dynamic> place = getPlace(); Map<String, dynamic> place = getPlace();
Methods method = Methods(); Methods method = Methods();
@@ -360,37 +354,35 @@ class _AddCamMainState extends State<AddCamMain> {
String jsonPlace = jsonEncode(place); String jsonPlace = jsonEncode(place);
if (selectedDirectory == null) { if (selectedDirectory == null) {
// ignore: use_build_context_synchronously if (mounted) Navigator.pop(context);
Navigator.pop(context);
return; return;
} }
await prefs.setString('saveDir', selectedDirectory); await prefs.setString('saveDir', selectedDirectory);
// ignore: use_build_context_synchronously
File file = File( File file = File(
'$selectedDirectory/${AppLocalizations.of(context)!.justplace}-${standortC.text}.txt'); '$selectedDirectory/${mounted ? AppLocalizations.of(context)!.justplace : const Text('')}-${standortC.text}.txt');
try { try {
await file.writeAsString(jsonPlace); await file.writeAsString(jsonPlace);
} catch (e) { } catch (e) {
// ignore: use_build_context_synchronously if (mounted) {
Navigator.pop(context); Navigator.pop(context);
// ignore: use_build_context_synchronously
ScaffoldMessenger.of(context).showSnackBar(SnackBar( ScaffoldMessenger.of(context).showSnackBar(SnackBar(
// ignore: use_build_context_synchronously content: Text(AppLocalizations.of(context)!.savefilefailed))); }
content: Text(AppLocalizations.of(context)!.savefilefailed)));
return; return;
} }
// ignore: use_build_context_synchronously if (mounted) {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Datei gespeichert in $selectedDirectory'))); SnackBar(content: Text('Datei gespeichert in $selectedDirectory')));
}
if (mounted) {
Navigator.pushNamedAndRemoveUntil( Navigator.pushNamedAndRemoveUntil(
// ignore: use_build_context_synchronously
context, context,
'/home', '/home',
(route) => false); (route) => false);
} }
}
// checks if required fields are not empty. If one is the name will be returned // checks if required fields are not empty. If one is the name will be returned
List<String> validateData() { List<String> validateData() {
@@ -569,12 +561,12 @@ class _AddCamMainState extends State<AddCamMain> {
Column( Column(
children: [ children: [
Text(currentPosition.latitude.toString()), Text(currentPosition.latitude.toString()),
Text(currentPosition.longitude.toString()), Text(currentPosition.longitude.toString()),
], ],
), ),
const SizedBox(width: 15,), const SizedBox(
width: 15,
),
ElevatedButton( ElevatedButton(
onPressed: () async { onPressed: () async {
final result = await Navigator.of(context) final result = await Navigator.of(context)
@@ -663,9 +655,19 @@ class _AddCamMainState extends State<AddCamMain> {
content: Column( content: Column(
children: [ children: [
Datum( Datum(
datum: datum, initDatum: datum,
onDateChanged: (value) {
datum = value;
},
),
KontDat(
initKontDat: kontDat,
onDateChanged: (value) {
setState(() {
kontDat = value;
});
},
), ),
KontDat(kontDat: kontDat),
const SizedBox( const SizedBox(
height: 20, height: 20,
), ),
@@ -714,7 +716,12 @@ class _AddCamMainState extends State<AddCamMain> {
), ),
Row( Row(
children: [ children: [
AbbauDat(abbauDat: abbauDat), AbbauDat(
initAbbauDat: abbauDat,
onDateChanged: (value) {
abbauDat = value;
},
),
], ],
), ),
const SizedBox( const SizedBox(

79
lib/addCam/cam_widgets.dart
View File

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map/flutter_map.dart';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
import 'package:intl/intl.dart';
import 'package:latlong2/latlong.dart'; import 'package:latlong2/latlong.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:geocoding/geocoding.dart'; import 'package:geocoding/geocoding.dart';
@@ -155,7 +154,8 @@ class Karte extends StatefulWidget {
{super.key, {super.key,
required this.currentPosition, required this.currentPosition,
required this.onPositionChange, required this.onPositionChange,
required this.beiOrtC, required this.ortInfoC}); required this.beiOrtC,
required this.ortInfoC});
@override @override
KarteState createState() => KarteState(); KarteState createState() => KarteState();
@@ -197,7 +197,7 @@ class KarteState extends State<Karte> {
List<Placemark> placemarks = await placemarkFromCoordinates( List<Placemark> placemarks = await placemarkFromCoordinates(
selectedPosition!.latitude, selectedPosition!.latitude,
selectedPosition!.longitude); selectedPosition!.longitude);
print(placemarks); // print(placemarks);
if (selectedPosition != null) { if (selectedPosition != null) {
setState(() { setState(() {
@@ -293,16 +293,23 @@ class KarteState extends State<Karte> {
// datum is the variable where the chosen date is stored // datum is the variable where the chosen date is stored
class Datum extends StatefulWidget { class Datum extends StatefulWidget {
final DateTime? datum; final DateTime? initDatum;
final Function(DateTime) onDateChanged;
const Datum({super.key, required this.datum}); const Datum({super.key, required this.initDatum, required this.onDateChanged});
@override @override
State<Datum> createState() => _DatumState(); State<Datum> createState() => _DatumState();
} }
class _DatumState extends State<Datum> { class _DatumState extends State<Datum> {
DateTime? datum = DateTime.now(); DateTime? datum;
@override
void initState() {
super.initState();
datum = widget.initDatum;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -316,6 +323,7 @@ class _DatumState extends State<Datum> {
final date = await pickDate(); final date = await pickDate();
if (date == null) return; if (date == null) return;
setState(() => datum = date); setState(() => datum = date);
widget.onDateChanged(date);
}, },
child: Text(AppLocalizations.of(context)!.pickDate)), child: Text(AppLocalizations.of(context)!.pickDate)),
), ),
@@ -336,14 +344,8 @@ class _DatumState extends State<Datum> {
initialDate: datum!, initialDate: datum!,
firstDate: DateTime(2000), firstDate: DateTime(2000),
lastDate: DateTime(5000)); lastDate: DateTime(5000));
if (date == null) return null;
setState(() => datum = date);
var place = {'Datum': DateFormat('yyyy-MM-dd').format(datum!)}; return date;
await DBHelper().addPlace(place);
return datum;
} }
} }
@@ -473,10 +475,10 @@ class Platzung extends StatefulWidget {
final Function(String) onPlatzungChanged; final Function(String) onPlatzungChanged;
final String? initialPlatzung; final String? initialPlatzung;
const Platzung({
const Platzung( super.key,
{super.key, required this.onPlatzungChanged,
required this.onPlatzungChanged, this.initialPlatzung, this.initialPlatzung,
}); });
@override @override
@@ -494,7 +496,6 @@ class _PlatzungState extends State<Platzung> {
} }
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column( return Column(
@@ -725,16 +726,24 @@ class _MEZState extends State<MEZ> {
// KontDat // KontDat
class KontDat extends StatefulWidget { class KontDat extends StatefulWidget {
final DateTime? kontDat; final DateTime? initKontDat;
final Function(DateTime) onDateChanged;
const KontDat({super.key, required this.kontDat}); const KontDat(
{super.key, required this.initKontDat, required this.onDateChanged});
@override @override
State<KontDat> createState() => _KontDatState(); State<KontDat> createState() => _KontDatState();
} }
class _KontDatState extends State<KontDat> { class _KontDatState extends State<KontDat> {
DateTime? kontDat = DateTime.now(); DateTime? kontDat;
@override
void initState() {
super.initState();
kontDat = widget.initKontDat;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -747,7 +756,10 @@ class _KontDatState extends State<KontDat> {
onPressed: () async { onPressed: () async {
final date = await pickDate(); final date = await pickDate();
if (date == null) return; if (date == null) return;
setState(() => kontDat = date); setState(() {
kontDat = date;
});
widget.onDateChanged(date);
}, },
child: Text(AppLocalizations.of(context)!.pickkontdat)), child: Text(AppLocalizations.of(context)!.pickkontdat)),
), ),
@@ -765,26 +777,21 @@ class _KontDatState extends State<KontDat> {
Future<DateTime?> pickDate() async { Future<DateTime?> pickDate() async {
final date = await showDatePicker( final date = await showDatePicker(
context: context, context: context,
initialDate: kontDat!, initialDate: kontDat ?? DateTime.now(),
firstDate: DateTime(2000), firstDate: DateTime(2000),
lastDate: DateTime(5000)); lastDate: DateTime(5000));
if (date == null) return null;
setState(() => kontDat = date);
var place = {'KontDat': DateFormat('yyyy-MM-dd').format(kontDat!)}; return date;
await DBHelper().addPlace(place);
return kontDat;
} }
} }
// AbbauDat // AbbauDat
class AbbauDat extends StatefulWidget { class AbbauDat extends StatefulWidget {
final DateTime? abbauDat; final DateTime? initAbbauDat;
final Function(DateTime) onDateChanged;
const AbbauDat({super.key, required this.abbauDat}); const AbbauDat({super.key, required this.initAbbauDat, required this.onDateChanged});
@override @override
State<AbbauDat> createState() => _AbbauDatState(); State<AbbauDat> createState() => _AbbauDatState();
@@ -793,6 +800,12 @@ class AbbauDat extends StatefulWidget {
class _AbbauDatState extends State<AbbauDat> { class _AbbauDatState extends State<AbbauDat> {
DateTime? abbauDat; DateTime? abbauDat;
@override
void initState() {
super.initState();
abbauDat = widget.initAbbauDat;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Row( return Row(
@@ -805,6 +818,7 @@ class _AbbauDatState extends State<AbbauDat> {
final date = await pickDate(); final date = await pickDate();
if (date == null) return; if (date == null) return;
setState(() => abbauDat = date); setState(() => abbauDat = date);
widget.onDateChanged(date);
}, },
child: Text(AppLocalizations.of(context)!.pickabbaudat)), child: Text(AppLocalizations.of(context)!.pickabbaudat)),
), ),
@@ -841,7 +855,6 @@ class _AbbauDatState extends State<AbbauDat> {
firstDate: DateTime(2000), firstDate: DateTime(2000),
lastDate: DateTime(5000)); lastDate: DateTime(5000));
if (date == null) return null; if (date == null) return null;
setState(() => abbauDat = date);
return abbauDat; return abbauDat;
} }

4
lib/methods/http_request.dart
View File

@@ -32,11 +32,11 @@ class Methods {
// ignore: unused_catch_clause // ignore: unused_catch_clause
} on DioException catch (e) { } on DioException catch (e) {
_errorCode = response.statusCode; _errorCode = response.statusCode;
print('is hier. var: ${_errorCode}'); print('is hier. var: $_errorCode');
return; return;
} }
_errorCode = response.statusCode; _errorCode = response.statusCode;
print('is hier 2. var: ${_errorCode}'); print('is hier 2. var: $_errorCode');
} }
} }

1
time.txt
View File

@@ -52,3 +52,4 @@
30 apr 4h 15 min 30 apr 4h 15 min
1 mai 6h 1 mai 6h
8 mai 4h 30 min 8 mai 4h 30 min
9 mai 1h 20 min