Skip to content

Fix for issue #256 relating to the strike modal features. #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 29, 2025
Merged

Fix for issue #256 relating to the strike modal features. #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88a2439
Fixed issue #256 by passing a null value
sirQuail Oct 28, 2025
d8218eb
edited the margins around the strike comments
sirQuail Oct 28, 2025
9c903fb
formatted and removed comments
sirQuail Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions client/src/components/education/StrikeDetailsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ export const StrikeDetailsModal = ({
setStrikeFields(strikeToEdit);
setIsEditMode(true);
return;
} else {
setIsEditMode(false);
}
resetForm();
}, [strikeToEdit]);
Expand Down Expand Up @@ -111,6 +113,7 @@ export const StrikeDetailsModal = ({
onConfirmEdit(strikeFields);
} else {
onConfirmAdd(strikeFields);
resetForm();
}
};

Expand Down
1 change: 1 addition & 0 deletions client/src/components/education/StrikesComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export const StrikesComponent = () => {
* Function to enable adding strikes.
*/
const onClickAdd = () => {
setStrikeToEdit(null);
setIsModalOpen(true);
};

Expand Down
7 changes: 5 additions & 2 deletions client/src/components/education/StrikesList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ export const StrikesList: React.FC<StrikesListProps> = ({ strikes, onClickEdit,
alignItems="flex-start"
disablePadding
sx={{
paddingBottom: 1,
bgcolor: index % 2 === 0 ? '#f8f9fa' : 'background.paper',
}}
>
Expand Down Expand Up @@ -95,7 +94,11 @@ export const StrikesList: React.FC<StrikesListProps> = ({ strikes, onClickEdit,
<Typography sx={{ paddingRight: 2 }}>{formatDateForDisplay(strike.date)}</Typography>
</Box>
}
secondary={<MarkdownText>{strike.comments}</MarkdownText>}
secondary={
<Box mt={-2}>
<MarkdownText>{strike.comments}</MarkdownText>
</Box>
}
/>
{renderActions(strike.id)}
</ListItem>
Expand Down
Loading