fixed alignment in anzahlen, added and finished 3rd step created hinweise widget, removed domain, changed letzter_niederschlag.dart to Dropdown

time

lib/screens/Excursion/excursion_main.dart

@@ -1,6 +1,7 @@
 import 'package:animations/animations.dart';
-import 'package:fforte/screens/Excursion/widgets/anzahlen.dart~';
+import 'package:fforte/screens/Excursion/widgets/anzahlen.dart';
 import 'package:fforte/screens/Excursion/widgets/bima_nutzer.dart';
+import 'package:fforte/screens/Excursion/widgets/hinweise.dart';
 import 'package:fforte/screens/Excursion/widgets/hund_u_leine.dart';
 import 'package:fforte/screens/Excursion/widgets/letzter_niederschlag.dart';
 import 'package:fforte/screens/Excursion/widgets/spur_gefunden.dart';
@@ -10,8 +11,6 @@ import 'package:fforte/screens/sharedWidgets/var_text_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-import 'widgets/anzahlen.dart';
-
 class ExcursionMain extends StatefulWidget {
   const ExcursionMain({super.key});
 
@@ -90,8 +89,7 @@ class _ExcursionMainState extends State<ExcursionMain> {
 
   @override
   Widget build(BuildContext context) {
-    List<Step> getSteps() =>
+    List<Step> getSteps() => [
-        [
           Step(
               title: Text(AppLocalizations.of(context)!.dateandtime),
               content: Column(
@@ -200,50 +198,82 @@ class _ExcursionMainState extends State<ExcursionMain> {
                       required: false)
                 ],
               )),
-
+          Step(
+            title: const Text("step2"),
+            content: Column(
+              children: [
+                VarTextField(
+                    textController: getTextFields()["Wetter"]!,
+                    localization: "Wetter",
+                    dbName: "Wetter",
+                    required: false),
+                const SizedBox(height: 10),
+                VarTextField(
+                    textController: getTextFields()["Temperat"]!,
+                    localization: "Temperatur",
+                    dbName: "Temperat",
+                    required: false),
+                const SizedBox(height: 10),
+                LetzterNiederschlag(controller: getTextFields()["RegenVor"]!),
+                const SizedBox(height: 20),
+                StreckeUSpurbedingungen(
+                  kmAutoController: getTextFields()["KmAuto"]!,
+                  kmFussController: getTextFields()["KmFuss"]!,
+                  kmRadController: getTextFields()["KmRad"]!,
+                  spGutController: getTextFields()["SpGut"]!,
+                  spMittelController: getTextFields()["SpMittel"]!,
+                  spSchlechtController: getTextFields()["SpSchlecht"]!,
+                ),
+                const SizedBox(
+                  height: 20,
+                ),
+                const Divider(),
+                SpurGefunden(
+                    spurFund: getTextFields()["SpurFund"]!,
+                    spurLang: getTextFields()["SpurLang"]!,
+                    spurTiere: getTextFields()["SpurTiere"]!,
+                    spSicher: getTextFields()["SpSicher"]!,
+                    welpenSp: getTextFields()["WelpenSp"]!,
+                    welpenAnz: getTextFields()["WelpenAnz"]!,
+                    wpSicher: getTextFields()["WpSicher"]!),
+                const SizedBox(
+                  height: 20,
+                ),
+                Anzahlen(
+                  losungAnz: getTextFields()["LosungAnz"]!,
+                  losungGes: getTextFields()["LosungGes"]!,
+                  losungGen: getTextFields()["LosungGen"]!,
+                  urinAnz: getTextFields()["UrinAnz"]!,
+                  urinGen: getTextFields()["UrinGen"]!,
+                  oestrAnz: getTextFields()["OestrAnz"]!,
+                  oestrGen: getTextFields()["OestrGen"]!,
+                  haarAnz: getTextFields()["HaarAnz"]!,
+                  haarGen: getTextFields()["HaarGen"]!,
+                ),
+                const SizedBox(
+                  height: 20,
+                ),
+                Hinweise(),
+              ],
+            ),
+          ),
 
           Step(
-              title: const Text("step2"),
+            title: const Text("step3"),
-              content: Column(
+            content: Column(
-                children: [
+              children: [
-                  VarTextField(
+                VarTextField(textController: getTextFields()["Bemerk"]!,
-                      textController: getTextFields()["Wetter"]!,
+                    localization: "Bemerkungen",
-                      localization: "Wetter",
+                    dbName: "Bemerk",
-                      dbName: "Wetter",
+                    required: false),
-                      required: false),
-                  const SizedBox(height: 10),
-                  VarTextField(
-                      textController: getTextFields()["Temperat"]!,
-                      localization: "Temperatur",
-                      dbName: "Temperat",
-                      required: false),
-                  const SizedBox(height: 10),
-                  LetzterNiederschlag(controller: getTextFields()["RegenVor"]!),
-                  const SizedBox(height: 20),
-                  StreckeUSpurbedingungen(
-                    kmAutoController: getTextFields()["KmAuto"]!,
-                    kmFussController: getTextFields()["KmFuss"]!,
-                    kmRadController: getTextFields()["KmRad"]!,
-                    spGutController: getTextFields()["SpGut"]!,
-                    spMittelController: getTextFields()["SpMittel"]!,
-                    spSchlechtController: getTextFields()["SpSchlecht"]!,
-                  ),
-                  const SizedBox(height: 20,),
-                  const Divider(),
-                  SpurGefunden(
-                      spurFund: getTextFields()["SpurFund"]!,
-                      spurLang: getTextFields()["SpurLang"]!,
-                      spurTiere: getTextFields()["SpurTiere"]!,
-                      spSicher: getTextFields()["SpSicher"]!,
-                      welpenSp: getTextFields()["WelpenSp"]!,
-                      welpenAnz: getTextFields()["WelpenAnz"]!,
-                      wpSicher: getTextFields()["WpSicher"]!),
 
-                  const SizedBox(height: 20,),
+                const SizedBox(height: 20,),
-                  Anzahlen()
+                VarTextField(textController: getTextFields()["IntKomm"]!,
-
+                    localization: "Interne Kommunikation",
-                ],
+                    dbName: "IntKomm", required: false),
-              ))
+              ],
+            ),
+          ),
         ];
 
     return Scaffold(

lib/screens/Excursion/widgets/anzahlen.dart

@@ -1,7 +1,27 @@
 import 'package:flutter/material.dart';
 
 class Anzahlen extends StatefulWidget {
-  const Anzahlen({super.key});
+  final TextEditingController losungAnz;
+  final TextEditingController losungGes;
+  final TextEditingController losungGen;
+  final TextEditingController urinAnz;
+  final TextEditingController urinGen;
+  final TextEditingController oestrAnz;
+  final TextEditingController oestrGen;
+  final TextEditingController haarAnz;
+  final TextEditingController haarGen;
+
+  const Anzahlen(
+      {super.key,
+      required this.losungAnz,
+      required this.losungGes,
+      required this.losungGen,
+      required this.urinAnz,
+      required this.urinGen,
+      required this.oestrAnz,
+      required this.oestrGen,
+      required this.haarAnz,
+      required this.haarGen});
 
   @override
   AnzahlenState createState() => AnzahlenState();
@@ -41,7 +61,7 @@ class AnzahlenState extends State<Anzahlen> {
                       child: Align(
                           alignment: Alignment.bottomLeft,
                           child: Text(
-                            "daven eingesammelt",
+                            "davon eingesammelt",
                           )),
                     ),
                     const SizedBox(
@@ -57,13 +77,14 @@ class AnzahlenState extends State<Anzahlen> {
                   ],
                 ),
                 Row(
+                  crossAxisAlignment: CrossAxisAlignment.end,
                   children: [
                     Expanded(
                       flex: 6,
                       child: Align(
                         alignment: Alignment.bottomLeft,
                         child: Text(
-                          "daven Genetikproben",
+                          "davon Genetikproben",
                         ),
                       ),
                     ),
@@ -76,9 +97,9 @@ class AnzahlenState extends State<Anzahlen> {
                     ),
                   ],
                 ),
-
+                const Divider(
-                const Divider(height: 40,),
+                  height: 40,
-
+                ),
                 Row(
                   children: [
                     Expanded(
@@ -104,7 +125,7 @@ class AnzahlenState extends State<Anzahlen> {
                       child: Align(
                           alignment: Alignment.bottomLeft,
                           child: Text(
-                            "daven Genetikproben",
+                            "davon Genetikproben",
                           )),
                     ),
                     const SizedBox(
@@ -119,9 +140,9 @@ class AnzahlenState extends State<Anzahlen> {
                     ),
                   ],
                 ),
-
+                const Divider(
-                const Divider(height: 40,),
+                  height: 40,
-
+                ),
                 Row(
                   children: [
                     Expanded(
@@ -147,7 +168,7 @@ class AnzahlenState extends State<Anzahlen> {
                       child: Align(
                           alignment: Alignment.bottomLeft,
                           child: Text(
-                            "daven Genetikproben",
+                            "davon Genetikproben",
                           )),
                     ),
                     const SizedBox(
@@ -162,9 +183,9 @@ class AnzahlenState extends State<Anzahlen> {
                     ),
                   ],
                 ),
-
+                const Divider(
-                const Divider(height: 40,),
+                  height: 40,
-
+                ),
                 Row(
                   children: [
                     Expanded(
@@ -190,7 +211,7 @@ class AnzahlenState extends State<Anzahlen> {
                       child: Align(
                           alignment: Alignment.bottomLeft,
                           child: Text(
-                            "daven Genetikproben",
+                            "davon Genetikproben",
                           )),
                     ),
                     const SizedBox(

lib/screens/Excursion/widgets/hinweise.dart

@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+
+class Hinweise extends StatefulWidget {
+  const Hinweise({super.key});
+
+  @override
+  State<Hinweise> createState() => _HinweiseState();
+}
+
+class _HinweiseState extends State<Hinweise> {
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+        height: 30,
+        child: const Placeholder());
+
+  }
+}

lib/screens/Excursion/widgets/letzter_niederschlag.dart

@@ -11,34 +11,47 @@ class LetzterNiederschlag extends StatefulWidget {
 }
 
 class LetzterNiederschlagState extends State<LetzterNiederschlag> {
+  String? selectedValue; // Variable für den ausgewählten Wert
   @override
   Widget build(BuildContext context) {
-    return DropdownMenu<String>(
+    return DropdownButton<String>(
-      controller: widget.controller,
+      isExpanded: true,
-      label: Text(AppLocalizations.of(context)!.letzterNiederschlag),
+      value: selectedValue,
-      requestFocusOnTap: true,
+      hint: Text(AppLocalizations.of(context)!.letzterNiederschlag),
-      dropdownMenuEntries: [
+      onChanged: (String? newValue) {
-        DropdownMenuEntry(
+        setState(() {
-            value: "aktuell",
+          selectedValue = newValue; // Aktualisiere den ausgewählten Wert
-            label: AppLocalizations.of(context)!.aktuell),
+        });
-        DropdownMenuEntry(
+      },
-            value: "selberMorgen",
+      items: [
-            label: AppLocalizations.of(context)!.selberMorgen),
+        DropdownMenuItem<String>(
-        DropdownMenuEntry(
+          value: "aktuell",
-            value: "nacht",
+          child: Text(AppLocalizations.of(context)!.aktuell),
-            label: AppLocalizations.of(context)!.nacht),
+        ),
-        DropdownMenuEntry(
+        DropdownMenuItem<String>(
-            value: "vortag",
+          value: "selberMorgen",
-            label: AppLocalizations.of(context)!.vortag),
+          child: Text(AppLocalizations.of(context)!.selberMorgen),
-        DropdownMenuEntry(
+        ),
-            value: "vor23Tagen",
+        DropdownMenuItem<String>(
-            label: AppLocalizations.of(context)!.vor23Tagen),
+          value: "nacht",
-        DropdownMenuEntry(
+          child: Text(AppLocalizations.of(context)!.nacht),
-            value: "vor46Tagen",
+        ),
-            label: AppLocalizations.of(context)!.vor46Tagen),
+        DropdownMenuItem<String>(
-        DropdownMenuEntry(
+          value: "vortag",
-            value: "vor1Woche",
+          child: Text(AppLocalizations.of(context)!.vortag),
-            label: AppLocalizations.of(context)!.vor1Woche)
+        ),
+        DropdownMenuItem<String>(
+          value: "vor23Tagen",
+          child: Text(AppLocalizations.of(context)!.vor23Tagen),
+        ),
+        DropdownMenuItem<String>(
+          value: "vor46Tagen",
+          child: Text(AppLocalizations.of(context)!.vor46Tagen),
+        ),
+        DropdownMenuItem<String>(
+          value: "vor1Woche",
+          child: Text(AppLocalizations.of(context)!.vor1Woche),
+        ),
       ],
     );
   }

lib/screens/intro_screen.dart

@@ -187,7 +187,7 @@ class _IntroScreenState extends State<IntroScreen> {
                                   child:
                                       Text(AppLocalizations.of(context)!.test)),
                               PopupMenuItem(
-                                  value: "https://data.dbb-wolf.de/app24.php",
+                                  value: "...",
                                   child: Text(
                                       AppLocalizations.of(context)!.notest))
                             ],

time.txt

@@ -71,3 +71,4 @@
 17 feb 30min
 24 feb 2h 45min
 25 feb 1h 30min
+17 mär 2h 30min