勤務記録タブを本名表示・同名マージ対応に改善 - #66
Merged
Merged
Conversation
- 通常シフトAPIのgetByDateRangeにusersテーブルのJOINを追加しreal_nameを取得 - 勤務記録の一番左カラムをuser_nameからreal_name（本名）に変更 - 表示名（本名）が同じユーザーのシフトを同一人物としてマージ - プルダウンも本名単位で表示 - 表示月の変更で自動的に再読み込み（ボタン不要） - 同名マージ挙動のテストを追加（5件） Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
変更内容
real_name）に変更。real_nameがない場合はuser_nameにフォールバックreal_nameが同じ異なるユーザーは同一人物としてシフトをマージして表示。プルダウンも本名単位で表示getByDateRangeにLEFT JOIN usersを追加し、real_nameをレスポンスに含めるよう修正変更ファイル
server/src/models/Shift.ts—getByDateRangeにusersテーブルの JOIN を追加js/modules/workRecords.js— 本名表示・同名マージ・月自動切り替え対応test/work-records.test.js— インライン関数を新実装に同期、同名マージテスト追加🤖 Generated with Claude Code