Skip to content
Snippets Groups Projects
Commit 28ed48d0 authored by Odin Aas's avatar Odin Aas :cry:
Browse files

Merge branch 'sensorManagement' into 'dev-branch' 

fixed some bugs so that adding and edit sensor is possible

See merge request !69
parents b26c527f 1947dacb
No related branches found
No related tags found
2 merge requests!71Dev branch,!69fixed some bugs so that adding and edit sensor is possible
Pipeline #26104 passed
Stage: deploy
Show whitespace changes
Inline Side-by-side
Backend/API/handlers/newHotdrop.go
+ 2
− 1
View file @ 28ed48d0
...@@ -58,8 +58,9 @@ func NewHotDrop(w http.ResponseWriter, r *http.Request) { ...@@ -58,8 +58,9 @@ func NewHotDrop(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
department := 0 //check if it is intended to have a department, if not, skip department := 0 //check if it is intended to have a department, if not, skip
if data.DepartmentName != "" { if data.DepartmentName != "" && data.DepartmentName != " " {
department, err = other.GetDepartmentIdByName(data.DepartmentName, building) department, err = other.GetDepartmentIdByName(data.DepartmentName, building)
if err != nil { if err != nil {
log.Println(err.Error()) log.Println(err.Error())
......
Frontend/power-tracker/src/pages/ManageSensors.tsx
+ 25
− 17
View file @ 28ed48d0
...@@ -349,7 +349,8 @@ function ManageSensors() { ...@@ -349,7 +349,8 @@ function ManageSensors() {
<FormItem> <FormItem>
<FormLabel>EUI</FormLabel> <FormLabel>EUI</FormLabel>
<FormControl> <FormControl>
<Input placeholder="EUI" {...field} /> { /* REMOVED {...field} from the under*/ }
<Input placeholder="EUI" />
</FormControl> </FormControl>
<FormDescription> <FormDescription>
The id code found under "MAC" on sensor The id code found under "MAC" on sensor
...@@ -364,7 +365,8 @@ function ManageSensors() { ...@@ -364,7 +365,8 @@ function ManageSensors() {
<FormItem> <FormItem>
<FormLabel>Name</FormLabel> <FormLabel>Name</FormLabel>
<FormControl> <FormControl>
<Input placeholder="Name" {...field} /> { /* REMOVED {...field} from the under*/ }
<Input placeholder="Name" />
</FormControl> </FormControl>
</FormItem> </FormItem>
)} )}
...@@ -376,7 +378,8 @@ function ManageSensors() { ...@@ -376,7 +378,8 @@ function ManageSensors() {
<FormItem> <FormItem>
<FormLabel>Nr</FormLabel> <FormLabel>Nr</FormLabel>
<FormControl> <FormControl>
<Input placeholder="Nr" {...field} /> { /* REMOVED {...field} from the under*/ }
<Input placeholder="Nr" />
</FormControl> </FormControl>
<FormDescription> <FormDescription>
Custom machine nr Custom machine nr
...@@ -390,7 +393,8 @@ function ManageSensors() { ...@@ -390,7 +393,8 @@ function ManageSensors() {
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel>Building</FormLabel> <FormLabel>Building</FormLabel>
<Select onValueChange={field.onChange} defaultValue={field.value}> { /* REMOVED defaultValue={field.value} from the under*/ }
<Select onValueChange={field.onChange} >
<FormControl> <FormControl>
<SelectTrigger> <SelectTrigger>
<SelectValue placeholder="Building" /> <SelectValue placeholder="Building" />
...@@ -409,26 +413,28 @@ function ManageSensors() { ...@@ -409,26 +413,28 @@ function ManageSensors() {
)} )}
/> />
{ /* If a building is selected, render department picker */ } { /* If a building is selected, render department picker */ }
{ (watchBuilding != "null") ? ( { (watchBuilding != "") ? (
<FormField <FormField
control={form.control} control={form.control}
name='dept' name='dept'
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel>Department</FormLabel> <FormLabel>Department</FormLabel>
<Select onValueChange={field.onChange} defaultValue={field.value}> { /* REMOVED defaultValue={field.value} from the under*/ }
<Select onValueChange={field.onChange} >
<FormControl> <FormControl>
<SelectTrigger> <SelectTrigger>
<SelectValue placeholder="Department" /> <SelectValue placeholder="Department" />
</SelectTrigger> </SelectTrigger>
</FormControl> </FormControl>
<SelectContent> <SelectContent>
<SelectItem key={1} value={" "}> </SelectItem>
{ buildDepData.buildingDepartmentData.map((building, index) => { { buildDepData.buildingDepartmentData.map((building, index) => {
if (index == 0) return (<></>) if (index == 0) return (<></>)
if (building.building.name === watchBuilding) return ( if (building.building.name === watchBuilding) return (
<div key={index}> <div key={index}>
{ building.departments.map((dept, index) => { { building.departments.map((dept, index) => {
if (index == 0) return (<></>) if (index == -1) return (<></>)
else return ( else return (
<SelectItem key={index} value={dept.name}>{dept.name}</SelectItem> <SelectItem key={index} value={dept.name}>{dept.name}</SelectItem>
) )
...@@ -451,7 +457,8 @@ function ManageSensors() { ...@@ -451,7 +457,8 @@ function ManageSensors() {
<FormItem> <FormItem>
<FormLabel>Expected power usage</FormLabel> <FormLabel>Expected power usage</FormLabel>
<FormControl> <FormControl>
<Input type="number" placeholder="0" {...field} /> { /* REMOVED {...field} from the under*/ }
<Input type="number" placeholder="0" />
</FormControl> </FormControl>
</FormItem> </FormItem>
)} )}
...@@ -517,7 +524,7 @@ function ManageSensors() { ...@@ -517,7 +524,7 @@ function ManageSensors() {
<FormItem> <FormItem>
<FormLabel>EUI</FormLabel> <FormLabel>EUI</FormLabel>
<FormControl> <FormControl>
<Input placeholder={machine.eui} {...field} /> <Input defaultValue={machine.eui} {...field} />
</FormControl> </FormControl>
</FormItem> </FormItem>
)} )}
...@@ -529,7 +536,7 @@ function ManageSensors() { ...@@ -529,7 +536,7 @@ function ManageSensors() {
<FormItem> <FormItem>
<FormLabel>Name</FormLabel> <FormLabel>Name</FormLabel>
<FormControl> <FormControl>
<Input placeholder={machine.machine_name} {...field} /> <Input defaultValue={machine.machine_name} {...field} />
</FormControl> </FormControl>
</FormItem> </FormItem>
)} )}
...@@ -541,7 +548,7 @@ function ManageSensors() { ...@@ -541,7 +548,7 @@ function ManageSensors() {
<FormItem> <FormItem>
<FormLabel>Nr</FormLabel> <FormLabel>Nr</FormLabel>
<FormControl> <FormControl>
<Input placeholder={machine.machineNr} {...field} /> <Input defaultValue={machine.machineNr} {...field} />
</FormControl> </FormControl>
</FormItem> </FormItem>
)} )}
...@@ -552,10 +559,10 @@ function ManageSensors() { ...@@ -552,10 +559,10 @@ function ManageSensors() {
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel>Building</FormLabel> <FormLabel>Building</FormLabel>
<Select onValueChange={field.onChange} defaultValue={field.value}> <Select onValueChange={field.onChange} defaultValue={machine.building_name}>
<FormControl> <FormControl>
<SelectTrigger> <SelectTrigger>
<SelectValue placeholder={machine.building_name} /> <SelectValue />
</SelectTrigger> </SelectTrigger>
</FormControl> </FormControl>
<SelectContent> <SelectContent>
...@@ -576,22 +583,23 @@ function ManageSensors() { ...@@ -576,22 +583,23 @@ function ManageSensors() {
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel>Department</FormLabel> <FormLabel>Department</FormLabel>
<Select onValueChange={field.onChange} defaultValue={field.value}> <Select onValueChange={field.onChange} defaultValue={machine.department_name}>
<FormControl> <FormControl>
<SelectTrigger> <SelectTrigger>
<SelectValue placeholder={machine.department_name} /> <SelectValue />
</SelectTrigger> </SelectTrigger>
</FormControl> </FormControl>
<FormDescription> <FormDescription>
{"Please select building first to change department : )"} {"Please select building first to change department : )"}
</FormDescription> </FormDescription>
<SelectContent> <SelectContent>
<SelectItem key={1} value={" "}></SelectItem>
{ buildDepData.buildingDepartmentData.map((building, index) => { { buildDepData.buildingDepartmentData.map((building, index) => {
if (index == 0) return (<></>) if (index == 0) return (<></>)
if (building.building.name === watchBuilding) return ( if (building.building.name === watchBuilding) return (
<div key={index}> <div key={index}>
{ building.departments.map((dept, index) => { { building.departments.map((dept, index) => {
if (index == 0) return (<></>) if (index == -1) return (<></>)
else return ( else return (
<SelectItem key={index} value={dept.name}>{dept.name}</SelectItem> <SelectItem key={index} value={dept.name}>{dept.name}</SelectItem>
) )
...@@ -612,7 +620,7 @@ function ManageSensors() { ...@@ -612,7 +620,7 @@ function ManageSensors() {
<FormItem> <FormItem>
<FormLabel>Expected power usage</FormLabel> <FormLabel>Expected power usage</FormLabel>
<FormControl> <FormControl>
<Input type="number" placeholder="0" {...field} /> <Input type="number" defaultValue={machine.expected_use} {...field} />
</FormControl> </FormControl>
</FormItem> </FormItem>
)} )}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment