diff --git a/lib/addCam/add_cam_main.dart b/lib/addCam/add_cam_main.dart index 7c9cfee..6588467 100644 --- a/lib/addCam/add_cam_main.dart +++ b/lib/addCam/add_cam_main.dart @@ -644,8 +644,6 @@ class _AddCamMainState extends State { height: 20, ), AbbauDat(abbauDat: abbauDat), - AusVon(ausVon: ausVon), - AusBis(ausBis: ausBis), const SizedBox( height: 20, ), diff --git a/lib/addCam/cam_widgets.dart b/lib/addCam/cam_widgets.dart index e5f9d91..5b1fdac 100644 --- a/lib/addCam/cam_widgets.dart +++ b/lib/addCam/cam_widgets.dart @@ -2270,127 +2270,6 @@ class _StandortState extends State { ); } -// AusVon - -class AusVon extends StatefulWidget { - final DateTime? ausVon; - - const AusVon({super.key, required this.ausVon}); - - @override - State createState() => _AusVonState(); -} - -class _AusVonState extends State { - DateTime? ausVon; - - @override - Widget build(BuildContext context) { - return Row( - children: [ - Row(children: [ - SizedBox( - width: 125, - child: ElevatedButton( - onPressed: () async { - final date = await pickDate(); - if (date == null) return; - setState(() => ausVon = date); - }, - child: Text(AppLocalizations.of(context)!.ausvon)), - ), - const SizedBox( - width: 10, - ), - Builder(builder: (context) { - if (ausVon != null) { - return Text('${ausVon?.day}. ${ausVon?.month}. ${ausVon?.year}'); - } else { - return Text(AppLocalizations.of(context)!.nichts); - } - }), - ]), - ], - ); - } - - Future pickDate() async { - final date = await showDatePicker( - context: context, - initialDate: ausVon, - firstDate: DateTime(2000), - lastDate: DateTime(5000)); - if (date == null) return null; - setState(() => ausVon = date); - - var place = {'AusVon': DateFormat('yyyy-MM-dd').format(ausVon!)}; - - await DBHelper().addPlace(place); - - return ausVon; - } -} - -// AusBis - -class AusBis extends StatefulWidget { - final DateTime? ausBis; - - const AusBis({super.key, required this.ausBis}); - - @override - State createState() => _AusBisState(); -} - -class _AusBisState extends State { - DateTime? ausBis; - - @override - Widget build(BuildContext context) { - return Row( - children: [ - Row(children: [ - SizedBox( - width: 125, - child: ElevatedButton( - onPressed: () async { - final date = await pickDate(); - if (date == null) return; - setState(() => ausBis = date); - }, - child: Text(AppLocalizations.of(context)!.ausbis)), - ), - const SizedBox( - width: 10, - ), - Builder(builder: (context) { - if (ausBis != null) { - return Text('${ausBis?.day}. ${ausBis?.month}. ${ausBis?.year}'); - } else { - return Text(AppLocalizations.of(context)!.nichts); - } - }), - ]), - ], - ); - } - - Future pickDate() async { - final date = await showDatePicker( - context: context, - initialDate: ausBis, - firstDate: DateTime(2000), - lastDate: DateTime(5000)); - if (date == null) return null; - setState(() => ausBis = date); - - var place = {'ausBis': DateFormat('yyyy-MM-dd').format(ausBis!)}; - - await DBHelper().addPlace(place); - - return ausBis; - } -} // KTage1 diff --git a/lib/db_helper.dart b/lib/db_helper.dart index 660ba53..5983dd2 100644 --- a/lib/db_helper.dart +++ b/lib/db_helper.dart @@ -31,9 +31,9 @@ class DBHelper { // The function that helps _onCreatePlace(Database placeDB, int version) async { await placeDB.execute( - 'CREATE TABLE place (id INTEGER PRIMARY KEY, CID TEXT UNIQUE, Standort TEXT, Rudel TEXT, Datum DATE, Adresse1 TEXT, Adresse2 TEXT, Adresse3 TEXT, BLand TEXT, Lkr TEXT, BeiOrt TEXT, OrtInfo TEXT, Status TEXT, STTyp TEXT, FFTyp TEXT, FotoFilm TEXT, MEZ TEXT, Platzung TEXT, KSchloNr TEXT, Bearsafe TEXT, KontDat DATE, Betreuung TEXT, AbbauDat DATE, Auftrag TEXT, KontAbsp TEXT, SonstBem TEXT, FKontakt1 TEXT, FKontakt2 TEXT, FKontakt3 TEXT, AusVon DATE, AusBis DATE, KTage1 INTEGER, KTage2 INTEGER, ProtoAm DATE, IntKomm TEXT, DECLNG DECIMALS(4,8), DECLAT DECIMALS(4,8), Sent INTEGER DEFAULT 0)'); + 'CREATE TABLE place (id INTEGER PRIMARY KEY, CID TEXT UNIQUE, Standort TEXT, Rudel TEXT, Datum DATE, Adresse1 TEXT, Adresse2 TEXT, Adresse3 TEXT, BLand TEXT, Lkr TEXT, BeiOrt TEXT, OrtInfo TEXT, Status TEXT, STTyp TEXT, FFTyp TEXT, FotoFilm TEXT, MEZ TEXT, Platzung TEXT, KSchloNr TEXT, Bearsafe 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), Sent INTEGER DEFAULT 0)'); await placeDB.execute( - 'CREATE TABLE templates (id INTEGER PRIMARY KEY, CID TEXT UNIQUE, Standort TEXT, Rudel TEXT, Datum DATE, Adresse1 TEXT, Adresse2 TEXT, Adresse3 TEXT, BLand TEXT, Lkr TEXT, BeiOrt TEXT, OrtInfo TEXT, Status TEXT, STTyp TEXT, FFTyp TEXT, FotoFilm TEXT, MEZ TEXT, Platzung TEXT, KSchloNr TEXT, Bearsafe TEXT, KontDat DATE, Betreuung TEXT, AbbauDat DATE, Auftrag TEXT, KontAbsp TEXT, SonstBem TEXT, FKontakt1 TEXT, FKontakt2 TEXT, FKontakt3 TEXT, AusVon DATE, AusBis DATE, KTage1 INTEGER, KTage2 INTEGER, ProtoAm DATE, IntKomm TEXT, DECLNG DECIMALS(4,8), DECLAT DECIMALS(4,8))'); + 'CREATE TABLE templates (id INTEGER PRIMARY KEY, CID TEXT UNIQUE, Standort TEXT, Rudel TEXT, Datum DATE, Adresse1 TEXT, Adresse2 TEXT, Adresse3 TEXT, BLand TEXT, Lkr TEXT, BeiOrt TEXT, OrtInfo TEXT, Status TEXT, STTyp TEXT, FFTyp TEXT, FotoFilm TEXT, MEZ TEXT, Platzung TEXT, KSchloNr TEXT, Bearsafe 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))'); } diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index fa561b3..c6e2595 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -51,9 +51,7 @@ "hofgarten": "Hof/Garten", "altstort": "Standort", "wiesefeld": "Wiese/Feld/Offenfläche", - "ausvon": "Ausfall von", "nichts": "---", - "ausbis": "Ausfall bis", "ktage1": "Kontrollintervall (Tage 1)", "ktage2": "Kontrollintervall (Tage 2)", "eugrid": "EUGrid", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 4fe0889..94647ea 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -242,21 +242,11 @@ "description": "altstort textfield" }, - "ausvon": "Off from", - "@ausvon": { - "description": "ausvon button" - }, - "nichts": "None", "@nichts": { "description": "nichts text" }, - "ausbis": "Off till", - "@ausbis": { - "description": "ausbis button" - }, - "ktage1": "KDays 1", "@ktage1": { "description": "ktage1 text/number field" diff --git a/lib/viewCam/view_cams.dart b/lib/viewCam/view_cams.dart index 8289dd0..0520c34 100644 --- a/lib/viewCam/view_cams.dart +++ b/lib/viewCam/view_cams.dart @@ -194,10 +194,6 @@ class _ViewCamsState extends State { '${AppLocalizations.of(context)!.pickkontdat}: ${place['KontDat']}'), Text( '${AppLocalizations.of(context)!.pickabbaudat}: ${place['AbbauDat']}'), - Text( - '${AppLocalizations.of(context)!.ausvon}: ${place['AusVon']}'), - Text( - '${AppLocalizations.of(context)!.ausbis}: ${place['AusBis']}'), Text( '${AppLocalizations.of(context)!.sommerzeit}: ${place['MEZ']}'), Text(