Skip to content

Gig work updates #5252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 11, 2020
Merged

Gig work updates #5252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8476a3
Merge pull request #5240 from topcoder-platform/develop
sushilshinde Dec 4, 2020
0be8e2b
fixes #5241
kkartunov Dec 7, 2020
37e384f
ci: on test
kkartunov Dec 7, 2020
5b6c782
Merge branch 'develop' into gig-work-updates
luizrrodrigues Dec 11, 2020
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
2 changes: 1 addition & 1 deletion src/shared/components/GUIKit/JobListCard/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default function JobListCard({
<IconBlackLocation /> {job.country}
</div>
<div styleName="icon-val">
<IconBlackPayment /> ${job.min_annual_salary} - ${job.max_annual_salary} / {getSalaryType(job.salary_type)}
<IconBlackPayment /> ${job.min_annual_salary} - {job.max_annual_salary} (USD) / {getSalaryType(job.salary_type)}
</div>
<div styleName="icon-val">
<IconBlackDuration /> {getCustomField(job.custom_fields, 'Duration')}
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/Gigs/GigDetails/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default function GigDetails(props) {
let skills = getCustomField(job.custom_fields, 'Technologies Required');
if (skills !== 'n/a') skills = skills.split(',').join(', ');
const hPerW = getCustomField(job.custom_fields, 'Hours per week');
const compens = job.min_annual_salary === job.max_annual_salary ? job.max_annual_salary : `${job.min_annual_salary} - ${job.max_annual_salary}`;
const compens = job.min_annual_salary === job.max_annual_salary ? job.max_annual_salary : `${job.min_annual_salary} - ${job.max_annual_salary} (USD)`;

return (
<div styleName="container">
Expand Down
11 changes: 7 additions & 4 deletions src/shared/containers/Gigs/RecruitCRMJobs.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class RecruitCRMJobsContainer extends React.Component {
term: '',
page: 0,
sortBy: 'created_on',
location: 'Any Location',
location: 'All',
};
// binds
this.onSearch = this.onSearch.bind(this);
Expand Down Expand Up @@ -121,13 +121,16 @@ class RecruitCRMJobsContainer extends React.Component {
// build current locations dropdown based on all data
// and filter by selected location
jobsToDisplay = _.filter(jobs, (job) => {
const country = job.country === 'Anywhere' || job.country === 'Any' ? 'All' : job.country;
// build dropdown
const found = _.find(locations, { label: job.country });
const found = _.find(locations, { label: country });
if (!found) {
locations.push({ label: job.country, selected: location === job.country });
locations.push({
label: country, selected: location.toLowerCase() === country.toLowerCase(),
});
}
// filter
if (location === 'Anywhere' || location === 'Any' || location === 'Any Location') return true;
if (location === 'Anywhere' || location === 'Any' || location === 'All') return true;
return location.toLowerCase() === job.country.toLowerCase();
});
// sort location dropdown
Expand Down