brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'staging_environment' into field_dashboard

Browse source
This commit is contained in:
csawatzky 2025-10-14 13:42:53 -06:00
commit 7a8a010a39
28 changed files with 212 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

@ -42,7 +42,7 @@
"mui-tel-input": "^7.0.0",
"notistack": "^3.0.1",
"openweathermap-ts": "^1.2.10",
"protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#field_dashboard",
"protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master",
"query-string": "^9.2.1",
"react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1",

2
package.json
View file

@ -54,7 +54,7 @@
"mui-tel-input": "^7.0.0",
"notistack": "^3.0.1",
"openweathermap-ts": "^1.2.10",
"protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#field_dashboard",
"protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master",
"query-string": "^9.2.1",
"react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1",

BIN
src/assets/marketplaceImages/Libra_Cart_temp.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

6
src/bin/BinCardV2.tsx
View file

@ -249,9 +249,9 @@ export default function BinCard(props: Props) {
noWrap
style={{ fontSize: "0.85rem", fontWeight: 650, color: tempColour }}>
{display +
(user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS
? "°C"
: "°F")}
(user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT
? "°F"
: "°C")}
</Typography>
);
};

15
src/bin/BinConditioningCard.tsx
View file

@ -33,7 +33,7 @@ const useStyles = makeStyles((theme: Theme) => {
interface Props {
interactions: Interaction[];
interactionDevices: Map<string, number>;
mode: pond.BinMode.BIN_MODE_DRYING | pond.BinMode.BIN_MODE_HYDRATING;
mode: pond.BinMode;
plenums?: Plenum[];
ambients?: Ambient[];
heaters?: Controller[];
@ -94,10 +94,21 @@ export default function BinConditioningCard(props: Props) {
return conditioningInteractions;
};
const modeDisplay = () => {
switch(mode){
case pond.BinMode.BIN_MODE_DRYING:
return "Drying"
case pond.BinMode.BIN_MODE_HYDRATING:
return "Hydrating"
case pond.BinMode.BIN_MODE_COOLDOWN:
return "Cooldown"
}
}
return (
<Card raised className={classes.card}>
<Typography style={{ fontWeight: 650 }}>
{mode === pond.BinMode.BIN_MODE_DRYING ? "Drying" : "Hydrating"} Conditions
{modeDisplay()} Conditions
</Typography>
{conditionsDisplay()}
</Card>

8
src/bin/BinConditioningInteraction.tsx
View file

@ -47,8 +47,6 @@ const useStyles = makeStyles((theme: Theme) => {
sliderThumb: {
height: 15,
width: 15,
marginTop: -6,
marginLeft: -7.5,
backgroundColor: "yellow"
},
sliderTrack: {
@ -60,10 +58,10 @@ const useStyles = makeStyles((theme: Theme) => {
backgroundColor: "white"
},
sliderValLabel: {
left: "calc(-50%)",
top: 22,
"& *": {
left: -20,
top: 40,
background: "transparent",
"& *": {
color: "#fff"
}
},

4
src/bin/BinSVGV2.tsx
View file

@ -507,9 +507,9 @@ export default function BinSVGV2(props: Props) {
//if the cables have the same number of nodes
if (b.temperatures.length === a.temperatures.length) {
//sort by temp only last and any type that has humidity first
if ((avg(a.humidities) === 0 || a.humidities.length === 0) && (avg(b.humidities) !== 0 || b.humidities.length > 0)) {
if ((avg(a.humidities) === 0) && (avg(b.humidities) !== 0)) {
return 1;
} else if ((avg(b.humidities) === 0 || b.humidities.length === 0) && (avg(a.humidities) !== 0 || a.humidities.length > 0)) {
} else if ((avg(b.humidities) === 0) && (avg(a.humidities) !== 0)) {
return -1;
}
else {

1
src/bin/BinSettings.tsx
View file

@ -485,6 +485,7 @@ export default function BinSettings(props: Props) {
form.inventory.inventoryControl = inventoryControl
form.inventory.autoThreshold = autoFillThreshold
}
console.log(form)
binAPI
.updateBin(bin.key(), form, as)
.then(response => {

9
src/bin/BinStorageConditions.tsx
View file

@ -21,7 +21,7 @@ import { Bin, Component } from "models";
import { GrainCable } from "models/GrainCable";
import { UnitMeasurement } from "models/UnitMeasurement";
import Co2Icon from "products/CommonIcons/co2Icon";
import { pond } from "protobuf-ts/pond";
import { pond, quack } from "protobuf-ts/pond";
import { useBinAPI, useGlobalState, useSnackbar } from "providers";
import React, { useEffect, useState } from "react";
import { avg, getTemperatureUnit } from "utils";
@ -200,11 +200,10 @@ export default function BinStorageConditions(props: Props) {
// }
});
if(cable.subType() !== quack.GrainCableSubtype.GRAIN_CABLE_SUBTYPE_OPI_TEMP){
let nodeEMCs: number[] = [];
filteredNodes.moistures.forEach((emc, i) => {
if (bin.settings.inventory?.targetMoisture) {
// if (i < cable.topNode) {
nodeEMCs.push(emc);
emcCounts.total++;
if (
@ -222,12 +221,12 @@ export default function BinStorageConditions(props: Props) {
} else {
emcCounts.onTarget++;
}
// }
}
});
cableTempAvgs.push(avg(nodeTemps));
cableEMCAvgs.push(avg(nodeEMCs));
}
cableTempAvgs.push(avg(nodeTemps));
}
});
if (cableTempAvgs.length > 0) {
setAverageTemp(avg(cableTempAvgs));

2
src/bin/BinVisualizerV2.tsx
View file

@ -436,7 +436,7 @@ export default function BinVisualizer(props: Props) {
highNodeConditions = {
tempC: filteredNodes.temps[highTempIndex],
humidity: filteredNodes.humids[highTempIndex],
emc: filteredNodes.humids[highTempIndex],
emc: filteredNodes.moistures[highTempIndex],
tempCTrend: cableTrendData.hotNodeTrend?.tempTrend ?? 0,
humidityTrend: cableTrendData.hotNodeTrend?.humidityTrend ?? 0,
emcTrend: cableTrendData.hotNodeTrend?.emcTrend ?? 0

10
src/bin/BinsList.tsx
View file

@ -22,6 +22,7 @@ interface Props {
loadMore?: () => void;
//startingTranslate: number;
valDisplay?: "high" | "low" | "average";
insert?: boolean
}
const useStyles = makeStyles((_theme) => {
@ -39,7 +40,7 @@ const useStyles = makeStyles((_theme) => {
});
export default function BinsList(props: Props) {
const { bins, duplicateBin, title, gridView, loadMore, valDisplay } = props;
const { bins, duplicateBin, title, gridView, loadMore, valDisplay, insert } = props;
const classes = useStyles();
// const history = useHistory();
const navigate = useNavigate()
@ -114,7 +115,12 @@ export default function BinsList(props: Props) {
{bins.map((b, i) =>
(
<Grid
size={{
size={insert ? {
xs: 6,
sm: 6,
md: 4,
lg: 3,
} : {
xs: 6,
sm: 4,
md: 3,

3
src/bin/BinyardDisplay.tsx
View file

@ -316,6 +316,7 @@ export default function BinyardDisplay(props: Props) {
<Grid size={12}>
<BinsList
gridView
insert
valDisplay="average"
bins={grainBins}
duplicateBin={duplicateBin}
@ -332,6 +333,7 @@ export default function BinyardDisplay(props: Props) {
<Grid size={12}>
<BinsList
gridView
insert
valDisplay="average"
bins={fertBins}
duplicateBin={duplicateBin}
@ -348,6 +350,7 @@ export default function BinyardDisplay(props: Props) {
<Grid size={12}>
<BinsList
gridView
insert
valDisplay="average"
bins={emptyBins}
duplicateBin={duplicateBin}

2
src/common/DataImports/BinCables/bin_cable_data_with_count.json
View file

File diff suppressed because one or more lines are too long

38
src/common/time/DateSelect.tsx
View file

@ -8,6 +8,7 @@ import {
MenuItem,
OutlinedInput,
Select,
TextField,
Theme
} from "@mui/material";
import moment, { Moment } from "moment";
@ -16,6 +17,7 @@ import ReactDOM from "react-dom";
import { DateRangePreset, SetDefaultPreset } from "./DateRange";
import ResponsiveDialog from "common/ResponsiveDialog";
import { withStyles, WithStyles } from "@mui/styles";
import { cloneDeep } from "lodash";
const styles = (_theme: Theme) => createStyles({});
@ -249,18 +251,30 @@ class DateSelect extends React.Component<Props, State> {
onClose={this.closeDateRangeDialog}
aria-labelledby="date-range-dialog">
<DialogContent>
{/* <StaticDateRangePicker
disableFuture
value={dateRange}
onChange={date => this.updateDateRange(date)}
renderInput={(startProps, endProps) => (
<React.Fragment>
<TextField {...startProps} />
<DateRangeDelimiter> to </DateRangeDelimiter>
<TextField {...endProps} />
</React.Fragment>
)}
/> */}
<TextField
fullWidth
margin="normal"
type="date"
label="Start Time"
value={dateRange[0]?.format("YYYY-MM-DD")}
onChange={e => {
let range = cloneDeep(dateRange)
range[0] = moment(e.target.value)
this.updateDateRange(range)
}}
/>
<TextField
fullWidth
margin="normal"
type="date"
label="End Time"
value={dateRange[1]?.format("YYYY-MM-DD")}
onChange={e => {
let range = cloneDeep(dateRange)
range[1] = moment(e.target.value)
this.updateDateRange(range)
}}
/>
</DialogContent>
<DialogActions>
<Button onClick={this.closeDateRangeDialog} color="primary">

2
src/device/UpgradeDevice.tsx
View file

@ -270,7 +270,7 @@ export default function UpgradeDevice(props: Props) {
<Divider />
<DialogContent className={classes.dialogContent}>
<DialogContentText id="alert-dialog-slide-description">
Upgrading from {currentFirmware()} to {latestFirmware()}
Upgrading {device.platformName()} from {currentFirmware()} to {latestFirmware()}
<br />
<br />
It is recommended that the device be plugged in during the upgrade as it will take

20
src/gate/GateDevice.tsx
View file

@ -338,14 +338,12 @@ export default function GateDevice(props: Props) {
return (
<Grid
container
direction="row"
alignContent="center"
direction={(isMobile) ? "column" : "row"}
width="100%"
//alignItems="center"
alignItems="center"
>
<Grid size={{ sm: 12, lg: isMobile || drawerView ? 12 : 4}} style={{ padding: 10 }}>
<Box
paddingLeft={1}
display="flex"
justifyContent="space-between"
alignItems="center"
@ -364,20 +362,6 @@ export default function GateDevice(props: Props) {
}
]}
/>
{/* <ToggleButtonGroup value={detail} exclusive size="small" aria-label="detail">
<ToggleButton
onClick={() => setDetail("analytics")}
value={"analytics"}
aria-label="Analysis Graphs">
Analysis
</ToggleButton>
<ToggleButton
onClick={() => setDetail("sensors")}
value={"sensors"}
aria-label="Sensor Graphs">
Sensors
</ToggleButton>
</ToggleButtonGroup> */}
</Box>
<Card raised>
<GateSVG

32
src/gate/GateFlowGraph.tsx
View file

@ -258,9 +258,9 @@ export default function GateFlowGraph(props: Props) {
<React.Fragment>
{flowEvents.length > 0 ? (
<Grid container direction="row" spacing={2} className={classes.eventGrid}>
<Grid size={3}>
<Grid size={{xs: 6, md: 3}}>
<Card raised className={classes.eventCard}>
<Grid container alignItems="center">
<Grid container width="100%" direction="column" alignItems="center">
<Grid size={9}>
<Box display="flex" justifyContent="space-between">
<Typography>Total Events:</Typography>
@ -271,7 +271,7 @@ export default function GateFlowGraph(props: Props) {
</Grid>
<Grid size={9}>
<Box display="flex" justifyContent="space-between">
<Typography>Total Time:</Typography>
<Typography>Time:</Typography>
<Typography style={{ fontWeight: 650, fontSize: 15 }}>
{moment.duration(totalTimeS, "s").humanize()}
</Typography>
@ -280,9 +280,9 @@ export default function GateFlowGraph(props: Props) {
</Grid>
</Card>
</Grid>
<Grid size={3}>
<Grid size={{xs: 6, md: 3}}>
<Card raised className={classes.eventCard}>
<Grid container alignItems="center">
<Grid container width="100%" direction="column" alignItems="center">
<Grid size={9}>
<Box display="flex" justifyContent="space-between">
<Typography>Events Inside:</Typography>
@ -293,7 +293,7 @@ export default function GateFlowGraph(props: Props) {
</Grid>
<Grid size={9}>
<Box display="flex" justifyContent="space-between">
<Typography>Event Time:</Typography>
<Typography>Time:</Typography>
<Typography style={{ fontWeight: 650, fontSize: 15 }}>
{moment.duration(timeSInside, "s").humanize()}
</Typography>
@ -302,9 +302,9 @@ export default function GateFlowGraph(props: Props) {
</Grid>
</Card>
</Grid>
<Grid size={3}>
<Grid size={{xs: 6, md: 3}}>
<Card raised className={classes.eventCard}>
<Grid container alignItems="center">
<Grid container width="100%" direction="column" alignItems="center">
<Grid size={9}>
<Box display="flex" justifyContent="space-between">
<Typography>Events Outside:</Typography>
@ -315,7 +315,7 @@ export default function GateFlowGraph(props: Props) {
</Grid>
<Grid size={9}>
<Box display="flex" justifyContent="space-between">
<Typography>Event Time:</Typography>
<Typography>Time:</Typography>
<Typography style={{ fontWeight: 650, fontSize: 15 }}>
{moment.duration(timeSOutside, "s").humanize()}
</Typography>
@ -324,15 +324,15 @@ export default function GateFlowGraph(props: Props) {
</Grid>
</Card>
</Grid>
<Grid size={3}>
<Grid size={{xs: 6, md: 3}}>
<Card raised className={classes.eventCard}>
<Grid container direction="column" alignItems="center">
<Grid container width="100%" direction="column" alignItems="center">
<Grid>
<Typography>Performance:</Typography>
</Grid>
<Grid>
<Typography style={{ fontWeight: 650, fontSize: 15 }}>
{(eventsInside / totalEvents) * 100}%
{((eventsInside / totalEvents) * 100).toFixed(2)}%
</Typography>
</Grid>
</Grid>
@ -367,7 +367,7 @@ export default function GateFlowGraph(props: Props) {
<React.Fragment>
{runtime && (
<Grid container direction="row" spacing={2} className={classes.runtimeGrid}>
<Grid size={3}>
<Grid size={{xs: 6, md: 3}}>
<Card raised className={classes.calcCard}>
<Grid container width="100%" direction="column" alignItems="center">
<Grid>Approximate Runtime:</Grid>
@ -379,7 +379,7 @@ export default function GateFlowGraph(props: Props) {
</Grid>
</Card>
</Grid>
<Grid size={3}>
<Grid size={{xs: 6, md: 3}}>
<Card raised className={classes.calcCard}>
<Grid container width="100%" direction="column" alignItems="center">
<Grid>Cost to run PCA:</Grid>
@ -394,7 +394,7 @@ export default function GateFlowGraph(props: Props) {
</Grid>
</Card>
</Grid>
<Grid size={3}>
<Grid size={{xs: 6, md: 3}}>
<Card raised className={classes.calcCard}>
<Grid container width="100%" direction="column" alignItems="center">
<Grid>Cost to run APU:</Grid>
@ -409,7 +409,7 @@ export default function GateFlowGraph(props: Props) {
</Grid>
</Card>
</Grid>
<Grid size={3}>
<Grid size={{xs: 6, md: 3}}>
<Card raised className={classes.calcCard}>
<Grid container width="100%" direction="column" alignItems="center">
<Grid>Total Cost:</Grid>

24
src/gate/GateSVG.tsx
View file

@ -249,9 +249,9 @@ export default function GateSVG(props: Props) {
<g key={"finalTemp"} id={"finalTemp"} data-name={"finalTemp"}>
<text fontSize={7} className={classes.fontBase} x={100} y={85}>
{convertFinalTemp(finalTemp).toFixed(2)}°
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS
? "C"
: "F"}
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT
? "°F"
: "°C"}
</text>
</g>
);
@ -260,9 +260,9 @@ export default function GateSVG(props: Props) {
<g key={"ambientTemp"} id={"ambientTemp"} data-name={"ambientTemp"}>
<text fontSize={7} className={classes.fontBase} x={30} y={114}>
Ambient: {ambientTemp}°
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS
? "C"
: "F"}
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT
? "°F"
: "°C"}
</text>
</g>
);
@ -271,13 +271,13 @@ export default function GateSVG(props: Props) {
<g key={"tempChain"} id={"tempChain"} data-name={"tempChain"}>
<text fontSize={7} className={classes.fontBase} x={30} y={149}>
T1: {innerTemps.t1}°
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS
? "C"
: "F"}
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT
? "°F"
: "°C"}
, T2: {innerTemps.t2}°
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS
? "C"
: "F"}
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT
? "°F"
: "°C"}
</text>
</g>
);

6
src/integrations/LibraCart/LibraCartAccess.tsx
View file

@ -182,7 +182,7 @@ export default function LibraCartAccess() {
color="primary"
onClick={e => {
e.preventDefault();
window.open(`https://staging.cloud.agrimatics.com/grain/integrations`, "_blank");
window.open(`https://cloud.agrimatics.com/grain/integrations`, "_blank");
}}>
Link Libra Cart Account
</Button>
@ -196,7 +196,7 @@ export default function LibraCartAccess() {
</Grid>
</Grid>
<Grid>
<Tooltip title={"This will Sync the data for all LibraCart accounts linked to " + (as ? "this team" : "your account")}>
<Tooltip title={"This will Sync the data for all Libra Cart accounts linked to " + (as ? "this team" : "your account")}>
<Button
variant="contained"
color="primary"
@ -210,7 +210,7 @@ export default function LibraCartAccess() {
</Grid>
<Box paddingTop={2}>
<Typography>
LibraCart data will sync every 6 hours, if the data is needed immediately you can select the Sync button. It may take up to 15 minutes for the data to appear in our platform.
Libra Cart data will sync every 6 hours, if the data is needed immediately you can select the Sync button.
</Typography>
</Box>

2
src/models/Bin.ts
View file

@ -96,7 +96,7 @@ export class Bin {
}
public empty(): boolean {
return this.settings.inventory?.empty || (this.settings.inventory !== undefined && this.settings.inventory !== null && this.settings.inventory.grainBushels < 5);
return this.settings.inventory?.empty || (this.settings.inventory !== undefined && this.settings.inventory !== null && this.bushels() < 5);
}
public objectType(): pond.ObjectType {

29
src/models/Device.ts
View file

@ -109,6 +109,35 @@ export class Device {
return m;
}
public platformName(): string {
switch (this.settings.platform) {
case pond.DevicePlatform.DEVICE_PLATFORM_PHOTON:
return "Photon"
case pond.DevicePlatform.DEVICE_PLATFORM_ELECTRON:
return "Electron"
case pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR:
return "V2 Cellular"
case pond.DevicePlatform.DEVICE_PLATFORM_V2_WIFI:
return "V2 Wifi"
case pond.DevicePlatform.DEVICE_PLATFORM_V2_WIFI_S3:
return "V2 Wifi S3"
case pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR_S3:
return "V2 Cellular S3"
case pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR_BLACK:
return "V2 Cellular Black"
case pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR_GREEN:
return "V2 Callular Green"
case pond.DevicePlatform.DEVICE_PLATFORM_V2_WIFI_BLUE:
return "V2 Wifi Blue"
case pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR_BLUE:
return "V2 Cellular Blue"
case pond.DevicePlatform.DEVICE_PLATFORM_V2_ETHERNET_BLUE:
return "V2 Ethernet Blue"
default:
return "";
}
}
public featureSupported(feature: string): boolean {
let versions = featureVersions.get(feature);
if (!versions) {

25
src/navigation/SideNavigator.tsx
View file

@ -70,19 +70,26 @@ const useStyles = makeStyles((theme: Theme) => ({
})
},
sideMenuOnClosed: {
transition: theme.transitions.create(["width", "z-index", "opacity"], {
transition: theme.transitions.create(["width"], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen
}),
overflowX: "hidden",
width: theme.spacing(7),
zIndex: theme.zIndex.drawer,
opacity: 0,
// overflowX: "hidden",
width: theme.spacing(0),
// zIndex: theme.zIndex.drawer,
// opacity: 0,
[theme.breakpoints.up("md")]: {
width: theme.spacing(9),
width: theme.spacing(9.25),
opacity: 1
}
},
sideMenuOnClosedMobile: {
transition: theme.transitions.create(["width"], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen
}),
width: theme.spacing(0),
},
list: {
paddingTop: 0
},
@ -480,7 +487,7 @@ export default function SideNavigator(props: Props) {
</Tooltip>
}
{user.hasFeature("libra-cart") &&
<Tooltip title="LibraCart" placement="right">
<Tooltip title="Libra Cart" placement="right">
<ListItemButton
id="tour-libraCart"
onClick={() => goTo("/libracart")}
@ -489,7 +496,7 @@ export default function SideNavigator(props: Props) {
<ListItemIcon>
<LibraCartIcon />
</ListItemIcon>
{open && <ListItemText primary="LibraCart" />}
{open && <ListItemText primary="Libra Cart" />}
</ListItemButton>
</Tooltip>
}
@ -504,7 +511,7 @@ export default function SideNavigator(props: Props) {
classes={{
paper: classNames(
classes.sideMenu,
open ? classes.sideMenuOpened : classes.sideMenuOnClosed
open ? classes.sideMenuOpened : (isMobile ? classes.sideMenuOnClosedMobile : classes.sideMenuOnClosed)
)
}}
anchor="left"

3
src/pages/Bin.tsx
View file

@ -810,7 +810,8 @@ export default function Bin(props: Props) {
</Grid>
<Grid size={{ xs: 12, sm: 12, md: 12, lg: 2.6 }}>
{(bin.settings.mode === pond.BinMode.BIN_MODE_DRYING ||
bin.settings.mode === pond.BinMode.BIN_MODE_HYDRATING) && (
bin.settings.mode === pond.BinMode.BIN_MODE_HYDRATING ||
bin.settings.mode === pond.BinMode.BIN_MODE_COOLDOWN) && (
<BinConditioningCard
mode={bin.settings.mode}
interactions={interactions}

2
src/pages/LibraCart.tsx
View file

@ -103,7 +103,7 @@ export default function LibraCart() {
<Grid>
<Select
//style={{ maxWidth: 110 }}
title="LibraCart Account"
title="Libra Cart Account"
displayEmpty
disableUnderline={true}
value={currentOrg}

2
src/pages/Users.tsx
View file

@ -129,7 +129,7 @@ export default function Users() {
"marketplace",
"installer",
"cnhi",
"libracart"
"libra-cart"
].sort();
const [rows, setRows] = useState<User[]>([])

23
src/pbHelpers/Power.tsx
View file

@ -71,16 +71,19 @@ export function describePower(power?: pond.DevicePower | null): PowerDescriber {
}
} else {
let thresholds = notChargingThresholds;
let suffix = "not charging";
if (power.inputVoltage >= 4) {
thresholds = chargingThresholds;
if (power.chargePercent === 100) {
suffix = "charged";
} else {
suffix = "charging";
}
}
result.description = power.chargePercent.toString() + "%, " + suffix;
// we would not actually know if it is charging here since it is just looking at the voltage now and not comparing to previous voltage
// let suffix = "not charging";
// if (power.inputVoltage >= 4) {
// thresholds = chargingThresholds;
// if (power.chargePercent === 100) {
// suffix = "charged";
// } else {
// suffix = "charging";
// }
// }
// result.description = power.chargePercent.toString() + "%, " + suffix;
// TODO: there is a plan in place to add a boolean value to power in the backend to have it check and set the boolean, we can then use that to know if it is charging or not
result.description = power.chargePercent.toString() + "%"
for (let i = 0; i < thresholds.length; i++) {
if (power.chargePercent >= thresholds[i].threshold) {
result.icon = thresholds[i].icon;

37
src/user/UserSettings.tsx
View file

@ -10,7 +10,7 @@ import {
Textsms as TextIcon,
Contrast,
} from "@mui/icons-material";
import { AppBar, Box, Button, Checkbox, CircularProgress, Collapse, Divider, FormControl, FormControlLabel, FormGroup, FormHelperText, FormLabel, Grid2, IconButton, List, ListItem, ListItemButton, ListItemIcon, ListItemText, MenuItem, Radio, RadioGroup, TextField, Theme, ToggleButton, ToggleButtonGroup, Toolbar, Tooltip, Typography } from "@mui/material";
import { AppBar, Box, Button, Checkbox, CircularProgress, Collapse, Divider, FormControl, FormControlLabel, FormGroup, FormHelperText, FormLabel, Grid2, IconButton, List, ListItem, ListItemButton, ListItemIcon, ListItemText, MenuItem, Radio, RadioGroup, Slider, TextField, Theme, ToggleButton, ToggleButtonGroup, Toolbar, Tooltip, Typography } from "@mui/material";
import ResponsiveDialog from "common/ResponsiveDialog";
import UserAvatar from "./UserAvatar";
import { useGlobalState, useSnackbar, useUserAPI } from "providers";
@ -31,6 +31,7 @@ import UnitsIcon from "@mui/icons-material/Category";
import { setThemeType } from "theme";
import { IsAdaptiveAgriculture } from "services/whiteLabel";
import { setDistanceUnit, setGrainUnit, setPressureUnit, setTemperatureUnit } from "utils";
import FieldsIcon from "products/AgIcons/FieldsIcon";
const useStyles = makeStyles((theme: Theme) => {
return ({
@ -82,7 +83,9 @@ export default function UserSettings(props: Props) {
const [avatarExpanded, setAvatarExpanded] = useState<boolean>(false);
const [notificationsExpanded, setNotificationsExpanded] = useState<boolean>(false);
const [unitsExpanded, setUnitsExpanded] = useState<boolean>(false);
const [mapsExpanded, setMapsExpanded] = useState<boolean>(false);
const [avatarUrl, setAvatarUrl] = useState<string>("");
const [sliderVal, setSliderVal] = useState(globalState.user.settings.mapZoom);
// const [themeValue, setThemeValue] = useState<"light" | "dark" | "system">(themeMode.mode)
useEffect(() => {
@ -151,6 +154,30 @@ export default function UserSettings(props: Props) {
setUser(updatedUser);
};
const changeDefaultZoom = (value: number) => {
setSliderVal(value);
let updatedUser = User.clone(user);
updatedUser.settings.mapZoom = value;
setUser(updatedUser)
};
const mapSettings = () => {
return (
<Box display="flex">
<Typography>Map Zoom Level</Typography>
<Slider
valueLabelDisplay="auto"
value={sliderVal}
min={1}
max={16}
onChange={(_, val) => {
changeDefaultZoom(val as number);
}}
/>
</Box>
);
};
const generalSettings = () => {
const { name, email, phoneNumber, timezone } = user.settings;
@ -631,15 +658,15 @@ export default function UserSettings(props: Props) {
</List>
</Collapse>
{/* <Divider />
<Divider />
<ListItem button onClick={() => setMapsExpanded(!mapsExpanded)}>
<ListItemButton onClick={() => setMapsExpanded(!mapsExpanded)}>
<ListItemIcon>
<FieldsIcon />
</ListItemIcon>
<ListItemText primary={"Map Settings"} />
{mapsExpanded ? <ExpandLess /> : <ExpandMore />}
</ListItem>
</ListItemButton>
<Collapse in={mapsExpanded} timeout="auto" unmountOnExit>
<List component="div">
<ListItem>
@ -648,7 +675,7 @@ export default function UserSettings(props: Props) {
</ListItemText>
</ListItem>
</List>
</Collapse> */}
</Collapse>
</List>
);
};

17
src/userFeatures/UserFeatures.tsx
View file

@ -17,6 +17,7 @@ import FeatureCard from "./FeatureCard";
//import { ImgIcon } from "common/ImgIcon";
//images to import for the image in the card for the feature make sure to have a 2:1 aspect ratio to keep the cards symmetrical
import FeatureImageTest from "assets/marketplaceImages/VisualFarmMPImage.png";
import LibraCartImage from "assets/marketplaceImages/Libra_Cart_temp.jpg";
// export interface FAQ {
// question: string;
@ -62,14 +63,14 @@ const agFeatureList: ProductDetails[] = [
// bulletPoints: ["bullet one", "bullet two"],
// questions: [],
},
// {
// featureName: "libra-cart",
// featureLogo: <LibraCartIcon />,
// featureCost: 0,
// cardImage: FeatureImageTest,
// featureTitle: "Libra Cart",
// longDescription: "Integrate with Libra Cart to bring your data into our platform"
// }
{
featureName: "libra-cart",
featureLogo: <LibraCartIcon />,
featureCost: 0,
cardImage: LibraCartImage,
featureTitle: "Libra Cart",
longDescription: "Integrate with Libra Cart to bring your data into our platform"
}
];
// const constructionFeatureList: ProductDetails[] = []