From c627bf0a4cf489d9dd64dc4f506ca7e0f52cb36f Mon Sep 17 00:00:00 2001 From: yoution Date: Sun, 14 Feb 2021 00:11:43 +0800 Subject: [PATCH] fix: issue #82 --- .../components/TeamPositions/index.jsx | 4 ++-- src/utils/format.js | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/routes/MyTeamsDetails/components/TeamPositions/index.jsx b/src/routes/MyTeamsDetails/components/TeamPositions/index.jsx index daefaf07..81de96b4 100644 --- a/src/routes/MyTeamsDetails/components/TeamPositions/index.jsx +++ b/src/routes/MyTeamsDetails/components/TeamPositions/index.jsx @@ -10,7 +10,7 @@ import SkillsList, { skillShape } from "components/SkillsList"; import Button from "components/Button"; import { POSITION_STATUS, POSITION_STATUS_TO_TEXT, RATE_TYPE } from "constants"; import "./styles.module.scss"; -import { formatDateRange } from "utils/format"; +import { formatJobDate } from "utils/format"; import { Link } from "@reach/router"; const TeamPositions = ({ teamId, positions }) => { @@ -44,7 +44,7 @@ const TeamPositions = ({ teamId, positions }) => {
- {formatDateRange(position.startDate, position.endDate)} + {formatJobDate(position.startDate, position.duration)}
{/* Hide rate as we don't have data for it */} diff --git a/src/utils/format.js b/src/utils/format.js index a125154c..44b4001d 100644 --- a/src/utils/format.js +++ b/src/utils/format.js @@ -200,3 +200,23 @@ export const formatPageTitle = (pageTitle) => { return formattedPageTitle; }; + +/** + * Format job date + * + * @param {string} startDate job startDate + * @param {number} duration job duration + * + * @returns {string} formatted string + */ +export const formatJobDate = (startDate, duration) => { + const dateStr = startDate ? moment(startDate).format(DAY_FORMAT) : ""; + if (startDate && duration) { + return `Requested starting ${dateStr} for ${duration} weeks`; + } else if (startDate) { + return `Requested starting ${dateStr}`; + } else if (duration) { + return `${duration} weeks`; + } + return ""; +};