develop #3

Merged
gitadmin merged 24 commits from develop into master 2026-07-02 11:38:20 +09:00
4 changed files with 33 additions and 23 deletions
Showing only changes of commit 3d4fa65b0e - Show all commits

View File

@@ -146,11 +146,11 @@ const UserPage = () => {
downloadExcelBuffer(buffer, tab === "monitoring" ? "모니터링 요원.xlsx" : "서면 평가위원.xlsx");
};
const renderEditableCell = (user: UserFull, key: string, fallbackKeys: string[], type: "text" | "select" = "text", options: Code[] = []) => {
const renderEditableCell = (user: UserFull, key: string, type: "text" | "select" = "text", options: Code[] = []) => {
const draft = draftRef.current;
const isEditing = editingId === user.userId && draft;
const source = isEditing ? draft.userDetail : user.userDetail;
const value = getDetailValue(source, [key, ...fallbackKeys]);
const value = getDetailValue(source, key);
if (!isEditing) return type === "select" ? (getOptionLabel(options, value) || "-") : (value || "-");
@@ -177,18 +177,18 @@ const UserPage = () => {
const monitoringColumns: DataTableColumn<UserFull>[] = [
{id: "participationCount", header: "참여 횟수", cell: ({row}) => assignCountMap.get(row.original.userId) ?? 0, enableSorting: true},
{id: "area", header: "지역", cell: ({row}) => renderEditableCell(row.original, "area", ["userArea", "region"], "select", codes.area)},
{id: "gender", header: "성별", cell: ({row}) => renderEditableCell(row.original, "gender", ["userGender"], "select", codes.gender)},
{id: "age", header: "연령", cell: ({row}) => renderEditableCell(row.original, "age", ["userAge"])},
{id: "tel", header: "연락처", cell: ({row}) => renderEditableCell(row.original, "tel", ["phone", "userTel"])},
{id: "email", header: "이메일", cell: ({row}) => renderEditableCell(row.original, "email", ["userEmail"])},
{id: "hasCar", header: "자차 여부", cell: ({row}) => renderEditableCell(row.original, "userHasCar", ["has_car", "hasCar"], "select", codes.has_car)},
{id: "area", header: "지역", cell: ({row}) => renderEditableCell(row.original, "userArea", "select", codes.area)},
{id: "gender", header: "성별", cell: ({row}) => renderEditableCell(row.original, "gender", "select", codes.gender)},
{id: "userAge", header: "연령", cell: ({row}) => renderEditableCell(row.original, "userAge")},
{id: "userTel", header: "연락처", cell: ({row}) => renderEditableCell(row.original, "userTel")},
{id: "userEmail", header: "이메일", cell: ({row}) => renderEditableCell(row.original, "userEmail")},
{id: "userHasCar", header: "자차 여부", cell: ({row}) => renderEditableCell(row.original, "userHasCar", "select", codes.has_car)},
];
const writtenColumns: DataTableColumn<UserFull>[] = [
{id: "genre", header: "장르", cell: ({row}) => renderEditableCell(row.original, "userGenre", ["genre", "reviewGenre"], "select", codes.genre)},
{id: "tel", header: "연락처", cell: ({row}) => renderEditableCell(row.original, "tel", ["phone", "userTel"])},
{id: "email", header: "이메일", cell: ({row}) => renderEditableCell(row.original, "email", ["userEmail"])},
{id: "userGenre", header: "장르", cell: ({row}) => renderEditableCell(row.original, "userGenre", "select", codes.genre)},
{id: "userTel", header: "연락처", cell: ({row}) => renderEditableCell(row.original, "userTel")},
{id: "userEmail", header: "이메일", cell: ({row}) => renderEditableCell(row.original, "userEmail")},
];
const actionColumns: DataTableColumn<UserFull>[] = [

View File

@@ -163,8 +163,8 @@ export function AssignMonitoringDialog({
["모니터링 일정", selected?.performanceMonitoringSchedule?.monitoringDate],
["모니터링 시간", selected?.performanceMonitoringSchedule?.monitoringTimeInfo],
["방문 장소", selected?.performanceMonitoringSchedule?.monitoringAddress],
["예매 예약", getCodeLabel(codes, "ticket_reservation_status", selected?.ticketReservationStatus)],
["예매 비고", selected?.ticketReservationMemo],
["티켓 예약", getCodeLabel(codes, "ticket_reservation_status", selected?.ticketReservationStatus)],
["티 비고", selected?.ticketReservationMemo],
].map(([label, value]) => (
<tr key={String(label)}>
<th className="w-32 border bg-muted p-2 text-left">{label}</th>

View File

@@ -85,6 +85,12 @@ export function SmsSendDialog({
.filter((item) => item.destTel);
}, [selectedUsers, addParams]);
const msgParamKeys = useMemo(() => {
return Array.from(
new Set(destinations.flatMap((destination) => Object.keys(destination.msgParam)))
);
}, [destinations]);
useEffect(() => {
if (!open) return;
@@ -105,6 +111,12 @@ export function SmsSendDialog({
setDraft((prev) => prev ? {...prev, [key]: value} : prev);
};
useEffect(() => {
if (!open) return;
console.log("d\estinations msgParam keys", msgParamKeys, destinations);
}, [msgParamKeys, open]);
const saveTemplate = async () => {
if (!draft) return null;

View File

@@ -35,14 +35,12 @@ export const getCodeLabel = (
export const getDetailValue = (
detail: Record<string, string> | undefined,
keys: string[],
key: string,
fallback = ""
) => {
if (!detail) return fallback;
for (const key of keys) {
const value = detail[key];
if (value !== undefined && value !== "") return value;
}
const value = detail[key];
if (value !== undefined && value !== "") return value;
return fallback;
};
@@ -92,9 +90,9 @@ export const filterUser = (
}
) => {
const detail = user.userDetail ?? {};
const area = getDetailValue(detail, ["area", "userArea", "region"]);
const gender = getDetailValue(detail, ["gender", "userGender"]);
const genre = getDetailValue(detail, ["genre", "performanceGenre", "reviewGenre"]);
const area = getDetailValue(detail, "userArea");
const gender = getDetailValue(detail, "userGender");
const genre = getDetailValue(detail, "userGenre");
const keyword = filters.keyword?.trim() ?? "";
const matches = (filter: string | string[] | undefined, value: string) => {
if (!filter || filter.length === 0) return true;
@@ -112,8 +110,8 @@ export const filterUser = (
includesText(user.userTeam, keyword) ||
includesText(user.userCmpn, keyword) ||
includesText(user.memo, keyword) ||
includesText(getDetailValue(detail, ["tel", "phone", "userTel"]), keyword) ||
includesText(getDetailValue(detail, ["email", "userEmail"]), keyword)
includesText(getDetailValue(detail, "userTel"), keyword) ||
includesText(getDetailValue(detail, "userEmail"), keyword)
)
);
};