Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

#442 #470

Merged
merged 2 commits into from Aug 12, 2021
Merged

#442 #470

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/routes/CreateNewTeam/components/SubmitContainer/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,21 @@ function SubmitContainer({
positions.push(position);
}
teamObject.positions = positions;

setTeamDetailsOpen(false);
setTeamObject(teamObject);

addedRoles.map((data) => {
if (_.has(formData, data.searchId)) {
const temp = {
...data,
numberOfResources: formData[data.searchId].numberOfResources,
durationWeeks: formData[data.searchId].durationWeeks,
hoursPerWeek: formData[data.searchId].hoursPerWeek,
};
dispatch(editRoleAction({ ...temp, searchId: data.searchId }));
}
});

requestTeam(teamObject);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ function TeamDetailsModal({ open, onClose, submitForm, addedRoles }) {
<td>
<Field
name={`${id}.hoursPerWeek`}
initialValue={hoursPerWeek || 40}
initialValue={hoursPerWeek || "40"}
>
{(props) => (
<Select
Expand Down
37 changes: 18 additions & 19 deletions src/routes/CreateNewTeam/pages/CreateTaasPayment/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ const CreateTassPayment = () => {
const [calculatedAmount, setCalculatedAmount] = useState(0);
const [error, setError] = useState(false);
const [value, setValue] = useState([]);
const { addedRoles, teamObject } = useSelector(
(state) => state.searchedRoles
);
const { addedRoles } = useSelector((state) => state.searchedRoles);

useEffect(() => {
const temp = [];
Expand All @@ -33,27 +31,32 @@ const CreateTassPayment = () => {
imageUrl,
name,
rates: [rates],
numberOfResources = 1,
durationWeeks = 4,
hoursPerWeek = "40",
} = role;
const { numberOfResources = 1, durationWeeks = 4, hoursPerWeek } =
_.find(
teamObject.positions,
(p) => p.roleSearchRequestId === role.searchId
) || {};

let rate;
let availability;

if (hoursPerWeek) {
if (hoursPerWeek === 30) rate = rates.rate30Global;
else if (hoursPerWeek === 20) rate = rates.rate20Global;
else if (hoursPerWeek === 40) rate = rates.global;
} else rate = rates.global;
if (hoursPerWeek === "30") {
rate = rates.rate30Global;
availability = "Part-Time Availability";
} else if (hoursPerWeek === "20") {
rate = rates.rate20Global;
availability = "Part-Time Availability";
} else if (hoursPerWeek === "40") {
rate = rates.global;
availability = "Full-Time Availability";
}

temp.push({
imageUrl,
name,
rate,
numberOfResources,
durationWeeks,
hoursPerWeek,
availability,
});
amount.push({ rate, numberOfResources });
});
Expand Down Expand Up @@ -110,11 +113,7 @@ const CreateTassPayment = () => {
{data.numberOfResources} x ${data.rate}/ Week
</li>
<li>{data.durationWeeks} Week Duration</li>
<li>
{data.hoursPerWeek === 40
? "Full-Time Availability"
: "Part-Time Availability"}
</li>
<li>{data.availability}</li>
</ul>
</div>
<p styleName="amount">
Expand Down