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

Null safety

This commit is contained in:
Hillel Coren 2023-09-27 14:47:47 +03:00
parent d89270bcd9
commit edb64886ad
107 changed files with 746 additions and 804 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/data/models/client_model.dart
View File

@ -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<String?, UserEntity?> userMap, StaticState staticState) {
BuiltMap<String, UserEntity> userMap, StaticState staticState) {
int response = 0;
final ClientEntity? clientA = sortAscending ? this : client;
final ClientEntity? clientB = sortAscending ? client : this;

8
lib/data/models/expense_model.dart
View File

@ -386,11 +386,11 @@ abstract class ExpenseEntity extends Object
ExpenseEntity? expense,
String sortField,
bool sortAscending,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
StaticState staticState) {
int response = 0;
final ExpenseEntity? expenseA = sortAscending ? this : expense;

6
lib/data/models/invoice_model.dart
View File

@ -688,9 +688,9 @@ abstract class InvoiceEntity extends Object
InvoiceEntity? invoice,
String? sortField,
required bool sortAscending,
required BuiltMap<String?, ClientEntity?> clientMap,
required BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?>? userMap,
required BuiltMap<String, ClientEntity> clientMap,
required BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity>? userMap,
String? recurringPrefix = '',
}) {
int response = 0;

4
lib/data/models/payment_model.dart
View File

@ -245,8 +245,8 @@ abstract class PaymentEntity extends Object
String? sortField,
required bool sortAscending,
BuiltMap<String, InvoiceEntity>? invoiceMap,
BuiltMap<String?, ClientEntity?>? clientMap,
BuiltMap<String?, UserEntity?>? userMap,
BuiltMap<String, ClientEntity>? clientMap,
BuiltMap<String, UserEntity>? userMap,
BuiltMap<String?, PaymentTypeEntity?>? paymentTypeMap,
}) {
int response = 0;

2
lib/data/models/product_model.dart
View File

@ -205,7 +205,7 @@ abstract class ProductEntity extends Object
ProductEntity? product, [
String? sortField,
bool sortAscending = true,
BuiltMap<String?, UserEntity?>? userMap,
BuiltMap<String, UserEntity>? userMap,
]) {
int response = 0;
final ProductEntity? productA = sortAscending ? this : product;

100
lib/data/models/serializers.g.dart
View File

@ -702,6 +702,48 @@ Serializers _$serializers = (new Serializers().toBuilder()
..addBuilderFactory(
const FullType(BuiltList, const [const FullType(String)]),
() => new ListBuilder<String>())
..addBuilderFactory(
const FullType(BuiltMap,
const [const FullType(String), const FullType(CurrencyEntity)]),
() => new MapBuilder<String, CurrencyEntity>())
..addBuilderFactory(
const FullType(BuiltMap,
const [const FullType(String), const FullType(SizeEntity)]),
() => new MapBuilder<String, SizeEntity>())
..addBuilderFactory(
const FullType(BuiltMap,
const [const FullType(String), const FullType(GatewayEntity)]),
() => new MapBuilder<String, GatewayEntity>())
..addBuilderFactory(
const FullType(BuiltMap,
const [const FullType(String), const FullType(IndustryEntity)]),
() => new MapBuilder<String, IndustryEntity>())
..addBuilderFactory(
const FullType(BuiltMap,
const [const FullType(String), const FullType(TimezoneEntity)]),
() => new MapBuilder<String, TimezoneEntity>())
..addBuilderFactory(
const FullType(BuiltMap,
const [const FullType(String), const FullType(DateFormatEntity)]),
() => new MapBuilder<String, DateFormatEntity>())
..addBuilderFactory(
const FullType(BuiltMap,
const [const FullType(String), const FullType(LanguageEntity)]),
() => new MapBuilder<String, LanguageEntity>())
..addBuilderFactory(
const FullType(BuiltMap, const [
const FullType(String),
const FullType(PaymentTypeEntity)
]),
() => new MapBuilder<String, PaymentTypeEntity>())
..addBuilderFactory(
const FullType(BuiltMap,
const [const FullType(String), const FullType(CountryEntity)]),
() => new MapBuilder<String, CountryEntity>())
..addBuilderFactory(
const FullType(BuiltMap,
const [const FullType(String), const FullType(TemplateEntity)]),
() => new MapBuilder<String, TemplateEntity>())
..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<String, BuiltList<String>>())
..addBuilderFactory(
const FullType(BuiltMap, const [
const FullType.nullable(String),
const FullType.nullable(CurrencyEntity)
]),
() => new MapBuilder<String?, CurrencyEntity?>())
..addBuilderFactory(
const FullType(BuiltMap, const [
const FullType.nullable(String),
const FullType.nullable(SizeEntity)
]),
() => new MapBuilder<String?, SizeEntity?>())
..addBuilderFactory(
const FullType(BuiltMap, const [
const FullType.nullable(String),
const FullType.nullable(GatewayEntity)
]),
() => new MapBuilder<String?, GatewayEntity?>())
..addBuilderFactory(
const FullType(BuiltMap, const [
const FullType.nullable(String),
const FullType.nullable(IndustryEntity)
]),
() => new MapBuilder<String?, IndustryEntity?>())
..addBuilderFactory(
const FullType(BuiltMap, const [
const FullType.nullable(String),
const FullType.nullable(TimezoneEntity)
]),
() => new MapBuilder<String?, TimezoneEntity?>())
..addBuilderFactory(
const FullType(BuiltMap, const [
const FullType.nullable(String),
const FullType.nullable(DateFormatEntity)
]),
() => new MapBuilder<String?, DateFormatEntity?>())
..addBuilderFactory(
const FullType(BuiltMap, const [
const FullType.nullable(String),
const FullType.nullable(LanguageEntity)
]),
() => new MapBuilder<String?, LanguageEntity?>())
..addBuilderFactory(
const FullType(BuiltMap, const [
const FullType.nullable(String),
const FullType.nullable(PaymentTypeEntity)
]),
() => new MapBuilder<String?, PaymentTypeEntity?>())
..addBuilderFactory(
const FullType(BuiltMap, const [
const FullType.nullable(String),
const FullType.nullable(CountryEntity)
]),
() => new MapBuilder<String?, CountryEntity?>())
..addBuilderFactory(
const FullType(BuiltMap,
const [const FullType(String), const FullType(TemplateEntity)]),
() => new MapBuilder<String, TemplateEntity>())
..addBuilderFactory(
const FullType(BuiltMap, const [
const FullType.nullable(String),

8
lib/data/models/transaction_model.dart
View File

@ -218,11 +218,11 @@ abstract class TransactionEntity extends Object
TransactionEntity? transaction,
String sortField,
bool sortAscending,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String?, BankAccountEntity?> bankAccountMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
BuiltMap<String, BankAccountEntity> bankAccountMap,
) {
int response = 0;
final transactionA = sortAscending ? this : transaction;

2
lib/data/models/vendor_model.dart
View File

@ -268,7 +268,7 @@ abstract class VendorEntity extends Object
}
int compareTo(VendorEntity? vendor, String sortField, bool sortAscending,
BuiltMap<String?, UserEntity?> userMap, StaticState staticState) {
BuiltMap<String, UserEntity> userMap, StaticState staticState) {
int response = 0;
final VendorEntity? vendorA = sortAscending ? this : vendor;
final VendorEntity? vendorB = sortAscending ? vendor : this;

12
lib/redux/bank_account/bank_account_selectors.dart
View File

@ -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<String?, BankAccountEntity?> bankAccountMap,
(BuiltMap<String, BankAccountEntity> bankAccountMap,
BuiltList<String> bankAccountList,
StaticState staticState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
String? bankAccountId) =>
dropdownBankAccountsSelector(bankAccountMap, bankAccountList,
staticState, userMap, bankAccountId));
List<String> dropdownBankAccountsSelector(
BuiltMap<String?, BankAccountEntity?> bankAccountMap,
BuiltMap<String, BankAccountEntity> bankAccountMap,
BuiltList<String> bankAccountList,
StaticState staticState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
String? bankAccountId) {
final list = bankAccountList.where((bankAccountId) {
final bankAccount = bankAccountMap[bankAccountId]!;
@ -40,7 +40,7 @@ List<String> dropdownBankAccountsSelector(
}
var memoizedFilteredBankAccountList = memo4((SelectionState selectionState,
BuiltMap<String?, BankAccountEntity?> bankAccountMap,
BuiltMap<String, BankAccountEntity> bankAccountMap,
BuiltList<String> bankAccountList,
ListUIState bankAccountListState) =>
filteredBankAccountsSelector(
@ -48,7 +48,7 @@ var memoizedFilteredBankAccountList = memo4((SelectionState selectionState,
List<String> filteredBankAccountsSelector(
SelectionState selectionState,
BuiltMap<String?, BankAccountEntity?> bankAccountMap,
BuiltMap<String, BankAccountEntity> bankAccountMap,
BuiltList<String> bankAccountList,
ListUIState bankAccountListState) {
final filterEntityId = selectionState.filterEntityId;

24
lib/redux/client/client_selectors.dart
View File

@ -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<String?, ClientEntity?> clientMap, BuiltList<String> clientList,
BuiltMap<String?, UserEntity?> userMap, StaticState staticState) =>
(BuiltMap<String, ClientEntity> clientMap, BuiltList<String> clientList,
BuiltMap<String, UserEntity> userMap, StaticState staticState) =>
dropdownClientsSelector(clientMap, clientList, userMap, staticState));
List<String> dropdownClientsSelector(
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltList<String> clientList,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState) {
final list =
clientList.where((clientId) => clientMap[clientId]!.isActive).toList();
@ -33,11 +33,11 @@ List<String> dropdownClientsSelector(
}
var memoizedClientStatsForUser = memo2(
(String userId, BuiltMap<String?, ClientEntity?> clientMap) =>
(String userId, BuiltMap<String, ClientEntity> clientMap) =>
clientStatsForUser(userId, clientMap));
EntityStats clientStatsForUser(
String userId, BuiltMap<String?, ClientEntity?> clientMap) {
String userId, BuiltMap<String, ClientEntity> clientMap) {
int countActive = 0;
int countArchived = 0;
clientMap.forEach((clientId, client) {
@ -54,22 +54,22 @@ EntityStats clientStatsForUser(
}
var memoizedFilteredClientList = memo7((SelectionState selectionState,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltList<String> clientList,
BuiltMap<String?, GroupEntity?> groupMap,
BuiltMap<String, GroupEntity> groupMap,
ListUIState clientListState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState) =>
filteredClientsSelector(selectionState, clientMap, clientList, groupMap,
clientListState, userMap, staticState));
List<String> filteredClientsSelector(
SelectionState selectionState,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltList<String> clientList,
BuiltMap<String?, GroupEntity?> groupMap,
BuiltMap<String, GroupEntity> groupMap,
ListUIState clientListState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState) {
final filterEntityId = selectionState.filterEntityId;
final filterEntityType = selectionState.filterEntityType;

20
lib/redux/company/company_selectors.dart
View File

@ -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<String?, ExpenseCategoryEntity?> categoryMap,
(BuiltMap<String, ExpenseCategoryEntity> categoryMap,
BuiltList<String> categoryList) =>
dropdownExpenseCategoriesSelector(categoryMap, categoryList));
List<String> dropdownExpenseCategoriesSelector(
BuiltMap<String?, ExpenseCategoryEntity?> categoryMap,
BuiltMap<String, ExpenseCategoryEntity> categoryMap,
BuiltList<String> categoryList) {
final list = categoryList
.where((categoryId) => categoryMap[categoryId]!.isActive)
@ -34,25 +34,25 @@ List<String> dropdownExpenseCategoriesSelector(
}
var memoizedHasMultipleCurrencies = memo3((CompanyEntity? company,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, GroupEntity?> groupMap) =>
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, GroupEntity> groupMap) =>
hasMultipleCurrencies(company, clientMap, groupMap));
bool hasMultipleCurrencies(
CompanyEntity? company,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, GroupEntity?> groupMap) =>
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, GroupEntity> groupMap) =>
memoizedGetCurrencyIds(company, clientMap, groupMap).length > 1;
var memoizedGetCurrencyIds = memo3((CompanyEntity? company,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, GroupEntity?> groupMap) =>
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, GroupEntity> groupMap) =>
getCurrencyIds(company!, clientMap, groupMap));
List<String> getCurrencyIds(
CompanyEntity company,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, GroupEntity?> groupMap) {
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, GroupEntity> groupMap) {
final currencyIds = <String>[company.currencyId];
clientMap.forEach((clientId, client) {
final group = groupMap[client!.groupId];

12
lib/redux/company_gateway/company_gateway_selectors.dart
View File

@ -87,13 +87,13 @@ List<String> filteredCompanyGatewaysSelector(
}
var memoizedCalculateCompanyGatewayProcessed = memo2(
(String companyGatewayId, BuiltMap<String?, PaymentEntity?> paymentMap) =>
(String companyGatewayId, BuiltMap<String, PaymentEntity> paymentMap) =>
calculateCompanyGatewayProcessed(
companyGatewayId: companyGatewayId, paymentMap: paymentMap));
double calculateCompanyGatewayProcessed({
String? companyGatewayId,
required BuiltMap<String?, PaymentEntity?> paymentMap,
required BuiltMap<String, PaymentEntity> paymentMap,
}) {
double total = 0;
@ -107,12 +107,12 @@ double calculateCompanyGatewayProcessed({
}
var memoizedClientStatsForCompanyGateway = memo2(
(String companyGatewayId, BuiltMap<String?, ClientEntity?> clientMap) =>
(String companyGatewayId, BuiltMap<String, ClientEntity> clientMap) =>
clientStatsForCompanyGateway(companyGatewayId, clientMap));
EntityStats clientStatsForCompanyGateway(
String companyGatewayId,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
) {
int countActive = 0;
int countArchived = 0;
@ -132,12 +132,12 @@ EntityStats clientStatsForCompanyGateway(
}
var memoizedPaymentStatsForCompanyGateway = memo2(
(String companyGatewayId, BuiltMap<String?, PaymentEntity?> paymentMap) =>
(String companyGatewayId, BuiltMap<String, PaymentEntity> paymentMap) =>
paymentStatsForCompanyGateway(companyGatewayId, paymentMap));
EntityStats paymentStatsForCompanyGateway(
String companyGatewayId,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, PaymentEntity> paymentMap,
) {
int countActive = 0;
int countArchived = 0;

28
lib/redux/credit/credit_selectors.dart
View File

@ -21,11 +21,11 @@ ClientContactEntity? creditContactSelector(
var memoizedDropdownCreditList = memo7(
(BuiltMap<String, InvoiceEntity> creditMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltList<String> creditList,
String clientId,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
List<String?> excludedIds) =>
dropdownCreditSelector(
creditMap,
@ -39,11 +39,11 @@ var memoizedDropdownCreditList = memo7(
List<String> dropdownCreditSelector(
BuiltMap<String, InvoiceEntity> creditMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltList<String> creditList,
String clientId,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
List<String?> excludedIds) {
final list = creditList.where((creditId) {
final credit = creditMap[creditId];
@ -86,11 +86,11 @@ ClientEntity? creditClientSelector(
var memoizedFilteredCreditList = memo8((SelectionState selectionState,
BuiltMap<String, InvoiceEntity> creditMap,
BuiltList<String> creditList,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, PaymentEntity> paymentMap,
ListUIState creditListState,
BuiltMap<String?, UserEntity?> userMap) =>
BuiltMap<String, UserEntity> userMap) =>
filteredCreditsSelector(selectionState, creditMap, creditList, clientMap,
vendorMap, paymentMap, creditListState, userMap));
@ -98,11 +98,11 @@ List<String> filteredCreditsSelector(
SelectionState selectionState,
BuiltMap<String, InvoiceEntity> creditMap,
BuiltList<String> creditList,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, PaymentEntity> paymentMap,
ListUIState creditListState,
BuiltMap<String?, UserEntity?> userMap) {
BuiltMap<String, UserEntity> userMap) {
final filterEntityId = selectionState.filterEntityId;
final filterEntityType = selectionState.filterEntityType;

101
lib/redux/dashboard/dashboard_selectors.dart
View File

@ -33,11 +33,11 @@ class ChartMoneyData {
}
var memoizedChartInvoices = memo5((
BuiltMap<String?, CurrencyEntity?> currencyMap,
BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity? company,
DashboardUISettings settings,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
) =>
_chartInvoices(
currencyMap: currencyMap,
@ -47,11 +47,11 @@ var memoizedChartInvoices = memo5((
clientMap: clientMap));
var memoizedChartOverviewInvoices = memo5((
BuiltMap<String?, CurrencyEntity?> currencyMap,
BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity? company,
DashboardUISettings settings,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
) =>
_chartInvoices(
currencyMap: currencyMap,
@ -61,11 +61,11 @@ var memoizedChartOverviewInvoices = memo5((
clientMap: clientMap));
var memoizedPreviousChartInvoices = memo5((
BuiltMap<String?, CurrencyEntity?> currencyMap,
BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity? company,
DashboardUISettings settings,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
) =>
_chartInvoices(
currencyMap: currencyMap,
@ -75,11 +75,11 @@ var memoizedPreviousChartInvoices = memo5((
clientMap: clientMap));
List<ChartDataGroup> _chartInvoices({
BuiltMap<String?, CurrencyEntity?>? currencyMap,
BuiltMap<String, CurrencyEntity>? currencyMap,
required CompanyEntity company,
required DashboardUISettings settings,
required BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?>? clientMap,
BuiltMap<String, ClientEntity>? clientMap,
}) {
const STATUS_ACTIVE = 'active';
const STATUS_OUTSTANDING = 'outstanding';
@ -208,11 +208,11 @@ List<ChartDataGroup> _chartInvoices({
}
var memoizedChartQuotes = memo5((
BuiltMap<String?, CurrencyEntity?> currencyMap,
BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity? company,
DashboardUISettings settings,
BuiltMap<String, InvoiceEntity> quoteMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
) =>
chartQuotes(
currencyMap: currencyMap,
@ -223,11 +223,11 @@ var memoizedChartQuotes = memo5((
));
var memoizedPreviousChartQuotes = memo5((
BuiltMap<String?, CurrencyEntity?> currencyMap,
BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity? company,
DashboardUISettings settings,
BuiltMap<String, InvoiceEntity> quoteMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
) =>
chartQuotes(
currencyMap: currencyMap,
@ -238,11 +238,11 @@ var memoizedPreviousChartQuotes = memo5((
));
List<ChartDataGroup> chartQuotes({
BuiltMap<String?, CurrencyEntity?>? currencyMap,
BuiltMap<String, CurrencyEntity>? currencyMap,
required CompanyEntity company,
required DashboardUISettings settings,
required BuiltMap<String, InvoiceEntity> quoteMap,
BuiltMap<String?, ClientEntity?>? clientMap,
BuiltMap<String, ClientEntity>? clientMap,
}) {
const STATUS_ACTIVE = 'active';
const STATUS_APPROVED = 'approved';
@ -384,12 +384,12 @@ List<ChartDataGroup> chartQuotes({
}
var memoizedChartPayments = memo6((
BuiltMap<String?, CurrencyEntity?> currencyMap,
BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity? company,
DashboardUISettings settings,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, PaymentEntity> paymentMap,
) =>
chartPayments(
currencyMap,
@ -401,12 +401,12 @@ var memoizedChartPayments = memo6((
));
var memoizedPreviousChartPayments = memo6((
BuiltMap<String?, CurrencyEntity?> currencyMap,
BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity? company,
DashboardUISettings settings,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, PaymentEntity> paymentMap,
) =>
chartPayments(
currencyMap,
@ -418,12 +418,12 @@ var memoizedPreviousChartPayments = memo6((
));
List<ChartDataGroup> chartPayments(
BuiltMap<String?, CurrencyEntity?> currencyMap,
BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity company,
DashboardUISettings settings,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, PaymentEntity> paymentMap,
) {
const STATUS_COMPLETED = 'completed';
const STATUS_REFUNDED = 'refunded';
@ -557,14 +557,14 @@ List<ChartDataGroup> chartPayments(
}
var memoizedChartTasks = memo8((
BuiltMap<String?, CurrencyEntity?> currencyMap,
BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity? company,
DashboardUISettings settings,
BuiltMap<String?, TaskEntity?> taskMap,
BuiltMap<String, TaskEntity> taskMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ProjectEntity?> projectMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, GroupEntity?> groupMap,
BuiltMap<String, ProjectEntity> projectMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, GroupEntity> groupMap,
) =>
chartTasks(
currencyMap,
@ -578,14 +578,14 @@ var memoizedChartTasks = memo8((
));
var memoizedPreviousChartTasks = memo8((
BuiltMap<String?, CurrencyEntity?> currencyMap,
BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity? company,
DashboardUISettings settings,
BuiltMap<String?, TaskEntity?> taskMap,
BuiltMap<String, TaskEntity> taskMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ProjectEntity?> projectMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, GroupEntity?> groupMap,
BuiltMap<String, ProjectEntity> projectMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, GroupEntity> groupMap,
) =>
chartTasks(
currencyMap,
@ -599,14 +599,14 @@ var memoizedPreviousChartTasks = memo8((
));
List<ChartDataGroup> chartTasks(
BuiltMap<String?, CurrencyEntity?> currencyMap,
BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity company,
DashboardUISettings settings,
BuiltMap<String?, TaskEntity?> taskMap,
BuiltMap<String, TaskEntity> taskMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ProjectEntity?> projectMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, GroupEntity?> groupMap,
BuiltMap<String, ProjectEntity> projectMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, GroupEntity> groupMap,
) {
const STATUS_LOGGED = 'logged';
const STATUS_INVOICED = 'invoiced';
@ -774,11 +774,11 @@ List<ChartDataGroup> chartTasks(
}
List<ChartDataGroup> chartExpenses(
BuiltMap<String?, CurrencyEntity?> currencyMap,
BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity company,
DashboardUISettings settings,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ExpenseEntity?> expenseMap) {
BuiltMap<String, ExpenseEntity> expenseMap) {
const STATUS_LOGGED = 'logged';
const STATUS_PENDING = 'pending';
const STATUS_INVOICED = 'invoiced';
@ -941,28 +941,27 @@ List<ChartDataGroup> chartExpenses(
return data;
}
var memoizedChartExpenses = memo5(
(BuiltMap<String?, CurrencyEntity?> currencyMap,
CompanyEntity? company,
DashboardUISettings settings,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ExpenseEntity?> expenseMap) =>
chartExpenses(currencyMap, company!, settings, invoiceMap, expenseMap));
var memoizedChartExpenses = memo5((BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity? company,
DashboardUISettings settings,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String, ExpenseEntity> expenseMap) =>
chartExpenses(currencyMap, company!, settings, invoiceMap, expenseMap));
var memoizedPreviousChartExpenses = memo5(
(BuiltMap<String?, CurrencyEntity?> currencyMap,
(BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity? company,
DashboardUISettings settings,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ExpenseEntity?> expenseMap) =>
BuiltMap<String, ExpenseEntity> expenseMap) =>
chartExpenses(currencyMap, company!, settings, invoiceMap, expenseMap));
var memoizedRunningTasks = memo2(
(BuiltMap<String?, TaskEntity?> taskMap, String userId) =>
(BuiltMap<String, TaskEntity> taskMap, String userId) =>
runningTasks(taskMap, userId));
List<TaskEntity?> runningTasks(
BuiltMap<String?, TaskEntity?> taskMap, String userId) {
BuiltMap<String, TaskEntity> taskMap, String userId) {
final tasks = <TaskEntity?>[];
taskMap.forEach((taskId, task) {

40
lib/redux/dashboard/dashboard_sidebar_selectors.dart
View File

@ -7,7 +7,7 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
var memoizedUpcomingInvoices = memo2((
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
) =>
_upcomingInvoices(
invoiceMap: invoiceMap,
@ -16,7 +16,7 @@ var memoizedUpcomingInvoices = memo2((
List<InvoiceEntity?> _upcomingInvoices({
required BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?>? clientMap,
BuiltMap<String, ClientEntity>? clientMap,
}) {
final invoices = <InvoiceEntity?>[];
invoiceMap.forEach((index, invoice) {
@ -39,7 +39,7 @@ List<InvoiceEntity?> _upcomingInvoices({
var memoizedPastDueInvoices = memo2((
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
) =>
_pastDueInvoices(
invoiceMap: invoiceMap,
@ -48,7 +48,7 @@ var memoizedPastDueInvoices = memo2((
List<InvoiceEntity?> _pastDueInvoices({
required BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?>? clientMap,
BuiltMap<String, ClientEntity>? clientMap,
}) {
final invoices = <InvoiceEntity?>[];
invoiceMap.forEach((index, invoice) {
@ -70,8 +70,8 @@ List<InvoiceEntity?> _pastDueInvoices({
}
var memoizedRecentPayments = memo2((
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, ClientEntity> clientMap,
) =>
_recentPayments(
paymentMap: paymentMap,
@ -79,8 +79,8 @@ var memoizedRecentPayments = memo2((
));
List<PaymentEntity?> _recentPayments({
required BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String?, ClientEntity?>? clientMap,
required BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, ClientEntity>? clientMap,
}) {
final payments = <PaymentEntity?>[];
final threeMonthsAgo =
@ -110,7 +110,7 @@ List<PaymentEntity?> _recentPayments({
var memoizedUpcomingQuotes = memo2((
BuiltMap<String, InvoiceEntity> quoteMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
) =>
_upcomingQuotes(
quoteMap: quoteMap,
@ -119,7 +119,7 @@ var memoizedUpcomingQuotes = memo2((
List<InvoiceEntity?> _upcomingQuotes({
required BuiltMap<String, InvoiceEntity> quoteMap,
BuiltMap<String?, ClientEntity?>? clientMap,
BuiltMap<String, ClientEntity>? clientMap,
}) {
final quotes = <InvoiceEntity?>[];
quoteMap.forEach((index, quote) {
@ -140,7 +140,7 @@ List<InvoiceEntity?> _upcomingQuotes({
var memoizedExpiredQuotes = memo2((
BuiltMap<String, InvoiceEntity> quoteMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
) =>
_expiredQuotes(
quoteMap: quoteMap,
@ -149,7 +149,7 @@ var memoizedExpiredQuotes = memo2((
List<InvoiceEntity?> _expiredQuotes({
required BuiltMap<String, InvoiceEntity> quoteMap,
BuiltMap<String?, ClientEntity?>? clientMap,
BuiltMap<String, ClientEntity>? clientMap,
}) {
final quotes = <InvoiceEntity?>[];
quoteMap.forEach((index, quote) {
@ -169,8 +169,8 @@ List<InvoiceEntity?> _expiredQuotes({
}
var memoizedRunningTasks = memo2((
BuiltMap<String?, TaskEntity?> taskMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, TaskEntity> taskMap,
BuiltMap<String, ClientEntity> clientMap,
) =>
_runningTasks(
taskMap: taskMap,
@ -178,8 +178,8 @@ var memoizedRunningTasks = memo2((
));
List<TaskEntity?> _runningTasks({
required BuiltMap<String?, TaskEntity?> taskMap,
BuiltMap<String?, ClientEntity?>? clientMap,
required BuiltMap<String, TaskEntity> taskMap,
BuiltMap<String, ClientEntity>? clientMap,
}) {
final tasks = <TaskEntity?>[];
taskMap.forEach((index, task) {
@ -260,8 +260,8 @@ List<ExpenseEntity> _upcomingExpenses({
*/
var memoizedRecentExpenses = memo2((
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ClientEntity> clientMap,
) =>
_recentExpenses(
expenseMap: expenseMap,
@ -269,8 +269,8 @@ var memoizedRecentExpenses = memo2((
));
List<ExpenseEntity?> _recentExpenses({
required BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ClientEntity?>? clientMap,
required BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ClientEntity>? clientMap,
}) {
final expenses = <ExpenseEntity?>[];
expenseMap.forEach((index, expense) {

4
lib/redux/design/design_selectors.dart
View File

@ -35,11 +35,11 @@ List<String> dropdownDesignsSelector(BuiltMap<String, DesignEntity> designMap,
}
var memoizedFilteredDesignList = memo3(
(BuiltMap<String?, DesignEntity?> designMap, BuiltList<String> designList,
(BuiltMap<String, DesignEntity> designMap, BuiltList<String> designList,
ListUIState designListState) =>
filteredDesignsSelector(designMap, designList, designListState));
List<String> filteredDesignsSelector(BuiltMap<String?, DesignEntity?> designMap,
List<String> filteredDesignsSelector(BuiltMap<String, DesignEntity> designMap,
BuiltList<String> designList, ListUIState designListState) {
final list = designList.where((designId) {
final design = designMap[designId]!;

4
lib/redux/document/document_selectors.dart
View File

@ -37,7 +37,7 @@ List<String> dropdownDocumentsSelector(
var memoizedFilteredDocumentList = memo4((
SelectionState selectionState,
BuiltMap<String?, DocumentEntity?> documentMap,
BuiltMap<String, DocumentEntity> documentMap,
BuiltList<String> documentList,
ListUIState documentListState,
) =>
@ -50,7 +50,7 @@ var memoizedFilteredDocumentList = memo4((
List<String> filteredDocumentsSelector(
SelectionState selectionState,
BuiltMap<String?, DocumentEntity?> documentMap,
BuiltMap<String, DocumentEntity> documentMap,
BuiltList<String> documentList,
ListUIState documentListState,
) {

40
lib/redux/expense/expense_selectors.dart
View File

@ -149,13 +149,13 @@ List<String> dropdownExpensesSelector(
}
var memoizedFilteredExpenseList = memo9((SelectionState selectionState,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
ListUIState expenseListState,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
StaticState staticState) =>
filteredExpensesSelector(
selectionState,
@ -170,13 +170,13 @@ var memoizedFilteredExpenseList = memo9((SelectionState selectionState,
List<String?> filteredExpensesSelector(
SelectionState selectionState,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
ListUIState expenseListState,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
StaticState staticState) {
final filterEntityId = selectionState.filterEntityId;
final filterEntityType = selectionState.filterEntityType;
@ -275,11 +275,11 @@ List<String?> filteredExpensesSelector(
}
var memoizedExpenseStatsForVendor = memo2(
(String vendorId, BuiltMap<String?, ExpenseEntity?> expenseMap) =>
(String vendorId, BuiltMap<String, ExpenseEntity> expenseMap) =>
expenseStatsForVendor(vendorId, expenseMap));
EntityStats expenseStatsForVendor(
String vendorId, BuiltMap<String?, ExpenseEntity?> expenseMap) {
String vendorId, BuiltMap<String, ExpenseEntity> expenseMap) {
int countActive = 0;
int countArchived = 0;
expenseMap.forEach((expenseId, expense) {
@ -296,11 +296,11 @@ EntityStats expenseStatsForVendor(
}
var memoizedExpenseStatsForClient = memo2(
(String clientId, BuiltMap<String?, ExpenseEntity?> expenseMap) =>
(String clientId, BuiltMap<String, ExpenseEntity> expenseMap) =>
expenseStatsForClient(clientId, expenseMap));
EntityStats expenseStatsForClient(
String clientId, BuiltMap<String?, ExpenseEntity?> expenseMap) {
String clientId, BuiltMap<String, ExpenseEntity> expenseMap) {
int countActive = 0;
int countArchived = 0;
expenseMap.forEach((expenseId, expense) {
@ -317,11 +317,11 @@ EntityStats expenseStatsForClient(
}
var memoizedClientExpenseList = memo2(
(BuiltMap<String?, ExpenseEntity?> expenseMap, String? clientId) =>
(BuiltMap<String, ExpenseEntity> expenseMap, String? clientId) =>
clientExpenseList(expenseMap, clientId));
List<String?> clientExpenseList(
BuiltMap<String?, ExpenseEntity?> expenseMap, String? clientId) {
BuiltMap<String, ExpenseEntity> expenseMap, String? clientId) {
final list = expenseMap.keys.where((expenseid) {
final expense = expenseMap[expenseid];
if ((clientId ?? '').isNotEmpty &&
@ -341,12 +341,12 @@ List<String?> clientExpenseList(
var memoizedExpenseStatsForProject = memo2((
String projectId,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String, ExpenseEntity> expenseMap,
) =>
expenseStatsForProject(projectId, expenseMap));
EntityStats expenseStatsForProject(
String projectId, BuiltMap<String?, ExpenseEntity?> expenseMap) {
String projectId, BuiltMap<String, ExpenseEntity> expenseMap) {
int countActive = 0;
int countArchived = 0;
expenseMap.forEach((expenseId, expense) {
@ -364,12 +364,12 @@ EntityStats expenseStatsForProject(
var memoizedExpenseStatsForUser = memo2((
String userId,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String, ExpenseEntity> expenseMap,
) =>
expenseStatsForUser(userId, expenseMap));
EntityStats expenseStatsForUser(
String userId, BuiltMap<String?, ExpenseEntity?> expenseMap) {
String userId, BuiltMap<String, ExpenseEntity> expenseMap) {
int countActive = 0;
int countArchived = 0;
expenseMap.forEach((expenseId, expense) {

24
lib/redux/expense_category/expense_category_selectors.dart
View File

@ -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<String?, ExpenseCategoryEntity?> expenseCategoryMap,
(BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
BuiltList<String> expenseCategoryList,
StaticState staticState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
String categoryId) =>
dropdownExpenseCategoriesSelector(expenseCategoryMap,
expenseCategoryList, staticState, userMap, categoryId));
List<String> dropdownExpenseCategoriesSelector(
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
BuiltList<String> expenseCategoryList,
StaticState staticState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
String clientId) {
final list = expenseCategoryList.where((expenseCategoryId) {
final expenseCategory = expenseCategoryMap[expenseCategoryId]!;
@ -46,7 +46,7 @@ List<String> dropdownExpenseCategoriesSelector(
}
var memoizedFilteredExpenseCategoryList = memo4((SelectionState selectionState,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
BuiltList<String> expenseCategoryList,
ListUIState expenseCategoryListState) =>
filteredExpenseCategoriesSelector(selectionState, expenseCategoryMap,
@ -54,7 +54,7 @@ var memoizedFilteredExpenseCategoryList = memo4((SelectionState selectionState,
List<String> filteredExpenseCategoriesSelector(
SelectionState selectionState,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
BuiltList<String> expenseCategoryList,
ListUIState expenseCategoryListState) {
final list = expenseCategoryList.where((expenseCategoryId) {
@ -82,13 +82,13 @@ List<String> filteredExpenseCategoriesSelector(
}
var memoizedCalculateExpenseCategoryAmount = memo2(
(String categoryId, BuiltMap<String?, ExpenseEntity?> expenseMap) =>
(String categoryId, BuiltMap<String, ExpenseEntity> expenseMap) =>
calculateExpenseCategoryAmount(
categoryId: categoryId, expenseMap: expenseMap));
double calculateExpenseCategoryAmount({
String? categoryId,
required BuiltMap<String?, ExpenseEntity?> expenseMap,
required BuiltMap<String, ExpenseEntity> expenseMap,
}) {
double total = 0;
@ -102,12 +102,12 @@ double calculateExpenseCategoryAmount({
}
var memoizedExpenseStatsForExpenseCategory = memo2(
(String companyGatewayId, BuiltMap<String?, ExpenseEntity?> expenseMap) =>
(String companyGatewayId, BuiltMap<String, ExpenseEntity> expenseMap) =>
expenseStatsForExpenseCategory(companyGatewayId, expenseMap));
EntityStats expenseStatsForExpenseCategory(
String categoryId,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String, ExpenseEntity> expenseMap,
) {
int countActive = 0;
int countArchived = 0;
@ -125,12 +125,12 @@ EntityStats expenseStatsForExpenseCategory(
}
var memoizedTransactionStatsForExpenseCategory = memo2((String companyGatewayId,
BuiltMap<String?, TransactionEntity?> transactionMap) =>
BuiltMap<String, TransactionEntity> transactionMap) =>
transactionStatsForExpenseCategory(companyGatewayId, transactionMap));
EntityStats transactionStatsForExpenseCategory(
String categoryId,
BuiltMap<String?, TransactionEntity?> transactionMap,
BuiltMap<String, TransactionEntity> transactionMap,
) {
int countActive = 0;
int countArchived = 0;

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

@ -35,7 +35,7 @@ List<String> dropdownGroupsSelector(BuiltMap<String, GroupEntity> groupMap,
}
var memoizedFilteredGroupList = memo4((SelectionState selectionState,
BuiltMap<String?, GroupEntity?> groupMap,
BuiltMap<String, GroupEntity> groupMap,
BuiltList<String> groupList,
ListUIState groupListState) =>
filteredGroupsSelector(
@ -43,7 +43,7 @@ var memoizedFilteredGroupList = memo4((SelectionState selectionState,
List<String> filteredGroupsSelector(
SelectionState selectionState,
BuiltMap<String?, GroupEntity?> groupMap,
BuiltMap<String, GroupEntity> groupMap,
BuiltList<String> groupList,
ListUIState groupListState) {
final list = groupList.where((groupId) {
@ -70,11 +70,11 @@ List<String> filteredGroupsSelector(
}
var memoizedClientStatsForGroup = memo2(
(BuiltMap<String?, ClientEntity?> clientMap, String groupId) =>
(BuiltMap<String, ClientEntity> clientMap, String groupId) =>
clientStatsForGroup(clientMap, groupId));
EntityStats clientStatsForGroup(
BuiltMap<String?, ClientEntity?> clientMap, String groupId) {
BuiltMap<String, ClientEntity> clientMap, String groupId) {
int countActive = 0;
int countArchived = 0;
clientMap.forEach((clientId, client) {

31
lib/redux/invoice/invoice_selectors.dart
View File

@ -57,11 +57,11 @@ ClientContactEntity? invoiceContactSelector(
var memoizedDropdownInvoiceList = memo8(
(BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltList<String> invoiceList,
String clientId,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
List<String?> excludedIds,
String? recurringPrefix) =>
dropdownInvoiceSelector(
@ -77,11 +77,11 @@ var memoizedDropdownInvoiceList = memo8(
List<String> dropdownInvoiceSelector(
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltList<String> invoiceList,
String clientId,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
List<String?> excludedIds,
String? recurringPrefix,
) {
@ -90,8 +90,7 @@ List<String> 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<String> dropdownInvoiceSelector(
var memoizedFilteredInvoiceList = memo9((SelectionState selectionState,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltList<String> invoiceList,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, PaymentEntity> paymentMap,
ListUIState invoiceListState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
String? recurringPrefix) =>
filteredInvoicesSelector(
selectionState,
@ -145,11 +144,11 @@ List<String> filteredInvoicesSelector(
SelectionState selectionState,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltList<String> invoiceList,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, PaymentEntity> paymentMap,
ListUIState invoiceListState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
String? recurringPrefix,
) {
final filterEntityId = selectionState.filterEntityId;

32
lib/redux/payment/payment_selectors.dart
View File

@ -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<String?, PaymentEntity?> paymentMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltList<String> paymentList) =>
paymentsByInvoiceSelector(invoiceId, paymentMap, paymentList));
List<PaymentEntity?> paymentsByInvoiceSelector(
String invoiceId,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltList<String> paymentList) {
List<PaymentEntity?> paymentsByInvoiceSelector(String invoiceId,
BuiltMap<String, PaymentEntity> paymentMap, BuiltList<String> 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<PaymentEntity?> paymentsByInvoiceSelector(
}
var memoizedPaymentsByCredit = memo3((String invoiceId,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltList<String> paymentList) =>
paymentsByCreditSelector(invoiceId, paymentMap, paymentList));
List<PaymentEntity?> paymentsByCreditSelector(
String creditId,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltList<String> paymentList) {
List<PaymentEntity?> paymentsByCreditSelector(String creditId,
BuiltMap<String, PaymentEntity> paymentMap, BuiltList<String> 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<String> dropdownPaymentsSelector(
}
var memoizedFilteredPaymentList = memo8((SelectionState selectionState,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltList<String> paymentList,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String?, PaymentTypeEntity?> paymentTypeMap,
ListUIState paymentListState) =>
filteredPaymentsSelector(
@ -99,11 +95,11 @@ var memoizedFilteredPaymentList = memo8((SelectionState selectionState,
List<String> filteredPaymentsSelector(
SelectionState selectionState,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltList<String> paymentList,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String?, PaymentTypeEntity?> paymentTypeMap,
ListUIState paymentListState) {
final filterEntityId = selectionState.filterEntityId;
@ -174,13 +170,13 @@ List<String> filteredPaymentsSelector(
}
var memoizedPaymentStatsForClient = memo3((String clientId,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, InvoiceEntity> invoiceMap) =>
paymentStatsForClient(clientId, paymentMap, invoiceMap));
EntityStats paymentStatsForClient(
String clientId,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, InvoiceEntity> invoiceMap) {
int countActive = 0;
int countArchived = 0;

8
lib/redux/payment_term/payment_term_selectors.dart
View File

@ -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<String?, PaymentTermEntity?> paymentTermMap,
(BuiltMap<String, PaymentTermEntity> paymentTermMap,
BuiltList<String> paymentTermList) =>
dropdownPaymentTermsSelector(paymentTermMap, paymentTermList));
List<String> dropdownPaymentTermsSelector(
BuiltMap<String?, PaymentTermEntity?> paymentTermMap,
BuiltMap<String, PaymentTermEntity> paymentTermMap,
BuiltList<String> paymentTermList) {
final Map<int, bool> numDays = {};
final list = paymentTermList.where((paymentTermId) {
@ -38,7 +38,7 @@ List<String> dropdownPaymentTermsSelector(
}
var memoizedFilteredPaymentTermList = memo4((SelectionState selectionState,
BuiltMap<String?, PaymentTermEntity?> paymentTermMap,
BuiltMap<String, PaymentTermEntity> paymentTermMap,
BuiltList<String> paymentTermList,
ListUIState paymentTermListState) =>
filteredPaymentTermsSelector(
@ -46,7 +46,7 @@ var memoizedFilteredPaymentTermList = memo4((SelectionState selectionState,
List<String> filteredPaymentTermsSelector(
SelectionState selectionState,
BuiltMap<String?, PaymentTermEntity?> paymentTermMap,
BuiltMap<String, PaymentTermEntity> paymentTermMap,
BuiltList<String> paymentTermList,
ListUIState paymentTermListState) {
final list = paymentTermList.where((paymentTermId) {

23
lib/redux/product/product_selectors.dart
View File

@ -25,7 +25,7 @@ InvoiceItemEntity convertProductToInvoiceItem({
required ProductEntity? product,
required CompanyEntity company,
required InvoiceEntity invoice,
required BuiltMap<String?, CurrencyEntity?> currencyMap,
required BuiltMap<String, CurrencyEntity> currencyMap,
ClientEntity? client,
}) {
if (company.fillProducts) {
@ -68,15 +68,14 @@ InvoiceItemEntity convertProductToInvoiceItem({
}
var memoizedDropdownProductList = memo3(
(BuiltMap<String?, ProductEntity?> productMap,
BuiltList<String> productList,
BuiltMap<String?, UserEntity?> userMap) =>
(BuiltMap<String, ProductEntity> productMap, BuiltList<String> productList,
BuiltMap<String, UserEntity> userMap) =>
dropdownProductsSelector(productMap, productList, userMap));
List<String> dropdownProductsSelector(
BuiltMap<String?, ProductEntity?> productMap,
BuiltMap<String, ProductEntity> productMap,
BuiltList<String> productList,
BuiltMap<String?, UserEntity?> userMap) {
BuiltMap<String, UserEntity> userMap) {
final list = productList
.where((productId) => productMap[productId]!.isActive)
.toList();
@ -92,9 +91,9 @@ List<String> dropdownProductsSelector(
}
var memoizedProductList = memo1(
(BuiltMap<String?, ProductEntity?> productMap) => productList(productMap));
(BuiltMap<String, ProductEntity> productMap) => productList(productMap));
List<String?> productList(BuiltMap<String?, ProductEntity?> productMap) {
List<String?> productList(BuiltMap<String, ProductEntity> productMap) {
final list = productMap.keys
.where((productId) => productMap[productId]!.isActive)
.toList();
@ -107,19 +106,19 @@ List<String?> productList(BuiltMap<String?, ProductEntity?> productMap) {
}
var memoizedFilteredProductList = memo5((SelectionState selectionState,
BuiltMap<String?, ProductEntity?> productMap,
BuiltMap<String, ProductEntity> productMap,
BuiltList<String> productList,
ListUIState productListState,
BuiltMap<String?, UserEntity?> userMap) =>
BuiltMap<String, UserEntity> userMap) =>
filteredProductsSelector(
selectionState, productMap, productList, productListState, userMap));
List<String> filteredProductsSelector(
SelectionState selectionState,
BuiltMap<String?, ProductEntity?> productMap,
BuiltMap<String, ProductEntity> productMap,
BuiltList<String> productList,
ListUIState productListState,
BuiltMap<String?, UserEntity?> userMap) {
BuiltMap<String, UserEntity> userMap) {
final list = productList.where((productId) {
final product = productMap[productId]!;

8
lib/redux/project/project_selectors.dart
View File

@ -233,7 +233,7 @@ List<String> filteredProjectsSelector(
Duration taskDurationForProject(
ProjectEntity project,
BuiltMap<String?, TaskEntity?> taskMap,
BuiltMap<String, TaskEntity> taskMap,
) {
int total = 0;
taskMap.forEach((index, task) {
@ -245,11 +245,11 @@ Duration taskDurationForProject(
}
var memoizedProjectStatsForClient = memo2(
(String clientId, BuiltMap<String?, ProjectEntity?> projectMap) =>
(String clientId, BuiltMap<String, ProjectEntity> projectMap) =>
projectStatsForClient(clientId, projectMap));
EntityStats projectStatsForClient(
String clientId, BuiltMap<String?, ProjectEntity?> projectMap) {
String clientId, BuiltMap<String, ProjectEntity> projectMap) {
int countActive = 0;
int countArchived = 0;
projectMap.forEach((projectId, project) {
@ -266,7 +266,7 @@ EntityStats projectStatsForClient(
}
var memoizedProjectStatsForUser = memo2(
(String userId, BuiltMap<String?, ProjectEntity?> projectMap) =>
(String userId, BuiltMap<String, ProjectEntity> projectMap) =>
projectStatsForClient(userId, projectMap));
EntityStats projectStatsForUser(

24
lib/redux/purchase_order/purchase_order_selectors.dart
View File

@ -27,9 +27,9 @@ var memoizedDropdownPurchaseOrderList = memo7(
(BuiltMap<String, InvoiceEntity> purchaseOrderMap,
BuiltList<String> purchaseOrderList,
StaticState staticState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
String clientId) =>
dropdownPurchaseOrdersSelector(purchaseOrderMap, purchaseOrderList,
staticState, userMap, clientMap, vendorMap, clientId));
@ -38,9 +38,9 @@ List<String> dropdownPurchaseOrdersSelector(
BuiltMap<String, InvoiceEntity> purchaseOrderMap,
BuiltList<String> purchaseOrderList,
StaticState staticState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
String clientId) {
final list = purchaseOrderList.where((purchaseOrderId) {
final purchaseOrder = purchaseOrderMap[purchaseOrderId]!;
@ -72,10 +72,10 @@ var memoizedFilteredPurchaseOrderList = memo7((
SelectionState selectionState,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltList<String> invoiceList,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
ListUIState invoiceListState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
) =>
filteredPurchaseOrdersSelector(selectionState, invoiceMap, invoiceList,
clientMap, vendorMap, invoiceListState, userMap));
@ -84,10 +84,10 @@ List<String> filteredPurchaseOrdersSelector(
SelectionState selectionState,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltList<String> invoiceList,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
ListUIState invoiceListState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
) {
final filterEntityId = selectionState.filterEntityId;
final filterEntityType = selectionState.filterEntityType;

24
lib/redux/quote/quote_selectors.dart
View File

@ -26,11 +26,11 @@ ClientContactEntity? quoteContactSelector(
var memoizedDropdownQuoteList = memo7((
BuiltMap<String, InvoiceEntity> quoteMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltList<String> quoteList,
String clientId,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
List<String> excludedIds,
) =>
dropdownQuoteSelector(
@ -45,11 +45,11 @@ var memoizedDropdownQuoteList = memo7((
List<String> dropdownQuoteSelector(
BuiltMap<String, InvoiceEntity> quoteMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltList<String> quoteList,
String clientId,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
List<String> excludedIds,
) {
final list = quoteList.where((invoiceId) {
@ -88,10 +88,10 @@ List<String> dropdownQuoteSelector(
var memoizedFilteredQuoteList = memo7((SelectionState selectionState,
BuiltMap<String, InvoiceEntity> quoteMap,
BuiltList<String> quoteList,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
ListUIState quoteListState,
BuiltMap<String?, UserEntity?> userMap) =>
BuiltMap<String, UserEntity> userMap) =>
filteredQuotesSelector(selectionState, quoteMap, quoteList, clientMap,
vendorMap, quoteListState, userMap));
@ -99,10 +99,10 @@ List<String> filteredQuotesSelector(
SelectionState selectionState,
BuiltMap<String, InvoiceEntity> quoteMap,
BuiltList<String> quoteList,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
ListUIState quoteListState,
BuiltMap<String?, UserEntity?> userMap) {
BuiltMap<String, UserEntity> userMap) {
final filterEntityId = selectionState.filterEntityId;
final filterEntityType = selectionState.filterEntityType;

40
lib/redux/recurring_expense/recurring_expense_selectors.dart
View File

@ -69,13 +69,13 @@ List<String> dropdownRecurringExpensesSelector(
}
var memoizedFilteredRecurringExpenseList = memo9((SelectionState selectionState,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
ListUIState expenseListState,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
StaticState staticState) =>
filteredRecurringExpensesSelector(
selectionState,
@ -90,13 +90,13 @@ var memoizedFilteredRecurringExpenseList = memo9((SelectionState selectionState,
List<String?> filteredRecurringExpensesSelector(
SelectionState selectionState,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
ListUIState expenseListState,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
StaticState staticState) {
final filterEntityId = selectionState.filterEntityId;
final filterEntityType = selectionState.filterEntityType;
@ -192,11 +192,11 @@ List<String?> filteredRecurringExpensesSelector(
}
var memoizedRecurringExpenseStatsForClient = memo2(
(String clientId, BuiltMap<String?, ExpenseEntity?> expenseMap) =>
(String clientId, BuiltMap<String, ExpenseEntity> expenseMap) =>
recurringExpenseStatsForClient(clientId, expenseMap));
EntityStats recurringExpenseStatsForClient(
String clientId, BuiltMap<String?, ExpenseEntity?> expenseMap) {
String clientId, BuiltMap<String, ExpenseEntity> expenseMap) {
int countActive = 0;
int countArchived = 0;
expenseMap.forEach((expenseId, expense) {
@ -213,11 +213,11 @@ EntityStats recurringExpenseStatsForClient(
}
var memoizedRecurringExpenseStatsForVendor = memo2(
(String vendorId, BuiltMap<String?, ExpenseEntity?> expenseMap) =>
(String vendorId, BuiltMap<String, ExpenseEntity> expenseMap) =>
recurringExpenseStatsForVendor(vendorId, expenseMap));
EntityStats recurringExpenseStatsForVendor(
String vendorId, BuiltMap<String?, ExpenseEntity?> expenseMap) {
String vendorId, BuiltMap<String, ExpenseEntity> expenseMap) {
int countActive = 0;
int countArchived = 0;
expenseMap.forEach((expenseId, expense) {
@ -234,11 +234,11 @@ EntityStats recurringExpenseStatsForVendor(
}
var memoizedTransactionStatsForVendor = memo2(
(String vendorId, BuiltMap<String?, TransactionEntity?> transactionMap) =>
(String vendorId, BuiltMap<String, TransactionEntity> transactionMap) =>
transactionStatsForVendor(vendorId, transactionMap));
EntityStats transactionStatsForVendor(
String vendorId, BuiltMap<String?, TransactionEntity?> transactionMap) {
String vendorId, BuiltMap<String, TransactionEntity> transactionMap) {
int countActive = 0;
int countArchived = 0;
transactionMap.forEach((transactionId, transaction) {
@ -255,11 +255,11 @@ EntityStats transactionStatsForVendor(
}
var memoizedRecurringExpenseStatsForUser = memo2(
(String userId, BuiltMap<String?, ExpenseEntity?> expenseMap) =>
(String userId, BuiltMap<String, ExpenseEntity> expenseMap) =>
recurringExpenseStatsForUser(userId, expenseMap));
EntityStats recurringExpenseStatsForUser(
String userId, BuiltMap<String?, ExpenseEntity?> expenseMap) {
String userId, BuiltMap<String, ExpenseEntity> expenseMap) {
int countActive = 0;
int countArchived = 0;
expenseMap.forEach((expenseId, expense) {
@ -276,11 +276,11 @@ EntityStats recurringExpenseStatsForUser(
}
var memoizedRecurringExpenseStatsForExpense = memo2(
(String expenseId, BuiltMap<String?, ExpenseEntity?> expenseMap) =>
(String expenseId, BuiltMap<String, ExpenseEntity> expenseMap) =>
recurringExpenseStatsForExpense(expenseId, expenseMap));
EntityStats recurringExpenseStatsForExpense(
String recurrigExpenseId, BuiltMap<String?, ExpenseEntity?> expenseMap) {
String recurrigExpenseId, BuiltMap<String, ExpenseEntity> expenseMap) {
int countActive = 0;
int countArchived = 0;
expenseMap.forEach((expenseId, expense) {

12
lib/redux/recurring_invoice/recurring_invoice_selectors.dart
View File

@ -10,11 +10,11 @@ import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
var memoizedFilteredRecurringInvoiceList = memo7((
SelectionState selectionState,
BuiltMap<String, InvoiceEntity> recurringInvoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltList<String> recurringInvoiceList,
ListUIState recurringInvoiceListState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
) =>
filteredRecurringInvoicesSelector(
selectionState,
@ -29,11 +29,11 @@ var memoizedFilteredRecurringInvoiceList = memo7((
List<String> filteredRecurringInvoicesSelector(
SelectionState selectionState,
BuiltMap<String, InvoiceEntity> recurringInvoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltList<String> recurringInvoiceList,
ListUIState invoiceListState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
) {
final filterEntityId = selectionState.filterEntityId;
final filterEntityType = selectionState.filterEntityType;

4
lib/redux/schedule/schedule_selectors.dart
View File

@ -40,7 +40,7 @@ List<String> dropdownSchedulesSelector(
}
var memoizedFilteredScheduleList = memo4((SelectionState selectionState,
BuiltMap<String?, ScheduleEntity?> scheduleMap,
BuiltMap<String, ScheduleEntity> scheduleMap,
BuiltList<String> scheduleList,
ListUIState scheduleListState) =>
filteredSchedulesSelector(
@ -48,7 +48,7 @@ var memoizedFilteredScheduleList = memo4((SelectionState selectionState,
List<String> filteredSchedulesSelector(
SelectionState selectionState,
BuiltMap<String?, ScheduleEntity?> scheduleMap,
BuiltMap<String, ScheduleEntity> scheduleMap,
BuiltList<String> scheduleList,
ListUIState scheduleListState) {
final filterEntityId = selectionState.filterEntityId;

38
lib/redux/static/static_selectors.dart
View File

@ -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<String?, CountryEntity?> countryMap) => countryList(countryMap));
(BuiltMap<String, CountryEntity> countryMap) => countryList(countryMap));
List<String?> countryList(BuiltMap<String?, CountryEntity?> countryMap) {
List<String?> countryList(BuiltMap<String, CountryEntity> countryMap) {
final list = countryMap.keys.toList();
list.sort((idA, idB) => countryMap[idA]!
@ -21,11 +21,10 @@ List<String?> countryList(BuiltMap<String?, CountryEntity?> countryMap) {
}
var memoizedCountryIso2Map = memo1(
(BuiltMap<String?, CountryEntity?> countryMap) =>
countryIso2Map(countryMap));
(BuiltMap<String, CountryEntity> countryMap) => countryIso2Map(countryMap));
Map<String, CountryEntity> countryIso2Map(
BuiltMap<String?, CountryEntity?> countryMap) {
BuiltMap<String, CountryEntity> countryMap) {
final map = <String, CountryEntity>{};
countryMap.keys.forEach((countryId) {
final country = countryMap[countryId]!;
@ -35,9 +34,9 @@ Map<String, CountryEntity> countryIso2Map(
}
var memoizedGroupList =
memo1((BuiltMap<String?, GroupEntity?> groupMap) => groupList(groupMap));
memo1((BuiltMap<String, GroupEntity> groupMap) => groupList(groupMap));
List<String?> groupList(BuiltMap<String?, GroupEntity?> groupMap) {
List<String?> groupList(BuiltMap<String, GroupEntity> groupMap) {
final list =
groupMap.keys.where((groupId) => groupMap[groupId]!.isActive).toList();
@ -48,10 +47,10 @@ List<String?> groupList(BuiltMap<String?, GroupEntity?> groupMap) {
}
var memoizedLanguageList = memo1(
(BuiltMap<String?, LanguageEntity?> languageMap) =>
(BuiltMap<String, LanguageEntity> languageMap) =>
languageList(languageMap));
List<String?> languageList(BuiltMap<String?, LanguageEntity?> languageMap) {
List<String?> languageList(BuiltMap<String, LanguageEntity> languageMap) {
final list = languageMap.keys.toList();
list.sort((idA, idB) => languageMap[idA]!
@ -62,10 +61,10 @@ List<String?> languageList(BuiltMap<String?, LanguageEntity?> languageMap) {
}
var memoizedCurrencyList = memo1(
(BuiltMap<String?, CurrencyEntity?> currencyMap) =>
(BuiltMap<String, CurrencyEntity> currencyMap) =>
currencyList(currencyMap));
List<String?> currencyList(BuiltMap<String?, CurrencyEntity?> currencyMap) {
List<String?> currencyList(BuiltMap<String, CurrencyEntity> currencyMap) {
final list = currencyMap.keys.toList();
list.sort((idA, idB) => currencyMap[idA]!
@ -76,10 +75,10 @@ List<String?> currencyList(BuiltMap<String?, CurrencyEntity?> currencyMap) {
}
var memoizedTimezoneList = memo1(
(BuiltMap<String?, TimezoneEntity?> timezoneMap) =>
(BuiltMap<String, TimezoneEntity> timezoneMap) =>
timezoneList(timezoneMap));
List<String?> timezoneList(BuiltMap<String?, TimezoneEntity?> timezoneMap) {
List<String?> timezoneList(BuiltMap<String, TimezoneEntity> timezoneMap) {
final list = timezoneMap.keys.toList();
list.sort((idA, idB) => timezoneMap[idA]!
@ -90,11 +89,10 @@ List<String?> timezoneList(BuiltMap<String?, TimezoneEntity?> timezoneMap) {
}
var memoizedDateFormatList = memo1(
(BuiltMap<String?, DateFormatEntity?> dateFormatMap) =>
(BuiltMap<String, DateFormatEntity> dateFormatMap) =>
dateFormatList(dateFormatMap));
List<String?> dateFormatList(
BuiltMap<String?, DateFormatEntity?> dateFormatMap) {
List<String?> dateFormatList(BuiltMap<String, DateFormatEntity> dateFormatMap) {
final list = dateFormatMap.keys.toList();
list.sort((idA, idB) => dateFormatMap[idA]!
@ -119,9 +117,9 @@ List<String?> industryList(BuiltMap<String?, IndustryEntity?> industryMap) {
}
var memoizedSizeList =
memo1((BuiltMap<String?, SizeEntity?> sizeMap) => sizeList(sizeMap));
memo1((BuiltMap<String, SizeEntity> sizeMap) => sizeList(sizeMap));
List<String?> sizeList(BuiltMap<String?, SizeEntity?> sizeMap) {
List<String?> sizeList(BuiltMap<String, SizeEntity> sizeMap) {
final list = sizeMap.keys.toList();
list.sort((idA, idB) => sizeMap[idA]!.id.compareTo(sizeMap[idB]!.id));
@ -130,9 +128,9 @@ List<String?> sizeList(BuiltMap<String?, SizeEntity?> sizeMap) {
}
var memoizedGatewayList = memo1(
(BuiltMap<String?, GatewayEntity?> gatewayMap) => gatewayList(gatewayMap));
(BuiltMap<String, GatewayEntity> gatewayMap) => gatewayList(gatewayMap));
List<String?> gatewayList(BuiltMap<String?, GatewayEntity?> gatewayMap) {
List<String?> gatewayList(BuiltMap<String, GatewayEntity> gatewayMap) {
final list = gatewayMap.keys
.where((gatewayId) => gatewayMap[gatewayId]!.isVisible)
.toList();

18
lib/redux/static/static_state.dart
View File

@ -44,23 +44,23 @@ abstract class StaticState implements Built<StaticState, StaticStateBuilder> {
kMillisecondsToRefreshStaticData;
}
BuiltMap<String?, CurrencyEntity?> get currencyMap;
BuiltMap<String, CurrencyEntity> get currencyMap;
BuiltMap<String?, SizeEntity?> get sizeMap;
BuiltMap<String, SizeEntity> get sizeMap;
BuiltMap<String?, GatewayEntity?> get gatewayMap;
BuiltMap<String, GatewayEntity> get gatewayMap;
BuiltMap<String?, IndustryEntity?> get industryMap;
BuiltMap<String, IndustryEntity> get industryMap;
BuiltMap<String?, TimezoneEntity?> get timezoneMap;
BuiltMap<String, TimezoneEntity> get timezoneMap;
BuiltMap<String?, DateFormatEntity?> get dateFormatMap;
BuiltMap<String, DateFormatEntity> get dateFormatMap;
BuiltMap<String?, LanguageEntity?> get languageMap;
BuiltMap<String, LanguageEntity> get languageMap;
BuiltMap<String?, PaymentTypeEntity?> get paymentTypeMap;
BuiltMap<String, PaymentTypeEntity> get paymentTypeMap;
BuiltMap<String?, CountryEntity?> get countryMap;
BuiltMap<String, CountryEntity> get countryMap;
BuiltMap<String, TemplateEntity> get templateMap;

176
lib/redux/static/static_state.g.dart
View File

@ -20,58 +20,44 @@ class _$StaticStateSerializer implements StructuredSerializer<StaticState> {
final result = <Object?>[
'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<StaticState> {
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<String?, CurrencyEntity?> currencyMap;
final BuiltMap<String, CurrencyEntity> currencyMap;
@override
final BuiltMap<String?, SizeEntity?> sizeMap;
final BuiltMap<String, SizeEntity> sizeMap;
@override
final BuiltMap<String?, GatewayEntity?> gatewayMap;
final BuiltMap<String, GatewayEntity> gatewayMap;
@override
final BuiltMap<String?, IndustryEntity?> industryMap;
final BuiltMap<String, IndustryEntity> industryMap;
@override
final BuiltMap<String?, TimezoneEntity?> timezoneMap;
final BuiltMap<String, TimezoneEntity> timezoneMap;
@override
final BuiltMap<String?, DateFormatEntity?> dateFormatMap;
final BuiltMap<String, DateFormatEntity> dateFormatMap;
@override
final BuiltMap<String?, LanguageEntity?> languageMap;
final BuiltMap<String, LanguageEntity> languageMap;
@override
final BuiltMap<String?, PaymentTypeEntity?> paymentTypeMap;
final BuiltMap<String, PaymentTypeEntity> paymentTypeMap;
@override
final BuiltMap<String?, CountryEntity?> countryMap;
final BuiltMap<String, CountryEntity> countryMap;
@override
final BuiltMap<String, TemplateEntity> templateMap;
@ -309,58 +295,58 @@ class StaticStateBuilder implements Builder<StaticState, StaticStateBuilder> {
int? get updatedAt => _$this._updatedAt;
set updatedAt(int? updatedAt) => _$this._updatedAt = updatedAt;
MapBuilder<String?, CurrencyEntity?>? _currencyMap;
MapBuilder<String?, CurrencyEntity?> get currencyMap =>
_$this._currencyMap ??= new MapBuilder<String?, CurrencyEntity?>();
set currencyMap(MapBuilder<String?, CurrencyEntity?>? currencyMap) =>
MapBuilder<String, CurrencyEntity>? _currencyMap;
MapBuilder<String, CurrencyEntity> get currencyMap =>
_$this._currencyMap ??= new MapBuilder<String, CurrencyEntity>();
set currencyMap(MapBuilder<String, CurrencyEntity>? currencyMap) =>
_$this._currencyMap = currencyMap;
MapBuilder<String?, SizeEntity?>? _sizeMap;
MapBuilder<String?, SizeEntity?> get sizeMap =>
_$this._sizeMap ??= new MapBuilder<String?, SizeEntity?>();
set sizeMap(MapBuilder<String?, SizeEntity?>? sizeMap) =>
MapBuilder<String, SizeEntity>? _sizeMap;
MapBuilder<String, SizeEntity> get sizeMap =>
_$this._sizeMap ??= new MapBuilder<String, SizeEntity>();
set sizeMap(MapBuilder<String, SizeEntity>? sizeMap) =>
_$this._sizeMap = sizeMap;
MapBuilder<String?, GatewayEntity?>? _gatewayMap;
MapBuilder<String?, GatewayEntity?> get gatewayMap =>
_$this._gatewayMap ??= new MapBuilder<String?, GatewayEntity?>();
set gatewayMap(MapBuilder<String?, GatewayEntity?>? gatewayMap) =>
MapBuilder<String, GatewayEntity>? _gatewayMap;
MapBuilder<String, GatewayEntity> get gatewayMap =>
_$this._gatewayMap ??= new MapBuilder<String, GatewayEntity>();
set gatewayMap(MapBuilder<String, GatewayEntity>? gatewayMap) =>
_$this._gatewayMap = gatewayMap;
MapBuilder<String?, IndustryEntity?>? _industryMap;
MapBuilder<String?, IndustryEntity?> get industryMap =>
_$this._industryMap ??= new MapBuilder<String?, IndustryEntity?>();
set industryMap(MapBuilder<String?, IndustryEntity?>? industryMap) =>
MapBuilder<String, IndustryEntity>? _industryMap;
MapBuilder<String, IndustryEntity> get industryMap =>
_$this._industryMap ??= new MapBuilder<String, IndustryEntity>();
set industryMap(MapBuilder<String, IndustryEntity>? industryMap) =>
_$this._industryMap = industryMap;
MapBuilder<String?, TimezoneEntity?>? _timezoneMap;
MapBuilder<String?, TimezoneEntity?> get timezoneMap =>
_$this._timezoneMap ??= new MapBuilder<String?, TimezoneEntity?>();
set timezoneMap(MapBuilder<String?, TimezoneEntity?>? timezoneMap) =>
MapBuilder<String, TimezoneEntity>? _timezoneMap;
MapBuilder<String, TimezoneEntity> get timezoneMap =>
_$this._timezoneMap ??= new MapBuilder<String, TimezoneEntity>();
set timezoneMap(MapBuilder<String, TimezoneEntity>? timezoneMap) =>
_$this._timezoneMap = timezoneMap;
MapBuilder<String?, DateFormatEntity?>? _dateFormatMap;
MapBuilder<String?, DateFormatEntity?> get dateFormatMap =>
_$this._dateFormatMap ??= new MapBuilder<String?, DateFormatEntity?>();
set dateFormatMap(MapBuilder<String?, DateFormatEntity?>? dateFormatMap) =>
MapBuilder<String, DateFormatEntity>? _dateFormatMap;
MapBuilder<String, DateFormatEntity> get dateFormatMap =>
_$this._dateFormatMap ??= new MapBuilder<String, DateFormatEntity>();
set dateFormatMap(MapBuilder<String, DateFormatEntity>? dateFormatMap) =>
_$this._dateFormatMap = dateFormatMap;
MapBuilder<String?, LanguageEntity?>? _languageMap;
MapBuilder<String?, LanguageEntity?> get languageMap =>
_$this._languageMap ??= new MapBuilder<String?, LanguageEntity?>();
set languageMap(MapBuilder<String?, LanguageEntity?>? languageMap) =>
MapBuilder<String, LanguageEntity>? _languageMap;
MapBuilder<String, LanguageEntity> get languageMap =>
_$this._languageMap ??= new MapBuilder<String, LanguageEntity>();
set languageMap(MapBuilder<String, LanguageEntity>? languageMap) =>
_$this._languageMap = languageMap;
MapBuilder<String?, PaymentTypeEntity?>? _paymentTypeMap;
MapBuilder<String?, PaymentTypeEntity?> get paymentTypeMap =>
_$this._paymentTypeMap ??= new MapBuilder<String?, PaymentTypeEntity?>();
set paymentTypeMap(MapBuilder<String?, PaymentTypeEntity?>? paymentTypeMap) =>
MapBuilder<String, PaymentTypeEntity>? _paymentTypeMap;
MapBuilder<String, PaymentTypeEntity> get paymentTypeMap =>
_$this._paymentTypeMap ??= new MapBuilder<String, PaymentTypeEntity>();
set paymentTypeMap(MapBuilder<String, PaymentTypeEntity>? paymentTypeMap) =>
_$this._paymentTypeMap = paymentTypeMap;
MapBuilder<String?, CountryEntity?>? _countryMap;
MapBuilder<String?, CountryEntity?> get countryMap =>
_$this._countryMap ??= new MapBuilder<String?, CountryEntity?>();
set countryMap(MapBuilder<String?, CountryEntity?>? countryMap) =>
MapBuilder<String, CountryEntity>? _countryMap;
MapBuilder<String, CountryEntity> get countryMap =>
_$this._countryMap ??= new MapBuilder<String, CountryEntity>();
set countryMap(MapBuilder<String, CountryEntity>? countryMap) =>
_$this._countryMap = countryMap;
MapBuilder<String, TemplateEntity>? _templateMap;

26
lib/redux/task/task_selectors.dart
View File

@ -183,19 +183,19 @@ InvoiceItemEntity convertTaskToInvoiceItem({
..customValue4 = customValue4);
}
var memoizedTaskList = memo5((BuiltMap<String?, TaskEntity?> taskMap,
var memoizedTaskList = memo5((BuiltMap<String, TaskEntity> taskMap,
String? clientId,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, ProjectEntity?> projectMap) =>
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, ProjectEntity> projectMap) =>
taskList(taskMap, clientId, userMap, clientMap, projectMap));
List<String?> taskList(
BuiltMap<String?, TaskEntity?> taskMap,
BuiltMap<String, TaskEntity> taskMap,
String? clientId,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, ProjectEntity?> projectMap) {
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, ProjectEntity> 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<String?, TaskEntity?> taskMap) =>
(String clientId, BuiltMap<String, TaskEntity> taskMap) =>
taskStatsForClient(clientId, taskMap));
EntityStats taskStatsForClient(
String clientId, BuiltMap<String?, TaskEntity?> taskMap) {
String clientId, BuiltMap<String, TaskEntity> taskMap) {
int countActive = 0;
int countArchived = 0;
taskMap.forEach((taskId, task) {
@ -487,12 +487,12 @@ EntityStats taskStatsForClient(
var memoizedTaskStatsForProject = memo2((
String projectId,
BuiltMap<String?, TaskEntity?> taskMap,
BuiltMap<String, TaskEntity> taskMap,
) =>
taskStatsForProject(projectId, taskMap));
EntityStats taskStatsForProject(
String projectId, BuiltMap<String?, TaskEntity?> taskMap) {
String projectId, BuiltMap<String, TaskEntity> taskMap) {
int countActive = 0;
int countArchived = 0;
taskMap.forEach((taskId, task) {
@ -510,7 +510,7 @@ EntityStats taskStatsForProject(
var memoizedTaskStatsForUser = memo2((
String userId,
BuiltMap<String?, TaskEntity?> taskMap,
BuiltMap<String, TaskEntity> taskMap,
) =>
taskStatsForProject(userId, taskMap));

12
lib/redux/task_status/task_status_selectors.dart
View File

@ -45,7 +45,7 @@ var memoizedDropdownTaskStatusList = memo4(
(BuiltMap<String?, TaskStatusEntity?> taskStatusMap,
BuiltList<String> taskStatusList,
StaticState staticState,
BuiltMap<String?, UserEntity?> userMap) =>
BuiltMap<String, UserEntity> userMap) =>
dropdownTaskStatusesSelector(
taskStatusMap, taskStatusList, staticState, userMap));
@ -53,7 +53,7 @@ List<String> dropdownTaskStatusesSelector(
BuiltMap<String?, TaskStatusEntity?> taskStatusMap,
BuiltList<String> taskStatusList,
StaticState staticState,
BuiltMap<String?, UserEntity?> userMap) {
BuiltMap<String, UserEntity> userMap) {
final list = taskStatusList.where((taskStatusId) {
final taskStatus = taskStatusMap[taskStatusId]!;
return taskStatus.isActive;
@ -114,12 +114,12 @@ List<String> filteredTaskStatusesSelector(
}
var memoizedCalculateTaskStatusAmount = memo2((String taskStatusId,
BuiltMap<String?, TaskEntity?> taskMap) =>
BuiltMap<String, TaskEntity> taskMap) =>
calculateTaskStatusAmount(taskStatusId: taskStatusId, taskMap: taskMap));
int calculateTaskStatusAmount({
String? taskStatusId,
required BuiltMap<String?, TaskEntity?> taskMap,
required BuiltMap<String, TaskEntity> taskMap,
}) {
int total = 0;
@ -133,12 +133,12 @@ int calculateTaskStatusAmount({
}
var memoizedTaskStatsForTaskStatus = memo2(
(String companyGatewayId, BuiltMap<String?, TaskEntity?> taskMap) =>
(String companyGatewayId, BuiltMap<String, TaskEntity> taskMap) =>
taskStatsForTaskStatus(companyGatewayId, taskMap));
EntityStats taskStatsForTaskStatus(
String statusId,
BuiltMap<String?, TaskEntity?> taskMap,
BuiltMap<String, TaskEntity> taskMap,
) {
int countActive = 0;
int countArchived = 0;

26
lib/redux/transaction/transaction_selectors.dart
View File

@ -60,13 +60,13 @@ List<String> dropdownTransactionsSelector(
}
var memoizedFilteredTransactionList = memo9((SelectionState selectionState,
BuiltMap<String?, TransactionEntity?> transactionMap,
BuiltMap<String, TransactionEntity> transactionMap,
BuiltList<String> transactionList,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String?, BankAccountEntity?> bankAccountMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
BuiltMap<String, BankAccountEntity> bankAccountMap,
ListUIState transactionListState) =>
filteredTransactionsSelector(
selectionState,
@ -81,13 +81,13 @@ var memoizedFilteredTransactionList = memo9((SelectionState selectionState,
List<String> filteredTransactionsSelector(
SelectionState selectionState,
BuiltMap<String?, TransactionEntity?> transactionMap,
BuiltMap<String, TransactionEntity> transactionMap,
BuiltList<String> transactionList,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String?, BankAccountEntity?> bankAccountMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
BuiltMap<String, BankAccountEntity> bankAccountMap,
ListUIState transactionListState) {
final filterEntityId = selectionState.filterEntityId;
final filterEntityType = selectionState.filterEntityType;
@ -153,11 +153,11 @@ List<String> filteredTransactionsSelector(
}
var memoizedTransactionStatsForBankAccount = memo2((String bankAccountId,
BuiltMap<String?, TransactionEntity?> transactionMap) =>
BuiltMap<String, TransactionEntity> transactionMap) =>
transactionStatsForBankAccount(bankAccountId, transactionMap));
EntityStats transactionStatsForBankAccount(String bankAccountId,
BuiltMap<String?, TransactionEntity?> transactionMap) {
EntityStats transactionStatsForBankAccount(
String bankAccountId, BuiltMap<String, TransactionEntity> transactionMap) {
int countActive = 0;
int countArchived = 0;
transactionMap.forEach((transactionId, transaction) {

4
lib/redux/transaction_rule/transaction_rule_selectors.dart
View File

@ -82,12 +82,12 @@ List<String> filteredTransactionRulesSelector(
}
var memoizedTransactionStatsForTransactionRule = memo2(
(String userId, BuiltMap<String?, TransactionEntity?> transactionMap) =>
(String userId, BuiltMap<String, TransactionEntity> transactionMap) =>
transactionStatsForTransactionRule(userId, transactionMap));
EntityStats transactionStatsForTransactionRule(
String transactionRuleId,
BuiltMap<String?, TransactionEntity?> transactionMap,
BuiltMap<String, TransactionEntity> transactionMap,
) {
int countActive = 0;
int countArchived = 0;

18
lib/redux/user/user_selectors.dart
View File

@ -34,7 +34,7 @@ List<String> dropdownUsersSelector(BuiltMap<String, UserEntity> userMap,
}
var memoizedFilteredUserList = memo5((SelectionState selectionState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
BuiltList<String> userList,
ListUIState userListState,
String authUserId) =>
@ -43,7 +43,7 @@ var memoizedFilteredUserList = memo5((SelectionState selectionState,
List<String> filteredUsersSelector(
SelectionState selectionState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
BuiltList<String> userList,
ListUIState userListState,
String authUserId) {
@ -74,9 +74,9 @@ List<String> filteredUsersSelector(
}
var memoizedUserList =
memo1((BuiltMap<String?, UserEntity?> userMap) => userList(userMap));
memo1((BuiltMap<String, UserEntity> userMap) => userList(userMap));
List<String?> userList(BuiltMap<String?, UserEntity?> userMap) {
List<String?> userList(BuiltMap<String, UserEntity> userMap) {
final list =
userMap.keys.where((userId) => userMap[userId]!.isActive).toList();
@ -89,9 +89,9 @@ List<String?> userList(BuiltMap<String?, UserEntity?> userMap) {
}
var memoizedGmailUserList =
memo1((BuiltMap<String?, UserEntity?> userMap) => gmailUserList(userMap));
memo1((BuiltMap<String, UserEntity> userMap) => gmailUserList(userMap));
List<String?> gmailUserList(BuiltMap<String?, UserEntity?> userMap) {
List<String?> gmailUserList(BuiltMap<String, UserEntity> userMap) {
return userList(userMap).where((userId) {
final user = (userMap[userId] ?? UserEntity) as UserEntity;
@ -99,10 +99,10 @@ List<String?> gmailUserList(BuiltMap<String?, UserEntity?> userMap) {
}).toList();
}
var memoizedMicrosoftUserList = memo1(
(BuiltMap<String?, UserEntity?> userMap) => microsoftUserList(userMap));
var memoizedMicrosoftUserList =
memo1((BuiltMap<String, UserEntity> userMap) => microsoftUserList(userMap));
List<String?> microsoftUserList(BuiltMap<String?, UserEntity?> userMap) {
List<String?> microsoftUserList(BuiltMap<String, UserEntity> userMap) {
return userList(userMap).where((userId) {
final user = (userMap[userId] ?? UserEntity) as UserEntity;

29
lib/redux/vendor/vendor_selectors.dart vendored
View File

@ -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<String?, VendorEntity?> vendorMap, BuiltList<String> vendorList,
BuiltMap<String?, UserEntity?> userMap, StaticState staticState) =>
(BuiltMap<String, VendorEntity> vendorMap, BuiltList<String> vendorList,
BuiltMap<String, UserEntity> userMap, StaticState staticState) =>
dropdownVendorsSelector(vendorMap, vendorList, userMap, staticState));
List<String> dropdownVendorsSelector(
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltList<String> vendorList,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState) {
final list = vendorList.where((vendorId) {
final vendor = vendorMap[vendorId]!;
@ -34,20 +34,20 @@ List<String> dropdownVendorsSelector(
}
var memoizedFilteredVendorList = memo6((SelectionState selectionState,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltList<String> vendorList,
ListUIState vendorListState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState) =>
filteredVendorsSelector(selectionState, vendorMap, vendorList,
vendorListState, userMap, staticState));
List<String> filteredVendorsSelector(
SelectionState selectionState,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltList<String> vendorList,
ListUIState vendorListState,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState) {
final list = vendorList.where((vendorId) {
final vendor = vendorMap[vendorId]!;
@ -88,11 +88,11 @@ List<String> filteredVendorsSelector(
}
var memoizedVendorStatsForUser = memo2(
(String userId, BuiltMap<String?, VendorEntity?> vendorMap) =>
(String userId, BuiltMap<String, VendorEntity> vendorMap) =>
vendorStatsForUser(userId, vendorMap));
EntityStats vendorStatsForUser(
String userId, BuiltMap<String?, VendorEntity?> vendorMap) {
String userId, BuiltMap<String, VendorEntity> 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<String?, ExpenseEntity?> expenseMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltList<String> expenseList) =>
calculateVendorBalance(vendorId, currencyId, expenseMap, expenseList));
double calculateVendorBalance(
String vendorId,
String currencyId,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltList<String> expenseList) {
double calculateVendorBalance(String vendorId, String currencyId,
BuiltMap<String, ExpenseEntity> expenseMap, BuiltList<String> expenseList) {
double total = 0;
expenseList.forEach((expenseId) {

4
lib/redux/webhook/webhook_selectors.dart
View File

@ -38,7 +38,7 @@ List<String> dropdownWebhooksSelector(
var memoizedFilteredWebhookList = memo4((
SelectionState selectionState,
BuiltMap<String?, WebhookEntity?> webhookMap,
BuiltMap<String, WebhookEntity> webhookMap,
BuiltList<String> webhookList,
ListUIState webhookListState,
) =>
@ -51,7 +51,7 @@ var memoizedFilteredWebhookList = memo4((
List<String> filteredWebhooksSelector(
SelectionState selectionState,
BuiltMap<String?, WebhookEntity?> webhookMap,
BuiltMap<String, WebhookEntity> webhookMap,
BuiltList<String> webhookList,
ListUIState webhookListState,
) {

8
lib/ui/bank_account/bank_account_list_vm.dart
View File

@ -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<String> bankAccountList;
final BuiltMap<String?, BankAccountEntity?> bankAccountMap;
final BuiltMap<String, BankAccountEntity> bankAccountMap;
final ListUIState listState;
final String? filter;
final bool isLoading;

2
lib/ui/bank_account/bank_account_screen_vm.dart
View File

@ -44,7 +44,7 @@ class BankAccountScreenVM {
final UserCompanyEntity? userCompany;
final List<String> bankAccountList;
final Function(BuildContext, List<BaseEntity>, EntityAction) onEntityAction;
final BuiltMap<String?, BankAccountEntity?> bankAccountMap;
final BuiltMap<String, BankAccountEntity> bankAccountMap;
final Function(BuildContext) onRefreshAccounts;
static BankAccountScreenVM fromStore(Store<AppState> store) {

2
lib/ui/client/client_screen_vm.dart
View File

@ -40,7 +40,7 @@ class ClientScreenVM {
final bool isInMultiselect;
final UserCompanyEntity? userCompany;
final List<String> clientList;
final BuiltMap<String?, ClientEntity?> clientMap;
final BuiltMap<String, ClientEntity> clientMap;
static ClientScreenVM fromStore(Store<AppState> store) {
final state = store.state;

2
lib/ui/credit/credit_list_vm.dart
View File

@ -68,7 +68,7 @@ class CreditListVM extends EntityListVM {
required AppState state,
required List<String> invoiceList,
required BuiltMap<String, InvoiceEntity> invoiceMap,
required BuiltMap<String?, ClientEntity?> clientMap,
required BuiltMap<String, ClientEntity> clientMap,
required String? filter,
required bool isLoading,
required Function(BuildContext) onRefreshed,

2
lib/ui/credit/edit/credit_edit_details_vm.dart
View File

@ -59,7 +59,7 @@ class CreditEditDetailsVM extends EntityEditDetailsVM {
Function(InvoiceEntity)? onChanged,
Function(BuildContext, InvoiceEntity, ClientEntity?)? onClientChanged,
Function(BuildContext, InvoiceEntity, VendorEntity?)? onVendorChanged,
BuiltMap<String?, ClientEntity?>? clientMap,
BuiltMap<String, ClientEntity>? clientMap,
BuiltList<String>? clientList,
Function(BuildContext context, Completer<SelectableEntity> completer)?
onAddClientPressed,

2
lib/ui/dashboard/dashboard_screen_vm.dart
View File

@ -125,7 +125,7 @@ class DashboardVM {
final AppState state;
final DashboardUIState dashboardUIState;
final BuiltMap<String?, CurrencyEntity?> currencyMap;
final BuiltMap<String, CurrencyEntity> currencyMap;
final String? filter;
final List<BaseEntity?> filteredList;
final bool isLoading;

2
lib/ui/design/design_list_vm.dart
View File

@ -109,7 +109,7 @@ class DesignListVM {
final AppState state;
final UserCompanyEntity? userCompany;
final List<String> designList;
final BuiltMap<String?, DesignEntity?> designMap;
final BuiltMap<String, DesignEntity> designMap;
final ListUIState listState;
final String? filter;
final bool isLoading;

2
lib/ui/design/design_screen_vm.dart
View File

@ -43,7 +43,7 @@ class DesignScreenVM {
final UserCompanyEntity? userCompany;
final List<String> designList;
final Function(BuildContext, List<BaseEntity>, EntityAction) onEntityAction;
final BuiltMap<String?, DesignEntity?> designMap;
final BuiltMap<String, DesignEntity> designMap;
static DesignScreenVM fromStore(Store<AppState> store) {
final state = store.state;

2
lib/ui/document/document_list_vm.dart
View File

@ -128,7 +128,7 @@ class DocumentListVM {
final AppState state;
final List<String> documentList;
final BuiltMap<String?, DocumentEntity?> documentMap;
final BuiltMap<String, DocumentEntity> documentMap;
final ListUIState listState;
final List<String> tableColumns;
final String? filter;

2
lib/ui/document/document_screen_vm.dart
View File

@ -40,7 +40,7 @@ class DocumentScreenVM {
final bool isInMultiselect;
final UserCompanyEntity? userCompany;
final List<String> documentList;
final BuiltMap<String?, DocumentEntity?> documentMap;
final BuiltMap<String, DocumentEntity> documentMap;
static DocumentScreenVM fromStore(Store<AppState> store) {
final state = store.state;

2
lib/ui/expense/expense_list_vm.dart
View File

@ -115,7 +115,7 @@ class ExpenseListVM {
final AppState state;
final UserEntity? user;
final List<String?> expenseList;
final BuiltMap<String?, ExpenseEntity?> expenseMap;
final BuiltMap<String, ExpenseEntity> expenseMap;
final ListUIState listState;
final String? filter;
final bool isLoading;

2
lib/ui/expense/expense_screen_vm.dart
View File

@ -40,7 +40,7 @@ class ExpenseScreenVM {
final bool isInMultiselect;
final UserCompanyEntity? userCompany;
final List<String?> expenseList;
final BuiltMap<String?, ExpenseEntity?> expenseMap;
final BuiltMap<String, ExpenseEntity> expenseMap;
static ExpenseScreenVM fromStore(Store<AppState> store) {
final state = store.state;

2
lib/ui/expense_category/expense_category_list_vm.dart
View File

@ -117,7 +117,7 @@ class ExpenseCategoryListVM {
final AppState state;
final UserCompanyEntity? userCompany;
final List<String> expenseCategoryList;
final BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap;
final BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap;
final ListUIState listState;
final String? filter;
final bool isLoading;

2
lib/ui/expense_category/expense_category_screen_vm.dart
View File

@ -43,7 +43,7 @@ class ExpenseCategoryScreenVM {
final UserCompanyEntity? userCompany;
final List<String> expenseCategoryList;
final Function(BuildContext, List<BaseEntity>, EntityAction) onEntityAction;
final BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap;
final BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap;
static ExpenseCategoryScreenVM fromStore(Store<AppState> store) {
final state = store.state;

2
lib/ui/group/group_list_vm.dart
View File

@ -107,7 +107,7 @@ class GroupListVM {
final AppState state;
final UserCompanyEntity? userCompany;
final List<String> groupList;
final BuiltMap<String?, GroupEntity?> groupMap;
final BuiltMap<String, GroupEntity> groupMap;
final ListUIState listState;
final String? filter;
final bool isLoading;

2
lib/ui/group/group_screen_vm.dart
View File

@ -41,7 +41,7 @@ class GroupScreenVM {
final bool isInMultiselect;
final UserCompanyEntity? userCompany;
final List<String> groupList;
final BuiltMap<String?, GroupEntity?> groupMap;
final BuiltMap<String, GroupEntity> groupMap;
static GroupScreenVM fromStore(Store<AppState> store) {
final state = store.state;

4
lib/ui/invoice/edit/invoice_edit_details_vm.dart
View File

@ -70,7 +70,7 @@ class EntityEditDetailsVM {
onClientChanged;
final Function(BuildContext context, InvoiceEntity, VendorEntity?)?
onVendorChanged;
final BuiltMap<String?, ClientEntity?>? clientMap;
final BuiltMap<String, ClientEntity>? clientMap;
final BuiltList<String>? clientList;
final Function(BuildContext context, Completer<SelectableEntity> completer)?
onAddClientPressed;
@ -86,7 +86,7 @@ class InvoiceEditDetailsVM extends EntityEditDetailsVM {
Function(InvoiceEntity)? onChanged,
Function(BuildContext, InvoiceEntity, ClientEntity?)? onClientChanged,
Function(BuildContext, InvoiceEntity, VendorEntity?)? onVendorChanged,
BuiltMap<String?, ClientEntity?>? clientMap,
BuiltMap<String, ClientEntity>? clientMap,
BuiltList<String>? clientList,
Function(BuildContext context, Completer<SelectableEntity> completer)?
onAddClientPressed,

4
lib/ui/invoice/invoice_list_vm.dart
View File

@ -77,7 +77,7 @@ class EntityListVM {
final EntityType entityType;
final List<String> invoiceList;
final BuiltMap<String, InvoiceEntity> invoiceMap;
final BuiltMap<String?, ClientEntity?> clientMap;
final BuiltMap<String, ClientEntity> clientMap;
final String? filter;
final bool isLoading;
final Function(BuildContext) onRefreshed;
@ -91,7 +91,7 @@ class InvoiceListVM extends EntityListVM {
required AppState state,
required List<String> invoiceList,
required BuiltMap<String, InvoiceEntity> invoiceMap,
required BuiltMap<String?, ClientEntity?> clientMap,
required BuiltMap<String, ClientEntity> clientMap,
required String? filter,
required bool isLoading,
required Function(BuildContext) onRefreshed,

4
lib/ui/payment/payment_list_vm.dart
View File

@ -117,8 +117,8 @@ class PaymentListVM {
final UserEntity? user;
final ListUIState listState;
final List<String> paymentList;
final BuiltMap<String?, PaymentEntity?> paymentMap;
final BuiltMap<String?, ClientEntity?> clientMap;
final BuiltMap<String, PaymentEntity> paymentMap;
final BuiltMap<String, ClientEntity> clientMap;
final String? filter;
final bool isLoading;
final Function(BuildContext) onRefreshed;

2
lib/ui/payment/payment_screen_vm.dart
View File

@ -40,7 +40,7 @@ class PaymentScreenVM {
final bool isInMultiselect;
final UserCompanyEntity? userCompany;
final List<String> paymentList;
final BuiltMap<String?, PaymentEntity?> paymentMap;
final BuiltMap<String, PaymentEntity> paymentMap;
static PaymentScreenVM fromStore(Store<AppState> store) {
final state = store.state;

2
lib/ui/payment_term/payment_term_list_vm.dart
View File

@ -112,7 +112,7 @@ class PaymentTermListVM {
final AppState state;
final UserCompanyEntity? userCompany;
final List<String> paymentTermList;
final BuiltMap<String?, PaymentTermEntity?> paymentTermMap;
final BuiltMap<String, PaymentTermEntity> paymentTermMap;
final ListUIState listState;
final String? filter;
final bool isLoading;

2
lib/ui/payment_term/payment_term_screen_vm.dart
View File

@ -44,7 +44,7 @@ class PaymentTermScreenVM {
final UserCompanyEntity? userCompany;
final List<String> paymentTermList;
final Function(BuildContext, List<BaseEntity>, EntityAction) onEntityAction;
final BuiltMap<String?, PaymentTermEntity?> paymentTermMap;
final BuiltMap<String, PaymentTermEntity> paymentTermMap;
static PaymentTermScreenVM fromStore(Store<AppState> store) {
final state = store.state;

2
lib/ui/product/product_screen_vm.dart
View File

@ -40,7 +40,7 @@ class ProductScreenVM {
final bool isInMultiselect;
final UserCompanyEntity? userCompany;
final List<String> productList;
final BuiltMap<String?, ProductEntity?> productMap;
final BuiltMap<String, ProductEntity> productMap;
static ProductScreenVM fromStore(Store<AppState> store) {
final state = store.state;

4
lib/ui/project/project_list_vm.dart
View File

@ -113,8 +113,8 @@ class ProjectListVM {
final AppState state;
final List<String> projectList;
final BuiltMap<String?, ProjectEntity?> projectMap;
final BuiltMap<String?, ClientEntity?> clientMap;
final BuiltMap<String, ProjectEntity> projectMap;
final BuiltMap<String, ClientEntity> clientMap;
final ListUIState listState;
final String? filter;
final bool isLoading;

2
lib/ui/project/project_screen_vm.dart
View File

@ -40,7 +40,7 @@ class ProjectScreenVM {
final bool isInMultiselect;
final UserCompanyEntity? userCompany;
final List<String> projectList;
final BuiltMap<String?, ProjectEntity?> projectMap;
final BuiltMap<String, ProjectEntity> projectMap;
static ProjectScreenVM fromStore(Store<AppState> store) {
final state = store.state;

2
lib/ui/purchase_order/edit/purchase_order_edit_details_vm.dart
View File

@ -59,7 +59,7 @@ class PurchaseOrderEditDetailsVM extends EntityEditDetailsVM {
Function(InvoiceEntity)? onChanged,
Function(BuildContext, InvoiceEntity, ClientEntity?)? onClientChanged,
Function(BuildContext, InvoiceEntity, VendorEntity?)? onVendorChanged,
BuiltMap<String?, ClientEntity?>? clientMap,
BuiltMap<String, ClientEntity>? clientMap,
BuiltList<String>? clientList,
Function(BuildContext context, Completer<SelectableEntity> completer)?
onAddClientPressed,

2
lib/ui/purchase_order/purchase_order_list_vm.dart
View File

@ -68,7 +68,7 @@ class PurchaseOrderListVM extends EntityListVM {
required AppState state,
required List<String> invoiceList,
required BuiltMap<String, InvoiceEntity> invoiceMap,
required BuiltMap<String?, ClientEntity?> clientMap,
required BuiltMap<String, ClientEntity> clientMap,
required String? filter,
required bool isLoading,
required Function(BuildContext) onRefreshed,

2
lib/ui/quote/edit/quote_edit_details_vm.dart
View File

@ -58,7 +58,7 @@ class QuoteEditDetailsVM extends EntityEditDetailsVM {
Function(InvoiceEntity)? onChanged,
Function(BuildContext, InvoiceEntity, ClientEntity?)? onClientChanged,
Function(BuildContext, InvoiceEntity, VendorEntity?)? onVendorChanged,
BuiltMap<String?, ClientEntity?>? clientMap,
BuiltMap<String, ClientEntity>? clientMap,
BuiltList<String>? clientList,
Function(BuildContext context, Completer<SelectableEntity> completer)?
onAddClientPressed,

2
lib/ui/quote/quote_list_vm.dart
View File

@ -61,7 +61,7 @@ class QuoteListVM extends EntityListVM {
required AppState state,
required List<String> invoiceList,
required BuiltMap<String, InvoiceEntity> invoiceMap,
required BuiltMap<String?, ClientEntity?> clientMap,
required BuiltMap<String, ClientEntity> clientMap,
required String? filter,
required bool isLoading,
required Function(BuildContext) onRefreshed,

2
lib/ui/recurring_expense/recurring_expense_list_vm.dart
View File

@ -122,7 +122,7 @@ class RecurringExpenseListVM {
final AppState state;
final UserCompanyEntity? userCompany;
final List<String?> recurringExpenseList;
final BuiltMap<String?, ExpenseEntity?> recurringExpenseMap;
final BuiltMap<String, ExpenseEntity> recurringExpenseMap;
final ListUIState listState;
final String? filter;
final bool isLoading;

2
lib/ui/recurring_expense/recurring_expense_screen_vm.dart
View File

@ -43,7 +43,7 @@ class RecurringExpenseScreenVM {
final UserCompanyEntity? userCompany;
final List<String?> recurringExpenseList;
final Function(BuildContext, List<BaseEntity>, EntityAction) onEntityAction;
final BuiltMap<String?, ExpenseEntity?> recurringExpenseMap;
final BuiltMap<String, ExpenseEntity> recurringExpenseMap;
static RecurringExpenseScreenVM fromStore(Store<AppState> store) {
final state = store.state;

2
lib/ui/recurring_invoice/edit/recurring_invoice_edit_details_vm.dart
View File

@ -59,7 +59,7 @@ class RecurringInvoiceEditDetailsVM extends EntityEditDetailsVM {
Function(InvoiceEntity)? onChanged,
Function(BuildContext, InvoiceEntity, ClientEntity?)? onClientChanged,
Function(BuildContext, InvoiceEntity, VendorEntity?)? onVendorChanged,
BuiltMap<String?, ClientEntity?>? clientMap,
BuiltMap<String, ClientEntity>? clientMap,
BuiltList<String>? clientList,
Function(BuildContext context, Completer<SelectableEntity> completer)?
onAddClientPressed,

27
lib/ui/reports/client_report.dart
View File

@ -83,9 +83,9 @@ enum ClientReportFields {
var memoizedClientReport = memo6((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String?, GroupEntity?> groupMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, GroupEntity> groupMap,
StaticState staticState,
) =>
clientReport(userCompany!, reportsUIState, clientMap, userMap, groupMap,
@ -94,9 +94,9 @@ var memoizedClientReport = memo6((
ReportResult clientReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String?, GroupEntity?> groupMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, GroupEntity> groupMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
@ -104,10 +104,9 @@ ReportResult clientReport(
BuiltList<ClientReportFields> 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(),

15
lib/ui/reports/contact_report.dart
View File

@ -72,8 +72,8 @@ enum ContactReportFields {
var memoizedContactReport = memo5((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) =>
contactReport(
@ -82,18 +82,17 @@ var memoizedContactReport = memo5((
ReportResult contactReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
BuiltList<ContactReportFields> 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,

15
lib/ui/reports/credit_item_report.dart
View File

@ -46,9 +46,9 @@ enum CreditItemReportFields {
var memoizedCreditItemReport = memo6((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ProductEntity?> productMap,
BuiltMap<String, ProductEntity> productMap,
BuiltMap<String, InvoiceEntity> creditMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
StaticState staticState,
) =>
lineItemReport(userCompany!, reportsUIState, productMap, creditMap,
@ -57,19 +57,18 @@ var memoizedCreditItemReport = memo6((
ReportResult lineItemReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ProductEntity?> productMap,
BuiltMap<String, ProductEntity> productMap,
BuiltMap<String, InvoiceEntity> creditMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
BuiltList<CreditItemReportFields> 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,

15
lib/ui/reports/credit_report.dart
View File

@ -83,8 +83,8 @@ var memoizedCreditReport = memo6((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String, InvoiceEntity> creditMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) =>
creditReport(userCompany!, reportsUIState, creditMap, clientMap, userMap,
@ -94,8 +94,8 @@ ReportResult creditReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String, InvoiceEntity> creditMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
@ -103,10 +103,9 @@ ReportResult creditReport(
BuiltList<CreditReportFields> 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,

15
lib/ui/reports/document_report.dart
View File

@ -29,8 +29,8 @@ enum DocumentReportFields {
var memoizedDocumentReport = memo4((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, DocumentEntity?> documentMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, DocumentEntity> documentMap,
BuiltMap<String, UserEntity> userMap,
) =>
documentReport(
userCompany!,
@ -42,8 +42,8 @@ var memoizedDocumentReport = memo4((
ReportResult documentReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, DocumentEntity?> documentMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, DocumentEntity> documentMap,
BuiltMap<String, UserEntity> userMap,
) {
final List<List<ReportElement>> data = [];
final List<BaseEntity> 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,

31
lib/ui/reports/expense_report.dart
View File

@ -58,13 +58,13 @@ enum ExpenseReportFields {
var memoizedExpenseReport = memo10((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, ProjectEntity?> projectMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, ProjectEntity> projectMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) =>
expenseReport(
@ -83,13 +83,13 @@ var memoizedExpenseReport = memo10((
ReportResult expenseReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, ProjectEntity?> projectMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, ProjectEntity> projectMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
@ -97,10 +97,9 @@ ReportResult expenseReport(
BuiltList<ExpenseReportFields> 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,

15
lib/ui/reports/invoice_item_report.dart
View File

@ -46,9 +46,9 @@ enum InvoiceItemReportFields {
var memoizedInvoiceItemReport = memo6((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ProductEntity?> productMap,
BuiltMap<String, ProductEntity> productMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
StaticState staticState,
) =>
lineItemReport(userCompany!, reportsUIState, productMap, invoiceMap,
@ -57,19 +57,18 @@ var memoizedInvoiceItemReport = memo6((
ReportResult lineItemReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ProductEntity?> productMap,
BuiltMap<String, ProductEntity> productMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
BuiltList<InvoiceItemReportFields> 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,

19
lib/ui/reports/invoice_tax_report.dart
View File

@ -31,9 +31,9 @@ var memoizedInvoiceTaxReport = memo9((
BuiltMap<String?, TaxRateEntity?> taxRateMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String, InvoiceEntity> creditMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) =>
taxReport(userCompany!, reportsUIState, taxRateMap, invoiceMap, creditMap,
@ -45,19 +45,18 @@ ReportResult taxReport(
BuiltMap<String?, TaxRateEntity?> taxRateMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String, InvoiceEntity> creditMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
BuiltList<TaxRateReportFields> 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,

19
lib/ui/reports/payment_report.dart
View File

@ -51,9 +51,9 @@ var memoizedPaymentReport = memo8(
(
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String, InvoiceEntity> creditMap,
StaticState staticState,
@ -73,9 +73,9 @@ var memoizedPaymentReport = memo8(
ReportResult paymentReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String, InvoiceEntity> creditMap,
StaticState staticState,
@ -85,10 +85,9 @@ ReportResult paymentReport(
BuiltList<PaymentReportFields> 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,

19
lib/ui/reports/payment_tax_report.dart
View File

@ -32,9 +32,9 @@ var memoizedPaymentTaxReport = memo9((
BuiltMap<String?, TaxRateEntity?> taxRateMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String, InvoiceEntity> creditMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) =>
paymentTaxReport(userCompany!, reportsUIState, taxRateMap, invoiceMap,
@ -46,19 +46,18 @@ ReportResult paymentTaxReport(
BuiltMap<String?, TaxRateEntity?> taxRateMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String, InvoiceEntity> creditMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
BuiltList<TaxRateReportFields> 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,

19
lib/ui/reports/product_report.dart
View File

@ -37,9 +37,9 @@ enum ProductReportFields {
var memoizedProductReport = memo6((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ProductEntity?> productMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ProductEntity> productMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) =>
productReport(userCompany!, reportsUIState, productMap, vendorMap, userMap,
@ -48,9 +48,9 @@ var memoizedProductReport = memo6((
ReportResult productReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ProductEntity?> productMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ProductEntity> productMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
@ -58,10 +58,9 @@ ReportResult productReport(
BuiltList<ProductReportFields> 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,

24
lib/ui/reports/profit_loss_report.dart
View File

@ -40,12 +40,12 @@ enum ProfitAndLossReportFields {
var memoizedProfitAndLossReport = memo9((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) =>
profitAndLossReport(
@ -63,12 +63,12 @@ var memoizedProfitAndLossReport = memo9((
ReportResult profitAndLossReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];

19
lib/ui/reports/purchase_order_item_report.dart
View File

@ -43,10 +43,10 @@ enum PurchaseOrderItemReportFields {
var memoizedPurchaseOrderItemReport = memo7((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ProductEntity?> productMap,
BuiltMap<String, ProductEntity> productMap,
BuiltMap<String, InvoiceEntity> purchaseOrderMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
StaticState staticState,
) =>
lineItemReport(userCompany!, reportsUIState, productMap, purchaseOrderMap,
@ -55,19 +55,20 @@ var memoizedPurchaseOrderItemReport = memo7((
ReportResult lineItemReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ProductEntity?> productMap,
BuiltMap<String, ProductEntity> productMap,
BuiltMap<String, InvoiceEntity> purchaseOrderMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
BuiltList<PurchaseOrderItemReportFields> 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,

12
lib/ui/reports/purchase_order_report.dart
View File

@ -82,9 +82,9 @@ var memoizedPurchaseOrderReport = memo7((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String, InvoiceEntity> purchaseOrderMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) =>
purchaseOrderReport(userCompany!, reportsUIState, purchaseOrderMap,
@ -94,9 +94,9 @@ ReportResult purchaseOrderReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String, InvoiceEntity> purchaseOrderMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];

15
lib/ui/reports/quote_item_report.dart
View File

@ -46,9 +46,9 @@ enum QuoteItemReportFields {
var memoizedQuoteItemReport = memo6((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ProductEntity?> productMap,
BuiltMap<String, ProductEntity> productMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
StaticState staticState,
) =>
lineItemReport(userCompany!, reportsUIState, productMap, invoiceMap,
@ -57,19 +57,18 @@ var memoizedQuoteItemReport = memo6((
ReportResult lineItemReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ProductEntity?> productMap,
BuiltMap<String, ProductEntity> productMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, ClientEntity> clientMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
BuiltList<QuoteItemReportFields> 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,

19
lib/ui/reports/quote_report.dart
View File

@ -81,9 +81,9 @@ var memoizedQuoteReport = memo7((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String, InvoiceEntity> quoteMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) =>
quoteReport(userCompany!, reportsUIState, quoteMap, clientMap, vendorMap,
@ -93,9 +93,9 @@ ReportResult quoteReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String, InvoiceEntity> quoteMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
@ -103,10 +103,9 @@ ReportResult quoteReport(
BuiltList<QuoteReportFields> 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,

30
lib/ui/reports/recurring_expense_report.dart
View File

@ -50,12 +50,12 @@ enum RecurringExpenseReportFields {
var memoizedRecurringExpenseReport = memo9((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) =>
recurringExpenseReport(
@ -73,12 +73,12 @@ var memoizedRecurringExpenseReport = memo9((
ReportResult recurringExpenseReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ExpenseCategoryEntity?> expenseCategoryMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) {
final List<List<ReportElement>> 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)!);

23
lib/ui/reports/recurring_invoice_report.dart
View File

@ -90,10 +90,10 @@ var memoizedRecurringInvoiceReport = memo8((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, ProjectEntity?> projectMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, ProjectEntity> projectMap,
StaticState staticState,
) =>
recurringInvoiceReport(
@ -111,10 +111,10 @@ ReportResult recurringInvoiceReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, ProjectEntity?> projectMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, ProjectEntity> projectMap,
StaticState staticState,
) {
final List<List<ReportElement>> 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,

11
lib/ui/reports/reports_screen_vm.dart
View File

@ -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<String?, CurrencyEntity?> currencyMap,
BuiltMap<String, CurrencyEntity> currencyMap,
CompanyEntity? company,
) =>
calculateReportTotals(
@ -562,7 +561,7 @@ GroupTotals calculateReportTotals({
required ReportResult reportResult,
required ReportsUIState reportState,
ReportSettingsEntity? reportSettings,
BuiltMap<String?, CurrencyEntity?>? currencyMap,
BuiltMap<String, CurrencyEntity>? currencyMap,
CompanyEntity? company,
}) {
final Map<String?, Map<String?, double?>> totals = {};

27
lib/ui/reports/task_report.dart
View File

@ -48,13 +48,13 @@ enum TaskReportFields {
var memoizedTaskReport = memo10((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, TaskEntity?> taskMap,
BuiltMap<String, TaskEntity> taskMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, GroupEntity?> groupMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, GroupEntity> groupMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String?, TaskStatusEntity?> taskStatusMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String?, ProjectEntity?> projectMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, ProjectEntity> projectMap,
StaticState staticState,
) =>
taskReport(
@ -73,13 +73,13 @@ var memoizedTaskReport = memo10((
ReportResult taskReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, TaskEntity?> taskMap,
BuiltMap<String, TaskEntity> taskMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, GroupEntity?> groupMap,
BuiltMap<String?, ClientEntity?> clientMap,
BuiltMap<String, GroupEntity> groupMap,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String?, TaskStatusEntity?> taskStatusMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String?, ProjectEntity?> projectMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, ProjectEntity> projectMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
@ -87,10 +87,9 @@ ReportResult taskReport(
BuiltList<TaskReportFields> 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,

24
lib/ui/reports/transaction_report.dart
View File

@ -36,13 +36,13 @@ enum TransactionReportFields {
var memoizedTransactionReport = memo10((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, TransactionEntity?> transactionMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ExpenseCategoryEntity?> categoryMap,
BuiltMap<String, TransactionEntity> transactionMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ExpenseCategoryEntity> categoryMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, BankAccountEntity?> bankAccountMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, BankAccountEntity> bankAccountMap,
BuiltMap<String, PaymentEntity> paymentMap,
StaticState staticState,
) =>
transactionReport(
@ -61,13 +61,13 @@ var memoizedTransactionReport = memo10((
ReportResult transactionReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, TransactionEntity?> transactionMap,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, ExpenseEntity?> expenseMap,
BuiltMap<String?, ExpenseCategoryEntity?> categoryMap,
BuiltMap<String, TransactionEntity> transactionMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, ExpenseCategoryEntity> categoryMap,
BuiltMap<String, InvoiceEntity> invoiceMap,
BuiltMap<String?, BankAccountEntity?> bankAccountMap,
BuiltMap<String?, PaymentEntity?> paymentMap,
BuiltMap<String, BankAccountEntity> bankAccountMap,
BuiltMap<String, PaymentEntity> paymentMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];

19
lib/ui/reports/vendor_report.dart
View File

@ -72,9 +72,9 @@ enum VendorReportFields {
var memoizedVendorReport = memo6((
UserCompanyEntity? userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String?, GroupEntity?> groupMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, GroupEntity> groupMap,
StaticState staticState,
) =>
vendorReport(userCompany!, reportsUIState, vendorMap, userMap, groupMap,
@ -83,9 +83,9 @@ var memoizedVendorReport = memo6((
ReportResult vendorReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String?, VendorEntity?> vendorMap,
BuiltMap<String?, UserEntity?> userMap,
BuiltMap<String?, GroupEntity?> groupMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
BuiltMap<String, GroupEntity> groupMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
@ -93,10 +93,9 @@ ReportResult vendorReport(
BuiltList<VendorReportFields> 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,

2
lib/ui/schedule/schedule_list_vm.dart
View File

@ -109,7 +109,7 @@ class ScheduleListVM {
final AppState state;
final UserCompanyEntity? userCompany;
final List<String> scheduleList;
final BuiltMap<String?, ScheduleEntity?> scheduleMap;
final BuiltMap<String, ScheduleEntity> scheduleMap;
final ListUIState listState;
final String? filter;
final bool isLoading;

2
lib/ui/schedule/schedule_screen_vm.dart
View File

@ -39,7 +39,7 @@ class ScheduleScreenVM {
final UserCompanyEntity? userCompany;
final List<String> scheduleList;
final Function(BuildContext, List<BaseEntity>, EntityAction) onEntityAction;
final BuiltMap<String?, ScheduleEntity?> scheduleMap;
final BuiltMap<String, ScheduleEntity> scheduleMap;
static ScheduleScreenVM fromStore(Store<AppState> store) {
final state = store.state;

4
lib/ui/task/task_list_vm.dart
View File

@ -113,8 +113,8 @@ class TaskListVM {
final AppState state;
final UserEntity? user;
final List<String> taskList;
final BuiltMap<String?, TaskEntity?> taskMap;
final BuiltMap<String?, ClientEntity?> clientMap;
final BuiltMap<String, TaskEntity> taskMap;
final BuiltMap<String, ClientEntity> clientMap;
final ListUIState listState;
final String? filter;
final bool isLoading;

2
lib/ui/task/task_screen_vm.dart
View File

@ -40,7 +40,7 @@ class TaskScreenVM {
final bool isInMultiselect;
final UserCompanyEntity? userCompany;
final List<String> taskList;
final BuiltMap<String?, TaskEntity?> taskMap;
final BuiltMap<String, TaskEntity> taskMap;
static TaskScreenVM fromStore(Store<AppState> store) {
final state = store.state;

8
lib/ui/transaction/transaction_list_vm.dart
View File

@ -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<String> transactionList;
final BuiltMap<String?, TransactionEntity?> transactionMap;
final BuiltMap<String, TransactionEntity> transactionMap;
final ListUIState listState;
final String? filter;
final bool isLoading;

2
lib/ui/transaction/transaction_screen_vm.dart
View File

@ -39,7 +39,7 @@ class TransactionScreenVM {
final UserCompanyEntity? userCompany;
final List<String> transactionList;
final Function(BuildContext, List<BaseEntity>, EntityAction) onEntityAction;
final BuiltMap<String?, TransactionEntity?> transactionMap;
final BuiltMap<String, TransactionEntity> transactionMap;
static TransactionScreenVM fromStore(Store<AppState> store) {
final state = store.state;

Some files were not shown because too many files have changed in this diff Show More