diff --git a/src/ui/ActiveScripts/WorkerScriptAccordion.tsx b/src/ui/ActiveScripts/WorkerScriptAccordion.tsx index 5e3ae1732..1e17ef2e2 100644 --- a/src/ui/ActiveScripts/WorkerScriptAccordion.tsx +++ b/src/ui/ActiveScripts/WorkerScriptAccordion.tsx @@ -6,6 +6,10 @@ import * as React from "react"; import { numeralWrapper } from "../numeralFormat"; +import Table from "@mui/material/Table"; +import TableCell from "@mui/material/TableCell"; +import TableRow from "@mui/material/TableRow"; +import TableBody from "@mui/material/TableBody"; import Button from "@mui/material/Button"; import Box from "@mui/material/Box"; import Paper from "@mui/material/Paper"; @@ -19,6 +23,8 @@ import IconButton from "@mui/material/IconButton"; import DeleteIcon from "@mui/icons-material/Delete"; import ListItemButton from "@mui/material/ListItemButton"; import ListItemText from "@mui/material/ListItemText"; +import makeStyles from "@mui/styles/makeStyles"; +import createStyles from "@mui/styles/createStyles"; import Collapse from "@mui/material/Collapse"; import ExpandMore from "@mui/icons-material/ExpandMore"; @@ -32,12 +38,20 @@ import { logBoxCreate } from "../../../utils/LogBox"; import { convertTimeMsToTimeElapsedString } from "../../../utils/StringHelperFunctions"; import { arrayToString } from "../../../utils/helpers/arrayToString"; import { Money } from "../React/Money"; +import { MoneyRate } from "../React/MoneyRate"; + +const useStyles = makeStyles({ + noborder: { + borderBottom: "none", + }, +}); type IProps = { workerScript: WorkerScript; }; export function WorkerScriptAccordion(props: IProps): React.ReactElement { + const classes = useStyles(); const [open, setOpen] = React.useState(false); const workerScript = props.workerScript; const scriptRef = workerScript.scriptRef; @@ -59,33 +73,94 @@ export function WorkerScriptAccordion(props: IProps): React.ReactElement { return ( <> setOpen((old) => !old)} component={Paper}> - └ {props.workerScript.name}} - /> + └ {props.workerScript.name}} /> {open ? : } - -
Threads: {numeralWrapper.formatThreads(props.workerScript.scriptRef.threads)}
-
Args: {arrayToString(props.workerScript.args)}
-
Online Time: {convertTimeMsToTimeElapsedString(scriptRef.onlineRunningTime * 1e3)}
-
Offline Time: {convertTimeMsToTimeElapsedString(scriptRef.offlineRunningTime * 1e3)}
-
-            Total online production: 
-          
-
{Array(26).join(" ") + numeralWrapper.formatExp(scriptRef.onlineExpGained) + " hacking exp"}
-
-            Online production rate:  / second
-          
-
{Array(25).join(" ") + numeralWrapper.formatExp(onlineEps) + " hacking exp / second"}
-
-            Total offline production: 
-          
-
{Array(27).join(" ") + numeralWrapper.formatExp(scriptRef.offlineExpGained) + " hacking exp"}
-
-            Offline production rate:  / second
-          
-
{Array(26).join(" ") + numeralWrapper.formatExp(offlineEps) + " hacking exp / second"}
+ + + + + + Threads: + + + {numeralWrapper.formatThreads(props.workerScript.scriptRef.threads)} + + + + + Args: {arrayToString(props.workerScript.args)} + + + + + Online Time: + + + {convertTimeMsToTimeElapsedString(scriptRef.onlineRunningTime * 1e3)} + + + + + Offline Time: + + + {convertTimeMsToTimeElapsedString(scriptRef.offlineRunningTime * 1e3)} + + + + + Total online production: + + + + + + + + + + +  {numeralWrapper.formatExp(scriptRef.onlineExpGained) + " hacking exp"} + + + + + + Online production rate: + + + + + + + + + + +  {numeralWrapper.formatExp(onlineEps) + " hacking exp / sec"} + + + + + + Total offline production: + + + + + + + + + + +  {numeralWrapper.formatExp(scriptRef.offlineExpGained) + " hacking exp"} + + + +