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

Settings

This commit is contained in:
Hillel Coren 2019-10-06 16:31:19 +03:00
parent bd7b65d83b
commit 773af4020e
7 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/data/models/group_model.dart
View File

@ -65,19 +65,14 @@ abstract class GroupEntity extends Object
SettingsEntity get settings; SettingsEntity get settings;
int compareTo(GroupEntity group, String sortField, bool sortAscending) { int compareTo(GroupEntity group, String sortField, bool sortAscending) {
int response = 0; const int response = 0;
final GroupEntity groupA = sortAscending ? this : group; final GroupEntity groupA = sortAscending ? this : group;
final GroupEntity groupB = sortAscending ? group : this; final GroupEntity groupB = sortAscending ? group : this;
switch (sortField) { switch (sortField) {
/* case GroupFields.name:
case GroupFields.balance: //response = groupA.balance.compareTo(groupB.balance);
response = groupA.balance.compareTo(groupB.balance); //break;
break;
case GroupFields.updatedAt:
response = groupA.updatedAt.compareTo(groupB.updatedAt);
break;
*/
} }
if (response == 0) { if (response == 0) {

1
lib/main.dart
View File

@ -57,7 +57,6 @@ import 'package:invoiceninja_flutter/redux/quote/quote_middleware.dart';
import 'package:invoiceninja_flutter/ui/group/group_screen.dart'; import 'package:invoiceninja_flutter/ui/group/group_screen.dart';
import 'package:invoiceninja_flutter/ui/group/edit/group_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/group/edit/group_edit_vm.dart';
import 'package:invoiceninja_flutter/ui/group/view/group_view_vm.dart'; import 'package:invoiceninja_flutter/ui/group/view/group_view_vm.dart';
import 'package:invoiceninja_flutter/redux/group/group_actions.dart';
import 'package:invoiceninja_flutter/redux/group/group_middleware.dart'; import 'package:invoiceninja_flutter/redux/group/group_middleware.dart';
void main({bool isTesting = false}) async { void main({bool isTesting = false}) async {

2
lib/redux/group/group_actions.dart
View File

@ -239,8 +239,6 @@ class FilterGroupsByEntity implements PersistUI {
void handleGroupAction( void handleGroupAction(
BuildContext context, GroupEntity group, EntityAction action) { BuildContext context, GroupEntity group, EntityAction action) {
final store = StoreProvider.of<AppState>(context); final store = StoreProvider.of<AppState>(context);
final state = store.state;
final CompanyEntity company = state.selectedCompany;
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
switch (action) { switch (action) {

1
lib/redux/group/group_reducer.dart
View File

@ -1,6 +1,5 @@
import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart';
import 'package:redux/redux.dart'; import 'package:redux/redux.dart';
import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart';
import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart';
import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';

1
lib/redux/group/group_selectors.dart
View File

@ -1,7 +1,6 @@
import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart';
import 'package:memoize/memoize.dart'; import 'package:memoize/memoize.dart';
import 'package:built_collection/built_collection.dart'; import 'package:built_collection/built_collection.dart';
import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
var memoizedDropdownGroupList = memo3((BuiltMap<String, GroupEntity> groupMap, var memoizedDropdownGroupList = memo3((BuiltMap<String, GroupEntity> groupMap,

2
lib/ui/group/edit/group_edit.dart
View File

@ -33,7 +33,7 @@ class _GroupEditState extends State<GroupEdit> {
_controllers.forEach((controller) => controller.removeListener(_onChanged)); _controllers.forEach((controller) => controller.removeListener(_onChanged));
final group = widget.viewModel.group; //final group = widget.viewModel.group;
// STARTER: read value - do not remove comment // STARTER: read value - do not remove comment
_controllers.forEach((controller) => controller.addListener(_onChanged)); _controllers.forEach((controller) => controller.addListener(_onChanged));

3
lib/ui/group/group_screen.dart
View File

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart';
import 'package:invoiceninja_flutter/ui/app/app_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/app_scaffold.dart';
import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart';
import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart';
import 'package:invoiceninja_flutter/ui/app/list_filter_button.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter_button.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
@ -10,7 +9,6 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/ui/group/group_list_vm.dart'; import 'package:invoiceninja_flutter/ui/group/group_list_vm.dart';
import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart';
import 'package:invoiceninja_flutter/ui/app/app_drawer_vm.dart';
import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart';
class GroupScreen extends StatelessWidget { class GroupScreen extends StatelessWidget {
@ -21,7 +19,6 @@ class GroupScreen extends StatelessWidget {
final store = StoreProvider.of<AppState>(context); final store = StoreProvider.of<AppState>(context);
final state = store.state; final state = store.state;
final company = state.selectedCompany; final company = state.selectedCompany;
final user = state.user;
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
return AppScaffold( return AppScaffold(