Overhead presses feature and bug fixes (#21)

* Changed formatting to allow routines

* Merging progress between branches

* Workout transition fix

* Added overhead exercises

Author: Noor-Nasri

UDPHandler.py

@@ -15,8 +15,11 @@
 # Processing UDP updates 
 def process(address, data):
     #print("Processing", data, " from", address)
+    #print(data)
     if type(data) == str:
         userID, isRoutine, workoutOrRoutineID = [int(e) for e in data.split(" ")]
+        print("GOT FIRST: ", userID, isRoutine, workoutOrRoutineID)
+
         if isRoutine:
             routine_data = workoutSetModel.get_workouts_of_routine(workoutOrRoutineID)
             mode = routine_data[0]["workoutType"]
@@ -36,7 +39,16 @@ def process(address, data):
         return
 
     # Process table update
-    session = temporaryData[address[0]]
+    try:
+        session = temporaryData[address[0]]
+        
+        if session == None:
+            print("GETTING UDP WITH NONE SESSION")
+            return
+    except:
+        print("GETTING UDP WITHOUT SESSION")
+        return
+    
     if not session.jointTotals: # initialize iteration table
         session.jointTotals = data
         return
@@ -85,23 +97,25 @@ def poll():
         return {"change": "nothing"}
 
     elif change == "complete": # finished
-        # TODO: clear data
+        dataMapping[id] = None
+        temporaryData[addr] = None
+        print("FINISHED!!!!!!!!!!!!!!!!")
         return {"change": "complete"}
 
     elif change == "next routine":
         next_workout_data = session.routine_data[session.routine_counter]
         mode = next_workout_data["workoutType"]
-        maxReps = next_workout_data["workoutType"]
+        maxReps = next_workout_data["reps"]
 
         session = makeSession(mode, maxReps, session.routine_data, session.routine_counter)
         temporaryData[addr] = session
 
-        return {"change": "new routine", "details": mode}
+        return {"change": "message", "details": f"Set complete. Next workout is {maxReps} reps of {mode}"}
 
     elif change == "new state":
         print("New State:", session.rep_state, "total reps:", session.reps)
         return {"change": session.rep_state, "reps": session.reps}
 
     else:
         print("Bad form: ", change)
-        return {"change": "bad form", "details": change}
+        return {"change": "message", "details": change}

graphing/upload_images.py

@@ -1,10 +1,14 @@
 from flask import Blueprint, request, send_file
+import os
 
 graphing_blueprint = Blueprint('graphing_blueprint', __name__)
 
 @graphing_blueprint.route("/graph/time", methods=["GET"])
 def getTimeGraph():
-    #img_dir = "./static"
-    #img_list = os.listdir(img_dir)
-    #img_path = os.path.join(img_dir, random.choice(img_list))
-    return
+    img_path = "D:\\Coding\\PeddieHacks2022\\backend\\graphing\\graphs\\time_graph.png" #os.path.join(os.getcwd(), "/graphs/time_graph.png")
+    return send_file(img_path, mimetype='image/png')
+
+@graphing_blueprint.route("/graph/reps", methods=["GET"])
+def getRepsGraph():
+    img_path = "D:\\Coding\\PeddieHacks2022\\backend\\graphing\\graphs\\reps_graph.png" #os.path.join(os.getcwd(), "/graphs/time_graph.png")
+    return send_file(img_path, mimetype='image/png')

sessionModels.py

@@ -17,13 +17,13 @@ def __init__(self, max_reps, routine_data, routine_counter):
 
 class curlSession(workoutSession):
     def __init__(self, max_reps, routine_data, routine_counter, 
-        rightEnabled, leftEnabled, alternatingEnabled):
+        rightEnabled, leftEnabled, overheadEnabled):
         super().__init__(max_reps, routine_data, routine_counter)
         self.rightEnabled = rightEnabled
         self.leftEnabled = leftEnabled
-        self.alternatingEnabled = alternatingEnabled
+        self.overheadEnabled = overheadEnabled
 
-    rep_state = "down"
+    rep_state = None
     rep_progress = 0
 
     UP_THRESHOLD = 80
@@ -51,7 +51,14 @@ def process_poll(self, points) -> str:
             state = "up"
         if (left_angle > self.DOWN_THRESHOLD and right_angle > self.DOWN_THRESHOLD):
             state = "down"
+        if (self.overheadEnabled):
+            state = state == "up" and "down" or "up"
 
+        if not self.rep_state:
+            # intialize repstate
+            self.rep_state = state or "down"
+            return 
+        
         if state:
             if self.rep_state != state:
                 if state == "up":
@@ -96,9 +103,8 @@ def process_poll(self, points) -> str:
 
 
 def makeSession(mode: str, max_reps, routine_data, routine_counter) -> workoutSession:
-    if mode.find("Bicep") > -1:
-        print(max_reps, routine_data, routine_counter)
-        session = curlSession(max_reps, routine_data, routine_counter, mode != "Left Bicep Curl", mode != "Right Bicep Curl", mode == "Alternating Bicep Curl")
+    if mode.find("Bicep") > -1 or mode.find("Overhead") > -1:
+        session = curlSession(max_reps, routine_data, routine_counter, mode.find("Right") > -1, mode.find("Left") > -1, mode.find("Overhead") > -1)
         return session
 
     else: