kjs
/
ERP-node
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

시간쪽 관련된거 #288

Merged
hjlee merged 1 commits from lhj into main 2025-12-15 13:46:56 +09:00
Conversation 0 Commits 1 Files Changed 3 +34 -14
3 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/components/admin/dashboard/widgets/ListWidget.tsx
View File

@ -148,9 +148,19 @@ export function ListWidget({ element, onConfigUpdate }: ListWidgetProps) {
switch (format) {
case "date":
return new Date(value).toLocaleDateString("ko-KR");
try {
const dateVal = new Date(value);
return dateVal.toLocaleDateString("ko-KR", { timeZone: "Asia/Seoul" });
} catch {
return String(value);
}
case "datetime":
return new Date(value).toLocaleString("ko-KR");
try {
const dateVal = new Date(value);
return dateVal.toLocaleString("ko-KR", { timeZone: "Asia/Seoul" });
} catch {
return String(value);
}
case "number":
return Number(value).toLocaleString("ko-KR");
case "currency":

14
frontend/components/dashboard/widgets/ListTestWidget.tsx
View File

@ -180,9 +180,19 @@ export function ListTestWidget({ element }: ListTestWidgetProps) {
switch (format) {
case "date":
return new Date(value).toLocaleDateString("ko-KR");
try {
const dateVal = new Date(value);
return dateVal.toLocaleDateString("ko-KR", { timeZone: "Asia/Seoul" });
} catch {
return String(value);
}
case "datetime":
return new Date(value).toLocaleString("ko-KR");
try {
const dateVal = new Date(value);
return dateVal.toLocaleString("ko-KR", { timeZone: "Asia/Seoul" });
} catch {
return String(value);
}
case "number":
return Number(value).toLocaleString("ko-KR");
case "currency":

20
frontend/components/dashboard/widgets/MapTestWidgetV2.tsx
View File

@ -203,14 +203,14 @@ export default function MapTestWidgetV2({ element }: MapTestWidgetV2Props) {
setTripInfoLoading(identifier);
try {
// user_id 또는 vehicle_number로 조회 (시간은 KST로 변환)
// user_id 또는 vehicle_number로 조회 (TIMESTAMPTZ는 변환 불필요)
const query = `SELECT
id, vehicle_number, user_id,
(last_trip_start AT TIME ZONE 'Asia/Seoul')::timestamp as last_trip_start,
(last_trip_end AT TIME ZONE 'Asia/Seoul')::timestamp as last_trip_end,
last_trip_start,
last_trip_end,
last_trip_distance, last_trip_time,
(last_empty_start AT TIME ZONE 'Asia/Seoul')::timestamp as last_empty_start,
(last_empty_end AT TIME ZONE 'Asia/Seoul')::timestamp as last_empty_end,
last_empty_start,
last_empty_end,
last_empty_distance, last_empty_time,
departure, arrival, status
FROM vehicles
@ -281,15 +281,15 @@ export default function MapTestWidgetV2({ element }: MapTestWidgetV2Props) {
if (identifiers.length === 0) return;
try {
// 모든 마커의 운행/공차 정보를 한 번에 조회 (시간은 KST로 변환)
// 모든 마커의 운행/공차 정보를 한 번에 조회 (TIMESTAMPTZ는 변환 불필요)
const placeholders = identifiers.map((_, i) => `$${i + 1}`).join(", ");
const query = `SELECT
id, vehicle_number, user_id,
(last_trip_start AT TIME ZONE 'Asia/Seoul')::timestamp as last_trip_start,
(last_trip_end AT TIME ZONE 'Asia/Seoul')::timestamp as last_trip_end,
last_trip_start,
last_trip_end,
last_trip_distance, last_trip_time,
(last_empty_start AT TIME ZONE 'Asia/Seoul')::timestamp as last_empty_start,
(last_empty_end AT TIME ZONE 'Asia/Seoul')::timestamp as last_empty_end,
last_empty_start,
last_empty_end,
last_empty_distance, last_empty_time,
departure, arrival, status
FROM vehicles