WIP

Werkout_ios/APIModels/Exercise.swift

@@ -23,13 +23,6 @@ struct ExerciseElement: Codable {
         case weightAudio = "weight_audio"
         case createdAt = "created_at"
     }
-    
-    var createdAtDate: Date {
-        let df = DateFormatter()
-        df.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
-        df.locale = Locale(identifier: "en_US_POSIX")
-        return df.date(from: self.createdAt) ?? Date()
-    }
 }
 
 struct ExerciseExercise: Codable, Hashable, Identifiable {
@@ -67,11 +60,4 @@ struct ExerciseExercise: Codable, Hashable, Identifiable {
         case muscleGroups = "muscle_groups"
         case synonyms
     }
-    
-    var createdAtDate: Date {
-        let df = DateFormatter()
-        df.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
-        df.locale = Locale(identifier: "en_US_POSIX")
-        return df.date(from: self.createdAt) ?? Date()
-    }
 }

Werkout_ios/APIModels/Workout.swift

@@ -35,7 +35,11 @@ struct Workout: Codable, Identifiable {
     
     var exercisesSortedByCreated_at: [ExerciseElement] {
         return self.exercises.sorted(by: {
-            $0.createdAtDate < $1.createdAtDate
+            if let lhsDate = $0.createdAt.dateFromServerDate,
+                let rhsDate = $1.createdAt.dateFromServerDate {
+                return lhsDate < rhsDate
+            }
+            return false
         })
     }
 }