diff --git a/components/dashboard/Content.js b/components/dashboard/Content.js index 5f85b20..bf2bbcd 100644 --- a/components/dashboard/Content.js +++ b/components/dashboard/Content.js @@ -9,7 +9,7 @@ import UserAccountPage from "./userAccount"; function Content({ matchedCity, params, logged }) { const [value, setValue] = useState(Number(params?.sidebar) || 0); const [isOpenSide, setIsOpenSide] = useState(); - const [isTurnsDetails, setIsTurnsDetails] = useState(false); + const [isTurnsDetails, setIsTurnsDetails] = useState(null); return ( {isTurnsDetails ? ( - + ) : ( <>
diff --git a/components/dashboard/userAccount/sidebars/turns/Card.js b/components/dashboard/userAccount/sidebars/turns/Card.js index 77a80ab..a7d76d3 100644 --- a/components/dashboard/userAccount/sidebars/turns/Card.js +++ b/components/dashboard/userAccount/sidebars/turns/Card.js @@ -3,23 +3,21 @@ import TextLoading from "@/app/component/loading/Text"; import ArrowLeftCardD from "@/components/icons/ArrowLeftCardD"; import { Button } from "@mui/material"; import Image from "next/image"; +import { convertTimestampToJalali, convertTimestampToTime } from "@/helper"; function Card({ data, loading, setIsTurnsDetails }) { return (
  • - - profile -
    - +

    - {data.name} + {data.doctor?.name || "--"}

    - +

    - {data.expertise} + {data.doctor?.specialty?.name || "--"}

    @@ -33,7 +31,7 @@ function Card({ data, loading, setIsTurnsDetails }) {

    - {data.date} + {convertTimestampToJalali(data.start_time)}

  • @@ -43,21 +41,16 @@ function Card({ data, loading, setIsTurnsDetails }) {

    - {data.time} + {data.slot?.time || convertTimestampToTime(data.start_time)}

    -
    - -

    - مبلغ پیش پرداخت: {data.amount} تومان -

    -
    +
    -
    ); } export default Head; + diff --git a/components/dashboard/userAccount/sidebars/turns/List.js b/components/dashboard/userAccount/sidebars/turns/List.js index 2a3c78b..0281b91 100644 --- a/components/dashboard/userAccount/sidebars/turns/List.js +++ b/components/dashboard/userAccount/sidebars/turns/List.js @@ -7,6 +7,7 @@ import CircularLoading from "@/app/component/loading/Circular"; import TextLoading from "@/app/component/loading/Text"; import CustomLoading from "@/app/component/loading/Custom"; import Pagination from "@/app/component/Pagination"; +import { convertTimestampToJalali, convertTimestampToTime } from "@/helper"; function List({ user, loading, setIsTurnsDetails, page, totalPages, onPageChange }) { const tableHead = [ @@ -15,10 +16,9 @@ function List({ user, loading, setIsTurnsDetails, page, totalPages, onPageChange "تخصص", "تاریخ", "ساعت", - "مبلغ (تومان)", "عملیات", ]; - const centerTable = [0, 5]; + const centerTable = [0, 4]; return (
    @@ -31,7 +31,7 @@ function List({ user, loading, setIsTurnsDetails, page, totalPages, onPageChange > - {idx + 1} + {(page - 1) * 10 + idx + 1} -
    - - doctor - - - {row.name} - -
    -
    - - - {row.expertise} + + {row.doctor?.name || "--"} - - {row.date} + + {row.doctor?.specialty?.name || "--"} + + + + + {convertTimestampToJalali(row.start_time)} - {row.time} - - - - - {row.amount} + {row.slot?.time || convertTimestampToTime(row.start_time)}
    -
    diff --git a/components/dashboard/userAccount/sidebars/turns/isTurnsDetails/Head.js b/components/dashboard/userAccount/sidebars/turns/isTurnsDetails/Head.js index 5adcf50..800d930 100644 --- a/components/dashboard/userAccount/sidebars/turns/isTurnsDetails/Head.js +++ b/components/dashboard/userAccount/sidebars/turns/isTurnsDetails/Head.js @@ -8,7 +8,7 @@ function Head({ setIsTurnsDetails }) {