diff --git a/src/partials/tagging/SubmitTagDistribution.tsx b/src/partials/tagging/SubmitTagDistribution.tsx index e1422a3..82c5caa 100644 --- a/src/partials/tagging/SubmitTagDistribution.tsx +++ b/src/partials/tagging/SubmitTagDistribution.tsx @@ -243,7 +243,11 @@ export const SubmitTagDistribution = ({ item, getData }: any) => { formattedNumber placeholder={ distributionType === "group" - ? `تعداد (${batch.label})` + ? `تعداد ${ + speciesOptions().find( + (s: any) => s.key === batch.species_code + )?.value + } (${batch.label}) ` : `تعداد ${ speciesOptions().find( (s: any) => s.key === batch.species_code diff --git a/src/partials/tagging/TagActiveDistributions.tsx b/src/partials/tagging/TagActiveDistributions.tsx index e2da7ac..fdfe424 100644 --- a/src/partials/tagging/TagActiveDistributions.tsx +++ b/src/partials/tagging/TagActiveDistributions.tsx @@ -63,9 +63,11 @@ export default function TagActiveDistributions() { ? index + 1 : index + tableInfo.page_size * (tableInfo.page - 1) + 1, item?.dist_batch_identity, - `${formatJustDate(item?.create_date)} (${formatJustTime( - item?.create_date - )})`, + `${formatJustDate(item?.create_date)} (${ + formatJustDate(item?.create_date) + ? formatJustTime(item?.create_date) + : "-" + })`, item?.assigner_org?.name, item?.assigned_org?.name, item?.total_tag_count, diff --git a/src/partials/tagging/TagCanceledDistributions.tsx b/src/partials/tagging/TagCanceledDistributions.tsx index a690c42..226d896 100644 --- a/src/partials/tagging/TagCanceledDistributions.tsx +++ b/src/partials/tagging/TagCanceledDistributions.tsx @@ -63,9 +63,11 @@ export default function TagCanceledDistributions() { ? index + 1 : index + tableInfo.page_size * (tableInfo.page - 1) + 1, item?.dist_batch_identity, - `${formatJustDate(item?.create_date)} (${formatJustTime( - item?.create_date - )})`, + `${formatJustDate(item?.create_date)} (${ + formatJustDate(item?.create_date) + ? formatJustTime(item?.create_date) + : "-" + })`, item?.assigner_org?.name, item?.assigned_org?.name, item?.total_tag_count, diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts index 0fb8cb5..cd87485 100644 --- a/src/utils/formatTime.ts +++ b/src/utils/formatTime.ts @@ -35,7 +35,9 @@ export const formatJustDate = (time: any) => { }; export const formatJustTime = (time: any) => { - return format(new Date(time), "HH:mm"); + if (time) { + return format(new Date(time), "HH:mm"); + } else return ""; }; export function formatStampDate(timestamp: number) {