From f798618f1e80fa4694cee478ad29d877bb222c1e Mon Sep 17 00:00:00 2001 From: miakh <2659269+miakh@users.noreply.github.com> Date: Thu, 12 Dec 2024 05:23:02 +0100 Subject: [PATCH] fixes --- lib/dataModels/OccasionUserModel.dart | 4 ++-- lib/dataModelsEshop/OrderModel.dart | 2 -- lib/pages/AdministrationOccasion/UserColumns.dart | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/dataModels/OccasionUserModel.dart b/lib/dataModels/OccasionUserModel.dart index fa7eaeef..0579940d 100644 --- a/lib/dataModels/OccasionUserModel.dart +++ b/lib/dataModels/OccasionUserModel.dart @@ -104,7 +104,7 @@ class OccasionUserModel extends IPlutoRowModel { Map serviceToOneColumnPlutoRow(Map? services, String serviceType) { Map serviceCells = {}; for (var entry in services?[serviceType]?.entries ?? []) { - serviceCells[serviceType + entry.formKey] = PlutoCell(value: entry.value); + serviceCells[serviceType + entry.key] = PlutoCell(value: entry.value); } return serviceCells; } @@ -128,7 +128,7 @@ class OccasionUserModel extends IPlutoRowModel { Map servicesToPlutoRow(Map? services, String serviceType) { Map serviceCells = {}; for (var entry in services?[serviceType]?.entries ?? []) { - serviceCells[serviceType + entry.formKey] = PlutoCell(value: entry.value); + serviceCells[serviceType + entry.key] = PlutoCell(value: entry.value); } return serviceCells; } diff --git a/lib/dataModelsEshop/OrderModel.dart b/lib/dataModelsEshop/OrderModel.dart index 1508b9c3..7f2bab34 100644 --- a/lib/dataModelsEshop/OrderModel.dart +++ b/lib/dataModelsEshop/OrderModel.dart @@ -1,5 +1,3 @@ -import 'dart:js_interop'; - import 'package:flutter/cupertino.dart'; import 'package:fstapp/components/dataGrid/PlutoAbstract.dart'; import 'package:fstapp/dataModelsEshop/TbEshop.dart'; diff --git a/lib/pages/AdministrationOccasion/UserColumns.dart b/lib/pages/AdministrationOccasion/UserColumns.dart index 44d47ede..b4c31899 100644 --- a/lib/pages/AdministrationOccasion/UserColumns.dart +++ b/lib/pages/AdministrationOccasion/UserColumns.dart @@ -166,7 +166,7 @@ class UserColumns { return columns; }, ACCOMMODATION: (Map data) { - var select = data[DbOccasions.serviceTypeAccommodation]?.map((a)=>a.id).toList(); + var select = data[DbOccasions.serviceTypeAccommodation]?.map((a)=>a.code).toList(); select ??= []; select.add(""); return [