diff --git a/lib/#main.dart# b/lib/#main.dart# index 0d83054..66fbc74 100644 --- a/lib/#main.dart# +++ b/lib/#main.dart# @@ -3,6 +3,7 @@ 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_de.arb b/lib/l10n/app_de.arb index 4722b96..b383548 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -104,5 +104,14 @@ "notest": "Kein Test", "dateandtime": "Datum und Zeit", "teilnehmer": "Teilnehmer", - "dauer": "Dauer" + "dauer": "Dauer hh:mm", + "bimaNr": "BIMA Nummer", + "bimaName": "BIMA Name", + "bimaNutzer": "BIMA Nutzer", + "bimaAGV": "BIMA AGV", + "bundeswehr": "Bundeswehr", + "gaststreitkraefte": "Gaststreitkräfte", + "nneBund": "NNE Bund", + "geschaeftsliegenschaftAGV": "Geschäftsliegenschaft/AGV", + "kein": "Kein" } \ No newline at end of file diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 58986ba..37b8ab9 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -509,10 +509,62 @@ "description": "teilnehmer text field" }, - "dauer": "Duration", + "dauer": "Duration hh:mm", "@dauer": { "description": "Duration text field" - } + }, + + "bimaNr": "BIMA Number", + "@bimaNr": { + "description": "BimaNr text field" + }, + +"bimaName": "BIMA Name", +"@bimaName": { +"description": "BimaName text field" +}, + +"bimaNutzer": "BIMA User", +"@bimaNutzer": { +"description": "BimaNutzer text field" +}, + +"bimaAGV": "BIMA AGV", +"@bimaAGV": { +"description": "BimaAGV text field" +}, + +"bundeswehr": "Bundeswehr", +"@bundeswehr": { +"description": "BIMA Bundeswehr radiobutton" +}, + +"gaststreitkraefte": "Gaststreitkraefte", +"@gaststreitkraefte": { +"description": "BIMA Gastreitkraefte radiobutton" +}, + +"nneBund": "NNE Bund", +"@nneBund": { +"description": "BIMA NNE Bund radiobutton" +}, + +"geschaeftsliegenschaftAGV": "Geschäftsliegenschaft/AGV", +"@geschaeftsliegenschaftAGV": { +"description": "BIMA Geschäftsliegenschaft/AGV radiobutton" +}, + +"kein": "None", +"@kein": { +"description": "BIMA kein radiobutton" +} + + + + + + + } \ No newline at end of file diff --git a/lib/screens/Excursion/excursion_main.dart b/lib/screens/Excursion/excursion_main.dart index be79898..ecb5830 100644 --- a/lib/screens/Excursion/excursion_main.dart +++ b/lib/screens/Excursion/excursion_main.dart @@ -1,4 +1,5 @@ import 'package:animations/animations.dart'; +import 'package:fforte/screens/Excursion/widgets/bima_nutzer.dart'; import 'package:fforte/screens/sharedWidgets/datum.dart'; import 'package:fforte/screens/sharedWidgets/var_text_field.dart'; import 'package:flutter/material.dart'; @@ -12,10 +13,8 @@ class ExcursionMain extends StatefulWidget { } class _ExcursionMainState extends State { - // erste überlegung: map mit textcontrollern und map mit rest. maybe später schauen, dass alles in die eine map und mit instanceoff (in dart version) checken + // alles TextEditingController - String datum = ''; - // dauer: nachfragen wie gespeichert werden soll und demnach felt machen. Vorerst eingaches Textfeld // TODO: // - Hund dabei u mit leine u fragen was dieses nein textfeld soll // - Input vorgabe fuer dauer feld @@ -25,15 +24,16 @@ class _ExcursionMainState extends State { "Rudel": TextEditingController(), "Teilnehm": TextEditingController(), "Jahr": TextEditingController(), - "Dauer_Stungen": TextEditingController(), + "Dauer": TextEditingController(), + "HundDabei": TextEditingController(), + "MitLeine": TextEditingController(), "BLand": TextEditingController(), "Lkr": TextEditingController(), "BeiOrt": TextEditingController(), "BimaNr": TextEditingController(), "BimaName": TextEditingController(), "BimaNutzer": TextEditingController(), - "BimAGV": TextEditingController(), - + "BimaAGV": TextEditingController(), }; return rmap; @@ -55,15 +55,83 @@ class _ExcursionMainState extends State { localization: AppLocalizations.of(context)!.rudel, dbName: "Rudel", required: false), - const SizedBox(height: 10,), + const SizedBox( + height: 10, + ), VarTextField( textController: getTextFields()["Teilnehm"]!, localization: AppLocalizations.of(context)!.teilnehmer, dbName: "Teilnehm", - required: false, + required: false, + ), + const SizedBox( + height: 10, + ), + VarTextField( + textController: getTextFields()["Dauer"]!, + localization: AppLocalizations.of(context)!.dauer, + dbName: "Dauer", + required: false), + const SizedBox( + height: 10, + ), + VarTextField( + textController: getTextFields()["BLand"]!, + localization: AppLocalizations.of(context)!.bland, + dbName: "BLand", + required: false), + const SizedBox( + height: 10, + ), + VarTextField( + textController: getTextFields()["Lkr"]!, + localization: AppLocalizations.of(context)!.lkr, + dbName: "Lkr", + required: false), + const SizedBox( + height: 10, ), - const SizedBox(height: 10,), - VarTextField(textController: getTextFields()["Dauer"]!, localization: AppLocalizations.of(context)!.dauer, dbName: "Dauer", required: false) + VarTextField( + textController: getTextFields()["BeiOrt"]!, + localization: AppLocalizations.of(context)!.beiort, + dbName: "BeiOrt", + required: false), + const SizedBox( + height: 10, + ), + const Divider(), + const SizedBox( + height: 10, + ), + VarTextField( + textController: getTextFields()["BimaNr"]!, + localization: AppLocalizations.of(context)!.bimaNr, + dbName: "BimaNr", + required: false), + const SizedBox( + height: 10, + ), + VarTextField( + textController: getTextFields()["BimaName"]!, + localization: AppLocalizations.of(context)!.bimaName, + dbName: "BimaName", + required: false), + const SizedBox( + height: 10, + ), + BimaNutzer(onBimaNutzerChanged: (value) { + setState(() { + getTextFields()["BimaNutzer"]!.text = value; + }); + }), + const SizedBox( + height: 10, + ), + VarTextField( + textController: getTextFields()["BimaAGV"]!, + localization: AppLocalizations.of(context)!.bimaAGV, + dbName: "BimaAGV", + required: false) ], )), const Step(title: Text("step2"), content: Text("data")) diff --git a/time.txt b/time.txt index c85cfe1..93bf63f 100644 --- a/time.txt +++ b/time.txt @@ -62,3 +62,4 @@ 22 nov 2h 1 dez 1h 22 dez 2h +23 dez 2h 15min