This commit is contained in:
Hillel Coren 2020-12-02 14:48:54 +02:00
parent 16fb9954a8
commit 59e1209856
11 changed files with 11 additions and 0 deletions

View File

@ -96,6 +96,7 @@ ReportResult clientReport(
if (clientReportSettings.columns.isNotEmpty) { if (clientReportSettings.columns.isNotEmpty) {
columns = BuiltList(clientReportSettings.columns columns = BuiltList(clientReportSettings.columns
.map((e) => EnumUtils.fromString(ClientReportFields.values, e)) .map((e) => EnumUtils.fromString(ClientReportFields.values, e))
.where((element) => element != null)
.toList()); .toList());
} else { } else {
columns = BuiltList(defaultColumns); columns = BuiltList(defaultColumns);

View File

@ -85,6 +85,7 @@ ReportResult creditReport(
if (creditReportSettings.columns.isNotEmpty) { if (creditReportSettings.columns.isNotEmpty) {
columns = BuiltList(creditReportSettings.columns columns = BuiltList(creditReportSettings.columns
.map((e) => EnumUtils.fromString(CreditReportFields.values, e)) .map((e) => EnumUtils.fromString(CreditReportFields.values, e))
.where((element) => element != null)
.toList()); .toList());
} else { } else {
columns = BuiltList(defaultColumns); columns = BuiltList(defaultColumns);

View File

@ -82,6 +82,7 @@ ReportResult documentReport(
if (documentReportSettings.columns.isNotEmpty) { if (documentReportSettings.columns.isNotEmpty) {
columns = BuiltList(documentReportSettings.columns columns = BuiltList(documentReportSettings.columns
.map((e) => EnumUtils.fromString(DocumentReportFields.values, e)) .map((e) => EnumUtils.fromString(DocumentReportFields.values, e))
.where((element) => element != null)
.toList()); .toList());
} else { } else {
columns = BuiltList(defaultColumns); columns = BuiltList(defaultColumns);

View File

@ -76,6 +76,7 @@ ReportResult expenseReport(
if (expenseReportSettings.columns.isNotEmpty) { if (expenseReportSettings.columns.isNotEmpty) {
columns = BuiltList(expenseReportSettings.columns columns = BuiltList(expenseReportSettings.columns
.map((e) => EnumUtils.fromString(ExpenseReportFields.values, e)) .map((e) => EnumUtils.fromString(ExpenseReportFields.values, e))
.where((element) => element != null)
.toList()); .toList());
} else { } else {
columns = BuiltList(defaultColumns); columns = BuiltList(defaultColumns);

View File

@ -93,6 +93,7 @@ ReportResult invoiceReport(
if (invoiceReportSettings.columns.isNotEmpty) { if (invoiceReportSettings.columns.isNotEmpty) {
columns = BuiltList(invoiceReportSettings.columns columns = BuiltList(invoiceReportSettings.columns
.map((e) => EnumUtils.fromString(InvoiceReportFields.values, e)) .map((e) => EnumUtils.fromString(InvoiceReportFields.values, e))
.where((element) => element != null)
.toList()); .toList());
} else { } else {
columns = BuiltList(defaultColumns); columns = BuiltList(defaultColumns);

View File

@ -67,6 +67,7 @@ ReportResult lineItemReport(
if (lineItemReportSettings.columns.isNotEmpty) { if (lineItemReportSettings.columns.isNotEmpty) {
columns = BuiltList(lineItemReportSettings.columns columns = BuiltList(lineItemReportSettings.columns
.map((e) => EnumUtils.fromString(LineItemReportFields.values, e)) .map((e) => EnumUtils.fromString(LineItemReportFields.values, e))
.where((element) => element != null)
.toList()); .toList());
} else { } else {
columns = BuiltList(defaultColumns); columns = BuiltList(defaultColumns);

View File

@ -68,6 +68,7 @@ ReportResult paymentReport(
if (paymentReportSettings.columns.isNotEmpty) { if (paymentReportSettings.columns.isNotEmpty) {
columns = BuiltList(paymentReportSettings.columns columns = BuiltList(paymentReportSettings.columns
.map((e) => EnumUtils.fromString(PaymentReportFields.values, e)) .map((e) => EnumUtils.fromString(PaymentReportFields.values, e))
.where((element) => element != null)
.toList()); .toList());
} else { } else {
columns = BuiltList(defaultColumns); columns = BuiltList(defaultColumns);

View File

@ -61,6 +61,7 @@ ReportResult productReport(
if (productReportSettings.columns.isNotEmpty) { if (productReportSettings.columns.isNotEmpty) {
columns = BuiltList(productReportSettings.columns columns = BuiltList(productReportSettings.columns
.map((e) => EnumUtils.fromString(ProductReportFields.values, e)) .map((e) => EnumUtils.fromString(ProductReportFields.values, e))
.where((element) => element != null)
.toList()); .toList());
} else { } else {
columns = BuiltList(defaultColumns); columns = BuiltList(defaultColumns);

View File

@ -64,6 +64,7 @@ ReportResult profitAndLossReport(
if (profitAndLossReportSettings.columns.isNotEmpty) { if (profitAndLossReportSettings.columns.isNotEmpty) {
columns = BuiltList(profitAndLossReportSettings.columns columns = BuiltList(profitAndLossReportSettings.columns
.map((e) => EnumUtils.fromString(ProfitAndLossReportFields.values, e)) .map((e) => EnumUtils.fromString(ProfitAndLossReportFields.values, e))
.where((element) => element != null)
.toList()); .toList());
} else { } else {
columns = BuiltList(defaultColumns); columns = BuiltList(defaultColumns);

View File

@ -85,6 +85,7 @@ ReportResult quoteReport(
if (quoteReportSettings.columns.isNotEmpty) { if (quoteReportSettings.columns.isNotEmpty) {
columns = BuiltList(quoteReportSettings.columns columns = BuiltList(quoteReportSettings.columns
.map((e) => EnumUtils.fromString(QuoteReportFields.values, e)) .map((e) => EnumUtils.fromString(QuoteReportFields.values, e))
.where((element) => element != null)
.toList()); .toList());
} else { } else {
columns = BuiltList(defaultColumns); columns = BuiltList(defaultColumns);

View File

@ -64,6 +64,7 @@ ReportResult taxRateReport(
if (taxRateReportSettings.columns.isNotEmpty) { if (taxRateReportSettings.columns.isNotEmpty) {
columns = BuiltList(taxRateReportSettings.columns columns = BuiltList(taxRateReportSettings.columns
.map((e) => EnumUtils.fromString(TaxRateReportFields.values, e)) .map((e) => EnumUtils.fromString(TaxRateReportFields.values, e))
.where((element) => element != null)
.toList()); .toList());
} else { } else {
columns = BuiltList(defaultColumns); columns = BuiltList(defaultColumns);