From 003be07a030f8754bf2341d40bed6fba2a578527 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 15 Aug 2022 13:24:27 +0300 Subject: [PATCH] Dashboard overview --- lib/data/models/company_model.dart | 5 ++++ lib/data/models/company_model.g.dart | 33 +++++++++++++++++++++++++- lib/ui/dashboard/dashboard_panels.dart | 1 + 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/lib/data/models/company_model.dart b/lib/data/models/company_model.dart index 5b05610e5..b13bfaa60 100644 --- a/lib/data/models/company_model.dart +++ b/lib/data/models/company_model.dart @@ -16,6 +16,7 @@ import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; import 'package:invoiceninja_flutter/data/models/system_log_model.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/dashboard/dashboard_state.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; @@ -1013,6 +1014,10 @@ abstract class UserSettingsEntity @BuiltValueField(wireName: 'accent_color') String get accentColor; + @nullable + @BuiltValueField(wireName: 'dashboard_settings') + DashboardUISettings get dashboardSettings; + @BuiltValueField(wireName: 'table_columns') BuiltMap> get tableColumns; diff --git a/lib/data/models/company_model.g.dart b/lib/data/models/company_model.g.dart index ade658c7c..67efc2a19 100644 --- a/lib/data/models/company_model.g.dart +++ b/lib/data/models/company_model.g.dart @@ -1189,6 +1189,13 @@ class _$UserSettingsEntitySerializer ..add(serializers.serialize(value, specifiedType: const FullType(String))); } + value = object.dashboardSettings; + if (value != null) { + result + ..add('dashboard_settings') + ..add(serializers.serialize(value, + specifiedType: const FullType(DashboardUISettings))); + } return result; } @@ -1208,6 +1215,11 @@ class _$UserSettingsEntitySerializer result.accentColor = serializers.deserialize(value, specifiedType: const FullType(String)) as String; break; + case 'dashboard_settings': + result.dashboardSettings.replace(serializers.deserialize(value, + specifiedType: const FullType(DashboardUISettings)) + as DashboardUISettings); + break; case 'table_columns': result.tableColumns.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltMap, const [ @@ -3553,6 +3565,8 @@ class _$UserSettingsEntity extends UserSettingsEntity { @override final String accentColor; @override + final DashboardUISettings dashboardSettings; + @override final BuiltMap> tableColumns; @override final BuiltMap reportSettings; @@ -3567,6 +3581,7 @@ class _$UserSettingsEntity extends UserSettingsEntity { _$UserSettingsEntity._( {this.accentColor, + this.dashboardSettings, this.tableColumns, this.reportSettings, this.numberYearsActive, @@ -3596,6 +3611,7 @@ class _$UserSettingsEntity extends UserSettingsEntity { if (identical(other, this)) return true; return other is UserSettingsEntity && accentColor == other.accentColor && + dashboardSettings == other.dashboardSettings && tableColumns == other.tableColumns && reportSettings == other.reportSettings && numberYearsActive == other.numberYearsActive && @@ -3607,7 +3623,11 @@ class _$UserSettingsEntity extends UserSettingsEntity { int get hashCode { return __hashCode ??= $jf($jc( $jc( - $jc($jc($jc(0, accentColor.hashCode), tableColumns.hashCode), + $jc( + $jc( + $jc($jc(0, accentColor.hashCode), + dashboardSettings.hashCode), + tableColumns.hashCode), reportSettings.hashCode), numberYearsActive.hashCode), includeDeletedClients.hashCode)); @@ -3617,6 +3637,7 @@ class _$UserSettingsEntity extends UserSettingsEntity { String toString() { return (newBuiltValueToStringHelper('UserSettingsEntity') ..add('accentColor', accentColor) + ..add('dashboardSettings', dashboardSettings) ..add('tableColumns', tableColumns) ..add('reportSettings', reportSettings) ..add('numberYearsActive', numberYearsActive) @@ -3633,6 +3654,12 @@ class UserSettingsEntityBuilder String get accentColor => _$this._accentColor; set accentColor(String accentColor) => _$this._accentColor = accentColor; + DashboardUISettingsBuilder _dashboardSettings; + DashboardUISettingsBuilder get dashboardSettings => + _$this._dashboardSettings ??= new DashboardUISettingsBuilder(); + set dashboardSettings(DashboardUISettingsBuilder dashboardSettings) => + _$this._dashboardSettings = dashboardSettings; + MapBuilder> _tableColumns; MapBuilder> get tableColumns => _$this._tableColumns ??= new MapBuilder>(); @@ -3663,6 +3690,7 @@ class UserSettingsEntityBuilder final $v = _$v; if ($v != null) { _accentColor = $v.accentColor; + _dashboardSettings = $v.dashboardSettings?.toBuilder(); _tableColumns = $v.tableColumns.toBuilder(); _reportSettings = $v.reportSettings.toBuilder(); _numberYearsActive = $v.numberYearsActive; @@ -3690,6 +3718,7 @@ class UserSettingsEntityBuilder _$result = _$v ?? new _$UserSettingsEntity._( accentColor: accentColor, + dashboardSettings: _dashboardSettings?.build(), tableColumns: tableColumns.build(), reportSettings: reportSettings.build(), numberYearsActive: BuiltValueNullFieldError.checkNotNull( @@ -3701,6 +3730,8 @@ class UserSettingsEntityBuilder } catch (_) { String _$failedField; try { + _$failedField = 'dashboardSettings'; + _dashboardSettings?.build(); _$failedField = 'tableColumns'; tableColumns.build(); _$failedField = 'reportSettings'; diff --git a/lib/ui/dashboard/dashboard_panels.dart b/lib/ui/dashboard/dashboard_panels.dart index 8d393fb68..286451e24 100644 --- a/lib/ui/dashboard/dashboard_panels.dart +++ b/lib/ui/dashboard/dashboard_panels.dart @@ -203,6 +203,7 @@ class DashboardPanels extends StatelessWidget { void _showSettings() { showDialog( context: context, + barrierDismissible: false, builder: (BuildContext context) { return _DashboardSettings( isWide: isWide,