diff --git a/src/components/Dashboard/Inventory/StockLocations/StockLocationInfo.jsx b/src/components/Dashboard/Inventory/StockLocations/StockLocationInfo.jsx index 5bad2e5f..13e23d18 100644 --- a/src/components/Dashboard/Inventory/StockLocations/StockLocationInfo.jsx +++ b/src/components/Dashboard/Inventory/StockLocations/StockLocationInfo.jsx @@ -12,6 +12,10 @@ import ViewButton from '../../common/ViewButton.jsx' import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx' import NoteIcon from '../../../Icons/NoteIcon.jsx' import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx' +import StockAuditIcon from '../../../Icons/StockAuditIcon.jsx' +import FilamentStockIcon from '../../../Icons/FilamentStockIcon.jsx' +import PartStockIcon from '../../../Icons/PartStockIcon.jsx' +import ProductStockIcon from '../../../Icons/ProductStockIcon.jsx' import ObjectForm from '../../common/ObjectForm.jsx' import EditButtons from '../../common/EditButtons.jsx' import ObjectTableNavigationButtons from '../../common/ObjectTableNavigationButtons.jsx' @@ -40,6 +44,10 @@ const StockLocationInfo = () => { 'StockLocationInfo', { info: true, + filamentStocks: true, + partStocks: true, + productStocks: true, + stockAudits: true, notes: true, auditLogs: false } @@ -107,6 +115,10 @@ const StockLocationInfo = () => { disabled={objectFormState.loading} items={[ { key: 'info', label: 'Stock Location' }, + { key: 'filamentStocks', label: 'Filament Stocks' }, + { key: 'partStocks', label: 'Part Stocks' }, + { key: 'productStocks', label: 'Product Stocks' }, + { key: 'stockAudits', label: 'Stock Audits' }, { key: 'notes', label: 'Notes' }, { key: 'auditLogs', label: 'Audit Logs' } ]} @@ -193,6 +205,118 @@ const StockLocationInfo = () => { + } + active={collapseState.filamentStocks} + onToggle={(expanded) => + updateCollapseState('filamentStocks', expanded) + } + collapseKey='filamentStocks' + > + {objectFormState.loading ? ( + + ) : ( + + )} + + + } + active={collapseState.partStocks} + onToggle={(expanded) => + updateCollapseState('partStocks', expanded) + } + collapseKey='partStocks' + > + {objectFormState.loading ? ( + + ) : ( + + )} + + + } + active={collapseState.productStocks} + onToggle={(expanded) => + updateCollapseState('productStocks', expanded) + } + collapseKey='productStocks' + > + {objectFormState.loading ? ( + + ) : ( + + )} + + + } + active={collapseState.stockAudits} + onToggle={(expanded) => + updateCollapseState('stockAudits', expanded) + } + collapseKey='stockAudits' + > + {objectFormState.loading ? ( + + ) : ( + + )} + + } diff --git a/src/components/Dashboard/Inventory/StockTransfers/StockTransferInfo.jsx b/src/components/Dashboard/Inventory/StockTransfers/StockTransferInfo.jsx index 404e1e4d..6d0d9cd4 100644 --- a/src/components/Dashboard/Inventory/StockTransfers/StockTransferInfo.jsx +++ b/src/components/Dashboard/Inventory/StockTransfers/StockTransferInfo.jsx @@ -13,6 +13,7 @@ import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx' import NoteIcon from '../../../Icons/NoteIcon.jsx' import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx' import StockTransferIcon from '../../../Icons/StockTransferIcon.jsx' +import StockEventIcon from '../../../Icons/StockEventIcon.jsx' import ObjectForm from '../../common/ObjectForm.jsx' import EditButtons from '../../common/EditButtons.jsx' import ObjectTableNavigationButtons from '../../common/ObjectTableNavigationButtons.jsx' @@ -47,6 +48,7 @@ const StockTransferInfo = () => { { info: true, lines: true, + stockEvents: true, notes: true, auditLogs: false } @@ -114,6 +116,7 @@ const StockTransferInfo = () => { items={[ { key: 'info', label: 'Transfer' }, { key: 'lines', label: 'Lines' }, + { key: 'stockEvents', label: 'Stock Events' }, { key: 'notes', label: 'Notes' }, { key: 'auditLogs', label: 'Audit Logs' } ]} @@ -220,6 +223,34 @@ const StockTransferInfo = () => { + } + active={collapseState.stockEvents} + onToggle={(expanded) => + updateCollapseState('stockEvents', expanded) + } + collapseKey='stockEvents' + > + {objectFormState.loading ? ( + + ) : ( + + )} + + } diff --git a/src/components/Dashboard/Management/StockAuditLevels/StockAuditLevelInfo.jsx b/src/components/Dashboard/Management/StockAuditLevels/StockAuditLevelInfo.jsx index 4761e38f..db4ff962 100644 --- a/src/components/Dashboard/Management/StockAuditLevels/StockAuditLevelInfo.jsx +++ b/src/components/Dashboard/Management/StockAuditLevels/StockAuditLevelInfo.jsx @@ -10,6 +10,7 @@ import ViewButton from '../../common/ViewButton' import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx' import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx' import StockAuditLevelIcon from '../../../Icons/StockAuditLevelIcon.jsx' +import StockAuditIcon from '../../../Icons/StockAuditIcon.jsx' import ObjectForm from '../../common/ObjectForm' import EditButtons from '../../common/EditButtons' import ObjectTableNavigationButtons from '../../common/ObjectTableNavigationButtons.jsx' @@ -36,6 +37,7 @@ const StockAuditLevelInfo = () => { { info: true, auditLines: true, + stockAudits: true, auditLogs: false } ) @@ -97,6 +99,7 @@ const StockAuditLevelInfo = () => { items={[ { key: 'info', label: 'Stock Audit Level Information' }, { key: 'auditLines', label: 'Audit Lines' }, + { key: 'stockAudits', label: 'Stock Audits' }, { key: 'auditLogs', label: 'Audit Logs' } ]} visibleState={collapseState} @@ -198,6 +201,33 @@ const StockAuditLevelInfo = () => { )} + } + active={collapseState.stockAudits} + onToggle={(expanded) => + updateCollapseState('stockAudits', expanded) + } + collapseKey='stockAudits' + > + {objectFormState.loading ? ( + + ) : ( + + )} + } diff --git a/src/database/models/StockAudit.js b/src/database/models/StockAudit.js index 0f1a758d..084d9505 100644 --- a/src/database/models/StockAudit.js +++ b/src/database/models/StockAudit.js @@ -35,7 +35,7 @@ export const StockAudit = { name: 'new', type: 'modal', pageName: 'list', - modalWidth: 800, + modalWidth: 700, label: 'New Stock Audit', icon: PlusIcon, content: (objectData, { onOk } = {}) => { diff --git a/src/database/models/StockAuditLevel.js b/src/database/models/StockAuditLevel.js index 0f64e2ef..3bb2bc63 100644 --- a/src/database/models/StockAuditLevel.js +++ b/src/database/models/StockAuditLevel.js @@ -32,7 +32,7 @@ export const StockAuditLevel = { name: 'new', type: 'modal', pageName: 'list', - modalWidth: 900, + modalWidth: 700, label: 'New Stock Audit Level', icon: PlusIcon, content: (objectData, { onOk } = {}) => {