Feature/update UI

src/Sleep.js

@@ -1,10 +1,8 @@
 class Sleep {
   constructor(sleepData, userNow, date, userRepo) {
-  // constructor(sleepData, userNow, userRepo) {
     this.sleepData = sleepData;
     this.user = userNow;
     this.date = date;
-    // this.date = this.returnToday(this.sleepData);
     this.userRepo = userRepo;
   }
 
@@ -35,13 +33,11 @@ class Sleep {
     });
     return findSleepQualityByDate.sleepQuality;
   }
-
-  calculateWeekSleep() {
-    return this.userRepo.getWeekFromDate(this.date, this.user.id, this.sleepData).map((data) => `${data.date}: ${data.hoursSlept}`);
-  }
-
-  calculateWeekSleepQuality() {
-    return this.userRepo.getWeekFromDate(this.date, this.user.id, this.sleepData).map((data) => `${data.date}: ${data.sleepQuality}`);
+
+  userDataForWeek(relevantData) {
+    return this.userRepo.getWeekFromDate(this.date, this.user.id, this.sleepData).map((data) => {
+      return {x: data.date, y: data[relevantData]}
+    });
   }
 
   calculateAllUserSleepQuality() {
@@ -52,44 +48,7 @@ class Sleep {
     let total = totalSleepQuality / this.sleepData.length;
     return parseFloat(total.toFixed(2));
   }
-//   determineBestSleepers(date, userRepo) {
-//     let timeline = userRepo.chooseWeekDataForAllUsers(this.sleepData, date);
-//     let userSleepObject = userRepo.isolateUsernameAndRelevantData(this.sleepData, date, 'sleepQuality', timeline);
-
-//     return Object.keys(userSleepObject).filter(function(key) {
-//       return (userSleepObject[key].reduce(function(sumSoFar, sleepQualityValue) {
-//         sumSoFar += sleepQualityValue
-//         return sumSoFar;
-//       }, 0) / userSleepObject[key].length) > 3
-//     }).map(function(sleeper) {
-//       return userRepo.getDataFromID(parseInt(sleeper)).name;
-//     })
-//   }
-//   determineSleepWinnerForWeek(date, userRepo) {
-//     let timeline = userRepo.chooseWeekDataForAllUsers(this.sleepData, date);
-//     let sleepRankWithData = userRepo.combineRankedUserIDsAndAveragedData(this.sleepData, date, 'sleepQuality', timeline);
-
-//     return this.getWinnerNamesFromList(sleepRankWithData, userRepo);
-//   }
-//   determineSleepHoursWinnerForDay(date, userRepo) {
-//     let timeline = userRepo.chooseDayDataForAllUsers(this.sleepData, date);
-//     let sleepRankWithData = userRepo.combineRankedUserIDsAndAveragedData(this.sleepData, date, 'hoursSlept', timeline);
-
-//     return this.getWinnerNamesFromList(sleepRankWithData, userRepo);
-//   }
-//   getWinnerNamesFromList(sortedArray, userRepo) {
-//     let bestSleepers = sortedArray.filter(function(element) {
-//       return element[Object.keys(element)] === Object.values(sortedArray[0])[0]
-//     });
-
-//     let bestSleeperIds = bestSleepers.map(function(bestSleeper) {
-//       return (Object.keys(bestSleeper));
-//     });
 
-//     return bestSleeperIds.map(function(sleepNumber) {
-//       return userRepo.getDataFromID(parseInt(sleepNumber)).name;
-//     });
-//   }
 }