From 9e9de5cc9cbc71e764f3890247271b8fd546b3eb Mon Sep 17 00:00:00 2001
From: Nico <nicovessen@gmail.com>
Date: Thu, 9 Jan 2025 23:47:15 +0100
Subject: [PATCH] merge

---
 ...24_11_15.csv => exkursion_2024_11_15.xlsx} |   0
 lib/screens/Excursion/excursion_main.dart     | 112 ++----------------
 2 files changed, 8 insertions(+), 104 deletions(-)
 rename fforte_data/{exkursion_2024_11_15.csv => exkursion_2024_11_15.xlsx} (100%)

diff --git a/fforte_data/exkursion_2024_11_15.csv b/fforte_data/exkursion_2024_11_15.xlsx
similarity index 100%
rename from fforte_data/exkursion_2024_11_15.csv
rename to fforte_data/exkursion_2024_11_15.xlsx
diff --git a/lib/screens/Excursion/excursion_main.dart b/lib/screens/Excursion/excursion_main.dart
index 31873a0..7cdb2c6 100644
--- a/lib/screens/Excursion/excursion_main.dart
+++ b/lib/screens/Excursion/excursion_main.dart
@@ -1,9 +1,6 @@
 import 'package:animations/animations.dart';
-import 'package:fforte/screens/Excursion/widgets/bima_nutzer.dart';
-import 'package:fforte/screens/Excursion/widgets/hund_u_leine.dart';
-import 'package:fforte/screens/Excursion/widgets/letzter_niederschlag.dart~';
 import 'package:fforte/screens/sharedWidgets/datum.dart';
-import 'package:fforte/screens/sharedWidgets/var_text_field.dart';
+/import 'package:fforte/screens/sharedWidgets/var_text_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
@@ -90,108 +87,15 @@ class _ExcursionMainState extends State<ExcursionMain> {
               title: Text(AppLocalizations.of(context)!.dateandtime),
               content: Column(
                 children: [
-                  Datum(
-                    initDatum: DateTime.now(),
+                  // Datum feld
+                  Datum(initDatum: DateTime.now(),
                     onDateChanged: (date) {
-                      getTextFields()["LogDat"]!.text = date.toString();
-                    },
-                    name: AppLocalizations.of(context)!.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()["Dauer"]!,
-                      localization: AppLocalizations.of(context)!.dauer,
-                      dbName: "Dauer",
-                      required: false),
-                  const SizedBox(
-                    height: 10,
-                  ),
-                  HundULeine(onMHundChanged: (mHund, mLeine) {
-                    getTextFields()["MHund"]!.text = mHund;
-                    getTextFields()["MLeine"]!.text = mLeine;
+                     
+                  }),
 
-                    // print(mHund);
-                    // print(mLeine);
-                  }),
-                  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,
-                  ),
-                  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)
+                  // Terretorium
+                  const SizedBox(height: 10,),
+                  VarTextField(textController: getTextFields()["Rudel"]!, localization: localization, dbName: dbName, required: required)
                 ],
               )),