Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Improve documents

This commit is contained in:
Hillel Coren 2023-08-09 19:08:35 +03:00
parent aa7496714f
commit 3eac70a4e6
3 changed files with 82 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/redux/document/document_reducer.dart
View File

@ -23,6 +23,7 @@ final forceSelectedReducer = combineReducers<bool>([
TypedReducer<bool, ViewDocument>((completer, action) => true),
TypedReducer<bool, ViewDocumentList>((completer, action) => false),
TypedReducer<bool, FilterDocumentsByState>((completer, action) => false),
TypedReducer<bool, FilterDocumentsByStatus>((completer, action) => false),
TypedReducer<bool, FilterDocuments>((completer, action) => false),
TypedReducer<bool, FilterDocumentsByCustom1>((completer, action) => false),
TypedReducer<bool, FilterDocumentsByCustom2>((completer, action) => false),
@ -43,6 +44,7 @@ Reducer<String> selectedIdReducer = combineReducers([
TypedReducer<String, SortDocuments>((selectedId, action) => ''),
TypedReducer<String, FilterDocuments>((selectedId, action) => ''),
TypedReducer<String, FilterDocumentsByState>((selectedId, action) => ''),
TypedReducer<String, FilterDocumentsByStatus>((selectedId, action) => ''),
TypedReducer<String, FilterDocumentsByCustom1>((selectedId, action) => ''),
TypedReducer<String, FilterDocumentsByCustom2>((selectedId, action) => ''),
TypedReducer<String, FilterDocumentsByCustom3>((selectedId, action) => ''),
@ -68,6 +70,7 @@ DocumentEntity _updateEditing(DocumentEntity document, dynamic action) {
final documentListReducer = combineReducers<ListUIState>([
TypedReducer<ListUIState, SortDocuments>(_sortDocuments),
TypedReducer<ListUIState, FilterDocumentsByState>(_filterDocumentsByState),
TypedReducer<ListUIState, FilterDocumentsByStatus>(_filterDocumentsByStatus),
TypedReducer<ListUIState, FilterDocuments>(_filterDocuments),
TypedReducer<ListUIState, FilterDocumentsByCustom1>(
_filterDocumentsByCustom1),
@ -125,6 +128,17 @@ ListUIState _filterDocumentsByState(
}
}
ListUIState _filterDocumentsByStatus(
ListUIState documentListState, FilterDocumentsByStatus action) {
if (documentListState.statusFilters.contains(action.status)) {
return documentListState
.rebuild((b) => b..statusFilters.remove(action.status));
} else {
return documentListState
.rebuild((b) => b..statusFilters.add(action.status));
}
}
ListUIState _filterDocuments(
ListUIState documentListState, FilterDocuments action) {
return documentListState.rebuild((b) => b

122
lib/ui/app/list_filter.dart
View File

@ -142,69 +142,71 @@ class _ListFilterState extends State<ListFilter> {
),
),
),
if (isDesktop(context) &&
!isDashboardOrSettings &&
widget.onSelectedState != null) ...[
SizedBox(width: 8),
Flexible(
child: DropDownMultiSelect(
onChanged: (List<dynamic> selected) {
final stateFilters = state
if (isDesktop(context) && !isDashboardOrSettings) ...[
if (widget.onSelectedState != null) ...[
SizedBox(width: 8),
Flexible(
child: DropDownMultiSelect(
onChanged: (List<dynamic> selected) {
final stateFilters = state
.getListState(widget.entityType)
.stateFilters
.toList();
final added = selected
.where((dynamic e) => !stateFilters.contains(e));
final removed = stateFilters
.where((dynamic e) => !selected.contains(e));
for (var state in added) {
widget.onSelectedState(state, true);
}
for (var state in removed) {
widget.onSelectedState(state, false);
}
},
options: EntityState.values.toList(),
decoration: InputDecoration(
border: OutlineInputBorder(borderSide: BorderSide()),
enabledBorder: state.prefState.enableDarkMode
? null
: OutlineInputBorder(
borderSide: BorderSide(color: Colors.white)),
isDense: true,
contentPadding:
EdgeInsets.symmetric(vertical: 13, horizontal: 10),
),
selectedValues: state
.getListState(widget.entityType)
.stateFilters
.toList();
final added =
selected.where((dynamic e) => !stateFilters.contains(e));
final removed =
stateFilters.where((dynamic e) => !selected.contains(e));
for (var state in added) {
widget.onSelectedState(state, true);
}
for (var state in removed) {
widget.onSelectedState(state, false);
}
},
options: EntityState.values.toList(),
decoration: InputDecoration(
border: OutlineInputBorder(borderSide: BorderSide()),
enabledBorder: state.prefState.enableDarkMode
? null
: OutlineInputBorder(
borderSide: BorderSide(color: Colors.white)),
isDense: true,
contentPadding:
EdgeInsets.symmetric(vertical: 13, horizontal: 10),
),
selectedValues:
state.getListState(widget.entityType).stateFilters.toList(),
whenEmpty: localization.all,
menuItembuilder: (dynamic value) {
final state = value as EntityState;
return Text(
localization.lookup(state.name),
overflow: TextOverflow.clip,
maxLines: 1,
);
},
childBuilder: (selected) {
return Align(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 10),
child: Text(
selected.isNotEmpty
? selected
.map<String>((dynamic value) => localization
.lookup((value as EntityState).name))
.join(', ')
: localization.all,
style: TextStyle(fontSize: 15),
.toList(),
whenEmpty: localization.all,
menuItembuilder: (dynamic value) {
final state = value as EntityState;
return Text(
localization.lookup(state.name),
overflow: TextOverflow.clip,
maxLines: 1,
);
},
childBuilder: (selected) {
return Align(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 10),
child: Text(
selected.isNotEmpty
? selected
.map<String>((dynamic value) => localization
.lookup((value as EntityState).name))
.join(', ')
: localization.all,
style: TextStyle(fontSize: 15),
),
),
),
alignment: Alignment.centerLeft);
}),
),
alignment: Alignment.centerLeft);
}),
),
],
if (widget.statuses != null) ...[
SizedBox(width: 8),
Flexible(

11
lib/ui/document/document_screen.dart
View File

@ -7,6 +7,7 @@ import 'package:invoiceninja_flutter/constants.dart';
// Project imports:
import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/data/models/static/document_status_model.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/document/document_actions.dart';
@ -36,27 +37,27 @@ class DocumentScreen extends StatelessWidget {
final localization = AppLocalization.of(context);
final statuses = [
InvoiceStatusEntity().rebuild(
DocumentStatusEntity().rebuild(
(b) => b
..id = kDocumentStatusPublic
..name = localization.public,
),
InvoiceStatusEntity().rebuild(
DocumentStatusEntity().rebuild(
(b) => b
..id = kDocumentStatusPrivate
..name = localization.private,
),
InvoiceStatusEntity().rebuild(
DocumentStatusEntity().rebuild(
(b) => b
..id = kDocumentStatusImage
..name = localization.image,
),
InvoiceStatusEntity().rebuild(
DocumentStatusEntity().rebuild(
(b) => b
..id = kDocumentStatusPDF
..name = localization.pdf,
),
InvoiceStatusEntity().rebuild(
DocumentStatusEntity().rebuild(
(b) => b
..id = kDocumentStatusOther
..name = localization.other,