add some new features
This commit is contained in:
@@ -0,0 +1,48 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
|
||||
import '../controller/abfall_controller.dart';
|
||||
import '../widgets/abfall_form.dart';
|
||||
import '../widgets/abfall_inventory.dart';
|
||||
|
||||
class AbfallView extends GetView<AbfallController> {
|
||||
static const routeName = '/abfall-view';
|
||||
const AbfallView({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => Scaffold(
|
||||
appBar: AppBar(
|
||||
leading: IconButton(
|
||||
tooltip: 'Zurück',
|
||||
icon: const Icon(Icons.arrow_back),
|
||||
onPressed: () => Get.back<void>(),
|
||||
),
|
||||
title: const Text('Abfallverwaltung'),
|
||||
),
|
||||
body: SafeArea(
|
||||
top: false,
|
||||
child: Align(
|
||||
alignment: Alignment.topCenter,
|
||||
child: ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 1000),
|
||||
child: CustomScrollView(
|
||||
controller: controller.scrollController,
|
||||
keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
|
||||
slivers: [
|
||||
SliverPadding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
sliver: SliverToBoxAdapter(
|
||||
child: AbfallForm(controller: controller),
|
||||
),
|
||||
),
|
||||
SliverPadding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 4, 16, 24),
|
||||
sliver: AbfallInventory(controller: controller),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,191 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
|
||||
import '../controller/bauteil_auswertung_controller.dart';
|
||||
import '../helper/display_formats.dart';
|
||||
import '../models/bauteil_auswertung_model.dart';
|
||||
import '../models/bauteil_model.dart';
|
||||
import '../theme/app_theme.dart';
|
||||
import '../widgets/entry_panel.dart';
|
||||
|
||||
class BauteilAuswertungView extends GetView<BauteilAuswertungController> {
|
||||
static const routeName = '/bauteile-auswertung-view';
|
||||
const BauteilAuswertungView({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => Scaffold(
|
||||
appBar: AppBar(
|
||||
leading: IconButton(
|
||||
tooltip: 'Zurück zu den Bauteilen',
|
||||
icon: const Icon(Icons.arrow_back),
|
||||
onPressed: () => Get.back<void>(),
|
||||
),
|
||||
title: const Text('Bauteilauswertung'),
|
||||
),
|
||||
body: SafeArea(
|
||||
top: false,
|
||||
child: Align(
|
||||
alignment: Alignment.topCenter,
|
||||
child: ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 1000),
|
||||
child: Obx(() {
|
||||
final gruppen = controller.gruppen;
|
||||
// Headers and entries share one lazy list, even with many periods.
|
||||
final zeilen = <Object>[
|
||||
for (final gruppe in gruppen) ...[gruppe, ...gruppe.bauteile],
|
||||
];
|
||||
return CustomScrollView(
|
||||
controller: controller.scrollController,
|
||||
slivers: [
|
||||
SliverPadding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
sliver: SliverToBoxAdapter(child: _uebersicht()),
|
||||
),
|
||||
if (zeilen.isEmpty)
|
||||
const SliverToBoxAdapter(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(24),
|
||||
child: Text(
|
||||
'Noch keine Bauteile gespeichert.',
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(color: AppTheme.muted),
|
||||
),
|
||||
),
|
||||
)
|
||||
else
|
||||
SliverPadding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 0, 16, 24),
|
||||
sliver: SliverList.builder(
|
||||
itemCount: zeilen.length,
|
||||
itemBuilder: (context, index) {
|
||||
final zeile = zeilen[index];
|
||||
if (zeile is BauteilAuswertungsGruppe) {
|
||||
return _gruppenKopf(zeile);
|
||||
}
|
||||
final bauteil = zeile as BauteilModel;
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12),
|
||||
child: SavedEntryCard(
|
||||
key: ValueKey('auswertung-${bauteil.bauteilId}'),
|
||||
title: bauteil.name,
|
||||
subtitle: DisplayFormats.date(
|
||||
bauteil.erstelltAm.toLocal(),
|
||||
),
|
||||
notes: bauteil.verwendung,
|
||||
details: [
|
||||
BauteilAuswertungsGruppe.preisBekannt(bauteil)
|
||||
? 'Gesamtpreis: ${DisplayFormats.currency(bauteil.gesamtpreis!)}'
|
||||
: 'Gesamtpreis nicht erfasst',
|
||||
'${DisplayFormats.number(bauteil.gewichtGramm)} g Bauteil',
|
||||
'${DisplayFormats.number(bauteil.abfallGramm)} g Abfall',
|
||||
DisplayFormats.duration(
|
||||
bauteil.druckdauerMinuten,
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
Widget _uebersicht() => Container(
|
||||
padding: const EdgeInsets.all(20),
|
||||
decoration: BoxDecoration(
|
||||
color: AppTheme.inputSurface,
|
||||
borderRadius: BorderRadius.circular(24),
|
||||
border: Border.all(color: const Color(0xFFCEE6DF)),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
const Text(
|
||||
'Alle gedruckten Bauteile',
|
||||
style: TextStyle(fontSize: 23, fontWeight: FontWeight.w700),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'${controller.bauteile.length} Bauteile · neueste zuerst',
|
||||
style: const TextStyle(color: AppTheme.muted),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
const Text('Gesamtsumme', style: TextStyle(color: AppTheme.muted)),
|
||||
Text(
|
||||
DisplayFormats.currency(controller.gesamtsumme),
|
||||
style: const TextStyle(
|
||||
color: AppTheme.teal,
|
||||
fontSize: 28,
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
if (controller.ohnePreis > 0) ...[
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'${controller.ohnePreis} Bauteile ohne Gesamtpreis sind in der Liste enthalten, aber nicht in der Preissumme.',
|
||||
style: const TextStyle(color: AppTheme.muted, height: 1.5),
|
||||
),
|
||||
],
|
||||
const SizedBox(height: 24),
|
||||
const Text(
|
||||
'Gruppieren nach',
|
||||
style: TextStyle(fontWeight: FontWeight.w600),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
SegmentedButton<BauteilZeitraum>(
|
||||
showSelectedIcon: false,
|
||||
segments: const [
|
||||
ButtonSegment(value: BauteilZeitraum.jahr, label: Text('Jahr')),
|
||||
ButtonSegment(value: BauteilZeitraum.monat, label: Text('Monat')),
|
||||
ButtonSegment(value: BauteilZeitraum.tag, label: Text('Tag')),
|
||||
],
|
||||
selected: {controller.zeitraum.value},
|
||||
onSelectionChanged: (auswahl) =>
|
||||
controller.waehleZeitraum(auswahl.single),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
Widget _gruppenKopf(BauteilAuswertungsGruppe gruppe) => Container(
|
||||
margin: const EdgeInsets.only(top: 8, bottom: 12),
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: AppTheme.inventorySurface,
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Text(
|
||||
controller.gruppenTitel(gruppe.beginn),
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 21,
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'${gruppe.bauteile.length} Bauteile · Summe: ${DisplayFormats.currency(gruppe.summe)}',
|
||||
style: const TextStyle(
|
||||
color: Color(0xFF79D7C6),
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
if (gruppe.ohnePreis > 0) ...[
|
||||
const SizedBox(height: 6),
|
||||
Text(
|
||||
'${gruppe.ohnePreis} ohne Gesamtpreis',
|
||||
style: const TextStyle(color: Color(0xFFB9CCD9)),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import '../widgets/bauteil_card.dart';
|
||||
import '../widgets/bauteil_delete_dialog.dart';
|
||||
import '../widgets/bauteil_form.dart';
|
||||
import '../widgets/entry_panel.dart';
|
||||
import 'bauteil_auswertung_view.dart';
|
||||
|
||||
class BauteilView extends GetView<BauteilController> {
|
||||
static const routeName = '/bauteile-view';
|
||||
@@ -15,7 +16,21 @@ class BauteilView extends GetView<BauteilController> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => Scaffold(
|
||||
appBar: AppBar(title: const Text('Gedruckte Bauteile')),
|
||||
appBar: AppBar(
|
||||
title: const Text(
|
||||
'Gedruckte Bauteile',
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
actions: [
|
||||
IconButton(
|
||||
tooltip: 'Bauteile auswerten',
|
||||
icon: const Icon(Icons.bar_chart_outlined),
|
||||
onPressed: () => Get.toNamed(BauteilAuswertungView.routeName),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
],
|
||||
),
|
||||
body: SafeArea(
|
||||
top: false,
|
||||
child: Align(
|
||||
|
||||
@@ -27,7 +27,7 @@ class ExportView extends GetView<ExportController> {
|
||||
children: [
|
||||
EntryPanel(
|
||||
title: 'Daten exportieren',
|
||||
subtitle: 'Sichere Filamente, Verarbeitungsprofile, Bauteile inklusive Fotos und Verbrauch sowie deine Materialarten in einer JSON-Datei.\n\nSpeichere die Datei außerhalb der App, zum Beispiel in Dokumente oder in deiner Cloud. So kannst du sie nach einer Neuinstallation wieder importieren.',
|
||||
subtitle: 'Sichere Filamente, Verarbeitungsprofile, Bauteile inklusive Fotos und Verbrauch sowie deine Materialarten und Abfalleinträge in einer JSON-Datei.\n\nSpeichere die Datei außerhalb der App, zum Beispiel in Dokumente oder in deiner Cloud. So kannst du sie nach einer Neuinstallation wieder importieren.',
|
||||
child: FilledButton.icon(
|
||||
onPressed: busy ? null : controller.exportData,
|
||||
icon: const Icon(Icons.file_download_outlined),
|
||||
@@ -63,6 +63,9 @@ class ExportView extends GetView<ExportController> {
|
||||
? 'Materialarten: Standardliste'
|
||||
: '${(backup.data[StorageKeys.materialien]!.single['werte'] as List).length} Materialarten',
|
||||
),
|
||||
Text(
|
||||
'${backup.data[StorageKeys.abfaelle]!.length} Abfalleinträge',
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
FilledButton.icon(
|
||||
onPressed: busy
|
||||
|
||||
@@ -9,6 +9,7 @@ import '../widgets/filament_inventory.dart';
|
||||
import '../widgets/app_version.dart';
|
||||
import 'anwendung_view.dart';
|
||||
import 'bauteil_view.dart';
|
||||
import 'abfall_view.dart';
|
||||
import 'export_view.dart';
|
||||
|
||||
class HomeView extends GetView<HomeController> {
|
||||
@@ -26,6 +27,11 @@ class HomeView extends GetView<HomeController> {
|
||||
icon: const Icon(Icons.view_in_ar_outlined),
|
||||
onPressed: () => Get.toNamed(BauteilView.routeName),
|
||||
),
|
||||
IconButton(
|
||||
tooltip: 'Abfall verwalten',
|
||||
icon: const Icon(Icons.delete_outline),
|
||||
onPressed: () => Get.toNamed(AbfallView.routeName),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
],
|
||||
title: LayoutBuilder(
|
||||
|
||||
Reference in New Issue
Block a user