diff --git a/frontend/src/components/production/ocp/LabelLog.tsx b/frontend/src/components/production/ocp/LabelLog.tsx
index 91bc1ee..d7e563f 100644
--- a/frontend/src/components/production/ocp/LabelLog.tsx
+++ b/frontend/src/components/production/ocp/LabelLog.tsx
@@ -1,5 +1,5 @@
import {LstCard} from "@/components/extendedUI/LstCard";
-import {CardHeader} from "@/components/ui/card";
+
import {Skeleton} from "@/components/ui/skeleton";
import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
// import {useSessionStore} from "@/lib/store/sessionStore";
@@ -17,7 +17,7 @@ const labelLogs = [
//{key: "reprint", label: "Reprint"}, // removing the reprint button for now until repritning is working as intended
];
export default function LabelLog() {
- const {data, isError, error, isLoading} = useQuery(getlabels("4"));
+ const {data, isError, isLoading} = useQuery(getlabels("4"));
//const {user} = useSessionStore();
//const {settings} = useSettingStore();
//const server = settings.filter((n) => n.name === "server")[0]?.value || "";
@@ -26,10 +26,42 @@ export default function LabelLog() {
if (isError) {
return (
-
+
- There was an error loading the lots
- {JSON.stringify(error)}
+ Labels for the last 2 hours
+
+
+
+ {labelLogs.map((l) => (
+ {l.label}
+ ))}
+
+
+
+
+ {Array(7)
+ .fill(0)
+ .map((_, i) => (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ))}
+
+
);
@@ -37,6 +69,7 @@ export default function LabelLog() {
return (
+ Labels for the last 2 hours
diff --git a/frontend/src/components/production/ocp/Lots.tsx b/frontend/src/components/production/ocp/Lots.tsx
index 2af4ac7..64564e4 100644
--- a/frontend/src/components/production/ocp/Lots.tsx
+++ b/frontend/src/components/production/ocp/Lots.tsx
@@ -1,5 +1,5 @@
import {LstCard} from "@/components/extendedUI/LstCard";
-import {CardHeader} from "@/components/ui/card";
+
import {Skeleton} from "@/components/ui/skeleton";
import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
import {useSessionStore} from "@/lib/store/sessionStore";
@@ -57,7 +57,7 @@ let lotColumns = [
// },
];
export default function Lots() {
- const {data, isError, error, isLoading} = useQuery(getlots());
+ const {data, isError, isLoading} = useQuery(getlots());
const {user} = useSessionStore();
const {settings} = useSettingStore();
const server = settings.filter((n) => n.name === "server")[0]?.value || "";
@@ -82,10 +82,54 @@ export default function Lots() {
if (isError) {
return (
-
+
- There was an error loading the lots
- {JSON.stringify(error)}
+ Current Assigned lots
+
+
+
+ {lotColumns.map((l) => (
+ {l.label}
+ ))}
+
+
+
+
+ {Array(10)
+ .fill(0)
+ .map((_, i) => (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ))}
+
+
);
@@ -93,6 +137,7 @@ export default function Lots() {
return (
+ Current Assigned lots
diff --git a/frontend/src/components/production/ocp/PrinterStatus.tsx b/frontend/src/components/production/ocp/PrinterStatus.tsx
index abf704a..27fe9f4 100644
--- a/frontend/src/components/production/ocp/PrinterStatus.tsx
+++ b/frontend/src/components/production/ocp/PrinterStatus.tsx
@@ -1,5 +1,52 @@
import {LstCard} from "@/components/extendedUI/LstCard";
+import {Skeleton} from "@/components/ui/skeleton";
+import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
+let printerCols = [
+ {
+ key: "status",
+ label: "Status",
+ },
+ {
+ key: "printer",
+ label: "Printer",
+ },
+ {
+ key: "statusMessage",
+ label: "Status Message",
+ },
+];
export default function PrinterStatus() {
- return Printer Status;
+ return (
+
+ Printer Status
+
+
+
+ {printerCols.map((l) => (
+ {l.label}
+ ))}
+
+
+
+
+ {Array(10)
+ .fill(0)
+ .map((_, i) => (
+
+
+
+
+
+
+
+
+
+
+
+ ))}
+
+
+
+ );
}