diff --git a/lib/models/workouts/log.dart b/lib/models/workouts/log.dart index a1f5d962..9a7e6358 100644 --- a/lib/models/workouts/log.dart +++ b/lib/models/workouts/log.dart @@ -39,11 +39,17 @@ class Log { @JsonKey(required: true, name: 'routine') late int routineId; + @JsonKey(required: false) + String? rir; + + @JsonKey(required: false, name: 'rir_target') + String? rirTarget; + @JsonKey(required: true) late int reps; - @JsonKey(required: false) - String? rir; + @JsonKey(required: true, name: 'reps_target') + late int? repsTarget; @JsonKey(required: true, name: 'repetition_unit') late int repetitionUnitId; @@ -54,6 +60,9 @@ class Log { @JsonKey(required: true, fromJson: stringToNum, toJson: numToString) late num weight; + @JsonKey(required: true, fromJson: stringToNum, toJson: numToString, name: 'weight_target') + late num? weightTarget; + @JsonKey(required: true, name: 'weight_unit') late int weightUnitId; @@ -71,9 +80,12 @@ class Log { required this.exerciseId, required this.routineId, required this.reps, - required this.rir, + this.repsTarget, required this.repetitionUnitId, + required this.rir, + this.rirTarget, required this.weight, + this.weightTarget, required this.weightUnitId, required this.date, }); diff --git a/lib/models/workouts/log.g.dart b/lib/models/workouts/log.g.dart index 1889a54e..c394bf6a 100644 --- a/lib/models/workouts/log.g.dart +++ b/lib/models/workouts/log.g.dart @@ -14,8 +14,10 @@ Log _$LogFromJson(Map json) { 'exercise', 'routine', 'reps', + 'reps_target', 'repetition_unit', 'weight', + 'weight_target', 'weight_unit', 'date' ], @@ -25,9 +27,12 @@ Log _$LogFromJson(Map json) { exerciseId: (json['exercise'] as num).toInt(), routineId: (json['routine'] as num).toInt(), reps: (json['reps'] as num).toInt(), - rir: json['rir'] as String?, + repsTarget: (json['reps_target'] as num?)?.toInt(), repetitionUnitId: (json['repetition_unit'] as num).toInt(), + rir: json['rir'] as String?, + rirTarget: json['rir_target'] as String?, weight: stringToNum(json['weight'] as String?), + weightTarget: stringToNum(json['weight_target'] as String?), weightUnitId: (json['weight_unit'] as num).toInt(), date: DateTime.parse(json['date'] as String), ); @@ -37,10 +42,13 @@ Map _$LogToJson(Log instance) => { 'id': instance.id, 'exercise': instance.exerciseId, 'routine': instance.routineId, - 'reps': instance.reps, 'rir': instance.rir, + 'rir_target': instance.rirTarget, + 'reps': instance.reps, + 'reps_target': instance.repsTarget, 'repetition_unit': instance.repetitionUnitId, 'weight': numToString(instance.weight), + 'weight_target': numToString(instance.weightTarget), 'weight_unit': instance.weightUnitId, 'date': dateToYYYYMMDD(instance.date), };