Skip to content

add event types table and link to known absences - #78

Merged
buzz-code merged 6 commits into
buzz-code:mainfrom
yael-miller:main
Feb 12, 2026
Merged

buzz-code merged 6 commits into
buzz-code:mainfrom
yael-miller:main

Conversation

@yael-miller

Copy link
Copy Markdown
Contributor

No description provided.

Comment thread client/src/entities/event.jsx Resolved
Comment thread client/src/entities/event.jsx Resolved
Comment thread client/src/entities/known-absence.jsx Resolved
Comment thread client/src/utils/appPermissions.js Resolved
Comment thread client/src/domainTranslations.js Resolved
Comment thread client/src/domainTranslations.js Resolved
Comment thread client/src/domainTranslations.js Resolved
Comment thread server/src/db/entities/Event.entity.ts Resolved
Comment thread client/src/entities/known-absence.jsx Resolved
Comment thread client/src/entities/known-absence.jsx Resolved
Comment thread client/src/entities/known-absence.jsx Outdated
<CommonReferenceInput source="klassReferenceId" reference="klass" validate={required()} dynamicFilter={filterByUserIdAndYear} />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" dynamicFilter={filterByUserIdAndYear} optionText={lessonKeyAndName} />
<CommonReferenceInput source="eventId" reference="event" dynamicFilter={filterByUserIdAndYear}/>
<CommonReferenceInput source="absenceTypeId" reference="absenceType" dynamicFilter={filterByUserIdAndYear}/>

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

כנל

Comment thread client/src/App.jsx Outdated
<Resource name="student_klass" {...studentKlass} options={{ menuGroup: 'data' }} icon={WorkspacesIcon} />
{(isTransportation(permissions) || isAdmin(permissions)) && <Resource name="transportation" {...transportation} options={{ menuGroup: 'data' }} icon={DirectionsBusIcon} />}
{(isStudentView(permissions) || isAdmin(permissions)) && <Resource name="event" {...event} options={{ menuGroup: 'data' }} icon={CelebrationIcon} />}
{(isStudentView(permissions) || isAdmin(permissions)) && <Resource name="absenceType" {...absenceType} options={{ menuGroup: 'data' }} icon={CelebrationIcon} />}

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

הname צריך להיות absence_type

@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column("int", { name: "event_id", nullable: true })
eventId: number | null;
@Column("int", { name: "absenceType_id", nullable: true })

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

שם קצת מוזר, או שאת הולכת על _ או על אותיות גדולות כמפריד בין מילים אבל למה לערבב?

@buzz-code
buzz-code merged commit 2f24444 into buzz-code:main Feb 12, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants