Skip to content
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

Jump to bottom

doc reviewer dashboard - sorting bug fix #36

Merged
merged 12 commits into from
Jul 25, 2023
Merged

doc reviewer dashboard - sorting bug fix #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0466260
navbar changes
soujash-mandal Jul 22, 2023
1a7f702
Due Date
soujash-mandal Jul 22, 2023
3846dd5
sort according to due date
soujash-mandal Jul 22, 2023
e07dbf3
date formatted to MMM DD, YYYY
soujash-mandal Jul 23, 2023
695f94e
Colours for badge only allowed for docs waiting for me to review
soujash-mandal Jul 23, 2023
e1db7e8
Docs Waiting for me and Reviewed By me
soujash-mandal Jul 24, 2023
a0da2d9
Merge branch 'main' of https://github.com/razorpay/hermes into soujas…
soujash-mandal Jul 24, 2023
8e9358e
Merge Conflict Bug Fix
soujash-mandal Jul 24, 2023
d634460
Merge branch 'main' of https://github.com/razorpay/hermes into soujas…
soujash-mandal Jul 24, 2023
cfcd957
fixing sort wrt due Date bug
soujash-mandal Jul 24, 2023
c434646
resolving sorting error
soujash-mandal Jul 25, 2023
2b2e801
Merge branch 'main' into soujash-mandal/Doc-Reviewer-Dashboard
soujash-mandal Jul 25, 2023
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
17 changes: 13 additions & 4 deletions web/app/routes/authenticated/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,21 +79,30 @@ export default class DashboardRoute extends Route {
this.recentDocs.all = null;
}
}



docsWaitingForReview._result = docsWaitingForReview._result.sort((a, b) => {
// Use optional chaining to access the 'dueDate' property safely
const dueDateA = a.dueDate?.toString()||"";
const dueDateB = b.dueDate?.toString()||"";

// Check if 'dueDate' property exists in both 'a' and 'b'
if (a.dueDate && b.dueDate) {
return a.dueDate.localeCompare(b.dueDate);
} else if (a.dueDate) {
if (dueDateA && dueDateB) {
return dueDateA.localeCompare(dueDateB);
} else if (dueDateA) {
// If 'dueDate' exists in 'a' but not in 'b', consider 'a' to come before 'b'
return -1;
} else if (b.dueDate) {
} else if (dueDateB) {

// If 'dueDate' exists in 'b' but not in 'a', consider 'b' to come before 'a'
return 1;
} else {
// If 'dueDate' doesn't exist in both 'a' and 'b', maintain their original order
return 0;
}
});

return RSVP.hash({
docsWaitingForReview: docsWaitingForReview,
});
Expand Down
15 changes: 10 additions & 5 deletions web/app/routes/authenticated/waiting-for-me.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,21 +113,26 @@ export default class WaitingForMeRoute extends Route {
}

docsWaitingForReview._result = docsWaitingForReview._result.sort((a, b) => {

// Use optional chaining to access the 'dueDate' property safely
const dueDateA = a.dueDate?.toString()||"";
const dueDateB = b.dueDate?.toString()||"";

// Check if 'dueDate' property exists in both 'a' and 'b'
if (a.dueDate && b.dueDate) {
return a.dueDate.localeCompare(b.dueDate);
} else if (a.dueDate) {
if (dueDateA && dueDateB) {
return dueDateA.localeCompare(dueDateB);
} else if (dueDateA) {
// If 'dueDate' exists in 'a' but not in 'b', consider 'a' to come before 'b'
return -1;
} else if (b.dueDate) {
} else if (dueDateB) {
// If 'dueDate' exists in 'b' but not in 'a', consider 'b' to come before 'a'
return 1;
} else {
// If 'dueDate' doesn't exist in both 'a' and 'b', maintain their original order
return 0;
}
});

return RSVP.hash({
docsWaitingForReview: docsWaitingForReview,
docsReviewed: docsReviewed,
Expand Down
Loading