Client/product documents
This commit is contained in:
parent
0763e9bc74
commit
e8d0ffbbb4
|
|
@ -1,4 +1,5 @@
|
|||
import 'package:built_collection/built_collection.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:invoiceninja_flutter/utils/enums.dart';
|
||||
import 'package:invoiceninja_flutter/constants.dart';
|
||||
import 'package:invoiceninja_flutter/data/models/document_model.dart';
|
||||
|
|
@ -7,6 +8,7 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
|
|||
import 'package:invoiceninja_flutter/redux/reports/reports_state.dart';
|
||||
import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart';
|
||||
import 'package:invoiceninja_flutter/utils/formatting.dart';
|
||||
import 'package:invoiceninja_flutter/utils/localization.dart';
|
||||
import 'package:memoize/memoize.dart';
|
||||
|
||||
enum DocumentReportFields {
|
||||
|
|
@ -59,6 +61,8 @@ ReportResult documentReport(
|
|||
final List<List<ReportElement>> data = [];
|
||||
BuiltList<DocumentReportFields> columns;
|
||||
|
||||
final localization =
|
||||
AppLocalization(AppLocalization.createLocale(Intl.defaultLocale));
|
||||
final reportSettings = userCompany.settings.reportSettings;
|
||||
final documentReportSettings =
|
||||
reportSettings != null && reportSettings.containsKey(kReportDocument)
|
||||
|
|
@ -120,6 +124,7 @@ ReportResult documentReport(
|
|||
userCompany: userCompany,
|
||||
reportsUIState: reportsUIState,
|
||||
column: EnumUtils.parse(column),
|
||||
localization: localization,
|
||||
)) {
|
||||
skip = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
|
|||
import 'package:flutter/widgets.dart';
|
||||
import 'package:flutter_redux/flutter_redux.dart';
|
||||
import 'package:flutter_typeahead/flutter_typeahead.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:invoiceninja_flutter/constants.dart';
|
||||
import 'package:invoiceninja_flutter/data/models/company_model.dart';
|
||||
import 'package:invoiceninja_flutter/data/models/dashboard_model.dart';
|
||||
|
|
@ -614,10 +613,11 @@ class ReportResult {
|
|||
final bool showTotals;
|
||||
|
||||
static bool matchField({
|
||||
String column,
|
||||
dynamic value,
|
||||
UserCompanyEntity userCompany,
|
||||
ReportsUIState reportsUIState,
|
||||
@required String column,
|
||||
@required dynamic value,
|
||||
@required UserCompanyEntity userCompany,
|
||||
@required ReportsUIState reportsUIState,
|
||||
AppLocalization localization,
|
||||
}) {
|
||||
if (reportsUIState.filters.containsKey(column)) {
|
||||
final filter = reportsUIState.filters[column];
|
||||
|
|
@ -647,8 +647,6 @@ class ReportResult {
|
|||
return false;
|
||||
}
|
||||
} else if (value.runtimeType == EntityType) {
|
||||
final localization = AppLocalization(
|
||||
AppLocalization.createLocale(Intl.defaultLocale));
|
||||
return filter == localization.lookup('$value');
|
||||
} else if (isValidDate(value)) {
|
||||
if (!ReportResult.matchDateTime(
|
||||
|
|
|
|||
Loading…
Reference in New Issue