diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index 8d83a49..4722b96 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -102,5 +102,7 @@ "loading": "Lädt", "test": "Test", "notest": "Kein Test", - "dateandtime": "Datum und Zeit" + "dateandtime": "Datum und Zeit", + "teilnehmer": "Teilnehmer", + "dauer": "Dauer" } \ No newline at end of file diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 85db2f9..58986ba 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -502,8 +502,17 @@ "dateandtime": "Date and Time", "@dateandtime": { "description": "date and time step header" - } + }, + "teilnehmer": "Participants", + "@teilnehmer": { + "description": "teilnehmer text field" + }, + + "dauer": "Duration", + "@dauer": { + "description": "Duration text field" + } } \ No newline at end of file diff --git a/lib/screens/Excursion/excursion_main.dart b/lib/screens/Excursion/excursion_main.dart index 77fb667..be79898 100644 --- a/lib/screens/Excursion/excursion_main.dart +++ b/lib/screens/Excursion/excursion_main.dart @@ -4,29 +4,41 @@ import 'package:fforte/screens/sharedWidgets/var_text_field.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; - class ExcursionMain extends StatefulWidget { const ExcursionMain({super.key}); @override State createState() => _ExcursionMainState(); } -class _ExcursionMainState extends State { +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 - - TextEditingController rudel = 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 Map getTextFields() { - Map rmap = { - "Rudel": rudel, - }; + Map rmap = { + "Rudel": TextEditingController(), + "Teilnehm": TextEditingController(), + "Jahr": TextEditingController(), + "Dauer_Stungen": TextEditingController(), + "BLand": TextEditingController(), + "Lkr": TextEditingController(), + "BeiOrt": TextEditingController(), + "BimaNr": TextEditingController(), + "BimaName": TextEditingController(), + "BimaNutzer": TextEditingController(), + "BimAGV": TextEditingController(), + + }; - return rmap; + return rmap; } - - @override Widget build(BuildContext context) { List getSteps() => [ @@ -34,20 +46,29 @@ class _ExcursionMainState extends State { title: Text(AppLocalizations.of(context)!.dateandtime), content: Column( children: [ - Datum(initDatum: DateTime.now(), - onDateChanged: (date) { - - }), + Datum(initDatum: DateTime.now(), onDateChanged: (date) {}), + const SizedBox( + height: 10, + ), + VarTextField( + textController: getTextFields()["Rudel"]!, + localization: AppLocalizations.of(context)!.rudel, + dbName: "Rudel", + required: false), + const SizedBox(height: 10,), + VarTextField( + textController: getTextFields()["Teilnehm"]!, + localization: AppLocalizations.of(context)!.teilnehmer, + dbName: "Teilnehm", + required: false, + ), const SizedBox(height: 10,), - VarTextField(textController: getTextFields()["Rudel"]!, localization: AppLocalizations.of(context)!.rudel, dbName: "Rudel", required: true) + VarTextField(textController: getTextFields()["Dauer"]!, localization: AppLocalizations.of(context)!.dauer, dbName: "Dauer", required: false) ], )), const Step(title: Text("step2"), content: Text("data")) ]; - - - int currentStep = 0; return Scaffold( diff --git a/time.txt b/time.txt index dc25110..c85cfe1 100644 --- a/time.txt +++ b/time.txt @@ -61,3 +61,4 @@ 20 nov 1h 30min 22 nov 2h 1 dez 1h +22 dez 2h