diff --git a/Backend/API/handlers/newHotdrop.go b/Backend/API/handlers/newHotdrop.go
index 860f0447d6950566ce695a6602543f2a36e64b68..76b03bb29922b74fd0998d8167c57c322cf3cbf0 100644
--- a/Backend/API/handlers/newHotdrop.go
+++ b/Backend/API/handlers/newHotdrop.go
@@ -145,7 +145,7 @@ func NewHotDrop(w http.ResponseWriter, r *http.Request) {
}
department := 0 //check if it is intended to have a department, if not, skip
if data.DepartmentName != "" {
- department, err = other.GetDepartmentIdByName(data.DepartmentName, building)
+ department, err = other.GetDepartmentIdByName(data.DepartmentName, CompID)
if err != nil {
log.Println(err.Error())
w.WriteHeader(http.StatusBadRequest)
diff --git a/Frontend/power-tracker/src/components/enoekAdd.tsx b/Frontend/power-tracker/src/components/enoekAdd.tsx
index dfa53f78345d867da54b4366d62d46d8702693d3..a9d33213a500f89d8689fb09c6c0e13cb881bd8e 100644
--- a/Frontend/power-tracker/src/components/enoekAdd.tsx
+++ b/Frontend/power-tracker/src/components/enoekAdd.tsx
@@ -258,6 +258,7 @@ const MainComponent: React.FC<ManageAddingProps> = ({ enoek, setData, search })
</FormItem>
)}
/>
+ <br></br>
<Button type='submit'>Done</Button>
</form>
</Form>
diff --git a/Frontend/power-tracker/src/components/enoekAllMeasures.tsx b/Frontend/power-tracker/src/components/enoekAllMeasures.tsx
index 804fae0fced033494875ffe29051f3eb5f89b096..f79a2db2392c84f9a967d9b407fe6e251d0070ba 100644
--- a/Frontend/power-tracker/src/components/enoekAllMeasures.tsx
+++ b/Frontend/power-tracker/src/components/enoekAllMeasures.tsx
@@ -221,17 +221,19 @@ const MainComponent: React.FC<ManageAddingProps> = ({ enoek, setData, search}) =
<TableCell>{data.process}</TableCell>
{(permission && parseInt(permission, 10) <= 1) && (
+ <>
+ <br></br>
<AlertDialog>
<AlertDialogTrigger asChild>
<Button size="sm" variant="outline">Delete</Button>
</AlertDialogTrigger>
<AlertDialogContent>
- <AlertDialogTitle>Delete Sensor?</AlertDialogTitle>
+ <AlertDialogTitle>Delete enoek suggestion?</AlertDialogTitle>
<AlertDialogDescription>Do you want to delete {data.author}'s post about {data.header}?</AlertDialogDescription>
<AlertDialogAction onClick={() => {deleteEnoek(data.id); }}>DELETE</AlertDialogAction>
<AlertDialogCancel >Cancel</AlertDialogCancel>
</AlertDialogContent>
- </AlertDialog>
+ </AlertDialog></>
)}
</TableRow>
: null
diff --git a/Frontend/power-tracker/src/components/enoekDecision.tsx b/Frontend/power-tracker/src/components/enoekDecision.tsx
index aaf1d08debf1e14a03927fbdb080b7c093a1dcf1..afcd772c7a484097785501edd37f1fe497106bfe 100644
--- a/Frontend/power-tracker/src/components/enoekDecision.tsx
+++ b/Frontend/power-tracker/src/components/enoekDecision.tsx
@@ -221,8 +221,9 @@ const MainComponent: React.FC<ManageAddingProps> = ({ enoek, setData, search}) =
<TableCell>{new Date(data.start_date).toDateString()}</TableCell>
<TableCell>{new Date(data.end_date).toDateString()}</TableCell>
<TableCell>{data.process}</TableCell>
- <Button className="mb-[10px]" variant="ghost" onClick={(e)=>{judge(e,data.id,true)}}>approve</Button>
- <Button className="mb-[10px]" variant="ghost" onClick={(e)=>{judge(e,data.id,false)}}>reject</Button>
+ <br></br>
+ <Button size="sm" variant="outline" onClick={(e)=>{judge(e,data.id,true)}}>approve</Button>
+ <Button size="sm" variant="outline" onClick={(e)=>{judge(e,data.id,false)}}>reject</Button>
</TableRow>
: null
))}
diff --git a/Frontend/power-tracker/src/components/manageBuildDep.tsx b/Frontend/power-tracker/src/components/manageBuildDep.tsx
index b46872d88a59b89d597e4318534869e148ab894b..8032d5330a4627dca5c6d1b2390a529694ed31d6 100644
--- a/Frontend/power-tracker/src/components/manageBuildDep.tsx
+++ b/Frontend/power-tracker/src/components/manageBuildDep.tsx
@@ -137,7 +137,7 @@ function BuildDepSubpage () {
<div className='w-[1100px]'>
{/* Title and search bar */}
- <div className="w-[100%] h-[40px] flex justify-between content-center">
+ <div className="w-[100%] h-[40px] flex justify-between content-center" style={{ marginTop: '5px' }}>
<h1 className="scroll-m-20 text-2xl font-semibold tracking-tight">Buildings and Departments</h1>
<Input
className="h-[30px] w-[200px]"
diff --git a/Frontend/power-tracker/src/components/manageGateway.tsx b/Frontend/power-tracker/src/components/manageGateway.tsx
index 41f9e62e9d171436ba06a00c1898be39ba39297b..a501f54b9e15fe27c4d3899a9b6eb46ef7b4b3a3 100644
--- a/Frontend/power-tracker/src/components/manageGateway.tsx
+++ b/Frontend/power-tracker/src/components/manageGateway.tsx
@@ -60,10 +60,10 @@ function ManageGateways() {
return (
<ResizablePanelGroup className='flex h-[100%]' direction="horizontal">
- <ResizablePanel minSize={72.5}>
+ <ResizablePanel minSize={72.5} >
{/* Title and search bar */}
- <div className="w-[100%] h-[40px] flex justify-between content-center">
- <h1 className="scroll-m-20 text-2xl font-semibold tracking-tight">Buildings and Departments</h1>
+ <div className="w-[100%] h-[40px] flex justify-between content-center" style={{ marginTop: '5px' }}>
+ <h1 className="scroll-m-20 text-2xl font-semibold tracking-tight">Gateways</h1>
<Input
className="h-[30px] w-[200px] mr-[10px]"
type="text"
diff --git a/Frontend/power-tracker/src/components/manageProcesses.tsx b/Frontend/power-tracker/src/components/manageProcesses.tsx
index 7352d50b483efdfad64b08dd95e8f95512a20bec..5a56333e6394b1faee927aa0d35297b5cfd0f08e 100644
--- a/Frontend/power-tracker/src/components/manageProcesses.tsx
+++ b/Frontend/power-tracker/src/components/manageProcesses.tsx
@@ -126,7 +126,7 @@ const ManageProcesses= () => {
<div className="flex h-[100%]">
<div className='w-[1100px]'>
{/* Title and search bar */}
- <div className="w-[100%] h-[40px] flex justify-between content-center">
+ <div className="w-[100%] h-[40px] flex justify-between content-center" style={{ marginTop: '5px' }}>
<h1 className="scroll-m-20 text-2xl font-semibold tracking-tight">Processes</h1>
<Input
className="h-[30px] w-[200px]"
@@ -264,8 +264,8 @@ const ManageProcesses= () => {
)}
</AlertDialogHeader>
<AlertDialogFooter>
- <AlertDialogCancel>Cancel</AlertDialogCancel>
<AlertDialogAction type='submit' onClick={()=>{handleSave2(processMachineData, processMachineData2, processDropDownId); console.log(processDropDownId)}}>Save</AlertDialogAction>
+ <AlertDialogCancel>Cancel</AlertDialogCancel>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
diff --git a/Frontend/power-tracker/src/pages/ManageSensors.tsx b/Frontend/power-tracker/src/pages/ManageSensors.tsx
index d5391f6c15ea46c490507a0f4f9e24ed98779584..0db22b62e5f1d37bfd65dcc7a87fe11756490228 100644
--- a/Frontend/power-tracker/src/pages/ManageSensors.tsx
+++ b/Frontend/power-tracker/src/pages/ManageSensors.tsx
@@ -133,7 +133,6 @@ function ManageSensors() {
}).catch((error) => {
console.log(error)
})
-
}
// function for editing a sensor
@@ -831,8 +830,8 @@ function ManageSensors() {
<AlertDialogContent>
<AlertDialogTitle>Delete Sensor?</AlertDialogTitle>
<AlertDialogDescription>Do you want to delete {machine.eui} - {machine.machine_name} ?</AlertDialogDescription>
- <AlertDialogCancel onClick={()=>{form.reset()}}>Cancel</AlertDialogCancel>
<AlertDialogAction onClick={() => {deleteSensor(machine.eui); }}>DELETE</AlertDialogAction>
+ <AlertDialogCancel onClick={()=>{form.reset()}}>Cancel</AlertDialogCancel>
</AlertDialogContent>
</AlertDialog>
</div>
diff --git a/Frontend/power-tracker/src/pages/adminUserConfig.tsx b/Frontend/power-tracker/src/pages/adminUserConfig.tsx
index a63828912b85c9c7c18c9fe26df3c425093605ea..4398d0e5775742ce6531dc5ebdda08428fd7eb50 100644
--- a/Frontend/power-tracker/src/pages/adminUserConfig.tsx
+++ b/Frontend/power-tracker/src/pages/adminUserConfig.tsx
@@ -232,7 +232,9 @@ function UserConfig() {
<div className = "spacer" />
</div>
<div className ="rightbar">
- <Input className="w-[250px]" type="search" value={search} onChange={(e) => filter(e)}/>
+ <div className="w-[250px] h-[70px]">
+ <Input type="text" className="outlined-input" value={search} onChange={(event) => setSearch(event.target.value) } placeholder="Search.."/>
+ </div>
<ScrollArea>
<Table>
<TableCaption>...</TableCaption>
@@ -288,7 +290,7 @@ function UserConfig() {
}
}).map((user, index) => (
<TableRow key={index}>
- <TableCell>{user.id}</TableCell>
+ <TableCell>{index}</TableCell>
<TableCell>{user.FirstName}</TableCell>
<TableCell>{user.LastName}</TableCell>
<TableCell>{user.email}</TableCell>
@@ -409,8 +411,8 @@ function UserConfig() {
<AlertDialogContent>
<AlertDialogTitle>Delete Sensor?</AlertDialogTitle>
<AlertDialogDescription>Do you want to delete {user.FirstName + " " + user.LastName}?</AlertDialogDescription>
- <AlertDialogCancel>Cancel</AlertDialogCancel>
<AlertDialogAction onClick={() => {deleteUser(user.id); }}>DELETE</AlertDialogAction>
+ <AlertDialogCancel>Cancel</AlertDialogCancel>
</AlertDialogContent>
</AlertDialog>
</div>
@@ -513,7 +515,7 @@ const deleteUser = ( id: number) => {
}
async function fetchData(): Promise<UserData>{
- var data: UserData = {Users: [{id: 0, email: "", FirstName: "", LastName: "", permission: 0}]}
+ var data: UserData = { Users: [] };
await axios.post(EgressAPI + '/userData',
{
sessionToken: sessionStorage.getItem('TOKEN')
diff --git a/Frontend/power-tracker/src/pages/enoek.tsx b/Frontend/power-tracker/src/pages/enoek.tsx
index d622195cb0526be210aa66dcc0318260684d4854..b7ce5fa2adfb614e77073cbb0476b34503acfec6 100644
--- a/Frontend/power-tracker/src/pages/enoek.tsx
+++ b/Frontend/power-tracker/src/pages/enoek.tsx
@@ -5,6 +5,7 @@ import { redirect } from 'react-router-dom';
import "./adminSysConfig.css"
import axios from 'axios';
import TopBar from '@/components/topbar';
+import { Input } from "@/components/ui/input"
import ManageAdding from '../components/enoekAdd'
import AllMeasures from '../components/enoekAllMeasures'
@@ -206,7 +207,7 @@ if (permissionString !== null) {
)}
{permissionInt!= undefined && permissionInt <= 1 && (
<>
- <Button className="mb-[10px]" variant="ghost" onClick={()=>{setPage(Page.judge); setSearch("");}}><h4 className="scroll-m-20 text-xl font-semibold tracking-tight">Accpet/reject measures</h4></Button>
+ <Button className="mb-[10px]" variant="ghost" onClick={()=>{setPage(Page.judge); setSearch("");}}><h4 className="scroll-m-20 text-xl font-semibold tracking-tight">Accept/reject measures</h4></Button>
<br/>
</>
@@ -215,8 +216,8 @@ if (permissionString !== null) {
<div className="rightbar">
<div className="w-[250px] h-[70px]">
- <input type="text" className="outlined-input" value={search} onChange={(event) => setSearch(event.target.value) } placeholder="Search.."/>
- </div>
+ <Input type="text" className="outlined-input" value={search} onChange={(event) => setSearch(event.target.value) } placeholder="Search.."/>
+ </div>
{(() => {
switch (page) {
case Page.overview: