diff --git a/lib/data/models/client_model.dart b/lib/data/models/client_model.dart index 40110b90c..e1cb157a4 100644 --- a/lib/data/models/client_model.dart +++ b/lib/data/models/client_model.dart @@ -388,7 +388,7 @@ abstract class ClientEntity extends Object contacts.where((contact) => contact!.email.isNotEmpty).isNotEmpty; int compareTo(ClientEntity? client, String sortField, bool sortAscending, - BuiltMap userMap, StaticState staticState) { + BuiltMap userMap, StaticState staticState) { int response = 0; final ClientEntity? clientA = sortAscending ? this : client; final ClientEntity? clientB = sortAscending ? client : this; diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart index 3f47fc954..e4d53dea9 100644 --- a/lib/data/models/expense_model.dart +++ b/lib/data/models/expense_model.dart @@ -386,11 +386,11 @@ abstract class ExpenseEntity extends Object ExpenseEntity? expense, String sortField, bool sortAscending, - BuiltMap clientMap, - BuiltMap userMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap userMap, + BuiltMap vendorMap, BuiltMap invoiceMap, - BuiltMap expenseCategoryMap, + BuiltMap expenseCategoryMap, StaticState staticState) { int response = 0; final ExpenseEntity? expenseA = sortAscending ? this : expense; diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart index e81c9d2d6..d122baa7d 100644 --- a/lib/data/models/invoice_model.dart +++ b/lib/data/models/invoice_model.dart @@ -688,9 +688,9 @@ abstract class InvoiceEntity extends Object InvoiceEntity? invoice, String? sortField, required bool sortAscending, - required BuiltMap clientMap, - required BuiltMap vendorMap, - BuiltMap? userMap, + required BuiltMap clientMap, + required BuiltMap vendorMap, + BuiltMap? userMap, String? recurringPrefix = '', }) { int response = 0; diff --git a/lib/data/models/payment_model.dart b/lib/data/models/payment_model.dart index 0c6c74a21..3c1e4b6cf 100644 --- a/lib/data/models/payment_model.dart +++ b/lib/data/models/payment_model.dart @@ -245,8 +245,8 @@ abstract class PaymentEntity extends Object String? sortField, required bool sortAscending, BuiltMap? invoiceMap, - BuiltMap? clientMap, - BuiltMap? userMap, + BuiltMap? clientMap, + BuiltMap? userMap, BuiltMap? paymentTypeMap, }) { int response = 0; diff --git a/lib/data/models/product_model.dart b/lib/data/models/product_model.dart index ab08b5107..a7775c08b 100644 --- a/lib/data/models/product_model.dart +++ b/lib/data/models/product_model.dart @@ -205,7 +205,7 @@ abstract class ProductEntity extends Object ProductEntity? product, [ String? sortField, bool sortAscending = true, - BuiltMap? userMap, + BuiltMap? userMap, ]) { int response = 0; final ProductEntity? productA = sortAscending ? this : product; diff --git a/lib/data/models/serializers.g.dart b/lib/data/models/serializers.g.dart index 1537db4d9..4db787a81 100644 --- a/lib/data/models/serializers.g.dart +++ b/lib/data/models/serializers.g.dart @@ -702,6 +702,48 @@ Serializers _$serializers = (new Serializers().toBuilder() ..addBuilderFactory( const FullType(BuiltList, const [const FullType(String)]), () => new ListBuilder()) + ..addBuilderFactory( + const FullType(BuiltMap, + const [const FullType(String), const FullType(CurrencyEntity)]), + () => new MapBuilder()) + ..addBuilderFactory( + const FullType(BuiltMap, + const [const FullType(String), const FullType(SizeEntity)]), + () => new MapBuilder()) + ..addBuilderFactory( + const FullType(BuiltMap, + const [const FullType(String), const FullType(GatewayEntity)]), + () => new MapBuilder()) + ..addBuilderFactory( + const FullType(BuiltMap, + const [const FullType(String), const FullType(IndustryEntity)]), + () => new MapBuilder()) + ..addBuilderFactory( + const FullType(BuiltMap, + const [const FullType(String), const FullType(TimezoneEntity)]), + () => new MapBuilder()) + ..addBuilderFactory( + const FullType(BuiltMap, + const [const FullType(String), const FullType(DateFormatEntity)]), + () => new MapBuilder()) + ..addBuilderFactory( + const FullType(BuiltMap, + const [const FullType(String), const FullType(LanguageEntity)]), + () => new MapBuilder()) + ..addBuilderFactory( + const FullType(BuiltMap, const [ + const FullType(String), + const FullType(PaymentTypeEntity) + ]), + () => new MapBuilder()) + ..addBuilderFactory( + const FullType(BuiltMap, + const [const FullType(String), const FullType(CountryEntity)]), + () => new MapBuilder()) + ..addBuilderFactory( + const FullType(BuiltMap, + const [const FullType(String), const FullType(TemplateEntity)]), + () => new MapBuilder()) ..addBuilderFactory( const FullType(BuiltMap, const [const FullType(String), const FullType(DesignEntity)]), @@ -965,64 +1007,6 @@ Serializers _$serializers = (new Serializers().toBuilder() const FullType(BuiltList, const [const FullType(String)]) ]), () => new MapBuilder>()) - ..addBuilderFactory( - const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(CurrencyEntity) - ]), - () => new MapBuilder()) - ..addBuilderFactory( - const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(SizeEntity) - ]), - () => new MapBuilder()) - ..addBuilderFactory( - const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(GatewayEntity) - ]), - () => new MapBuilder()) - ..addBuilderFactory( - const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(IndustryEntity) - ]), - () => new MapBuilder()) - ..addBuilderFactory( - const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(TimezoneEntity) - ]), - () => new MapBuilder()) - ..addBuilderFactory( - const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(DateFormatEntity) - ]), - () => new MapBuilder()) - ..addBuilderFactory( - const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(LanguageEntity) - ]), - () => new MapBuilder()) - ..addBuilderFactory( - const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(PaymentTypeEntity) - ]), - () => new MapBuilder()) - ..addBuilderFactory( - const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(CountryEntity) - ]), - () => new MapBuilder()) - ..addBuilderFactory( - const FullType(BuiltMap, - const [const FullType(String), const FullType(TemplateEntity)]), - () => new MapBuilder()) ..addBuilderFactory( const FullType(BuiltMap, const [ const FullType.nullable(String), diff --git a/lib/data/models/transaction_model.dart b/lib/data/models/transaction_model.dart index 5586e251e..404dcafee 100644 --- a/lib/data/models/transaction_model.dart +++ b/lib/data/models/transaction_model.dart @@ -218,11 +218,11 @@ abstract class TransactionEntity extends Object TransactionEntity? transaction, String sortField, bool sortAscending, - BuiltMap vendorMap, + BuiltMap vendorMap, BuiltMap invoiceMap, - BuiltMap expenseMap, - BuiltMap expenseCategoryMap, - BuiltMap bankAccountMap, + BuiltMap expenseMap, + BuiltMap expenseCategoryMap, + BuiltMap bankAccountMap, ) { int response = 0; final transactionA = sortAscending ? this : transaction; diff --git a/lib/data/models/vendor_model.dart b/lib/data/models/vendor_model.dart index 5663b9796..2fb3ae470 100644 --- a/lib/data/models/vendor_model.dart +++ b/lib/data/models/vendor_model.dart @@ -268,7 +268,7 @@ abstract class VendorEntity extends Object } int compareTo(VendorEntity? vendor, String sortField, bool sortAscending, - BuiltMap userMap, StaticState staticState) { + BuiltMap userMap, StaticState staticState) { int response = 0; final VendorEntity? vendorA = sortAscending ? this : vendor; final VendorEntity? vendorB = sortAscending ? vendor : this; diff --git a/lib/redux/bank_account/bank_account_selectors.dart b/lib/redux/bank_account/bank_account_selectors.dart index d523e8ccd..b494d973a 100644 --- a/lib/redux/bank_account/bank_account_selectors.dart +++ b/lib/redux/bank_account/bank_account_selectors.dart @@ -6,19 +6,19 @@ import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownBankAccountList = memo5( - (BuiltMap bankAccountMap, + (BuiltMap bankAccountMap, BuiltList bankAccountList, StaticState staticState, - BuiltMap userMap, + BuiltMap userMap, String? bankAccountId) => dropdownBankAccountsSelector(bankAccountMap, bankAccountList, staticState, userMap, bankAccountId)); List dropdownBankAccountsSelector( - BuiltMap bankAccountMap, + BuiltMap bankAccountMap, BuiltList bankAccountList, StaticState staticState, - BuiltMap userMap, + BuiltMap userMap, String? bankAccountId) { final list = bankAccountList.where((bankAccountId) { final bankAccount = bankAccountMap[bankAccountId]!; @@ -40,7 +40,7 @@ List dropdownBankAccountsSelector( } var memoizedFilteredBankAccountList = memo4((SelectionState selectionState, - BuiltMap bankAccountMap, + BuiltMap bankAccountMap, BuiltList bankAccountList, ListUIState bankAccountListState) => filteredBankAccountsSelector( @@ -48,7 +48,7 @@ var memoizedFilteredBankAccountList = memo4((SelectionState selectionState, List filteredBankAccountsSelector( SelectionState selectionState, - BuiltMap bankAccountMap, + BuiltMap bankAccountMap, BuiltList bankAccountList, ListUIState bankAccountListState) { final filterEntityId = selectionState.filterEntityId; diff --git a/lib/redux/client/client_selectors.dart b/lib/redux/client/client_selectors.dart index 4c51d6001..2035a9be9 100644 --- a/lib/redux/client/client_selectors.dart +++ b/lib/redux/client/client_selectors.dart @@ -10,14 +10,14 @@ import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownClientList = memo4( - (BuiltMap clientMap, BuiltList clientList, - BuiltMap userMap, StaticState staticState) => + (BuiltMap clientMap, BuiltList clientList, + BuiltMap userMap, StaticState staticState) => dropdownClientsSelector(clientMap, clientList, userMap, staticState)); List dropdownClientsSelector( - BuiltMap clientMap, + BuiltMap clientMap, BuiltList clientList, - BuiltMap userMap, + BuiltMap userMap, StaticState staticState) { final list = clientList.where((clientId) => clientMap[clientId]!.isActive).toList(); @@ -33,11 +33,11 @@ List dropdownClientsSelector( } var memoizedClientStatsForUser = memo2( - (String userId, BuiltMap clientMap) => + (String userId, BuiltMap clientMap) => clientStatsForUser(userId, clientMap)); EntityStats clientStatsForUser( - String userId, BuiltMap clientMap) { + String userId, BuiltMap clientMap) { int countActive = 0; int countArchived = 0; clientMap.forEach((clientId, client) { @@ -54,22 +54,22 @@ EntityStats clientStatsForUser( } var memoizedFilteredClientList = memo7((SelectionState selectionState, - BuiltMap clientMap, + BuiltMap clientMap, BuiltList clientList, - BuiltMap groupMap, + BuiltMap groupMap, ListUIState clientListState, - BuiltMap userMap, + BuiltMap userMap, StaticState staticState) => filteredClientsSelector(selectionState, clientMap, clientList, groupMap, clientListState, userMap, staticState)); List filteredClientsSelector( SelectionState selectionState, - BuiltMap clientMap, + BuiltMap clientMap, BuiltList clientList, - BuiltMap groupMap, + BuiltMap groupMap, ListUIState clientListState, - BuiltMap userMap, + BuiltMap userMap, StaticState staticState) { final filterEntityId = selectionState.filterEntityId; final filterEntityType = selectionState.filterEntityType; diff --git a/lib/redux/company/company_selectors.dart b/lib/redux/company/company_selectors.dart index 15cf948c3..3e43f0e7c 100644 --- a/lib/redux/company/company_selectors.dart +++ b/lib/redux/company/company_selectors.dart @@ -10,12 +10,12 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/company/company_state.dart'; var memoizedDropdownExpenseCategoriesList = memo2( - (BuiltMap categoryMap, + (BuiltMap categoryMap, BuiltList categoryList) => dropdownExpenseCategoriesSelector(categoryMap, categoryList)); List dropdownExpenseCategoriesSelector( - BuiltMap categoryMap, + BuiltMap categoryMap, BuiltList categoryList) { final list = categoryList .where((categoryId) => categoryMap[categoryId]!.isActive) @@ -34,25 +34,25 @@ List dropdownExpenseCategoriesSelector( } var memoizedHasMultipleCurrencies = memo3((CompanyEntity? company, - BuiltMap clientMap, - BuiltMap groupMap) => + BuiltMap clientMap, + BuiltMap groupMap) => hasMultipleCurrencies(company, clientMap, groupMap)); bool hasMultipleCurrencies( CompanyEntity? company, - BuiltMap clientMap, - BuiltMap groupMap) => + BuiltMap clientMap, + BuiltMap groupMap) => memoizedGetCurrencyIds(company, clientMap, groupMap).length > 1; var memoizedGetCurrencyIds = memo3((CompanyEntity? company, - BuiltMap clientMap, - BuiltMap groupMap) => + BuiltMap clientMap, + BuiltMap groupMap) => getCurrencyIds(company!, clientMap, groupMap)); List getCurrencyIds( CompanyEntity company, - BuiltMap clientMap, - BuiltMap groupMap) { + BuiltMap clientMap, + BuiltMap groupMap) { final currencyIds = [company.currencyId]; clientMap.forEach((clientId, client) { final group = groupMap[client!.groupId]; diff --git a/lib/redux/company_gateway/company_gateway_selectors.dart b/lib/redux/company_gateway/company_gateway_selectors.dart index b45078fff..bf67d9512 100644 --- a/lib/redux/company_gateway/company_gateway_selectors.dart +++ b/lib/redux/company_gateway/company_gateway_selectors.dart @@ -87,13 +87,13 @@ List filteredCompanyGatewaysSelector( } var memoizedCalculateCompanyGatewayProcessed = memo2( - (String companyGatewayId, BuiltMap paymentMap) => + (String companyGatewayId, BuiltMap paymentMap) => calculateCompanyGatewayProcessed( companyGatewayId: companyGatewayId, paymentMap: paymentMap)); double calculateCompanyGatewayProcessed({ String? companyGatewayId, - required BuiltMap paymentMap, + required BuiltMap paymentMap, }) { double total = 0; @@ -107,12 +107,12 @@ double calculateCompanyGatewayProcessed({ } var memoizedClientStatsForCompanyGateway = memo2( - (String companyGatewayId, BuiltMap clientMap) => + (String companyGatewayId, BuiltMap clientMap) => clientStatsForCompanyGateway(companyGatewayId, clientMap)); EntityStats clientStatsForCompanyGateway( String companyGatewayId, - BuiltMap clientMap, + BuiltMap clientMap, ) { int countActive = 0; int countArchived = 0; @@ -132,12 +132,12 @@ EntityStats clientStatsForCompanyGateway( } var memoizedPaymentStatsForCompanyGateway = memo2( - (String companyGatewayId, BuiltMap paymentMap) => + (String companyGatewayId, BuiltMap paymentMap) => paymentStatsForCompanyGateway(companyGatewayId, paymentMap)); EntityStats paymentStatsForCompanyGateway( String companyGatewayId, - BuiltMap paymentMap, + BuiltMap paymentMap, ) { int countActive = 0; int countArchived = 0; diff --git a/lib/redux/credit/credit_selectors.dart b/lib/redux/credit/credit_selectors.dart index 14e6b9e9d..a773e6d83 100644 --- a/lib/redux/credit/credit_selectors.dart +++ b/lib/redux/credit/credit_selectors.dart @@ -21,11 +21,11 @@ ClientContactEntity? creditContactSelector( var memoizedDropdownCreditList = memo7( (BuiltMap creditMap, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, BuiltList creditList, String clientId, - BuiltMap userMap, + BuiltMap userMap, List excludedIds) => dropdownCreditSelector( creditMap, @@ -39,11 +39,11 @@ var memoizedDropdownCreditList = memo7( List dropdownCreditSelector( BuiltMap creditMap, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, BuiltList creditList, String clientId, - BuiltMap userMap, + BuiltMap userMap, List excludedIds) { final list = creditList.where((creditId) { final credit = creditMap[creditId]; @@ -86,11 +86,11 @@ ClientEntity? creditClientSelector( var memoizedFilteredCreditList = memo8((SelectionState selectionState, BuiltMap creditMap, BuiltList creditList, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap paymentMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap paymentMap, ListUIState creditListState, - BuiltMap userMap) => + BuiltMap userMap) => filteredCreditsSelector(selectionState, creditMap, creditList, clientMap, vendorMap, paymentMap, creditListState, userMap)); @@ -98,11 +98,11 @@ List filteredCreditsSelector( SelectionState selectionState, BuiltMap creditMap, BuiltList creditList, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap paymentMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap paymentMap, ListUIState creditListState, - BuiltMap userMap) { + BuiltMap userMap) { final filterEntityId = selectionState.filterEntityId; final filterEntityType = selectionState.filterEntityType; diff --git a/lib/redux/dashboard/dashboard_selectors.dart b/lib/redux/dashboard/dashboard_selectors.dart index 64bed948b..27a8a55cc 100644 --- a/lib/redux/dashboard/dashboard_selectors.dart +++ b/lib/redux/dashboard/dashboard_selectors.dart @@ -33,11 +33,11 @@ class ChartMoneyData { } var memoizedChartInvoices = memo5(( - BuiltMap currencyMap, + BuiltMap currencyMap, CompanyEntity? company, DashboardUISettings settings, BuiltMap invoiceMap, - BuiltMap clientMap, + BuiltMap clientMap, ) => _chartInvoices( currencyMap: currencyMap, @@ -47,11 +47,11 @@ var memoizedChartInvoices = memo5(( clientMap: clientMap)); var memoizedChartOverviewInvoices = memo5(( - BuiltMap currencyMap, + BuiltMap currencyMap, CompanyEntity? company, DashboardUISettings settings, BuiltMap invoiceMap, - BuiltMap clientMap, + BuiltMap clientMap, ) => _chartInvoices( currencyMap: currencyMap, @@ -61,11 +61,11 @@ var memoizedChartOverviewInvoices = memo5(( clientMap: clientMap)); var memoizedPreviousChartInvoices = memo5(( - BuiltMap currencyMap, + BuiltMap currencyMap, CompanyEntity? company, DashboardUISettings settings, BuiltMap invoiceMap, - BuiltMap clientMap, + BuiltMap clientMap, ) => _chartInvoices( currencyMap: currencyMap, @@ -75,11 +75,11 @@ var memoizedPreviousChartInvoices = memo5(( clientMap: clientMap)); List _chartInvoices({ - BuiltMap? currencyMap, + BuiltMap? currencyMap, required CompanyEntity company, required DashboardUISettings settings, required BuiltMap invoiceMap, - BuiltMap? clientMap, + BuiltMap? clientMap, }) { const STATUS_ACTIVE = 'active'; const STATUS_OUTSTANDING = 'outstanding'; @@ -208,11 +208,11 @@ List _chartInvoices({ } var memoizedChartQuotes = memo5(( - BuiltMap currencyMap, + BuiltMap currencyMap, CompanyEntity? company, DashboardUISettings settings, BuiltMap quoteMap, - BuiltMap clientMap, + BuiltMap clientMap, ) => chartQuotes( currencyMap: currencyMap, @@ -223,11 +223,11 @@ var memoizedChartQuotes = memo5(( )); var memoizedPreviousChartQuotes = memo5(( - BuiltMap currencyMap, + BuiltMap currencyMap, CompanyEntity? company, DashboardUISettings settings, BuiltMap quoteMap, - BuiltMap clientMap, + BuiltMap clientMap, ) => chartQuotes( currencyMap: currencyMap, @@ -238,11 +238,11 @@ var memoizedPreviousChartQuotes = memo5(( )); List chartQuotes({ - BuiltMap? currencyMap, + BuiltMap? currencyMap, required CompanyEntity company, required DashboardUISettings settings, required BuiltMap quoteMap, - BuiltMap? clientMap, + BuiltMap? clientMap, }) { const STATUS_ACTIVE = 'active'; const STATUS_APPROVED = 'approved'; @@ -384,12 +384,12 @@ List chartQuotes({ } var memoizedChartPayments = memo6(( - BuiltMap currencyMap, + BuiltMap currencyMap, CompanyEntity? company, DashboardUISettings settings, BuiltMap invoiceMap, - BuiltMap clientMap, - BuiltMap paymentMap, + BuiltMap clientMap, + BuiltMap paymentMap, ) => chartPayments( currencyMap, @@ -401,12 +401,12 @@ var memoizedChartPayments = memo6(( )); var memoizedPreviousChartPayments = memo6(( - BuiltMap currencyMap, + BuiltMap currencyMap, CompanyEntity? company, DashboardUISettings settings, BuiltMap invoiceMap, - BuiltMap clientMap, - BuiltMap paymentMap, + BuiltMap clientMap, + BuiltMap paymentMap, ) => chartPayments( currencyMap, @@ -418,12 +418,12 @@ var memoizedPreviousChartPayments = memo6(( )); List chartPayments( - BuiltMap currencyMap, + BuiltMap currencyMap, CompanyEntity company, DashboardUISettings settings, BuiltMap invoiceMap, - BuiltMap clientMap, - BuiltMap paymentMap, + BuiltMap clientMap, + BuiltMap paymentMap, ) { const STATUS_COMPLETED = 'completed'; const STATUS_REFUNDED = 'refunded'; @@ -557,14 +557,14 @@ List chartPayments( } var memoizedChartTasks = memo8(( - BuiltMap currencyMap, + BuiltMap currencyMap, CompanyEntity? company, DashboardUISettings settings, - BuiltMap taskMap, + BuiltMap taskMap, BuiltMap invoiceMap, - BuiltMap projectMap, - BuiltMap clientMap, - BuiltMap groupMap, + BuiltMap projectMap, + BuiltMap clientMap, + BuiltMap groupMap, ) => chartTasks( currencyMap, @@ -578,14 +578,14 @@ var memoizedChartTasks = memo8(( )); var memoizedPreviousChartTasks = memo8(( - BuiltMap currencyMap, + BuiltMap currencyMap, CompanyEntity? company, DashboardUISettings settings, - BuiltMap taskMap, + BuiltMap taskMap, BuiltMap invoiceMap, - BuiltMap projectMap, - BuiltMap clientMap, - BuiltMap groupMap, + BuiltMap projectMap, + BuiltMap clientMap, + BuiltMap groupMap, ) => chartTasks( currencyMap, @@ -599,14 +599,14 @@ var memoizedPreviousChartTasks = memo8(( )); List chartTasks( - BuiltMap currencyMap, + BuiltMap currencyMap, CompanyEntity company, DashboardUISettings settings, - BuiltMap taskMap, + BuiltMap taskMap, BuiltMap invoiceMap, - BuiltMap projectMap, - BuiltMap clientMap, - BuiltMap groupMap, + BuiltMap projectMap, + BuiltMap clientMap, + BuiltMap groupMap, ) { const STATUS_LOGGED = 'logged'; const STATUS_INVOICED = 'invoiced'; @@ -774,11 +774,11 @@ List chartTasks( } List chartExpenses( - BuiltMap currencyMap, + BuiltMap currencyMap, CompanyEntity company, DashboardUISettings settings, BuiltMap invoiceMap, - BuiltMap expenseMap) { + BuiltMap expenseMap) { const STATUS_LOGGED = 'logged'; const STATUS_PENDING = 'pending'; const STATUS_INVOICED = 'invoiced'; @@ -941,28 +941,27 @@ List chartExpenses( return data; } -var memoizedChartExpenses = memo5( - (BuiltMap currencyMap, - CompanyEntity? company, - DashboardUISettings settings, - BuiltMap invoiceMap, - BuiltMap expenseMap) => - chartExpenses(currencyMap, company!, settings, invoiceMap, expenseMap)); +var memoizedChartExpenses = memo5((BuiltMap currencyMap, + CompanyEntity? company, + DashboardUISettings settings, + BuiltMap invoiceMap, + BuiltMap expenseMap) => + chartExpenses(currencyMap, company!, settings, invoiceMap, expenseMap)); var memoizedPreviousChartExpenses = memo5( - (BuiltMap currencyMap, + (BuiltMap currencyMap, CompanyEntity? company, DashboardUISettings settings, BuiltMap invoiceMap, - BuiltMap expenseMap) => + BuiltMap expenseMap) => chartExpenses(currencyMap, company!, settings, invoiceMap, expenseMap)); var memoizedRunningTasks = memo2( - (BuiltMap taskMap, String userId) => + (BuiltMap taskMap, String userId) => runningTasks(taskMap, userId)); List runningTasks( - BuiltMap taskMap, String userId) { + BuiltMap taskMap, String userId) { final tasks = []; taskMap.forEach((taskId, task) { diff --git a/lib/redux/dashboard/dashboard_sidebar_selectors.dart b/lib/redux/dashboard/dashboard_sidebar_selectors.dart index 7d472d758..bf295a403 100644 --- a/lib/redux/dashboard/dashboard_sidebar_selectors.dart +++ b/lib/redux/dashboard/dashboard_sidebar_selectors.dart @@ -7,7 +7,7 @@ import 'package:invoiceninja_flutter/data/models/models.dart'; var memoizedUpcomingInvoices = memo2(( BuiltMap invoiceMap, - BuiltMap clientMap, + BuiltMap clientMap, ) => _upcomingInvoices( invoiceMap: invoiceMap, @@ -16,7 +16,7 @@ var memoizedUpcomingInvoices = memo2(( List _upcomingInvoices({ required BuiltMap invoiceMap, - BuiltMap? clientMap, + BuiltMap? clientMap, }) { final invoices = []; invoiceMap.forEach((index, invoice) { @@ -39,7 +39,7 @@ List _upcomingInvoices({ var memoizedPastDueInvoices = memo2(( BuiltMap invoiceMap, - BuiltMap clientMap, + BuiltMap clientMap, ) => _pastDueInvoices( invoiceMap: invoiceMap, @@ -48,7 +48,7 @@ var memoizedPastDueInvoices = memo2(( List _pastDueInvoices({ required BuiltMap invoiceMap, - BuiltMap? clientMap, + BuiltMap? clientMap, }) { final invoices = []; invoiceMap.forEach((index, invoice) { @@ -70,8 +70,8 @@ List _pastDueInvoices({ } var memoizedRecentPayments = memo2(( - BuiltMap paymentMap, - BuiltMap clientMap, + BuiltMap paymentMap, + BuiltMap clientMap, ) => _recentPayments( paymentMap: paymentMap, @@ -79,8 +79,8 @@ var memoizedRecentPayments = memo2(( )); List _recentPayments({ - required BuiltMap paymentMap, - BuiltMap? clientMap, + required BuiltMap paymentMap, + BuiltMap? clientMap, }) { final payments = []; final threeMonthsAgo = @@ -110,7 +110,7 @@ List _recentPayments({ var memoizedUpcomingQuotes = memo2(( BuiltMap quoteMap, - BuiltMap clientMap, + BuiltMap clientMap, ) => _upcomingQuotes( quoteMap: quoteMap, @@ -119,7 +119,7 @@ var memoizedUpcomingQuotes = memo2(( List _upcomingQuotes({ required BuiltMap quoteMap, - BuiltMap? clientMap, + BuiltMap? clientMap, }) { final quotes = []; quoteMap.forEach((index, quote) { @@ -140,7 +140,7 @@ List _upcomingQuotes({ var memoizedExpiredQuotes = memo2(( BuiltMap quoteMap, - BuiltMap clientMap, + BuiltMap clientMap, ) => _expiredQuotes( quoteMap: quoteMap, @@ -149,7 +149,7 @@ var memoizedExpiredQuotes = memo2(( List _expiredQuotes({ required BuiltMap quoteMap, - BuiltMap? clientMap, + BuiltMap? clientMap, }) { final quotes = []; quoteMap.forEach((index, quote) { @@ -169,8 +169,8 @@ List _expiredQuotes({ } var memoizedRunningTasks = memo2(( - BuiltMap taskMap, - BuiltMap clientMap, + BuiltMap taskMap, + BuiltMap clientMap, ) => _runningTasks( taskMap: taskMap, @@ -178,8 +178,8 @@ var memoizedRunningTasks = memo2(( )); List _runningTasks({ - required BuiltMap taskMap, - BuiltMap? clientMap, + required BuiltMap taskMap, + BuiltMap? clientMap, }) { final tasks = []; taskMap.forEach((index, task) { @@ -260,8 +260,8 @@ List _upcomingExpenses({ */ var memoizedRecentExpenses = memo2(( - BuiltMap expenseMap, - BuiltMap clientMap, + BuiltMap expenseMap, + BuiltMap clientMap, ) => _recentExpenses( expenseMap: expenseMap, @@ -269,8 +269,8 @@ var memoizedRecentExpenses = memo2(( )); List _recentExpenses({ - required BuiltMap expenseMap, - BuiltMap? clientMap, + required BuiltMap expenseMap, + BuiltMap? clientMap, }) { final expenses = []; expenseMap.forEach((index, expense) { diff --git a/lib/redux/design/design_selectors.dart b/lib/redux/design/design_selectors.dart index d6cc24c67..976235648 100644 --- a/lib/redux/design/design_selectors.dart +++ b/lib/redux/design/design_selectors.dart @@ -35,11 +35,11 @@ List dropdownDesignsSelector(BuiltMap designMap, } var memoizedFilteredDesignList = memo3( - (BuiltMap designMap, BuiltList designList, + (BuiltMap designMap, BuiltList designList, ListUIState designListState) => filteredDesignsSelector(designMap, designList, designListState)); -List filteredDesignsSelector(BuiltMap designMap, +List filteredDesignsSelector(BuiltMap designMap, BuiltList designList, ListUIState designListState) { final list = designList.where((designId) { final design = designMap[designId]!; diff --git a/lib/redux/document/document_selectors.dart b/lib/redux/document/document_selectors.dart index 353d76e69..a90dc7684 100644 --- a/lib/redux/document/document_selectors.dart +++ b/lib/redux/document/document_selectors.dart @@ -37,7 +37,7 @@ List dropdownDocumentsSelector( var memoizedFilteredDocumentList = memo4(( SelectionState selectionState, - BuiltMap documentMap, + BuiltMap documentMap, BuiltList documentList, ListUIState documentListState, ) => @@ -50,7 +50,7 @@ var memoizedFilteredDocumentList = memo4(( List filteredDocumentsSelector( SelectionState selectionState, - BuiltMap documentMap, + BuiltMap documentMap, BuiltList documentList, ListUIState documentListState, ) { diff --git a/lib/redux/expense/expense_selectors.dart b/lib/redux/expense/expense_selectors.dart index 335f056e4..85a8003e3 100644 --- a/lib/redux/expense/expense_selectors.dart +++ b/lib/redux/expense/expense_selectors.dart @@ -149,13 +149,13 @@ List dropdownExpensesSelector( } var memoizedFilteredExpenseList = memo9((SelectionState selectionState, - BuiltMap expenseMap, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap expenseMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap userMap, ListUIState expenseListState, BuiltMap invoiceMap, - BuiltMap expenseCategoryMap, + BuiltMap expenseCategoryMap, StaticState staticState) => filteredExpensesSelector( selectionState, @@ -170,13 +170,13 @@ var memoizedFilteredExpenseList = memo9((SelectionState selectionState, List filteredExpensesSelector( SelectionState selectionState, - BuiltMap expenseMap, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap expenseMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap userMap, ListUIState expenseListState, BuiltMap invoiceMap, - BuiltMap expenseCategoryMap, + BuiltMap expenseCategoryMap, StaticState staticState) { final filterEntityId = selectionState.filterEntityId; final filterEntityType = selectionState.filterEntityType; @@ -275,11 +275,11 @@ List filteredExpensesSelector( } var memoizedExpenseStatsForVendor = memo2( - (String vendorId, BuiltMap expenseMap) => + (String vendorId, BuiltMap expenseMap) => expenseStatsForVendor(vendorId, expenseMap)); EntityStats expenseStatsForVendor( - String vendorId, BuiltMap expenseMap) { + String vendorId, BuiltMap expenseMap) { int countActive = 0; int countArchived = 0; expenseMap.forEach((expenseId, expense) { @@ -296,11 +296,11 @@ EntityStats expenseStatsForVendor( } var memoizedExpenseStatsForClient = memo2( - (String clientId, BuiltMap expenseMap) => + (String clientId, BuiltMap expenseMap) => expenseStatsForClient(clientId, expenseMap)); EntityStats expenseStatsForClient( - String clientId, BuiltMap expenseMap) { + String clientId, BuiltMap expenseMap) { int countActive = 0; int countArchived = 0; expenseMap.forEach((expenseId, expense) { @@ -317,11 +317,11 @@ EntityStats expenseStatsForClient( } var memoizedClientExpenseList = memo2( - (BuiltMap expenseMap, String? clientId) => + (BuiltMap expenseMap, String? clientId) => clientExpenseList(expenseMap, clientId)); List clientExpenseList( - BuiltMap expenseMap, String? clientId) { + BuiltMap expenseMap, String? clientId) { final list = expenseMap.keys.where((expenseid) { final expense = expenseMap[expenseid]; if ((clientId ?? '').isNotEmpty && @@ -341,12 +341,12 @@ List clientExpenseList( var memoizedExpenseStatsForProject = memo2(( String projectId, - BuiltMap expenseMap, + BuiltMap expenseMap, ) => expenseStatsForProject(projectId, expenseMap)); EntityStats expenseStatsForProject( - String projectId, BuiltMap expenseMap) { + String projectId, BuiltMap expenseMap) { int countActive = 0; int countArchived = 0; expenseMap.forEach((expenseId, expense) { @@ -364,12 +364,12 @@ EntityStats expenseStatsForProject( var memoizedExpenseStatsForUser = memo2(( String userId, - BuiltMap expenseMap, + BuiltMap expenseMap, ) => expenseStatsForUser(userId, expenseMap)); EntityStats expenseStatsForUser( - String userId, BuiltMap expenseMap) { + String userId, BuiltMap expenseMap) { int countActive = 0; int countArchived = 0; expenseMap.forEach((expenseId, expense) { diff --git a/lib/redux/expense_category/expense_category_selectors.dart b/lib/redux/expense_category/expense_category_selectors.dart index 80567cbbd..1984de300 100644 --- a/lib/redux/expense_category/expense_category_selectors.dart +++ b/lib/redux/expense_category/expense_category_selectors.dart @@ -9,19 +9,19 @@ import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownExpenseCategoryList = memo5( - (BuiltMap expenseCategoryMap, + (BuiltMap expenseCategoryMap, BuiltList expenseCategoryList, StaticState staticState, - BuiltMap userMap, + BuiltMap userMap, String categoryId) => dropdownExpenseCategoriesSelector(expenseCategoryMap, expenseCategoryList, staticState, userMap, categoryId)); List dropdownExpenseCategoriesSelector( - BuiltMap expenseCategoryMap, + BuiltMap expenseCategoryMap, BuiltList expenseCategoryList, StaticState staticState, - BuiltMap userMap, + BuiltMap userMap, String clientId) { final list = expenseCategoryList.where((expenseCategoryId) { final expenseCategory = expenseCategoryMap[expenseCategoryId]!; @@ -46,7 +46,7 @@ List dropdownExpenseCategoriesSelector( } var memoizedFilteredExpenseCategoryList = memo4((SelectionState selectionState, - BuiltMap expenseCategoryMap, + BuiltMap expenseCategoryMap, BuiltList expenseCategoryList, ListUIState expenseCategoryListState) => filteredExpenseCategoriesSelector(selectionState, expenseCategoryMap, @@ -54,7 +54,7 @@ var memoizedFilteredExpenseCategoryList = memo4((SelectionState selectionState, List filteredExpenseCategoriesSelector( SelectionState selectionState, - BuiltMap expenseCategoryMap, + BuiltMap expenseCategoryMap, BuiltList expenseCategoryList, ListUIState expenseCategoryListState) { final list = expenseCategoryList.where((expenseCategoryId) { @@ -82,13 +82,13 @@ List filteredExpenseCategoriesSelector( } var memoizedCalculateExpenseCategoryAmount = memo2( - (String categoryId, BuiltMap expenseMap) => + (String categoryId, BuiltMap expenseMap) => calculateExpenseCategoryAmount( categoryId: categoryId, expenseMap: expenseMap)); double calculateExpenseCategoryAmount({ String? categoryId, - required BuiltMap expenseMap, + required BuiltMap expenseMap, }) { double total = 0; @@ -102,12 +102,12 @@ double calculateExpenseCategoryAmount({ } var memoizedExpenseStatsForExpenseCategory = memo2( - (String companyGatewayId, BuiltMap expenseMap) => + (String companyGatewayId, BuiltMap expenseMap) => expenseStatsForExpenseCategory(companyGatewayId, expenseMap)); EntityStats expenseStatsForExpenseCategory( String categoryId, - BuiltMap expenseMap, + BuiltMap expenseMap, ) { int countActive = 0; int countArchived = 0; @@ -125,12 +125,12 @@ EntityStats expenseStatsForExpenseCategory( } var memoizedTransactionStatsForExpenseCategory = memo2((String companyGatewayId, - BuiltMap transactionMap) => + BuiltMap transactionMap) => transactionStatsForExpenseCategory(companyGatewayId, transactionMap)); EntityStats transactionStatsForExpenseCategory( String categoryId, - BuiltMap transactionMap, + BuiltMap transactionMap, ) { int countActive = 0; int countArchived = 0; diff --git a/lib/redux/group/group_selectors.dart b/lib/redux/group/group_selectors.dart index 7f3d00550..9dc333287 100644 --- a/lib/redux/group/group_selectors.dart +++ b/lib/redux/group/group_selectors.dart @@ -35,7 +35,7 @@ List dropdownGroupsSelector(BuiltMap groupMap, } var memoizedFilteredGroupList = memo4((SelectionState selectionState, - BuiltMap groupMap, + BuiltMap groupMap, BuiltList groupList, ListUIState groupListState) => filteredGroupsSelector( @@ -43,7 +43,7 @@ var memoizedFilteredGroupList = memo4((SelectionState selectionState, List filteredGroupsSelector( SelectionState selectionState, - BuiltMap groupMap, + BuiltMap groupMap, BuiltList groupList, ListUIState groupListState) { final list = groupList.where((groupId) { @@ -70,11 +70,11 @@ List filteredGroupsSelector( } var memoizedClientStatsForGroup = memo2( - (BuiltMap clientMap, String groupId) => + (BuiltMap clientMap, String groupId) => clientStatsForGroup(clientMap, groupId)); EntityStats clientStatsForGroup( - BuiltMap clientMap, String groupId) { + BuiltMap clientMap, String groupId) { int countActive = 0; int countArchived = 0; clientMap.forEach((clientId, client) { diff --git a/lib/redux/invoice/invoice_selectors.dart b/lib/redux/invoice/invoice_selectors.dart index e90d19c2f..9dc6e1a9b 100644 --- a/lib/redux/invoice/invoice_selectors.dart +++ b/lib/redux/invoice/invoice_selectors.dart @@ -57,11 +57,11 @@ ClientContactEntity? invoiceContactSelector( var memoizedDropdownInvoiceList = memo8( (BuiltMap invoiceMap, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, BuiltList invoiceList, String clientId, - BuiltMap userMap, + BuiltMap userMap, List excludedIds, String? recurringPrefix) => dropdownInvoiceSelector( @@ -77,11 +77,11 @@ var memoizedDropdownInvoiceList = memo8( List dropdownInvoiceSelector( BuiltMap invoiceMap, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, BuiltList invoiceList, String clientId, - BuiltMap userMap, + BuiltMap userMap, List excludedIds, String? recurringPrefix, ) { @@ -90,8 +90,7 @@ List dropdownInvoiceSelector( if (excludedIds.contains(invoiceId)) { return false; } - if (clientId.isNotEmpty && - invoice!.clientId != clientId) { + if (clientId.isNotEmpty && invoice!.clientId != clientId) { return false; } if (!clientMap.containsKey(invoice!.clientId) || @@ -123,11 +122,11 @@ List dropdownInvoiceSelector( var memoizedFilteredInvoiceList = memo9((SelectionState selectionState, BuiltMap invoiceMap, BuiltList invoiceList, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap paymentMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap paymentMap, ListUIState invoiceListState, - BuiltMap userMap, + BuiltMap userMap, String? recurringPrefix) => filteredInvoicesSelector( selectionState, @@ -145,11 +144,11 @@ List filteredInvoicesSelector( SelectionState selectionState, BuiltMap invoiceMap, BuiltList invoiceList, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap paymentMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap paymentMap, ListUIState invoiceListState, - BuiltMap userMap, + BuiltMap userMap, String? recurringPrefix, ) { final filterEntityId = selectionState.filterEntityId; diff --git a/lib/redux/payment/payment_selectors.dart b/lib/redux/payment/payment_selectors.dart index 2161dbb20..5ae50cc5b 100644 --- a/lib/redux/payment/payment_selectors.dart +++ b/lib/redux/payment/payment_selectors.dart @@ -8,14 +8,12 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedPaymentsByInvoice = memo3((String invoiceId, - BuiltMap paymentMap, + BuiltMap paymentMap, BuiltList paymentList) => paymentsByInvoiceSelector(invoiceId, paymentMap, paymentList)); -List paymentsByInvoiceSelector( - String invoiceId, - BuiltMap paymentMap, - BuiltList paymentList) { +List paymentsByInvoiceSelector(String invoiceId, + BuiltMap paymentMap, BuiltList paymentList) { return paymentList.map((paymentId) => paymentMap[paymentId]).where((payment) { return payment!.paymentables.map((p) => p.invoiceId).contains(invoiceId) && !payment.isDeleted!; @@ -23,14 +21,12 @@ List paymentsByInvoiceSelector( } var memoizedPaymentsByCredit = memo3((String invoiceId, - BuiltMap paymentMap, + BuiltMap paymentMap, BuiltList paymentList) => paymentsByCreditSelector(invoiceId, paymentMap, paymentList)); -List paymentsByCreditSelector( - String creditId, - BuiltMap paymentMap, - BuiltList paymentList) { +List paymentsByCreditSelector(String creditId, + BuiltMap paymentMap, BuiltList paymentList) { return paymentList.map((paymentId) => paymentMap[paymentId]).where((payment) { return payment!.paymentables.map((p) => p.creditId).contains(creditId) && !payment.isDeleted!; @@ -79,11 +75,11 @@ List dropdownPaymentsSelector( } var memoizedFilteredPaymentList = memo8((SelectionState selectionState, - BuiltMap paymentMap, + BuiltMap paymentMap, BuiltList paymentList, BuiltMap invoiceMap, - BuiltMap clientMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap userMap, BuiltMap paymentTypeMap, ListUIState paymentListState) => filteredPaymentsSelector( @@ -99,11 +95,11 @@ var memoizedFilteredPaymentList = memo8((SelectionState selectionState, List filteredPaymentsSelector( SelectionState selectionState, - BuiltMap paymentMap, + BuiltMap paymentMap, BuiltList paymentList, BuiltMap invoiceMap, - BuiltMap clientMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap userMap, BuiltMap paymentTypeMap, ListUIState paymentListState) { final filterEntityId = selectionState.filterEntityId; @@ -174,13 +170,13 @@ List filteredPaymentsSelector( } var memoizedPaymentStatsForClient = memo3((String clientId, - BuiltMap paymentMap, + BuiltMap paymentMap, BuiltMap invoiceMap) => paymentStatsForClient(clientId, paymentMap, invoiceMap)); EntityStats paymentStatsForClient( String clientId, - BuiltMap paymentMap, + BuiltMap paymentMap, BuiltMap invoiceMap) { int countActive = 0; int countArchived = 0; diff --git a/lib/redux/payment_term/payment_term_selectors.dart b/lib/redux/payment_term/payment_term_selectors.dart index 250a25126..b6e207846 100644 --- a/lib/redux/payment_term/payment_term_selectors.dart +++ b/lib/redux/payment_term/payment_term_selectors.dart @@ -8,12 +8,12 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownPaymentTermList = memo2( - (BuiltMap paymentTermMap, + (BuiltMap paymentTermMap, BuiltList paymentTermList) => dropdownPaymentTermsSelector(paymentTermMap, paymentTermList)); List dropdownPaymentTermsSelector( - BuiltMap paymentTermMap, + BuiltMap paymentTermMap, BuiltList paymentTermList) { final Map numDays = {}; final list = paymentTermList.where((paymentTermId) { @@ -38,7 +38,7 @@ List dropdownPaymentTermsSelector( } var memoizedFilteredPaymentTermList = memo4((SelectionState selectionState, - BuiltMap paymentTermMap, + BuiltMap paymentTermMap, BuiltList paymentTermList, ListUIState paymentTermListState) => filteredPaymentTermsSelector( @@ -46,7 +46,7 @@ var memoizedFilteredPaymentTermList = memo4((SelectionState selectionState, List filteredPaymentTermsSelector( SelectionState selectionState, - BuiltMap paymentTermMap, + BuiltMap paymentTermMap, BuiltList paymentTermList, ListUIState paymentTermListState) { final list = paymentTermList.where((paymentTermId) { diff --git a/lib/redux/product/product_selectors.dart b/lib/redux/product/product_selectors.dart index 5af2f0067..cfd36184e 100644 --- a/lib/redux/product/product_selectors.dart +++ b/lib/redux/product/product_selectors.dart @@ -25,7 +25,7 @@ InvoiceItemEntity convertProductToInvoiceItem({ required ProductEntity? product, required CompanyEntity company, required InvoiceEntity invoice, - required BuiltMap currencyMap, + required BuiltMap currencyMap, ClientEntity? client, }) { if (company.fillProducts) { @@ -68,15 +68,14 @@ InvoiceItemEntity convertProductToInvoiceItem({ } var memoizedDropdownProductList = memo3( - (BuiltMap productMap, - BuiltList productList, - BuiltMap userMap) => + (BuiltMap productMap, BuiltList productList, + BuiltMap userMap) => dropdownProductsSelector(productMap, productList, userMap)); List dropdownProductsSelector( - BuiltMap productMap, + BuiltMap productMap, BuiltList productList, - BuiltMap userMap) { + BuiltMap userMap) { final list = productList .where((productId) => productMap[productId]!.isActive) .toList(); @@ -92,9 +91,9 @@ List dropdownProductsSelector( } var memoizedProductList = memo1( - (BuiltMap productMap) => productList(productMap)); + (BuiltMap productMap) => productList(productMap)); -List productList(BuiltMap productMap) { +List productList(BuiltMap productMap) { final list = productMap.keys .where((productId) => productMap[productId]!.isActive) .toList(); @@ -107,19 +106,19 @@ List productList(BuiltMap productMap) { } var memoizedFilteredProductList = memo5((SelectionState selectionState, - BuiltMap productMap, + BuiltMap productMap, BuiltList productList, ListUIState productListState, - BuiltMap userMap) => + BuiltMap userMap) => filteredProductsSelector( selectionState, productMap, productList, productListState, userMap)); List filteredProductsSelector( SelectionState selectionState, - BuiltMap productMap, + BuiltMap productMap, BuiltList productList, ListUIState productListState, - BuiltMap userMap) { + BuiltMap userMap) { final list = productList.where((productId) { final product = productMap[productId]!; diff --git a/lib/redux/project/project_selectors.dart b/lib/redux/project/project_selectors.dart index 3287b21b5..e1fecb5ec 100644 --- a/lib/redux/project/project_selectors.dart +++ b/lib/redux/project/project_selectors.dart @@ -233,7 +233,7 @@ List filteredProjectsSelector( Duration taskDurationForProject( ProjectEntity project, - BuiltMap taskMap, + BuiltMap taskMap, ) { int total = 0; taskMap.forEach((index, task) { @@ -245,11 +245,11 @@ Duration taskDurationForProject( } var memoizedProjectStatsForClient = memo2( - (String clientId, BuiltMap projectMap) => + (String clientId, BuiltMap projectMap) => projectStatsForClient(clientId, projectMap)); EntityStats projectStatsForClient( - String clientId, BuiltMap projectMap) { + String clientId, BuiltMap projectMap) { int countActive = 0; int countArchived = 0; projectMap.forEach((projectId, project) { @@ -266,7 +266,7 @@ EntityStats projectStatsForClient( } var memoizedProjectStatsForUser = memo2( - (String userId, BuiltMap projectMap) => + (String userId, BuiltMap projectMap) => projectStatsForClient(userId, projectMap)); EntityStats projectStatsForUser( diff --git a/lib/redux/purchase_order/purchase_order_selectors.dart b/lib/redux/purchase_order/purchase_order_selectors.dart index 2cc105ca7..93ebdcd3e 100644 --- a/lib/redux/purchase_order/purchase_order_selectors.dart +++ b/lib/redux/purchase_order/purchase_order_selectors.dart @@ -27,9 +27,9 @@ var memoizedDropdownPurchaseOrderList = memo7( (BuiltMap purchaseOrderMap, BuiltList purchaseOrderList, StaticState staticState, - BuiltMap userMap, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap userMap, + BuiltMap clientMap, + BuiltMap vendorMap, String clientId) => dropdownPurchaseOrdersSelector(purchaseOrderMap, purchaseOrderList, staticState, userMap, clientMap, vendorMap, clientId)); @@ -38,9 +38,9 @@ List dropdownPurchaseOrdersSelector( BuiltMap purchaseOrderMap, BuiltList purchaseOrderList, StaticState staticState, - BuiltMap userMap, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap userMap, + BuiltMap clientMap, + BuiltMap vendorMap, String clientId) { final list = purchaseOrderList.where((purchaseOrderId) { final purchaseOrder = purchaseOrderMap[purchaseOrderId]!; @@ -72,10 +72,10 @@ var memoizedFilteredPurchaseOrderList = memo7(( SelectionState selectionState, BuiltMap invoiceMap, BuiltList invoiceList, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, ListUIState invoiceListState, - BuiltMap userMap, + BuiltMap userMap, ) => filteredPurchaseOrdersSelector(selectionState, invoiceMap, invoiceList, clientMap, vendorMap, invoiceListState, userMap)); @@ -84,10 +84,10 @@ List filteredPurchaseOrdersSelector( SelectionState selectionState, BuiltMap invoiceMap, BuiltList invoiceList, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, ListUIState invoiceListState, - BuiltMap userMap, + BuiltMap userMap, ) { final filterEntityId = selectionState.filterEntityId; final filterEntityType = selectionState.filterEntityType; diff --git a/lib/redux/quote/quote_selectors.dart b/lib/redux/quote/quote_selectors.dart index bd1347002..bc3a1b5e9 100644 --- a/lib/redux/quote/quote_selectors.dart +++ b/lib/redux/quote/quote_selectors.dart @@ -26,11 +26,11 @@ ClientContactEntity? quoteContactSelector( var memoizedDropdownQuoteList = memo7(( BuiltMap quoteMap, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, BuiltList quoteList, String clientId, - BuiltMap userMap, + BuiltMap userMap, List excludedIds, ) => dropdownQuoteSelector( @@ -45,11 +45,11 @@ var memoizedDropdownQuoteList = memo7(( List dropdownQuoteSelector( BuiltMap quoteMap, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, BuiltList quoteList, String clientId, - BuiltMap userMap, + BuiltMap userMap, List excludedIds, ) { final list = quoteList.where((invoiceId) { @@ -88,10 +88,10 @@ List dropdownQuoteSelector( var memoizedFilteredQuoteList = memo7((SelectionState selectionState, BuiltMap quoteMap, BuiltList quoteList, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, ListUIState quoteListState, - BuiltMap userMap) => + BuiltMap userMap) => filteredQuotesSelector(selectionState, quoteMap, quoteList, clientMap, vendorMap, quoteListState, userMap)); @@ -99,10 +99,10 @@ List filteredQuotesSelector( SelectionState selectionState, BuiltMap quoteMap, BuiltList quoteList, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, ListUIState quoteListState, - BuiltMap userMap) { + BuiltMap userMap) { final filterEntityId = selectionState.filterEntityId; final filterEntityType = selectionState.filterEntityType; diff --git a/lib/redux/recurring_expense/recurring_expense_selectors.dart b/lib/redux/recurring_expense/recurring_expense_selectors.dart index afcfd3df2..efe0556a8 100644 --- a/lib/redux/recurring_expense/recurring_expense_selectors.dart +++ b/lib/redux/recurring_expense/recurring_expense_selectors.dart @@ -69,13 +69,13 @@ List dropdownRecurringExpensesSelector( } var memoizedFilteredRecurringExpenseList = memo9((SelectionState selectionState, - BuiltMap expenseMap, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap expenseMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap userMap, ListUIState expenseListState, BuiltMap invoiceMap, - BuiltMap expenseCategoryMap, + BuiltMap expenseCategoryMap, StaticState staticState) => filteredRecurringExpensesSelector( selectionState, @@ -90,13 +90,13 @@ var memoizedFilteredRecurringExpenseList = memo9((SelectionState selectionState, List filteredRecurringExpensesSelector( SelectionState selectionState, - BuiltMap expenseMap, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap expenseMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap userMap, ListUIState expenseListState, BuiltMap invoiceMap, - BuiltMap expenseCategoryMap, + BuiltMap expenseCategoryMap, StaticState staticState) { final filterEntityId = selectionState.filterEntityId; final filterEntityType = selectionState.filterEntityType; @@ -192,11 +192,11 @@ List filteredRecurringExpensesSelector( } var memoizedRecurringExpenseStatsForClient = memo2( - (String clientId, BuiltMap expenseMap) => + (String clientId, BuiltMap expenseMap) => recurringExpenseStatsForClient(clientId, expenseMap)); EntityStats recurringExpenseStatsForClient( - String clientId, BuiltMap expenseMap) { + String clientId, BuiltMap expenseMap) { int countActive = 0; int countArchived = 0; expenseMap.forEach((expenseId, expense) { @@ -213,11 +213,11 @@ EntityStats recurringExpenseStatsForClient( } var memoizedRecurringExpenseStatsForVendor = memo2( - (String vendorId, BuiltMap expenseMap) => + (String vendorId, BuiltMap expenseMap) => recurringExpenseStatsForVendor(vendorId, expenseMap)); EntityStats recurringExpenseStatsForVendor( - String vendorId, BuiltMap expenseMap) { + String vendorId, BuiltMap expenseMap) { int countActive = 0; int countArchived = 0; expenseMap.forEach((expenseId, expense) { @@ -234,11 +234,11 @@ EntityStats recurringExpenseStatsForVendor( } var memoizedTransactionStatsForVendor = memo2( - (String vendorId, BuiltMap transactionMap) => + (String vendorId, BuiltMap transactionMap) => transactionStatsForVendor(vendorId, transactionMap)); EntityStats transactionStatsForVendor( - String vendorId, BuiltMap transactionMap) { + String vendorId, BuiltMap transactionMap) { int countActive = 0; int countArchived = 0; transactionMap.forEach((transactionId, transaction) { @@ -255,11 +255,11 @@ EntityStats transactionStatsForVendor( } var memoizedRecurringExpenseStatsForUser = memo2( - (String userId, BuiltMap expenseMap) => + (String userId, BuiltMap expenseMap) => recurringExpenseStatsForUser(userId, expenseMap)); EntityStats recurringExpenseStatsForUser( - String userId, BuiltMap expenseMap) { + String userId, BuiltMap expenseMap) { int countActive = 0; int countArchived = 0; expenseMap.forEach((expenseId, expense) { @@ -276,11 +276,11 @@ EntityStats recurringExpenseStatsForUser( } var memoizedRecurringExpenseStatsForExpense = memo2( - (String expenseId, BuiltMap expenseMap) => + (String expenseId, BuiltMap expenseMap) => recurringExpenseStatsForExpense(expenseId, expenseMap)); EntityStats recurringExpenseStatsForExpense( - String recurrigExpenseId, BuiltMap expenseMap) { + String recurrigExpenseId, BuiltMap expenseMap) { int countActive = 0; int countArchived = 0; expenseMap.forEach((expenseId, expense) { diff --git a/lib/redux/recurring_invoice/recurring_invoice_selectors.dart b/lib/redux/recurring_invoice/recurring_invoice_selectors.dart index 1e74486dc..1569fb084 100644 --- a/lib/redux/recurring_invoice/recurring_invoice_selectors.dart +++ b/lib/redux/recurring_invoice/recurring_invoice_selectors.dart @@ -10,11 +10,11 @@ import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedFilteredRecurringInvoiceList = memo7(( SelectionState selectionState, BuiltMap recurringInvoiceMap, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, BuiltList recurringInvoiceList, ListUIState recurringInvoiceListState, - BuiltMap userMap, + BuiltMap userMap, ) => filteredRecurringInvoicesSelector( selectionState, @@ -29,11 +29,11 @@ var memoizedFilteredRecurringInvoiceList = memo7(( List filteredRecurringInvoicesSelector( SelectionState selectionState, BuiltMap recurringInvoiceMap, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, BuiltList recurringInvoiceList, ListUIState invoiceListState, - BuiltMap userMap, + BuiltMap userMap, ) { final filterEntityId = selectionState.filterEntityId; final filterEntityType = selectionState.filterEntityType; diff --git a/lib/redux/schedule/schedule_selectors.dart b/lib/redux/schedule/schedule_selectors.dart index 8c5007de8..a18005321 100644 --- a/lib/redux/schedule/schedule_selectors.dart +++ b/lib/redux/schedule/schedule_selectors.dart @@ -40,7 +40,7 @@ List dropdownSchedulesSelector( } var memoizedFilteredScheduleList = memo4((SelectionState selectionState, - BuiltMap scheduleMap, + BuiltMap scheduleMap, BuiltList scheduleList, ListUIState scheduleListState) => filteredSchedulesSelector( @@ -48,7 +48,7 @@ var memoizedFilteredScheduleList = memo4((SelectionState selectionState, List filteredSchedulesSelector( SelectionState selectionState, - BuiltMap scheduleMap, + BuiltMap scheduleMap, BuiltList scheduleList, ListUIState scheduleListState) { final filterEntityId = selectionState.filterEntityId; diff --git a/lib/redux/static/static_selectors.dart b/lib/redux/static/static_selectors.dart index 1420f1b3c..daac75a00 100644 --- a/lib/redux/static/static_selectors.dart +++ b/lib/redux/static/static_selectors.dart @@ -8,9 +8,9 @@ import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/static/font_model.dart'; var memoizedCountryList = memo1( - (BuiltMap countryMap) => countryList(countryMap)); + (BuiltMap countryMap) => countryList(countryMap)); -List countryList(BuiltMap countryMap) { +List countryList(BuiltMap countryMap) { final list = countryMap.keys.toList(); list.sort((idA, idB) => countryMap[idA]! @@ -21,11 +21,10 @@ List countryList(BuiltMap countryMap) { } var memoizedCountryIso2Map = memo1( - (BuiltMap countryMap) => - countryIso2Map(countryMap)); + (BuiltMap countryMap) => countryIso2Map(countryMap)); Map countryIso2Map( - BuiltMap countryMap) { + BuiltMap countryMap) { final map = {}; countryMap.keys.forEach((countryId) { final country = countryMap[countryId]!; @@ -35,9 +34,9 @@ Map countryIso2Map( } var memoizedGroupList = - memo1((BuiltMap groupMap) => groupList(groupMap)); + memo1((BuiltMap groupMap) => groupList(groupMap)); -List groupList(BuiltMap groupMap) { +List groupList(BuiltMap groupMap) { final list = groupMap.keys.where((groupId) => groupMap[groupId]!.isActive).toList(); @@ -48,10 +47,10 @@ List groupList(BuiltMap groupMap) { } var memoizedLanguageList = memo1( - (BuiltMap languageMap) => + (BuiltMap languageMap) => languageList(languageMap)); -List languageList(BuiltMap languageMap) { +List languageList(BuiltMap languageMap) { final list = languageMap.keys.toList(); list.sort((idA, idB) => languageMap[idA]! @@ -62,10 +61,10 @@ List languageList(BuiltMap languageMap) { } var memoizedCurrencyList = memo1( - (BuiltMap currencyMap) => + (BuiltMap currencyMap) => currencyList(currencyMap)); -List currencyList(BuiltMap currencyMap) { +List currencyList(BuiltMap currencyMap) { final list = currencyMap.keys.toList(); list.sort((idA, idB) => currencyMap[idA]! @@ -76,10 +75,10 @@ List currencyList(BuiltMap currencyMap) { } var memoizedTimezoneList = memo1( - (BuiltMap timezoneMap) => + (BuiltMap timezoneMap) => timezoneList(timezoneMap)); -List timezoneList(BuiltMap timezoneMap) { +List timezoneList(BuiltMap timezoneMap) { final list = timezoneMap.keys.toList(); list.sort((idA, idB) => timezoneMap[idA]! @@ -90,11 +89,10 @@ List timezoneList(BuiltMap timezoneMap) { } var memoizedDateFormatList = memo1( - (BuiltMap dateFormatMap) => + (BuiltMap dateFormatMap) => dateFormatList(dateFormatMap)); -List dateFormatList( - BuiltMap dateFormatMap) { +List dateFormatList(BuiltMap dateFormatMap) { final list = dateFormatMap.keys.toList(); list.sort((idA, idB) => dateFormatMap[idA]! @@ -119,9 +117,9 @@ List industryList(BuiltMap industryMap) { } var memoizedSizeList = - memo1((BuiltMap sizeMap) => sizeList(sizeMap)); + memo1((BuiltMap sizeMap) => sizeList(sizeMap)); -List sizeList(BuiltMap sizeMap) { +List sizeList(BuiltMap sizeMap) { final list = sizeMap.keys.toList(); list.sort((idA, idB) => sizeMap[idA]!.id.compareTo(sizeMap[idB]!.id)); @@ -130,9 +128,9 @@ List sizeList(BuiltMap sizeMap) { } var memoizedGatewayList = memo1( - (BuiltMap gatewayMap) => gatewayList(gatewayMap)); + (BuiltMap gatewayMap) => gatewayList(gatewayMap)); -List gatewayList(BuiltMap gatewayMap) { +List gatewayList(BuiltMap gatewayMap) { final list = gatewayMap.keys .where((gatewayId) => gatewayMap[gatewayId]!.isVisible) .toList(); diff --git a/lib/redux/static/static_state.dart b/lib/redux/static/static_state.dart index e8432439a..8b0436c36 100644 --- a/lib/redux/static/static_state.dart +++ b/lib/redux/static/static_state.dart @@ -44,23 +44,23 @@ abstract class StaticState implements Built { kMillisecondsToRefreshStaticData; } - BuiltMap get currencyMap; + BuiltMap get currencyMap; - BuiltMap get sizeMap; + BuiltMap get sizeMap; - BuiltMap get gatewayMap; + BuiltMap get gatewayMap; - BuiltMap get industryMap; + BuiltMap get industryMap; - BuiltMap get timezoneMap; + BuiltMap get timezoneMap; - BuiltMap get dateFormatMap; + BuiltMap get dateFormatMap; - BuiltMap get languageMap; + BuiltMap get languageMap; - BuiltMap get paymentTypeMap; + BuiltMap get paymentTypeMap; - BuiltMap get countryMap; + BuiltMap get countryMap; BuiltMap get templateMap; diff --git a/lib/redux/static/static_state.g.dart b/lib/redux/static/static_state.g.dart index 92a6dd772..e518a5b1d 100644 --- a/lib/redux/static/static_state.g.dart +++ b/lib/redux/static/static_state.g.dart @@ -20,58 +20,44 @@ class _$StaticStateSerializer implements StructuredSerializer { final result = [ 'currencyMap', serializers.serialize(object.currencyMap, - specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(CurrencyEntity) - ])), + specifiedType: const FullType(BuiltMap, + const [const FullType(String), const FullType(CurrencyEntity)])), 'sizeMap', serializers.serialize(object.sizeMap, - specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(SizeEntity) - ])), + specifiedType: const FullType(BuiltMap, + const [const FullType(String), const FullType(SizeEntity)])), 'gatewayMap', serializers.serialize(object.gatewayMap, - specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(GatewayEntity) - ])), + specifiedType: const FullType(BuiltMap, + const [const FullType(String), const FullType(GatewayEntity)])), 'industryMap', serializers.serialize(object.industryMap, - specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(IndustryEntity) - ])), + specifiedType: const FullType(BuiltMap, + const [const FullType(String), const FullType(IndustryEntity)])), 'timezoneMap', serializers.serialize(object.timezoneMap, - specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(TimezoneEntity) - ])), + specifiedType: const FullType(BuiltMap, + const [const FullType(String), const FullType(TimezoneEntity)])), 'dateFormatMap', serializers.serialize(object.dateFormatMap, specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(DateFormatEntity) + const FullType(String), + const FullType(DateFormatEntity) ])), 'languageMap', serializers.serialize(object.languageMap, - specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(LanguageEntity) - ])), + specifiedType: const FullType(BuiltMap, + const [const FullType(String), const FullType(LanguageEntity)])), 'paymentTypeMap', serializers.serialize(object.paymentTypeMap, specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(PaymentTypeEntity) + const FullType(String), + const FullType(PaymentTypeEntity) ])), 'countryMap', serializers.serialize(object.countryMap, - specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(CountryEntity) - ])), + specifiedType: const FullType(BuiltMap, + const [const FullType(String), const FullType(CountryEntity)])), 'templateMap', serializers.serialize(object.templateMap, specifiedType: const FullType(BuiltMap, @@ -105,64 +91,64 @@ class _$StaticStateSerializer implements StructuredSerializer { case 'currencyMap': result.currencyMap.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(CurrencyEntity) + const FullType(String), + const FullType(CurrencyEntity) ]))!); break; case 'sizeMap': result.sizeMap.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(SizeEntity) + const FullType(String), + const FullType(SizeEntity) ]))!); break; case 'gatewayMap': result.gatewayMap.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(GatewayEntity) + const FullType(String), + const FullType(GatewayEntity) ]))!); break; case 'industryMap': result.industryMap.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(IndustryEntity) + const FullType(String), + const FullType(IndustryEntity) ]))!); break; case 'timezoneMap': result.timezoneMap.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(TimezoneEntity) + const FullType(String), + const FullType(TimezoneEntity) ]))!); break; case 'dateFormatMap': result.dateFormatMap.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(DateFormatEntity) + const FullType(String), + const FullType(DateFormatEntity) ]))!); break; case 'languageMap': result.languageMap.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(LanguageEntity) + const FullType(String), + const FullType(LanguageEntity) ]))!); break; case 'paymentTypeMap': result.paymentTypeMap.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(PaymentTypeEntity) + const FullType(String), + const FullType(PaymentTypeEntity) ]))!); break; case 'countryMap': result.countryMap.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltMap, const [ - const FullType.nullable(String), - const FullType.nullable(CountryEntity) + const FullType(String), + const FullType(CountryEntity) ]))!); break; case 'templateMap': @@ -183,23 +169,23 @@ class _$StaticState extends StaticState { @override final int? updatedAt; @override - final BuiltMap currencyMap; + final BuiltMap currencyMap; @override - final BuiltMap sizeMap; + final BuiltMap sizeMap; @override - final BuiltMap gatewayMap; + final BuiltMap gatewayMap; @override - final BuiltMap industryMap; + final BuiltMap industryMap; @override - final BuiltMap timezoneMap; + final BuiltMap timezoneMap; @override - final BuiltMap dateFormatMap; + final BuiltMap dateFormatMap; @override - final BuiltMap languageMap; + final BuiltMap languageMap; @override - final BuiltMap paymentTypeMap; + final BuiltMap paymentTypeMap; @override - final BuiltMap countryMap; + final BuiltMap countryMap; @override final BuiltMap templateMap; @@ -309,58 +295,58 @@ class StaticStateBuilder implements Builder { int? get updatedAt => _$this._updatedAt; set updatedAt(int? updatedAt) => _$this._updatedAt = updatedAt; - MapBuilder? _currencyMap; - MapBuilder get currencyMap => - _$this._currencyMap ??= new MapBuilder(); - set currencyMap(MapBuilder? currencyMap) => + MapBuilder? _currencyMap; + MapBuilder get currencyMap => + _$this._currencyMap ??= new MapBuilder(); + set currencyMap(MapBuilder? currencyMap) => _$this._currencyMap = currencyMap; - MapBuilder? _sizeMap; - MapBuilder get sizeMap => - _$this._sizeMap ??= new MapBuilder(); - set sizeMap(MapBuilder? sizeMap) => + MapBuilder? _sizeMap; + MapBuilder get sizeMap => + _$this._sizeMap ??= new MapBuilder(); + set sizeMap(MapBuilder? sizeMap) => _$this._sizeMap = sizeMap; - MapBuilder? _gatewayMap; - MapBuilder get gatewayMap => - _$this._gatewayMap ??= new MapBuilder(); - set gatewayMap(MapBuilder? gatewayMap) => + MapBuilder? _gatewayMap; + MapBuilder get gatewayMap => + _$this._gatewayMap ??= new MapBuilder(); + set gatewayMap(MapBuilder? gatewayMap) => _$this._gatewayMap = gatewayMap; - MapBuilder? _industryMap; - MapBuilder get industryMap => - _$this._industryMap ??= new MapBuilder(); - set industryMap(MapBuilder? industryMap) => + MapBuilder? _industryMap; + MapBuilder get industryMap => + _$this._industryMap ??= new MapBuilder(); + set industryMap(MapBuilder? industryMap) => _$this._industryMap = industryMap; - MapBuilder? _timezoneMap; - MapBuilder get timezoneMap => - _$this._timezoneMap ??= new MapBuilder(); - set timezoneMap(MapBuilder? timezoneMap) => + MapBuilder? _timezoneMap; + MapBuilder get timezoneMap => + _$this._timezoneMap ??= new MapBuilder(); + set timezoneMap(MapBuilder? timezoneMap) => _$this._timezoneMap = timezoneMap; - MapBuilder? _dateFormatMap; - MapBuilder get dateFormatMap => - _$this._dateFormatMap ??= new MapBuilder(); - set dateFormatMap(MapBuilder? dateFormatMap) => + MapBuilder? _dateFormatMap; + MapBuilder get dateFormatMap => + _$this._dateFormatMap ??= new MapBuilder(); + set dateFormatMap(MapBuilder? dateFormatMap) => _$this._dateFormatMap = dateFormatMap; - MapBuilder? _languageMap; - MapBuilder get languageMap => - _$this._languageMap ??= new MapBuilder(); - set languageMap(MapBuilder? languageMap) => + MapBuilder? _languageMap; + MapBuilder get languageMap => + _$this._languageMap ??= new MapBuilder(); + set languageMap(MapBuilder? languageMap) => _$this._languageMap = languageMap; - MapBuilder? _paymentTypeMap; - MapBuilder get paymentTypeMap => - _$this._paymentTypeMap ??= new MapBuilder(); - set paymentTypeMap(MapBuilder? paymentTypeMap) => + MapBuilder? _paymentTypeMap; + MapBuilder get paymentTypeMap => + _$this._paymentTypeMap ??= new MapBuilder(); + set paymentTypeMap(MapBuilder? paymentTypeMap) => _$this._paymentTypeMap = paymentTypeMap; - MapBuilder? _countryMap; - MapBuilder get countryMap => - _$this._countryMap ??= new MapBuilder(); - set countryMap(MapBuilder? countryMap) => + MapBuilder? _countryMap; + MapBuilder get countryMap => + _$this._countryMap ??= new MapBuilder(); + set countryMap(MapBuilder? countryMap) => _$this._countryMap = countryMap; MapBuilder? _templateMap; diff --git a/lib/redux/task/task_selectors.dart b/lib/redux/task/task_selectors.dart index cb04082ca..20549aeb3 100644 --- a/lib/redux/task/task_selectors.dart +++ b/lib/redux/task/task_selectors.dart @@ -183,19 +183,19 @@ InvoiceItemEntity convertTaskToInvoiceItem({ ..customValue4 = customValue4); } -var memoizedTaskList = memo5((BuiltMap taskMap, +var memoizedTaskList = memo5((BuiltMap taskMap, String? clientId, - BuiltMap userMap, - BuiltMap clientMap, - BuiltMap projectMap) => + BuiltMap userMap, + BuiltMap clientMap, + BuiltMap projectMap) => taskList(taskMap, clientId, userMap, clientMap, projectMap)); List taskList( - BuiltMap taskMap, + BuiltMap taskMap, String? clientId, - BuiltMap userMap, - BuiltMap clientMap, - BuiltMap projectMap) { + BuiltMap userMap, + BuiltMap clientMap, + BuiltMap projectMap) { final list = taskMap.keys.where((taskId) { final task = taskMap[taskId]; if ((clientId ?? '').isNotEmpty && @@ -465,11 +465,11 @@ double? taskRateSelector({ } var memoizedTaskStatsForClient = memo2( - (String clientId, BuiltMap taskMap) => + (String clientId, BuiltMap taskMap) => taskStatsForClient(clientId, taskMap)); EntityStats taskStatsForClient( - String clientId, BuiltMap taskMap) { + String clientId, BuiltMap taskMap) { int countActive = 0; int countArchived = 0; taskMap.forEach((taskId, task) { @@ -487,12 +487,12 @@ EntityStats taskStatsForClient( var memoizedTaskStatsForProject = memo2(( String projectId, - BuiltMap taskMap, + BuiltMap taskMap, ) => taskStatsForProject(projectId, taskMap)); EntityStats taskStatsForProject( - String projectId, BuiltMap taskMap) { + String projectId, BuiltMap taskMap) { int countActive = 0; int countArchived = 0; taskMap.forEach((taskId, task) { @@ -510,7 +510,7 @@ EntityStats taskStatsForProject( var memoizedTaskStatsForUser = memo2(( String userId, - BuiltMap taskMap, + BuiltMap taskMap, ) => taskStatsForProject(userId, taskMap)); diff --git a/lib/redux/task_status/task_status_selectors.dart b/lib/redux/task_status/task_status_selectors.dart index 054e59026..cd576ac1f 100644 --- a/lib/redux/task_status/task_status_selectors.dart +++ b/lib/redux/task_status/task_status_selectors.dart @@ -45,7 +45,7 @@ var memoizedDropdownTaskStatusList = memo4( (BuiltMap taskStatusMap, BuiltList taskStatusList, StaticState staticState, - BuiltMap userMap) => + BuiltMap userMap) => dropdownTaskStatusesSelector( taskStatusMap, taskStatusList, staticState, userMap)); @@ -53,7 +53,7 @@ List dropdownTaskStatusesSelector( BuiltMap taskStatusMap, BuiltList taskStatusList, StaticState staticState, - BuiltMap userMap) { + BuiltMap userMap) { final list = taskStatusList.where((taskStatusId) { final taskStatus = taskStatusMap[taskStatusId]!; return taskStatus.isActive; @@ -114,12 +114,12 @@ List filteredTaskStatusesSelector( } var memoizedCalculateTaskStatusAmount = memo2((String taskStatusId, - BuiltMap taskMap) => + BuiltMap taskMap) => calculateTaskStatusAmount(taskStatusId: taskStatusId, taskMap: taskMap)); int calculateTaskStatusAmount({ String? taskStatusId, - required BuiltMap taskMap, + required BuiltMap taskMap, }) { int total = 0; @@ -133,12 +133,12 @@ int calculateTaskStatusAmount({ } var memoizedTaskStatsForTaskStatus = memo2( - (String companyGatewayId, BuiltMap taskMap) => + (String companyGatewayId, BuiltMap taskMap) => taskStatsForTaskStatus(companyGatewayId, taskMap)); EntityStats taskStatsForTaskStatus( String statusId, - BuiltMap taskMap, + BuiltMap taskMap, ) { int countActive = 0; int countArchived = 0; diff --git a/lib/redux/transaction/transaction_selectors.dart b/lib/redux/transaction/transaction_selectors.dart index d86c2406d..decabc5c7 100644 --- a/lib/redux/transaction/transaction_selectors.dart +++ b/lib/redux/transaction/transaction_selectors.dart @@ -60,13 +60,13 @@ List dropdownTransactionsSelector( } var memoizedFilteredTransactionList = memo9((SelectionState selectionState, - BuiltMap transactionMap, + BuiltMap transactionMap, BuiltList transactionList, BuiltMap invoiceMap, - BuiltMap vendorMap, - BuiltMap expenseMap, - BuiltMap expenseCategoryMap, - BuiltMap bankAccountMap, + BuiltMap vendorMap, + BuiltMap expenseMap, + BuiltMap expenseCategoryMap, + BuiltMap bankAccountMap, ListUIState transactionListState) => filteredTransactionsSelector( selectionState, @@ -81,13 +81,13 @@ var memoizedFilteredTransactionList = memo9((SelectionState selectionState, List filteredTransactionsSelector( SelectionState selectionState, - BuiltMap transactionMap, + BuiltMap transactionMap, BuiltList transactionList, BuiltMap invoiceMap, - BuiltMap vendorMap, - BuiltMap expenseMap, - BuiltMap expenseCategoryMap, - BuiltMap bankAccountMap, + BuiltMap vendorMap, + BuiltMap expenseMap, + BuiltMap expenseCategoryMap, + BuiltMap bankAccountMap, ListUIState transactionListState) { final filterEntityId = selectionState.filterEntityId; final filterEntityType = selectionState.filterEntityType; @@ -153,11 +153,11 @@ List filteredTransactionsSelector( } var memoizedTransactionStatsForBankAccount = memo2((String bankAccountId, - BuiltMap transactionMap) => + BuiltMap transactionMap) => transactionStatsForBankAccount(bankAccountId, transactionMap)); -EntityStats transactionStatsForBankAccount(String bankAccountId, - BuiltMap transactionMap) { +EntityStats transactionStatsForBankAccount( + String bankAccountId, BuiltMap transactionMap) { int countActive = 0; int countArchived = 0; transactionMap.forEach((transactionId, transaction) { diff --git a/lib/redux/transaction_rule/transaction_rule_selectors.dart b/lib/redux/transaction_rule/transaction_rule_selectors.dart index 7744ec8c4..260bc1589 100644 --- a/lib/redux/transaction_rule/transaction_rule_selectors.dart +++ b/lib/redux/transaction_rule/transaction_rule_selectors.dart @@ -82,12 +82,12 @@ List filteredTransactionRulesSelector( } var memoizedTransactionStatsForTransactionRule = memo2( - (String userId, BuiltMap transactionMap) => + (String userId, BuiltMap transactionMap) => transactionStatsForTransactionRule(userId, transactionMap)); EntityStats transactionStatsForTransactionRule( String transactionRuleId, - BuiltMap transactionMap, + BuiltMap transactionMap, ) { int countActive = 0; int countArchived = 0; diff --git a/lib/redux/user/user_selectors.dart b/lib/redux/user/user_selectors.dart index 6e3600fb3..931ca54e2 100644 --- a/lib/redux/user/user_selectors.dart +++ b/lib/redux/user/user_selectors.dart @@ -34,7 +34,7 @@ List dropdownUsersSelector(BuiltMap userMap, } var memoizedFilteredUserList = memo5((SelectionState selectionState, - BuiltMap userMap, + BuiltMap userMap, BuiltList userList, ListUIState userListState, String authUserId) => @@ -43,7 +43,7 @@ var memoizedFilteredUserList = memo5((SelectionState selectionState, List filteredUsersSelector( SelectionState selectionState, - BuiltMap userMap, + BuiltMap userMap, BuiltList userList, ListUIState userListState, String authUserId) { @@ -74,9 +74,9 @@ List filteredUsersSelector( } var memoizedUserList = - memo1((BuiltMap userMap) => userList(userMap)); + memo1((BuiltMap userMap) => userList(userMap)); -List userList(BuiltMap userMap) { +List userList(BuiltMap userMap) { final list = userMap.keys.where((userId) => userMap[userId]!.isActive).toList(); @@ -89,9 +89,9 @@ List userList(BuiltMap userMap) { } var memoizedGmailUserList = - memo1((BuiltMap userMap) => gmailUserList(userMap)); + memo1((BuiltMap userMap) => gmailUserList(userMap)); -List gmailUserList(BuiltMap userMap) { +List gmailUserList(BuiltMap userMap) { return userList(userMap).where((userId) { final user = (userMap[userId] ?? UserEntity) as UserEntity; @@ -99,10 +99,10 @@ List gmailUserList(BuiltMap userMap) { }).toList(); } -var memoizedMicrosoftUserList = memo1( - (BuiltMap userMap) => microsoftUserList(userMap)); +var memoizedMicrosoftUserList = + memo1((BuiltMap userMap) => microsoftUserList(userMap)); -List microsoftUserList(BuiltMap userMap) { +List microsoftUserList(BuiltMap userMap) { return userList(userMap).where((userId) { final user = (userMap[userId] ?? UserEntity) as UserEntity; diff --git a/lib/redux/vendor/vendor_selectors.dart b/lib/redux/vendor/vendor_selectors.dart index 98ad50410..ceea1894f 100644 --- a/lib/redux/vendor/vendor_selectors.dart +++ b/lib/redux/vendor/vendor_selectors.dart @@ -9,14 +9,14 @@ import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownVendorList = memo4( - (BuiltMap vendorMap, BuiltList vendorList, - BuiltMap userMap, StaticState staticState) => + (BuiltMap vendorMap, BuiltList vendorList, + BuiltMap userMap, StaticState staticState) => dropdownVendorsSelector(vendorMap, vendorList, userMap, staticState)); List dropdownVendorsSelector( - BuiltMap vendorMap, + BuiltMap vendorMap, BuiltList vendorList, - BuiltMap userMap, + BuiltMap userMap, StaticState staticState) { final list = vendorList.where((vendorId) { final vendor = vendorMap[vendorId]!; @@ -34,20 +34,20 @@ List dropdownVendorsSelector( } var memoizedFilteredVendorList = memo6((SelectionState selectionState, - BuiltMap vendorMap, + BuiltMap vendorMap, BuiltList vendorList, ListUIState vendorListState, - BuiltMap userMap, + BuiltMap userMap, StaticState staticState) => filteredVendorsSelector(selectionState, vendorMap, vendorList, vendorListState, userMap, staticState)); List filteredVendorsSelector( SelectionState selectionState, - BuiltMap vendorMap, + BuiltMap vendorMap, BuiltList vendorList, ListUIState vendorListState, - BuiltMap userMap, + BuiltMap userMap, StaticState staticState) { final list = vendorList.where((vendorId) { final vendor = vendorMap[vendorId]!; @@ -88,11 +88,11 @@ List filteredVendorsSelector( } var memoizedVendorStatsForUser = memo2( - (String userId, BuiltMap vendorMap) => + (String userId, BuiltMap vendorMap) => vendorStatsForUser(userId, vendorMap)); EntityStats vendorStatsForUser( - String userId, BuiltMap vendorMap) { + String userId, BuiltMap vendorMap) { int countActive = 0; int countArchived = 0; vendorMap.forEach((vendorId, vendor) { @@ -110,15 +110,12 @@ EntityStats vendorStatsForUser( var memoizedCalculateVendorBalance = memo4((String vendorId, String currencyId, - BuiltMap expenseMap, + BuiltMap expenseMap, BuiltList expenseList) => calculateVendorBalance(vendorId, currencyId, expenseMap, expenseList)); -double calculateVendorBalance( - String vendorId, - String currencyId, - BuiltMap expenseMap, - BuiltList expenseList) { +double calculateVendorBalance(String vendorId, String currencyId, + BuiltMap expenseMap, BuiltList expenseList) { double total = 0; expenseList.forEach((expenseId) { diff --git a/lib/redux/webhook/webhook_selectors.dart b/lib/redux/webhook/webhook_selectors.dart index 4444eeb2b..3bc8623d1 100644 --- a/lib/redux/webhook/webhook_selectors.dart +++ b/lib/redux/webhook/webhook_selectors.dart @@ -38,7 +38,7 @@ List dropdownWebhooksSelector( var memoizedFilteredWebhookList = memo4(( SelectionState selectionState, - BuiltMap webhookMap, + BuiltMap webhookMap, BuiltList webhookList, ListUIState webhookListState, ) => @@ -51,7 +51,7 @@ var memoizedFilteredWebhookList = memo4(( List filteredWebhooksSelector( SelectionState selectionState, - BuiltMap webhookMap, + BuiltMap webhookMap, BuiltList webhookList, ListUIState webhookListState, ) { diff --git a/lib/ui/bank_account/bank_account_list_vm.dart b/lib/ui/bank_account/bank_account_list_vm.dart index 147dc2121..bfe642174 100644 --- a/lib/ui/bank_account/bank_account_list_vm.dart +++ b/lib/ui/bank_account/bank_account_list_vm.dart @@ -98,9 +98,9 @@ class BankAccountListVM { EntityAction action) => handleBankAccountAction(context, bankAccounts, action), onRefreshed: (context) => _handleRefresh(context), - tableColumns: state.userCompany.settings - .getTableColumns(EntityType.bankAccount) ?? - BankAccountPresenter.getDefaultTableFields(state.userCompany), + tableColumns: + state.userCompany.settings.getTableColumns(EntityType.bankAccount) ?? + BankAccountPresenter.getDefaultTableFields(state.userCompany), onSortColumn: (field) => store.dispatch(SortBankAccounts(field)), onClearMultielsect: () => store.dispatch(ClearBankAccountMultiselect()), ); @@ -109,7 +109,7 @@ class BankAccountListVM { final AppState state; final UserCompanyEntity? userCompany; final List bankAccountList; - final BuiltMap bankAccountMap; + final BuiltMap bankAccountMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/bank_account/bank_account_screen_vm.dart b/lib/ui/bank_account/bank_account_screen_vm.dart index 3588e069b..ef9e40953 100644 --- a/lib/ui/bank_account/bank_account_screen_vm.dart +++ b/lib/ui/bank_account/bank_account_screen_vm.dart @@ -44,7 +44,7 @@ class BankAccountScreenVM { final UserCompanyEntity? userCompany; final List bankAccountList; final Function(BuildContext, List, EntityAction) onEntityAction; - final BuiltMap bankAccountMap; + final BuiltMap bankAccountMap; final Function(BuildContext) onRefreshAccounts; static BankAccountScreenVM fromStore(Store store) { diff --git a/lib/ui/client/client_screen_vm.dart b/lib/ui/client/client_screen_vm.dart index 36846f072..a8a6ce544 100644 --- a/lib/ui/client/client_screen_vm.dart +++ b/lib/ui/client/client_screen_vm.dart @@ -40,7 +40,7 @@ class ClientScreenVM { final bool isInMultiselect; final UserCompanyEntity? userCompany; final List clientList; - final BuiltMap clientMap; + final BuiltMap clientMap; static ClientScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/credit/credit_list_vm.dart b/lib/ui/credit/credit_list_vm.dart index ae743dd81..b4a053860 100644 --- a/lib/ui/credit/credit_list_vm.dart +++ b/lib/ui/credit/credit_list_vm.dart @@ -68,7 +68,7 @@ class CreditListVM extends EntityListVM { required AppState state, required List invoiceList, required BuiltMap invoiceMap, - required BuiltMap clientMap, + required BuiltMap clientMap, required String? filter, required bool isLoading, required Function(BuildContext) onRefreshed, diff --git a/lib/ui/credit/edit/credit_edit_details_vm.dart b/lib/ui/credit/edit/credit_edit_details_vm.dart index 423ddf65d..16d47bc58 100644 --- a/lib/ui/credit/edit/credit_edit_details_vm.dart +++ b/lib/ui/credit/edit/credit_edit_details_vm.dart @@ -59,7 +59,7 @@ class CreditEditDetailsVM extends EntityEditDetailsVM { Function(InvoiceEntity)? onChanged, Function(BuildContext, InvoiceEntity, ClientEntity?)? onClientChanged, Function(BuildContext, InvoiceEntity, VendorEntity?)? onVendorChanged, - BuiltMap? clientMap, + BuiltMap? clientMap, BuiltList? clientList, Function(BuildContext context, Completer completer)? onAddClientPressed, diff --git a/lib/ui/dashboard/dashboard_screen_vm.dart b/lib/ui/dashboard/dashboard_screen_vm.dart index 3f65ac5b1..e8da692f8 100644 --- a/lib/ui/dashboard/dashboard_screen_vm.dart +++ b/lib/ui/dashboard/dashboard_screen_vm.dart @@ -125,7 +125,7 @@ class DashboardVM { final AppState state; final DashboardUIState dashboardUIState; - final BuiltMap currencyMap; + final BuiltMap currencyMap; final String? filter; final List filteredList; final bool isLoading; diff --git a/lib/ui/design/design_list_vm.dart b/lib/ui/design/design_list_vm.dart index 63b79c841..e1eba7030 100644 --- a/lib/ui/design/design_list_vm.dart +++ b/lib/ui/design/design_list_vm.dart @@ -109,7 +109,7 @@ class DesignListVM { final AppState state; final UserCompanyEntity? userCompany; final List designList; - final BuiltMap designMap; + final BuiltMap designMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/design/design_screen_vm.dart b/lib/ui/design/design_screen_vm.dart index 04e32ac03..3be1d848d 100644 --- a/lib/ui/design/design_screen_vm.dart +++ b/lib/ui/design/design_screen_vm.dart @@ -43,7 +43,7 @@ class DesignScreenVM { final UserCompanyEntity? userCompany; final List designList; final Function(BuildContext, List, EntityAction) onEntityAction; - final BuiltMap designMap; + final BuiltMap designMap; static DesignScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/document/document_list_vm.dart b/lib/ui/document/document_list_vm.dart index 01d0d92d7..fd5dbb1dc 100644 --- a/lib/ui/document/document_list_vm.dart +++ b/lib/ui/document/document_list_vm.dart @@ -128,7 +128,7 @@ class DocumentListVM { final AppState state; final List documentList; - final BuiltMap documentMap; + final BuiltMap documentMap; final ListUIState listState; final List tableColumns; final String? filter; diff --git a/lib/ui/document/document_screen_vm.dart b/lib/ui/document/document_screen_vm.dart index 56469dbab..f190e6c68 100644 --- a/lib/ui/document/document_screen_vm.dart +++ b/lib/ui/document/document_screen_vm.dart @@ -40,7 +40,7 @@ class DocumentScreenVM { final bool isInMultiselect; final UserCompanyEntity? userCompany; final List documentList; - final BuiltMap documentMap; + final BuiltMap documentMap; static DocumentScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/expense/expense_list_vm.dart b/lib/ui/expense/expense_list_vm.dart index e54382a02..07531629a 100644 --- a/lib/ui/expense/expense_list_vm.dart +++ b/lib/ui/expense/expense_list_vm.dart @@ -115,7 +115,7 @@ class ExpenseListVM { final AppState state; final UserEntity? user; final List expenseList; - final BuiltMap expenseMap; + final BuiltMap expenseMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/expense/expense_screen_vm.dart b/lib/ui/expense/expense_screen_vm.dart index 8260a2fbd..6e3bdcc0f 100644 --- a/lib/ui/expense/expense_screen_vm.dart +++ b/lib/ui/expense/expense_screen_vm.dart @@ -40,7 +40,7 @@ class ExpenseScreenVM { final bool isInMultiselect; final UserCompanyEntity? userCompany; final List expenseList; - final BuiltMap expenseMap; + final BuiltMap expenseMap; static ExpenseScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/expense_category/expense_category_list_vm.dart b/lib/ui/expense_category/expense_category_list_vm.dart index fa864312a..e94e2cfb8 100644 --- a/lib/ui/expense_category/expense_category_list_vm.dart +++ b/lib/ui/expense_category/expense_category_list_vm.dart @@ -117,7 +117,7 @@ class ExpenseCategoryListVM { final AppState state; final UserCompanyEntity? userCompany; final List expenseCategoryList; - final BuiltMap expenseCategoryMap; + final BuiltMap expenseCategoryMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/expense_category/expense_category_screen_vm.dart b/lib/ui/expense_category/expense_category_screen_vm.dart index e6d2ff40e..90e0ba499 100644 --- a/lib/ui/expense_category/expense_category_screen_vm.dart +++ b/lib/ui/expense_category/expense_category_screen_vm.dart @@ -43,7 +43,7 @@ class ExpenseCategoryScreenVM { final UserCompanyEntity? userCompany; final List expenseCategoryList; final Function(BuildContext, List, EntityAction) onEntityAction; - final BuiltMap expenseCategoryMap; + final BuiltMap expenseCategoryMap; static ExpenseCategoryScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/group/group_list_vm.dart b/lib/ui/group/group_list_vm.dart index c4cd5a3dc..a408fee88 100644 --- a/lib/ui/group/group_list_vm.dart +++ b/lib/ui/group/group_list_vm.dart @@ -107,7 +107,7 @@ class GroupListVM { final AppState state; final UserCompanyEntity? userCompany; final List groupList; - final BuiltMap groupMap; + final BuiltMap groupMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/group/group_screen_vm.dart b/lib/ui/group/group_screen_vm.dart index 68cf484f0..e2fe15829 100644 --- a/lib/ui/group/group_screen_vm.dart +++ b/lib/ui/group/group_screen_vm.dart @@ -41,7 +41,7 @@ class GroupScreenVM { final bool isInMultiselect; final UserCompanyEntity? userCompany; final List groupList; - final BuiltMap groupMap; + final BuiltMap groupMap; static GroupScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/invoice/edit/invoice_edit_details_vm.dart b/lib/ui/invoice/edit/invoice_edit_details_vm.dart index d686978c3..0b4b7be75 100644 --- a/lib/ui/invoice/edit/invoice_edit_details_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_details_vm.dart @@ -70,7 +70,7 @@ class EntityEditDetailsVM { onClientChanged; final Function(BuildContext context, InvoiceEntity, VendorEntity?)? onVendorChanged; - final BuiltMap? clientMap; + final BuiltMap? clientMap; final BuiltList? clientList; final Function(BuildContext context, Completer completer)? onAddClientPressed; @@ -86,7 +86,7 @@ class InvoiceEditDetailsVM extends EntityEditDetailsVM { Function(InvoiceEntity)? onChanged, Function(BuildContext, InvoiceEntity, ClientEntity?)? onClientChanged, Function(BuildContext, InvoiceEntity, VendorEntity?)? onVendorChanged, - BuiltMap? clientMap, + BuiltMap? clientMap, BuiltList? clientList, Function(BuildContext context, Completer completer)? onAddClientPressed, diff --git a/lib/ui/invoice/invoice_list_vm.dart b/lib/ui/invoice/invoice_list_vm.dart index c45a27b04..993fe00f7 100644 --- a/lib/ui/invoice/invoice_list_vm.dart +++ b/lib/ui/invoice/invoice_list_vm.dart @@ -77,7 +77,7 @@ class EntityListVM { final EntityType entityType; final List invoiceList; final BuiltMap invoiceMap; - final BuiltMap clientMap; + final BuiltMap clientMap; final String? filter; final bool isLoading; final Function(BuildContext) onRefreshed; @@ -91,7 +91,7 @@ class InvoiceListVM extends EntityListVM { required AppState state, required List invoiceList, required BuiltMap invoiceMap, - required BuiltMap clientMap, + required BuiltMap clientMap, required String? filter, required bool isLoading, required Function(BuildContext) onRefreshed, diff --git a/lib/ui/payment/payment_list_vm.dart b/lib/ui/payment/payment_list_vm.dart index 14f1f66be..7c9e3ce4f 100644 --- a/lib/ui/payment/payment_list_vm.dart +++ b/lib/ui/payment/payment_list_vm.dart @@ -117,8 +117,8 @@ class PaymentListVM { final UserEntity? user; final ListUIState listState; final List paymentList; - final BuiltMap paymentMap; - final BuiltMap clientMap; + final BuiltMap paymentMap; + final BuiltMap clientMap; final String? filter; final bool isLoading; final Function(BuildContext) onRefreshed; diff --git a/lib/ui/payment/payment_screen_vm.dart b/lib/ui/payment/payment_screen_vm.dart index 22d88b53a..0eae67ffa 100644 --- a/lib/ui/payment/payment_screen_vm.dart +++ b/lib/ui/payment/payment_screen_vm.dart @@ -40,7 +40,7 @@ class PaymentScreenVM { final bool isInMultiselect; final UserCompanyEntity? userCompany; final List paymentList; - final BuiltMap paymentMap; + final BuiltMap paymentMap; static PaymentScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/payment_term/payment_term_list_vm.dart b/lib/ui/payment_term/payment_term_list_vm.dart index e9976ccd2..b32c1a875 100644 --- a/lib/ui/payment_term/payment_term_list_vm.dart +++ b/lib/ui/payment_term/payment_term_list_vm.dart @@ -112,7 +112,7 @@ class PaymentTermListVM { final AppState state; final UserCompanyEntity? userCompany; final List paymentTermList; - final BuiltMap paymentTermMap; + final BuiltMap paymentTermMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/payment_term/payment_term_screen_vm.dart b/lib/ui/payment_term/payment_term_screen_vm.dart index c44d5eb89..12a85da61 100644 --- a/lib/ui/payment_term/payment_term_screen_vm.dart +++ b/lib/ui/payment_term/payment_term_screen_vm.dart @@ -44,7 +44,7 @@ class PaymentTermScreenVM { final UserCompanyEntity? userCompany; final List paymentTermList; final Function(BuildContext, List, EntityAction) onEntityAction; - final BuiltMap paymentTermMap; + final BuiltMap paymentTermMap; static PaymentTermScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/product/product_screen_vm.dart b/lib/ui/product/product_screen_vm.dart index e8e9fbac5..d9cdee6f3 100644 --- a/lib/ui/product/product_screen_vm.dart +++ b/lib/ui/product/product_screen_vm.dart @@ -40,7 +40,7 @@ class ProductScreenVM { final bool isInMultiselect; final UserCompanyEntity? userCompany; final List productList; - final BuiltMap productMap; + final BuiltMap productMap; static ProductScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/project/project_list_vm.dart b/lib/ui/project/project_list_vm.dart index 0f7423d9f..de3ea11c2 100644 --- a/lib/ui/project/project_list_vm.dart +++ b/lib/ui/project/project_list_vm.dart @@ -113,8 +113,8 @@ class ProjectListVM { final AppState state; final List projectList; - final BuiltMap projectMap; - final BuiltMap clientMap; + final BuiltMap projectMap; + final BuiltMap clientMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/project/project_screen_vm.dart b/lib/ui/project/project_screen_vm.dart index 930ef8bc9..71ebe6a69 100644 --- a/lib/ui/project/project_screen_vm.dart +++ b/lib/ui/project/project_screen_vm.dart @@ -40,7 +40,7 @@ class ProjectScreenVM { final bool isInMultiselect; final UserCompanyEntity? userCompany; final List projectList; - final BuiltMap projectMap; + final BuiltMap projectMap; static ProjectScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/purchase_order/edit/purchase_order_edit_details_vm.dart b/lib/ui/purchase_order/edit/purchase_order_edit_details_vm.dart index 1791c1afb..640108c44 100644 --- a/lib/ui/purchase_order/edit/purchase_order_edit_details_vm.dart +++ b/lib/ui/purchase_order/edit/purchase_order_edit_details_vm.dart @@ -59,7 +59,7 @@ class PurchaseOrderEditDetailsVM extends EntityEditDetailsVM { Function(InvoiceEntity)? onChanged, Function(BuildContext, InvoiceEntity, ClientEntity?)? onClientChanged, Function(BuildContext, InvoiceEntity, VendorEntity?)? onVendorChanged, - BuiltMap? clientMap, + BuiltMap? clientMap, BuiltList? clientList, Function(BuildContext context, Completer completer)? onAddClientPressed, diff --git a/lib/ui/purchase_order/purchase_order_list_vm.dart b/lib/ui/purchase_order/purchase_order_list_vm.dart index da91c9d5f..3ebe34b85 100644 --- a/lib/ui/purchase_order/purchase_order_list_vm.dart +++ b/lib/ui/purchase_order/purchase_order_list_vm.dart @@ -68,7 +68,7 @@ class PurchaseOrderListVM extends EntityListVM { required AppState state, required List invoiceList, required BuiltMap invoiceMap, - required BuiltMap clientMap, + required BuiltMap clientMap, required String? filter, required bool isLoading, required Function(BuildContext) onRefreshed, diff --git a/lib/ui/quote/edit/quote_edit_details_vm.dart b/lib/ui/quote/edit/quote_edit_details_vm.dart index 034d93337..b0b3d5268 100644 --- a/lib/ui/quote/edit/quote_edit_details_vm.dart +++ b/lib/ui/quote/edit/quote_edit_details_vm.dart @@ -58,7 +58,7 @@ class QuoteEditDetailsVM extends EntityEditDetailsVM { Function(InvoiceEntity)? onChanged, Function(BuildContext, InvoiceEntity, ClientEntity?)? onClientChanged, Function(BuildContext, InvoiceEntity, VendorEntity?)? onVendorChanged, - BuiltMap? clientMap, + BuiltMap? clientMap, BuiltList? clientList, Function(BuildContext context, Completer completer)? onAddClientPressed, diff --git a/lib/ui/quote/quote_list_vm.dart b/lib/ui/quote/quote_list_vm.dart index 7c502bdb3..e3a1207a3 100644 --- a/lib/ui/quote/quote_list_vm.dart +++ b/lib/ui/quote/quote_list_vm.dart @@ -61,7 +61,7 @@ class QuoteListVM extends EntityListVM { required AppState state, required List invoiceList, required BuiltMap invoiceMap, - required BuiltMap clientMap, + required BuiltMap clientMap, required String? filter, required bool isLoading, required Function(BuildContext) onRefreshed, diff --git a/lib/ui/recurring_expense/recurring_expense_list_vm.dart b/lib/ui/recurring_expense/recurring_expense_list_vm.dart index c48b46a44..97b470d11 100644 --- a/lib/ui/recurring_expense/recurring_expense_list_vm.dart +++ b/lib/ui/recurring_expense/recurring_expense_list_vm.dart @@ -122,7 +122,7 @@ class RecurringExpenseListVM { final AppState state; final UserCompanyEntity? userCompany; final List recurringExpenseList; - final BuiltMap recurringExpenseMap; + final BuiltMap recurringExpenseMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/recurring_expense/recurring_expense_screen_vm.dart b/lib/ui/recurring_expense/recurring_expense_screen_vm.dart index 89434a48b..8665eb06e 100644 --- a/lib/ui/recurring_expense/recurring_expense_screen_vm.dart +++ b/lib/ui/recurring_expense/recurring_expense_screen_vm.dart @@ -43,7 +43,7 @@ class RecurringExpenseScreenVM { final UserCompanyEntity? userCompany; final List recurringExpenseList; final Function(BuildContext, List, EntityAction) onEntityAction; - final BuiltMap recurringExpenseMap; + final BuiltMap recurringExpenseMap; static RecurringExpenseScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_details_vm.dart b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_details_vm.dart index 555b881f3..1ce476970 100644 --- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_details_vm.dart +++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_details_vm.dart @@ -59,7 +59,7 @@ class RecurringInvoiceEditDetailsVM extends EntityEditDetailsVM { Function(InvoiceEntity)? onChanged, Function(BuildContext, InvoiceEntity, ClientEntity?)? onClientChanged, Function(BuildContext, InvoiceEntity, VendorEntity?)? onVendorChanged, - BuiltMap? clientMap, + BuiltMap? clientMap, BuiltList? clientList, Function(BuildContext context, Completer completer)? onAddClientPressed, diff --git a/lib/ui/reports/client_report.dart b/lib/ui/reports/client_report.dart index de197cfed..48702c355 100644 --- a/lib/ui/reports/client_report.dart +++ b/lib/ui/reports/client_report.dart @@ -83,9 +83,9 @@ enum ClientReportFields { var memoizedClientReport = memo6(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap clientMap, - BuiltMap userMap, - BuiltMap groupMap, + BuiltMap clientMap, + BuiltMap userMap, + BuiltMap groupMap, StaticState staticState, ) => clientReport(userCompany!, reportsUIState, clientMap, userMap, groupMap, @@ -94,9 +94,9 @@ var memoizedClientReport = memo6(( ReportResult clientReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap clientMap, - BuiltMap userMap, - BuiltMap groupMap, + BuiltMap clientMap, + BuiltMap userMap, + BuiltMap groupMap, StaticState staticState, ) { final List> data = []; @@ -104,10 +104,9 @@ ReportResult clientReport( BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final clientReportSettings = - reportSettings.containsKey(kReportClient) - ? reportSettings[kReportClient]! - : ReportSettingsEntity(); + final clientReportSettings = reportSettings.containsKey(kReportClient) + ? reportSettings[kReportClient]! + : ReportSettingsEntity(); final defaultColumns = [ ClientReportFields.name, @@ -408,15 +407,13 @@ ReportResult clientReport( } } - final selectedColumns = - columns.map((item) => EnumUtils.parse(item)).toList(); + final selectedColumns = columns.map((item) => EnumUtils.parse(item)).toList(); data.sort((rowA, rowB) => sortReportTableRows(rowA, rowB, clientReportSettings, selectedColumns)!); return ReportResult( - allColumns: ClientReportFields.values - .map((item) => EnumUtils.parse(item)) - .toList(), + allColumns: + ClientReportFields.values.map((item) => EnumUtils.parse(item)).toList(), columns: selectedColumns, defaultColumns: defaultColumns.map((item) => EnumUtils.parse(item)).toList(), diff --git a/lib/ui/reports/contact_report.dart b/lib/ui/reports/contact_report.dart index 6732220c3..861d7dd99 100644 --- a/lib/ui/reports/contact_report.dart +++ b/lib/ui/reports/contact_report.dart @@ -72,8 +72,8 @@ enum ContactReportFields { var memoizedContactReport = memo5(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap clientMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap userMap, StaticState staticState, ) => contactReport( @@ -82,18 +82,17 @@ var memoizedContactReport = memo5(( ReportResult contactReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap clientMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap userMap, StaticState staticState, ) { final List> data = []; BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final clientReportSettings = - reportSettings.containsKey(kReportClientContact) - ? reportSettings[kReportClientContact]! - : ReportSettingsEntity(); + final clientReportSettings = reportSettings.containsKey(kReportClientContact) + ? reportSettings[kReportClientContact]! + : ReportSettingsEntity(); final defaultColumns = [ ContactReportFields.name, diff --git a/lib/ui/reports/credit_item_report.dart b/lib/ui/reports/credit_item_report.dart index 9ff3474ce..e03e12bcf 100644 --- a/lib/ui/reports/credit_item_report.dart +++ b/lib/ui/reports/credit_item_report.dart @@ -46,9 +46,9 @@ enum CreditItemReportFields { var memoizedCreditItemReport = memo6(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap productMap, + BuiltMap productMap, BuiltMap creditMap, - BuiltMap clientMap, + BuiltMap clientMap, StaticState staticState, ) => lineItemReport(userCompany!, reportsUIState, productMap, creditMap, @@ -57,19 +57,18 @@ var memoizedCreditItemReport = memo6(( ReportResult lineItemReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap productMap, + BuiltMap productMap, BuiltMap creditMap, - BuiltMap clientMap, + BuiltMap clientMap, StaticState staticState, ) { final List> data = []; BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final lineItemReportSettings = - reportSettings.containsKey(kReportCreditItem) - ? reportSettings[kReportCreditItem]! - : ReportSettingsEntity(); + final lineItemReportSettings = reportSettings.containsKey(kReportCreditItem) + ? reportSettings[kReportCreditItem]! + : ReportSettingsEntity(); final defaultColumns = [ CreditItemReportFields.creditNumber, diff --git a/lib/ui/reports/credit_report.dart b/lib/ui/reports/credit_report.dart index 74165cdc9..b31b109ca 100644 --- a/lib/ui/reports/credit_report.dart +++ b/lib/ui/reports/credit_report.dart @@ -83,8 +83,8 @@ var memoizedCreditReport = memo6(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, BuiltMap creditMap, - BuiltMap clientMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap userMap, StaticState staticState, ) => creditReport(userCompany!, reportsUIState, creditMap, clientMap, userMap, @@ -94,8 +94,8 @@ ReportResult creditReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, BuiltMap creditMap, - BuiltMap clientMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap userMap, StaticState staticState, ) { final List> data = []; @@ -103,10 +103,9 @@ ReportResult creditReport( BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final creditReportSettings = - reportSettings.containsKey(kReportCredit) - ? reportSettings[kReportCredit]! - : ReportSettingsEntity(); + final creditReportSettings = reportSettings.containsKey(kReportCredit) + ? reportSettings[kReportCredit]! + : ReportSettingsEntity(); final defaultColumns = [ CreditReportFields.number, diff --git a/lib/ui/reports/document_report.dart b/lib/ui/reports/document_report.dart index 49c4898e8..a9d8168f4 100644 --- a/lib/ui/reports/document_report.dart +++ b/lib/ui/reports/document_report.dart @@ -29,8 +29,8 @@ enum DocumentReportFields { var memoizedDocumentReport = memo4(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap documentMap, - BuiltMap userMap, + BuiltMap documentMap, + BuiltMap userMap, ) => documentReport( userCompany!, @@ -42,8 +42,8 @@ var memoizedDocumentReport = memo4(( ReportResult documentReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap documentMap, - BuiltMap userMap, + BuiltMap documentMap, + BuiltMap userMap, ) { final List> data = []; final List entities = []; @@ -52,10 +52,9 @@ ReportResult documentReport( final localization = AppLocalization(AppLocalization.createLocale(Intl.defaultLocale)); final reportSettings = userCompany.settings.reportSettings; - final documentReportSettings = - reportSettings.containsKey(kReportDocument) - ? reportSettings[kReportDocument]! - : ReportSettingsEntity(); + final documentReportSettings = reportSettings.containsKey(kReportDocument) + ? reportSettings[kReportDocument]! + : ReportSettingsEntity(); final defaultColumns = [ DocumentReportFields.record_type, diff --git a/lib/ui/reports/expense_report.dart b/lib/ui/reports/expense_report.dart index 2f9d2b40d..997ef7b93 100644 --- a/lib/ui/reports/expense_report.dart +++ b/lib/ui/reports/expense_report.dart @@ -58,13 +58,13 @@ enum ExpenseReportFields { var memoizedExpenseReport = memo10(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap expenseMap, - BuiltMap expenseCategoryMap, + BuiltMap expenseMap, + BuiltMap expenseCategoryMap, BuiltMap invoiceMap, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap projectMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap projectMap, + BuiltMap userMap, StaticState staticState, ) => expenseReport( @@ -83,13 +83,13 @@ var memoizedExpenseReport = memo10(( ReportResult expenseReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap expenseMap, - BuiltMap expenseCategoryMap, + BuiltMap expenseMap, + BuiltMap expenseCategoryMap, BuiltMap invoiceMap, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap projectMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap projectMap, + BuiltMap userMap, StaticState staticState, ) { final List> data = []; @@ -97,10 +97,9 @@ ReportResult expenseReport( BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final expenseReportSettings = - reportSettings.containsKey(kReportExpense) - ? reportSettings[kReportExpense]! - : ReportSettingsEntity(); + final expenseReportSettings = reportSettings.containsKey(kReportExpense) + ? reportSettings[kReportExpense]! + : ReportSettingsEntity(); final defaultColumns = [ ExpenseReportFields.amount, diff --git a/lib/ui/reports/invoice_item_report.dart b/lib/ui/reports/invoice_item_report.dart index feb769136..16ce400e0 100644 --- a/lib/ui/reports/invoice_item_report.dart +++ b/lib/ui/reports/invoice_item_report.dart @@ -46,9 +46,9 @@ enum InvoiceItemReportFields { var memoizedInvoiceItemReport = memo6(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap productMap, + BuiltMap productMap, BuiltMap invoiceMap, - BuiltMap clientMap, + BuiltMap clientMap, StaticState staticState, ) => lineItemReport(userCompany!, reportsUIState, productMap, invoiceMap, @@ -57,19 +57,18 @@ var memoizedInvoiceItemReport = memo6(( ReportResult lineItemReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap productMap, + BuiltMap productMap, BuiltMap invoiceMap, - BuiltMap clientMap, + BuiltMap clientMap, StaticState staticState, ) { final List> data = []; BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final lineItemReportSettings = - reportSettings.containsKey(kReportInvoiceItem) - ? reportSettings[kReportInvoiceItem]! - : ReportSettingsEntity(); + final lineItemReportSettings = reportSettings.containsKey(kReportInvoiceItem) + ? reportSettings[kReportInvoiceItem]! + : ReportSettingsEntity(); final defaultColumns = [ InvoiceItemReportFields.invoiceNumber, diff --git a/lib/ui/reports/invoice_tax_report.dart b/lib/ui/reports/invoice_tax_report.dart index 4ae115a5d..656bdbdc0 100644 --- a/lib/ui/reports/invoice_tax_report.dart +++ b/lib/ui/reports/invoice_tax_report.dart @@ -31,9 +31,9 @@ var memoizedInvoiceTaxReport = memo9(( BuiltMap taxRateMap, BuiltMap invoiceMap, BuiltMap creditMap, - BuiltMap clientMap, - BuiltMap paymentMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap paymentMap, + BuiltMap userMap, StaticState staticState, ) => taxReport(userCompany!, reportsUIState, taxRateMap, invoiceMap, creditMap, @@ -45,19 +45,18 @@ ReportResult taxReport( BuiltMap taxRateMap, BuiltMap invoiceMap, BuiltMap creditMap, - BuiltMap clientMap, - BuiltMap paymentMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap paymentMap, + BuiltMap userMap, StaticState staticState, ) { final List> data = []; BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final taxRateReportSettings = - reportSettings.containsKey(kReportInvoiceTax) - ? reportSettings[kReportInvoiceTax]! - : ReportSettingsEntity(); + final taxRateReportSettings = reportSettings.containsKey(kReportInvoiceTax) + ? reportSettings[kReportInvoiceTax]! + : ReportSettingsEntity(); final defaultColumns = [ TaxRateReportFields.tax_name, diff --git a/lib/ui/reports/payment_report.dart b/lib/ui/reports/payment_report.dart index 8418b2434..43b72f9f3 100644 --- a/lib/ui/reports/payment_report.dart +++ b/lib/ui/reports/payment_report.dart @@ -51,9 +51,9 @@ var memoizedPaymentReport = memo8( ( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap paymentMap, - BuiltMap clientMap, - BuiltMap userMap, + BuiltMap paymentMap, + BuiltMap clientMap, + BuiltMap userMap, BuiltMap invoiceMap, BuiltMap creditMap, StaticState staticState, @@ -73,9 +73,9 @@ var memoizedPaymentReport = memo8( ReportResult paymentReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap paymentMap, - BuiltMap clientMap, - BuiltMap userMap, + BuiltMap paymentMap, + BuiltMap clientMap, + BuiltMap userMap, BuiltMap invoiceMap, BuiltMap creditMap, StaticState staticState, @@ -85,10 +85,9 @@ ReportResult paymentReport( BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final paymentReportSettings = - reportSettings.containsKey(kReportPayment) - ? reportSettings[kReportPayment]! - : ReportSettingsEntity(); + final paymentReportSettings = reportSettings.containsKey(kReportPayment) + ? reportSettings[kReportPayment]! + : ReportSettingsEntity(); final defaultColumns = [ PaymentReportFields.number, diff --git a/lib/ui/reports/payment_tax_report.dart b/lib/ui/reports/payment_tax_report.dart index 1a64612d9..9d04a7020 100644 --- a/lib/ui/reports/payment_tax_report.dart +++ b/lib/ui/reports/payment_tax_report.dart @@ -32,9 +32,9 @@ var memoizedPaymentTaxReport = memo9(( BuiltMap taxRateMap, BuiltMap invoiceMap, BuiltMap creditMap, - BuiltMap clientMap, - BuiltMap paymentMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap paymentMap, + BuiltMap userMap, StaticState staticState, ) => paymentTaxReport(userCompany!, reportsUIState, taxRateMap, invoiceMap, @@ -46,19 +46,18 @@ ReportResult paymentTaxReport( BuiltMap taxRateMap, BuiltMap invoiceMap, BuiltMap creditMap, - BuiltMap clientMap, - BuiltMap paymentMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap paymentMap, + BuiltMap userMap, StaticState staticState, ) { final List> data = []; BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final taxRateReportSettings = - reportSettings.containsKey(kReportPaymentTax) - ? reportSettings[kReportPaymentTax]! - : ReportSettingsEntity(); + final taxRateReportSettings = reportSettings.containsKey(kReportPaymentTax) + ? reportSettings[kReportPaymentTax]! + : ReportSettingsEntity(); final defaultColumns = [ TaxRateReportFields.tax_name, diff --git a/lib/ui/reports/product_report.dart b/lib/ui/reports/product_report.dart index 9debcc17e..df7ae6c0f 100644 --- a/lib/ui/reports/product_report.dart +++ b/lib/ui/reports/product_report.dart @@ -37,9 +37,9 @@ enum ProductReportFields { var memoizedProductReport = memo6(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap productMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap productMap, + BuiltMap vendorMap, + BuiltMap userMap, StaticState staticState, ) => productReport(userCompany!, reportsUIState, productMap, vendorMap, userMap, @@ -48,9 +48,9 @@ var memoizedProductReport = memo6(( ReportResult productReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap productMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap productMap, + BuiltMap vendorMap, + BuiltMap userMap, StaticState staticState, ) { final List> data = []; @@ -58,10 +58,9 @@ ReportResult productReport( BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final productReportSettings = - reportSettings.containsKey(kReportProduct) - ? reportSettings[kReportProduct]! - : ReportSettingsEntity(); + final productReportSettings = reportSettings.containsKey(kReportProduct) + ? reportSettings[kReportProduct]! + : ReportSettingsEntity(); final defaultColumns = [ ProductReportFields.name, diff --git a/lib/ui/reports/profit_loss_report.dart b/lib/ui/reports/profit_loss_report.dart index 7898fbef4..75698f1c4 100644 --- a/lib/ui/reports/profit_loss_report.dart +++ b/lib/ui/reports/profit_loss_report.dart @@ -40,12 +40,12 @@ enum ProfitAndLossReportFields { var memoizedProfitAndLossReport = memo9(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap clientMap, - BuiltMap paymentMap, - BuiltMap expenseMap, - BuiltMap expenseCategoryMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap paymentMap, + BuiltMap expenseMap, + BuiltMap expenseCategoryMap, + BuiltMap vendorMap, + BuiltMap userMap, StaticState staticState, ) => profitAndLossReport( @@ -63,12 +63,12 @@ var memoizedProfitAndLossReport = memo9(( ReportResult profitAndLossReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap clientMap, - BuiltMap paymentMap, - BuiltMap expenseMap, - BuiltMap expenseCategoryMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap paymentMap, + BuiltMap expenseMap, + BuiltMap expenseCategoryMap, + BuiltMap vendorMap, + BuiltMap userMap, StaticState staticState, ) { final List> data = []; diff --git a/lib/ui/reports/purchase_order_item_report.dart b/lib/ui/reports/purchase_order_item_report.dart index 2e3f2932f..203ab4ca2 100644 --- a/lib/ui/reports/purchase_order_item_report.dart +++ b/lib/ui/reports/purchase_order_item_report.dart @@ -43,10 +43,10 @@ enum PurchaseOrderItemReportFields { var memoizedPurchaseOrderItemReport = memo7(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap productMap, + BuiltMap productMap, BuiltMap purchaseOrderMap, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, StaticState staticState, ) => lineItemReport(userCompany!, reportsUIState, productMap, purchaseOrderMap, @@ -55,19 +55,20 @@ var memoizedPurchaseOrderItemReport = memo7(( ReportResult lineItemReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap productMap, + BuiltMap productMap, BuiltMap purchaseOrderMap, - BuiltMap clientMap, - BuiltMap vendorMap, + BuiltMap clientMap, + BuiltMap vendorMap, StaticState staticState, ) { final List> data = []; BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final lineItemReportSettings = reportSettings.containsKey(kReportPurchaseOrderItem) - ? reportSettings[kReportPurchaseOrderItem]! - : ReportSettingsEntity(); + final lineItemReportSettings = + reportSettings.containsKey(kReportPurchaseOrderItem) + ? reportSettings[kReportPurchaseOrderItem]! + : ReportSettingsEntity(); final defaultColumns = [ PurchaseOrderItemReportFields.purchaseOrderNumber, diff --git a/lib/ui/reports/purchase_order_report.dart b/lib/ui/reports/purchase_order_report.dart index de1d3c3ea..4941fef20 100644 --- a/lib/ui/reports/purchase_order_report.dart +++ b/lib/ui/reports/purchase_order_report.dart @@ -82,9 +82,9 @@ var memoizedPurchaseOrderReport = memo7(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, BuiltMap purchaseOrderMap, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap userMap, StaticState staticState, ) => purchaseOrderReport(userCompany!, reportsUIState, purchaseOrderMap, @@ -94,9 +94,9 @@ ReportResult purchaseOrderReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, BuiltMap purchaseOrderMap, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap userMap, StaticState staticState, ) { final List> data = []; diff --git a/lib/ui/reports/quote_item_report.dart b/lib/ui/reports/quote_item_report.dart index 24b44d130..ced58c2e3 100644 --- a/lib/ui/reports/quote_item_report.dart +++ b/lib/ui/reports/quote_item_report.dart @@ -46,9 +46,9 @@ enum QuoteItemReportFields { var memoizedQuoteItemReport = memo6(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap productMap, + BuiltMap productMap, BuiltMap invoiceMap, - BuiltMap clientMap, + BuiltMap clientMap, StaticState staticState, ) => lineItemReport(userCompany!, reportsUIState, productMap, invoiceMap, @@ -57,19 +57,18 @@ var memoizedQuoteItemReport = memo6(( ReportResult lineItemReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap productMap, + BuiltMap productMap, BuiltMap invoiceMap, - BuiltMap clientMap, + BuiltMap clientMap, StaticState staticState, ) { final List> data = []; BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final lineItemReportSettings = - reportSettings.containsKey(kReportQuoteItem) - ? reportSettings[kReportQuoteItem]! - : ReportSettingsEntity(); + final lineItemReportSettings = reportSettings.containsKey(kReportQuoteItem) + ? reportSettings[kReportQuoteItem]! + : ReportSettingsEntity(); final defaultColumns = [ QuoteItemReportFields.quoteNumber, diff --git a/lib/ui/reports/quote_report.dart b/lib/ui/reports/quote_report.dart index 3994e7aec..288688929 100644 --- a/lib/ui/reports/quote_report.dart +++ b/lib/ui/reports/quote_report.dart @@ -81,9 +81,9 @@ var memoizedQuoteReport = memo7(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, BuiltMap quoteMap, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap userMap, StaticState staticState, ) => quoteReport(userCompany!, reportsUIState, quoteMap, clientMap, vendorMap, @@ -93,9 +93,9 @@ ReportResult quoteReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, BuiltMap quoteMap, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap userMap, StaticState staticState, ) { final List> data = []; @@ -103,10 +103,9 @@ ReportResult quoteReport( BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final quoteReportSettings = - reportSettings.containsKey(kReportQuote) - ? reportSettings[kReportQuote]! - : ReportSettingsEntity(); + final quoteReportSettings = reportSettings.containsKey(kReportQuote) + ? reportSettings[kReportQuote]! + : ReportSettingsEntity(); final defaultColumns = [ QuoteReportFields.number, diff --git a/lib/ui/reports/recurring_expense_report.dart b/lib/ui/reports/recurring_expense_report.dart index 5b215577e..a972f39bf 100644 --- a/lib/ui/reports/recurring_expense_report.dart +++ b/lib/ui/reports/recurring_expense_report.dart @@ -50,12 +50,12 @@ enum RecurringExpenseReportFields { var memoizedRecurringExpenseReport = memo9(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap expenseMap, - BuiltMap expenseCategoryMap, + BuiltMap expenseMap, + BuiltMap expenseCategoryMap, BuiltMap invoiceMap, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap userMap, StaticState staticState, ) => recurringExpenseReport( @@ -73,12 +73,12 @@ var memoizedRecurringExpenseReport = memo9(( ReportResult recurringExpenseReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap expenseMap, - BuiltMap expenseCategoryMap, + BuiltMap expenseMap, + BuiltMap expenseCategoryMap, BuiltMap invoiceMap, - BuiltMap clientMap, - BuiltMap vendorMap, - BuiltMap userMap, + BuiltMap clientMap, + BuiltMap vendorMap, + BuiltMap userMap, StaticState staticState, ) { final List> data = []; @@ -87,9 +87,10 @@ ReportResult recurringExpenseReport( final localization = AppLocalization.of(navigatorKey.currentContext!); final reportSettings = userCompany.settings.reportSettings; - final expenseReportSettings = reportSettings.containsKey(kReportRecurringExpense) - ? reportSettings[kReportRecurringExpense]! - : ReportSettingsEntity(); + final expenseReportSettings = + reportSettings.containsKey(kReportRecurringExpense) + ? reportSettings[kReportRecurringExpense]! + : ReportSettingsEntity(); final defaultColumns = [ RecurringExpenseReportFields.amount, @@ -253,8 +254,7 @@ ReportResult recurringExpenseReport( } } - final selectedColumns = - columns.map((item) => EnumUtils.parse(item)).toList(); + final selectedColumns = columns.map((item) => EnumUtils.parse(item)).toList(); data.sort((rowA, rowB) => sortReportTableRows(rowA, rowB, expenseReportSettings, selectedColumns)!); diff --git a/lib/ui/reports/recurring_invoice_report.dart b/lib/ui/reports/recurring_invoice_report.dart index 12de3a4a3..699937bae 100644 --- a/lib/ui/reports/recurring_invoice_report.dart +++ b/lib/ui/reports/recurring_invoice_report.dart @@ -90,10 +90,10 @@ var memoizedRecurringInvoiceReport = memo8(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, BuiltMap invoiceMap, - BuiltMap clientMap, - BuiltMap userMap, - BuiltMap vendorMap, - BuiltMap projectMap, + BuiltMap clientMap, + BuiltMap userMap, + BuiltMap vendorMap, + BuiltMap projectMap, StaticState staticState, ) => recurringInvoiceReport( @@ -111,10 +111,10 @@ ReportResult recurringInvoiceReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, BuiltMap invoiceMap, - BuiltMap clientMap, - BuiltMap userMap, - BuiltMap vendorMap, - BuiltMap projectMap, + BuiltMap clientMap, + BuiltMap userMap, + BuiltMap vendorMap, + BuiltMap projectMap, StaticState staticState, ) { final List> data = []; @@ -123,9 +123,10 @@ ReportResult recurringInvoiceReport( final localization = AppLocalization.of(navigatorKey.currentContext!); final reportSettings = userCompany.settings.reportSettings; - final invoiceReportSettings = reportSettings.containsKey(kReportRecurringInvoice) - ? reportSettings[kReportRecurringInvoice]! - : ReportSettingsEntity(); + final invoiceReportSettings = + reportSettings.containsKey(kReportRecurringInvoice) + ? reportSettings[kReportRecurringInvoice]! + : ReportSettingsEntity(); final defaultColumns = [ RecurringInvoiceReportFields.number, diff --git a/lib/ui/reports/reports_screen_vm.dart b/lib/ui/reports/reports_screen_vm.dart index a7e5e9dda..e71e75e64 100644 --- a/lib/ui/reports/reports_screen_vm.dart +++ b/lib/ui/reports/reports_screen_vm.dart @@ -111,10 +111,9 @@ class ReportsScreenVM { final state = store.state; final report = state.uiState.reportsUIState.report; final allReportSettings = state.userCompany.settings.reportSettings; - final reportSettings = - allReportSettings.containsKey(report) - ? allReportSettings[report] - : ReportSettingsEntity(); + final reportSettings = allReportSettings.containsKey(report) + ? allReportSettings[report] + : ReportSettingsEntity(); ReportResult? reportResult; @@ -547,7 +546,7 @@ var memoizeedGroupTotals = memo5(( ReportResult? reportResult, ReportsUIState reportUIState, ReportSettingsEntity? reportSettings, - BuiltMap currencyMap, + BuiltMap currencyMap, CompanyEntity? company, ) => calculateReportTotals( @@ -562,7 +561,7 @@ GroupTotals calculateReportTotals({ required ReportResult reportResult, required ReportsUIState reportState, ReportSettingsEntity? reportSettings, - BuiltMap? currencyMap, + BuiltMap? currencyMap, CompanyEntity? company, }) { final Map> totals = {}; diff --git a/lib/ui/reports/task_report.dart b/lib/ui/reports/task_report.dart index 6450f99ab..44bb5ecaa 100644 --- a/lib/ui/reports/task_report.dart +++ b/lib/ui/reports/task_report.dart @@ -48,13 +48,13 @@ enum TaskReportFields { var memoizedTaskReport = memo10(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap taskMap, + BuiltMap taskMap, BuiltMap invoiceMap, - BuiltMap groupMap, - BuiltMap clientMap, + BuiltMap groupMap, + BuiltMap clientMap, BuiltMap taskStatusMap, - BuiltMap userMap, - BuiltMap projectMap, + BuiltMap userMap, + BuiltMap projectMap, StaticState staticState, ) => taskReport( @@ -73,13 +73,13 @@ var memoizedTaskReport = memo10(( ReportResult taskReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap taskMap, + BuiltMap taskMap, BuiltMap invoiceMap, - BuiltMap groupMap, - BuiltMap clientMap, + BuiltMap groupMap, + BuiltMap clientMap, BuiltMap taskStatusMap, - BuiltMap userMap, - BuiltMap projectMap, + BuiltMap userMap, + BuiltMap projectMap, StaticState staticState, ) { final List> data = []; @@ -87,10 +87,9 @@ ReportResult taskReport( BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final taskReportSettings = - reportSettings.containsKey(kReportTask) - ? reportSettings[kReportTask]! - : ReportSettingsEntity(); + final taskReportSettings = reportSettings.containsKey(kReportTask) + ? reportSettings[kReportTask]! + : ReportSettingsEntity(); final defaultColumns = [ TaskReportFields.start_time, diff --git a/lib/ui/reports/transaction_report.dart b/lib/ui/reports/transaction_report.dart index 89c212e39..62be3c92d 100644 --- a/lib/ui/reports/transaction_report.dart +++ b/lib/ui/reports/transaction_report.dart @@ -36,13 +36,13 @@ enum TransactionReportFields { var memoizedTransactionReport = memo10(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap transactionMap, - BuiltMap vendorMap, - BuiltMap expenseMap, - BuiltMap categoryMap, + BuiltMap transactionMap, + BuiltMap vendorMap, + BuiltMap expenseMap, + BuiltMap categoryMap, BuiltMap invoiceMap, - BuiltMap bankAccountMap, - BuiltMap paymentMap, + BuiltMap bankAccountMap, + BuiltMap paymentMap, StaticState staticState, ) => transactionReport( @@ -61,13 +61,13 @@ var memoizedTransactionReport = memo10(( ReportResult transactionReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap transactionMap, - BuiltMap vendorMap, - BuiltMap expenseMap, - BuiltMap categoryMap, + BuiltMap transactionMap, + BuiltMap vendorMap, + BuiltMap expenseMap, + BuiltMap categoryMap, BuiltMap invoiceMap, - BuiltMap bankAccountMap, - BuiltMap paymentMap, + BuiltMap bankAccountMap, + BuiltMap paymentMap, StaticState staticState, ) { final List> data = []; diff --git a/lib/ui/reports/vendor_report.dart b/lib/ui/reports/vendor_report.dart index 5d717006d..60d677e36 100644 --- a/lib/ui/reports/vendor_report.dart +++ b/lib/ui/reports/vendor_report.dart @@ -72,9 +72,9 @@ enum VendorReportFields { var memoizedVendorReport = memo6(( UserCompanyEntity? userCompany, ReportsUIState reportsUIState, - BuiltMap vendorMap, - BuiltMap userMap, - BuiltMap groupMap, + BuiltMap vendorMap, + BuiltMap userMap, + BuiltMap groupMap, StaticState staticState, ) => vendorReport(userCompany!, reportsUIState, vendorMap, userMap, groupMap, @@ -83,9 +83,9 @@ var memoizedVendorReport = memo6(( ReportResult vendorReport( UserCompanyEntity userCompany, ReportsUIState reportsUIState, - BuiltMap vendorMap, - BuiltMap userMap, - BuiltMap groupMap, + BuiltMap vendorMap, + BuiltMap userMap, + BuiltMap groupMap, StaticState staticState, ) { final List> data = []; @@ -93,10 +93,9 @@ ReportResult vendorReport( BuiltList columns; final reportSettings = userCompany.settings.reportSettings; - final vendorReportSettings = - reportSettings.containsKey(kReportVendor) - ? reportSettings[kReportVendor]! - : ReportSettingsEntity(); + final vendorReportSettings = reportSettings.containsKey(kReportVendor) + ? reportSettings[kReportVendor]! + : ReportSettingsEntity(); final defaultColumns = [ VendorReportFields.name, diff --git a/lib/ui/schedule/schedule_list_vm.dart b/lib/ui/schedule/schedule_list_vm.dart index 2bf71da50..18e0be374 100644 --- a/lib/ui/schedule/schedule_list_vm.dart +++ b/lib/ui/schedule/schedule_list_vm.dart @@ -109,7 +109,7 @@ class ScheduleListVM { final AppState state; final UserCompanyEntity? userCompany; final List scheduleList; - final BuiltMap scheduleMap; + final BuiltMap scheduleMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/schedule/schedule_screen_vm.dart b/lib/ui/schedule/schedule_screen_vm.dart index 960b4a02a..6845ea6a9 100644 --- a/lib/ui/schedule/schedule_screen_vm.dart +++ b/lib/ui/schedule/schedule_screen_vm.dart @@ -39,7 +39,7 @@ class ScheduleScreenVM { final UserCompanyEntity? userCompany; final List scheduleList; final Function(BuildContext, List, EntityAction) onEntityAction; - final BuiltMap scheduleMap; + final BuiltMap scheduleMap; static ScheduleScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/task/task_list_vm.dart b/lib/ui/task/task_list_vm.dart index 2197d0384..10aa7ce37 100644 --- a/lib/ui/task/task_list_vm.dart +++ b/lib/ui/task/task_list_vm.dart @@ -113,8 +113,8 @@ class TaskListVM { final AppState state; final UserEntity? user; final List taskList; - final BuiltMap taskMap; - final BuiltMap clientMap; + final BuiltMap taskMap; + final BuiltMap clientMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/task/task_screen_vm.dart b/lib/ui/task/task_screen_vm.dart index a80ec5658..82a43c25f 100644 --- a/lib/ui/task/task_screen_vm.dart +++ b/lib/ui/task/task_screen_vm.dart @@ -40,7 +40,7 @@ class TaskScreenVM { final bool isInMultiselect; final UserCompanyEntity? userCompany; final List taskList; - final BuiltMap taskMap; + final BuiltMap taskMap; static TaskScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/transaction/transaction_list_vm.dart b/lib/ui/transaction/transaction_list_vm.dart index 967cf207b..2fced2bcf 100644 --- a/lib/ui/transaction/transaction_list_vm.dart +++ b/lib/ui/transaction/transaction_list_vm.dart @@ -103,9 +103,9 @@ class TransactionListVM { EntityAction action) => handleTransactionAction(context, transactions, action), onRefreshed: (context) => _handleRefresh(context), - tableColumns: state.userCompany.settings - .getTableColumns(EntityType.transaction) ?? - TransactionPresenter.getDefaultTableFields(state.userCompany), + tableColumns: + state.userCompany.settings.getTableColumns(EntityType.transaction) ?? + TransactionPresenter.getDefaultTableFields(state.userCompany), onSortColumn: (field) => store.dispatch(SortTransactions(field)), onClearMultielsect: () => store.dispatch(ClearTransactionMultiselect()), ); @@ -114,7 +114,7 @@ class TransactionListVM { final AppState state; final UserCompanyEntity? userCompany; final List transactionList; - final BuiltMap transactionMap; + final BuiltMap transactionMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/transaction/transaction_screen_vm.dart b/lib/ui/transaction/transaction_screen_vm.dart index 446333d8f..9af2d9401 100644 --- a/lib/ui/transaction/transaction_screen_vm.dart +++ b/lib/ui/transaction/transaction_screen_vm.dart @@ -39,7 +39,7 @@ class TransactionScreenVM { final UserCompanyEntity? userCompany; final List transactionList; final Function(BuildContext, List, EntityAction) onEntityAction; - final BuiltMap transactionMap; + final BuiltMap transactionMap; static TransactionScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/user/user_list_vm.dart b/lib/ui/user/user_list_vm.dart index 984db28a0..dbedd550d 100644 --- a/lib/ui/user/user_list_vm.dart +++ b/lib/ui/user/user_list_vm.dart @@ -108,7 +108,7 @@ class UserListVM { final AppState state; final UserCompanyEntity? userCompany; final List userList; - final BuiltMap userMap; + final BuiltMap userMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/user/user_screen_vm.dart b/lib/ui/user/user_screen_vm.dart index 5295d727a..3ae416030 100644 --- a/lib/ui/user/user_screen_vm.dart +++ b/lib/ui/user/user_screen_vm.dart @@ -40,7 +40,7 @@ class UserScreenVM { final bool isInMultiselect; final UserCompanyEntity? userCompany; final List userList; - final BuiltMap userMap; + final BuiltMap userMap; static UserScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/vendor/vendor_list_vm.dart b/lib/ui/vendor/vendor_list_vm.dart index 84d78dbf4..ca4072065 100644 --- a/lib/ui/vendor/vendor_list_vm.dart +++ b/lib/ui/vendor/vendor_list_vm.dart @@ -110,7 +110,7 @@ class VendorListVM { final AppState state; final List vendorList; - final BuiltMap vendorMap; + final BuiltMap vendorMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/vendor/vendor_screen_vm.dart b/lib/ui/vendor/vendor_screen_vm.dart index c90c5afea..f5dbeeff3 100644 --- a/lib/ui/vendor/vendor_screen_vm.dart +++ b/lib/ui/vendor/vendor_screen_vm.dart @@ -40,7 +40,7 @@ class VendorScreenVM { final bool isInMultiselect; final UserCompanyEntity? userCompany; final List vendorList; - final BuiltMap vendorMap; + final BuiltMap vendorMap; static VendorScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/ui/webhook/webhook_list_vm.dart b/lib/ui/webhook/webhook_list_vm.dart index 74e00da1d..d345fef02 100644 --- a/lib/ui/webhook/webhook_list_vm.dart +++ b/lib/ui/webhook/webhook_list_vm.dart @@ -115,7 +115,7 @@ class WebhookListVM { final AppState state; final UserCompanyEntity? userCompany; final List webhookList; - final BuiltMap webhookMap; + final BuiltMap webhookMap; final ListUIState listState; final String? filter; final bool isLoading; diff --git a/lib/ui/webhook/webhook_screen_vm.dart b/lib/ui/webhook/webhook_screen_vm.dart index e750c6434..ccb1d91d5 100644 --- a/lib/ui/webhook/webhook_screen_vm.dart +++ b/lib/ui/webhook/webhook_screen_vm.dart @@ -43,7 +43,7 @@ class WebhookScreenVM { final UserCompanyEntity? userCompany; final List webhookList; final Function(BuildContext, List, EntityAction) onEntityAction; - final BuiltMap webhookMap; + final BuiltMap webhookMap; static WebhookScreenVM fromStore(Store store) { final state = store.state; diff --git a/lib/utils/money.dart b/lib/utils/money.dart index 555bffa5b..b0d2ac244 100644 --- a/lib/utils/money.dart +++ b/lib/utils/money.dart @@ -5,7 +5,7 @@ import 'package:built_collection/built_collection.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/static/currency_model.dart'; -double getExchangeRate(BuiltMap? currencyMap, +double getExchangeRate(BuiltMap? currencyMap, {String? fromCurrencyId, String? toCurrencyId}) { if ((fromCurrencyId ?? '').isEmpty || (toCurrencyId ?? '').isEmpty) { return 1;