gotthard_g/aaredb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove 'retrieved' property and add slot sorting by QR code

Browse Source 
Removed the 'retrieved' property and its associated logic from Slots.tsx as it is no longer needed. Introduced sorting of slots by QR code in LogisticsView.tsx to ensure consistent order for slot display. Additionally, enhanced slot selection handling to clear or update Dewar QR code appropriately.
This commit is contained in:
GotthardG 2025-02-03 13:51:15 +01:00
parent 70962ba67a
commit fef9b1c618
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
logistics/src/components/Slots.tsx
View File

@ -15,8 +15,6 @@ export interface SlotData {
needs_refill?: boolean;
time_until_refill?: number;
beamlineLocation?: string;
retrieved?: boolean; // Indicates if the dewar is retrieved
retrievedTimestamp?: string; // Timestamp of the retrieval event
}
interface SlotProps {
@ -39,7 +37,12 @@ const pulse = keyframes`
}
`;
const StyledSlot = styled(Box)<{ isSelected: boolean; isOccupied: boolean; atBeamline: boolean; isRetrieved: boolean; needsRefillSoon: boolean }>`
const StyledSlot = styled(Box)<{
isSelected: boolean;
isOccupied: boolean;
atBeamline: boolean;
needsRefillSoon: boolean
}>`
padding: 16px;
margin: 8px;
width: 140px;
@ -108,7 +111,7 @@ const BottleIcon: React.FC<{ fillHeight: number }> = ({ fillHeight }) => {
};
const Slot: React.FC<SlotProps> = ({ data, isSelected, onSelect, onRefillDewar, reloadSlots }) => {
const { id, qr_code, label, occupied, needs_refill, time_until_refill, dewar_unique_id, dewar_name, beamlineLocation, retrieved } = data;
const { id, qr_code, label, occupied, needs_refill, time_until_refill, dewar_unique_id, dewar_name, beamlineLocation } = data;
// Calculate fill height for the LN2 bottle level (only visual, no percentage displayed)
const calculateFillHeight = (timeUntilRefill?: number) => {
@ -123,7 +126,6 @@ const Slot: React.FC<SlotProps> = ({ data, isSelected, onSelect, onRefillDewar,
// Determine slot state
const isSpecificBeamline = beamlineLocation === 'X10SA' || beamlineLocation === 'X06SA' || beamlineLocation === 'X06DA';
const isRetrieved = retrieved && !isSpecificBeamline;
const needsRefillSoon = occupied && (time_until_refill !== undefined && time_until_refill <= 10800);
// Refill handler
@ -139,9 +141,8 @@ const Slot: React.FC<SlotProps> = ({ data, isSelected, onSelect, onRefillDewar,
isSelected={isSelected}
isOccupied={occupied}
atBeamline={isSpecificBeamline}
isRetrieved={isRetrieved}
needsRefillSoon={needsRefillSoon}
onClick={() => onSelect(data)} // Select slot on click
onClick={() => onSelect(data)}
>
{/* Top Content: Label and dewar name */}
<Box textAlign="center" width="100%" mb={2}>

10
logistics/src/pages/LogisticsView.tsx
View File

@ -179,6 +179,9 @@ const LogisticsView: React.FC = () => {
};
});
// SORT THE SLOTS BY QR CODE
newSlotsData.sort((a, b) => a.qr_code.localeCompare(b.qr_code));
setSlotsData(newSlotsData);
} catch (e) {
console.error(e);
@ -274,14 +277,19 @@ const LogisticsView: React.FC = () => {
const handleSlotSelect = (slot: SlotData) => {
if (selectedSlot === slot.qr_code) {
// Deselect if the same slot is clicked again
setSelectedSlot(null);
setLocationQr(null);
setSelectedSlotData(null);
setDewarQr(null); // Clear Dewar QR code
} else {
// Set the selected slot and its data
setSelectedSlot(slot.qr_code);
setLocationQr(slot.qr_code);
setSelectedSlotData(slot);
setRetrievedDewar(slot.dewar?.unique_id || null);
// If occupied, set the `dewar_unique_id` to the `Dewar QR Code` field
setDewarQr(slot.dewar?.unique_id || null);
}
};