Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bulk item printing #82

Merged
merged 11 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/business_logic/item_action.dart
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ class PrintAction extends ItemAction {
handle(BuildContext context, InventoryItem item) {
showDialog(
context: context,
builder: (context) => PrintDialog(item: item),
builder: (context) => PrintDialog(items: [item]),
);
}

Expand Down
11 changes: 6 additions & 5 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -58,25 +58,26 @@ class _MyAppState extends State<MyApp> {
stream: _authStream,
builder: (context, snapshot) {
final user = snapshot.data;

var userEmailValid = user?.email?.endsWith('vehikl.com') ?? false;

if (!userEmailValid) {
return SignInPage(
error: user == null
? null
: 'Please log in with your Vehikl email',
);
}

return FutureBuilder<IdTokenResult>(
future: user!.getIdTokenResult(true),
builder: (context, snap) {
if (!snap.hasData) return Scaffold(body: Container());

final isAdmin = snap.data?.claims?['role'] == 'admin';
return Provider<UserRole>(
create: (context) => isAdmin ? UserRole.admin : UserRole.user,
create: (context) =>
isAdmin ? UserRole.admin : UserRole.user,
child: HomePage(),
);
},
Expand Down
5 changes: 3 additions & 2 deletions lib/pages/home_page/inventory_view/filters/search_field.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';

class SearchField extends StatelessWidget {
final void Function(String) onChanged;
final void Function(String)? onChanged;
final TextEditingController searchFieldController;

const SearchField({
Expand All @@ -24,12 +24,13 @@ class SearchField extends StatelessWidget {
icon: Icon(
searchFieldController.text.isEmpty ? Icons.search : Icons.clear),
onPressed: () {
onChanged('');
onChanged?.call('');
searchFieldController.clear();
},
),
),
onChanged: onChanged,
enabled: onChanged != null,
);
}
}
95 changes: 43 additions & 52 deletions lib/pages/home_page/inventory_view/inventory_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ import 'package:spare_parts/entities/inventory_item.dart';
import 'package:spare_parts/pages/home_page/inventory_view/filters/available_items_filter.dart';
import 'package:spare_parts/pages/home_page/inventory_view/filters/search_field.dart';
import 'package:spare_parts/pages/home_page/inventory_view/filters/user_filter.dart';
import 'package:spare_parts/pages/home_page/inventory_view/inventory_view_list.dart';
import 'package:spare_parts/services/repositories/repositories.dart';
import 'package:spare_parts/utilities/constants.dart';
import 'package:spare_parts/widgets/empty_list_state.dart';
import 'package:spare_parts/widgets/error_container.dart';
import 'package:spare_parts/widgets/inputs/multiselect_button.dart';
import 'package:spare_parts/widgets/inventory_list_item.dart';
import 'package:spare_parts/widgets/inventory_list_item_loading.dart';

class InventoryView extends StatefulWidget {
Expand All @@ -25,6 +24,7 @@ class _InventoryViewState extends State<InventoryView> {
late bool _showOnlyAvailableItems;
String _searchQuery = '';
final searchFieldController = TextEditingController();
bool _inSelectionMode = false;

bool get isAdmin => context.read<UserRole>() == UserRole.admin;

Expand All @@ -47,6 +47,10 @@ class _InventoryViewState extends State<InventoryView> {
setState(() => _showOnlyAvailableItems = !_showOnlyAvailableItems);
}

void _handleSelectionModeChanged(bool inSelectionMode) {
setState(() => _inSelectionMode = inSelectionMode);
}

@override
Widget build(BuildContext context) {
final inventoryItemRepository = context.read<InventoryItemRepository>();
Expand All @@ -61,44 +65,48 @@ class _InventoryViewState extends State<InventoryView> {
padding: const EdgeInsets.all(8.0),
child: SearchField(
searchFieldController: searchFieldController,
onChanged: (value) => setState(() {
_searchQuery = value;
}),
onChanged: _inSelectionMode
? null
: (value) => setState(() {
_searchQuery = value;
}),
),
),
),
],
),
SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
children: [
MultiselectButton(
buttonLabel: 'Item Types',
values: itemTypes.keys.toList(),
selectedValues: _selectedItemTypes,
icon: Icons.filter_list,
leadingBuilder: (itemType) =>
Icon(itemTypes[itemType] ?? itemTypes['Other']!),
onConfirm: _handleTypesFilterChanged,
),
if (isAdmin) ...[
SizedBox(width: 10),
UserFilter(
if (!_inSelectionMode) ...[
SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
children: [
MultiselectButton(
buttonLabel: 'Item Types',
values: itemTypes.keys.toList(),
selectedValues: _selectedItemTypes,
icon: Icons.filter_list,
selectedUsers: _selectedBorrowers,
onChanged: _handleBorrowersFilterChanged,
),
SizedBox(width: 10),
AvailableItemsFilter(
value: _showOnlyAvailableItems,
onPressed: _handleAvailableItemsFilterChanged,
leadingBuilder: (itemType) =>
Icon(itemTypes[itemType] ?? itemTypes['Other']!),
onConfirm: _handleTypesFilterChanged,
),
if (isAdmin) ...[
SizedBox(width: 10),
UserFilter(
icon: Icons.filter_list,
selectedUsers: _selectedBorrowers,
onChanged: _handleBorrowersFilterChanged,
),
SizedBox(width: 10),
AvailableItemsFilter(
value: _showOnlyAvailableItems,
onPressed: _handleAvailableItemsFilterChanged,
),
],
],
],
),
),
),
Divider(),
Divider(),
],
Expanded(
child: StreamBuilder<List<InventoryItem>>(
stream: inventoryItemRepository.getItemsStream(
Expand Down Expand Up @@ -128,27 +136,10 @@ class _InventoryViewState extends State<InventoryView> {

final items = snapshot.data!;

if (items.isEmpty) {
return EmptyListState(
message: "No inventory items to display...",
);
}

final filteredItems = items.where((item) {
List<String?> properties = [item.name, item.borrower?.name];
return properties.where((property) => property != null).any(
(property) => property!
.toLowerCase()
.contains(_searchQuery.toLowerCase()));
}).toList();

filteredItems.sort();

return ListView(
children: filteredItems
.map((item) =>
InventoryListItem(item: item, showBorrower: true))
.toList(),
return InventoryViewList(
items: items,
searchQuery: _searchQuery,
onSelectionModeChanged: _handleSelectionModeChanged,
);
},
),
Expand Down
113 changes: 113 additions & 0 deletions lib/pages/home_page/inventory_view/inventory_view_list.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
import 'package:flutter/material.dart';
import 'package:spare_parts/entities/inventory_item.dart';
import 'package:spare_parts/pages/home_page/inventory_view/selection_actions.dart';
import 'package:spare_parts/widgets/dialogs/print_dialog/print_dialog_mobile.dart'
if (dart.library.html) 'package:spare_parts/widgets/dialogs/print_dialog/print_dialog_web.dart';
import 'package:spare_parts/widgets/empty_list_state.dart';
import 'package:spare_parts/widgets/inventory_list_item.dart';

class InventoryViewList extends StatefulWidget {
final List<InventoryItem> items;
final String? searchQuery;
final void Function(bool)? onSelectionModeChanged;

const InventoryViewList({
super.key,
required this.items,
this.searchQuery,
this.onSelectionModeChanged,
});

@override
State<InventoryViewList> createState() => _InventoryViewListState();
}

class _InventoryViewListState extends State<InventoryViewList> {
final List<String> _selectedItemIds = [];
bool get _inSelectionMode => _selectedItemIds.isNotEmpty;

void _handleSelectItem(String itemId) {
final previousListEmpty = _selectedItemIds.isEmpty;
setState(() {
if (_selectedItemIds.contains(itemId)) {
_selectedItemIds.remove(itemId);
} else {
_selectedItemIds.add(itemId);
}
});
if (_selectedItemIds.isEmpty != previousListEmpty) {
widget.onSelectionModeChanged?.call(_inSelectionMode);
}
}

void _handleSelectAll() {
setState(() {
_selectedItemIds.clear();
_selectedItemIds.addAll(widget.items.map((item) => item.id));
});
}

void _handleDeselectAll() {
setState(() {
_selectedItemIds.clear();
});
widget.onSelectionModeChanged?.call(false);
}

void _handlePrintAll() {
final selectedItems = widget.items
.where((item) => _selectedItemIds.contains(item.id))
.toList();
showDialog(
context: context,
builder: (_) => PrintDialog(items: selectedItems),
);
}

@override
Widget build(BuildContext context) {
if (widget.items.isEmpty) {
return EmptyListState(
message: "No inventory items to display...",
);
}

final filteredItems = widget.items.where((item) {
if (widget.searchQuery == null) {
return true;
}

List<String?> properties = [item.name, item.borrower?.name];
return properties.where((property) => property != null).any((property) =>
property!.toLowerCase().contains(widget.searchQuery!.toLowerCase()));
}).toList();

filteredItems.sort();

return Column(
mainAxisSize: MainAxisSize.min,
children: [
if (_inSelectionMode) ...[
SelectionActions(
onSelectAll: _handleSelectAll,
onDeselectAll: _handleDeselectAll,
onPrintAll: _handlePrintAll,
),
Divider(),
],
ListView(
shrinkWrap: true,
children: filteredItems
.map((item) => InventoryListItem(
item: item,
showBorrower: true,
selectable: _inSelectionMode,
selected: _selectedItemIds.contains(item.id),
onSelected: _handleSelectItem,
))
.toList(),
),
],
);
}
}
27 changes: 27 additions & 0 deletions lib/pages/home_page/inventory_view/selection_actions.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import 'package:flutter/material.dart';

class SelectionActions extends StatelessWidget {
final void Function() onSelectAll;
final void Function() onDeselectAll;
final void Function() onPrintAll;

const SelectionActions({
Key? key,
required this.onSelectAll,
required this.onDeselectAll,
required this.onPrintAll,
}) : super(key: key);

@override
Widget build(BuildContext context) {
return Row(
children: [
TextButton(onPressed: onSelectAll, child: Text('Select All')),
SizedBox(width: 8),
TextButton(onPressed: onDeselectAll, child: Text('Deselect All')),
Spacer(),
ElevatedButton(onPressed: onPrintAll, child: Text('Print Labels')),
],
);
}
}
6 changes: 3 additions & 3 deletions lib/widgets/dialogs/print_dialog/print_dialog_mobile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
import 'package:spare_parts/entities/inventory_item.dart';

class PrintDialog extends StatelessWidget {
final InventoryItem item;
const PrintDialog({super.key, required this.item});
final List<InventoryItem> items;

const PrintDialog({super.key, required this.items});

@override
Widget build(BuildContext context) {
Expand Down
Loading
Loading