Merged in feature/IO-2743-Production-Board-GridDND (pull request #1539)
Feature/IO-2743 Production Board GridDND
This commit is contained in:
33
_reference/productionBoardNotes.md
Normal file
33
_reference/productionBoardNotes.md
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
# Production Board Notes:
|
||||||
|
|
||||||
|
## General Notes
|
||||||
|
|
||||||
|
- You can single click the lane footer to collapse/un-collapse the lane
|
||||||
|
- You can double click the lane header to collapse/un-collapse the lane
|
||||||
|
- If you need to scroll horizontally, you can hold shift and use the mouse scroll wheel, or press the mouse scroll wheel while scrolling
|
||||||
|
|
||||||
|
## Board Settings
|
||||||
|
|
||||||
|
#### Layout
|
||||||
|
|
||||||
|
- Board Orientation (Vertical or Horizontal)
|
||||||
|
- This determines the orientation of the card layout on the board.
|
||||||
|
- Horizontal is the default setting, and how the prior board was set up.
|
||||||
|
- Vertical is the new setting and allows lanes to be displayed vertically, with a grid of cards
|
||||||
|
- Card Size (Small, Medium, Large)
|
||||||
|
- This determines the size of the cards on the board.
|
||||||
|
- Small is the default setting, and how the prior board was set up.
|
||||||
|
- Medium and Large are new settings and allow for larger cards to be displayed on the board.
|
||||||
|
- Compact Cards (Tall or Wide)
|
||||||
|
- Formally called 'Compact'
|
||||||
|
- When on, data is displayed on the card vertically
|
||||||
|
- when turned off, some fields may share horizontal space, tightening the card layout
|
||||||
|
- Colored Cards (On or Off)
|
||||||
|
- When on, cards are colored based on the Status color
|
||||||
|
- Kiosk Mode (On or Off)
|
||||||
|
- This should be turned on if the shop is using it on a tablet (Ipad)
|
||||||
|
|
||||||
|
#### Information
|
||||||
|
|
||||||
|
These allow users to turn fields on or off, turning them all off will show the card in the most minimal form
|
||||||
|
|
||||||
@@ -210,19 +210,16 @@ const SubletsComponent = ({ metadata, cardSettings }) =>
|
|||||||
const ProductionNoteComponent = ({ metadata, cardSettings, card }) =>
|
const ProductionNoteComponent = ({ metadata, cardSettings, card }) =>
|
||||||
cardSettings?.production_note && (
|
cardSettings?.production_note && (
|
||||||
<Col span={24} style={{ margin: "2px 0" }}>
|
<Col span={24} style={{ margin: "2px 0" }}>
|
||||||
{metadata?.production_vars ? (
|
<ProductionListColumnProductionNote
|
||||||
<ProductionListColumnProductionNote
|
record={{
|
||||||
record={{
|
production_vars: metadata?.production_vars,
|
||||||
production_vars: metadata?.production_vars,
|
id: card?.id,
|
||||||
id: card?.id,
|
refetch: card?.refetch
|
||||||
refetch: card?.refetch
|
}}
|
||||||
}}
|
/>
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<span> </span>
|
|
||||||
)}
|
|
||||||
</Col>
|
</Col>
|
||||||
);
|
);
|
||||||
|
|
||||||
const PartsStatusComponent = ({ metadata, cardSettings }) =>
|
const PartsStatusComponent = ({ metadata, cardSettings }) =>
|
||||||
cardSettings?.partsstatus && (
|
cardSettings?.partsstatus && (
|
||||||
<Col span={24} style={{ textAlign: "center" }}>
|
<Col span={24} style={{ textAlign: "center" }}>
|
||||||
|
|||||||
@@ -149,8 +149,6 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
|
|||||||
)
|
)
|
||||||
});
|
});
|
||||||
|
|
||||||
// TODO (Note): This is causing the subscription to fire
|
|
||||||
|
|
||||||
insertAuditTrail({
|
insertAuditTrail({
|
||||||
jobid: draggableId,
|
jobid: draggableId,
|
||||||
operation: AuditTrailMapping.jobstatuschange(targetLane.id),
|
operation: AuditTrailMapping.jobstatuschange(targetLane.id),
|
||||||
@@ -259,7 +257,9 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
|
|||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
{cardSettings.cardcolor && <CardColorLegend cardSettings={cardSettings} bodyshop={bodyshop} />}
|
{cardSettings.cardcolor && <CardColorLegend cardSettings={cardSettings} bodyshop={bodyshop} />}
|
||||||
|
|
||||||
<ProductionListDetailComponent jobs={data} />
|
<ProductionListDetailComponent jobs={data} />
|
||||||
|
|
||||||
<Board data={boardLanes} onDragEnd={onDragEnd} orientation={orientation} cardSettings={cardSettings} />
|
<Board data={boardLanes} onDragEnd={onDragEnd} orientation={orientation} cardSettings={cardSettings} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ const HeightMemoryWrapper = ({ children, maxHeight, setMaxHeight, override, item
|
|||||||
const ref = useRef(null);
|
const ref = useRef(null);
|
||||||
const heightMapRef = useRef(new Map());
|
const heightMapRef = useRef(new Map());
|
||||||
const [localMaxHeight, setLocalMaxHeight] = useState(maxHeight);
|
const [localMaxHeight, setLocalMaxHeight] = useState(maxHeight);
|
||||||
|
const [devicePixelRatio, setDevicePixelRatio] = useState(window.devicePixelRatio);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const currentRef = ref.current;
|
const currentRef = ref.current;
|
||||||
@@ -31,16 +32,30 @@ const HeightMemoryWrapper = ({ children, maxHeight, setMaxHeight, override, item
|
|||||||
};
|
};
|
||||||
|
|
||||||
const resizeObserver = new ResizeObserver(updateHeight);
|
const resizeObserver = new ResizeObserver(updateHeight);
|
||||||
|
|
||||||
if (currentRef?.firstChild) {
|
if (currentRef?.firstChild) {
|
||||||
resizeObserver.observe(currentRef.firstChild);
|
resizeObserver.observe(currentRef.firstChild);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const resizeHandler = () => {
|
||||||
|
if (Math.abs(window.devicePixelRatio - devicePixelRatio) > 0.1) {
|
||||||
|
// Threshold to detect significant zoom level change
|
||||||
|
heightMapRef.current.clear(); // Clearing the height memory as zoom level has changed significantly
|
||||||
|
setLocalMaxHeight(0); // Reset local max height
|
||||||
|
setDevicePixelRatio(window.devicePixelRatio); // Update the recorded device pixel ratio
|
||||||
|
}
|
||||||
|
updateHeight();
|
||||||
|
};
|
||||||
|
|
||||||
|
window.addEventListener("resize", resizeHandler);
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
if (currentRef?.firstChild) {
|
if (currentRef?.firstChild) {
|
||||||
resizeObserver.unobserve(currentRef.firstChild);
|
resizeObserver.unobserve(currentRef.firstChild);
|
||||||
}
|
}
|
||||||
|
window.removeEventListener("resize", resizeHandler);
|
||||||
};
|
};
|
||||||
}, [itemKey, setMaxHeight]);
|
}, [itemKey, setMaxHeight, devicePixelRatio]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (itemKey && heightMapRef.current.has(itemKey)) {
|
if (itemKey && heightMapRef.current.has(itemKey)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user