We are getting there, first successful code generation #269

Some things to tackle: IsarLinks.findAll() and finalizeActivity
TrackMyIndoorWorkout · Feb 24, 2023 · f891915 · f891915
1 parent 1259622
commit f891915
Show file tree

Hide file tree

Showing 37 changed files with 10,856 additions and 915 deletions.
diff --git a/lib/devices/gadgets/fitness_equipment.dart b/lib/devices/gadgets/fitness_equipment.dart
@@ -476,6 +476,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
     _activity = activity;
     lastRecord = RecordWithSport.getZero(sport);
     if (Get.isRegistered<Isar>()) {
+      await activity.records.load();
       final lastRecord = activity.records.findAll().last();
       continuationRecord = lastRecord ?? RecordWithSport.getZero(sport);
       continuation = continuationRecord.hasCumulative();
@@ -855,7 +856,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
           if (Get.isRegistered<Isar>()) {
             final database = Get.find<Isar>();
             database.writeTxnSync(() async {
-              database.activitys.putSync(_activity);
+              database.activitys.putSync(_activity!);
             });
           }
         }

diff --git a/lib/import/csv_importer.dart b/lib/import/csv_importer.dart
@@ -8,6 +8,7 @@ import '../devices/device_descriptors/schwinn_ac_performance_plus.dart';
 import '../devices/device_factory.dart';
 import '../devices/device_fourcc.dart';
 import '../persistence/isar/activity.dart';
+import '../persistence/isar/db_utils.dart';
 import '../persistence/isar/record.dart';
 import '../preferences/athlete_age.dart';
 import '../preferences/athlete_body_weight.dart';
@@ -474,7 +475,7 @@ class CSVImporter with PowerSpeedMixin {
       }
     } else {
       DeviceDescriptor device = DeviceFactory.getDescriptorForFourCC(schwinnACPerfPlusFourCC);
-      final factors = await database.getFactors(deviceId);  // TODO
+      final factors = await DbUtils.getFactors(deviceId);
       fourCC = device.fourCC;
       deviceName = deviceNamePrefixes[fourCC]![0];
       sport = device.sport;

diff --git a/lib/main.dart b/lib/main.dart
@@ -2,9 +2,15 @@ import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
 import 'package:isar/isar.dart';
 import 'package:package_info_plus/package_info_plus.dart';
-import 'devices/company_registry.dart';
 import 'track_my_indoor_exercise_app.dart';
+import 'devices/company_registry.dart';
+import 'persistence/isar/activity.dart';
+import 'persistence/isar/calorie_tune.dart';
+import 'persistence/isar/device_usage.dart';
+import 'persistence/isar/power_tune.dart';
 import 'ui/models/advertisement_cache.dart';
+import 'persistence/isar/record.dart';
+import 'persistence/isar/workout_summary.dart';
 import 'utils/init_preferences.dart';
 import 'utils/logging.dart';
 

diff --git a/lib/persistence/floor/database.g.dart b/lib/persistence/floor/database.g.dart
diff --git a/lib/persistence/isar/activity.dart b/lib/persistence/isar/activity.dart
@@ -10,7 +10,7 @@ import '../../../utils/display.dart' as display;
 import 'record.dart';
 import 'workout_summary.dart';
 
-part 'record.g.dart';
+part 'activity.g.dart';
 
 const activitiesTableName = 'activities';
 
@@ -47,7 +47,7 @@ class Activity {
   int trainingPeaksWorkoutId;
   int trainingPeaksAthleteId;
 
-  final record = IsarLinks<Record>();
+  final records = IsarLinks<Record>();
 
   @ignore
   DateTime? startDateTime;