[#148] [NF] Chart for Accounts. Limit scope

lyskouski · Aug 21, 2023 · 41e5bf6 · 41e5bf6
1 parent b884f1c
commit 41e5bf6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/lib/_classes/storage/data_handler.dart b/lib/_classes/storage/data_handler.dart
@@ -41,10 +41,11 @@ class DataHandler {
     return result;
   }
 
-  static List<OhlcData> generateOhlcSummary(List<List<TransactionLogData>?> scope, {required Exchange exchange}) {
+  static List<OhlcData> generateOhlcSummary(List<List<TransactionLogData>?> scope,
+      {required Exchange exchange, DateTime? cut}) {
     final data = scope.firstOrNull;
     for (int i = 1; i < scope.length; i++) {
-      data!.addAll(scope[i]!);
+      data!.addAll(scope[i]!.where((e) => cut == null || e.timestamp.isAfter(cut)));
     }
     if (data != null && data.isNotEmpty) {
       data.sort((a, b) => a.timestamp.compareTo(b.timestamp));

diff --git a/lib/charts/ohlc_chart.dart b/lib/charts/ohlc_chart.dart
@@ -12,6 +12,7 @@ class OhlcChart extends StatefulWidget {
   final double width;
   final double height;
   final double indent;
+  final DateTime xMin;
   final String tooltip;
   final List<OhlcData> data;
 
@@ -20,6 +21,7 @@ class OhlcChart extends StatefulWidget {
     required this.data,
     required this.width,
     required this.height,
+    required this.xMin,
     this.indent = 0.0,
     this.tooltip = '',
   });
@@ -34,15 +36,14 @@ class OhlcChartState extends State<OhlcChart> {
     final now = DateTime.now();
     final size = Size(widget.width, widget.height);
     final bgColor = Theme.of(context).colorScheme.onBackground;
-    final xMin = DateTime(now.year, now.month - 5);
     final xMax = DateTime(now.year, now.month + 1);
     double yMin = 0.0;
     double yMax = 0.0;
     for (int i = 0; i < widget.data.length; i++) {
       if (widget.data[i].low < yMin) yMin = widget.data[i].low;
       if (widget.data[i].high > yMax) yMax = widget.data[i].high;
     }
-    yMax *= 1.2;
+    yMax *= 1.25;
     final bg = ForegroundChartPainter(
       size: size,
       color: bgColor,
@@ -51,7 +52,7 @@ class OhlcChartState extends State<OhlcChart> {
       yMin: yMin,
       yMax: yMax,
       xType: DateTime,
-      xMin: xMin,
+      xMin: widget.xMin,
       xMax: xMax,
       xDivider: 6,
       xTpl: DateFormat.Md(AppLocale.code),
@@ -67,7 +68,7 @@ class OhlcChartState extends State<OhlcChart> {
           size: size,
           data: widget.data,
           yMax: yMax,
-          xMin: xMin.microsecondsSinceEpoch.toDouble(),
+          xMin: widget.xMin.microsecondsSinceEpoch.toDouble(),
           xMax: xMax.microsecondsSinceEpoch.toDouble(),
         ),
         foregroundPainter: bg,

diff --git a/lib/widgets/metrics/account_tab.dart b/lib/widgets/metrics/account_tab.dart
@@ -23,6 +23,8 @@ class AccountTab extends StatelessWidget {
     final TextTheme textTheme = Theme.of(context).textTheme;
     double indent = ThemeHelper.getIndent();
     final exchange = Exchange(store: store);
+    final now = DateTime.now();
+    final xMin = DateTime(now.year, now.month - 5);
     return SingleChildScrollView(
       child: Padding(
         padding: EdgeInsets.all(indent * 2),
@@ -37,9 +39,11 @@ class AccountTab extends StatelessWidget {
               width: ThemeHelper.getWidth(context, 4),
               height: 200,
               indent: indent,
+              xMin: xMin,
               data: DataHandler.generateOhlcSummary(
                 store.getMultiLog(store.getList(AppDataType.accounts).cast<AccountAppData>()),
                 exchange: exchange,
+                cut: xMin,
               ),
             ),
           ],