diff --git a/lib/redux/purchase_order/purchase_order_reducer.dart b/lib/redux/purchase_order/purchase_order_reducer.dart index c7e298512..f15635795 100644 --- a/lib/redux/purchase_order/purchase_order_reducer.dart +++ b/lib/redux/purchase_order/purchase_order_reducer.dart @@ -14,15 +14,14 @@ import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState purchaseOrderUIReducer( PurchaseOrderUIState state, dynamic action) { return state.rebuild((b) => b - ..listUIState - .replace(purchaseOrderListReducer(state.listUIState, action)) - ..editing.replace(editingReducer(state.editing, action)) - ..editingItemIndex = editingItemReducer(state.editingItemIndex, action) - ..selectedId = selectedIdReducer(state.selectedId, action) - ..forceSelected = forceSelectedReducer(state.forceSelected, action) - ..tabIndex = tabIndexReducer(state.tabIndex, action) - //..historyActivityId = historyActivityIdReducer(state.historyActivityId, action) - ); + ..listUIState.replace(purchaseOrderListReducer(state.listUIState, action)) + ..editing.replace(editingReducer(state.editing, action)) + ..editingItemIndex = editingItemReducer(state.editingItemIndex, action) + ..selectedId = selectedIdReducer(state.selectedId, action) + ..forceSelected = forceSelectedReducer(state.forceSelected, action) + ..tabIndex = tabIndexReducer(state.tabIndex, action) + ..historyActivityId = + historyActivityIdReducer(state.historyActivityId, action)); } final forceSelectedReducer = combineReducers([ diff --git a/lib/redux/purchase_order/purchase_order_state.dart b/lib/redux/purchase_order/purchase_order_state.dart index 259ad0e46..493ef69bd 100644 --- a/lib/redux/purchase_order/purchase_order_state.dart +++ b/lib/redux/purchase_order/purchase_order_state.dart @@ -76,6 +76,10 @@ abstract class PurchaseOrderUIState extends Object @BuiltValueField(serialize: false) int get editingItemIndex; + @nullable + @BuiltValueField(serialize: false) + String get historyActivityId; + @override bool get isCreatingNew => editing.isNew; diff --git a/lib/redux/purchase_order/purchase_order_state.g.dart b/lib/redux/purchase_order/purchase_order_state.g.dart index 53b7e6caf..7a6eec661 100644 --- a/lib/redux/purchase_order/purchase_order_state.g.dart +++ b/lib/redux/purchase_order/purchase_order_state.g.dart @@ -266,6 +266,8 @@ class _$PurchaseOrderUIState extends PurchaseOrderUIState { @override final int editingItemIndex; @override + final String historyActivityId; + @override final ListUIState listUIState; @override final String selectedId; @@ -285,6 +287,7 @@ class _$PurchaseOrderUIState extends PurchaseOrderUIState { _$PurchaseOrderUIState._( {this.editing, this.editingItemIndex, + this.historyActivityId, this.listUIState, this.selectedId, this.forceSelected, @@ -313,6 +316,7 @@ class _$PurchaseOrderUIState extends PurchaseOrderUIState { return other is PurchaseOrderUIState && editing == other.editing && editingItemIndex == other.editingItemIndex && + historyActivityId == other.historyActivityId && listUIState == other.listUIState && selectedId == other.selectedId && forceSelected == other.forceSelected && @@ -330,8 +334,10 @@ class _$PurchaseOrderUIState extends PurchaseOrderUIState { $jc( $jc( $jc( - $jc($jc(0, editing.hashCode), - editingItemIndex.hashCode), + $jc( + $jc($jc(0, editing.hashCode), + editingItemIndex.hashCode), + historyActivityId.hashCode), listUIState.hashCode), selectedId.hashCode), forceSelected.hashCode), @@ -345,6 +351,7 @@ class _$PurchaseOrderUIState extends PurchaseOrderUIState { return (newBuiltValueToStringHelper('PurchaseOrderUIState') ..add('editing', editing) ..add('editingItemIndex', editingItemIndex) + ..add('historyActivityId', historyActivityId) ..add('listUIState', listUIState) ..add('selectedId', selectedId) ..add('forceSelected', forceSelected) @@ -369,6 +376,11 @@ class PurchaseOrderUIStateBuilder set editingItemIndex(int editingItemIndex) => _$this._editingItemIndex = editingItemIndex; + String _historyActivityId; + String get historyActivityId => _$this._historyActivityId; + set historyActivityId(String historyActivityId) => + _$this._historyActivityId = historyActivityId; + ListUIStateBuilder _listUIState; ListUIStateBuilder get listUIState => _$this._listUIState ??= new ListUIStateBuilder(); @@ -405,6 +417,7 @@ class PurchaseOrderUIStateBuilder if ($v != null) { _editing = $v.editing?.toBuilder(); _editingItemIndex = $v.editingItemIndex; + _historyActivityId = $v.historyActivityId; _listUIState = $v.listUIState.toBuilder(); _selectedId = $v.selectedId; _forceSelected = $v.forceSelected; @@ -435,6 +448,7 @@ class PurchaseOrderUIStateBuilder new _$PurchaseOrderUIState._( editing: _editing?.build(), editingItemIndex: editingItemIndex, + historyActivityId: historyActivityId, listUIState: listUIState.build(), selectedId: selectedId, forceSelected: forceSelected, diff --git a/lib/ui/purchase_order/purchase_order_pdf_vm.dart b/lib/ui/purchase_order/purchase_order_pdf_vm.dart index b13b0cbf9..d1c3e1b61 100644 --- a/lib/ui/purchase_order/purchase_order_pdf_vm.dart +++ b/lib/ui/purchase_order/purchase_order_pdf_vm.dart @@ -56,7 +56,7 @@ class PurchaseOrderPdfVM extends EntityPdfVM { return PurchaseOrderPdfVM( state: state, invoice: invoice, - //activityId: purchaseOrderUIState.historyActivityId, + activityId: purchaseOrderUIState.historyActivityId, ); } }