add planet extraction simulation to tooltip
This commit is contained in:
@@ -0,0 +1,174 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { Box, Paper, Typography, Stack } from '@mui/material';
|
||||||
|
import { Line } from 'react-chartjs-2';
|
||||||
|
import { getProgramOutputPrediction } from './ExtractionSimulation';
|
||||||
|
import { PI_TYPES_MAP } from '@/const';
|
||||||
|
import {
|
||||||
|
Chart as ChartJS,
|
||||||
|
CategoryScale,
|
||||||
|
LinearScale,
|
||||||
|
PointElement,
|
||||||
|
LineElement,
|
||||||
|
Title,
|
||||||
|
Tooltip,
|
||||||
|
Legend
|
||||||
|
} from 'chart.js';
|
||||||
|
import { DateTime } from 'luxon';
|
||||||
|
import Countdown from 'react-countdown';
|
||||||
|
|
||||||
|
ChartJS.register(
|
||||||
|
CategoryScale,
|
||||||
|
LinearScale,
|
||||||
|
PointElement,
|
||||||
|
LineElement,
|
||||||
|
Title,
|
||||||
|
Tooltip,
|
||||||
|
Legend
|
||||||
|
);
|
||||||
|
|
||||||
|
interface ExtractorConfig {
|
||||||
|
typeId: number;
|
||||||
|
baseValue: number;
|
||||||
|
cycleTime: number;
|
||||||
|
installTime: string;
|
||||||
|
expiryTime: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ExtractionSimulationTooltipProps {
|
||||||
|
extractors: ExtractorConfig[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export const ExtractionSimulationTooltip: React.FC<ExtractionSimulationTooltipProps> = ({
|
||||||
|
extractors
|
||||||
|
}) => {
|
||||||
|
const CYCLE_TIME = 30 * 60; // 30 minutes in seconds
|
||||||
|
|
||||||
|
// Calculate program duration and cycles for each extractor
|
||||||
|
const extractorPrograms = extractors.map(extractor => {
|
||||||
|
const installDate = new Date(extractor.installTime);
|
||||||
|
const expiryDate = new Date(extractor.expiryTime);
|
||||||
|
const programDuration = (expiryDate.getTime() - installDate.getTime()) / 1000; // Convert to seconds
|
||||||
|
return {
|
||||||
|
...extractor,
|
||||||
|
programDuration,
|
||||||
|
cycles: Math.floor(programDuration / CYCLE_TIME)
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const maxCycles = Math.max(...extractorPrograms.map(e => e.cycles));
|
||||||
|
|
||||||
|
// Get output predictions for each extractor
|
||||||
|
const extractorOutputs = extractorPrograms.map(extractor => ({
|
||||||
|
typeId: extractor.typeId,
|
||||||
|
cycleTime: CYCLE_TIME,
|
||||||
|
cycles: extractor.cycles,
|
||||||
|
prediction: getProgramOutputPrediction(
|
||||||
|
extractor.baseValue,
|
||||||
|
CYCLE_TIME,
|
||||||
|
extractor.cycles
|
||||||
|
)
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Create datasets for the chart
|
||||||
|
const datasets = extractorOutputs.map((output, index) => {
|
||||||
|
const hue = (360 / extractors.length) * index;
|
||||||
|
return {
|
||||||
|
label: `${PI_TYPES_MAP[output.typeId]?.name ?? `Resource ${output.typeId}`}`,
|
||||||
|
data: output.prediction,
|
||||||
|
borderColor: `hsl(${hue}, 70%, 50%)`,
|
||||||
|
backgroundColor: `hsl(${hue}, 70%, 80%)`,
|
||||||
|
tension: 0.4
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const chartData = {
|
||||||
|
labels: Array.from({ length: maxCycles }, (_, i) => {
|
||||||
|
return (i % 4 === 0) ? `Cycle ${i + 1}` : '';
|
||||||
|
}),
|
||||||
|
datasets
|
||||||
|
};
|
||||||
|
|
||||||
|
const chartOptions = {
|
||||||
|
responsive: true,
|
||||||
|
maintainAspectRatio: false,
|
||||||
|
plugins: {
|
||||||
|
legend: {
|
||||||
|
position: 'top' as const,
|
||||||
|
},
|
||||||
|
title: {
|
||||||
|
display: true,
|
||||||
|
text: 'Extraction Output Prediction'
|
||||||
|
},
|
||||||
|
tooltip: {
|
||||||
|
callbacks: {
|
||||||
|
title: (context: any) => `Cycle ${context[0].dataIndex + 1}`,
|
||||||
|
label: (context: any) => `Output: ${context.raw.toFixed(1)} units`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
scales: {
|
||||||
|
y: {
|
||||||
|
beginAtZero: true,
|
||||||
|
title: {
|
||||||
|
display: true,
|
||||||
|
text: 'Units per Cycle'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
x: {
|
||||||
|
ticks: {
|
||||||
|
autoSkip: true,
|
||||||
|
maxTicksLimit: 24
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Paper sx={{ p: 1, bgcolor: 'background.paper', minWidth: 800 }}>
|
||||||
|
<Stack direction="row" spacing={2} sx={{ width: '100%' }}>
|
||||||
|
<Box sx={{ flex: 1, minWidth: 0 }}>
|
||||||
|
<div style={{ height: '200px' }}>
|
||||||
|
<Line data={chartData} options={chartOptions} />
|
||||||
|
</div>
|
||||||
|
</Box>
|
||||||
|
<Box sx={{ flex: 1, minWidth: 0 }}>
|
||||||
|
<Stack spacing={1}>
|
||||||
|
{extractorPrograms.map(({ typeId, cycleTime, cycles, installTime, expiryTime }) => {
|
||||||
|
const prediction = getProgramOutputPrediction(
|
||||||
|
extractors.find(e => e.typeId === typeId)?.baseValue || 0,
|
||||||
|
CYCLE_TIME,
|
||||||
|
cycles
|
||||||
|
);
|
||||||
|
const totalOutput = prediction.reduce((sum, val) => sum + val, 0);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Paper key={typeId} sx={{ p: 1, bgcolor: 'background.default' }}>
|
||||||
|
<Typography variant="subtitle2">
|
||||||
|
{PI_TYPES_MAP[typeId]?.name}
|
||||||
|
</Typography>
|
||||||
|
<Stack spacing={0.5}>
|
||||||
|
<Typography variant="body2">
|
||||||
|
• Total Output: {totalOutput.toFixed(1)} units per program
|
||||||
|
</Typography>
|
||||||
|
<Typography variant="body2">
|
||||||
|
• Cycle Time: {(cycleTime / 60).toFixed(1)} minutes
|
||||||
|
</Typography>
|
||||||
|
<Typography variant="body2">
|
||||||
|
• Program Cycles: {cycles}
|
||||||
|
</Typography>
|
||||||
|
<Typography variant="body2">
|
||||||
|
• Average per Cycle: {(totalOutput / cycles).toFixed(1)} units
|
||||||
|
</Typography>
|
||||||
|
<Typography variant="body2">
|
||||||
|
• Expires in: <Countdown overtime={true} date={DateTime.fromISO(expiryTime).toMillis()} />
|
||||||
|
</Typography>
|
||||||
|
</Stack>
|
||||||
|
</Paper>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Stack>
|
||||||
|
</Box>
|
||||||
|
</Stack>
|
||||||
|
</Paper>
|
||||||
|
);
|
||||||
|
};
|
@@ -20,6 +20,7 @@ import { PlanetConfigDialog } from "../PlanetConfig/PlanetConfigDialog";
|
|||||||
import PinsCanvas3D from "./PinsCanvas3D";
|
import PinsCanvas3D from "./PinsCanvas3D";
|
||||||
import { alertModeVisibility, timeColor } from "./timeColors";
|
import { alertModeVisibility, timeColor } from "./timeColors";
|
||||||
import { ExtractionSimulationDisplay } from './ExtractionSimulationDisplay';
|
import { ExtractionSimulationDisplay } from './ExtractionSimulationDisplay';
|
||||||
|
import { ExtractionSimulationTooltip } from './ExtractionSimulationTooltip';
|
||||||
import { ProductionNode } from './ExtractionSimulation';
|
import { ProductionNode } from './ExtractionSimulation';
|
||||||
import { Collapse, Box, Stack } from "@mui/material";
|
import { Collapse, Box, Stack } from "@mui/material";
|
||||||
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
|
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
|
||||||
@@ -160,7 +161,38 @@ export const PlanetTableRow = ({
|
|||||||
height={theme.custom.cardImageSize / 6}
|
height={theme.custom.cardImageSize / 6}
|
||||||
style={{ marginRight: "5px" }}
|
style={{ marginRight: "5px" }}
|
||||||
/>
|
/>
|
||||||
{planetInfoUniverse?.name}
|
<Tooltip
|
||||||
|
placement="right"
|
||||||
|
title={
|
||||||
|
<ExtractionSimulationTooltip
|
||||||
|
extractors={extractors
|
||||||
|
.filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
|
||||||
|
.map(e => ({
|
||||||
|
typeId: e.extractor_details!.product_type_id!,
|
||||||
|
baseValue: e.extractor_details!.qty_per_cycle!,
|
||||||
|
cycleTime: e.extractor_details!.cycle_time || 3600,
|
||||||
|
installTime: e.install_time ?? "",
|
||||||
|
expiryTime: e.expiry_time ?? ""
|
||||||
|
}))}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
componentsProps={{
|
||||||
|
tooltip: {
|
||||||
|
sx: {
|
||||||
|
bgcolor: 'background.paper',
|
||||||
|
'& .MuiTooltip-arrow': {
|
||||||
|
color: 'background.paper',
|
||||||
|
},
|
||||||
|
maxWidth: 'none',
|
||||||
|
width: 'fit-content'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Typography fontSize={theme.custom.smallText}>
|
||||||
|
{planetInfoUniverse?.name}
|
||||||
|
</Typography>
|
||||||
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
@@ -383,18 +415,38 @@ export const PlanetTableRow = ({
|
|||||||
<TableCell colSpan={6} style={{ paddingBottom: 0, paddingTop: 0 }}>
|
<TableCell colSpan={6} style={{ paddingBottom: 0, paddingTop: 0 }}>
|
||||||
<Collapse in={simulationOpen} timeout="auto" unmountOnExit>
|
<Collapse in={simulationOpen} timeout="auto" unmountOnExit>
|
||||||
<Box sx={{ my: 2 }}>
|
<Box sx={{ my: 2 }}>
|
||||||
<ExtractionSimulationDisplay
|
<Tooltip
|
||||||
extractors={extractors
|
placement="right"
|
||||||
.filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
|
title={
|
||||||
.map(e => ({
|
<ExtractionSimulationTooltip
|
||||||
typeId: e.extractor_details!.product_type_id!,
|
extractors={extractors
|
||||||
baseValue: e.extractor_details!.qty_per_cycle!,
|
.filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
|
||||||
cycleTime: e.extractor_details!.cycle_time || 3600,
|
.map(e => ({
|
||||||
installTime: e.install_time ?? "",
|
typeId: e.extractor_details!.product_type_id!,
|
||||||
expiryTime: e.expiry_time ?? ""
|
baseValue: e.extractor_details!.qty_per_cycle!,
|
||||||
}))}
|
cycleTime: e.extractor_details!.cycle_time || 3600,
|
||||||
productionNodes={productionNodes}
|
installTime: e.install_time ?? "",
|
||||||
/>
|
expiryTime: e.expiry_time ?? ""
|
||||||
|
}))}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
componentsProps={{
|
||||||
|
tooltip: {
|
||||||
|
sx: {
|
||||||
|
bgcolor: 'background.paper',
|
||||||
|
'& .MuiTooltip-arrow': {
|
||||||
|
color: 'background.paper',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<Typography fontSize={theme.custom.smallText}>
|
||||||
|
{planetInfoUniverse?.name}
|
||||||
|
</Typography>
|
||||||
|
</div>
|
||||||
|
</Tooltip>
|
||||||
</Box>
|
</Box>
|
||||||
</Collapse>
|
</Collapse>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
|
@@ -1,7 +1,6 @@
|
|||||||
import { EvePraisalResult } from "@/eve-praisal";
|
import { EvePraisalResult } from "@/eve-praisal";
|
||||||
import { AccessToken, CharacterUpdate } from "@/types";
|
import { AccessToken, CharacterUpdate, PlanetConfig } from "@/types";
|
||||||
import { Dispatch, SetStateAction, createContext } from "react";
|
import { Dispatch, SetStateAction, createContext } from "react";
|
||||||
import { PlanetConfig } from "../components/PlanetConfig/PlanetConfigDialog";
|
|
||||||
|
|
||||||
export const CharacterContext = createContext<{
|
export const CharacterContext = createContext<{
|
||||||
characters: AccessToken[];
|
characters: AccessToken[];
|
||||||
|
@@ -17,7 +17,7 @@ import {
|
|||||||
import { useSearchParams } from "next/navigation";
|
import { useSearchParams } from "next/navigation";
|
||||||
import { EvePraisalResult, fetchAllPrices } from "@/eve-praisal";
|
import { EvePraisalResult, fetchAllPrices } from "@/eve-praisal";
|
||||||
import { getPlanet, getPlanetUniverse, getPlanets } from "@/planets";
|
import { getPlanet, getPlanetUniverse, getPlanets } from "@/planets";
|
||||||
import { PlanetConfig } from "./components/PlanetConfig/PlanetConfigDialog";
|
import { PlanetConfig } from "@/types";
|
||||||
|
|
||||||
const Home = () => {
|
const Home = () => {
|
||||||
const searchParams = useSearchParams();
|
const searchParams = useSearchParams();
|
||||||
|
@@ -1,5 +1,3 @@
|
|||||||
import { PlanetConfig } from "./app/components/PlanetConfig/PlanetConfigDialog";
|
|
||||||
|
|
||||||
export interface AccessToken {
|
export interface AccessToken {
|
||||||
access_token: string;
|
access_token: string;
|
||||||
expires_at: number;
|
expires_at: number;
|
||||||
@@ -119,3 +117,9 @@ export interface Pin {
|
|||||||
amount: number;
|
amount: number;
|
||||||
}>;
|
}>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface PlanetConfig {
|
||||||
|
characterId: number;
|
||||||
|
planetId: number;
|
||||||
|
excludeFromTotals: boolean;
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user