From 8361e09a7a374ec5a83285e93bb68aada1485cf6 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 6 Oct 2019 16:25:20 +0300 Subject: [PATCH] Settings --- lib/ui/group/group_list.dart | 5 +++-- lib/ui/group/group_list_vm.dart | 6 +++--- stubs/ui/stub/stub_list | 6 +++--- stubs/ui/stub/stub_list_vm | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/ui/group/group_list.dart b/lib/ui/group/group_list.dart index bbde7098b..5cd2f1435 100644 --- a/lib/ui/group/group_list.dart +++ b/lib/ui/group/group_list.dart @@ -43,15 +43,16 @@ class GroupList extends StatelessWidget { itemBuilder: (BuildContext context, index) { final groupId = viewModel.groupList[index]; final group = viewModel.groupMap[groupId]; - final user = viewModel.user; + final userCompany = viewModel.userCompany; void showDialog() => showEntityActionsDialog( + userCompany: userCompany, entity: group, context: context, onEntityAction: viewModel.onEntityAction); return GroupListItem( - user: viewModel.user, + user: viewModel.userCompany.user, filter: viewModel.filter, group: group, onTap: () => viewModel.onGroupTap(context, group), diff --git a/lib/ui/group/group_list_vm.dart b/lib/ui/group/group_list_vm.dart index fc15c1c7b..0379cce2d 100644 --- a/lib/ui/group/group_list_vm.dart +++ b/lib/ui/group/group_list_vm.dart @@ -34,7 +34,7 @@ class GroupListBuilder extends StatelessWidget { class GroupListVM { GroupListVM({ - @required this.user, + @required this.userCompany, @required this.groupList, @required this.groupMap, @required this.filter, @@ -62,7 +62,7 @@ class GroupListVM { final state = store.state; return GroupListVM( - user: state.user, + userCompany: state.userCompany, listState: state.groupListState, groupList: memoizedFilteredGroupList( state.groupState.map, state.groupState.list, state.groupListState), @@ -84,7 +84,7 @@ class GroupListVM { ); } - final UserEntity user; + final UserCompanyEntity userCompany; final List groupList; final BuiltMap groupMap; final ListUIState listState; diff --git a/stubs/ui/stub/stub_list b/stubs/ui/stub/stub_list index a2115433b..0d56eac8e 100644 --- a/stubs/ui/stub/stub_list +++ b/stubs/ui/stub/stub_list @@ -46,16 +46,16 @@ class StubList extends StatelessWidget { itemBuilder: (BuildContext context, index) { final stubId = viewModel.stubList[index]; final stub = viewModel.stubMap[stubId]; - final user = viewModel.user; + final userCompany = viewModel.userCompany; void showDialog() => showEntityActionsDialog( + userCompany: userCompany, entity: stub, context: context, onEntityAction: viewModel.onEntityAction); - return StubListItem( - user: viewModel.user, + user: viewModel.userCompany.user, filter: viewModel.filter, stub: stub, onTap: () => diff --git a/stubs/ui/stub/stub_list_vm b/stubs/ui/stub/stub_list_vm index 956e74b28..128dceecd 100644 --- a/stubs/ui/stub/stub_list_vm +++ b/stubs/ui/stub/stub_list_vm @@ -34,7 +34,7 @@ class StubListBuilder extends StatelessWidget { class StubListVM { StubListVM({ - @required this.user, + @required this.userCompany, @required this.stubList, @required this.stubMap, @required this.filter, @@ -62,7 +62,7 @@ class StubListVM { final state = store.state; return StubListVM( - user: state.user, + userCompany: state.userCompany, listState: state.stubListState, stubList: memoizedFilteredStubList(state.stubState.map, state.stubState.list, state.stubListState), @@ -86,7 +86,7 @@ class StubListVM { ); } - final UserEntity user; + final UserCompanyEntity userCompany; final List stubList; final BuiltMap stubMap; final ListUIState listState;