diff --git a/Frontend/power-tracker/src/pages/ManageSensors.tsx b/Frontend/power-tracker/src/pages/ManageSensors.tsx index d8b432aba9ece47e216e1a91c771c34dde98223a..d5391f6c15ea46c490507a0f4f9e24ed98779584 100644 --- a/Frontend/power-tracker/src/pages/ManageSensors.tsx +++ b/Frontend/power-tracker/src/pages/ManageSensors.tsx @@ -148,15 +148,15 @@ function ManageSensors() { } var euse; if(values.euse == undefined || values.euse == null){ - euse=1 + euse=0 }else{ euse=values.euse } var volt; - if(values.euse == undefined || values.euse == null){ + if(values.voltage == undefined || values.voltage == null){ volt=1 }else{ - volt=values.euse + volt=values.voltage } axios.put( IngressAPI + '/new-hotdrop', diff --git a/Frontend/power-tracker/src/pages/overview.tsx b/Frontend/power-tracker/src/pages/overview.tsx index e6f67931cddcec14e768a8cecd1a50af904fe170..c7784481c86fc1c5bba8b9c12a530ec39cbf0e9b 100644 --- a/Frontend/power-tracker/src/pages/overview.tsx +++ b/Frontend/power-tracker/src/pages/overview.tsx @@ -119,7 +119,7 @@ function Overview() { <div> {/* GOTTA IMPLEMENT FUNCTIONALITY TO THE 2 BUTTONS TO CHNAGE INOUT */} - <label className='text-primary text-sm'>Interval between data points</label> + <label className='text-primary text-sm'>Minuites between readings</label> <div className='flex'> <Input className="w-[280px] h-[40px]" type='number' value={interval} onChange={event => setInterval(parseInt(event.target.value))}></Input> <div className="flex flex-col h-[40px] ml-[5px]"> @@ -135,7 +135,7 @@ function Overview() { {/* DATE FROM PICKER */} <label className='text-primary text-sm'>Date From</label> <div className='flex'> - <DatePicker width={280} dates={startDate} setDate={setStartDate} allowedDate={new Date()}/> + <DatePicker width={280} dates={endDate} setDate={setEndDate} allowedDate={startDate} /> <div className='flex flex-col h-[40px] ml-[5px]'> <Button className='h-[20px] w-[25px] rounded-none rounded-r-lg' variant="ghost" size="icon" onClick={_ => { //TODO: CLEAN UP THESE LATER ------------------------------- NO REALLY, THEY SUCK ATM var date = new Date; @@ -162,7 +162,7 @@ function Overview() { {/* DATE TO PICKER */} <label className='text-primary text-sm'>Date To</label> <div className='flex mb-[10px]'> - <DatePicker width={280} dates={endDate} setDate={setEndDate} allowedDate={startDate} /> + <DatePicker width={280} dates={startDate} setDate={setStartDate} allowedDate={new Date()}/> <div className='flex flex-col h-[40px] ml-[5px]'> <Button className='h-[20px] w-[25px] rounded-none rounded-r-lg' variant="ghost" size="icon" onClick={e => { //TODO: CLEAN UP THESE LATER ------------------------------- NO REALLY, THEY SUCK ATM var date = new Date; var sdate = startDate