jens/ambito
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stammdaten

Browse source
This commit is contained in:
reinjens 2024-12-17 13:19:09 +01:00
parent 8b1ec3818c
commit 16f1442564
31 changed files with 82 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/main.dart
View file

@ -52,8 +52,8 @@ void main() async {
for (final cart in carts) { for (final cart in carts) {
CartRepository().put(Cart.fromJson(cart)); CartRepository().put(Cart.fromJson(cart));
} }
var cart_elements = await BaseApi().getContent('cart_element', false); var cartElements = await BaseApi().getContent('cart_element', false);
for (final element in cart_elements) { for (final element in cartElements) {
CartRepository().putElement(CartElement.fromJson(element)); CartRepository().putElement(CartElement.fromJson(element));
} }
/*for (final cart in carts) { /*for (final cart in carts) {

2
lib/src/entity/area/area.dart
View file

@ -53,7 +53,7 @@ extension AreaExtension on Area {
id.toString(), id.toString(),
), ),
strokeColor: const Color(0xFF60845E), strokeColor: const Color(0xFF60845E),
fillColor: const Color(0xff87A34E).withOpacity(.7), fillColor: const Color(0xff87A34E).withValues(alpha: .7),
strokeWidth: 2, strokeWidth: 2,
points: points, points: points,
); );

22
lib/src/entity/cart/cart_datasource.dart
View file

@ -57,21 +57,19 @@ class CartDataSource extends DataGridSource {
final AmbitoTheme theme = getTheme(context); final AmbitoTheme theme = getTheme(context);
double completePrice = double.tryParse(row double completePrice = double.tryParse(row
.getCells() .getCells()
.where((cell) => cell.columnName == 'Richtpreis') .where((cell) => cell.columnName == 'Richtpreis')
.first .first
.value .value
.toString() ?? .toString()) ??
'0.0') ??
0; 0;
int amount = int.tryParse(row int amount = int.tryParse(row
.getCells() .getCells()
.where((cell) => cell.columnName == 'Menge') .where((cell) => cell.columnName == 'Menge')
.first .first
.value .value
.toString() ?? .toString()) ??
'0') ??
0; 0;
if (amount > 1) { if (amount > 1) {

2
lib/src/entity/entities.dart
View file

@ -1,5 +1,3 @@
library ambito_entities;
export '_general/file/file_part.dart'; export '_general/file/file_part.dart';
export '_general/file/thumbnail.dart'; export '_general/file/thumbnail.dart';
export '_general/file/thumbnails.dart'; export '_general/file/thumbnails.dart';

2
lib/src/entity/measure/measure_repository.dart
View file

@ -283,7 +283,7 @@ class MeasureRepository extends BaseDB {
.getTypeDetailsForType(measureType?.measureType ?? ''); .getTypeDetailsForType(measureType?.measureType ?? '');
// Save preferences and populate combined map // Save preferences and populate combined map
prefs.setBool('extended_json', true).then((_) { prefs.setBool('extended_json', true).then((_) {
_mergeToCombinedMap(combined, measureGeneral?.toJson()); _mergeToCombinedMap(combined, measureGeneral.toJson());
_mergeToCombinedMap(combined, measureDetails?.toJson()); _mergeToCombinedMap(combined, measureDetails?.toJson());
_mergeToCombinedMap(combined, measureType?.toJson()); _mergeToCombinedMap(combined, measureType?.toJson());
_mergeToCombinedMap(combined, measureTypesDetails?.toJson()); _mergeToCombinedMap(combined, measureTypesDetails?.toJson());

2
lib/src/extensions/extensions.dart
View file

@ -1,5 +1,3 @@
library ambito_extensions;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart'; import 'package:flutter_i18n/flutter_i18n.dart';

2
lib/src/packages/ambito_api/restclient.dart
View file

@ -1,5 +1,3 @@
library vyc_api;
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';

8
lib/src/packages/ambito_theme/ambito_theme.dart
View file

@ -37,10 +37,10 @@ final actionGroupColors = {
}; };
final actionAreaColors = { final actionAreaColors = {
'Landschaft': const Color(0xffeebb4b).withOpacity(.1), 'Landschaft': const Color(0xffeebb4b)..withValues(alpha: .1),
'Weinberg': const Color(0xff88a44e).withOpacity(.1), 'Weinberg': const Color(0xff88a44e)..withValues(alpha: .1),
'Betriebsfläche': const Color(0xff96172f).withOpacity(.1), 'Betriebsfläche': const Color(0xff96172f)..withValues(alpha: .1),
'Betriebsstätte': const Color(0xffCCCDCC).withOpacity(.1), 'Betriebsstätte': const Color(0xffCCCDCC)..withValues(alpha: .1),
}; };
final actionAreaFGColors = { final actionAreaFGColors = {

4
lib/src/pages/calendar/calendar_page_year.dart
View file

@ -186,7 +186,7 @@ class CalendarPageYearState extends State<CalendarPageYear> {
), ),
horizontalInside: BorderSide( horizontalInside: BorderSide(
width: 1, width: 1,
color: Colors.black.withOpacity(.6), color: Colors.black..withValues(alpha: .6),
), ),
verticalInside: const BorderSide( verticalInside: const BorderSide(
width: 0, width: 0,
@ -216,7 +216,7 @@ class CalendarPageYearState extends State<CalendarPageYear> {
), ),
horizontalInside: BorderSide( horizontalInside: BorderSide(
width: 1, width: 1,
color: Colors.black.withOpacity(.6), color: Colors.black..withValues(alpha: .6),
), ),
verticalInside: const BorderSide( verticalInside: const BorderSide(
width: 0, width: 0,

2
lib/src/pages/cart/cart_page.dart
View file

@ -162,7 +162,7 @@ class CartPageState extends State<CartPage> {
], ],
), ),
theme.verticalSpacerSmall, theme.verticalSpacerSmall,
gridWidget(elements ?? [], key), gridWidget(elements, key),
theme.verticalSpacer, theme.verticalSpacer,
Row( Row(
children: [ children: [

22
lib/src/pages/dashboard/areas/dashboard_areas_page.dart
View file

@ -164,11 +164,11 @@ class DashboardAreasPageState extends State<DashboardAreasPage> {
color: theme.currentColorScheme.secondary), color: theme.currentColorScheme.secondary),
), ),
onPressed: () async { onPressed: () async {
final TextEditingController _controllerName = final TextEditingController controllerName =
TextEditingController(); TextEditingController();
final TextEditingController _controllerSize = final TextEditingController controllerSize =
TextEditingController(); TextEditingController();
final TextEditingController _controllerDescription = final TextEditingController controllerDescription =
TextEditingController(); TextEditingController();
await showDialog<String>( await showDialog<String>(
context: context, context: context,
@ -245,8 +245,8 @@ class DashboardAreasPageState extends State<DashboardAreasPage> {
backgroundColor: theme backgroundColor: theme
.currentColorScheme .currentColorScheme
.surface .surface
.withOpacity( ..withValues(
.1), alpha: .1),
foregroundColor: theme foregroundColor: theme
.currentColorScheme .currentColorScheme
.primary, .primary,
@ -309,7 +309,7 @@ class DashboardAreasPageState extends State<DashboardAreasPage> {
..id = isar.areas ..id = isar.areas
.autoIncrement() .autoIncrement()
..description = ..description =
_controllerDescription controllerDescription
.value .value
.text .text
..business = [ ..business = [
@ -321,11 +321,11 @@ class DashboardAreasPageState extends State<DashboardAreasPage> {
.name! .name!
] ]
..name = ..name =
_controllerName controllerName
.value .value
.text .text
..size = ..size =
_controllerSize controllerSize
.value .value
.text; .text;
await BaseApi() await BaseApi()
@ -382,7 +382,7 @@ class DashboardAreasPageState extends State<DashboardAreasPage> {
child: child:
TextField( TextField(
controller: controller:
_controllerName, controllerName,
maxLines: 1, maxLines: 1,
decoration: decoration:
InputDecoration( InputDecoration(
@ -424,7 +424,7 @@ class DashboardAreasPageState extends State<DashboardAreasPage> {
child: child:
TextField( TextField(
controller: controller:
_controllerSize, controllerSize,
maxLines: 1, maxLines: 1,
decoration: decoration:
InputDecoration( InputDecoration(
@ -467,7 +467,7 @@ class DashboardAreasPageState extends State<DashboardAreasPage> {
theme.verticalSpacer, theme.verticalSpacer,
TextField( TextField(
controller: controller:
_controllerDescription, controllerDescription,
maxLines: 5, maxLines: 5,
decoration: decoration:
InputDecoration( InputDecoration(

2
lib/src/pages/dashboard/layouts/normal_layout_dashboard_page.dart
View file

@ -38,7 +38,7 @@ extension NormalLayoutDashboardPage on DashboardPageState {
height: 250, height: 250,
child: Card( child: Card(
elevation: 0, elevation: 0,
color: const Color(0xff666666).withOpacity(.1), color: const Color(0xff666666).withValues(alpha: .1),
child: Column( child: Column(
children: [ children: [
ClipRRect( ClipRRect(

3
lib/src/pages/dashboard/layouts/small_layout_dashboard_page.dart
View file

@ -43,7 +43,8 @@ extension SmallLayoutDashboardPage on DashboardPageState {
Container( Container(
height: 80, height: 80,
decoration: BoxDecoration( decoration: BoxDecoration(
color: theme.currentColorScheme.outline.withOpacity(.6), color: theme.currentColorScheme.outline
..withValues(alpha: .6),
borderRadius: const BorderRadius.only( borderRadius: const BorderRadius.only(
bottomLeft: Radius.circular(10), bottomLeft: Radius.circular(10),
bottomRight: Radius.circular(10)), bottomRight: Radius.circular(10)),

2
lib/src/pages/dashboard/master_data/master_data_page.dart
View file

@ -146,7 +146,7 @@ class MasterDataPageState extends State<MasterDataPage> {
..value = business!.name ..value = business!.name
]; ];
final ret = await BaseApi().patchContent( await BaseApi().patchContent(
'login', 'login',
login!.id, login!.id,
changedlogin.toJson(), changedlogin.toJson(),

6
lib/src/pages/dashboard/parts/parts_dashboard_page.dart
View file

@ -17,7 +17,7 @@ extension PartsDashboardPage on DashboardPageState {
width: double.infinity, width: double.infinity,
child: Card( child: Card(
elevation: 0, elevation: 0,
color: orangeColors['primary']?.withOpacity(0.1), color: orangeColors['primary']?..withValues(alpha: 0.1),
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Column( child: Column(
@ -85,7 +85,7 @@ extension PartsDashboardPage on DashboardPageState {
width: double.infinity, width: double.infinity,
child: Card( child: Card(
elevation: 0, elevation: 0,
color: greenColors['primary']?.withOpacity(0.3), color: greenColors['primary']?..withValues(alpha: 0.3),
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Column( child: Column(
@ -222,7 +222,7 @@ extension PartsDashboardPage on DashboardPageState {
width: 532, width: 532,
child: Card( child: Card(
elevation: 0, elevation: 0,
color: Theme.of(context).colorScheme.outline.withOpacity(.1), color: Theme.of(context).colorScheme.outline..withValues(alpha: .1),
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Column( child: Column(

4
lib/src/pages/error/error_page.dart
View file

@ -29,7 +29,7 @@ class ErrorPage extends StatelessWidget {
width: 1152, width: 1152,
child: Card( child: Card(
elevation: 0, elevation: 0,
color: theme.currentColorScheme.outline.withOpacity(.1), color: theme.currentColorScheme.outline..withValues(alpha: .1),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -49,7 +49,7 @@ class ErrorPage extends StatelessWidget {
Widget _smallCard(AmbitoTheme theme) { Widget _smallCard(AmbitoTheme theme) {
return Card( return Card(
elevation: 0, elevation: 0,
color: theme.currentColorScheme.outline.withOpacity(.1), color: theme.currentColorScheme.outline..withValues(alpha: .1),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [

4
lib/src/pages/measure/categories/measure_categories_page.dart
View file

@ -97,8 +97,8 @@ class MeasureCategoriesPageState extends State<MeasureCategoriesPage> {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: borderRadius:
const BorderRadius.all(Radius.circular(8)), const BorderRadius.all(Radius.circular(8)),
color: color: theme.currentColorScheme.onSurface
theme.currentColorScheme.onSurface.withOpacity(.1), ..withValues(alpha: .1),
), ),
width: Breakpoint.fromContext(context).width, width: Breakpoint.fromContext(context).width,
child: Padding( child: Padding(

4
lib/src/pages/measure/detail/cards/_main_card.dart
View file

@ -29,8 +29,8 @@ class MainCard extends StatelessWidget {
contentPadding: const EdgeInsets.only(left: 16), contentPadding: const EdgeInsets.only(left: 16),
elevation: 0, elevation: 0,
expandedTextColor: theme.currentColorScheme.outline, expandedTextColor: theme.currentColorScheme.outline,
baseColor: theme.currentColorScheme.outline.withOpacity(.1), baseColor: theme.currentColorScheme.outline..withValues(alpha: .1),
expandedColor: theme.currentColorScheme.outline.withOpacity(.1), expandedColor: theme.currentColorScheme.outline..withValues(alpha: .1),
title: Text( title: Text(
context.translate(title), context.translate(title),
style: theme.currentThemeData.textTheme.labelMedium style: theme.currentThemeData.textTheme.labelMedium

2
lib/src/pages/measure/detail/cards/_sidebar_card.dart
View file

@ -26,7 +26,7 @@ class SideBarCard extends StatelessWidget {
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
elevation: 0, elevation: 0,
color: greenColors['primary']!.withOpacity(.1), color: greenColors['primary']!..withValues(alpha: .1),
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Column( child: Column(

4
lib/src/pages/measure/detail/cards/main/combined_card.dart
View file

@ -30,8 +30,8 @@ class CombinedCard extends StatelessWidget {
contentPadding: const EdgeInsets.only(left: 16), contentPadding: const EdgeInsets.only(left: 16),
elevation: 0, elevation: 0,
expandedTextColor: theme.currentColorScheme.outline, expandedTextColor: theme.currentColorScheme.outline,
baseColor: theme.currentColorScheme.outline.withOpacity(.1), baseColor: theme.currentColorScheme.outline..withValues(alpha: .1),
expandedColor: theme.currentColorScheme.outline.withOpacity(.1), expandedColor: theme.currentColorScheme.outline..withValues(alpha: .1),
title: Text( title: Text(
title, title,
style: theme.currentThemeData.textTheme.labelMedium style: theme.currentThemeData.textTheme.labelMedium

4
lib/src/pages/measure/detail/cards/main/gallery_card.dart
View file

@ -31,8 +31,8 @@ class GalleryCard extends StatelessWidget {
contentPadding: const EdgeInsets.only(left: 16), contentPadding: const EdgeInsets.only(left: 16),
elevation: 0, elevation: 0,
expandedTextColor: theme.currentColorScheme.outline, expandedTextColor: theme.currentColorScheme.outline,
baseColor: theme.currentColorScheme.outline.withOpacity(.1), baseColor: theme.currentColorScheme.outline..withValues(alpha: .1),
expandedColor: theme.currentColorScheme.outline.withOpacity(.1), expandedColor: theme.currentColorScheme.outline..withValues(alpha: .1),
title: Text( title: Text(
title, title,
style: theme.currentThemeData.textTheme.labelMedium style: theme.currentThemeData.textTheme.labelMedium

4
lib/src/pages/measure/detail/cards/main/simple_text_card.dart
View file

@ -30,8 +30,8 @@ class SimpleTextCard extends StatelessWidget {
contentPadding: const EdgeInsets.only(left: 16), contentPadding: const EdgeInsets.only(left: 16),
elevation: 0, elevation: 0,
expandedTextColor: theme.currentColorScheme.outline, expandedTextColor: theme.currentColorScheme.outline,
baseColor: theme.currentColorScheme.outline.withOpacity(.1), baseColor: theme.currentColorScheme.outline..withValues(alpha: .1),
expandedColor: theme.currentColorScheme.outline.withOpacity(.1), expandedColor: theme.currentColorScheme.outline..withValues(alpha: .1),
title: Text( title: Text(
title, title,
style: theme.currentThemeData.textTheme.labelMedium style: theme.currentThemeData.textTheme.labelMedium

3
lib/src/pages/measure/detail/cards/main/sublevel_months_card.dart
View file

@ -26,7 +26,8 @@ class SublevelMonthsCard extends StatelessWidget {
labelPadding: EdgeInsets.zero, labelPadding: EdgeInsets.zero,
backgroundColor: active backgroundColor: active
? theme.currentColorScheme.secondary ? theme.currentColorScheme.secondary
: theme.currentColorScheme.outline.withOpacity(.1), : theme.currentColorScheme.outline
..withValues(alpha: .1),
label: Text( label: Text(
label, label,
style: theme.currentThemeData.textTheme.bodyLarge?.copyWith( style: theme.currentThemeData.textTheme.bodyLarge?.copyWith(

40
lib/src/pages/measure/detail/cards/main/sublevel_unordered_list_card.dart
View file

@ -36,28 +36,26 @@ class SublevelUnorderedListCard extends StatelessWidget {
title, title,
style: theme.currentThemeData.textTheme.labelMedium, style: theme.currentThemeData.textTheme.labelMedium,
), ),
...text! ...text!.map(
.map( (item) => Row(
(item) => Row( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ const Align(
const Align( alignment: Alignment.center,
alignment: Alignment.center, child: Icon(Icons.circle, size: 4),
child: Icon(Icons.circle, size: 4),
),
theme.horizontalSpacerSmall,
Expanded(
child: Text(
item,
softWrap: true,
maxLines: 2,
style: theme.bodyMedium,
),
),
],
), ),
) theme.horizontalSpacerSmall,
.toList(), Expanded(
child: Text(
item,
softWrap: true,
maxLines: 2,
style: theme.bodyMedium,
),
),
],
),
),
], ],
), ),
), ),

4
lib/src/pages/measure/detail/cards/main/unordered_list_card.dart
View file

@ -30,8 +30,8 @@ class UnorderedListCard extends StatelessWidget {
contentPadding: const EdgeInsets.only(left: 16), contentPadding: const EdgeInsets.only(left: 16),
elevation: 0, elevation: 0,
expandedTextColor: theme.currentColorScheme.outline, expandedTextColor: theme.currentColorScheme.outline,
baseColor: theme.currentColorScheme.outline.withOpacity(.1), baseColor: theme.currentColorScheme.outline..withValues(alpha: .1),
expandedColor: theme.currentColorScheme.outline.withOpacity(.1), expandedColor: theme.currentColorScheme.outline..withValues(alpha: .1),
title: Text( title: Text(
title, title,
style: theme.currentThemeData.textTheme.labelMedium style: theme.currentThemeData.textTheme.labelMedium

5
lib/src/pages/measure/detail/cards/material_card.dart
View file

@ -34,10 +34,7 @@ class MaterialCard extends StatelessWidget {
theme.verticalSpacer, theme.verticalSpacer,
if (massnahme.costs != null) if (massnahme.costs != null)
Text( Text(
context.translate( '${context.translate('page.actionDetailPage.material.suggested_price')} ${massnahme.costs} €',
'page.actionDetailPage.material.suggested_price') +
massnahme.costs +
' €',
style: theme.bodyMedium.copyWith(fontWeight: FontWeight.bold), style: theme.bodyMedium.copyWith(fontWeight: FontWeight.bold),
), ),
theme.verticalSpacer, theme.verticalSpacer,

2
lib/src/pages/measure/groups/measure_groups_page.dart
View file

@ -103,7 +103,7 @@ class MeasureGroupsPageState extends State<MeasureGroupsPage> {
borderRadius: borderRadius:
const BorderRadius.all(Radius.circular(8)), const BorderRadius.all(Radius.circular(8)),
color: color:
theme.currentColorScheme.onSurface.withOpacity(.1), theme.currentColorScheme.onSurface..withValues(alpha:.1),
), ),
width: Breakpoint.fromContext(context).width, width: Breakpoint.fromContext(context).width,
child: Padding( child: Padding(

2
lib/src/pages/measure/measure_page.dart
View file

@ -273,7 +273,7 @@ class MeasuresPageState extends State<MeasuresPage> {
width: double.infinity, width: double.infinity,
child: Card( child: Card(
elevation: 0, elevation: 0,
color: theme.currentColorScheme.outline.withOpacity(.1), color: theme.currentColorScheme.outline..withValues(alpha: .1),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,

2
lib/src/widgets/cards/card_measure.dart
View file

@ -43,7 +43,7 @@ class CardMeasure extends StatelessWidget {
context, context,
title: group!.name!, title: group!.name!,
image: group!.image, image: group!.image,
color: actionGroupColors[group!.name!]!.withOpacity(0.1), color: actionGroupColors[group!.name!]!..withValues(alpha: 0.1),
titleColor: actionGroupColors[group!.name!]!, titleColor: actionGroupColors[group!.name!]!,
description: group!.description! + description: group!.description! +
ListRepository() ListRepository()

4
lib/src/widgets/dialogs/edit_field_dialog/edit_area_notice_dialog.dart
View file

@ -73,8 +73,8 @@ class EditAreaNoticeDialog extends StatelessWidget {
Navigator.pop(context); Navigator.pop(context);
}, },
title: 'Abbrechen', title: 'Abbrechen',
backgroundColor: backgroundColor: theme.currentColorScheme.surface
theme.currentColorScheme.surface.withOpacity(.1), ..withValues(alpha: .1),
foregroundColor: theme.currentColorScheme.primary, foregroundColor: theme.currentColorScheme.primary,
borderColor: theme.currentColorScheme.primary, borderColor: theme.currentColorScheme.primary,
), ),

2
lib/src/widgets/map/marker_generator.dart
View file

@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
class MarkerGenerator { class MarkerGenerator {
final _markerSize; final double _markerSize;
double _circleStrokeWidth = 0; double _circleStrokeWidth = 0;
double _circleOffset = 0; double _circleOffset = 0;
double _outlineCircleWidth = 0; double _outlineCircleWidth = 0;