mirror of
https://github.com/wger-project/flutter.git
synced 2026-02-18 00:17:48 +01:00
Add target fields to workout log
This commit is contained in:
@@ -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,
|
||||
});
|
||||
|
||||
@@ -14,8 +14,10 @@ Log _$LogFromJson(Map<String, dynamic> json) {
|
||||
'exercise',
|
||||
'routine',
|
||||
'reps',
|
||||
'reps_target',
|
||||
'repetition_unit',
|
||||
'weight',
|
||||
'weight_target',
|
||||
'weight_unit',
|
||||
'date'
|
||||
],
|
||||
@@ -25,9 +27,12 @@ Log _$LogFromJson(Map<String, dynamic> 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<String, dynamic> _$LogToJson(Log instance) => <String, dynamic>{
|
||||
'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),
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user