Dwinzo-Beta
/
Dwinzo_dev
4
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v3-refactor' into v3

This commit is contained in:
Jerald-Golden-B 2025-06-10 11:36:13 +05:30
parent f586354fb4 6884ffd562
commit 12d667543c
26 changed files with 412 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/components/layout/sidebarRight/analysis/Analysis.tsx
View File

@ -14,9 +14,9 @@ const Analysis: React.FC = () => {
const AnalysisPresets: AnalysisPresetsType = { const AnalysisPresets: AnalysisPresetsType = {
"Throughput time": [ "Throughput time": [
{ type: "default", inputs: { label: "Cycle time", activeOption: "s" } }, // { type: "default", inputs: { label: "Cycle time", activeOption: "s" } },
{ type: "default", inputs: { label: "machines / lines", activeOption: "item" } }, // { type: "default", inputs: { label: "machines / lines", activeOption: "item" } },
{ type: "default", inputs: { label: "Machine uptime", activeOption: "%" } }, // { type: "default", inputs: { label: "Machine uptime", activeOption: "%" } },
], ],
"Production capacity": [ "Production capacity": [
{ type: "default", inputs: { label: "Shift length", activeOption: "hr" } }, { type: "default", inputs: { label: "Shift length", activeOption: "hr" } },

8
app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx
View File

@ -9,6 +9,7 @@ import {
usezoneTarget, usezoneTarget,
} from "../../../../store/builder/store"; } from "../../../../store/builder/store";
import { zoneCameraUpdate } from "../../../../services/visulization/zone/zoneCameraUpdation"; import { zoneCameraUpdate } from "../../../../services/visulization/zone/zoneCameraUpdation";
import { useParams } from "react-router-dom";
const ZoneProperties: React.FC = () => { const ZoneProperties: React.FC = () => {
const { Edit, setEdit } = useEditPosition(); const { Edit, setEdit } = useEditPosition();
@ -16,6 +17,7 @@ const ZoneProperties: React.FC = () => {
const { zonePosition, setZonePosition } = usezonePosition(); const { zonePosition, setZonePosition } = usezonePosition();
const { zoneTarget, setZoneTarget } = usezoneTarget(); const { zoneTarget, setZoneTarget } = usezoneTarget();
const { zones, setZones } = useZones(); const { zones, setZones } = useZones();
const { projectId } = useParams()
useEffect(() => { useEffect(() => {
setZonePosition(selectedZone.zoneViewPortPosition); setZonePosition(selectedZone.zoneViewPortPosition);
@ -33,7 +35,8 @@ const ZoneProperties: React.FC = () => {
viewPortCenter: zoneTarget, viewPortCenter: zoneTarget,
}; };
let response = await zoneCameraUpdate(zonesdata, organization); let response = await zoneCameraUpdate(zonesdata, organization,projectId);
console.log('response: ', response);
if (response.message === "updated successfully") { if (response.message === "updated successfully") {
setEdit(false); setEdit(false);
} else { } else {
@ -56,7 +59,8 @@ const ZoneProperties: React.FC = () => {
zoneName: newName, zoneName: newName,
}; };
// Call your API to update the zone // Call your API to update the zone
let response = await zoneCameraUpdate(zonesdata, organization); let response = await zoneCameraUpdate(zonesdata, organization,projectId);
console.log('response: ', response);
// console.log("response: ", response); // console.log("response: ", response);
if (response.message === "updated successfully") { if (response.message === "updated successfully") {
setZones((prevZones: any[]) => setZones((prevZones: any[]) =>

21
app/src/components/layout/sidebarRight/visualization/IotInputCards/BarChartInput.tsx
View File

@ -8,6 +8,7 @@ import { useWidgetStore } from "../../../../../store/useWidgetStore";
import axios from "axios"; import axios from "axios";
import RenameInput from "../../../../ui/inputs/RenameInput"; import RenameInput from "../../../../ui/inputs/RenameInput";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import { useSocketStore } from "../../../../../store/builder/store";
type Props = {}; type Props = {};
@ -26,6 +27,7 @@ const BarChartInput = (props: Props) => {
const organization = email?.split("@")[1]?.split(".")[0]; const organization = email?.split("@")[1]?.split(".")[0];
const [isLoading, setLoading] = useState<boolean>(true); const [isLoading, setLoading] = useState<boolean>(true);
const { projectId } = useParams(); const { projectId } = useParams();
const { visualizationSocket } = useSocketStore();
useEffect(() => { useEffect(() => {
@ -92,6 +94,25 @@ const BarChartInput = (props: Props) => {
inputDuration: any, inputDuration: any,
inputName: any inputName: any
) => { ) => {
// const userId = localStorage.getItem("userId");
// let newWidget = {
// id: selectedChartId.id,
// panel: selectedChartId.panel,
// widgetName: inputName,
// Data: {
// measurements: inputMeasurement,
// duration: inputDuration,
// }
// }
// const adding3dWidget = {
// organization: organization,
// widget: newWidget,
// zoneUuid: selectedZone.zoneUuid,
// projectId, userId
// };
// if (visualizationSocket) {
// visualizationSocket.emit("v1:viz-3D-widget:add", adding3dWidget);
// }
try { try {
const response = await axios.post( const response = await axios.post(
`http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`, `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`,

21
app/src/components/layout/sidebarRight/visualization/IotInputCards/LineGrapInput.tsx
View File

@ -124,6 +124,7 @@ import { useWidgetStore } from "../../../../../store/useWidgetStore";
import axios from "axios"; import axios from "axios";
import RenameInput from "../../../../ui/inputs/RenameInput"; import RenameInput from "../../../../ui/inputs/RenameInput";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import { useSocketStore } from "../../../../../store/builder/store";
type Props = {}; type Props = {};
@ -142,6 +143,7 @@ const LineGrapInput = (props: Props) => {
const organization = email?.split("@")[1]?.split(".")[0]; const organization = email?.split("@")[1]?.split(".")[0];
const [isLoading, setLoading] = useState<boolean>(true); const [isLoading, setLoading] = useState<boolean>(true);
const { projectId } = useParams(); const { projectId } = useParams();
const { visualizationSocket } = useSocketStore();
useEffect(() => { useEffect(() => {
const fetchZoneData = async () => { const fetchZoneData = async () => {
@ -207,6 +209,25 @@ const LineGrapInput = (props: Props) => {
inputDuration: any, inputDuration: any,
inputName: any inputName: any
) => { ) => {
// const userId = localStorage.getItem("userId");
// let newWidget = {
// id: selectedChartId.id,
// panel: selectedChartId.panel,
// widgetName: inputName,
// Data: {
// measurements: inputMeasurement,
// duration: inputDuration,
// }
// }
// const adding3dWidget = {
// organization: organization,
// widget: newWidget,
// zoneUuid: selectedZone.zoneUuid,
// projectId, userId
// };
// if (visualizationSocket) {
// visualizationSocket.emit("v1:viz-3D-widget:add", adding3dWidget);
// }
try { try {
const response = await axios.post( const response = await axios.post(
`http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`, `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`,

22
app/src/components/layout/sidebarRight/visualization/IotInputCards/PieChartInput.tsx
View File

@ -8,6 +8,7 @@ import { useWidgetStore } from "../../../../../store/useWidgetStore";
import axios from "axios"; import axios from "axios";
import RenameInput from "../../../../ui/inputs/RenameInput"; import RenameInput from "../../../../ui/inputs/RenameInput";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import { useSocketStore } from "../../../../../store/builder/store";
type Props = {}; type Props = {};
@ -26,6 +27,7 @@ const PieChartInput = (props: Props) => {
const organization = email?.split("@")[1]?.split(".")[0]; const organization = email?.split("@")[1]?.split(".")[0];
const [isLoading, setLoading] = useState<boolean>(true); const [isLoading, setLoading] = useState<boolean>(true);
const { projectId } = useParams(); const { projectId } = useParams();
const { visualizationSocket } = useSocketStore();
useEffect(() => { useEffect(() => {
@ -92,6 +94,26 @@ const PieChartInput = (props: Props) => {
inputDuration: any, inputDuration: any,
inputName: any inputName: any
) => { ) => {
// const userId = localStorage.getItem("userId");
// let newWidget = {
// id: selectedChartId.id,
// panel: selectedChartId.panel,
// widgetName: inputName,
// Data: {
// measurements: inputMeasurement,
// duration: inputDuration,
// },
// }
// const adding3dWidget = {
// organization: organization,
// widget: newWidget,
// zoneUuid: selectedZone.zoneUuid,
// projectId, userId
// };
// if (visualizationSocket) {
// visualizationSocket.emit("v1:viz-3D-widget:add", adding3dWidget);
// }
try { try {
const response = await axios.post( const response = await axios.post(
`http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`, `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`,

21
app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress1Input.tsx
View File

@ -8,6 +8,7 @@ import { useWidgetStore } from "../../../../../store/useWidgetStore";
import axios from "axios"; import axios from "axios";
import RenameInput from "../../../../ui/inputs/RenameInput"; import RenameInput from "../../../../ui/inputs/RenameInput";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import { useSocketStore } from "../../../../../store/builder/store";
type Props = {}; type Props = {};
@ -26,6 +27,7 @@ const Progress1Input = (props: Props) => {
const organization = email?.split("@")[1]?.split(".")[0]; const organization = email?.split("@")[1]?.split(".")[0];
const [isLoading, setLoading] = useState<boolean>(true); const [isLoading, setLoading] = useState<boolean>(true);
const { projectId } = useParams(); const { projectId } = useParams();
const { visualizationSocket } = useSocketStore();
useEffect(() => { useEffect(() => {
@ -92,6 +94,25 @@ const Progress1Input = (props: Props) => {
inputDuration: any, inputDuration: any,
inputName: any inputName: any
) => { ) => {
// const userId = localStorage.getItem("userId");
// let newWidget = {
// id: selectedChartId.id,
// panel: selectedChartId.panel,
// widgetName: inputName,
// Data: {
// measurements: inputMeasurement,
// duration: inputDuration,
// },
// }
// const adding3dWidget = {
// organization: organization,
// widget: newWidget,
// zoneUuid: selectedZone.zoneUuid,
// projectId, userId
// };
// if (visualizationSocket) {
// visualizationSocket.emit("v1:viz-3D-widget:add", adding3dWidget);
// }
try { try {
const response = await axios.post( const response = await axios.post(
`http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`, `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`,

21
app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress2Input.tsx
View File

@ -8,6 +8,7 @@ import { useWidgetStore } from "../../../../../store/useWidgetStore";
import axios from "axios"; import axios from "axios";
import RenameInput from "../../../../ui/inputs/RenameInput"; import RenameInput from "../../../../ui/inputs/RenameInput";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import { useSocketStore } from "../../../../../store/builder/store";
type Props = {}; type Props = {};
@ -26,6 +27,7 @@ const Progress2Input = (props: Props) => {
const organization = email?.split("@")[1]?.split(".")[0]; const organization = email?.split("@")[1]?.split(".")[0];
const [isLoading, setLoading] = useState<boolean>(true); const [isLoading, setLoading] = useState<boolean>(true);
const { projectId } = useParams(); const { projectId } = useParams();
const { visualizationSocket } = useSocketStore();
useEffect(() => { useEffect(() => {
@ -92,6 +94,25 @@ const Progress2Input = (props: Props) => {
inputDuration: any, inputDuration: any,
inputName: any inputName: any
) => { ) => {
// const userId = localStorage.getItem("userId");
// let newWidget = {
// id: selectedChartId.id,
// panel: selectedChartId.panel,
// widgetName: inputName,
// Data: {
// measurements: inputMeasurement,
// duration: inputDuration,
// }
// }
// const adding3dWidget = {
// organization: organization,
// widget: newWidget,
// zoneUuid: selectedZone.zoneUuid,
// projectId, userId
// };
// if (visualizationSocket) {
// visualizationSocket.emit("v1:viz-3D-widget:add", adding3dWidget);
// }
try { try {
const response = await axios.post( const response = await axios.post(
`http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`, `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}/api/V1/widget/save`,

155
app/src/components/ui/analysis/ProductionCapacity.tsx
View File

@ -91,7 +91,8 @@ const ThroughputSummary: React.FC = () => {
const [isLoading, setIsLoading] = useState(true); const [isLoading, setIsLoading] = useState(true);
useEffect(() => { useEffect(() => {
if (productionCapacityData >= 0) { // console.log('productionCapacityData > 0: ', productionCapacityData > 0);
if (productionCapacityData > 0) {
setIsLoading(false); setIsLoading(false);
console.log("productionCapacityData: ", productionCapacityData); console.log("productionCapacityData: ", productionCapacityData);
} else { } else {
@ -100,91 +101,93 @@ const ThroughputSummary: React.FC = () => {
}, [productionCapacityData]); }, [productionCapacityData]);
return ( return (
<div className="production analysis-card"> <>
<div className="production-wrapper analysis-card-wrapper"> {!isLoading && <div className="production analysis-card">
<div className="card-header"> <div className="production-wrapper analysis-card-wrapper">
<div className="header"> <div className="card-header">
<div className="main-header">Production Capacity</div> <div className="header">
<div className="sub-header"> <div className="main-header">Production Capacity</div>
{timeRange.startTime} - {timeRange.endTime} <div className="sub-header">
{timeRange.startTime} - {timeRange.endTime}
</div>
</div>
<div className="icon-wrapper">
<ProductionCapacityIcon />
</div> </div>
</div> </div>
<div className="icon-wrapper">
<ProductionCapacityIcon />
</div>
</div>
{!isLoading ? ( {!isLoading ? (
<> <>
<div className="process-container"> <div className="process-container">
<div className="throughput-value"> <div className="throughput-value">
<span className="value">{productionCapacityData}</span>{" "} <span className="value">{productionCapacityData}</span>{" "}
Units/hour Units/hour
</div>
<div className="lineChart">
<div className="assetUsage">
<div className="key">Asset usage</div>
<div className="value">{parseFloat(inputValues["Yield rate"])}%</div>
</div> </div>
<Line data={chartData} options={chartOptions} /> <div className="lineChart">
</div> <div className="assetUsage">
</div> <div className="key">Asset usage</div>
<div className="value">{parseFloat(inputValues["Yield rate"])}%</div>
<div className="footer">
<div className="energyConsumption footer-card">
<div className="header">Energy Consumption</div>
<div className="value-container">
<div className="energy-icon">
<PowerIcon />
</div> </div>
<div className="value-wrapper"> <Line data={chartData} options={chartOptions} />
<div className="value"> </div>
{energyConsumption.energyConsumed} </div>
<div className="footer">
<div className="energyConsumption footer-card">
<div className="header">Energy Consumption</div>
<div className="value-container">
<div className="energy-icon">
<PowerIcon />
</div> </div>
<div className="unit">{energyConsumption.unit}</div> <div className="value-wrapper">
</div> <div className="value">
</div> {energyConsumption.energyConsumed}
</div>
<div className="shiftUtilization footer-card">
<div className="header">Shift Utilization</div>
<div className="value-container">
<div className="value">{throughputData.assetUsage}%</div>
<div className="progress-wrapper">
{/* Dynamically create progress bars based on shiftUtilization array */}
{shiftUtilization.map((shift, index) => (
<div
key={shift.shift}
className={`progress shift-${shift.shift}`}
style={{
width: `${shift.percentage}%`,
backgroundColor: shift.color,
}}
></div>
))}
</div>
<div className="progress-indicator">
{/* Dynamically create shift indicators with random colors */}
{shiftUtilization.map((shift, index) => (
<div className="shift-wrapper" key={shift.shift}>
<span
className={`indicator shift-${shift.shift}`}
style={{ backgroundColor: shift.color }} // Random color for indicator
></span>
<label>Shift {shift.shift}</label>
</div> </div>
))} <div className="unit">{energyConsumption.unit}</div>
</div>
</div>
</div>
<div className="shiftUtilization footer-card">
<div className="header">Shift Utilization</div>
<div className="value-container">
<div className="value">{throughputData.assetUsage}%</div>
<div className="progress-wrapper">
{/* Dynamically create progress bars based on shiftUtilization array */}
{shiftUtilization.map((shift, index) => (
<div
key={shift.shift}
className={`progress shift-${shift.shift}`}
style={{
width: `${shift.percentage}%`,
backgroundColor: shift.color,
}}
></div>
))}
</div>
<div className="progress-indicator">
{/* Dynamically create shift indicators with random colors */}
{shiftUtilization.map((shift, index) => (
<div className="shift-wrapper" key={shift.shift}>
<span
className={`indicator shift-${shift.shift}`}
style={{ backgroundColor: shift.color }} // Random color for indicator
></span>
<label>Shift {shift.shift}</label>
</div>
))}
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </>
</> ) : (
) : ( <SkeletonUI type={"default"} />
<SkeletonUI type={"default"} /> )}
)} </div>
</div> </div>}
</div> </>
); );
}; };

255
app/src/components/ui/analysis/ROISummary.tsx
View File

@ -83,136 +83,142 @@ const ROISummary = ({
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const { roiSummary } = useROISummaryData(); const { roiSummary } = useROISummaryData();
useEffect(() => { useEffect(() => {
if (roiSummary && typeof roiSummary === "object") { if (roiSummary.productName) {
setIsLoading(false); // Data loaded // If productName is set, assume data is loaded
setIsLoading(false);
} else { } else {
setIsLoading(true); // Show skeleton while loading // If productName is empty, assume still loading
setIsLoading(true);
} }
}, [roiSummary]); }, [roiSummary]);
return ( return (
<div className="roiSummary-container analysis-card"> <>
<div className="roiSummary-wrapper analysis-card-wrapper">
<div className="card-header"> {
<div className="header"> !isLoading && <div className="roiSummary-container analysis-card">
<div className="main-header">ROI Summary</div> <div className="roiSummary-wrapper analysis-card-wrapper">
<div className="sub-header">From {getCurrentDate()}</div> <div className="card-header">
</div> <div className="header">
<div className="icon-wrapper"> <div className="main-header">ROI Summary</div>
<ROISummaryIcon /> <div className="sub-header">From {getCurrentDate()}</div>
</div> </div>
</div> <div className="icon-wrapper">
{!isLoading ? ( <ROISummaryIcon />
<>
<div className="product-info">
<ROISummaryProductName />
<div className="product-label">Product :</div>
<div className="product-name">{roiSummary.productName}</div>
</div>
<div className="playBack">
<SonarCrownIcon />
<div className="icon"></div>
<div className="info">
<span> {roiSummary.roiPercentage}%</span> ROI with payback
in just <span>{roiSummary.paybackPeriod}</span> months
</div> </div>
</div> </div>
<div className="roi-details"> {!isLoading ? (
<div className="progress-wrapper"> <>
<SemiCircleProgress /> <div className="product-info">
<div className="content"> <ROISummaryProductName />
you're on track to hit it by <div className="product-label">Product :</div>
<div className="key">July 2029</div> <div className="product-name">{roiSummary.productName}</div>
</div> </div>
</div> <div className="playBack">
<div className="metrics"> <SonarCrownIcon />
<div className="metric-wrapper"> <div className="icon"></div>
<div className="metric-item"> <div className="info">
<span className="metric-label">Total Cost Incurred</span> <span> {roiSummary.roiPercentage}%</span> ROI with payback
<span className="metric-value"> in just <span>{roiSummary.paybackPeriod}</span> months
<span>₹</span> </div>
{roiSummary.totalCost} </div>
<div className="roi-details">
<div className="progress-wrapper">
<SemiCircleProgress />
<div className="content">
you're on track to hit it by
<div className="key">July 2029</div>
</div>
</div>
<div className="metrics">
<div className="metric-wrapper">
<div className="metric-item">
<span className="metric-label">Total Cost Incurred</span>
<span className="metric-value">
<span>₹</span>
{roiSummary.totalCost}
</span>
</div>
<div className="metric-item">
<span className="metric-label">Revenue Generated</span>
<span className="metric-value">
<span>₹</span>
{roiSummary.revenueGenerated}
</span>
</div>
</div>
<div
className={`metric-item net-profit ${roiSummary.netProfit > 0 ? "profit" : "loss"}`}
>
<div className="metric-label">
<span>↑</span>
Net Profit
</div>
<div className="metric-value">
<span>₹</span>
{roiSummary.netProfit > 0
? roiSummary.netProfit
: roiSummary.netLoss}
</div>
</div>
</div>
</div>
<div className="cost-breakdown">
<div className="breakdown-header" onClick={toggleTable}>
<div className="section-wrapper">
<CostBreakDownIcon />
<span className="section-title">Cost Breakdown</span>
</div>
<span className={`expand-icon ${isTableOpen ? "open" : ""}`}>
<ArrowIcon />
</span> </span>
</div> </div>
<div className="metric-item"> <div
<span className="metric-label">Revenue Generated</span> className={`breakdown-table-wrapper ${isTableOpen ? "open" : "closed"
<span className="metric-value"> }`}
<span>₹</span> style={{
transition: "max-height 0.3s ease-in-out",
{roiSummary.revenueGenerated} overflow: "hidden",
</span> }}
>
<table className="breakdown-table">
<thead>
<tr>
<th>Item</th>
<th>Unit Cost</th>
<th>Labor Cost</th>
<th>Total Cost</th>
<th>Selling Price</th>
</tr>
</thead>
<tbody>
{roiSummaryData.costBreakdown.map((row, index) => (
<tr
key={index}
className={
row.item === "Total"
? "total-row"
: row.item === "Net Profit"
? "net-profit-row"
: ""
}
>
<td>{row.item}</td>
<td>{row.unitCost}</td>
<td>{row.laborCost}</td>
<td>{row.totalCost}</td>
<td>{row.sellingPrice}</td>
</tr>
))}
</tbody>
</table>
</div> </div>
</div> </div>
<div {/* <div className="tips-section">
className={`metric-item net-profit ${roiSummary.netProfit > 0 ? "profit" : "loss"}`}
>
<div className="metric-label">
<span>↑</span>
Net Profit
</div>
<div className="metric-value">
<span>₹</span>
{roiSummary.netProfit > 0
? roiSummary.netProfit
: roiSummary.netLoss}
</div>
</div>
</div>
</div>
<div className="cost-breakdown">
<div className="breakdown-header" onClick={toggleTable}>
<div className="section-wrapper">
<CostBreakDownIcon />
<span className="section-title">Cost Breakdown</span>
</div>
<span className={`expand-icon ${isTableOpen ? "open" : ""}`}>
<ArrowIcon />
</span>
</div>
<div
className={`breakdown-table-wrapper ${isTableOpen ? "open" : "closed"
}`}
style={{
transition: "max-height 0.3s ease-in-out",
overflow: "hidden",
}}
>
<table className="breakdown-table">
<thead>
<tr>
<th>Item</th>
<th>Unit Cost</th>
<th>Labor Cost</th>
<th>Total Cost</th>
<th>Selling Price</th>
</tr>
</thead>
<tbody>
{roiSummaryData.costBreakdown.map((row, index) => (
<tr
key={index}
className={
row.item === "Total"
? "total-row"
: row.item === "Net Profit"
? "net-profit-row"
: ""
}
>
<td>{row.item}</td>
<td>{row.unitCost}</td>
<td>{row.laborCost}</td>
<td>{row.totalCost}</td>
<td>{row.sellingPrice}</td>
</tr>
))}
</tbody>
</table>
</div>
</div>
{/* <div className="tips-section">
<div className="tip-header"> <div className="tip-header">
<span className="lightbulb-icon"> <span className="lightbulb-icon">
<LightBulpIcon /> <LightBulpIcon />
@ -232,13 +238,14 @@ const ROISummary = ({
<div className="btn">Get ROI Boost Tips</div> <div className="btn">Get ROI Boost Tips</div>
</button> </button>
</div> */} </div> */}
</> </>
) : ( ) : (
<SkeletonUI type={"default"} /> <SkeletonUI type={"default"} />
// <div> No Data</div> // <div> No Data</div>
)} )}
</div> </div>
</div> </div>}
</>
); );
}; };

113
app/src/components/ui/analysis/ThroughputSummary.tsx
View File

@ -30,72 +30,79 @@ const ProductionCapacity = ({
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
useEffect(() => { useEffect(() => {
if (throughputData >= 0) { console.log('typeof throughputData:', typeof throughputData);
console.log('throughputData > 0: ', throughputData > 0);
if (throughputData > 0) {
// console.log('machineActiveTime: ', machineActiveTime); // console.log('machineActiveTime: ', machineActiveTime);
// console.log('materialCycleTime: ', materialCycleTime); // console.log('materialCycleTime: ', materialCycleTime);
// console.log('throughputData: ', throughputData); // console.log('throughputData: ', throughputData);
// console.log('productionCapacityData: ', productionCapacityData); // console.log('productionCapacityData: ', productionCapacityData);
setIsLoading(false);
} else {
setIsLoading(true); setIsLoading(true);
} }
}, [throughputData]) }, [throughputData])
return ( return (
<div className="throughtputSummary-container analysis-card"> <>
<div className="throughtputSummary-wrapper analysis-card-wrapper">
<div className="card-header"> {!isLoading && <div className="throughtputSummary-container analysis-card">
<div className="header"> <div className="throughtputSummary-wrapper analysis-card-wrapper">
<div className="main-header">Throughput Summary</div> <div className="card-header">
<div className="sub-header"> <div className="header">
{timeRange.startTime} - {timeRange.endTime} <div className="main-header">Throughput Summary</div>
<div className="sub-header">
{timeRange.startTime} - {timeRange.endTime}
</div>
</div>
<div className="icon-wrapper">
<ThroughputSummaryIcon />
</div> </div>
</div> </div>
<div className="icon-wrapper"> {isLoading ? (
<ThroughputSummaryIcon /> <>
</div> <div className="process-container">
<div className="throughput-value">
<span className="value">{throughputData}</span> Units/hour
</div>
{/* Dynamic Progress Bar */}
<div className="progress-bar-wrapper">
{[...Array(totalBars)].map((_, i) => (
<div className="progress-bar" key={i}>
{i < barsToFill ? (
<div className="bar-fill full" />
) : i === barsToFill ? (
<div
className="bar-fill partial"
style={{ width: `${partialFillPercent}%` }}
/>
) : null}
</div>
))}
</div>
</div>
<div className="metrics-section">
<div className="metric">
<span className="label">Avg. Process Time</span>
<span className="value">{materialCycleTime} secs/unit </span>
</div>
<div className="metric">
<span className="label">Machine Utilization</span>
<span className="value">{machineActiveTime}</span>
{/* <span className="value">{machineActiveTime}</span> */}
</div>
</div>
</>
) : (
<SkeletonUI type={"default"} />
)}
</div> </div>
{isLoading ? ( </div>}
<> </>
<div className="process-container">
<div className="throughput-value">
<span className="value">{throughputData}</span> Units/hour
</div>
{/* Dynamic Progress Bar */}
<div className="progress-bar-wrapper">
{[...Array(totalBars)].map((_, i) => (
<div className="progress-bar" key={i}>
{i < barsToFill ? (
<div className="bar-fill full" />
) : i === barsToFill ? (
<div
className="bar-fill partial"
style={{ width: `${partialFillPercent}%` }}
/>
) : null}
</div>
))}
</div>
</div>
<div className="metrics-section">
<div className="metric">
<span className="label">Avg. Process Time</span>
<span className="value">{materialCycleTime} secs/unit </span>
</div>
<div className="metric">
<span className="label">Machine Utilization</span>
<span className="value">{machineActiveTime}</span>
{/* <span className="value">{machineActiveTime}</span> */}
</div>
</div>
</>
) : (
<SkeletonUI type={"default"} />
)}
</div>
</div>
); );
}; };

3
app/src/components/ui/list/List.tsx
View File

@ -125,7 +125,8 @@ const List: React.FC<ListProps> = ({ items = [], remove }) => {
zoneName: newName, zoneName: newName,
}; };
const response = await zoneCameraUpdate(zonesdata, organization); const response = await zoneCameraUpdate(zonesdata, organization,projectId);
console.log('response: ', response);
if (response.message === "updated successfully") { if (response.message === "updated successfully") {
setSelectedZone((prev) => ({ ...prev, zoneName: newName })); setSelectedZone((prev) => ({ ...prev, zoneName: newName }));

2
app/src/components/ui/simulation/simulationPlayer.tsx
View File

@ -165,7 +165,7 @@ const SimulationPlayer: React.FC = () => {
<div className="icon"> <div className="icon">
<HourlySimulationIcon /> <HourlySimulationIcon />
</div> </div>
<div className="label">Hourly Simulation</div> <div className="label">ThroughPut Data</div>
</div> </div>
<div className="progress-wrapper"> <div className="progress-wrapper">
<div <div

2
app/src/modules/builder/geomentries/points/deletePoint.ts
View File

@ -45,7 +45,7 @@ function deletePoint(
userId userId
} }
console.log('data: ', data); // console.log('data: ', data);
socket.emit('v1:Line:delete:point', data); socket.emit('v1:Line:delete:point', data);
////////// Update onlyFloorlines.current to remove references to the deleted point ////////// ////////// Update onlyFloorlines.current to remove references to the deleted point //////////

2
app/src/modules/builder/groups/zoneGroup.tsx
View File

@ -82,7 +82,7 @@ const ZoneGroup: React.FC = () => {
const organization = email.split("@")[1].split(".")[0]; const organization = email.split("@")[1].split(".")[0];
const data = await getZonesApi(organization, projectId); const data = await getZonesApi(organization, projectId);
console.log('data: ', data); // console.log('data: ', data);
if (data.length > 0) { if (data.length > 0) {
const fetchedZones = data.map((zone: any) => ({ const fetchedZones = data.map((zone: any) => ({

1
app/src/modules/collaboration/camera/collabCams.tsx
View File

@ -144,6 +144,7 @@ const CamModelsGroup = () => {
}); });
socket.on("v1:camera:Response:update", (data: any) => { socket.on("v1:camera:Response:update", (data: any) => {
// console.log('data: ', data);
if ( if (
!groupRef.current || !groupRef.current ||
socket.id === data.socketId || socket.id === data.socketId ||

13
app/src/modules/collaboration/socket/socketResponses.dev.tsx
View File

@ -84,6 +84,7 @@ export default function SocketResponses({
}); });
socket.on("v1:camera:Response:update", (data: any) => { socket.on("v1:camera:Response:update", (data: any) => {
console.log('dataCamera: ', data);
// //
}); });
@ -172,7 +173,7 @@ export default function SocketResponses({
}); });
socket.on("v1:Line:response:update", (data: any) => { socket.on("v1:Line:response:update", (data: any) => {
console.log('data: ', data); // console.log('data: ', data);
if (socket.id === data.socketId) { if (socket.id === data.socketId) {
return; return;
} }
@ -214,7 +215,7 @@ export default function SocketResponses({
}); });
socket.on("v1:Line:response:delete", (data: any) => { socket.on("v1:Line:response:delete", (data: any) => {
console.log('data: ', data); // console.log('data: ', data);
if (socket.id === data.socketId) { if (socket.id === data.socketId) {
return; return;
} }
@ -337,7 +338,7 @@ export default function SocketResponses({
}); });
socket.on("v1:Line:response:delete:layer", async (data: any) => { socket.on("v1:Line:response:delete:layer", async (data: any) => {
console.log('data: ', data); // console.log('data: ', data);
if (socket.id === data.socketId) { if (socket.id === data.socketId) {
return; return;
} }
@ -669,7 +670,7 @@ export default function SocketResponses({
const organization = email!.split("@")[1].split(".")[0]; const organization = email!.split("@")[1].split(".")[0];
socket.on("v1:Line:response:create", async (data: any) => { socket.on("v1:Line:response:create", async (data: any) => {
console.log('data: ', data); // console.log('data: ', data);
// //
if (socket.id === data.socketId) { if (socket.id === data.socketId) {
return; return;
@ -788,7 +789,7 @@ export default function SocketResponses({
const organization = email!.split("@")[1].split(".")[0]; const organization = email!.split("@")[1].split(".")[0];
socket.on("v1:zone:response:updates", (data: any) => { socket.on("v1:zone:response:updates", (data: any) => {
console.log('data: ', data); // console.log('data: ', data);
if (socket.id === data.socketId) { if (socket.id === data.socketId) {
return; return;
} }
@ -834,7 +835,7 @@ export default function SocketResponses({
}); });
socket.on("v1:zone:response:delete", (data: any) => { socket.on("v1:zone:response:delete", (data: any) => {
console.log('data: ', data); // console.log('data: ', data);
if (socket.id === data.socketId) { if (socket.id === data.socketId) {
return; return;
} }

1
app/src/modules/scene/camera/updateCameraPosition.ts
View File

@ -22,6 +22,7 @@ export default function updateCamPosition(
socketId: socket.id, socketId: socket.id,
projectId projectId
}; };
// console.log('CameracamData: ', camData);
socket.emit("v1:Camera:set", camData); socket.emit("v1:Camera:set", camData);
localStorage.setItem("cameraPosition", JSON.stringify(position)); localStorage.setItem("cameraPosition", JSON.stringify(position));
localStorage.setItem("controlTarget", JSON.stringify(new THREE.Vector3(target.x, 0, target.z))); localStorage.setItem("controlTarget", JSON.stringify(new THREE.Vector3(target.x, 0, target.z)));

1
app/src/modules/scene/controls/controls.tsx
View File

@ -67,6 +67,7 @@ export default function Controls() {
socketId: socket.id, socketId: socket.id,
projectId projectId
}; };
// console.log('CameracamData: ', camData);
socket.emit('v1:Camera:set', camData) socket.emit('v1:Camera:set', camData)
setResetCamera(false); setResetCamera(false);

2
app/src/modules/scene/controls/selectionControls/copyPasteControls.tsx
View File

@ -363,6 +363,7 @@ const CopyPasteControls = ({
projectId projectId
}; };
// console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
obj.userData = { obj.userData = {
@ -418,6 +419,7 @@ const CopyPasteControls = ({
userId userId
}; };
// console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
const asset: Asset = { const asset: Asset = {

2
app/src/modules/scene/controls/selectionControls/duplicationControls.tsx
View File

@ -338,6 +338,7 @@ const DuplicationControls = ({
userId userId
}; };
// console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
const asset: Asset = { const asset: Asset = {
@ -387,6 +388,7 @@ const DuplicationControls = ({
projectId projectId
}; };
// console.log('data: ', data);/
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
const asset: Asset = { const asset: Asset = {

1
app/src/modules/scene/controls/selectionControls/moveControls.tsx
View File

@ -314,6 +314,7 @@ function MoveControls({
userId userId
}; };
// console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
AssetGroup.current.add(obj); AssetGroup.current.add(obj);

1
app/src/modules/scene/controls/selectionControls/rotateControls.tsx
View File

@ -273,6 +273,7 @@ function RotateControls({
userId userId
}; };
// console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
AssetGroup.current.add(obj); AssetGroup.current.add(obj);

1
app/src/modules/scene/controls/transformControls/transformControls.tsx
View File

@ -134,6 +134,7 @@ export default function TransformControl() {
projectId projectId
}; };
// console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
} }
} }

7
app/src/modules/visualization/widgets/3d/Dropped3dWidget.tsx
View File

@ -361,10 +361,7 @@ export default function Dropped3dWidgets() {
} }
}, [rightSelect, rightClickSelected]); }, [rightSelect, rightClickSelected]);
function isPointInPolygon( function isPointInPolygon(point: [number, number], polygon: Array<[number, number]>): boolean {
point: [number, number],
polygon: Array<[number, number]>
): boolean {
const [x, z] = point; const [x, z] = point;
let inside = false; let inside = false;
@ -434,8 +431,6 @@ export default function Dropped3dWidgets() {
} }
} }
}; };
const handleMouseMove = (event: MouseEvent) => { const handleMouseMove = (event: MouseEvent) => {
if (!rightClickSelected || !rightSelect) return; if (!rightClickSelected || !rightSelect) return;
const selectedzoneUuid = Object.keys(zoneWidgetData).find( const selectedzoneUuid = Object.keys(zoneWidgetData).find(

1
app/src/services/factoryBuilder/environment/setEnvironment.ts
View File

@ -31,7 +31,6 @@ export const setEnvironment = async (
renderDistance, renderDistance,
limitDistance, limitDistance,
projectId projectId
}), }),
} }
); );

8
app/src/services/visulization/zone/zoneCameraUpdation.ts
View File

@ -1,17 +1,17 @@
let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`; let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
// let url_Backend_dwinzo = `http://192.168.0.102:5000`; // let url_Backend_dwinzo = `http://192.168.0.102:5000`;
export const zoneCameraUpdate = async (zonesdata: {}, organization: string) => { export const zoneCameraUpdate = async (zoneData: {}, organization: string, projectId?: string) => {
try { try {
const response = await fetch(`${url_Backend_dwinzo}/api/V1/zones`, { const response = await fetch(`${url_Backend_dwinzo}/api/V1/zones`, {
method: "POST", method: "POST",
headers: { headers: {
Authorization: "Bearer <access_token>", Authorization: "Bearer <access_token>", // Replace with actual token
"Content-Type": "application/json", "Content-Type": "application/json",
token: localStorage.getItem("token") || "", token: localStorage.getItem("token") || "",
refresh_token: localStorage.getItem("refreshToken") || "", refresh_token: localStorage.getItem("refreshToken") || "",
}, },
body: JSON.stringify({ zonesdata, organization }), body: JSON.stringify({ zoneData,projectId }),
}); });
if (!response.ok) { if (!response.ok) {