datagrid & sexes refact

vkh-cr · Dec 5, 2023 · f26295e · f26295e
1 parent 2c28899
commit f26295e
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 12 deletions.
diff --git a/lib/dataGrids/AdministrationHeader.dart b/lib/dataGrids/AdministrationHeader.dart
@@ -2,7 +2,7 @@ import 'package:avapp/dataGrids/SingleTableDataGrid.dart';
 import 'package:flutter/material.dart';
 import 'package:pluto_grid/pluto_grid.dart';
 
-import '../models/PlutoAbstract.dart';
+import 'PlutoAbstract.dart';
 import '../services/DialogHelper.dart';
 import '../services/ToastHelper.dart';
 

diff --git a/lib/services/DataGridHelper.dart → lib/dataGrids/DataGridHelper.dart b/lib/services/DataGridHelper.dart → lib/dataGrids/DataGridHelper.dart
diff --git a/lib/models/PlutoAbstract.dart → lib/dataGrids/PlutoAbstract.dart b/lib/models/PlutoAbstract.dart → lib/dataGrids/PlutoAbstract.dart
diff --git a/lib/dataGrids/SingleTableDataGrid.dart b/lib/dataGrids/SingleTableDataGrid.dart
@@ -2,7 +2,7 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:pluto_grid/pluto_grid.dart';
 
-import '../models/PlutoAbstract.dart';
+import 'PlutoAbstract.dart';
 import 'AdministrationHeader.dart';
 
 enum DataGridFirstColumn{

diff --git a/lib/models/EventModel.dart b/lib/models/EventModel.dart
@@ -1,9 +1,9 @@
 import 'package:avapp/models/PlaceModel.dart';
-import 'package:avapp/services/DataGridHelper.dart';
+import 'package:avapp/dataGrids/DataGridHelper.dart';
 import 'package:intl/intl.dart';
 import 'package:pluto_grid/pluto_grid.dart';
 
-import '../models/PlutoAbstract.dart';
+import '../dataGrids/PlutoAbstract.dart';
 import '../services/DataService.dart';
 
 class EventModel extends IPlutoRowModel {

diff --git a/lib/models/ExclusiveGroupModel.dart b/lib/models/ExclusiveGroupModel.dart
@@ -1,6 +1,6 @@
 import 'package:pluto_grid/pluto_grid.dart';
 
-import '../models/PlutoAbstract.dart';
+import '../dataGrids/PlutoAbstract.dart';
 import '../services/DataService.dart';
 
 class ExclusiveGroupModel extends IPlutoRowModel {

diff --git a/lib/models/InformationModel.dart b/lib/models/InformationModel.dart
@@ -1,7 +1,7 @@
 import 'package:avapp/services/DataService.dart';
 import 'package:pluto_grid/pluto_grid.dart';
 
-import 'PlutoAbstract.dart';
+import '../dataGrids/PlutoAbstract.dart';
 
 
 class InformationModel extends IPlutoRowModel {

diff --git a/lib/models/PlaceModel.dart b/lib/models/PlaceModel.dart
@@ -1,7 +1,7 @@
 import 'package:avapp/services/DataService.dart';
 import 'package:pluto_grid/pluto_grid.dart';
 
-import 'PlutoAbstract.dart';
+import '../dataGrids/PlutoAbstract.dart';
 
 class PlaceModel extends IPlutoRowModel {
   dynamic latLng;

diff --git a/lib/models/UserGroupInfoModel.dart b/lib/models/UserGroupInfoModel.dart
@@ -1,6 +1,6 @@
 import 'package:pluto_grid/pluto_grid.dart';
 
-import '../models/PlutoAbstract.dart';
+import '../dataGrids/PlutoAbstract.dart';
 import '../services/DataService.dart';
 import 'PlaceModel.dart';
 import 'UserInfoModel.dart';

diff --git a/lib/models/UserInfoModel.dart b/lib/models/UserInfoModel.dart
@@ -4,7 +4,7 @@ import 'package:intl/intl.dart';
 import 'package:pluto_grid/pluto_grid.dart';
 
 import '../services/DataService.dart';
-import 'PlutoAbstract.dart';
+import '../dataGrids/PlutoAbstract.dart';
 
 class UserInfoModel extends IPlutoRowModel {
   String? id;
@@ -39,6 +39,7 @@ class UserInfoModel extends IPlutoRowModel {
 
   PlaceModel? place;
 
+  static const sexes = ["male", "female"];
 
   static const migrateColumns =
   {

diff --git a/lib/pages/AdministrationPage.dart b/lib/pages/AdministrationPage.dart
@@ -5,7 +5,7 @@ import 'package:avapp/models/PlaceModel.dart';
 import 'package:avapp/models/UserGroupInfoModel.dart';
 import 'package:avapp/models/UserInfoModel.dart';
 import 'package:avapp/pages/MapPage.dart';
-import 'package:avapp/services/DataGridHelper.dart';
+import 'package:avapp/dataGrids/DataGridHelper.dart';
 import 'package:avapp/services/DataService.dart';
 import 'package:avapp/services/MailerSendHelper.dart';
 import 'package:avapp/services/MapIconService.dart';
@@ -127,8 +127,8 @@ class _AdministrationPageState extends State<AdministrationPage> {
           PlutoColumn(
             title: "Pohlaví",
             field: UserInfoModel.sexColumn,
-            type: PlutoColumnType.select(["male", "female"]),
-            formatter: (value) => DataGridHelper.returnQuestionMarkOnInvalid(value, ["male", "female"]),
+            type: PlutoColumnType.select(UserInfoModel.sexes),
+            formatter: (value) => DataGridHelper.returnQuestionMarkOnInvalid(value, UserInfoModel.sexes),
             applyFormatterInEditing: true,
             width: 100,
           ),