Merge branch 'dev-branch' into 'main'

fixed stupid fucking bug

See merge request !94

Backend/EgressAPI/handlers/overview.go

@@ -282,7 +282,6 @@ func setIntoDatasets(Machines []other.MachineDetails) other.OverviewData {
 func createDataset(details other.MachineDetails) other.Dataset {
 	dataset := other.Dataset{Label: details.Machine.Name}
 	for _, data := range details.SensorDataList {
-		log.Println(data.AVGCurrent * float64(details.Machine.Voltage))
 		dataset.Data = append(dataset.Data, data.AVGCurrent*float64(details.Machine.Voltage))
 	}
 	return dataset

Backend/EgressAPI/other/sqlqueries.go

@@ -174,7 +174,6 @@ func GetSensors(token string) ([]SensorInfo, error) {
 		); err != nil {
 			return nil, err
 		}
-		// Check if departmentID is valid (not NULL)
 		if tempVoltage.Valid {
 			machineInfo.Voltage = int(tempVoltage.Int64)
 		} else {
@@ -401,8 +400,10 @@ func GetMachineDetailsForUser(token string) ([]MachineDetails, error) {
 	defer rows.Close()
 
 	var machineDetailsMap = make(map[string]MachineDetails)
-
+	i := 0
 	for rows.Next() {
+		log.Println(i)
+		i++
 		var machineDetails MachineDetails
 		var machine Machine
 		var building Building
@@ -427,8 +428,8 @@ func GetMachineDetailsForUser(token string) ([]MachineDetails, error) {
 			&machine.ExpectedUse,
 			&machine.MachineNr,
 			&machine.BuildingID,
-			&tempVoltage,
 			&departmentId,
+			&tempVoltage,
 			&building.ID,
 			&building.CompanyID,
 			&building.Name,
@@ -508,13 +509,12 @@ func GetMachineDetailsForUser(token string) ([]MachineDetails, error) {
 			machineDetails.AssociatedProcesses = append(machineDetails.AssociatedProcesses, process)
 			machineDetailsMap[machineDetails.Machine.EUI] = machineDetails
 		}
-
 	}
-
 	// Convert map values to a slice
 	var machineDetailsList []MachineDetails
 	for _, details := range machineDetailsMap {
 		machineDetailsList = append(machineDetailsList, details)
+		log.Println(details.Machine.Voltage)
 	}
 	if err := rows.Err(); err != nil {
 		return nil, err