This commit is contained in:
Hillel Coren 2018-12-17 16:40:23 +02:00
parent dcc49b9168
commit 2691d706a1
3 changed files with 7 additions and 1 deletions

View File

@ -84,6 +84,7 @@ class ProjectList extends StatelessWidget {
user: viewModel.user, user: viewModel.user,
filter: viewModel.filter, filter: viewModel.filter,
project: project, project: project,
client: viewModel.clientMap[project.clientId],
onEntityAction: (EntityAction action) { onEntityAction: (EntityAction action) {
if (action == EntityAction.more) { if (action == EntityAction.more) {
_showMenu(context, project); _showMenu(context, project);

View File

@ -15,6 +15,7 @@ class ProjectListItem extends StatelessWidget {
//@required this.onCheckboxChanged, //@required this.onCheckboxChanged,
@required this.project, @required this.project,
@required this.filter, @required this.filter,
@required this.client,
}); });
final UserEntity user; final UserEntity user;
@ -23,6 +24,7 @@ class ProjectListItem extends StatelessWidget {
final GestureTapCallback onLongPress; final GestureTapCallback onLongPress;
//final ValueChanged<bool> onCheckboxChanged; //final ValueChanged<bool> onCheckboxChanged;
final ProjectEntity project; final ProjectEntity project;
final ClientEntity client;
final String filter; final String filter;
static final projectItemKey = (int id) => Key('__project_item_${id}__'); static final projectItemKey = (int id) => Key('__project_item_${id}__');
@ -32,7 +34,7 @@ class ProjectListItem extends StatelessWidget {
final filterMatch = filter != null && filter.isNotEmpty final filterMatch = filter != null && filter.isNotEmpty
? project.matchesFilterValue(filter) ? project.matchesFilterValue(filter)
: null; : null;
final subtitle = filterMatch ?? project.privateNotes; final subtitle = filterMatch ?? client.displayName;
return DismissibleEntity( return DismissibleEntity(
user: user, user: user,

View File

@ -34,6 +34,7 @@ class ProjectListVM {
@required this.user, @required this.user,
@required this.projectList, @required this.projectList,
@required this.projectMap, @required this.projectMap,
@required this.clientMap,
@required this.filter, @required this.filter,
@required this.isLoading, @required this.isLoading,
@required this.isLoaded, @required this.isLoaded,
@ -60,6 +61,7 @@ class ProjectListVM {
projectList: memoizedFilteredProjectList(state.projectState.map, projectList: memoizedFilteredProjectList(state.projectState.map,
state.projectState.list, state.projectListState, state.clientState.map), state.projectState.list, state.projectListState, state.clientState.map),
projectMap: state.projectState.map, projectMap: state.projectState.map,
clientMap: state.clientState.map,
isLoading: state.isLoading, isLoading: state.isLoading,
isLoaded: state.projectState.isLoaded, isLoaded: state.projectState.isLoaded,
filter: state.projectUIState.listUIState.filter, filter: state.projectUIState.listUIState.filter,
@ -100,6 +102,7 @@ class ProjectListVM {
final UserEntity user; final UserEntity user;
final List<int> projectList; final List<int> projectList;
final BuiltMap<int, ProjectEntity> projectMap; final BuiltMap<int, ProjectEntity> projectMap;
final BuiltMap<int, ClientEntity> clientMap;
final String filter; final String filter;
final bool isLoading; final bool isLoading;
final bool isLoaded; final bool isLoaded;