Merge pull request #950 from wger-project/feature/day-type

Set day and set types

Author: rolandgeider

.github/actions/flutter-common/action.yml

@@ -9,7 +9,7 @@ runs:
       uses: subosito/flutter-action@v2
       with:
         channel: stable
-        flutter-version: 3.35.2
+        flutter-version: 3.35.5
         cache: true
 
     - name: Install Flutter dependencies

lib/l10n/app_en.arb

@@ -156,6 +156,25 @@
     "description": "Category for an exercise, ingredient, etc."
   },
   "startDate": "Start date",
+  "@startDate": {
+    "description": "The start date of a nutritional plan or routine"
+  },
+  "dayTypeCustom": "Custom",
+  "dayTypeEnom": "Every minute on the minute",
+  "dayTypeAmrap": "As many rounds as possible",
+  "dayTypeHiit": "High intensity interval training",
+  "dayTypeTabata": "Tabata",
+  "dayTypeEdt": "Escalating density training",
+  "dayTypeRft": "Rounds for time",
+  "dayTypeAfap": "As fast as possible",
+  "slotEntryTypeNormal": "Normal",
+  "slotEntryTypeDropset": "Dropset",
+  "slotEntryTypeMyo": "Myo",
+  "slotEntryTypePartial": "Partial",
+  "slotEntryTypeForced": "Forced",
+  "slotEntryTypeTut": "Time under Tension",
+  "slotEntryTypeIso": "Isometric hold",
+  "slotEntryTypeJump": "Jump",
   "routines": "Routines",
   "newRoutine": "New routine",
   "noRoutines": "You have no routines",
@@ -386,13 +405,9 @@
   "@date": {
     "description": "The date of a workout log or body weight entry"
   },
-  "creationDate": "Start date",
-  "@creationDate": {
-    "description": "The Start date of a nutritional plan"
-  },
   "endDate": "End date",
   "@endDate": {
-    "description": "The End date of a nutritional plan"
+    "description": "The End date of a nutritional plan or routine"
   },
   "openEnded": "Open ended",
   "@openEnded": {

lib/models/workouts/day.dart

@@ -17,10 +17,36 @@
  */
 
 import 'package:json_annotation/json_annotation.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/workouts/slot.dart';
 
 part 'day.g.dart';
 
+enum DayType { custom, enom, amrap, hiit, tabata, edt, rft, afap }
+
+extension DayTypeExtension on DayType {
+  String i18Label(AppLocalizations i18n) {
+    switch (this) {
+      case DayType.custom:
+        return i18n.dayTypeCustom;
+      case DayType.enom:
+        return i18n.dayTypeEnom;
+      case DayType.amrap:
+        return i18n.dayTypeAmrap;
+      case DayType.hiit:
+        return i18n.dayTypeHiit;
+      case DayType.tabata:
+        return i18n.dayTypeTabata;
+      case DayType.edt:
+        return i18n.dayTypeEdt;
+      case DayType.rft:
+        return i18n.dayTypeRft;
+      case DayType.afap:
+        return i18n.dayTypeAfap;
+    }
+  }
+}
+
 @JsonSerializable()
 class Day {
   static const MIN_LENGTH_NAME = 3;
@@ -39,48 +65,67 @@ class Day {
   @JsonKey(required: true)
   late String description;
 
+  @JsonKey(required: true)
+  late DayType type;
+
   @JsonKey(required: true, name: 'is_rest')
   late bool isRest;
 
   @JsonKey(required: true, name: 'need_logs_to_advance')
   late bool needLogsToAdvance;
 
-  @JsonKey(required: true)
-  late String type;
-
   @JsonKey(required: true)
   late num order;
 
   @JsonKey(required: true)
   late Object? config;
 
-  @JsonKey(required: false, defaultValue: [], includeFromJson: true, includeToJson: false)
+  @JsonKey(required: false, includeFromJson: true, includeToJson: false)
   List<Slot> slots = [];
 
   Day({
     this.id,
     required this.routineId,
     required this.name,
-    required this.description,
+    this.description = '',
     this.isRest = false,
     this.needLogsToAdvance = false,
-    this.type = 'custom',
-    this.order = 0,
-    this.config = null,
+    this.type = DayType.custom,
+    this.order = 1,
+    this.config,
     this.slots = const [],
   });
 
-  Day.empty() {
-    name = 'new day';
-    description = '';
-    type = 'custom';
-    isRest = false;
-    needLogsToAdvance = false;
-    order = 0;
-    config = {};
-    slots = [];
+  Day copyWith({
+    int? id,
+    int? routineId,
+    String? name,
+    String? description,
+    DayType? type,
+    bool? isRest,
+    bool? needLogsToAdvance,
+    num? order,
+    Object? config,
+    List<Slot>? slots,
+  }) {
+    return Day(
+      id: id ?? this.id,
+      routineId: routineId ?? this.routineId,
+      name: name ?? this.name,
+      description: description ?? this.description,
+      type: type ?? this.type,
+      isRest: isRest ?? this.isRest,
+      needLogsToAdvance: needLogsToAdvance ?? this.needLogsToAdvance,
+      order: order ?? this.order,
+      config: config ?? this.config,
+      slots: slots ?? this.slots,
+    );
   }
 
+  bool get isSpecialType => type != DayType.custom;
+
+  String get nameWithType => isSpecialType ? '${type.name.toUpperCase()} - $name' : name;
+
   // Boilerplate
   factory Day.fromJson(Map<String, dynamic> json) => _$DayFromJson(json);
 

lib/models/workouts/day.g.dart

@@ -21,6 +21,7 @@ import 'package:wger/helpers/consts.dart';
 import 'package:wger/helpers/json.dart';
 import 'package:wger/models/exercises/exercise.dart';
 import 'package:wger/models/workouts/repetition_unit.dart';
+import 'package:wger/models/workouts/slot_entry.dart';
 import 'package:wger/models/workouts/weight_unit.dart';
 
 part 'set_config_data.g.dart';
@@ -37,11 +38,13 @@ class SetConfigData {
   late int slotEntryId;
 
   @JsonKey(required: true)
-  late String type;
+  late SlotEntryType type;
 
   @JsonKey(required: true, name: 'text_repr')
   late String textRepr;
 
+  String get textReprWithType => '$textRepr${type.typeLabel}';
+
   @JsonKey(required: true, name: 'sets')
   late num? nrOfSets;
 
@@ -99,17 +102,17 @@ class SetConfigData {
   SetConfigData({
     required this.exerciseId,
     required this.slotEntryId,
-    this.type = 'normal',
+    this.type = SlotEntryType.normal,
     required this.nrOfSets,
     this.maxNrOfSets,
     required this.weight,
     this.maxWeight,
     this.weightUnitId = WEIGHT_UNIT_KG,
-    this.weightRounding = null,
+    this.weightRounding,
     required this.repetitions,
     this.maxRepetitions,
     this.repetitionsUnitId = REP_UNIT_REPETITIONS_ID,
-    this.repetitionsRounding = null,
+    this.repetitionsRounding,
     required this.rir,
     this.maxRir,
     required this.rpe,