Skip to content

feat: advanced sort dialog; teacher salary report sorts by klass order/type - #237

Merged
buzz-code merged 5 commits into
mainfrom
claude/dreamy-meitner-85nt3u
Oct 22, 2026
Merged

buzz-code merged 5 commits into
mainfrom
claude/dreamy-meitner-85nt3u

Conversation

@buzz-code

@buzz-code buzz-code commented Oct 21, 2026 •

Copy link
Copy Markdown
Owner

Summary

A customer asked to see kodesh teachers first, then specialization teachers, and to sort by specialization.

  • client/shared → b95a332 (nra-client main, the merge of feat(list): advanced multi-level sort dialog nra-client#67). This adds the "מיון" multi-level sort dialog to every CommonList. The dataProvider sends every level to the list query and to the Excel/PDF/JSON export.
  • Teacher salary report (teacher-salary-report.jsx): sortOptions for "סדר כיתה" (klass.order) and "שיוך כיתה" (klass.klassType.name).
  • Server (teacher-salary-report.config.ts): joins klass.klassType for the list and the export, so the nested sort field passes BaseEntityService validation. The config spec is updated.
  • Roadmap entry.

Verification

  • After merging the latest main: client jest 250/250, server jest 1195/1195, tsc --noEmit clean.
  • Playwright (mocked API):
    • The dialog works on the teacher salary report and the teacher list, at 1400px and 390px.
    • The sort button is aligned with the other toolbar buttons.
    • Export sends the same levels for every format: extra.format=excel|pdf|json&sort[0]=name,ASC&sort[1]=tz,DESC.
  • Not run against a real MySQL. The nested sort uses the same validation path as the "שיוך כיתה" filter that's already in production.

🤖 Generated with Claude Code

https://claude.ai/code/session_01AxGDngmD8yeYDDm3rcXX4n

…r/type

- client/shared -> 173581a (nra-client branch claude/dreamy-meitner-85nt3u):
  "מיון" toolbar button with a multi-level sort dialog; the dataProvider
  sends every level to the server and to the Excel export.
- teacher_salary_report: sortOptions for סדר כיתה (klass.order) and
  שיוך כיתה (klass.klassType.name); server joins klass.klassType (list and
  export) so the nested sort field passes validation.
- Roadmap entry.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AxGDngmD8yeYDDm3rcXX4n
Resolve client/shared to bb489e2 (sort branch merged with nra-client main)
and keep the roadmap entries from both sides.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AxGDngmD8yeYDDm3rcXX4n
Merge of nra-client#67 (advanced sort dialog); also picks up #68
(ops-tracking skill, docs only).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AxGDngmD8yeYDDm3rcXX4n
@buzz-code
buzz-code merged commit 0cd8980 into main Oct 22, 2026
1 check 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