Actually set the RiR value in the logs

Author: rolandgeider

lib/models/workouts/log.dart

@@ -22,6 +22,7 @@ import 'package:wger/helpers/json.dart';
 import 'package:wger/helpers/misc.dart';
 import 'package:wger/models/exercises/exercise.dart';
 import 'package:wger/models/workouts/repetition_unit.dart';
+import 'package:wger/models/workouts/set_config_data.dart';
 import 'package:wger/models/workouts/weight_unit.dart';
 
 part 'log.g.dart';
@@ -101,6 +102,24 @@ class Log {
 
   Log.empty();
 
+  Log.fromSetConfigData(SetConfigData data) {
+    date = DateTime.now();
+    sessionId = null;
+    slotEntryId = data.slotEntryId;
+    exerciseBase = data.exercise;
+
+    weight = data.weight;
+    weightTarget = data.weight;
+    weightUnit = data.weightUnit;
+
+    repetitions = data.repetitions;
+    repetitionsTarget = data.repetitions;
+    repetitionUnit = data.repetitionsUnit;
+
+    rir = data.rir;
+    rirTarget = data.rir;
+  }
+
   // Boilerplate
   factory Log.fromJson(Map<String, dynamic> json) => _$LogFromJson(json);
 

lib/models/workouts/slot_entry.dart

@@ -43,7 +43,7 @@ enum ConfigType {
 class SlotEntry {
   /// Allowed RiR values. This list must be kept in sync with RIR_OPTIONS in the
   /// wger server
-  static const POSSIBLE_RIR_VALUES = ['', '0', '0.5', '1', '1.5', '2', '2.5', '3', '3.5', '4'];
+  static const POSSIBLE_RIR_VALUES = ['', 0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5];
   static const DEFAULT_RIR = '';
 
   @JsonKey(required: true, includeToJson: false)

lib/widgets/routines/forms/rir.dart

@@ -30,7 +30,7 @@ class RiRInputWidget extends StatefulWidget {
   static const SLIDER_START = -0.5;
 
   RiRInputWidget(this._initialValue, {required this.onChanged}) {
-    dropdownValue = _initialValue != null ? _initialValue.toString() : SlotEntry.DEFAULT_RIR;
+    dropdownValue = _initialValue != null ? _initialValue!.toString() : SlotEntry.DEFAULT_RIR;
 
     // Read string RiR into a double
     if (_initialValue != null) {
@@ -50,20 +50,23 @@ class _RiRInputWidgetState extends State<RiRInputWidget> {
     if (value < 0) {
       return AppLocalizations.of(context).rirNotUsed;
     }
+    if (value > 4) {
+      return '4+ ${AppLocalizations.of(context).rir}';
+    }
     return '$value ${AppLocalizations.of(context).rir}';
   }
 
   String mapDoubleToAllowedRir(double value) {
     if (value < 0) {
       return '';
-    } else {
-      // The representation is different (3.0 -> 3) we are on an int, round
-      if (value.toInt() < value) {
-        return value.toString();
-      } else {
-        return value.toInt().toString();
-      }
     }
+
+    // The representation is different (3.0 -> 3) we are on an int, round
+    if (value.toInt() < value) {
+      return value.toString();
+    }
+
+    return value.toInt().toString();
   }
 
   @override

lib/widgets/routines/gym_mode/log_page.dart

@@ -28,7 +28,6 @@ import 'package:wger/models/workouts/log.dart';
 import 'package:wger/models/workouts/routine.dart';
 import 'package:wger/models/workouts/set_config_data.dart';
 import 'package:wger/models/workouts/slot_data.dart';
-import 'package:wger/models/workouts/slot_entry.dart';
 import 'package:wger/providers/routines.dart';
 import 'package:wger/widgets/core/core.dart';
 import 'package:wger/widgets/core/progress_indicator.dart';
@@ -45,7 +44,7 @@ class LogPage extends StatefulWidget {
   final Routine _workoutPlan;
   final double _ratioCompleted;
   final Map<Exercise, int> _exercisePages;
-  final Log _log = Log.empty();
+  late Log _log;
   final int _iteration;
 
   LogPage(
@@ -58,18 +57,9 @@ class LogPage extends StatefulWidget {
     this._exercisePages,
     this._iteration,
   ) {
-    _log.date = DateTime.now();
-    _log.sessionId = null;
+    _log = Log.fromSetConfigData(_configData);
     _log.routineId = _workoutPlan.id!;
-    _log.exerciseBase = _exercise;
-    _log.weightUnit = _configData.weightUnit;
-    _log.weightTarget = _configData.weight;
-    _log.repetitionUnit = _configData.repetitionsUnit;
-    _log.repetitionsTarget = _configData.repetitions;
-    _log.rir = _configData.rir;
-    _log.rirTarget = _configData.rir;
     _log.iteration = _iteration;
-    _log.slotEntryId = _configData.slotEntryId;
   }
 
   @override
@@ -78,7 +68,6 @@ class LogPage extends StatefulWidget {
 
 class _LogPageState extends State<LogPage> {
   final _form = GlobalKey<FormState>();
-  String rirValue = SlotEntry.DEFAULT_RIR;
   final _repetitionsController = TextEditingController();
   final _weightController = TextEditingController();
   var _detailed = false;
@@ -275,7 +264,13 @@ class _LogPageState extends State<LogPage> {
           if (_detailed)
             RiRInputWidget(
               widget._log.rir,
-              onChanged: (v) => {},
+              onChanged: (value) {
+                if (value == '') {
+                  widget._log.rir = null;
+                } else {
+                  widget._log.rir = num.parse(value);
+                }
+              },
             ),
           SwitchListTile(
             title: Text(AppLocalizations.of(context).setUnitsAndRir),