Merge pull request #93 from yoution/issue-82

fix: issue #82

Author: maxceem

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 }) => {
                 </div>
                 <div styleName="table-group-first-inner">
                   <div styleName="table-cell cell-date">
-                    {formatDateRange(position.startDate, position.endDate)}
+                    {formatJobDate(position.startDate, position.duration)}
                   </div>
                   <div styleName="table-cell cell-money">
                     {/* Hide rate as we don't have data for it */}

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 "";
+};