Skip to content

部員一覧が開けなくなる不具合を修正 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
newt239 merged 1 commit into from
Apr 18, 2025
Merged

部員一覧が開けなくなる不具合を修正 #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions util/format.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,20 @@ export const formatPhoneNumber = (phoneNumber: string): string => {

export const formatParentName = (user: User): string => {
const familyName = user.firstName;
// 全角スペースがあればそのまま返す
if (user.parentName.includes("　")) {
return user.parentName;
}
// 半角スペースがあれば全角スペースに変換して返す
if (user.parentName.includes(" ")) {
return user.parentName.replace(/ /g, "　");
}
// スペースがないとき、親子の姓が同じ場合は、子の姓の文字数を参考にスペースを入れる
const parentFamilyName = user.parentName.slice(0, familyName.length);
if (familyName === parentFamilyName) {
return `${user.firstName}　${user.parentName.slice(familyName.length)}`;
if (typeof user.parentName === "string") {
// 全角スペースがあればそのまま返す
if (user.parentName.includes("　")) {
return user.parentName;
}
// 半角スペースがあれば全角スペースに変換して返す
if (user.parentName.includes(" ")) {
return user.parentName.replace(/ /g, "　");
}
// スペースがないとき、親子の姓が同じ場合は、子の姓の文字数を参考にスペースを入れる
const parentFamilyName = user.parentName.slice(0, familyName.length);
if (familyName === parentFamilyName) {
return `${user.firstName}　${user.parentName.slice(familyName.length)}`;
}
}
// これ以外はそのまま返す
return user.parentName;
Expand Down
Loading