Merge branch 'develop'

invoiceninja · May 19, 2024 · 9b3ab7a · 9b3ab7a
2 parents 8d4a37a + aa52e41
commit 9b3ab7a
Show file tree

Hide file tree

Showing 17 changed files with 564 additions and 331 deletions.
diff --git a/lib/data/models/company_model.dart b/lib/data/models/company_model.dart
@@ -1456,23 +1456,21 @@ abstract class RegistrationFieldEntity
 abstract class DashboardField
     implements Built<DashboardField, DashboardFieldBuilder> {
   factory DashboardField({
-    String? field,
-    String? period,
-    String? type,
+    required String field,
+    required String period,
+    String? calculate,
+    String? format,
   }) {
     return _$DashboardField._(
-      field: field ?? '',
-      period: period ?? '',
-      type: type ?? TYPE_SUM,
+      field: field,
+      period: period,
+      calculate: calculate ?? DashboardUISettings.CALCULATE_SUM,
+      format: format ?? DashboardUISettings.FORMAT_MONEY,
     );
   }
 
   DashboardField._();
 
-  static const TYPE_SUM = 'sum';
-  static const TYPE_COUNT = 'count';
-  static const TYPE_AVERAGE = 'average';
-
   @override
   @memoized
   int get hashCode;
@@ -1481,11 +1479,23 @@ abstract class DashboardField
 
   String get period;
 
-  String get type;
+  String get format;
+
+  String get calculate;
+
+  bool get isTimeFormat => format == DashboardUISettings.FORMAT_TIME;
+
+  bool get isSumCalculate => calculate == DashboardUISettings.CALCULATE_SUM;
+
+  bool get isAverageCalculate =>
+      calculate == DashboardUISettings.CALCULATE_AVERAGE;
+
+  bool get isCountCalculate => calculate == DashboardUISettings.CALCULATE_COUNT;
 
   // ignore: unused_element
-  static void _initializeBuilder(DashboardFieldBuilder builder) =>
-      builder..type = TYPE_SUM;
+  static void _initializeBuilder(DashboardFieldBuilder builder) => builder
+    ..format = DashboardUISettings.FORMAT_MONEY
+    ..calculate = DashboardUISettings.CALCULATE_SUM;
 
   static Serializer<DashboardField> get serializer =>
       _$dashboardFieldSerializer;

diff --git a/lib/data/models/company_model.g.dart b/lib/data/models/company_model.g.dart
diff --git a/lib/redux/app/app_actions.dart b/lib/redux/app/app_actions.dart
@@ -104,10 +104,6 @@ class UpdateLastHistory implements PersistUI {
   final int page;
 }
 
-class DismissFlutterWebWarning implements PersistUI {}
-
-class DismissFlutterWebWarningPermanently implements PersistUI, PersistPrefs {}
-
 class DismissGatewayWarningPermanently implements PersistUI, PersistPrefs {}
 
 class DismissReviewAppPermanently implements PersistUI, PersistPrefs {}

diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
@@ -197,6 +197,10 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
   bool get showTwoYearReviewApp =>
       !prefState.hideTwoYearReviewApp && company.daysActive > 730;
 
+  Color get greyColor => prefState.enableDarkMode
+      ? convertHexStringToColor('#AAAAAA')!
+      : convertHexStringToColor('#666666')!;
+
   Color? get linkColor => prefState.enableDarkMode
       ? convertHexStringToColor('#FFFFFF')
       : accentColor;