From e7e7eb02e6fa94b1cd1705d6bd26c342f811fae1 Mon Sep 17 00:00:00 2001
From: yoution <zhuyan207@gmail.com>
Date: Thu, 9 Sep 2021 13:27:04 +0800
Subject: [PATCH 1/2] fix issue topcoder-platform/taas-apis#507

---
 src/routes/JobForm/index.jsx | 4 ++++
 src/services/teams.js        | 8 +++++++-
 src/utils/format.js          | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/routes/JobForm/index.jsx b/src/routes/JobForm/index.jsx
index 8405d2c4..00c00182 100644
--- a/src/routes/JobForm/index.jsx
+++ b/src/routes/JobForm/index.jsx
@@ -8,6 +8,7 @@
 import React, { useState, useEffect } from "react";
 import PT from "prop-types";
 import { toastr } from "react-redux-toastr";
+import moment from 'moment';
 import _ from "lodash";
 import store from "../../store";
 import Page from "components/Page";
@@ -33,6 +34,9 @@ const JobForm = ({ teamId, jobId }) => {
   const title = isEdit ? "Edit Job Details" : "Create Job";
 
   const onSubmit = async (values) => {
+    if (values.startDate) {
+      values.startDate = moment(values.startDate).format('YYYY-MM-DD')
+    }
     if (isEdit) {
       await updateJob(values, jobId).then(
         () => {
diff --git a/src/services/teams.js b/src/services/teams.js
index 1e0ed867..984d9b4f 100644
--- a/src/services/teams.js
+++ b/src/services/teams.js
@@ -5,7 +5,8 @@ import {
   axiosInstance as axios,
   fetchCustom as fetch,
 } from "./requestInterceptor";
-
+import _ from "lodash";
+import moment from "moment";
 import config from "../../config";
 
 /**
@@ -257,6 +258,11 @@ export const searchRoles = (searchObject) => {
  * @returns {Promise<object>} object containing new projectId
  */
 export const postTeamRequest = (teamObject) => {
+  _.forEach(teamObject.positions, (p) => {
+    if (p.startMonth) {
+      p.startMonth = moment(p.startMonth).format("YYYY-MM-DD");
+    }
+  });
   const url = `${config.API.V5}/taas-teams/submitTeamRequest`;
   return axios.post(url, teamObject);
 };
diff --git a/src/utils/format.js b/src/utils/format.js
index e2eb8991..72df6a20 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -299,7 +299,7 @@ export const formatOpenPositions = (job, resources) => {
  * @returns {string} formatted string
  */
 export const formatJobDate = (startDate, duration) => {
-  const dateStr = startDate ? moment(startDate).format(DAY_FORMAT) : "";
+  const dateStr = startDate ? startDate : "";
 
   if (startDate && duration) {
     return `Requested starting ${dateStr} for ${formatPlural(

From a1b485e6b015be8954633e494c1deec83ad24de0 Mon Sep 17 00:00:00 2001
From: yoution <zhuyan207@gmail.com>
Date: Fri, 10 Sep 2021 17:58:24 +0800
Subject: [PATCH 2/2] fix issue topcoder-platform/taas-apis#507

---
 src/utils/format.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/format.js b/src/utils/format.js
index 72df6a20..e2eb8991 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -299,7 +299,7 @@ export const formatOpenPositions = (job, resources) => {
  * @returns {string} formatted string
  */
 export const formatJobDate = (startDate, duration) => {
-  const dateStr = startDate ? startDate : "";
+  const dateStr = startDate ? moment(startDate).format(DAY_FORMAT) : "";
 
   if (startDate && duration) {
     return `Requested starting ${dateStr} for ${formatPlural(