Skip to content

add transportation table and creation functionality - #66

Merged
buzz-code merged 5 commits into
buzz-code:mainfrom
yaely20:main
Jan 13, 2026
Merged

buzz-code merged 5 commits into
buzz-code:mainfrom
yaely20:main

Conversation

@yaely20

@yaely20 yaely20 commented Jan 13, 2026

Copy link
Copy Markdown
Contributor

No description provided.

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.

השינוי הזה לא באמת נצרך

@Index('transportations_users_idx', ['userId'], {})
@Index(['userId', 'key', 'year'], { unique: true })
@Entity('transportations')
export class Transportation implements IHasUserId {

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.

כדאי להוסיף פה fill default year

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ואז יצירת הסעה חדשה לא יצטרכו להכניס שנה?

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.

כן, וגם יהיה אפשר להוריד את זה מהמערך של הimporter, תראי איך זה בטבלאות אחרות

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.

בשביל שזה יעבוד צריך לשים מעל זה @beforeCreate @beforeUpdate

Comment thread client/src/domainTranslations.js Outdated
fields: {
...generalResourceFieldsTranslation,
key: 'שילוט',
year: 'שנה',

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.

שנה לא נמצאת כבר בgeneralResourceFieldsTranslation?

Comment thread client/src/App.jsx Resolved
Comment thread client/src/App.jsx Outdated
<Route path="student-attendance" element={<StudentAttendanceList />} />
</Resource>
<Resource name="student_klass" {...studentKlass} options={{ menuGroup: 'data' }} icon={WorkspacesIcon} />
{transportationOnly && <Resource name="transportation" {...transportation} options={{ menuGroup: 'data' }} icon={DirectionsBusIcon} />}

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.

אני לא רואה צורך להשתמש פה במשתנה, ובכל מקרה השם שלו לא נכון
תשימי פה (isTransportation(permissions) !! isAdmin(permissions)) && <Resource

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

2 סימני קריאה או אחד בisAdmin(permissions)

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/entities/transportation.jsx Outdated
Comment on lines +98 to +100
filterDefaultValues: {
year: defaultYearFilter.year,
},

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/entities/transportation.jsx Outdated
minute: "2-digit",
});
}}
/>

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.

למה לא פשוט text field? זה לא מציג את הערך בצורה טובה?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ככה זה נראה עם text field -2023-10-01T14:30:00Z

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.

מענין, איך זה עובד בreport group sessions?

Comment thread client/src/App.jsx Outdated
Comment on lines +161 to +166

{isTransportation(permissions) && !!isAdmin(permissions)&&
<>
<Resource name="transportation" {...transportation} options={{ menuGroup: 'data' }} icon={DirectionsBusIcon} />
</>}

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.

אין צורך ב!!
וגם לא לעטוף ב <> </>

@Index('transportations_users_idx', ['userId'], {})
@Index(['userId', 'key', 'year'], { unique: true })
@Entity('transportations')
export class Transportation implements IHasUserId {

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.

בשביל שזה יעבוד צריך לשים מעל זה @beforeCreate @beforeUpdate

@buzz-code
buzz-code merged commit 8e78a95 into buzz-code:main Jan 13, 2026
3 checks passed
buzz-code pushed a commit that referenced this pull request Jul 14, 2026
Same fix as dnd-management-nra#65/#66:
- client's healthcheck start_period bumped from 30s to 60s to match
  server, giving Caddy's independent active health check enough time
  to confirm the new container before Swarm's start-first update
  retires the old one.
- caddy.reverse_proxy.lb_try_duration/lb_retries added so a request
  landing on the old container while it drains after SIGQUIT (still
  "running" in Docker's eyes, but refusing new connections) transparently
  retries against the healthy upstream instead of surfacing 502/503.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
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