Use better conversion function, the (max) rest time can be null

This commit is contained in:
Roland Geider
2025-03-13 14:42:48 +01:00
parent a2ef3278fa
commit f8e4304a01
2 changed files with 5 additions and 5 deletions

View File

@@ -63,7 +63,7 @@ class SetConfigData {
@JsonKey(required: true, name: 'weight_rounding', fromJson: stringToNumNull)
late num? weightRounding;
@JsonKey(required: true, fromJson: stringToNumNull, name: 'repetitions')
@JsonKey(required: true, name: 'repetitions', fromJson: stringToNumNull)
late num? repetitions;
@JsonKey(required: true, name: 'max_repetitions', fromJson: stringToNumNull)
@@ -87,10 +87,10 @@ class SetConfigData {
@JsonKey(required: true)
late String? rpe;
@JsonKey(required: true, name: 'rest', fromJson: stringToNum)
@JsonKey(required: true, name: 'rest', fromJson: stringToNumNull)
late num? restTime;
@JsonKey(required: true, name: 'max_rest', fromJson: stringToNum)
@JsonKey(required: true, name: 'max_rest', fromJson: stringToNumNull)
late num? maxRestTime;
@JsonKey(required: true)

View File

@@ -53,8 +53,8 @@ SetConfigData _$SetConfigDataFromJson(Map<String, dynamic> json) {
rir: json['rir'] as String?,
maxRir: json['max_rir'] as String?,
rpe: json['rpe'] as String?,
restTime: stringToNum(json['rest'] as String?),
maxRestTime: stringToNum(json['max_rest'] as String?),
restTime: stringToNumNull(json['rest'] as String?),
maxRestTime: stringToNumNull(json['max_rest'] as String?),
comment: json['comment'] as String? ?? '',
textRepr: json['text_repr'] as String? ?? '',
);