From 3264def8def61c9fe470b5fc3c204b8baa005ca9 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 17 Oct 2026 18:18:28 +0000 Subject: [PATCH 1/3] feat: advanced sort dialog; teacher salary report sorts by klass order/type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 Claude-Session: https://claude.ai/code/session_01AxGDngmD8yeYDDm3rcXX4n --- client/shared | 2 +- client/src/entities/teacher-salary-report.jsx | 6 ++++++ client/src/roadmapFeatures.js | 1 + .../__tests__/teacher-salary-report.config.spec.ts | 2 ++ server/src/entity-modules/teacher-salary-report.config.ts | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/client/shared b/client/shared index aad767b1..173581a3 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit aad767b171a0df8a3385c1fe503c1fec514a9cdd +Subproject commit 173581a3ea9f9cfcee68b2a4608a89ce73e892bd diff --git a/client/src/entities/teacher-salary-report.jsx b/client/src/entities/teacher-salary-report.jsx index 9eb90629..f0539a07 100644 --- a/client/src/entities/teacher-salary-report.jsx +++ b/client/src/entities/teacher-salary-report.jsx @@ -53,10 +53,16 @@ const Datagrid = ({ isAdmin, children, ...props }) => { ); }; +const sortOptions = [ + { field: 'klass.order', label: 'סדר כיתה' }, + { field: 'klass.klassType.name', label: 'שיוך כיתה' }, +]; + const entity = { Datagrid, filters, filterDefaultValues, + sortOptions, }; export default getResourceComponents(entity); diff --git a/client/src/roadmapFeatures.js b/client/src/roadmapFeatures.js index 4c33c3d1..bf1c86ae 100644 --- a/client/src/roadmapFeatures.js +++ b/client/src/roadmapFeatures.js @@ -38,6 +38,7 @@ export default [ { html: 'דוחות "מורות שדיווחו נוכחות" ו"מעקב חיסורים": הצגת שם לתצוגה של כיתה, שיעור ומורה כשהוגדר', status: 'בוצע', statusColor: 'success' }, { html: 'הגדרת זמני שיעורים לכל יום במסך ההגדרות, ובדוח המורות שדיווחו: ריבוע ריק לשיעור שלא דווח באמצע היום', status: 'בוצע', statusColor: 'success' }, { html: 'רשימות: שורת הסינון והייצוא וכותרת הטבלה נשארות קבועות בראש המסך בזמן גלילה (במחשב), ובייצוא לאקסל שורת הכותרת קפואה', status: 'בוצע', statusColor: 'success' }, + { html: 'רשימות: כפתור "מיון" למיון מתקדם לפי כמה עמודות (למשל סדר כיתה ואז שם מורה), כולל בייצוא לאקסל. בדוח שכר למורה אפשר למיין גם לפי סדר כיתה ושיוך כיתה', status: 'בוצע', statusColor: 'success' }, // { html: 'הגדרת תקופת זמן לפי תאריכים', status: 'בקרוב', statusColor: 'warning' }, // { html: 'הגדרת תקופת זמן לפי יום בשבוע', status: 'בוצע', statusColor: 'success' }, diff --git a/server/src/entity-modules/__tests__/teacher-salary-report.config.spec.ts b/server/src/entity-modules/__tests__/teacher-salary-report.config.spec.ts index 901c43bb..5545ae89 100644 --- a/server/src/entity-modules/__tests__/teacher-salary-report.config.spec.ts +++ b/server/src/entity-modules/__tests__/teacher-salary-report.config.spec.ts @@ -8,11 +8,13 @@ createEntityConfigTests('TeacherSalaryReportConfig', config, { teacher: {}, lesson: {}, klass: {}, + 'klass.klassType': {}, reportMonth: {}, }, expectedExportJoins: { teacher: { eager: true }, klass: { eager: true }, + 'klass.klassType': { eager: false }, lesson: { eager: true }, reportMonth: { eager: true }, }, diff --git a/server/src/entity-modules/teacher-salary-report.config.ts b/server/src/entity-modules/teacher-salary-report.config.ts index c46a6143..5c3d1627 100644 --- a/server/src/entity-modules/teacher-salary-report.config.ts +++ b/server/src/entity-modules/teacher-salary-report.config.ts @@ -11,6 +11,7 @@ function getConfig(): BaseEntityModuleOptions { teacher: {}, lesson: {}, klass: {}, + 'klass.klassType': {}, reportMonth: {}, }, }, @@ -19,6 +20,7 @@ function getConfig(): BaseEntityModuleOptions { req.options.query.join = { teacher: { eager: true }, klass: { eager: true }, + 'klass.klassType': { eager: false }, lesson: { eager: true }, reportMonth: { eager: true }, }; From a4a7b09c73a613cc41f63b255b372a61dee0a1e8 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 21 Oct 2026 17:48:05 +0000 Subject: [PATCH 2/3] chore: bump client/shared to 7f18577 (sort button alignment) Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01AxGDngmD8yeYDDm3rcXX4n --- client/shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/shared b/client/shared index bb489e2b..7f18577c 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit bb489e2b7a09aa572ede79c0980fea3380d92a97 +Subproject commit 7f18577c32f6b01591f63bd5473a3aec7fc5d071 From effc89181f18001d72d8127d31659acac45959d3 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 22 Oct 2026 18:36:41 +0000 Subject: [PATCH 3/3] chore: pin client/shared to nra-client main (b95a332) Merge of nra-client#67 (advanced sort dialog); also picks up #68 (ops-tracking skill, docs only). Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01AxGDngmD8yeYDDm3rcXX4n --- client/shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/shared b/client/shared index 7f18577c..b95a3326 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit 7f18577c32f6b01591f63bd5473a3aec7fc5d071 +Subproject commit b95a33269ff309e9c530d1d43b23377268b0a0c7