Skip to content

Implement Employment History #304

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
MBreathe merged 16 commits into from
Feb 20, 2026
Merged

Implement Employment History #304

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
38a54ce
started working on the feature, not much added, still figuring out MU…
MBreathe Feb 9, 2026
f768ba9
started working on queries file and integration of Modal into the page
MBreathe Feb 10, 2026
2b7bcbd
list is displayed, but needs adjustments to look as required, editing…
MBreathe Feb 10, 2026
e308282
finished implementing the new feature, cleaned up codebase a little a…
MBreathe Feb 11, 2026
cc273f4
finished implementing the new feature, cleaned up codebase a little a…
MBreathe Feb 11, 2026
280eaf7
updated dependencies to not include extensions, moved fetching logic …
MBreathe Feb 12, 2026
9682a09
applied given feedback
MBreathe Feb 16, 2026
a8f3d7b
Merge branch 'main' into feature/employment-history-ui
MBreathe Feb 16, 2026
35f901e
moved employment history related components into a separate folder an…
MBreathe Feb 17, 2026
b5a366c
switched to using key factory
MBreathe Feb 18, 2026
930a94c
merged changes
MBreathe Feb 18, 2026
24f302a
ran `npm audit fix` on both server and client, fixed an issue with ke…
MBreathe Feb 18, 2026
c09a292
when !feeCollected feeAmount falls back to ""
MBreathe Feb 18, 2026
d290d67
switched from "" to undefined for fallback for feeAmount since feeAmo…
MBreathe Feb 18, 2026
9ca39a9
found the reason of the bug, added todo comment
MBreathe Feb 19, 2026
2918479
bug with feeAmount fixed
MBreathe Feb 20, 2026
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
31 changes: 6 additions & 25 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions client/src/features/trainee-profile/education/strikes/StrikeDetailsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,8 @@ export const StrikeDetailsModal = ({
<Modal
open={isOpen}
closeAfterTransition
BackdropComponent={Backdrop}
BackdropProps={{
timeout: 500,
}}
slots={{ backdrop: Backdrop }}
slotProps={{ backdrop: { timeout: 500 } }}
>
<Fade in={isOpen}>
<Box
Expand All @@ -123,7 +121,7 @@ export const StrikeDetailsModal = ({
top: '50%',
left: '50%',
transform: 'translate(-50%, -50%)',
bgcolor: 'background.paper',
backgroundColor: 'background.paper',
boxShadow: 24,
p: 4,
}}
Expand All @@ -140,7 +138,7 @@ export const StrikeDetailsModal = ({
label="Date"
type="date"
value={formatDate(strikeFields.date)}
InputLabelProps={{ shrink: true }}
slotProps={{ inputLabel: { shrink: true } }}
onChange={handleStrikeChange}
fullWidth
/>
Expand Down Expand Up @@ -187,7 +185,7 @@ export const StrikeDetailsModal = ({
error={commentsRequiredError}
helperText={commentsRequiredError ? 'Comments are required' : ''}
value={strikeFields.comments}
InputLabelProps={{ shrink: true }}
slotProps={{ inputLabel: { shrink: true} }}
onChange={onChangeComments}
fullWidth
/>
Expand Down
19 changes: 9 additions & 10 deletions client/src/features/trainee-profile/education/strikes/StrikesList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import EditIcon from '@mui/icons-material/Edit';
import MarkdownText from '../../components/MarkdownText';
import { Strike } from '../../../../data/types/Trainee';
import { formatDateForDisplay } from '../../utils/dateHelper';
import React from 'react';

interface StrikesListProps {
strikes: Strike[];
Expand Down Expand Up @@ -33,7 +34,7 @@ export const StrikesList: React.FC<StrikesListProps> = ({ strikes, onClickEdit,

const renderActions = (id: string) => {
return (
<Box sx={{ display: 'flex', alignItems: 'center', justifyContent: 'flex-end', paddingRight: 1 }}>
<Box sx={{ display: 'flex', alignItems: 'center', justifyContent: 'flex-end', pr: 1 }}>
<IconButton aria-label="edit" onClick={() => handleEdit(id)}>
<EditIcon />
</IconButton>
Expand All @@ -48,7 +49,7 @@ export const StrikesList: React.FC<StrikesListProps> = ({ strikes, onClickEdit,
<List
sx={{
width: '100%',
bgcolor: 'background.paper',
backgroundColor: 'background.paper',
maxHeight: 300,
overflow: 'auto',
scrollbarWidth: 'thin',
Expand All @@ -66,16 +67,15 @@ export const StrikesList: React.FC<StrikesListProps> = ({ strikes, onClickEdit,
alignItems="flex-start"
disablePadding
sx={{
bgcolor: index % 2 === 0 ? 'background.paperAlt' : 'background.paper',
backgroundColor: index % 2 === 0 ? 'background.paperAlt' : 'background.paper',
}}
>
<ListItemAvatar
sx={{
display: 'flex',
alignIntems: 'center',
paddingLeft: 2,
paddingRight: 2,
paddingTop: 1,
alignItems: 'center',
px: 2,
pt: 1,
}}
>
<AvatarWithTooltip imageUrl={strike.reporter.imageUrl} name={strike.reporter.name} />
Expand All @@ -87,11 +87,10 @@ export const StrikesList: React.FC<StrikesListProps> = ({ strikes, onClickEdit,
flexDirection="row"
justifyContent="space-between"
width="100%"
paddingTop={1}
paddingBottom={1}
py={1}
>
{formatStrikeReason(strike.reason || '')}
<Typography sx={{ paddingRight: 2 }}>{formatDateForDisplay(strike.date)}</Typography>
<Typography sx={{ pr: 2 }}>{formatDateForDisplay(strike.date)}</Typography>
</Box>
}
secondary={
Expand Down
Loading