Merge pull request #56 from yujinyang1998/master

v1.0
AY2021S1-CS2113T-F11-1 · Oct 15, 2020 · 8288eb4 · 8288eb4
2 parents 2bb51e3 + 41380c7
commit 8288eb4
Show file tree

Hide file tree

Showing 11 changed files with 346 additions and 62 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,4 @@ bin/
 text-ui-test/EXPECTED-UNIX.TXT
 
 data/
+saves/
diff --git a/saves/workout/history.json b/saves/workout/history.json
@@ -8,10 +8,10 @@
         "day": 15
       },
       "time": {
-        "hour": 20,
-        "minute": 45,
-        "second": 45,
-        "nano": 607542500
+        "hour": 21,
+        "minute": 53,
+        "second": 53,
+        "nano": 931518000
       }
     },
     "lastEditTime": {
@@ -21,10 +21,10 @@
         "day": 15
       },
       "time": {
-        "hour": 20,
-        "minute": 45,
-        "second": 45,
-        "nano": 607542500
+        "hour": 21,
+        "minute": 53,
+        "second": 53,
+        "nano": 932518300
       }
     }
   },
@@ -37,10 +37,10 @@
         "day": 15
       },
       "time": {
-        "hour": 20,
-        "minute": 46,
-        "second": 21,
-        "nano": 304254000
+        "hour": 21,
+        "minute": 55,
+        "second": 45,
+        "nano": 945448400
       }
     },
     "lastEditTime": {
@@ -50,10 +50,10 @@
         "day": 15
       },
       "time": {
-        "hour": 20,
-        "minute": 46,
-        "second": 21,
-        "nano": 304254000
+        "hour": 21,
+        "minute": 55,
+        "second": 45,
+        "nano": 946448700
       }
     }
   },
@@ -66,10 +66,10 @@
         "day": 15
       },
       "time": {
-        "hour": 20,
-        "minute": 47,
-        "second": 46,
-        "nano": 909094000
+        "hour": 21,
+        "minute": 57,
+        "second": 36,
+        "nano": 385192800
       }
     },
     "lastEditTime": {
@@ -79,10 +79,10 @@
         "day": 15
       },
       "time": {
-        "hour": 20,
-        "minute": 47,
-        "second": 46,
-        "nano": 909094000
+        "hour": 21,
+        "minute": 57,
+        "second": 36,
+        "nano": 385192800
       }
     }
   },
@@ -95,10 +95,10 @@
         "day": 15
       },
       "time": {
-        "hour": 20,
-        "minute": 48,
-        "second": 13,
-        "nano": 877009100
+        "hour": 22,
+        "minute": 2,
+        "second": 30,
+        "nano": 308990700
       }
     },
     "lastEditTime": {
@@ -108,10 +108,10 @@
         "day": 15
       },
       "time": {
-        "hour": 20,
-        "minute": 48,
-        "second": 13,
-        "nano": 877009100
+        "hour": 22,
+        "minute": 2,
+        "second": 30,
+        "nano": 308990700
       }
     }
   },
@@ -124,10 +124,10 @@
         "day": 15
       },
       "time": {
-        "hour": 20,
-        "minute": 53,
-        "second": 17,
-        "nano": 920083000
+        "hour": 22,
+        "minute": 3,
+        "second": 25,
+        "nano": 757600600
       }
     },
     "lastEditTime": {
@@ -137,10 +137,242 @@
         "day": 15
       },
       "time": {
-        "hour": 20,
-        "minute": 53,
-        "second": 17,
-        "nano": 920083000
+        "hour": 22,
+        "minute": 3,
+        "second": 25,
+        "nano": 757600600
+      }
+    }
+  },
+  {
+    "filePath": "saves/workout/workoutSession/5.json",
+    "creationTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 6,
+        "second": 33,
+        "nano": 707839400
+      }
+    },
+    "lastEditTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 6,
+        "second": 33,
+        "nano": 707839400
+      }
+    }
+  },
+  {
+    "filePath": "saves/workout/workoutSession/6.json",
+    "creationTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 8,
+        "second": 28,
+        "nano": 32634600
+      }
+    },
+    "lastEditTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 8,
+        "second": 28,
+        "nano": 33633700
+      }
+    }
+  },
+  {
+    "filePath": "saves/workout/workoutSession/7.json",
+    "creationTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 10,
+        "second": 34,
+        "nano": 793642500
+      }
+    },
+    "lastEditTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 10,
+        "second": 34,
+        "nano": 794642700
+      }
+    }
+  },
+  {
+    "filePath": "saves/workout/workoutSession/8.json",
+    "creationTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 11,
+        "second": 24,
+        "nano": 863070700
+      }
+    },
+    "lastEditTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 11,
+        "second": 24,
+        "nano": 863070700
+      }
+    }
+  },
+  {
+    "filePath": "saves/workout/workoutSession/9.json",
+    "creationTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 11,
+        "second": 54,
+        "nano": 700742100
+      }
+    },
+    "lastEditTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 11,
+        "second": 54,
+        "nano": 701742900
+      }
+    }
+  },
+  {
+    "filePath": "saves/workout/workoutSession/10.json",
+    "creationTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 16,
+        "second": 6,
+        "nano": 481669100
+      }
+    },
+    "lastEditTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 16,
+        "second": 6,
+        "nano": 481669100
+      }
+    }
+  },
+  {
+    "filePath": "saves/workout/workoutSession/11.json",
+    "creationTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 19,
+        "second": 2,
+        "nano": 502813500
+      }
+    },
+    "lastEditTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 19,
+        "second": 2,
+        "nano": 502813500
+      }
+    }
+  },
+  {
+    "filePath": "saves/workout/workoutSession/12.json",
+    "creationTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 22,
+        "second": 48,
+        "nano": 511306700
+      }
+    },
+    "lastEditTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 22,
+        "minute": 22,
+        "second": 48,
+        "nano": 511306700
       }
     }
   }

diff --git a/saves/workout/workoutSession/1.json b/saves/workout/workoutSession/1.json
@@ -0,0 +1 @@
+[{"moveName":"nulldsadsa","repetitions":32,"weight":34}]
diff --git a/saves/workout/workoutSession/3.json b/saves/workout/workoutSession/3.json
@@ -0,0 +1,3 @@
+[
+  null
+]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,4 @@ bin/
		text-ui-test/EXPECTED-UNIX.TXT

		data/
		saves/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[{"moveName":"nulldsadsa","repetitions":32,"weight":34}]
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    [
+      null
+    ]