doing some more mobile views to load more

This commit is contained in:
csawatzky 2025-05-26 13:21:42 -06:00
parent 3368a9112f
commit fde0eb731c
8 changed files with 68 additions and 37 deletions

View file

@ -1,4 +1,4 @@
import { Box, Button, DialogActions, DialogContent, DialogTitle } from "@mui/material"; import { Box, Button, Checkbox, DialogActions, DialogContent, DialogTitle, Typography } from "@mui/material";
// import MaterialTable from "material-table"; // import MaterialTable from "material-table";
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import ResponsiveDialog from "./ResponsiveDialog"; import ResponsiveDialog from "./ResponsiveDialog";
@ -36,7 +36,7 @@ export default function(props: Props) {
width: 500 width: 500
}, },
viewerMobile: { viewerMobile: {
height: "100%", height: 500,
width: "100%" width: "100%"
}, },
page: { page: {
@ -103,12 +103,12 @@ export default function(props: Props) {
selected.push(row) selected.push(row)
}else{ //remove the page/index from the map }else{ //remove the page/index from the map
if(pageSelect){ if(pageSelect){
pageSelect.splice(pageSelect.indexOf(index)) pageSelect.splice(pageSelect.indexOf(index), 1)
} }
//remove the selected object from the array //remove the selected object from the array
selected.forEach((codeKey, index) => { selected.forEach((codeKey, index) => {
if(row.key === codeKey.key){ if(row.key === codeKey.key){
selected.splice(index) selected.splice(index, 1)
} }
}) })
} }
@ -137,35 +137,27 @@ export default function(props: Props) {
total={keyList.length} total={keyList.length}
setPage={(page) => {setTablePage(page)}} setPage={(page) => {setTablePage(page)}}
handleRowsPerPageChange={handleRowsPerPageChange} handleRowsPerPageChange={handleRowsPerPageChange}
loadMore={() => {
let clone: QrCodeKey[] = cloneDeep(keyList)
let current = cloneDeep(displayedRows)
let newRows = clone.splice(current.length, pageSize)
setDisplayedRows(current.concat(newRows))
}}
renderMobile={(row, index) => {
return (
<Box display="flex">
<Checkbox
onChange={(e, checked) => {
rowSelected(row, index, checked)
}}
/>
<Typography>
{row.name}
</Typography>
</Box>
)
}}
/> />
{/* <MaterialTable
icons={getTableIcons()}
title={""}
data={keyList}
options={{
paging: true,
// pageSize: pageSize,
// pageSizeOptions: [5, 10, 20],
padding: "dense",
showTitle: true,
toolbar: true,
sorting: true,
columnsButton: true,
search: false,
selection: true
}}
onSelectionChange={(data, rowData) => {
setSelectedKeys(data);
}}
columns={[
{
cellStyle: {
padding: 0
},
title: "Name",
field: "name"
}
]}></MaterialTable> */}
</React.Fragment> </React.Fragment>
); );
}; };

View file

