dave/eve-industrializer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sort transactions properly

Browse Source
This commit is contained in:
PhatPhuckDave
2025-07-05 14:36:32 +02:00
parent 93264aa658
commit b54e3ee847
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/src/components/JobCard.tsx
View File

@@ -18,12 +18,21 @@ interface JobCardProps {
const JobCard: React.FC<JobCardProps> = ({ job, onEdit, onDelete, onUpdateProduced }) => { const JobCard: React.FC<JobCardProps> = ({ job, onEdit, onDelete, onUpdateProduced }) => {
const [isEditingProduced, setIsEditingProduced] = useState(false); const [isEditingProduced, setIsEditingProduced] = useState(false);
const [producedValue, setProducedValue] = useState(job.produced?.toString() || '0'); const [producedValue, setProducedValue] = useState(job.produced?.toString() || '0');
const totalExpenditure = job.expenditures.reduce((sum, tx) => sum + tx.totalPrice, 0);
const totalIncome = job.income.reduce((sum, tx) => sum + tx.totalPrice, 0); // Sort transactions by date descending
const sortedExpenditures = [...job.expenditures].sort((a, b) =>
new Date(b.date).getTime() - new Date(a.date).getTime()
);
const sortedIncome = [...job.income].sort((a, b) =>
new Date(b.date).getTime() - new Date(a.date).getTime()
);
const totalExpenditure = sortedExpenditures.reduce((sum, tx) => sum + tx.totalPrice, 0);
const totalIncome = sortedIncome.reduce((sum, tx) => sum + tx.totalPrice, 0);
const profit = totalIncome - totalExpenditure; const profit = totalIncome - totalExpenditure;
const margin = totalIncome > 0 ? ((profit / totalIncome) * 100) : 0; const margin = totalIncome > 0 ? ((profit / totalIncome) * 100) : 0;
const itemsSold = job.income.reduce((sum, tx) => sum + tx.quantity, 0); const itemsSold = sortedIncome.reduce((sum, tx) => sum + tx.quantity, 0);
const saleStartTime = job.saleStart ? new Date(job.saleStart).getTime() : null; const saleStartTime = job.saleStart ? new Date(job.saleStart).getTime() : null;
const daysSinceStart = saleStartTime ? Math.max(1, Math.ceil((Date.now() - saleStartTime) / (1000 * 60 * 60 * 24))) : 0; const daysSinceStart = saleStartTime ? Math.max(1, Math.ceil((Date.now() - saleStartTime) / (1000 * 60 * 60 * 24))) : 0;
const itemsPerDay = daysSinceStart > 0 ? itemsSold / daysSinceStart : 0; const itemsPerDay = daysSinceStart > 0 ? itemsSold / daysSinceStart : 0;

9
frontend/src/components/TransactionTable.tsx
View File

@@ -26,7 +26,12 @@ const TransactionTable: React.FC<TransactionTableProps> = ({
const [editingId, setEditingId] = useState<string | null>(null); const [editingId, setEditingId] = useState<string | null>(null);
const [editingTransaction, setEditingTransaction] = useState<IndTransactionRecord | null>(null); const [editingTransaction, setEditingTransaction] = useState<IndTransactionRecord | null>(null);
const totalAmount = transactions.reduce((sum, tx) => sum + tx.totalPrice, 0); // Sort transactions by date descending
const sortedTransactions = [...transactions].sort((a, b) =>
new Date(b.date).getTime() - new Date(a.date).getTime()
);
const totalAmount = sortedTransactions.reduce((sum, tx) => sum + tx.totalPrice, 0);
const handleEdit = (transaction: IndTransactionRecord) => { const handleEdit = (transaction: IndTransactionRecord) => {
setEditingId(transaction.id); setEditingId(transaction.id);
@@ -92,7 +97,7 @@ const TransactionTable: React.FC<TransactionTableProps> = ({
</TableRow> </TableRow>
</TableHeader> </TableHeader>
<TableBody> <TableBody>
{transactions.map((transaction) => ( {sortedTransactions.map((transaction) => (
<TableRow key={transaction.id} className="border-gray-700"> <TableRow key={transaction.id} className="border-gray-700">
<TableCell className="text-gray-300"> <TableCell className="text-gray-300">
{editingId === transaction.id ? ( {editingId === transaction.id ? (