Skip to content

issue 4982 fix #5019

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 5 commits into from
Feb 19, 2021
Merged

issue 4982 fix #5019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a419f1
adding sort options in buckets
PrakashDurlabhji Sep 29, 2020
79e582b
minor fix
PrakashDurlabhji Oct 3, 2020
52d38b6
sort by changes
PrakashDurlabhji Oct 12, 2020
7521450
Update sort.js
PrakashDurlabhji Jan 6, 2021
75b1ae5
Update sort.js
PrakashDurlabhji Jan 6, 2021
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: 7 additions & 7 deletions src/shared/utils/challenge-listing/buckets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ export const BUCKET_DATA = {
name: 'My Challenges',
sorts: [
SORTS.MOST_RECENT_START_DATE,
// SORTS.TIME_TO_SUBMIT,
SORTS.TIME_TO_SUBMIT,
// SORTS.NUM_REGISTRANTS,
// SORTS.NUM_SUBMISSIONS,
// SORTS.PRIZE_HIGH_TO_LOW,
SORTS.PRIZE_HIGH_TO_LOW,
SORTS.TITLE_A_TO_Z,
],
},
Expand All @@ -53,11 +53,11 @@ export const BUCKET_DATA = {
name: 'Open for registration',
sorts: [
SORTS.MOST_RECENT_START_DATE,
// SORTS.TIME_TO_REGISTER,
// SORTS.TIME_TO_SUBMIT,
SORTS.TIME_TO_REGISTER,
SORTS.TIME_TO_SUBMIT,
// SORTS.NUM_REGISTRANTS,
// SORTS.NUM_SUBMISSIONS,
// SORTS.PRIZE_HIGH_TO_LOW,
SORTS.PRIZE_HIGH_TO_LOW,
SORTS.TITLE_A_TO_Z,
],
},
Expand All @@ -72,9 +72,9 @@ export const BUCKET_DATA = {
name: 'Ongoing challenges',
sorts: [
SORTS.MOST_RECENT_START_DATE,
// SORTS.CURRENT_PHASE,
SORTS.CURRENT_PHASE,
SORTS.TITLE_A_TO_Z,
// SORTS.PRIZE_HIGH_TO_LOW,
SORTS.PRIZE_HIGH_TO_LOW,
],
},
[BUCKETS.UPCOMING]: {
Expand Down
92 changes: 43 additions & 49 deletions src/shared/utils/challenge-listing/sort.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,79 +6,73 @@ import moment from 'moment';
import { sumBy } from 'lodash';

export const SORTS = {
// CURRENT_PHASE: 'current-phase',
CURRENT_PHASE: 'current-phase',
MOST_RECENT: 'updated',
MOST_RECENT_START_DATE: 'startDate',
// NUM_REGISTRANTS: 'num-registrants',
// NUM_SUBMISSIONS: 'num-submissions',
// PRIZE_HIGH_TO_LOW: 'prize-high-to-low',
// TIME_TO_REGISTER: 'time-to-register',
// TIME_TO_SUBMIT: 'time-to-submit',
PRIZE_HIGH_TO_LOW: 'overview.totalPrizes',
TIME_TO_REGISTER: 'registrationEndDate',
TIME_TO_SUBMIT: 'submissionEndDate',
TITLE_A_TO_Z: 'name',
REVIEW_OPPORTUNITIES_TITLE_A_TO_Z: 'review-opportunities-title-a-to-z',
REVIEW_OPPORTUNITIES_PAYMENT: 'review-opportunities-payment',
REVIEW_OPPORTUNITIES_START_DATE: 'review-opportunities-start-date',
};

export default {
// [SORTS.CURRENT_PHASE]: {
// func: (a, b) => a.status.localeCompare(b.status),
// name: 'Current phase',
// },
[SORTS.CURRENT_PHASE]: {
func: (a, b) => a.status.localeCompare(b.status),
name: 'Current phase',
},
[SORTS.MOST_RECENT]: {
// func: (a, b) => moment(b.registrationStartDate).diff(a.registrationStartDate),
name: 'Most recent',
order: 'desc',
},
[SORTS.MOST_RECENT_START_DATE]: {
name: 'Most recent',
order: 'desc',
},
// [SORTS.NUM_REGISTRANTS]: {
// func: (a, b) => b.numOfRegistrants - a.numOfRegistrants,
// name: '# of registrants',
// },
// [SORTS.NUM_SUBMISSIONS]: {
// func: (a, b) => b.numOfSubmissions - a.numOfSubmissions,
// name: '# of submissions',
// },
// [SORTS.PRIZE_HIGH_TO_LOW]: {
// func: (a, b) => b.totalPrize - a.totalPrize,
// name: 'Prize high to low',
// },
// [SORTS.TIME_TO_REGISTER]: {
// func: (a, b) => {
// const aDate = moment(a.registrationEndDate || a.submissionEndTimestamp);
// const bDate = moment(b.registrationEndDate || b.submissionEndTimestamp);
[SORTS.PRIZE_HIGH_TO_LOW]: {
func: (a, b) => b.totalPrize - a.totalPrize,
name: 'Prize high to low',
order: 'desc',
},
[SORTS.TIME_TO_REGISTER]: {
func: (a, b) => {
const aDate = moment(a.registrationEndDate || a.submissionEndTimestamp);
const bDate = moment(b.registrationEndDate || b.submissionEndTimestamp);

// if (aDate.isBefore() && bDate.isAfter()) return 1;
// if (aDate.isAfter() && bDate.isBefore()) return -1;
// if (aDate.isBefore() && bDate.isBefore()) return bDate.diff(aDate);
if (aDate.isBefore() && bDate.isAfter()) return 1;
if (aDate.isAfter() && bDate.isBefore()) return -1;
if (aDate.isBefore() && bDate.isBefore()) return bDate.diff(aDate);

// return aDate.diff(bDate);
// },
// name: 'Time to register',
// },
// [SORTS.TIME_TO_SUBMIT]: {
// func: (a, b) => {
// function nextSubEndDate(o) {
// if (o.checkpointSubmissionEndDate && moment(o.checkpointSubmissionEndDate).isAfter()) {
// return moment(o.checkpointSubmissionEndDate);
// }
// return moment(o.submissionEndTimestamp);
// }
return aDate.diff(bDate);
},
name: 'Time to register',
order: 'desc',
},
[SORTS.TIME_TO_SUBMIT]: {
func: (a, b) => {
function nextSubEndDate(o) {
if (o.checkpointSubmissionEndDate && moment(o.checkpointSubmissionEndDate).isAfter()) {
return moment(o.checkpointSubmissionEndDate);
}
return moment(o.submissionEndTimestamp);
}

// const aDate = nextSubEndDate(a);
// const bDate = nextSubEndDate(b);
const aDate = nextSubEndDate(a);
const bDate = nextSubEndDate(b);

// if (aDate.isBefore() && bDate.isAfter()) return 1;
// if (aDate.isAfter() && bDate.isBefore()) return -1;
// if (aDate.isBefore() && bDate.isBefore()) return bDate.diff(aDate);
if (aDate.isBefore() && bDate.isAfter()) return 1;
if (aDate.isAfter() && bDate.isBefore()) return -1;
if (aDate.isBefore() && bDate.isBefore()) return bDate.diff(aDate);

// return aDate.diff(bDate);
// },
// name: 'Time to submit',
// },
return aDate.diff(bDate);
},
name: 'Time to submit',
order: 'desc',
},
[SORTS.TITLE_A_TO_Z]: {
// func: (a, b) => a.name.localeCompare(b.name),
name: 'Title A-Z',
Expand Down