@ -85,7 +85,7 @@ interface Props<T> {
multiGutter?: boolean; multiGutter?: boolean;
rowsPerPageOptions?: number[]; rowsPerPageOptions?: number[];
noDataMessage?: string; noDataMessage?: string;
renderMobile?: (row: T) => JSX.Element; renderMobile?: (row: T, index: number) => JSX.Element;
hideKeys?: boolean; hideKeys?: boolean;
onRowClick?: (row: T) => void; onRowClick?: (row: T) => void;
actions?: string | JSX.Element; actions?: string | JSX.Element;
@ -273,9 +273,9 @@ export default function ResponsiveTable<T extends Object>(props: Props<T>) {
return String(val).charAt(0).toUpperCase() + String(val).slice(1); return String(val).charAt(0).toUpperCase() + String(val).slice(1);
} }
const renderMobileRow = (row: T) => { const renderMobileRow = (row: T, index: number) => {
if (renderMobile) return ( if (renderMobile) return (
renderMobile(row) renderMobile(row, index)
) )
if (columns) { if (columns) {
return ( return (
@ -330,7 +330,7 @@ export default function ResponsiveTable<T extends Object>(props: Props<T>) {
{rows.map((row, index) => { {rows.map((row, index) => {
return ( return (
<Card className={classNames(classes.card)} key={"mobile-card-"+index} onClick={() => onRowClick&&onRowClick(row)}> <Card className={classNames(classes.card)} key={"mobile-card-"+index} onClick={() => onRowClick&&onRowClick(row)}>
{renderMobileRow(row)} {renderMobileRow(row, index)}
{renderGutter && {renderGutter &&
<> <>
<Divider/> <Divider/>

View file

@ -369,6 +369,12 @@ export default function ContractTransactionTable(props: Props) {
total={tableData.length} total={tableData.length}
handleRowsPerPageChange={(e)=>{setPageSize(e.target.value)}} handleRowsPerPageChange={(e)=>{setPageSize(e.target.value)}}
setPage={(page)=>{setTablePage(page)}} setPage={(page)=>{setTablePage(page)}}
loadMore={()=>{
let clone: Transaction[] = cloneDeep(tableData)
let current = cloneDeep(displayData)
let newRows = clone.splice(current.length, pageSize)
setDisplayData(current.concat(newRows))
}}
/> />
{/* <MaterialTable {/* <MaterialTable
title={"Deliveries"} title={"Deliveries"}

View file

@ -127,6 +127,7 @@ export default function GateFlowGraph(props: Props) {
setRuntime(moment.duration(runtime)); setRuntime(moment.duration(runtime));
let state = false; let state = false;
if ( if (
data.length > 1 &&
data[data.length - 1].value > gate.lowerFlow() && data[data.length - 1].value > gate.lowerFlow() &&
data[data.length - 1].value < gate.upperFlow() data[data.length - 1].value < gate.upperFlow()
) { ) {

View file

@ -12,6 +12,7 @@ import AddGateFab from "./AddGateFab";
import GateSettings from "./GateSettings"; import GateSettings from "./GateSettings";
import { useGateAPI, useGlobalState } from "providers"; import { useGateAPI, useGlobalState } from "providers";
import { Settings } from "@mui/icons-material"; import { Settings } from "@mui/icons-material";
import { cloneDeep } from "lodash";
interface Props { interface Props {
//gates: Gate[]; //gates: Gate[];
@ -219,6 +220,19 @@ export default function GateList(props: Props) {
onRowClick={(gate) => {goToGate(gate)}} onRowClick={(gate) => {goToGate(gate)}}
hideKeys={isMobile || props.useMobile} hideKeys={isMobile || props.useMobile}
setSearchText={(search) => setSearch(search)} setSearchText={(search) => setSearch(search)}
loadMore={()=>{
let current = cloneDeep(gates)
let keys = undefined
let types = undefined
if(currentTerminal) {
keys = [currentTerminal]
types = ["terminal"]
}
gateAPI.listGates(pageSize, current.length , "asc", "name", search, undefined, keys, types, undefined, undefined, as).then(resp => {
let newGates = resp.data.gates.map(gate => Gate.create(gate))
setGates(current.concat(newGates))
})
}}
/> />
) )
}; };

View file

@ -183,7 +183,7 @@ export default function GroupDrawer(props: Props) {
onRowClick={toDevice} onRowClick={toDevice}
handleRowsPerPageChange={()=>{}} handleRowsPerPageChange={()=>{}}
setPage={()=>{}} setPage={()=>{}}
total={0} total={grpDevs.length}
rows={grpDevs} rows={grpDevs}
renderMobile={mobile} renderMobile={mobile}
renderGutter={gutter} renderGutter={gutter}

View file

@ -1117,6 +1117,7 @@ export default function Bins(props: Props) {
<MenuItem <MenuItem
onClick={() => { onClick={() => {
setOpenQrGenerator(true); setOpenQrGenerator(true);
setBinMenuAnchorEl(null)
}}> }}>
<Typography>Generate QR Codes</Typography> <Typography>Generate QR Codes</Typography>
</MenuItem> </MenuItem>

View file

@ -39,6 +39,7 @@ import { useGlobalState } from "providers";
import { useCallback, useEffect, useState } from "react"; import { useCallback, useEffect, useState } from "react";
import { downloadFile } from "utils/download"; import { downloadFile } from "utils/download";
import { or } from "utils/types"; import { or } from "utils/types";
import { cloneDeep } from "lodash";
const useStyles = makeStyles((theme: Theme) => { const useStyles = makeStyles((theme: Theme) => {
const themeType = useThemeType() const themeType = useThemeType()
@ -463,6 +464,22 @@ export default function Firmware() {
columns={columns(width === "xs" || width === "sm")} columns={columns(width === "xs" || width === "sm")}
setPage={(page)=>{setTablePage(page)}} setPage={(page)=>{setTablePage(page)}}
handleRowsPerPageChange={(e)=>{setPageSize(e.target.value)}} handleRowsPerPageChange={(e)=>{setPageSize(e.target.value)}}
loadMore={() => {
let current = cloneDeep(tableData)
firmwareAPI.listFirmware(pageSize, current.length, "desc", "version", searchText)
.then((response) => {
let newRows: FirmwareModel[] = or(response.data.firmware, []).map(
(firmwareData: any) => {
return FirmwareModel.create(pond.Firmware.fromObject(firmwareData));
}
);
setTableData(current.concat(newRows))
})
.catch(() => {
//failed to load
error("Failed to load more firmware versions")
});
}}
/> />
</Box> </Box>
<UploadFirmware <UploadFirmware