Refactor: Split BatchExpenditureForm into smaller components
Refactors the BatchExpenditureForm component into smaller, more manageable files to improve code organization and readability.
This commit is contained in:
gpt-engineer-app[bot]
@@ -1,14 +1,13 @@
|
|||||||
import { useState, useRef, useEffect } from 'react';
|
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
import { Card, CardContent } from '@/components/ui/card';
|
||||||
import { Button } from '@/components/ui/button';
|
import { IndTransactionRecordNoId } from '@/lib/pbtypes';
|
||||||
import { Textarea } from '@/components/ui/textarea';
|
|
||||||
import { Badge } from '@/components/ui/badge';
|
|
||||||
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table';
|
|
||||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
|
|
||||||
import { parseTransactionLine, formatISK, PastedTransaction } from '@/utils/priceUtils';
|
|
||||||
import { IndTransactionRecordNoId, IndJobStatusOptions } from '@/lib/pbtypes';
|
|
||||||
import { IndJob } from '@/lib/types';
|
import { IndJob } from '@/lib/types';
|
||||||
import { X } from 'lucide-react';
|
import BatchExpenditureHeader from './batch-expenditure/BatchExpenditureHeader';
|
||||||
|
import PasteExpenditureInput from './batch-expenditure/PasteExpenditureInput';
|
||||||
|
import ExpenditureStats from './batch-expenditure/ExpenditureStats';
|
||||||
|
import ExpenditureTable from './batch-expenditure/ExpenditureTable';
|
||||||
|
import ExpenditureActions from './batch-expenditure/ExpenditureActions';
|
||||||
|
import { useBatchExpenditureLogic } from '@/hooks/useBatchExpenditureLogic';
|
||||||
|
|
||||||
interface BatchExpenditureFormProps {
|
interface BatchExpenditureFormProps {
|
||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
@@ -16,188 +15,16 @@ interface BatchExpenditureFormProps {
|
|||||||
jobs: IndJob[];
|
jobs: IndJob[];
|
||||||
}
|
}
|
||||||
|
|
||||||
interface TransactionGroup {
|
|
||||||
itemName: string;
|
|
||||||
transactions: PastedTransaction[];
|
|
||||||
totalQuantity: number;
|
|
||||||
totalValue: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
const BatchExpenditureForm: React.FC<BatchExpenditureFormProps> = ({ onClose, onTransactionsAssigned, jobs }) => {
|
const BatchExpenditureForm: React.FC<BatchExpenditureFormProps> = ({ onClose, onTransactionsAssigned, jobs }) => {
|
||||||
const [pastedData, setPastedData] = useState('');
|
const {
|
||||||
const [transactionGroups, setTransactionGroups] = useState<TransactionGroup[]>([]);
|
pastedData,
|
||||||
const [duplicatesFound, setDuplicatesFound] = useState(0);
|
transactionGroups,
|
||||||
const textareaRef = useRef<HTMLTextAreaElement>(null);
|
duplicatesFound,
|
||||||
|
eligibleJobs,
|
||||||
// Auto focus the textarea when component mounts
|
handlePaste,
|
||||||
useEffect(() => {
|
handleAssignJob,
|
||||||
if (textareaRef.current) {
|
canSubmit
|
||||||
textareaRef.current.focus();
|
} = useBatchExpenditureLogic(jobs);
|
||||||
}
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
// Filter jobs that are in acquisition status
|
|
||||||
const eligibleJobs = jobs.filter(job => job.status === IndJobStatusOptions.Acquisition);
|
|
||||||
|
|
||||||
const findMatchingJob = (itemName: string): string | undefined => {
|
|
||||||
// Find jobs where the item is in the bill of materials and not satisfied
|
|
||||||
for (const job of eligibleJobs) {
|
|
||||||
const billItem = job.billOfMaterials?.find(item =>
|
|
||||||
item.name.toLowerCase() === itemName.toLowerCase()
|
|
||||||
);
|
|
||||||
|
|
||||||
if (billItem) {
|
|
||||||
// Check if this material is already satisfied
|
|
||||||
const ownedQuantity = job.expenditures?.reduce((total, exp) =>
|
|
||||||
exp.itemName.toLowerCase() === itemName.toLowerCase() ? total + exp.quantity : total, 0
|
|
||||||
) || 0;
|
|
||||||
|
|
||||||
// Only return this job if we still need more of this material
|
|
||||||
if (ownedQuantity < billItem.quantity) {
|
|
||||||
return job.id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
};
|
|
||||||
|
|
||||||
const normalizeDate = (dateStr: string): string => {
|
|
||||||
return dateStr.replace('T', ' ');
|
|
||||||
};
|
|
||||||
|
|
||||||
const createTransactionKey = (parsed: PastedTransaction): string => {
|
|
||||||
if (!parsed) return '';
|
|
||||||
const key = [
|
|
||||||
normalizeDate(parsed.date.toString()),
|
|
||||||
parsed.itemName,
|
|
||||||
parsed.quantity.toString(),
|
|
||||||
Math.abs(parsed.totalPrice).toString(), // Use absolute value for expenditures
|
|
||||||
parsed.buyer,
|
|
||||||
parsed.location
|
|
||||||
].join('|');
|
|
||||||
return key;
|
|
||||||
};
|
|
||||||
|
|
||||||
const createTransactionKeyFromRecord = (tx: IndTransactionRecordNoId): string => {
|
|
||||||
const key = [
|
|
||||||
normalizeDate(tx.date),
|
|
||||||
tx.itemName,
|
|
||||||
tx.quantity.toString(),
|
|
||||||
Math.abs(tx.totalPrice).toString(), // Use absolute value for expenditures
|
|
||||||
tx.buyer,
|
|
||||||
tx.location
|
|
||||||
].join('|');
|
|
||||||
return key;
|
|
||||||
};
|
|
||||||
|
|
||||||
const handlePaste = (value: string) => {
|
|
||||||
console.log('Handling paste with value:', value);
|
|
||||||
setPastedData(value);
|
|
||||||
const lines = value.trim().split('\n').filter(line => line.trim().length > 0);
|
|
||||||
console.log('Processing lines:', lines);
|
|
||||||
|
|
||||||
const pasteTransactionMap = new Map<string, PastedTransaction>();
|
|
||||||
|
|
||||||
// STEP 1: Combine identical transactions within the pasted data
|
|
||||||
lines.forEach((line, index) => {
|
|
||||||
console.log(`Processing line ${index}:`, line);
|
|
||||||
const parsed: PastedTransaction | null = parseTransactionLine(line);
|
|
||||||
|
|
||||||
if (parsed) {
|
|
||||||
console.log('Parsed transaction:', parsed);
|
|
||||||
|
|
||||||
// For expenditures, we expect negative amounts, but handle both cases
|
|
||||||
const isExpenditure = parsed.totalPrice < 0;
|
|
||||||
if (isExpenditure) {
|
|
||||||
// Convert to positive values for expenditures
|
|
||||||
parsed.totalPrice = Math.abs(parsed.totalPrice);
|
|
||||||
parsed.unitPrice = Math.abs(parsed.unitPrice);
|
|
||||||
} else {
|
|
||||||
// If it's positive, we might still want to treat it as expenditure
|
|
||||||
// based on context, but let's keep it as is for now
|
|
||||||
console.log('Transaction has positive amount, treating as expenditure anyway');
|
|
||||||
}
|
|
||||||
|
|
||||||
const transactionKey: string = createTransactionKey(parsed);
|
|
||||||
console.log('Transaction key:', transactionKey);
|
|
||||||
|
|
||||||
if (pasteTransactionMap.has(transactionKey)) {
|
|
||||||
const existing = pasteTransactionMap.get(transactionKey)!;
|
|
||||||
existing.quantity += parsed.quantity;
|
|
||||||
existing.totalPrice += parsed.totalPrice;
|
|
||||||
const newKey = createTransactionKey(existing);
|
|
||||||
pasteTransactionMap.set(newKey, existing);
|
|
||||||
pasteTransactionMap.delete(transactionKey);
|
|
||||||
} else {
|
|
||||||
pasteTransactionMap.set(transactionKey, parsed);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
console.log('Failed to parse line:', line);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log('Parsed transactions map:', pasteTransactionMap);
|
|
||||||
|
|
||||||
// STEP 2: Identify which jobs these transactions belong to
|
|
||||||
const relevantJobIds = new Set<string>();
|
|
||||||
pasteTransactionMap.forEach((transaction) => {
|
|
||||||
const matchingJobId = findMatchingJob(transaction.itemName);
|
|
||||||
if (matchingJobId) {
|
|
||||||
relevantJobIds.add(matchingJobId);
|
|
||||||
transaction.assignedJobId = matchingJobId;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// STEP 3: Check against existing expenditures from relevant jobs
|
|
||||||
const existingTransactionKeys = new Set<string>();
|
|
||||||
eligibleJobs.forEach(job => {
|
|
||||||
if (relevantJobIds.has(job.id)) {
|
|
||||||
job.expenditures?.forEach(tx => {
|
|
||||||
const key = createTransactionKeyFromRecord(tx);
|
|
||||||
existingTransactionKeys.add(key);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// STEP 4: Mark duplicates and assign jobs
|
|
||||||
let duplicates = 0;
|
|
||||||
pasteTransactionMap.forEach((transaction, key) => {
|
|
||||||
const isDuplicate = existingTransactionKeys.has(key);
|
|
||||||
transaction.isDuplicate = isDuplicate;
|
|
||||||
|
|
||||||
if (isDuplicate) {
|
|
||||||
duplicates++;
|
|
||||||
transaction.assignedJobId = undefined;
|
|
||||||
} else if (!transaction.assignedJobId) {
|
|
||||||
transaction.assignedJobId = findMatchingJob(transaction.itemName);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const transactionList = Array.from(pasteTransactionMap.values());
|
|
||||||
console.log('Final transaction list:', transactionList);
|
|
||||||
setDuplicatesFound(duplicates);
|
|
||||||
|
|
||||||
// Create individual transaction groups
|
|
||||||
const groups = transactionList.map(tx => ({
|
|
||||||
itemName: tx.itemName,
|
|
||||||
transactions: [tx],
|
|
||||||
totalQuantity: tx.quantity,
|
|
||||||
totalValue: tx.totalPrice
|
|
||||||
}));
|
|
||||||
|
|
||||||
console.log('Transaction groups:', groups);
|
|
||||||
setTransactionGroups(groups);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleAssignJob = (groupIndex: number, jobId: string) => {
|
|
||||||
setTransactionGroups(prev => {
|
|
||||||
const newGroups = [...prev];
|
|
||||||
newGroups[groupIndex].transactions.forEach(tx => {
|
|
||||||
tx.assignedJobId = jobId;
|
|
||||||
});
|
|
||||||
return newGroups;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleSubmit = () => {
|
const handleSubmit = () => {
|
||||||
// Group transactions by assigned job
|
// Group transactions by assigned job
|
||||||
@@ -228,137 +55,29 @@ const BatchExpenditureForm: React.FC<BatchExpenditureFormProps> = ({ onClose, on
|
|||||||
className="bg-gray-900 border-gray-700 text-white w-full max-w-4xl max-h-[90vh] overflow-y-auto"
|
className="bg-gray-900 border-gray-700 text-white w-full max-w-4xl max-h-[90vh] overflow-y-auto"
|
||||||
onClick={(e) => e.stopPropagation()}
|
onClick={(e) => e.stopPropagation()}
|
||||||
>
|
>
|
||||||
<CardHeader className="flex flex-row items-center justify-between sticky top-0 bg-gray-900 border-b border-gray-700 z-10">
|
<BatchExpenditureHeader onClose={onClose} />
|
||||||
<CardTitle className="text-blue-400">Batch Expenditure Assignment</CardTitle>
|
|
||||||
<Button
|
|
||||||
variant="ghost"
|
|
||||||
size="icon"
|
|
||||||
onClick={onClose}
|
|
||||||
className="text-gray-400 hover:text-white"
|
|
||||||
>
|
|
||||||
<X className="h-4 w-4" />
|
|
||||||
</Button>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent className="space-y-4">
|
<CardContent className="space-y-4">
|
||||||
<div className="space-y-2">
|
<PasteExpenditureInput pastedData={pastedData} onPaste={handlePaste} />
|
||||||
<label className="text-sm font-medium text-gray-300">
|
|
||||||
Paste EVE expenditure data (negative amounts):
|
|
||||||
</label>
|
|
||||||
<Textarea
|
|
||||||
ref={textareaRef}
|
|
||||||
value={pastedData}
|
|
||||||
onChange={(e) => handlePaste(e.target.value)}
|
|
||||||
placeholder="Paste your EVE expenditure transaction data here..."
|
|
||||||
className="min-h-32 bg-gray-800 border-gray-600 text-white"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{transactionGroups.length > 0 && (
|
{transactionGroups.length > 0 && (
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
<div className="flex items-center justify-between">
|
<ExpenditureStats
|
||||||
<div className="flex items-center gap-4">
|
totalExpenditures={transactionGroups.length}
|
||||||
<Badge variant="outline" className="text-blue-400 border-blue-400">
|
duplicatesFound={duplicatesFound}
|
||||||
{transactionGroups.length} expenditures found
|
/>
|
||||||
</Badge>
|
|
||||||
{duplicatesFound > 0 && (
|
|
||||||
<Badge variant="outline" className="text-yellow-400 border-yellow-400">
|
|
||||||
{duplicatesFound} duplicates found
|
|
||||||
</Badge>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<Table>
|
<ExpenditureTable
|
||||||
<TableHeader>
|
transactionGroups={transactionGroups}
|
||||||
<TableRow className="border-gray-700">
|
jobs={jobs}
|
||||||
<TableHead className="text-gray-300">Material</TableHead>
|
eligibleJobs={eligibleJobs}
|
||||||
<TableHead className="text-gray-300">Quantity</TableHead>
|
onAssignJob={handleAssignJob}
|
||||||
<TableHead className="text-gray-300">Total Cost</TableHead>
|
/>
|
||||||
<TableHead className="text-gray-300">Assign To Job</TableHead>
|
|
||||||
</TableRow>
|
|
||||||
</TableHeader>
|
|
||||||
<TableBody>
|
|
||||||
{transactionGroups.map((group, index) => {
|
|
||||||
const autoAssigned = group.transactions[0]?.assignedJobId;
|
|
||||||
const isDuplicate = group.transactions[0]?.isDuplicate;
|
|
||||||
const matchingJob = autoAssigned ? jobs.find(j => j.id === autoAssigned) : undefined;
|
|
||||||
|
|
||||||
return (
|
<ExpenditureActions
|
||||||
<TableRow
|
onCancel={onClose}
|
||||||
key={`${group.itemName}-${index}`}
|
onSubmit={handleSubmit}
|
||||||
className={`border-gray-700 ${isDuplicate ? 'bg-red-900/30' : ''}`}
|
canSubmit={canSubmit}
|
||||||
>
|
/>
|
||||||
<TableCell className="text-white flex items-center gap-2">
|
|
||||||
{group.itemName}
|
|
||||||
{isDuplicate && (
|
|
||||||
<Badge variant="destructive" className="bg-red-600">
|
|
||||||
Duplicate
|
|
||||||
</Badge>
|
|
||||||
)}
|
|
||||||
</TableCell>
|
|
||||||
<TableCell className="text-gray-300">
|
|
||||||
{group.totalQuantity.toLocaleString()}
|
|
||||||
</TableCell>
|
|
||||||
<TableCell className="text-red-400">
|
|
||||||
{formatISK(group.totalValue)}
|
|
||||||
</TableCell>
|
|
||||||
<TableCell>
|
|
||||||
{isDuplicate ? (
|
|
||||||
<div className="text-red-400 text-sm">
|
|
||||||
Transaction already exists
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<Select
|
|
||||||
value={group.transactions[0]?.assignedJobId || ''}
|
|
||||||
onValueChange={(value) => handleAssignJob(index, value)}
|
|
||||||
>
|
|
||||||
<SelectTrigger
|
|
||||||
className={`bg-gray-800 border-gray-600 text-white ${autoAssigned ? 'border-green-600' : ''}`}
|
|
||||||
>
|
|
||||||
<SelectValue placeholder={autoAssigned ? `Auto-assigned to ${matchingJob?.outputItem}` : 'Select a job'} />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent className="bg-gray-800 border-gray-600">
|
|
||||||
{eligibleJobs
|
|
||||||
.filter(job =>
|
|
||||||
job.billOfMaterials?.some(item =>
|
|
||||||
item.name.toLowerCase().includes(group.itemName.toLowerCase())
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.map(job => (
|
|
||||||
<SelectItem
|
|
||||||
key={job.id}
|
|
||||||
value={job.id}
|
|
||||||
className="text-white"
|
|
||||||
>
|
|
||||||
{job.outputItem} (Acquisition)
|
|
||||||
</SelectItem>
|
|
||||||
))}
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
)}
|
|
||||||
</TableCell>
|
|
||||||
</TableRow>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</TableBody>
|
|
||||||
</Table>
|
|
||||||
|
|
||||||
<div className="flex justify-end gap-2">
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
onClick={onClose}
|
|
||||||
className="border-gray-600 hover:bg-gray-800"
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
onClick={handleSubmit}
|
|
||||||
disabled={!transactionGroups.some(g => g.transactions.some(tx => !tx.isDuplicate && tx.assignedJobId))}
|
|
||||||
className="bg-blue-600 hover:bg-blue-700"
|
|
||||||
>
|
|
||||||
Assign Expenditures
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</CardContent>
|
</CardContent>
|
||||||
|
|||||||
26
src/components/batch-expenditure/BatchExpenditureHeader.tsx
Normal file
26
src/components/batch-expenditure/BatchExpenditureHeader.tsx
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { CardHeader, CardTitle } from '@/components/ui/card';
|
||||||
|
import { X } from 'lucide-react';
|
||||||
|
|
||||||
|
interface BatchExpenditureHeaderProps {
|
||||||
|
onClose: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
const BatchExpenditureHeader: React.FC<BatchExpenditureHeaderProps> = ({ onClose }) => {
|
||||||
|
return (
|
||||||
|
<CardHeader className="flex flex-row items-center justify-between sticky top-0 bg-gray-900 border-b border-gray-700 z-10">
|
||||||
|
<CardTitle className="text-blue-400">Batch Expenditure Assignment</CardTitle>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
onClick={onClose}
|
||||||
|
className="text-gray-400 hover:text-white"
|
||||||
|
>
|
||||||
|
<X className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
</CardHeader>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default BatchExpenditureHeader;
|
||||||
31
src/components/batch-expenditure/ExpenditureActions.tsx
Normal file
31
src/components/batch-expenditure/ExpenditureActions.tsx
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
|
||||||
|
interface ExpenditureActionsProps {
|
||||||
|
onCancel: () => void;
|
||||||
|
onSubmit: () => void;
|
||||||
|
canSubmit: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
const ExpenditureActions: React.FC<ExpenditureActionsProps> = ({ onCancel, onSubmit, canSubmit }) => {
|
||||||
|
return (
|
||||||
|
<div className="flex justify-end gap-2">
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
onClick={onCancel}
|
||||||
|
className="border-gray-600 hover:bg-gray-800"
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
onClick={onSubmit}
|
||||||
|
disabled={!canSubmit}
|
||||||
|
className="bg-blue-600 hover:bg-blue-700"
|
||||||
|
>
|
||||||
|
Assign Expenditures
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ExpenditureActions;
|
||||||
26
src/components/batch-expenditure/ExpenditureStats.tsx
Normal file
26
src/components/batch-expenditure/ExpenditureStats.tsx
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
|
||||||
|
import { Badge } from '@/components/ui/badge';
|
||||||
|
|
||||||
|
interface ExpenditureStatsProps {
|
||||||
|
totalExpenditures: number;
|
||||||
|
duplicatesFound: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
const ExpenditureStats: React.FC<ExpenditureStatsProps> = ({ totalExpenditures, duplicatesFound }) => {
|
||||||
|
return (
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<div className="flex items-center gap-4">
|
||||||
|
<Badge variant="outline" className="text-blue-400 border-blue-400">
|
||||||
|
{totalExpenditures} expenditures found
|
||||||
|
</Badge>
|
||||||
|
{duplicatesFound > 0 && (
|
||||||
|
<Badge variant="outline" className="text-yellow-400 border-yellow-400">
|
||||||
|
{duplicatesFound} duplicates found
|
||||||
|
</Badge>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ExpenditureStats;
|
||||||
106
src/components/batch-expenditure/ExpenditureTable.tsx
Normal file
106
src/components/batch-expenditure/ExpenditureTable.tsx
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
|
||||||
|
import { Badge } from '@/components/ui/badge';
|
||||||
|
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table';
|
||||||
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
|
||||||
|
import { formatISK } from '@/utils/priceUtils';
|
||||||
|
import { IndJob } from '@/lib/types';
|
||||||
|
|
||||||
|
interface TransactionGroup {
|
||||||
|
itemName: string;
|
||||||
|
transactions: any[];
|
||||||
|
totalQuantity: number;
|
||||||
|
totalValue: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ExpenditureTableProps {
|
||||||
|
transactionGroups: TransactionGroup[];
|
||||||
|
jobs: IndJob[];
|
||||||
|
eligibleJobs: IndJob[];
|
||||||
|
onAssignJob: (groupIndex: number, jobId: string) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
const ExpenditureTable: React.FC<ExpenditureTableProps> = ({
|
||||||
|
transactionGroups,
|
||||||
|
jobs,
|
||||||
|
eligibleJobs,
|
||||||
|
onAssignJob
|
||||||
|
}) => {
|
||||||
|
return (
|
||||||
|
<Table>
|
||||||
|
<TableHeader>
|
||||||
|
<TableRow className="border-gray-700">
|
||||||
|
<TableHead className="text-gray-300">Material</TableHead>
|
||||||
|
<TableHead className="text-gray-300">Quantity</TableHead>
|
||||||
|
<TableHead className="text-gray-300">Total Cost</TableHead>
|
||||||
|
<TableHead className="text-gray-300">Assign To Job</TableHead>
|
||||||
|
</TableRow>
|
||||||
|
</TableHeader>
|
||||||
|
<TableBody>
|
||||||
|
{transactionGroups.map((group, index) => {
|
||||||
|
const autoAssigned = group.transactions[0]?.assignedJobId;
|
||||||
|
const isDuplicate = group.transactions[0]?.isDuplicate;
|
||||||
|
const matchingJob = autoAssigned ? jobs.find(j => j.id === autoAssigned) : undefined;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<TableRow
|
||||||
|
key={`${group.itemName}-${index}`}
|
||||||
|
className={`border-gray-700 ${isDuplicate ? 'bg-red-900/30' : ''}`}
|
||||||
|
>
|
||||||
|
<TableCell className="text-white flex items-center gap-2">
|
||||||
|
{group.itemName}
|
||||||
|
{isDuplicate && (
|
||||||
|
<Badge variant="destructive" className="bg-red-600">
|
||||||
|
Duplicate
|
||||||
|
</Badge>
|
||||||
|
)}
|
||||||
|
</TableCell>
|
||||||
|
<TableCell className="text-gray-300">
|
||||||
|
{group.totalQuantity.toLocaleString()}
|
||||||
|
</TableCell>
|
||||||
|
<TableCell className="text-red-400">
|
||||||
|
{formatISK(group.totalValue)}
|
||||||
|
</TableCell>
|
||||||
|
<TableCell>
|
||||||
|
{isDuplicate ? (
|
||||||
|
<div className="text-red-400 text-sm">
|
||||||
|
Transaction already exists
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<Select
|
||||||
|
value={group.transactions[0]?.assignedJobId || ''}
|
||||||
|
onValueChange={(value) => onAssignJob(index, value)}
|
||||||
|
>
|
||||||
|
<SelectTrigger
|
||||||
|
className={`bg-gray-800 border-gray-600 text-white ${autoAssigned ? 'border-green-600' : ''}`}
|
||||||
|
>
|
||||||
|
<SelectValue placeholder={autoAssigned ? `Auto-assigned to ${matchingJob?.outputItem}` : 'Select a job'} />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent className="bg-gray-800 border-gray-600">
|
||||||
|
{eligibleJobs
|
||||||
|
.filter(job =>
|
||||||
|
job.billOfMaterials?.some(item =>
|
||||||
|
item.name.toLowerCase().includes(group.itemName.toLowerCase())
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.map(job => (
|
||||||
|
<SelectItem
|
||||||
|
key={job.id}
|
||||||
|
value={job.id}
|
||||||
|
className="text-white"
|
||||||
|
>
|
||||||
|
{job.outputItem} (Acquisition)
|
||||||
|
</SelectItem>
|
||||||
|
))}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
)}
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</TableBody>
|
||||||
|
</Table>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ExpenditureTable;
|
||||||
36
src/components/batch-expenditure/PasteExpenditureInput.tsx
Normal file
36
src/components/batch-expenditure/PasteExpenditureInput.tsx
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
|
||||||
|
import { useRef, useEffect } from 'react';
|
||||||
|
import { Textarea } from '@/components/ui/textarea';
|
||||||
|
|
||||||
|
interface PasteExpenditureInputProps {
|
||||||
|
pastedData: string;
|
||||||
|
onPaste: (value: string) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
const PasteExpenditureInput: React.FC<PasteExpenditureInputProps> = ({ pastedData, onPaste }) => {
|
||||||
|
const textareaRef = useRef<HTMLTextAreaElement>(null);
|
||||||
|
|
||||||
|
// Auto focus the textarea when component mounts
|
||||||
|
useEffect(() => {
|
||||||
|
if (textareaRef.current) {
|
||||||
|
textareaRef.current.focus();
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-2">
|
||||||
|
<label className="text-sm font-medium text-gray-300">
|
||||||
|
Paste EVE expenditure data (negative amounts):
|
||||||
|
</label>
|
||||||
|
<Textarea
|
||||||
|
ref={textareaRef}
|
||||||
|
value={pastedData}
|
||||||
|
onChange={(e) => onPaste(e.target.value)}
|
||||||
|
placeholder="Paste your EVE expenditure transaction data here..."
|
||||||
|
className="min-h-32 bg-gray-800 border-gray-600 text-white"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default PasteExpenditureInput;
|
||||||
192
src/hooks/useBatchExpenditureLogic.ts
Normal file
192
src/hooks/useBatchExpenditureLogic.ts
Normal file
@@ -0,0 +1,192 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { parseTransactionLine, formatISK, PastedTransaction } from '@/utils/priceUtils';
|
||||||
|
import { IndTransactionRecordNoId, IndJobStatusOptions } from '@/lib/pbtypes';
|
||||||
|
import { IndJob } from '@/lib/types';
|
||||||
|
|
||||||
|
interface TransactionGroup {
|
||||||
|
itemName: string;
|
||||||
|
transactions: PastedTransaction[];
|
||||||
|
totalQuantity: number;
|
||||||
|
totalValue: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const useBatchExpenditureLogic = (jobs: IndJob[]) => {
|
||||||
|
const [pastedData, setPastedData] = useState('');
|
||||||
|
const [transactionGroups, setTransactionGroups] = useState<TransactionGroup[]>([]);
|
||||||
|
const [duplicatesFound, setDuplicatesFound] = useState(0);
|
||||||
|
|
||||||
|
// Filter jobs that are in acquisition status
|
||||||
|
const eligibleJobs = jobs.filter(job => job.status === IndJobStatusOptions.Acquisition);
|
||||||
|
|
||||||
|
const findMatchingJob = (itemName: string): string | undefined => {
|
||||||
|
// Find jobs where the item is in the bill of materials and not satisfied
|
||||||
|
for (const job of eligibleJobs) {
|
||||||
|
const billItem = job.billOfMaterials?.find(item =>
|
||||||
|
item.name.toLowerCase() === itemName.toLowerCase()
|
||||||
|
);
|
||||||
|
|
||||||
|
if (billItem) {
|
||||||
|
// Check if this material is already satisfied
|
||||||
|
const ownedQuantity = job.expenditures?.reduce((total, exp) =>
|
||||||
|
exp.itemName.toLowerCase() === itemName.toLowerCase() ? total + exp.quantity : total, 0
|
||||||
|
) || 0;
|
||||||
|
|
||||||
|
// Only return this job if we still need more of this material
|
||||||
|
if (ownedQuantity < billItem.quantity) {
|
||||||
|
return job.id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
};
|
||||||
|
|
||||||
|
const normalizeDate = (dateStr: string): string => {
|
||||||
|
return dateStr.replace('T', ' ');
|
||||||
|
};
|
||||||
|
|
||||||
|
const createTransactionKey = (parsed: PastedTransaction): string => {
|
||||||
|
if (!parsed) return '';
|
||||||
|
const key = [
|
||||||
|
normalizeDate(parsed.date.toString()),
|
||||||
|
parsed.itemName,
|
||||||
|
parsed.quantity.toString(),
|
||||||
|
Math.abs(parsed.totalPrice).toString(), // Use absolute value for expenditures
|
||||||
|
parsed.buyer,
|
||||||
|
parsed.location
|
||||||
|
].join('|');
|
||||||
|
return key;
|
||||||
|
};
|
||||||
|
|
||||||
|
const createTransactionKeyFromRecord = (tx: IndTransactionRecordNoId): string => {
|
||||||
|
const key = [
|
||||||
|
normalizeDate(tx.date),
|
||||||
|
tx.itemName,
|
||||||
|
tx.quantity.toString(),
|
||||||
|
Math.abs(tx.totalPrice).toString(), // Use absolute value for expenditures
|
||||||
|
tx.buyer,
|
||||||
|
tx.location
|
||||||
|
].join('|');
|
||||||
|
return key;
|
||||||
|
};
|
||||||
|
|
||||||
|
const handlePaste = (value: string) => {
|
||||||
|
console.log('Handling paste with value:', value);
|
||||||
|
setPastedData(value);
|
||||||
|
const lines = value.trim().split('\n').filter(line => line.trim().length > 0);
|
||||||
|
console.log('Processing lines:', lines);
|
||||||
|
|
||||||
|
const pasteTransactionMap = new Map<string, PastedTransaction>();
|
||||||
|
|
||||||
|
// STEP 1: Combine identical transactions within the pasted data
|
||||||
|
lines.forEach((line, index) => {
|
||||||
|
console.log(`Processing line ${index}:`, line);
|
||||||
|
const parsed: PastedTransaction | null = parseTransactionLine(line);
|
||||||
|
|
||||||
|
if (parsed) {
|
||||||
|
console.log('Parsed transaction:', parsed);
|
||||||
|
|
||||||
|
// For expenditures, we expect negative amounts, but handle both cases
|
||||||
|
const isExpenditure = parsed.totalPrice < 0;
|
||||||
|
if (isExpenditure) {
|
||||||
|
// Convert to positive values for expenditures
|
||||||
|
parsed.totalPrice = Math.abs(parsed.totalPrice);
|
||||||
|
parsed.unitPrice = Math.abs(parsed.unitPrice);
|
||||||
|
} else {
|
||||||
|
// If it's positive, we might still want to treat it as expenditure
|
||||||
|
// based on context, but let's keep it as is for now
|
||||||
|
console.log('Transaction has positive amount, treating as expenditure anyway');
|
||||||
|
}
|
||||||
|
|
||||||
|
const transactionKey: string = createTransactionKey(parsed);
|
||||||
|
console.log('Transaction key:', transactionKey);
|
||||||
|
|
||||||
|
if (pasteTransactionMap.has(transactionKey)) {
|
||||||
|
const existing = pasteTransactionMap.get(transactionKey)!;
|
||||||
|
existing.quantity += parsed.quantity;
|
||||||
|
existing.totalPrice += parsed.totalPrice;
|
||||||
|
const newKey = createTransactionKey(existing);
|
||||||
|
pasteTransactionMap.set(newKey, existing);
|
||||||
|
pasteTransactionMap.delete(transactionKey);
|
||||||
|
} else {
|
||||||
|
pasteTransactionMap.set(transactionKey, parsed);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log('Failed to parse line:', line);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log('Parsed transactions map:', pasteTransactionMap);
|
||||||
|
|
||||||
|
// STEP 2: Identify which jobs these transactions belong to
|
||||||
|
const relevantJobIds = new Set<string>();
|
||||||
|
pasteTransactionMap.forEach((transaction) => {
|
||||||
|
const matchingJobId = findMatchingJob(transaction.itemName);
|
||||||
|
if (matchingJobId) {
|
||||||
|
relevantJobIds.add(matchingJobId);
|
||||||
|
transaction.assignedJobId = matchingJobId;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// STEP 3: Check against existing expenditures from relevant jobs
|
||||||
|
const existingTransactionKeys = new Set<string>();
|
||||||
|
eligibleJobs.forEach(job => {
|
||||||
|
if (relevantJobIds.has(job.id)) {
|
||||||
|
job.expenditures?.forEach(tx => {
|
||||||
|
const key = createTransactionKeyFromRecord(tx);
|
||||||
|
existingTransactionKeys.add(key);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// STEP 4: Mark duplicates and assign jobs
|
||||||
|
let duplicates = 0;
|
||||||
|
pasteTransactionMap.forEach((transaction, key) => {
|
||||||
|
const isDuplicate = existingTransactionKeys.has(key);
|
||||||
|
transaction.isDuplicate = isDuplicate;
|
||||||
|
|
||||||
|
if (isDuplicate) {
|
||||||
|
duplicates++;
|
||||||
|
transaction.assignedJobId = undefined;
|
||||||
|
} else if (!transaction.assignedJobId) {
|
||||||
|
transaction.assignedJobId = findMatchingJob(transaction.itemName);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const transactionList = Array.from(pasteTransactionMap.values());
|
||||||
|
console.log('Final transaction list:', transactionList);
|
||||||
|
setDuplicatesFound(duplicates);
|
||||||
|
|
||||||
|
// Create individual transaction groups
|
||||||
|
const groups = transactionList.map(tx => ({
|
||||||
|
itemName: tx.itemName,
|
||||||
|
transactions: [tx],
|
||||||
|
totalQuantity: tx.quantity,
|
||||||
|
totalValue: tx.totalPrice
|
||||||
|
}));
|
||||||
|
|
||||||
|
console.log('Transaction groups:', groups);
|
||||||
|
setTransactionGroups(groups);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleAssignJob = (groupIndex: number, jobId: string) => {
|
||||||
|
setTransactionGroups(prev => {
|
||||||
|
const newGroups = [...prev];
|
||||||
|
newGroups[groupIndex].transactions.forEach(tx => {
|
||||||
|
tx.assignedJobId = jobId;
|
||||||
|
});
|
||||||
|
return newGroups;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const canSubmit = transactionGroups.some(g => g.transactions.some(tx => !tx.isDuplicate && tx.assignedJobId));
|
||||||
|
|
||||||
|
return {
|
||||||
|
pastedData,
|
||||||
|
transactionGroups,
|
||||||
|
duplicatesFound,
|
||||||
|
eligibleJobs,
|
||||||
|
handlePaste,
|
||||||
|
handleAssignJob,
|
||||||
|
canSubmit
|
||||||
|
};
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user