Bugfix for metrics preview

App/lib/ui/blocs/care/patients.dart

@@ -62,6 +62,11 @@ class _PatientsState extends State<Patients> {
               final persons = snapshot.data as List<Person>;
               final cards = persons
                   .map((p) => Card(
+                        shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(0),
+                        ),
+                        shadowColor: Theme.of(context).colorScheme.shadow,
+                        elevation: 2,
                         child: Padding(
                           padding: const EdgeInsets.all(8.0),
                           child: Column(

App/lib/ui/blocs/metrics/metric_detail_page.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
-import 'package:helse/services/swagger/generated_code/swagger.swagger.dart';
-import 'package:helse/ui/blocs/calendar/calendar_view.dart';
-import 'package:helse/ui/blocs/metrics/metric_condensed.dart';
-import 'package:helse/ui/blocs/metrics/metric_graph.dart';
 
 import '../../../logic/d_i.dart';
 import '../../../logic/settings/ordered_item.dart';
+import '../../../services/swagger/generated_code/swagger.swagger.dart';
 import '../../common/date_range_input.dart';
 import '../../common/loader.dart';
+import '../calendar/calendar_view.dart';
+import 'metric_condensed.dart';
+import 'metric_graph.dart';
 
 class MetricDetailPage extends StatefulWidget {
   const MetricDetailPage({
@@ -34,12 +34,14 @@ class _MetricDetailPageState extends State<MetricDetailPage> {
   List<Metric> _metrics = [];
   List<Metric>? _allMetrics;
 
+  Future<List<Metric>?>? _dataFuture;
+
   @override
   void initState() {
     super.initState();
     var date = DateTimeRange(start: widget.date.start, end: widget.date.start.add(const Duration(days: 1)));
     _date = date;
-    _metrics = _filter(_metrics, date);
+    _dataFuture = _getData();
   }
 
   Future<List<Metric>?> _getData() async {
@@ -56,6 +58,8 @@ class _MetricDetailPageState extends State<MetricDetailPage> {
 
     _allMetrics = await DI.metric?.metrics(id, start, end, person: widget.person, simple: false);
 
+    _metrics = _filter(_allMetrics, date);
+
     return _allMetrics;
   }
 
@@ -67,7 +71,7 @@ class _MetricDetailPageState extends State<MetricDetailPage> {
         //child: DateRangeInput((x) => {}, date),
       ),
       body: FutureBuilder(
-          future: _getData(),
+          future: _dataFuture,
           builder: (ctx, snapshot) {
             // Checking if future is resolved
             if (snapshot.connectionState == ConnectionState.done) {
@@ -95,7 +99,14 @@ class _MetricDetailPageState extends State<MetricDetailPage> {
                           ? CalendarView(metrics, widget.date)
                           : Column(
                               children: [
-                                SizedBox(height: 80, child: WidgetGraph(widget.summary, widget.date, GraphKind.line, highlight: _date,)),
+                                SizedBox(
+                                    height: 80,
+                                    child: WidgetGraph(
+                                      widget.summary,
+                                      widget.date,
+                                      GraphKind.line,
+                                      highlight: _date,
+                                    )),
                                 Center(
                                   child: Padding(
                                     padding: const EdgeInsets.all(8.0),
@@ -123,14 +134,15 @@ class _MetricDetailPageState extends State<MetricDetailPage> {
   }
 
   void _setDate(DateTimeRange date) {
-    var metrics = _filter(_allMetrics ?? [], date);
+    var metrics = _filter(_allMetrics, date);
     setState(() {
       _date = date;
       _metrics = metrics;
     });
   }
 
-  List<Metric> _filter(List<Metric> metrics, DateTimeRange date) {
-    return metrics.where((metric) => (metric.date!.compareTo(date.start) >= 0 && metric.date!.compareTo(date.end) <= 0)).toList();
+  List<Metric> _filter(List<Metric>? metrics, DateTimeRange date) {
+    // TODO add first and last out of bound to make the graph better 
+    return metrics?.where((metric) => (metric.date!.compareTo(date.start) >= 0 && metric.date!.compareTo(date.end) <= 0)).toList() ?? [];
   }
 }

Backend/Api/Data/EventsContext.cs

@@ -316,10 +316,7 @@ public Task<bool> ExistsMetric(long person, string tag, Api.Models.FileTypes sou
     public async Task<Metric[]> GetSummaryMetrics(int tile, long id, int type, Api.Models.MetricSummary action, DateTime start, DateTime end)
     {
         // Use a manual command to use the SQL function NTILE
-        var groups = db.FromSql<ChunkedMetric>($"SELECT NTILE({tile}) OVER (ORDER BY date) as chunk,* FROM health.metric m")
-         .Where(x => x.PersonId == id
-                 && x.Type == type
-                 && x.Date <= end && x.Date >= start)
+        var groups = db.FromSql<ChunkedMetric>($"SELECT NTILE({tile}) OVER (ORDER BY date) as chunk,* FROM health.metric m WHERE m.PersonId = {id} AND m.Type = {type} AND m.Date <= {end} AND m.Date >= {start}")
          .AsSubQuery()
          .GroupBy(x => x.Chunk);