Fix: Implement BOM import/export and SPA navigation
- Fixed JobForm date field population. - Implemented clipboard-based BOM import/export functionality with a proper preview. - Ensured the application is no longer a SPA, with navigation to job details pages.
This commit is contained in:
@@ -1,10 +1,10 @@
|
|||||||
|
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
|
import { useNavigate } from 'react-router-dom';
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
||||||
import { Badge } from '@/components/ui/badge';
|
import { Badge } from '@/components/ui/badge';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { HoverCard, HoverCardContent, HoverCardTrigger } from '@/components/ui/hover-card';
|
import { HoverCard, HoverCardContent, HoverCardTrigger } from '@/components/ui/hover-card';
|
||||||
import { Calendar, Factory, TrendingUp, TrendingDown, Clock, Import, Upload, Wrench, Check } from 'lucide-react';
|
import { Calendar, Factory, TrendingUp, TrendingDown, Clock, Import, Upload, Check } from 'lucide-react';
|
||||||
import { formatISK } from '@/utils/priceUtils';
|
import { formatISK } from '@/utils/priceUtils';
|
||||||
import { IndJob } from '@/lib/types';
|
import { IndJob } from '@/lib/types';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
@@ -15,16 +15,24 @@ interface JobCardProps {
|
|||||||
onEdit: (job: any) => void;
|
onEdit: (job: any) => void;
|
||||||
onDelete: (jobId: string) => void;
|
onDelete: (jobId: string) => void;
|
||||||
onUpdateProduced?: (jobId: string, produced: number) => void;
|
onUpdateProduced?: (jobId: string, produced: number) => void;
|
||||||
|
onImportBOM?: (jobId: string, items: { name: string; quantity: number }[]) => void;
|
||||||
isTracked?: boolean;
|
isTracked?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const JobCard: React.FC<JobCardProps> = ({ job, onEdit, onDelete, onUpdateProduced, isTracked = false }) => {
|
const JobCard: React.FC<JobCardProps> = ({
|
||||||
|
job,
|
||||||
|
onEdit,
|
||||||
|
onDelete,
|
||||||
|
onUpdateProduced,
|
||||||
|
onImportBOM,
|
||||||
|
isTracked = false
|
||||||
|
}) => {
|
||||||
|
const navigate = useNavigate();
|
||||||
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 [copyingBom, setCopyingBom] = useState(false);
|
const [copyingBom, setCopyingBom] = useState(false);
|
||||||
const { toast } = useToast();
|
const { toast } = useToast();
|
||||||
|
|
||||||
// Sort transactions by date descending
|
|
||||||
const sortedExpenditures = [...job.expenditures].sort((a, b) =>
|
const sortedExpenditures = [...job.expenditures].sort((a, b) =>
|
||||||
new Date(b.date).getTime() - new Date(a.date).getTime()
|
new Date(b.date).getTime() - new Date(a.date).getTime()
|
||||||
);
|
);
|
||||||
@@ -32,7 +40,6 @@ const JobCard: React.FC<JobCardProps> = ({ job, onEdit, onDelete, onUpdateProduc
|
|||||||
new Date(b.date).getTime() - new Date(a.date).getTime()
|
new Date(b.date).getTime() - new Date(a.date).getTime()
|
||||||
);
|
);
|
||||||
|
|
||||||
// Calculate totals for this job (including tracked jobs)
|
|
||||||
const totalExpenditure = sortedExpenditures.reduce((sum, tx) => sum + tx.totalPrice, 0);
|
const totalExpenditure = sortedExpenditures.reduce((sum, tx) => sum + tx.totalPrice, 0);
|
||||||
const totalIncome = sortedIncome.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;
|
||||||
@@ -91,7 +98,7 @@ const JobCard: React.FC<JobCardProps> = ({ job, onEdit, onDelete, onUpdateProduc
|
|||||||
try {
|
try {
|
||||||
const clipboardText = await navigator.clipboard.readText();
|
const clipboardText = await navigator.clipboard.readText();
|
||||||
const lines = clipboardText.split('\n').filter(line => line.trim());
|
const lines = clipboardText.split('\n').filter(line => line.trim());
|
||||||
let importedCount = 0;
|
const items: { name: string; quantity: number }[] = [];
|
||||||
|
|
||||||
for (const line of lines) {
|
for (const line of lines) {
|
||||||
const parts = line.trim().split(/\s+/);
|
const parts = line.trim().split(/\s+/);
|
||||||
@@ -99,16 +106,26 @@ const JobCard: React.FC<JobCardProps> = ({ job, onEdit, onDelete, onUpdateProduc
|
|||||||
const name = parts.slice(0, -1).join(' ');
|
const name = parts.slice(0, -1).join(' ');
|
||||||
const quantity = parseInt(parts[parts.length - 1]);
|
const quantity = parseInt(parts[parts.length - 1]);
|
||||||
if (name && !isNaN(quantity)) {
|
if (name && !isNaN(quantity)) {
|
||||||
importedCount++;
|
items.push({ name, quantity });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
toast({
|
if (items.length > 0 && onImportBOM) {
|
||||||
title: "Import Preview",
|
onImportBOM(job.id, items);
|
||||||
description: `Found ${importedCount} items to import. This is just a preview - actual import functionality needs to be connected.`,
|
toast({
|
||||||
duration: 3000,
|
title: "BOM Imported",
|
||||||
});
|
description: `Successfully imported ${items.length} items`,
|
||||||
|
duration: 3000,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
toast({
|
||||||
|
title: "No Valid Items",
|
||||||
|
description: "No valid items found in clipboard. Format: 'Item Name Quantity' per line",
|
||||||
|
variant: "destructive",
|
||||||
|
duration: 3000,
|
||||||
|
});
|
||||||
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toast({
|
toast({
|
||||||
title: "Error",
|
title: "Error",
|
||||||
@@ -153,6 +170,10 @@ const JobCard: React.FC<JobCardProps> = ({ job, onEdit, onDelete, onUpdateProduc
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleCardClick = () => {
|
||||||
|
navigate(`/${job.id}`);
|
||||||
|
};
|
||||||
|
|
||||||
const handleProducedClick = (e: React.MouseEvent) => {
|
const handleProducedClick = (e: React.MouseEvent) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
if (job.status !== 'Closed') {
|
if (job.status !== 'Closed') {
|
||||||
@@ -181,7 +202,10 @@ const JobCard: React.FC<JobCardProps> = ({ job, onEdit, onDelete, onUpdateProduc
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card className={`bg-gray-900 border-gray-700 text-white h-full flex flex-col ${job.status === 'Tracked' ? 'border-l-4 border-l-cyan-600' : ''}`}>
|
<Card
|
||||||
|
className={`bg-gray-900 border-gray-700 text-white h-full flex flex-col cursor-pointer hover:bg-gray-800/50 transition-colors ${job.status === 'Tracked' ? 'border-l-4 border-l-cyan-600' : ''}`}
|
||||||
|
onClick={handleCardClick}
|
||||||
|
>
|
||||||
<CardHeader className="flex-shrink-0">
|
<CardHeader className="flex-shrink-0">
|
||||||
<div className="flex justify-between items-start">
|
<div className="flex justify-between items-start">
|
||||||
<div className="flex-1 min-w-0">
|
<div className="flex-1 min-w-0">
|
||||||
|
|||||||
@@ -15,14 +15,20 @@ interface JobFormProps {
|
|||||||
onCancel: () => void;
|
onCancel: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const formatDateForInput = (dateString: string | undefined | null): string => {
|
||||||
|
if (!dateString) return '';
|
||||||
|
// Convert ISO string to datetime-local format (YYYY-MM-DDTHH:MM)
|
||||||
|
return new Date(dateString).toISOString().slice(0, 16);
|
||||||
|
};
|
||||||
|
|
||||||
const JobForm: React.FC<JobFormProps> = ({ job, onSubmit, onCancel }) => {
|
const JobForm: React.FC<JobFormProps> = ({ job, onSubmit, onCancel }) => {
|
||||||
const [formData, setFormData] = useState({
|
const [formData, setFormData] = useState({
|
||||||
outputItem: job?.outputItem || '',
|
outputItem: job?.outputItem || '',
|
||||||
outputQuantity: job?.outputQuantity || 0,
|
outputQuantity: job?.outputQuantity || 0,
|
||||||
jobStart: job?.jobStart ? new Date(job.jobStart).toISOString().slice(0, 16) : '',
|
jobStart: formatDateForInput(job?.jobStart),
|
||||||
jobEnd: job?.jobEnd ? new Date(job.jobEnd).toISOString().slice(0, 16) : '',
|
jobEnd: formatDateForInput(job?.jobEnd),
|
||||||
saleStart: job?.saleStart ? new Date(job.saleStart).toISOString().slice(0, 16) : '',
|
saleStart: formatDateForInput(job?.saleStart),
|
||||||
saleEnd: job?.saleEnd ? new Date(job.saleEnd).toISOString().slice(0, 16) : '',
|
saleEnd: formatDateForInput(job?.saleEnd),
|
||||||
status: job?.status || IndJobStatusOptions.Planned,
|
status: job?.status || IndJobStatusOptions.Planned,
|
||||||
projectedCost: job?.projectedCost || 0,
|
projectedCost: job?.projectedCost || 0,
|
||||||
projectedRevenue: job?.projectedRevenue || 0
|
projectedRevenue: job?.projectedRevenue || 0
|
||||||
@@ -34,15 +40,11 @@ const JobForm: React.FC<JobFormProps> = ({ job, onSubmit, onCancel }) => {
|
|||||||
onSubmit({
|
onSubmit({
|
||||||
outputItem: formData.outputItem,
|
outputItem: formData.outputItem,
|
||||||
outputQuantity: formData.outputQuantity,
|
outputQuantity: formData.outputQuantity,
|
||||||
jobStart: formData.jobStart ? formData.jobStart : undefined,
|
jobStart: formData.jobStart || undefined,
|
||||||
jobEnd: formData.jobEnd ? formData.jobEnd : undefined,
|
jobEnd: formData.jobEnd || undefined,
|
||||||
saleStart: formData.saleStart ? formData.saleStart : undefined,
|
saleStart: formData.saleStart || undefined,
|
||||||
saleEnd: formData.saleEnd ? formData.saleEnd : undefined,
|
saleEnd: formData.saleEnd || undefined,
|
||||||
status: formData.status,
|
status: formData.status,
|
||||||
billOfMaterials: job?.billOfMaterials?.map(item => item.id) || [],
|
|
||||||
consumedMaterials: job?.consumedMaterials?.map(item => item.id) || [],
|
|
||||||
expenditures: job?.expenditures?.map(item => item.id) || [],
|
|
||||||
income: job?.income?.map(item => item.id) || [],
|
|
||||||
projectedCost: formData.projectedCost,
|
projectedCost: formData.projectedCost,
|
||||||
projectedRevenue: formData.projectedRevenue
|
projectedRevenue: formData.projectedRevenue
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
|
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
import { useNavigate } from 'react-router-dom';
|
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
||||||
import { Plus, Factory, TrendingUp, Briefcase, FileText } from 'lucide-react';
|
import { Plus, Factory, TrendingUp, Briefcase, FileText } from 'lucide-react';
|
||||||
@@ -14,7 +12,6 @@ import BatchTransactionForm from '@/components/BatchTransactionForm';
|
|||||||
import { useJobs } from '@/hooks/useDataService';
|
import { useJobs } from '@/hooks/useDataService';
|
||||||
|
|
||||||
const Index = () => {
|
const Index = () => {
|
||||||
const navigate = useNavigate();
|
|
||||||
const {
|
const {
|
||||||
jobs,
|
jobs,
|
||||||
loading,
|
loading,
|
||||||
@@ -22,7 +19,8 @@ const Index = () => {
|
|||||||
createJob,
|
createJob,
|
||||||
updateJob,
|
updateJob,
|
||||||
deleteJob,
|
deleteJob,
|
||||||
createMultipleTransactions
|
createMultipleTransactions,
|
||||||
|
createMultipleBillItems
|
||||||
} = useJobs();
|
} = useJobs();
|
||||||
|
|
||||||
const [showJobForm, setShowJobForm] = useState(false);
|
const [showJobForm, setShowJobForm] = useState(false);
|
||||||
@@ -142,6 +140,19 @@ const Index = () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleImportBOM = async (jobId: string, items: { name: string; quantity: number }[]) => {
|
||||||
|
try {
|
||||||
|
const billItems = items.map(item => ({
|
||||||
|
name: item.name,
|
||||||
|
quantity: item.quantity,
|
||||||
|
unitPrice: 0
|
||||||
|
}));
|
||||||
|
await createMultipleBillItems(jobId, billItems, 'billOfMaterials');
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error importing BOM:', error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const jobGroups = regularJobs.reduce((groups, job) => {
|
const jobGroups = regularJobs.reduce((groups, job) => {
|
||||||
const status = job.status;
|
const status = job.status;
|
||||||
if (!groups[status]) {
|
if (!groups[status]) {
|
||||||
@@ -167,10 +178,6 @@ const Index = () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleJobCardClick = (jobId: string) => {
|
|
||||||
navigate(`/${jobId}`);
|
|
||||||
};
|
|
||||||
|
|
||||||
if (showJobForm) {
|
if (showJobForm) {
|
||||||
return (
|
return (
|
||||||
<div className="min-h-screen bg-gray-950 p-6">
|
<div className="min-h-screen bg-gray-950 p-6">
|
||||||
@@ -274,14 +281,14 @@ const Index = () => {
|
|||||||
{!collapsedGroups[status] && (
|
{!collapsedGroups[status] && (
|
||||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||||
{statusJobs.map(job => (
|
{statusJobs.map(job => (
|
||||||
<div key={job.id} onClick={() => handleJobCardClick(job.id)} className="cursor-pointer">
|
<JobCard
|
||||||
<JobCard
|
key={job.id}
|
||||||
job={job}
|
job={job}
|
||||||
onEdit={handleEditJob}
|
onEdit={handleEditJob}
|
||||||
onDelete={handleDeleteJob}
|
onDelete={handleDeleteJob}
|
||||||
onUpdateProduced={handleUpdateProduced}
|
onUpdateProduced={handleUpdateProduced}
|
||||||
/>
|
onImportBOM={handleImportBOM}
|
||||||
</div>
|
/>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -309,15 +316,15 @@ const Index = () => {
|
|||||||
{!collapsedGroups['Tracked'] && (
|
{!collapsedGroups['Tracked'] && (
|
||||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||||
{trackedJobs.map(job => (
|
{trackedJobs.map(job => (
|
||||||
<div key={job.id} onClick={() => handleJobCardClick(job.id)} className="cursor-pointer">
|
<JobCard
|
||||||
<JobCard
|
key={job.id}
|
||||||
job={job}
|
job={job}
|
||||||
onEdit={handleEditJob}
|
onEdit={handleEditJob}
|
||||||
onDelete={handleDeleteJob}
|
onDelete={handleDeleteJob}
|
||||||
onUpdateProduced={handleUpdateProduced}
|
onUpdateProduced={handleUpdateProduced}
|
||||||
isTracked={true}
|
onImportBOM={handleImportBOM}
|
||||||
/>
|
isTracked={true}
|
||||||
</div>
|
/>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in New Issue
Block a user