Skip to content

Commit

Permalink
[TEAMMATES#12656] Student Home Page: Indicate default sort (TEAMMATES…
Browse files Browse the repository at this point in the history
…#12660)

* sortBy to CREATION DATE

* snapshot update

* sort to creation time upon load

* linting to specs

* trailing space fix

* replaces sort with sort function

---------

Co-authored-by: Dominic Lim <46486515+domlimm@users.noreply.github.com>
  • Loading branch information
averheecke-scottlogic and domlimm committed Dec 24, 2023
1 parent 1915ade commit b44938b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
Expand Up @@ -13,7 +13,7 @@ exports[`StudentHomePageComponent should snap when courses are still loading 1`]
isCoursesLoading={[Function Boolean]}
route={[Function ActivatedRoute]}
sessionSubmissionStatusPipe={[Function SubmissionStatusPipe]}
sortBy="0"
sortBy={[Function Number]}
statusMessageService={[Function StatusMessageService]}
studentFeedbackSessionStatusAwaiting={[Function String]}
studentFeedbackSessionStatusClosed={[Function String]}
Expand Down Expand Up @@ -58,7 +58,7 @@ exports[`StudentHomePageComponent should snap when there is course loading faile
isCoursesLoading="false"
route={[Function ActivatedRoute]}
sessionSubmissionStatusPipe={[Function SubmissionStatusPipe]}
sortBy="0"
sortBy={[Function Number]}
statusMessageService={[Function StatusMessageService]}
studentFeedbackSessionStatusAwaiting={[Function String]}
studentFeedbackSessionStatusClosed={[Function String]}
Expand Down Expand Up @@ -106,7 +106,7 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2
isCoursesLoading="false"
route={[Function ActivatedRoute]}
sessionSubmissionStatusPipe={[Function SubmissionStatusPipe]}
sortBy="0"
sortBy={[Function Number]}
statusMessageService={[Function StatusMessageService]}
studentFeedbackSessionStatusAwaiting={[Function String]}
studentFeedbackSessionStatusClosed={[Function String]}
Expand Down Expand Up @@ -152,6 +152,7 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2
</button>
<button
class="btn btn-light"
disabled=""
id="sort-course-date-btn"
>
Creation Date
Expand Down Expand Up @@ -488,7 +489,7 @@ exports[`StudentHomePageComponent should snap with default fields 1`] = `
isCoursesLoading={[Function Boolean]}
route={[Function ActivatedRoute]}
sessionSubmissionStatusPipe={[Function SubmissionStatusPipe]}
sortBy="0"
sortBy={[Function Number]}
statusMessageService={[Function StatusMessageService]}
studentFeedbackSessionStatusAwaiting={[Function String]}
studentFeedbackSessionStatusClosed={[Function String]}
Expand Down Expand Up @@ -533,7 +534,7 @@ exports[`StudentHomePageComponent should snap with feedback sessions 1`] = `
isCoursesLoading="false"
route={[Function ActivatedRoute]}
sessionSubmissionStatusPipe={[Function SubmissionStatusPipe]}
sortBy="0"
sortBy={[Function Number]}
statusMessageService={[Function StatusMessageService]}
studentFeedbackSessionStatusAwaiting={[Function String]}
studentFeedbackSessionStatusClosed={[Function String]}
Expand Down Expand Up @@ -598,7 +599,7 @@ exports[`StudentHomePageComponent should snap with no course 1`] = `
isCoursesLoading="false"
route={[Function ActivatedRoute]}
sessionSubmissionStatusPipe={[Function SubmissionStatusPipe]}
sortBy="0"
sortBy={[Function Number]}
statusMessageService={[Function StatusMessageService]}
studentFeedbackSessionStatusAwaiting={[Function String]}
studentFeedbackSessionStatusClosed={[Function String]}
Expand Down Expand Up @@ -641,7 +642,7 @@ exports[`StudentHomePageComponent should snap with no feedback session over 2 co
isCoursesLoading="false"
route={[Function ActivatedRoute]}
sessionSubmissionStatusPipe={[Function SubmissionStatusPipe]}
sortBy="0"
sortBy={[Function Number]}
statusMessageService={[Function StatusMessageService]}
studentFeedbackSessionStatusAwaiting={[Function String]}
studentFeedbackSessionStatusClosed={[Function String]}
Expand Down Expand Up @@ -687,6 +688,7 @@ exports[`StudentHomePageComponent should snap with no feedback session over 2 co
</button>
<button
class="btn btn-light"
disabled=""
id="sort-course-date-btn"
>
Creation Date
Expand Down Expand Up @@ -777,7 +779,7 @@ exports[`StudentHomePageComponent should snap with no feedback sessions 1`] = `
isCoursesLoading="false"
route={[Function ActivatedRoute]}
sessionSubmissionStatusPipe={[Function SubmissionStatusPipe]}
sortBy="0"
sortBy={[Function Number]}
statusMessageService={[Function StatusMessageService]}
studentFeedbackSessionStatusAwaiting={[Function String]}
studentFeedbackSessionStatusClosed={[Function String]}
Expand Down
Expand Up @@ -72,7 +72,7 @@ export class StudentHomePageComponent implements OnInit {
isCoursesLoading: boolean = false;
hasCoursesLoadingFailed: boolean = false;

sortBy: SortBy = SortBy.NONE;
sortBy: SortBy = SortBy.COURSE_CREATION_DATE;

sessionSubmissionStatusPipe = new SubmissionStatusPipe();
formatDateDetailPipe = new FormatDateDetailPipe(this.timezoneService);
Expand Down Expand Up @@ -114,7 +114,7 @@ export class StudentHomePageComponent implements OnInit {
});
});

this.courses.sort((a: StudentCourse, b: StudentCourse) => (a.course.courseId > b.course.courseId ? 1 : -1));
this.sortCoursesBy(SortBy.COURSE_CREATION_DATE);
this.courses.slice(0, 3).forEach((course: StudentCourse) => {
course.isTabExpanded = true;
this.loadFeedbackSessionsForCourse(course.course.courseId);
Expand Down

0 comments on commit b44938b

Please sign in to comment.