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

Added Profit and Loss report

This commit is contained in:
Gianfranco Gasbarri 2020-03-19 21:58:17 +00:00
parent 4f8dcc61f8
commit 0406053d08
3 changed files with 241 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
lib/ui/reports/profit_loss_report.dart Normal file
View File

@ -0,0 +1,227 @@
import 'package:built_collection/built_collection.dart';
import 'package:invoiceninja_flutter/utils/enums.dart';
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/data/models/company_model.dart';
import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/redux/reports/reports_state.dart';
import 'package:invoiceninja_flutter/redux/static/static_state.dart';
import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart';
import 'package:memoize/memoize.dart';
enum ProfitAndLossReportFields {
client,
client_address1,
client_address2,
client_shipping_address1,
client_shipping_address2,
vendor,
vendor_city,
vendor_state,
vendor_country,
amount,
date
}
var memoizedProfitAndLossReport = memo8((
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) =>
profitAndLossReport(userCompany, reportsUIState, clientMap, paymentMap,
expenseMap, vendorMap, userMap, staticState));
ReportResult profitAndLossReport(
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
BuiltMap<String, ClientEntity> clientMap,
BuiltMap<String, PaymentEntity> paymentMap,
BuiltMap<String, ExpenseEntity> expenseMap,
BuiltMap<String, VendorEntity> vendorMap,
BuiltMap<String, UserEntity> userMap,
StaticState staticState,
) {
final List<List<ReportElement>> data = [];
BuiltList<ProfitAndLossReportFields> columns;
final reportSettings = userCompany.settings.reportSettings;
final profitAndLossReportSettings =
reportSettings != null && reportSettings.containsKey(kReportProfitAndLoss)
? reportSettings[kReportProfitAndLoss]
: ReportSettingsEntity();
final defaultColumns = [
ProfitAndLossReportFields.amount,
ProfitAndLossReportFields.client,
ProfitAndLossReportFields.vendor,
ProfitAndLossReportFields.date,
];
if (profitAndLossReportSettings.columns.isNotEmpty) {
columns = BuiltList(profitAndLossReportSettings.columns
.map((e) => EnumUtils.fromString(ProfitAndLossReportFields.values, e))
.toList());
} else {
columns = BuiltList(defaultColumns);
}
for (var paymentId in paymentMap.keys) {
final payment = paymentMap[paymentId];
final client = clientMap[payment.clientId];
final vendor = vendorMap[payment.vendorId];
bool skip = false;
final List<ReportElement> row = [];
for (var column in columns) {
dynamic value = '';
switch (column) {
case ProfitAndLossReportFields.client:
value = client.displayName;
break;
case ProfitAndLossReportFields.client_address1:
value = client.address1;
break;
case ProfitAndLossReportFields.client_address2:
value = client.address2;
break;
case ProfitAndLossReportFields.client_shipping_address1:
value = client.shippingAddress1;
break;
case ProfitAndLossReportFields.client_shipping_address2:
value = client.shippingAddress2;
break;
case ProfitAndLossReportFields.vendor:
value = vendor?.listDisplayName;
break;
case ProfitAndLossReportFields.vendor_city:
value = vendor?.city;
break;
case ProfitAndLossReportFields.vendor_state:
value = vendor?.state;
break;
case ProfitAndLossReportFields.vendor_country:
value = staticState.countryMap[vendor?.countryId];
break;
case ProfitAndLossReportFields.amount:
value = payment.amount;
break;
case ProfitAndLossReportFields.date:
value = payment.date;
break;
}
if (!ReportResult.matchField(
value: value,
userCompany: userCompany,
reportsUIState: reportsUIState,
column: EnumUtils.parse(column),
)) {
skip = true;
}
if (value.runtimeType == bool) {
row.add(payment.getReportBool(value: value));
} else if (value.runtimeType == double || value.runtimeType == int) {
row.add(payment.getReportNumber(
value: value, currencyId: client.settings.currencyId));
} else {
row.add(payment.getReportString(value: value));
}
}
if (!skip) {
data.add(row);
}
}
for (var expenseId in expenseMap.keys) {
final expense = expenseMap[expenseId];
final client = clientMap[expense.clientId];
final vendor = vendorMap[expense.vendorId];
bool skip = false;
final List<ReportElement> row = [];
for (var column in columns) {
dynamic value = '';
switch (column) {
case ProfitAndLossReportFields.client:
value = client.displayName;
break;
case ProfitAndLossReportFields.client_address1:
value = client.address1;
break;
case ProfitAndLossReportFields.client_address2:
value = client.address2;
break;
case ProfitAndLossReportFields.client_shipping_address1:
value = client.shippingAddress1;
break;
case ProfitAndLossReportFields.client_shipping_address2:
value = client.shippingAddress2;
break;
case ProfitAndLossReportFields.vendor:
value = vendor.listDisplayName;
break;
case ProfitAndLossReportFields.vendor_city:
value = vendor?.city;
break;
case ProfitAndLossReportFields.vendor_state:
value = vendor?.state;
break;
case ProfitAndLossReportFields.vendor_country:
value = staticState.countryMap[vendor?.countryId];
break;
case ProfitAndLossReportFields.amount:
value = -expense.amount;
break;
case ProfitAndLossReportFields.date:
value = expense.expenseDate;
break;
}
if (!ReportResult.matchField(
value: value,
userCompany: userCompany,
reportsUIState: reportsUIState,
column: EnumUtils.parse(column),
)) {
skip = true;
}
if (value.runtimeType == bool) {
row.add(expense.getReportBool(value: value));
} else if (value.runtimeType == double || value.runtimeType == int) {
row.add(expense.getReportNumber(
value: value, currencyId: client.settings.currencyId));
} else {
row.add(expense.getReportString(value: value));
}
}
if (!skip) {
data.add(row);
}
}
final selectedColumns = columns.map((item) => EnumUtils.parse(item)).toList();
data.sort((rowA, rowB) => sortReportTableRows(
rowA, rowB, profitAndLossReportSettings, selectedColumns));
return ReportResult(
allColumns: ProfitAndLossReportFields.values
.map((e) => EnumUtils.parse(e))
.toList(),
columns: columns.map((item) => EnumUtils.parse(item)).toList(),
defaultColumns:
defaultColumns.map((item) => EnumUtils.parse(item)).toList(),
data: data,
);
}

