add a setting to alert if extraction is under desired level

This commit is contained in:
calli
2025-12-30 17:49:25 +02:00
parent 9de91f9982
commit 7a09503ffa
8 changed files with 97 additions and 21 deletions

View File

@@ -22,15 +22,17 @@ interface AccountTotals {
totalExtractors: number; totalExtractors: number;
} }
const calculateAlertState = (planetDetails: PlanetCalculations): AlertState => { const calculateAlertState = (planetDetails: PlanetCalculations, minExtractionRate: number): AlertState => {
const hasLowStorage = planetDetails.storageInfo.some(storage => storage.fillRate > 60); const hasLowStorage = planetDetails.storageInfo.some(storage => storage.fillRate > 60);
const hasLowImports = planetDetails.importDepletionTimes.some(depletion => depletion.hoursUntilDepletion < 24); const hasLowImports = planetDetails.importDepletionTimes.some(depletion => depletion.hoursUntilDepletion < 24);
const hasLowExtractionRate = planetDetails.extractorAverages.length > 0 && minExtractionRate > 0 && planetDetails.extractorAverages.some(avg => avg.averagePerHour < minExtractionRate);
return { return {
expired: planetDetails.expired, expired: planetDetails.expired,
hasLowStorage, hasLowStorage,
hasLowImports, hasLowImports,
hasLargeExtractorDifference: planetDetails.hasLargeExtractorDifference hasLargeExtractorDifference: planetDetails.hasLargeExtractorDifference,
hasLowExtractionRate
}; };
}; };
@@ -228,7 +230,7 @@ const calculateAccountTotals = (characters: AccessToken[], piPrices: EvePraisalR
export const AccountCard = ({ characters, isCollapsed: propIsCollapsed }: { characters: AccessToken[], isCollapsed?: boolean }) => { export const AccountCard = ({ characters, isCollapsed: propIsCollapsed }: { characters: AccessToken[], isCollapsed?: boolean }) => {
const theme = useTheme(); const theme = useTheme();
const [localIsCollapsed, setLocalIsCollapsed] = useState(false); const [localIsCollapsed, setLocalIsCollapsed] = useState(false);
const { planMode, piPrices, alertMode, balanceThreshold } = useContext(SessionContext); const { planMode, piPrices, alertMode, balanceThreshold, minExtractionRate } = useContext(SessionContext);
const { monthlyEstimate, storageValue, planetCount, characterCount, runningExtractors, totalExtractors } = calculateAccountTotals(characters, piPrices); const { monthlyEstimate, storageValue, planetCount, characterCount, runningExtractors, totalExtractors } = calculateAccountTotals(characters, piPrices);
// Calculate planet details and alert states for each planet // Calculate planet details and alert states for each planet
@@ -237,7 +239,7 @@ export const AccountCard = ({ characters, isCollapsed: propIsCollapsed }: { char
const details = calculatePlanetDetails(planet, piPrices, balanceThreshold); const details = calculatePlanetDetails(planet, piPrices, balanceThreshold);
acc[`${character.character.characterId}-${planet.planet_id}`] = { acc[`${character.character.characterId}-${planet.planet_id}`] = {
...details, ...details,
alertState: calculateAlertState(details) alertState: calculateAlertState(details, minExtractionRate)
}; };
}); });
return acc; return acc;
@@ -254,16 +256,18 @@ export const AccountCard = ({ characters, isCollapsed: propIsCollapsed }: { char
if (alertState.hasLowStorage) return 'visible'; if (alertState.hasLowStorage) return 'visible';
if (alertState.hasLowImports) return 'visible'; if (alertState.hasLowImports) return 'visible';
if (alertState.hasLargeExtractorDifference) return 'visible'; if (alertState.hasLargeExtractorDifference) return 'visible';
if (alertState.hasLowExtractionRate) return 'visible';
return 'hidden'; return 'hidden';
}; };
// Check if any planet in the account has alerts // Check if any planet in the account has alerts
const hasAnyAlerts = Object.values(planetDetails).some(details => { const hasAnyAlerts = Object.values(planetDetails).some(details => {
const alertState = calculateAlertState(details); const alertState = calculateAlertState(details, minExtractionRate);
return alertState.expired || return alertState.expired ||
alertState.hasLowStorage || alertState.hasLowStorage ||
alertState.hasLowImports || alertState.hasLowImports ||
alertState.hasLargeExtractorDifference; alertState.hasLargeExtractorDifference ||
alertState.hasLowExtractionRate;
}); });
// If in alert mode and no alerts, hide the entire card // If in alert mode and no alerts, hide the entire card

View File

@@ -1,8 +1,9 @@
import React from 'react'; import React, { useContext } from 'react';
import { Box, Paper, Typography, Stack } from '@mui/material'; import { Box, Paper, Typography, Stack } from '@mui/material';
import { Line } from 'react-chartjs-2'; import { Line } from 'react-chartjs-2';
import { getProgramOutputPrediction } from './ExtractionSimulation'; import { getProgramOutputPrediction } from './ExtractionSimulation';
import { PI_TYPES_MAP } from '@/const'; import { PI_TYPES_MAP } from '@/const';
import { SessionContext } from '@/app/context/Context';
import { import {
Chart as ChartJS, Chart as ChartJS,
CategoryScale, CategoryScale,
@@ -41,6 +42,7 @@ interface ExtractionSimulationTooltipProps {
export const ExtractionSimulationTooltip: React.FC<ExtractionSimulationTooltipProps> = ({ export const ExtractionSimulationTooltip: React.FC<ExtractionSimulationTooltipProps> = ({
extractors extractors
}) => { }) => {
const { minExtractionRate } = useContext(SessionContext);
const CYCLE_TIME = 30 * 60; // 30 minutes in seconds const CYCLE_TIME = 30 * 60; // 30 minutes in seconds
// Calculate program duration and cycles for each extractor // Calculate program duration and cycles for each extractor
@@ -159,8 +161,15 @@ export const ExtractionSimulationTooltip: React.FC<ExtractionSimulationTooltipPr
<Typography variant="body2"> <Typography variant="body2">
Average per Cycle: {(totalOutput / cycles).toFixed(1)} units Average per Cycle: {(totalOutput / cycles).toFixed(1)} units
</Typography> </Typography>
<Typography variant="body2"> <Typography
Average per hour: {(totalOutput / cycles * 2).toFixed(1)} units variant="body2"
color={
minExtractionRate > 0 && (extractors[idx].baseValue * 3600) / extractors[idx].cycleTime < minExtractionRate
? 'error'
: 'inherit'
}
>
Average per hour: {((extractors[idx].baseValue * 3600) / extractors[idx].cycleTime).toFixed(1)} units
</Typography> </Typography>
<Typography variant="body2"> <Typography variant="body2">
Expires in: <Countdown overtime={true} date={DateTime.fromISO(expiryTime).toMillis()} /> Expires in: <Countdown overtime={true} date={DateTime.fromISO(expiryTime).toMillis()} />

View File

@@ -8,7 +8,7 @@ import { PlanetCalculations } from "@/types/planet";
import React, { useContext } from "react"; import React, { useContext } from "react";
import { DateTime } from "luxon"; import { DateTime } from "luxon";
import Countdown from "react-countdown"; import Countdown from "react-countdown";
import { ColorContext } from "@/app/context/Context"; import { ColorContext, SessionContext } from "@/app/context/Context";
import { ExtractionSimulationTooltip } from "./ExtractionSimulationTooltip"; import { ExtractionSimulationTooltip } from "./ExtractionSimulationTooltip";
import { timeColor } from "./alerts"; import { timeColor } from "./alerts";
@@ -40,6 +40,7 @@ export const PlanetCard = ({
}) => { }) => {
const theme = useTheme(); const theme = useTheme();
const { colors } = useContext(ColorContext); const { colors } = useContext(ColorContext);
const { minExtractionRate } = useContext(SessionContext);
const extractorConfigs: ExtractorConfig[] = planetDetails.extractors const extractorConfigs: ExtractorConfig[] = planetDetails.extractors
.filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle) .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
@@ -51,6 +52,8 @@ export const PlanetCard = ({
expiryTime: e.expiry_time ?? "" expiryTime: e.expiry_time ?? ""
})); }));
const hasLowExtractionRate = planetDetails.extractorAverages.length > 0 && minExtractionRate > 0 && planetDetails.extractorAverages.some(avg => avg.averagePerHour < minExtractionRate);
return ( return (
<Tooltip <Tooltip
title={ title={
@@ -114,9 +117,30 @@ export const PlanetCard = ({
/> />
)} )}
<div style={{ position: "absolute", top: 5, left: 10 }}> <div style={{ position: "absolute", top: 5, left: 10 }}>
<Typography fontSize={theme.custom.smallText}> <Typography
fontSize={theme.custom.smallText}
color={(planetDetails.hasLargeExtractorDifference || hasLowExtractionRate) ? 'error' : 'inherit'}
>
{planet.infoUniverse?.name} {planet.infoUniverse?.name}
</Typography> </Typography>
{planetDetails.hasLargeExtractorDifference && (
<Typography
fontSize={theme.custom.smallText}
color="error"
sx={{ opacity: 0.7 }}
>
off-balance
</Typography>
)}
{hasLowExtractionRate && (
<Typography
fontSize={theme.custom.smallText}
color="error"
sx={{ opacity: 0.7 }}
>
low-extraction
</Typography>
)}
{planetDetails.extractors.map((e, idx) => { {planetDetails.extractors.map((e, idx) => {
const average = planetDetails.extractorAverages[idx]; const average = planetDetails.extractorAverages[idx];
return ( return (

View File

@@ -55,7 +55,7 @@ export const PlanetTableRow = ({
planetDetails: PlanetCalculations; planetDetails: PlanetCalculations;
}) => { }) => {
const theme = useTheme(); const theme = useTheme();
const { showProductIcons, extractionTimeMode, alertMode } = useContext(SessionContext); const { showProductIcons, extractionTimeMode, alertMode, minExtractionRate } = useContext(SessionContext);
const { colors } = useContext(ColorContext); const { colors } = useContext(ColorContext);
const [planetRenderOpen, setPlanetRenderOpen] = useState(false); const [planetRenderOpen, setPlanetRenderOpen] = useState(false);
@@ -103,11 +103,13 @@ export const PlanetTableRow = ({
}; };
// Check if there are any alerts // Check if there are any alerts
const hasLowExtractionRate = planetDetails.extractorAverages.length > 0 && minExtractionRate > 0 && planetDetails.extractorAverages.some(avg => avg.averagePerHour < minExtractionRate);
const hasAlerts = alertMode && ( const hasAlerts = alertMode && (
planetDetails.expired || planetDetails.expired ||
planetDetails.storageInfo.some(storage => storage.fillRate > 60) || planetDetails.storageInfo.some(storage => storage.fillRate > 60) ||
planetDetails.importDepletionTimes.some(depletion => depletion.hoursUntilDepletion < 24) || planetDetails.importDepletionTimes.some(depletion => depletion.hoursUntilDepletion < 24) ||
planetDetails.hasLargeExtractorDifference planetDetails.hasLargeExtractorDifference ||
hasLowExtractionRate
); );
// If in alert mode and no alerts, hide the row // If in alert mode and no alerts, hide the row
@@ -227,7 +229,7 @@ export const PlanetTableRow = ({
<Stack spacing={0}> <Stack spacing={0}>
<Typography <Typography
fontSize={theme.custom.smallText} fontSize={theme.custom.smallText}
color={planetDetails.hasLargeExtractorDifference ? 'error' : 'inherit'} color={(planetDetails.hasLargeExtractorDifference || hasLowExtractionRate) ? 'error' : 'inherit'}
> >
{planetInfoUniverse?.name} {planetInfoUniverse?.name}
</Typography> </Typography>
@@ -240,6 +242,15 @@ export const PlanetTableRow = ({
off-balance off-balance
</Typography> </Typography>
)} )}
{hasLowExtractionRate && (
<Typography
fontSize={theme.custom.smallText}
color="error"
sx={{ opacity: 0.7 }}
>
low-extraction
</Typography>
)}
</Stack> </Stack>
</Tooltip> </Tooltip>
</div> </div>

View File

@@ -21,7 +21,7 @@ import React, { useState, useContext } from "react";
export const SettingsButton = () => { export const SettingsButton = () => {
const { colors, setColors } = useContext(ColorContext); const { colors, setColors } = useContext(ColorContext);
const { balanceThreshold, setBalanceThreshold, showProductIcons, setShowProductIcons } = useContext(SessionContext); const { balanceThreshold, setBalanceThreshold, minExtractionRate, setMinExtractionRate, showProductIcons, setShowProductIcons } = useContext(SessionContext);
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const handleClickOpen = () => { const handleClickOpen = () => {
@@ -51,6 +51,13 @@ export const SettingsButton = () => {
setShowProductIcons(event.target.checked); setShowProductIcons(event.target.checked);
}; };
const handleMinExtractionRateChange = (event: React.ChangeEvent<HTMLInputElement>) => {
const value = parseInt(event.target.value);
if (!isNaN(value) && value >= 0 && value <= 100000) {
setMinExtractionRate(value);
}
};
return ( return (
<Tooltip title="Toggle settings dialog"> <Tooltip title="Toggle settings dialog">
<> <>
@@ -93,6 +100,19 @@ export const SettingsButton = () => {
error={balanceThreshold < 0 || balanceThreshold > 100000} error={balanceThreshold < 0 || balanceThreshold > 100000}
/> />
</Box> </Box>
<Box sx={{ mt: 2 }}>
<Typography variant="subtitle1">Minimum Extraction Rate</Typography>
<TextField
type="number"
value={minExtractionRate}
onChange={handleMinExtractionRateChange}
fullWidth
margin="normal"
inputProps={{ min: 0, max: 100000 }}
helperText="Alert if extraction per hour is below this value (0-100,000, 0 = disabled)"
error={minExtractionRate < 0 || minExtractionRate > 100000}
/>
</Box>
{Object.keys(colors).map((key) => { {Object.keys(colors).map((key) => {
return ( return (
<div key={`color-row-${key}`}> <div key={`color-row-${key}`}>

View File

@@ -39,6 +39,8 @@ export const SessionContext = createContext<{
}) => PlanetConfig; }) => PlanetConfig;
balanceThreshold: number; balanceThreshold: number;
setBalanceThreshold: Dispatch<SetStateAction<number>>; setBalanceThreshold: Dispatch<SetStateAction<number>>;
minExtractionRate: number;
setMinExtractionRate: Dispatch<SetStateAction<number>>;
showProductIcons: boolean; showProductIcons: boolean;
setShowProductIcons: (show: boolean) => void; setShowProductIcons: (show: boolean) => void;
}>({ }>({
@@ -68,6 +70,8 @@ export const SessionContext = createContext<{
}, },
balanceThreshold: 1000, balanceThreshold: 1000,
setBalanceThreshold: () => {}, setBalanceThreshold: () => {},
minExtractionRate: 0,
setMinExtractionRate: () => {},
showProductIcons: false, showProductIcons: false,
setShowProductIcons: () => {}, setShowProductIcons: () => {},
}); });

View File

@@ -46,6 +46,7 @@ const Home = () => {
undefined, undefined,
); );
const [balanceThreshold, setBalanceThreshold] = useState(1000); const [balanceThreshold, setBalanceThreshold] = useState(1000);
const [minExtractionRate, setMinExtractionRate] = useState(0);
const [showProductIcons, setShowProductIcons] = useState(false); const [showProductIcons, setShowProductIcons] = useState(false);
const [extractionTimeMode, setExtractionTimeMode] = useState(false); const [extractionTimeMode, setExtractionTimeMode] = useState(false);
@@ -305,6 +306,8 @@ const Home = () => {
readPlanetConfig, readPlanetConfig,
balanceThreshold, balanceThreshold,
setBalanceThreshold, setBalanceThreshold,
minExtractionRate,
setMinExtractionRate,
showProductIcons, showProductIcons,
setShowProductIcons, setShowProductIcons,
}} }}

View File

@@ -32,6 +32,7 @@ export interface AlertState {
hasLowStorage: boolean; hasLowStorage: boolean;
hasLowImports: boolean; hasLowImports: boolean;
hasLargeExtractorDifference: boolean; hasLargeExtractorDifference: boolean;
hasLowExtractionRate: boolean;
} }
export interface ExtractorAverage { export interface ExtractorAverage {