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

Merge remote-tracking branch 'origin/dev-resourceManagement' into main-demo

Browse Source
This commit is contained in:
Vishnu
2025-08-25 18:17:40 +05:30
parent cd86846a37 ff22152d8c
commit 2125c3dc73
5 changed files with 62 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/components/layout/sidebarRight/resourceManagement/hrm/Hrm.tsx
View File

@@ -3,6 +3,8 @@ import { ClockThreeIcon, LocationPinIcon, TargetIcon } from '../../../../icons/E
import { useSceneContext } from '../../../../../modules/scene/sceneContext';
import { useProductContext } from '../../../../../modules/simulation/products/productContext';
import RenameInput from '../../../../ui/inputs/RenameInput';
import { useResourceManagementId } from '../../../../../store/builder/store';
import { set } from 'immer/dist/internal';
// import NavigateCatagory from '../NavigateCatagory'
const Hrm = () => {
@@ -13,6 +15,7 @@ const Hrm = () => {
const { products, getProductById } = productStore();
const { selectedProductStore } = useProductContext();
const { selectedProduct } = selectedProductStore();
const { setResourceManagementId } = useResourceManagementId();
useEffect(() => {
if (selectedProduct) {
@@ -25,6 +28,7 @@ const Hrm = () => {
employee: {
image: "",
name: worker.modelName,
modelId: worker.modelUuid,
employee_id: `HR-${204 + index}`,
status: "Active",
},
@@ -54,7 +58,7 @@ const Hrm = () => {
}, [selectedProduct, getProductById]);
useEffect(() => {
// console.log("Workers data updated:", workers);
//
}, [workers]);
@@ -147,9 +151,14 @@ const Hrm = () => {
// },
// ]
function handleRenameWorker(newName: string) {
// console.log('newName: ', newName);
//
}
function handleHumanClick(employee: any) {
if (employee.modelId) {
setResourceManagementId(employee.modelId);
}
}
return (
@@ -173,14 +182,14 @@ const Hrm = () => {
<img className='user-image' src={employee.employee.image} alt="" />
<div className={`status ${employee.employee.status}`}></div>
</div>
<div className="details">
<div className="details" >
{/* <div className="employee-name">{employee.employee.name}</div> */}
<RenameInput value={employee.employee.name} onRename={handleRenameWorker} />
<div className="employee-id">{employee.employee.employee_id}</div>
</div>
</div>
<div className="see-more">View more</div>
<div className="see-more" onClick={() => { handleHumanClick(employee.employee) }}>View in Scene</div>
</header>
<div className="content">

26
app/src/components/layout/sidebarRight/resourceManagement/hrm/assetManagement/AssetManagement.tsx
View File

@@ -5,6 +5,7 @@ import assetImage from "../../../../../../assets/image/asset-image.png"
import { useSceneContext } from '../../../../../../modules/scene/sceneContext';
import { useProductContext } from '../../../../../../modules/simulation/products/productContext';
import RenameInput from '../../../../../ui/inputs/RenameInput';
import { useResourceManagementId } from '../../../../../../store/builder/store';
const AssetManagement = () => {
// const [selectedCategory, setSelectedCategory] = useState("All Assets");
const [expandedAssetId, setExpandedAssetId] = useState<string | null>(null);
@@ -14,6 +15,7 @@ const AssetManagement = () => {
const { products, getProductById } = productStore();
const { selectedProductStore } = useProductContext();
const { selectedProduct } = selectedProductStore();
const { setResourceManagementId } = useResourceManagementId();
@@ -26,7 +28,7 @@ const AssetManagement = () => {
if (asset.type === "storageUnit" || asset.type === "human") return;
if (!grouped[asset.modelName]) {
grouped[asset.modelName] = {
id: asset.assetId,
id: asset.modelUuid,
name: asset.modelName,
model: asset.modelCode || "N/A",
status: asset.status || "Online",
@@ -47,7 +49,7 @@ const AssetManagement = () => {
}, [selectedProduct]);
function handleRenameAsset(newName: string) {
// console.log('newName: ', newName);
//
// if (expandedAssetId) {
// setAssets(prevAssets =>
// prevAssets.map(asset =>
@@ -62,6 +64,12 @@ const AssetManagement = () => {
}, [assets]);
function handleAssetClick(id: string) {
setResourceManagementId(id);
}
// const dummyAssets = [
// {
// id: '1',
@@ -105,10 +113,10 @@ const AssetManagement = () => {
return (
<>
{/* <NavigateCatagory
category={["All Assets", "Machines", "Workstation", "Vehicles"]}
selectedCategory={selectedCategory}
setSelectedCategory={setSelectedCategory}
/> */}
category={["All Assets", "Machines", "Workstation", "Vehicles"]}
selectedCategory={selectedCategory}
setSelectedCategory={setSelectedCategory}
/> */}
<div className='assetManagement-container assetManagement-wrapper'>
{assets.map((asset, index) => (
@@ -125,15 +133,13 @@ const AssetManagement = () => {
<div className="icon"><ForkLiftIcon /></div>
}
<div className="asset-details-container">
<div className="asset-details">
<div className="asset-details" >
{/* <div className="asset-name">{asset.name}</div> */}
<RenameInput value={asset.name} onRename={handleRenameAsset} />
{asset.count !== 1 && <div>
<span className="asset-id-label">x</span>
<span className="asset-id">{asset.count}</span>
</div>}
<div className="asset-model">{asset.model}</div>
</div>
<div className="asset-status-wrapper">
@@ -166,7 +172,7 @@ const AssetManagement = () => {
<div className="asset-estimate__view-button">
<EyeIcon isClosed={false} />
<div className="asset-estimate__view-text">View in Scene</div>
<div className="asset-estimate__view-text" onClick={() => handleAssetClick(asset.id)}>View in Scene</div>
</div>
</div>