diff --git a/Backend/EgressAPI/handlers/overview.go b/Backend/EgressAPI/handlers/overview.go index 4224f1f0c8a14d9761dc960c390b06cdb37ba424..b05f2074a086f9f82dbee1030e643661e062f427 100644 --- a/Backend/EgressAPI/handlers/overview.go +++ b/Backend/EgressAPI/handlers/overview.go @@ -93,7 +93,7 @@ func sortData(machines []other.MachineDetails, interval int64, since int64, star } //loop over each machine using a for loop for k := range machines { - quickSort(machines[k].SensorDataList, 0, len(machines[k].SensorDataList)-1) + //quickSort(machines[k].SensorDataList, 0, len(machines[k].SensorDataList)-1) var packetList []other.SensorData //new list of packets var tempPacketList []other.SensorData //temporary list of packets, to make sure it is averaged correctly @@ -102,7 +102,6 @@ func sortData(machines []other.MachineDetails, interval int64, since int64, star for _, tInterval := range intervalList { for i < len(machines[k].SensorDataList) { - //println(i) if machines[k].SensorDataList[i].DateTime.Before(startTime) { //if the packet has not yet reached the start time, go to next packet i++ continue diff --git a/Backend/EgressAPI/other/structs.go b/Backend/EgressAPI/other/structs.go index 5ff4b45b8e1a7f17115349b582bc760479af9cc8..6de182c6fa9b48c63fd40bf017497734de7b3985 100644 --- a/Backend/EgressAPI/other/structs.go +++ b/Backend/EgressAPI/other/structs.go @@ -16,7 +16,7 @@ type UserInfo struct { SessionToken string `json:"stoken"` } -// IncomingRequest This struct is the top level for ALL requests coming from frontend, two members, user info and the body +// IncomingRequest This struct is the top level for ALL requests coming from frontend, two members, user info and the body -- UNUSED -- type IncomingRequest struct { Uinfo UserInfo `json:"uinfo"` Body interface{} `json:"body"` diff --git a/Frontend/power-tracker/src/pages/adminUserConfig.tsx b/Frontend/power-tracker/src/pages/adminUserConfig.tsx index 9138f3f833a6e76445d50579905f0886adf474bc..15c3236a2a66317fdce2325eab52dac4dfb80074 100644 --- a/Frontend/power-tracker/src/pages/adminUserConfig.tsx +++ b/Frontend/power-tracker/src/pages/adminUserConfig.tsx @@ -102,7 +102,7 @@ function UserConfig() { setUserData(UserDat) setUsersToShow(UserDat) }) - }, [userData]); + }, []); // when search term gets updated, redraw and filter list of users useEffect(() => {