nico/fforte
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commented and aligned text for cog

Browse Source
This commit is contained in:
Nico
2025-05-05 20:52:41 +02:00
parent 55b3c7df14
commit 522d9885f6
2 changed files with 323 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

618
lib/screens/Excursion/excursion_main.dart
View File

@@ -24,64 +24,64 @@ class _ExcursionMainState extends State<ExcursionMain> {
Map<String, TextEditingController> getTextFields() { Map<String, TextEditingController> getTextFields() {
Map<String, TextEditingController> rmap = { Map<String, TextEditingController> rmap = {
// Step 1 // Step 1
"LogDat": TextEditingController(), "LogDat": TextEditingController(),
"Rudel": TextEditingController(), "Rudel": TextEditingController(),
"Teilnehm": TextEditingController(), "Teilnehm": TextEditingController(),
"Jahr": TextEditingController(), "Jahr": TextEditingController(),
"Dauer": TextEditingController(), "Dauer": TextEditingController(),
"MHund": TextEditingController(), "MHund": TextEditingController(),
"MLeine": TextEditingController(), "MLeine": TextEditingController(),
"BLand": TextEditingController(), "BLand": TextEditingController(),
"Lkr": TextEditingController(), "Lkr": TextEditingController(),
"BeiOrt": TextEditingController(), "BeiOrt": TextEditingController(),
"BimaNr": TextEditingController(), "BimaNr": TextEditingController(),
"BimaName": TextEditingController(), "BimaName": TextEditingController(),
"BimaNutzer": TextEditingController(), "BimaNutzer": TextEditingController(),
"BimaAGV": TextEditingController(), "BimaAGV": TextEditingController(),
// Step 2 // Step 2
"Wetter": TextEditingController(), "Wetter": TextEditingController(),
"Temperat": TextEditingController(), "Temperat": TextEditingController(),
"RegenVor": TextEditingController(), "RegenVor": TextEditingController(),
"KmAuto": TextEditingController(), "KmAuto": TextEditingController(),
"KmFuss": TextEditingController(), "KmFuss": TextEditingController(),
"KmRad": TextEditingController(), "KmRad": TextEditingController(),
"KmTotal": TextEditingController(), "KmTotal": TextEditingController(),
"KmAuProz": TextEditingController(), "KmAuProz": TextEditingController(),
"KmFuProz": TextEditingController(), "KmFuProz": TextEditingController(),
"KmRaProz": TextEditingController(), "KmRaProz": TextEditingController(),
// Spur maybe own step? // Spur maybe own step?
"SpGut": TextEditingController(), "SpGut": TextEditingController(),
"SpMittel": TextEditingController(), "SpMittel": TextEditingController(),
"SpSchlecht": TextEditingController(), "SpSchlecht": TextEditingController(),
"SpurFund": TextEditingController(), "SpurFund": TextEditingController(),
"SpurLang": TextEditingController(), "SpurLang": TextEditingController(),
"SpurTiere": TextEditingController(), "SpurTiere": TextEditingController(),
"SpSicher": TextEditingController(), "SpSicher": TextEditingController(),
"WelpenSp": TextEditingController(), "WelpenSp": TextEditingController(),
"WelpenAnz": TextEditingController(), "WelpenAnz": TextEditingController(),
"WpSicher": TextEditingController(), "WpSicher": TextEditingController(),
"LosungGes": TextEditingController(), "LosungGes": TextEditingController(),
"LosungAnz": TextEditingController(), "LosungAnz": TextEditingController(),
"LosungGen": TextEditingController(), "LosungGen": TextEditingController(),
"UrinAnz": TextEditingController(), "UrinAnz": TextEditingController(),
"UrinGen": TextEditingController(), "UrinGen": TextEditingController(),
"OestrAnz": TextEditingController(), "OestrAnz": TextEditingController(),
"OestrGen": TextEditingController(), "OestrGen": TextEditingController(),
"HaarAnz": TextEditingController(), "HaarAnz": TextEditingController(),
"HaarGen": TextEditingController(), "HaarGen": TextEditingController(),
"LosungKm": TextEditingController(), "LosungKm": TextEditingController(),
"GenetiKm": TextEditingController(), "GenetiKm": TextEditingController(),
"Hinweise": TextEditingController(), "Hinweise": TextEditingController(),
// Step 3 // Step 3
"Bemerk": TextEditingController(), "Bemerk": TextEditingController(),
"IntKomm": TextEditingController(), "IntKomm": TextEditingController(),
"FallNum": TextEditingController(), "FallNum": TextEditingController(),
}; };
return rmap; return rmap;
} }
@@ -91,265 +91,287 @@ class _ExcursionMainState extends State<ExcursionMain> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<Step> getSteps() => [ List<Step> getSteps() => [
Step( Step(
title: Text(AppLocalizations.of(context)!.dateandtime), title: Text(AppLocalizations.of(context)!.dateandtime),
content: Column( content: Column(
children: [ children: [
Datum( // ---------- Date
initDatum: DateTime.now(), Datum(
onDateChanged: (date) { initDatum: DateTime.now(),
getTextFields()["LogDat"]!.text = date.toString(); onDateChanged: (date) {
}, getTextFields()["LogDat"]!.text = date.toString();
name: AppLocalizations.of(context)!.date, },
name: AppLocalizations.of(context)!.date,
),
const SizedBox(
height: 10,
),
// ---------- Pack
VarTextField(
textController: getTextFields()["Rudel"]!,
localization: AppLocalizations.of(context)!.rudel,
dbName: "Rudel",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
// ---------- Participants
VarTextField(
textController: getTextFields()["Teilnehm"]!,
localization: AppLocalizations.of(context)!.teilnehmer,
dbName: "Teilnehm",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
// ---------- Duration
VarTextField(
textController: getTextFields()["Dauer"]!,
localization: AppLocalizations.of(context)!.dauer,
dbName: "Dauer",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
// ---------- Dog(leash)
HundULeine(onMHundChanged: (mHund, mLeine) {
getTextFields()["MHund"]!.text = mHund;
getTextFields()["MLeine"]!.text = mLeine;
}),
const SizedBox(
height: 10,
),
// ---------- State
VarTextField(
textController: getTextFields()["BLand"]!,
localization: AppLocalizations.of(context)!.bland,
dbName: "BLand",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
// ---------- Country
VarTextField(
textController: getTextFields()["Lkr"]!,
localization: AppLocalizations.of(context)!.lkr,
dbName: "Lkr",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
// ---------- By State
VarTextField(
textController: getTextFields()["BeiOrt"]!,
localization: AppLocalizations.of(context)!.beiort,
dbName: "BeiOrt",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
// ---------- Bima number
const Divider(),
const SizedBox(
height: 10,
),
VarTextField(
textController: getTextFields()["BimaNr"]!,
localization: AppLocalizations.of(context)!.bimaNr,
dbName: "BimaNr",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
// ---------- Bima name
VarTextField(
textController: getTextFields()["BimaName"]!,
localization: AppLocalizations.of(context)!.bimaName,
dbName: "BimaName",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
// ---------- Bima user
BimaNutzer(onBimaNutzerChanged: (value) {
setState(() {
getTextFields()["BimaNutzer"]!.text = value;
});
}),
const SizedBox(
height: 10,
),
// ---------- Bima AGV
VarTextField(
textController: getTextFields()["BimaAGV"]!,
localization: AppLocalizations.of(context)!.bimaAGV,
dbName: "BimaAGV",
required: false,
dbDesignation: DatabasesEnum.excursion,
)
],
)),
Step(
title: const Text("step2"),
content: Column(
children: [
// ---------- Weather
// TODO CHANGE TO LOCALIZATION
VarTextField(
textController: getTextFields()["Wetter"]!,
localization: "Wetter",
dbName: "Wetter",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(height: 10),
// ---------- Temperature
VarTextField(
textController: getTextFields()["Temperat"]!,
localization: "Temperatur",
dbName: "Temperat",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(height: 10),
// ---------- Last precipitation
LetzterNiederschlag(controller: getTextFields()["RegenVor"]!),
const SizedBox(height: 20),
// ---------- Track conditions
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(),
// ---------- Track found
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,
),
// ---------- Counts
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,
),
const Divider(),
// ---------- Clues
// TODO Add title
Hinweise(
hinweise: getTextFields()["Hinweise"]!,
),
],
), ),
const SizedBox( ),
height: 10, Step(
title: const Text("step3"),
content: Column(
children: [
// ---------- Remarks
VarTextField(
textController: getTextFields()["Bemerk"]!,
localization: "Bemerkungen",
dbName: "Bemerk",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 20,
),
// ---------- Internal communication
VarTextField(
textController: getTextFields()["IntKomm"]!,
localization: "Interne Kommunikation",
dbName: "IntKomm",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
],
), ),
VarTextField( ),
textController: getTextFields()["Rudel"]!, ];
localization: AppLocalizations.of(context)!.rudel,
dbName: "Rudel",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
VarTextField(
textController: getTextFields()["Teilnehm"]!,
localization: AppLocalizations.of(context)!.teilnehmer,
dbName: "Teilnehm",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
VarTextField(
textController: getTextFields()["Dauer"]!,
localization: AppLocalizations.of(context)!.dauer,
dbName: "Dauer",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
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,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
VarTextField(
textController: getTextFields()["Lkr"]!,
localization: AppLocalizations.of(context)!.lkr,
dbName: "Lkr",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
VarTextField(
textController: getTextFields()["BeiOrt"]!,
localization: AppLocalizations.of(context)!.beiort,
dbName: "BeiOrt",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
const Divider(),
const SizedBox(
height: 10,
),
VarTextField(
textController: getTextFields()["BimaNr"]!,
localization: AppLocalizations.of(context)!.bimaNr,
dbName: "BimaNr",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(
height: 10,
),
VarTextField(
textController: getTextFields()["BimaName"]!,
localization: AppLocalizations.of(context)!.bimaName,
dbName: "BimaName",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
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,
dbDesignation: DatabasesEnum.excursion,
)
],
)),
Step(
title: const Text("step2"),
content: Column(
children: [
VarTextField(
textController: getTextFields()["Wetter"]!,
localization: "Wetter",
dbName: "Wetter",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(height: 10),
VarTextField(
textController: getTextFields()["Temperat"]!,
localization: "Temperatur",
dbName: "Temperat",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
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,
),
const Divider(),
Hinweise(
hinweise: getTextFields()["Hinweise"]!,
),
],
),
),
Step(
title: const Text("step3"),
content: Column(
children: [
VarTextField(textController: getTextFields()["Bemerk"]!,
localization: "Bemerkungen",
dbName: "Bemerk",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
const SizedBox(height: 20,),
VarTextField(
textController: getTextFields()["IntKomm"]!,
localization: "Interne Kommunikation",
dbName: "IntKomm",
required: false,
dbDesignation: DatabasesEnum.excursion,
),
],
),
),
];
// Begin of widget tree
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text(AppLocalizations.of(context)!.excursion), title: Text(AppLocalizations.of(context)!.excursion),
), ),
body: PageTransitionSwitcher( body: PageTransitionSwitcher(
duration: const Duration(microseconds: 800), duration: const Duration(microseconds: 800),
transitionBuilder: (Widget child, Animation<double> animation, transitionBuilder: (Widget child, Animation<double> animation,
Animation<double> secondaryAnimation) { Animation<double> secondaryAnimation) {
return SharedAxisTransition( return SharedAxisTransition(
animation: animation, animation: animation,
secondaryAnimation: secondaryAnimation, secondaryAnimation: secondaryAnimation,
transitionType: SharedAxisTransitionType.vertical, transitionType: SharedAxisTransitionType.vertical,
child: child, child: child,
); );
},
child: Stepper(
key: ValueKey<int>(currentStep),
steps: getSteps(),
currentStep: currentStep,
onStepTapped: (value) {
setState(() {
currentStep = value;
});
}, },
onStepContinue: () { child: Stepper(
final isLastStep = currentStep == getSteps().length - 1; key: ValueKey<int>(currentStep),
steps: getSteps(),
currentStep: currentStep,
onStepTapped: (value) {
setState(() {
currentStep = value;
});
},
onStepContinue: () {
final isLastStep = currentStep == getSteps().length - 1;
if (!isLastStep) { if (!isLastStep) {
setState(() { setState(() {
currentStep += 1; currentStep += 1;
}); });
} }
}, },
onStepCancel: () { onStepCancel: () {
if (currentStep == 0) { if (currentStep == 0) {
Navigator.pop(context); Navigator.pop(context);
} else { } else {
setState(() { setState(() {
currentStep -= 1; currentStep -= 1;
}); });
} }
}, },
), ),
)); ));
} }
} }

4
lib/screens/Excursion/widgets/hund_u_leine.dart
View File

@@ -39,7 +39,9 @@ class HundULeineState extends State<HundULeine> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column( return Column(
children: [ children: [
Text(AppLocalizations.of(context)!.mHund), Align(
alignment: Alignment.bottomLeft,
child: Text(AppLocalizations.of(context)!.mHund)),
ListTile( ListTile(
visualDensity: const VisualDensity(vertical: -4), visualDensity: const VisualDensity(vertical: -4),
title: Text(AppLocalizations.of(context)!.ja), title: Text(AppLocalizations.of(context)!.ja),