diff --git a/src/common_components/form_answer/FormPage.tsx b/src/common_components/form_answer/FormPage.tsx index 3de4e83e..c78bf594 100644 --- a/src/common_components/form_answer/FormPage.tsx +++ b/src/common_components/form_answer/FormPage.tsx @@ -4,6 +4,7 @@ import { FC, useState } from "react"; import { assignType } from "@/lib/openapi"; import { css } from "@styled-system/css"; import dayjs from "dayjs"; +import ja from "dayjs/locale/ja"; import { FormFieldsType } from "./FormItems"; import { getTimeLeftText, getSubmitStatusFromDate } from "@/lib/formHelpers"; @@ -51,6 +52,7 @@ export const FormPage = ({ answer, answerError, answerLoading, form, formError, const [editable, setEdiatable] = useState(false); + const deadlineText = form && getTimeLeftText(dayjs(), dayjs(form.ends_at), status); return ( <>

- - {form && dayjs(form.ends_at).format("YYYY/MM/DD")} ( - {form && getTimeLeftText(dayjs(), dayjs(form.ends_at), status)}) + + {form && dayjs(form.ends_at).locale(ja).format("YYYY/MM/DD(ddd) HH:mm")} + {deadlineText ? ` (${deadlineText})` : ""}

{answerItems && dayjs().isBefore(dayjs(form.ends_at)) && !editable && ( diff --git a/src/lib/formHelpers.ts b/src/lib/formHelpers.ts index e5493b15..05f36bad 100644 --- a/src/lib/formHelpers.ts +++ b/src/lib/formHelpers.ts @@ -38,9 +38,9 @@ export const getSubmitStatusFromDate = (deadline: string | null | undefined, ans export const getTimeLeft = (now: dayjs.Dayjs, deadline: dayjs.Dayjs) => deadline.diff(now, "d"); -export const getTimeLeftText = (now: dayjs.Dayjs, deadline: dayjs.Dayjs, status: SubmitStatus) => { +export const getTimeLeftText = (now: dayjs.Dayjs, deadline: dayjs.Dayjs, status: SubmitStatus): string => { const diff = getTimeLeft(now, deadline); - return status === "未提出" ? (diff >= 0 ? `残り${diff}日` : "締切を過ぎています") : ""; + return diff >= 0 ? `残り${diff}日` : status === "未提出" ? "締切を過ぎています" : ""; }; export const getCommitteeTimeLeftText = (now: dayjs.Dayjs, deadline: dayjs.Dayjs) => {