Skip to content

Commit 79e582b

Browse files
minor fix
1 parent 6a419f1 commit 79e582b

File tree

1 file changed

+42
-39
lines changed
  • src/shared/utils/challenge-listing

1 file changed

+42
-39
lines changed

src/shared/utils/challenge-listing/sort.js

Lines changed: 42 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ export const SORTS = {
1111
MOST_RECENT_START_DATE: 'startDate',
1212
// NUM_REGISTRANTS: 'num-registrants',
1313
// NUM_SUBMISSIONS: 'num-submissions',
14-
// PRIZE_HIGH_TO_LOW: 'prize-high-to-low',
15-
// TIME_TO_REGISTER: 'time-to-register',
16-
// TIME_TO_SUBMIT: 'time-to-submit',
14+
PRIZE_HIGH_TO_LOW: 'prize-high-to-low',
15+
TIME_TO_REGISTER: 'time-to-register',
16+
TIME_TO_SUBMIT: 'time-to-submit',
1717
TITLE_A_TO_Z: 'name',
1818
REVIEW_OPPORTUNITIES_TITLE_A_TO_Z: 'review-opportunities-title-a-to-z',
1919
REVIEW_OPPORTUNITIES_PAYMENT: 'review-opportunities-payment',
2020
REVIEW_OPPORTUNITIES_START_DATE: 'review-opportunities-start-date',
2121
};
2222

2323
export default {
24-
// [SORTS.CURRENT_PHASE]: {
25-
// func: (a, b) => a.status.localeCompare(b.status),
26-
// name: 'Current phase',
27-
// },
24+
[SORTS.CURRENT_PHASE]: {
25+
func: (a, b) => a.status.localeCompare(b.status),
26+
name: 'Current phase',
27+
},
2828
[SORTS.MOST_RECENT]: {
2929
// func: (a, b) => moment(b.registrationStartDate).diff(a.registrationStartDate),
3030
name: 'Most recent',
@@ -42,43 +42,46 @@ export default {
4242
// func: (a, b) => b.numOfSubmissions - a.numOfSubmissions,
4343
// name: '# of submissions',
4444
// },
45-
// [SORTS.PRIZE_HIGH_TO_LOW]: {
46-
// func: (a, b) => b.totalPrize - a.totalPrize,
47-
// name: 'Prize high to low',
48-
// },
49-
// [SORTS.TIME_TO_REGISTER]: {
50-
// func: (a, b) => {
51-
// const aDate = moment(a.registrationEndDate || a.submissionEndTimestamp);
52-
// const bDate = moment(b.registrationEndDate || b.submissionEndTimestamp);
45+
[SORTS.PRIZE_HIGH_TO_LOW]: {
46+
func: (a, b) => b.totalPrize - a.totalPrize,
47+
name: 'Prize high to low',
48+
order: 'desc',
49+
},
50+
[SORTS.TIME_TO_REGISTER]: {
51+
func: (a, b) => {
52+
const aDate = moment(a.registrationEndDate || a.submissionEndTimestamp);
53+
const bDate = moment(b.registrationEndDate || b.submissionEndTimestamp);
5354

54-
// if (aDate.isBefore() && bDate.isAfter()) return 1;
55-
// if (aDate.isAfter() && bDate.isBefore()) return -1;
56-
// if (aDate.isBefore() && bDate.isBefore()) return bDate.diff(aDate);
55+
if (aDate.isBefore() && bDate.isAfter()) return 1;
56+
if (aDate.isAfter() && bDate.isBefore()) return -1;
57+
if (aDate.isBefore() && bDate.isBefore()) return bDate.diff(aDate);
5758

58-
// return aDate.diff(bDate);
59-
// },
60-
// name: 'Time to register',
61-
// },
62-
// [SORTS.TIME_TO_SUBMIT]: {
63-
// func: (a, b) => {
64-
// function nextSubEndDate(o) {
65-
// if (o.checkpointSubmissionEndDate && moment(o.checkpointSubmissionEndDate).isAfter()) {
66-
// return moment(o.checkpointSubmissionEndDate);
67-
// }
68-
// return moment(o.submissionEndTimestamp);
69-
// }
59+
return aDate.diff(bDate);
60+
},
61+
name: 'Time to register',
62+
order: 'desc',
63+
},
64+
[SORTS.TIME_TO_SUBMIT]: {
65+
func: (a, b) => {
66+
function nextSubEndDate(o) {
67+
if (o.checkpointSubmissionEndDate && moment(o.checkpointSubmissionEndDate).isAfter()) {
68+
return moment(o.checkpointSubmissionEndDate);
69+
}
70+
return moment(o.submissionEndTimestamp);
71+
}
7072

71-
// const aDate = nextSubEndDate(a);
72-
// const bDate = nextSubEndDate(b);
73+
const aDate = nextSubEndDate(a);
74+
const bDate = nextSubEndDate(b);
7375

74-
// if (aDate.isBefore() && bDate.isAfter()) return 1;
75-
// if (aDate.isAfter() && bDate.isBefore()) return -1;
76-
// if (aDate.isBefore() && bDate.isBefore()) return bDate.diff(aDate);
76+
if (aDate.isBefore() && bDate.isAfter()) return 1;
77+
if (aDate.isAfter() && bDate.isBefore()) return -1;
78+
if (aDate.isBefore() && bDate.isBefore()) return bDate.diff(aDate);
7779

78-
// return aDate.diff(bDate);
79-
// },
80-
// name: 'Time to submit',
81-
// },
80+
return aDate.diff(bDate);
81+
},
82+
name: 'Time to submit',
83+
order: 'desc',
84+
},
8285
[SORTS.TITLE_A_TO_Z]: {
8386
// func: (a, b) => a.name.localeCompare(b.name),
8487
name: 'Title A-Z',

0 commit comments

Comments
 (0)