From 270ed8e63913438ab0671012a2e02a2d8788d957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20H=C3=B8yland?= <daniehoy@stud.ntnu.no> Date: Tue, 30 Apr 2024 22:45:17 +0200 Subject: [PATCH] Fixed edit button not working, fixed a more consistent design on buttons and search --- Backend/API/handlers/newHotdrop.go | 2 +- Frontend/power-tracker/src/components/enoekAdd.tsx | 1 + .../power-tracker/src/components/enoekAllMeasures.tsx | 6 ++++-- .../power-tracker/src/components/enoekDecision.tsx | 5 +++-- .../power-tracker/src/components/manageBuildDep.tsx | 2 +- .../power-tracker/src/components/manageGateway.tsx | 6 +++--- .../power-tracker/src/components/manageProcesses.tsx | 4 ++-- Frontend/power-tracker/src/pages/ManageSensors.tsx | 3 +-- Frontend/power-tracker/src/pages/adminUserConfig.tsx | 10 ++++++---- Frontend/power-tracker/src/pages/enoek.tsx | 7 ++++--- 10 files changed, 26 insertions(+), 20 deletions(-) diff --git a/Backend/API/handlers/newHotdrop.go b/Backend/API/handlers/newHotdrop.go index 860f044..76b03bb 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 dfa53f7..a9d3321 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 804fae0..f79a2db 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 aaf1d08..afcd772 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 b46872d..8032d53 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 41f9e62..a501f54 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 7352d50..5a56333 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 d5391f6..0db22b6 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 a638289..4398d0e 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 d622195..b7ce5fa 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: -- GitLab