2
lib/ui/reports/reports_screen.dart
View File

@ -159,7 +159,7 @@ class ReportsScreen extends StatelessWidget {
kReportInvoice,
kReportPayment,
//kReportProduct,
//kReportProfitAndLoss,
kReportProfitAndLoss,
//kReportTask,
kReportTaxRate,
kReportQuote,

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

@ -19,6 +19,7 @@ import 'package:invoiceninja_flutter/ui/reports/expense_report.dart';
import 'package:invoiceninja_flutter/ui/reports/invoice_report.dart';
import 'package:invoiceninja_flutter/ui/reports/payment_report.dart';
import 'package:invoiceninja_flutter/ui/reports/product_report.dart';
import 'package:invoiceninja_flutter/ui/reports/profit_loss_report.dart';
import 'package:invoiceninja_flutter/ui/reports/quote_report.dart';
import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart';
import 'package:invoiceninja_flutter/ui/reports/task_report.dart';
@ -208,6 +209,18 @@ class ReportsScreenVM {
state.staticState,
);
break;
case kReportProfitAndLoss:
reportResult = memoizedProfitAndLossReport(
state.userCompany,
state.uiState.reportsUIState,
state.clientState.map,
state.paymentState.map,
state.expenseState.map,
state.vendorState.map,
state.userState.map,
state.staticState,
);
break;
default:
reportResult = memoizedClientReport(
state.userCompany,