From 391efacbbc6266621b0581be3c63dcd0b53f6b5f Mon Sep 17 00:00:00 2001 From: Tan Kian Wei Jason <31800234+jtankw3@users.noreply.github.com> Date: Mon, 6 Jul 2020 08:04:23 +0800 Subject: [PATCH 001/205] [#10279] Restore all feedback sessions causes error (#10280) --- .../instructor-sessions-page.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts index 8842b9db288..4d0faa51874 100644 --- a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts +++ b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts @@ -531,7 +531,7 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC const restoreRequests: Observable[] = []; this.recycleBinFeedbackSessionRowModels.forEach((model: RecycleBinFeedbackSessionRowModel) => { restoreRequests.push( - this.feedbackSessionsService.deleteFeedbackSession( + this.feedbackSessionsService.deleteSessionFromRecycleBin( model.feedbackSession.courseId, model.feedbackSession.feedbackSessionName, )); From 3f076d08d495186d3c506500768b03ec794a30a7 Mon Sep 17 00:00:00 2001 From: Chong Chee Yuan <32454748+ccyccyccy@users.noreply.github.com> Date: Mon, 6 Jul 2020 14:24:09 +0800 Subject: [PATCH 002/205] [#10213] Fix clickable area / cursor related issues (#10275) * Fix clickable area / cursor related issues * Update snapshot --- .../copy-session-modal.component.spec.ts.snap | 34 +++++++++---------- .../copy-session-modal.component.html | 12 +++---- .../gqr-rqg-view-responses.component.html | 10 +++--- .../grq-rgq-view-responses.component.html | 4 +-- ...structor-course-enroll-page.component.html | 4 +-- .../template-question-modal.component.html | 8 ++--- ...r-session-no-response-panel.component.html | 2 +- ...tor-session-result-gqr-view.component.html | 2 +- ...tor-session-result-grq-view.component.html | 2 +- ...tor-session-result-rgq-view.component.html | 2 +- ...tor-session-result-rqg-view.component.html | 2 +- ...nstructor-student-list-page.component.html | 2 +- 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap b/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap index 00d11787ebc..d8da4187f7f 100644 --- a/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap +++ b/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap @@ -143,14 +143,14 @@ exports[`CopySessionModalComponent should snap with some session and courses can
- - -
- {Session currently in this course} -
- -
diff --git a/src/web/app/components/copy-session-modal/copy-session-modal.component.html b/src/web/app/components/copy-session-modal/copy-session-modal.component.html index 13c8193f8f0..d982a065a69 100644 --- a/src/web/app/components/copy-session-modal/copy-session-modal.component.html +++ b/src/web/app/components/copy-session-modal/copy-session-modal.component.html @@ -12,19 +12,19 @@
- + {{ FEEDBACK_SESSION_NAME_MAX_LENGTH - newFeedbackSessionName.length }} characters left
- -
- {{ "{Session currently in this course}" }} -
diff --git a/src/web/app/components/question-responses/gqr-rqg-view-responses/gqr-rqg-view-responses.component.html b/src/web/app/components/question-responses/gqr-rqg-view-responses/gqr-rqg-view-responses.component.html index 15b2a03c450..e1c2077c1e0 100644 --- a/src/web/app/components/question-responses/gqr-rqg-view-responses/gqr-rqg-view-responses.component.html +++ b/src/web/app/components/question-responses/gqr-rqg-view-responses/gqr-rqg-view-responses.component.html @@ -1,7 +1,7 @@
-
+
{{ teamInfo.key }}
@@ -17,7 +17,7 @@

{{ teamInfo.key }} Statistics for {{ isGqr ? 'Given' : 'Received' }} Respons
+ >
{{ teamInfo.key }} Detailed Responses

-
+
{{ isGqr ? 'From' : 'To' }}: {{ teamInfo.key }} Detailed Responses
-
+
+ >
diff --git a/src/web/app/components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.component.html b/src/web/app/components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.component.html index 934563889f0..e38cac6d7b8 100644 --- a/src/web/app/components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.component.html +++ b/src/web/app/components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.component.html @@ -1,7 +1,7 @@
-
+
{{ teamInfo.key }}
@@ -32,7 +32,7 @@
-
+
{{ isGrq ? 'From' : 'To' }}: Enroll Students for {{ courseid }}
-
Existing Students
@@ -48,7 +48,7 @@

Enroll Students for {{ courseid }}

-
+
diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/template-question-modal/template-question-modal.component.html b/src/web/app/pages-instructor/instructor-session-edit-page/template-question-modal/template-question-modal.component.html index 327c48cd3d7..e970688abb5 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/template-question-modal/template-question-modal.component.html +++ b/src/web/app/pages-instructor/instructor-session-edit-page/template-question-modal/template-question-modal.component.html @@ -6,12 +6,12 @@

Add Template Questions

-
+
  - +
diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.html index dc55a5d56aa..30168484f81 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.html @@ -1,4 +1,4 @@ -
+
Participants who have not responded to any question
diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-gqr-view.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-gqr-view.component.html index ca0a3962f27..71951b25e8b 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-gqr-view.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-gqr-view.component.html @@ -1,6 +1,6 @@
-
+
{{ sectionInfo.key === 'None' ? 'No specific section' : sectionInfo.key }}
diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-grq-view.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-grq-view.component.html index b11ac5562a5..c64c2f7cac7 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-grq-view.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-grq-view.component.html @@ -1,6 +1,6 @@
-
+
{{ sectionInfo.key === 'None' ? 'No specific section' : sectionInfo.key }}
diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rgq-view.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rgq-view.component.html index 712c5c4f885..106d6eecf8d 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rgq-view.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rgq-view.component.html @@ -1,6 +1,6 @@
-
+
{{ sectionInfo.key === 'None' ? 'No specific section' : sectionInfo.key }}
diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rqg-view.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rqg-view.component.html index b80befcba8d..90f98081fb4 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rqg-view.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rqg-view.component.html @@ -1,6 +1,6 @@
-
+
{{ sectionInfo.key === 'None' ? 'No specific section' : sectionInfo.key }}
diff --git a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.html b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.html index 751c34c125f..a6932165e37 100644 --- a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.html +++ b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.html @@ -9,7 +9,7 @@

Student List

-
From 25cc37c333b551c8ad1befd852d5b1e09e705deb Mon Sep 17 00:00:00 2001 From: t-cheepeng Date: Mon, 6 Jul 2020 15:32:09 +0800 Subject: [PATCH 003/205] [#10245] Per Question CSV Download in Session Result (#10271) * Update CSEET href link * Add questionId to csv download method * Add download event emitter to base classes * Add download event emitter to question text * Add handling of download to response views * Add handling of download to specific view * Add handling of download to root page * Style question text with info * Update snapshots and fix lint issues * Standardize styles and add period to comments * Remove download question event from group views * Add optional tooltip to question text * Update snapshots * Remove unintended changes Co-authored-by: Ahmed Bahajjaj --- ...tion-text-with-info.component.spec.ts.snap | 87 ++++++++++++++----- .../question-text-with-info.component.html | 20 ++++- .../question-text-with-info.component.scss | 4 + .../question-text-with-info.component.ts | 5 +- .../question-text-with-info.module.ts | 3 + ...tructor-session-result-page.component.html | 2 +- ...nstructor-session-result-page.component.ts | 21 ++++- ...ession-result-question-view.component.html | 9 +- ...-session-result-question-view.component.ts | 12 +++ .../index-page/index-page.component.html | 2 +- src/web/services/feedback-sessions.service.ts | 2 + 11 files changed, 134 insertions(+), 33 deletions(-) diff --git a/src/web/app/components/question-text-with-info/__snapshots__/question-text-with-info.component.spec.ts.snap b/src/web/app/components/question-text-with-info/__snapshots__/question-text-with-info.component.spec.ts.snap index cbad2ec4ca8..621b99b39da 100644 --- a/src/web/app/components/question-text-with-info/__snapshots__/question-text-with-info.component.spec.ts.snap +++ b/src/web/app/components/question-text-with-info/__snapshots__/question-text-with-info.component.spec.ts.snap @@ -4,13 +4,26 @@ exports[`QuestionTextWithInfoComponent should not show control link and question - - Question 0: - Text question details - + + + + + + Question 0: + + + Text question details + + `; @@ -18,20 +31,33 @@ exports[`QuestionTextWithInfoComponent should show control link when question ty - - Question 0: - MCQ question details - - [more] - - + + + + + Question 0: + + + MCQ question details + + + [more] + + `; @@ -39,20 +65,33 @@ exports[`QuestionTextWithInfoComponent should show question detail when click co - - Question 0: - MCQ question details - - [less] - -
+ + Question 0: + + + MCQ question details + + + [less] + +
diff --git a/src/web/app/components/question-text-with-info/question-text-with-info.component.html b/src/web/app/components/question-text-with-info/question-text-with-info.component.html index 8a48c36eef5..64da75a2b46 100644 --- a/src/web/app/components/question-text-with-info/question-text-with-info.component.html +++ b/src/web/app/components/question-text-with-info/question-text-with-info.component.html @@ -1,7 +1,19 @@ -Question {{ questionNumber }}: {{ questionDetails.questionText }} - - [{{ additionalInfoIsExpanded ? 'less' : 'more' }}] - + + + + + + Question {{ questionNumber }}: + + + {{ questionDetails.questionText }} + + [{{ additionalInfoIsExpanded ? 'less' : 'more' }}] + + +
diff --git a/src/web/app/components/question-text-with-info/question-text-with-info.component.scss b/src/web/app/components/question-text-with-info/question-text-with-info.component.scss index 63b210f9900..93e1155d5cd 100644 --- a/src/web/app/components/question-text-with-info/question-text-with-info.component.scss +++ b/src/web/app/components/question-text-with-info/question-text-with-info.component.scss @@ -1,3 +1,7 @@ .info-font-size { font-size: 1rem; } + +.padding-0 { + padding: 0; +} diff --git a/src/web/app/components/question-text-with-info/question-text-with-info.component.ts b/src/web/app/components/question-text-with-info/question-text-with-info.component.ts index c78e64f6509..aef7c0d9dc6 100644 --- a/src/web/app/components/question-text-with-info/question-text-with-info.component.ts +++ b/src/web/app/components/question-text-with-info/question-text-with-info.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FeedbackQuestionDetails, FeedbackQuestionType } from '../../../types/api-output'; /** @@ -16,6 +16,9 @@ export class QuestionTextWithInfoComponent implements OnInit { questionType: FeedbackQuestionType.TEXT, questionText: '', }; + @Input() shouldShowDownloadQuestionResult: boolean = false; + + @Output() downloadQuestionResultEvent: EventEmitter = new EventEmitter(); // enum FeedbackQuestionType: typeof FeedbackQuestionType = FeedbackQuestionType; diff --git a/src/web/app/components/question-text-with-info/question-text-with-info.module.ts b/src/web/app/components/question-text-with-info/question-text-with-info.module.ts index c9b01dba6eb..638f34d215e 100644 --- a/src/web/app/components/question-text-with-info/question-text-with-info.module.ts +++ b/src/web/app/components/question-text-with-info/question-text-with-info.module.ts @@ -1,6 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; + import { QuestionAdditionalInfoModule, } from '../question-types/question-additional-info/question-additional-info.module'; @@ -20,6 +22,7 @@ import { QuestionTextWithInfoComponent } from './question-text-with-info.compone CommonModule, RouterModule, QuestionAdditionalInfoModule, + NgbTooltipModule, ], }) export class QuestionTextWithInfoModule { } diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html index 7c893c3fc00..ae04b6c3513 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html @@ -120,7 +120,7 @@

[showStatistics]="showStatistics" [indicateMissingResponses]="indicateMissingResponses" [(instructorCommentTableModel)]="instructorCommentTableModel" (saveNewCommentEvent)="saveNewComment($event)" (deleteCommentEvent)="deleteComment($event)" (updateCommentEvent)="updateComment($event)" - (toggleAndLoadTab)="toggleQuestionTab($event)"> + (toggleAndLoadTab)="toggleQuestionTab($event)" (downloadQuestionResult)="downloadQuestionResultHandler($event)"> { this.feedbackSessionsService.getFeedbackSession({ courseId: queryParams.courseid, @@ -375,6 +374,26 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp }); } + downloadQuestionResultHandler(question: { questionNumber: number, questionId: string }): void { + const filename: string = `${ + this.session.feedbackSessionName.concat('_question', String(question.questionNumber)) + }.csv`; + + this.feedbackSessionsService.downloadSessionResults( + this.session.courseId, + this.session.feedbackSessionName, + Intent.INSTRUCTOR_RESULT, + this.indicateMissingResponses, + this.showStatistics, + question.questionId, + ).subscribe((resp: string) => { + const blob: any = new Blob([resp], { type: 'text/csv' }); + saveAs(blob, filename); + }, (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + }); + } + /** * Handle expand all questions button event. */ diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-question-view.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-question-view.component.html index 42f70c0b80e..ad9a0496a4d 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-question-view.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-question-view.component.html @@ -1,7 +1,14 @@
- +
diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-question-view.component.ts b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-question-view.component.ts index 9499d614171..0ce13d75d6a 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-question-view.component.ts +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-question-view.component.ts @@ -21,6 +21,11 @@ export class InstructorSessionResultQuestionViewComponent @Input() questions: Record = {}; @Input() isDisplayOnly: boolean = false; + @Output() downloadQuestionResult: EventEmitter<{ + questionNumber: number, + questionId: string, + }> = new EventEmitter(); + questionsOrder: QuestionTabModel[] = []; constructor() { @@ -41,4 +46,11 @@ export class InstructorSessionResultQuestionViewComponent return val1.question.questionNumber - (val2.question.questionNumber); }); } + + /** + * Triggers the download of a question result. + */ + triggerDownloadQuestionResult($event: { questionNumber: number, questionId: string }): void { + this.downloadQuestionResult.emit($event); + } } diff --git a/src/web/app/pages-static/index-page/index-page.component.html b/src/web/app/pages-static/index-page/index-page.component.html index 61b23ff8516..f4476f302ed 100644 --- a/src/web/app/pages-static/index-page/index-page.component.html +++ b/src/web/app/pages-static/index-page/index-page.component.html @@ -113,7 +113,7 @@

Not for Profit:

Well Received by the Academic Community:

TEAMMATES has been presented, and well-received, in education-related conferences such as the - International Conference on Software Engineering Education and Training (CSEET), + International Conference on Software Engineering Education and Training (CSEET), the International Conference on Teaching and Learning in Higher Education (TLHE), the EDULEARN13 Conference (Spain), and the Tel2013 Symposium (Singapore). diff --git a/src/web/services/feedback-sessions.service.ts b/src/web/services/feedback-sessions.service.ts index ba6921ec727..91b329c4297 100644 --- a/src/web/services/feedback-sessions.service.ts +++ b/src/web/services/feedback-sessions.service.ts @@ -312,12 +312,14 @@ export class FeedbackSessionsService { intent: Intent, indicateMissingResponses: boolean, showStatistics: boolean, + questionId?: string, groupBySection?: string, sectionDetail?: InstructorSessionResultSectionType): Observable { return this.getFeedbackSessionResults({ courseId, feedbackSessionName, intent, + questionId, groupBySection, }).pipe( map((results: SessionResults) => From 1557c7294c47e96ce92119677aaf3ff3d792cb65 Mon Sep 17 00:00:00 2001 From: Ahmed Bahajjaj Date: Mon, 6 Jul 2020 20:23:46 +0800 Subject: [PATCH 004/205] [#10245] UAT Fix: Instructor Search Page (#10273) * Fix instructor student search as admin * Move entity param validation to execute --- .../webapi/action/SearchStudentsAction.java | 14 +++++--- .../webapi/SearchStudentsActionTest.java | 35 ++++++++++++++++++- src/web/services/search.service.spec.ts | 3 +- src/web/services/search.service.ts | 7 ++-- 4 files changed, 49 insertions(+), 10 deletions(-) diff --git a/src/main/java/teammates/ui/webapi/action/SearchStudentsAction.java b/src/main/java/teammates/ui/webapi/action/SearchStudentsAction.java index 1c462ddc428..e8f03668b10 100644 --- a/src/main/java/teammates/ui/webapi/action/SearchStudentsAction.java +++ b/src/main/java/teammates/ui/webapi/action/SearchStudentsAction.java @@ -6,6 +6,7 @@ import teammates.common.datatransfer.attributes.AccountAttributes; import teammates.common.datatransfer.attributes.InstructorAttributes; import teammates.common.datatransfer.attributes.StudentAttributes; +import teammates.common.exception.InvalidHttpParameterException; import teammates.common.exception.UnauthorizedAccessException; import teammates.common.util.Const; import teammates.common.util.StringHelper; @@ -72,21 +73,24 @@ private String findAvailableInstructorGoogleIdForCourse(String courseId) { @Override public ActionResult execute() { String searchKey = getNonNullRequestParamValue(Const.ParamsNames.SEARCH_KEY); + String entity = getNonNullRequestParamValue(Const.ParamsNames.ENTITY_TYPE); List students; - List studentDataList = new ArrayList<>(); // Search for students - if (userInfo.isAdmin) { - students = logic.searchStudentsInWholeSystem(searchKey).studentList; - } else { + if (userInfo.isInstructor && entity.equals(Const.EntityType.INSTRUCTOR)) { List instructors = logic.getInstructorsForGoogleId(userInfo.id); students = logic.searchStudents(searchKey, instructors).studentList; + } else if (userInfo.isAdmin && entity.equals(Const.EntityType.ADMIN)) { + students = logic.searchStudentsInWholeSystem(searchKey).studentList; + } else { + throw new InvalidHttpParameterException("Invalid entity type for search"); } + List studentDataList = new ArrayList<>(); for (StudentAttributes s : students) { StudentData studentData = new StudentData(s); - if (userInfo.isAdmin) { + if (userInfo.isAdmin && entity.equals(Const.EntityType.ADMIN)) { studentData.addAdditionalInformationForAdminSearch( StringHelper.encrypt(s.getKey()), getInstituteFromCourseId(s.getCourse())); diff --git a/src/test/java/teammates/test/cases/webapi/SearchStudentsActionTest.java b/src/test/java/teammates/test/cases/webapi/SearchStudentsActionTest.java index 627a5e36c14..c3f21c08f7e 100644 --- a/src/test/java/teammates/test/cases/webapi/SearchStudentsActionTest.java +++ b/src/test/java/teammates/test/cases/webapi/SearchStudentsActionTest.java @@ -37,9 +37,35 @@ protected void testExecute() { } @Test - public void execute_notEnoughParameters_parameterFailure() { + public void execute_invalidParameters_parameterFailure() { loginAsAdmin(); verifyHttpParameterFailure(); + + String[] notEnoughParams = new String[] { + Const.ParamsNames.SEARCH_KEY, "dummy", + }; + verifyHttpParameterFailure(notEnoughParams); + + String[] invalidEntityParams = new String[] { + Const.ParamsNames.SEARCH_KEY, "dummy", + Const.ParamsNames.ENTITY_TYPE, "dummy", + }; + verifyHttpParameterFailure(invalidEntityParams); + + String[] adminParams = new String[] { + Const.ParamsNames.SEARCH_KEY, "dummy", + Const.ParamsNames.ENTITY_TYPE, Const.EntityType.ADMIN, + }; + String[] instructorParams = new String[] { + Const.ParamsNames.SEARCH_KEY, "dummy", + Const.ParamsNames.ENTITY_TYPE, Const.EntityType.INSTRUCTOR, + }; + + loginAsAdmin(); + verifyHttpParameterFailure(instructorParams); + + loginAsInstructor("idOfInstructor1OfCourse1"); + verifyHttpParameterFailure(adminParams); } @Test @@ -48,6 +74,7 @@ public void execute_adminSearchName_success() { loginAsAdmin(); String[] accNameParams = new String[] { Const.ParamsNames.SEARCH_KEY, acc.getName(), + Const.ParamsNames.ENTITY_TYPE, Const.EntityType.ADMIN, }; SearchStudentsAction a = getAction(accNameParams); JsonResult result = getJsonResult(a); @@ -61,6 +88,7 @@ public void execute_adminSearchCourseId_success() { loginAsAdmin(); String[] accCourseIdParams = new String[] { Const.ParamsNames.SEARCH_KEY, acc.getCourse(), + Const.ParamsNames.ENTITY_TYPE, Const.EntityType.ADMIN, }; SearchStudentsAction a = getAction(accCourseIdParams); JsonResult result = getJsonResult(a); @@ -73,6 +101,7 @@ public void execute_adminSearchAccountsGeneral_success() { loginAsAdmin(); String[] accNameParams = new String[] { Const.ParamsNames.SEARCH_KEY, "Course2", + Const.ParamsNames.ENTITY_TYPE, Const.EntityType.ADMIN, }; SearchStudentsAction a = getAction(accNameParams); JsonResult result = getJsonResult(a); @@ -87,6 +116,7 @@ public void execute_adminSearchEmail_success() { StudentAttributes acc = typicalBundle.students.get("student1InCourse1"); String[] emailParams = new String[] { Const.ParamsNames.SEARCH_KEY, acc.getEmail(), + Const.ParamsNames.ENTITY_TYPE, Const.EntityType.ADMIN, }; SearchStudentsAction a = getAction(emailParams); @@ -101,6 +131,7 @@ public void execute_adminSearchNoMatch_noMatch() { loginAsAdmin(); String[] accNameParams = new String[] { Const.ParamsNames.SEARCH_KEY, "minuscoronavirus", + Const.ParamsNames.ENTITY_TYPE, Const.EntityType.ADMIN, }; SearchStudentsAction a = getAction(accNameParams); JsonResult result = getJsonResult(a); @@ -114,6 +145,7 @@ public void execute_adminSearchGoogleId_success() { loginAsAdmin(); String[] googleIdParams = new String[] { Const.ParamsNames.SEARCH_KEY, "Course", + Const.ParamsNames.ENTITY_TYPE, Const.EntityType.ADMIN, }; SearchStudentsAction a = getAction(googleIdParams); JsonResult result = getJsonResult(a); @@ -127,6 +159,7 @@ public void execute_instructorSearchGoogleId_matchOnlyStudentsInCourse() { loginAsInstructor("idOfInstructor1OfCourse1"); String[] googleIdParams = new String[] { Const.ParamsNames.SEARCH_KEY, "Course", + Const.ParamsNames.ENTITY_TYPE, Const.EntityType.INSTRUCTOR, }; SearchStudentsAction a = getAction(googleIdParams); diff --git a/src/web/services/search.service.spec.ts b/src/web/services/search.service.spec.ts index cf5c035db99..44281f4bb78 100644 --- a/src/web/services/search.service.spec.ts +++ b/src/web/services/search.service.spec.ts @@ -168,9 +168,10 @@ describe('SearchService', () => { }); it('should execute GET when searching for students', () => { - service.searchStudents('Alice'); + service.searchStudents('Alice', 'instructor'); const paramMap: { [key: string]: string } = { searchkey: 'Alice', + entitytype: 'instructor', }; expect(spyHttpRequestService.get).toHaveBeenCalledWith( '/search/students', diff --git a/src/web/services/search.service.ts b/src/web/services/search.service.ts index d6a2c17fdb8..af270a003ba 100644 --- a/src/web/services/search.service.ts +++ b/src/web/services/search.service.ts @@ -45,7 +45,7 @@ export class SearchService { ) {} searchInstructor(searchKey: string): Observable { - return this.searchStudents(searchKey).pipe( + return this.searchStudents(searchKey, 'instructor').pipe( map((studentsRes: Students) => this.getCoursesWithSections(studentsRes)), mergeMap((coursesWithSections: SearchStudentsTable[]) => forkJoin([ @@ -69,7 +69,7 @@ export class SearchService { searchAdmin(searchKey: string): Observable { return forkJoin([ - this.searchStudents(searchKey), + this.searchStudents(searchKey, 'admin'), this.searchInstructors(searchKey), ]).pipe( map((value: [Students, Instructors]): [Student[], Instructor[]] => @@ -92,9 +92,10 @@ export class SearchService { ); } - searchStudents(searchKey: string): Observable { + searchStudents(searchKey: string, entityType: string): Observable { const paramMap: { [key: string]: string } = { searchkey: searchKey, + entitytype: entityType, }; return this.httpRequestService.get(ResourceEndpoints.SEARCH_STUDENTS, paramMap); } From 05f722b5c7fb7a9da70aba900b744a9139b55e8c Mon Sep 17 00:00:00 2001 From: Ahmed Bahajjaj Date: Wed, 8 Jul 2020 13:30:19 +0800 Subject: [PATCH 005/205] [#10264] Encrypt Feedback Response ID (#10283) * Add encryption to API output * Add decryption to API endpoints * Update tests for encryption and decryption --- .../CreateFeedbackResponseCommentAction.java | 17 ++++- .../action/DeleteFeedbackResponseAction.java | 18 ++++- .../GetFeedbackResponseCommentAction.java | 18 ++++- .../action/UpdateFeedbackResponseAction.java | 18 ++++- .../webapi/output/FeedbackResponseData.java | 3 +- .../ui/webapi/output/SessionResultsData.java | 4 +- ...eateFeedbackResponseCommentActionTest.java | 66 +++++++++++-------- .../DeleteFeedbackResponseActionTest.java | 39 ++++++----- .../GetFeedbackResponseCommentActionTest.java | 39 ++++++----- .../GetFeedbackResponsesActionTest.java | 11 ++-- .../UpdateFeedbackResponseActionTest.java | 56 ++++++++-------- 11 files changed, 187 insertions(+), 102 deletions(-) diff --git a/src/main/java/teammates/ui/webapi/action/CreateFeedbackResponseCommentAction.java b/src/main/java/teammates/ui/webapi/action/CreateFeedbackResponseCommentAction.java index bd452160893..ba171183de1 100644 --- a/src/main/java/teammates/ui/webapi/action/CreateFeedbackResponseCommentAction.java +++ b/src/main/java/teammates/ui/webapi/action/CreateFeedbackResponseCommentAction.java @@ -15,6 +15,7 @@ import teammates.common.exception.InvalidParametersException; import teammates.common.util.Assumption; import teammates.common.util.Const; +import teammates.common.util.StringHelper; import teammates.ui.webapi.output.FeedbackResponseCommentData; import teammates.ui.webapi.request.FeedbackResponseCommentCreateRequest; import teammates.ui.webapi.request.Intent; @@ -31,7 +32,13 @@ protected AuthType getMinAuthLevel() { @Override public void checkSpecificAccessControl() { - String feedbackResponseId = getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID); + String feedbackResponseId; + try { + feedbackResponseId = StringHelper.decrypt( + getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID)); + } catch (InvalidParametersException ipe) { + throw new InvalidHttpParameterException(ipe.getMessage(), ipe); + } FeedbackResponseAttributes response = logic.getFeedbackResponse(feedbackResponseId); Assumption.assertNotNull(response); @@ -91,7 +98,13 @@ public void checkSpecificAccessControl() { @Override public ActionResult execute() { - String feedbackResponseId = getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID); + String feedbackResponseId; + try { + feedbackResponseId = StringHelper.decrypt( + getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID)); + } catch (InvalidParametersException ipe) { + throw new InvalidHttpParameterException(ipe.getMessage(), ipe); + } FeedbackResponseAttributes response = logic.getFeedbackResponse(feedbackResponseId); Assumption.assertNotNull(response); diff --git a/src/main/java/teammates/ui/webapi/action/DeleteFeedbackResponseAction.java b/src/main/java/teammates/ui/webapi/action/DeleteFeedbackResponseAction.java index 91722548603..94200b804fb 100644 --- a/src/main/java/teammates/ui/webapi/action/DeleteFeedbackResponseAction.java +++ b/src/main/java/teammates/ui/webapi/action/DeleteFeedbackResponseAction.java @@ -11,8 +11,10 @@ import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.EntityNotFoundException; import teammates.common.exception.InvalidHttpParameterException; +import teammates.common.exception.InvalidParametersException; import teammates.common.exception.UnauthorizedAccessException; import teammates.common.util.Const; +import teammates.common.util.StringHelper; import teammates.ui.webapi.request.Intent; /** @@ -27,7 +29,13 @@ protected AuthType getMinAuthLevel() { @Override public void checkSpecificAccessControl() { - String feedbackResponseId = getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID); + String feedbackResponseId; + try { + feedbackResponseId = StringHelper.decrypt( + getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID)); + } catch (InvalidParametersException ipe) { + throw new InvalidHttpParameterException(ipe.getMessage(), ipe); + } FeedbackResponseAttributes feedbackResponse = logic.getFeedbackResponse(feedbackResponseId); if (feedbackResponse == null) { throw new EntityNotFoundException(new EntityDoesNotExistException("The feedback response does not exist.")); @@ -76,7 +84,13 @@ public void checkSpecificAccessControl() { @Override public ActionResult execute() { - String feedbackResponseId = getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID); + String feedbackResponseId; + try { + feedbackResponseId = StringHelper.decrypt( + getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID)); + } catch (InvalidParametersException ipe) { + throw new InvalidHttpParameterException(ipe.getMessage(), ipe); + } FeedbackResponseAttributes feedbackResponse = logic.getFeedbackResponse(feedbackResponseId); logic.deleteFeedbackResponseCascade(feedbackResponse.getId()); diff --git a/src/main/java/teammates/ui/webapi/action/GetFeedbackResponseCommentAction.java b/src/main/java/teammates/ui/webapi/action/GetFeedbackResponseCommentAction.java index b26d5cbaa82..d6ccfd5fd8c 100644 --- a/src/main/java/teammates/ui/webapi/action/GetFeedbackResponseCommentAction.java +++ b/src/main/java/teammates/ui/webapi/action/GetFeedbackResponseCommentAction.java @@ -11,7 +11,9 @@ import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.EntityNotFoundException; import teammates.common.exception.InvalidHttpParameterException; +import teammates.common.exception.InvalidParametersException; import teammates.common.util.Const; +import teammates.common.util.StringHelper; import teammates.ui.webapi.output.FeedbackResponseCommentData; import teammates.ui.webapi.request.Intent; @@ -27,7 +29,13 @@ protected AuthType getMinAuthLevel() { @Override public void checkSpecificAccessControl() { - String feedbackResponseId = getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID); + String feedbackResponseId; + try { + feedbackResponseId = StringHelper.decrypt( + getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID)); + } catch (InvalidParametersException ipe) { + throw new InvalidHttpParameterException(ipe.getMessage(), ipe); + } FeedbackResponseAttributes feedbackResponseAttributes = logic.getFeedbackResponse(feedbackResponseId); if (feedbackResponseAttributes == null) { @@ -62,7 +70,13 @@ public void checkSpecificAccessControl() { @Override public ActionResult execute() { - String feedbackResponseId = getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID); + String feedbackResponseId; + try { + feedbackResponseId = StringHelper.decrypt( + getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID)); + } catch (InvalidParametersException ipe) { + throw new InvalidHttpParameterException(ipe.getMessage(), ipe); + } Intent intent = Intent.valueOf(getNonNullRequestParamValue(Const.ParamsNames.INTENT)); switch (intent) { diff --git a/src/main/java/teammates/ui/webapi/action/UpdateFeedbackResponseAction.java b/src/main/java/teammates/ui/webapi/action/UpdateFeedbackResponseAction.java index 45bf13fb303..471c054dfc1 100644 --- a/src/main/java/teammates/ui/webapi/action/UpdateFeedbackResponseAction.java +++ b/src/main/java/teammates/ui/webapi/action/UpdateFeedbackResponseAction.java @@ -12,8 +12,10 @@ import teammates.common.exception.EntityNotFoundException; import teammates.common.exception.InvalidHttpParameterException; import teammates.common.exception.InvalidHttpRequestBodyException; +import teammates.common.exception.InvalidParametersException; import teammates.common.exception.UnauthorizedAccessException; import teammates.common.util.Const; +import teammates.common.util.StringHelper; import teammates.ui.webapi.output.FeedbackResponseData; import teammates.ui.webapi.request.FeedbackResponseUpdateRequest; import teammates.ui.webapi.request.Intent; @@ -30,7 +32,13 @@ protected AuthType getMinAuthLevel() { @Override public void checkSpecificAccessControl() { - String feedbackResponseId = getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID); + String feedbackResponseId; + try { + feedbackResponseId = StringHelper.decrypt( + getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID)); + } catch (InvalidParametersException ipe) { + throw new InvalidHttpParameterException(ipe.getMessage(), ipe); + } FeedbackResponseAttributes feedbackResponse = logic.getFeedbackResponse(feedbackResponseId); if (feedbackResponse == null) { throw new EntityNotFoundException(new EntityDoesNotExistException("The feedback response does not exist.")); @@ -75,7 +83,13 @@ public void checkSpecificAccessControl() { @Override public ActionResult execute() { - String feedbackResponseId = getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID); + String feedbackResponseId; + try { + feedbackResponseId = StringHelper.decrypt( + getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_RESPONSE_ID)); + } catch (InvalidParametersException ipe) { + throw new InvalidHttpParameterException(ipe.getMessage(), ipe); + } FeedbackResponseAttributes feedbackResponse = logic.getFeedbackResponse(feedbackResponseId); FeedbackQuestionAttributes feedbackQuestion = logic.getFeedbackQuestion(feedbackResponse.feedbackQuestionId); diff --git a/src/main/java/teammates/ui/webapi/output/FeedbackResponseData.java b/src/main/java/teammates/ui/webapi/output/FeedbackResponseData.java index 99984519f4d..e2996789744 100644 --- a/src/main/java/teammates/ui/webapi/output/FeedbackResponseData.java +++ b/src/main/java/teammates/ui/webapi/output/FeedbackResponseData.java @@ -2,6 +2,7 @@ import teammates.common.datatransfer.attributes.FeedbackResponseAttributes; import teammates.common.datatransfer.questions.FeedbackResponseDetails; +import teammates.common.util.StringHelper; /** * The API output format of {@link FeedbackResponseAttributes}. @@ -17,7 +18,7 @@ public class FeedbackResponseData extends ApiOutput { private final FeedbackResponseDetails responseDetails; public FeedbackResponseData(FeedbackResponseAttributes feedbackResponseAttributes) { - this.feedbackResponseId = feedbackResponseAttributes.getId(); + this.feedbackResponseId = StringHelper.encrypt(feedbackResponseAttributes.getId()); this.giverIdentifier = feedbackResponseAttributes.giver; this.recipientIdentifier = feedbackResponseAttributes.recipient; this.responseDetails = feedbackResponseAttributes.getResponseDetails(); diff --git a/src/main/java/teammates/ui/webapi/output/SessionResultsData.java b/src/main/java/teammates/ui/webapi/output/SessionResultsData.java index 89921a421db..6cd575fdfc5 100644 --- a/src/main/java/teammates/ui/webapi/output/SessionResultsData.java +++ b/src/main/java/teammates/ui/webapi/output/SessionResultsData.java @@ -20,6 +20,7 @@ import teammates.common.datatransfer.questions.FeedbackQuestionDetails; import teammates.common.datatransfer.questions.FeedbackResponseDetails; import teammates.common.util.Const; +import teammates.common.util.StringHelper; /** * API output format for session results, including statistics. @@ -436,7 +437,6 @@ public static class ResponseOutput { private boolean isMissingResponse; - // TODO: security risk: responseId can expose giver and recipient email private String responseId; private String giver; @@ -564,7 +564,7 @@ public Builder withIsMissingResponse(boolean isMissingResponse) { } public Builder withResponseId(String responseId) { - responseOutput.responseId = responseId; + responseOutput.responseId = StringHelper.encrypt(responseId); return this; } diff --git a/src/test/java/teammates/test/cases/webapi/CreateFeedbackResponseCommentActionTest.java b/src/test/java/teammates/test/cases/webapi/CreateFeedbackResponseCommentActionTest.java index f6987a82197..0b27e1ab18d 100644 --- a/src/test/java/teammates/test/cases/webapi/CreateFeedbackResponseCommentActionTest.java +++ b/src/test/java/teammates/test/cases/webapi/CreateFeedbackResponseCommentActionTest.java @@ -19,6 +19,7 @@ import teammates.common.datatransfer.attributes.StudentAttributes; import teammates.common.exception.InvalidHttpParameterException; import teammates.common.util.Const; +import teammates.common.util.StringHelper; import teammates.logic.core.FeedbackResponseCommentsLogic; import teammates.logic.core.FeedbackSessionsLogic; import teammates.storage.api.FeedbackResponseCommentsDb; @@ -113,6 +114,13 @@ public void testExecute_invalidHttpParameters_shouldFail() { ______TS("not enough parameters"); verifyHttpParameterFailure(); + + ______TS("unencrypted responseId"); + String[] submissionParams = new String[] { + Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + }; + verifyHttpParameterFailure(submissionParams); } @Test @@ -122,7 +130,7 @@ public void testExecute_unpublishedSessionForInstructorResult_shouldPass() { ______TS("successful case for unpublished session for INSTRUCTOR_RESULT"); String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; FeedbackResponseCommentCreateRequest requestBody = new FeedbackResponseCommentCreateRequest("Comment to first response", @@ -151,7 +159,7 @@ public void testExecute_unpublishedSessionEmptyGiverPermission_shouldPass() { ______TS("typical successful case for unpublished session empty giver permissions"); String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; FeedbackResponseCommentCreateRequest requestBody = new FeedbackResponseCommentCreateRequest( @@ -168,7 +176,7 @@ public void testExecute_unpublishedSessionValidVisibilitySettings_shouldPass() { String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; FeedbackResponseCommentCreateRequest requestBody = new FeedbackResponseCommentCreateRequest( @@ -178,7 +186,7 @@ public void testExecute_unpublishedSessionValidVisibilitySettings_shouldPass() { submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; requestBody = new FeedbackResponseCommentCreateRequest("Comment shown to giver", @@ -188,7 +196,7 @@ public void testExecute_unpublishedSessionValidVisibilitySettings_shouldPass() { submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; requestBody = new FeedbackResponseCommentCreateRequest("Comment shown to receiver", @@ -198,7 +206,7 @@ public void testExecute_unpublishedSessionValidVisibilitySettings_shouldPass() { submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; requestBody = @@ -209,7 +217,7 @@ public void testExecute_unpublishedSessionValidVisibilitySettings_shouldPass() { submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; requestBody = new FeedbackResponseCommentCreateRequest( @@ -220,7 +228,7 @@ public void testExecute_unpublishedSessionValidVisibilitySettings_shouldPass() { submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; requestBody = new FeedbackResponseCommentCreateRequest("Comment shown to students", @@ -238,7 +246,7 @@ public void testExecute_publishedSessionForInstructorResult_shouldPass() throws session1InCourse1.getCourseId()); String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; FeedbackResponseCommentCreateRequest requestBody = new FeedbackResponseCommentCreateRequest( @@ -264,7 +272,7 @@ public void testExecute_emptyCommentText_shouldFail() { ______TS("Unsuccessful case: empty comment text"); String[] submissionParams = new String[] { - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; FeedbackResponseCommentCreateRequest requestBody = new FeedbackResponseCommentCreateRequest("", @@ -291,7 +299,7 @@ protected void testExecute_typicalCaseForSubmission_shouldPass() { loginAsStudent(student1InCourse1.getGoogleId()); String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ3.getId()), }; FeedbackResponseCommentCreateRequest requestBody = new FeedbackResponseCommentCreateRequest( @@ -312,7 +320,7 @@ protected void testExecute_typicalCaseForSubmission_shouldPass() { loginAsInstructor(instructor1OfCourse1.getGoogleId()); submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; requestBody = new FeedbackResponseCommentCreateRequest( @@ -335,14 +343,14 @@ protected void testExecute_invalidIntent_shouldFail() { ______TS("invalid intent STUDENT_RESULT"); String[] invalidIntent1 = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ3.getId()), }; verifyHttpParameterFailure(invalidIntent1); ______TS("invalid intent FULL_DETAIL"); String[] invalidIntent2 = new String[] { Const.ParamsNames.INTENT, Intent.FULL_DETAIL.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ3.getId()), }; verifyHttpParameterFailure(invalidIntent2); } @@ -357,7 +365,7 @@ protected void testAccessControl() throws Exception { protected void testAccessControl_textTypeQuestionResponse_notAllowedToAddComment() { String[] submissionParamsInstructor = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ2.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ2.getId()), }; loginAsInstructor(instructor1OfCourse1.getGoogleId()); @@ -380,7 +388,7 @@ public void testAccessControl_contributionQuestionResponse_instructorNotAllowedT String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, contributionResponse.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(contributionResponse.getId()), }; loginAsInstructor(instructorAttributes.getGoogleId()); @@ -398,7 +406,7 @@ protected void testAccessControl_commentAlreadyExist_shouldNotCreateAgain() { loginAsStudent(student1InCourse1.getGoogleId()); String[] submissionParamsStudent = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ3.getId()), }; assertThrows(InvalidHttpParameterException.class, @@ -411,7 +419,7 @@ protected void testAccessControl_commentAlreadyExist_shouldNotCreateAgain() { loginAsInstructor(instructor1OfCourse1.getGoogleId()); String[] submissionParamsInstructor = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; assertThrows(InvalidHttpParameterException.class, @@ -425,7 +433,7 @@ protected void testAccessControl_submitCommentForOthersResponse_shouldFail() { loginAsStudent(student1InCourse1.getGoogleId()); String[] submissionParamsStudentToStudents = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response2ForQ3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response2ForQ3.getId()), }; verifyCannotAccess(submissionParamsStudentToStudents); @@ -439,7 +447,7 @@ protected void testAccessControl_submitCommentForOthersResponse_shouldFail() { loginAsStudent(student3InCourse1.getGoogleId()); String[] submissionParamsTeam = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response2ForQ4.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response2ForQ4.getId()), }; verifyCannotAccess(submissionParamsTeam); @@ -452,7 +460,7 @@ protected void testAccessControl_submitCommentForOthersResponse_shouldFail() { loginAsInstructor(instructor2OfCourse1.getGoogleId()); String[] submissionParamsInstructorToInstructor = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ5.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ5.getId()), }; verifyCannotAccess(submissionParamsInstructorToInstructor); @@ -469,14 +477,14 @@ protected void testAccessControl_invalidIntent_shouldFail() { loginAsStudent(student1InCourse1.getGoogleId()); String[] invalidIntent1 = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ3.getId()), }; assertThrows(InvalidHttpParameterException.class, () -> getAction(invalidIntent1).checkAccessControl()); ______TS("invalid intent FULL_DETAIL"); String[] invalidIntent2 = new String[] { Const.ParamsNames.INTENT, Intent.FULL_DETAIL.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; assertThrows(InvalidHttpParameterException.class, () -> getAction(invalidIntent2).checkAccessControl()); } @@ -487,7 +495,7 @@ protected void testAccessControl_instructorWithoutSubmitSessionInSectionsPrivile loginAsInstructor(helperOfCourse1.getGoogleId()); String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ3.getId()), }; verifyCannotAccess(submissionParams); } @@ -498,7 +506,7 @@ protected void testAccessControl_logOut_shouldFail() { gaeSimulation.logoutUser(); String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ3.getId()), }; verifyCannotAccess(submissionParams); } @@ -509,7 +517,7 @@ protected void testAccessControl_studentAccessInstructorResponse_shouldFail() { loginAsStudent(student1InCourse1.getGoogleId()); String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; verifyCannotAccess(submissionParams); } @@ -520,7 +528,7 @@ protected void testAccessControl_accessibleForInstructorInSameCourse_shouldPass( loginAsInstructor(instructor2OfCourse1.getGoogleId()); String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; verifyCanAccess(submissionParams); } @@ -531,7 +539,7 @@ protected void testAccessControl_accessibleForAdminToMasqueradeAsInstructor_shou loginAsAdmin(); String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; verifyCanMasquerade(instructor1OfCourse1.getGoogleId(), submissionParams); } @@ -579,7 +587,7 @@ protected void testAccessControl_onlyInstructorsWithOnlyEitherPrivilege_shouldFa private String[] getSubmissionParamsForCrossSectionResponse() { return new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ6.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ6.getId()), }; } diff --git a/src/test/java/teammates/test/cases/webapi/DeleteFeedbackResponseActionTest.java b/src/test/java/teammates/test/cases/webapi/DeleteFeedbackResponseActionTest.java index 156d2530fca..386582ad94b 100644 --- a/src/test/java/teammates/test/cases/webapi/DeleteFeedbackResponseActionTest.java +++ b/src/test/java/teammates/test/cases/webapi/DeleteFeedbackResponseActionTest.java @@ -12,6 +12,7 @@ import teammates.common.exception.EntityNotFoundException; import teammates.common.exception.InvalidHttpParameterException; import teammates.common.util.Const; +import teammates.common.util.StringHelper; import teammates.ui.webapi.action.DeleteFeedbackResponseAction; import teammates.ui.webapi.action.JsonResult; import teammates.ui.webapi.request.Intent; @@ -96,11 +97,19 @@ protected void testExecute() throws Exception { verifyHttpParameterFailure(); verifyHttpParameterFailure(Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString()); + ______TS("Unencrypted responseId"); + + String[] invalidParams = new String[] { + Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, typicalResponse.getId(), + }; + verifyHttpParameterFailure(invalidParams); + ______TS("Typical success case, student"); String[] params = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, typicalResponse.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(typicalResponse.getId()), }; DeleteFeedbackResponseAction a = getAction(params); @@ -122,7 +131,7 @@ protected void testExecute() throws Exception { params = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, typicalResponse3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(typicalResponse3.getId()), }; a = getAction(params); @@ -149,7 +158,7 @@ protected void testAccessControl() throws Exception { String[] wrongGiverTypeParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, typicalResponse.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(typicalResponse.getId()), }; verifyCannotAccess(wrongGiverTypeParams); @@ -160,7 +169,7 @@ protected void testAccessControl() throws Exception { String[] previewParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, typicalResponse.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(typicalResponse.getId()), Const.ParamsNames.PREVIEWAS, instructor1OfCourse1.email, }; @@ -174,7 +183,7 @@ protected void testAccessControl() throws Exception { String[] sessionNotOpenParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, responseInClosedSession.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(responseInClosedSession.getId()), }; verifyCannotAccess(sessionNotOpenParams); @@ -189,7 +198,7 @@ protected void testAccessControl() throws Exception { String[] invalidModeratedInstructorSubmissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, typicalResponse2.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(typicalResponse2.getId()), Const.ParamsNames.FEEDBACK_SESSION_MODERATED_PERSON, instructor1OfCourse1.getEmail(), }; @@ -206,7 +215,7 @@ protected void testAccessControl() throws Exception { String[] moderatedStudentSubmissionParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, testModerateResponse.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(testModerateResponse.getId()), Const.ParamsNames.FEEDBACK_SESSION_MODERATED_PERSON, student1InCourse1.getEmail(), }; verifyCannotAccess(moderatedStudentSubmissionParams); @@ -217,7 +226,7 @@ protected void testAccessControl() throws Exception { String[] nonExistParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, "randomNonExistId", + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt("randomNonExistId"), }; assertThrows(EntityNotFoundException.class, () -> getAction(nonExistParams).checkAccessControl()); @@ -232,7 +241,7 @@ protected void testAccessControl() throws Exception { String[] studentAccessOtherPersonParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, typicalResponse.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(typicalResponse.getId()), }; verifyCannotAccess(studentAccessOtherPersonParams); @@ -245,7 +254,7 @@ protected void testAccessControl() throws Exception { String[] studentAccessOwnPersonParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, typicalResponse.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(typicalResponse.getId()), }; verifyCanAccess(studentAccessOwnPersonParams); @@ -260,7 +269,7 @@ protected void testAccessControl() throws Exception { String[] studentAccessOSameTeamParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, typicalResponse2.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(typicalResponse2.getId()), }; verifyCanAccess(studentAccessOSameTeamParams); @@ -275,7 +284,7 @@ protected void testAccessControl() throws Exception { String[] studentAccessOtherTeamParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, typicalResponse2.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(typicalResponse2.getId()), }; verifyCannotAccess(studentAccessOtherTeamParams); @@ -290,7 +299,7 @@ protected void testAccessControl() throws Exception { String[] instructorAccessOtherPersonParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, typicalResponse3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(typicalResponse3.getId()), }; verifyCannotAccess(instructorAccessOtherPersonParams); @@ -303,7 +312,7 @@ protected void testAccessControl() throws Exception { String[] instructorAccessOwnPersonParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, typicalResponse3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(typicalResponse3.getId()), }; verifyCanAccess(instructorAccessOwnPersonParams); @@ -314,7 +323,7 @@ protected void testAccessControl() throws Exception { String[] unknownIntentParams = new String[] { Const.ParamsNames.INTENT, Intent.FULL_DETAIL.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, typicalResponse3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(typicalResponse3.getId()), }; assertThrows(InvalidHttpParameterException.class, () -> getAction(unknownIntentParams).checkAccessControl()); diff --git a/src/test/java/teammates/test/cases/webapi/GetFeedbackResponseCommentActionTest.java b/src/test/java/teammates/test/cases/webapi/GetFeedbackResponseCommentActionTest.java index 266f59c26fa..8ad3e14e041 100644 --- a/src/test/java/teammates/test/cases/webapi/GetFeedbackResponseCommentActionTest.java +++ b/src/test/java/teammates/test/cases/webapi/GetFeedbackResponseCommentActionTest.java @@ -13,6 +13,7 @@ import teammates.common.exception.EntityNotFoundException; import teammates.common.exception.InvalidHttpParameterException; import teammates.common.util.Const; +import teammates.common.util.StringHelper; import teammates.ui.webapi.action.GetFeedbackResponseCommentAction; import teammates.ui.webapi.action.JsonResult; import teammates.ui.webapi.output.FeedbackResponseCommentData; @@ -74,11 +75,17 @@ protected void testExecute() { @Test protected void testExecute_notEnoughParameters_shouldFail() { - loginAsStudent(student1InCourse1.getGoogleId()); + loginAsInstructor(instructor1OfCourse1.getGoogleId()); verifyHttpParameterFailure(); - verifyHttpParameterFailure(Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId()); - verifyHttpParameterFailure(Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString()); + verifyHttpParameterFailure(Const.ParamsNames.FEEDBACK_RESPONSE_ID, + StringHelper.encrypt(response1ForQ1.getId())); + verifyHttpParameterFailure(Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString()); + String[] submissionParams = new String[] { + Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + }; + verifyHttpParameterFailure(submissionParams); } @Test @@ -89,7 +96,7 @@ protected void testExecute_invalidIntent_shouldFail() { String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; verifyHttpParameterFailure(submissionParams); @@ -97,7 +104,7 @@ protected void testExecute_invalidIntent_shouldFail() { loginAsStudent(student1InCourse1.getGoogleId()); submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ3.getId()), }; verifyHttpParameterFailure(submissionParams); } @@ -111,13 +118,12 @@ protected void testExecute_typicalSuccessCase_shouldPass() { String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ3.getId()), }; FeedbackResponseCommentData actualComment = getFeedbackResponseComments(submissionParams); FeedbackResponseCommentAttributes expected = logic.getFeedbackResponseCommentForResponseFromParticipant(response1ForQ3.getId()); - assertNotNull(actualComment.getFeedbackResponseCommentId()); assertEquals(actualComment.getFeedbackCommentText(), expected.getCommentText()); assertEquals(actualComment.getCommentGiver(), expected.getCommentGiver()); @@ -131,11 +137,10 @@ protected void testExecute_typicalSuccessCase_shouldPass() { submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; actualComment = getFeedbackResponseComments(submissionParams); expected = logic.getFeedbackResponseCommentForResponseFromParticipant(response1ForQ1.getId()); - assertNotNull(actualComment.getFeedbackResponseCommentId()); assertEquals(actualComment.getFeedbackCommentText(), expected.getCommentText()); assertEquals(actualComment.getCommentGiver(), expected.getCommentGiver()); @@ -145,7 +150,7 @@ protected void testExecute_typicalSuccessCase_shouldPass() { submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response2ForQ4.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response2ForQ4.getId()), }; GetFeedbackResponseCommentAction action = getAction(submissionParams); JsonResult actualResult = getJsonResult(action); @@ -166,7 +171,7 @@ protected void testAccessControl_typicalSuccessCase_shouldPass() { String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ3.getId()), }; verifyCanAccess(submissionParams); @@ -176,7 +181,7 @@ protected void testAccessControl_typicalSuccessCase_shouldPass() { submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; verifyCanAccess(submissionParams); } @@ -188,7 +193,7 @@ protected void testAccessControl_invalidIntent_shouldFail() { loginAsStudent(student1InCourse1.getGoogleId()); String[] studentInvalidIntentParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ3.getId()), }; assertThrows(InvalidHttpParameterException.class, () -> getAction(studentInvalidIntentParams).checkSpecificAccessControl()); @@ -197,7 +202,7 @@ protected void testAccessControl_invalidIntent_shouldFail() { loginAsInstructor(instructor1OfCourse1.getGoogleId()); String[] instructorInvalidIntentParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_RESULT.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; assertThrows(InvalidHttpParameterException.class, () -> getAction(instructorInvalidIntentParams).checkSpecificAccessControl()); @@ -209,7 +214,7 @@ protected void testAccessControl_responseNotExisting_shouldFail() { String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, "responseIdOfNonExistingResponse", + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt("responseIdOfNonExistingResponse"), }; assertThrows(EntityNotFoundException.class, () -> getAction(submissionParams).checkSpecificAccessControl()); @@ -222,7 +227,7 @@ protected void testAccessControl_accessAcrossCourses_shouldFail() { loginAsInstructor(instructor1OfCourse2.getGoogleId()); String[] submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ1.getId()), }; verifyCannotAccess(submissionParams); @@ -231,7 +236,7 @@ protected void testAccessControl_accessAcrossCourses_shouldFail() { loginAsStudent(student1InCourse2.getGoogleId()); submissionParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, response1ForQ3.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(response1ForQ3.getId()), }; verifyCannotAccess(submissionParams); diff --git a/src/test/java/teammates/test/cases/webapi/GetFeedbackResponsesActionTest.java b/src/test/java/teammates/test/cases/webapi/GetFeedbackResponsesActionTest.java index 096c37c9e27..3ba303b809d 100644 --- a/src/test/java/teammates/test/cases/webapi/GetFeedbackResponsesActionTest.java +++ b/src/test/java/teammates/test/cases/webapi/GetFeedbackResponsesActionTest.java @@ -13,8 +13,10 @@ import teammates.common.datatransfer.attributes.StudentAttributes; import teammates.common.exception.EntityNotFoundException; import teammates.common.exception.InvalidHttpParameterException; +import teammates.common.exception.InvalidParametersException; import teammates.common.util.Const; import teammates.common.util.JsonUtils; +import teammates.common.util.StringHelper; import teammates.ui.webapi.action.GetFeedbackResponsesAction; import teammates.ui.webapi.action.JsonResult; import teammates.ui.webapi.output.FeedbackResponseData; @@ -85,7 +87,7 @@ protected void testExecute_invalidIntent_shouldFail() { } @Test - protected void testExecute_studentSubmission_shouldGetResponseSuccessfully() { + protected void testExecute_studentSubmission_shouldGetResponseSuccessfully() throws InvalidParametersException { loginAsStudent(student1InCourse1.getGoogleId()); String[] params = { @@ -104,7 +106,7 @@ protected void testExecute_studentSubmission_shouldGetResponseSuccessfully() { } @Test - protected void testExecute_instructorSubmission_shouldGetResponseSuccessfully() { + protected void testExecute_instructorSubmission_shouldGetResponseSuccessfully() throws InvalidParametersException { loginAsInstructor(instructor1OfCourse1.getGoogleId()); String[] params = { @@ -251,8 +253,9 @@ private FeedbackResponsesData getFeedbackResponse(String[] params) { return (FeedbackResponsesData) actualResult.getOutput(); } - private void verifyFeedbackResponseEquals(FeedbackResponseAttributes expected, FeedbackResponseData actual) { - assertEquals(expected.getId(), actual.getFeedbackResponseId()); + private void verifyFeedbackResponseEquals(FeedbackResponseAttributes expected, FeedbackResponseData actual) + throws InvalidParametersException { + assertEquals(expected.getId(), StringHelper.decrypt(actual.getFeedbackResponseId())); assertEquals(expected.getGiver(), actual.getGiverIdentifier()); assertEquals(expected.getRecipient(), actual.getRecipientIdentifier()); assertEquals(expected.getResponseDetails().getAnswerString(), actual.getResponseDetails().getAnswerString()); diff --git a/src/test/java/teammates/test/cases/webapi/UpdateFeedbackResponseActionTest.java b/src/test/java/teammates/test/cases/webapi/UpdateFeedbackResponseActionTest.java index 338f14fd57b..ab69354eab8 100644 --- a/src/test/java/teammates/test/cases/webapi/UpdateFeedbackResponseActionTest.java +++ b/src/test/java/teammates/test/cases/webapi/UpdateFeedbackResponseActionTest.java @@ -17,6 +17,7 @@ import teammates.common.exception.InvalidHttpParameterException; import teammates.common.exception.InvalidHttpRequestBodyException; import teammates.common.util.Const; +import teammates.common.util.StringHelper; import teammates.test.driver.AssertHelper; import teammates.ui.webapi.action.UpdateFeedbackResponseAction; import teammates.ui.webapi.request.FeedbackResponseUpdateRequest; @@ -69,31 +70,34 @@ protected void testExecute() throws Exception { } @Test - protected void testExecute_missingIntent_httpParameterFailure() { + protected void testExecute_invalidParams_httpParameterFailure() { ______TS("missing intent response parameters"); loginAsStudent(student1InCourse1.getGoogleId()); String[] missingIntentParams = new String[] { - Const.ParamsNames.FEEDBACK_RESPONSE_ID, student1ResponseToStudent1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(student1ResponseToStudent1.getId()), }; verifyHttpParameterFailure(missingIntentParams); - } - - @Test - protected void testExecute_missingResponseId_httpParameterFailure() { ______TS("missing response id parameters"); - loginAsStudent(student1InCourse1.getGoogleId()); - String[] missingResponseIdParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), }; verifyHttpParameterFailure(missingResponseIdParams); + + ______TS("unencrypted response id parameters"); + + String[] unencryptedResponseId = new String[] { + Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, student1ResponseToStudent1.getId(), + }; + + verifyHttpParameterFailure(unencryptedResponseId); } @Test @@ -135,7 +139,7 @@ public void testExecute_studentFeedbackSubmissionMcqGenerateOptionsForTeams_shou FeedbackResponseUpdateRequest updateRequest = getUpdateRequest(studentAttributes.getEmail()); String[] params = { - Const.ParamsNames.FEEDBACK_RESPONSE_ID, feedbackResponse.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(feedbackResponse.getId()), Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), }; @@ -188,7 +192,7 @@ public void testExecute_instructorFeedbackSubmissionMcqGenerateOptionsForTeams_s FeedbackResponseUpdateRequest updateRequest = getUpdateRequest(instructorAttributes.getEmail()); String[] params = { - Const.ParamsNames.FEEDBACK_RESPONSE_ID, feedbackResponse.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(feedbackResponse.getId()), Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), }; @@ -225,7 +229,7 @@ protected void testAccessControl_wrongGiver_inaccessible() { String[] wrongGiverTypeParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, student1ResponseToStudent1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(student1ResponseToStudent1.getId()), }; verifyCannotAccess(wrongGiverTypeParams); @@ -240,7 +244,7 @@ protected void testAccessControl_previewMode_inaccessible() { String[] previewParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, student1ResponseToStudent1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(student1ResponseToStudent1.getId()), Const.ParamsNames.PREVIEWAS, instructor1OfCourse1.email, }; @@ -265,7 +269,7 @@ protected void testAccessControl_responseSessionNotOpen_inaccessible() { String[] sessionNotOpenParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, responseInClosedSession.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(responseInClosedSession.getId()), }; verifyCannotAccess(sessionNotOpenParams); @@ -291,7 +295,7 @@ protected void testAccessControl_containsQuestionNotForInstructor_inaccessible() String[] invalidModeratedInstructorSubmissionParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, student4ResponseToTeam.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(student4ResponseToTeam.getId()), Const.ParamsNames.FEEDBACK_SESSION_MODERATED_PERSON, student4inCourse1.getEmail(), }; @@ -309,7 +313,7 @@ protected void testAccessControl_noFeedbackResponse_inaccessible() { String[] nonExistParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, "randomNonExistId", + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt("randomNonExistId"), }; assertThrows(EntityNotFoundException.class, () -> getAction(nonExistParams).checkAccessControl()); @@ -324,7 +328,7 @@ protected void testAccessControl_unknownIntent_inaccessible() { String[] unknownIntentParams = new String[] { Const.ParamsNames.INTENT, Intent.FULL_DETAIL.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, instructor1ResponseToAll.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(instructor1ResponseToAll.getId()), }; assertThrows(InvalidHttpParameterException.class, () -> getAction(unknownIntentParams).checkAccessControl()); @@ -354,7 +358,7 @@ protected void testAccessControl_giverNotModeratedStudent_inaccessible() { String[] moderatedStudentSubmissionParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, testModerateResponse.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(testModerateResponse.getId()), Const.ParamsNames.FEEDBACK_SESSION_MODERATED_PERSON, student1InCourse1.getEmail(), }; @@ -378,7 +382,7 @@ protected void testAccessControl_studentAccessOtherStudent_inaccessible() { String[] studentAccessOtherPersonParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, student1ResponseToStudent1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(student1ResponseToStudent1.getId()), }; verifyCannotAccess(updateRequest, studentAccessOtherPersonParams); @@ -407,7 +411,7 @@ protected void testAccessControl_studentAccessOtherTeam_inaccessible() { String[] studentAccessOtherTeamParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, student4ResponseToTeam.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(student4ResponseToTeam.getId()), }; verifyCannotAccess(updateRequest, studentAccessOtherTeamParams); @@ -430,7 +434,7 @@ protected void testAccessControl_instructorAccessOtherGiver_inaccessible() { String[] instructorAccessOtherPersonParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, instructor1ResponseToAll.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(instructor1ResponseToAll.getId()), }; verifyCannotAccess(updateRequest, instructorAccessOtherPersonParams); @@ -449,7 +453,7 @@ protected void testAccessControl_instructorAccessOwnResponse_accessible() { String[] instructorAccessOwnPersonParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, instructor1ResponseToAll.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(instructor1ResponseToAll.getId()), }; verifyCanAccess(updateRequest, instructorAccessOwnPersonParams); @@ -468,7 +472,7 @@ protected void testAccessControl_instructorAccessIntentStudentLoggedIn_inaccessi String[] instructorAccessOwnPersonParams = new String[] { Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, instructor1ResponseToAll.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(instructor1ResponseToAll.getId()), }; verifyCannotAccess(updateRequest, instructorAccessOwnPersonParams); @@ -496,7 +500,7 @@ protected void testAccessControl_studentAccessSameTeam_accessible() { String[] studentAccessSameTeamParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, student4ResponseToTeam.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(student4ResponseToTeam.getId()), }; verifyCanAccess(updateRequest, studentAccessSameTeamParams); @@ -515,7 +519,7 @@ protected void testAccessControl_studentAccessOwnResponse_accessible() { String[] studentAccessOwnPersonParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, student1ResponseToStudent1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(student1ResponseToStudent1.getId()), }; verifyCanAccess(updateRequest, studentAccessOwnPersonParams); @@ -534,7 +538,7 @@ protected void testAccessControl_instructorSubmitStudentResponse_accessible() { String[] studentAccessOwnPersonParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, student1ResponseToStudent1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(student1ResponseToStudent1.getId()), Const.ParamsNames.FEEDBACK_SESSION_MODERATED_PERSON, student1InCourse1.getEmail(), }; @@ -557,7 +561,7 @@ protected void testAccessControl_instructorSubmitStudentResponseNoPermission_ina String[] studentAccessOwnPersonParams = new String[] { Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), - Const.ParamsNames.FEEDBACK_RESPONSE_ID, student1ResponseToStudent1.getId(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt(student1ResponseToStudent1.getId()), Const.ParamsNames.FEEDBACK_SESSION_MODERATED_PERSON, student1InCourse1.getEmail(), }; From 5da3cd22e793f69c461c540cff9893692ddc778d Mon Sep 17 00:00:00 2001 From: Chong Chee Yuan <32454748+ccyccyccy@users.noreply.github.com> Date: Wed, 8 Jul 2020 22:26:02 +0800 Subject: [PATCH 006/205] [#10245] Add send email feature for admin search (#10270) * Add API for email request * Add frontend buttons for email feature * Test fix * Rename generateemail endpoint to email * Change auth type Co-authored-by: Ahmed Bahajjaj * Link EmailType from backend to frontend * Change params of getEmail * Fix year not showing * Refactor data shape returned by generating strings to display * Remove comment * Move formatProperties to searchservice.ts * Change error message for unaccepted email type * Abstration for email opening link * Lint fix * Fix bad merge * Remove useless enum Co-authored-by: Ahmed Bahajjaj --- build.gradle | 3 +- .../java/teammates/common/util/Const.java | 3 + .../teammates/logic/api/EmailGenerator.java | 15 +++ .../ui/webapi/action/ActionFactory.java | 1 + .../ui/webapi/action/GenerateEmailAction.java | 60 ++++++++++++ .../webapi/endpoints/ResourceEndpoints.java | 1 + .../teammates/ui/webapi/output/EmailData.java | 31 ++++++ .../admin-search-page.component.html | 16 +-- .../admin-search-page.component.scss | 4 + .../admin-search-page.component.spec.ts | 98 ++++++++++++++----- .../admin-search-page.component.ts | 45 +++++++-- .../services/email-generation.service.spec.ts | 21 ++++ src/web/services/email-generation.service.ts | 38 +++++++ src/web/services/feedback-sessions.service.ts | 13 --- src/web/services/search.service.ts | 49 +++++++--- 15 files changed, 330 insertions(+), 68 deletions(-) create mode 100644 src/main/java/teammates/ui/webapi/action/GenerateEmailAction.java create mode 100644 src/main/java/teammates/ui/webapi/output/EmailData.java create mode 100644 src/web/services/email-generation.service.spec.ts create mode 100644 src/web/services/email-generation.service.ts diff --git a/build.gradle b/build.gradle index bd042c6f573..85e2e346682 100644 --- a/build.gradle +++ b/build.gradle @@ -166,7 +166,8 @@ task generateApiOutputFormat(type: cz.habarta.typescript.generator.gradle.Genera task generateApiRequestFormat(type: cz.habarta.typescript.generator.gradle.GenerateTask) { classPatterns = [ - "teammates.ui.webapi.request.**" + "teammates.ui.webapi.request.**", + "teammates.common.util.EmailType" ] outputFile = "src/web/types/api-request.ts" } diff --git a/src/main/java/teammates/common/util/Const.java b/src/main/java/teammates/common/util/Const.java index ca20d37c930..e829d9b7d9c 100644 --- a/src/main/java/teammates/common/util/Const.java +++ b/src/main/java/teammates/common/util/Const.java @@ -550,6 +550,8 @@ public static class ParamsNames { public static final String SESSION_LINKS_RECOVERY_EMAIL = "sessionlinksrecoveryemail"; public static final String USER_CAPTCHA_RESPONSE = "captcharesponse"; + public static final String EMAIL_TYPE = "emailtype"; + //Parameters for checking persistence of data during Eventual Consistency public static final String CHECK_PERSISTENCE_COURSE = "persistencecourse"; @@ -704,6 +706,7 @@ public static class ResourceURIs { public static final String LOCAL_DATE_TIME = "/localdatetime"; public static final String SESSION_LINKS_RECOVERY = "/sessionlinksrecovery"; public static final String NATIONALITIES = "/nationalities"; + public static final String EMAIL = "/email"; public static final String STUDENT_PROFILE_PICTURE = "/student/profilePic"; public static final String STUDENT_PROFILE = "/student/profile"; diff --git a/src/main/java/teammates/logic/api/EmailGenerator.java b/src/main/java/teammates/logic/api/EmailGenerator.java index a1bd223e05b..983c18ca546 100644 --- a/src/main/java/teammates/logic/api/EmailGenerator.java +++ b/src/main/java/teammates/logic/api/EmailGenerator.java @@ -108,6 +108,21 @@ public List generateFeedbackSessionReminderEmails( return emails; } + /** + * Generates the feedback session reminder emails for the given {@code student}. + */ + public EmailWrapper generateFeedbackSessionStudentReminderEmail( + FeedbackSessionAttributes session, StudentAttributes student) { + + CourseAttributes course = coursesLogic.getCourse(session.getCourseId()); + String template = EmailTemplates.USER_FEEDBACK_SESSION.replace("${status}", FEEDBACK_STATUS_SESSION_OPEN); + String additionalContactInformation = HTML_NO_ACTION_REQUIRED + getAdditionalContactInformationFragment(course); + + return generateFeedbackSessionEmailBaseForStudents(course, session, student, template, + EmailType.FEEDBACK_SESSION_REMINDER.getSubject(), + FEEDBACK_ACTION_SUBMIT_EDIT_OR_VIEW, additionalContactInformation); + } + /** * Generates the email containing the summary of the feedback sessions * email for the given {@code courseId} for {@code student}. diff --git a/src/main/java/teammates/ui/webapi/action/ActionFactory.java b/src/main/java/teammates/ui/webapi/action/ActionFactory.java index e9808559f31..d8162064b27 100644 --- a/src/main/java/teammates/ui/webapi/action/ActionFactory.java +++ b/src/main/java/teammates/ui/webapi/action/ActionFactory.java @@ -78,6 +78,7 @@ public class ActionFactory { map(ResourceURIs.SEARCH_COMMENTS, GET, SearchCommentsAction.class); map(ResourceURIs.SEARCH_INSTRUCTORS, GET, SearchInstructorsAction.class); map(ResourceURIs.SEARCH_STUDENTS, GET, SearchStudentsAction.class); + map(ResourceURIs.EMAIL, GET, GenerateEmailAction.class); map(ResourceURIs.SESSIONS_ONGOING, GET, GetOngoingSessionsAction.class); map(ResourceURIs.SESSION_STATS, GET, GetSessionResponseStatsAction.class); diff --git a/src/main/java/teammates/ui/webapi/action/GenerateEmailAction.java b/src/main/java/teammates/ui/webapi/action/GenerateEmailAction.java new file mode 100644 index 00000000000..513dda16676 --- /dev/null +++ b/src/main/java/teammates/ui/webapi/action/GenerateEmailAction.java @@ -0,0 +1,60 @@ +package teammates.ui.webapi.action; + +import teammates.common.datatransfer.attributes.CourseAttributes; +import teammates.common.datatransfer.attributes.FeedbackSessionAttributes; +import teammates.common.datatransfer.attributes.StudentAttributes; +import teammates.common.exception.InvalidHttpParameterException; +import teammates.common.exception.UnauthorizedAccessException; +import teammates.common.util.Assumption; +import teammates.common.util.Const; +import teammates.common.util.EmailType; +import teammates.common.util.EmailWrapper; +import teammates.ui.webapi.output.EmailData; + +/** + * Generate email content. + */ +public class GenerateEmailAction extends Action { + + @Override + protected AuthType getMinAuthLevel() { + return AuthType.LOGGED_IN; + } + + @Override + public void checkSpecificAccessControl() { + if (!userInfo.isAdmin) { + throw new UnauthorizedAccessException("Admin privilege is required to access this resource."); + } + } + + @Override + public ActionResult execute() { + String courseId = getNonNullRequestParamValue(Const.ParamsNames.COURSE_ID); + String studentEmail = getNonNullRequestParamValue(Const.ParamsNames.STUDENT_EMAIL); + String emailType = getNonNullRequestParamValue(Const.ParamsNames.EMAIL_TYPE); + String feedbackSessionName = getRequestParamValue(Const.ParamsNames.FEEDBACK_SESSION_NAME); + + CourseAttributes course = logic.getCourse(courseId); + Assumption.assertNotNull(course); + + StudentAttributes student = logic.getStudentForEmail(courseId, studentEmail); + Assumption.assertNotNull(student); + + EmailWrapper email; + + if (emailType.equals(EmailType.STUDENT_COURSE_JOIN.name())) { + email = emailGenerator.generateStudentCourseJoinEmail(course, student); + } else if (emailType.equals(EmailType.FEEDBACK_SESSION_REMINDER.name())) { + if (feedbackSessionName == null) { + throw new InvalidHttpParameterException("Feedback session name not specified"); + } + FeedbackSessionAttributes feedbackSession = logic.getFeedbackSession(feedbackSessionName, courseId); + email = emailGenerator.generateFeedbackSessionStudentReminderEmail(feedbackSession, student); + } else { + throw new InvalidHttpParameterException("Email type " + emailType + " not accepted"); + } + + return new JsonResult(new EmailData(email)); + } +} diff --git a/src/main/java/teammates/ui/webapi/endpoints/ResourceEndpoints.java b/src/main/java/teammates/ui/webapi/endpoints/ResourceEndpoints.java index f665c231c7e..30d2d0f9000 100644 --- a/src/main/java/teammates/ui/webapi/endpoints/ResourceEndpoints.java +++ b/src/main/java/teammates/ui/webapi/endpoints/ResourceEndpoints.java @@ -53,6 +53,7 @@ public enum ResourceEndpoints { LOCAL_DATE_TIME(ResourceURIs.LOCAL_DATE_TIME), SESSION_LINKS_RECOVERY(ResourceURIs.SESSION_LINKS_RECOVERY), NATIONALITIES(ResourceURIs.NATIONALITIES), + EMAIL(ResourceURIs.EMAIL), STUDENT_PROFILE_PICTURE(ResourceURIs.STUDENT_PROFILE_PICTURE), STUDENT_PROFILE(ResourceURIs.STUDENT_PROFILE), STUDENT_COURSE_LINKS_REGENERATION(ResourceURIs.STUDENT_COURSE_LINKS_REGENERATION), diff --git a/src/main/java/teammates/ui/webapi/output/EmailData.java b/src/main/java/teammates/ui/webapi/output/EmailData.java new file mode 100644 index 00000000000..7b1a41408e1 --- /dev/null +++ b/src/main/java/teammates/ui/webapi/output/EmailData.java @@ -0,0 +1,31 @@ +package teammates.ui.webapi.output; + +import teammates.common.util.EmailWrapper; + +/** + * The output format for email request. + */ +public class EmailData extends ApiOutput { + private final String recipient; + private final String subject; + private final String content; + + public EmailData(EmailWrapper email) { + this.recipient = email.getRecipient(); + this.subject = email.getSubject(); + this.content = email.getContent(); + } + + public String getRecipient() { + return recipient; + } + + public String getSubject() { + return subject; + } + + public String getContent() { + return content; + } + +} diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html index 1eaf60b5099..69a35f4f98c 100644 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html @@ -149,19 +149,23 @@

  • Course Join Link +
  • - {{ openFs.key }} - + {{ openFs.key + ' ' + openFs.value.startTime + ' - ' + openFs.value.endTime }} + +
  • - {{ notOpenFs.key }} - + {{ notOpenFs.key + ' ' + notOpenFs.value.startTime + ' - ' + notOpenFs.value.endTime }} + +
  • - {{ publishedFs.key }} - + {{ publishedFs.key + ' ' + publishedFs.value.startTime + ' - ' + publishedFs.value.endTime }} + +
    • diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.scss b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.scss index 616206252d5..ff23100ba3b 100644 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.scss +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.scss @@ -1,3 +1,7 @@ .top-padded { margin-top: 20px; } + +.margin-left-5px { + margin-left: 5px; +} diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts index 6deba72a729..540c341610b 100644 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts @@ -4,12 +4,22 @@ import { FormsModule } from '@angular/forms'; import { NgbModal, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { of, throwError } from 'rxjs'; import { AccountService } from '../../../services/account.service'; -import { InstructorAccountSearchResult, - SearchService, StudentAccountSearchResult } from '../../../services/search.service'; +import { + FeedbackSessionsGroup, InstructorAccountSearchResult, + SearchService, StudentAccountSearchResult, +} from '../../../services/search.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { AdminSearchPageComponent } from './admin-search-page.component'; +const DEFAULT_FEEDBACK_SESSION_GROUP: FeedbackSessionsGroup = { + sessionName: { + feedbackSessionUrl: 'sessionUrl', + startTime: 'startTime', + endTime: 'endTime', + }, +}; + describe('AdminSearchPageComponent', () => { let component: AdminSearchPageComponent; let fixture: ComponentFixture; @@ -142,9 +152,9 @@ describe('AdminSearchPageComponent', () => { team: 'team1', comments: 'comments1', recordsPageLink: 'recordsPageLink1', - openSessions: { ['index']: 'session' }, - notOpenSessions: { ['index']: 'session' }, - publishedSessions: { ['index']: 'session' }, + openSessions: DEFAULT_FEEDBACK_SESSION_GROUP, + notOpenSessions: DEFAULT_FEEDBACK_SESSION_GROUP, + publishedSessions: DEFAULT_FEEDBACK_SESSION_GROUP, }, { name: 'name2', email: 'email2', @@ -160,9 +170,9 @@ describe('AdminSearchPageComponent', () => { team: 'team2', comments: 'comments2', recordsPageLink: 'recordsPageLink2', - openSessions: { ['index']: 'session' }, - notOpenSessions: { ['index']: 'session' }, - publishedSessions: { ['index']: 'session' }, + openSessions: DEFAULT_FEEDBACK_SESSION_GROUP, + notOpenSessions: DEFAULT_FEEDBACK_SESSION_GROUP, + publishedSessions: DEFAULT_FEEDBACK_SESSION_GROUP, }]; spyOn(searchService, 'searchAdmin').and.returnValue(of({ @@ -218,9 +228,9 @@ describe('AdminSearchPageComponent', () => { team: 'team', comments: 'comments', recordsPageLink: 'recordsPageLink', - openSessions: { ['index']: 'session' }, - notOpenSessions: { ['index']: 'session' }, - publishedSessions: { ['index']: 'session' }, + openSessions: DEFAULT_FEEDBACK_SESSION_GROUP, + notOpenSessions: DEFAULT_FEEDBACK_SESSION_GROUP, + publishedSessions: DEFAULT_FEEDBACK_SESSION_GROUP, }; component.students = [studentResult]; fixture.detectChanges(); @@ -326,9 +336,9 @@ describe('AdminSearchPageComponent', () => { team: 'team', comments: 'comments', recordsPageLink: 'recordsPageLink', - openSessions: { ['index']: 'session' }, - notOpenSessions: { ['index']: 'session' }, - publishedSessions: { ['index']: 'session' }, + openSessions: DEFAULT_FEEDBACK_SESSION_GROUP, + notOpenSessions: DEFAULT_FEEDBACK_SESSION_GROUP, + publishedSessions: DEFAULT_FEEDBACK_SESSION_GROUP, }; component.students = [studentResult]; fixture.detectChanges(); @@ -372,9 +382,9 @@ describe('AdminSearchPageComponent', () => { team: 'team', comments: 'comments', recordsPageLink: 'recordsPageLink', - openSessions: { ['index']: 'session' }, - notOpenSessions: { ['index']: 'session' }, - publishedSessions: { ['index']: 'session' }, + openSessions: DEFAULT_FEEDBACK_SESSION_GROUP, + notOpenSessions: DEFAULT_FEEDBACK_SESSION_GROUP, + publishedSessions: DEFAULT_FEEDBACK_SESSION_GROUP, }; component.students = [studentResult]; fixture.detectChanges(); @@ -422,9 +432,27 @@ describe('AdminSearchPageComponent', () => { team: 'team', comments: 'comments', recordsPageLink: 'recordsPageLink', - openSessions: { ['index']: 'openSession?key=oldKey' }, - notOpenSessions: { ['index']: 'notOpenSession?key=oldKey' }, - publishedSessions: { ['index']: 'publishedSession?key=oldKey' }, + openSessions: { + ...DEFAULT_FEEDBACK_SESSION_GROUP, + sessionName: { + ...DEFAULT_FEEDBACK_SESSION_GROUP.sessionName, + feedbackSessionUrl: 'openSession?key=oldKey', + }, + }, + notOpenSessions: { + ...DEFAULT_FEEDBACK_SESSION_GROUP, + sessionName: { + ...DEFAULT_FEEDBACK_SESSION_GROUP.sessionName, + feedbackSessionUrl: 'notOpenSession?key=oldKey', + }, + }, + publishedSessions: { + ...DEFAULT_FEEDBACK_SESSION_GROUP, + sessionName: { + ...DEFAULT_FEEDBACK_SESSION_GROUP.sessionName, + feedbackSessionUrl: 'publishedSession?key=oldKey', + }, + }, }; component.students = [studentResult]; fixture.detectChanges(); @@ -454,9 +482,9 @@ describe('AdminSearchPageComponent', () => { expect(spyStatusMessageService).toBeCalled(); expect(studentResult.courseJoinLink).toEqual('courseJoinLink?key=newKey'); - expect(studentResult.openSessions.index).toEqual('openSession?key=newKey'); - expect(studentResult.notOpenSessions.index).toEqual('notOpenSession?key=newKey'); - expect(studentResult.publishedSessions.index).toEqual('publishedSession?key=newKey'); + expect(studentResult.openSessions.sessionName.feedbackSessionUrl).toEqual('openSession?key=newKey'); + expect(studentResult.notOpenSessions.sessionName.feedbackSessionUrl).toEqual('notOpenSession?key=newKey'); + expect(studentResult.publishedSessions.sessionName.feedbackSessionUrl).toEqual('publishedSession?key=newKey'); }); it('should show error message if fail to regenerate registration key for student in a course', () => { @@ -476,9 +504,27 @@ describe('AdminSearchPageComponent', () => { team: 'team', comments: 'comments', recordsPageLink: 'recordsPageLink', - openSessions: { ['index']: 'openSession?key=oldKey' }, - notOpenSessions: { ['index']: 'notOpenSession?key=oldKey' }, - publishedSessions: { ['index']: 'publishedSession?key=oldKey' }, + openSessions: { + ...DEFAULT_FEEDBACK_SESSION_GROUP, + sessionName: { + ...DEFAULT_FEEDBACK_SESSION_GROUP.sessionName, + feedbackSessionUrl: 'openSession?key=oldKey', + }, + }, + notOpenSessions: { + ...DEFAULT_FEEDBACK_SESSION_GROUP, + sessionName: { + ...DEFAULT_FEEDBACK_SESSION_GROUP.sessionName, + feedbackSessionUrl: 'notOpenSession?key=oldKey', + }, + }, + publishedSessions: { + ...DEFAULT_FEEDBACK_SESSION_GROUP, + sessionName: { + ...DEFAULT_FEEDBACK_SESSION_GROUP.sessionName, + feedbackSessionUrl: 'publishedSession?key=oldKey', + }, + }, }; component.students = [studentResult]; fixture.detectChanges(); diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts index 28e130b51f8..bbbfc3c1f2f 100755 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts @@ -1,22 +1,20 @@ import { Component } from '@angular/core'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { AccountService } from '../../../services/account.service'; +import { EmailGenerationService } from '../../../services/email-generation.service'; import { AdminSearchResult, + FeedbackSessionsGroup, InstructorAccountSearchResult, SearchService, StudentAccountSearchResult, } from '../../../services/search.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; -import { RegenerateStudentCourseLinks } from '../../../types/api-output'; +import { Email, RegenerateStudentCourseLinks } from '../../../types/api-output'; import { ErrorMessageOutput } from '../../error-message-output'; -import { - RegenerateLinksConfirmModalComponent, -} from './regenerate-links-confirm-modal/regenerate-links-confirm-modal.component'; -import { - ResetGoogleIdConfirmModalComponent, -} from './reset-google-id-confirm-modal/reset-google-id-confirm-modal.component'; +import { RegenerateLinksConfirmModalComponent } from './regenerate-links-confirm-modal/regenerate-links-confirm-modal.component'; +import { ResetGoogleIdConfirmModalComponent } from './reset-google-id-confirm-modal/reset-google-id-confirm-modal.component'; /** * Admin search page. @@ -38,6 +36,7 @@ export class AdminSearchPageComponent { private accountService: AccountService, private studentService: StudentService, private searchService: SearchService, + private emailGenerationService: EmailGenerationService, ) {} /** @@ -166,9 +165,9 @@ export class AdminSearchPageComponent { * Updates the student's displayed course join and feedback session links with the value of the newKey. */ private updateDisplayedStudentCourseLinks(student: StudentAccountSearchResult, newKey: string): void { - const updateSessions: Function = (sessions: { [index: string]: string }): void => { + const updateSessions: Function = (sessions: FeedbackSessionsGroup): void => { Object.keys(sessions).forEach((key: string): void => { - sessions[key] = this.getUpdatedUrl(sessions[key], newKey); + sessions[key].feedbackSessionUrl = this.getUpdatedUrl(sessions[key].feedbackSessionUrl, newKey); }); }; @@ -189,4 +188,32 @@ export class AdminSearchPageComponent { return link.replace(regex, `$1${newVal}`); } + /** + * Open up an email populated with content for course join invitation. + */ + openCourseJoinEmail(courseId: string, studentemail: string): void { + this.emailGenerationService.getCourseJoinEmail(courseId, studentemail) + .subscribe((email: Email) => { + window.location.href = `mailto:${email.recipient}` + + `?Subject=${email.subject}` + + `&body=${email.content}`; + }, (err: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(err.error.message); + }); + } + + /** + * Open up an email populated with content for feedback session reminder. + */ + openFeedbackSessionReminderEmail(courseId: string, studentemail: string, fsname: string): void { + this.emailGenerationService.getFeedbackSessionReminderEmail(courseId, studentemail, fsname) + .subscribe((email: Email) => { + window.location.href = `mailto:${email.recipient}` + + `?Subject=${email.subject}` + + `&body=${email.content}`; + }, (err: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(err.error.message); + }); + } + } diff --git a/src/web/services/email-generation.service.spec.ts b/src/web/services/email-generation.service.spec.ts new file mode 100644 index 00000000000..7d2edcdb20d --- /dev/null +++ b/src/web/services/email-generation.service.spec.ts @@ -0,0 +1,21 @@ +import { TestBed } from '@angular/core/testing'; + +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { EmailGenerationService } from './email-generation.service'; + +describe('EmailGenerationService', () => { + let service: EmailGenerationService; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + HttpClientTestingModule, + ], + }); + service = TestBed.inject(EmailGenerationService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/web/services/email-generation.service.ts b/src/web/services/email-generation.service.ts new file mode 100644 index 00000000000..39edc3e2c8c --- /dev/null +++ b/src/web/services/email-generation.service.ts @@ -0,0 +1,38 @@ +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; +import { ResourceEndpoints } from '../types/api-endpoints'; +import { Email } from '../types/api-output'; +import { EmailType } from '../types/api-request'; +import { HttpRequestService } from './http-request.service'; + +/** + * Handles email generation. + */ +@Injectable({ + providedIn: 'root', +}) +export class EmailGenerationService { + + constructor(private httpRequestService: HttpRequestService) { } + + getCourseJoinEmail(courseId: string, studentEmail: string): Observable { + return this.getEmail(courseId, studentEmail, EmailType.STUDENT_COURSE_JOIN); + } + + getFeedbackSessionReminderEmail(courseId: string, studentEmail: string, fsname: string): Observable { + return this.getEmail(courseId, studentEmail, EmailType.FEEDBACK_SESSION_REMINDER, fsname); + } + + /** + * Get email contents by calling API. + */ + private getEmail(courseId: string, studentemail: string, emailtype: EmailType, fsname?: string): Observable { + const paramsMap: Record = { + studentemail, + emailtype, + courseid: courseId, + ...(fsname && { fsname }), + }; + return this.httpRequestService.get(ResourceEndpoints.EMAIL, paramsMap); + } +} diff --git a/src/web/services/feedback-sessions.service.ts b/src/web/services/feedback-sessions.service.ts index 91b329c4297..e309ac44f99 100644 --- a/src/web/services/feedback-sessions.service.ts +++ b/src/web/services/feedback-sessions.service.ts @@ -28,7 +28,6 @@ import { } from '../types/api-request'; import { HttpRequestService } from './http-request.service'; import { SessionResultCsvService } from './session-result-csv.service'; -import { TimezoneService } from './timezone.service'; /** * A template session. @@ -47,7 +46,6 @@ export interface TemplateSession { export class FeedbackSessionsService { constructor(private httpRequestService: HttpRequestService, - private timezoneService: TimezoneService, private sessionResultCsvService: SessionResultCsvService) { } @@ -414,15 +412,4 @@ export class FeedbackSessionsService { return feedbackSession.publishStatus === FeedbackSessionPublishStatus.PUBLISHED; } - /** - * Generates the name fragment of a feedbackSession for display on the frontend. - */ - generateNameFragment(feedbackSession: FeedbackSession): string { - const DATE_FORMAT_WITH_ZONE_INFO: string = 'ddd, DD MMM yyyy, hh:mm A Z'; - const startTime: string = this.timezoneService - .formatToString(feedbackSession.submissionStartTimestamp, feedbackSession.timeZone, DATE_FORMAT_WITH_ZONE_INFO); - const endTime: string = this.timezoneService - .formatToString(feedbackSession.submissionEndTimestamp, feedbackSession.timeZone, DATE_FORMAT_WITH_ZONE_INFO); - return `${feedbackSession.feedbackSessionName} ${startTime}-${endTime}`; - } } diff --git a/src/web/services/search.service.ts b/src/web/services/search.service.ts index af270a003ba..72e538750b2 100644 --- a/src/web/services/search.service.ts +++ b/src/web/services/search.service.ts @@ -12,7 +12,7 @@ import { ResourceEndpoints } from '../types/api-endpoints'; import { CommentSearchResult, CommentSearchResults, - Course, + Course, FeedbackSession, FeedbackSessions, Instructor, InstructorPermissionRole, @@ -27,6 +27,7 @@ import { FeedbackSessionsService } from './feedback-sessions.service'; import { HttpRequestService } from './http-request.service'; import { InstructorService } from './instructor.service'; import { LinkService } from './link.service'; +import { TimezoneService } from './timezone.service'; /** * Handles the logic for search. @@ -42,6 +43,7 @@ export class SearchService { private feedbackSessionService: FeedbackSessionsService, private courseService: CourseService, private linkService: LinkService, + private timezoneService: TimezoneService, ) {} searchInstructor(searchKey: string): Observable { @@ -343,16 +345,22 @@ export class SearchService { }; for (const feedbackSession of feedbackSessions.feedbackSessions) { if (this.feedbackSessionService.isFeedbackSessionOpen(feedbackSession)) { - feedbackSessionLinks.openSessions[this.feedbackSessionService.generateNameFragment(feedbackSession).toString()] - = this.linkService.generateSubmitUrl(student, feedbackSession.feedbackSessionName); + feedbackSessionLinks.openSessions[feedbackSession.feedbackSessionName] = { + ...this.formatProperties(feedbackSession), + feedbackSessionUrl: this.linkService.generateSubmitUrl(student, feedbackSession.feedbackSessionName), + }; } else { - feedbackSessionLinks.notOpenSessions[this.feedbackSessionService.generateNameFragment(feedbackSession)] - = this.linkService.generateSubmitUrl(student, feedbackSession.feedbackSessionName); + feedbackSessionLinks.notOpenSessions[feedbackSession.feedbackSessionName] = { + ...this.formatProperties(feedbackSession), + feedbackSessionUrl: this.linkService.generateSubmitUrl(student, feedbackSession.feedbackSessionName), + }; } if (this.feedbackSessionService.isFeedbackSessionPublished(feedbackSession)) { - feedbackSessionLinks.publishedSessions[this.feedbackSessionService.generateNameFragment(feedbackSession)] - = this.linkService.generateResultUrl(student, feedbackSession.feedbackSessionName); + feedbackSessionLinks.publishedSessions[feedbackSession.feedbackSessionName] = { + ...this.formatProperties(feedbackSession), + feedbackSessionUrl: this.linkService.generateResultUrl(student, feedbackSession.feedbackSessionName), + }; } } return feedbackSessionLinks; @@ -464,6 +472,15 @@ export class SearchService { }), ); } + + private formatProperties(feedbackSession: FeedbackSession): { startTime: string, endTime: string } { + const DATE_FORMAT_WITH_ZONE_INFO: string = 'ddd, DD MMM YYYY, hh:mm A Z'; + const startTime: string = this.timezoneService + .formatToString(feedbackSession.submissionStartTimestamp, feedbackSession.timeZone, DATE_FORMAT_WITH_ZONE_INFO); + const endTime: string = this.timezoneService + .formatToString(feedbackSession.submissionEndTimestamp, feedbackSession.timeZone, DATE_FORMAT_WITH_ZONE_INFO); + return { startTime, endTime }; + } } /** @@ -506,14 +523,20 @@ export interface StudentAccountSearchResult extends InstructorAccountSearchResul team: string; comments: string; recordsPageLink: string; - openSessions: { [index: string]: string }; - notOpenSessions: { [index: string]: string }; - publishedSessions: { [index: string]: string }; + openSessions: FeedbackSessionsGroup; + notOpenSessions: FeedbackSessionsGroup; + publishedSessions: FeedbackSessionsGroup; } -// Private interfaces -interface FeedbackSessionsGroup { - [key: string]: string; +/** + * Feedback session inforamtion for search result. + */ +export interface FeedbackSessionsGroup { + [name: string]: { + startTime: string; + endTime: string; + feedbackSessionUrl: string; + }; } interface StudentFeedbackSessions { From 4d21afb8e2b4ed5e0b2575ca3a9a771753ee46e4 Mon Sep 17 00:00:00 2001 From: edwardkang0925 <32270970+edwardkang0925@users.noreply.github.com> Date: Wed, 8 Jul 2020 09:57:11 -0500 Subject: [PATCH 007/205] [#10161] Extract data out to dedicated file from instructor help page componenets (#10276) * npm run test passes, need to fix according to lint test output * fixed styling to pass the lint test. passes npm run test too * worked on instructor-help-sessions-section component, passes lint and componenet tests * worked on instructor-hel-students-section (refactoring properties), passes lint and component tests * resolved merge conflict Co-authored-by: Kon Yoo --- .../instructor-help-questions-data.ts | 1502 +++++++++++++++++ ...ructor-help-questions-section.component.ts | 1494 +--------------- .../instructor-help-sessions-data.ts | 420 +++++ ...tructor-help-sessions-section.component.ts | 400 +---- .../instructor-help-students-data.ts | 112 ++ ...tructor-help-students-section.component.ts | 107 +- 6 files changed, 2152 insertions(+), 1883 deletions(-) create mode 100644 src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-data.ts create mode 100644 src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-data.ts create mode 100644 src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-data.ts diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-data.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-data.ts new file mode 100644 index 00000000000..09bc0d50767 --- /dev/null +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-data.ts @@ -0,0 +1,1502 @@ +import { + ContributionStatistics, + FeedbackConstantSumDistributePointsType, + FeedbackConstantSumQuestionDetails, + FeedbackConstantSumResponseDetails, + FeedbackContributionResponseDetails, + FeedbackMcqQuestionDetails, + FeedbackNumericalScaleResponseDetails, + FeedbackParticipantType, + FeedbackQuestionType, + FeedbackRankRecipientsResponseDetails, + FeedbackRubricQuestionDetails, + FeedbackRubricResponseDetails, + FeedbackSession, + FeedbackSessionPublishStatus, + FeedbackSessionSubmissionStatus, + FeedbackVisibilityType, + NumberOfEntitiesToGiveFeedbackToSetting, + ResponseOutput, + ResponseVisibleSetting, + SessionVisibleSetting, +} from '../../../../types/api-output'; +import { + DEFAULT_CONSTSUM_RECIPIENTS_QUESTION_DETAILS, + DEFAULT_CONTRIBUTION_QUESTION_DETAILS, + DEFAULT_MCQ_QUESTION_DETAILS, + DEFAULT_NUMSCALE_QUESTION_DETAILS, + DEFAULT_RANK_OPTIONS_QUESTION_DETAILS, + DEFAULT_RANK_RECIPIENTS_QUESTION_DETAILS, + DEFAULT_RUBRIC_QUESTION_DETAILS, + DEFAULT_TEXT_QUESTION_DETAILS, +} from '../../../../types/default-question-structs'; +import { CommentTableModel } from '../../../components/comment-box/comment-table/comment-table.component'; +import { + QuestionEditFormModel, +} from '../../../components/question-edit-form/question-edit-form-model'; +import { QuestionSubmissionFormModel, +} from '../../../components/question-submission-form/question-submission-form-model'; +import { Response } from '../../../components/question-types/question-statistics/question-statistics'; +import { + QuestionTabModel, +} from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-page.component'; + +/** + * Structure for example of essay question model + */ +export const EXAMPLE_ESSAY_QUESTION_MODEL: QuestionEditFormModel = { + feedbackQuestionId: '', + isQuestionHasResponses: false, + + questionNumber: 1, + questionBrief: '', + questionDescription: '', + questionType: FeedbackQuestionType.TEXT, + questionDetails: DEFAULT_TEXT_QUESTION_DETAILS(), + + isEditable: false, + isSaving: false, + isCollapsed: false, + isChanged: false, + + giverType: FeedbackParticipantType.STUDENTS, + recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, + + customNumberOfEntitiesToGiveFeedbackTo: 0, + numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, + + showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], + showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], + showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], +}; +/** + * Structure for example of numerical scale question model + */ +export const EXAMPLE_NUMERICAL_SCALE_QUESTION_MODEL: QuestionEditFormModel = { + feedbackQuestionId: '', + isQuestionHasResponses: false, + + questionNumber: 1, + questionBrief: '', + questionDescription: '', + questionType: FeedbackQuestionType.NUMSCALE, + questionDetails: DEFAULT_NUMSCALE_QUESTION_DETAILS(), + + isEditable: false, + isSaving: false, + isCollapsed: false, + isChanged: false, + + giverType: FeedbackParticipantType.STUDENTS, + recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, + + customNumberOfEntitiesToGiveFeedbackTo: 0, + numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, + + showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], + showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], + showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], +}; +/** + * Structure for example of numerical scale responses + */ +export const EXAMPLE_NUMERICAL_SCALE_RESPONSES: Response[] = [ + { + giver: 'Alice', + giverEmail: 'alice@gmail.com', + giverTeam: 'Team 1', + giverSection: '', + recipient: 'Bob', + recipientEmail: 'bob@gmail.com', + recipientTeam: 'Team 2', + recipientSection: '', + responseDetails: { + answer: 5, + questionType: FeedbackQuestionType.NUMSCALE, + }, + }, + { + giver: 'Charles', + giverEmail: 'charles@gmail.com', + giverTeam: 'Team 1', + giverSection: '', + recipient: 'Bob', + recipientEmail: 'bob@gmail.com', + recipientTeam: 'Team 2', + recipientSection: '', + responseDetails: { + answer: 5, + questionType: FeedbackQuestionType.NUMSCALE, + }, + }, + { + giver: 'David', + giverEmail: 'david@gmail.com', + giverTeam: 'Team 1', + giverSection: '', + recipient: 'Bob', + recipientEmail: 'bob@gmail.com', + recipientTeam: 'Team 2', + recipientSection: '', + responseDetails: { + answer: 2, + questionType: FeedbackQuestionType.NUMSCALE, + }, + }, + { + giver: 'Bob', + giverEmail: 'bob@gmail.com', + giverTeam: 'Team 2', + giverSection: '', + recipient: 'Bob', + recipientEmail: 'bob@gmail.com', + recipientTeam: 'Team 2', + recipientSection: '', + responseDetails: { + answer: 5, + questionType: FeedbackQuestionType.NUMSCALE, + }, + }, + { + giver: 'Alice', + giverEmail: 'alice@gmail.com', + giverTeam: 'Team 1', + giverSection: '', + recipient: 'Emma', + recipientEmail: 'emma@gmail.com', + recipientTeam: 'Team 2', + recipientSection: '', + responseDetails: { + answer: 4, + questionType: FeedbackQuestionType.NUMSCALE, + }, + }, + { + giver: 'Charles', + giverEmail: 'charles@gmail.com', + giverTeam: 'Team 1', + giverSection: '', + recipient: 'Emma', + recipientEmail: 'emma@gmail.com', + recipientTeam: 'Team 2', + recipientSection: '', + responseDetails: { + answer: 3, + questionType: FeedbackQuestionType.NUMSCALE, + }, + }, + { + giver: 'David', + giverEmail: 'david@gmail.com', + giverTeam: 'Team 1', + giverSection: '', + recipient: 'Emma', + recipientEmail: 'emma@gmail.com', + recipientTeam: 'Team 2', + recipientSection: '', + responseDetails: { + answer: 4, + questionType: FeedbackQuestionType.NUMSCALE, + }, + }, + { + giver: 'Emma', + giverEmail: 'emma@gmail.com', + giverTeam: 'Team 2', + giverSection: '', + recipient: 'Emma', + recipientEmail: 'emma@gmail.com', + recipientTeam: 'Team 2', + recipientSection: '', + responseDetails: { + answer: 5, + questionType: FeedbackQuestionType.NUMSCALE, + }, + }, +]; +/** + * Structure for example of numerical scale response output + */ +export const EXAMPLE_NUMERICAL_SCALE_RESPONSE_OUTPUT: ResponseOutput[] = [ + { + isMissingResponse: false, + responseId: '1', + giver: 'Alice', + giverTeam: 'Team 1', + giverEmail: 'alice@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: 5, + questionType: FeedbackQuestionType.NUMSCALE, + } as FeedbackNumericalScaleResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '2', + giver: 'Charles', + giverTeam: 'Team 1', + giverEmail: 'charles@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: 5, + questionType: FeedbackQuestionType.NUMSCALE, + } as FeedbackNumericalScaleResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '3', + giver: 'David', + giverTeam: 'Team 1', + giverEmail: 'david@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: 2, + questionType: FeedbackQuestionType.NUMSCALE, + } as FeedbackNumericalScaleResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '4', + giver: 'Bob', + giverTeam: 'Team 2', + giverEmail: 'bob@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: 5, + questionType: FeedbackQuestionType.NUMSCALE, + } as FeedbackNumericalScaleResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '5', + giver: 'Alice', + giverTeam: 'Team 1', + giverEmail: 'alice@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: 4, + questionType: FeedbackQuestionType.NUMSCALE, + } as FeedbackNumericalScaleResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '6', + giver: 'Charles', + giverTeam: 'Team 1', + giverEmail: 'charles@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: 3, + questionType: FeedbackQuestionType.NUMSCALE, + } as FeedbackNumericalScaleResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '7', + giver: 'David', + giverTeam: 'Team 1', + giverEmail: 'david@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: 4, + questionType: FeedbackQuestionType.NUMSCALE, + } as FeedbackNumericalScaleResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '8', + giver: 'Emma', + giverTeam: 'Team 2', + giverEmail: 'emma@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: 5, + questionType: FeedbackQuestionType.NUMSCALE, + } as FeedbackNumericalScaleResponseDetails, + instructorComments: [], + }, +]; +/** + * Structure for example of numerical scale question tab model + */ +export const EXAMPLE_NUMERICAL_SCALE_QUESTION_TAB_MODEL: QuestionTabModel = { + question: EXAMPLE_NUMERICAL_SCALE_QUESTION_MODEL, + responses: EXAMPLE_NUMERICAL_SCALE_RESPONSE_OUTPUT, + statistics: '', + hasPopulated: true, + isTabExpanded: true, +}; +/** + * Structure for example of numerical scale questions + */ +export const EXAMPLE_NUMERICAL_SCALE_QUESTIONS: Record = { + question: EXAMPLE_NUMERICAL_SCALE_QUESTION_TAB_MODEL, +}; +/** + * Structure for example of instructor comment tab model + */ +export const EXAMPLE_INSTRUCTOR_COMMENT_TABLE_MODEL: Record = { + 1: { + commentRows: [], + newCommentRow: { + commentEditFormModel: { + commentText: '', + + isUsingCustomVisibilities: false, + showCommentTo: [], + showGiverNameTo: [], + }, + isEditing: false, + }, + + isAddingNewComment: false, + isReadOnly: true, + }, + 2: { + commentRows: [], + newCommentRow: { + commentEditFormModel: { + commentText: '', + + isUsingCustomVisibilities: false, + showCommentTo: [], + showGiverNameTo: [], + }, + isEditing: false, + }, + + isAddingNewComment: false, + isReadOnly: true, + }, + 3: { + commentRows: [], + newCommentRow: { + commentEditFormModel: { + commentText: '', + + isUsingCustomVisibilities: false, + showCommentTo: [], + showGiverNameTo: [], + }, + isEditing: false, + }, + + isAddingNewComment: false, + isReadOnly: true, + }, + 4: { + commentRows: [], + newCommentRow: { + commentEditFormModel: { + commentText: '', + + isUsingCustomVisibilities: false, + showCommentTo: [], + showGiverNameTo: [], + }, + isEditing: false, + }, + + isAddingNewComment: false, + isReadOnly: true, + }, + 5: { + commentRows: [], + newCommentRow: { + commentEditFormModel: { + commentText: '', + + isUsingCustomVisibilities: false, + showCommentTo: [], + showGiverNameTo: [], + }, + isEditing: false, + }, + + isAddingNewComment: false, + isReadOnly: true, + }, + 6: { + commentRows: [], + newCommentRow: { + commentEditFormModel: { + commentText: '', + + isUsingCustomVisibilities: false, + showCommentTo: [], + showGiverNameTo: [], + }, + isEditing: false, + }, + + isAddingNewComment: false, + isReadOnly: true, + }, + 7: { + commentRows: [], + newCommentRow: { + commentEditFormModel: { + commentText: '', + + isUsingCustomVisibilities: false, + showCommentTo: [], + showGiverNameTo: [], + }, + isEditing: false, + }, + + isAddingNewComment: false, + isReadOnly: true, + }, + 8: { + commentRows: [], + newCommentRow: { + commentEditFormModel: { + commentText: '', + + isUsingCustomVisibilities: false, + showCommentTo: [], + showGiverNameTo: [], + }, + isEditing: false, + }, + + isAddingNewComment: false, + isReadOnly: true, + }, +}; +/** + * Structure for example of feedback session + */ +export const EXAMPLE_FEEDBACK_SESSION: FeedbackSession = { + courseId: 'CS2103T', + timeZone: 'UTC', + feedbackSessionName: 'Project Feedback 1', + instructions: 'Enter your feedback for projects', + submissionStartTimestamp: 0, + submissionEndTimestamp: 0, + gracePeriod: 0, + sessionVisibleSetting: SessionVisibleSetting.AT_OPEN, + responseVisibleSetting: ResponseVisibleSetting.AT_VISIBLE, + submissionStatus: FeedbackSessionSubmissionStatus.CLOSED, + publishStatus: FeedbackSessionPublishStatus.NOT_PUBLISHED, + isClosingEmailEnabled: true, + isPublishedEmailEnabled: true, + createdAtTimestamp: 0, +}; +/** + * Structure for example of distrution point option question detail + */ +export const EXAMPLE_DISTRIBUTE_POINT_OPTION_QUESTION_DETAIL: FeedbackConstantSumQuestionDetails = { + numOfConstSumOptions: 2, + constSumOptions: ['Option A', 'Option B'], + distributeToRecipients: false, + pointsPerOption: false, + forceUnevenDistribution: false, + distributePointsFor: FeedbackConstantSumDistributePointsType.NONE, + points: 100, + questionType: FeedbackQuestionType.CONSTSUM_OPTIONS, + questionText: '', +}; +/** + * Structure for example of distribution point option model + */ +export const EXAMPLE_DISTRIBUTED_POINT_OPTION_MODEL: QuestionEditFormModel = { + feedbackQuestionId: '', + isQuestionHasResponses: false, + + questionNumber: 1, + questionBrief: '', + questionDescription: '', + questionType: FeedbackQuestionType.CONSTSUM_OPTIONS, + questionDetails: EXAMPLE_DISTRIBUTE_POINT_OPTION_QUESTION_DETAIL, + + isEditable: false, + isSaving: false, + isCollapsed: false, + isChanged: false, + + giverType: FeedbackParticipantType.STUDENTS, + recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, + + customNumberOfEntitiesToGiveFeedbackTo: 0, + numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, + + showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], + showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], + showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], +}; +/** + * Structure for example of distribute point option response output + */ +export const EXAMPLE_DISTRIBUTE_POINT_OPTION_RESPONSE_OUTPUT: ResponseOutput[] = [ + { + isMissingResponse: false, + responseId: '1', + giver: 'Alice', + giverTeam: 'Team 1', + giverEmail: 'alice@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answers: [2, 8], + questionType: FeedbackQuestionType.CONSTSUM, + } as FeedbackConstantSumResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '2', + giver: 'Charles', + giverTeam: 'Team 1', + giverEmail: 'charles@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answers: [3, 7], + questionType: FeedbackQuestionType.CONSTSUM, + } as FeedbackConstantSumResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '3', + giver: 'David', + giverTeam: 'Team 1', + giverEmail: 'david@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answers: [5, 5], + questionType: FeedbackQuestionType.CONSTSUM, + } as FeedbackConstantSumResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '4', + giver: 'Bob', + giverTeam: 'Team 2', + giverEmail: 'bob@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answers: [5, 5], + questionType: FeedbackQuestionType.CONSTSUM, + } as FeedbackConstantSumResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '5', + giver: 'Alice', + giverTeam: 'Team 1', + giverEmail: 'alice@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answers: [9, 1], + questionType: FeedbackQuestionType.CONSTSUM, + } as FeedbackConstantSumResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '6', + giver: 'Charles', + giverTeam: 'Team 1', + giverEmail: 'charles@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answers: [6, 4], + questionType: FeedbackQuestionType.CONSTSUM, + } as FeedbackConstantSumResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '7', + giver: 'David', + giverTeam: 'Team 1', + giverEmail: 'david@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answers: [4, 6], + questionType: FeedbackQuestionType.CONSTSUM, + } as FeedbackConstantSumResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '8', + giver: 'Emma', + giverTeam: 'Team 2', + giverEmail: 'emma@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answers: [7, 3], + questionType: FeedbackQuestionType.CONSTSUM, + } as FeedbackConstantSumResponseDetails, + instructorComments: [], + }, +]; +/** + * Structure for example of distribute point option question tab model + */ +export const EXAMPLE_DISTRIBUTE_POINT_OPTION_QUESTION_TAB_MODEL: QuestionTabModel = { + question: EXAMPLE_DISTRIBUTED_POINT_OPTION_MODEL, + responses: EXAMPLE_DISTRIBUTE_POINT_OPTION_RESPONSE_OUTPUT, + statistics: '', + hasPopulated: true, + isTabExpanded: true, +}; +/** + * Structure for example of distribute point option questions + */ +export const EXAMPLE_DISTRIBUTE_POINT_OPTION_QUESTIONS: Record = { + question: EXAMPLE_DISTRIBUTE_POINT_OPTION_QUESTION_TAB_MODEL, +}; +/** + * Structure for example of distributed point recipient model + */ +export const EXAMPLE_DISTRIBUTED_POINT_RECIPIENT_MODEL: QuestionEditFormModel = { + feedbackQuestionId: '', + isQuestionHasResponses: false, + + questionNumber: 1, + questionBrief: '', + questionDescription: '', + questionType: FeedbackQuestionType.CONSTSUM_RECIPIENTS, + questionDetails: DEFAULT_CONSTSUM_RECIPIENTS_QUESTION_DETAILS(), + + isEditable: false, + isSaving: false, + isCollapsed: false, + isChanged: false, + + giverType: FeedbackParticipantType.STUDENTS, + recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, + + customNumberOfEntitiesToGiveFeedbackTo: 0, + numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, + + showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], + showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], + showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], +}; +/** + * Structure for example of team contribution question model + */ +export const EXAMPLE_TEAM_CONTRIBUTION_QUESTION_MODEL: QuestionEditFormModel = { + feedbackQuestionId: '', + isQuestionHasResponses: false, + + questionNumber: 1, + questionBrief: '', + questionDescription: '', + questionType: FeedbackQuestionType.CONTRIB, + questionDetails: DEFAULT_CONTRIBUTION_QUESTION_DETAILS(), + + isEditable: false, + isSaving: false, + isCollapsed: false, + isChanged: false, + + giverType: FeedbackParticipantType.STUDENTS, + recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS_INCLUDING_SELF, + + customNumberOfEntitiesToGiveFeedbackTo: 0, + numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, + + showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT, + FeedbackVisibilityType.GIVER_TEAM_MEMBERS], + showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], + showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], +}; +/** + * Structure for example of team contribution response output + */ +export const EXAMPLE_TEAM_CONTRIBUTION_RESPONSE_OUTPUT: ResponseOutput[] = [ + { + isMissingResponse: false, + responseId: '1', + giver: 'Alice', + giverTeam: 'Team 1', + giverEmail: 'alice@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: 90, + questionType: FeedbackQuestionType.CONTRIB, + } as FeedbackContributionResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '2', + giver: 'Charles', + giverTeam: 'Team 1', + giverEmail: 'charles@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: 70, + questionType: FeedbackQuestionType.CONTRIB, + } as FeedbackContributionResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '3', + giver: 'David', + giverTeam: 'Team 1', + giverEmail: 'david@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: 120, + questionType: FeedbackQuestionType.CONTRIB, + } as FeedbackContributionResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '4', + giver: 'Bob', + giverTeam: 'Team 2', + giverEmail: 'bob@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: 100, + questionType: FeedbackQuestionType.CONTRIB, + } as FeedbackContributionResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '5', + giver: 'Alice', + giverTeam: 'Team 1', + giverEmail: 'alice@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: 110, + questionType: FeedbackQuestionType.CONTRIB, + } as FeedbackContributionResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '6', + giver: 'Charles', + giverTeam: 'Team 1', + giverEmail: 'charles@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: 110, + questionType: FeedbackQuestionType.CONTRIB, + } as FeedbackContributionResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '7', + giver: 'David', + giverTeam: 'Team 1', + giverEmail: 'david@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: 100, + questionType: FeedbackQuestionType.CONTRIB, + } as FeedbackContributionResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '8', + giver: 'Emma', + giverTeam: 'Team 2', + giverEmail: 'emma@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: 110, + questionType: FeedbackQuestionType.CONTRIB, + } as FeedbackContributionResponseDetails, + instructorComments: [], + }, +]; +/** + * Structure for example of contribution statistics + */ +export const EXAMPLE_CONTRIBUTION_STATISTICS: ContributionStatistics = { + results: { + 'emma@gmail.com': { + claimed: 110, + perceived: 106, + claimedOthers: [], + perceivedOthers: [110, 110, 100], + }, + 'bob@gmail.com': { + claimed: 100, + perceived: 93, + claimedOthers: [], + perceivedOthers: [90, 70, 120], + }, + }, +}; +/** + * Structure for example of team contribution question tab model + */ +export const EXAMPLE_TEAM_CONTRIBUTION_QUESTION_TAB_MODEL: QuestionTabModel = { + question: EXAMPLE_TEAM_CONTRIBUTION_QUESTION_MODEL, + responses: EXAMPLE_TEAM_CONTRIBUTION_RESPONSE_OUTPUT, + statistics: JSON.stringify(EXAMPLE_CONTRIBUTION_STATISTICS), + hasPopulated: true, + isTabExpanded: true, +}; +/** + * Structure for example of team contribution questions + */ +export const EXAMPLE_TEAM_CONTRIBUTION_QUESTIONS: Record = { + question: EXAMPLE_TEAM_CONTRIBUTION_QUESTION_TAB_MODEL, +}; +/** + * Structure for example of rubric question model + */ +export const EXAMPLE_RUBRIC_QUESTION_MODEL: QuestionEditFormModel = { + feedbackQuestionId: '', + isQuestionHasResponses: false, + + questionNumber: 1, + questionBrief: '', + questionDescription: '', + questionType: FeedbackQuestionType.RUBRIC, + questionDetails: { + ...DEFAULT_RUBRIC_QUESTION_DETAILS(), + numOfRubricChoices: 4, + rubricChoices: ['Strongly Disagree', 'Disagree', 'Agree', 'Strongly Agree'], + numOfRubricSubQuestions: 2, + rubricSubQuestions: + ['This student participates well in online discussions.', 'This student completes assigned tasks on time.'], + rubricDescriptions: [ + ['Rarely or never responds.', 'Occasionally responds, but never initiates discussions.', + 'Takes part in discussions and sometimes initiates discussions.', + 'Initiates discussions frequently, and engages the team.'], + ['Rarely or never completes tasks.', 'Often misses deadlines.', 'Occasionally misses deadlines.', + 'Tasks are always completed before the deadline.']], + } as FeedbackRubricQuestionDetails, + + isEditable: false, + isSaving: false, + isCollapsed: false, + isChanged: false, + + giverType: FeedbackParticipantType.STUDENTS, + recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, + + customNumberOfEntitiesToGiveFeedbackTo: 0, + numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, + + showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], + showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], + showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], +}; +/** + * Structure for example of rubric question response output + */ +export const EXAMPLE_RUBRIC_QUESTION_RESPONSE_OUTPUT: ResponseOutput[] = [ + { + isMissingResponse: false, + responseId: '1', + giver: 'Alice', + giverTeam: 'Team 1', + giverEmail: 'alice@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: [0, 0], + questionType: FeedbackQuestionType.RUBRIC, + } as FeedbackRubricResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '2', + giver: 'Charles', + giverTeam: 'Team 1', + giverEmail: 'charles@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: [2, 2], + questionType: FeedbackQuestionType.RUBRIC, + } as FeedbackRubricResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '3', + giver: 'David', + giverTeam: 'Team 1', + giverEmail: 'david@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: [1, 1], + questionType: FeedbackQuestionType.RUBRIC, + } as FeedbackRubricResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '4', + giver: 'Bob', + giverTeam: 'Team 2', + giverEmail: 'bob@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: [1, 2], + questionType: FeedbackQuestionType.RUBRIC, + } as FeedbackRubricResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '5', + giver: 'Alice', + giverTeam: 'Team 1', + giverEmail: 'alice@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: [0, 1], + questionType: FeedbackQuestionType.RUBRIC, + } as FeedbackRubricResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '6', + giver: 'Charles', + giverTeam: 'Team 1', + giverEmail: 'charles@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: [2, 3], + questionType: FeedbackQuestionType.RUBRIC, + } as FeedbackRubricResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '7', + giver: 'David', + giverTeam: 'Team 1', + giverEmail: 'david@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: [1, 3], + questionType: FeedbackQuestionType.RUBRIC, + } as FeedbackRubricResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '8', + giver: 'Emma', + giverTeam: 'Team 2', + giverEmail: 'emma@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: [0, 1], + questionType: FeedbackQuestionType.RUBRIC, + } as FeedbackRubricResponseDetails, + instructorComments: [], + }, +]; +/** + * Structure for example of rubric question questions tab model + */ +export const EXAMPLE_RUBRIC_QUESTION_QUESTION_TAB_MODEL: QuestionTabModel = { + question: EXAMPLE_RUBRIC_QUESTION_MODEL, + responses: EXAMPLE_RUBRIC_QUESTION_RESPONSE_OUTPUT, + statistics: '', + hasPopulated: true, + isTabExpanded: true, +}; +/** + * Structure for example of rubric question questions + */ +export const EXAMPLE_RUBRIC_QUESTION_QUESTIONS: Record = { + question: EXAMPLE_RUBRIC_QUESTION_QUESTION_TAB_MODEL, +}; +/** + * Structure for example of rank recipient question model + */ +export const EXAMPLE_RANK_RECIPIENT_QUESTION_MODEL: QuestionEditFormModel = { + feedbackQuestionId: '', + isQuestionHasResponses: false, + + questionNumber: 1, + questionBrief: '', + questionDescription: '', + questionType: FeedbackQuestionType.RANK_RECIPIENTS, + questionDetails: DEFAULT_RANK_RECIPIENTS_QUESTION_DETAILS(), + + isEditable: false, + isSaving: false, + isCollapsed: false, + isChanged: false, + + giverType: FeedbackParticipantType.STUDENTS, + recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, + + customNumberOfEntitiesToGiveFeedbackTo: 0, + numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, + + showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], + showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], + showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], +}; +/** + * Structure for example of rank recipient response output + */ +export const EXAMPLE_RANK_RECIPIENT_RESPONSE_OUTPUT: ResponseOutput[] = [ + { + isMissingResponse: false, + responseId: '1', + giver: 'Alice', + giverTeam: 'Team 1', + giverEmail: 'alice@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: 2, + questionType: FeedbackQuestionType.RANK_RECIPIENTS, + } as FeedbackRankRecipientsResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '2', + giver: 'Charles', + giverTeam: 'Team 1', + giverEmail: 'charles@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: 3, + questionType: FeedbackQuestionType.RANK_RECIPIENTS, + } as FeedbackRankRecipientsResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '3', + giver: 'David', + giverTeam: 'Team 1', + giverEmail: 'david@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: 4, + questionType: FeedbackQuestionType.RANK_RECIPIENTS, + } as FeedbackRankRecipientsResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '4', + giver: 'Bob', + giverTeam: 'Team 2', + giverEmail: 'bob@gmail.com', + giverSection: '', + recipient: 'Bob', + recipientTeam: 'Team 2', + recipientEmail: 'bob@gmail.com', + recipientSection: '', + responseDetails: { + answer: 1, + questionType: FeedbackQuestionType.RANK_RECIPIENTS, + } as FeedbackRankRecipientsResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '5', + giver: 'Alice', + giverTeam: 'Team 1', + giverEmail: 'alice@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: 2, + questionType: FeedbackQuestionType.RANK_RECIPIENTS, + } as FeedbackRankRecipientsResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '6', + giver: 'Charles', + giverTeam: 'Team 1', + giverEmail: 'charles@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: 3, + questionType: FeedbackQuestionType.RANK_RECIPIENTS, + } as FeedbackRankRecipientsResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '7', + giver: 'David', + giverTeam: 'Team 1', + giverEmail: 'david@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: 2, + questionType: FeedbackQuestionType.RANK_RECIPIENTS, + } as FeedbackRankRecipientsResponseDetails, + instructorComments: [], + }, + { + isMissingResponse: false, + responseId: '8', + giver: 'Emma', + giverTeam: 'Team 2', + giverEmail: 'emma@gmail.com', + giverSection: '', + recipient: 'Emma', + recipientTeam: 'Team 2', + recipientEmail: 'emma@gmail.com', + recipientSection: '', + responseDetails: { + answer: 2, + questionType: FeedbackQuestionType.RANK_RECIPIENTS, + } as FeedbackRankRecipientsResponseDetails, + instructorComments: [], + }, +]; +/** + * Structure for example of rank recipient question tab model + */ +export const EXAMPLE_RANK_RECIPIENT_QUESTION_TAB_MODEL: QuestionTabModel = { + question: EXAMPLE_RANK_RECIPIENT_QUESTION_MODEL, + responses: EXAMPLE_RANK_RECIPIENT_RESPONSE_OUTPUT, + statistics: '', + hasPopulated: true, + isTabExpanded: true, +}; +/** + * Structure for example of rank recipient questions + */ +export const EXAMPLE_RANK_RECIPIENT_QUESTIONS: Record = { + question: EXAMPLE_RANK_RECIPIENT_QUESTION_TAB_MODEL, +}; +/** + * Structure for example of rank option question model + */ +export const EXAMPLE_RANK_OPTION_QUESTION_MODEL: QuestionEditFormModel = { + feedbackQuestionId: '', + isQuestionHasResponses: false, + + questionNumber: 1, + questionBrief: '', + questionDescription: '', + questionType: FeedbackQuestionType.RANK_OPTIONS, + questionDetails: DEFAULT_RANK_OPTIONS_QUESTION_DETAILS(), + + isEditable: false, + isSaving: false, + isCollapsed: false, + isChanged: false, + + giverType: FeedbackParticipantType.STUDENTS, + recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, + + customNumberOfEntitiesToGiveFeedbackTo: 0, + numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, + + showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT, + FeedbackVisibilityType.GIVER_TEAM_MEMBERS], + showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], + showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], +}; +/** + * Structure for example of MCQ question without weights model + */ +export const EXAMPLE_MCQ_QUESTION_WITHOUT_WEIGHTS_MODEL: QuestionEditFormModel = { + feedbackQuestionId: '', + isQuestionHasResponses: false, + + questionNumber: 1, + questionBrief: 'How much did you think you contributed?', + questionDescription: '', + questionType: FeedbackQuestionType.MCQ, + questionDetails: { + ...DEFAULT_MCQ_QUESTION_DETAILS(), + numOfMcqChoices: 3, + mcqChoices: ['I did great!', 'I performed satisfactorily.', 'I did not contribute as much as I wanted to.'], + hasAssignedWeights: false, + mcqWeights: [], + } as FeedbackMcqQuestionDetails, + + isEditable: false, + isSaving: false, + isCollapsed: false, + isChanged: false, + + giverType: FeedbackParticipantType.STUDENTS, + recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, + + customNumberOfEntitiesToGiveFeedbackTo: 0, + numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, + + showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT, + FeedbackVisibilityType.GIVER_TEAM_MEMBERS], + showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], + showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], +}; +/** + * Structure for example of MCQ question with weights model + */ +export const EXAMPLE_MCQ_QUESTION_WITH_WEIGHTS_MODEL: QuestionEditFormModel = { + feedbackQuestionId: '', + isQuestionHasResponses: false, + + questionNumber: 1, + questionBrief: 'How much did you think you contributed?', + questionDescription: '', + questionType: FeedbackQuestionType.MCQ, + questionDetails: { + ...DEFAULT_MCQ_QUESTION_DETAILS(), + numOfMcqChoices: 3, + mcqChoices: ['I did great!', 'I performed satisfactorily.', 'I did not contribute as much as I wanted to.'], + hasAssignedWeights: true, + mcqWeights: [1, 3, 5], + } as FeedbackMcqQuestionDetails, + + isEditable: false, + isSaving: false, + isCollapsed: false, + isChanged: false, + + giverType: FeedbackParticipantType.STUDENTS, + recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, + + customNumberOfEntitiesToGiveFeedbackTo: 0, + numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, + + showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT, + FeedbackVisibilityType.GIVER_TEAM_MEMBERS], + showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], + showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], +}; +/** + * Structure for example of responder rubric submission form model + */ +export const EXAMPLE_RESPONDER_RUBRIC_SUBMISSION_FORM_MODEL: QuestionSubmissionFormModel = { + recipientList: [ + { + recipientIdentifier: 'alice', + recipientName: 'Alice', + }, + { + recipientIdentifier: 'bob', + recipientName: 'Bob', + }, + ], + recipientSubmissionForms: [ + { + responseId: 'response1', + recipientIdentifier: 'alice', + responseDetails: { questionType: FeedbackQuestionType.RUBRIC, answer: [0, 2] } as FeedbackRubricResponseDetails, + }, + { + responseId: 'response2', + recipientIdentifier: 'bob', + responseDetails: { questionType: FeedbackQuestionType.RUBRIC, answer: [1, 3] } as FeedbackRubricResponseDetails, + }, + ], + customNumberOfEntitiesToGiveFeedbackTo: 0, + feedbackQuestionId: '', + questionNumber: 1, + questionBrief: '', + questionDescription: '', + questionType: FeedbackQuestionType.RUBRIC, + giverType: FeedbackParticipantType.STUDENTS, + recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, + numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, + showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], + showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], + showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], + questionDetails: { + ...DEFAULT_RUBRIC_QUESTION_DETAILS(), + numOfRubricChoices: 4, + rubricChoices: ['Strongly Disagree', 'Disagree', 'Agree', 'Strongly Agree'], + numOfRubricSubQuestions: 2, + rubricSubQuestions: [ + 'This student participates well in online discussions.', + 'This student completes assigned tasks on time.', + ], + rubricDescriptions: + [ + [ + 'Rarely or never responds.', 'Occasionally responds, but never initiates discussions.', + 'Takes part in discussions and sometimes initiates discussions.', + 'Initiates discussions frequently, and engages the team.', + ], + [ + 'Rarely or never completes tasks.', + 'Often misses deadlines.', + 'Occasionally misses deadlines.', + 'Tasks are always completed before the deadline.', + ], + ], + } as FeedbackRubricQuestionDetails, +}; diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.ts index e623916c1af..286ca80c465 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.ts @@ -4,36 +4,11 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { PageScrollService } from 'ngx-page-scroll-core'; import { ContributionStatistics, - FeedbackConstantSumDistributePointsType, FeedbackConstantSumQuestionDetails, - FeedbackConstantSumResponseDetails, - FeedbackContributionResponseDetails, - FeedbackMcqQuestionDetails, FeedbackNumericalScaleResponseDetails, - FeedbackParticipantType, - FeedbackQuestionType, - FeedbackRankRecipientsResponseDetails, - FeedbackRubricQuestionDetails, - FeedbackRubricResponseDetails, FeedbackSession, - FeedbackSessionPublishStatus, - FeedbackSessionSubmissionStatus, - FeedbackVisibilityType, - NumberOfEntitiesToGiveFeedbackToSetting, ResponseOutput, - ResponseVisibleSetting, - SessionVisibleSetting, } from '../../../../types/api-output'; -import { - DEFAULT_CONSTSUM_RECIPIENTS_QUESTION_DETAILS, - DEFAULT_CONTRIBUTION_QUESTION_DETAILS, - DEFAULT_MCQ_QUESTION_DETAILS, - DEFAULT_NUMSCALE_QUESTION_DETAILS, - DEFAULT_RANK_OPTIONS_QUESTION_DETAILS, - DEFAULT_RANK_RECIPIENTS_QUESTION_DETAILS, - DEFAULT_RUBRIC_QUESTION_DETAILS, - DEFAULT_TEXT_QUESTION_DETAILS, -} from '../../../../types/default-question-structs'; import { CommentTableModel } from '../../../components/comment-box/comment-table/comment-table.component'; import { QuestionEditFormMode, @@ -43,12 +18,45 @@ import { QuestionSubmissionFormModel, } from '../../../components/question-submission-form/question-submission-form-model'; import { Response } from '../../../components/question-types/question-statistics/question-statistics'; import { - QuestionTabModel, + QuestionTabModel, } from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-page.component'; import { InstructorSessionResultSectionType, } from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-section-type.enum'; import { InstructorHelpSectionComponent } from '../instructor-help-section.component'; +import { + EXAMPLE_CONTRIBUTION_STATISTICS, + EXAMPLE_DISTRIBUTED_POINT_OPTION_MODEL, + EXAMPLE_DISTRIBUTED_POINT_RECIPIENT_MODEL, + EXAMPLE_DISTRIBUTE_POINT_OPTION_QUESTIONS, + EXAMPLE_DISTRIBUTE_POINT_OPTION_QUESTION_DETAIL, + EXAMPLE_DISTRIBUTE_POINT_OPTION_QUESTION_TAB_MODEL, + EXAMPLE_DISTRIBUTE_POINT_OPTION_RESPONSE_OUTPUT, + EXAMPLE_ESSAY_QUESTION_MODEL, + EXAMPLE_FEEDBACK_SESSION, + EXAMPLE_INSTRUCTOR_COMMENT_TABLE_MODEL, + EXAMPLE_MCQ_QUESTION_WITHOUT_WEIGHTS_MODEL, + EXAMPLE_MCQ_QUESTION_WITH_WEIGHTS_MODEL, + EXAMPLE_NUMERICAL_SCALE_QUESTIONS, + EXAMPLE_NUMERICAL_SCALE_QUESTION_MODEL, + EXAMPLE_NUMERICAL_SCALE_QUESTION_TAB_MODEL, + EXAMPLE_NUMERICAL_SCALE_RESPONSES, + EXAMPLE_NUMERICAL_SCALE_RESPONSE_OUTPUT, + EXAMPLE_RANK_OPTION_QUESTION_MODEL, + EXAMPLE_RANK_RECIPIENT_QUESTIONS, + EXAMPLE_RANK_RECIPIENT_QUESTION_MODEL, + EXAMPLE_RANK_RECIPIENT_QUESTION_TAB_MODEL, + EXAMPLE_RANK_RECIPIENT_RESPONSE_OUTPUT, + EXAMPLE_RESPONDER_RUBRIC_SUBMISSION_FORM_MODEL, + EXAMPLE_RUBRIC_QUESTION_MODEL, + EXAMPLE_RUBRIC_QUESTION_QUESTIONS, + EXAMPLE_RUBRIC_QUESTION_QUESTION_TAB_MODEL, + EXAMPLE_RUBRIC_QUESTION_RESPONSE_OUTPUT, + EXAMPLE_TEAM_CONTRIBUTION_QUESTIONS, + EXAMPLE_TEAM_CONTRIBUTION_QUESTION_MODEL, + EXAMPLE_TEAM_CONTRIBUTION_QUESTION_TAB_MODEL, + EXAMPLE_TEAM_CONTRIBUTION_RESPONSE_OUTPUT, +} from './instructor-help-questions-data'; /** * Questions Section of the Instructor Help Page. @@ -64,1402 +72,44 @@ export class InstructorHelpQuestionsSectionComponent extends InstructorHelpSecti InstructorSessionResultSectionType: typeof InstructorSessionResultSectionType = InstructorSessionResultSectionType; QuestionEditFormMode: typeof QuestionEditFormMode = QuestionEditFormMode; - readonly exampleEssayQuestionModel: QuestionEditFormModel = { - feedbackQuestionId: '', - isQuestionHasResponses: false, - - questionNumber: 1, - questionBrief: '', - questionDescription: '', - questionType: FeedbackQuestionType.TEXT, - questionDetails: DEFAULT_TEXT_QUESTION_DETAILS(), - - isEditable: false, - isSaving: false, - isCollapsed: false, - isChanged: false, - - giverType: FeedbackParticipantType.STUDENTS, - recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, - - customNumberOfEntitiesToGiveFeedbackTo: 0, - numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, - - showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], - showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - }; - - readonly exampleNumericalScaleQuestionModel: QuestionEditFormModel = { - feedbackQuestionId: '', - isQuestionHasResponses: false, - - questionNumber: 1, - questionBrief: '', - questionDescription: '', - questionType: FeedbackQuestionType.NUMSCALE, - questionDetails: DEFAULT_NUMSCALE_QUESTION_DETAILS(), - - isEditable: false, - isSaving: false, - isCollapsed: false, - isChanged: false, - - giverType: FeedbackParticipantType.STUDENTS, - recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, - - customNumberOfEntitiesToGiveFeedbackTo: 0, - numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, - - showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], - showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - }; - - readonly exampleNumericalScaleResponses: Response[] = [ - { - giver: 'Alice', - giverEmail: 'alice@gmail.com', - giverTeam: 'Team 1', - giverSection: '', - recipient: 'Bob', - recipientEmail: 'bob@gmail.com', - recipientTeam: 'Team 2', - recipientSection: '', - responseDetails: { - answer: 5, - questionType: FeedbackQuestionType.NUMSCALE, - }, - }, - { - giver: 'Charles', - giverEmail: 'charles@gmail.com', - giverTeam: 'Team 1', - giverSection: '', - recipient: 'Bob', - recipientEmail: 'bob@gmail.com', - recipientTeam: 'Team 2', - recipientSection: '', - responseDetails: { - answer: 5, - questionType: FeedbackQuestionType.NUMSCALE, - }, - }, - { - giver: 'David', - giverEmail: 'david@gmail.com', - giverTeam: 'Team 1', - giverSection: '', - recipient: 'Bob', - recipientEmail: 'bob@gmail.com', - recipientTeam: 'Team 2', - recipientSection: '', - responseDetails: { - answer: 2, - questionType: FeedbackQuestionType.NUMSCALE, - }, - }, - { - giver: 'Bob', - giverEmail: 'bob@gmail.com', - giverTeam: 'Team 2', - giverSection: '', - recipient: 'Bob', - recipientEmail: 'bob@gmail.com', - recipientTeam: 'Team 2', - recipientSection: '', - responseDetails: { - answer: 5, - questionType: FeedbackQuestionType.NUMSCALE, - }, - }, - { - giver: 'Alice', - giverEmail: 'alice@gmail.com', - giverTeam: 'Team 1', - giverSection: '', - recipient: 'Emma', - recipientEmail: 'emma@gmail.com', - recipientTeam: 'Team 2', - recipientSection: '', - responseDetails: { - answer: 4, - questionType: FeedbackQuestionType.NUMSCALE, - }, - }, - { - giver: 'Charles', - giverEmail: 'charles@gmail.com', - giverTeam: 'Team 1', - giverSection: '', - recipient: 'Emma', - recipientEmail: 'emma@gmail.com', - recipientTeam: 'Team 2', - recipientSection: '', - responseDetails: { - answer: 3, - questionType: FeedbackQuestionType.NUMSCALE, - }, - }, - { - giver: 'David', - giverEmail: 'david@gmail.com', - giverTeam: 'Team 1', - giverSection: '', - recipient: 'Emma', - recipientEmail: 'emma@gmail.com', - recipientTeam: 'Team 2', - recipientSection: '', - responseDetails: { - answer: 4, - questionType: FeedbackQuestionType.NUMSCALE, - }, - }, - { - giver: 'Emma', - giverEmail: 'emma@gmail.com', - giverTeam: 'Team 2', - giverSection: '', - recipient: 'Emma', - recipientEmail: 'emma@gmail.com', - recipientTeam: 'Team 2', - recipientSection: '', - responseDetails: { - answer: 5, - questionType: FeedbackQuestionType.NUMSCALE, - }, - }, - ]; - - readonly exampleNumericalScaleResponseOutput: ResponseOutput[] = [ - { - isMissingResponse: false, - responseId: '1', - giver: 'Alice', - giverTeam: 'Team 1', - giverEmail: 'alice@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: 5, - questionType: FeedbackQuestionType.NUMSCALE, - } as FeedbackNumericalScaleResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '2', - giver: 'Charles', - giverTeam: 'Team 1', - giverEmail: 'charles@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: 5, - questionType: FeedbackQuestionType.NUMSCALE, - } as FeedbackNumericalScaleResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '3', - giver: 'David', - giverTeam: 'Team 1', - giverEmail: 'david@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: 2, - questionType: FeedbackQuestionType.NUMSCALE, - } as FeedbackNumericalScaleResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '4', - giver: 'Bob', - giverTeam: 'Team 2', - giverEmail: 'bob@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: 5, - questionType: FeedbackQuestionType.NUMSCALE, - } as FeedbackNumericalScaleResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '5', - giver: 'Alice', - giverTeam: 'Team 1', - giverEmail: 'alice@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: 4, - questionType: FeedbackQuestionType.NUMSCALE, - } as FeedbackNumericalScaleResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '6', - giver: 'Charles', - giverTeam: 'Team 1', - giverEmail: 'charles@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: 3, - questionType: FeedbackQuestionType.NUMSCALE, - } as FeedbackNumericalScaleResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '7', - giver: 'David', - giverTeam: 'Team 1', - giverEmail: 'david@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: 4, - questionType: FeedbackQuestionType.NUMSCALE, - } as FeedbackNumericalScaleResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '8', - giver: 'Emma', - giverTeam: 'Team 2', - giverEmail: 'emma@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: 5, - questionType: FeedbackQuestionType.NUMSCALE, - } as FeedbackNumericalScaleResponseDetails, - instructorComments: [], - }, - ]; - - readonly exampleNumericalScaleQuestionTabModel: QuestionTabModel = { - question: this.exampleNumericalScaleQuestionModel, - responses: this.exampleNumericalScaleResponseOutput, - statistics: '', - hasPopulated: true, - isTabExpanded: true, - }; - - readonly exampleNumericalScaleQuestions: Record = { - question: this.exampleNumericalScaleQuestionTabModel, - }; - - readonly exampleInstructorCommentTableModel: Record = { - 1: { - commentRows: [], - newCommentRow: { - commentEditFormModel: { - commentText: '', - - isUsingCustomVisibilities: false, - showCommentTo: [], - showGiverNameTo: [], - }, - isEditing: false, - }, - - isAddingNewComment: false, - isReadOnly: true, - }, - 2: { - commentRows: [], - newCommentRow: { - commentEditFormModel: { - commentText: '', - - isUsingCustomVisibilities: false, - showCommentTo: [], - showGiverNameTo: [], - }, - isEditing: false, - }, - - isAddingNewComment: false, - isReadOnly: true, - }, - 3: { - commentRows: [], - newCommentRow: { - commentEditFormModel: { - commentText: '', - - isUsingCustomVisibilities: false, - showCommentTo: [], - showGiverNameTo: [], - }, - isEditing: false, - }, - - isAddingNewComment: false, - isReadOnly: true, - }, - 4: { - commentRows: [], - newCommentRow: { - commentEditFormModel: { - commentText: '', - - isUsingCustomVisibilities: false, - showCommentTo: [], - showGiverNameTo: [], - }, - isEditing: false, - }, - - isAddingNewComment: false, - isReadOnly: true, - }, - 5: { - commentRows: [], - newCommentRow: { - commentEditFormModel: { - commentText: '', - - isUsingCustomVisibilities: false, - showCommentTo: [], - showGiverNameTo: [], - }, - isEditing: false, - }, - - isAddingNewComment: false, - isReadOnly: true, - }, - 6: { - commentRows: [], - newCommentRow: { - commentEditFormModel: { - commentText: '', - - isUsingCustomVisibilities: false, - showCommentTo: [], - showGiverNameTo: [], - }, - isEditing: false, - }, - - isAddingNewComment: false, - isReadOnly: true, - }, - 7: { - commentRows: [], - newCommentRow: { - commentEditFormModel: { - commentText: '', - - isUsingCustomVisibilities: false, - showCommentTo: [], - showGiverNameTo: [], - }, - isEditing: false, - }, - - isAddingNewComment: false, - isReadOnly: true, - }, - 8: { - commentRows: [], - newCommentRow: { - commentEditFormModel: { - commentText: '', - - isUsingCustomVisibilities: false, - showCommentTo: [], - showGiverNameTo: [], - }, - isEditing: false, - }, - - isAddingNewComment: false, - isReadOnly: true, - }, - }; - - readonly exampleFeedbackSession: FeedbackSession = { - courseId: 'CS2103T', - timeZone: 'UTC', - feedbackSessionName: 'Project Feedback 1', - instructions: 'Enter your feedback for projects', - submissionStartTimestamp: 0, - submissionEndTimestamp: 0, - gracePeriod: 0, - sessionVisibleSetting: SessionVisibleSetting.AT_OPEN, - responseVisibleSetting: ResponseVisibleSetting.AT_VISIBLE, - submissionStatus: FeedbackSessionSubmissionStatus.CLOSED, - publishStatus: FeedbackSessionPublishStatus.NOT_PUBLISHED, - isClosingEmailEnabled: true, - isPublishedEmailEnabled: true, - createdAtTimestamp: 0, - }; - - readonly exampleDistributePointOptionQuestionDetail: FeedbackConstantSumQuestionDetails = { - numOfConstSumOptions: 2, - constSumOptions: ['Option A', 'Option B'], - distributeToRecipients: false, - pointsPerOption: false, - forceUnevenDistribution: false, - distributePointsFor: FeedbackConstantSumDistributePointsType.NONE, - points: 100, - questionType: FeedbackQuestionType.CONSTSUM_OPTIONS, - questionText: '', - }; - - readonly exampleDistributedPointOptionModel: QuestionEditFormModel = { - feedbackQuestionId: '', - isQuestionHasResponses: false, - - questionNumber: 1, - questionBrief: '', - questionDescription: '', - questionType: FeedbackQuestionType.CONSTSUM_OPTIONS, - questionDetails: this.exampleDistributePointOptionQuestionDetail, - - isEditable: false, - isSaving: false, - isCollapsed: false, - isChanged: false, - - giverType: FeedbackParticipantType.STUDENTS, - recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, - - customNumberOfEntitiesToGiveFeedbackTo: 0, - numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, - - showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], - showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - }; - - readonly exampleDistributePointOptionResponseOutput: ResponseOutput[] = [ - { - isMissingResponse: false, - responseId: '1', - giver: 'Alice', - giverTeam: 'Team 1', - giverEmail: 'alice@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answers: [2, 8], - questionType: FeedbackQuestionType.CONSTSUM, - } as FeedbackConstantSumResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '2', - giver: 'Charles', - giverTeam: 'Team 1', - giverEmail: 'charles@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answers: [3, 7], - questionType: FeedbackQuestionType.CONSTSUM, - } as FeedbackConstantSumResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '3', - giver: 'David', - giverTeam: 'Team 1', - giverEmail: 'david@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answers: [5, 5], - questionType: FeedbackQuestionType.CONSTSUM, - } as FeedbackConstantSumResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '4', - giver: 'Bob', - giverTeam: 'Team 2', - giverEmail: 'bob@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answers: [5, 5], - questionType: FeedbackQuestionType.CONSTSUM, - } as FeedbackConstantSumResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '5', - giver: 'Alice', - giverTeam: 'Team 1', - giverEmail: 'alice@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answers: [9, 1], - questionType: FeedbackQuestionType.CONSTSUM, - } as FeedbackConstantSumResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '6', - giver: 'Charles', - giverTeam: 'Team 1', - giverEmail: 'charles@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answers: [6, 4], - questionType: FeedbackQuestionType.CONSTSUM, - } as FeedbackConstantSumResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '7', - giver: 'David', - giverTeam: 'Team 1', - giverEmail: 'david@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answers: [4, 6], - questionType: FeedbackQuestionType.CONSTSUM, - } as FeedbackConstantSumResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '8', - giver: 'Emma', - giverTeam: 'Team 2', - giverEmail: 'emma@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answers: [7, 3], - questionType: FeedbackQuestionType.CONSTSUM, - } as FeedbackConstantSumResponseDetails, - instructorComments: [], - }, - ]; - - readonly exampleDistributePointOptionQuestionTabModel: QuestionTabModel = { - question: this.exampleDistributedPointOptionModel, - responses: this.exampleDistributePointOptionResponseOutput, - statistics: '', - hasPopulated: true, - isTabExpanded: true, - }; - - readonly exampleDistributePointOptionQuestions: Record = { - question: this.exampleDistributePointOptionQuestionTabModel, - }; - - readonly exampleDistributedPointRecipientModel: QuestionEditFormModel = { - feedbackQuestionId: '', - isQuestionHasResponses: false, - - questionNumber: 1, - questionBrief: '', - questionDescription: '', - questionType: FeedbackQuestionType.CONSTSUM_RECIPIENTS, - questionDetails: DEFAULT_CONSTSUM_RECIPIENTS_QUESTION_DETAILS(), - - isEditable: false, - isSaving: false, - isCollapsed: false, - isChanged: false, - - giverType: FeedbackParticipantType.STUDENTS, - recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, - - customNumberOfEntitiesToGiveFeedbackTo: 0, - numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, - - showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], - showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - }; - - readonly exampleTeamContributionQuestionModel: QuestionEditFormModel = { - feedbackQuestionId: '', - isQuestionHasResponses: false, - - questionNumber: 1, - questionBrief: '', - questionDescription: '', - questionType: FeedbackQuestionType.CONTRIB, - questionDetails: DEFAULT_CONTRIBUTION_QUESTION_DETAILS(), - - isEditable: false, - isSaving: false, - isCollapsed: false, - isChanged: false, - - giverType: FeedbackParticipantType.STUDENTS, - recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS_INCLUDING_SELF, - - customNumberOfEntitiesToGiveFeedbackTo: 0, - numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, - - showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT, - FeedbackVisibilityType.GIVER_TEAM_MEMBERS], - showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], - showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - }; - - readonly exampleTeamContributionResponseOutput: ResponseOutput[] = [ - { - isMissingResponse: false, - responseId: '1', - giver: 'Alice', - giverTeam: 'Team 1', - giverEmail: 'alice@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: 90, - questionType: FeedbackQuestionType.CONTRIB, - } as FeedbackContributionResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '2', - giver: 'Charles', - giverTeam: 'Team 1', - giverEmail: 'charles@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: 70, - questionType: FeedbackQuestionType.CONTRIB, - } as FeedbackContributionResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '3', - giver: 'David', - giverTeam: 'Team 1', - giverEmail: 'david@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: 120, - questionType: FeedbackQuestionType.CONTRIB, - } as FeedbackContributionResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '4', - giver: 'Bob', - giverTeam: 'Team 2', - giverEmail: 'bob@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: 100, - questionType: FeedbackQuestionType.CONTRIB, - } as FeedbackContributionResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '5', - giver: 'Alice', - giverTeam: 'Team 1', - giverEmail: 'alice@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: 110, - questionType: FeedbackQuestionType.CONTRIB, - } as FeedbackContributionResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '6', - giver: 'Charles', - giverTeam: 'Team 1', - giverEmail: 'charles@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: 110, - questionType: FeedbackQuestionType.CONTRIB, - } as FeedbackContributionResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '7', - giver: 'David', - giverTeam: 'Team 1', - giverEmail: 'david@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: 100, - questionType: FeedbackQuestionType.CONTRIB, - } as FeedbackContributionResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '8', - giver: 'Emma', - giverTeam: 'Team 2', - giverEmail: 'emma@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: 110, - questionType: FeedbackQuestionType.CONTRIB, - } as FeedbackContributionResponseDetails, - instructorComments: [], - }, - ]; - - readonly exampleContributionStatistics: ContributionStatistics = { - results: { - 'emma@gmail.com': { - claimed: 110, - perceived: 106, - claimedOthers: [], - perceivedOthers: [110, 110, 100], - }, - 'bob@gmail.com': { - claimed: 100, - perceived: 93, - claimedOthers: [], - perceivedOthers: [90, 70, 120], - }, - }, - }; - - readonly exampleTeamContributionQuestionTabModel: QuestionTabModel = { - question: this.exampleTeamContributionQuestionModel, - responses: this.exampleTeamContributionResponseOutput, - statistics: JSON.stringify(this.exampleContributionStatistics), - hasPopulated: true, - isTabExpanded: true, - }; - - readonly exampleTeamContributionQuestions: Record = { - question: this.exampleTeamContributionQuestionTabModel, - }; - - readonly exampleRubricQuestionModel: QuestionEditFormModel = { - feedbackQuestionId: '', - isQuestionHasResponses: false, - - questionNumber: 1, - questionBrief: '', - questionDescription: '', - questionType: FeedbackQuestionType.RUBRIC, - questionDetails: { - ...DEFAULT_RUBRIC_QUESTION_DETAILS(), - numOfRubricChoices: 4, - rubricChoices: ['Strongly Disagree', 'Disagree', 'Agree', 'Strongly Agree'], - numOfRubricSubQuestions: 2, - rubricSubQuestions: - ['This student participates well in online discussions.', 'This student completes assigned tasks on time.'], - rubricDescriptions: [ - ['Rarely or never responds.', 'Occasionally responds, but never initiates discussions.', - 'Takes part in discussions and sometimes initiates discussions.', - 'Initiates discussions frequently, and engages the team.'], - ['Rarely or never completes tasks.', 'Often misses deadlines.', 'Occasionally misses deadlines.', - 'Tasks are always completed before the deadline.']], - } as FeedbackRubricQuestionDetails, - - isEditable: false, - isSaving: false, - isCollapsed: false, - isChanged: false, - - giverType: FeedbackParticipantType.STUDENTS, - recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, - - customNumberOfEntitiesToGiveFeedbackTo: 0, - numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, - - showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], - showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - }; - - readonly exampleRubricQuestionResponseOutput: ResponseOutput[] = [ - { - isMissingResponse: false, - responseId: '1', - giver: 'Alice', - giverTeam: 'Team 1', - giverEmail: 'alice@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: [0, 0], - questionType: FeedbackQuestionType.RUBRIC, - } as FeedbackRubricResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '2', - giver: 'Charles', - giverTeam: 'Team 1', - giverEmail: 'charles@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: [2, 2], - questionType: FeedbackQuestionType.RUBRIC, - } as FeedbackRubricResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '3', - giver: 'David', - giverTeam: 'Team 1', - giverEmail: 'david@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: [1, 1], - questionType: FeedbackQuestionType.RUBRIC, - } as FeedbackRubricResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '4', - giver: 'Bob', - giverTeam: 'Team 2', - giverEmail: 'bob@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: [1, 2], - questionType: FeedbackQuestionType.RUBRIC, - } as FeedbackRubricResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '5', - giver: 'Alice', - giverTeam: 'Team 1', - giverEmail: 'alice@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: [0, 1], - questionType: FeedbackQuestionType.RUBRIC, - } as FeedbackRubricResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '6', - giver: 'Charles', - giverTeam: 'Team 1', - giverEmail: 'charles@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: [2, 3], - questionType: FeedbackQuestionType.RUBRIC, - } as FeedbackRubricResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '7', - giver: 'David', - giverTeam: 'Team 1', - giverEmail: 'david@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: [1, 3], - questionType: FeedbackQuestionType.RUBRIC, - } as FeedbackRubricResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '8', - giver: 'Emma', - giverTeam: 'Team 2', - giverEmail: 'emma@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: [0, 1], - questionType: FeedbackQuestionType.RUBRIC, - } as FeedbackRubricResponseDetails, - instructorComments: [], - }, - ]; - - readonly exampleRubricQuestionQuestionTabModel: QuestionTabModel = { - question: this.exampleRubricQuestionModel, - responses: this.exampleRubricQuestionResponseOutput, - statistics: '', - hasPopulated: true, - isTabExpanded: true, - }; - - readonly exampleRubricQuestionQuestions: Record = { - question: this.exampleRubricQuestionQuestionTabModel, - }; - - readonly exampleRankRecipientQuestionModel: QuestionEditFormModel = { - feedbackQuestionId: '', - isQuestionHasResponses: false, - - questionNumber: 1, - questionBrief: '', - questionDescription: '', - questionType: FeedbackQuestionType.RANK_RECIPIENTS, - questionDetails: DEFAULT_RANK_RECIPIENTS_QUESTION_DETAILS(), - - isEditable: false, - isSaving: false, - isCollapsed: false, - isChanged: false, - - giverType: FeedbackParticipantType.STUDENTS, - recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, - - customNumberOfEntitiesToGiveFeedbackTo: 0, - numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, - - showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], - showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - }; - - readonly exampleRankRecipientResponseOutput: ResponseOutput[] = [ - { - isMissingResponse: false, - responseId: '1', - giver: 'Alice', - giverTeam: 'Team 1', - giverEmail: 'alice@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: 2, - questionType: FeedbackQuestionType.RANK_RECIPIENTS, - } as FeedbackRankRecipientsResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '2', - giver: 'Charles', - giverTeam: 'Team 1', - giverEmail: 'charles@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: 3, - questionType: FeedbackQuestionType.RANK_RECIPIENTS, - } as FeedbackRankRecipientsResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '3', - giver: 'David', - giverTeam: 'Team 1', - giverEmail: 'david@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: 4, - questionType: FeedbackQuestionType.RANK_RECIPIENTS, - } as FeedbackRankRecipientsResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '4', - giver: 'Bob', - giverTeam: 'Team 2', - giverEmail: 'bob@gmail.com', - giverSection: '', - recipient: 'Bob', - recipientTeam: 'Team 2', - recipientEmail: 'bob@gmail.com', - recipientSection: '', - responseDetails: { - answer: 1, - questionType: FeedbackQuestionType.RANK_RECIPIENTS, - } as FeedbackRankRecipientsResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '5', - giver: 'Alice', - giverTeam: 'Team 1', - giverEmail: 'alice@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: 2, - questionType: FeedbackQuestionType.RANK_RECIPIENTS, - } as FeedbackRankRecipientsResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '6', - giver: 'Charles', - giverTeam: 'Team 1', - giverEmail: 'charles@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: 3, - questionType: FeedbackQuestionType.RANK_RECIPIENTS, - } as FeedbackRankRecipientsResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '7', - giver: 'David', - giverTeam: 'Team 1', - giverEmail: 'david@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: 2, - questionType: FeedbackQuestionType.RANK_RECIPIENTS, - } as FeedbackRankRecipientsResponseDetails, - instructorComments: [], - }, - { - isMissingResponse: false, - responseId: '8', - giver: 'Emma', - giverTeam: 'Team 2', - giverEmail: 'emma@gmail.com', - giverSection: '', - recipient: 'Emma', - recipientTeam: 'Team 2', - recipientEmail: 'emma@gmail.com', - recipientSection: '', - responseDetails: { - answer: 2, - questionType: FeedbackQuestionType.RANK_RECIPIENTS, - } as FeedbackRankRecipientsResponseDetails, - instructorComments: [], - }, - ]; - - readonly exampleRankRecipientQuestionTabModel: QuestionTabModel = { - question: this.exampleRankRecipientQuestionModel, - responses: this.exampleRankRecipientResponseOutput, - statistics: '', - hasPopulated: true, - isTabExpanded: true, - }; - - readonly exampleRankRecipientQuestions: Record = { - question: this.exampleRankRecipientQuestionTabModel, - }; - - readonly exampleRankOptionQuestionModel: QuestionEditFormModel = { - feedbackQuestionId: '', - isQuestionHasResponses: false, - - questionNumber: 1, - questionBrief: '', - questionDescription: '', - questionType: FeedbackQuestionType.RANK_OPTIONS, - questionDetails: DEFAULT_RANK_OPTIONS_QUESTION_DETAILS(), - - isEditable: false, - isSaving: false, - isCollapsed: false, - isChanged: false, - - giverType: FeedbackParticipantType.STUDENTS, - recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, - - customNumberOfEntitiesToGiveFeedbackTo: 0, - numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, - - showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT, - FeedbackVisibilityType.GIVER_TEAM_MEMBERS], - showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], - showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - }; - - readonly exampleMCQQuestionWithoutWeightsModel: QuestionEditFormModel = { - feedbackQuestionId: '', - isQuestionHasResponses: false, - - questionNumber: 1, - questionBrief: 'How much did you think you contributed?', - questionDescription: '', - questionType: FeedbackQuestionType.MCQ, - questionDetails: { - ...DEFAULT_MCQ_QUESTION_DETAILS(), - numOfMcqChoices: 3, - mcqChoices: ['I did great!', 'I performed satisfactorily.', 'I did not contribute as much as I wanted to.'], - hasAssignedWeights: false, - mcqWeights: [], - } as FeedbackMcqQuestionDetails, - - isEditable: false, - isSaving: false, - isCollapsed: false, - isChanged: false, - - giverType: FeedbackParticipantType.STUDENTS, - recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, - - customNumberOfEntitiesToGiveFeedbackTo: 0, - numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, - - showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT, - FeedbackVisibilityType.GIVER_TEAM_MEMBERS], - showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], - showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - }; - - readonly exampleMCQQuestionWithWeightsModel: QuestionEditFormModel = { - feedbackQuestionId: '', - isQuestionHasResponses: false, - - questionNumber: 1, - questionBrief: 'How much did you think you contributed?', - questionDescription: '', - questionType: FeedbackQuestionType.MCQ, - questionDetails: { - ...DEFAULT_MCQ_QUESTION_DETAILS(), - numOfMcqChoices: 3, - mcqChoices: ['I did great!', 'I performed satisfactorily.', 'I did not contribute as much as I wanted to.'], - hasAssignedWeights: true, - mcqWeights: [1, 3, 5], - } as FeedbackMcqQuestionDetails, - - isEditable: false, - isSaving: false, - isCollapsed: false, - isChanged: false, - - giverType: FeedbackParticipantType.STUDENTS, - recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, - - customNumberOfEntitiesToGiveFeedbackTo: 0, - numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, - - showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT, - FeedbackVisibilityType.GIVER_TEAM_MEMBERS], - showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], - showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - }; - - readonly exampleResponderRubricSubmissionFormModel: QuestionSubmissionFormModel = { - recipientList: [ - { - recipientIdentifier: 'alice', - recipientName: 'Alice', - }, - { - recipientIdentifier: 'bob', - recipientName: 'Bob', - }, - ], - recipientSubmissionForms: [ - { - responseId: 'response1', - recipientIdentifier: 'alice', - responseDetails: { questionType: FeedbackQuestionType.RUBRIC, answer: [0, 2] } as FeedbackRubricResponseDetails, - }, - { - responseId: 'response2', - recipientIdentifier: 'bob', - responseDetails: { questionType: FeedbackQuestionType.RUBRIC, answer: [1, 3] } as FeedbackRubricResponseDetails, - }, - ], - customNumberOfEntitiesToGiveFeedbackTo: 0, - feedbackQuestionId: '', - questionNumber: 1, - questionBrief: '', - questionDescription: '', - questionType: FeedbackQuestionType.RUBRIC, - giverType: FeedbackParticipantType.STUDENTS, - recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS, - numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, - showResponsesTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - showGiverNameTo: [FeedbackVisibilityType.INSTRUCTORS], - showRecipientNameTo: [FeedbackVisibilityType.INSTRUCTORS, FeedbackVisibilityType.RECIPIENT], - questionDetails: { - ...DEFAULT_RUBRIC_QUESTION_DETAILS(), - numOfRubricChoices: 4, - rubricChoices: ['Strongly Disagree', 'Disagree', 'Agree', 'Strongly Agree'], - numOfRubricSubQuestions: 2, - rubricSubQuestions: [ - 'This student participates well in online discussions.', - 'This student completes assigned tasks on time.', - ], - rubricDescriptions: - [ - [ - 'Rarely or never responds.', 'Occasionally responds, but never initiates discussions.', - 'Takes part in discussions and sometimes initiates discussions.', - 'Initiates discussions frequently, and engages the team.', - ], - [ - 'Rarely or never completes tasks.', - 'Often misses deadlines.', - 'Occasionally misses deadlines.', - 'Tasks are always completed before the deadline.', - ], - ], - } as FeedbackRubricQuestionDetails, - }; + readonly exampleEssayQuestionModel: QuestionEditFormModel = EXAMPLE_ESSAY_QUESTION_MODEL; + readonly exampleNumericalScaleQuestionModel: QuestionEditFormModel = EXAMPLE_NUMERICAL_SCALE_QUESTION_MODEL; + readonly exampleNumericalScaleResponses: Response[] + = EXAMPLE_NUMERICAL_SCALE_RESPONSES; + readonly exampleNumericalScaleResponseOutput: ResponseOutput[] = EXAMPLE_NUMERICAL_SCALE_RESPONSE_OUTPUT; + readonly exampleNumericalScaleQuestionTabModel: QuestionTabModel = EXAMPLE_NUMERICAL_SCALE_QUESTION_TAB_MODEL; + readonly exampleNumericalScaleQuestions: Record = EXAMPLE_NUMERICAL_SCALE_QUESTIONS; + readonly exampleInstructorCommentTableModel: Record + = EXAMPLE_INSTRUCTOR_COMMENT_TABLE_MODEL; + readonly exampleFeedbackSession: FeedbackSession = EXAMPLE_FEEDBACK_SESSION; + readonly exampleDistributePointOptionQuestionDetail: FeedbackConstantSumQuestionDetails + = EXAMPLE_DISTRIBUTE_POINT_OPTION_QUESTION_DETAIL; + readonly exampleDistributedPointOptionModel: QuestionEditFormModel = EXAMPLE_DISTRIBUTED_POINT_OPTION_MODEL; + readonly exampleDistributePointOptionResponseOutput: ResponseOutput[] + = EXAMPLE_DISTRIBUTE_POINT_OPTION_RESPONSE_OUTPUT; + readonly exampleDistributePointOptionQuestionTabModel: QuestionTabModel + = EXAMPLE_DISTRIBUTE_POINT_OPTION_QUESTION_TAB_MODEL; + readonly exampleDistributePointOptionQuestions: Record + = EXAMPLE_DISTRIBUTE_POINT_OPTION_QUESTIONS; + readonly exampleDistributedPointRecipientModel: QuestionEditFormModel = EXAMPLE_DISTRIBUTED_POINT_RECIPIENT_MODEL; + readonly exampleTeamContributionQuestionModel: QuestionEditFormModel = EXAMPLE_TEAM_CONTRIBUTION_QUESTION_MODEL; + readonly exampleTeamContributionResponseOutput: ResponseOutput[] = EXAMPLE_TEAM_CONTRIBUTION_RESPONSE_OUTPUT; + readonly exampleContributionStatistics: ContributionStatistics = EXAMPLE_CONTRIBUTION_STATISTICS; + readonly exampleTeamContributionQuestionTabModel: QuestionTabModel = EXAMPLE_TEAM_CONTRIBUTION_QUESTION_TAB_MODEL; + readonly exampleTeamContributionQuestions: Record = EXAMPLE_TEAM_CONTRIBUTION_QUESTIONS; + readonly exampleRubricQuestionModel: QuestionEditFormModel = EXAMPLE_RUBRIC_QUESTION_MODEL; + readonly exampleRubricQuestionResponseOutput: ResponseOutput[] = EXAMPLE_RUBRIC_QUESTION_RESPONSE_OUTPUT; + readonly exampleRubricQuestionQuestionTabModel: QuestionTabModel = EXAMPLE_RUBRIC_QUESTION_QUESTION_TAB_MODEL; + readonly exampleRubricQuestionQuestions: Record = EXAMPLE_RUBRIC_QUESTION_QUESTIONS; + readonly exampleRankRecipientQuestionModel: QuestionEditFormModel = EXAMPLE_RANK_RECIPIENT_QUESTION_MODEL; + readonly exampleRankRecipientResponseOutput: ResponseOutput[] = EXAMPLE_RANK_RECIPIENT_RESPONSE_OUTPUT; + readonly exampleRankRecipientQuestionTabModel: QuestionTabModel = EXAMPLE_RANK_RECIPIENT_QUESTION_TAB_MODEL; + readonly exampleRankRecipientQuestions: Record = EXAMPLE_RANK_RECIPIENT_QUESTIONS; + readonly exampleRankOptionQuestionModel: QuestionEditFormModel = EXAMPLE_RANK_OPTION_QUESTION_MODEL; + readonly exampleMCQQuestionWithoutWeightsModel: QuestionEditFormModel = EXAMPLE_MCQ_QUESTION_WITHOUT_WEIGHTS_MODEL; + readonly exampleMCQQuestionWithWeightsModel: QuestionEditFormModel = EXAMPLE_MCQ_QUESTION_WITH_WEIGHTS_MODEL; + readonly exampleResponderRubricSubmissionFormModel: QuestionSubmissionFormModel + = EXAMPLE_RESPONDER_RUBRIC_SUBMISSION_FORM_MODEL; isEssayQuestionsCollapsed: boolean = false; isMCQSingleAnsCollapsed: boolean = false; diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-data.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-data.ts new file mode 100644 index 00000000000..feb585d665a --- /dev/null +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-data.ts @@ -0,0 +1,420 @@ +import { TemplateSession } from '../../../../services/feedback-sessions.service'; +import { + CommentVisibilityType, + Course, FeedbackContributionResponseDetails, FeedbackMcqQuestionDetails, FeedbackMcqResponseDetails, + FeedbackParticipantType, + FeedbackQuestionType, FeedbackSession, + FeedbackSessionPublishStatus, + FeedbackSessionSubmissionStatus, + Instructor, + InstructorPermissionRole, + JoinState, + NumberOfEntitiesToGiveFeedbackToSetting, QuestionOutput, + ResponseOutput, + ResponseVisibleSetting, + SessionVisibleSetting, + Student, +} from '../../../../types/api-output'; +import { + DEFAULT_CONTRIBUTION_RESPONSE_DETAILS, DEFAULT_MCQ_QUESTION_DETAILS, + DEFAULT_MCQ_RESPONSE_DETAILS, +} from '../../../../types/default-question-structs'; +import { CommentEditFormModel } from '../../../components/comment-box/comment-edit-form/comment-edit-form.component'; +import { CommentTableModel } from '../../../components/comment-box/comment-table/comment-table.component'; +import { + SessionEditFormModel, +} from '../../../components/session-edit-form/session-edit-form-model'; +import { + RecycleBinFeedbackSessionRowModel, +} from '../../../components/sessions-recycle-bin-table/sessions-recycle-bin-table.component'; +import { + SearchCommentsTable, +} from '../../../pages-instructor/instructor-search-page/comment-result-table/comment-result-table.component'; +import { SectionTabModel, +} from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-page.component'; + +/** + * Structure of example session edit form model + */ +export const EXAMPLE_SESSION_EDIT_FORM_MODEL: SessionEditFormModel = { + courseId: 'CS2103T', + timeZone: 'UTC', + courseName: 'Software Engineering', + feedbackSessionName: 'Feedback for Project', + instructions: 'This is where you type the instructions for the session', + + submissionStartTime: { hour: 10, minute: 0 }, + submissionStartDate: { year: 2020, month: 3, day: 13 }, + submissionEndTime: { hour: 12, minute: 0 }, + submissionEndDate: { year: 2020, month: 3, day: 13 }, + gracePeriod: 0, + + sessionVisibleSetting: SessionVisibleSetting.AT_OPEN, + customSessionVisibleTime: { hour: 9, minute: 0 }, + customSessionVisibleDate: { year: 2020, month: 3, day: 13 }, + + responseVisibleSetting: ResponseVisibleSetting.CUSTOM, + customResponseVisibleTime: { hour: 13, minute: 0 }, + customResponseVisibleDate: { year: 2020, month: 3, day: 13 }, + + submissionStatus: FeedbackSessionSubmissionStatus.OPEN, + publishStatus: FeedbackSessionPublishStatus.NOT_PUBLISHED, + + isClosingEmailEnabled: true, + isPublishedEmailEnabled: true, + + templateSessionName: 'Example session', + + isSaving: false, + isEditable: false, + hasVisibleSettingsPanelExpanded: true, + hasEmailSettingsPanelExpanded: true, +}; +/** + * Structure of example of comment edit form model + */ +export let EXAMPLE_COMMENT_EDIT_FORM_MODEL: CommentEditFormModel = { + commentText: '', + + isUsingCustomVisibilities: false, + showCommentTo: [], + showGiverNameTo: [], +}; +/** + * Structure of example response + */ +export const EXAMPLE_RESPONSE: ResponseOutput = { + isMissingResponse: false, + responseId: '', + giver: 'Alice', + giverTeam: 'Team A', + giverSection: 'Section A', + recipient: 'Bob', + recipientTeam: 'Team B', + recipientSection: 'Section B', + responseDetails: DEFAULT_CONTRIBUTION_RESPONSE_DETAILS(), + instructorComments: [], +}; +/** + * Structure of example response with comment + */ +export const EXAMPLE_RESPONSE_WITH_COMMENT: ResponseOutput = { + isMissingResponse: false, + responseId: '1', + giver: 'Alice', + giverTeam: 'Team A', + giverSection: 'Section A', + recipient: 'Bob', + recipientTeam: 'Team B', + recipientSection: 'Section B', + responseDetails: { + answer: 110, + questionType: FeedbackQuestionType.CONTRIB, + } as FeedbackContributionResponseDetails, + instructorComments: [{ + commentGiver: 'Instructor', + lastEditorEmail: '', + feedbackResponseCommentId: 1, + commentText: 'Good to know!', + createdAt: 1, + lastEditedAt: 1, + isVisibilityFollowingFeedbackQuestion: true, + showGiverNameTo: [CommentVisibilityType.GIVER], + showCommentTo: [CommentVisibilityType.GIVER], + }], +}; +/** + * Structure of example course candidates + */ +export const EXAMPLE_COURSE_CANDIDATES: Course[] = [ + { + courseId: 'CS2103T', + courseName: 'Software Engineering', + timeZone: 'UTC', + creationTimestamp: 0, + deletionTimestamp: 0, + }, +]; +/** + * Structure of example template sessions + */ +export const EXAMPLE_TEMPLATE_SESSIONS: TemplateSession[] = [ + { + name: 'Example session', + questions: [], + }, +]; +/** + * Structure of example students + */ +export const EXAMPLE_STUDENTS: Student[] = [ + { + email: 'alice@email.com', + courseId: 'test.exa-demo', + name: 'Alice Betsy', + lastName: 'Betsy', + comments: 'Alice is a transfer student.', + teamName: 'Team A', + sectionName: 'Section A', + joinState: JoinState.JOINED, + }, +]; +/** + * Structure of example instructors + */ +export const EXAMPLE_INSTRUCTORS: Instructor[] = [ + { + googleId: 'bob@email.com', + courseId: 'test.exa-demo', + email: 'bob@email.com', + isDisplayedToStudents: true, + displayedToStudentsAs: 'Instructor', + name: 'Bob Ruth', + key: 'impicklerick', + role: InstructorPermissionRole.INSTRUCTOR_PERMISSION_ROLE_COOWNER, + joinState: JoinState.JOINED, + }, +]; + +/** + * Structure of example feedback session + */ +export const EXAMPLE_FEEDBACK_SESSION: FeedbackSession = { + courseId: 'CS2103T', + timeZone: 'UTC', + feedbackSessionName: 'Project Feedback 1', + instructions: 'Enter your feedback for projects', + submissionStartTimestamp: 0, + submissionEndTimestamp: 0, + gracePeriod: 0, + sessionVisibleSetting: SessionVisibleSetting.AT_OPEN, + responseVisibleSetting: ResponseVisibleSetting.AT_VISIBLE, + submissionStatus: FeedbackSessionSubmissionStatus.CLOSED, + publishStatus: FeedbackSessionPublishStatus.NOT_PUBLISHED, + isClosingEmailEnabled: true, + isPublishedEmailEnabled: true, + createdAtTimestamp: 0, +}; + +/** + * Structure of example recycle bin feedback sessions + */ +export const EXAMPLE_RECYCLE_BIN_FEEDBACK_SESSIONS: RecycleBinFeedbackSessionRowModel[] = [ + { + feedbackSession: EXAMPLE_FEEDBACK_SESSION, + }, +]; + +/** + * Structure of example instructor comment table model + */ +export const EXAMPLE_INSTRUCTOR_COMMENT_TABLE_MODEL: Record = { + 'feedbackQuestionId%bob@example.com%bob@example.com': { + isReadOnly: true, + commentRows: [], + newCommentRow: { + commentEditFormModel: { + commentText: '', + isUsingCustomVisibilities: true, + showCommentTo: [], + showGiverNameTo: [], + }, + isEditing: false, + }, + isAddingNewComment: true, + }, + 'feedbackQuestionId%bob@example.com%danny@example.com': { + isReadOnly: true, + commentRows: [], + newCommentRow: { + commentEditFormModel: { + commentText: '', + isUsingCustomVisibilities: false, + showCommentTo: [], + showGiverNameTo: [], + }, + isEditing: false, + }, + isAddingNewComment: false, + }, +}; + +/** + * Structure of example GRQ responses + */ +export const EXAMPLE_GRQ_RESPONSES: Record = { + 'Section A': { + questions: [ + { + feedbackQuestion: { + feedbackQuestionId: 'feedbackQuestionId', + questionNumber: 1, + questionBrief: 'How well did team member perform?', + questionDescription: '', + questionDetails: { + hasAssignedWeights: false, + mcqWeights: [], + mcqOtherWeight: 0, + numOfMcqChoices: 3, + mcqChoices: [ + '

    Good

    ', + '

    Normal

    ', + '

    Bad

    ', + ], + otherEnabled: false, + generateOptionsFor: 'NONE', + questionType: FeedbackQuestionType.MCQ, + questionText: 'How well did team member perform?', + } as FeedbackMcqQuestionDetails, + questionType: FeedbackQuestionType.MCQ, + giverType: FeedbackParticipantType.STUDENTS, + recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS_INCLUDING_SELF, + numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, + showResponsesTo: [], + showGiverNameTo: [], + showRecipientNameTo: [], + customNumberOfEntitiesToGiveFeedbackTo: 0, + }, + questionStatistics: '', + allResponses: [ + { + responseId: 'feedbackQuestionId%bob@example.com%bob@example.com', + giver: 'Bob Ruth', + giverTeam: 'Team A', + giverEmail: 'bob@example.com', + giverSection: 'Section A', + recipient: 'Bob Ruth', + recipientTeam: 'Team A', + recipientEmail: 'bob@example.com', + recipientSection: 'Section A', + responseDetails: { + answer: '

    Good

    ', + isOther: false, + otherFieldContent: '', + questionType: FeedbackQuestionType.MCQ, + } as FeedbackMcqResponseDetails, + instructorComments: [], + isMissingResponse: false, + }, + { + responseId: 'feedbackQuestionId%bob@example.com%danny@example.com', + giver: 'Bob Ruth', + giverTeam: 'Team A', + giverEmail: 'bob@example.com', + giverSection: 'Section A', + recipient: 'Danny Engrid', + recipientTeam: 'Team B', + recipientEmail: 'danny@example.com', + recipientSection: 'Section B', + responseDetails: { + answer: '

    Bad

    ', + isOther: false, + otherFieldContent: '', + questionType: FeedbackQuestionType.MCQ, + } as FeedbackMcqResponseDetails, + instructorComments: [], + isMissingResponse: false, + }, + ], + responsesToSelf: [], + responsesFromSelf: [], + otherResponses: [], + }, + ], + hasPopulated: true, + isTabExpanded: true, + }, +}; + +/** + * Structure of example questions with responses + */ +export const EXAMPLE_QUESTIONS_WITH_RESPONSES: QuestionOutput[] = [{ + feedbackQuestion: { + feedbackQuestionId: 'ag50ZWFtbWF0ZXMtam9obnIdCxIQRmVlZGJhY2tRdWVzdGlvbhiAgICAgIDICQw', + questionNumber: 1, + questionBrief: 'How well did this team member perform?', + questionDescription: '', + questionDetails: { + ...DEFAULT_MCQ_QUESTION_DETAILS(), + questionText: 'How well did this team member perform?', + numOfMcqChoices: 3, + mcqChoices: [ + '

    Good

    ', + '

    Normal

    ', + '

    Bad

    ', + ], + } as FeedbackMcqQuestionDetails, + questionType: FeedbackQuestionType.MCQ, + giverType: FeedbackParticipantType.STUDENTS, + recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS_INCLUDING_SELF, + numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, + showResponsesTo: [], + showGiverNameTo: [], + showRecipientNameTo: [], + customNumberOfEntitiesToGiveFeedbackTo: 0, + }, + questionStatistics: '', + allResponses: [EXAMPLE_RESPONSE_WITH_COMMENT], + responsesToSelf: [ + { + responseId: 'ag50ZWFtbWF0ZXMtam9obnIdCxIQRmVlZGJhY2tRdWVzdGlvbhiAgICAgIDICQw' + + '%benny.c.tmms@gmail.tmt%alice.b.tmms@gmail.tmt', + giver: 'Benny Charles', + giverTeam: 'Team A', + giverSection: 'Section A', + recipient: 'You', + recipientTeam: 'Team A', + recipientSection: 'Section A', + responseDetails: { + ...DEFAULT_MCQ_RESPONSE_DETAILS(), + answer: '

    Good

    ', + } as FeedbackMcqResponseDetails, + instructorComments: [], + isMissingResponse: false, + }, + ], + responsesFromSelf: [ + { + responseId: 'ag50ZWFtbWF0ZXMtam9obnIdCxIQRmVlZGJhY2tRdWVzdGlvbhiAgICAgIDICQw' + + '%alice.b.tmms@gmail.tmt%alice.b.tmms@gmail.tmt', + giver: 'You', + giverTeam: 'Team A', + giverSection: 'Section A', + recipient: 'You', + recipientSection: 'Section A', + recipientTeam: 'Team A', + responseDetails: { + ...DEFAULT_MCQ_RESPONSE_DETAILS(), + answer: '

    Good

    ', + } as FeedbackMcqResponseDetails, + instructorComments: [], + isMissingResponse: false, + }, + { + responseId: 'ag50ZWFtbWF0ZXMtam9obnIdCxIQRmVlZGJhY2tRdWVzdGlvbhiAgICAgIDICQw' + + ' %alice.b.tmms@gmail.tmt%benny.c.tmms@gmail.tmt', + giver: 'You', + giverTeam: 'Team A', + giverSection: 'Section A', + recipient: 'Benny Charles', + recipientTeam: 'Team A', + recipientSection: 'Section A', + responseDetails: { + ...DEFAULT_MCQ_RESPONSE_DETAILS(), + answer: '

    Bad

    ', + } as FeedbackMcqResponseDetails, + instructorComments: [], + isMissingResponse: false, + }, + ], + otherResponses: [], +}]; + +/** + * Structure of example comment search result + */ +export const EXAMPLE_COMMENT_SEARCH_RESULT: SearchCommentsTable[] = [{ + feedbackSession: EXAMPLE_FEEDBACK_SESSION, + questions: EXAMPLE_QUESTIONS_WITH_RESPONSES, +}]; diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.ts index dd191663264..52b1f52e27a 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.ts @@ -4,25 +4,13 @@ import { PageScrollService } from 'ngx-page-scroll-core'; import { TemplateSession } from '../../../../services/feedback-sessions.service'; import { - CommentVisibilityType, - Course, FeedbackContributionResponseDetails, FeedbackMcqQuestionDetails, FeedbackMcqResponseDetails, - FeedbackParticipantType, - FeedbackQuestionType, FeedbackSession, - FeedbackSessionPublishStatus, - FeedbackSessionSubmissionStatus, + Course, + FeedbackSession, Instructor, - InstructorPermissionRole, - JoinState, - NumberOfEntitiesToGiveFeedbackToSetting, QuestionOutput, + QuestionOutput, ResponseOutput, - ResponseVisibleSetting, - SessionVisibleSetting, Student, } from '../../../../types/api-output'; -import { - DEFAULT_CONTRIBUTION_RESPONSE_DETAILS, DEFAULT_MCQ_QUESTION_DETAILS, - DEFAULT_MCQ_RESPONSE_DETAILS, -} from '../../../../types/default-question-structs'; import { CommentEditFormModel } from '../../../components/comment-box/comment-edit-form/comment-edit-form.component'; import { CommentRowMode } from '../../../components/comment-box/comment-row/comment-row.component'; import { CommentTableModel } from '../../../components/comment-box/comment-table/comment-table.component'; @@ -42,6 +30,22 @@ import { InstructorSessionResultSectionType, import { InstructorSessionResultViewType, } from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-view-type.enum'; import { InstructorHelpSectionComponent } from '../instructor-help-section.component'; +import { + EXAMPLE_COMMENT_EDIT_FORM_MODEL, + EXAMPLE_COMMENT_SEARCH_RESULT, + EXAMPLE_COURSE_CANDIDATES, + EXAMPLE_FEEDBACK_SESSION, + EXAMPLE_GRQ_RESPONSES, + EXAMPLE_INSTRUCTORS, + EXAMPLE_INSTRUCTOR_COMMENT_TABLE_MODEL, + EXAMPLE_QUESTIONS_WITH_RESPONSES, + EXAMPLE_RECYCLE_BIN_FEEDBACK_SESSIONS, + EXAMPLE_RESPONSE, + EXAMPLE_RESPONSE_WITH_COMMENT, + EXAMPLE_SESSION_EDIT_FORM_MODEL, + EXAMPLE_STUDENTS, + EXAMPLE_TEMPLATE_SESSIONS, +} from './instructor-help-sessions-data'; /** * Sessions Section of the Instructor Help Page. @@ -58,356 +62,22 @@ export class InstructorHelpSessionsSectionComponent extends InstructorHelpSectio SessionEditFormMode: typeof SessionEditFormMode = SessionEditFormMode; InstructorSessionResultViewType: typeof InstructorSessionResultViewType = InstructorSessionResultViewType; InstructorSessionResultSectionType: typeof InstructorSessionResultSectionType = InstructorSessionResultSectionType; - - readonly exampleSessionEditFormModel: SessionEditFormModel = { - courseId: 'CS2103T', - timeZone: 'UTC', - courseName: 'Software Engineering', - feedbackSessionName: 'Feedback for Project', - instructions: 'This is where you type the instructions for the session', - - submissionStartTime: { hour: 10, minute: 0 }, - submissionStartDate: { year: 2020, month: 3, day: 13 }, - submissionEndTime: { hour: 12, minute: 0 }, - submissionEndDate: { year: 2020, month: 3, day: 13 }, - gracePeriod: 0, - - sessionVisibleSetting: SessionVisibleSetting.AT_OPEN, - customSessionVisibleTime: { hour: 9, minute: 0 }, - customSessionVisibleDate: { year: 2020, month: 3, day: 13 }, - - responseVisibleSetting: ResponseVisibleSetting.CUSTOM, - customResponseVisibleTime: { hour: 13, minute: 0 }, - customResponseVisibleDate: { year: 2020, month: 3, day: 13 }, - - submissionStatus: FeedbackSessionSubmissionStatus.OPEN, - publishStatus: FeedbackSessionPublishStatus.NOT_PUBLISHED, - - isClosingEmailEnabled: true, - isPublishedEmailEnabled: true, - - templateSessionName: 'Example session', - - isSaving: false, - isEditable: false, - hasVisibleSettingsPanelExpanded: true, - hasEmailSettingsPanelExpanded: true, - }; - - exampleCommentEditFormModel: CommentEditFormModel = { - commentText: '', - - isUsingCustomVisibilities: false, - showCommentTo: [], - showGiverNameTo: [], - }; - - readonly exampleResponse: ResponseOutput = { - isMissingResponse: false, - responseId: '', - giver: 'Alice', - giverTeam: 'Team A', - giverSection: 'Section A', - recipient: 'Bob', - recipientTeam: 'Team B', - recipientSection: 'Section B', - responseDetails: DEFAULT_CONTRIBUTION_RESPONSE_DETAILS(), - instructorComments: [], - }; - - readonly exampleResponseWithComment: ResponseOutput = { - isMissingResponse: false, - responseId: '1', - giver: 'Alice', - giverTeam: 'Team A', - giverSection: 'Section A', - recipient: 'Bob', - recipientTeam: 'Team B', - recipientSection: 'Section B', - responseDetails: { - answer: 110, - questionType: FeedbackQuestionType.CONTRIB, - } as FeedbackContributionResponseDetails, - instructorComments: [{ - commentGiver: 'Instructor', - lastEditorEmail: '', - feedbackResponseCommentId: 1, - commentText: 'Good to know!', - createdAt: 1, - lastEditedAt: 1, - isVisibilityFollowingFeedbackQuestion: true, - showGiverNameTo: [CommentVisibilityType.GIVER], - showCommentTo: [CommentVisibilityType.GIVER], - }], - }; - - readonly exampleCourseCandidates: Course[] = [ - { - courseId: 'CS2103T', - courseName: 'Software Engineering', - timeZone: 'UTC', - creationTimestamp: 0, - deletionTimestamp: 0, - }, - ]; - - readonly exampleTemplateSessions: TemplateSession[] = [ - { - name: 'Example session', - questions: [], - }, - ]; - - readonly exampleStudents: Student[] = [ - { - email: 'alice@email.com', - courseId: 'test.exa-demo', - name: 'Alice Betsy', - lastName: 'Betsy', - comments: 'Alice is a transfer student.', - teamName: 'Team A', - sectionName: 'Section A', - joinState: JoinState.JOINED, - }, - ]; - readonly exampleInstructors: Instructor[] = [ - { - googleId: 'bob@email.com', - courseId: 'test.exa-demo', - email: 'bob@email.com', - isDisplayedToStudents: true, - displayedToStudentsAs: 'Instructor', - name: 'Bob Ruth', - key: 'impicklerick', - role: InstructorPermissionRole.INSTRUCTOR_PERMISSION_ROLE_COOWNER, - joinState: JoinState.JOINED, - }, - ]; - - readonly exampleFeedbackSession: FeedbackSession = { - courseId: 'CS2103T', - timeZone: 'UTC', - feedbackSessionName: 'Project Feedback 1', - instructions: 'Enter your feedback for projects', - submissionStartTimestamp: 0, - submissionEndTimestamp: 0, - gracePeriod: 0, - sessionVisibleSetting: SessionVisibleSetting.AT_OPEN, - responseVisibleSetting: ResponseVisibleSetting.AT_VISIBLE, - submissionStatus: FeedbackSessionSubmissionStatus.CLOSED, - publishStatus: FeedbackSessionPublishStatus.NOT_PUBLISHED, - isClosingEmailEnabled: true, - isPublishedEmailEnabled: true, - createdAtTimestamp: 0, - }; - - readonly exampleRecycleBinFeedbackSessions: RecycleBinFeedbackSessionRowModel[] = [ - { - feedbackSession: this.exampleFeedbackSession, - }, - ]; - - readonly exampleInstructorCommentTableModel: Record = { - 'feedbackQuestionId%bob@example.com%bob@example.com': { - isReadOnly: true, - commentRows: [], - newCommentRow: { - commentEditFormModel: { - commentText: '', - isUsingCustomVisibilities: true, - showCommentTo: [], - showGiverNameTo: [], - }, - isEditing: false, - }, - isAddingNewComment: true, - }, - 'feedbackQuestionId%bob@example.com%danny@example.com': { - isReadOnly: true, - commentRows: [], - newCommentRow: { - commentEditFormModel: { - commentText: '', - isUsingCustomVisibilities: false, - showCommentTo: [], - showGiverNameTo: [], - }, - isEditing: false, - }, - isAddingNewComment: false, - }, - }; - - readonly exampleGrqResponses: Record = { - 'Section A': { - questions: [ - { - feedbackQuestion: { - feedbackQuestionId: 'feedbackQuestionId', - questionNumber: 1, - questionBrief: 'How well did team member perform?', - questionDescription: '', - questionDetails: { - hasAssignedWeights: false, - mcqWeights: [], - mcqOtherWeight: 0, - numOfMcqChoices: 3, - mcqChoices: [ - '

    Good

    ', - '

    Normal

    ', - '

    Bad

    ', - ], - otherEnabled: false, - generateOptionsFor: 'NONE', - questionType: FeedbackQuestionType.MCQ, - questionText: 'How well did team member perform?', - } as FeedbackMcqQuestionDetails, - questionType: FeedbackQuestionType.MCQ, - giverType: FeedbackParticipantType.STUDENTS, - recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS_INCLUDING_SELF, - numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, - showResponsesTo: [], - showGiverNameTo: [], - showRecipientNameTo: [], - customNumberOfEntitiesToGiveFeedbackTo: 0, - }, - questionStatistics: '', - allResponses: [ - { - responseId: 'feedbackQuestionId%bob@example.com%bob@example.com', - giver: 'Bob Ruth', - giverTeam: 'Team A', - giverEmail: 'bob@example.com', - giverSection: 'Section A', - recipient: 'Bob Ruth', - recipientTeam: 'Team A', - recipientEmail: 'bob@example.com', - recipientSection: 'Section A', - responseDetails: { - answer: '

    Good

    ', - isOther: false, - otherFieldContent: '', - questionType: FeedbackQuestionType.MCQ, - } as FeedbackMcqResponseDetails, - instructorComments: [], - isMissingResponse: false, - }, - { - responseId: 'feedbackQuestionId%bob@example.com%danny@example.com', - giver: 'Bob Ruth', - giverTeam: 'Team A', - giverEmail: 'bob@example.com', - giverSection: 'Section A', - recipient: 'Danny Engrid', - recipientTeam: 'Team B', - recipientEmail: 'danny@example.com', - recipientSection: 'Section B', - responseDetails: { - answer: '

    Bad

    ', - isOther: false, - otherFieldContent: '', - questionType: FeedbackQuestionType.MCQ, - } as FeedbackMcqResponseDetails, - instructorComments: [], - isMissingResponse: false, - }, - ], - responsesToSelf: [], - responsesFromSelf: [], - otherResponses: [], - }, - ], - hasPopulated: true, - isTabExpanded: true, - }, - }; - - readonly exampleQuestionsWithResponses: QuestionOutput[] = [{ - feedbackQuestion: { - feedbackQuestionId: 'ag50ZWFtbWF0ZXMtam9obnIdCxIQRmVlZGJhY2tRdWVzdGlvbhiAgICAgIDICQw', - questionNumber: 1, - questionBrief: 'How well did this team member perform?', - questionDescription: '', - questionDetails: { - ...DEFAULT_MCQ_QUESTION_DETAILS(), - questionText: 'How well did this team member perform?', - numOfMcqChoices: 3, - mcqChoices: [ - '

    Good

    ', - '

    Normal

    ', - '

    Bad

    ', - ], - } as FeedbackMcqQuestionDetails, - questionType: FeedbackQuestionType.MCQ, - giverType: FeedbackParticipantType.STUDENTS, - recipientType: FeedbackParticipantType.OWN_TEAM_MEMBERS_INCLUDING_SELF, - numberOfEntitiesToGiveFeedbackToSetting: NumberOfEntitiesToGiveFeedbackToSetting.UNLIMITED, - showResponsesTo: [], - showGiverNameTo: [], - showRecipientNameTo: [], - customNumberOfEntitiesToGiveFeedbackTo: 0, - }, - questionStatistics: '', - allResponses: [this.exampleResponseWithComment], - responsesToSelf: [ - { - responseId: 'ag50ZWFtbWF0ZXMtam9obnIdCxIQRmVlZGJhY2tRdWVzdGlvbhiAgICAgIDICQw' + - '%benny.c.tmms@gmail.tmt%alice.b.tmms@gmail.tmt', - giver: 'Benny Charles', - giverTeam: 'Team A', - giverSection: 'Section A', - recipient: 'You', - recipientTeam: 'Team A', - recipientSection: 'Section A', - responseDetails: { - ...DEFAULT_MCQ_RESPONSE_DETAILS(), - answer: '

    Good

    ', - } as FeedbackMcqResponseDetails, - instructorComments: [], - isMissingResponse: false, - }, - ], - responsesFromSelf: [ - { - responseId: 'ag50ZWFtbWF0ZXMtam9obnIdCxIQRmVlZGJhY2tRdWVzdGlvbhiAgICAgIDICQw' + - '%alice.b.tmms@gmail.tmt%alice.b.tmms@gmail.tmt', - giver: 'You', - giverTeam: 'Team A', - giverSection: 'Section A', - recipient: 'You', - recipientSection: 'Section A', - recipientTeam: 'Team A', - responseDetails: { - ...DEFAULT_MCQ_RESPONSE_DETAILS(), - answer: '

    Good

    ', - } as FeedbackMcqResponseDetails, - instructorComments: [], - isMissingResponse: false, - }, - { - responseId: 'ag50ZWFtbWF0ZXMtam9obnIdCxIQRmVlZGJhY2tRdWVzdGlvbhiAgICAgIDICQw' + - ' %alice.b.tmms@gmail.tmt%benny.c.tmms@gmail.tmt', - giver: 'You', - giverTeam: 'Team A', - giverSection: 'Section A', - recipient: 'Benny Charles', - recipientTeam: 'Team A', - recipientSection: 'Section A', - responseDetails: { - ...DEFAULT_MCQ_RESPONSE_DETAILS(), - answer: '

    Bad

    ', - } as FeedbackMcqResponseDetails, - instructorComments: [], - isMissingResponse: false, - }, - ], - otherResponses: [], - }]; - - readonly exampleCommentSearchResult: SearchCommentsTable[] = [{ - feedbackSession: this.exampleFeedbackSession, - questions: this.exampleQuestionsWithResponses, - }]; + exampleCommentEditFormModel: CommentEditFormModel = EXAMPLE_COMMENT_EDIT_FORM_MODEL; + readonly exampleSessionEditFormModel: SessionEditFormModel = EXAMPLE_SESSION_EDIT_FORM_MODEL; + readonly exampleResponse: ResponseOutput = EXAMPLE_RESPONSE; + readonly exampleResponseWithComment: ResponseOutput = EXAMPLE_RESPONSE_WITH_COMMENT; + readonly exampleCourseCandidates: Course[] = EXAMPLE_COURSE_CANDIDATES; + readonly exampleTemplateSessions: TemplateSession[] = EXAMPLE_TEMPLATE_SESSIONS; + readonly exampleStudents: Student[] = EXAMPLE_STUDENTS; + readonly exampleInstructors: Instructor[] = EXAMPLE_INSTRUCTORS; + readonly exampleFeedbackSession: FeedbackSession = EXAMPLE_FEEDBACK_SESSION; + readonly exampleRecycleBinFeedbackSessions: RecycleBinFeedbackSessionRowModel[] + = EXAMPLE_RECYCLE_BIN_FEEDBACK_SESSIONS; + readonly exampleInstructorCommentTableModel: Record + = EXAMPLE_INSTRUCTOR_COMMENT_TABLE_MODEL; + readonly exampleGrqResponses: Record = EXAMPLE_GRQ_RESPONSES; + readonly exampleQuestionsWithResponses: QuestionOutput[] = EXAMPLE_QUESTIONS_WITH_RESPONSES; + readonly exampleCommentSearchResult: SearchCommentsTable[] = EXAMPLE_COMMENT_SEARCH_RESULT; @Input() isPeerEvalTipsCollapsed: boolean = false; isNewFeedbackSessionCollapsed: boolean = false; diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-data.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-data.ts new file mode 100644 index 00000000000..5774bed4525 --- /dev/null +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-data.ts @@ -0,0 +1,112 @@ +import { Gender, JoinState, Student, StudentProfile } from '../../../../types/api-output'; +import { + SearchStudentsListRowTable, +} from '../../../pages-instructor/instructor-search-page/student-result-table/student-result-table.component'; + +/** + * Structure of example of student profile. + */ +export const EXAMPLE_STUDENT_PROFILE: StudentProfile = { + name: 'Alice Betsy', + shortName: 'Alice', + email: 'alice@email.com', + institute: 'National University of Singapore', + nationality: 'American', + gender: Gender.FEMALE, + moreInfo: 'Hi I am Alice Betsy! I am from Colorado, America. I am a programming and gaming enthusiast. ' + + 'Aspiring to become a Software Architect in a well reputed organization.', +}; +/** + * Structure of example of student attributes. + */ +export const EXAMPLE_STUDENT_ATTRIBUTES: Student = { + email: 'alice@email.com', + courseId: 'test.exa-demo', + name: 'Alice Betsy', + lastName: 'Betsy', + comments: 'Alice is a transfer student.', + teamName: 'Team A', + sectionName: 'Section A', + joinState: JoinState.JOINED, +}; +/** + * Structure of example of student result table of a student. + */ +export const EXAMPLE_SINGLE_STUDENT_RESULT_TABLES: SearchStudentsListRowTable[] = [{ + courseId: 'Course name appears here', + students: [{ + student: EXAMPLE_STUDENT_ATTRIBUTES, + isAllowedToViewStudentInSection: true, + isAllowedToModifyStudent: true, + }], +}]; +/** + * Structure of example of student result tables of multiple students. + */ +export const EXAMPLE_MULTIPLE_STUDENT_RESULT_TABLES: SearchStudentsListRowTable[] = [{ + courseId: 'Course name appears here', + students: [ + { + student: { + sectionName: 'Section A', + name: 'Alice Betsy', + email: 'alice@email.com', + joinState: JoinState.JOINED, + teamName: 'Team A', + courseId: 'Course name appears here', + }, + isAllowedToViewStudentInSection: true, + isAllowedToModifyStudent: true, + + }, + { + student: { + name: 'Jean Grey', + email: 'jean@email.com', + joinState: JoinState.JOINED, + teamName: 'Team A', + sectionName: 'Section A', + courseId: 'Course name appears here', + }, + isAllowedToViewStudentInSection: true, + isAllowedToModifyStudent: true, + + }, + { + student: { + name: 'Oliver Gates', + email: 'oliver@email.com', + joinState: JoinState.JOINED, + teamName: 'Team B', + sectionName: 'Section B', + courseId: 'Course name appears here', + }, + isAllowedToViewStudentInSection: true, + isAllowedToModifyStudent: true, + }, + { + student: { + name: 'Thora Parker', + email: 'thora@email.com', + joinState: JoinState.JOINED, + teamName: 'Team B', + sectionName: 'Section B', + courseId: 'Course name appears here', + }, + isAllowedToViewStudentInSection: true, + isAllowedToModifyStudent: true, + }, + { + student: { + name: 'Jack Wayne', + email: 'jack@email.com', + joinState: JoinState.JOINED, + teamName: 'Team C', + sectionName: 'Section C', + courseId: 'Course name appears here', + }, + isAllowedToViewStudentInSection: true, + isAllowedToModifyStudent: true, + }, + ], +}]; diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.ts index c5b2f96fddb..2fa5124bc39 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.ts @@ -1,10 +1,16 @@ import { Component, Input, OnInit } from '@angular/core'; import { environment } from '../../../../environments/environment'; -import { Gender, JoinState, Student, StudentProfile } from '../../../../types/api-output'; +import { Student, StudentProfile } from '../../../../types/api-output'; import { SearchStudentsListRowTable, } from '../../../pages-instructor/instructor-search-page/student-result-table/student-result-table.component'; import { InstructorHelpSectionComponent } from '../instructor-help-section.component'; +import { + EXAMPLE_MULTIPLE_STUDENT_RESULT_TABLES, + EXAMPLE_SINGLE_STUDENT_RESULT_TABLES, + EXAMPLE_STUDENT_ATTRIBUTES, + EXAMPLE_STUDENT_PROFILE, +} from './instructor-help-students-data'; /** * Students Section of the Instructor Help Page. @@ -17,101 +23,10 @@ import { InstructorHelpSectionComponent } from '../instructor-help-section.compo export class InstructorHelpStudentsSectionComponent extends InstructorHelpSectionComponent implements OnInit { readonly supportEmail: string = environment.supportEmail; - readonly exampleStudentProfile: StudentProfile = { - name: 'Alice Betsy', - shortName: 'Alice', - email: 'alice@email.com', - institute: 'National University of Singapore', - nationality: 'American', - gender: Gender.FEMALE, - moreInfo: 'Hi I am Alice Betsy! I am from Colorado, America. I am a programming and gaming enthusiast. ' - + 'Aspiring to become a Software Architect in a well reputed organization.', - }; - readonly exampleStudentAttributes: Student = { - email: 'alice@email.com', - courseId: 'test.exa-demo', - name: 'Alice Betsy', - lastName: 'Betsy', - comments: 'Alice is a transfer student.', - teamName: 'Team A', - sectionName: 'Section A', - joinState: JoinState.JOINED, - }; - readonly exampleSingleStudentResultTables: SearchStudentsListRowTable[] = [{ - courseId: 'Course name appears here', - students: [{ - student: this.exampleStudentAttributes, - isAllowedToViewStudentInSection: true, - isAllowedToModifyStudent: true, - }], - }]; - readonly exampleMultipleStudentResultTables: SearchStudentsListRowTable[] = [{ - courseId: 'Course name appears here', - students: [ - { - student: { - sectionName: 'Section A', - name: 'Alice Betsy', - email: 'alice@email.com', - joinState: JoinState.JOINED, - teamName: 'Team A', - courseId: 'Course name appears here', - }, - isAllowedToViewStudentInSection: true, - isAllowedToModifyStudent: true, - - }, - { - student: { - name: 'Jean Grey', - email: 'jean@email.com', - joinState: JoinState.JOINED, - teamName: 'Team A', - sectionName: 'Section A', - courseId: 'Course name appears here', - }, - isAllowedToViewStudentInSection: true, - isAllowedToModifyStudent: true, - - }, - { - student: { - name: 'Oliver Gates', - email: 'oliver@email.com', - joinState: JoinState.JOINED, - teamName: 'Team B', - sectionName: 'Section B', - courseId: 'Course name appears here', - }, - isAllowedToViewStudentInSection: true, - isAllowedToModifyStudent: true, - }, - { - student: { - name: 'Thora Parker', - email: 'thora@email.com', - joinState: JoinState.JOINED, - teamName: 'Team B', - sectionName: 'Section B', - courseId: 'Course name appears here', - }, - isAllowedToViewStudentInSection: true, - isAllowedToModifyStudent: true, - }, - { - student: { - name: 'Jack Wayne', - email: 'jack@email.com', - joinState: JoinState.JOINED, - teamName: 'Team C', - sectionName: 'Section C', - courseId: 'Course name appears here', - }, - isAllowedToViewStudentInSection: true, - isAllowedToModifyStudent: true, - }, - ], - }]; + readonly exampleStudentProfile: StudentProfile = EXAMPLE_STUDENT_PROFILE; + readonly exampleStudentAttributes: Student = EXAMPLE_STUDENT_ATTRIBUTES; + readonly exampleSingleStudentResultTables: SearchStudentsListRowTable[] = EXAMPLE_SINGLE_STUDENT_RESULT_TABLES; + readonly exampleMultipleStudentResultTables: SearchStudentsListRowTable[] = EXAMPLE_MULTIPLE_STUDENT_RESULT_TABLES; @Input() isEditDetailsCollapsed: boolean = false; isViewProfileCollapsed: boolean = false; From 8461a63ce7ab065b11c457cd7f56810d5f66ab99 Mon Sep 17 00:00:00 2001 From: Chong Chee Yuan <32454748+ccyccyccy@users.noreply.github.com> Date: Thu, 9 Jul 2020 13:05:34 +0800 Subject: [PATCH 008/205] [#10245] Add and refactor collapse animations (#10281) * Add skeleton for new collapse * Convert old collapse animations to use new ones * Add collapse animations for multiple places * Update snapshots * Lint fix * Fix E2E by adding timer for animation to play * Indentation fix * Change animation waiting method --- .../e2e/cases/e2e/AdminSearchPageE2ETest.java | 2 + .../teammates/e2e/pageobjects/AppPage.java | 5 + .../pageobjects/InstructorCoursesPage.java | 2 + .../comment-edit-form.component.html | 38 ++++---- .../comment-edit-form.component.ts | 2 + .../comment-table-modal.component.spec.ts | 2 + .../comment-table.component.html | 2 +- .../comment-table.component.spec.ts | 2 + .../comment-table/comment-table.component.ts | 2 + .../question-edit-form.component.spec.ts.snap | 24 ++++- .../question-edit-form.component.html | 2 +- .../question-edit-form.component.spec.ts | 2 + .../question-edit-form.component.ts | 2 + .../gqr-rqg-view-responses.component.html | 6 +- .../gqr-rqg-view-responses.component.ts | 2 + .../grq-rgq-view-responses.component.html | 4 +- .../grq-rgq-view-responses.component.ts | 2 + .../session-edit-form.component.html | 4 +- .../session-edit-form.component.ts | 2 + .../sessions-recycle-bin-table.component.html | 96 ++++++++++--------- .../sessions-recycle-bin-table.component.ts | 2 + .../teammates-common/collapse-anim.ts | 17 ++++ .../admin-search-page.component.html | 4 +- .../admin-search-page.component.ts | 2 + .../admin-sessions-page.component.html | 2 +- .../admin-sessions-page.component.ts | 2 + ...ructor-help-courses-section.component.html | 40 ++++---- ...structor-help-courses-section.component.ts | 2 + ...ctor-help-questions-section.component.html | 20 ++-- ...ructor-help-questions-section.component.ts | 2 + ...uctor-help-sessions-section.component.html | 28 +++--- ...tructor-help-sessions-section.component.ts | 2 + ...uctor-help-students-section.component.html | 14 +-- ...tructor-help-students-section.component.ts | 2 + ...structor-course-enroll-page.component.html | 2 +- ...instructor-course-enroll-page.component.ts | 2 + ...ructor-courses-page.component.spec.ts.snap | 20 ---- .../instructor-courses-page.component.html | 6 +- .../instructor-courses-page.component.spec.ts | 2 + .../instructor-courses-page.component.ts | 2 + ...nstructor-home-page.component.spec.ts.snap | 39 ++++---- .../instructor-home-page.component.html | 2 +- .../instructor-home-page.component.spec.ts | 2 + .../instructor-home-page.component.ts | 2 + .../template-question-modal.component.html | 2 +- .../template-question-modal.component.ts | 2 + ...r-session-no-response-panel.component.html | 2 +- ...tor-session-no-response-panel.component.ts | 2 + ...tor-session-result-gqr-view.component.html | 2 +- ...uctor-session-result-gqr-view.component.ts | 2 + ...tor-session-result-grq-view.component.html | 2 +- ...uctor-session-result-grq-view.component.ts | 2 + ...ession-result-question-view.component.html | 2 +- ...-session-result-question-view.component.ts | 2 + ...tor-session-result-rgq-view.component.html | 2 +- ...uctor-session-result-rgq-view.component.ts | 2 + ...tor-session-result-rqg-view.component.html | 2 +- ...uctor-session-result-rqg-view.component.ts | 2 + .../instructor-sessions-page.component.html | 2 +- .../instructor-sessions-page.component.ts | 2 + ...nstructor-student-list-page.component.html | 2 +- .../instructor-student-list-page.component.ts | 2 + ...ructor-student-records-page.component.html | 2 +- ...structor-student-records-page.component.ts | 2 + src/web/styles.scss | 45 --------- 65 files changed, 275 insertions(+), 231 deletions(-) create mode 100644 src/web/app/components/teammates-common/collapse-anim.ts diff --git a/src/e2e/java/teammates/e2e/cases/e2e/AdminSearchPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/e2e/AdminSearchPageE2ETest.java index bcf4bee21c1..d76a7484e7a 100644 --- a/src/e2e/java/teammates/e2e/cases/e2e/AdminSearchPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/e2e/AdminSearchPageE2ETest.java @@ -231,6 +231,8 @@ private void verifyLinkExpansionButtons(StudentAttributes student, InstructorAtt searchPage.clickExpandInstructorLinks(); searchPage.clickCollapseStudentLinks(); + searchPage.waitUntilAnimationFinish(); + numExpandedStudentRows = searchPage.getNumExpandedRows(studentRow); numExpandedInstructorRows = searchPage.getNumExpandedRows(instructorRow); assertEquals(numExpandedStudentRows, 0); diff --git a/src/e2e/java/teammates/e2e/pageobjects/AppPage.java b/src/e2e/java/teammates/e2e/pageobjects/AppPage.java index 56774753323..fa2a9ecac8b 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/AppPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/AppPage.java @@ -190,6 +190,11 @@ public void waitForElementToBeClickable(WebElement element) { waitFor(ExpectedConditions.elementToBeClickable(element)); } + public void waitUntilAnimationFinish() { + WebDriverWait wait = new WebDriverWait(browser.driver, 2); + wait.until(ExpectedConditions.invisibilityOfElementLocated(By.className("ng-animating"))); + } + /** * Waits until an element is no longer attached to the DOM or the timeout expires. * @param element the WebElement diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorCoursesPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorCoursesPage.java index 07f6d5b98de..d028ff49c12 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorCoursesPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorCoursesPage.java @@ -85,6 +85,7 @@ public void verifyActiveCourseStatistics(CourseAttributes course, String numSect public void verifyArchivedCoursesDetails(CourseAttributes[] courses) { showArchiveTable(); + this.waitUntilAnimationFinish(); String[][] courseDetails = getCourseDetails(courses); for (int i = 0; i < courses.length; i++) { // use verifyTableRowValues as archive courses are not sorted @@ -94,6 +95,7 @@ public void verifyArchivedCoursesDetails(CourseAttributes[] courses) { public void verifyDeletedCoursesDetails(CourseAttributes[] courses) { showDeleteTable(); + this.waitUntilAnimationFinish(); String[][] courseDetails = getDeletedCourseDetails(courses); for (int i = 0; i < courses.length; i++) { // use verifyTableRowValues as deleted courses are not sorted diff --git a/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html b/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html index 906447de453..9375ff4725a 100755 --- a/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html +++ b/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html @@ -23,25 +23,27 @@

    You may change comment's visibility using the visibility options on the right hand side.

    - - - - - - - - - - - - +
    +
    User/Group{{ commentVisibilityControl | commentVisibilityControlName }}
    {{ commentVisibilityType | commentVisibilityTypeName }} - -
    + + + + - - -
    User/Group{{ commentVisibilityControl | commentVisibilityControlName }}
    + + + + + {{ commentVisibilityType | commentVisibilityTypeName }} + + + + + + + +
    { HttpClientTestingModule, RichTextEditorModule, NgbModule, + BrowserAnimationsModule, ], providers: [NgbActiveModal], }) diff --git a/src/web/app/components/comment-box/comment-table/comment-table.component.html b/src/web/app/components/comment-box/comment-table/comment-table.component.html index 1e16b852240..dcd6183dc70 100644 --- a/src/web/app/components/comment-box/comment-table/comment-table.component.html +++ b/src/web/app/components/comment-box/comment-table/comment-table.component.html @@ -25,7 +25,7 @@ > -
  • +
  • { HttpClientTestingModule, TeammatesCommonModule, FormsModule, + BrowserAnimationsModule, ], }) .compileComponents(); diff --git a/src/web/app/components/comment-box/comment-table/comment-table.component.ts b/src/web/app/components/comment-box/comment-table/comment-table.component.ts index 8dfa365129c..6b420d93254 100644 --- a/src/web/app/components/comment-box/comment-table/comment-table.component.ts +++ b/src/web/app/components/comment-box/comment-table/comment-table.component.ts @@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FeedbackResponseComment, FeedbackVisibilityType, ResponseOutput, } from '../../../../types/api-output'; +import { collapseAnim } from '../../teammates-common/collapse-anim'; import { CommentRowMode, CommentRowModel } from '../comment-row/comment-row.component'; /** @@ -22,6 +23,7 @@ export interface CommentTableModel { selector: 'tm-comment-table', templateUrl: './comment-table.component.html', styleUrls: ['./comment-table.component.scss'], + animations: [collapseAnim], }) export class CommentTableComponent implements OnInit { diff --git a/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap b/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap index 1b1e4eef41e..cb189dcf0e0 100644 --- a/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap +++ b/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap @@ -103,8 +103,10 @@ exports[`QuestionEditFormComponent should snap with default view 1`] = `
    • +
    - +
    @@ -241,7 +245,9 @@ exports[`QuestionEditFormComponent should snap with default view 1`] = ` ngbdropdowntoggle="" > - + Students in this course will give feedback on
    - + @@ -371,10 +380,12 @@ exports[`QuestionEditFormComponent should snap with default view 1`] = `
  • Custom visibility options...
    • @@ -406,7 +417,9 @@ exports[`QuestionEditFormComponent should snap with default view 1`] = ` -
  • +
  • No-one can see your responses
    • @@ -416,6 +429,7 @@ exports[`QuestionEditFormComponent should snap with default view 1`] = `
    Warning: Any u
    {{model.questionBrief}}
    -
    +
    diff --git a/src/web/app/components/question-edit-form/question-edit-form.component.spec.ts b/src/web/app/components/question-edit-form/question-edit-form.component.spec.ts index 03e4fb73aa0..41ba1068ab1 100644 --- a/src/web/app/components/question-edit-form/question-edit-form.component.spec.ts +++ b/src/web/app/components/question-edit-form/question-edit-form.component.spec.ts @@ -18,6 +18,7 @@ import { VisibilityTypeNamePipe, } from './visibility-setting.pipe'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { mockTinyMceUuid } from '../../../test-helpers/mock-tinymce-uuid'; describe('QuestionEditFormComponent', () => { @@ -45,6 +46,7 @@ describe('QuestionEditFormComponent', () => { QuestionEditDetailsFormModule, NgbModule, VisibilityMessagesModule, + BrowserAnimationsModule, ], }) .compileComponents(); diff --git a/src/web/app/components/question-edit-form/question-edit-form.component.ts b/src/web/app/components/question-edit-form/question-edit-form.component.ts index 1011de4b964..8193a2ee112 100644 --- a/src/web/app/components/question-edit-form/question-edit-form.component.ts +++ b/src/web/app/components/question-edit-form/question-edit-form.component.ts @@ -9,6 +9,7 @@ import { NumberOfEntitiesToGiveFeedbackToSetting, } from '../../../types/api-output'; import { VisibilityControl } from '../../../types/visibility-control'; +import { collapseAnim } from '../teammates-common/collapse-anim'; import { QuestionEditFormMode, QuestionEditFormModel } from './question-edit-form-model'; const CLEAN_PROPERTIES: Set = new Set(['isEditable', 'isCollapsed', 'isChanged']); @@ -20,6 +21,7 @@ const CLEAN_PROPERTIES: Set = new Set(['isEditable', 'isCollapse selector: 'tm-question-edit-form', templateUrl: './question-edit-form.component.html', styleUrls: ['./question-edit-form.component.scss'], + animations: [collapseAnim], }) export class QuestionEditFormComponent implements OnInit { diff --git a/src/web/app/components/question-responses/gqr-rqg-view-responses/gqr-rqg-view-responses.component.html b/src/web/app/components/question-responses/gqr-rqg-view-responses/gqr-rqg-view-responses.component.html index e1c2077c1e0..38cc87e1441 100644 --- a/src/web/app/components/question-responses/gqr-rqg-view-responses/gqr-rqg-view-responses.component.html +++ b/src/web/app/components/question-responses/gqr-rqg-view-responses/gqr-rqg-view-responses.component.html @@ -8,7 +8,7 @@
    -
    +

    {{ teamInfo.key }} Statistics for {{ isGqr ? 'Given' : 'Received' }} Responses

    @@ -70,7 +70,7 @@

    {{ teamInfo.key }} Detailed Responses

    -
    +
    @@ -82,7 +82,7 @@

    {{ teamInfo.key }} Detailed Responses

    -
    +
    -
    +
    -
    +
    diff --git a/src/web/app/components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.component.ts b/src/web/app/components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.component.ts index 069ffcda78f..fdfbfc1d9df 100644 --- a/src/web/app/components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.component.ts +++ b/src/web/app/components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.component.ts @@ -11,6 +11,7 @@ import { import { InstructorSessionResultSectionType, } from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-section-type.enum'; +import { collapseAnim } from '../../teammates-common/collapse-anim'; import { InstructorResponsesViewBase } from '../instructor-responses-view-base'; /** @@ -20,6 +21,7 @@ import { InstructorResponsesViewBase } from '../instructor-responses-view-base'; selector: 'tm-grq-rgq-view-responses', templateUrl: './grq-rgq-view-responses.component.html', styleUrls: ['./grq-rgq-view-responses.component.scss'], + animations: [collapseAnim], }) export class GrqRgqViewResponsesComponent extends InstructorResponsesViewBase implements OnInit, OnChanges { diff --git a/src/web/app/components/session-edit-form/session-edit-form.component.html b/src/web/app/components/session-edit-form/session-edit-form.component.html index 0a03ae4714a..c9113631674 100644 --- a/src/web/app/components/session-edit-form/session-edit-form.component.html +++ b/src/web/app/components/session-edit-form/session-edit-form.component.html @@ -207,7 +207,7 @@
    Warning: The s Session is visible at submission opening time, responses are only visible when you publish the results.
    -
    +
    @@ -307,7 +307,7 @@
    Warning: The s Emails are sent when session opens (within 15 minutes), 24 hrs before session closes and when results are published.
    -
    +
    Send emails for diff --git a/src/web/app/components/session-edit-form/session-edit-form.component.ts b/src/web/app/components/session-edit-form/session-edit-form.component.ts index 8f08cfd300e..67f3beba5bd 100644 --- a/src/web/app/components/session-edit-form/session-edit-form.component.ts +++ b/src/web/app/components/session-edit-form/session-edit-form.component.ts @@ -12,6 +12,7 @@ import { SessionVisibleSetting, } from '../../../types/api-output'; import { FEEDBACK_SESSION_NAME_MAX_LENGTH } from '../../../types/field-validator'; +import { collapseAnim } from '../teammates-common/collapse-anim'; import { SessionEditFormDatePickerFormatter } from './session-edit-form-datepicker-formatter'; import { DateFormat, SessionEditFormMode, SessionEditFormModel } from './session-edit-form-model'; @@ -23,6 +24,7 @@ import { DateFormat, SessionEditFormMode, SessionEditFormModel } from './session templateUrl: './session-edit-form.component.html', styleUrls: ['./session-edit-form.component.scss'], providers: [{ provide: NgbDateParserFormatter, useClass: SessionEditFormDatePickerFormatter }], + animations: [collapseAnim], }) export class SessionEditFormComponent implements OnInit { diff --git a/src/web/app/components/sessions-recycle-bin-table/sessions-recycle-bin-table.component.html b/src/web/app/components/sessions-recycle-bin-table/sessions-recycle-bin-table.component.html index 382d0c4bb12..e1e3768d410 100644 --- a/src/web/app/components/sessions-recycle-bin-table/sessions-recycle-bin-table.component.html +++ b/src/web/app/components/sessions-recycle-bin-table/sessions-recycle-bin-table.component.html @@ -19,53 +19,55 @@

    - - - - - - - - - - - - - - - - - - - -
    - Course ID - - - - - Session Name - - - - - Creation Date - - - - - Deletion Date - - - - Action(s)
    {{ recycleBinFeedbackSessionRowModel.feedbackSession.courseId }}{{ recycleBinFeedbackSessionRowModel.feedbackSession.feedbackSessionName }} - {{ recycleBinFeedbackSessionRowModel.feedbackSession.createdAtTimestamp | recycleBinTableFormatDate:recycleBinFeedbackSessionRowModel.feedbackSession.timeZone }} - - {{ recycleBinFeedbackSessionRowModel.feedbackSession.deletedAtTimestamp | recycleBinTableFormatDate:recycleBinFeedbackSessionRowModel.feedbackSession.timeZone }} - - - -
    +
    + + + + + + + + + + + + + + + + + + + +
    + Course ID + + + + + Session Name + + + + + Creation Date + + + + + Deletion Date + + + + Action(s)
    {{ recycleBinFeedbackSessionRowModel.feedbackSession.courseId }}{{ recycleBinFeedbackSessionRowModel.feedbackSession.feedbackSessionName }} + {{ recycleBinFeedbackSessionRowModel.feedbackSession.createdAtTimestamp | recycleBinTableFormatDate:recycleBinFeedbackSessionRowModel.feedbackSession.timeZone }} + + {{ recycleBinFeedbackSessionRowModel.feedbackSession.deletedAtTimestamp | recycleBinTableFormatDate:recycleBinFeedbackSessionRowModel.feedbackSession.timeZone }} + + + +
    +
    diff --git a/src/web/app/components/sessions-recycle-bin-table/sessions-recycle-bin-table.component.ts b/src/web/app/components/sessions-recycle-bin-table/sessions-recycle-bin-table.component.ts index 1d5b7c127bf..31f474a3742 100644 --- a/src/web/app/components/sessions-recycle-bin-table/sessions-recycle-bin-table.component.ts +++ b/src/web/app/components/sessions-recycle-bin-table/sessions-recycle-bin-table.component.ts @@ -1,6 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FeedbackSession } from '../../../types/api-output'; import { SortBy, SortOrder } from '../../../types/sort-properties'; +import { collapseAnim } from '../teammates-common/collapse-anim'; /** * Model for a row of recycle bin feedback session @@ -16,6 +17,7 @@ export interface RecycleBinFeedbackSessionRowModel { selector: 'tm-sessions-recycle-bin-table', templateUrl: './sessions-recycle-bin-table.component.html', styleUrls: ['./sessions-recycle-bin-table.component.scss'], + animations: [collapseAnim], }) export class SessionsRecycleBinTableComponent implements OnInit { diff --git a/src/web/app/components/teammates-common/collapse-anim.ts b/src/web/app/components/teammates-common/collapse-anim.ts new file mode 100644 index 00000000000..d71b4baf267 --- /dev/null +++ b/src/web/app/components/teammates-common/collapse-anim.ts @@ -0,0 +1,17 @@ +import { animate, AnimationTriggerMetadata, state, style, transition, trigger } from '@angular/animations'; + +/** + * Directive for collapsing of *ngIf columns. + */ +export const collapseAnim: AnimationTriggerMetadata = trigger('collapseAnim', [ + state('*', style({ overflow: 'hidden' })), + state('void', style({ overflow: 'hidden' })), + transition(':leave', [ + style({ height: '*' }), + animate('300ms ease-in-out', style({ height: 0, opacity: 0 })), + ]), + transition(':enter', [ + style({ height: '0' }), + animate('300ms ease-in-out', style({ height: '*', opacity: 1 })), + ]), +]); diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html index 69a35f4f98c..5a6e801b100 100644 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html @@ -140,9 +140,9 @@ - + -
      +
      • Email diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts index bbbfc3c1f2f..def46b3fa7a 100755 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts @@ -12,6 +12,7 @@ import { import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { Email, RegenerateStudentCourseLinks } from '../../../types/api-output'; +import { collapseAnim } from '../../components/teammates-common/collapse-anim'; import { ErrorMessageOutput } from '../../error-message-output'; import { RegenerateLinksConfirmModalComponent } from './regenerate-links-confirm-modal/regenerate-links-confirm-modal.component'; import { ResetGoogleIdConfirmModalComponent } from './reset-google-id-confirm-modal/reset-google-id-confirm-modal.component'; @@ -23,6 +24,7 @@ import { ResetGoogleIdConfirmModalComponent } from './reset-google-id-confirm-mo selector: 'tm-admin-search-page', templateUrl: './admin-search-page.component.html', styleUrls: ['./admin-search-page.component.scss'], + animations: [collapseAnim], }) export class AdminSearchPageComponent { diff --git a/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.html b/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.html index 4617ea5f44a..7cefe249bda 100644 --- a/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.html +++ b/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.html @@ -116,7 +116,7 @@

    -
    +
    diff --git a/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.ts b/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.ts index f9abd582a9b..94ff7b185e3 100644 --- a/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.ts +++ b/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.ts @@ -4,6 +4,7 @@ import { FeedbackSessionsService } from '../../../services/feedback-sessions.ser import { StatusMessageService } from '../../../services/status-message.service'; import { TimezoneService } from '../../../services/timezone.service'; import { FeedbackSessionStats, OngoingSession, OngoingSessions } from '../../../types/api-output'; +import { collapseAnim } from '../../components/teammates-common/collapse-anim'; import { ErrorMessageOutput } from '../../error-message-output'; interface OngoingSessionModel { @@ -18,6 +19,7 @@ interface OngoingSessionModel { selector: 'tm-admin-sessions-page', templateUrl: './admin-sessions-page.component.html', styleUrls: ['./admin-sessions-page.component.scss'], + animations: [collapseAnim], }) export class AdminSessionsPageComponent implements OnInit { diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.html b/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.html index b01f7aa6259..847ed041ad8 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.html +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.html @@ -9,7 +9,7 @@

    Enrolling Students in Courses< How do I add students to a course?

    -
    +

    @@ -33,7 +33,7 @@

    Enrolling Students in Courses<

    -
    +

    @@ -52,7 +52,7 @@

    Enrolling Students in Courses< What should I do if my course doesn’t have teams?

    -
    +

    @@ -71,7 +71,7 @@

    Enrolling Students in Courses< What are sections meant for?

    -
    +

    @@ -95,7 +95,7 @@

    Enrolling Students in Courses< How do I enroll students into sections?

    -
    +

    @@ -116,7 +116,7 @@

    Adding Instructors to Courses< How do I add instructors to my course?

    -
    +

    @@ -149,7 +149,7 @@

    Adding Instructors to Courses< How do I edit the information of an instructor in my course?

    -
    +

    @@ -185,7 +185,7 @@

    Adding Instructors to Courses< How do I set an instructor's access level?

    -
    +

    @@ -222,7 +222,7 @@

    Adding Instructors to Courses< How do I set custom privileges for an instructor?

    -
    +

    @@ -248,7 +248,7 @@

    Managing Courses

    How do I view a list of students in a course?

    -
    +

    @@ -278,7 +278,7 @@

    Managing Courses

    How do I change a student's section?

    -
    +

    @@ -310,7 +310,7 @@

    Managing Courses

    What should I do if a student says his/her courses have disappeared from the system?

    -
    +

    @@ -329,7 +329,7 @@

    Managing Courses

    How do I delete students from a course?

    -
    +

    @@ -360,7 +360,7 @@

    Archiving Courses

    How do I archive a course?

    -
    +

    @@ -387,7 +387,7 @@

    Archiving Courses

    How do I view courses I have archived?

    -
    +

    @@ -410,7 +410,7 @@

    Archiving Courses

    How do I unarchive an archived course?

    -
    +

    @@ -431,7 +431,7 @@

    Restoring Deleted Courses

    -
    +

    @@ -454,7 +454,7 @@

    Restoring Deleted Courses

    -
    +

    @@ -476,7 +476,7 @@

    Restoring Deleted Courses

    -
    +

    @@ -498,7 +498,7 @@

    Restoring Deleted Courses

    -
    +

    diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.ts index 224e1a487c0..e7d1c27a183 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.ts @@ -2,6 +2,7 @@ import { DOCUMENT } from '@angular/common'; import { Component, EventEmitter, Inject, OnInit, Output } from '@angular/core'; import { PageScrollService } from 'ngx-page-scroll-core'; import { environment } from '../../../../environments/environment'; +import { collapseAnim } from '../../../components/teammates-common/collapse-anim'; import { InstructorHelpSectionComponent } from '../instructor-help-section.component'; /** @@ -11,6 +12,7 @@ import { InstructorHelpSectionComponent } from '../instructor-help-section.compo selector: 'tm-instructor-help-courses-section', templateUrl: './instructor-help-courses-section.component.html', styleUrls: ['./instructor-help-courses-section.component.scss'], + animations: [collapseAnim], }) export class InstructorHelpCoursesSectionComponent extends InstructorHelpSectionComponent implements OnInit { diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.html b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.html index 402e9187c0f..2e13d99e51c 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.html +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.html @@ -9,7 +9,7 @@

    Setting Up Questions

    Essay Questions

    -
    +

    @@ -46,7 +46,7 @@

    Setting Up Questions

    Multiple Choice (Single Answer) Questions

    -
    +

    @@ -113,7 +113,7 @@

    Setting Up Questions

    Multiple Choice (Multiple Answers) Questions

    -
    +

    @@ -138,7 +138,7 @@

    Setting Up Questions

    Numerical Scale Questions

    -
    +

    @@ -197,7 +197,7 @@

    Setting Up Questions

    Distribute Points (Among Options) Questions

    -
    +

    @@ -255,7 +255,7 @@

    Setting Up Questions

    Distribute Points (Among Recipients) Questions

    -
    +

    @@ -298,7 +298,7 @@

    Setting Up Questions

    Team Contribution Questions

    -
    +

    @@ -558,7 +558,7 @@

    Setting Up Questions

    Rubric Questions

    -
    +

    @@ -657,7 +657,7 @@

    Setting Up Questions

    Rank (Options) Questions

    -
    +

    @@ -703,7 +703,7 @@

    Setting Up Questions

    Rank (Recipients) Questions

    -
    +

    diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.ts index 286ca80c465..9671ddd8bdf 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.ts @@ -17,6 +17,7 @@ import { import { QuestionSubmissionFormModel, } from '../../../components/question-submission-form/question-submission-form-model'; import { Response } from '../../../components/question-types/question-statistics/question-statistics'; +import { collapseAnim } from '../../../components/teammates-common/collapse-anim'; import { QuestionTabModel, } from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-page.component'; @@ -65,6 +66,7 @@ import { selector: 'tm-instructor-help-questions-section', templateUrl: './instructor-help-questions-section.component.html', styleUrls: ['./instructor-help-questions-section.component.scss'], + animations: [collapseAnim], }) export class InstructorHelpQuestionsSectionComponent extends InstructorHelpSectionComponent implements OnInit { diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.html b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.html index 3ce8420a93a..cfcbfe93df8 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.html +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.html @@ -9,7 +9,7 @@

    Setting Up Sessions

    Tips for conducting team peer evaluation sessions

    -
    +

    @@ -63,7 +63,7 @@

    Setting Up Sessions

    How do I create and schedule a new feedback session?

    -
    +
    To create a new feedback session, click the Sessions tab at the top of the page. Then, @@ -154,7 +154,7 @@

    Setting Up Sessions

    How do I add questions to a session?

    -
    +

    @@ -255,7 +255,7 @@

    Setting Up Sessions

    How do I preview a session?

    -
    +

    @@ -304,7 +304,7 @@

    Managing Session Responses

    -
    +

    @@ -339,7 +339,7 @@

    Managing Session Responses

    -
    +

    @@ -473,7 +473,7 @@

    Managing Session Responses

    -
    +

    @@ -502,7 +502,7 @@

    Adding Comments to Responses< How do I create a comment on a response?

    -
    +

    @@ -552,7 +552,7 @@

    Adding Comments to Responses< How do I edit or delete a comment on a response?

    -
    +

    @@ -588,7 +588,7 @@

    Adding Comments to Responses< How do I search for a feedback session question, response or comment on a response?

    -
    +
    You can search for questions, responses to a question and comments on responses in any of your courses. To do so: @@ -627,7 +627,7 @@

    Restoring Deleted Sessions

    -
    +

    @@ -656,7 +656,7 @@

    Restoring Deleted Sessions

    -
    +

    @@ -684,7 +684,7 @@

    Restoring Deleted Sessions

    -
    +

    @@ -712,7 +712,7 @@

    Restoring Deleted Sessions

    -
    +

    diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.ts index 52b1f52e27a..695c4b48dfa 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.ts @@ -20,6 +20,7 @@ import { import { RecycleBinFeedbackSessionRowModel, } from '../../../components/sessions-recycle-bin-table/sessions-recycle-bin-table.component'; +import { collapseAnim } from '../../../components/teammates-common/collapse-anim'; import { SearchCommentsTable, } from '../../../pages-instructor/instructor-search-page/comment-result-table/comment-result-table.component'; @@ -54,6 +55,7 @@ import { selector: 'tm-instructor-help-sessions-section', templateUrl: './instructor-help-sessions-section.component.html', styleUrls: ['./instructor-help-sessions-section.component.scss'], + animations: [collapseAnim], }) export class InstructorHelpSessionsSectionComponent extends InstructorHelpSectionComponent implements OnInit { diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.html b/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.html index d552eb7ddd4..d91fe321606 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.html +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.html @@ -9,7 +9,7 @@

    Student Records

    How do I view a student's profile?

    -
    +

    To view the profile of Student A from Course B:

    @@ -60,7 +60,7 @@

    Student Records

    -
    +

    @@ -101,7 +101,7 @@

    Student Records

    How do I view all the responses a student has given and received?

    -
    +

    @@ -130,7 +130,7 @@

    Finding Students

    How do I search for a student in my course?

    -
    +

    @@ -183,7 +183,7 @@

    Finding Students

    How do I email a student or students in my course?

    -
    +
      @@ -212,7 +212,7 @@

      Student Accounts

      Is it compulsory for students to use Google accounts?

      -
      +

      @@ -231,7 +231,7 @@

      Student Accounts

      How do I change the Google ID associated with a student?

      -
      +

      diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.ts index 2fa5124bc39..fab1d5eaae6 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.ts @@ -1,6 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { environment } from '../../../../environments/environment'; import { Student, StudentProfile } from '../../../../types/api-output'; +import { collapseAnim } from '../../../components/teammates-common/collapse-anim'; import { SearchStudentsListRowTable, } from '../../../pages-instructor/instructor-search-page/student-result-table/student-result-table.component'; @@ -19,6 +20,7 @@ import { selector: 'tm-instructor-help-students-section', templateUrl: './instructor-help-students-section.component.html', styleUrls: ['./instructor-help-students-section.component.scss'], + animations: [collapseAnim], }) export class InstructorHelpStudentsSectionComponent extends InstructorHelpSectionComponent implements OnInit { diff --git a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.html b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.html index 5ab68e26983..f01a7d70ded 100644 --- a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.html +++ b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.html @@ -44,7 +44,7 @@

      Enroll Students for {{ courseid }}

      [maxCols]="5" [maxRows]="100" [stretchH]="'all'" - [hidden]="isExistingStudentsPanelCollapsed"> + [hidden]="isExistingStudentsPanelCollapsed" @collapseAnim>
      diff --git a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.ts b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.ts index ee54903dd90..0670108617f 100644 --- a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.ts +++ b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.ts @@ -10,6 +10,7 @@ import { StudentService } from '../../../services/student.service'; import { HasResponses, JoinState, Student, Students } from '../../../types/api-output'; import { StudentEnrollRequest, StudentsEnrollRequest } from '../../../types/api-request'; import { StatusMessage } from '../../components/status-message/status-message'; +import { collapseAnim } from '../../components/teammates-common/collapse-anim'; import { ErrorMessageOutput } from '../../error-message-output'; import { EnrollStatus } from './enroll-status'; @@ -26,6 +27,7 @@ interface EnrollResultPanel { selector: 'tm-instructor-course-enroll-page', templateUrl: './instructor-course-enroll-page.component.html', styleUrls: ['./instructor-course-enroll-page.component.scss'], + animations: [collapseAnim], }) export class InstructorCourseEnrollPageComponent implements OnInit { diff --git a/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap index d92e7533e69..2c7c499b121 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap @@ -33,11 +33,6 @@ exports[`InstructorCoursesPageComponent should snap when it is undeletable and u /> Add New Course -
      @@ -484,11 +479,6 @@ exports[`InstructorCoursesPageComponent should snap with all courses in course s /> Add New Course -
      @@ -941,11 +931,6 @@ exports[`InstructorCoursesPageComponent should snap with default fields 1`] = ` /> Add New Course -
      diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html index b62c1e891e0..352a93842e2 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html @@ -4,7 +4,7 @@
      -
      +
      @@ -166,7 +166,7 @@

      -
      +

    @@ -233,7 +233,7 @@

    -
    +

    diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.spec.ts b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.spec.ts index 6f9ff994b01..658707cc8fc 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.spec.ts @@ -1,6 +1,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { Component } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { InstructorCoursesPageComponent } from './instructor-courses-page.component'; @@ -112,6 +113,7 @@ describe('InstructorCoursesPageComponent', () => { HttpClientTestingModule, RouterTestingModule, NgbModule, + BrowserAnimationsModule, ], }) .compileComponents(); diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts index a7a195da642..1d93f5ff263 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts @@ -18,6 +18,7 @@ import { Students, } from '../../../types/api-output'; import { SortBy, SortOrder } from '../../../types/sort-properties'; +import { collapseAnim } from '../../components/teammates-common/collapse-anim'; import { ErrorMessageOutput } from '../../error-message-output'; import { CoursePermanentDeletionConfirmModalComponent, @@ -39,6 +40,7 @@ interface CourseModel { selector: 'tm-instructor-courses-page', templateUrl: './instructor-courses-page.component.html', styleUrls: ['./instructor-courses-page.component.scss'], + animations: [collapseAnim], }) export class InstructorCoursesPageComponent implements OnInit { diff --git a/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap index 563d7836159..e0ffde2012c 100644 --- a/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap @@ -207,13 +207,16 @@ exports[`InstructorHomePageComponent should snap with one course with error load +
    There are no feedback sessions in this course.
    @@ -504,13 +507,16 @@ exports[`InstructorHomePageComponent should snap with one course with one feedba +
    - - -
    - There are no feedback sessions in this course. -
    - -     -
    +
    @@ -1981,13 +1978,16 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate +
    There are no feedback sessions in this course.
    @@ -2278,13 +2278,16 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac +
    There are no feedback sessions in this course.
    diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html index daa8b0543ef..fe856cd0557 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html @@ -142,7 +142,7 @@
    Confirm archiv
    -
    +
    { InstructorHomePageModule, HttpClientTestingModule, RouterTestingModule, + BrowserAnimationsModule, ], }) .compileComponents(); diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.ts b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.ts index f6e01a5b6e6..9f85c869a0b 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.ts +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.ts @@ -27,6 +27,7 @@ import { SessionsTableHeaderColorScheme, SessionsTableRowModel, } from '../../components/sessions-table/sessions-table-model'; +import { collapseAnim } from '../../components/teammates-common/collapse-anim'; import { ErrorMessageOutput } from '../../error-message-output'; import { InstructorSessionModalPageComponent } from '../instructor-session-modal-page.component'; @@ -49,6 +50,7 @@ interface CourseTabModel { selector: 'tm-instructor-home-page', templateUrl: './instructor-home-page.component.html', styleUrls: ['./instructor-home-page.component.scss'], + animations: [collapseAnim], }) export class InstructorHomePageComponent extends InstructorSessionModalPageComponent implements OnInit { diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/template-question-modal/template-question-modal.component.html b/src/web/app/pages-instructor/instructor-session-edit-page/template-question-modal/template-question-modal.component.html index e970688abb5..71c17a52188 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/template-question-modal/template-question-modal.component.html +++ b/src/web/app/pages-instructor/instructor-session-edit-page/template-question-modal/template-question-modal.component.html @@ -13,7 +13,7 @@

    Add Template Questions

     
    -
    +
    diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/template-question-modal/template-question-modal.component.ts b/src/web/app/pages-instructor/instructor-session-edit-page/template-question-modal/template-question-modal.component.ts index c28ca78e674..c033f3b967e 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/template-question-modal/template-question-modal.component.ts +++ b/src/web/app/pages-instructor/instructor-session-edit-page/template-question-modal/template-question-modal.component.ts @@ -5,6 +5,7 @@ import { FeedbackQuestion } from '../../../../types/api-output'; import { QuestionEditFormModel, } from '../../../components/question-edit-form/question-edit-form-model'; +import { collapseAnim } from '../../../components/teammates-common/collapse-anim'; interface TemplateQuestionModel { description: string; @@ -19,6 +20,7 @@ interface TemplateQuestionModel { @Component({ templateUrl: './template-question-modal.component.html', styleUrls: ['./template-question-modal.component.scss'], + animations: [collapseAnim], }) export class TemplateQuestionModalComponent implements OnInit { diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.html index 30168484f81..0567eead258 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.html @@ -10,7 +10,7 @@
    -
    +
    diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.ts b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.ts index 8d5c13e2794..db59291bd71 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.ts +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.ts @@ -13,6 +13,7 @@ import { import { StudentListInfoTableRowModel, } from '../../components/sessions-table/student-list-info-table/student-list-info-table-model'; +import { collapseAnim } from '../../components/teammates-common/collapse-anim'; /** * Instructor sessions results page No Response Panel. @@ -21,6 +22,7 @@ import { selector: 'tm-instructor-session-no-response-panel', templateUrl: './instructor-session-no-response-panel.component.html', styleUrls: ['./instructor-session-no-response-panel.component.scss'], + animations: [collapseAnim], }) export class InstructorSessionNoResponsePanelComponent implements OnInit, OnChanges { diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-gqr-view.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-gqr-view.component.html index 71951b25e8b..f32dcc9e275 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-gqr-view.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-gqr-view.component.html @@ -7,7 +7,7 @@ -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    Student List
    -
    +
    diff --git a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts index f7e6e57ad56..41ac2574c13 100644 --- a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts +++ b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts @@ -7,6 +7,7 @@ import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { Course, Courses, InstructorPrivilege, Student, Students } from '../../../types/api-output'; import { StudentListRowModel } from '../../components/student-list/student-list.component'; +import { collapseAnim } from '../../components/teammates-common/collapse-anim'; import { ErrorMessageOutput } from '../../error-message-output'; interface StudentIndexedData { @@ -28,6 +29,7 @@ interface CourseTab { selector: 'tm-instructor-student-list-page', templateUrl: './instructor-student-list-page.component.html', styleUrls: ['./instructor-student-list-page.component.scss'], + animations: [collapseAnim], }) export class InstructorStudentListPageComponent implements OnInit { diff --git a/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.html b/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.html index 0dbc5c38ee1..1104f57bd2b 100644 --- a/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.html +++ b/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.html @@ -8,7 +8,7 @@

    Records in feedback sessions

    -
    +
    Date: Thu, 9 Jul 2020 16:56:14 +0800 Subject: [PATCH 009/205] [#10245] Show error details on submit feedback (#10291) * Show error details on submit * Change map type to be more accurate, add comment to explain map Co-authored-by: Ahmed Bahajjaj --- .../saving-complete-modal.component.html | 20 +++++++++++-------- .../saving-complete-modal.component.ts | 6 +++++- .../session-submission-page.component.ts | 15 ++++++++------ 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/web/app/pages-session/session-submission-page/saving-complete-modal/saving-complete-modal.component.html b/src/web/app/pages-session/session-submission-page/saving-complete-modal/saving-complete-modal.component.html index 708e4712b7e..0dd7799a550 100644 --- a/src/web/app/pages-session/session-submission-page/saving-complete-modal/saving-complete-modal.component.html +++ b/src/web/app/pages-session/session-submission-page/saving-complete-modal/saving-complete-modal.component.html @@ -1,10 +1,10 @@
    + [ngClass]="{'bg-danger': hasFailToSaveQuestions, 'bg-success': !hasFailToSaveQuestions}">
    - + All responses submitted successfully! - + Some questions were not saved!
    @@ -17,11 +17,15 @@
    Note that some questions are yet to be answered. They are: {{ notYetAnsweredQuestions }}.

    -

    +

    Some answers to questions are not saved due to errors. - Those questions are: {{ failToSaveQuestions }}. Refreshing the page and submit again might solve the problem. -

    -

    +

      +
    • + Question {{ question.key }}: {{ question.value }} +
      • +
    +
    +

    All your responses have been successfully recorded! You may now leave this page.

    @@ -34,6 +38,6 @@

    diff --git a/src/web/app/pages-session/session-submission-page/saving-complete-modal/saving-complete-modal.component.ts b/src/web/app/pages-session/session-submission-page/saving-complete-modal/saving-complete-modal.component.ts index 253cc518a1c..fe8bc319e27 100644 --- a/src/web/app/pages-session/session-submission-page/saving-complete-modal/saving-complete-modal.component.ts +++ b/src/web/app/pages-session/session-submission-page/saving-complete-modal/saving-complete-modal.component.ts @@ -15,11 +15,15 @@ export class SavingCompleteModalComponent implements OnInit { notYetAnsweredQuestions: string = ''; @Input() - failToSaveQuestions: string = ''; + failToSaveQuestions: Record = {}; // Map of question number to error message @Input() hasSubmissionConfirmationError: boolean = false; + get hasFailToSaveQuestions(): boolean { + return Object.keys(this.failToSaveQuestions).length !== 0; + } + constructor(public activeModal: NgbActiveModal) {} ngOnInit(): void { diff --git a/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts b/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts index 8e036b854ed..212d721534e 100644 --- a/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts +++ b/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts @@ -520,7 +520,7 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { */ saveFeedbackResponses(): void { const notYetAnsweredQuestions: Set = new Set(); - const failToSaveQuestions: Set = new Set(); + const failToSaveQuestions: Record = {}; // Map of question number to error message const savingRequests: Observable[] = []; this.questionSubmissionForms.forEach((questionSubmissionFormModel: QuestionSubmissionFormModel) => { @@ -548,7 +548,8 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { }), catchError((error: any) => { this.statusMessageService.showErrorToast((error as ErrorMessageOutput).error.message); - failToSaveQuestions.add(questionSubmissionFormModel.questionNumber); + failToSaveQuestions[questionSubmissionFormModel.questionNumber] = + (error as ErrorMessageOutput).error.message; return of(error); }), )); @@ -574,7 +575,8 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { switchMap(() => this.createCommentRequest(recipientSubmissionFormModel)), catchError((error: any) => { this.statusMessageService.showErrorToast((error as ErrorMessageOutput).error.message); - failToSaveQuestions.add(questionSubmissionFormModel.questionNumber); + failToSaveQuestions[questionSubmissionFormModel.questionNumber] = + (error as ErrorMessageOutput).error.message; return of(error); }), )); @@ -600,7 +602,8 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { switchMap(() => this.createCommentRequest(recipientSubmissionFormModel)), catchError((error: any) => { this.statusMessageService.showErrorToast((error as ErrorMessageOutput).error.message); - failToSaveQuestions.add(questionSubmissionFormModel.questionNumber); + failToSaveQuestions[questionSubmissionFormModel.questionNumber] + = (error as ErrorMessageOutput).error.message; return of(error); }), )); @@ -616,7 +619,7 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { let hasSubmissionConfirmationError: boolean = false; forkJoin(savingRequests).pipe( switchMap(() => { - if (failToSaveQuestions.size === 0) { + if (Object.keys(failToSaveQuestions).length === 0) { this.statusMessageService.showSuccessToast('All responses submitted successfully!'); } else { this.statusMessageService.showErrorToast('Some responses are not saved successfully'); @@ -644,7 +647,7 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { const modalRef: NgbModalRef = this.modalService.open(SavingCompleteModalComponent); modalRef.componentInstance.notYetAnsweredQuestions = Array.from(notYetAnsweredQuestions.values()).join(', '); - modalRef.componentInstance.failToSaveQuestions = Array.from(failToSaveQuestions.values()).join(', '); + modalRef.componentInstance.failToSaveQuestions = failToSaveQuestions; modalRef.componentInstance.hasSubmissionConfirmationError = hasSubmissionConfirmationError; }), ).subscribe((response: ConfirmationResponse) => { From c4f4d4b6bdcbfb5eabcb4488e08480ee7338f890 Mon Sep 17 00:00:00 2001 From: t-cheepeng Date: Fri, 10 Jul 2020 09:16:15 +0800 Subject: [PATCH 010/205] [#10245] UAT Round 2 Fix: Sorting of floating point numbers (#10290) * Change SortBy constants for numerical scale * Add tests for comparing floats * Add compare float method * Shift floating point related SortBy constants * Change method name and simplify implementation --- ...num-scale-question-statistics.component.ts | 12 ++--- .../services/table-comparator.service.spec.ts | 16 ++++++ src/web/services/table-comparator.service.ts | 52 +++++++++++++------ 3 files changed, 58 insertions(+), 22 deletions(-) diff --git a/src/web/app/components/question-types/question-statistics/num-scale-question-statistics.component.ts b/src/web/app/components/question-types/question-statistics/num-scale-question-statistics.component.ts index 9e879a187c4..524f1e493b9 100644 --- a/src/web/app/components/question-types/question-statistics/num-scale-question-statistics.component.ts +++ b/src/web/app/components/question-types/question-statistics/num-scale-question-statistics.component.ts @@ -36,12 +36,12 @@ export class NumScaleQuestionStatisticsComponent extends NumScaleQuestionStatist private getTableData(): void { this.columnsData = [ - { header: 'Team', sortBy: SortBy.MCQ_CHOICE }, - { header: 'Recipient', sortBy: SortBy.MCQ_WEIGHT }, - { header: 'Average', sortBy: SortBy.MCQ_RESPONSE_COUNT, headerToolTip: 'Average of the visible responses' }, - { header: 'Max', sortBy: SortBy.MCQ_PERCENTAGE, headerToolTip: 'Maximum of the visible responses' }, - { header: 'Min', sortBy: SortBy.MCQ_WEIGHTED_PERCENTAGE, headerToolTip: 'Minimum of the visible responses' }, - { header: 'Average excluding self response', sortBy: SortBy.MCQ_WEIGHTED_PERCENTAGE, + { header: 'Team', sortBy: SortBy.TEAM_NAME }, + { header: 'Recipient', sortBy: SortBy.RECIPIENT_NAME }, + { header: 'Average', sortBy: SortBy.NUMERICAL_SCALE_AVERAGE, headerToolTip: 'Average of the visible responses' }, + { header: 'Max', sortBy: SortBy.NUMERICAL_SCALE_MAX, headerToolTip: 'Maximum of the visible responses' }, + { header: 'Min', sortBy: SortBy.NUMERICAL_SCALE_MIN, headerToolTip: 'Minimum of the visible responses' }, + { header: 'Average excluding self response', sortBy: SortBy.NUMERICAL_SCALE_AVERAGE_EXCLUDE_SELF, headerToolTip: 'Average of the visible responses excluding recipient\'s own response to himself/herself'}, ]; diff --git a/src/web/services/table-comparator.service.spec.ts b/src/web/services/table-comparator.service.spec.ts index f4786249745..ddd80b41276 100644 --- a/src/web/services/table-comparator.service.spec.ts +++ b/src/web/services/table-comparator.service.spec.ts @@ -32,4 +32,20 @@ describe('SortableService', () => { expect(service.compare(SortBy.SECTION_NAME, SortOrder.ASC, 'Team 2' , 'Team 11')).toEqual(-1); expect(service.compare(SortBy.STUDENT_NAME, SortOrder.ASC, 'Team 2' , 'Team 11')).toEqual(1); }); + + it('should compare floating point numbers correctly', () => { + expect(service.compareNumbers('30.5', '30.31', SortOrder.ASC)).toEqual(1); + expect(service.compareNumbers('0.67', '0.66', SortOrder.DESC)).toEqual(-1); + expect(service.compareNumbers('0.76', '0.76', SortOrder.ASC)).toEqual(0); + expect(service.compareNumbers('1.76', '1.76', SortOrder.DESC)).toEqual(-0); + }); + + it('should compare NaN correctly', () => { + expect(service.compareNumbers('-', '1.34', SortOrder.ASC)).toEqual(1); + expect(service.compareNumbers('-', '1.34', SortOrder.DESC)).toEqual(1); + expect(service.compareNumbers('1.34', 'NaN', SortOrder.ASC)).toEqual(-1); + expect(service.compareNumbers('1.34', 'NaN', SortOrder.DESC)).toEqual(-1); + expect(service.compareNumbers('-', 'NaN', SortOrder.ASC)).toEqual(1); + expect(service.compareNumbers('NaN', '-', SortOrder.DESC)).toEqual(1); + }); }); diff --git a/src/web/services/table-comparator.service.ts b/src/web/services/table-comparator.service.ts index f209802d729..b46547dec70 100644 --- a/src/web/services/table-comparator.service.ts +++ b/src/web/services/table-comparator.service.ts @@ -37,38 +37,41 @@ export class TableComparatorService { return 0; } + /** + * Compares two strings which are expected to be numbers depending on the order given. + * If either string cannot be parsed into number, it will be seen as 'smaller' + * If both strings cannot be parsed into number, strA will always be seen as 'larger' + */ + compareNumbers(strA: string, strB: string, order: SortOrder): number { + const numA: number = Number(strA); + const numB: number = Number(strB); + if (Number.isNaN(numA)) { + return 1; + } + + if (Number.isNaN(numB)) { + return -1; + } + + return (order === SortOrder.DESC ? -1 : 1) * Math.sign(numA - numB); + } + /** * Compares two strings depending on element to sort by and the order given. */ compare(sortBy: SortBy, order: SortOrder, strA: string, strB: string): number { switch (sortBy) { - case SortBy.CONSTSUM_OPTIONS_POINTS: - case SortBy.CONSTSUM_RECIPIENTS_POINTS: case SortBy.CONTRIBUTION_VALUE: case SortBy.RUBRIC_CHOICE: case SortBy.RANK_RECIPIENTS_TEAM: case SortBy.RANK_RECIPIENTS_RECIPIENT: case SortBy.RANK_OPTIONS_OVERALL_RANK: - case SortBy.NUMERICAL_SCALE_AVERAGE: case SortBy.NUMERICAL_SCALE_MAX: case SortBy.NUMERICAL_SCALE_MIN: - case SortBy.NUMERICAL_SCALE_AVERAGE_EXCLUDE_SELF: - case SortBy.MCQ_WEIGHT: case SortBy.MCQ_RESPONSE_COUNT: - case SortBy.MCQ_PERCENTAGE: - case SortBy.MCQ_WEIGHTED_PERCENTAGE: case SortBy.MCQ_OPTION_SELECTED_TIMES: - case SortBy.MCQ_WEIGHT_TOTAL: - case SortBy.MCQ_WEIGHT_AVERAGE: - case SortBy.MSQ_WEIGHT: case SortBy.MSQ_RESPONSE_COUNT: - case SortBy.MSQ_PERCENTAGE: - case SortBy.MSQ_WEIGHTED_PERCENTAGE: case SortBy.MSQ_OPTION_SELECTED_TIMES: - case SortBy.MSQ_WEIGHT_TOTAL: - case SortBy.MSQ_WEIGHT_AVERAGE: - case SortBy.RUBRIC_TOTAL_CHOSEN_WEIGHT: - case SortBy.RUBRIC_WEIGHT_AVERAGE: case SortBy.SECTION_NAME: case SortBy.TEAM_NAME: case SortBy.SESSION_NAME: @@ -107,6 +110,23 @@ export class TableComparatorService { case SortBy.RECIPIENT_TEAM: case SortBy.RECIPIENT_NAME: return this.compareLexicographically(strA, strB, order); + case SortBy.CONSTSUM_OPTIONS_POINTS: + case SortBy.CONSTSUM_RECIPIENTS_POINTS: + case SortBy.RUBRIC_WEIGHT_AVERAGE: + case SortBy.RUBRIC_TOTAL_CHOSEN_WEIGHT: + case SortBy.NUMERICAL_SCALE_AVERAGE: + case SortBy.NUMERICAL_SCALE_AVERAGE_EXCLUDE_SELF: + case SortBy.MCQ_WEIGHT: + case SortBy.MCQ_PERCENTAGE: + case SortBy.MCQ_WEIGHTED_PERCENTAGE: + case SortBy.MCQ_WEIGHT_TOTAL: + case SortBy.MCQ_WEIGHT_AVERAGE: + case SortBy.MSQ_WEIGHT: + case SortBy.MSQ_PERCENTAGE: + case SortBy.MSQ_WEIGHTED_PERCENTAGE: + case SortBy.MSQ_WEIGHT_TOTAL: + case SortBy.MSQ_WEIGHT_AVERAGE: + return this.compareNumbers(strA, strB, order); default: return 0; } From ad54d250050e608fd1a2d2ce77b0d52eadff0b6d Mon Sep 17 00:00:00 2001 From: nodermatt Date: Fri, 10 Jul 2020 05:07:57 +0200 Subject: [PATCH 011/205] [#10042] improve ui for mobile compatibility ranked question (#10289) * Fix checkbox margins for small displays * Fix overflow of dropdown button in feedback path and visibility * Revert "Fix overflow of dropdown button in feedback path and visibility" This reverts commit 05de3c1eaa662096b4a3560a50b97f351eaeaef9. * Add css class to enable button shrinking * Updated question-edit-form.component.spec.ts.snap Co-authored-by: Nic Co-authored-by: t-cheepeng --- .../question-edit-form.component.spec.ts.snap | 8 +-- .../question-edit-form.component.html | 6 +- .../question-edit-form.component.scss | 4 ++ ...-question-edit-details-form.component.html | 66 +++++++++++-------- 4 files changed, 51 insertions(+), 33 deletions(-) diff --git a/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap b/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap index cb189dcf0e0..5c4cdb33c6f 100644 --- a/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap +++ b/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap @@ -161,14 +161,14 @@ exports[`QuestionEditFormComponent should snap with default view 1`] = ` class="col-md-10" >
    -
    @@ -110,7 +110,7 @@
    Warning: Any u (Who is giving feedback about whom?)
    -
    -
    +
    - -
    -
    - - -
    - - +
    +
    +
    + +
    +
    + +
    +
    + + + +
    +
    +
    +
    + + +
    +
    +
    From 560eb09e763c0b0523b238d1171b025c3564802a Mon Sep 17 00:00:00 2001 From: Ahmed Bahajjaj Date: Fri, 10 Jul 2020 18:34:21 +0800 Subject: [PATCH 012/205] [#10019] Add secure flag to cookie in server response (#10292) --- src/main/java/teammates/ui/webapi/action/GetAuthInfoAction.java | 2 -- src/main/java/teammates/ui/webapi/action/JsonResult.java | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/teammates/ui/webapi/action/GetAuthInfoAction.java b/src/main/java/teammates/ui/webapi/action/GetAuthInfoAction.java index 6571caba507..382eebd2282 100644 --- a/src/main/java/teammates/ui/webapi/action/GetAuthInfoAction.java +++ b/src/main/java/teammates/ui/webapi/action/GetAuthInfoAction.java @@ -6,7 +6,6 @@ import javax.servlet.http.Cookie; import teammates.common.datatransfer.attributes.AccountAttributes; -import teammates.common.util.Config; import teammates.common.util.Const; import teammates.common.util.HttpRequestHelper; import teammates.common.util.StringHelper; @@ -65,7 +64,6 @@ public ActionResult execute() { return new JsonResult(output); } Cookie csrfTokenCookie = new Cookie(Const.CsrfConfig.TOKEN_COOKIE_NAME, csrfToken); - csrfTokenCookie.setSecure(!Config.isDevServer()); csrfTokenCookie.setPath("/"); List cookieList = Collections.singletonList(csrfTokenCookie); return new JsonResult(output, cookieList); diff --git a/src/main/java/teammates/ui/webapi/action/JsonResult.java b/src/main/java/teammates/ui/webapi/action/JsonResult.java index 0bc14cb3e26..a12f70e5975 100644 --- a/src/main/java/teammates/ui/webapi/action/JsonResult.java +++ b/src/main/java/teammates/ui/webapi/action/JsonResult.java @@ -54,6 +54,7 @@ public ApiOutput getOutput() { public void send(HttpServletResponse resp) throws IOException { output.setRequestId(Config.getRequestId()); for (Cookie cookie : cookies) { + cookie.setSecure(!Config.isDevServer()); resp.addCookie(cookie); } resp.setStatus(getStatusCode()); From 0b8966c9a72a6f7c5d60a187f70bec2790da008b Mon Sep 17 00:00:00 2001 From: t-cheepeng Date: Fri, 10 Jul 2020 20:47:08 +0800 Subject: [PATCH 013/205] [#10245] UAT Round 2: Fix Help Page Links (#10274) --- ...ibution-question-statistics.component.html | 2 +- ...tribution-question-statistics.component.ts | 6 + .../session-edit-form.component.ts | 2 +- .../courses-section-questions.ts | 104 +++++++++++++++ ...ructor-help-courses-section.component.html | 122 +++++++++--------- ...structor-help-courses-section.component.ts | 60 +++++---- ...ructor-help-getting-started.component.html | 28 ++-- ...structor-help-getting-started.component.ts | 13 ++ .../instructor-help-page.component.html | 8 +- .../instructor-help-page.component.spec.ts | 35 ++--- .../instructor-help-page.component.ts | 72 +++++++++-- ...ctor-help-questions-section.component.html | 50 +++---- ...ructor-help-questions-section.component.ts | 47 +++---- .../questions-section-questions.ts | 54 ++++++++ .../instructor-help-section.component.ts | 6 +- ...uctor-help-sessions-section.component.html | 88 ++++++------- ...tructor-help-sessions-section.component.ts | 51 +++++--- .../sessions-section-questions.ts | 74 +++++++++++ ...uctor-help-students-section.component.html | 42 +++--- ...tructor-help-students-section.component.ts | 27 ++-- .../students-section-questions.ts | 39 ++++++ ...instructor-course-edit-page.component.html | 2 +- .../instructor-course-edit-page.component.ts | 14 +- .../instructor-session-edit-page.component.ts | 2 +- 24 files changed, 660 insertions(+), 288 deletions(-) create mode 100644 src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/courses-section-questions.ts create mode 100644 src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/questions-section-questions.ts create mode 100644 src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/sessions-section-questions.ts create mode 100644 src/web/app/pages-help/instructor-help-page/instructor-help-students-section/students-section-questions.ts diff --git a/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.html b/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.html index cc3bc702101..b6182c13866 100644 --- a/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.html +++ b/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.html @@ -51,7 +51,7 @@
    - [How do I interpret/use these values?] + [How do I interpret/use these values?]
    diff --git a/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.ts b/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.ts index e6f0defbc51..6c0cd5ec366 100644 --- a/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.ts +++ b/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.ts @@ -3,6 +3,8 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ContributionStatistics } from '../../../../../types/api-output'; import { DEFAULT_CONTRIBUTION_QUESTION_DETAILS } from '../../../../../types/default-question-structs'; import { SortBy } from '../../../../../types/sort-properties'; +import { QuestionsSectionQuestions } from '../../../../pages-help/instructor-help-page/instructor-help-questions-section/questions-section-questions'; +import { Sections } from '../../../../pages-help/instructor-help-page/sections'; import { ColumnData, SortableTableCellData } from '../../../sortable-table/sortable-table.component'; import { ContributionQuestionStatisticsCalculation, @@ -21,6 +23,10 @@ import { ContributionComponent } from './contribution.component'; export class ContributionQuestionStatisticsComponent extends ContributionQuestionStatisticsCalculation implements OnInit, OnChanges { + // enum + QuestionsSectionQuestions: typeof QuestionsSectionQuestions = QuestionsSectionQuestions; + Sections: typeof Sections = Sections; + @Input() displayContributionStats: boolean = true; columnsData: ColumnData[] = []; diff --git a/src/web/app/components/session-edit-form/session-edit-form.component.ts b/src/web/app/components/session-edit-form/session-edit-form.component.ts index 67f3beba5bd..4ffb6f2d0fb 100644 --- a/src/web/app/components/session-edit-form/session-edit-form.component.ts +++ b/src/web/app/components/session-edit-form/session-edit-form.component.ts @@ -231,7 +231,7 @@ export class SessionEditFormComponent implements OnInit { * Handles session 'Help' link click event. */ sessionHelpHandler(): void { - this.navigationService.openNewWindow(`${environment.frontendUrl}/web/instructor/help#sessions`); + this.navigationService.openNewWindow(`${environment.frontendUrl}/web/instructor/help?questionId=sessions§ion=sessions`); } /** diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/courses-section-questions.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/courses-section-questions.ts new file mode 100644 index 00000000000..d18b32d225c --- /dev/null +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/courses-section-questions.ts @@ -0,0 +1,104 @@ +/** + * Unique identifiers for each question in the courses section of instructor help page + */ +export enum CoursesSectionQuestions { + /** + * How do I add students to a course? + */ + COURSE_ADD_STUDENTS = 'course-add-students', + + /** + * Is there a size limit for a course? + */ + SIZE_LIMIT = 'size-limit', + + /** + * What should I do if my course doesn’t have teams? + */ + NO_TEAMS = 'no-teams', + + /** + * What are sections meant for? + */ + SECTIONS = 'sections', + + /** + * How do I enroll students into sections? + */ + ENROLL_SECTIONS = 'enroll-sections', + + /** + * How do I add instructors to my course? + */ + COURSE_ADD_INSTRUCTOR = 'course-add-instructor', + + /** + * How do I edit the information of an instructor in my course? + */ + COURSE_EDIT_INSTRUCTOR = 'course-edit-instructor', + + /** + * How do I set an instructor's access level? + */ + COURSE_INSTRUCTOR_ACCESS = 'course-instructor-access', + + /** + * How do I set custom privileges for an instructor? + */ + PRIVILEGES = 'privileges', + + /** + * How do I view a list of students in a course? + */ + COURSE_VIEW_STUDENTS = 'course-view-students', + + /** + * How do I change a student's section? + */ + CHANGE_SECTION = 'change-section', + + /** + * What should I do if a student says his/her courses have disappeared from the system? + */ + DISAPPEARED_COURSE = 'disappeared-course', + + /** + * How do I delete students from a course? + */ + DEL_STUDENTS = 'del-students', + + /** + * How do I archive a course? + */ + COURSE_ARCHIVE = 'course-archive', + + /** + * How do I view courses I have archived? + */ + COURSE_VIEW_ARCHIVED = 'course-view-archived', + + /** + * How do I unarchive an archived course? + */ + COURSE_UNARCHIVE = 'course-unarchive', + + /** + * How do I view courses I have deleted? + */ + COURSE_VIEW_DELETED = 'course-view-deleted', + + /** + * How do I restore a deleted course? + */ + COURSE_RESTORE = 'course-restore', + + /** + * How do I permanently delete a course? + */ + PERM_DEL = 'perm-del', + + /** + * How do I restore/delete all courses from Recycle Bin? + */ + RESTORE_ALL = 'restore-all', +} diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.html b/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.html index 847ed041ad8..f2a7fc4fcfa 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.html +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.html @@ -3,13 +3,13 @@

    Enrolling Students in Courses

    -
    +

    -

    -
    +

    @@ -30,14 +30,14 @@

    Enrolling Students in Courses<

    -

    -
    +

    - No. However, if courses with an enrollment of more than 100 students need to be divided into sections.
    + No. However, if courses with an enrollment of more than 100 students need to be divided into sections.
    TEAMMATES uses section information to organize the results of your sessions into a downloadable report.

    @@ -48,11 +48,11 @@

    Enrolling Students in Courses<

    -

    -
    +

    @@ -67,11 +67,11 @@

    Enrolling Students in Courses<

    -

    -
    +

    @@ -89,13 +89,13 @@

    Enrolling Students in Courses<

    -
    +

    -

    -
    +

    @@ -110,13 +110,13 @@

    Enrolling Students in Courses<

    Adding Instructors to Courses

    -
    +

    -

    -
    +

    @@ -143,13 +143,13 @@

    Adding Instructors to Courses<

    -
    +

    -

    -
    +

    @@ -179,17 +179,17 @@

    Adding Instructors to Courses<

    -
    +

    -

    -
    +

    - When adding an instructor or editing an instructor's information, you can set the instructor's access level. + When adding an instructor or editing an instructor's information, you can set the instructor's access level. There are 4 pre-defined privilege options for you to choose from:

      @@ -218,11 +218,11 @@

      Adding Instructors to Courses<

      -

      -
      +

      @@ -242,13 +242,13 @@

      Adding Instructors to Courses<

      Managing Courses

      -
      +

      -

      -
      +

      @@ -274,11 +274,11 @@

      Managing Courses

      -

      -
      +

      @@ -292,7 +292,7 @@

      Managing Courses

      Click the button in the last column of the row corresponding to Student A.
    • - A new page will open that allows you to edit the student's profile, including a field to edit the student's section.
      + A new page will open that allows you to , including a field to edit the student's section.
    • After editing the section name, click to confirm Student A's new section. @@ -306,11 +306,11 @@

      Managing Courses

      -

      -
      +

      @@ -325,11 +325,11 @@

      Managing Courses

      -

      -
      +

      @@ -337,7 +337,7 @@

      Managing Courses

      1. - View the student list of Course B. + View the student list of Course B.
      2. In the row corresponding to Student A, click the button. @@ -354,13 +354,13 @@

        Managing Courses

        Archiving Courses

        -
        +

        -

        -
        +

        @@ -381,13 +381,13 @@

        Archiving Courses

        -
        +

        -

        -
        +

        @@ -396,7 +396,7 @@

        Archiving Courses

        The courses you have previously archived are listed here. - In order to access information in an archived course, unarchive the course. + In order to access information in an archived course, unarchive the course.

        @@ -404,17 +404,17 @@

        Archiving Courses

        -
        +

        -

        -
        +

        - To unarchive a course, first view the course that you would like to unarchive in the Courses page.
        + To unarchive a course, first view the course that you would like to unarchive in the Courses page.
        Then, click on the button corresponding to the course you want to unarchive.

        @@ -425,13 +425,13 @@

        Archiving Courses

        Restoring Deleted Courses

        -
        +

        -

        -
        +

        @@ -440,7 +440,7 @@

        Restoring Deleted Courses

        The courses you have previously deleted are listed here. - In order to access information in a deleted course, restore the course. + In order to access information in a deleted course, restore the course.

        @@ -448,17 +448,17 @@

        Restoring Deleted Courses

        -
        +

        -

        -
        +

        - To restore a deleted course, first view the course that you would like to restore in the Courses page.
        + To restore a deleted course, first view the course that you would like to restore in the Courses page.
        Then, click on the button corresponding to the course you want to restore.

        @@ -472,15 +472,15 @@

        Restoring Deleted Courses

        -

        -
        +

        - To permanently delete a course, first view the course that you would like to permanently delete in the Courses page.
        + To permanently delete a course, first view the course that you would like to permanently delete in the Courses page.
        Then, click on the button corresponding to the course you want to delete.

        @@ -494,15 +494,15 @@

        Restoring Deleted Courses

        -

        -
        +

        - First view the course and check for courses in Recycle Bin.
        + First view the course and check for courses in Recycle Bin.
        To restore all courses, click on the Restore All button in Deleted courses heading; to delete all courses, click on the Delete All button in Deleted courses heading.

        diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.ts index e7d1c27a183..70eecd69403 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-courses-section/instructor-help-courses-section.component.ts @@ -4,6 +4,9 @@ import { PageScrollService } from 'ngx-page-scroll-core'; import { environment } from '../../../../environments/environment'; import { collapseAnim } from '../../../components/teammates-common/collapse-anim'; import { InstructorHelpSectionComponent } from '../instructor-help-section.component'; +import { StudentsSectionQuestions } from '../instructor-help-students-section/students-section-questions'; +import { Sections } from '../sections'; +import { CoursesSectionQuestions } from './courses-section-questions'; /** * Courses section of the Instructor Help Page @@ -16,29 +19,37 @@ import { InstructorHelpSectionComponent } from '../instructor-help-section.compo }) export class InstructorHelpCoursesSectionComponent extends InstructorHelpSectionComponent implements OnInit { + // enum + StudentsSectionQuestions: typeof StudentsSectionQuestions = StudentsSectionQuestions; + CoursesSectionQuestions: typeof CoursesSectionQuestions = CoursesSectionQuestions; + Sections: typeof Sections = Sections; + readonly supportEmail: string = environment.supportEmail; - isAddStudentsCollapsed: boolean = false; - isSizeLimitCollapsed: boolean = false; - isNoTeamsCollapsed: boolean = false; - isSectionsCollapsed: boolean = false; - isEnrollSectionsCollapsed: boolean = false; - isAddInstructorCollapsed: boolean = false; - isEditInstructorCollapsed: boolean = false; - isInstructorAccessCollapsed: boolean = false; - isPrivilegesCollapsed: boolean = false; - isViewStudentsCollapsed: boolean = false; - isChangeSectionCollapsed: boolean = false; - isDisappearedCourseCollapsed: boolean = false; - isDelStudentsCollapsed: boolean = false; - isArchiveCourseCollapsed: boolean = false; - isViewArchivedCollapsed: boolean = false; - isCourseUnarchiveCollapsed: boolean = false; - isViewDelCollapsed: boolean = false; - isRestoreCollapsed: boolean = false; - isDelCollapsed: boolean = false; - isRestoreAllCollapsed: boolean = false; - @Output() collapseStudentEditDetails: EventEmitter = new EventEmitter(); + questionsToCollapsed: Record = { + [CoursesSectionQuestions.COURSE_ADD_STUDENTS]: false, + [CoursesSectionQuestions.SIZE_LIMIT]: false, + [CoursesSectionQuestions.NO_TEAMS]: false, + [CoursesSectionQuestions.SECTIONS]: false, + [CoursesSectionQuestions.ENROLL_SECTIONS]: false, + [CoursesSectionQuestions.COURSE_ADD_INSTRUCTOR]: false, + [CoursesSectionQuestions.COURSE_EDIT_INSTRUCTOR]: false, + [CoursesSectionQuestions.COURSE_INSTRUCTOR_ACCESS]: false, + [CoursesSectionQuestions.PRIVILEGES]: false, + [CoursesSectionQuestions.COURSE_VIEW_STUDENTS]: false, + [CoursesSectionQuestions.CHANGE_SECTION]: false, + [CoursesSectionQuestions.DISAPPEARED_COURSE]: false, + [CoursesSectionQuestions.DEL_STUDENTS]: false, + [CoursesSectionQuestions.COURSE_ARCHIVE]: false, + [CoursesSectionQuestions.COURSE_VIEW_ARCHIVED]: false, + [CoursesSectionQuestions.COURSE_UNARCHIVE]: false, + [CoursesSectionQuestions.COURSE_VIEW_DELETED]: false, + [CoursesSectionQuestions.COURSE_RESTORE]: false, + [CoursesSectionQuestions.PERM_DEL]: false, + [CoursesSectionQuestions.RESTORE_ALL]: false, + }; + + @Output() collapseStudentEditDetails: EventEmitter = new EventEmitter(); constructor(private pageScrollService: PageScrollService, @Inject(DOCUMENT) private document: any) { @@ -57,9 +68,10 @@ export class InstructorHelpCoursesSectionComponent extends InstructorHelpSection scrollTarget: `#${target}`, scrollOffset: 70, }); - if (target === 'student-edit-details') { - this.collapseStudentEditDetails.emit(true); - } return false; } + + expand(questionId: string): void { + this.questionsToCollapsed[questionId] = true; + } } diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-getting-started/instructor-help-getting-started.component.html b/src/web/app/pages-help/instructor-help-page/instructor-help-getting-started/instructor-help-getting-started.component.html index 5dd1e368af6..61597ebe33f 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-getting-started/instructor-help-getting-started.component.html +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-getting-started/instructor-help-getting-started.component.html @@ -33,15 +33,15 @@

        1. Set up a course

      3. - Enroll students in the course
        + Enroll students in the course
        Go to the Courses page and click the button of the corresponding course.
        Students can be enrolled into teams (e.g. project groups) and sections (e.g. tutorial classes, lecture groups) to facilitate giving feedback in and among these smaller groups.
        TEAMMATES will not automatically notify students that they have been enrolled. However, if you would like students to access TEAMMATES sooner (e.g. if you would like them to fill in their profile page in advance), click the button of the course in the Courses page. Then, click button, which will send them instructions to access TEAMMATES immediately.
      4. - Add instructors to the course
        + Add instructors to the course
        From the Courses page, click the button of the course you would like to add instructors to. You will be directed to the Edit Course page where you can add a new instructor to your course. - You can specify the access level of any instructor you add to a course. For more information about how to add an instructor to your course, click here. + You can specify the access level of any instructor you add to a course. For more information about how to add an instructor to your course, click here.
      @@ -74,12 +74,12 @@

      2. Create a session

  • - Add questions to your session to suit your needs.
    + Add questions to your session to suit your needs.
    For each question, you can set the following:
    • - Question type: the style of question being asked. Choose from our 10 different question types. + Question type: the style of question being asked. Choose from our 10 different question types.
    • Question feedback path: the feedback giver and feedback recipient @@ -90,7 +90,7 @@

      2. Create a session

  • Preview your session
    - After you have finished setting up your session, preview the session as a student or another instructor. + After you have finished setting up your session, preview the session as a student or another instructor.
    • @@ -139,19 +139,19 @@

    4. View and publish session results

    • - View responses: see what respondents have answered, even if the session is still ongoing. Go to the Sessions page and click the corresponding button. + View responses: see what respondents have answered, even if the session is still ongoing. Go to the Sessions page and click the corresponding button.
    • Moderate responses: edit inappropriate responses from respondents before publishing the responses.
    • - Add comments to responses: reply to respondents' answers, or add your own notes on a response. You can make your comment visible to other instructors, the response giver, and/or the response giver's team. + Add comments to responses: reply to respondents' answers, or add your own notes on a response. You can make your comment visible to other instructors, the response giver, and/or the response giver's team.
    • Remind students to submit responses: TEAMMATES automatically sends reminders to students; however, you can also manually send reminder emails to students at any time while a session is open. Click the button of the session from the Home or Sessions page.
    • - Submit responses for students: if a student has missed the closing time of the session, or is unable to submit the evaluation due to technical problems, you can submit the student's responses on his/her behalf. + Submit responses for students: if a student has missed the closing time of the session, or is unable to submit the evaluation due to technical problems, you can submit the student's responses on his/her behalf.

    @@ -179,19 +179,19 @@

    5. Learn about other actions you can perform

    diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-getting-started/instructor-help-getting-started.component.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-getting-started/instructor-help-getting-started.component.ts index 6cd4a921b3d..a83536415aa 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-getting-started/instructor-help-getting-started.component.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-getting-started/instructor-help-getting-started.component.ts @@ -1,6 +1,11 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { environment } from '../../../../environments/environment'; +import { CoursesSectionQuestions } from '../instructor-help-courses-section/courses-section-questions'; +import { QuestionsSectionQuestions } from '../instructor-help-questions-section/questions-section-questions'; +import { SessionsSectionQuestions } from '../instructor-help-sessions-section/sessions-section-questions'; +import { StudentsSectionQuestions } from '../instructor-help-students-section/students-section-questions'; +import { Sections } from '../sections'; /** * Getting Started Section for Instructors @@ -11,6 +16,14 @@ import { environment } from '../../../../environments/environment'; styleUrls: ['./instructor-help-getting-started.component.scss'], }) export class InstructorHelpGettingStartedComponent implements OnInit { + + // enum + StudentsSectionQuestions: typeof StudentsSectionQuestions = StudentsSectionQuestions; + CoursesSectionQuestions: typeof CoursesSectionQuestions = CoursesSectionQuestions; + SessionsSectionQuestions: typeof SessionsSectionQuestions = SessionsSectionQuestions; + QuestionsSectionQuestions: typeof QuestionsSectionQuestions = QuestionsSectionQuestions; + Sections: typeof Sections = Sections; + readonly supportEmail: string = environment.supportEmail; instructorHelpPath: string = ''; diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-page.component.html b/src/web/app/pages-help/instructor-help-page/instructor-help-page.component.html index d02f94e8442..3f946734c73 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-page.component.html +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-page.component.html @@ -21,19 +21,19 @@

    Help for Instructors

    - +
    - +
    - +
    - +
    diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-page.component.spec.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-page.component.spec.ts index 3c31cf567b7..4724043046e 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-page.component.spec.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-page.component.spec.ts @@ -1,29 +1,11 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { NgxPageScrollCoreModule } from 'ngx-page-scroll-core'; import { InstructorHelpPageComponent } from './instructor-help-page.component'; - -import { Component, Input } from '@angular/core'; - -@Component({ selector: 'tm-instructor-help-students-section', template: '' }) -class InstructorHelpStudentsSectionStubComponent { - @Input() key: string = ''; - @Input() isEditDetailsCollapsed: boolean = false; -} -@Component({ selector: 'tm-instructor-help-courses-section', template: '' }) -class InstructorHelpCoursesSectionStubComponent { - @Input() key: string = ''; -} -@Component({ selector: 'tm-instructor-help-sessions-section', template: '' }) -class InstructorHelpSessionsSectionStubComponent { - @Input() key: string = ''; - @Input() isPeerEvalTipsCollapsed: boolean = false; -} -@Component({ selector: 'tm-instructor-help-questions-section', template: '' }) -class InstructorHelpQuestionsSectionStubComponent { - @Input() key: string = ''; -} +import { InstructorHelpPageModule } from './instructor-help-page.module'; describe('InstructorHelpPageComponent', () => { let component: InstructorHelpPageComponent; @@ -31,10 +13,13 @@ describe('InstructorHelpPageComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [InstructorHelpPageComponent, InstructorHelpCoursesSectionStubComponent, - InstructorHelpStudentsSectionStubComponent, InstructorHelpSessionsSectionStubComponent, - InstructorHelpQuestionsSectionStubComponent], - imports: [FormsModule, NgbModule, RouterTestingModule], + imports: [ + FormsModule, + NgbModule, + RouterTestingModule, + InstructorHelpPageModule, + NgxPageScrollCoreModule, + HttpClientTestingModule], }) .compileComponents(); })); diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-page.component.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-page.component.ts index d5dc6194d64..3562895d267 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-page.component.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-page.component.ts @@ -1,6 +1,14 @@ -import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; +import { DOCUMENT } from '@angular/common'; +import { AfterViewInit, Component, ElementRef, EventEmitter, Inject, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute, Params } from '@angular/router'; +import { PageScrollService } from 'ngx-page-scroll-core'; import { environment } from '../../../environments/environment'; +import { InstructorHelpCoursesSectionComponent } from './instructor-help-courses-section/instructor-help-courses-section.component'; +import { InstructorHelpQuestionsSectionComponent } from './instructor-help-questions-section/instructor-help-questions-section.component'; +import { InstructorHelpSessionsSectionComponent } from './instructor-help-sessions-section/instructor-help-sessions-section.component'; +import { SessionsSectionQuestions } from './instructor-help-sessions-section/sessions-section-questions'; +import { InstructorHelpStudentsSectionComponent } from './instructor-help-students-section/instructor-help-students-section.component'; +import { StudentsSectionQuestions } from './instructor-help-students-section/students-section-questions'; import { Sections } from './sections'; /** @@ -17,22 +25,47 @@ export class InstructorHelpPageComponent implements OnInit, AfterViewInit { readonly supportEmail: string = environment.supportEmail; searchTerm: String = ''; key: String = ''; - isEditDetailsCollapsed: boolean = false; - isPeerEvalTipsCollapsed: boolean = false; + + scrollFinishEvent: EventEmitter = new EventEmitter(); + questionIdToExpand: string = ''; + section: string = ''; @ViewChild('helpPage') bodyRef ?: ElementRef; + @ViewChild('studentsHelpSection') studentsHelpSection?: InstructorHelpStudentsSectionComponent; + @ViewChild('coursesHelpSection') coursesHelpSection?: InstructorHelpCoursesSectionComponent; + @ViewChild('sessionsHelpSection') sessionsHelpSection?: InstructorHelpSessionsSectionComponent; + @ViewChild('questionsHelpSection') questionsHelpSection?: InstructorHelpQuestionsSectionComponent; - constructor(private route: ActivatedRoute) { } + constructor(private route: ActivatedRoute, + private pageScrollService: PageScrollService, + @Inject(DOCUMENT) private document: Document) { } ngOnInit(): void { + this.scrollFinishEvent.subscribe(() => this.expandQuestionTab()); } ngAfterViewInit(): void { - this.route.fragment.subscribe((f: string) => { - this.scroll(f); + this.route.queryParams.subscribe((queryParam: Params) => { + if (queryParam.questionId && queryParam.section) { + this.questionIdToExpand = queryParam.questionId; + this.section = queryParam.section; + this.scrollTo(queryParam.questionId); + } }); } + expandQuestionTab(): void { + if (this.section === Sections.students && this.studentsHelpSection) { + this.studentsHelpSection.expand(this.questionIdToExpand); + } else if (this.section === Sections.courses && this.coursesHelpSection) { + this.coursesHelpSection.expand(this.questionIdToExpand); + } else if (this.section === Sections.sessions && this.sessionsHelpSection) { + this.sessionsHelpSection.expand(this.questionIdToExpand); + } else if (this.section === Sections.questions && this.questionsHelpSection) { + this.questionsHelpSection.expand(this.questionIdToExpand); + } + } + /** * Filters the help contents and displays only those that matches the filter. */ @@ -58,6 +91,16 @@ export class InstructorHelpPageComponent implements OnInit, AfterViewInit { } } + scrollTo(target: string, timeout?: number): void { + setTimeout(() => this.pageScrollService.scroll({ + document: this.document, + duration: 500, + scrollTarget: `#${target}`, + scrollOffset: 70, + scrollFinishListener: this.scrollFinishEvent, + }), timeout ? timeout : 500); + } + /** * Clears the filter used for search. */ @@ -69,16 +112,19 @@ export class InstructorHelpPageComponent implements OnInit, AfterViewInit { /** * Collapses question card on student edit details in Students section. */ - collapseStudentEditDetails(event: boolean): void { - this.isEditDetailsCollapsed = event; - this.isEditDetailsCollapsed = Object.assign({}, this.isEditDetailsCollapsed); + collapseStudentEditDetails(): void { + this.questionIdToExpand = StudentsSectionQuestions.STUDENT_EDIT_DETAILS; + this.section = Sections.students; + this.scrollTo(StudentsSectionQuestions.STUDENT_EDIT_DETAILS, 100); } /** * Collapses question card on peer evaluation tips in Sessions section. */ - collapsePeerEvalTips(event: boolean): void { - this.isPeerEvalTipsCollapsed = event; - this.isPeerEvalTipsCollapsed = Object.assign({}, this.isPeerEvalTipsCollapsed); + collapsePeerEvalTips(): void { + this.questionIdToExpand = SessionsSectionQuestions.TIPS_FOR_CONDUCTION_PEER_EVAL; + this.section = Sections.sessions; + this.scrollTo(SessionsSectionQuestions.TIPS_FOR_CONDUCTION_PEER_EVAL, 100); } + } diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.html b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.html index 2e13d99e51c..6174df51cb4 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.html +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.html @@ -3,13 +3,13 @@

    Setting Up Questions

    -
    +

    -

    -
    +

    @@ -40,13 +40,13 @@

    Setting Up Questions

    -
    +

    -

    -
    +

    @@ -109,17 +109,17 @@

    Setting Up Questions

    -

    -
    +

    Multiple-choice (multiple answers) question are similar to the single answer version, except that respondents are able to select multiple options as their response.
    The setup and result statistics is similar to the single answer version. See - above for details. + above for details.

    Note: Multiple-choice (multiple answers) question allow respondents to select 'None of the above' option as an answer, @@ -134,11 +134,11 @@

    Setting Up Questions

    -

    -
    +

    @@ -193,11 +193,11 @@

    Setting Up Questions

    -

    -
    +

    @@ -251,11 +251,11 @@

    Setting Up Questions

    -

    -
    +

    @@ -292,13 +292,13 @@

    Setting Up Questions

    -
    +

    -

    -
    +

    @@ -529,7 +529,7 @@

    Setting Up Questions

    The ratings in a contribution question can be used to identify relative contribution levels of students in a team. If you use these values for grading, also refer the ‘Interpret contribution numbers with care’ caveat in the - tips for conducting 'team peer evaluation' sessions section. + section.

    The actual contribution values entered by the student may appear different from the values shown in the results because the system ‘normalizes’ those values so that there is no artificial inflation of contribution. @@ -554,11 +554,11 @@

    Setting Up Questions

    -

    -
    +

    @@ -653,11 +653,11 @@

    Setting Up Questions

    -

    -
    +

    @@ -699,11 +699,11 @@

    Setting Up Questions

    -

    -
    +

    diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.ts index 9671ddd8bdf..39ffb067979 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/instructor-help-questions-section.component.ts @@ -14,17 +14,13 @@ import { QuestionEditFormMode, QuestionEditFormModel, } from '../../../components/question-edit-form/question-edit-form-model'; -import { QuestionSubmissionFormModel, -} from '../../../components/question-submission-form/question-submission-form-model'; +import { QuestionSubmissionFormModel } from '../../../components/question-submission-form/question-submission-form-model'; import { Response } from '../../../components/question-types/question-statistics/question-statistics'; import { collapseAnim } from '../../../components/teammates-common/collapse-anim'; -import { - QuestionTabModel, -} from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-page.component'; -import { - InstructorSessionResultSectionType, -} from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-section-type.enum'; +import { QuestionTabModel } from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-page.component'; +import { InstructorSessionResultSectionType } from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-section-type.enum'; import { InstructorHelpSectionComponent } from '../instructor-help-section.component'; +import { SessionsSectionQuestions } from '../instructor-help-sessions-section/sessions-section-questions'; import { EXAMPLE_CONTRIBUTION_STATISTICS, EXAMPLE_DISTRIBUTED_POINT_OPTION_MODEL, @@ -58,6 +54,7 @@ import { EXAMPLE_TEAM_CONTRIBUTION_QUESTION_TAB_MODEL, EXAMPLE_TEAM_CONTRIBUTION_RESPONSE_OUTPUT, } from './instructor-help-questions-data'; +import { QuestionsSectionQuestions } from './questions-section-questions'; /** * Questions Section of the Instructor Help Page. @@ -71,6 +68,8 @@ import { export class InstructorHelpQuestionsSectionComponent extends InstructorHelpSectionComponent implements OnInit { // enum + QuestionsSectionQuestions: typeof QuestionsSectionQuestions = QuestionsSectionQuestions; + SessionsSectionQuestions: typeof SessionsSectionQuestions = SessionsSectionQuestions; InstructorSessionResultSectionType: typeof InstructorSessionResultSectionType = InstructorSessionResultSectionType; QuestionEditFormMode: typeof QuestionEditFormMode = QuestionEditFormMode; @@ -113,17 +112,20 @@ export class InstructorHelpQuestionsSectionComponent extends InstructorHelpSecti readonly exampleResponderRubricSubmissionFormModel: QuestionSubmissionFormModel = EXAMPLE_RESPONDER_RUBRIC_SUBMISSION_FORM_MODEL; - isEssayQuestionsCollapsed: boolean = false; - isMCQSingleAnsCollapsed: boolean = false; - isMCQMultipleAnsCollapsed: boolean = false; - isNumericalScaleCollapsed: boolean = false; - isPointsOptionsCollapsed: boolean = false; - isPointsRecipientsCollapsed: boolean = false; - isContributionQsCollapsed: boolean = false; - isRubricQsCollapsed: boolean = false; - isRankOptionsCollapsed: boolean = false; - isRankRecipientsCollapsed: boolean = false; - @Output() collapsePeerEvalTips: EventEmitter = new EventEmitter(); + questionsToCollapsed: Record = { + [QuestionsSectionQuestions.ESSAY]: false, + [QuestionsSectionQuestions.SINGLE_ANSWER_MCQ]: false, + [QuestionsSectionQuestions.MULTIPLE_ANSWER_MCQ]: false, + [QuestionsSectionQuestions.NUMERICAL_SCALE]: false, + [QuestionsSectionQuestions.POINTS_OPTIONS]: false, + [QuestionsSectionQuestions.POINTS_RECIPIENTS]: false, + [QuestionsSectionQuestions.CONTRIBUTION]: false, + [QuestionsSectionQuestions.RUBRIC]: false, + [QuestionsSectionQuestions.RANK_OPTIONS]: false, + [QuestionsSectionQuestions.RANK_RECIPIENTS]: false, + }; + + @Output() collapsePeerEvalTips: EventEmitter = new EventEmitter(); constructor(private modalService: NgbModal, private pageScrollService: PageScrollService, @@ -150,9 +152,10 @@ export class InstructorHelpQuestionsSectionComponent extends InstructorHelpSecti scrollTarget: `#${target}`, scrollOffset: 70, }); - if (target === 'tips-for-conducting-peer-eval') { - this.collapsePeerEvalTips.emit(true); - } return false; } + + expand(questionId: string): void { + this.questionsToCollapsed[questionId] = true; + } } diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/questions-section-questions.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/questions-section-questions.ts new file mode 100644 index 00000000000..99e779dcf49 --- /dev/null +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-questions-section/questions-section-questions.ts @@ -0,0 +1,54 @@ +/** + * Unique identifiers for each question in the questions section of instructor help page + */ +export enum QuestionsSectionQuestions { + /** + * Essay Questions + */ + ESSAY = 'essay-questions', + + /** + * Multiple Choice (Single Answer) Questions + */ + SINGLE_ANSWER_MCQ = 'single-answer-mcq', + + /** + * Multiple Choice (Multiple Answers) Questions + */ + MULTIPLE_ANSWER_MCQ = 'multiple-answer-mcq', + + /** + * Numerical Scale Questions + */ + NUMERICAL_SCALE = 'numerical-scale', + + /** + * Distribute Points (Among Options) Questions + */ + POINTS_OPTIONS = 'points-options', + + /** + * Distribute Points (Among Recipients) Questions + */ + POINTS_RECIPIENTS = 'points-recipients', + + /** + * Team Contribution Questions + */ + CONTRIBUTION = 'contribution', + + /** + * Rubric Questions + */ + RUBRIC = 'rubric', + + /** + * Rank (Options) Questions + */ + RANK_OPTIONS = 'rank-options', + + /** + * Rank (Recipients) Questions + */ + RANK_RECIPIENTS = 'rank-recipients', +} diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-section.component.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-section.component.ts index ad31debe2ba..e7428f4e3c1 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-section.component.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-section.component.ts @@ -11,7 +11,7 @@ interface QuestionDetail { /** * Base section for instructor help page. */ -export class InstructorHelpSectionComponent implements OnInit, OnChanges, AfterViewInit { +export abstract class InstructorHelpSectionComponent implements OnInit, OnChanges, AfterViewInit { @Input() key: String; @ViewChildren('question') questionHTML !: QueryList; @@ -20,7 +20,7 @@ export class InstructorHelpSectionComponent implements OnInit, OnChanges, AfterV searchedTerms: number; questionDetails: QuestionDetail[]; - constructor() { + protected constructor() { this.key = ''; this.showQuestion = []; this.searchedTerms = -1; @@ -109,4 +109,6 @@ export class InstructorHelpSectionComponent implements OnInit, OnChanges, AfterV return questionsToDisplay.length === 0 || questionsToDisplay.slice(firstPoint, lastPoint) .reduce((x: any, y: any) => x || y, false); } + + abstract expand(questionId: string): void; } diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.html b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.html index cfcbfe93df8..c8e7b2a6700 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.html +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.html @@ -3,13 +3,13 @@

    Setting Up Sessions

    -
    +

    -

    -
    +

    @@ -59,11 +59,11 @@

    Setting Up Sessions

    -

    -
    +
    To create a new feedback session, click the Sessions tab at the top of the page. Then, @@ -148,13 +148,13 @@

    Setting Up Sessions

    -
    +

    -

    -
    +

    @@ -249,13 +249,13 @@

    Setting Up Sessions

    -
    +

    -

    -
    +

    @@ -298,13 +298,13 @@

    Setting Up Sessions

    Managing Session Responses

    -
    +

    -

    -
    +

    @@ -315,7 +315,7 @@

    Managing Session Responses

  • - View the results of the session. + View the results of the session.
  • Scroll to the panel titled Participants who have not responded to any question. Click on the panel to expand it. @@ -333,13 +333,13 @@

    Managing Session Responses

    • -
    +

    -

    -
    +

    @@ -469,11 +469,11 @@

    Managing Session Responses

    -

    -
    +

    @@ -496,17 +496,17 @@

    Managing Session Responses

    Adding Comments to Responses

    -
    +

    -

    -
    +

    - While viewing the results of a session, you can add comments to respondents' answers. + While viewing the results of a session, you can add comments to respondents' answers.

    To create comments on a response in a session: @@ -548,11 +548,11 @@

    Adding Comments to Responses<

    -

    -
    +

    @@ -560,7 +560,7 @@

    Adding Comments to Responses<

    1. - Navigate to the page where you added the comment that you want to edit or delete. + Navigate to the page where you added the comment that you want to edit or delete.
    2. Hover over the comment which you want to edit or delete. @@ -582,13 +582,13 @@

      Adding Comments to Responses<

    -
    +

    -

    -
    +
    You can search for questions, responses to a question and comments on responses in any of your courses. To do so: @@ -621,13 +621,13 @@

    Adding Comments to Responses<

    Restoring Deleted Sessions

    -
    +

    -

    -
    +

    @@ -642,7 +642,7 @@

    Restoring Deleted Sessions

    The feedback sessions you have previously deleted are listed here. - In order to access information in a deleted session, restore the session. + In order to access information in a deleted session, restore the session.

    @@ -650,17 +650,17 @@

    Restoring Deleted Sessions

    -
    +

    -

    -
    +

    - To restore a deleted feedback session, first view the session that you would like to restore in the Sessions page.
    + To restore a deleted feedback session, first view the session that you would like to restore in the Sessions page.
    Then, click on the button corresponding to the session you want to restore.

    @@ -680,15 +680,15 @@

    Restoring Deleted Sessions

    -

    -
    +

    - To permanently delete a feedback session, first view the session that you would like to permanently delete in the Sessions page.
    + To permanently delete a feedback session, first view the session that you would like to permanently delete in the Sessions page.
    Then, click on the button corresponding to the session you want to delete.

    @@ -708,15 +708,15 @@

    Restoring Deleted Sessions

    -

    -
    +

    - First view the session and check for sessions in Recycle Bin.
    + First view the session and check for sessions in Recycle Bin.
    To restore all sessions, click on the button in Deleted feedback sessions heading; to delete all sessions, click on the button in Deleted feedback sessions heading.

    diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.ts index 695c4b48dfa..e1743415c6c 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.ts +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.ts @@ -1,5 +1,5 @@ import { DOCUMENT } from '@angular/common'; -import { Component, Inject, Input, OnInit } from '@angular/core'; +import { Component, Inject, OnInit } from '@angular/core'; import { PageScrollService } from 'ngx-page-scroll-core'; import { TemplateSession } from '../../../../services/feedback-sessions.service'; @@ -15,7 +15,8 @@ import { CommentEditFormModel } from '../../../components/comment-box/comment-ed import { CommentRowMode } from '../../../components/comment-box/comment-row/comment-row.component'; import { CommentTableModel } from '../../../components/comment-box/comment-table/comment-table.component'; import { - SessionEditFormMode, SessionEditFormModel, + SessionEditFormMode, + SessionEditFormModel, } from '../../../components/session-edit-form/session-edit-form-model'; import { RecycleBinFeedbackSessionRowModel, @@ -24,11 +25,14 @@ import { collapseAnim } from '../../../components/teammates-common/collapse-anim import { SearchCommentsTable, } from '../../../pages-instructor/instructor-search-page/comment-result-table/comment-result-table.component'; -import { SectionTabModel, +import { + SectionTabModel, } from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-page.component'; -import { InstructorSessionResultSectionType, +import { + InstructorSessionResultSectionType, } from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-section-type.enum'; -import { InstructorSessionResultViewType, +import { + InstructorSessionResultViewType, } from '../../../pages-instructor/instructor-session-result-page/instructor-session-result-view-type.enum'; import { InstructorHelpSectionComponent } from '../instructor-help-section.component'; import { @@ -47,6 +51,7 @@ import { EXAMPLE_STUDENTS, EXAMPLE_TEMPLATE_SESSIONS, } from './instructor-help-sessions-data'; +import { SessionsSectionQuestions } from './sessions-section-questions'; /** * Sessions Section of the Instructor Help Page. @@ -64,6 +69,8 @@ export class InstructorHelpSessionsSectionComponent extends InstructorHelpSectio SessionEditFormMode: typeof SessionEditFormMode = SessionEditFormMode; InstructorSessionResultViewType: typeof InstructorSessionResultViewType = InstructorSessionResultViewType; InstructorSessionResultSectionType: typeof InstructorSessionResultSectionType = InstructorSessionResultSectionType; + SessionsSectionQuestions: typeof SessionsSectionQuestions = SessionsSectionQuestions; + exampleCommentEditFormModel: CommentEditFormModel = EXAMPLE_COMMENT_EDIT_FORM_MODEL; readonly exampleSessionEditFormModel: SessionEditFormModel = EXAMPLE_SESSION_EDIT_FORM_MODEL; readonly exampleResponse: ResponseOutput = EXAMPLE_RESPONSE; @@ -81,20 +88,22 @@ export class InstructorHelpSessionsSectionComponent extends InstructorHelpSectio readonly exampleQuestionsWithResponses: QuestionOutput[] = EXAMPLE_QUESTIONS_WITH_RESPONSES; readonly exampleCommentSearchResult: SearchCommentsTable[] = EXAMPLE_COMMENT_SEARCH_RESULT; - @Input() isPeerEvalTipsCollapsed: boolean = false; - isNewFeedbackSessionCollapsed: boolean = false; - isAddQuestionsCollapsed: boolean = false; - isPreviewCollapsed: boolean = false; - isCannotSubmitCollapsed: boolean = false; - isViewResultsCollapsed: boolean = false; - isViewAllResponsesCollapsed: boolean = false; - isAddCommentCollapsed: boolean = false; - isEditDelCommentCollapsed: boolean = false; - isSearchCollapsed: boolean = false; - isViewDeletedCollapsed: boolean = false; - isRestoreSessionCollapsed: boolean = false; - isDelSessionCollapsed: boolean = false; - isRestoreDelAllCollapsed: boolean = false; + questionsToCollapsed: Record = { + [SessionsSectionQuestions.TIPS_FOR_CONDUCTION_PEER_EVAL]: false, + [SessionsSectionQuestions.SESSION_NEW_FEEDBACK]: false, + [SessionsSectionQuestions.SESSION_QUESTIONS]: false, + [SessionsSectionQuestions.SESSION_PREVIEW]: false, + [SessionsSectionQuestions.SESSION_CANNOT_SUBMIT]: false, + [SessionsSectionQuestions.SESSION_VIEW_RESULTS]: false, + [SessionsSectionQuestions.VIEW_ALL_RESPONSES]: false, + [SessionsSectionQuestions.SESSION_ADD_COMMENTS]: false, + [SessionsSectionQuestions.EDIT_DEL_COMMENT]: false, + [SessionsSectionQuestions.SESSION_SEARCH]: false, + [SessionsSectionQuestions.VIEW_DELETED_SESSION]: false, + [SessionsSectionQuestions.RESTORE_SESSION]: false, + [SessionsSectionQuestions.PERMANENT_DEL_SESSION]: false, + [SessionsSectionQuestions.RESTORE_DEL_ALL]: false, + }; constructor(private pageScrollService: PageScrollService, @Inject(DOCUMENT) private document: any) { @@ -112,4 +121,8 @@ export class InstructorHelpSessionsSectionComponent extends InstructorHelpSectio }); return false; } + + expand(questionId: string): void { + this.questionsToCollapsed[questionId] = true; + } } diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/sessions-section-questions.ts b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/sessions-section-questions.ts new file mode 100644 index 00000000000..7ff233ac546 --- /dev/null +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/sessions-section-questions.ts @@ -0,0 +1,74 @@ +/** + * Unique identifiers for each question in the sessions section of instructor help page + */ +export enum SessionsSectionQuestions { + /** + * Tips for conducting team peer evaluation sessions + */ + TIPS_FOR_CONDUCTION_PEER_EVAL = 'tips-for-conducting-peer-eval', + + /** + * How do I add questions to a session? + */ + SESSION_QUESTIONS = 'session-questions', + + /** + * How do I preview a session? + */ + SESSION_PREVIEW = 'session-preview', + + /** + * What should I do if a student says he/she cannot submit an evaluation due to a technical glitch? + */ + SESSION_CANNOT_SUBMIT = 'session-cannot-submit', + + /** + * How do I view the results of my session? + */ + SESSION_VIEW_RESULTS = 'session-view-results', + + /** + * How do I create a comment on a response? + */ + SESSION_ADD_COMMENTS = 'session-add-comments', + + /** + * How do I search for a feedback session question, response or comment on a response? + */ + SESSION_SEARCH = 'session-search', + + /** + * How do I view sessions I have deleted? + */ + VIEW_DELETED_SESSION = 'view-deleted-session', + + /** + * How do I restore a deleted session? + */ + RESTORE_SESSION = 'restore-session', + + /** + * How do I create and schedule a new feedback session? + */ + SESSION_NEW_FEEDBACK = 'session-new-feedback', + + /** + * How do I view all the responses a student has given and received? + */ + VIEW_ALL_RESPONSES = 'view-all-responses', + + /** + * How do I edit or delete a comment on a response? + */ + EDIT_DEL_COMMENT = 'edit-del-comment', + + /** + * How do I permanently delete a session? + */ + PERMANENT_DEL_SESSION = 'permenant-del-session', + + /** + * How do I restore/delete all sessions from Recycle Bin? + */ + RESTORE_DEL_ALL = 'restore-del-all', +} diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.html b/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.html index d91fe321606..c30cfc1ce55 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.html +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-students-section/instructor-help-students-section.component.html @@ -3,13 +3,13 @@

    Student Records

    -
    +

    -

    -
    +

    To view the profile of Student A from Course B:

    @@ -56,11 +56,11 @@

    Student Records

    -
    -

    -
    +

    @@ -95,13 +95,13 @@

    Student Records

    -
    +

    -

    -
    +

    @@ -124,13 +124,13 @@

    Student Records

    Finding Students

    -

    '\"", typicalStudent.getName()); @@ -85,6 +87,8 @@ public void testExecute_withCourseIdAndTeamName_shouldReturnAllStudentsOfTheTeam assertEquals(4, students.size()); StudentData typicalStudent = students.get(0); + assertNull(typicalStudent.getGoogleId()); + assertNull(typicalStudent.getKey()); assertEquals("idOfTypicalCourse1", typicalStudent.getCourseId()); assertEquals("student1InCourse1@gmail.tmt", typicalStudent.getEmail()); assertEquals("student1 In Course1'\"", typicalStudent.getName()); diff --git a/src/web/app/components/student-list/join-state.pipe.ts b/src/web/app/components/student-list/join-state.pipe.ts index d5da1085bb2..d76caca2497 100644 --- a/src/web/app/components/student-list/join-state.pipe.ts +++ b/src/web/app/components/student-list/join-state.pipe.ts @@ -12,7 +12,7 @@ export class JoinStatePipe implements PipeTransform { /** * Transforms {@code JoinState} to a join state display for the student list component. */ - transform(joinState: JoinState): any { + transform(joinState?: JoinState): any { switch (joinState) { case (JoinState.JOINED): return 'Joined'; diff --git a/src/web/app/components/student-list/student-list-section-data.ts b/src/web/app/components/student-list/student-list-section-data.ts index 22a0be8a2d0..76e92f28e7f 100644 --- a/src/web/app/components/student-list/student-list-section-data.ts +++ b/src/web/app/components/student-list/student-list-section-data.ts @@ -16,7 +16,7 @@ export interface StudentListSectionData { export interface StudentListStudentData { name: string; email: string; - status: JoinState; + status?: JoinState; team: string; photoUrl?: string; } From b5a1a294b3e1bfe36375fbd4544162b6cfed935e Mon Sep 17 00:00:00 2001 From: Tan Kian Wei Jason <31800234+jtankw3@users.noreply.github.com> Date: Mon, 13 Jul 2020 14:07:37 +0800 Subject: [PATCH 017/205] [#10305] CollapseAnim causing elements to be cut off (#10306) * Fix CollapseAnim bug causing element cut off * Update snapshots * Remove unnecessary styling in animate --- .../question-edit-form.component.spec.ts.snap | 2 +- src/web/app/components/teammates-common/collapse-anim.ts | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap b/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap index 5c4cdb33c6f..f53b51e6286 100644 --- a/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap +++ b/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap @@ -106,7 +106,7 @@ exports[`QuestionEditFormComponent should snap with default view 1`] = `
    Date: Mon, 13 Jul 2020 17:02:36 +0800 Subject: [PATCH 018/205] [#10307] Fix toast timeout bug (#10308) --- src/web/app/components/toast/toast.component.html | 2 +- src/web/app/components/toast/toast.component.ts | 14 ++++++++++++++ src/web/app/components/toast/toast.ts | 1 + src/web/services/status-message.service.ts | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/web/app/components/toast/toast.component.html b/src/web/app/components/toast/toast.component.html index afeaa6180a6..2abb4ddf91b 100644 --- a/src/web/app/components/toast/toast.component.html +++ b/src/web/app/components/toast/toast.component.html @@ -1,4 +1,4 @@ - + diff --git a/src/web/app/components/toast/toast.component.ts b/src/web/app/components/toast/toast.component.ts index cc5306895a5..998a8ab083f 100644 --- a/src/web/app/components/toast/toast.component.ts +++ b/src/web/app/components/toast/toast.component.ts @@ -19,6 +19,20 @@ export class ToastComponent implements OnInit { ngOnInit(): void { } + ngOnChanges(): void { + // reset autohide timing + this.setAutohide(false); + setTimeout(() => { + this.setAutohide(true); + }, 100); + } + + setAutohide(status: boolean): void { + if (this.toast) { + this.toast.autohide = status; + } + } + /** * Removes the toast from view. */ diff --git a/src/web/app/components/toast/toast.ts b/src/web/app/components/toast/toast.ts index a9e0f1f3225..7bf3438964b 100644 --- a/src/web/app/components/toast/toast.ts +++ b/src/web/app/components/toast/toast.ts @@ -7,4 +7,5 @@ export interface Toast { message: string | TemplateRef; delay?: number; classes: string; + autohide: boolean; } diff --git a/src/web/services/status-message.service.ts b/src/web/services/status-message.service.ts index a1ebee3294a..d884775c9b4 100644 --- a/src/web/services/status-message.service.ts +++ b/src/web/services/status-message.service.ts @@ -49,6 +49,7 @@ export class StatusMessageService { message, classes, delay, + autohide: true, }); } @@ -64,6 +65,7 @@ export class StatusMessageService { classes, delay, message: template, + autohide: true, }); } From 3f7f9bae060daa4c47e829400970d0ff9ac96cde Mon Sep 17 00:00:00 2001 From: Ahmed Bahajjaj Date: Mon, 13 Jul 2020 17:57:13 +0800 Subject: [PATCH 019/205] [#9474] Change Email Validation to Enforce TLD (#10300) * Change email validation to enforce TLD * Fix emails used in other tests --- .../java/teammates/common/util/FieldValidator.java | 4 ++-- .../test/cases/logic/AccountsLogicTest.java | 2 +- .../test/cases/util/FieldValidatorTest.java | 12 ++++++++---- .../test/cases/webapi/EnrollStudentsActionTest.java | 4 ++-- .../test/cases/webapi/UpdateStudentActionTest.java | 4 ++-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/teammates/common/util/FieldValidator.java b/src/main/java/teammates/common/util/FieldValidator.java index 6d69c353be3..07302307e8b 100644 --- a/src/main/java/teammates/common/util/FieldValidator.java +++ b/src/main/java/teammates/common/util/FieldValidator.java @@ -232,10 +232,10 @@ public final class FieldValidator { *
  • Special characters allowed are ! # $ % & ' * + - / = ? ^ _ ` { } ~ *
  • Dot can only appear between any 2 characters and cannot appear continuously
    * Domain part: - *
  • Only allow letters, digits, hyphen and dot; Must end with letters + *
  • Only allow letters, digits, hyphen and dot; Must end with letters; Must have TLD */ public static final String REGEX_EMAIL = "^[\\w+-][\\w+!#$%&'*/=?^_`{}~-]*+(\\.[\\w+!#$%&'*/=?^_`{}~-]+)*+" - + "@([A-Za-z0-9-]+\\.)*[A-Za-z]+$"; + + "@([A-Za-z0-9-]+\\.)+[A-Za-z]+$"; /** * Allows English alphabet, numbers, underscore, dot and hyphen. diff --git a/src/test/java/teammates/test/cases/logic/AccountsLogicTest.java b/src/test/java/teammates/test/cases/logic/AccountsLogicTest.java index b9764b6d4b5..000d57df730 100644 --- a/src/test/java/teammates/test/cases/logic/AccountsLogicTest.java +++ b/src/test/java/teammates/test/cases/logic/AccountsLogicTest.java @@ -453,7 +453,7 @@ public void testDeleteAccountCascade_lastInstructorInCourse_shouldDeleteOrphanCo // Make instructor account id a student too. StudentAttributes student = StudentAttributes - .builder(instructor.courseId, "email@com") + .builder(instructor.courseId, "email@test.com") .withName(instructor.name) .withSectionName("section") .withTeamName("team") diff --git a/src/test/java/teammates/test/cases/util/FieldValidatorTest.java b/src/test/java/teammates/test/cases/util/FieldValidatorTest.java index a20df808064..115ab9c6696 100644 --- a/src/test/java/teammates/test/cases/util/FieldValidatorTest.java +++ b/src/test/java/teammates/test/cases/util/FieldValidatorTest.java @@ -347,7 +347,7 @@ public void testGetInvalidityInfoForGoogleId_valid_returnEmptyString() { assertEquals("Valid Google ID (typical email) should return empty string", "", FieldValidator.getInvalidityInfoForGoogleId(emailAsId)); - String shortEmailAsId = "e@y"; + String shortEmailAsId = "e@y.c"; assertEquals("Valid Google ID (short email) should return empty string", "", FieldValidator.getInvalidityInfoForGoogleId(shortEmailAsId)); @@ -415,7 +415,7 @@ public void testGetInvalidityInfoForEmail_valid_returnEmptyString() { assertEquals("Valid email (typical) should return empty string", "", FieldValidator.getInvalidityInfoForEmail(typicalEmail)); - String shortEmail = "e@y"; + String shortEmail = "e@y.c"; assertEquals("Valid email (short) should return empty string", "", FieldValidator.getInvalidityInfoForEmail(shortEmail)); @@ -647,12 +647,16 @@ public void testRegexEmail() { String email = "john@email.com"; assertTrue(StringHelper.isMatching(email, FieldValidator.REGEX_EMAIL)); - ______TS("success: minimum allowed email format"); + ______TS("failure: no top level domain"); email = "a@e"; + assertFalse(StringHelper.isMatching(email, FieldValidator.REGEX_EMAIL)); + + ______TS("success: minimum allowed email format"); + email = "a@e.c"; assertTrue(StringHelper.isMatching(email, FieldValidator.REGEX_EMAIL)); ______TS("success: all allowed special characters"); - email = "a!#$%&'*/=?^_`{}~@e"; + email = "a!#$%&'*/=?^_`{}~@e.c"; assertTrue(StringHelper.isMatching(email, FieldValidator.REGEX_EMAIL)); ______TS("failure: invalid starting character"); diff --git a/src/test/java/teammates/test/cases/webapi/EnrollStudentsActionTest.java b/src/test/java/teammates/test/cases/webapi/EnrollStudentsActionTest.java index b8af090b739..a3b7babcd8d 100644 --- a/src/test/java/teammates/test/cases/webapi/EnrollStudentsActionTest.java +++ b/src/test/java/teammates/test/cases/webapi/EnrollStudentsActionTest.java @@ -199,7 +199,7 @@ public void testExecute_withNumberOfStudentsMoreThanSectionLimit_shouldThrowInva for (int i = 0; i < Const.StudentsLogicConst.SECTION_SIZE_LIMIT; i++) { StudentAttributes addedStudent = StudentAttributes - .builder(courseId, i + "email@com") + .builder(courseId, i + "email@test.com") .withName("Name " + i) .withSectionName(randomSectionName) .withTeamName("Team " + i) @@ -218,7 +218,7 @@ public void testExecute_withNumberOfStudentsMoreThanSectionLimit_shouldThrowInva // Enroll one more student to exceed limit. StudentAttributes oneMoreStudentToGoBeyondLimit = StudentAttributes - .builder(courseId, "email@com") + .builder(courseId, "email@test.com") .withName("Name") .withSectionName(randomSectionName) .withTeamName("Team") diff --git a/src/test/java/teammates/test/cases/webapi/UpdateStudentActionTest.java b/src/test/java/teammates/test/cases/webapi/UpdateStudentActionTest.java index 806e2caa611..2cd30057cad 100644 --- a/src/test/java/teammates/test/cases/webapi/UpdateStudentActionTest.java +++ b/src/test/java/teammates/test/cases/webapi/UpdateStudentActionTest.java @@ -209,7 +209,7 @@ public void testExecute_withSectionAlreadyHasMaxNumberOfStudents_shouldFail() th String sectionInMaxCapacity = "sectionInMaxCapacity"; StudentAttributes studentToJoinMaxSection = StudentAttributes - .builder(courseId, "studentToJoinMaxSection@com") + .builder(courseId, "studentToJoinMaxSection@test.com") .withName("studentToJoinMaxSection ") .withSectionName("RandomUniqueSection") .withTeamName("RandomUniqueTeamName") @@ -220,7 +220,7 @@ public void testExecute_withSectionAlreadyHasMaxNumberOfStudents_shouldFail() th for (int i = 0; i < Const.StudentsLogicConst.SECTION_SIZE_LIMIT; i++) { StudentAttributes addedStudent = StudentAttributes - .builder(courseId, i + "email@com") + .builder(courseId, i + "email@test.com") .withName("Name " + i) .withSectionName(sectionInMaxCapacity) .withTeamName("Team " + i) From ff989e0d38504060c9175932a928ea2db5e8f52d Mon Sep 17 00:00:00 2001 From: Wilson Kurniawan Date: Tue, 14 Jul 2020 20:24:52 +0800 Subject: [PATCH 020/205] [#10245] Improve rich-text editors (#10294) --- angular.json | 3 +- package.json | 2 +- .../question-edit-form.component.spec.ts.snap | 4 +- .../option-rich-text-editor.component.html | 4 +- .../option-rich-text-editor.component.scss | 11 ++- .../option-rich-text-editor.component.ts | 70 ++++++++---------- .../rich-text-editor.component.html | 4 +- .../rich-text-editor.component.scss | 4 + .../rich-text-editor.component.ts | 74 ++++++++----------- .../session-edit-form.component.html | 2 +- src/web/assets/tinymce/tinymce.css | 7 ++ src/web/styles.scss | 5 -- src/web/tinymce/placeholder-plugin.js | 50 ------------- 13 files changed, 86 insertions(+), 154 deletions(-) create mode 100644 src/web/assets/tinymce/tinymce.css delete mode 100644 src/web/tinymce/placeholder-plugin.js diff --git a/angular.json b/angular.json index 5a090f055ba..ec7e235f06c 100644 --- a/angular.json +++ b/angular.json @@ -45,8 +45,7 @@ "src/web/styles.scss" ], "scripts": [ - "node_modules/tinymce/tinymce.min.js", - "src/web/tinymce/placeholder-plugin.js" + "node_modules/tinymce/tinymce.min.js" ] }, "configurations": { diff --git a/package.json b/package.json index c5a0df03603..2be3e13e316 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "coverage": "rimraf coverage && ng test --coverage", "lint:ts": "ng lint --tslint-config static-analysis/teammates-tslint.yml", "lint:json": "jsonlint-cli src/web/**/*.json src/main/resources/*.json src/test/resources/data/*.json", - "lint:css": "stylelint \"src/web/**/*.scss\" \"src/web/**/*.html\" --config static-analysis/teammates-stylelint.yml", + "lint:css": "stylelint \"src/web/**/*.css\" \"src/web/**/*.scss\" \"src/web/**/*.html\" --config static-analysis/teammates-stylelint.yml", "lint:spaces": "lintspaces -n -t -d spaces -l 1 -. \"src/main/**/*.html\" \"src/web/**/*.html\" \"src/**/*.xml\" \"src/**/*.json\" \"src/**/*.properties\" \"*.yml\" \"*.json\" \"*.gradle\" \"static-analysis/*.*ml\"", "lint": "npm-run-all lint:* -c" }, diff --git a/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap b/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap index f53b51e6286..c8397726492 100644 --- a/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap +++ b/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap @@ -168,11 +168,11 @@ exports[`QuestionEditFormComponent should snap with default view 1`] = ` - '\"", - "comments": "This student's name is Alice Betsy
    • '\"", - "team": "Team 1
    '\"", + "SCDetailsE2eT.alice": { + "googleId": "SCDetailsE2eT.alice", + "email": "SCDetailsE2eT.alice@gmail.tmt", + "course": "SCDetailsE2eT.CS2104", + "name": "Alice Betsy", + "comments": "This student's name is Alice Betsy", + "team": "Team 1", "section": "None" }, - "SCDetailsUiT.benny": { - "googleId": "SCDetailsUiT.benny", - "email": "SCDetailsUiT.benny@gmail.tmt", - "course": "SCDetailsUiT.CS2104", + "SCDetailsE2eT.benny": { + "googleId": "SCDetailsE2eT.benny", + "email": "SCDetailsE2eT.benny@gmail.tmt", + "course": "SCDetailsE2eT.CS2104", "name": "Benny Charles", "comments": "This student's name is Benny Charles", - "team": "Team 1'\"", + "team": "Team 1", + "section": "None" + }, + "SCDetailsE2eT.charlie": { + "googleId": "SCDetailsE2eT.charlie", + "email": "SCDetailsE2eT.charlie@gmail.tmt", + "course": "SCDetailsE2eT.CS2104", + "name": "Charlie Davis", + "comments": "This student's name is Charlie Davis", + "team": "Team 1", "section": "None" } }, @@ -65,14 +98,24 @@ "feedbackResponses": {}, "feedbackResponseComments": {}, "profiles": { - "SCDetailsUiT.student1InTSCourse": { - "googleId": "SCDetailsUiT.benny", + "SCDetailsE2eT.benny": { + "googleId": "SCDetailsE2eT.benny", "shortName": "Benny", - "email": "SCDetailsUiT.benny@gmail.tmt", - "institute": "inst", + "email": "SCDetailsE2eT.benny@gmail.tmt", + "institute": "inst", "nationality": "American", "gender": "OTHER", - "moreInfo": "I am just a student :P", + "moreInfo": "I am just a student :P", + "pictureKey": "" + }, + "SCDetailsE2eT.charlie": { + "googleId": "SCDetailsE2eT.charlie", + "shortName": "Charlie", + "email": "SCDetailsE2eT.charlie@gmail.tmt", + "institute": "inst", + "nationality": "Singaporean", + "gender": "OTHER", + "moreInfo": "I am also a student :P", "pictureKey": "" } } diff --git a/src/web/app/pages-student/student-course-details-page/__snapshots__/student-course-details-page.component.spec.ts.snap b/src/web/app/pages-student/student-course-details-page/__snapshots__/student-course-details-page.component.spec.ts.snap index c6ec9cba64a..167c3f39005 100644 --- a/src/web/app/pages-student/student-course-details-page/__snapshots__/student-course-details-page.component.spec.ts.snap +++ b/src/web/app/pages-student/student-course-details-page/__snapshots__/student-course-details-page.component.spec.ts.snap @@ -55,7 +55,9 @@ exports[`StudentCourseDetailsPageComponent should snap with default fields 1`] =
    - +
    @@ -73,7 +75,9 @@ exports[`StudentCourseDetailsPageComponent should snap with default fields 1`] =
    - +
    @@ -91,7 +95,9 @@ exports[`StudentCourseDetailsPageComponent should snap with default fields 1`] =
    - + UTC
    @@ -109,7 +115,9 @@ exports[`StudentCourseDetailsPageComponent should snap with default fields 1`] =
    - + Thu, 01 Jan 1970, 00:00 AM UTC
    @@ -151,7 +159,9 @@ exports[`StudentCourseDetailsPageComponent should snap with default fields 1`] =
    - +
    @@ -169,7 +179,9 @@ exports[`StudentCourseDetailsPageComponent should snap with default fields 1`] =
    - +
    @@ -187,7 +199,9 @@ exports[`StudentCourseDetailsPageComponent should snap with default fields 1`] =
    - +
    @@ -205,7 +219,9 @@ exports[`StudentCourseDetailsPageComponent should snap with default fields 1`] =
    - +
    @@ -232,6 +248,7 @@ exports[`StudentCourseDetailsPageComponent should snap with default fields 1`] = > @@ -316,7 +333,9 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`]
    - + Sample Course 101
    @@ -334,7 +353,9 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`]
    - + 1.1.c-demo2
    @@ -352,7 +373,9 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`]
    - + UTC
    @@ -370,7 +393,9 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`]
    - + Wed, 13 Mar 2019, 10:15 AM UTC
    @@ -404,6 +429,7 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`] >
    View Responses @@ -110,9 +110,9 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 Edit Submission @@ -146,9 +146,9 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 View Responses @@ -157,9 +157,9 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 Start Submission @@ -187,9 +187,9 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 > View team @@ -249,9 +249,9 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 View Responses @@ -261,9 +261,9 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 Edit Submission @@ -297,9 +297,9 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 View Responses @@ -310,9 +310,9 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 View Submission @@ -388,9 +388,9 @@ exports[`StudentHomePageComponent should snap with no feedback sessions 1`] = ` > View team diff --git a/src/web/app/pages-student/student-home-page/student-home-page.component.html b/src/web/app/pages-student/student-home-page/student-home-page.component.html index 72b880a6ef5..4e3aad16a28 100644 --- a/src/web/app/pages-student/student-home-page/student-home-page.component.html +++ b/src/web/app/pages-student/student-home-page/student-home-page.component.html @@ -8,7 +8,7 @@
    [{{ course.courseId }}]: {{ course.courseName }} - View team @@ -45,7 +45,7 @@
    		View Responses   @@ -53,19 +53,19 @@ Start Submission Start Submission Edit Submission View Submission diff --git a/src/web/app/pages-student/student-home-page/student-home-page.module.ts b/src/web/app/pages-student/student-home-page/student-home-page.module.ts index 6feb0acd41c..4284d9e647e 100644 --- a/src/web/app/pages-student/student-home-page/student-home-page.module.ts +++ b/src/web/app/pages-student/student-home-page/student-home-page.module.ts @@ -1,11 +1,18 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { RouterModule, Routes } from '@angular/router'; +import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TeammatesCommonModule } from '../../components/teammates-common/teammates-common.module'; import { Pipes } from '../../pipes/pipes.module'; import { StudentHomePageComponent } from './student-home-page.component'; +const routes: Routes = [ + { + path: '', + component: StudentHomePageComponent, + }, +]; + /** * Module for student home page. */ @@ -18,8 +25,8 @@ import { StudentHomePageComponent } from './student-home-page.component'; ], imports: [ CommonModule, - RouterModule, - NgbModule, + RouterModule.forChild(routes), + NgbTooltipModule, Pipes, TeammatesCommonModule, ], diff --git a/src/web/app/pages-student/student-pages.module.ts b/src/web/app/pages-student/student-pages.module.ts index a8c1c56f781..3c66688e148 100644 --- a/src/web/app/pages-student/student-pages.module.ts +++ b/src/web/app/pages-student/student-pages.module.ts @@ -4,47 +4,38 @@ import { RouterModule, Routes } from '@angular/router'; import { Intent } from '../../types/api-request'; import { PageNotFoundComponent } from '../page-not-found/page-not-found.component'; import { PageNotFoundModule } from '../page-not-found/page-not-found.module'; -import { StudentHelpPageComponent } from '../pages-help/student-help-page/student-help-page.component'; -import { StudentHelpPageModule } from '../pages-help/student-help-page/student-help-page.module'; -import { SessionResultPageComponent } from '../pages-session/session-result-page/session-result-page.component'; -import { SessionResultPageModule } from '../pages-session/session-result-page/session-result-page.module'; -import { - SessionSubmissionPageComponent, -} from '../pages-session/session-submission-page/session-submission-page.component'; -import { SessionSubmissionPageModule } from '../pages-session/session-submission-page/session-submission-page.module'; -import { StudentCourseDetailsPageComponent } from './student-course-details-page/student-course-details-page.component'; -import { StudentCourseDetailsPageModule } from './student-course-details-page/student-course-details-page.module'; -import { StudentHomePageComponent } from './student-home-page/student-home-page.component'; -import { StudentHomePageModule } from './student-home-page/student-home-page.module'; -import { StudentProfilePageComponent } from './student-profile-page/student-profile-page.component'; -import { StudentProfilePageModule } from './student-profile-page/student-profile-page.module'; const routes: Routes = [ { path: 'home', - component: StudentHomePageComponent, + loadChildren: () => import('./student-home-page/student-home-page.module') + .then((m: any) => m.StudentHomePageModule), data: { pageTitle: 'Student Home', }, }, { path: 'profile', - component: StudentProfilePageComponent, + loadChildren: () => import('./student-profile-page/student-profile-page.module') + .then((m: any) => m.StudentProfilePageModule), }, { path: 'course', - component: StudentCourseDetailsPageComponent, + loadChildren: () => import('./student-course-details-page/student-course-details-page.module') + .then((m: any) => m.StudentCourseDetailsPageModule), }, { path: 'sessions', children: [ { path: 'result', - component: SessionResultPageComponent, + loadChildren: () => import('../pages-session/session-result-page/session-result-page.module') + .then((m: any) => m.SessionResultPageModule), }, { path: 'submission', - component: SessionSubmissionPageComponent, + loadChildren: () => import('../pages-session/session-submission-page/session-submission-page.module') + .then((m: any) => m.SessionSubmissionPageModule), data: { pageTitle: 'Submit Feedback', intent: Intent.STUDENT_SUBMISSION, @@ -54,7 +45,8 @@ const routes: Routes = [ }, { path: 'help', - component: StudentHelpPageComponent, + loadChildren: () => import('../pages-help/student-help-page/student-help-page.module') + .then((m: any) => m.StudentHelpPageModule), }, { path: '', @@ -75,12 +67,6 @@ const routes: Routes = [ imports: [ CommonModule, PageNotFoundModule, - StudentHomePageModule, - StudentProfilePageModule, - StudentCourseDetailsPageModule, - StudentHelpPageModule, - SessionResultPageModule, - SessionSubmissionPageModule, RouterModule.forChild(routes), ], }) diff --git a/src/web/app/pages-student/student-profile-page/student-profile-page.module.ts b/src/web/app/pages-student/student-profile-page/student-profile-page.module.ts index 0879cec35e1..5f2661d35ba 100644 --- a/src/web/app/pages-student/student-profile-page/student-profile-page.module.ts +++ b/src/web/app/pages-student/student-profile-page/student-profile-page.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { ImageCropperModule } from 'ngx-image-cropper'; import { TeammatesCommonModule } from '../../components/teammates-common/teammates-common.module'; @@ -11,6 +11,13 @@ import { UploadEditProfilePictureModalComponent, } from './upload-edit-profile-picture-modal/upload-edit-profile-picture-modal.component'; +const routes: Routes = [ + { + path: '', + component: StudentProfilePageComponent, + }, +]; + /** * Module for student profile page. */ @@ -29,7 +36,7 @@ import { imports: [ CommonModule, ReactiveFormsModule, - RouterModule, + RouterModule.forChild(routes), TeammatesCommonModule, ImageCropperModule, NgbTooltipModule, diff --git a/src/web/app/pages.module.ts b/src/web/app/pages.module.ts deleted file mode 100644 index 47fa70c8319..00000000000 --- a/src/web/app/pages.module.ts +++ /dev/null @@ -1,110 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { Intent } from '../types/api-request'; -import { ErrorReportModule } from './components/error-report/error-report.module'; -import { LoaderBarModule } from './components/loader-bar/loader-bar.module'; -import { LoadingSpinnerComponent } from './components/loading-spinner/loading-spinner.component'; -import { StatusMessageModule } from './components/status-message/status-message.module'; -import { ToastModule } from './components/toast/toast.module'; -import { PageNotFoundModule } from './page-not-found/page-not-found.module'; -import { ClickOutsideDirective, PageComponent } from './page.component'; -import { AdminPageComponent } from './pages-admin/admin-page.component'; -import { InstructorPageComponent } from './pages-instructor/instructor-page.component'; -import { SessionResultPageComponent } from './pages-session/session-result-page/session-result-page.component'; -import { SessionResultPageModule } from './pages-session/session-result-page/session-result-page.module'; -import { - SessionSubmissionPageComponent, -} from './pages-session/session-submission-page/session-submission-page.component'; -import { SessionSubmissionPageModule } from './pages-session/session-submission-page/session-submission-page.module'; -import { StaticPageComponent } from './pages-static/static-page.component'; -import { StudentPageComponent } from './pages-student/student-page.component'; -import { PublicPageComponent } from './public-page.component'; -import { UserJoinPageComponent } from './user-join-page.component'; - -const routes: Routes = [ - { - path: 'front', - component: StaticPageComponent, - loadChildren: () => import('./pages-static/static-pages.module').then((m: any) => m.StaticPagesModule), - }, - { - path: 'join', - component: PublicPageComponent, - children: [ - { - path: '', - component: UserJoinPageComponent, - }, - ], - }, - { - path: 'sessions', - component: PublicPageComponent, - children: [ - { - path: 'result', - component: SessionResultPageComponent, - }, - { - path: 'submission', - component: SessionSubmissionPageComponent, - data: { - pageTitle: 'Submit Feedback', - intent: Intent.STUDENT_SUBMISSION, - }, - }, - ], - }, - { - path: 'student', - component: StudentPageComponent, - loadChildren: () => import('./pages-student/student-pages.module').then((m: any) => m.StudentPagesModule), - }, - { - path: 'instructor', - component: InstructorPageComponent, - loadChildren: () => import('./pages-instructor/instructor-pages.module').then((m: any) => m.InstructorPagesModule), - }, - { - path: 'admin', - component: AdminPageComponent, - loadChildren: () => import('./pages-admin/admin-pages.module').then((m: any) => m.AdminPagesModule), - }, - { - path: '**', - pathMatch: 'full', - redirectTo: 'front', - }, -]; - -/** - * Base module for pages. - */ -@NgModule({ - imports: [ - CommonModule, - LoaderBarModule, - NgbModule, - ErrorReportModule, - PageNotFoundModule, - StatusMessageModule, - SessionResultPageModule, - SessionSubmissionPageModule, - RouterModule.forChild(routes), - ToastModule, - ], - declarations: [ - PageComponent, - ClickOutsideDirective, - PublicPageComponent, - UserJoinPageComponent, - StaticPageComponent, - StudentPageComponent, - InstructorPageComponent, - AdminPageComponent, - LoadingSpinnerComponent, - ], -}) -export class PagesModule {} diff --git a/src/web/app/user-join-page.module.ts b/src/web/app/user-join-page.module.ts new file mode 100644 index 00000000000..4c1b8396e73 --- /dev/null +++ b/src/web/app/user-join-page.module.ts @@ -0,0 +1,28 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { UserJoinPageComponent } from './user-join-page.component'; + +const routes: Routes = [ + { + path: '', + component: UserJoinPageComponent, + }, +]; + +/** + * Module for user join page. + */ +@NgModule({ + declarations: [ + UserJoinPageComponent, + ], + exports: [ + UserJoinPageComponent, + ], + imports: [ + CommonModule, + RouterModule.forChild(routes), + ], +}) +export class UserJoinPageModule { } diff --git a/src/web/services/http-request.service.spec.ts b/src/web/services/http-request.service.spec.ts index f7cea061951..eca9ae7504b 100644 --- a/src/web/services/http-request.service.spec.ts +++ b/src/web/services/http-request.service.spec.ts @@ -53,6 +53,7 @@ describe('HttpRequestService', () => { service.get('/url'); expect(spyHttpClient.get).toHaveBeenCalledWith(`${backendUrl}${ResourceEndpoints.URI_PREFIX}/url`, { withCredentials, + headers: expect.any(Object), params: expect.any(Object), responseType: 'json' as 'text', }); }); diff --git a/src/web/services/http-request.service.ts b/src/web/services/http-request.service.ts index 2f0cccd7395..9cd71c4b638 100644 --- a/src/web/services/http-request.service.ts +++ b/src/web/services/http-request.service.ts @@ -46,9 +46,10 @@ export class HttpRequestService { responseType: any = 'json' as 'text'): Observable { const params: HttpParams = this.buildParams(paramsMap); const withCredentials: boolean = this.withCredentials; + const headers: HttpHeaders = new HttpHeaders({ 'ngsw-bypass': 'true' }); return this.httpClient.get( `${this.backendUrl}${ResourceEndpoints.URI_PREFIX}${endpoint}`, - { params, responseType, withCredentials }, + { params, headers, responseType, withCredentials }, ); } @@ -59,6 +60,7 @@ export class HttpRequestService { const params: HttpParams = this.buildParams(paramsMap); const withCredentials: boolean = this.withCredentials; const headers: HttpHeaders = this.getCsrfHeader(); + headers.set('ngsw-bypass', 'true'); return this.httpClient.post( `${this.backendUrl}${ResourceEndpoints.URI_PREFIX}${endpoint}`, body, { params, headers, withCredentials }, @@ -72,6 +74,7 @@ export class HttpRequestService { const params: HttpParams = this.buildParams(paramsMap); const withCredentials: boolean = this.withCredentials; const headers: HttpHeaders = this.getCsrfHeader(); + headers.set('ngsw-bypass', 'true'); return this.httpClient.put( `${this.backendUrl}${ResourceEndpoints.URI_PREFIX}${endpoint}`, body, @@ -86,6 +89,7 @@ export class HttpRequestService { const params: HttpParams = this.buildParams(paramsMap); const withCredentials: boolean = this.withCredentials; const headers: HttpHeaders = this.getCsrfHeader(); + headers.set('ngsw-bypass', 'true'); return this.httpClient.delete( `${this.backendUrl}${ResourceEndpoints.URI_PREFIX}${endpoint}`, { params, headers, withCredentials }, From a1066023662d5e2ece6970304a6edccd5e1ff76b Mon Sep 17 00:00:00 2001 From: Wilson Kurniawan Date: Sat, 11 Jul 2020 01:15:13 +0800 Subject: [PATCH 015/205] [#10245] Change status codes for non-required entities from 404 to 204 (#10296) * Fix student short name/email wrongly hidden for student-instructor caller * Add empty ImageResult response object * Change status code for no response comment to 204 * Add check in getting student profile for when student is not found --- .../GetFeedbackResponseCommentAction.java | 7 ++++- .../action/GetStudentProfileAction.java | 5 +++- .../GetStudentProfilePictureAction.java | 8 +++--- .../ui/webapi/action/ImageResult.java | 8 +++++- .../GetFeedbackResponseCommentActionTest.java | 13 +++++++-- .../GetStudentProfilePictureActionTest.java | 27 +++++++++++++------ .../session-submission-page.component.ts | 10 +++---- .../student-profile-page.component.ts | 11 +------- 8 files changed, 57 insertions(+), 32 deletions(-) diff --git a/src/main/java/teammates/ui/webapi/action/GetFeedbackResponseCommentAction.java b/src/main/java/teammates/ui/webapi/action/GetFeedbackResponseCommentAction.java index d6ccfd5fd8c..64ffe8ea79e 100644 --- a/src/main/java/teammates/ui/webapi/action/GetFeedbackResponseCommentAction.java +++ b/src/main/java/teammates/ui/webapi/action/GetFeedbackResponseCommentAction.java @@ -85,7 +85,12 @@ public ActionResult execute() { FeedbackResponseCommentAttributes comment = logic.getFeedbackResponseCommentForResponseFromParticipant(feedbackResponseId); if (comment == null) { - return new JsonResult("Comment not found", HttpStatus.SC_NOT_FOUND); + FeedbackResponseAttributes fr = logic.getFeedbackResponse(feedbackResponseId); + if (fr == null) { + throw new EntityNotFoundException( + new EntityDoesNotExistException("The feedback response does not exist.")); + } + return new JsonResult("Comment not found", HttpStatus.SC_NO_CONTENT); } return new JsonResult(new FeedbackResponseCommentData(comment)); default: diff --git a/src/main/java/teammates/ui/webapi/action/GetStudentProfileAction.java b/src/main/java/teammates/ui/webapi/action/GetStudentProfileAction.java index 0685024cd5b..21d7980358a 100644 --- a/src/main/java/teammates/ui/webapi/action/GetStudentProfileAction.java +++ b/src/main/java/teammates/ui/webapi/action/GetStudentProfileAction.java @@ -56,6 +56,9 @@ public ActionResult execute() { studentId = userInfo.id; } else { StudentAttributes student = logic.getStudentForEmail(courseId, studentEmail); + if (student == null) { + return new JsonResult("No student found", HttpStatus.SC_NOT_FOUND); + } studentId = student.getGoogleId(); } @@ -74,7 +77,7 @@ public ActionResult execute() { StudentProfileData output = new StudentProfileData(name, studentProfile); // If student requesting and is not the student's own profile, hide some fields - if (userInfo.isStudent && !studentId.equals(userInfo.id)) { + if (userInfo.isStudent && !userInfo.isInstructor && !studentId.equals(userInfo.id)) { output.hideInformationWhenViewedByOtherStudent(); } diff --git a/src/main/java/teammates/ui/webapi/action/GetStudentProfilePictureAction.java b/src/main/java/teammates/ui/webapi/action/GetStudentProfilePictureAction.java index 1a53231550a..8c426361514 100644 --- a/src/main/java/teammates/ui/webapi/action/GetStudentProfilePictureAction.java +++ b/src/main/java/teammates/ui/webapi/action/GetStudentProfilePictureAction.java @@ -16,9 +16,6 @@ public class GetStudentProfilePictureAction extends Action { /** Indicates ACCESS is not given. */ public static final String UNAUTHORIZED_ACCESS = "You are not allowed to view this resource!"; - /** Indicates profile picture not found. */ - public static final String PROFILE_PIC_NOT_FOUND = "Student has no profile picture"; - @Override protected AuthType getMinAuthLevel() { return AuthType.LOGGED_IN; @@ -57,6 +54,9 @@ public ActionResult execute() { studentProfile = logic.getStudentProfile(userInfo.id); } else { StudentAttributes student = logic.getStudentForEmail(courseId, studentEmail); + if (student == null) { + return new JsonResult("No student found", HttpStatus.SC_NOT_FOUND); + } if (!StringHelper.isEmpty(student.googleId)) { studentProfile = logic.getStudentProfile(student.googleId); @@ -64,7 +64,7 @@ public ActionResult execute() { } if (studentProfile == null || studentProfile.pictureKey.equals("")) { - return new JsonResult(PROFILE_PIC_NOT_FOUND, HttpStatus.SC_NOT_FOUND); + return new ImageResult(); } return new ImageResult(studentProfile.pictureKey); diff --git a/src/main/java/teammates/ui/webapi/action/ImageResult.java b/src/main/java/teammates/ui/webapi/action/ImageResult.java index 2a1a3428fbb..25ccbba375e 100644 --- a/src/main/java/teammates/ui/webapi/action/ImageResult.java +++ b/src/main/java/teammates/ui/webapi/action/ImageResult.java @@ -16,6 +16,10 @@ public class ImageResult extends ActionResult { /** The blob key for the image. */ public String blobKey; + public ImageResult() { + super(HttpStatus.SC_NO_CONTENT); + } + public ImageResult(String blobKey) { super(HttpStatus.SC_OK); this.blobKey = blobKey; @@ -24,7 +28,9 @@ public ImageResult(String blobKey) { @Override public void send(HttpServletResponse resp) throws IOException { resp.setContentType("image/png"); - GoogleCloudStorageHelper.serve(resp, blobKey); + if (blobKey != null) { + GoogleCloudStorageHelper.serve(resp, blobKey); + } } } diff --git a/src/test/java/teammates/test/cases/webapi/GetFeedbackResponseCommentActionTest.java b/src/test/java/teammates/test/cases/webapi/GetFeedbackResponseCommentActionTest.java index 8ad3e14e041..4048debeeaa 100644 --- a/src/test/java/teammates/test/cases/webapi/GetFeedbackResponseCommentActionTest.java +++ b/src/test/java/teammates/test/cases/webapi/GetFeedbackResponseCommentActionTest.java @@ -144,7 +144,7 @@ protected void testExecute_typicalSuccessCase_shouldPass() { assertEquals(actualComment.getFeedbackCommentText(), expected.getCommentText()); assertEquals(actualComment.getCommentGiver(), expected.getCommentGiver()); - ______TS("non-existent comment, should return 404"); + ______TS("non-existent comment in existing response, should return 204"); loginAsStudent(student1InCourse1.getGoogleId()); @@ -154,7 +154,16 @@ protected void testExecute_typicalSuccessCase_shouldPass() { }; GetFeedbackResponseCommentAction action = getAction(submissionParams); JsonResult actualResult = getJsonResult(action); - assertEquals(HttpStatus.SC_NOT_FOUND, actualResult.getStatusCode()); + assertEquals(HttpStatus.SC_NO_CONTENT, actualResult.getStatusCode()); + + ______TS("non-existent response, should return 404"); + + String[] nonExistentResponseSubmissionParams = new String[] { + Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), + Const.ParamsNames.FEEDBACK_RESPONSE_ID, StringHelper.encrypt("randomresponseid"), + }; + + assertThrows(EntityNotFoundException.class, () -> getAction(nonExistentResponseSubmissionParams).execute()); } @Override diff --git a/src/test/java/teammates/test/cases/webapi/GetStudentProfilePictureActionTest.java b/src/test/java/teammates/test/cases/webapi/GetStudentProfilePictureActionTest.java index 4fb117be920..51579f8d759 100644 --- a/src/test/java/teammates/test/cases/webapi/GetStudentProfilePictureActionTest.java +++ b/src/test/java/teammates/test/cases/webapi/GetStudentProfilePictureActionTest.java @@ -107,13 +107,11 @@ public void testExecute() throws Exception { }; action = getAction(submissionParams); - JsonResult jsonResult = getJsonResult(action); - MessageOutput message = (MessageOutput) jsonResult.getOutput(); + imageResult = getImageResult(action); - assertEquals(HttpStatus.SC_NOT_FOUND, jsonResult.getStatusCode()); - assertEquals(GetStudentProfilePictureAction.PROFILE_PIC_NOT_FOUND, message.getMessage()); + assertEquals(HttpStatus.SC_NO_CONTENT, imageResult.getStatusCode()); - ______TS("Failure case: requested student has no profile picture"); + ______TS("Success case: requested student has no profile picture"); submissionParams = new String[] { Const.ParamsNames.COURSE_ID, student2InCourse1.getCourse(), @@ -121,11 +119,24 @@ public void testExecute() throws Exception { }; action = getAction(submissionParams); - jsonResult = getJsonResult(action); - message = (MessageOutput) jsonResult.getOutput(); + imageResult = getImageResult(action); + + assertEquals(HttpStatus.SC_NO_CONTENT, imageResult.getStatusCode()); + + ______TS("Failure case: requesting image of a non-existing student"); + + submissionParams = new String[] { + Const.ParamsNames.COURSE_ID, student2InCourse1.getCourse(), + Const.ParamsNames.STUDENT_EMAIL, "non-existent@student.com", + }; + + action = getAction(submissionParams); + JsonResult jsonResult = getJsonResult(action); + MessageOutput message = (MessageOutput) jsonResult.getOutput(); assertEquals(HttpStatus.SC_NOT_FOUND, jsonResult.getStatusCode()); - assertEquals(GetStudentProfilePictureAction.PROFILE_PIC_NOT_FOUND, message.getMessage()); + assertEquals("No student found", message.getMessage()); + } @Test diff --git a/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts b/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts index 212d721534e..dec89473bf4 100644 --- a/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts +++ b/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts @@ -3,7 +3,7 @@ import { AfterViewInit, Component, Inject, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { PageScrollService } from 'ngx-page-scroll-core'; -import { forkJoin, Observable, of, throwError } from 'rxjs'; +import { forkJoin, Observable, of } from 'rxjs'; import { catchError, finalize, switchMap, tap } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; import { AuthService } from '../../../services/auth.service'; @@ -473,11 +473,11 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { key: this.regKey, moderatedperson: this.moderatedPerson, }).pipe( - tap((comment: FeedbackResponseComment) => { - recipientSubmissionFormModel.commentByGiver = this.getCommentModel(comment); + tap((comment?: FeedbackResponseComment) => { + if (comment) { + recipientSubmissionFormModel.commentByGiver = this.getCommentModel(comment); + } }), - // ignore 404 as comment does not exist - catchError((err: any) => err.status === 404 ? of({}) : throwError(err)), )); }); forkJoin(loadCommentRequests).subscribe(() => { diff --git a/src/web/app/pages-student/student-profile-page/student-profile-page.component.ts b/src/web/app/pages-student/student-profile-page/student-profile-page.component.ts index 83c1b703ee8..40097e0e0cf 100644 --- a/src/web/app/pages-student/student-profile-page/student-profile-page.component.ts +++ b/src/web/app/pages-student/student-profile-page/student-profile-page.component.ts @@ -12,8 +12,7 @@ import { StatusMessageService } from '../../../services/status-message.service'; import { StudentProfileService } from '../../../services/student-profile.service'; import { ErrorMessageOutput } from '../../error-message-output'; -import { HttpErrorResponse } from '@angular/common/http'; -import { from, of, throwError } from 'rxjs'; +import { from, throwError } from 'rxjs'; import { catchError, switchMap } from 'rxjs/operators'; import { NationalitiesService } from '../../../services/nationalities.service'; import { @@ -116,17 +115,9 @@ export class StudentProfilePageComponent implements OnInit { */ onUploadEdit(): void { const NO_IMAGE_UPLOADED: number = 600; - const NO_IMAGE_FOUND: number = 404; this.studentProfileService.getProfilePicture() .pipe( - // If no picture is found, return null - catchError((err: HttpErrorResponse) => { - if (err.status !== NO_IMAGE_FOUND) { - return throwError(status); - } - return of(null); - }), // Open Modal and wait for user to upload picture switchMap((image: Blob | null) => { const modalRef: NgbModalRef = this.ngbModal.open(UploadEditProfilePictureModalComponent); From a5f15f9f634d1b988b3f6f50a85959365da48b1b Mon Sep 17 00:00:00 2001 From: Ahmed Bahajjaj Date: Sat, 11 Jul 2020 12:13:49 +0800 Subject: [PATCH 016/205] [#10264] Remove Student Google ID from Output (#10287) * Remove googleId from StudentData output * Refactor frontend use of JoinState --- .../ui/webapi/action/GetStudentAction.java | 11 +++++------ .../ui/webapi/action/GetStudentsAction.java | 9 ++------- .../ui/webapi/action/SearchStudentsAction.java | 6 +++--- .../teammates/ui/webapi/output/StudentData.java | 16 ++++++++-------- .../test/cases/webapi/GetStudentActionTest.java | 2 ++ .../test/cases/webapi/GetStudentsActionTest.java | 4 ++++ .../components/student-list/join-state.pipe.ts | 2 +- .../student-list/student-list-section-data.ts | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/java/teammates/ui/webapi/action/GetStudentAction.java b/src/main/java/teammates/ui/webapi/action/GetStudentAction.java index 5170a01f764..c57a9682ac1 100644 --- a/src/main/java/teammates/ui/webapi/action/GetStudentAction.java +++ b/src/main/java/teammates/ui/webapi/action/GetStudentAction.java @@ -30,14 +30,14 @@ public void checkSpecificAccessControl() { String courseId = getNonNullRequestParamValue(Const.ParamsNames.COURSE_ID); CourseAttributes course = logic.getCourse(courseId); - StudentAttributes student = null; + StudentAttributes student; String studentEmail = getRequestParamValue(Const.ParamsNames.STUDENT_EMAIL); String regKey = getRequestParamValue(Const.ParamsNames.REGKEY); if (studentEmail != null) { student = logic.getStudentForEmail(courseId, studentEmail); - if (student == null || !userInfo.isInstructor) { + if (student == null || userInfo == null || !userInfo.isInstructor) { throw new UnauthorizedAccessException(UNAUTHORIZED_ACCESS); } @@ -47,7 +47,7 @@ public void checkSpecificAccessControl() { } else if (regKey != null) { getUnregisteredStudent().orElseThrow(() -> new UnauthorizedAccessException(UNAUTHORIZED_ACCESS)); } else { - if (!userInfo.isStudent) { + if (userInfo == null || !userInfo.isStudent) { throw new UnauthorizedAccessException(UNAUTHORIZED_ACCESS); } @@ -59,7 +59,7 @@ public void checkSpecificAccessControl() { @Override public ActionResult execute() { String courseId = getNonNullRequestParamValue(Const.ParamsNames.COURSE_ID); - StudentAttributes student = null; + StudentAttributes student; String studentEmail = getRequestParamValue(Const.ParamsNames.STUDENT_EMAIL); @@ -83,8 +83,7 @@ public ActionResult execute() { // hide information if not an instructor if (studentEmail == null) { - studentData.setComments(null); - studentData.setJoinState(null); + studentData.hideInformationForStudent(); } return new JsonResult(studentData); diff --git a/src/main/java/teammates/ui/webapi/action/GetStudentsAction.java b/src/main/java/teammates/ui/webapi/action/GetStudentsAction.java index a036fe66536..d590735b71f 100644 --- a/src/main/java/teammates/ui/webapi/action/GetStudentsAction.java +++ b/src/main/java/teammates/ui/webapi/action/GetStudentsAction.java @@ -6,6 +6,7 @@ import teammates.common.datatransfer.attributes.StudentAttributes; import teammates.common.exception.UnauthorizedAccessException; import teammates.common.util.Const; +import teammates.ui.webapi.output.StudentData; import teammates.ui.webapi.output.StudentsData; /** @@ -48,13 +49,7 @@ public ActionResult execute() { // request to get team members by current student List studentsForTeam = logic.getStudentsForTeam(teamName, courseId); StudentsData studentsData = new StudentsData(studentsForTeam); - - // hide information for students - studentsData.getStudents().forEach(s -> { - s.setComments(null); - s.setJoinState(null); - }); - + studentsData.getStudents().forEach(StudentData::hideInformationForStudent); return new JsonResult(studentsData); } diff --git a/src/main/java/teammates/ui/webapi/action/SearchStudentsAction.java b/src/main/java/teammates/ui/webapi/action/SearchStudentsAction.java index e8f03668b10..b7365177cde 100644 --- a/src/main/java/teammates/ui/webapi/action/SearchStudentsAction.java +++ b/src/main/java/teammates/ui/webapi/action/SearchStudentsAction.java @@ -93,9 +93,9 @@ public ActionResult execute() { if (userInfo.isAdmin && entity.equals(Const.EntityType.ADMIN)) { studentData.addAdditionalInformationForAdminSearch( StringHelper.encrypt(s.getKey()), - getInstituteFromCourseId(s.getCourse())); - } else { - studentData.hideInformationForInstructor(); + getInstituteFromCourseId(s.getCourse()), + s.getGoogleId() + ); } studentData.hideLastName(); diff --git a/src/main/java/teammates/ui/webapi/output/StudentData.java b/src/main/java/teammates/ui/webapi/output/StudentData.java index 6543457afeb..9893ed96941 100644 --- a/src/main/java/teammates/ui/webapi/output/StudentData.java +++ b/src/main/java/teammates/ui/webapi/output/StudentData.java @@ -23,7 +23,7 @@ public class StudentData extends ApiOutput { private String key; @Nullable private String institute; - + @Nullable private JoinState joinState; private final String teamName; @@ -33,7 +33,6 @@ public StudentData(StudentAttributes studentAttributes) { this.email = studentAttributes.getEmail(); this.courseId = studentAttributes.getCourse(); this.name = studentAttributes.getName(); - this.googleId = studentAttributes.getGoogleId(); this.lastName = studentAttributes.getLastName(); this.joinState = studentAttributes.isRegistered() ? JoinState.JOINED : JoinState.NOT_JOINED; this.comments = studentAttributes.getComments(); @@ -117,21 +116,22 @@ public void hideLastName() { } /** - * Hides some attributes to instructor. + * Hides some attributes to student. */ - public void hideInformationForInstructor() { - setGoogleId(null); + public void hideInformationForStudent() { setComments(null); + setJoinState(null); } /** * Adds additional information only for search result for admin. - * - * @param key The encyrpted key + * @param key The encrypted key * @param institute The institute of the student + * @param googleId The googleId of the student */ - public void addAdditionalInformationForAdminSearch(String key, String institute) { + public void addAdditionalInformationForAdminSearch(String key, String institute, String googleId) { this.setKey(key); this.setInstitute(institute); + this.setGoogleId(googleId); } } diff --git a/src/test/java/teammates/test/cases/webapi/GetStudentActionTest.java b/src/test/java/teammates/test/cases/webapi/GetStudentActionTest.java index d6803fdf0a2..d026b68f865 100644 --- a/src/test/java/teammates/test/cases/webapi/GetStudentActionTest.java +++ b/src/test/java/teammates/test/cases/webapi/GetStudentActionTest.java @@ -32,6 +32,8 @@ protected String getRequestMethod() { private void assertStudentDataMatches(StudentData studentData, StudentAttributes student, boolean isRequestFromInstructor) { + assertNull(studentData.getGoogleId()); + assertNull(studentData.getKey()); assertEquals(student.getEmail(), studentData.getEmail()); assertEquals(student.getCourse(), studentData.getCourseId()); assertEquals(student.getName(), studentData.getName()); diff --git a/src/test/java/teammates/test/cases/webapi/GetStudentsActionTest.java b/src/test/java/teammates/test/cases/webapi/GetStudentsActionTest.java index 84d90bdb0a5..95c4c94651f 100644 --- a/src/test/java/teammates/test/cases/webapi/GetStudentsActionTest.java +++ b/src/test/java/teammates/test/cases/webapi/GetStudentsActionTest.java @@ -57,6 +57,8 @@ public void testExecute_withOnlyCourseId_shouldReturnAllStudentsOfTheCourse() { assertEquals(5, students.size()); StudentData typicalStudent = students.get(0); + assertNull(typicalStudent.getGoogleId()); + assertNull(typicalStudent.getKey()); assertEquals("idOfTypicalCourse1", typicalStudent.getCourseId()); assertEquals("student1InCourse1@gmail.tmt", typicalStudent.getEmail()); assertEquals("student1 In Course1
    @@ -473,7 +499,9 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`]
    - + 1
    @@ -491,7 +519,9 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`]
    - + Tutorial Group 2
    @@ -509,7 +539,9 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`]
    - + Team 2
    @@ -527,7 +559,9 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`]
    - + 1@1.com
    @@ -554,6 +588,7 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`] > @@ -614,6 +649,7 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`] >
    diff --git a/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.html b/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.html index bfdaca346e3..5cc0859397c 100644 --- a/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.html +++ b/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.html @@ -12,7 +12,7 @@

    Course

    - {{course.courseName}} + {{course.courseName}}
    @@ -20,7 +20,7 @@

    Course

    - {{course.courseId}} + {{course.courseId}}
    @@ -28,7 +28,7 @@

    Course

    - {{course.timeZone}} + {{course.timeZone}}
    @@ -36,7 +36,7 @@

    Course

    - {{course.creationTimestamp | formatDateDetail: course.timeZone}} + {{course.creationTimestamp | formatDateDetail: course.timeZone}}
    @@ -52,7 +52,7 @@

    Instructors

    -
    +
    @@ -86,7 +86,7 @@

    Self

    - {{student.name}} + {{student.name}}
    @@ -94,7 +94,7 @@

    Self

    - {{student.sectionName}} + {{student.sectionName}}
    @@ -102,7 +102,7 @@

    Self

    - {{student.teamName}} + {{student.teamName}}
    @@ -110,7 +110,7 @@

    Self

    - {{student.email}} + {{student.email}}
    @@ -122,7 +122,7 @@

    Self

    Sort By:
    - + @@ -135,7 +135,7 @@
    Sort By:

    Team Profiles

    -
    +
    @@ -143,7 +143,7 @@

    Team Profiles

    class="profile-pic float-left" (error)="setDefaultPic(teammateProfile)">
    -
    Name
    +
    From 5deb81a13108950736b7484f938f1f989f962ce2 Mon Sep 17 00:00:00 2001 From: Ahmed Bahajjaj Date: Wed, 15 Jul 2020 01:34:13 +0800 Subject: [PATCH 022/205] [#9495] Add cancel button when editing an existing session (#10301) * Adds "Discard" button to session edit * Removes unnecessary change. * Added warning modal and tooltip * Update package.json * Changes modal text to match others * Removes call to backend, instead stores session instructions locally on clicking "Edit" * fixes linting issues * Uses getSessionEditFormModel to update form * tslint ignores no null assertion for one line * Removed Map for FeedbackSession * Renamed variables and updated comments * Renamed cancel event and handler * renamed functions and variables * Change feedbackSessionModelBeforeEditing to model * Refactor edit model in subscription Co-authored-by: Xiao Pu * Implement deep copy of session model Co-authored-by: martinoamigo Co-authored-by: Xiao Pu --- .../session-edit-form.component.html | 16 ++++++++++++++++ .../session-edit-form.component.ts | 12 ++++++++++++ .../instructor-session-edit-page.component.html | 2 +- .../instructor-session-edit-page.component.ts | 12 ++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/web/app/components/session-edit-form/session-edit-form.component.html b/src/web/app/components/session-edit-form/session-edit-form.component.html index c12eb0d8a27..15478583b2e 100644 --- a/src/web/app/components/session-edit-form/session-edit-form.component.html +++ b/src/web/app/components/session-edit-form/session-edit-form.component.html @@ -36,6 +36,22 @@
    Or:
    + + +
    +
    Warning: Any unsaved changes will be lost
    + +
    +
    + Are you sure you want to discard your unsaved edits? +
    +
    + + +
    +
    diff --git a/src/web/app/components/session-edit-form/session-edit-form.component.ts b/src/web/app/components/session-edit-form/session-edit-form.component.ts index 4ffb6f2d0fb..64170ec68ac 100644 --- a/src/web/app/components/session-edit-form/session-edit-form.component.ts +++ b/src/web/app/components/session-edit-form/session-edit-form.component.ts @@ -91,6 +91,9 @@ export class SessionEditFormComponent implements OnInit { @Output() editExistingSessionEvent: EventEmitter = new EventEmitter(); + @Output() + cancelEditingSessionEvent: EventEmitter = new EventEmitter(); + @Output() deleteExistingSessionEvent: EventEmitter = new EventEmitter(); @@ -204,6 +207,15 @@ export class SessionEditFormComponent implements OnInit { } } + /** + * Handles cancel button click event. + */ + cancelHandler(modal: any): void { + this.modalService.open(modal).result.then(() => { + this.cancelEditingSessionEvent.emit(); + }, () => {}); + } + /** * Handles delete current feedback session button click event. */ diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html index d14af0d3c7d..e6e5f8f6a31 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html +++ b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html @@ -1,4 +1,4 @@ -
    diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts index d2481a25b1c..cab8b579bce 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts @@ -115,6 +115,9 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag hasEmailSettingsPanelExpanded: false, }; + // to get the original session model on discard changes + feedbackSessionModelBeforeEditing: SessionEditFormModel = JSON.parse(JSON.stringify(this.sessionEditFormModel)); + // to get the original question model feedbackQuestionModels: Map = new Map(); @@ -209,6 +212,7 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag }) .subscribe((feedbackSession: FeedbackSession) => { this.sessionEditFormModel = this.getSessionEditFormModel(feedbackSession); + this.feedbackSessionModelBeforeEditing = this.getSessionEditFormModel(feedbackSession); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); @@ -333,6 +337,7 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag */ editExistingSessionHandler(): void { this.sessionEditFormModel.isSaving = true; + this.feedbackSessionModelBeforeEditing = JSON.parse(JSON.stringify(this.sessionEditFormModel)); forkJoin([ this.resolveLocalDateTime(this.sessionEditFormModel.submissionStartDate, @@ -382,6 +387,13 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag }); } + /** + * Handles canceling existing session event without saving changes. + */ + cancelEditingSessionHandler(): void { + this.sessionEditFormModel = JSON.parse(JSON.stringify(this.feedbackSessionModelBeforeEditing)); + } + /** * Resolves the local date time to an UNIX timestamp. */ From 1df7a07640bb533ab4202a2b745107e2e64cfd5e Mon Sep 17 00:00:00 2001 From: edwardkang0925 <32270970+edwardkang0925@users.noreply.github.com> Date: Tue, 14 Jul 2020 22:36:46 -0500 Subject: [PATCH 023/205] [#10212] Refactor search service's searchInstructor method (#10282) * refactor search service (before modifying component test) * modified the component tests * changed naming convention more intuitively * fixed the component tests regarding sections * deleted the declaration of SearchStudentsTable and modified getPrivileges for performance improvement * specified type of privileges and used Record for performance improvement * replaced for loops with forEach Co-authored-by: t-cheepeng --- .../instructor-search-page.component.ts | 39 +-------- .../student-result-table.component.ts | 9 -- src/web/services/search.service.spec.ts | 64 ++++++++------ src/web/services/search.service.ts | 87 ++++++++----------- 4 files changed, 80 insertions(+), 119 deletions(-) diff --git a/src/web/app/pages-instructor/instructor-search-page/instructor-search-page.component.ts b/src/web/app/pages-instructor/instructor-search-page/instructor-search-page.component.ts index c09f44eef7d..4789bce4b13 100644 --- a/src/web/app/pages-instructor/instructor-search-page/instructor-search-page.component.ts +++ b/src/web/app/pages-instructor/instructor-search-page/instructor-search-page.component.ts @@ -6,15 +6,10 @@ import { finalize } from 'rxjs/operators'; import { LoadingBarService } from '../../../services/loading-bar.service'; import { InstructorSearchResult, SearchService } from '../../../services/search.service'; import { StatusMessageService } from '../../../services/status-message.service'; -import { - StudentListSectionData, - StudentListStudentData, -} from '../../components/student-list/student-list-section-data'; -import { StudentListRowModel } from '../../components/student-list/student-list.component'; import { ErrorMessageOutput } from '../../error-message-output'; import { SearchCommentsTable } from './comment-result-table/comment-result-table.component'; import { SearchParams } from './instructor-search-bar/instructor-search-bar.component'; -import { SearchStudentsListRowTable, SearchStudentsTable } from './student-result-table/student-result-table.component'; +import { SearchStudentsListRowTable } from './student-result-table/student-result-table.component'; /** * Instructor search page. @@ -72,7 +67,7 @@ export class InstructorSearchPageComponent implements OnInit { finalize(() => this.loadingBarService.hideLoadingBar()), ).subscribe((resp: InstructorSearchResult[]) => { this.commentTables = resp[0].searchCommentsTables; - const searchStudentsTable: SearchStudentsTable[] = resp[1].searchStudentsTables; + const searchStudentsTable: SearchStudentsListRowTable[] = resp[1].searchStudentsTables; const hasStudents: boolean = !!( searchStudentsTable && searchStudentsTable.length ); @@ -81,7 +76,7 @@ export class InstructorSearchPageComponent implements OnInit { ); if (hasStudents) { - this.studentsListRowTables = this.flattenStudentTable(searchStudentsTable); + this.studentsListRowTables = searchStudentsTable; } if (!hasStudents && !hasComments) { this.statusMessageService.showWarningToast('No results found.'); @@ -90,32 +85,4 @@ export class InstructorSearchPageComponent implements OnInit { this.statusMessageService.showErrorToast(resp.error.message); }); } - - private flattenStudentTable(searchStudentsTable: SearchStudentsTable[]): SearchStudentsListRowTable[] { - return searchStudentsTable.map((course: SearchStudentsTable) => { - const studentsList: StudentListRowModel[] = []; - course.sections.forEach((section: StudentListSectionData) => { - section.students.forEach((student: StudentListStudentData) => { - studentsList.push({ - student: { - courseId: course.courseId, - name: student.name, - email: student.email, - teamName: student.team, - sectionName: section.sectionName, - joinState: student.status, - }, - photoUrl: student.photoUrl, - isAllowedToModifyStudent: section.isAllowedToModifyStudent, - isAllowedToViewStudentInSection: section.isAllowedToViewStudentInSection, - }); - }); - }); - - return { - courseId: course.courseId, - students: studentsList, - }; - }); - } } diff --git a/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.ts b/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.ts index 8dfc832dae2..68ad56004fd 100644 --- a/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.ts +++ b/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.ts @@ -1,15 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; -import { StudentListSectionData } from '../../../components/student-list/student-list-section-data'; import { StudentListRowModel } from '../../../components/student-list/student-list.component'; -/** - * Search result for a list of sections containing students of a course - */ -export interface SearchStudentsTable { - courseId: string; - sections: StudentListSectionData[]; -} - /** * Search result for a list of students in a course */ diff --git a/src/web/services/search.service.spec.ts b/src/web/services/search.service.spec.ts index 44281f4bb78..2cab6417307 100644 --- a/src/web/services/search.service.spec.ts +++ b/src/web/services/search.service.spec.ts @@ -2,9 +2,9 @@ import { TestBed } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { of } from 'rxjs'; -import { StudentListSectionData } from '../app/components/student-list/student-list-section-data'; +import { StudentListRowModel } from '../app/components/student-list/student-list.component'; import { - SearchStudentsTable, + SearchStudentsListRowTable, } from '../app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component'; import { ResourceEndpoints } from '../types/api-endpoints'; import { @@ -64,7 +64,7 @@ describe('SearchService', () => { }, ], }; - let coursesWithSections: SearchStudentsTable[]; + let coursesWithStudents: SearchStudentsListRowTable[]; const mockStudent: Student = { email: 'alice.b.tmms@gmail.tmt', @@ -160,7 +160,7 @@ describe('SearchService', () => { ], }); service = TestBed.inject(SearchService); - coursesWithSections = service.getCoursesWithSections(mockStudents); + coursesWithStudents = service.getCoursesWithStudents(mockStudents); }); it('should be created', () => { @@ -183,14 +183,19 @@ describe('SearchService', () => { const { students }: { students: Student[] } = mockStudents; // Number of courses should match - expect(coursesWithSections.length).toEqual( + expect(coursesWithStudents.length).toEqual( Array.from(new Set(students.map((s: Student) => s.courseId))).length, ); // Number of sections in a course should match expect( - coursesWithSections.filter((t: SearchStudentsTable) => t.courseId === students[0].courseId)[0] - .sections.length, + Array.from( + new Set( + coursesWithStudents + .filter((t: SearchStudentsListRowTable) => t.courseId === students[0].courseId)[0] + .students.map((studentModel: StudentListRowModel) => studentModel.student.sectionName), + ), + ).length, ).toEqual( Array.from( new Set( @@ -203,10 +208,10 @@ describe('SearchService', () => { // Number of students in a section should match expect( - coursesWithSections - .filter((t: SearchStudentsTable) => t.courseId === students[0].courseId)[0] - .sections.filter((s: StudentListSectionData) => s.sectionName === students[0].sectionName)[0] - .students.length, + coursesWithStudents + .filter((t: SearchStudentsListRowTable) => t.courseId === students[0].courseId)[0] + .students.filter((s: StudentListRowModel) => s.student.sectionName === students[0].sectionName) + .length, ).toEqual( students.filter((s: Student) => s.sectionName === students[0].sectionName).length, ); @@ -226,15 +231,15 @@ describe('SearchService', () => { canSubmitSessionInSections: true, }); }); - service.getPrivileges(coursesWithSections); + service.getPrivileges(coursesWithStudents); - for (const course of coursesWithSections) { - for (const section of course.sections) { + for (const course of coursesWithStudents) { + for (const studentModel of course.students) { expect(spyHttpRequestService.get).toHaveBeenCalledWith( ResourceEndpoints.INSTRUCTOR_PRIVILEGE, { courseid: course.courseId, - sectionname: section.sectionName, + sectionname: studentModel.student.sectionName, }, ); } @@ -264,20 +269,29 @@ describe('SearchService', () => { canViewStudentInSections: true, canModifyStudent: false, }, + { + ...basePrivilege, + canViewStudentInSections: false, + canModifyStudent: false, + }, ]; - service.combinePrivileges([coursesWithSections, mockPrivilegesArray]); + service.combinePrivileges([coursesWithStudents, mockPrivilegesArray]); + + const course1Student1: StudentListRowModel = coursesWithStudents[0].students[0]; + expect(course1Student1.isAllowedToViewStudentInSection).toEqual(true); + expect(course1Student1.isAllowedToModifyStudent).toEqual(true); - const course1Section1: StudentListSectionData = coursesWithSections[0].sections[0]; - expect(course1Section1.isAllowedToViewStudentInSection).toEqual(true); - expect(course1Section1.isAllowedToModifyStudent).toEqual(true); + const course1Student2: StudentListRowModel = coursesWithStudents[0].students[1]; + expect(course1Student2.isAllowedToViewStudentInSection).toEqual(false); + expect(course1Student2.isAllowedToModifyStudent).toEqual(true); - const course1Section2: StudentListSectionData = coursesWithSections[0].sections[1]; - expect(course1Section2.isAllowedToViewStudentInSection).toEqual(false); - expect(course1Section2.isAllowedToModifyStudent).toEqual(true); + const course1Student3: StudentListRowModel = coursesWithStudents[0].students[2]; + expect(course1Student3.isAllowedToViewStudentInSection).toEqual(true); + expect(course1Student3.isAllowedToModifyStudent).toEqual(false); - const course2Section1: StudentListSectionData = coursesWithSections[1].sections[0]; - expect(course2Section1.isAllowedToViewStudentInSection).toEqual(true); - expect(course2Section1.isAllowedToModifyStudent).toEqual(false); + const course2Student1: StudentListRowModel = coursesWithStudents[1].students[0]; + expect(course2Student1.isAllowedToViewStudentInSection).toEqual(false); + expect(course2Student1.isAllowedToModifyStudent).toEqual(false); expect(mockPrivilegesArray.length).toEqual(0); }); diff --git a/src/web/services/search.service.ts b/src/web/services/search.service.ts index 72e538750b2..d1468fbb6ca 100644 --- a/src/web/services/search.service.ts +++ b/src/web/services/search.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; import { forkJoin, Observable, of } from 'rxjs'; import { flatMap, map, mergeMap } from 'rxjs/operators'; -import { StudentListSectionData } from '../app/components/student-list/student-list-section-data'; +import { StudentListRowModel } from '../app/components/student-list/student-list.component'; import { SearchCommentsTable, } from '../app/pages-instructor/instructor-search-page/comment-result-table/comment-result-table.component'; import { - SearchStudentsTable, + SearchStudentsListRowTable, } from '../app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component'; import { ResourceEndpoints } from '../types/api-endpoints'; import { @@ -48,14 +48,14 @@ export class SearchService { searchInstructor(searchKey: string): Observable { return this.searchStudents(searchKey, 'instructor').pipe( - map((studentsRes: Students) => this.getCoursesWithSections(studentsRes)), - mergeMap((coursesWithSections: SearchStudentsTable[]) => + map((studentsRes: Students) => this.getCoursesWithStudents(studentsRes)), + mergeMap((coursesWithStudents: SearchStudentsListRowTable[]) => forkJoin([ - of(coursesWithSections), - this.getPrivileges(coursesWithSections), + of(coursesWithStudents), + this.getPrivileges(coursesWithStudents), ]), ), - map((res: [SearchStudentsTable[], InstructorPrivilege[]]) => this.combinePrivileges(res)), + map((res: [SearchStudentsListRowTable[], InstructorPrivilege[]]) => this.combinePrivileges(res)), ); } @@ -120,41 +120,29 @@ export class SearchService { return this.httpRequestService.get(ResourceEndpoints.SEARCH_COMMENTS, paramMap); } - getCoursesWithSections(studentsRes: Students): SearchStudentsTable[] { + getCoursesWithStudents(studentsRes: Students): SearchStudentsListRowTable[] { const { students }: { students: Student[] } = studentsRes; const distinctCourses: string[] = Array.from( new Set(students.map((s: Student) => s.courseId)), ); - const coursesWithSections: SearchStudentsTable[] = distinctCourses.map( + const coursesWithStudents: SearchStudentsListRowTable[] = distinctCourses.map( (courseId: string) => ({ courseId, - sections: Array.from( + students: Array.from( new Set( students - .filter((s: Student) => s.courseId === courseId) - .map((s: Student) => s.sectionName), + .filter((s: Student) => s.courseId === courseId), ), - ).map((sectionName: string) => ({ - sectionName, + ).map((s: Student) => ({ + student: s, isAllowedToViewStudentInSection: false, isAllowedToModifyStudent: false, - students: students - .filter( - (s: Student) => - s.courseId === courseId && s.sectionName === sectionName, - ) - .map((s: Student) => ({ - name: s.name, - email: s.email, - status: s.joinState, - team: s.teamName, - })), })), }), ); - return coursesWithSections; + return coursesWithStudents; } private getSearchCommentsTable(searchResults: CommentSearchResults): InstructorSearchResult { @@ -169,47 +157,48 @@ export class SearchService { } getPrivileges( - coursesWithSections: SearchStudentsTable[], + coursesWithStudents: SearchStudentsListRowTable[], ): Observable { - if (coursesWithSections.length === 0) { + if (coursesWithStudents.length === 0) { return of([]); } - return forkJoin( - coursesWithSections.map((course: SearchStudentsTable) => { - return course.sections.map((section: StudentListSectionData) => { - return this.instructorService.loadInstructorPrivilege({ - courseId: course.courseId, - sectionName: section.sectionName, - }); - }); - }).reduce( - (acc: Observable[], val: Observable[]) => - acc.concat(val), - [], - ), - ); + const privileges: Observable[] = []; + coursesWithStudents.forEach((course: SearchStudentsListRowTable) => { + const sectionToPrivileges: Record> = {}; + Array.from( + new Set(course.students.map((studentModel: StudentListRowModel) => studentModel.student.sectionName)), + ).forEach((section: string) => { + sectionToPrivileges[section] = this.instructorService.loadInstructorPrivilege( + { courseId: course.courseId, sectionName: section }, + ); + }); + course.students.forEach((studentModel: StudentListRowModel) => + privileges.push(sectionToPrivileges[studentModel.student.sectionName]), + ); + }); + return forkJoin(privileges); } combinePrivileges( - [coursesWithSections, privileges]: [SearchStudentsTable[], InstructorPrivilege[]], + [coursesWithStudents, privileges]: [SearchStudentsListRowTable[], InstructorPrivilege[]], ): InstructorSearchResult { /** * Pop the privilege objects one at a time and attach them to the results. This is possible * because `forkJoin` guarantees that the `InstructorPrivilege` results are returned in the * same order the requests were made. */ - for (const course of coursesWithSections) { - for (const section of course.sections) { + for (const course of coursesWithStudents) { + for (const studentModel of course.students) { const sectionPrivileges: InstructorPrivilege | undefined = privileges.shift(); if (!sectionPrivileges) { continue; } - section.isAllowedToViewStudentInSection = sectionPrivileges.canViewStudentInSections; - section.isAllowedToModifyStudent = sectionPrivileges.canModifyStudent; + studentModel.isAllowedToViewStudentInSection = sectionPrivileges.canViewStudentInSections; + studentModel.isAllowedToModifyStudent = sectionPrivileges.canModifyStudent; } } return { - searchStudentsTables: coursesWithSections, + searchStudentsTables: coursesWithStudents, searchCommentsTables: [], }; } @@ -487,7 +476,7 @@ export class SearchService { * The typings for the response object returned by the instructor search service. */ export interface InstructorSearchResult { - searchStudentsTables: SearchStudentsTable[]; + searchStudentsTables: SearchStudentsListRowTable[]; searchCommentsTables: SearchCommentsTable[]; } From 1bbf28caa2bef26f3bc148a61ed03608eac9d35b Mon Sep 17 00:00:00 2001 From: Wilson Kurniawan Date: Wed, 15 Jul 2020 14:16:15 +0800 Subject: [PATCH 024/205] [#10299] Fix some issues from UAT round 3 (#10312) * Fix wrong redirect for registered user accessing public submission/result page * Do not disable submission forms during preview mode * Handle floating point division error for numscale question validation * Change min amount of MSQ selectable choices to 1 * Fix instructor search page not working when not both checkboxes are ticked * Add timezone offset information for edit course page * Show all possible instructor roles only when editing * Add mobile rubric submission form --- .../pageobjects/InstructorCourseEditPage.java | 20 ++++++---------- ...ale-question-edit-answer-form.component.ts | 6 ++++- ...c-question-edit-answer-form.component.html | 21 ++++++++++++++-- ...c-question-edit-answer-form.component.scss | 16 +++++++++++++ ...-question-edit-details-form.component.html | 2 +- ...instructor-course-edit-page.component.html | 2 +- .../instructor-course-edit-page.component.ts | 24 +++++++++++++++++-- .../instructor-edit-panel.component.html | 23 +++++++++++------- .../instructor-search-page.component.ts | 4 ++-- .../session-result-page.component.ts | 2 +- .../session-submission-page.component.html | 2 +- .../session-submission-page.component.ts | 2 +- 12 files changed, 91 insertions(+), 33 deletions(-) diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseEditPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseEditPage.java index 53f0c2c38a4..e971c790747 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseEditPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseEditPage.java @@ -94,7 +94,7 @@ public void verifyInstructorDetails(InstructorAttributes instructor) { } else { assertEquals("(This instructor will NOT be displayed to students)", getInstructorDisplayName(instrNum)); } - assertEquals(getRoleIndex(instructor.role), getInstructorAccessLevel(instrNum)); + assertEquals(instructor.role, getInstructorRole(instrNum)); if (instructor.role.equals(Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_CUSTOM) && getEditInstructorButton(instrNum).isEnabled()) { verifyCustomPrivileges(instrNum, instructor.privileges); @@ -235,7 +235,7 @@ public void editInstructor(int instrNum, InstructorAttributes instructor) { } public void toggleCustomCourseLevelPrivilege(int instrNum, String privilege) { - if (getInstructorAccessLevel(instrNum) != INSTRUCTOR_TYPE_CUSTOM) { + if (!getInstructorRole(instrNum).equals(Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_CUSTOM)) { return; } @@ -246,7 +246,7 @@ public void toggleCustomCourseLevelPrivilege(int instrNum, String privilege) { public void toggleCustomSectionLevelPrivilege(int instrNum, int panelNum, String section, String privilege) { - if (getInstructorAccessLevel(instrNum) != INSTRUCTOR_TYPE_CUSTOM) { + if (!getInstructorRole(instrNum).equals(Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_CUSTOM)) { return; } @@ -260,7 +260,7 @@ public void toggleCustomSectionLevelPrivilege(int instrNum, int panelNum, String public void toggleCustomSessionLevelPrivilege(int instrNum, int panelNum, String section, String session, String privilege) { - if (getInstructorAccessLevel(instrNum) != INSTRUCTOR_TYPE_CUSTOM) { + if (!getInstructorRole(instrNum).equals(Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_CUSTOM)) { return; } @@ -388,15 +388,9 @@ public String getInstructorDisplayName(int instrNum) { return browser.driver.findElement(By.id("displayed-name-instructor-" + instrNum)).getAttribute("value"); } - public int getInstructorAccessLevel(int instrNum) { - List accessLevelCheckboxes = browser.driver.findElements( - By.cssSelector("#access-levels-instructor-" + instrNum + " input")); - for (int i = 0; i < accessLevelCheckboxes.size(); i++) { - if (accessLevelCheckboxes.get(i).isSelected()) { - return i; - } - } - return -1; + public String getInstructorRole(int instrNum) { + String roleAndDescription = browser.driver.findElement(By.id("role-instructor-" + instrNum)).getText(); + return roleAndDescription.split(":")[0]; } private WebElement getAccessLevels(int instrNum) { diff --git a/src/web/app/components/question-types/question-edit-answer-form/num-scale-question-edit-answer-form.component.ts b/src/web/app/components/question-types/question-edit-answer-form/num-scale-question-edit-answer-form.component.ts index d921a7054f9..52750fa62d4 100644 --- a/src/web/app/components/question-types/question-edit-answer-form/num-scale-question-edit-answer-form.component.ts +++ b/src/web/app/components/question-types/question-edit-answer-form/num-scale-question-edit-answer-form.component.ts @@ -71,7 +71,11 @@ export class NumScaleQuestionEditAnswerFormComponent return false; } - return value >= minValue && value <= maxValue && (value - minValue) % increment === 0; + if (value < minValue || value > maxValue) { + return false; + } + + return +((value - minValue) / increment).toFixed(6) % 1 === 0; } } diff --git a/src/web/app/components/question-types/question-edit-answer-form/rubric-question-edit-answer-form.component.html b/src/web/app/components/question-types/question-edit-answer-form/rubric-question-edit-answer-form.component.html index ea957ec9b0c..a38817afd8d 100644 --- a/src/web/app/components/question-types/question-edit-answer-form/rubric-question-edit-answer-form.component.html +++ b/src/web/app/components/question-types/question-edit-answer-form/rubric-question-edit-answer-form.component.html @@ -1,4 +1,4 @@ -
    Name
    +
    @@ -10,9 +10,26 @@
    +
    +
    +
    + {{ questionDetails.rubricSubQuestions[i] }} +
    +
    +
    + +
    +
    +
    +
    diff --git a/src/web/app/components/question-types/question-edit-answer-form/rubric-question-edit-answer-form.component.scss b/src/web/app/components/question-types/question-edit-answer-form/rubric-question-edit-answer-form.component.scss index aea25b59880..77e2952c283 100644 --- a/src/web/app/components/question-types/question-edit-answer-form/rubric-question-edit-answer-form.component.scss +++ b/src/web/app/components/question-types/question-edit-answer-form/rubric-question-edit-answer-form.component.scss @@ -5,3 +5,19 @@ .answer-cell:hover { background-color: #D9EDF7 !important; } + +.mobile-view .card { + margin-bottom: 20px; +} + +@media (max-width: 768px) { + .desktop-view { + display: none; + } +} + +@media (min-width: 768px) { + .mobile-view { + display: none; + } +} diff --git a/src/web/app/components/question-types/question-edit-details-form/msq-question-edit-details-form.component.html b/src/web/app/components/question-types/question-edit-details-form/msq-question-edit-details-form.component.html index fb9a543ac95..ad05a5d32f8 100644 --- a/src/web/app/components/question-types/question-edit-details-form/msq-question-edit-details-form.component.html +++ b/src/web/app/components/question-types/question-edit-details-form/msq-question-edit-details-form.component.html @@ -94,6 +94,6 @@ + (ngModelChange)="triggerModelChange('minSelectableChoices', $event)" min="1" [max]="maxMinSelectableValue">
    diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.html b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.html index 724bad860ab..c408685a72e 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.html +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.html @@ -56,7 +56,7 @@ - -
    + +
    + +
    +     + + {{ instructor.role | instructorRoleDescription }} + +
    diff --git a/src/web/app/pages-instructor/instructor-search-page/instructor-search-page.component.ts b/src/web/app/pages-instructor/instructor-search-page/instructor-search-page.component.ts index 4789bce4b13..8ba86b5560f 100644 --- a/src/web/app/pages-instructor/instructor-search-page/instructor-search-page.component.ts +++ b/src/web/app/pages-instructor/instructor-search-page/instructor-search-page.component.ts @@ -59,10 +59,10 @@ export class InstructorSearchPageComponent implements OnInit { forkJoin([ this.searchParams.isSearchForComments ? this.searchService.searchComment(this.searchParams.searchKey) - : of() as Observable, + : of({}) as Observable, this.searchParams.isSearchForStudents ? this.searchService.searchInstructor(this.searchParams.searchKey) - : of() as Observable, + : of({}) as Observable, ]).pipe( finalize(() => this.loadingBarService.hideLoadingBar()), ).subscribe((resp: InstructorSearchResult[]) => { diff --git a/src/web/app/pages-session/session-result-page/session-result-page.component.ts b/src/web/app/pages-session/session-result-page/session-result-page.component.ts index ce9bcf96fd4..6c9388b3522 100644 --- a/src/web/app/pages-session/session-result-page/session-result-page.component.ts +++ b/src/web/app/pages-session/session-result-page/session-result-page.component.ts @@ -80,7 +80,7 @@ export class SessionResultPageComponent implements OnInit { if (auth.user) { // The logged in user matches the registration key; redirect to the logged in URL - this.navigationService.navigateByURLWithParamEncoding(this.router, '/web/student/sessions/submission', + this.navigationService.navigateByURLWithParamEncoding(this.router, '/web/student/sessions/result', { courseid: this.courseId, fsname: this.feedbackSessionName }); } else { // There is no logged in user for valid, unused registration key; load information based on the key diff --git a/src/web/app/pages-session/session-submission-page/session-submission-page.component.html b/src/web/app/pages-session/session-submission-page/session-submission-page.component.html index 28c325bc30d..6702ea27b18 100644 --- a/src/web/app/pages-session/session-submission-page/session-submission-page.component.html +++ b/src/web/app/pages-session/session-submission-page/session-submission-page.component.html @@ -77,7 +77,7 @@

    Previewing Session as diff --git a/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts b/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts index dec89473bf4..f17c7dc182e 100644 --- a/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts +++ b/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts @@ -158,7 +158,7 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { if (auth.user) { // The logged in user matches the registration key; redirect to the logged in URL - this.navigationService.navigateByURLWithParamEncoding(this.router, '/web/student/sessions/result', + this.navigationService.navigateByURLWithParamEncoding(this.router, '/web/student/sessions/submission', { courseid: this.courseId, fsname: this.feedbackSessionName }); } else { // There is no logged in user for valid, unused registration key; load information based on the key From 70f388d654b8876744d75daf68cfe8c8a6799581 Mon Sep 17 00:00:00 2001 From: t-cheepeng Date: Wed, 15 Jul 2020 16:29:37 +0800 Subject: [PATCH 025/205] [#10213] Add default sorting of tables and pages (#10288) * Add sort by to student home page * Add default sort to instructor course page * Add comment sort by last edited date * Add initial sorting to sortable table * Add sorting to instructor home, session, student * Update snapshots and fix lint issues * Fix instructor home page * Fix instructor course page E2E test * Specify initial sort more explicitly * Change loadFeedbackSession to use index * Move comment sorting to root page * Remove sorting from CUD and sort by creation date * Change sortCoursesEvent to be called at the end * Fix E2E tests for instructor course page --- .../e2e/InstructorCoursesPageE2ETest.java | 5 +- ...options-question-statistics.component.html | 2 +- ...m-options-question-statistics.component.ts | 3 + ...ipients-question-statistics.component.html | 2 +- ...ecipients-question-statistics.component.ts | 3 + .../mcq-question-statistics.component.html | 4 +- .../mcq-question-statistics.component.ts | 3 + .../msq-question-statistics.component.html | 4 +- .../msq-question-statistics.component.ts | 3 + ...options-question-statistics.component.html | 1 + ...k-options-question-statistics.component.ts | 3 + ...ipients-question-statistics.component.html | 1 + ...ecipients-question-statistics.component.ts | 3 + .../sortable-table.component.ts | 20 ++++++ .../instructor-comments.component.ts | 17 ++++- ...ructor-courses-page.component.spec.ts.snap | 26 +++---- .../instructor-courses-page.component.html | 8 +-- .../instructor-courses-page.component.ts | 31 ++++----- .../instructor-home-page.component.html | 2 +- .../instructor-home-page.component.ts | 9 +-- ...nstructor-session-result-page.component.ts | 8 ++- .../instructor-sessions-page.component.ts | 4 +- .../instructor-student-list-page.component.ts | 17 ++++- ...tudent-records-page.component.spec.ts.snap | 2 + ...structor-student-records-page.component.ts | 31 +++++++-- .../student-home-page.component.spec.ts.snap | 69 +++++++++++++++++++ .../student-home-page.component.html | 11 +++ .../student-home-page.component.ts | 36 +++++++++- src/web/services/table-comparator.service.ts | 1 + src/web/types/sort-properties.ts | 5 ++ 30 files changed, 273 insertions(+), 61 deletions(-) diff --git a/src/e2e/java/teammates/e2e/cases/e2e/InstructorCoursesPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/e2e/InstructorCoursesPageE2ETest.java index 738450ea66e..c6719363483 100644 --- a/src/e2e/java/teammates/e2e/cases/e2e/InstructorCoursesPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/e2e/InstructorCoursesPageE2ETest.java @@ -70,7 +70,7 @@ public void testAll() { coursesPage.verifyNotModifiable(courses[0].getId()); ______TS("add new course"); - CourseAttributes[] activeCoursesWithNewCourse = { newCourse, courses[0] }; + CourseAttributes[] activeCoursesWithNewCourse = { courses[0], newCourse }; String[] expectedLinks = { Const.WebPageURIs.INSTRUCTOR_COURSE_ENROLL_PAGE + "?courseid=" + newCourse.getId(), Const.WebPageURIs.INSTRUCTOR_COURSE_EDIT_PAGE + "?courseid=" + newCourse.getId() }; coursesPage.addCourse(newCourse); @@ -115,12 +115,13 @@ public void testAll() { ______TS("restore active course"); newCourse.deletedAt = null; + CourseAttributes[] activeCoursesWithNewCourseSorted = { newCourse, courses[0] }; coursesPage.restoreCourse(newCourse.getId()); coursesPage.verifyStatusMessage("The course " + newCourse.getId() + " has been restored."); coursesPage.verifyNumDeletedCourses(1); coursesPage.sortByCreationDate(); - coursesPage.verifyActiveCoursesDetails(activeCoursesWithNewCourse); + coursesPage.verifyActiveCoursesDetails(activeCoursesWithNewCourseSorted); assertFalse(isCourseInRecycleBin(newCourse.getId())); ______TS("move archived course to recycle bin"); diff --git a/src/web/app/components/question-types/question-statistics/constsum-options-question-statistics.component.html b/src/web/app/components/question-types/question-statistics/constsum-options-question-statistics.component.html index cdc23b11fe2..20d126a3489 100644 --- a/src/web/app/components/question-types/question-statistics/constsum-options-question-statistics.component.html +++ b/src/web/app/components/question-types/question-statistics/constsum-options-question-statistics.component.html @@ -8,7 +8,7 @@

    - +
    diff --git a/src/web/app/components/question-types/question-statistics/constsum-options-question-statistics.component.ts b/src/web/app/components/question-types/question-statistics/constsum-options-question-statistics.component.ts index 91a9b39170c..d882bae66e1 100644 --- a/src/web/app/components/question-types/question-statistics/constsum-options-question-statistics.component.ts +++ b/src/web/app/components/question-types/question-statistics/constsum-options-question-statistics.component.ts @@ -18,6 +18,9 @@ export class ConstsumOptionsQuestionStatisticsComponent extends ConstsumOptionsQuestionStatisticsCalculation implements OnInit, OnChanges { + // enum + SortBy: typeof SortBy = SortBy; + columnsData: ColumnData[] = []; rowsData: SortableTableCellData[][] = []; diff --git a/src/web/app/components/question-types/question-statistics/constsum-recipients-question-statistics.component.html b/src/web/app/components/question-types/question-statistics/constsum-recipients-question-statistics.component.html index cdc23b11fe2..e03d5da17f1 100644 --- a/src/web/app/components/question-types/question-statistics/constsum-recipients-question-statistics.component.html +++ b/src/web/app/components/question-types/question-statistics/constsum-recipients-question-statistics.component.html @@ -8,7 +8,7 @@
    - +
    diff --git a/src/web/app/components/question-types/question-statistics/constsum-recipients-question-statistics.component.ts b/src/web/app/components/question-types/question-statistics/constsum-recipients-question-statistics.component.ts index b97af4db556..30558533626 100644 --- a/src/web/app/components/question-types/question-statistics/constsum-recipients-question-statistics.component.ts +++ b/src/web/app/components/question-types/question-statistics/constsum-recipients-question-statistics.component.ts @@ -17,6 +17,9 @@ import { export class ConstsumRecipientsQuestionStatisticsComponent extends ConstsumRecipientsQuestionStatisticsCalculation implements OnInit, OnChanges { + // enum + SortBy: typeof SortBy = SortBy; + columnsData: ColumnData[] = []; rowsData: SortableTableCellData[][] = []; diff --git a/src/web/app/components/question-types/question-statistics/mcq-question-statistics.component.html b/src/web/app/components/question-types/question-statistics/mcq-question-statistics.component.html index 94c37274949..f4aaeef511f 100644 --- a/src/web/app/components/question-types/question-statistics/mcq-question-statistics.component.html +++ b/src/web/app/components/question-types/question-statistics/mcq-question-statistics.component.html @@ -8,13 +8,13 @@
    - +
    Per Recipient Statistics - +
    diff --git a/src/web/app/components/question-types/question-statistics/mcq-question-statistics.component.ts b/src/web/app/components/question-types/question-statistics/mcq-question-statistics.component.ts index b45e94d29d7..3671ffa7e8a 100644 --- a/src/web/app/components/question-types/question-statistics/mcq-question-statistics.component.ts +++ b/src/web/app/components/question-types/question-statistics/mcq-question-statistics.component.ts @@ -16,6 +16,9 @@ import { }) export class McqQuestionStatisticsComponent extends McqQuestionStatisticsCalculation implements OnInit, OnChanges { + // enum + SortBy: typeof SortBy = SortBy; + summaryColumnsData: ColumnData[] = []; summaryRowsData: SortableTableCellData[][] = []; perRecipientColumnsData: ColumnData[] = []; diff --git a/src/web/app/components/question-types/question-statistics/msq-question-statistics.component.html b/src/web/app/components/question-types/question-statistics/msq-question-statistics.component.html index 2e1743738d1..047581b821a 100644 --- a/src/web/app/components/question-types/question-statistics/msq-question-statistics.component.html +++ b/src/web/app/components/question-types/question-statistics/msq-question-statistics.component.html @@ -8,13 +8,13 @@
    - +
    Per Recipient Statistics - +
    diff --git a/src/web/app/components/question-types/question-statistics/msq-question-statistics.component.ts b/src/web/app/components/question-types/question-statistics/msq-question-statistics.component.ts index d96d2d82f4a..9d63abb3d1a 100644 --- a/src/web/app/components/question-types/question-statistics/msq-question-statistics.component.ts +++ b/src/web/app/components/question-types/question-statistics/msq-question-statistics.component.ts @@ -16,6 +16,9 @@ import { }) export class MsqQuestionStatisticsComponent extends MsqQuestionStatisticsCalculation implements OnInit, OnChanges { + // enum + SortBy: typeof SortBy = SortBy; + summaryColumnsData: ColumnData[] = []; summaryRowsData: SortableTableCellData[][] = []; perRecipientColumnsData: ColumnData[] = []; diff --git a/src/web/app/components/question-types/question-statistics/rank-options-question-statistics.component.html b/src/web/app/components/question-types/question-statistics/rank-options-question-statistics.component.html index 8e39bf4faa6..64514ab724a 100644 --- a/src/web/app/components/question-types/question-statistics/rank-options-question-statistics.component.html +++ b/src/web/app/components/question-types/question-statistics/rank-options-question-statistics.component.html @@ -10,6 +10,7 @@
    diff --git a/src/web/app/components/question-types/question-statistics/rank-options-question-statistics.component.ts b/src/web/app/components/question-types/question-statistics/rank-options-question-statistics.component.ts index 99249fb4eda..ac9f5e6b05f 100644 --- a/src/web/app/components/question-types/question-statistics/rank-options-question-statistics.component.ts +++ b/src/web/app/components/question-types/question-statistics/rank-options-question-statistics.component.ts @@ -17,6 +17,9 @@ import { export class RankOptionsQuestionStatisticsComponent extends RankOptionsQuestionStatisticsCalculation implements OnInit, OnChanges { + // enum + SortBy: typeof SortBy = SortBy; + columnsData: ColumnData[] = []; rowsData: SortableTableCellData[][] = []; diff --git a/src/web/app/components/question-types/question-statistics/rank-recipients-question-statistics.component.html b/src/web/app/components/question-types/question-statistics/rank-recipients-question-statistics.component.html index 8e39bf4faa6..4f1d2f9f406 100644 --- a/src/web/app/components/question-types/question-statistics/rank-recipients-question-statistics.component.html +++ b/src/web/app/components/question-types/question-statistics/rank-recipients-question-statistics.component.html @@ -10,6 +10,7 @@
    diff --git a/src/web/app/components/question-types/question-statistics/rank-recipients-question-statistics.component.ts b/src/web/app/components/question-types/question-statistics/rank-recipients-question-statistics.component.ts index c75d68f2909..17b80a1e3b3 100644 --- a/src/web/app/components/question-types/question-statistics/rank-recipients-question-statistics.component.ts +++ b/src/web/app/components/question-types/question-statistics/rank-recipients-question-statistics.component.ts @@ -17,6 +17,9 @@ import { export class RankRecipientsQuestionStatisticsComponent extends RankRecipientsQuestionStatisticsCalculation implements OnInit, OnChanges { + // enum + SortBy: typeof SortBy = SortBy; + columnsData: ColumnData[] = []; rowsData: SortableTableCellData[][] = []; diff --git a/src/web/app/components/sortable-table/sortable-table.component.ts b/src/web/app/components/sortable-table/sortable-table.component.ts index cc23ca5257a..56e7d872a91 100644 --- a/src/web/app/components/sortable-table/sortable-table.component.ts +++ b/src/web/app/components/sortable-table/sortable-table.component.ts @@ -49,6 +49,9 @@ export class SortableTableComponent implements OnInit { @Input() rows: SortableTableCellData[][] = []; + @Input() + initialSortBy: SortBy = SortBy.NONE; + columnToSortBy: string = ''; sortOrder: SortOrder = SortOrder.ASC; tableRows: SortableTableCellData[][] = []; @@ -57,6 +60,7 @@ export class SortableTableComponent implements OnInit { ngOnInit(): void { this.tableRows = this.rows.slice(); // Shallow clone to avoid reordering original array + this.initialSort(); // Performs an initial sort on the table } ngOnChanges(): void { @@ -94,4 +98,20 @@ export class SortableTableComponent implements OnInit { }); } + /** + * Sorts the table with an initial SortBy + */ + initialSort(): void { + let indexOfColumnToSort: number = + this.columns.findIndex((column: ColumnData) => column.sortBy === this.initialSortBy); + if (indexOfColumnToSort < 0) { + indexOfColumnToSort = this.columns.findIndex((column: ColumnData) => column.sortBy); + if (indexOfColumnToSort < 0) { + return; + } + } + + this.columnToSortBy = this.columns[indexOfColumnToSort].header; + this.sortRows(); + } } diff --git a/src/web/app/pages-instructor/instructor-comments.component.ts b/src/web/app/pages-instructor/instructor-comments.component.ts index 0b31e171f87..1f150533969 100644 --- a/src/web/app/pages-instructor/instructor-comments.component.ts +++ b/src/web/app/pages-instructor/instructor-comments.component.ts @@ -1,5 +1,6 @@ import { FeedbackResponseCommentService } from '../../services/feedback-response-comment.service'; import { StatusMessageService } from '../../services/status-message.service'; +import { TableComparatorService } from '../../services/table-comparator.service'; import { FeedbackResponseComment, FeedbackSession, FeedbackSessionPublishStatus, FeedbackSessionSubmissionStatus, @@ -7,6 +8,7 @@ import { SessionVisibleSetting, } from '../../types/api-output'; import { Intent } from '../../types/api-request'; +import { SortBy, SortOrder } from '../../types/sort-properties'; import { CommentRowModel } from '../components/comment-box/comment-row/comment-row.component'; import { CommentTableModel } from '../components/comment-box/comment-table/comment-table.component'; import { CommentToCommentRowModelPipe } from '../components/comment-box/comment-to-comment-row-model.pipe'; @@ -42,7 +44,8 @@ export abstract class InstructorCommentsComponent { protected constructor( protected commentToCommentRowModel: CommentToCommentRowModelPipe, protected commentService: FeedbackResponseCommentService, - protected statusMessageService: StatusMessageService) { } + protected statusMessageService: StatusMessageService, + protected tableComparatorService: TableComparatorService) { } /** * Deletes an instructor comment. @@ -129,4 +132,16 @@ export abstract class InstructorCommentsComponent { this.statusMessageService.showErrorToast(resp.error.message); }); } + + /** + * Sorts instructor's comments according to creation date. + */ + sortComments(commentTable: CommentTableModel): void { + commentTable.commentRows.sort((a: CommentRowModel, b: CommentRowModel) => { + return this.tableComparatorService.compare( + SortBy.COMMENTS_CREATION_DATE, + SortOrder.ASC, + String(a.originalComment?.createdAt), String(b.originalComment?.createdAt)); + }); + } } diff --git a/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap index 2c7c499b121..87aca8917b8 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap @@ -20,7 +20,7 @@ exports[`InstructorCoursesPageComponent should snap when it is undeletable and u statusMessageService={[Function StatusMessageService]} studentService={[Function StudentService]} tableComparatorService={[Function TableComparatorService]} - tableSortBy="0" + tableSortBy={[Function Number]} tableSortOrder={[Function Number]} >
    @@ -84,13 +84,13 @@ exports[`InstructorCoursesPageComponent should snap when it is undeletable and u > Creation Date + + - - Sections @@ -466,7 +466,7 @@ exports[`InstructorCoursesPageComponent should snap with all courses in course s statusMessageService={[Function StatusMessageService]} studentService={[Function StudentService]} tableComparatorService={[Function TableComparatorService]} - tableSortBy="0" + tableSortBy={[Function Number]} tableSortOrder={[Function Number]} >
    @@ -530,13 +530,13 @@ exports[`InstructorCoursesPageComponent should snap with all courses in course s > Creation Date + + - - Sections @@ -918,7 +918,7 @@ exports[`InstructorCoursesPageComponent should snap with default fields 1`] = ` statusMessageService={[Function StatusMessageService]} studentService={[Function StudentService]} tableComparatorService={[Function TableComparatorService]} - tableSortBy="0" + tableSortBy={[Function Number]} tableSortOrder={[Function Number]} >
    @@ -960,7 +960,7 @@ exports[`InstructorCoursesPageComponent should snap with no courses in course st statusMessageService={[Function StatusMessageService]} studentService={[Function StudentService]} tableComparatorService={[Function TableComparatorService]} - tableSortBy="0" + tableSortBy={[Function Number]} tableSortOrder={[Function Number]} >
    @@ -1024,13 +1024,13 @@ exports[`InstructorCoursesPageComponent should snap with no courses in course st > Creation Date + + - - Sections diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html index 352a93842e2..a8fe2b2e067 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html @@ -34,11 +34,11 @@

    Active courses

    - + Creation Date - - - + + + Sections Teams diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts index 1d93f5ff263..55c51ff975b 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts @@ -20,12 +20,8 @@ import { import { SortBy, SortOrder } from '../../../types/sort-properties'; import { collapseAnim } from '../../components/teammates-common/collapse-anim'; import { ErrorMessageOutput } from '../../error-message-output'; -import { - CoursePermanentDeletionConfirmModalComponent, -} from './course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component'; -import { - CourseSoftDeletionConfirmModalComponent, -} from './course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component'; +import { CoursePermanentDeletionConfirmModalComponent } from './course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component'; +import { CourseSoftDeletionConfirmModalComponent } from './course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component'; interface CourseModel { course: Course; @@ -50,7 +46,7 @@ export class InstructorCoursesPageComponent implements OnInit { courseStats: Record> = {}; tableSortOrder: SortOrder = SortOrder.ASC; - tableSortBy: SortBy = SortBy.NONE; + tableSortBy: SortBy = SortBy.COURSE_CREATION_DATE; // enum SortBy: typeof SortBy = SortBy; @@ -87,17 +83,20 @@ export class InstructorCoursesPageComponent implements OnInit { this.archivedCourses = []; this.softDeletedCourses = []; this.courseService.getAllCoursesAsInstructor('active').subscribe((resp: Courses) => { - for (const course of resp.courses) { - this.instructorService.loadInstructorPrivilege({ courseId: course.courseId }) - .subscribe((instructorPrivilege: InstructorPrivilege) => { - const canModifyCourse: boolean = instructorPrivilege.canModifyCourse; - const canModifyStudent: boolean = instructorPrivilege.canModifyStudent; + forkJoin( + resp.courses.map((course: Course) => + this.instructorService.loadInstructorPrivilege({ courseId: course.courseId })), + ).subscribe((privileges: InstructorPrivilege[]) => { + resp.courses.forEach((course: Course, index: number) => { + const canModifyCourse: boolean = privileges[index].canModifyCourse; + const canModifyStudent: boolean = privileges[index].canModifyStudent; const activeCourse: CourseModel = Object.assign({}, { course, canModifyCourse, canModifyStudent }); this.activeCourses.push(activeCourse); - }, (error: ErrorMessageOutput) => { - this.statusMessageService.showErrorToast(error.error.message); }); - } + this.sortCoursesEvent(SortBy.COURSE_CREATION_DATE); + }, (error: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(error.error.message); + }); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); @@ -371,7 +370,7 @@ export class InstructorCoursesPageComponent implements OnInit { strA = a.course.courseName; strB = b.course.courseName; break; - case SortBy.SESSION_CREATION_DATE: + case SortBy.COURSE_CREATION_DATE: strA = a.course.creationTimestamp.toString(); strB = b.course.creationTimestamp.toString(); break; diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html index fe856cd0557..b13f8e1737f 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html @@ -38,7 +38,7 @@

    Home

    -
    +
    [{{ courseTabModel.course.courseId }}]: {{ courseTabModel.course.courseName }} diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.ts b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.ts index 9f85c869a0b..405f1777909 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.ts +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.ts @@ -198,9 +198,10 @@ export class InstructorHomePageComponent extends InstructorSessionModalPageCompo } /** - * Loads the feedback session in the course. + * Loads the feedback session in the course and sorts them according to end date. */ - loadFeedbackSessions(model: CourseTabModel): void { + loadFeedbackSessions(index: number): void { + const model: CourseTabModel = this.courseTabModels[index]; if (!model.hasPopulated) { this.feedbackSessionsService.getFeedbackSessionsForInstructor(model.course.courseId) .subscribe((response: FeedbackSessions) => { @@ -221,7 +222,7 @@ export class InstructorHomePageComponent extends InstructorSessionModalPageCompo }, (resp: ErrorMessageOutput) => { model.isAjaxSuccess = false; this.statusMessageService.showErrorToast(resp.error.message); - }); + }, () => this.sortSessionsTableRowModelsEvent(index, SortBy.SESSION_END_DATE)); } } @@ -253,7 +254,7 @@ export class InstructorHomePageComponent extends InstructorSessionModalPageCompo break; } this.courseTabModels[i].isTabExpanded = true; - this.loadFeedbackSessions(this.courseTabModels[i]); + this.loadFeedbackSessions(i); } } diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts index 23036612fe4..6eed1995cdb 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts @@ -10,6 +10,7 @@ import { FeedbackSessionsService } from '../../../services/feedback-sessions.ser import { InstructorService } from '../../../services/instructor.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; +import { TableComparatorService } from '../../../services/table-comparator.service'; import { TimezoneService } from '../../../services/timezone.service'; import { CourseSectionNames, @@ -120,8 +121,9 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp private commentsToCommentTableModel: CommentsToCommentTableModelPipe, statusMessageService: StatusMessageService, commentService: FeedbackResponseCommentService, - commentToCommentRowModel: CommentToCommentRowModelPipe) { - super(commentToCommentRowModel, commentService, statusMessageService); + commentToCommentRowModel: CommentToCommentRowModelPipe, + tableComparatorService: TableComparatorService) { + super(commentToCommentRowModel, commentService, statusMessageService, tableComparatorService); this.timezoneService.getTzVersion(); // import timezone service to load timezone data } @@ -307,7 +309,7 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp responses.forEach((response: ResponseOutput) => { this.instructorCommentTableModel[response.responseId] = this.commentsToCommentTableModel.transform(response.instructorComments, false, this.session.timeZone); - + this.sortComments(this.instructorCommentTableModel[response.responseId]); // clear the original comments for safe as instructorCommentTableModel will become the single point of truth response.instructorComments = []; }); diff --git a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts index aa4b0ed330a..02cd376f3ca 100644 --- a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts +++ b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts @@ -386,7 +386,7 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC }); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); - }); + }, () => this.sortSessionsTableRowModelsEvent(SortBy.COURSE_ID)); } /** @@ -523,7 +523,7 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC }); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); - }); + }, () => this.sortRecycleBinFeedbackSessionRowsEvent(SortBy.SESSION_DELETION_DATE)); } /** diff --git a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts index 41ac2574c13..29a8856f9dd 100644 --- a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts +++ b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts @@ -5,7 +5,9 @@ import { InstructorService } from '../../../services/instructor.service'; import { LoadingBarService } from '../../../services/loading-bar.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; +import { TableComparatorService } from '../../../services/table-comparator.service'; import { Course, Courses, InstructorPrivilege, Student, Students } from '../../../types/api-output'; +import { SortBy, SortOrder } from '../../../types/sort-properties'; import { StudentListRowModel } from '../../components/student-list/student-list.component'; import { collapseAnim } from '../../components/teammates-common/collapse-anim'; import { ErrorMessageOutput } from '../../error-message-output'; @@ -39,7 +41,8 @@ export class InstructorStudentListPageComponent implements OnInit { private courseService: CourseService, private studentService: StudentService, private statusMessageService: StatusMessageService, - private loadingBarService: LoadingBarService) { + private loadingBarService: LoadingBarService, + private tableComparatorService: TableComparatorService) { } ngOnInit(): void { @@ -71,7 +74,7 @@ export class InstructorStudentListPageComponent implements OnInit { }); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); - }); + }, () => this.sortCourses()); } /** @@ -153,4 +156,14 @@ export class InstructorStudentListPageComponent implements OnInit { this.statusMessageService.showErrorToast(resp.error.message); }); } + + /** + * Sorts the courses in the list according to course ID. + */ + sortCourses(): void { + this.courseTabList.sort((a: CourseTab, b: CourseTab) => { + return this.tableComparatorService + .compare(SortBy.COURSE_ID, SortOrder.ASC, a.course.courseId, b.course.courseId); + }); + } } diff --git a/src/web/app/pages-instructor/instructor-student-records-page/__snapshots__/instructor-student-records-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-student-records-page/__snapshots__/instructor-student-records-page.component.spec.ts.snap index 69194a7b245..1a6d6962f27 100644 --- a/src/web/app/pages-instructor/instructor-student-records-page/__snapshots__/instructor-student-records-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-student-records-page/__snapshots__/instructor-student-records-page.component.spec.ts.snap @@ -21,6 +21,7 @@ exports[`InstructorStudentRecordsPageComponent should snap with default fields 1 studentSection="" studentService={[Function StudentService]} studentTeam="" + tableComparatorService={[Function TableComparatorService]} >

    's Records @@ -56,6 +57,7 @@ exports[`InstructorStudentRecordsPageComponent should snap with populated fields studentSection="" studentService={[Function StudentService]} studentTeam="" + tableComparatorService={[Function TableComparatorService]} >

    Not John Doe's Records diff --git a/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.ts b/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.ts index 61e4f05c4db..35b9e1d6342 100644 --- a/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.ts +++ b/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.ts @@ -8,15 +8,20 @@ import { InstructorService } from '../../../services/instructor.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentProfileService } from '../../../services/student-profile.service'; import { StudentService } from '../../../services/student.service'; +import { TableComparatorService } from '../../../services/table-comparator.service'; import { FeedbackSession, FeedbackSessions, - Gender, Instructor, - QuestionOutput, ResponseOutput, - SessionResults, Student, + Gender, + Instructor, + QuestionOutput, + ResponseOutput, + SessionResults, + Student, StudentProfile, } from '../../../types/api-output'; import { Intent } from '../../../types/api-request'; +import { SortBy, SortOrder } from '../../../types/sort-properties'; import { CommentTableModel } from '../../components/comment-box/comment-table/comment-table.component'; import { CommentToCommentRowModelPipe } from '../../components/comment-box/comment-to-comment-row-model.pipe'; import { CommentsToCommentTableModelPipe } from '../../components/comment-box/comments-to-comment-table-model.pipe'; @@ -67,10 +72,11 @@ export class InstructorStudentRecordsPageComponent extends InstructorCommentsCom private studentService: StudentService, private instructorService: InstructorService, private commentsToCommentTableModel: CommentsToCommentTableModelPipe, + tableComparatorService: TableComparatorService, statusMessageService: StatusMessageService, commentService: FeedbackResponseCommentService, commentToCommentRowModel: CommentToCommentRowModelPipe) { - super(commentToCommentRowModel, commentService, statusMessageService); + super(commentToCommentRowModel, commentService, statusMessageService, tableComparatorService); } ngOnInit(): void { @@ -151,7 +157,7 @@ export class InstructorStudentRecordsPageComponent extends InstructorCommentsCom results.questions.forEach((questions: QuestionOutput) => this.preprocessComments(questions.allResponses)); }, (errorMessageOutput: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(errorMessageOutput.error.message); - }); + }, () => this.sortFeedbackSessions()); } /** @@ -165,9 +171,22 @@ export class InstructorStudentRecordsPageComponent extends InstructorCommentsCom responses.forEach((response: ResponseOutput) => { this.instructorCommentTableModel[response.responseId] = this.commentsToCommentTableModel.transform(response.instructorComments, false, timezone); - + this.sortComments(this.instructorCommentTableModel[response.responseId]); // clear the original comments for safe as instructorCommentTableModel will become the single point of truth response.instructorComments = []; }); } + + /** + * Sorts the student's feedback sessions according to name + */ + private sortFeedbackSessions(): void { + this.sessionTabs.sort((a: SessionTab, b: SessionTab) => { + return this.tableComparatorService.compare( + SortBy.SESSION_NAME, + SortOrder.ASC, + a.feedbackSession.feedbackSessionName, + b.feedbackSession.feedbackSessionName); + }); + } } diff --git a/src/web/app/pages-student/student-home-page/__snapshots__/student-home-page.component.spec.ts.snap b/src/web/app/pages-student/student-home-page/__snapshots__/student-home-page.component.spec.ts.snap index 59046cd2a77..b754cef64ca 100644 --- a/src/web/app/pages-student/student-home-page/__snapshots__/student-home-page.component.spec.ts.snap +++ b/src/web/app/pages-student/student-home-page/__snapshots__/student-home-page.component.spec.ts.snap @@ -2,11 +2,13 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 courses 1`] = `
    +
    +
    + + Sort By: + +
    + + +
    +
    +
    +
    @@ -329,11 +362,13 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 exports[`StudentHomePageComponent should snap with default fields 1`] = `
    @@ -359,11 +395,13 @@ exports[`StudentHomePageComponent should snap with default fields 1`] = ` exports[`StudentHomePageComponent should snap with no feedback sessions 1`] = `
    +
    +
    + + Sort By: + +
    + + +
    +
    +
    +
    diff --git a/src/web/app/pages-student/student-home-page/student-home-page.component.html b/src/web/app/pages-student/student-home-page/student-home-page.component.html index 4e3aad16a28..dfa2e5f2870 100644 --- a/src/web/app/pages-student/student-home-page/student-home-page.component.html +++ b/src/web/app/pages-student/student-home-page/student-home-page.component.html @@ -3,6 +3,17 @@ if you need more information.
    +
    +
    +
    + Sort By: +
    + + +
    +
    +
    +
    diff --git a/src/web/app/pages-student/student-home-page/student-home-page.component.ts b/src/web/app/pages-student/student-home-page/student-home-page.component.ts index d8eb050d410..b60f414d53b 100644 --- a/src/web/app/pages-student/student-home-page/student-home-page.component.ts +++ b/src/web/app/pages-student/student-home-page/student-home-page.component.ts @@ -5,6 +5,7 @@ import { CourseService } from '../../../services/course.service'; import { FeedbackSessionsService } from '../../../services/feedback-sessions.service'; import { LoadingBarService } from '../../../services/loading-bar.service'; import { StatusMessageService } from '../../../services/status-message.service'; +import { TableComparatorService } from '../../../services/table-comparator.service'; import { TimezoneService } from '../../../services/timezone.service'; import { Course, @@ -15,6 +16,7 @@ import { FeedbackSessionSubmissionStatus, HasResponses, } from '../../../types/api-output'; +import { SortBy, SortOrder } from '../../../types/sort-properties'; import { ErrorMessageOutput } from '../../error-message-output'; interface StudentCourse { @@ -40,6 +42,9 @@ interface StudentSession { }) export class StudentHomePageComponent implements OnInit { + // enum + SortBy: typeof SortBy = SortBy; + // Tooltip messages studentFeedbackSessionStatusPublished: string = 'The responses for the session have been published and can now be viewed.'; @@ -53,12 +58,15 @@ export class StudentHomePageComponent implements OnInit { courses: StudentCourse[] = []; + sortBy: SortBy = SortBy.NONE; + constructor(private route: ActivatedRoute, private courseService: CourseService, private statusMessageService: StatusMessageService, private feedbackSessionsService: FeedbackSessionsService, private timezoneService: TimezoneService, - private loadingBarService: LoadingBarService) { + private loadingBarService: LoadingBarService, + private tableComparatorService: TableComparatorService) { this.timezoneService.getTzVersion(); } @@ -148,4 +156,30 @@ export class StudentHomePageComponent implements OnInit { b.createdAtTimestamp) ? 1 : (a.createdAtTimestamp === b.createdAtTimestamp) ? ((a.submissionEndTimestamp > b.submissionEndTimestamp) ? 1 : -1) : -1); } + + sortCoursesBy(by: SortBy): void { + this.sortBy = by; + this.courses.sort(this.sortPanelsBy(by)); + } + + sortPanelsBy(by: SortBy): ((a: StudentCourse, b: StudentCourse) => number) { + return ((a: StudentCourse, b: StudentCourse): number => { + let strA: string; + let strB: string; + switch (by) { + case SortBy.COURSE_NAME: + strA = a.course.courseName; + strB = b.course.courseName; + break; + case SortBy.COURSE_ID: + strA = a.course.courseId; + strB = b.course.courseId; + break; + default: + strA = ''; + strB = ''; + } + return this.tableComparatorService.compare(by, SortOrder.ASC, strA, strB); + }); + } } diff --git a/src/web/services/table-comparator.service.ts b/src/web/services/table-comparator.service.ts index b46547dec70..e18956db3be 100644 --- a/src/web/services/table-comparator.service.ts +++ b/src/web/services/table-comparator.service.ts @@ -79,6 +79,7 @@ export class TableComparatorService { case SortBy.CONSTSUM_OPTIONS_OPTION: case SortBy.CONTRIBUTION_TEAM: case SortBy.CONTRIBUTION_RECIPIENT: + case SortBy.COMMENTS_CREATION_DATE: case SortBy.RANK_RECIPIENTS_SELF_RANK: case SortBy.RANK_RECIPIENTS_OVERALL_RANK: case SortBy.RANK_RECIPIENTS_OVERALL_RANK_EXCLUDING_SELF: diff --git a/src/web/types/sort-properties.ts b/src/web/types/sort-properties.ts index 8bbf43f6784..5479f18c646 100644 --- a/src/web/types/sort-properties.ts +++ b/src/web/types/sort-properties.ts @@ -321,6 +321,11 @@ export enum SortBy { * Amount of contribution measured in numbers */ CONTRIBUTION_VALUE, + + /** + * The creation date of a comment + */ + COMMENTS_CREATION_DATE, } /** From 8677046d5d91410ad4421ddb2423afbe665f29f1 Mon Sep 17 00:00:00 2001 From: Ahmed Bahajjaj Date: Wed, 15 Jul 2020 21:53:50 +0800 Subject: [PATCH 026/205] [#10264] Remove Instructor Google ID from Output (#10295) * Remove instructor googleId from output * Change access control to appropriate permission --- .../java/teammates/ui/webapi/action/Action.java | 3 +++ .../ui/webapi/action/GetInstructorAction.java | 7 ++++++- .../ui/webapi/action/GetInstructorsAction.java | 14 +++++++++++++- .../webapi/action/SearchInstructorsAction.java | 4 ++-- .../webapi/action/UpdateInstructorAction.java | 4 +++- .../ui/webapi/output/InstructorData.java | 17 +++++------------ .../cases/webapi/GetInstructorActionTest.java | 2 ++ .../instructor-edit-panel.component.html | 2 +- .../instructor-edit-panel.component.ts | 2 +- 9 files changed, 36 insertions(+), 19 deletions(-) diff --git a/src/main/java/teammates/ui/webapi/action/Action.java b/src/main/java/teammates/ui/webapi/action/Action.java index f19324ca29e..5668a109c21 100644 --- a/src/main/java/teammates/ui/webapi/action/Action.java +++ b/src/main/java/teammates/ui/webapi/action/Action.java @@ -98,6 +98,9 @@ private void initAuthInfo() { if (Config.BACKDOOR_KEY.equals(req.getHeader("Backdoor-Key"))) { authType = AuthType.ALL_ACCESS; userInfo = new UserInfo(getRequestParamValue(Const.ParamsNames.USER_ID)); + userInfo.isAdmin = true; + userInfo.isStudent = true; + userInfo.isInstructor = true; return; } diff --git a/src/main/java/teammates/ui/webapi/action/GetInstructorAction.java b/src/main/java/teammates/ui/webapi/action/GetInstructorAction.java index 94bf8440d3d..f83d7260f9f 100644 --- a/src/main/java/teammates/ui/webapi/action/GetInstructorAction.java +++ b/src/main/java/teammates/ui/webapi/action/GetInstructorAction.java @@ -68,7 +68,12 @@ public ActionResult execute() { return new JsonResult("Instructor could not be found for this course", HttpStatus.SC_NOT_FOUND); } - return new JsonResult(new InstructorData(instructorAttributes)); + InstructorData instructorData = new InstructorData(instructorAttributes); + if (intent == Intent.FULL_DETAIL) { + instructorData.setGoogleId(instructorAttributes.googleId); + } + + return new JsonResult(instructorData); } } diff --git a/src/main/java/teammates/ui/webapi/action/GetInstructorsAction.java b/src/main/java/teammates/ui/webapi/action/GetInstructorsAction.java index 5af8e6ba79d..184ae66469b 100644 --- a/src/main/java/teammates/ui/webapi/action/GetInstructorsAction.java +++ b/src/main/java/teammates/ui/webapi/action/GetInstructorsAction.java @@ -10,6 +10,7 @@ import teammates.common.exception.EntityNotFoundException; import teammates.common.exception.InvalidHttpParameterException; import teammates.common.util.Const; +import teammates.ui.webapi.output.InstructorData; import teammates.ui.webapi.output.InstructorsData; import teammates.ui.webapi.request.Intent; @@ -76,7 +77,18 @@ public ActionResult execute() { }); } else if (intentStr.equals(Intent.FULL_DETAIL.toString())) { // get all instructors of a course without information hiding - data = new InstructorsData(instructorsOfCourse); + // adds googleId if caller is admin or has the appropriate privilege to modify instructor + if (userInfo.isAdmin || logic.getInstructorForGoogleId(courseId, userInfo.getId()).getPrivileges() + .isAllowedForPrivilege(Const.ParamsNames.INSTRUCTOR_PERMISSION_MODIFY_INSTRUCTOR)) { + data = new InstructorsData(); + for (InstructorAttributes instructor : instructorsOfCourse) { + InstructorData instructorData = new InstructorData(instructor); + instructorData.setGoogleId(instructor.googleId); + data.getInstructors().add(instructorData); + } + } else { + data = new InstructorsData(instructorsOfCourse); + } } else { throw new InvalidHttpParameterException("unknown intent"); } diff --git a/src/main/java/teammates/ui/webapi/action/SearchInstructorsAction.java b/src/main/java/teammates/ui/webapi/action/SearchInstructorsAction.java index 5c9b40d9cb0..f48c9457c1c 100644 --- a/src/main/java/teammates/ui/webapi/action/SearchInstructorsAction.java +++ b/src/main/java/teammates/ui/webapi/action/SearchInstructorsAction.java @@ -49,8 +49,8 @@ public ActionResult execute() { InstructorData instructorData = new InstructorData(instructor); instructorData.addAdditionalInformationForAdminSearch( StringHelper.encrypt(instructor.getKey()), - getInstituteFromGoogleId(instructor.getGoogleId())); - instructorData.hideInformationForSearch(); + getInstituteFromGoogleId(instructor.getGoogleId()), + instructor.getGoogleId()); instructorDataList.add(instructorData); } diff --git a/src/main/java/teammates/ui/webapi/action/UpdateInstructorAction.java b/src/main/java/teammates/ui/webapi/action/UpdateInstructorAction.java index 3071515aed4..e07e910dff9 100644 --- a/src/main/java/teammates/ui/webapi/action/UpdateInstructorAction.java +++ b/src/main/java/teammates/ui/webapi/action/UpdateInstructorAction.java @@ -69,7 +69,9 @@ public ActionResult execute() { .withRole(instructorToEdit.role) .build()); } - return new JsonResult(new InstructorData(updatedInstructor)); + InstructorData newInstructorData = new InstructorData(updatedInstructor); + newInstructorData.setGoogleId(updatedInstructor.getGoogleId()); + return new JsonResult(newInstructorData); } catch (InvalidParametersException e) { return new JsonResult(e.getMessage(), HttpStatus.SC_BAD_REQUEST); } catch (EntityDoesNotExistException ednee) { diff --git a/src/main/java/teammates/ui/webapi/output/InstructorData.java b/src/main/java/teammates/ui/webapi/output/InstructorData.java index 30196575d33..52d09755539 100644 --- a/src/main/java/teammates/ui/webapi/output/InstructorData.java +++ b/src/main/java/teammates/ui/webapi/output/InstructorData.java @@ -8,6 +8,7 @@ * The API output format of an instructor. */ public class InstructorData extends ApiOutput { + @Nullable private String googleId; private final String courseId; private final String email; @@ -25,7 +26,6 @@ public class InstructorData extends ApiOutput { private String institute; public InstructorData(InstructorAttributes instructorAttributes) { - this.googleId = instructorAttributes.getGoogleId(); this.courseId = instructorAttributes.getCourseId(); this.email = instructorAttributes.getEmail(); this.role = instructorAttributes.getRole() == null ? null @@ -105,23 +105,16 @@ public void setInstitute(String institute) { this.institute = institute; } - /** - * Hides some attributes for search result. - */ - public void hideInformationForSearch() { - setRole(null); - setDisplayedToStudentsAs(null); - setIsDisplayedToStudents(null); - } - /** * Adds additional attributes only for search result for admin. * * @param key Encrypted registration key - * @param institute Institute of the student + * @param institute Institute of the instructor + * @param googleId Google ID of the instructor */ - public void addAdditionalInformationForAdminSearch(String key, String institute) { + public void addAdditionalInformationForAdminSearch(String key, String institute, String googleId) { setKey(key); setInstitute(institute); + setGoogleId(googleId); } } diff --git a/src/test/java/teammates/test/cases/webapi/GetInstructorActionTest.java b/src/test/java/teammates/test/cases/webapi/GetInstructorActionTest.java index 62861b30bf9..4bac677ae05 100644 --- a/src/test/java/teammates/test/cases/webapi/GetInstructorActionTest.java +++ b/src/test/java/teammates/test/cases/webapi/GetInstructorActionTest.java @@ -59,6 +59,8 @@ protected void testExecute() throws Exception { assertEquals(HttpStatus.SC_OK, actionOutput.getStatusCode()); InstructorData response = (InstructorData) actionOutput.getOutput(); assertEquals(instructor1OfCourse1.name, response.getName()); + assertNull(response.getGoogleId()); + assertNull(response.getKey()); ______TS("Typical Success Case with FULL_DETAIL"); params = new String[] { diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.html b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.html index 6ac70e28f04..f49612afa17 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.html +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.html @@ -37,7 +37,7 @@
    -
    +
    diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.ts b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.ts index 973083b2f2b..56989e50f41 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.ts @@ -8,7 +8,7 @@ import { * Model for edit instructor panel. */ export interface InstructorEditPanel { - googleId: string; + googleId?: string; courseId: string; email: string; isDisplayedToStudents: boolean; From dd9977ec150a49c93040004c4eb034a43fe0180a Mon Sep 17 00:00:00 2001 From: Ahmed Bahajjaj Date: Fri, 17 Jul 2020 12:08:35 +0800 Subject: [PATCH 027/205] [#10264] Hide MCQ/MSQ/Rubric Question Weights from Students (#10320) * Hide weights from students in FeedbackQuestionData * Update javadoc description * Hide other weights by setting to zero --- .../action/GetFeedbackQuestionsAction.java | 6 ++++++ .../webapi/output/FeedbackQuestionData.java | 20 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/src/main/java/teammates/ui/webapi/action/GetFeedbackQuestionsAction.java b/src/main/java/teammates/ui/webapi/action/GetFeedbackQuestionsAction.java index ff64a86dced..e6bb39a6413 100644 --- a/src/main/java/teammates/ui/webapi/action/GetFeedbackQuestionsAction.java +++ b/src/main/java/teammates/ui/webapi/action/GetFeedbackQuestionsAction.java @@ -11,6 +11,7 @@ import teammates.common.exception.InvalidHttpParameterException; import teammates.common.util.Const; import teammates.common.util.StringHelper; +import teammates.ui.webapi.output.FeedbackQuestionData; import teammates.ui.webapi.output.FeedbackQuestionsData; import teammates.ui.webapi.request.Intent; @@ -96,6 +97,11 @@ public ActionResult execute() { FeedbackQuestionsData response = new FeedbackQuestionsData(questions); response.normalizeQuestionNumber(); + if (intent.equals(Intent.STUDENT_SUBMISSION)) { + for (FeedbackQuestionData questionData : response.getQuestions()) { + questionData.hideInformationForStudent(); + } + } return new JsonResult(response); } diff --git a/src/main/java/teammates/ui/webapi/output/FeedbackQuestionData.java b/src/main/java/teammates/ui/webapi/output/FeedbackQuestionData.java index 716750009bc..70bb9e6db61 100644 --- a/src/main/java/teammates/ui/webapi/output/FeedbackQuestionData.java +++ b/src/main/java/teammates/ui/webapi/output/FeedbackQuestionData.java @@ -1,5 +1,6 @@ package teammates.ui.webapi.output; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -7,8 +8,11 @@ import teammates.common.datatransfer.attributes.FeedbackQuestionAttributes; import teammates.common.datatransfer.questions.FeedbackConstantSumDistributePointsType; import teammates.common.datatransfer.questions.FeedbackConstantSumQuestionDetails; +import teammates.common.datatransfer.questions.FeedbackMcqQuestionDetails; +import teammates.common.datatransfer.questions.FeedbackMsqQuestionDetails; import teammates.common.datatransfer.questions.FeedbackQuestionDetails; import teammates.common.datatransfer.questions.FeedbackQuestionType; +import teammates.common.datatransfer.questions.FeedbackRubricQuestionDetails; import teammates.common.util.Assumption; import teammates.common.util.Const; @@ -176,4 +180,20 @@ public List getShowGiverNameTo() { public List getShowRecipientNameTo() { return showRecipientNameTo; } + + /** + * Hides some attributes to a student. + */ + public void hideInformationForStudent() { + if (questionDetails instanceof FeedbackMcqQuestionDetails) { + ((FeedbackMcqQuestionDetails) questionDetails).setMcqWeights(Collections.emptyList()); + ((FeedbackMcqQuestionDetails) questionDetails).setMcqOtherWeight(0); + } else if (questionDetails instanceof FeedbackMsqQuestionDetails) { + ((FeedbackMsqQuestionDetails) questionDetails).setMsqWeights(Collections.emptyList()); + ((FeedbackMsqQuestionDetails) questionDetails).setMsqOtherWeight(0); + } else if (questionDetails instanceof FeedbackRubricQuestionDetails) { + ((FeedbackRubricQuestionDetails) questionDetails) + .setRubricWeightsForEachCell(Collections.singletonList(Collections.emptyList())); + } + } } From faf15f9cc55f795550277b8ef7f4b8ce571ac07c Mon Sep 17 00:00:00 2001 From: t-cheepeng Date: Fri, 17 Jul 2020 20:31:01 +0800 Subject: [PATCH 028/205] [#10042] Improve UI for Mobile Compatibility (#10324) * Optimize student pages for mobile * Optimize instructor related pages for mobile * Optimize components for mobile --- .../comment-edit-form.component.html | 2 +- .../question-edit-form.component.spec.ts.snap | 6 ++-- .../question-edit-form.component.html | 6 ++-- .../gqr-rqg-view-responses.component.html | 2 +- ...per-question-view-responses.component.html | 2 +- ...tion-text-with-info.component.spec.ts.snap | 30 +++++++++++++------ .../question-text-with-info.component.html | 9 +++--- ...-question-edit-details-form.component.html | 2 +- ...-question-edit-details-form.component.scss | 6 ++-- ...-question-edit-details-form.component.scss | 6 ++-- ...m-scale-question-statistics.component.html | 2 +- .../sessions-recycle-bin-table.component.html | 4 +-- ...tom-privilege-setting-panel.component.html | 8 ++--- ...instructor-course-edit-page.component.html | 8 ++--- .../instructor-edit-panel.component.html | 14 ++++----- ...structor-course-enroll-page.component.html | 2 +- ...e-student-edit-page.component.spec.ts.snap | 26 ++++++++-------- ...or-course-student-edit-page.component.html | 22 +++++++------- ...ructor-courses-page.component.spec.ts.snap | 8 ++--- .../instructor-courses-page.component.html | 4 +-- ...nstructor-session-edit-page.component.html | 6 ++-- ...tructor-session-result-page.component.html | 4 +-- ...ession-result-question-view.component.html | 4 +-- ...nstructor-student-list-page.component.html | 6 ++-- .../course-related-info.component.html | 24 +++++++-------- .../student-profile.component.html | 4 +-- ...tudent-profile-page.component.spec.ts.snap | 12 +++++--- .../student-profile-page.component.html | 4 +-- 28 files changed, 125 insertions(+), 108 deletions(-) diff --git a/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html b/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html index 9375ff4725a..9c5fde7449c 100755 --- a/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html +++ b/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html @@ -24,7 +24,7 @@

    You may change comment's visibility using the visibility options on the right hand side.

    - +
    diff --git a/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap b/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap index c8397726492..f3a449c75f8 100644 --- a/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap +++ b/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap @@ -284,12 +284,12 @@ exports[`QuestionEditFormComponent should snap with default view 1`] = ` style="" >
    The maximum number of students each respondent should give feedback to:
    Warning: Any u
    -
    +
    The maximum number of {{ model.recipientType | lowercase }} each respondent should give feedback to:
    -
    +
    @@ -180,7 +180,7 @@
    Warning: Any u
    -
    +
    -
    +
    - - + Question {{ questionNumber }}: - - {{ questionDetails.questionText }} + {{ questionDetails.questionText }} [{{ additionalInfoIsExpanded ? 'less' : 'more' }}] diff --git a/src/web/app/components/question-types/question-edit-details-form/contribution-question-edit-details-form.component.html b/src/web/app/components/question-types/question-edit-details-form/contribution-question-edit-details-form.component.html index 790caf6646a..84b173469da 100644 --- a/src/web/app/components/question-types/question-edit-details-form/contribution-question-edit-details-form.component.html +++ b/src/web/app/components/question-types/question-edit-details-form/contribution-question-edit-details-form.component.html @@ -1,6 +1,6 @@

    -
    +
    -
    +
    diff --git a/src/web/app/components/sessions-recycle-bin-table/sessions-recycle-bin-table.component.html b/src/web/app/components/sessions-recycle-bin-table/sessions-recycle-bin-table.component.html index e1e3768d410..8ee1377dfce 100644 --- a/src/web/app/components/sessions-recycle-bin-table/sessions-recycle-bin-table.component.html +++ b/src/web/app/components/sessions-recycle-bin-table/sessions-recycle-bin-table.component.html @@ -6,10 +6,10 @@

    -
    +
    Recycle Bin
    -
    +
    @@ -149,7 +149,7 @@ -

    User/Group
    +
    diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.html b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.html index c408685a72e..27c7a8d0e54 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.html +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.html @@ -1,10 +1,10 @@ -
    -
    +
    +
    -
    +
    Course
    -
    +
    -
    +
    -
    -
    Session Name
    +
    diff --git a/src/web/app/pages-instructor/instructor-course-student-edit-page/__snapshots__/instructor-course-student-edit-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-course-student-edit-page/__snapshots__/instructor-course-student-edit-page.component.spec.ts.snap index 15d7e2ab661..ed2852b1975 100644 --- a/src/web/app/pages-instructor/instructor-course-student-edit-page/__snapshots__/instructor-course-student-edit-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-course-student-edit-page/__snapshots__/instructor-course-student-edit-page.component.spec.ts.snap @@ -37,7 +37,7 @@ exports[`InstructorCourseStudentEditPageComponent should snap with student detai class="card border-primary" >
    @@ -45,7 +45,7 @@
    - @@ -65,35 +65,3 @@
    - - -
    -
    Confirm Deletion
    - -
    -
    -

    Are you sure you want to clear the row?

    -
    -
    - - -
    -     - - -
    -
    Confirm Deletion
    - -
    -
    -

    Are you sure you want to clear the column?

    -
    -
    - - -
    -     diff --git a/src/web/app/components/question-types/question-edit-details-form/rubric-question-edit-details-form.component.ts b/src/web/app/components/question-types/question-edit-details-form/rubric-question-edit-details-form.component.ts index cfc760856f2..73c145625f8 100644 --- a/src/web/app/components/question-types/question-edit-details-form/rubric-question-edit-details-form.component.ts +++ b/src/web/app/components/question-types/question-edit-details-form/rubric-question-edit-details-form.component.ts @@ -1,10 +1,9 @@ import { moveItemInArray } from '@angular/cdk/drag-drop'; import { Component, OnInit } from '@angular/core'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { SimpleModalService } from '../../../../services/simple-modal.service'; import { FeedbackRubricQuestionDetails } from '../../../../types/api-output'; -import { - DEFAULT_RUBRIC_QUESTION_DETAILS, -} from '../../../../types/default-question-structs'; +import { DEFAULT_RUBRIC_QUESTION_DETAILS } from '../../../../types/default-question-structs'; +import { SimpleModalType } from '../../simple-modal/simple-modal-type'; import { QuestionEditDetailsFormComponent } from './question-edit-details-form.component'; /** @@ -21,7 +20,7 @@ export class RubricQuestionEditDetailsFormComponent rowToHighlight: number = -1; columnToHighlight: number = -1; - constructor(private modalService: NgbModal) { + constructor(private simpleModalService: SimpleModalService) { super(DEFAULT_RUBRIC_QUESTION_DETAILS()); } @@ -162,69 +161,71 @@ export class RubricQuestionEditDetailsFormComponent /** * Deletes a sub question. */ - deleteSubQuestion(index: number, confirmModal: any): void { + deleteSubQuestion(index: number): void { if (this.model.numOfRubricSubQuestions === 1 || !this.isEditable) { // ignore deletion return; } - this.modalService.open(confirmModal).result.then(() => { + this.simpleModalService.openConfirmationModal('Delete the row?', SimpleModalType.WARNING, + 'Are you sure you want to clear the row?').result.then(() => { - const newSubQuestions: string[] = this.model.rubricSubQuestions.slice(); - newSubQuestions.splice(index, 1); + const newSubQuestions: string[] = this.model.rubricSubQuestions.slice(); + newSubQuestions.splice(index, 1); - const newDescriptions: string[][] = this.model.rubricDescriptions.map((arr: string[]) => arr.slice()); - newDescriptions.splice(index, 1); + const newDescriptions: string[][] = this.model.rubricDescriptions.map((arr: string[]) => arr.slice()); + newDescriptions.splice(index, 1); // update weights - let newWeightsForEachCell: number[][] = []; - if (this.model.hasAssignedWeights) { - newWeightsForEachCell = this.model.rubricWeightsForEachCell.map((arr: number[]) => arr.slice()); + let newWeightsForEachCell: number[][] = []; + if (this.model.hasAssignedWeights) { + newWeightsForEachCell = this.model.rubricWeightsForEachCell.map((arr: number[]) => arr.slice()); - newWeightsForEachCell.splice(index, 1); - } + newWeightsForEachCell.splice(index, 1); + } - this.triggerModelChangeBatch({ - rubricSubQuestions: newSubQuestions, - rubricDescriptions: newDescriptions, - numOfRubricSubQuestions: this.model.numOfRubricSubQuestions - 1, - rubricWeightsForEachCell: newWeightsForEachCell, - }); + this.triggerModelChangeBatch({ + rubricSubQuestions: newSubQuestions, + rubricDescriptions: newDescriptions, + numOfRubricSubQuestions: this.model.numOfRubricSubQuestions - 1, + rubricWeightsForEachCell: newWeightsForEachCell, + }); - }, () => {}); + }, () => {}); } /** * Deletes a choice. */ - deleteChoice(index: number, confirmModal: any): void { - this.modalService.open(confirmModal).result.then(() => { - const newChoices: string[] = this.model.rubricChoices.slice(); - newChoices.splice(index, 1); - - const newDescriptions: string[][] = this.model.rubricDescriptions.map((arr: string[]) => { - const newArr: string[] = arr.slice(); - newArr.splice(index, 1); - return newArr; - }); + deleteChoice(index: number): void { + this.simpleModalService.openConfirmationModal('Delete the column?', SimpleModalType.WARNING, + 'Are you sure you want to clear the column?').result.then(() => { + const newChoices: string[] = this.model.rubricChoices.slice(); + newChoices.splice(index, 1); + + const newDescriptions: string[][] = this.model.rubricDescriptions.map((arr: string[]) => { + const newArr: string[] = arr.slice(); + newArr.splice(index, 1); + return newArr; + }); // update weights - let newWeightsForEachCell: number[][] = []; - if (this.model.hasAssignedWeights) { - newWeightsForEachCell = this.model.rubricWeightsForEachCell.map((arr: number[]) => { - const newArr: number[] = arr.slice(); - newArr.splice(index, 1); - return newArr; - }); - } - - this.triggerModelChangeBatch({ - rubricChoices: newChoices, - numOfRubricChoices: this.model.numOfRubricChoices - 1, - rubricDescriptions: newDescriptions, - rubricWeightsForEachCell: newWeightsForEachCell, - }); - }, () => {}); + let newWeightsForEachCell: number[][] = []; + if (this.model.hasAssignedWeights) { + newWeightsForEachCell = this.model.rubricWeightsForEachCell.map((arr: number[]) => { + const newArr: number[] = arr.slice(); + newArr.splice(index, 1); + return newArr; + }); + } + + this.triggerModelChangeBatch({ + rubricChoices: newChoices, + numOfRubricChoices: this.model.numOfRubricChoices - 1, + rubricDescriptions: newDescriptions, + rubricWeightsForEachCell: newWeightsForEachCell, + }); + }, () => {}); } /** diff --git a/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.html b/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.html index 3b53f88198f..ffec00908ce 100644 --- a/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.html +++ b/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.html @@ -19,7 +19,7 @@ ,  -   +  
    @@ -60,57 +60,51 @@
    - - -
    -

    More info about contribution questions

    -
    -
    -

    How do I interpret these results?

    -
      -
    • - Compare the values given in 'My view' with those under 'Team's view'. - This tells you whether your perception matches what the team thinks, particularly regarding your own contribution. - You may ignore minor differences. -
      • -
    • - From the estimates you submit, we try to deduce the answer to this question: - In your opinion, if your teammates are doing the project by themselves without you, - how do they compare against each other in terms of contribution? - We want to deduce your unbiased opinion about your team members' contributions. -
      • -
    -

    How are contribution question results used in grading?

    -
      -
    • - TEAMMATES does not calculate grades. Instructors are free to choose how they use contribution question results. -
      • -
    • - TEAMMATES recommends that contribution question results be used only as flags to identify teams with contribution imbalances. - Once identified, the instructor is recommended to investigate further before taking action. -
      • -
    -

    How are the scores for contribution questions calculated?

    -

    - Here are the important things to note about - how contribution scores are calculated: -

    -
      -
    • - The contribution value you attribute to yourself is not used to calculate the team's view of your contribution. - That means you cannot boost your perceived contribution by claiming a high contribution for yourself - or attributing a low contribution to team members. -
      • -
    • - We adjust the estimates you submitted to remove artificial inflation/deflation. - For example, giving everyone [Equal share + 20%] is as same as giving everyone - [Equal share] because in both cases all members have done a similar share of work. -
      • -
    • - The sum of values in the team's view has been scaled to equal the sum of values in your view. - That way, you can make a direct comparison between your view and the team's view. - As this scaling is specific to you, the values you see in team's view may not match the values your team members see in their results. -
      • -
    -
    + +

    How do I interpret these results?

    +
      +
    • + Compare the values given in 'My view' with those under 'Team's view'. + This tells you whether your perception matches what the team thinks, particularly regarding your own contribution. + You may ignore minor differences. +
      • +
    • + From the estimates you submit, we try to deduce the answer to this question: + In your opinion, if your teammates are doing the project by themselves without you, + how do they compare against each other in terms of contribution? + We want to deduce your unbiased opinion about your team members' contributions. +
      • +
    +

    How are contribution question results used in grading?

    +
      +
    • + TEAMMATES does not calculate grades. Instructors are free to choose how they use contribution question results. +
      • +
    • + TEAMMATES recommends that contribution question results be used only as flags to identify teams with contribution imbalances. + Once identified, the instructor is recommended to investigate further before taking action. +
      • +
    +

    How are the scores for contribution questions calculated?

    +

    + Here are the important things to note about + how contribution scores are calculated: +

    +
      +
    • + The contribution value you attribute to yourself is not used to calculate the team's view of your contribution. + That means you cannot boost your perceived contribution by claiming a high contribution for yourself + or attributing a low contribution to team members. +
      • +
    • + We adjust the estimates you submitted to remove artificial inflation/deflation. + For example, giving everyone [Equal share + 20%] is as same as giving everyone + [Equal share] because in both cases all members have done a similar share of work. +
      • +
    • + The sum of values in the team's view has been scaled to equal the sum of values in your view. + That way, you can make a direct comparison between your view and the team's view. + As this scaling is specific to you, the values you see in team's view may not match the values your team members see in their results. +
      • +
    diff --git a/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.ts b/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.ts index 6c0cd5ec366..0876b54c18c 100644 --- a/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.ts +++ b/src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.ts @@ -1,14 +1,16 @@ -import { Component, Input, OnChanges, OnInit } from '@angular/core'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { Component, Input, OnChanges, OnInit, TemplateRef } from '@angular/core'; +import { SimpleModalService } from '../../../../../services/simple-modal.service'; import { ContributionStatistics } from '../../../../../types/api-output'; import { DEFAULT_CONTRIBUTION_QUESTION_DETAILS } from '../../../../../types/default-question-structs'; import { SortBy } from '../../../../../types/sort-properties'; import { QuestionsSectionQuestions } from '../../../../pages-help/instructor-help-page/instructor-help-questions-section/questions-section-questions'; import { Sections } from '../../../../pages-help/instructor-help-page/sections'; -import { ColumnData, SortableTableCellData } from '../../../sortable-table/sortable-table.component'; +import { SimpleModalType } from '../../../simple-modal/simple-modal-type'; import { - ContributionQuestionStatisticsCalculation, -} from '../question-statistics-calculation/contribution-question-statistics-calculation'; + ColumnData, + SortableTableCellData, +} from '../../../sortable-table/sortable-table.component'; +import { ContributionQuestionStatisticsCalculation } from '../question-statistics-calculation/contribution-question-statistics-calculation'; import { ContributionRatingsListComponent } from './contribution-ratings-list.component'; import { ContributionComponent } from './contribution.component'; @@ -20,9 +22,9 @@ import { ContributionComponent } from './contribution.component'; templateUrl: './contribution-question-statistics.component.html', styleUrls: ['./contribution-question-statistics.component.scss'], }) -export class ContributionQuestionStatisticsComponent extends ContributionQuestionStatisticsCalculation - implements OnInit, OnChanges { - +export class ContributionQuestionStatisticsComponent + extends ContributionQuestionStatisticsCalculation + implements OnInit, OnChanges { // enum QuestionsSectionQuestions: typeof QuestionsSectionQuestions = QuestionsSectionQuestions; Sections: typeof Sections = Sections; @@ -32,7 +34,7 @@ export class ContributionQuestionStatisticsComponent extends ContributionQuestio columnsData: ColumnData[] = []; rowsData: SortableTableCellData[][] = []; - constructor(private modalService: NgbModal) { + constructor(private simpleModalService: SimpleModalService) { super(DEFAULT_CONTRIBUTION_QUESTION_DETAILS()); } @@ -97,11 +99,8 @@ export class ContributionQuestionStatisticsComponent extends ContributionQuestio }); } - /** - * Opens a modal. - */ - openModal(modal: any): void { - this.modalService.open(modal); + openHelpModal(modal: TemplateRef): void { + this.simpleModalService.openInformationModal( + 'More info about contribution questions', SimpleModalType.NEUTRAL, modal); } - } diff --git a/src/web/app/components/session-edit-form/session-edit-form.component.html b/src/web/app/components/session-edit-form/session-edit-form.component.html index 15478583b2e..0e997336da3 100644 --- a/src/web/app/components/session-edit-form/session-edit-form.component.html +++ b/src/web/app/components/session-edit-form/session-edit-form.component.html @@ -36,38 +36,8 @@
    Or:
    - - -
    -
    Warning: Any unsaved changes will be lost
    - -
    -
    - Are you sure you want to discard your unsaved edits? -
    -
    - - -
    -     - - -
    -
    Warning: The session will be moved to the recycle bin.
    - -
    -
    - Are you sure you want to continue? -
    -
    - - -
    -     + +
    diff --git a/src/web/app/components/session-edit-form/session-edit-form.component.ts b/src/web/app/components/session-edit-form/session-edit-form.component.ts index 64170ec68ac..b116a7977a2 100644 --- a/src/web/app/components/session-edit-form/session-edit-form.component.ts +++ b/src/web/app/components/session-edit-form/session-edit-form.component.ts @@ -1,9 +1,10 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { NgbDateParserFormatter, NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap'; import moment from 'moment-timezone'; import { environment } from '../../../environments/environment'; import { TemplateSession } from '../../../services/feedback-sessions.service'; import { NavigationService } from '../../../services/navigation.service'; +import { SimpleModalService } from '../../../services/simple-modal.service'; import { Course, FeedbackSessionPublishStatus, @@ -12,6 +13,7 @@ import { SessionVisibleSetting, } from '../../../types/api-output'; import { FEEDBACK_SESSION_NAME_MAX_LENGTH } from '../../../types/field-validator'; +import { SimpleModalType } from '../simple-modal/simple-modal-type'; import { collapseAnim } from '../teammates-common/collapse-anim'; import { SessionEditFormDatePickerFormatter } from './session-edit-form-datepicker-formatter'; import { DateFormat, SessionEditFormMode, SessionEditFormModel } from './session-edit-form-model'; @@ -106,7 +108,7 @@ export class SessionEditFormComponent implements OnInit { @Output() closeEditFormEvent: EventEmitter = new EventEmitter(); - constructor(private modalService: NgbModal, private navigationService: NavigationService) { } + constructor(private simpleModalService: SimpleModalService, private navigationService: NavigationService) { } ngOnInit(): void { } @@ -210,19 +212,21 @@ export class SessionEditFormComponent implements OnInit { /** * Handles cancel button click event. */ - cancelHandler(modal: any): void { - this.modalService.open(modal).result.then(() => { - this.cancelEditingSessionEvent.emit(); - }, () => {}); + cancelHandler(): void { + this.simpleModalService.openConfirmationModal('Discard unsaved edit?', + SimpleModalType.WARNING, 'Warning: Any unsaved changes will be lost.').result.then(() => { + this.cancelEditingSessionEvent.emit(); + }, () => {}); } /** * Handles delete current feedback session button click event. */ - deleteHandler(modal: any): void { - this.modalService.open(modal).result.then(() => { - this.deleteExistingSessionEvent.emit(); - }, () => {}); + deleteHandler(): void { + this.simpleModalService.openConfirmationModal(`Delete the session ${ this.model.feedbackSessionName }?`, + SimpleModalType.WARNING, 'The session will be moved to the recycle bin.').result.then(() => { + this.deleteExistingSessionEvent.emit(); + }, () => {}); } /** diff --git a/src/web/app/components/sessions-table/__snapshots__/sessions-table.component.spec.ts.snap b/src/web/app/components/sessions-table/__snapshots__/sessions-table.component.spec.ts.snap index cafc7a0a64c..775039c6a50 100644 --- a/src/web/app/components/sessions-table/__snapshots__/sessions-table.component.spec.ts.snap +++ b/src/web/app/components/sessions-table/__snapshots__/sessions-table.component.spec.ts.snap @@ -15,14 +15,15 @@ exports[`SessionsTableComponent should snap like in home page with 2 sessions so editSessionEvent={[Function EventEmitter]} headerColorScheme="0" loadResponseRateEvent={[Function EventEmitter]} - modalService={[Function NgbModal]} moveSessionToRecycleBinEvent={[Function EventEmitter]} + ngbModal={[Function NgbModal]} publishSessionEvent={[Function EventEmitter]} resendResultsLinkToStudentsEvent={[Function EventEmitter]} sendRemindersToStudentsEvent={[Function EventEmitter]} sessionsTableRowModels={[Function Array]} sessionsTableRowModelsSortBy={[Function Number]} sessionsTableRowModelsSortOrder={[Function Number]} + simpleModalService={[Function SimpleModalService]} sortSessionsTableRowModelsEvent={[Function EventEmitter]} submitSessionAsInstructorEvent={[Function EventEmitter]} unpublishSessionEvent={[Function EventEmitter]} @@ -422,14 +423,15 @@ exports[`SessionsTableComponent should snap like in sessions page with 2 session editSessionEvent={[Function EventEmitter]} headerColorScheme="0" loadResponseRateEvent={[Function EventEmitter]} - modalService={[Function NgbModal]} moveSessionToRecycleBinEvent={[Function EventEmitter]} + ngbModal={[Function NgbModal]} publishSessionEvent={[Function EventEmitter]} resendResultsLinkToStudentsEvent={[Function EventEmitter]} sendRemindersToStudentsEvent={[Function EventEmitter]} sessionsTableRowModels={[Function Array]} sessionsTableRowModelsSortBy={[Function Number]} sessionsTableRowModelsSortOrder={[Function Number]} + simpleModalService={[Function SimpleModalService]} sortSessionsTableRowModelsEvent={[Function EventEmitter]} submitSessionAsInstructorEvent={[Function EventEmitter]} unpublishSessionEvent={[Function EventEmitter]} @@ -782,14 +784,15 @@ exports[`SessionsTableComponent should snap with default fields 1`] = ` editSessionEvent={[Function EventEmitter]} headerColorScheme="0" loadResponseRateEvent={[Function EventEmitter]} - modalService={[Function NgbModal]} moveSessionToRecycleBinEvent={[Function EventEmitter]} + ngbModal={[Function NgbModal]} publishSessionEvent={[Function EventEmitter]} resendResultsLinkToStudentsEvent={[Function EventEmitter]} sendRemindersToStudentsEvent={[Function EventEmitter]} sessionsTableRowModels={[Function Array]} sessionsTableRowModelsSortBy="0" sessionsTableRowModelsSortOrder={[Function Number]} + simpleModalService={[Function SimpleModalService]} sortSessionsTableRowModelsEvent={[Function EventEmitter]} submitSessionAsInstructorEvent={[Function EventEmitter]} unpublishSessionEvent={[Function EventEmitter]} diff --git a/src/web/app/components/sessions-table/confirm-publishing-session-modal/confirm-publishing-session-modal.component.html b/src/web/app/components/sessions-table/confirm-publishing-session-modal/confirm-publishing-session-modal.component.html deleted file mode 100644 index 1dfdfe896fa..00000000000 --- a/src/web/app/components/sessions-table/confirm-publishing-session-modal/confirm-publishing-session-modal.component.html +++ /dev/null @@ -1,16 +0,0 @@ -
    -
    Confirm publishing responses
    - -
    -
    -
    - Are you sure you want to publish the responses for the session "{{ feedbackSessionName }}"? - An email will be sent to students to inform them that the responses are ready for viewing. -
    -
    -
    - - -
    diff --git a/src/web/app/components/sessions-table/confirm-publishing-session-modal/confirm-publishing-session-modal.component.scss b/src/web/app/components/sessions-table/confirm-publishing-session-modal/confirm-publishing-session-modal.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/web/app/components/sessions-table/confirm-publishing-session-modal/confirm-publishing-session-modal.component.spec.ts b/src/web/app/components/sessions-table/confirm-publishing-session-modal/confirm-publishing-session-modal.component.spec.ts deleted file mode 100644 index c134e8821bd..00000000000 --- a/src/web/app/components/sessions-table/confirm-publishing-session-modal/confirm-publishing-session-modal.component.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ConfirmPublishingSessionModalComponent } from './confirm-publishing-session-modal.component'; - -describe('ConfirmPublishingSessionModalComponent', () => { - let component: ConfirmPublishingSessionModalComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ConfirmPublishingSessionModalComponent], - providers: [NgbActiveModal], - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ConfirmPublishingSessionModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/web/app/components/sessions-table/confirm-publishing-session-modal/confirm-publishing-session-modal.component.ts b/src/web/app/components/sessions-table/confirm-publishing-session-modal/confirm-publishing-session-modal.component.ts deleted file mode 100644 index ac1c552224c..00000000000 --- a/src/web/app/components/sessions-table/confirm-publishing-session-modal/confirm-publishing-session-modal.component.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - -/** - * Confirm publishing session modal. - */ -@Component({ - selector: 'tm-confirm-publishing-session-modal', - templateUrl: './confirm-publishing-session-modal.component.html', - styleUrls: ['./confirm-publishing-session-modal.component.scss'], -}) -export class ConfirmPublishingSessionModalComponent implements OnInit { - - @Input() - feedbackSessionName: string = ''; - - constructor(public activeModal: NgbActiveModal) {} - - ngOnInit(): void { - } - -} diff --git a/src/web/app/components/sessions-table/confirm-session-move-to-recycle-bin-modal/confirm-session-move-to-recycle-bin-modal.component.html b/src/web/app/components/sessions-table/confirm-session-move-to-recycle-bin-modal/confirm-session-move-to-recycle-bin-modal.component.html deleted file mode 100644 index 41c73be90bd..00000000000 --- a/src/web/app/components/sessions-table/confirm-session-move-to-recycle-bin-modal/confirm-session-move-to-recycle-bin-modal.component.html +++ /dev/null @@ -1,13 +0,0 @@ -
    -
    Warning: The session will be moved to the recycle bin.
    - -
    -
    - Are you sure you want to continue? -
    -
    - - -
    diff --git a/src/web/app/components/sessions-table/confirm-session-move-to-recycle-bin-modal/confirm-session-move-to-recycle-bin-modal.component.scss b/src/web/app/components/sessions-table/confirm-session-move-to-recycle-bin-modal/confirm-session-move-to-recycle-bin-modal.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/web/app/components/sessions-table/confirm-session-move-to-recycle-bin-modal/confirm-session-move-to-recycle-bin-modal.component.spec.ts b/src/web/app/components/sessions-table/confirm-session-move-to-recycle-bin-modal/confirm-session-move-to-recycle-bin-modal.component.spec.ts deleted file mode 100644 index 88410033c7a..00000000000 --- a/src/web/app/components/sessions-table/confirm-session-move-to-recycle-bin-modal/confirm-session-move-to-recycle-bin-modal.component.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ConfirmSessionMoveToRecycleBinModalComponent } from './confirm-session-move-to-recycle-bin-modal.component'; - -describe('ConfirmSessionMoveToRecycleBinModalComponent', () => { - let component: ConfirmSessionMoveToRecycleBinModalComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ConfirmSessionMoveToRecycleBinModalComponent], - providers: [NgbActiveModal], - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ConfirmSessionMoveToRecycleBinModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/web/app/components/sessions-table/confirm-session-move-to-recycle-bin-modal/confirm-session-move-to-recycle-bin-modal.component.ts b/src/web/app/components/sessions-table/confirm-session-move-to-recycle-bin-modal/confirm-session-move-to-recycle-bin-modal.component.ts deleted file mode 100644 index 9955ed26c20..00000000000 --- a/src/web/app/components/sessions-table/confirm-session-move-to-recycle-bin-modal/confirm-session-move-to-recycle-bin-modal.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - -/** - * Confirm session move to recycle bin modal. - */ -@Component({ - selector: 'tm-confirm-session-move-to-recycle-bin-modal', - templateUrl: './confirm-session-move-to-recycle-bin-modal.component.html', - styleUrls: ['./confirm-session-move-to-recycle-bin-modal.component.scss'], -}) -export class ConfirmSessionMoveToRecycleBinModalComponent implements OnInit { - - constructor(public activeModal: NgbActiveModal) {} - - ngOnInit(): void { - } - -} diff --git a/src/web/app/components/sessions-table/confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component.html b/src/web/app/components/sessions-table/confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component.html deleted file mode 100644 index 0fbbf886647..00000000000 --- a/src/web/app/components/sessions-table/confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component.html +++ /dev/null @@ -1,17 +0,0 @@ -
    -
    Confirm unpublishing responses
    - -
    -
    -
    - Are you sure you want to unpublish the session "{{ feedbackSessionName }}"? - An email will be sent to students to inform them that the session has been unpublished and the session responses - will no longer be viewable by students. -
    -
    -
    - - -
    diff --git a/src/web/app/components/sessions-table/confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component.scss b/src/web/app/components/sessions-table/confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/web/app/components/sessions-table/confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component.spec.ts b/src/web/app/components/sessions-table/confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component.spec.ts deleted file mode 100644 index 3a7f1bc9c92..00000000000 --- a/src/web/app/components/sessions-table/confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ConfirmUnpublishingSessionModalComponent } from './confirm-unpublishing-session-modal.component'; - -describe('ConfirmUnpublishingSessionModalComponent', () => { - let component: ConfirmUnpublishingSessionModalComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ConfirmUnpublishingSessionModalComponent], - providers: [NgbActiveModal], - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ConfirmUnpublishingSessionModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/web/app/components/sessions-table/confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component.ts b/src/web/app/components/sessions-table/confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component.ts deleted file mode 100644 index 754d3688ae6..00000000000 --- a/src/web/app/components/sessions-table/confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - -/** - * Confirm unpublishing session modal. - */ -@Component({ - selector: 'tm-confirm-unpublishing-session-modal', - templateUrl: './confirm-unpublishing-session-modal.component.html', - styleUrls: ['./confirm-unpublishing-session-modal.component.scss'], -}) -export class ConfirmUnpublishingSessionModalComponent implements OnInit { - - @Input() - feedbackSessionName: string = ''; - - constructor(public activeModal: NgbActiveModal) {} - - ngOnInit(): void { - } - -} diff --git a/src/web/app/components/sessions-table/sessions-table.component.ts b/src/web/app/components/sessions-table/sessions-table.component.ts index 36e7e7b0701..1415f89f2a0 100644 --- a/src/web/app/components/sessions-table/sessions-table.component.ts +++ b/src/web/app/components/sessions-table/sessions-table.component.ts @@ -1,18 +1,11 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { SimpleModalService } from '../../../services/simple-modal.service'; import { Course, FeedbackSessionPublishStatus, FeedbackSessionSubmissionStatus } from '../../../types/api-output'; import { SortBy, SortOrder } from '../../../types/sort-properties'; import { CopySessionModalResult } from '../copy-session-modal/copy-session-modal-model'; import { CopySessionModalComponent } from '../copy-session-modal/copy-session-modal.component'; -import { - ConfirmPublishingSessionModalComponent, -} from './confirm-publishing-session-modal/confirm-publishing-session-modal.component'; -import { - ConfirmSessionMoveToRecycleBinModalComponent, -} from './confirm-session-move-to-recycle-bin-modal/confirm-session-move-to-recycle-bin-modal.component'; -import { - ConfirmUnpublishingSessionModalComponent, -} from './confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component'; +import { SimpleModalType } from '../simple-modal/simple-modal-type'; import { CopySessionResult, SessionsTableColumn, @@ -92,7 +85,7 @@ export class SessionsTableComponent implements OnInit { @Output() downloadSessionResultsEvent: EventEmitter = new EventEmitter(); - constructor(private modalService: NgbModal) { } + constructor(private ngbModal: NgbModal, private simpleModalService: SimpleModalService) { } /** * Sorts the list of feedback session row. @@ -105,7 +98,11 @@ export class SessionsTableComponent implements OnInit { * Moves the feedback session to the recycle bin. */ moveSessionToRecycleBin(rowIndex: number): void { - this.modalService.open(ConfirmSessionMoveToRecycleBinModalComponent).result.then(() => { + const modalContent: string = 'Session will be moved to the recycle bin.'; + const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal( + `Delete session ${ this.sessionsTableRowModels[rowIndex].feedbackSession.feedbackSessionName }?`, + SimpleModalType.WARNING, modalContent); + modalRef.result.then(() => { this.moveSessionToRecycleBinEvent.emit(rowIndex); }, () => {}); } @@ -114,7 +111,7 @@ export class SessionsTableComponent implements OnInit { * Copies the feedback session. */ copySession(rowIndex: number): void { - const modalRef: NgbModalRef = this.modalService.open(CopySessionModalComponent); + const modalRef: NgbModalRef = this.ngbModal.open(CopySessionModalComponent); const model: SessionsTableRowModel = this.sessionsTableRowModels[rowIndex]; modalRef.componentInstance.newFeedbackSessionName = model.feedbackSession.feedbackSessionName; modalRef.componentInstance.courseCandidates = this.courseCandidates; @@ -132,9 +129,11 @@ export class SessionsTableComponent implements OnInit { * Publishes a feedback session. */ publishSession(rowIndex: number): void { - const modalRef: NgbModalRef = this.modalService.open(ConfirmPublishingSessionModalComponent); const model: SessionsTableRowModel = this.sessionsTableRowModels[rowIndex]; - modalRef.componentInstance.feedbackSessionName = model.feedbackSession.feedbackSessionName; + + const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal( + `Publish session ${ model.feedbackSession.feedbackSessionName }?`, + SimpleModalType.WARNING, 'An email will be sent to students to inform them that the responses are ready for viewing.'); modalRef.result.then(() => { this.publishSessionEvent.emit(rowIndex); @@ -145,9 +144,13 @@ export class SessionsTableComponent implements OnInit { * Unpublishes a feedback session. */ unpublishSession(rowIndex: number): void { - const modalRef: NgbModalRef = this.modalService.open(ConfirmUnpublishingSessionModalComponent); const model: SessionsTableRowModel = this.sessionsTableRowModels[rowIndex]; - modalRef.componentInstance.feedbackSessionName = model.feedbackSession.feedbackSessionName; + const modalContent: string = `An email will be sent to students to inform them that the session has been unpublished + and the session responses will no longer be viewable by students.`; + + const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal( + `Unpublish session ${ model.feedbackSession.feedbackSessionName }?`, + SimpleModalType.WARNING, modalContent); modalRef.result.then(() => { this.unpublishSessionEvent.emit(rowIndex); diff --git a/src/web/app/components/sessions-table/sessions-table.module.ts b/src/web/app/components/sessions-table/sessions-table.module.ts index 2ce55f8053c..1db9e383c1e 100644 --- a/src/web/app/components/sessions-table/sessions-table.module.ts +++ b/src/web/app/components/sessions-table/sessions-table.module.ts @@ -1,27 +1,17 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { + NgbDropdownModule, + NgbTooltipModule, +} from '@ng-bootstrap/ng-bootstrap'; import { AjaxLoadingModule } from '../ajax-loading/ajax-loading.module'; import { AjaxPreloadModule } from '../ajax-preload/ajax-preload.module'; import { CopySessionModalModule } from '../copy-session-modal/copy-session-modal.module'; import { TeammatesCommonModule } from '../teammates-common/teammates-common.module'; -import { - ConfirmPublishingSessionModalComponent, -} from './confirm-publishing-session-modal/confirm-publishing-session-modal.component'; -import { - ConfirmSessionMoveToRecycleBinModalComponent, -} from './confirm-session-move-to-recycle-bin-modal/confirm-session-move-to-recycle-bin-modal.component'; -import { - ConfirmUnpublishingSessionModalComponent, -} from './confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component'; import { PublishStatusTooltipPipe } from './publish-status-tooltip.pipe'; -import { - ResendResultsLinkToStudentModalComponent, -} from './resend-results-link-to-student-modal/resend-results-link-to-student-modal.component'; -import { - SendRemindersToStudentModalComponent, -} from './send-reminders-to-student-modal/send-reminders-to-student-modal.component'; +import { ResendResultsLinkToStudentModalComponent } from './resend-results-link-to-student-modal/resend-results-link-to-student-modal.component'; +import { SendRemindersToStudentModalComponent } from './send-reminders-to-student-modal/send-reminders-to-student-modal.component'; import { SessionsTableComponent } from './sessions-table.component'; import { StudentListInfoTableComponent } from './student-list-info-table/student-list-info-table.component'; import { SubmissionStatusTooltipPipe } from './submission-status-tooltip.pipe'; @@ -34,11 +24,8 @@ import { SubmissionStatusTooltipPipe } from './submission-status-tooltip.pipe'; SubmissionStatusTooltipPipe, PublishStatusTooltipPipe, SessionsTableComponent, - ConfirmUnpublishingSessionModalComponent, - ConfirmPublishingSessionModalComponent, ResendResultsLinkToStudentModalComponent, SendRemindersToStudentModalComponent, - ConfirmSessionMoveToRecycleBinModalComponent, StudentListInfoTableComponent, ], imports: [ @@ -52,15 +39,9 @@ import { SubmissionStatusTooltipPipe } from './submission-status-tooltip.pipe'; CopySessionModalModule, ], entryComponents: [ - ConfirmSessionMoveToRecycleBinModalComponent, - ConfirmUnpublishingSessionModalComponent, - ConfirmPublishingSessionModalComponent, ResendResultsLinkToStudentModalComponent, SendRemindersToStudentModalComponent, ], - exports: [ - SessionsTableComponent, - StudentListInfoTableComponent, - ], + exports: [SessionsTableComponent, StudentListInfoTableComponent], }) -export class SessionsTableModule { } +export class SessionsTableModule {} diff --git a/src/web/app/components/simple-modal/simple-modal-type.ts b/src/web/app/components/simple-modal/simple-modal-type.ts new file mode 100644 index 00000000000..d45b96c50e5 --- /dev/null +++ b/src/web/app/components/simple-modal/simple-modal-type.ts @@ -0,0 +1,21 @@ +/** + * Represents the type of the modal to be displayed. + */ +export enum SimpleModalType { + /** + * Warning modal. + */ + WARNING, + /** + * Danger modal. + */ + DANGER, + /** + * Info modal. + */ + INFO, + /** + * Neutral modal. + */ + NEUTRAL, +} diff --git a/src/web/app/components/simple-modal/simple-modal.component.html b/src/web/app/components/simple-modal/simple-modal.component.html new file mode 100644 index 00000000000..c1f932ac355 --- /dev/null +++ b/src/web/app/components/simple-modal/simple-modal.component.html @@ -0,0 +1,36 @@ +
    +
    +
    + + + + +
    +
    + +
    +
    +
    + +
    +
    +
    +
    + + +
    diff --git a/src/web/app/components/simple-modal/simple-modal.component.scss b/src/web/app/components/simple-modal/simple-modal.component.scss new file mode 100644 index 00000000000..bafa05dfb57 --- /dev/null +++ b/src/web/app/components/simple-modal/simple-modal.component.scss @@ -0,0 +1,3 @@ +.margin-left-5px { + margin-left: 5px; +} diff --git a/src/web/app/pages-admin/admin-search-page/reset-google-id-confirm-modal/reset-google-id-confirm-modal.component.spec.ts b/src/web/app/components/simple-modal/simple-modal.component.spec.ts similarity index 52% rename from src/web/app/pages-admin/admin-search-page/reset-google-id-confirm-modal/reset-google-id-confirm-modal.component.spec.ts rename to src/web/app/components/simple-modal/simple-modal.component.spec.ts index 687d1d4a977..b224e2d11f1 100644 --- a/src/web/app/pages-admin/admin-search-page/reset-google-id-confirm-modal/reset-google-id-confirm-modal.component.spec.ts +++ b/src/web/app/components/simple-modal/simple-modal.component.spec.ts @@ -1,22 +1,22 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ResetGoogleIdConfirmModalComponent } from './reset-google-id-confirm-modal.component'; +import { SimpleModalComponent } from './simple-modal.component'; -describe('ResetGoogleIdConfirmModalComponent', () => { - let component: ResetGoogleIdConfirmModalComponent; - let fixture: ComponentFixture; +describe('SimpleModalComponent', () => { + let component: SimpleModalComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ResetGoogleIdConfirmModalComponent], + declarations: [SimpleModalComponent], providers: [NgbActiveModal], }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(ResetGoogleIdConfirmModalComponent); + fixture = TestBed.createComponent(SimpleModalComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/web/app/components/simple-modal/simple-modal.component.ts b/src/web/app/components/simple-modal/simple-modal.component.ts new file mode 100644 index 00000000000..315e832a78d --- /dev/null +++ b/src/web/app/components/simple-modal/simple-modal.component.ts @@ -0,0 +1,34 @@ +import { Component, Input, OnInit, TemplateRef } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { SimpleModalType } from './simple-modal-type'; + +/** + * A component to display contents of confirmation modals. + */ +@Component({ + selector: 'tm-confirmation-modal', + templateUrl: './simple-modal.component.html', + styleUrls: ['./simple-modal.component.scss'], +}) +export class SimpleModalComponent implements OnInit { + + // enum + SimpleModalType: typeof SimpleModalType = SimpleModalType; + + @Input() header: string = ''; + @Input() content: string | TemplateRef = ''; + @Input() type: SimpleModalType = SimpleModalType.NEUTRAL; + @Input() isInformationOnly: boolean = false; // true will cause modal to only have 1 button + @Input() confirmMessage: string = 'Yes'; // custom text message for confirm button + @Input() cancelMessage: string = 'No, cancel the operation'; // custom text message for cancel button + + get isTemplate(): boolean { + return this.content instanceof TemplateRef; + } + + constructor(public activeModal: NgbActiveModal) { } + + ngOnInit(): void { + } + +} diff --git a/src/web/app/components/simple-modal/simple-modal.module.ts b/src/web/app/components/simple-modal/simple-modal.module.ts new file mode 100644 index 00000000000..2273067a1f8 --- /dev/null +++ b/src/web/app/components/simple-modal/simple-modal.module.ts @@ -0,0 +1,17 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { SimpleModalComponent } from './simple-modal.component'; + +/** + * Module for the modal component + */ +@NgModule({ + declarations: [SimpleModalComponent], + exports: [SimpleModalComponent], + imports: [ + CommonModule, + ], + entryComponents: [SimpleModalComponent], +}) + +export class SimpleModalModule { } diff --git a/src/web/app/components/status-message/status-messsage-modal/status-message-modal.component.html b/src/web/app/components/status-message/status-messsage-modal/status-message-modal.component.html deleted file mode 100644 index 1ff6e783c14..00000000000 --- a/src/web/app/components/status-message/status-messsage-modal/status-message-modal.component.html +++ /dev/null @@ -1,13 +0,0 @@ -
    -

    {{title}}

    - -
    -
    -

    {{subtitle}}

    -

    {{message}}

    -
    -
    - -
    diff --git a/src/web/app/components/status-message/status-messsage-modal/status-message-modal.component.scss b/src/web/app/components/status-message/status-messsage-modal/status-message-modal.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/web/app/components/status-message/status-messsage-modal/status-message-modal.component.spec.ts b/src/web/app/components/status-message/status-messsage-modal/status-message-modal.component.spec.ts deleted file mode 100644 index b3e9e65d3b1..00000000000 --- a/src/web/app/components/status-message/status-messsage-modal/status-message-modal.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { StatusMessageModalComponent } from './status-message-modal.component'; - -describe('StatusMessageModalComponent', () => { - let component: StatusMessageModalComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [StatusMessageModalComponent], - providers: [ - NgbActiveModal, - ], - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(StatusMessageModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/web/app/components/status-message/status-messsage-modal/status-message-modal.component.ts b/src/web/app/components/status-message/status-messsage-modal/status-message-modal.component.ts deleted file mode 100644 index 6d3b54f33b5..00000000000 --- a/src/web/app/components/status-message/status-messsage-modal/status-message-modal.component.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - -/** - * Modal to contain status messages. - */ -@Component({ - selector: 'tm-status-message-modal', - templateUrl: './status-message-modal.component.html', - styleUrls: ['./status-message-modal.component.scss'], -}) -export class StatusMessageModalComponent implements OnInit { - - @Input() title: string = ''; - @Input() subtitle: string = ''; - @Input() message: string = ''; - @Input() color: string = 'info'; - - constructor(public activeModal: NgbActiveModal) { } - - ngOnInit(): void { - } - -} diff --git a/src/web/app/components/status-message/status-messsage-modal/status-messsage-modal.module.ts b/src/web/app/components/status-message/status-messsage-modal/status-messsage-modal.module.ts deleted file mode 100644 index f30524368c5..00000000000 --- a/src/web/app/components/status-message/status-messsage-modal/status-messsage-modal.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { StatusMessageModalComponent } from './status-message-modal.component'; - -/** - * Module for status message modal - */ -@NgModule({ - declarations: [StatusMessageModalComponent], - imports: [ - CommonModule, - ], - exports: [ - StatusMessageModalComponent, - ], - entryComponents: [ - StatusMessageModalComponent, - ], -}) -export class StatusMesssageModalModule { } diff --git a/src/web/app/components/student-list/__snapshots__/student-list.component.spec.ts.snap b/src/web/app/components/student-list/__snapshots__/student-list.component.spec.ts.snap index a2478993ac4..0d207cd90d4 100644 --- a/src/web/app/components/student-list/__snapshots__/student-list.component.spec.ts.snap +++ b/src/web/app/components/student-list/__snapshots__/student-list.component.spec.ts.snap @@ -12,9 +12,9 @@ exports[`StudentListComponent should snap with default fields 1`] = ` isHideTableHead="false" listOfStudentsToHide={[Function Array]} navigationService={[Function NavigationService]} - ngbModal={[Function NgbModal]} removeStudentFromCourseEvent={[Function EventEmitter]} router={[Function Router]} + simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} students={[Function Array]} tableComparatorService={[Function TableComparatorService]} @@ -113,9 +113,9 @@ exports[`StudentListComponent should snap with enable remind button set to true isHideTableHead="false" listOfStudentsToHide={[Function Array]} navigationService={[Function NavigationService]} - ngbModal={[Function NgbModal]} removeStudentFromCourseEvent={[Function EventEmitter]} router={[Function Router]} + simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} students={[Function Array]} tableComparatorService={[Function TableComparatorService]} @@ -284,14 +284,12 @@ exports[`StudentListComponent should snap with enable remind button set to true - - - - Delete - Delete - - - Delete - Delete - Delete - - - - - - - - - - - - - - - - - - - - - - - - - - -

    here. -

    - -
    -
      -
    • - General Mechanism -
      - Students enter contribution estimates for themselves and their team members using the contribution scale - (see glossary). + here. + +
      +
        +
      • + General Mechanism +
        + Students enter contribution estimates for themselves and their team members using the contribution scale + (see glossary). +
        +
        Based on those values, a student's answer to the following two questions are deduced: +
        (a) In your opinion, what portion of the project did you do? +
        (b) In your opinion, if your teammates are doing the project by themselves without you, how do they compare against each other in terms of contribution? +
        +
        In the calculation, we do not allow (a) to affect (b). We use (b) to calculate the average perceived contribution for each student. +
        +

        -
        Based on those values, a student's answer to the following two questions are deduced: -
        (a) In your opinion, what portion of the project did you do? -
        (b) In your opinion, if your teammates are doing the project by themselves without you, how do they compare against each other in terms of contribution? -
        -
        In the calculation, we do not allow (a) to affect (b). We use (b) to calculate the average perceived contribution for each student. -
        -
      -
      -
      • -
    • - Calculation Scheme -
      -
        -
      1. - Calculate normalizedClaimed values -
        - This is required because the total of points entered might not sum up to 100 * (team size). -

        - (normalized value) = (original value) * (normalization factor) -

        -
        - entered values: 90 [self], 110, 130, N/A (total = 330) -
        normalization factor: (100 * 3) / (90 + 110 + 130) = 300 / 330 -
        normalized: 82, 100, 118, N/A -
        normalized total = 300 (i.e. 100 * number of inputs) +
        2. +
      2. + Calculation Scheme +
        +
          +
        1. + Calculate normalizedClaimed values +
          + This is required because the total of points entered might not sum up to 100 * (team size). +

          + (normalized value) = (original value) * (normalization factor) +

          +
          + entered values: 90 [self], 110, 130, N/A (total = 330) +
          normalization factor: (100 * 3) / (90 + 110 + 130) = 300 / 330 +
          normalized: 82, 100, 118, N/A +
          normalized total = 300 (i.e. 100 * number of inputs) +
          + This answers the question (a) above. The student thinks he did 'Equal share - 18%' (as indicated by 82). +
          +
          +
          +
          2. +
        2. + Calculate peerContributionRatio values by removing self-rating bias +
          + Here, we ignore the self rating and normalize remaining values. +

          +
          + normalized input (from above): 82,100, 118, N/A +
          Calculating unbiased values: +
           82 → ignored. +
           100 → 100 * 200 / (100 + 118) = 92 +
           118 → 118 * 200 / (100 + 118) = 108 +
          Unbiased values: [self (ignored)], 92, 108, N/A +
          Unbiased values total = 200 (100 * number of ratings) +
          + This answers the question (b) above. In the example above, the student thinks his teammates contribution ratio is 92:108 and is unsure of the third teammate. +

          +
          +
          3. +
        3. + Calculate averagePerceivedContributionRatio +
          + Next, we calculate averagePerceivedContributionRatio among team members, independent of (a). This consists of these steps: +

          +
            +
          1. + Calculate averagePerceived: +
            + For each student, take the average of peerContributionRatio that others have given him. +
            +
            +
            2. +
          2. + Calculate normalizedAveragePerceived: +
            + Normalize the averages, similar to how input was normalized. +

            + + normalizedAveragePerceived = averagePerceived * normalizationFactor +
            normalizationFactor = 100 * (number of students with averagePerceived values)/(sum of averagePerceived) +             +
            +
            This is the relative work distribution among team members based on unbiased opinions of team members. +
            +
            +
            +
            3. +
          3. + Calculate normalizedPeerContributionRatio +
            + Since we normalized the averages (in previous step), we also normalize the value that were averaged in the first place. This is such that average and averaged tallies with each other. +
            + normalizedPeerContributionRatio = peerContributionRatio * normalizationFactor +
            +
            +
            4. +
          - This answers the question (a) above. The student thinks he did 'Equal share - 18%' (as indicated by 82). -
          -
          -
        +
        3. +
      3. + Denormalize normalizedAveragePerceived +
        + For each student, denormalize normalizedAveragePerceived. We scale back to match the total of original + input by student. That way, student can compare his input (i.e., his opinion of the team’s work distribution) + with the team’s opinion. In the example used above, we should use 330/300 as the denormalizing factor for that student. + The result could be something like this: +
        +
        +
        + student’s opinion: 90 [self], 110, 130, N/A (total = 330) +
        team’s opinion : 95, 105, 125, 115 (total = 440) +
        + Value transformation steps: input (i.e. claimed) → normalizedClaimed → + peerContributionRatio → averagePerceived → + normalizedAveragePerceived → denormalizedAveragePerceived → + normalizedPeerContributionRatio +
        +
        +
        +
        4. +
      +
      + Student view: +
        +
      • + for claimed contribution, show: same as what the student entered initially (otherwise, the student will be confused as to how the value got changed)
      • - Calculate peerContributionRatio values by removing self-rating bias -
        - Here, we ignore the self rating and normalize remaining values. -

        -
        - normalized input (from above): 82,100, 118, N/A -
        Calculating unbiased values: -
         82 → ignored. -
         100 → 100 * 200 / (100 + 118) = 92 -
         118 → 118 * 200 / (100 + 118) = 108 -
        Unbiased values: [self (ignored)], 92, 108, N/A -
        Unbiased values total = 200 (100 * number of ratings) -
        - This answers the question (b) above. In the example above, the student thinks his teammates contribution ratio is 92:108 and is unsure of the third teammate. -

        -
        + for perceived contribution, show: denormalizedAveragePerceived
        • +
      +
      Instructor view: +
      • - Calculate averagePerceivedContributionRatio -
        - Next, we calculate averagePerceivedContributionRatio among team members, independent of (a). This consists of these steps: -

        -
          -
        1. - Calculate averagePerceived: -
          - For each student, take the average of peerContributionRatio that others have given him. -
          -
          -
          2. -
        2. - Calculate normalizedAveragePerceived: -
          - Normalize the averages, similar to how input was normalized. -

          - - normalizedAveragePerceived = averagePerceived * normalizationFactor -
          normalizationFactor = 100 * (number of students with averagePerceived values)/(sum of averagePerceived) -           -
          -
          This is the relative work distribution among team members based on unbiased opinions of team members. -
          -
          -
          -
          3. -
        3. - Calculate normalizedPeerContributionRatio -
          - Since we normalized the averages (in previous step), we also normalize the value that were averaged in the first place. This is such that average and averaged tallies with each other. -
          - normalizedPeerContributionRatio = peerContributionRatio * normalizationFactor -
          -
          -
          4. -
        -
        + for claimed contribution, show: normalizedClaimed
      • - Denormalize normalizedAveragePerceived -
        - For each student, denormalize normalizedAveragePerceived. We scale back to match the total of original - input by student. That way, student can compare his input (i.e., his opinion of the team’s work distribution) - with the team’s opinion. In the example used above, we should use 330/300 as the denormalizing factor for that student. - The result could be something like this: -
        -
        -
        - student’s opinion: 90 [self], 110, 130, N/A (total = 330) -
        team’s opinion : 95, 105, 125, 115 (total = 440) -
        - Value transformation steps: input (i.e. claimed) → normalizedClaimed → - peerContributionRatio → averagePerceived → - normalizedAveragePerceived → denormalizedAveragePerceived → - normalizedPeerContributionRatio -
        -
        -
        + for perceived contribution, show: normalizedAveragePerceived
        • - -
    - Student view: -
      -
    • - for claimed contribution, show: same as what the student entered initially (otherwise, the student will be confused as to how the value got changed) -
      • -
    • - for perceived contribution, show: denormalizedAveragePerceived -
      • -
    -
    Instructor view: -
      -
    • - for claimed contribution, show: normalizedClaimed -
      • -
    • - for perceived contribution, show: normalizedAveragePerceived -
      • -
    -
    Note: -
      -
    • - Scenario 1: If students give 0 points to each other, then everyone should receive Equal Share and difference should be 0. -
      • -
    • - Scenario 2: If students are not sure or do not submit the evaluation, then Perceived/Claimed for Instructor should be shown as N/A instead of Equal Share. In this case, difference too should be shown as N/A. -
      • -
    - - - -     + +
    Note: +
      +
    • + Scenario 1: If students give 0 points to each other, then everyone should receive Equal Share and difference should be 0. +
      • +
    • + Scenario 2: If students are not sure or do not submit the evaluation, then Perceived/Claimed for Instructor should be shown as N/A instead of Equal Share. In this case, difference too should be shown as N/A. +
      • +
    + + + + +

    The results and statistics are presented in the example below. Here is a summary of the terms used:

    @@ -746,21 +746,19 @@

    Setting Up Questions

    - Technical details about how ranks are calculated are available here. -

    - -
    -
      -
    • - Ranks Received is a list of the actual ranks each recipient received. TEAMMATES processes the original responses, handling ties and unused ranks. - For example, if giver A's original response is (1, 3, 3, 5) and Rank 5 is given to recipient B, after the processing, giver A's response will become (1, 2, 2, 4) and recipient B will have a Rank 4 in his/her Ranks Received, instead of the Rank 5 in the original response by giver A. -
      • -
    • - The Overall Rank ranks the average rank each recipient receives. - For example, if recipient A received the ranks (1, 2) and recipient B received the ranks (2, 4, 6), then recipient A and recipient B's average ranks are 1.5 and 4 respectively. By ranking these two averages, recipient A and B will get an Overall Rank of 1 and 2 respectively. -
      • -
    -
    + Technical details about how ranks are calculated are available here. +

    + +
      +
    • + Ranks Received is a list of the actual ranks each recipient received. TEAMMATES processes the original responses, handling ties and unused ranks. + For example, if giver A's original response is (1, 3, 3, 5) and Rank 5 is given to recipient B, after the processing, giver A's response will become (1, 2, 2, 4) and recipient B will have a Rank 4 in his/her Ranks Received, instead of the Rank 5 in the original response by giver A. +
      • +
    • + The Overall Rank ranks the average rank each recipient receives. + For example, if recipient A received the ranks (1, 2) and recipient B received the ranks (2, 4, 6), then recipient A and recipient B's average ranks are 1.5 and 4 respectively. By ranking these two averages, recipient A and B will get an Overall Rank of 1 and 2 respectively. +
      • +
    = new EventEmitter(); - constructor(private modalService: NgbModal, + constructor(private simpleModalService: SimpleModalService, private pageScrollService: PageScrollService, @Inject(DOCUMENT) private document: any) { super(); } /** - * Opens modal window. + * Opens modal for contribution info. */ - openModal(modal: any): void { - this.modalService.open(modal); + openContribInfoModal(modal: TemplateRef): void { + this.simpleModalService.openInformationModal( + 'Team contribution calculation', SimpleModalType.NEUTRAL, modal); + } + + /** + * Opens modal for rank info. + */ + openRankInfoModal(modal: TemplateRef): void { + this.simpleModalService.openInformationModal( + 'Rank calculation', SimpleModalType.NEUTRAL, modal); } ngOnInit(): void { diff --git a/src/web/app/pages-instructor/instructor-course-details-page/__snapshots__/instructor-course-details-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-course-details-page/__snapshots__/instructor-course-details-page.component.spec.ts.snap index 35171f1c9b0..f6821476046 100644 --- a/src/web/app/pages-instructor/instructor-course-details-page/__snapshots__/instructor-course-details-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-course-details-page/__snapshots__/instructor-course-details-page.component.spec.ts.snap @@ -13,6 +13,7 @@ exports[`InstructorCourseDetailsPageComponent should snap with a course with one ngbModal={[Function NgbModal]} route={[Function ActivatedRoute]} router={[Function Router]} + simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} studentService={[Function StudentService]} students={[Function Array]} @@ -161,8 +162,6 @@ exports[`InstructorCourseDetailsPageComponent should snap with a course with one to enroll students. - - `; @@ -180,6 +179,7 @@ exports[`InstructorCourseDetailsPageComponent should snap with a course with one ngbModal={[Function NgbModal]} route={[Function ActivatedRoute]} router={[Function Router]} + simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} studentService={[Function StudentService]} students={[Function Array]} @@ -516,14 +516,12 @@ exports[`InstructorCourseDetailsPageComponent should snap with a course with one - - - - `; @@ -560,6 +556,7 @@ exports[`InstructorCourseDetailsPageComponent should snap with default fields 1` ngbModal={[Function NgbModal]} route={[Function ActivatedRoute]} router={[Function Router]} + simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} studentService={[Function StudentService]} students={[Function Array]} @@ -705,8 +702,6 @@ exports[`InstructorCourseDetailsPageComponent should snap with default fields 1` to enroll students. - - `; diff --git a/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.html b/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.html index b11c43d8130..31e11066fa4 100644 --- a/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.html +++ b/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.html @@ -45,7 +45,7 @@

    Course Details

    - @@ -53,7 +53,7 @@

    Course Details

    Download Student List - @@ -75,35 +75,4 @@

    Course Details

    >
    - -
    - -

    Confirm sending join requests

    - -
    -
    - Usually, there is no need to use this feature because TEAMMATES sends an automatic invite to students at the opening - time of each session. Send a join request to all yet-to-join students in {{courseDetails.course.courseId}} anyway? -
    -
    -
    - - -
    -     - -
    - -

    Confirm Deletion

    - -
    -
    - Are you sure you want to remove all students from the course {{courseDetails.course.courseId}}? -
    -
    -
    - - -
    -
    diff --git a/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.ts b/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.ts index 57c6d2178a0..b86c675e686 100644 --- a/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.ts +++ b/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.ts @@ -5,6 +5,7 @@ import { saveAs } from 'file-saver'; import { CourseService, CourseStatistics } from '../../../services/course.service'; import { InstructorService } from '../../../services/instructor.service'; import { NavigationService } from '../../../services/navigation.service'; +import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { @@ -17,6 +18,7 @@ import { Students, } from '../../../types/api-output'; import { Intent } from '../../../types/api-request'; +import { SimpleModalType } from '../../components/simple-modal/simple-modal-type'; import { StudentListRowModel } from '../../components/student-list/student-list.component'; import { ErrorMessageOutput } from '../../error-message-output'; @@ -63,7 +65,9 @@ export class InstructorCourseDetailsPageComponent implements OnInit { constructor(private route: ActivatedRoute, private router: Router, private statusMessageService: StatusMessageService, private courseService: CourseService, - private ngbModal: NgbModal, private navigationService: NavigationService, + private ngbModal: NgbModal, + private simpleModalService: SimpleModalService, + private navigationService: NavigationService, private studentService: StudentService, private instructorService: InstructorService) { } @@ -163,6 +167,23 @@ export class InstructorCourseDetailsPageComponent implements OnInit { this.ngbModal.open(content); } + openRemindStudentModal(): void { + const modalContent: string = `Usually, there is no need to use this feature because TEAMMATES sends an automatic invite to students at the opening + time of each session. Send a join request to all yet-to-join students in ${ this.courseDetails.course.courseId } anyway?`; + this.simpleModalService.openConfirmationModal( + 'Sending join requests?', SimpleModalType.INFO, modalContent).result.then(() => { + this.remindAllStudentsFromCourse(this.courseDetails.course.courseId); + }, () => {}); + } + + openDeleteAllStudentsModal(): void { + const modalContent: string = `Are you sure you want to remove all students from the course ${ this.courseDetails.course.courseId }?`; + this.simpleModalService.openConfirmationModal( + 'Delete all students?', SimpleModalType.DANGER, modalContent).result.then(() => { + this.deleteAllStudentsFromCourse(this.courseDetails.course.courseId); + }, () => {}); + } + /** * Delete all the students in a course. */ diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/delete-instructor-confirm-model/delete-instructor-confirm-modal.component.html b/src/web/app/pages-instructor/instructor-course-edit-page/delete-instructor-confirm-model/delete-instructor-confirm-modal.component.html deleted file mode 100644 index 5006f1f22c8..00000000000 --- a/src/web/app/pages-instructor/instructor-course-edit-page/delete-instructor-confirm-model/delete-instructor-confirm-modal.component.html +++ /dev/null @@ -1,20 +0,0 @@ -
    -

    Confirm deleting instructor

    - -
    -
    - - Are you sure you want to delete your instructor role from the course {{ instructorToDelete.courseId }}? - You will not be able to access the course anymore. - - - Are you sure you want to delete the instructor {{ instructorToDelete.name }} from the course {{ instructorToDelete.courseId }}? - He/she will not be able to access the course anymore. - -
    -
    - - -
    diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/delete-instructor-confirm-model/delete-instructor-confirm-modal.component.scss b/src/web/app/pages-instructor/instructor-course-edit-page/delete-instructor-confirm-model/delete-instructor-confirm-modal.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/delete-instructor-confirm-model/delete-instructor-confirm-modal.component.spec.ts b/src/web/app/pages-instructor/instructor-course-edit-page/delete-instructor-confirm-model/delete-instructor-confirm-modal.component.spec.ts deleted file mode 100644 index ae39531bb65..00000000000 --- a/src/web/app/pages-instructor/instructor-course-edit-page/delete-instructor-confirm-model/delete-instructor-confirm-modal.component.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { DeleteInstructorConfirmModalComponent } from './delete-instructor-confirm-modal.component'; - -describe('DeleteInstructorConfirmModalComponent', () => { - let component: DeleteInstructorConfirmModalComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [DeleteInstructorConfirmModalComponent], - providers: [NgbActiveModal], - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DeleteInstructorConfirmModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/delete-instructor-confirm-model/delete-instructor-confirm-modal.component.ts b/src/web/app/pages-instructor/instructor-course-edit-page/delete-instructor-confirm-model/delete-instructor-confirm-modal.component.ts deleted file mode 100644 index e95f7f06121..00000000000 --- a/src/web/app/pages-instructor/instructor-course-edit-page/delete-instructor-confirm-model/delete-instructor-confirm-modal.component.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { Instructor, InstructorPermissionRole, JoinState } from '../../../../types/api-output'; - -/** - * Delete instructor confirm modal. - */ -@Component({ - selector: 'tm-delete-instructor-confirm-model', - templateUrl: './delete-instructor-confirm-modal.component.html', - styleUrls: ['./delete-instructor-confirm-modal.component.scss'], -}) -export class DeleteInstructorConfirmModalComponent implements OnInit { - - @Input() - instructorToDelete: Instructor = { - googleId: '', - courseId: '', - email: '', - isDisplayedToStudents: true, - displayedToStudentsAs: '', - name: '', - role: InstructorPermissionRole.INSTRUCTOR_PERMISSION_ROLE_COOWNER, - joinState: JoinState.JOINED, - }; - - @Input() - isDeletingSelf: boolean = false; - - constructor(public activeModal: NgbActiveModal) { } - - ngOnInit(): void { - } - -} diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.spec.ts b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.spec.ts index ada99e996f1..c53aa06e05a 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.spec.ts @@ -7,17 +7,11 @@ import { TeammatesCommonModule } from '../../components/teammates-common/teammat import { CustomPrivilegeSettingPanelComponent, } from './custom-privilege-setting-panel/custom-privilege-setting-panel.component'; -import { - DeleteInstructorConfirmModalComponent, -} from './delete-instructor-confirm-model/delete-instructor-confirm-modal.component'; import { InstructorCourseEditPageComponent } from './instructor-course-edit-page.component'; import { InstructorEditPanelComponent, } from './instructor-edit-panel/instructor-edit-panel.component'; import { InstructorRoleDescriptionPipe } from './instructor-edit-panel/instructor-role-description.pipe'; -import { - ResendInvitationEmailModalComponent, -} from './resend-invitation-email-modal/resend-invitation-email-modal.component'; import { ViewRolePrivilegesModalComponent } from './view-role-privileges-modal/view-role-privileges-modal.component'; describe('InstructorCourseEditPageComponent', () => { @@ -31,8 +25,6 @@ describe('InstructorCourseEditPageComponent', () => { InstructorEditPanelComponent, ViewRolePrivilegesModalComponent, InstructorRoleDescriptionPipe, - DeleteInstructorConfirmModalComponent, - ResendInvitationEmailModalComponent, CustomPrivilegeSettingPanelComponent, ], imports: [ diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.ts b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.ts index 603c1046e7b..0d23b370d76 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.ts @@ -10,6 +10,7 @@ import { CourseService } from '../../../services/course.service'; import { FeedbackSessionsService } from '../../../services/feedback-sessions.service'; import { InstructorService } from '../../../services/instructor.service'; import { NavigationService } from '../../../services/navigation.service'; +import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { TimezoneService } from '../../../services/timezone.service'; @@ -29,28 +30,17 @@ import { } from '../../../types/api-output'; import { InstructorCreateRequest, InstructorPrivilegeUpdateRequest, Intent } from '../../../types/api-request'; import { FormValidator } from '../../../types/form-validator'; +import { SimpleModalType } from '../../components/simple-modal/simple-modal-type'; import { ErrorMessageOutput } from '../../error-message-output'; -import { - CoursesSectionQuestions, -} from '../../pages-help/instructor-help-page/instructor-help-courses-section/courses-section-questions'; +import { CoursesSectionQuestions } from '../../pages-help/instructor-help-page/instructor-help-courses-section/courses-section-questions'; import { Sections } from '../../pages-help/instructor-help-page/sections'; import { InstructorOverallPermission, InstructorSectionLevelPermission, InstructorSessionLevelPermission, } from './custom-privilege-setting-panel/custom-privilege-setting-panel.component'; -import { - DeleteInstructorConfirmModalComponent, -} from './delete-instructor-confirm-model/delete-instructor-confirm-modal.component'; -import { - EditMode, InstructorEditPanel, -} from './instructor-edit-panel/instructor-edit-panel.component'; -import { - ResendInvitationEmailModalComponent, -} from './resend-invitation-email-modal/resend-invitation-email-modal.component'; -import { - ViewRolePrivilegesModalComponent, -} from './view-role-privileges-modal/view-role-privileges-modal.component'; +import { EditMode, InstructorEditPanel } from './instructor-edit-panel/instructor-edit-panel.component'; +import { ViewRolePrivilegesModalComponent } from './view-role-privileges-modal/view-role-privileges-modal.component'; interface InstructorEditPanelDetail { originalInstructor: Instructor; @@ -161,7 +151,8 @@ export class InstructorCourseEditPageComponent implements OnInit { private statusMessageService: StatusMessageService, private courseService: CourseService, private authService: AuthService, - private modalService: NgbModal) { } + private ngbModal: NgbModal, + private simpleModalService: SimpleModalService) { } ngOnInit(): void { this.route.queryParams.subscribe((queryParams: any) => { @@ -349,7 +340,7 @@ export class InstructorCourseEditPageComponent implements OnInit { * Shows the model of details permission for a role. */ viewRolePrivilegeModel(role: InstructorPermissionRole): void { - const modalRef: NgbModalRef = this.modalService.open(ViewRolePrivilegesModalComponent); + const modalRef: NgbModalRef = this.ngbModal.open(ViewRolePrivilegesModalComponent); modalRef.result.then(() => {}, () => {}); this.instructorService.loadInstructorPrivilege({ courseId: this.courseId, @@ -412,9 +403,15 @@ export class InstructorCourseEditPageComponent implements OnInit { */ deleteInstructor(index: number): void { const panelDetail: InstructorEditPanelDetail = this.instructorDetailPanels[index]; - const modalRef: NgbModalRef = this.modalService.open(DeleteInstructorConfirmModalComponent); - modalRef.componentInstance.instructorToDelete = panelDetail.originalInstructor; - modalRef.componentInstance.isDeletingSelf = panelDetail.originalInstructor.googleId === this.currInstructorGoogleId; + const isDeletingSelf: boolean = panelDetail.originalInstructor.googleId === this.currInstructorGoogleId; + const modalContent: string = isDeletingSelf ? + `Are you sure you want to delete your instructor role from the course ${ panelDetail.originalInstructor.courseId }? + You will not be able to access the course anymore.` + : `Are you sure you want to delete the instructor ${ panelDetail.originalInstructor.name } from the course ${ panelDetail.originalInstructor.courseId }? + He/she will not be able to access the course anymore.`; + const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal( + `Delete instructor ${ panelDetail.originalInstructor.name }?`, + SimpleModalType.DANGER, modalContent); modalRef.result.then(() => { this.instructorService.deleteInstructor({ @@ -439,8 +436,9 @@ export class InstructorCourseEditPageComponent implements OnInit { */ resendReminderEmail(index: number): void { const panelDetail: InstructorEditPanelDetail = this.instructorDetailPanels[index]; - const modalRef: NgbModalRef = this.modalService.open(ResendInvitationEmailModalComponent); - modalRef.componentInstance.instructorToResend = panelDetail.originalInstructor; + const modalContent: string = `Do you wish to re-send the invitation email to instructor ${ panelDetail.originalInstructor.name } from course ${ panelDetail.originalInstructor.courseId }?`; + const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal( + 'Re-send invitation email?', SimpleModalType.INFO, modalContent); modalRef.result.then(() => { this.courseService diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.module.ts b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.module.ts index 571258b1987..ba16ffde02a 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.module.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.module.ts @@ -7,15 +7,9 @@ import { TeammatesCommonModule } from '../../components/teammates-common/teammat import { CustomPrivilegeSettingPanelComponent, } from './custom-privilege-setting-panel/custom-privilege-setting-panel.component'; -import { - DeleteInstructorConfirmModalComponent, -} from './delete-instructor-confirm-model/delete-instructor-confirm-modal.component'; import { InstructorCourseEditPageComponent } from './instructor-course-edit-page.component'; import { InstructorEditPanelComponent } from './instructor-edit-panel/instructor-edit-panel.component'; import { InstructorRoleDescriptionPipe } from './instructor-edit-panel/instructor-role-description.pipe'; -import { - ResendInvitationEmailModalComponent, -} from './resend-invitation-email-modal/resend-invitation-email-modal.component'; import { ViewRolePrivilegesModalComponent } from './view-role-privileges-modal/view-role-privileges-modal.component'; const routes: Routes = [ @@ -34,8 +28,6 @@ const routes: Routes = [ InstructorEditPanelComponent, ViewRolePrivilegesModalComponent, InstructorRoleDescriptionPipe, - DeleteInstructorConfirmModalComponent, - ResendInvitationEmailModalComponent, CustomPrivilegeSettingPanelComponent, ], exports: [ @@ -50,8 +42,6 @@ const routes: Routes = [ ], entryComponents: [ ViewRolePrivilegesModalComponent, - DeleteInstructorConfirmModalComponent, - ResendInvitationEmailModalComponent, ], }) export class InstructorCourseEditPageModule { } diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.spec.ts b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.spec.ts index 3a37ca1cb0d..e67a39cd1d1 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.spec.ts @@ -6,12 +6,6 @@ import { TeammatesCommonModule } from '../../../components/teammates-common/team import { CustomPrivilegeSettingPanelComponent, } from '../custom-privilege-setting-panel/custom-privilege-setting-panel.component'; -import { - DeleteInstructorConfirmModalComponent, -} from '../delete-instructor-confirm-model/delete-instructor-confirm-modal.component'; -import { - ResendInvitationEmailModalComponent, -} from '../resend-invitation-email-modal/resend-invitation-email-modal.component'; import { ViewRolePrivilegesModalComponent } from '../view-role-privileges-modal/view-role-privileges-modal.component'; import { InstructorEditPanelComponent } from './instructor-edit-panel.component'; import { InstructorRoleDescriptionPipe } from './instructor-role-description.pipe'; @@ -27,8 +21,6 @@ describe('InstructorEditPanelComponent', () => { InstructorEditPanelComponent, ViewRolePrivilegesModalComponent, InstructorRoleDescriptionPipe, - DeleteInstructorConfirmModalComponent, - ResendInvitationEmailModalComponent, CustomPrivilegeSettingPanelComponent, ], imports: [ diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/resend-invitation-email-modal/resend-invitation-email-modal.component.html b/src/web/app/pages-instructor/instructor-course-edit-page/resend-invitation-email-modal/resend-invitation-email-modal.component.html deleted file mode 100644 index cc47be6f626..00000000000 --- a/src/web/app/pages-instructor/instructor-course-edit-page/resend-invitation-email-modal/resend-invitation-email-modal.component.html +++ /dev/null @@ -1,14 +0,0 @@ -
    -

    Confirm re-sending invitation email

    - -
    -
    - Do you wish to re-send the invitation email to instructor {{ instructorToResend.name }} from course {{ instructorToResend.courseId }}? -
    -
    - - -
    diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/resend-invitation-email-modal/resend-invitation-email-modal.component.scss b/src/web/app/pages-instructor/instructor-course-edit-page/resend-invitation-email-modal/resend-invitation-email-modal.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/resend-invitation-email-modal/resend-invitation-email-modal.component.spec.ts b/src/web/app/pages-instructor/instructor-course-edit-page/resend-invitation-email-modal/resend-invitation-email-modal.component.spec.ts deleted file mode 100644 index 8c517dc14e2..00000000000 --- a/src/web/app/pages-instructor/instructor-course-edit-page/resend-invitation-email-modal/resend-invitation-email-modal.component.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ResendInvitationEmailModalComponent } from './resend-invitation-email-modal.component'; - -describe('ResendInvitationEmailModalComponent', () => { - let component: ResendInvitationEmailModalComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ResendInvitationEmailModalComponent], - providers: [NgbActiveModal], - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ResendInvitationEmailModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/resend-invitation-email-modal/resend-invitation-email-modal.component.ts b/src/web/app/pages-instructor/instructor-course-edit-page/resend-invitation-email-modal/resend-invitation-email-modal.component.ts deleted file mode 100644 index e3e2a05eb25..00000000000 --- a/src/web/app/pages-instructor/instructor-course-edit-page/resend-invitation-email-modal/resend-invitation-email-modal.component.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { Instructor, InstructorPermissionRole, JoinState } from '../../../../types/api-output'; - -/** - * Resend invitation email modal. - */ -@Component({ - selector: 'tm-resend-invitation-email-modal', - templateUrl: './resend-invitation-email-modal.component.html', - styleUrls: ['./resend-invitation-email-modal.component.scss'], -}) -export class ResendInvitationEmailModalComponent implements OnInit { - - @Input() - instructorToResend: Instructor = { - googleId: '', - courseId: '', - email: '', - isDisplayedToStudents: true, - displayedToStudentsAs: '', - name: '', - role: InstructorPermissionRole.INSTRUCTOR_PERMISSION_ROLE_COOWNER, - joinState: JoinState.JOINED, - }; - - constructor(public activeModal: NgbActiveModal) { } - - ngOnInit(): void { - } - -} diff --git a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.html b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.html index 64171e5581a..bc33be89ae0 100644 --- a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.html +++ b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.html @@ -100,29 +100,7 @@

    Enroll Students for {{ courseid }}

    - - -
    -

    Pasting data through the context menu

    - -
    -
    - Pasting data through the context menu is not supported due to browser restrictions.
    - Please use Ctrl + V or ⌘ + V to paste your data instead. -
    -
    - - -
    -     +

    More info

    diff --git a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.ts b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.ts index a64d8bc21e2..762f825d0af 100644 --- a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.ts +++ b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.ts @@ -1,14 +1,15 @@ -import { Component, ContentChild, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; +import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { HotTableRegisterer } from '@handsontable/angular'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import Handsontable from 'handsontable'; import { CourseService } from '../../../services/course.service'; +import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { HasResponses, JoinState, Student, Students } from '../../../types/api-output'; import { StudentEnrollRequest, StudentsEnrollRequest } from '../../../types/api-request'; +import { SimpleModalType } from '../../components/simple-modal/simple-modal-type'; import { StatusMessage } from '../../components/status-message/status-message'; import { collapseAnim } from '../../components/teammates-common/collapse-anim'; import { ErrorMessageOutput } from '../../error-message-output'; @@ -39,7 +40,6 @@ export class InstructorCourseEnrollPageComponent implements OnInit { statusMessage: StatusMessage[] = []; @ViewChild('moreInfo') moreInfo?: ElementRef; - @ContentChild('pasteModalBox') pasteModalBox?: NgbModal; @Input() isNewStudentsPanelCollapsed: boolean = false; @Input() isExistingStudentsPanelCollapsed: boolean = true; @@ -74,7 +74,7 @@ export class InstructorCourseEnrollPageComponent implements OnInit { private statusMessageService: StatusMessageService, private courseService: CourseService, private studentService: StudentService, - private ngbModal: NgbModal) { } + private simpleModalService: SimpleModalService) { } ngOnInit(): void { this.route.queryParams.subscribe((queryParams: any) => { @@ -337,8 +337,11 @@ export class InstructorCourseEnrollPageComponent implements OnInit { * Shows modal box when user clicks on the 'paste' option in the * Handsontable context menu */ - showPasteModalBox(pasteModalBox: any): void { - this.ngbModal.open(pasteModalBox); + showPasteModalBox(): void { + const modalContent: string = `Pasting data through the context menu is not supported due to browser restrictions.
    + Please use Ctrl + V or ⌘ + V to paste your data instead.`; + this.simpleModalService.openInformationModal('Pasting data through the context menu', + SimpleModalType.WARNING, modalContent); } /** @@ -349,11 +352,12 @@ export class InstructorCourseEnrollPageComponent implements OnInit { this.coursePresent = true; this.courseid = courseid; if (resp.hasResponses) { - this.statusMessageService.showWarningModal('Existing feedback responses', - 'There are existing feedback responses for this course.', - 'Modifying records of enrolled students will result in some existing responses ' - + 'from those modified students to be deleted. You may wish to download the data ' - + 'before you make the changes.'); + const modalContent: string = `

    There are existing feedback responses for this course.

    + Modifying records of enrolled students will result in some existing responses + from those modified students to be deleted. You may wish to download the data + before you make the changes.`; + this.simpleModalService.openInformationModal( + 'Existing feedback responses', SimpleModalType.WARNING, modalContent); } }, (resp: ErrorMessageOutput) => { this.coursePresent = false; diff --git a/src/web/app/pages-instructor/instructor-course-student-edit-page/__snapshots__/instructor-course-student-edit-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-course-student-edit-page/__snapshots__/instructor-course-student-edit-page.component.spec.ts.snap index e8b2818549e..e88afa038a7 100644 --- a/src/web/app/pages-instructor/instructor-course-student-edit-page/__snapshots__/instructor-course-student-edit-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-course-student-edit-page/__snapshots__/instructor-course-student-edit-page.component.spec.ts.snap @@ -10,6 +10,7 @@ exports[`InstructorCourseStudentEditPageComponent should snap with default field ngbModal={[Function NgbModal]} route={[Function ActivatedRoute]} router={[Function Router]} + simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} studentService={[Function StudentService]} > @@ -28,6 +29,7 @@ exports[`InstructorCourseStudentEditPageComponent should snap with student detai ngbModal={[Function NgbModal]} route={[Function ActivatedRoute]} router={[Function Router]} + simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} student={[Function Object]} studentService={[Function StudentService]} @@ -156,7 +158,6 @@ exports[`InstructorCourseStudentEditPageComponent should snap with student detai

    -
    diff --git a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.html b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.html index d82fd815bef..3e4214d419a 100644 --- a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.html +++ b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.html @@ -4,7 +4,7 @@
    + (ngSubmit)="onSubmit(resendPastLinksModal)" [formGroup]="editForm">
    @@ -112,28 +112,6 @@


    - -
    -

    Confirm Deletion

    - -
    -
    - Editing these fields will result in some existing responses from this student to be deleted. - You may download the data before you make the changes. Are you sure you want to continue? -
    -
    - - -
    -

    Resend past links to the new email?

    diff --git a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.ts b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.ts index 55f59964818..4beda4b9f31 100644 --- a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.ts +++ b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.ts @@ -1,15 +1,17 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Subscription } from 'rxjs'; import { StatusMessageService } from '../../../services/status-message.service'; import { JoinState, MessageOutput, Student } from '../../../types/api-output'; import { StudentUpdateRequest } from '../../../types/api-request'; import { ErrorMessageOutput } from '../../error-message-output'; +import { SimpleModalService } from '../../../services/simple-modal.service'; import { StudentService } from '../../../services/student.service'; import { FormValidator } from '../../../types/form-validator'; +import { SimpleModalType } from '../../components/simple-modal/simple-modal-type'; /** * Instructor course student edit page. @@ -38,7 +40,8 @@ export class InstructorCourseStudentEditPageComponent implements OnInit, OnDestr private router: Router, private statusMessageService: StatusMessageService, private studentService: StudentService, - private ngbModal: NgbModal) { } + private ngbModal: NgbModal, + private simpleModalService: SimpleModalService) { } ngOnInit(): void { if (!this.isEnabled) { @@ -128,13 +131,19 @@ export class InstructorCourseStudentEditPageComponent implements OnInit, OnDestr * Handles logic related to showing the appropriate modal boxes * upon submission of the form. Submits the form otherwise. */ - onSubmit(confirmDelModal: any, resendPastLinksModal: any): void { + onSubmit(resendPastLinksModal: any): void { if (!this.isEnabled) { return; } if (this.isTeamnameFieldChanged) { - this.ngbModal.open(confirmDelModal); + const modalContent: string = `Editing these fields will result in some existing responses from this student to be deleted. + You may download the data before you make the changes.`; + const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal( + 'Delete existing responses?', SimpleModalType.WARNING, modalContent); + modalRef.result.then(() => { + this.deleteExistingResponses(resendPastLinksModal); + }, () => {}); } else if (this.isEmailFieldChanged) { this.ngbModal.open(resendPastLinksModal); } else { diff --git a/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap index 2dbf40374ea..22934c60d04 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap @@ -14,8 +14,8 @@ exports[`InstructorCoursesPageComponent should snap when it is undeletable and u isAddNewCourseFormExpanded="false" isArchivedCourseExpanded="false" isRecycleBinExpanded="false" - modalService={[Function NgbModal]} route={[Function ActivatedRoute]} + simpleModalService={[Function SimpleModalService]} softDeletedCourses={[Function Array]} statusMessageService={[Function StatusMessageService]} studentService={[Function StudentService]} @@ -460,8 +460,8 @@ exports[`InstructorCoursesPageComponent should snap with all courses in course s isAddNewCourseFormExpanded="false" isArchivedCourseExpanded="false" isRecycleBinExpanded="false" - modalService={[Function NgbModal]} route={[Function ActivatedRoute]} + simpleModalService={[Function SimpleModalService]} softDeletedCourses={[Function Array]} statusMessageService={[Function StatusMessageService]} studentService={[Function StudentService]} @@ -912,8 +912,8 @@ exports[`InstructorCoursesPageComponent should snap with default fields 1`] = ` isAddNewCourseFormExpanded="false" isArchivedCourseExpanded="false" isRecycleBinExpanded="false" - modalService={[Function NgbModal]} route={[Function ActivatedRoute]} + simpleModalService={[Function SimpleModalService]} softDeletedCourses={[Function Array]} statusMessageService={[Function StatusMessageService]} studentService={[Function StudentService]} @@ -954,8 +954,8 @@ exports[`InstructorCoursesPageComponent should snap with no courses in course st isAddNewCourseFormExpanded="false" isArchivedCourseExpanded="false" isRecycleBinExpanded="false" - modalService={[Function NgbModal]} route={[Function ActivatedRoute]} + simpleModalService={[Function SimpleModalService]} softDeletedCourses={[Function Array]} statusMessageService={[Function StatusMessageService]} studentService={[Function StudentService]} diff --git a/src/web/app/pages-instructor/instructor-courses-page/course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component.html b/src/web/app/pages-instructor/instructor-courses-page/course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component.html deleted file mode 100644 index 621a15914db..00000000000 --- a/src/web/app/pages-instructor/instructor-courses-page/course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component.html +++ /dev/null @@ -1,27 +0,0 @@ -
    -
    -
    Confirm deleting all courses
    -
    -
    -
    Confirm deleting a course
    -
    - -
    -
    - Are you sure you want to permanently delete all the courses in the Recycle Bin? -
    - This operation will delete all students and sessions in these courses. - All instructors of these courses will not be able to access them hereafter as well. -
    -
    - Are you sure you want to permanently delete {{courseId}}? -
    - This operation will delete all students and sessions in this course. - All instructors of this course will not be able to access them hereafter as well. -
    -
    - - -
    diff --git a/src/web/app/pages-instructor/instructor-courses-page/course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component.scss b/src/web/app/pages-instructor/instructor-courses-page/course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/web/app/pages-instructor/instructor-courses-page/course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component.spec.ts b/src/web/app/pages-instructor/instructor-courses-page/course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component.spec.ts deleted file mode 100644 index ab3d678223e..00000000000 --- a/src/web/app/pages-instructor/instructor-courses-page/course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { CoursePermanentDeletionConfirmModalComponent } from './course-permanent-deletion-confirm-modal.component'; - -describe('CoursePermanentDeletionConfirmModalComponent', () => { - let component: CoursePermanentDeletionConfirmModalComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [CoursePermanentDeletionConfirmModalComponent], - providers: [NgbActiveModal], - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(CoursePermanentDeletionConfirmModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/web/app/pages-instructor/instructor-courses-page/course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component.ts b/src/web/app/pages-instructor/instructor-courses-page/course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component.ts deleted file mode 100644 index e2b9535a1d8..00000000000 --- a/src/web/app/pages-instructor/instructor-courses-page/course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - -/** - * Modal to confirm permanent deletion of one course or all courses in the Recycle Bin. - */ -@Component({ - selector: 'tm-course-permanent-deletion-confirm-modal', - templateUrl: './course-permanent-deletion-confirm-modal.component.html', - styleUrls: ['./course-permanent-deletion-confirm-modal.component.scss'], -}) -export class CoursePermanentDeletionConfirmModalComponent implements OnInit { - - @Input() - courseId: string = ''; - - @Input() - isDeleteAll: boolean = false; - - constructor(public activeModal: NgbActiveModal) { } - - ngOnInit(): void { - } - -} diff --git a/src/web/app/pages-instructor/instructor-courses-page/course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component.html b/src/web/app/pages-instructor/instructor-courses-page/course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component.html deleted file mode 100644 index 63dfdde2701..00000000000 --- a/src/web/app/pages-instructor/instructor-courses-page/course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component.html +++ /dev/null @@ -1,13 +0,0 @@ -
    -
    Warning: The course will be moved to the recycle bin.
    - -
    -
    - Are you sure you want to continue? -
    -
    - - -
    diff --git a/src/web/app/pages-instructor/instructor-courses-page/course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component.scss b/src/web/app/pages-instructor/instructor-courses-page/course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/web/app/pages-instructor/instructor-courses-page/course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component.spec.ts b/src/web/app/pages-instructor/instructor-courses-page/course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component.spec.ts deleted file mode 100644 index 37151160c1a..00000000000 --- a/src/web/app/pages-instructor/instructor-courses-page/course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { CourseSoftDeletionConfirmModalComponent } from './course-soft-deletion-confirm-modal.component'; - -describe('CourseSoftDeletionConfirmModalComponent', () => { - let component: CourseSoftDeletionConfirmModalComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [CourseSoftDeletionConfirmModalComponent], - providers: [NgbActiveModal], - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(CourseSoftDeletionConfirmModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/web/app/pages-instructor/instructor-courses-page/course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component.ts b/src/web/app/pages-instructor/instructor-courses-page/course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component.ts deleted file mode 100644 index 52d35c50fc8..00000000000 --- a/src/web/app/pages-instructor/instructor-courses-page/course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - -/** - * Modal to confirm soft deletion of a course. - */ -@Component({ - selector: 'tm-course-soft-deletion-confirm-modal', - templateUrl: './course-soft-deletion-confirm-modal.component.html', - styleUrls: ['./course-soft-deletion-confirm-modal.component.scss'], -}) -export class CourseSoftDeletionConfirmModalComponent implements OnInit { - - constructor(public activeModal: NgbActiveModal) { } - - ngOnInit(): void { - } - -} diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts index 55c51ff975b..52fd2370541 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts @@ -1,9 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { forkJoin, Observable } from 'rxjs'; import { CourseService } from '../../../services/course.service'; import { InstructorService } from '../../../services/instructor.service'; +import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { TableComparatorService } from '../../../services/table-comparator.service'; @@ -18,10 +19,9 @@ import { Students, } from '../../../types/api-output'; import { SortBy, SortOrder } from '../../../types/sort-properties'; +import { SimpleModalType } from '../../components/simple-modal/simple-modal-type'; import { collapseAnim } from '../../components/teammates-common/collapse-anim'; import { ErrorMessageOutput } from '../../error-message-output'; -import { CoursePermanentDeletionConfirmModalComponent } from './course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component'; -import { CourseSoftDeletionConfirmModalComponent } from './course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component'; interface CourseModel { course: Course; @@ -63,7 +63,7 @@ export class InstructorCoursesPageComponent implements OnInit { private courseService: CourseService, private studentService: StudentService, private instructorService: InstructorService, - private modalService: NgbModal, + private simpleModalService: SimpleModalService, private tableComparatorService: TableComparatorService) { } ngOnInit(): void { @@ -235,7 +235,8 @@ export class InstructorCoursesPageComponent implements OnInit { this.statusMessageService.showErrorToast(`Course ${courseId} is not found!`); return; } - const modalRef: NgbModalRef = this.modalService.open(CourseSoftDeletionConfirmModalComponent); + const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal('Warning: The course will be moved to the recycle bin.', + SimpleModalType.WARNING, 'Are you sure you want to continue?'); modalRef.result.then(() => { this.courseService.binCourse(courseId).subscribe((course: Course) => { this.moveCourseToRecycleBin(courseId, course.deletionTimestamp); @@ -275,7 +276,12 @@ export class InstructorCoursesPageComponent implements OnInit { this.statusMessageService.showErrorToast(`Course ${courseId} is not found!`); return; } - const modalRef: NgbModalRef = this.modalService.open(CoursePermanentDeletionConfirmModalComponent); + const modalContent: string = `Are you sure you want to permanently delete ${courseId}?
    + This operation will delete all students and sessions in these courses. + All instructors of these courses will not be able to access them hereafter as well.`; + + const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal( + `Delete course ${ courseId } permanently?`, SimpleModalType.DANGER, modalContent); modalRef.componentInstance.courseId = courseId; modalRef.result.then(() => { this.courseService.deleteCourse(courseId).subscribe(() => { @@ -308,8 +314,12 @@ export class InstructorCoursesPageComponent implements OnInit { * Permanently deletes all soft-deleted courses in Recycle Bin. */ onDeleteAll(): void { - const modalRef: NgbModalRef = this.modalService.open(CoursePermanentDeletionConfirmModalComponent); - modalRef.componentInstance.isDeleteAll = true; + const modalContent: string = `Are you sure you want to permanently delete all the courses in the Recycle Bin?
    + This operation will delete all students and sessions in these courses. + All instructors of these courses will not be able to access them hereafter as well.`; + + const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal( + 'Deleting all courses permanently?', SimpleModalType.DANGER, modalContent); modalRef.result.then(() => { const deleteRequests: Observable[] = []; this.softDeletedCourses.forEach((courseToDelete: CourseModel) => { diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.module.ts b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.module.ts index d791a89700b..0f8265ff95b 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.module.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.module.ts @@ -4,12 +4,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { AddCourseFormModule } from './add-course-form/add-course-form.module'; -import { - CoursePermanentDeletionConfirmModalComponent, -} from './course-permanent-deletion-confirm-modal/course-permanent-deletion-confirm-modal.component'; -import { - CourseSoftDeletionConfirmModalComponent, -} from './course-soft-deletion-confirm-modal/course-soft-deletion-confirm-modal.component'; import { InstructorCoursesPageComponent } from './instructor-courses-page.component'; const routes: Routes = [ @@ -25,8 +19,6 @@ const routes: Routes = [ @NgModule({ declarations: [ InstructorCoursesPageComponent, - CourseSoftDeletionConfirmModalComponent, - CoursePermanentDeletionConfirmModalComponent, ], exports: [ InstructorCoursesPageComponent, @@ -40,9 +32,5 @@ const routes: Routes = [ NgbTooltipModule, AddCourseFormModule, ], - entryComponents: [ - CourseSoftDeletionConfirmModalComponent, - CoursePermanentDeletionConfirmModalComponent, - ], }) export class InstructorCoursesPageModule { } diff --git a/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap index e0ffde2012c..bc9fc4767fe 100644 --- a/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap @@ -14,10 +14,10 @@ exports[`InstructorHomePageComponent should snap with default fields 1`] = ` instructorService={[Function InstructorService]} isNewUser="false" loadingBarService={[Function LoadingBarService]} - modalService={[Function NgbModal]} navigationService={[Function NavigationService]} ngbModal={[Function NgbModal]} router={[Function Router]} + simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} studentSearchkey="" studentService={[Function StudentService]} @@ -87,10 +87,10 @@ exports[`InstructorHomePageComponent should snap with one course with error load instructorService={[Function InstructorService]} isNewUser="false" loadingBarService={[Function LoadingBarService]} - modalService={[Function NgbModal]} navigationService={[Function NavigationService]} ngbModal={[Function NgbModal]} router={[Function Router]} + simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} studentSearchkey="" studentService={[Function StudentService]} @@ -206,8 +206,6 @@ exports[`InstructorHomePageComponent should snap with one course with error load
    - -
    - -
    - -
    - -
    @@ -1713,10 +1705,10 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate instructorService={[Function InstructorService]} isNewUser="false" loadingBarService={[Function LoadingBarService]} - modalService={[Function NgbModal]} navigationService={[Function NavigationService]} ngbModal={[Function NgbModal]} router={[Function Router]} + simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} studentSearchkey="" studentService={[Function StudentService]} @@ -1977,8 +1969,6 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate
    - -
    - -
    Home @@ -109,38 +109,6 @@

    Home

    Error loading feedback sessions. Click here to retry. - -
    -
    Warning: Confirm moving course to Recycle Bin
    - -
    -
    - Are you sure you want to delete the course: {{courseTabModel.course.courseId}}? - This action can be reverted by going to the "Courses" tab and restoring the desired course(s). -
    -
    - - -
    -     - -
    -
    Confirm archiving course
    - -
    -
    - Are you sure you want to archive {{courseTabModel.course.courseId}}? - This action can be reverted by going to the "Courses" tab and unarchiving the desired course(s). -
    -
    - - -
    -
    { - this.courseTabModels = this.courseTabModels.filter((model: CourseTabModel) => { - return model.course.courseId !== courseId; + const modalContent: string = 'This action can be reverted by going to the "Courses" tab and unarchiving the desired course(s).'; + + const modalRef: NgbModalRef = + this.simpleModalService.openConfirmationModal( + `Archive course ${courseId}?`, SimpleModalType.INFO, modalContent); + modalRef.result.then(() => { + this.courseService.changeArchiveStatus(courseId, { + archiveStatus: true, + }).subscribe((courseArchive: CourseArchive) => { + this.courseTabModels = this.courseTabModels.filter((model: CourseTabModel) => { + return model.course.courseId !== courseId; + }); + this.statusMessageService.showSuccessToast(`The course ${courseArchive.courseId} has been archived. + You can retrieve it from the Courses page.`); + }, (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); }); - this.statusMessageService.showSuccessToast(`The course ${courseArchive.courseId} has been archived. - You can retrieve it from the Courses page.`); - }, (resp: ErrorMessageOutput) => { - this.statusMessageService.showErrorToast(resp.error.message); - }); + }, () => {}); } /** * Deletes the entire course from the instructor */ deleteCourse(courseId: string): void { - this.courseService.binCourse(courseId).subscribe((course: Course) => { - this.courseTabModels = this.courseTabModels.filter((model: CourseTabModel) => { - return model.course.courseId !== courseId; + const modalContent: string = 'This action can be reverted by going to the "Courses" tab and restoring the desired course(s).'; + + const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal( + `Move course ${courseId} to Recycle Bin`, SimpleModalType.WARNING, modalContent); + modalRef.result.then(() => { + this.courseService.binCourse(courseId).subscribe((course: Course) => { + this.courseTabModels = this.courseTabModels.filter((model: CourseTabModel) => { + return model.course.courseId !== courseId; + }); + this.statusMessageService.showSuccessToast( + `The course ${course.courseId} has been deleted. You can restore it from the Recycle Bin manually.`); + }, (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); }); - this.statusMessageService.showSuccessToast( - `The course ${course.courseId} has been deleted. You can restore it from the Recycle Bin manually.`); - }, (resp: ErrorMessageOutput) => { - this.statusMessageService.showErrorToast(resp.error.message); - }); + }, () => {}); } /** * Loads courses of current instructor. diff --git a/src/web/app/pages-instructor/instructor-search-page/__snapshots__/instructor-search-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-search-page/__snapshots__/instructor-search-page.component.spec.ts.snap index 26b1eb11d39..eccc1ed73f9 100644 --- a/src/web/app/pages-instructor/instructor-search-page/__snapshots__/instructor-search-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-search-page/__snapshots__/instructor-search-page.component.spec.ts.snap @@ -395,14 +395,12 @@ exports[`InstructorSearchPageComponent should snap with a student table 1`] = ` - - - - - - - -   - +
    - -
    -
    Warning: Unsaved field(s).
    - -
    -
    -

    There exists unsaved field(s), this operation will cause all the changes to be lost.

    -

    Are you sure you want to continue?

    -
    -
    - - -
    -     diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts index 32899bfdc69..e515bf5a88f 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts @@ -10,6 +10,7 @@ import { FeedbackQuestionsService, NewQuestionModel } from '../../../services/fe import { FeedbackSessionsService } from '../../../services/feedback-sessions.service'; import { InstructorService } from '../../../services/instructor.service'; import { NavigationService } from '../../../services/navigation.service'; +import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { TableComparatorService } from '../../../services/table-comparator.service'; @@ -48,14 +49,11 @@ import { SessionEditFormModel, TimeFormat, } from '../../components/session-edit-form/session-edit-form-model'; +import { SimpleModalType } from '../../components/simple-modal/simple-modal-type'; import { ErrorMessageOutput } from '../../error-message-output'; import { InstructorSessionBasePageComponent } from '../instructor-session-base-page.component'; -import { - QuestionToCopyCandidate, -} from './copy-questions-from-other-sessions-modal/copy-questions-from-other-sessions-modal-model'; -import { - CopyQuestionsFromOtherSessionsModalComponent, -} from './copy-questions-from-other-sessions-modal/copy-questions-from-other-sessions-modal.component'; +import { QuestionToCopyCandidate } from './copy-questions-from-other-sessions-modal/copy-questions-from-other-sessions-modal-model'; +import { CopyQuestionsFromOtherSessionsModalComponent } from './copy-questions-from-other-sessions-modal/copy-questions-from-other-sessions-modal.component'; import { TemplateQuestionModalComponent } from './template-question-modal/template-question-modal.component'; /** @@ -180,7 +178,8 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag private courseService: CourseService, private route: ActivatedRoute, private timezoneService: TimezoneService, - private modalService: NgbModal, + private ngbModal: NgbModal, + private simpleModalService: SimpleModalService, private changeDetectorRef: ChangeDetectorRef) { super(router, instructorService, statusMessageService, navigationService, feedbackSessionsService, feedbackQuestionsService, tableComparatorService); @@ -227,7 +226,7 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag // load course candidates first this.courseService.getInstructorCoursesThatAreActive() .subscribe((courses: Courses) => { - const modalRef: NgbModalRef = this.modalService.open(CopySessionModalComponent); + const modalRef: NgbModalRef = this.ngbModal.open(CopySessionModalComponent); modalRef.componentInstance.newFeedbackSessionName = this.feedbackSessionName; modalRef.componentInstance.courseCandidates = courses.courses; modalRef.componentInstance.sessionToCopyCourseId = this.courseId; @@ -648,7 +647,7 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag * Handles display of template question modal. */ templateQuestionModalHandler(): void { - this.modalService.open(TemplateQuestionModalComponent).result.then((questions: FeedbackQuestion[]) => { + this.ngbModal.open(TemplateQuestionModalComponent).result.then((questions: FeedbackQuestion[]) => { let questionNumber: number = this.questionEditFormModels.length; // append the questions at the end of(...questions).pipe( concatMap((question: FeedbackQuestion) => { @@ -796,7 +795,7 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag ).subscribe((questionToCopyCandidate: QuestionToCopyCandidate[]) => { questionToCopyCandidates.push(...questionToCopyCandidate); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }, () => { - const ref: NgbModalRef = this.modalService.open(CopyQuestionsFromOtherSessionsModalComponent); + const ref: NgbModalRef = this.ngbModal.open(CopyQuestionsFromOtherSessionsModalComponent); ref.componentInstance.questionToCopyCandidates = questionToCopyCandidates; ref.result.then((questionsToCopy: FeedbackQuestion[]) => { @@ -833,12 +832,15 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag /** * Handles 'Done Editing' click event. */ - doneEditingHandler(modal: any): void { + doneEditingHandler(): void { if (this.questionEditFormModels.some((q: QuestionEditFormModel) => q.isEditable) || this.sessionEditFormModel.isEditable) { - this.modalService.open(modal).result.then(() => { - this.router.navigateByUrl('/web/instructor/sessions'); - }, () => {}); + const modalContent: string = `

    There exists unsaved field(s), this operation will cause all the changes to be lost.

    +

    Are you sure you want to continue?

    `; + this.simpleModalService.openConfirmationModal( + 'Discard unsaved field(s)?', SimpleModalType.WARNING, modalContent).result.then(() => { + this.router.navigateByUrl('/web/instructor/sessions'); + }, () => {}); } else { this.router.navigateByUrl('/web/instructor/sessions'); } diff --git a/src/web/app/pages-instructor/instructor-session-modal-page.component.ts b/src/web/app/pages-instructor/instructor-session-modal-page.component.ts index 8b8635d2e69..b3ac40e330a 100644 --- a/src/web/app/pages-instructor/instructor-session-modal-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-modal-page.component.ts @@ -41,7 +41,7 @@ export abstract class InstructorSessionModalPageComponent extends InstructorSess feedbackSessionsService: FeedbackSessionsService, feedbackQuestionsService: FeedbackQuestionsService, tableComparatorService: TableComparatorService, - protected modalService: NgbModal, + protected ngbModal: NgbModal, protected studentService: StudentService) { super(router, instructorService, statusMessageService, navigationService, feedbackSessionsService, feedbackQuestionsService, tableComparatorService); @@ -55,7 +55,7 @@ export abstract class InstructorSessionModalPageComponent extends InstructorSess const feedbackSessionName: string = model.feedbackSession.feedbackSessionName; this.studentService.getStudentsFromCourse({ courseId }).subscribe((students: Students) => { - const modalRef: NgbModalRef = this.modalService.open(ResendResultsLinkToStudentModalComponent); + const modalRef: NgbModalRef = this.ngbModal.open(ResendResultsLinkToStudentModalComponent); modalRef.componentInstance.courseId = courseId; modalRef.componentInstance.feedbackSessionName = feedbackSessionName; @@ -96,7 +96,7 @@ export abstract class InstructorSessionModalPageComponent extends InstructorSess const students: Student[] = (result[0] as Students).students; const giverSet: Set = new Set((result[1] as FeedbackSessionSubmittedGiverSet).giverIdentifiers); - const modalRef: NgbModalRef = this.modalService.open(SendRemindersToStudentModalComponent); + const modalRef: NgbModalRef = this.ngbModal.open(SendRemindersToStudentModalComponent); modalRef.componentInstance.courseId = courseId; modalRef.componentInstance.feedbackSessionName = feedbackSessionName; diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.ts b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.ts index db59291bd71..fc2b27f1e2c 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.ts +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-no-response-panel.component.ts @@ -53,7 +53,7 @@ export class InstructorSessionNoResponsePanelComponent implements OnInit, OnChan @Output() studentsToRemindEvent: EventEmitter = new EventEmitter(); constructor( - private modalService: NgbModal) { } + private ngbModal: NgbModal) { } ngOnInit(): void { this.filterStudentsBySection(); @@ -81,7 +81,7 @@ export class InstructorSessionNoResponsePanelComponent implements OnInit, OnChan const nonResponseStudentEmails: string[] = this.noResponseStudents.map((student: Student) => student.email); const nonResponseStudentEmailSet: Set = new Set(nonResponseStudentEmails); - const modalRef: NgbModalRef = this.modalService.open(SendRemindersToStudentModalComponent); + const modalRef: NgbModalRef = this.ngbModal.open(SendRemindersToStudentModalComponent); modalRef.componentInstance.courseId = courseId; modalRef.componentInstance.feedbackSessionName = feedbackSessionName; modalRef.componentInstance.studentListInfoTableRowModels diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts index e3727cc8af0..4f444b71360 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { saveAs } from 'file-saver'; import { Observable } from 'rxjs'; import { CourseService } from '../../../services/course.service'; @@ -8,6 +8,7 @@ import { FeedbackQuestionsService } from '../../../services/feedback-questions.s import { FeedbackResponseCommentService } from '../../../services/feedback-response-comment.service'; import { FeedbackSessionsService } from '../../../services/feedback-sessions.service'; import { InstructorService } from '../../../services/instructor.service'; +import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { TableComparatorService } from '../../../services/table-comparator.service'; @@ -29,16 +30,8 @@ import { import { Intent } from '../../../types/api-request'; import { CommentToCommentRowModelPipe } from '../../components/comment-box/comment-to-comment-row-model.pipe'; import { CommentsToCommentTableModelPipe } from '../../components/comment-box/comments-to-comment-table-model.pipe'; -import { - ConfirmPublishingSessionModalComponent, -} from '../../components/sessions-table/confirm-publishing-session-modal/confirm-publishing-session-modal.component'; -import { - ConfirmUnpublishingSessionModalComponent, -// tslint:disable-next-line:max-line-length -} from '../../components/sessions-table/confirm-unpublishing-session-modal/confirm-unpublishing-session-modal.component'; -import { - StudentListInfoTableRowModel, -} from '../../components/sessions-table/student-list-info-table/student-list-info-table-model'; +import { StudentListInfoTableRowModel } from '../../components/sessions-table/student-list-info-table/student-list-info-table-model'; +import { SimpleModalType } from '../../components/simple-modal/simple-modal-type'; import { ErrorMessageOutput } from '../../error-message-output'; import { InstructorCommentsComponent } from '../instructor-comments.component'; import { InstructorSessionNoResponsePanelComponent } from './instructor-session-no-response-panel.component'; @@ -116,7 +109,7 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp private instructorService: InstructorService, private route: ActivatedRoute, private timezoneService: TimezoneService, - private modalService: NgbModal, + private simpleModalService: SimpleModalService, private router: Router, private commentsToCommentTableModel: CommentsToCommentTableModelPipe, statusMessageService: StatusMessageService, @@ -320,9 +313,19 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp */ publishResultHandler(): void { const isPublished: boolean = this.session.publishStatus === FeedbackSessionPublishStatus.PUBLISHED; - const modalRef: NgbModalRef = this.modalService.open(isPublished ? ConfirmUnpublishingSessionModalComponent : - ConfirmPublishingSessionModalComponent); - modalRef.componentInstance.feedbackSessionName = this.session.feedbackSessionName; + let modalRef: NgbModalRef; + if (isPublished) { + const modalContent: string = `An email will be sent to students to inform them that the session has been unpublished and the session responses + will no longer be viewable by students.`; + modalRef = this.simpleModalService.openConfirmationModal( + `Unpublish this session ${ this.session.feedbackSessionName }?`, + SimpleModalType.WARNING, modalContent); + } else { + const modalContent: string = 'An email will be sent to students to inform them that the responses are ready for viewing.'; + modalRef = this.simpleModalService.openConfirmationModal( + `Publish this session ${ this.session.feedbackSessionName }?`, + SimpleModalType.WARNING, modalContent); + } modalRef.result.then(() => { const response: Observable = isPublished ? diff --git a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts index 02cd376f3ca..adfe8d3f95a 100644 --- a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts +++ b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts @@ -137,15 +137,15 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC navigationService: NavigationService, feedbackSessionsService: FeedbackSessionsService, feedbackQuestionsService: FeedbackQuestionsService, - modalService: NgbModal, + ngbModalService: NgbModal, studentService: StudentService, instructorService: InstructorService, tableComparatorService: TableComparatorService, private courseService: CourseService, private route: ActivatedRoute, private timezoneService: TimezoneService) { - super(router, instructorService, statusMessageService, navigationService, - feedbackSessionsService, feedbackQuestionsService, tableComparatorService, modalService, studentService); + super(router, instructorService, statusMessageService, navigationService, feedbackSessionsService, + feedbackQuestionsService, tableComparatorService, ngbModalService, studentService); } ngOnInit(): void { @@ -164,7 +164,7 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC * Copies from other sessions. */ copyFromOtherSessionsHandler(): void { - const modalRef: NgbModalRef = this.modalService.open(CopyFromOtherSessionsModalComponent); + const modalRef: NgbModalRef = this.ngbModal.open(CopyFromOtherSessionsModalComponent); // select the current course Id. modalRef.componentInstance.copyToCourseId = this.sessionEditFormModel.courseId; @@ -561,7 +561,7 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC * Deletes the feedback session permanently. */ permanentDeleteSession(model: RecycleBinFeedbackSessionRowModel): void { - const modalRef: NgbModalRef = this.modalService.open(SessionPermanentDeletionConfirmModalComponent); + const modalRef: NgbModalRef = this.ngbModal.open(SessionPermanentDeletionConfirmModalComponent); modalRef.componentInstance.courseId = model.feedbackSession.courseId; modalRef.componentInstance.feedbackSessionName = model.feedbackSession.feedbackSessionName; @@ -583,7 +583,7 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC * Deletes all feedback sessions in the recycle bin permanently. */ permanentDeleteAllSessions(): void { - const modalRef: NgbModalRef = this.modalService.open(SessionsPermanentDeletionConfirmModalComponent); + const modalRef: NgbModalRef = this.ngbModal.open(SessionsPermanentDeletionConfirmModalComponent); modalRef.componentInstance.sessionsToDelete = this.recycleBinFeedbackSessionRowModels.map( (model: RecycleBinFeedbackSessionRowModel) => model.feedbackSession); diff --git a/src/web/app/pages-instructor/student-profile/more-info/more-info.component.html b/src/web/app/pages-instructor/student-profile/more-info/more-info.component.html index e8c77a5bc9e..6edcd42b303 100644 --- a/src/web/app/pages-instructor/student-profile/more-info/more-info.component.html +++ b/src/web/app/pages-instructor/student-profile/more-info/more-info.component.html @@ -1,25 +1,10 @@ Not Specified - -
    -

    {{studentName}}'s Profile - More Info

    - -
    -
    - -

    - {{moreInfoText}} -

    -
    -
    - -
    -
    + (click)="openMoreInfoModal()" *ngIf="moreInfoText">

    More Info:

    diff --git a/src/web/app/pages-instructor/student-profile/more-info/more-info.component.ts b/src/web/app/pages-instructor/student-profile/more-info/more-info.component.ts index 146c9e1caf9..77f3aa8f6a0 100644 --- a/src/web/app/pages-instructor/student-profile/more-info/more-info.component.ts +++ b/src/web/app/pages-instructor/student-profile/more-info/more-info.component.ts @@ -1,5 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { SimpleModalService } from '../../../../services/simple-modal.service'; +import { SimpleModalType } from '../../../components/simple-modal/simple-modal-type'; /** * More info box and dialog @@ -14,7 +15,7 @@ export class MoreInfoComponent implements OnInit { @Input() studentName: string = ''; @Input() moreInfoText: string = ''; - constructor(private ngbModal: NgbModal) { } + constructor(private simpleModalService: SimpleModalService) { } ngOnInit(): void { } @@ -22,8 +23,10 @@ export class MoreInfoComponent implements OnInit { /** * Open the more info modal. */ - openModal(content: any): void { - this.ngbModal.open(content); + openMoreInfoModal(): void { + this.simpleModalService + .openInformationModal(`${this.studentName}\'s Profile - More Info`, SimpleModalType.NEUTRAL, + this.moreInfoText, { confirmMessage: 'Close' }); } } diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-closed-modal/feedback-session-closed-modal.component.html b/src/web/app/pages-session/session-submission-page/feedback-session-closed-modal/feedback-session-closed-modal.component.html deleted file mode 100644 index 9714be58745..00000000000 --- a/src/web/app/pages-session/session-submission-page/feedback-session-closed-modal/feedback-session-closed-modal.component.html +++ /dev/null @@ -1,14 +0,0 @@ -

    -

    Feedback Session Closed

    - -
    -
    -

    Feedback Session is Closed

    -

    You can view the questions and any submitted responses - for this feedback session but cannot submit new responses.

    -
    -
    - -
    diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-closed-modal/feedback-session-closed-modal.component.scss b/src/web/app/pages-session/session-submission-page/feedback-session-closed-modal/feedback-session-closed-modal.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-closed-modal/feedback-session-closed-modal.component.spec.ts b/src/web/app/pages-session/session-submission-page/feedback-session-closed-modal/feedback-session-closed-modal.component.spec.ts deleted file mode 100644 index 0d0fd0e1e2b..00000000000 --- a/src/web/app/pages-session/session-submission-page/feedback-session-closed-modal/feedback-session-closed-modal.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { FeedbackSessionClosedModalComponent } from './feedback-session-closed-modal.component'; - -describe('FeedbackSessionClosedModalComponent', () => { - let component: FeedbackSessionClosedModalComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [FeedbackSessionClosedModalComponent], - providers: [ - NgbActiveModal, - ], - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(FeedbackSessionClosedModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-closed-modal/feedback-session-closed-modal.component.ts b/src/web/app/pages-session/session-submission-page/feedback-session-closed-modal/feedback-session-closed-modal.component.ts deleted file mode 100644 index 34ecad0e2f4..00000000000 --- a/src/web/app/pages-session/session-submission-page/feedback-session-closed-modal/feedback-session-closed-modal.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - -/** - * Modal to alert that a feedback session is closed. - */ -@Component({ - selector: 'tm-feedback-session-closed-modal', - templateUrl: './feedback-session-closed-modal.component.html', - styleUrls: ['./feedback-session-closed-modal.component.scss'], -}) -export class FeedbackSessionClosedModalComponent implements OnInit { - - constructor(public activeModal: NgbActiveModal) {} - - ngOnInit(): void { - } - -} diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-closing-soon-modal/feedback-session-closing-soon-modal.component.html b/src/web/app/pages-session/session-submission-page/feedback-session-closing-soon-modal/feedback-session-closing-soon-modal.component.html deleted file mode 100644 index 4329a9b79a9..00000000000 --- a/src/web/app/pages-session/session-submission-page/feedback-session-closing-soon-modal/feedback-session-closing-soon-modal.component.html +++ /dev/null @@ -1,12 +0,0 @@ -
    -

    Feedback Session Will Be Closing Soon!

    - -
    -
    -

    Warning: you have less than 15 minutes before the submission deadline expires!

    -
    -
    - -
    diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-closing-soon-modal/feedback-session-closing-soon-modal.component.scss b/src/web/app/pages-session/session-submission-page/feedback-session-closing-soon-modal/feedback-session-closing-soon-modal.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-closing-soon-modal/feedback-session-closing-soon-modal.component.spec.ts b/src/web/app/pages-session/session-submission-page/feedback-session-closing-soon-modal/feedback-session-closing-soon-modal.component.spec.ts deleted file mode 100644 index a61e1f05930..00000000000 --- a/src/web/app/pages-session/session-submission-page/feedback-session-closing-soon-modal/feedback-session-closing-soon-modal.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { FeedbackSessionClosingSoonModalComponent } from './feedback-session-closing-soon-modal.component'; - -describe('FeedbackSessionClosingSoonModalComponent', () => { - let component: FeedbackSessionClosingSoonModalComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [FeedbackSessionClosingSoonModalComponent], - providers: [ - NgbActiveModal, - ], - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(FeedbackSessionClosingSoonModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-closing-soon-modal/feedback-session-closing-soon-modal.component.ts b/src/web/app/pages-session/session-submission-page/feedback-session-closing-soon-modal/feedback-session-closing-soon-modal.component.ts deleted file mode 100644 index bbf630a082f..00000000000 --- a/src/web/app/pages-session/session-submission-page/feedback-session-closing-soon-modal/feedback-session-closing-soon-modal.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - -/** - * Modal to alert that a feedback session is closing soon. - */ -@Component({ - selector: 'tm-feedback-session-closing-soon-modal', - templateUrl: './feedback-session-closing-soon-modal.component.html', - styleUrls: ['./feedback-session-closing-soon-modal.component.scss'], -}) -export class FeedbackSessionClosingSoonModalComponent implements OnInit { - - constructor(public activeModal: NgbActiveModal) {} - - ngOnInit(): void { - } - -} diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-deleted-modal/feedback-session-deleted-modal.component.html b/src/web/app/pages-session/session-submission-page/feedback-session-deleted-modal/feedback-session-deleted-modal.component.html deleted file mode 100644 index 0d0529f4d68..00000000000 --- a/src/web/app/pages-session/session-submission-page/feedback-session-deleted-modal/feedback-session-deleted-modal.component.html +++ /dev/null @@ -1,12 +0,0 @@ -
    -

    Feedback Session Deleted!

    - -
    -
    -

    The feedback session has been permanently deleted and is no longer accessible.

    -
    -
    - -
    diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-deleted-modal/feedback-session-deleted-modal.component.scss b/src/web/app/pages-session/session-submission-page/feedback-session-deleted-modal/feedback-session-deleted-modal.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-deleted-modal/feedback-session-deleted-modal.component.spec.ts b/src/web/app/pages-session/session-submission-page/feedback-session-deleted-modal/feedback-session-deleted-modal.component.spec.ts deleted file mode 100644 index 2a2e563f5c1..00000000000 --- a/src/web/app/pages-session/session-submission-page/feedback-session-deleted-modal/feedback-session-deleted-modal.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { FeedbackSessionDeletedModalComponent } from './feedback-session-deleted-modal.component'; - -describe('FeedbackSessionDeletedModalComponent', () => { - let component: FeedbackSessionDeletedModalComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [FeedbackSessionDeletedModalComponent], - providers: [ - NgbActiveModal, - ], - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(FeedbackSessionDeletedModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-deleted-modal/feedback-session-deleted-modal.component.ts b/src/web/app/pages-session/session-submission-page/feedback-session-deleted-modal/feedback-session-deleted-modal.component.ts deleted file mode 100644 index dff0f6fc1f7..00000000000 --- a/src/web/app/pages-session/session-submission-page/feedback-session-deleted-modal/feedback-session-deleted-modal.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - -/** - * Modal to alert the deletion of a feedback session. - */ -@Component({ - selector: 'tm-feedback-session-deleted-modal', - templateUrl: './feedback-session-deleted-modal.component.html', - styleUrls: ['./feedback-session-deleted-modal.component.scss'], -}) -export class FeedbackSessionDeletedModalComponent implements OnInit { - - constructor(public activeModal: NgbActiveModal) {} - - ngOnInit(): void { - } - -} diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-not-open-modal/feedback-session-not-open-modal.component.html b/src/web/app/pages-session/session-submission-page/feedback-session-not-open-modal/feedback-session-not-open-modal.component.html deleted file mode 100644 index a9c05689d64..00000000000 --- a/src/web/app/pages-session/session-submission-page/feedback-session-not-open-modal/feedback-session-not-open-modal.component.html +++ /dev/null @@ -1,14 +0,0 @@ -
    -

    Feedback Session Not Open

    - -
    -
    -

    The feedback session is currently not open for submissions.

    -

    You can view the questions and any submitted responses - for this feedback session but cannot submit new responses.

    -
    -
    - -
    diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-not-open-modal/feedback-session-not-open-modal.component.scss b/src/web/app/pages-session/session-submission-page/feedback-session-not-open-modal/feedback-session-not-open-modal.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-not-open-modal/feedback-session-not-open-modal.component.spec.ts b/src/web/app/pages-session/session-submission-page/feedback-session-not-open-modal/feedback-session-not-open-modal.component.spec.ts deleted file mode 100644 index 6d3d807836c..00000000000 --- a/src/web/app/pages-session/session-submission-page/feedback-session-not-open-modal/feedback-session-not-open-modal.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { FeedbackSessionNotOpenModalComponent } from './feedback-session-not-open-modal.component'; - -describe('FeedbackSessionNotOpenModalComponent', () => { - let component: FeedbackSessionNotOpenModalComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [FeedbackSessionNotOpenModalComponent], - providers: [ - NgbActiveModal, - ], - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(FeedbackSessionNotOpenModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/web/app/pages-session/session-submission-page/feedback-session-not-open-modal/feedback-session-not-open-modal.component.ts b/src/web/app/pages-session/session-submission-page/feedback-session-not-open-modal/feedback-session-not-open-modal.component.ts deleted file mode 100644 index c5021f8e0a7..00000000000 --- a/src/web/app/pages-session/session-submission-page/feedback-session-not-open-modal/feedback-session-not-open-modal.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - -/** - * Modal to alert that a feedback session is not open yet. - */ -@Component({ - selector: 'tm-feedback-session-not-open-modal', - templateUrl: './feedback-session-not-open-modal.component.html', - styleUrls: ['./feedback-session-not-open-modal.component.scss'], -}) -export class FeedbackSessionNotOpenModalComponent implements OnInit { - - constructor(public activeModal: NgbActiveModal) {} - - ngOnInit(): void { - } - -} diff --git a/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts b/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts index f17c7dc182e..11f61f1d85c 100644 --- a/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts +++ b/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts @@ -13,6 +13,7 @@ import { FeedbackResponsesService } from '../../../services/feedback-responses.s import { FeedbackSessionsService } from '../../../services/feedback-sessions.service'; import { InstructorService } from '../../../services/instructor.service'; import { NavigationService } from '../../../services/navigation.service'; +import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { TimezoneService } from '../../../services/timezone.service'; @@ -24,7 +25,8 @@ import { FeedbackQuestion, FeedbackQuestionRecipient, FeedbackQuestionRecipients, - FeedbackResponse, FeedbackResponseComment, + FeedbackResponse, + FeedbackResponseComment, FeedbackSession, FeedbackSessionSubmissionStatus, Instructor, @@ -40,22 +42,9 @@ import { QuestionSubmissionFormMode, QuestionSubmissionFormModel, } from '../../components/question-submission-form/question-submission-form-model'; +import { SimpleModalType } from '../../components/simple-modal/simple-modal-type'; import { ErrorMessageOutput } from '../../error-message-output'; -import { - FeedbackSessionClosedModalComponent, -} from './feedback-session-closed-modal/feedback-session-closed-modal.component'; -import { - FeedbackSessionClosingSoonModalComponent, -} from './feedback-session-closing-soon-modal/feedback-session-closing-soon-modal.component'; -import { - FeedbackSessionDeletedModalComponent, -} from './feedback-session-deleted-modal/feedback-session-deleted-modal.component'; -import { - FeedbackSessionNotOpenModalComponent, -} from './feedback-session-not-open-modal/feedback-session-not-open-modal.component'; -import { - SavingCompleteModalComponent, -} from './saving-complete-modal/saving-complete-modal.component'; +import { SavingCompleteModalComponent } from './saving-complete-modal/saving-complete-modal.component'; interface FeedbackQuestionsResponse { questions: FeedbackQuestion[]; @@ -121,7 +110,8 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { private feedbackSessionsService: FeedbackSessionsService, private studentService: StudentService, private instructorService: InstructorService, - private modalService: NgbModal, + private ngbModal: NgbModal, + private simpleModalService: SimpleModalService, private pageScrollService: PageScrollService, private authService: AuthService, private navigationService: NavigationService, @@ -268,20 +258,31 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { // don't show alert modal in moderation if (!this.moderatedPerson) { + let modalContent: string; switch (feedbackSession.submissionStatus) { case FeedbackSessionSubmissionStatus.VISIBLE_NOT_OPEN: this.isSubmissionFormsDisabled = true; - this.modalService.open(FeedbackSessionNotOpenModalComponent); + modalContent = `

    The feedback session is currently not open for submissions.

    +

    You can view the questions and any submitted responses + for this feedback session but cannot submit new responses.

    `; + this.simpleModalService.openInformationModal( + 'Feedback Session Not Open', SimpleModalType.WARNING, modalContent); break; case FeedbackSessionSubmissionStatus.OPEN: // closing in 15 minutes if (feedbackSession.submissionEndTimestamp - Date.now() < 15 * 60 * 1000) { - this.modalService.open(FeedbackSessionClosingSoonModalComponent); + modalContent = 'Warning: you have less than 15 minutes before the submission deadline expires!'; + this.simpleModalService.openInformationModal( + 'Feedback Session Will Be Closing Soon!', SimpleModalType.WARNING, modalContent); } break; case FeedbackSessionSubmissionStatus.CLOSED: this.isSubmissionFormsDisabled = true; - this.modalService.open(FeedbackSessionClosedModalComponent); + modalContent = `

    Feedback Session is Closed

    +

    You can view the questions and any submitted responses + for this feedback session but cannot submit new responses.

    `; + this.simpleModalService.openInformationModal( + 'Feedback Session Closed', SimpleModalType.WARNING, modalContent); break; case FeedbackSessionSubmissionStatus.GRACE_PERIOD: default: @@ -291,7 +292,8 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { this.loadFeedbackQuestions(); }, (resp: ErrorMessageOutput) => { if (resp.status === 404) { - this.modalService.open(FeedbackSessionDeletedModalComponent); + this.simpleModalService.openInformationModal('Feedback Session Deleted!', SimpleModalType.DANGER, + 'The feedback session has been permanently deleted and is no longer accessible.'); } this.statusMessageService.showErrorToast(resp.error.message); }); @@ -645,7 +647,7 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { finalize(() => { this.isSavingResponses = false; - const modalRef: NgbModalRef = this.modalService.open(SavingCompleteModalComponent); + const modalRef: NgbModalRef = this.ngbModal.open(SavingCompleteModalComponent); modalRef.componentInstance.notYetAnsweredQuestions = Array.from(notYetAnsweredQuestions.values()).join(', '); modalRef.componentInstance.failToSaveQuestions = failToSaveQuestions; modalRef.componentInstance.hasSubmissionConfirmationError = hasSubmissionConfirmationError; diff --git a/src/web/app/pages-session/session-submission-page/session-submission-page.module.ts b/src/web/app/pages-session/session-submission-page/session-submission-page.module.ts index cf02ba2b5d2..b24bbe73dee 100644 --- a/src/web/app/pages-session/session-submission-page/session-submission-page.module.ts +++ b/src/web/app/pages-session/session-submission-page/session-submission-page.module.ts @@ -8,18 +8,6 @@ import { QuestionSubmissionFormModule, } from '../../components/question-submission-form/question-submission-form.module'; import { TeammatesCommonModule } from '../../components/teammates-common/teammates-common.module'; -import { - FeedbackSessionClosedModalComponent, -} from './feedback-session-closed-modal/feedback-session-closed-modal.component'; -import { - FeedbackSessionClosingSoonModalComponent, -} from './feedback-session-closing-soon-modal/feedback-session-closing-soon-modal.component'; -import { - FeedbackSessionDeletedModalComponent, -} from './feedback-session-deleted-modal/feedback-session-deleted-modal.component'; -import { - FeedbackSessionNotOpenModalComponent, -} from './feedback-session-not-open-modal/feedback-session-not-open-modal.component'; import { SavingCompleteModalComponent } from './saving-complete-modal/saving-complete-modal.component'; import { SessionSubmissionPageComponent } from './session-submission-page.component'; @@ -46,20 +34,12 @@ const routes: Routes = [ declarations: [ SavingCompleteModalComponent, SessionSubmissionPageComponent, - FeedbackSessionClosingSoonModalComponent, - FeedbackSessionClosedModalComponent, - FeedbackSessionNotOpenModalComponent, - FeedbackSessionDeletedModalComponent, ], exports: [ SessionSubmissionPageComponent, ], entryComponents: [ SavingCompleteModalComponent, - FeedbackSessionClosingSoonModalComponent, - FeedbackSessionClosedModalComponent, - FeedbackSessionNotOpenModalComponent, - FeedbackSessionDeletedModalComponent, ], }) export class SessionSubmissionPageModule { } diff --git a/src/web/app/pages-student/student-profile-page/__snapshots__/student-profile-page.component.spec.ts.snap b/src/web/app/pages-student/student-profile-page/__snapshots__/student-profile-page.component.spec.ts.snap index 0fe96fef5a3..6b9581ebdcd 100644 --- a/src/web/app/pages-student/student-profile-page/__snapshots__/student-profile-page.component.spec.ts.snap +++ b/src/web/app/pages-student/student-profile-page/__snapshots__/student-profile-page.component.spec.ts.snap @@ -10,6 +10,7 @@ exports[`StudentProfilePageComponent should snap with a student field without in id="" nationalitiesService={[Function NationalitiesService]} ngbModal={[Function NgbModal]} + simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} student={[Function Object]} studentProfileService={[Function StudentProfileService]} @@ -208,8 +209,6 @@ exports[`StudentProfilePageComponent should snap with a student field without in This profile will be visible to all your instructors and coursemates.
    - -
    @@ -225,6 +224,7 @@ exports[`StudentProfilePageComponent should snap with default fields 1`] = ` id="" nationalitiesService={[Function NationalitiesService]} ngbModal={[Function NgbModal]} + simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} studentProfileService={[Function StudentProfileService]} > @@ -244,6 +244,7 @@ exports[`StudentProfilePageComponent should snap with values and a profile photo nationalitiesService={[Function NationalitiesService]} ngbModal={[Function NgbModal]} profilePicLink={[Function String]} + simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} student={[Function Object]} studentProfileService={[Function StudentProfileService]} @@ -452,8 +453,6 @@ exports[`StudentProfilePageComponent should snap with values and a profile photo This profile will be visible to all your instructors and coursemates. - - diff --git a/src/web/app/pages-student/student-profile-page/student-profile-page.component.html b/src/web/app/pages-student/student-profile-page/student-profile-page.component.html index c2de389391b..8a01bd5b438 100644 --- a/src/web/app/pages-student/student-profile-page/student-profile-page.component.html +++ b/src/web/app/pages-student/student-profile-page/student-profile-page.component.html @@ -24,13 +24,13 @@

    {{ name }}

    id="profile-delete-photo" class="btn btn-danger" ngbTooltip="Delete your profile picture" - (click)="onDelete(confirmDeleteProfilePicture)"> + (click)="onDelete()"> Delete Photo
    + (ngSubmit)="onSubmit()">
    {{ name }}
    This profile will be visible to all your instructors and coursemates.
    - -
    -

    Save Changes?

    - -
    -
    - Are you sure you want to make changes to your profile? -
    -
    - - -
    -     - -
    -

    Confirm Deletion?

    - -
    -
    - Are you sure you want to delete your profile picture? -
    -
    - - -
    -     diff --git a/src/web/app/pages-student/student-profile-page/student-profile-page.component.ts b/src/web/app/pages-student/student-profile-page/student-profile-page.component.ts index 40097e0e0cf..80848ef3bd8 100644 --- a/src/web/app/pages-student/student-profile-page/student-profile-page.component.ts +++ b/src/web/app/pages-student/student-profile-page/student-profile-page.component.ts @@ -15,9 +15,9 @@ import { ErrorMessageOutput } from '../../error-message-output'; import { from, throwError } from 'rxjs'; import { catchError, switchMap } from 'rxjs/operators'; import { NationalitiesService } from '../../../services/nationalities.service'; -import { - UploadEditProfilePictureModalComponent, -} from './upload-edit-profile-picture-modal/upload-edit-profile-picture-modal.component'; +import { SimpleModalService } from '../../../services/simple-modal.service'; +import { SimpleModalType } from '../../components/simple-modal/simple-modal-type'; +import { UploadEditProfilePictureModalComponent } from './upload-edit-profile-picture-modal/upload-edit-profile-picture-modal.component'; /** * Student profile page. @@ -40,9 +40,10 @@ export class StudentProfilePageComponent implements OnInit { private backendUrl: string = environment.backendUrl; - constructor(private ngbModal: NgbModal, + constructor(private simpleModalService: SimpleModalService, private nationalitiesService: NationalitiesService, private authService: AuthService, + private ngbModal: NgbModal, private statusMessageService: StatusMessageService, private studentProfileService: StudentProfileService) { } @@ -106,8 +107,10 @@ export class StudentProfilePageComponent implements OnInit { /** * Prompts the user with a modal box to confirm changes made to the form. */ - onSubmit(confirmEditProfile: any): void { - this.ngbModal.open(confirmEditProfile); + onSubmit(): void { + const modalRef: NgbModalRef = this.simpleModalService + .openConfirmationModal('Save Changes?', SimpleModalType.INFO, 'Are you sure you want to make changes to your profile?'); + modalRef.result.then(() => this.submitEditForm(), () => {}); } /** @@ -178,8 +181,13 @@ export class StudentProfilePageComponent implements OnInit { /** * Prompts the user with a modal box to confirm deleting the profile picture. */ - onDelete(confirmDeleteProfilePicture: any): void { - this.ngbModal.open(confirmDeleteProfilePicture); + onDelete(): void { + const modalRef: NgbModalRef = this.simpleModalService + .openConfirmationModal('Delete profile picture?', SimpleModalType.DANGER, + 'Warning: Profile picture cannot be recovered.'); + modalRef.result.then(() => { + this.deleteProfilePicture(); + }, () => {}); } /** diff --git a/src/web/services/simple-modal.service.spec.ts b/src/web/services/simple-modal.service.spec.ts new file mode 100644 index 00000000000..e3b4ef4bbeb --- /dev/null +++ b/src/web/services/simple-modal.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { SimpleModalService } from './simple-modal.service'; + +describe('SimpleModalService', () => { + let service: SimpleModalService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(SimpleModalService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/web/services/simple-modal.service.ts b/src/web/services/simple-modal.service.ts new file mode 100644 index 00000000000..376054ef300 --- /dev/null +++ b/src/web/services/simple-modal.service.ts @@ -0,0 +1,69 @@ +import { Injectable, TemplateRef } from '@angular/core'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { SimpleModalType } from '../app/components/simple-modal/simple-modal-type'; +import { SimpleModalComponent } from '../app/components/simple-modal/simple-modal.component'; + +/** + * Optional parameters for modal. + */ +export interface SimpleModalOptions { + // determines if there should be 2 buttons for confirmation or only 1 button to close the modal + isInformationOnly?: boolean; + confirmMessage?: string; // custom text message for confirm button + cancelMessage?: string; // custom text message for cancel button +} + +/** + * Service to handle display of confirmation modals. + * For more a complicated use case, use {@link NgbModal} directly. + */ +@Injectable({ + providedIn: 'root', +}) +export class SimpleModalService { + + constructor(private ngbModal: NgbModal) { + } + + /** + * Opens a confirmation modal + * @param header to be displayed on the modal + * @param type which determines the look of the modal + * @param content to be displayed in the body of the modal. content supports HTML tags + * @param options See {@code SimpleModalOptions} + */ + private open(header: string, type: SimpleModalType, + content: string | TemplateRef, options?: SimpleModalOptions): NgbModalRef { + const modalRef: NgbModalRef = this.ngbModal.open(SimpleModalComponent); + modalRef.componentInstance.header = header; + modalRef.componentInstance.content = content; + modalRef.componentInstance.type = type; + if (options) { + Object.entries(options).map(([key, value]: [string, string | boolean]) => { + modalRef.componentInstance[key] = value; + }); + } + return modalRef; + } + + openConfirmationModal(header: string, type: SimpleModalType, + content: string | TemplateRef, options?: SimpleModalOptions): NgbModalRef { + const modalOptions: SimpleModalOptions = { + isInformationOnly: false, + confirmMessage: 'Yes', + cancelMessage: 'No, cancel the operation', + ...options, + }; + return this.open(header, type, content, modalOptions); + } + + openInformationModal(header: string, type: SimpleModalType, + content: string | TemplateRef, options?: SimpleModalOptions): NgbModalRef { + const modalOptions: SimpleModalOptions = { + isInformationOnly: true, + confirmMessage: 'OK', + ...options, + }; + return this.open(header, type, content, modalOptions); + } +} diff --git a/src/web/services/status-message.service.ts b/src/web/services/status-message.service.ts index d884775c9b4..5558002d58a 100644 --- a/src/web/services/status-message.service.ts +++ b/src/web/services/status-message.service.ts @@ -1,10 +1,5 @@ import { Injectable, TemplateRef } from '@angular/core'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Observable, Subject } from 'rxjs'; -import { StatusMessage } from '../app/components/status-message/status-message'; -import { - StatusMessageModalComponent, -} from '../app/components/status-message/status-messsage-modal/status-message-modal.component'; import { Toast } from '../app/components/toast/toast'; /** @@ -17,7 +12,7 @@ export class StatusMessageService { private toast: Subject = new Subject(); - constructor(private modalService: NgbModal) {} + constructor() {} getToastEvent(): Observable { return this.toast.asObservable(); @@ -69,20 +64,4 @@ export class StatusMessageService { }); } - /** - * Shows a warning message modal on the page that must be acknowledged. - */ - showWarningModal(title: string, subtitle: string, message: string): NgbModalRef { - return this.showMessageModal(title, subtitle, { message, color: 'warning' }); - } - - private showMessageModal(title: string, subtitle: string, message: StatusMessage): NgbModalRef { - const activeModal: NgbModalRef = this.modalService.open(StatusMessageModalComponent); - activeModal.componentInstance.title = title; - activeModal.componentInstance.subtitle = subtitle; - activeModal.componentInstance.message = message.message; - activeModal.componentInstance.color = message.color; - return activeModal; - } - } From 1ac404a6d199ff19d8c860cde865fad81ddaadc5 Mon Sep 17 00:00:00 2001 From: Ni Tianzhen Date: Mon, 20 Jul 2020 22:35:58 +0800 Subject: [PATCH 038/205] [#10370] Remove extra border around rich text editor (#10371) --- .../rich-text-editor/rich-text-editor.component.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/web/app/components/rich-text-editor/rich-text-editor.component.scss b/src/web/app/components/rich-text-editor/rich-text-editor.component.scss index 59b334017ee..06440a07229 100644 --- a/src/web/app/components/rich-text-editor/rich-text-editor.component.scss +++ b/src/web/app/components/rich-text-editor/rich-text-editor.component.scss @@ -1,8 +1,5 @@ .editor { - border: 1px solid #CED4DA; background-color: #FFF; - border-radius: .25rem; - padding: .375rem .75rem; } .editor-disabled { From 3feb12a4040089305849ac9602a35cb523bbf3ac Mon Sep 17 00:00:00 2001 From: t-cheepeng Date: Tue, 21 Jul 2020 13:28:47 +0800 Subject: [PATCH 039/205] [#9356] Improve UI for loading indicators (#10309) * Add loading indicator from old PR * Add loading spinner directive * Add spinner to base page * Add spinner to instructor home page * Add spinner to instructor course related page * Add spinner to instructor sessions related page * Add spinner to instructor student related page * Add spinner to admin pages * Add spinner to session pages * Add spinner to student pages * Fix indentation and documentation * Remove unnecessary code and hide student home page * Fix snapshots and add loading snapshots * Change ajax loading gif * Remove redundant variable in course details page * Change ajax loading gif to bootstrap spinner * Remove check and shift field to model * Update snapshots * Remove redundant csv variable and shift field * Update snapshots --- src/web/app/app.module.ts | 4 +- .../ajax-loading/ajax-loading.component.html | 4 +- .../ajax-loading/ajax-loading.component.scss | 3 + .../loading-spinner.component.html | 5 +- .../loading-spinner.component.scss | 9 +- .../loading-spinner.component.ts | 7 +- .../loading-spinner.directive.ts | 38 + .../loading-spinner/loading-spinner.module.ts | 17 + .../question-edit-form.component.html | 17 +- .../session-edit-form.component.html | 6 +- .../sessions-table.component.spec.ts.snap | 22 +- src/web/app/page.component.html | 3 +- src/web/app/page.component.spec.ts | 4 +- .../admin-accounts-page.component.html | 139 +- .../admin-accounts-page.component.spec.ts | 2 + .../admin-accounts-page.component.ts | 52 +- .../admin-accounts-page.module.ts | 2 + .../admin-home-page.component.spec.ts.snap | 19 +- .../admin-home-page.component.html | 5 +- .../admin-home-page.component.spec.ts | 6 +- .../admin-home-page.component.ts | 24 +- .../admin-home-page/admin-home-page.module.ts | 2 + .../pages-admin/admin-page.component.spec.ts | 4 +- .../admin-search-page.component.ts | 8 +- .../admin-sessions-page.component.html | 76 +- .../admin-sessions-page.component.spec.ts | 2 + .../admin-sessions-page.component.ts | 5 + .../admin-sessions-page.module.ts | 2 + .../admin-timezone-page.component.html | 2 +- .../admin-timezone-page.component.spec.ts | 2 + .../admin-timezone-page.component.ts | 13 +- .../admin-timezone-page.module.ts | 2 + ...course-details-page.component.spec.ts.snap | 197 +- ...tructor-course-details-page.component.html | 5 +- ...ctor-course-details-page.component.spec.ts | 14 +- ...nstructor-course-details-page.component.ts | 56 +- .../instructor-course-details-page.module.ts | 4 + ...instructor-course-edit-page.component.html | 39 +- ...tructor-course-edit-page.component.spec.ts | 4 + .../instructor-course-edit-page.component.ts | 28 +- .../instructor-course-edit-page.module.ts | 4 + .../instructor-edit-panel.component.html | 13 +- .../instructor-edit-panel.component.spec.ts | 4 + .../instructor-edit-panel.component.ts | 5 + ...structor-course-enroll-page.component.html | 2 + ...uctor-course-enroll-page.component.spec.ts | 4 + ...instructor-course-enroll-page.component.ts | 7 +- .../instructor-course-enroll-page.module.ts | 2 + ...tudent-details-page.component.spec.ts.snap | 38 +- ...course-student-details-page.component.html | 14 +- ...rse-student-details-page.component.spec.ts | 2 + ...r-course-student-details-page.component.ts | 14 +- ...ctor-course-student-details-page.module.ts | 2 + ...e-student-edit-page.component.spec.ts.snap | 52 +- ...tructor-course-student-edit-form.module.ts | 2 + ...or-course-student-edit-page.component.html | 4 +- ...course-student-edit-page.component.spec.ts | 9 + ...ctor-course-student-edit-page.component.ts | 11 +- ...ructor-courses-page.component.spec.ts.snap | 1792 ++++++----- .../add-course-form.component.spec.ts.snap | 8 +- .../add-course-form.component.html | 13 +- .../add-course-form.component.spec.ts | 2 + .../add-course-form.component.ts | 6 +- .../add-course-form/add-course-form.module.ts | 2 + .../instructor-courses-page.component.html | 114 +- .../instructor-courses-page.component.spec.ts | 11 + .../instructor-courses-page.component.ts | 4 +- .../instructor-courses-page.module.ts | 2 + ...nstructor-home-page.component.spec.ts.snap | 2823 +++++++++-------- .../instructor-home-page.component.html | 140 +- .../instructor-home-page.component.spec.ts | 23 + .../instructor-home-page.module.ts | 2 + .../instructor-page.component.spec.ts | 4 +- ...nstructor-session-edit-page.component.html | 28 +- .../instructor-session-edit-page.component.ts | 15 +- .../instructor-session-edit-page.module.ts | 2 + ...tor-session-result-gqr-view.component.html | 2 +- ...-session-result-gqr-view.component.spec.ts | 3 +- ...tor-session-result-grq-view.component.html | 2 +- ...-session-result-grq-view.component.spec.ts | 3 +- ...tructor-session-result-page.component.html | 184 +- ...ctor-session-result-page.component.spec.ts | 4 + ...nstructor-session-result-page.component.ts | 10 +- .../instructor-session-result-page.module.ts | 4 + ...ession-result-question-view.component.html | 2 +- ...ion-result-question-view.component.spec.ts | 2 + ...tor-session-result-rgq-view.component.html | 2 +- ...-session-result-rgq-view.component.spec.ts | 3 +- ...tor-session-result-rqg-view.component.html | 2 +- ...-session-result-rqg-view.component.spec.ts | 3 +- .../instructor-session-result-view.module.ts | 2 + .../instructor-sessions-page.component.html | 3 +- .../instructor-sessions-page.module.ts | 2 + ...nstructor-student-list-page.component.html | 2 +- .../instructor-student-list-page.component.ts | 6 +- .../instructor-student-list-page.module.ts | 2 + ...tudent-records-page.component.spec.ts.snap | 109 +- ...ructor-student-records-page.component.html | 54 +- ...tor-student-records-page.component.spec.ts | 26 + ...structor-student-records-page.component.ts | 18 +- .../instructor-student-records-page.module.ts | 2 + .../session-result-page.component.html | 32 +- .../session-result-page.component.spec.ts | 2 + .../session-result-page.component.ts | 21 +- .../session-result-page.module.ts | 2 + .../session-submission-page.component.html | 46 +- .../session-submission-page.component.spec.ts | 2 + .../session-submission-page.component.ts | 62 +- .../session-submission-page.module.ts | 2 + .../static-page.component.spec.ts | 4 +- ...course-details-page.component.spec.ts.snap | 107 +- ...student-course-details-page.component.html | 11 +- ...dent-course-details-page.component.spec.ts | 16 + .../student-course-details-page.component.ts | 22 +- .../student-course-details-page.module.ts | 2 + .../student-home-page.component.spec.ts.snap | 71 +- .../student-home-page.component.html | 5 +- .../student-home-page.component.spec.ts | 10 + .../student-home-page.component.ts | 11 +- .../student-home-page.module.ts | 2 + .../student-page.component.spec.ts | 4 +- ...tudent-profile-page.component.spec.ts.snap | 73 +- .../student-profile-page.component.html | 11 +- .../student-profile-page.component.spec.ts | 12 + .../student-profile-page.component.ts | 33 +- .../student-profile-page.module.ts | 4 + src/web/app/public-page.component.spec.ts | 4 +- src/web/assets/images/ajax-loader.gif | Bin 307 -> 1737 bytes 128 files changed, 3988 insertions(+), 3068 deletions(-) create mode 100644 src/web/app/components/loading-spinner/loading-spinner.directive.ts create mode 100644 src/web/app/components/loading-spinner/loading-spinner.module.ts diff --git a/src/web/app/app.module.ts b/src/web/app/app.module.ts index 35558568b0f..41189f45985 100644 --- a/src/web/app/app.module.ts +++ b/src/web/app/app.module.ts @@ -11,7 +11,7 @@ import { Intent } from '../types/api-request'; import { AppComponent } from './app.component'; import { ErrorReportModule } from './components/error-report/error-report.module'; import { LoaderBarModule } from './components/loader-bar/loader-bar.module'; -import { LoadingSpinnerComponent } from './components/loading-spinner/loading-spinner.component'; +import { LoadingSpinnerModule } from './components/loading-spinner/loading-spinner.module'; import { SimpleModalModule } from './components/simple-modal/simple-modal.module'; import { ToastModule } from './components/toast/toast.module'; import { CustomUrlSerializer } from './custom-url-serializer'; @@ -104,7 +104,6 @@ const routes: Routes = [ StudentPageComponent, InstructorPageComponent, AdminPageComponent, - LoadingSpinnerComponent, ], imports: [ SimpleModalModule, @@ -121,6 +120,7 @@ const routes: Routes = [ enabled: environment.production, registrationStrategy: 'registerImmediately', }), + LoadingSpinnerModule, ], providers: [customUrlSerializerProvider], bootstrap: [AppComponent], diff --git a/src/web/app/components/ajax-loading/ajax-loading.component.html b/src/web/app/components/ajax-loading/ajax-loading.component.html index 7a7dc47a290..0421c4de4ac 100644 --- a/src/web/app/components/ajax-loading/ajax-loading.component.html +++ b/src/web/app/components/ajax-loading/ajax-loading.component.html @@ -1 +1,3 @@ - +
    + +
    diff --git a/src/web/app/components/ajax-loading/ajax-loading.component.scss b/src/web/app/components/ajax-loading/ajax-loading.component.scss index e69de29bb2d..a61e6d3ab7e 100644 --- a/src/web/app/components/ajax-loading/ajax-loading.component.scss +++ b/src/web/app/components/ajax-loading/ajax-loading.component.scss @@ -0,0 +1,3 @@ +.loading-container { + display: inline; +} diff --git a/src/web/app/components/loading-spinner/loading-spinner.component.html b/src/web/app/components/loading-spinner/loading-spinner.component.html index 4f14c0b81cf..034e46421e7 100644 --- a/src/web/app/components/loading-spinner/loading-spinner.component.html +++ b/src/web/app/components/loading-spinner/loading-spinner.component.html @@ -1,5 +1,4 @@
    - + +
    Loading...
    diff --git a/src/web/app/components/loading-spinner/loading-spinner.component.scss b/src/web/app/components/loading-spinner/loading-spinner.component.scss index b350bd70a1c..2312a6d7f92 100644 --- a/src/web/app/components/loading-spinner/loading-spinner.component.scss +++ b/src/web/app/components/loading-spinner/loading-spinner.component.scss @@ -1,8 +1,9 @@ .loading-container { - margin: 0; - position: absolute; - top: 50%; - left: 50%; + margin: 1rem; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; } .spinner-border { diff --git a/src/web/app/components/loading-spinner/loading-spinner.component.ts b/src/web/app/components/loading-spinner/loading-spinner.component.ts index 6cb7ee9a541..f17da338dc5 100644 --- a/src/web/app/components/loading-spinner/loading-spinner.component.ts +++ b/src/web/app/components/loading-spinner/loading-spinner.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; /** * Loading spinner to show when waiting for request. @@ -8,11 +8,8 @@ import { Component, OnInit } from '@angular/core'; templateUrl: './loading-spinner.component.html', styleUrls: ['./loading-spinner.component.scss'], }) -export class LoadingSpinnerComponent implements OnInit { +export class LoadingSpinnerComponent { constructor() { } - ngOnInit(): void { - } - } diff --git a/src/web/app/components/loading-spinner/loading-spinner.directive.ts b/src/web/app/components/loading-spinner/loading-spinner.directive.ts new file mode 100644 index 00000000000..41bbc6c1984 --- /dev/null +++ b/src/web/app/components/loading-spinner/loading-spinner.directive.ts @@ -0,0 +1,38 @@ +import { + ComponentFactory, + ComponentFactoryResolver, + ComponentRef, + Directive, + Input, + TemplateRef, + ViewContainerRef, +} from '@angular/core'; +import { LoadingSpinnerComponent } from './loading-spinner.component'; + +/** + * Directive for loading spinner component + */ +@Directive({ + selector: '[tmIsLoading]', +}) +export class LoadingSpinnerDirective { + loadingComponent: ComponentRef; + loadingFactory: ComponentFactory; + + constructor(private templateRef: TemplateRef, + private viewContainer: ViewContainerRef, + private componentFactoryResolver: ComponentFactoryResolver) { + this.loadingFactory = this.componentFactoryResolver.resolveComponentFactory(LoadingSpinnerComponent); + this.loadingComponent = this.viewContainer.createComponent(this.loadingFactory); + } + + @Input() set tmIsLoading(loading: boolean) { + this.viewContainer.clear(); + + if (loading) { + this.loadingComponent = this.viewContainer.createComponent(this.loadingFactory); + } else { + this.viewContainer.createEmbeddedView(this.templateRef); + } + } +} diff --git a/src/web/app/components/loading-spinner/loading-spinner.module.ts b/src/web/app/components/loading-spinner/loading-spinner.module.ts new file mode 100644 index 00000000000..00c05b855ec --- /dev/null +++ b/src/web/app/components/loading-spinner/loading-spinner.module.ts @@ -0,0 +1,17 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { LoadingSpinnerComponent } from './loading-spinner.component'; +import { LoadingSpinnerDirective } from './loading-spinner.directive'; + +/** + * Module for the loading spinner + */ +@NgModule({ + declarations: [LoadingSpinnerDirective, LoadingSpinnerComponent], + imports: [ + CommonModule, + ], + exports: [LoadingSpinnerDirective], + entryComponents: [LoadingSpinnerComponent], +}) +export class LoadingSpinnerModule { } diff --git a/src/web/app/components/question-edit-form/question-edit-form.component.html b/src/web/app/components/question-edit-form/question-edit-form.component.html index 75bbd782201..79a9304453c 100644 --- a/src/web/app/components/question-edit-form/question-edit-form.component.html +++ b/src/web/app/components/question-edit-form/question-edit-form.component.html @@ -14,19 +14,22 @@
    - - + ngbTooltip="Discard any unsaved edits and revert back to original question." (click)="discardChangesHandler(false); $event.stopPropagation();" [disabled]="model.isSaving"> Cancel +
    + ngbTooltip="Cancel adding new question. No new question will be added to the feedback session." container="body" (click)="discardChangesHandler(true); $event.stopPropagation();" [disabled]="model.isSaving"> + + Cancel +
    @@ -224,7 +227,9 @@
    Changing the visibility after collecting responses is not recommended.
    + ngbTooltip="Discard any unsaved edits and revert back to original question." (click)="discardChangesHandler(false)" [disabled]="model.isSaving"> + Cancel +
    - + - - + +
    diff --git a/src/web/app/components/sessions-table/__snapshots__/sessions-table.component.spec.ts.snap b/src/web/app/components/sessions-table/__snapshots__/sessions-table.component.spec.ts.snap index 775039c6a50..208b1dc4f17 100644 --- a/src/web/app/components/sessions-table/__snapshots__/sessions-table.component.spec.ts.snap +++ b/src/web/app/components/sessions-table/__snapshots__/sessions-table.component.spec.ts.snap @@ -300,9 +300,14 @@ exports[`SessionsTableComponent should snap like in home page with 2 sessions so - +
    +
    Section - +
    +
    		- -
    +
    - +
    diff --git a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.spec.ts b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.spec.ts index a7f9e5fbc61..5a4fbf4089c 100644 --- a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.spec.ts +++ b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.spec.ts @@ -3,6 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { of, throwError } from 'rxjs'; import { AccountService } from '../../../services/account.service'; +import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { AdminHomePageComponent } from './admin-home-page.component'; describe('AdminHomePageComponent', () => { @@ -16,6 +18,8 @@ describe('AdminHomePageComponent', () => { imports: [ FormsModule, HttpClientTestingModule, + LoadingSpinnerModule, + AjaxLoadingModule, ], providers: [AccountService], }) @@ -286,9 +290,9 @@ describe('AdminHomePageComponent', () => { }, ]; component.activeRequests = 1; + component.isAddingInstructors = true; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); }); - }); diff --git a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.ts b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.ts index 262789d47d8..ce34b9d07bd 100644 --- a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.ts +++ b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; +import { finalize } from 'rxjs/operators'; import { AccountService } from '../../../services/account.service'; import { JoinLink } from '../../../types/api-output'; import { ErrorMessageOutput } from '../../error-message-output'; @@ -30,6 +31,8 @@ export class AdminHomePageComponent { instructorsConsolidated: InstructorData[] = []; activeRequests: number = 0; + isAddingInstructors: boolean = false; + constructor(private accountService: AccountService) {} /** @@ -89,19 +92,22 @@ export class AdminHomePageComponent { this.activeRequests += 1; instructor.status = 'ADDING'; + this.isAddingInstructors = true; this.accountService.createAccount({ instructorEmail: instructor.email, instructorName: instructor.name, instructorInstitution: instructor.institution, - }).subscribe((resp: JoinLink) => { - instructor.status = 'SUCCESS'; - instructor.joinLink = resp.joinLink; - this.activeRequests -= 1; - }, (resp: ErrorMessageOutput) => { - instructor.status = 'FAIL'; - instructor.message = resp.error.message; - this.activeRequests -= 1; - }); + }) + .pipe(finalize(() => this.isAddingInstructors = false)) + .subscribe((resp: JoinLink) => { + instructor.status = 'SUCCESS'; + instructor.joinLink = resp.joinLink; + this.activeRequests -= 1; + }, (resp: ErrorMessageOutput) => { + instructor.status = 'FAIL'; + instructor.message = resp.error.message; + this.activeRequests -= 1; + }); } /** diff --git a/src/web/app/pages-admin/admin-home-page/admin-home-page.module.ts b/src/web/app/pages-admin/admin-home-page/admin-home-page.module.ts index cf1ee888b32..8c5f9b53d1c 100644 --- a/src/web/app/pages-admin/admin-home-page/admin-home-page.module.ts +++ b/src/web/app/pages-admin/admin-home-page/admin-home-page.module.ts @@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; +import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; import { AdminHomePageComponent } from './admin-home-page.component'; const routes: Routes = [ @@ -25,6 +26,7 @@ const routes: Routes = [ CommonModule, FormsModule, RouterModule.forChild(routes), + AjaxLoadingModule, ], }) export class AdminHomePageModule { } diff --git a/src/web/app/pages-admin/admin-page.component.spec.ts b/src/web/app/pages-admin/admin-page.component.spec.ts index fdaeb45363f..0d9d8d657e2 100644 --- a/src/web/app/pages-admin/admin-page.component.spec.ts +++ b/src/web/app/pages-admin/admin-page.component.spec.ts @@ -3,7 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { LoaderBarModule } from '../components/loader-bar/loader-bar.module'; -import { LoadingSpinnerComponent } from '../components/loading-spinner/loading-spinner.component'; +import { LoadingSpinnerModule } from '../components/loading-spinner/loading-spinner.module'; import { StatusMessageModule } from '../components/status-message/status-message.module'; import { ToastModule } from '../components/toast/toast.module'; import { PageComponent } from '../page.component'; @@ -18,7 +18,6 @@ describe('AdminPageComponent', () => { declarations: [ PageComponent, AdminPageComponent, - LoadingSpinnerComponent, ], imports: [ NgbModule, @@ -27,6 +26,7 @@ describe('AdminPageComponent', () => { RouterTestingModule, StatusMessageModule, ToastModule, + LoadingSpinnerModule, ], }) .compileComponents(); diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts index 00e1a0391c5..19067e8a295 100755 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts @@ -1,7 +1,9 @@ import { Component } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { finalize } from 'rxjs/operators'; import { AccountService } from '../../../services/account.service'; import { EmailGenerationService } from '../../../services/email-generation.service'; +import { LoadingBarService } from '../../../services/loading-bar.service'; import { AdminSearchResult, FeedbackSessionsGroup, @@ -39,13 +41,17 @@ export class AdminSearchPageComponent { private studentService: StudentService, private searchService: SearchService, private emailGenerationService: EmailGenerationService, + private loadingBarService: LoadingBarService, ) {} /** * Searches for students and instructors matching the search query. */ search(): void { - this.searchService.searchAdmin(this.searchQuery).subscribe((resp: AdminSearchResult) => { + this.loadingBarService.showLoadingBar(); + this.searchService.searchAdmin( + this.searchQuery, + ).pipe(finalize(() => this.loadingBarService.hideLoadingBar())).subscribe((resp: AdminSearchResult) => { const hasStudents: boolean = !!(resp.students && resp.students.length); const hasInstructors: boolean = !!(resp.instructors && resp.instructors.length); diff --git a/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.html b/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.html index 7cefe249bda..f4423e4f276 100644 --- a/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.html +++ b/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.html @@ -105,45 +105,47 @@

    -
    -
    -
    -
    - {{ mapping.key }} - Number of sessions: {{ mapping.value.length }} -
    -
    - - +
    +
    +
    +
    +
    + {{ mapping.key }} - Number of sessions: {{ mapping.value.length }} +
    +
    + + +
    -
    -
    -
    - - - - - - - - - - - +
    +
    +
    Status[Course ID] Session NameResponse RateStart TimeEnd TimeCreator
    + + + + + + + + + + - - - - - - - - - - -
    Status[Course ID] Session NameResponse RateStart TimeEnd TimeCreator
    {{ session.ongoingSession.sessionStatus }}[{{ session.ongoingSession.courseId }}] {{ session.ongoingSession.feedbackSessionName }} - {{ session.responseRate }} - Show - {{ showDateFromMillis(session.ongoingSession.startTime) }}{{ showDateFromMillis(session.ongoingSession.endTime) }}{{ session.ongoingSession.creatorEmail }}
    + + + {{ session.ongoingSession.sessionStatus }} + [{{ session.ongoingSession.courseId }}] {{ session.ongoingSession.feedbackSessionName }} + + {{ session.responseRate }} + Show + + {{ showDateFromMillis(session.ongoingSession.startTime) }} + {{ showDateFromMillis(session.ongoingSession.endTime) }} +     {{ session.ongoingSession.creatorEmail }} + + + +
    diff --git a/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.spec.ts b/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.spec.ts index 8755ec5ab7b..9dfd38eb9cd 100644 --- a/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.spec.ts +++ b/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.spec.ts @@ -2,6 +2,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { AdminSessionsPageComponent } from './admin-sessions-page.component'; describe('AdminSessionsPageComponent', () => { @@ -14,6 +15,7 @@ describe('AdminSessionsPageComponent', () => { NgbModule, FormsModule, HttpClientTestingModule, + LoadingSpinnerModule, ], declarations: [AdminSessionsPageComponent], }) diff --git a/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.ts b/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.ts index 94ff7b185e3..c94d93b4fbb 100644 --- a/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.ts +++ b/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import moment from 'moment-timezone'; +import { finalize } from 'rxjs/operators'; import { FeedbackSessionsService } from '../../../services/feedback-sessions.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { TimezoneService } from '../../../services/timezone.service'; @@ -45,6 +46,8 @@ export class AdminSessionsPageComponent implements OnInit { startTimeString: string = ''; endTimeString: string = ''; + isLoadingOngoingSessions: boolean = false; + constructor(private timezoneService: TimezoneService, private statusMessageService: StatusMessageService, private feedbackSessionsService: FeedbackSessionsService) {} @@ -125,8 +128,10 @@ export class AdminSessionsPageComponent implements OnInit { this.startTimeString = startTime.format(displayFormat); this.endTimeString = endTime.format(displayFormat); this.timezoneString = this.timezone; + this.isLoadingOngoingSessions = true; this.feedbackSessionsService.getOngoingSessions(startTime.toDate().getTime(), endTime.toDate().getTime()) + .pipe(finalize(() => this.isLoadingOngoingSessions = false)) .subscribe((resp: OngoingSessions) => { this.totalOngoingSessions = resp.totalOngoingSessions; this.totalOpenSessions = resp.totalOpenSessions; diff --git a/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.module.ts b/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.module.ts index 29b8a930aed..2c0c9b873c2 100644 --- a/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.module.ts +++ b/src/web/app/pages-admin/admin-sessions-page/admin-sessions-page.module.ts @@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbDatepickerModule, NgbTimepickerModule } from '@ng-bootstrap/ng-bootstrap'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { AdminSessionsPageComponent } from './admin-sessions-page.component'; const routes: Routes = [ @@ -28,6 +29,7 @@ const routes: Routes = [ NgbDatepickerModule, NgbTimepickerModule, RouterModule.forChild(routes), + LoadingSpinnerModule, ], }) export class AdminSessionsPageModule { } diff --git a/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.component.html b/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.component.html index e22a4ca50d4..09ff2db8412 100644 --- a/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.component.html +++ b/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.component.html @@ -1,4 +1,4 @@ -
    +

    Java timezones

    Version: {{ javaTzVersion }} diff --git a/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.component.spec.ts b/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.component.spec.ts index ed84f6f7a57..52f84b3acaf 100644 --- a/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.component.spec.ts +++ b/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.component.spec.ts @@ -1,5 +1,6 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { AdminTimezonePageComponent } from './admin-timezone-page.component'; describe('AdminTimezonePageComponent', () => { @@ -11,6 +12,7 @@ describe('AdminTimezonePageComponent', () => { declarations: [AdminTimezonePageComponent], imports: [ HttpClientTestingModule, + LoadingSpinnerModule, ], }) .compileComponents(); diff --git a/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.component.ts b/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.component.ts index 2280669881c..5c98e8c6c7c 100644 --- a/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.component.ts +++ b/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { finalize } from 'rxjs/operators'; import { TimezoneService } from '../../../services/timezone.service'; import { TimeZones } from '../../../types/api-output'; @@ -17,15 +18,17 @@ export class AdminTimezonePageComponent implements OnInit { momentTzVersion: string = ''; momentTimezones: Record = {}; + isTimezonesLoading: boolean = false; + constructor(private timezoneService: TimezoneService) {} ngOnInit(): void { this.momentTzVersion = this.timezoneService.getTzVersion(); this.momentTimezones = this.timezoneService.getTzOffsets(); - this.timezoneService.getTimeZone().subscribe((res: TimeZones) => { - this.javaTzVersion = res.version; - this.javaTimezones = res.offsets; - }); + this.timezoneService.getTimeZone().pipe(finalize(() => this.isTimezonesLoading = false)) + .subscribe((res: TimeZones) => { + this.javaTzVersion = res.version; + this.javaTimezones = res.offsets; + }); } - } diff --git a/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.module.ts b/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.module.ts index 81d8ee3241d..ca3b1d5cde1 100644 --- a/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.module.ts +++ b/src/web/app/pages-admin/admin-timezone-page/admin-timezone-page.module.ts @@ -1,6 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { AdminTimezonePageComponent } from './admin-timezone-page.component'; const routes: Routes = [ @@ -23,6 +24,7 @@ const routes: Routes = [ imports: [ CommonModule, RouterModule.forChild(routes), + LoadingSpinnerModule, ], }) export class AdminTimezonePageModule { } diff --git a/src/web/app/pages-instructor/instructor-course-details-page/__snapshots__/instructor-course-details-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-course-details-page/__snapshots__/instructor-course-details-page.component.spec.ts.snap index f6821476046..e0f542bf1ad 100644 --- a/src/web/app/pages-instructor/instructor-course-details-page/__snapshots__/instructor-course-details-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-course-details-page/__snapshots__/instructor-course-details-page.component.spec.ts.snap @@ -1,14 +1,48 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`InstructorCourseDetailsPageComponent should snap when students are still loading 1`] = ` + + +
    + + + +`; + exports[`InstructorCourseDetailsPageComponent should snap with a course with one co-owner and no students, and populated course student list 1`] = ` + + Download Student List
    +     `; diff --git a/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.html b/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.html index 31e11066fa4..ee7244fc289 100644 --- a/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.html +++ b/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.html @@ -1,4 +1,4 @@ -
    +

    Course Details

    @@ -50,7 +50,8 @@

    Course Details

    Remind Students to Join   @@ -59,7 +60,7 @@ - @@ -68,7 +69,8 @@
    -
    @@ -82,19 +84,21 @@ More about configuring access permissions
    - - - -
    -     +
    + + + +
    +     +
    { imports: [ NgbModule, FormsModule, + AjaxLoadingModule, TeammatesCommonModule, RouterTestingModule, HttpClientTestingModule, + LoadingSpinnerModule, ], }) .compileComponents(); diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.ts b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.ts index 0d23b370d76..e1450c1a37f 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.ts @@ -4,7 +4,7 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { FormGroup } from '@angular/forms'; import { forkJoin, Observable, of } from 'rxjs'; -import { concatAll, tap } from 'rxjs/operators'; +import { concatAll, finalize, tap } from 'rxjs/operators'; import { AuthService } from '../../../services/auth.service'; import { CourseService } from '../../../services/course.service'; import { FeedbackSessionsService } from '../../../services/feedback-sessions.service'; @@ -135,12 +135,18 @@ export class InstructorCourseEditPageComponent implements OnInit { }, isEditing: true, + isSavingInstructorEdit: false, }; // for fine-grain permission setting allSections: string[] = []; allSessions: string[] = []; + isCourseLoading: boolean = false; + isInstructorsLoading: boolean = false; + isSavingCourseEdit: boolean = false; + isSavingNewInstructor: boolean = false; + constructor(private route: ActivatedRoute, private router: Router, private navigationService: NavigationService, @@ -200,7 +206,10 @@ export class InstructorCourseEditPageComponent implements OnInit { * Loads the course being edited. */ loadCourseInfo(): void { - this.courseService.getCourseAsInstructor(this.courseId).subscribe((resp: Course) => { + this.isCourseLoading = true; + this.courseService.getCourseAsInstructor(this.courseId).pipe(finalize(() => { + this.isCourseLoading = false; + })).subscribe((resp: Course) => { this.course = resp; this.originalCourse = Object.assign({}, resp); }, (resp: ErrorMessageOutput) => { @@ -249,10 +258,11 @@ export class InstructorCourseEditPageComponent implements OnInit { Object.values(this.form.controls).forEach((control: any) => control.markAsTouched()); return; } + this.isSavingCourseEdit = true; this.courseService.updateCourse(this.courseId, { courseName: this.course.courseName, timeZone: this.course.timeZone, - }).subscribe((resp: Course) => { + }).pipe(finalize(() => this.isSavingCourseEdit = false)).subscribe((resp: Course) => { this.statusMessageService.showSuccessToast('The course has been edited.'); this.isEditingCourse = false; this.course = resp; @@ -278,6 +288,7 @@ export class InstructorCourseEditPageComponent implements OnInit { * Loads all instructors in the course. */ loadCourseInstructors(): void { + this.isInstructorsLoading = true; this.instructorService.loadInstructors({ courseId: this.courseId, intent: Intent.FULL_DETAIL, @@ -287,6 +298,7 @@ export class InstructorCourseEditPageComponent implements OnInit { originalInstructor: Object.assign({}, i), originalPanel: this.getInstructorEditPanelModel(i), editPanel: this.getInstructorEditPanelModel(i), + isSavingInstructorEdit: false, })); this.instructorDetailPanels.forEach((panel: InstructorEditPanelDetail) => { this.loadPermissionForInstructor(panel); @@ -333,6 +345,7 @@ export class InstructorCourseEditPageComponent implements OnInit { }, isEditing: false, + isSavingInstructorEdit: false, }; } @@ -365,6 +378,7 @@ export class InstructorCourseEditPageComponent implements OnInit { */ saveInstructor(index: number): void { const panelDetail: InstructorEditPanelDetail = this.instructorDetailPanels[index]; + panelDetail.editPanel.isSavingInstructorEdit = true; const reqBody: InstructorCreateRequest = { id: panelDetail.originalInstructor.joinState === JoinState.JOINED ? panelDetail.originalInstructor.googleId : undefined, @@ -379,7 +393,7 @@ export class InstructorCourseEditPageComponent implements OnInit { this.instructorService.updateInstructor({ courseId: panelDetail.originalInstructor.courseId, requestBody: reqBody, - }).subscribe((resp: Instructor) => { + }).pipe(finalize(() => panelDetail.editPanel.isSavingInstructorEdit = false)).subscribe((resp: Instructor) => { panelDetail.originalInstructor = Object.assign({}, resp); const permission: InstructorOverallPermission = panelDetail.editPanel.permission; @@ -455,6 +469,7 @@ export class InstructorCourseEditPageComponent implements OnInit { * Adds new instructor. */ addNewInstructor(): void { + this.isSavingNewInstructor = true; const reqBody: InstructorCreateRequest = { name: this.newInstructorPanel.name, email: this.newInstructorPanel.email, @@ -464,6 +479,7 @@ export class InstructorCourseEditPageComponent implements OnInit { } as InstructorCreateRequest; this.instructorService.createInstructor({ courseId: this.courseId, requestBody: reqBody }) + .pipe(finalize(() => this.isSavingNewInstructor = false)) .subscribe((resp: Instructor) => { const newDetailPanels: InstructorEditPanelDetail = { originalInstructor: Object.assign({}, resp), @@ -505,6 +521,7 @@ export class InstructorCourseEditPageComponent implements OnInit { }, isEditing: true, + isSavingInstructorEdit: false, }; }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); @@ -519,6 +536,7 @@ export class InstructorCourseEditPageComponent implements OnInit { const permission: InstructorOverallPermission = panel.editPanel.permission; if (instructor.role !== InstructorPermissionRole.INSTRUCTOR_PERMISSION_ROLE_CUSTOM) { + this.isInstructorsLoading = false; return; } @@ -592,7 +610,7 @@ export class InstructorCourseEditPageComponent implements OnInit { }); // get all permission - forkJoin(requests).subscribe(() => { + forkJoin(requests).pipe(finalize(() => this.isInstructorsLoading = false)).subscribe(() => { permission.sectionLevel = permission.sectionLevel .filter((sectionLevelPermission: InstructorSectionLevelPermission) => { // discard section level permission that is consistent with the overall permission diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.module.ts b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.module.ts index ba16ffde02a..84391c2e6df 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.module.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.module.ts @@ -3,6 +3,8 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { TeammatesCommonModule } from '../../components/teammates-common/teammates-common.module'; import { CustomPrivilegeSettingPanelComponent, @@ -39,6 +41,8 @@ const routes: Routes = [ RouterModule.forChild(routes), NgbTooltipModule, TeammatesCommonModule, + LoadingSpinnerModule, + AjaxLoadingModule, ], entryComponents: [ ViewRolePrivilegesModalComponent, diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.html b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.html index 7990b951c9d..f5b37d969d6 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.html +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.html @@ -7,27 +7,29 @@
        diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.spec.ts b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.spec.ts index e67a39cd1d1..c209f7778fc 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.spec.ts @@ -2,6 +2,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { AjaxLoadingModule } from '../../../components/ajax-loading/ajax-loading.module'; +import { LoadingSpinnerModule } from '../../../components/loading-spinner/loading-spinner.module'; import { TeammatesCommonModule } from '../../../components/teammates-common/teammates-common.module'; import { CustomPrivilegeSettingPanelComponent, @@ -26,7 +28,9 @@ describe('InstructorEditPanelComponent', () => { imports: [ FormsModule, NgbModule, + AjaxLoadingModule, TeammatesCommonModule, + LoadingSpinnerModule, ], }) .compileComponents(); diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.ts b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.ts index 56989e50f41..37ad5a6ac9d 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.ts @@ -20,6 +20,7 @@ export interface InstructorEditPanel { permission: InstructorOverallPermission; isEditing: boolean; + isSavingInstructorEdit: boolean; } /** @@ -84,6 +85,7 @@ export class InstructorEditPanelComponent implements OnInit { }, isEditing: false, + isSavingInstructorEdit: false, }; @Output() instructorChange: EventEmitter = new EventEmitter(); @@ -106,6 +108,9 @@ export class InstructorEditPanelComponent implements OnInit { @Input() allSessions: string[] = []; + @Input() + isSavingNewInstructor: boolean = false; + @Output() sendRemindJoinEmail: EventEmitter = new EventEmitter(); @Output() diff --git a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.html b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.html index bc33be89ae0..0e0aa0fe8bb 100644 --- a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.html +++ b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.html @@ -92,7 +92,9 @@

    Enroll Students for {{ courseid }}

    id="btn-enroll" name="button-enroll" class="btn btn-primary float-right" + [disabled]="isEnrolling" (click)="submitEnrollData()"> + Enroll students
    diff --git a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.spec.ts b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.spec.ts index e3281d10e80..c77ffd3c230 100644 --- a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.spec.ts @@ -2,7 +2,9 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { HotTableModule } from '@handsontable/angular'; +import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; import { AjaxPreloadModule } from '../../components/ajax-preload/ajax-preload.module'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { StatusMessageModule } from '../../components/status-message/status-message.module'; import { InstructorCourseEnrollPageComponent } from './instructor-course-enroll-page.component'; @@ -18,7 +20,9 @@ describe('InstructorCourseEnrollPageComponent', () => { HotTableModule, RouterTestingModule, AjaxPreloadModule, + AjaxLoadingModule, StatusMessageModule, + LoadingSpinnerModule, ], }) .compileComponents(); diff --git a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.ts b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.ts index 762f825d0af..3f95db09bd9 100644 --- a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.ts +++ b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.ts @@ -3,6 +3,7 @@ import { ActivatedRoute } from '@angular/router'; import { HotTableRegisterer } from '@handsontable/angular'; import Handsontable from 'handsontable'; +import { finalize } from 'rxjs/operators'; import { CourseService } from '../../../services/course.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; @@ -69,6 +70,7 @@ export class InstructorCourseEnrollPageComponent implements OnInit { isExistingStudentsPresent: boolean = true; loading: boolean = false; isAjaxSuccess: boolean = true; + isEnrolling: boolean = false; constructor(private route: ActivatedRoute, private statusMessageService: StatusMessageService, @@ -86,6 +88,7 @@ export class InstructorCourseEnrollPageComponent implements OnInit { * Submits enroll data */ submitEnrollData(): void { + this.isEnrolling = true; const newStudentsHOTInstance: Handsontable = this.hotRegisterer.getInstance(this.newStudentsHOT); @@ -113,7 +116,9 @@ export class InstructorCourseEnrollPageComponent implements OnInit { '' : row[hotInstanceColHeaders.indexOf(this.colHeaders[4])], }))); - this.studentService.enrollStudents(this.courseid, studentsEnrollRequest).subscribe((resp: Students) => { + this.studentService.enrollStudents( + this.courseid, studentsEnrollRequest, + ).pipe(finalize(() => this.isEnrolling = false)).subscribe((resp: Students) => { const enrolledStudents: Student[] = resp.students; this.showEnrollResults = true; this.statusMessage.pop(); // removes any existing error status message diff --git a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.module.ts b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.module.ts index 1fe600eac6b..610c37c7dd1 100644 --- a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.module.ts +++ b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.module.ts @@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { HotTableModule } from '@handsontable/angular'; +import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; import { AjaxPreloadModule } from '../../components/ajax-preload/ajax-preload.module'; import { StatusMessageModule } from '../../components/status-message/status-message.module'; import { InstructorCourseEnrollPageComponent } from './instructor-course-enroll-page.component'; @@ -29,6 +30,7 @@ const routes: Routes = [ StatusMessageModule, AjaxPreloadModule, RouterModule.forChild(routes), + AjaxLoadingModule, ], }) export class InstructorCourseEnrollPageModule { } diff --git a/src/web/app/pages-instructor/instructor-course-student-details-page/__snapshots__/instructor-course-student-details-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-course-student-details-page/__snapshots__/instructor-course-student-details-page.component.spec.ts.snap index 6c4f3a17264..e14824b0b32 100644 --- a/src/web/app/pages-instructor/instructor-course-student-details-page/__snapshots__/instructor-course-student-details-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-course-student-details-page/__snapshots__/instructor-course-student-details-page.component.spec.ts.snap @@ -2,18 +2,36 @@ exports[`InstructorCourseStudentDetailsPageComponent should snap with default fields 1`] = ` - + +
    + + `; exports[`InstructorCourseStudentDetailsPageComponent should snap with populated student 1`] = ` -

    - firstName -

    + +
    + + `; diff --git a/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.component.html b/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.component.html index cfc95bc33fc..eb61c937e06 100644 --- a/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.component.html +++ b/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.component.html @@ -1,6 +1,8 @@ - -

    {{student?.name}}

    - - - -     +
    + +

    {{student?.name}}

    + + + +     +
    diff --git a/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.component.spec.ts b/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.component.spec.ts index 70e9d577137..90efb9e62bc 100644 --- a/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.component.spec.ts @@ -3,6 +3,7 @@ import { Component, Input } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { Gender, JoinState, Student, StudentProfile } from '../../../types/api-output'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { InstructorCourseStudentDetailsPageComponent, } from './instructor-course-student-details-page.component'; @@ -48,6 +49,7 @@ describe('InstructorCourseStudentDetailsPageComponent', () => { imports: [ HttpClientTestingModule, RouterTestingModule, + LoadingSpinnerModule, ], }) .compileComponents(); diff --git a/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.component.ts b/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.component.ts index fe6a0074035..75b75084caf 100644 --- a/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.component.ts +++ b/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { finalize } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentProfileService } from '../../../services/student-profile.service'; @@ -21,6 +22,9 @@ export class InstructorCourseStudentDetailsPageComponent implements OnInit { studentProfile?: StudentProfile; photoUrl: string = ''; + isStudentLoading: boolean = false; + isStudentProfileLoading: boolean = false; + constructor(private route: ActivatedRoute, private statusMessageService: StatusMessageService, private studentService: StudentService, @@ -41,12 +45,18 @@ export class InstructorCourseStudentDetailsPageComponent implements OnInit { * Loads the student's details based on the given course ID and email. */ loadStudentDetails(courseId: string, studentEmail: string): void { - this.studentProfileService.getStudentProfile(studentEmail, courseId).subscribe((studentProfile: StudentProfile) => { + this.isStudentProfileLoading = true; + this.isStudentLoading = true; + this.studentProfileService.getStudentProfile( + studentEmail, courseId, + ).pipe(finalize(() => this.isStudentProfileLoading = false)).subscribe((studentProfile: StudentProfile) => { this.studentProfile = studentProfile; }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); - this.studentService.getStudent(courseId, studentEmail).subscribe((student: Student) => { + this.studentService.getStudent( + courseId, studentEmail, + ).pipe(finalize(() => this.isStudentLoading = false)).subscribe((student: Student) => { this.student = student; }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); diff --git a/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.module.ts b/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.module.ts index 7955f9b9759..57dc01175f9 100644 --- a/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.module.ts +++ b/src/web/app/pages-instructor/instructor-course-student-details-page/instructor-course-student-details-page.module.ts @@ -1,6 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { StudentProfileModule } from '../student-profile/student-profile.module'; import { InstructorCourseStudentDetailsPageComponent } from './instructor-course-student-details-page.component'; @@ -25,6 +26,7 @@ const routes: Routes = [ CommonModule, StudentProfileModule, RouterModule.forChild(routes), + LoadingSpinnerModule, ], }) export class InstructorCourseStudentDetailsPageModule { } diff --git a/src/web/app/pages-instructor/instructor-course-student-edit-page/__snapshots__/instructor-course-student-edit-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-course-student-edit-page/__snapshots__/instructor-course-student-edit-page.component.spec.ts.snap index e88afa038a7..cb1cb84aad4 100644 --- a/src/web/app/pages-instructor/instructor-course-student-edit-page/__snapshots__/instructor-course-student-edit-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-course-student-edit-page/__snapshots__/instructor-course-student-edit-page.component.spec.ts.snap @@ -1,11 +1,45 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`InstructorCourseStudentEditPageComponent should snap when student is still loading 1`] = ` + + +
    + + + +`; + exports[`InstructorCourseStudentEditPageComponent should snap with default fields 1`] = ` - + +
    + + `; @@ -25,6 +73,7 @@ exports[`InstructorCourseStudentEditPageComponent should snap with student detai editForm={[Function FormGroup]} isEmailFieldChanged="false" isEnabled={[Function Boolean]} + isStudentLoading="false" isTeamnameFieldChanged="false" ngbModal={[Function NgbModal]} route={[Function ActivatedRoute]} @@ -35,6 +84,7 @@ exports[`InstructorCourseStudentEditPageComponent should snap with student detai studentService={[Function StudentService]} >
    +
    diff --git a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-form.module.ts b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-form.module.ts index 904d55e727c..88874e82c77 100644 --- a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-form.module.ts +++ b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-form.module.ts @@ -1,6 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { InstructorCourseStudentEditPageComponent } from './instructor-course-student-edit-page.component'; /** @@ -16,6 +17,7 @@ import { InstructorCourseStudentEditPageComponent } from './instructor-course-st imports: [ CommonModule, ReactiveFormsModule, + LoadingSpinnerModule, ], }) export class InstructorCourseStudentEditFormModule { } diff --git a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.html b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.html index 3e4214d419a..0bcd8519341 100644 --- a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.html +++ b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.html @@ -1,5 +1,5 @@ -
    -
    +
    +
    { @@ -16,6 +17,7 @@ describe('InstructorCourseStudentEditPageComponent', () => { RouterTestingModule, ReactiveFormsModule, HttpClientTestingModule, + LoadingSpinnerModule, ], }) .compileComponents(); @@ -53,6 +55,13 @@ describe('InstructorCourseStudentEditPageComponent', () => { newstudentemail: new FormControl('jake@gmail.com'), comments: new FormControl('Cool cool cool.'), }); + component.isStudentLoading = false; + fixture.detectChanges(); + expect(fixture).toMatchSnapshot(); + }); + + it('should snap when student is still loading', () => { + component.isStudentLoading = true; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); }); diff --git a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.ts b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.ts index 4beda4b9f31..669111d678b 100644 --- a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.ts +++ b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.ts @@ -3,6 +3,7 @@ import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/fo import { ActivatedRoute, Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Subscription } from 'rxjs'; +import { finalize } from 'rxjs/operators'; import { StatusMessageService } from '../../../services/status-message.service'; import { JoinState, MessageOutput, Student } from '../../../types/api-output'; import { StudentUpdateRequest } from '../../../types/api-request'; @@ -23,19 +24,20 @@ import { SimpleModalType } from '../../components/simple-modal/simple-modal-type }) export class InstructorCourseStudentEditPageComponent implements OnInit, OnDestroy { + FormValidator: typeof FormValidator = FormValidator; // enum + @Input() isEnabled: boolean = true; courseId: string = ''; student!: Student; isTeamnameFieldChanged: boolean = false; isEmailFieldChanged: boolean = false; + isStudentLoading: boolean = false; editForm!: FormGroup; teamFieldSubscription?: Subscription; emailFieldSubscription?: Subscription; - FormValidator: typeof FormValidator = FormValidator; // enum - constructor(private route: ActivatedRoute, private router: Router, private statusMessageService: StatusMessageService, @@ -78,7 +80,10 @@ export class InstructorCourseStudentEditPageComponent implements OnInit, OnDestr * Loads student details required for this page. */ loadStudentEditDetails(courseId: string, studentEmail: string): void { - this.studentService.getStudent(courseId, studentEmail).subscribe((student: Student) => { + this.isStudentLoading = true; + this.studentService.getStudent( + courseId, studentEmail, + ).pipe(finalize(() => this.isStudentLoading = false)).subscribe((student: Student) => { this.student = student; this.initEditForm(); }, (resp: ErrorMessageOutput) => { diff --git a/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap index 22934c60d04..17143c9a7cb 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap @@ -1,5 +1,57 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`InstructorCoursesPageComponent should snap when courses are still loading 1`] = ` + +
    + +
    +
    + + + +`; + exports[`InstructorCoursesPageComponent should snap when it is undeletable and unrestorable 1`] = ` Add New Course -
    -

    - Active courses -

    +
    +
    - + Active courses + +
    -
    - - - - - - - - - - - - - - - - - - - - - - + - - - - -
    + + + + + +
    + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + - - + + + + +
    - Course ID - - - - - - - - Course Name - - - - - - - - Creation Date - - - - - - - - Sections - - Teams - - Total Students - - Total Unregistered - - Action(s) -
    - CS3281 - - Modifiable Students and Courses - - 5 Nov 2018 - - - - - 1 - - - - - - 1 - - - - - - 1 - - - - - - 1 - - +
    + Course Name + + + + + + + + Creation Date + + + + + + + + Sections + + Teams + + Total Students + + Total Unregistered + + Action(s) +
    + CS3281 + + Modifiable Students and Courses + + 5 Nov 2018 + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + +
    - - - - - - + + + + + + + +
    - -
    - CS3282 - - Nothing modifiable - - 2 Feb 2019 - - - - - 2 - - - - - - 2 - - - - - - 2 - - - - - - 2 - - - - -
    - Enroll - -
    +
    		+ Nothing modifiable + + 2 Feb 2019 + + + + + 2 + + + + + + 2 + + + + + + 2 + + + + + + 2 + + + +
    - - - - - + + + + + + +
    - -
    - - +
    Add New Course -
    -

    - Active courses -

    +
    +
    - + Active courses + +
    -
    - - - - - - - - - - - - - - - - - - - - - - + - - - - -
    + + + + + +
    + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + - - + + + + +
    - Course ID - - - - - - - - Course Name - - - - - - - - Creation Date - - - - - - - - Sections - - Teams - - Total Students - - Total Unregistered - - Action(s) -
    - CS3281 - - Modifiable Students and Courses - - 5 Nov 2018 - - - - - 1 - - - - - - 1 - - - - - - 1 - - - - - - 1 - - +
    + Course Name + + + + + + + + Creation Date + + + + + + + + Sections + + Teams + + Total Students + + Total Unregistered + + Action(s) +
    + CS3281 + + Modifiable Students and Courses + + 5 Nov 2018 + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + +
    - - - - - - + + + + + + + +
    - -
    - CS3282 - - Nothing modifiable - - 2 Feb 2019 - - - - - 2 - - - - - - 2 - - - - - - 2 - - - - - - 2 - - - - -
    - Enroll - -
    +
    		+ Nothing modifiable + + 2 Feb 2019 + + + + + 2 + + + + + + 2 + + + + + + 2 + + + + + + 2 + + + +
    - - - - - + + + + + + +
    - -
    - - +
    Add New Course -
    +
    +
    + + `; @@ -953,6 +1023,7 @@ exports[`InstructorCoursesPageComponent should snap with no courses in course st instructorService={[Function InstructorService]} isAddNewCourseFormExpanded="false" isArchivedCourseExpanded="false" + isLoading="false" isRecycleBinExpanded="false" route={[Function ActivatedRoute]} simpleModalService={[Function SimpleModalService]} @@ -973,342 +1044,345 @@ exports[`InstructorCoursesPageComponent should snap with no courses in course st /> Add New Course -
    -

    - Active courses -

    +
    +
    - + Active courses + +
    -
    - - - - - - - - - - - - - - - - - - - - - - + - - - - -
    + + + + + +
    + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + - - + + + + +
    - Course ID - - - - - - - - Course Name - - - - - - - - Creation Date - - - - - - - - Sections - - Teams - - Total Students - - Total Unregistered - - Action(s) -
    - CS3281 - - Modifiable Students and Courses - - 5 Nov 2018 - - - - - Show - - - - - - - - Show - - - - - - - - Show - - - - - - - - Show - - - - +
    + Course Name + + + + + + + + Creation Date + + + + + + + + Sections + + Teams + + Total Students + + Total Unregistered + + Action(s) +
    + CS3281 + + Modifiable Students and Courses + + 5 Nov 2018 + + + + + Show + + + + + + + + Show + + + + + + + + Show + + + + + + + + Show + + + + + + +
    - - - - - - + + + + + + + +
    - -
    - CS3282 - - Nothing modifiable - - 2 Feb 2019 - - - - - Show - - - - - - - - Show - - - - - - - - Show - - - - - - - - Show - - - - - - -
    - Enroll - -
    +
    		+ Nothing modifiable + + 2 Feb 2019 + + + + + Show + + + + + + + + Show + + + + + + + + Show + + + + + + + + Show + + + + + +
    - - - - - + + + + + + +
    - -
    - - +
    diff --git a/src/web/app/pages-instructor/instructor-courses-page/add-course-form/__snapshots__/add-course-form.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-courses-page/add-course-form/__snapshots__/add-course-form.component.spec.ts.snap index 7e89e7c7072..32b24389e73 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/add-course-form/__snapshots__/add-course-form.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-courses-page/add-course-form/__snapshots__/add-course-form.component.spec.ts.snap @@ -5,6 +5,7 @@ exports[`AddCourseFormComponent should snap when not enabled 1`] = ` closeCourseFormEvent={[Function EventEmitter]} courseAdded={[Function EventEmitter]} courseService={[Function Object]} + isAddingCourse="false" isEnabled="false" newCourseId="" newCourseName="" @@ -127,7 +128,8 @@ exports[`AddCourseFormComponent should snap when not enabled 1`] = ` class="btn btn-primary" id="btn-save-course" > - Add Course + + Add Course
    @@ -141,6 +143,7 @@ exports[`AddCourseFormComponent should snap with default fields 1`] = ` closeCourseFormEvent={[Function EventEmitter]} courseAdded={[Function EventEmitter]} courseService={[Function Object]} + isAddingCourse="false" isEnabled={[Function Boolean]} newCourseId="" newCourseName="" @@ -263,7 +266,8 @@ exports[`AddCourseFormComponent should snap with default fields 1`] = ` class="btn btn-primary" id="btn-save-course" > - Add Course + + Add Course
    diff --git a/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.component.html b/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.component.html index e2b5c7d7236..52f9fe37213 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.component.html +++ b/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.component.html @@ -10,7 +10,7 @@
    + [maxlength]="40" [disabled]="isAddingCourse" placeholder="e.g. CS3215-2013Semester1"/>
    @@ -18,27 +18,30 @@
    + [maxlength]="64" [disabled]="isAddingCourse" placeholder="e.g. Software Engineering"/>
    - - +
    - +
    diff --git a/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.component.spec.ts b/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.component.spec.ts index 645fcb5c155..a2bb6d226f6 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.component.spec.ts @@ -3,6 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { CourseService } from '../../../../services/course.service'; import { StatusMessageService } from '../../../../services/status-message.service'; import { TimezoneService } from '../../../../services/timezone.service'; +import { AjaxLoadingModule } from '../../../components/ajax-loading/ajax-loading.module'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @@ -42,6 +43,7 @@ describe('AddCourseFormComponent', () => { ReactiveFormsModule, RouterTestingModule, NgbModule, + AjaxLoadingModule, ], providers: [ { provide: StatusMessageService, useValue: spyStatusMessageService }, diff --git a/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.component.ts b/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.component.ts index c6b04ec9d05..adb928c01e4 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.component.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.component.ts @@ -1,4 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { finalize } from 'rxjs/operators'; import { CourseService } from '../../../../services/course.service'; import { StatusMessageService } from '../../../../services/status-message.service'; import { TimezoneService } from '../../../../services/timezone.service'; @@ -34,6 +35,7 @@ export class AddCourseFormComponent implements OnInit { timezone: string = ''; newCourseId: string = ''; newCourseName: string = ''; + isAddingCourse: boolean = false; constructor(private statusMessageService: StatusMessageService, private courseService: CourseService, @@ -75,11 +77,13 @@ export class AddCourseFormComponent implements OnInit { 'Please make sure you have filled in both Course ID and Name before adding the course!'); return; } + + this.isAddingCourse = true; this.courseService.createCourse({ courseName: this.newCourseName, timeZone: this.timezone, courseId: this.newCourseId, - }).subscribe(() => { + }).pipe(finalize(() => this.isAddingCourse = false)).subscribe(() => { this.courseAdded.emit(); this.statusMessageService.showSuccessToast('The course has been added.'); }, (resp: ErrorMessageOutput) => { diff --git a/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.module.ts b/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.module.ts index 0bd05849d9a..0a9b9ddfe7b 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.module.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/add-course-form/add-course-form.module.ts @@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; +import { AjaxLoadingModule } from '../../../components/ajax-loading/ajax-loading.module'; import { AddCourseFormComponent } from './add-course-form.component'; /** @@ -14,6 +15,7 @@ import { AddCourseFormComponent } from './add-course-form.component'; CommonModule, FormsModule, RouterModule, + AjaxLoadingModule, ], }) export class AddCourseFormModule { } diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html index 8203cd1f891..e509adc3ada 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html @@ -16,11 +16,12 @@
    -
    -

    Active courses

    -
    - - +
    +
    +

    Active courses

    +
    +
    + - - + + @@ -95,58 +96,59 @@

    Active courses

    + + - - - - - - - - - - - -
    Course ID @@ -46,8 +47,8 @@

    Active courses

    		Total Unregistered Action(s)
    {{course.course.courseId}} {{course.course.courseName}} - - -
    - -
    - - - - - -
    + Enroll + + +
    + +
    + + + + +
    -
    -

    No records found.

    + + + + + + + + + + + + +

    No records found.

    +
    diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.spec.ts b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.spec.ts index 658707cc8fc..6af32008ba6 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.spec.ts @@ -4,6 +4,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { InstructorCoursesPageComponent } from './instructor-courses-page.component'; @Component({ selector: 'tm-add-course-form', template: '' }) @@ -114,6 +115,7 @@ describe('InstructorCoursesPageComponent', () => { RouterTestingModule, NgbModule, BrowserAnimationsModule, + LoadingSpinnerModule, ], }) .compileComponents(); @@ -138,6 +140,7 @@ describe('InstructorCoursesPageComponent', () => { component.archivedCourses = archivedCourses; component.softDeletedCourses = deletedCourses; component.courseStats = courseStats; + component.isLoading = false; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); }); @@ -149,12 +152,20 @@ describe('InstructorCoursesPageComponent', () => { component.courseStats = courseStats; component.canDeleteAll = false; component.canRestoreAll = false; + component.isLoading = false; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); }); it('should snap with no courses in course stats', () => { component.activeCourses = activeCourses; + component.isLoading = false; + fixture.detectChanges(); + expect(fixture).toMatchSnapshot(); + }); + + it('should snap when courses are still loading', () => { + component.isLoading = true; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); }); diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts index 52fd2370541..999ee298e26 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts @@ -52,6 +52,7 @@ export class InstructorCoursesPageComponent implements OnInit { SortBy: typeof SortBy = SortBy; SortOrder: typeof SortOrder = SortOrder; + isLoading: boolean = false; isRecycleBinExpanded: boolean = false; canDeleteAll: boolean = true; canRestoreAll: boolean = true; @@ -79,6 +80,7 @@ export class InstructorCoursesPageComponent implements OnInit { * Loads instructor courses required for this page. */ loadInstructorCourses(): void { + this.isLoading = true; this.activeCourses = []; this.archivedCourses = []; this.softDeletedCourses = []; @@ -99,7 +101,7 @@ export class InstructorCoursesPageComponent implements OnInit { }); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); - }); + }, () => this.isLoading = false); this.courseService.getAllCoursesAsInstructor('archived').subscribe((resp: Courses) => { for (const course of resp.courses) { diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.module.ts b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.module.ts index 0f8265ff95b..c4a744f5c69 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.module.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.module.ts @@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { AddCourseFormModule } from './add-course-form/add-course-form.module'; import { InstructorCoursesPageComponent } from './instructor-courses-page.component'; @@ -31,6 +32,7 @@ const routes: Routes = [ NgbDropdownModule, NgbTooltipModule, AddCourseFormModule, + LoadingSpinnerModule, ], }) export class InstructorCoursesPageModule { } diff --git a/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap index bc9fc4767fe..0e25087253a 100644 --- a/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`InstructorHomePageComponent should snap with default fields 1`] = ` +exports[`InstructorHomePageComponent should snap when courses are still loading 1`] = `
    -
    +
    + + +
    + + + +`; + +exports[`InstructorHomePageComponent should snap with default fields 1`] = ` + +

    + Home +

    - - Add New Course - +
    + +
    + +
    +
    +
    - -
    +
    +
    + + +
    + + `; @@ -82,7 +181,7 @@ exports[`InstructorHomePageComponent should snap with one course with error load courseTabModels={[Function Array]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackSessionsService={[Function FeedbackSessionsService]} - hasCoursesLoaded="false" + hasCoursesLoaded={[Function Boolean]} instructorCoursesSortBy={[Function Number]} instructorService={[Function InstructorService]} isNewUser="false" @@ -178,48 +277,59 @@ exports[`InstructorHomePageComponent should snap with one course with error load
    -
    +
    +
    - - [CS3281]: Thematic Systems - -
    -
    - - Error loading feedback sessions. Click here to retry. - - Error loading feedback sessions. Click here to retry. +
    + + [CS3281]: Thematic Systems + +
    +
    + + Error loading feedback sessions. Click here to retry. + + Error loading feedback sessions. Click here to retry. +
    -
    - - -
    - + + +
    -
    - There are no feedback sessions in this course. -
    - - +
    + + +
    @@ -235,7 +345,7 @@ exports[`InstructorHomePageComponent should snap with one course with one feedba courseTabModels={[Function Array]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackSessionsService={[Function FeedbackSessionsService]} - hasCoursesLoaded="false" + hasCoursesLoaded={[Function Boolean]} instructorCoursesSortBy={[Function Number]} instructorService={[Function InstructorService]} isNewUser="false" @@ -331,419 +441,424 @@ exports[`InstructorHomePageComponent should snap with one course with one feedba
    -
    +
    +
    - - [CS3281]: Thematic Systems - -
    -
    -
    - + [CS3281]: Thematic Systems + +
    +
    + +
    - -
    - - - - - +
    - View / Edit - -
    - - - -
    + Enroll + + + + View / Edit + +
    +     + - -
    - - - -
    - +
    - Add - -
    - - - -
    + View / Edit + +
    +     + - - +
    - View / Edit - - - - + Add + +
    +     + +
    -     -
    - -
    - + Course + +
    + + Archive + + + View / Edit + + + + + Delete + + +
    + +
    - +
    + + + +
    -
    - - -
    - + + +
    -
    +
    - - - - - - - + +
    - Session Name - - - - - - - - Start Date + + + - - - - - - - - - - - - + Start Date + + + + + + + - - - - - - - - - - - - - - + + + + + - - - -
    - 0 / 6 -
    +     - - + + + + + + + + - - -
    - End Date + Session Name + + + + + + + - Submissions - - Responses - - - Response Rate - - - Action(s) -
    - Feedback - - + + + + + + + Submissions + + Responses + - 19 Jan 6:43 AM - - - - - - + Response Rate + + + - 19 Jan 6:46 AM - - + Action(s) +
    - - Awaiting - - - - Not Published - - - +
    + Feedback + - - - Delete - - - Copy - - - Submit - -
    + Not Published + +
    		+ + +
    + 0 / 6 +
    + +     		+ + +
    - - - - - + + + + + + + +
    + +
    - -
    - -
    -
    + +
    +
    -
    - -     + + +
    @@ -759,7 +874,7 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba courseTabModels={[Function Array]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackSessionsService={[Function FeedbackSessionsService]} - hasCoursesLoaded="false" + hasCoursesLoaded={[Function Boolean]} instructorCoursesSortBy={[Function Number]} instructorService={[Function InstructorService]} isNewUser="false" @@ -855,553 +970,558 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba
    -
    +
    +
    - - [CS3281]: Thematic Systems - -
    -
    -
    - + [CS3281]: Thematic Systems + +
    +
    + +
    - -
    - - -
    - - - -
    - +
    - View / Edit - -
    - - - -
    + View / Edit + +
    +     + - -
    -     - - - - -
    - + + Archive + + + View / Edit + + +
    +     +
    - +
    + + + +
    -
    - - -
    - + + +
    -
    +
    - - - - - - - + +
    - Session Name - - - - - - - - Start Date + + + - - - - - - - - - - - - + Start Date + + + + + + + - - - - - - - - - - - - - - + + + + + - - - -
    - 0 / 6 -
    +     - - + + + + + + + + + + + + + - - - - - - - - - - - - - -
    - 5 / 6 -
    - -     + + + + + - - -
    - End Date + Session Name + + + + + + + - Submissions - - Responses - - - Response Rate - - - Action(s) -
    - Feedback 1 - - + + + + + + + Submissions + + Responses + - 1 Jan 7:30 AM - - - - - - + Response Rate + + + - 1 Jan 7:30 AM - - + Action(s) +
    - - Closed - - - - Published - - - +
    + Feedback 1 + - - - Delete - - - Copy - - - Submit - -
    + Published + +
    		+ + +
    + 0 / 6 +
    + +     		+ + +
    - - - - - - + + + + + + + + +
    + +
    - -
    +
    + Feedback 2 + - - -
    - Feedback 2 - - - 1 Jan 7:30 AM - - - - 1 Jan 7:30 AM - - - - Open - - - - Not Published - - - + 1 Jan 7:30 AM + + - - - - Copy - - - Submit - -
    + Not Published + +
    		+ + +
    + 5 / 6 +
    + +     		+ + +
    - - - - - + + + + + + + +
    + +
    - -
    - -
    -
    + +
    +
    -
    - -     + + +
    @@ -1417,7 +1537,7 @@ exports[`InstructorHomePageComponent should snap with one course with unexpanded courseTabModels={[Function Array]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackSessionsService={[Function FeedbackSessionsService]} - hasCoursesLoaded="false" + hasCoursesLoaded={[Function Boolean]} instructorCoursesSortBy={[Function Number]} instructorService={[Function InstructorService]} isNewUser="false" @@ -1513,179 +1633,182 @@ exports[`InstructorHomePageComponent should snap with one course with unexpanded
    -
    +
    +
    - - [CS3281]: Thematic Systems - -
    -
    -
    + + [CS3281]: Thematic Systems + +
    +
    - - -
    - - - - - +
    - View / Edit - -
    - - - -
    + Enroll + + + + View / Edit + +
    +     + - -
    -     - - -
    - +
    - Add - -
    - - - -
    + View / Edit + +
    +     + - - +
    - View / Edit - - - - + Add + +
    +     + +
    -     -
    - -
    - - + Course + +
    + + Archive + + + View / Edit + + + + + Delete + + +
    + +
    +
    + + + +
    + +
    - -
    @@ -1700,7 +1823,7 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate courseTabModels={[Function Array]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackSessionsService={[Function FeedbackSessionsService]} - hasCoursesLoaded="false" + hasCoursesLoaded={[Function Boolean]} instructorCoursesSortBy={[Function Number]} instructorService={[Function InstructorService]} isNewUser="false" @@ -1796,193 +1919,204 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate
    -
    +
    +
    - - [CS3281]: Thematic Systems - -
    -
    -
    + + [CS3281]: Thematic Systems + +
    +
    - - -
    - - - - - +
    - View / Edit - -
    - - - -
    + Enroll + + + + View / Edit + +
    +     + - -
    -     - - -
    - +
    - Add - -
    - - - -
    + View / Edit + +
    +     + - - +
    - View / Edit - - - - + Add + +
    +     + +
    -     -
    - -
    - + Course + +
    + + Archive + + + View / Edit + + + + + Delete + + +
    + +
    - +
    + + + +
    -
    - - -
    - + + +
    -
    - There are no feedback sessions in this course. -
    - - +
    + + +
    @@ -1998,7 +2132,7 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac courseTabModels={[Function Array]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackSessionsService={[Function FeedbackSessionsService]} - hasCoursesLoaded="false" + hasCoursesLoaded={[Function Boolean]} instructorCoursesSortBy={[Function Number]} instructorService={[Function InstructorService]} isNewUser="false" @@ -2094,193 +2228,198 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac
    -
    +
    +
    - - [CS3243]: Introduction to AI - -
    -
    -
    + + [CS3243]: Introduction to AI + +
    +
    - - -
    - - - - - +
    - View / Edit - -
    - - - -
    + Enroll + + + + View / Edit + +
    +     + - -
    -     - - -
    - +
    - Add - -
    - - - -
    + View / Edit + +
    +     + - - +
    - View / Edit - - - - + Add + +
    +     + +
    -     -
    - -
    - + Course + +
    + + Archive + + + View / Edit + + + + + Delete + + +
    + +
    - +
    + + + +
    -
    - - -
    - + + +
    -
    - There are no feedback sessions in this course. -
    - - + +
    + There are no feedback sessions in this course. +
    + + +
    diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html index 57f9ba7c250..5096bfa6736 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html @@ -20,7 +20,7 @@

    Home

    -
    +
    Add New Course
    @@ -36,93 +36,95 @@

    Home

    -
    -
    -
    -
    -
    - [{{ courseTabModel.course.courseId }}]: {{ courseTabModel.course.courseName }} -
    -
    -
    - - -
    - - + - - Error loading feedback sessions. Click here to retry. - + + Error loading feedback sessions. Click here to retry. + -
    - +
    + +
    diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.spec.ts b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.spec.ts index 150203def2e..ea4d83765bb 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.spec.ts @@ -97,6 +97,7 @@ describe('InstructorHomePageComponent', () => { isAjaxSuccess: true, isTabExpanded: true, }; + component.hasCoursesLoaded = true; component.courseTabModels = [courseTabModels]; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); @@ -113,6 +114,7 @@ describe('InstructorHomePageComponent', () => { isAjaxSuccess: true, isTabExpanded: true, }; + component.hasCoursesLoaded = true; component.courseTabModels = [courseTabModels]; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); @@ -129,6 +131,7 @@ describe('InstructorHomePageComponent', () => { isAjaxSuccess: false, isTabExpanded: true, }; + component.hasCoursesLoaded = true; component.courseTabModels = [courseTabModels]; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); @@ -145,6 +148,7 @@ describe('InstructorHomePageComponent', () => { isAjaxSuccess: true, isTabExpanded: false, }; + component.hasCoursesLoaded = true; component.courseTabModels = [courseTabModels]; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); @@ -167,6 +171,7 @@ describe('InstructorHomePageComponent', () => { isAjaxSuccess: true, isTabExpanded: true, }; + component.hasCoursesLoaded = true; component.courseTabModels = [courseTabModels]; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); @@ -237,6 +242,24 @@ describe('InstructorHomePageComponent', () => { isAjaxSuccess: true, isTabExpanded: true, }; + component.hasCoursesLoaded = true; + component.courseTabModels = [courseTabModels]; + fixture.detectChanges(); + expect(fixture).toMatchSnapshot(); + }); + + it('should snap when courses are still loading', () => { + const courseTabModels: any = { + instructorPrivilege, + course: defaultCourse, + sessionsTableRowModels: [], + sessionsTableRowModelsSortBy: SortBy.NONE, + sessionsTableRowModelsSortOrder: SortOrder.ASC, + hasPopulated: true, + isAjaxSuccess: true, + isTabExpanded: true, + }; + component.hasCoursesLoaded = false; component.courseTabModels = [courseTabModels]; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.module.ts b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.module.ts index 85d861d7684..08db1b67be5 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.module.ts +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.module.ts @@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbCollapseModule, NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { SessionsTableModule } from '../../components/sessions-table/sessions-table.module'; import { InstructorHomePageComponent } from './instructor-home-page.component'; @@ -28,6 +29,7 @@ const routes: Routes = [ NgbCollapseModule, NgbDropdownModule, NgbTooltipModule, + LoadingSpinnerModule, ], exports: [ InstructorHomePageComponent, diff --git a/src/web/app/pages-instructor/instructor-page.component.spec.ts b/src/web/app/pages-instructor/instructor-page.component.spec.ts index cb31998e6bc..966ef7b58ed 100644 --- a/src/web/app/pages-instructor/instructor-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-page.component.spec.ts @@ -3,7 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { LoaderBarModule } from '../components/loader-bar/loader-bar.module'; -import { LoadingSpinnerComponent } from '../components/loading-spinner/loading-spinner.component'; +import { LoadingSpinnerModule } from '../components/loading-spinner/loading-spinner.module'; import { StatusMessageModule } from '../components/status-message/status-message.module'; import { ToastModule } from '../components/toast/toast.module'; import { PageComponent } from '../page.component'; @@ -18,12 +18,12 @@ describe('InstructorPageComponent', () => { declarations: [ PageComponent, InstructorPageComponent, - LoadingSpinnerComponent, ], imports: [ NgbModule, HttpClientTestingModule, LoaderBarModule, + LoadingSpinnerModule, RouterTestingModule, StatusMessageModule, ToastModule, diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html index e871cc1614a..a527ff34550 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html +++ b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html @@ -1,24 +1,26 @@ - -
    +
    -
    - +
    +
    + +

    -
    +
    @@ -34,7 +36,7 @@
    -   +  
    @@ -46,7 +48,7 @@ [(formModel)]="newQuestionEditFormModel" >
    -
    +
    diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts index e515bf5a88f..586584c9e1b 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts @@ -153,6 +153,9 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag }; isAddingQuestionPanelExpanded: boolean = false; + isLoadingFeedbackSession: boolean = false; + isLoadingFeedbackQuestions: boolean = false; + isCopyingQuestion: boolean = false; // all students of the course studentsOfCourse: Student[] = []; @@ -201,6 +204,7 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag * Loads a feedback session. */ loadFeedbackSession(): void { + this.isLoadingFeedbackSession = true; // load the course of the feedback session first this.courseService.getCourseAsInstructor(this.courseId).subscribe((course: Course) => { this.courseName = course.courseName; @@ -209,13 +213,16 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag courseId: this.courseId, feedbackSessionName: this.feedbackSessionName, intent: Intent.FULL_DETAIL, - }) + }).pipe(finalize(() => this.isLoadingFeedbackSession = false)) .subscribe((feedbackSession: FeedbackSession) => { this.sessionEditFormModel = this.getSessionEditFormModel(feedbackSession); this.feedbackSessionModelBeforeEditing = this.getSessionEditFormModel(feedbackSession); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); + }, (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + this.isLoadingFeedbackSession = false; }); } @@ -432,11 +439,13 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag * Loads feedback questions. */ loadFeedbackQuestions(): void { + this.isLoadingFeedbackQuestions = true; this.feedbackQuestionsService.getFeedbackQuestions({ courseId: this.courseId, feedbackSessionName: this.feedbackSessionName, intent: Intent.FULL_DETAIL, }) + .pipe(finalize(() => this.isLoadingFeedbackQuestions = false)) .subscribe((response: FeedbackQuestions) => { response.questions.forEach((feedbackQuestion: FeedbackQuestion) => { const addedQuestionEditFormModel: QuestionEditFormModel = this.getQuestionEditFormModel(feedbackQuestion); @@ -799,6 +808,7 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag ref.componentInstance.questionToCopyCandidates = questionToCopyCandidates; ref.result.then((questionsToCopy: FeedbackQuestion[]) => { + this.isCopyingQuestion = true; of(...questionsToCopy).pipe( concatMap((questionToCopy: FeedbackQuestion) => { return this.feedbackQuestionsService.createFeedbackQuestion(this.courseId, this.feedbackSessionName, { @@ -820,12 +830,13 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag showRecipientNameTo: questionToCopy.showRecipientNameTo, }); }), + finalize(() => this.isCopyingQuestion = false), ).subscribe((newQuestion: FeedbackQuestion) => { this.questionEditFormModels.push(this.getQuestionEditFormModel(newQuestion)); this.feedbackQuestionModels.set(newQuestion.feedbackQuestionId, newQuestion); this.statusMessageService.showSuccessToast('The question has been added to this feedback session.'); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); - }, () => {}); + }); }); } diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.module.ts b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.module.ts index ea092537c0e..b4f39cec988 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.module.ts +++ b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.module.ts @@ -5,6 +5,7 @@ import { RouterModule, Routes } from '@angular/router'; import { NgbCollapseModule, NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; import { CopySessionModalModule } from '../../components/copy-session-modal/copy-session-modal.module'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { QuestionEditFormModule } from '../../components/question-edit-form/question-edit-form.module'; import { SessionEditFormModule } from '../../components/session-edit-form/session-edit-form.module'; import { TeammatesCommonModule } from '../../components/teammates-common/teammates-common.module'; @@ -37,6 +38,7 @@ const routes: Routes = [ QuestionEditFormModule, CopySessionModalModule, RouterModule.forChild(routes), + LoadingSpinnerModule, ], entryComponents: [ TemplateQuestionModalComponent, diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-gqr-view.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-gqr-view.component.html index f32dcc9e275..f39c98483ea 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-gqr-view.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-gqr-view.component.html @@ -8,7 +8,7 @@
    -
    +
    { beforeEach(async(() => { TestBed.configureTestingModule({ declarations: [InstructorSessionResultGqrViewComponent], - imports: [GqrRqgViewResponsesModule, NgbModule], + imports: [GqrRqgViewResponsesModule, NgbModule, LoadingSpinnerModule], }) .compileComponents(); })); diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-grq-view.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-grq-view.component.html index 18a66535b4a..b2405701475 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-grq-view.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-grq-view.component.html @@ -8,7 +8,7 @@
    -
    +
    { beforeEach(async(() => { TestBed.configureTestingModule({ declarations: [InstructorSessionResultGrqViewComponent], - imports: [GrqRgqViewResponsesModule, NgbModule], + imports: [GrqRgqViewResponsesModule, NgbModule, LoadingSpinnerModule], }) .compileComponents(); })); diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html index f9899259fdf..b9d0b8482a9 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html @@ -2,119 +2,121 @@

    Feedback Session Results

    -
    -
    -
    -
    - -
    -

    {{ session.courseId }}

    +
    +
    +
    +
    +
    + +
    +

    {{ session.courseId }}

    +
    -
    -
    - -
    -

    {{ session.feedbackSessionName }} - -

    +
    + +
    +

    {{ session.feedbackSessionName }} + +

    +
    -
    -
    -
    - -
    -

    {{ formattedSessionOpeningTime }}   to   {{ formattedSessionClosingTime }}

    +
    +
    + +
    +

    {{ formattedSessionOpeningTime }}   to   {{ formattedSessionClosingTime }}

    +
    -
    -
    - -
    -

    {{ formattedResultVisibleFromTime }}

    +
    + +
    +

    {{ formattedResultVisibleFromTime }}

    +
    -
    -
    - - - +
    + + + +
    -
    -
    -
    -
    -
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    - +
    -
    -
    -
    - +
    -
    -
    -
    - +
    -
    - -
    - -
    -
    - -
    -
    - -
    -
    -
    - -
    - -
    +
    +
    + +
    { GrqRgqViewResponsesModule, PerQuestionViewResponsesModule, SingleStatisticsModule, + LoadingSpinnerModule, + AjaxLoadingModule, ], providers: [ CommentsToCommentTableModelPipe, diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts index 4f444b71360..2358ec4e874 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts @@ -3,6 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { saveAs } from 'file-saver'; import { Observable } from 'rxjs'; +import { finalize } from 'rxjs/operators'; import { CourseService } from '../../../services/course.service'; import { FeedbackQuestionsService } from '../../../services/feedback-questions.service'; import { FeedbackResponseCommentService } from '../../../services/feedback-response-comment.service'; @@ -91,6 +92,9 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp questionsModel: Record = {}; isQuestionsLoaded: boolean = false; + isFeedbackSessionLoading: boolean = false; + isDownloadingResults: boolean = false; + noResponseStudents: Student[] = []; isNoResponsePanelLoaded: boolean = false; @@ -122,6 +126,7 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp ngOnInit(): void { this.route.queryParams.subscribe((queryParams: any) => { + this.isFeedbackSessionLoading = true; this.feedbackSessionsService.getFeedbackSession({ courseId: queryParams.courseid, feedbackSessionName: queryParams.fsname, @@ -137,6 +142,7 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp this.formattedResultVisibleFromTime = this.timezoneService .formatToString(this.session.resultVisibleFromTimestamp, this.session.timeZone, TIME_FORMAT); } + this.isFeedbackSessionLoading = false; // load section tabs this.courseService.getCourseSectionNames(queryParams.courseid) @@ -210,6 +216,7 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp this.currInstructorName = instructor.name; }); }, (resp: ErrorMessageOutput) => { + this.isFeedbackSessionLoading = false; this.statusMessageService.showErrorToast(resp.error.message); }); }); @@ -356,6 +363,7 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp * Handle download results button event. */ downloadResultHandler(): void { + this.isDownloadingResults = true; const filename: string = `${this.session.feedbackSessionName.concat('_result')}.csv`; let blob: any; @@ -367,7 +375,7 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp this.showStatistics, this.section.length === 0 ? undefined : this.section, this.section.length === 0 ? undefined : this.sectionType, - ).subscribe((resp: string) => { + ).pipe(finalize(() => this.isDownloadingResults = false)).subscribe((resp: string) => { blob = new Blob([resp], { type: 'text/csv' }); saveAs(blob, filename); }, (resp: ErrorMessageOutput) => { diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.module.ts b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.module.ts index 788c025f86e..4f2c8974804 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.module.ts +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.module.ts @@ -3,6 +3,8 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbCollapseModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { TeammatesCommonModule } from '../../components/teammates-common/teammates-common.module'; import { InstructorSessionResultPageComponent } from './instructor-session-result-page.component'; import { InstructorSessionResultViewModule } from './instructor-session-result-view.module'; @@ -34,6 +36,8 @@ const routes: Routes = [ TeammatesCommonModule, RouterModule.forChild(routes), InstructorSessionResultViewModule, + LoadingSpinnerModule, + AjaxLoadingModule, ], }) export class InstructorSessionResultPageModule { } diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-question-view.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-question-view.component.html index ea78fbb63f4..394a3541dd2 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-question-view.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-question-view.component.html @@ -16,7 +16,7 @@
    -
    +
    { QuestionTextWithInfoModule, SingleStatisticsModule, NgbModule, + LoadingSpinnerModule, ], }) .compileComponents(); diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rgq-view.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rgq-view.component.html index a33f7aeca57..f7dd3bd5d96 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rgq-view.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rgq-view.component.html @@ -8,7 +8,7 @@
    -
    +
    { beforeEach(async(() => { TestBed.configureTestingModule({ declarations: [InstructorSessionResultRgqViewComponent], - imports: [GrqRgqViewResponsesModule, NgbModule], + imports: [GrqRgqViewResponsesModule, NgbModule, LoadingSpinnerModule], }) .compileComponents(); })); diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rqg-view.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rqg-view.component.html index 73d753c3573..3205dcc982b 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rqg-view.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-rqg-view.component.html @@ -8,7 +8,7 @@
    -
    +
    { beforeEach(async(() => { TestBed.configureTestingModule({ declarations: [InstructorSessionResultRqgViewComponent], - imports: [GqrRqgViewResponsesModule, NgbModule], + imports: [GqrRqgViewResponsesModule, NgbModule, LoadingSpinnerModule], }) .compileComponents(); })); diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-view.module.ts b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-view.module.ts index fd3b9e94b3b..143ac75d05c 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-view.module.ts +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-view.module.ts @@ -5,6 +5,7 @@ import { RouterModule } from '@angular/router'; import { NgbCollapseModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { CommentToCommentRowModelPipe } from '../../components/comment-box/comment-to-comment-row-model.pipe'; import { CommentsToCommentTableModelPipe } from '../../components/comment-box/comments-to-comment-table-model.pipe'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { GqrRqgViewResponsesModule } from '../../components/question-responses/gqr-rqg-view-responses/gqr-rqg-view-responses.module'; import { GrqRgqViewResponsesModule } from '../../components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.module'; import { PerQuestionViewResponsesModule } from '../../components/question-responses/per-question-view-responses/per-question-view-responses.module'; @@ -48,6 +49,7 @@ import { InstructorSessionResultRqgViewComponent } from './instructor-session-re GqrRqgViewResponsesModule, GrqRgqViewResponsesModule, SingleStatisticsModule, + LoadingSpinnerModule, ], providers: [ CommentToCommentRowModelPipe, diff --git a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.html b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.html index 6d6670ae10b..e18f503f4de 100644 --- a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.html +++ b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.html @@ -21,7 +21,8 @@
    - Student List

    -
    +
    diff --git a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts index 29a8856f9dd..0dec8048fa2 100644 --- a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts +++ b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts @@ -84,7 +84,6 @@ export class InstructorStudentListPageComponent implements OnInit { courseTab.hasTabExpanded = !courseTab.hasTabExpanded; if (!courseTab.hasStudentLoaded) { this.loadStudents(courseTab); - courseTab.hasStudentLoaded = true; } } @@ -93,6 +92,7 @@ export class InstructorStudentListPageComponent implements OnInit { */ loadStudents(courseTab: CourseTab): void { this.studentService.getStudentsFromCourse({ courseId: courseTab.course.courseId }) + .pipe(finalize(() => courseTab.hasStudentLoaded = true)) .subscribe((students: Students) => { courseTab.studentList = []; // Reset the list of students for the course const sections: StudentIndexedData = students.students.reduce((acc: StudentIndexedData, x: Student) => { @@ -115,7 +115,9 @@ export class InstructorStudentListPageComponent implements OnInit { }); courseTab.stats = this.courseService.calculateCourseStatistics(students.students); - }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); + }, (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + }); } /** diff --git a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.module.ts b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.module.ts index f2c57439b0e..4636e6c9ba3 100644 --- a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.module.ts +++ b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.module.ts @@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { StudentListModule } from '../../components/student-list/student-list.module'; import { InstructorStudentListPageComponent } from './instructor-student-list-page.component'; @@ -29,6 +30,7 @@ const routes: Routes = [ RouterModule.forChild(routes), StudentListModule, NgbCollapseModule, + LoadingSpinnerModule, ], }) export class InstructorStudentListPageModule { } diff --git a/src/web/app/pages-instructor/instructor-student-records-page/__snapshots__/instructor-student-records-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-student-records-page/__snapshots__/instructor-student-records-page.component.spec.ts.snap index 1a6d6962f27..8cd0bc973f6 100644 --- a/src/web/app/pages-instructor/instructor-student-records-page/__snapshots__/instructor-student-records-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-student-records-page/__snapshots__/instructor-student-records-page.component.spec.ts.snap @@ -1,5 +1,58 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`InstructorStudentRecordsPageComponent should snap when student results are still loading 1`] = ` + +

    + John Doe's Records + + - CS1111 + +

    + Records in feedback sessions +

    +
    + + + +`; + exports[`InstructorStudentRecordsPageComponent should snap with default fields 1`] = ` - su1337 -

    +

    +
    + + +
    + +

    Records in feedback sessions -

    + +
    + + `; @@ -45,6 +143,9 @@ exports[`InstructorStudentRecordsPageComponent should snap with populated fields feedbackSessionsService={[Function FeedbackSessionsService]} instructorCommentTableModel={[Function Object]} instructorService={[Function InstructorService]} + isStudentLoading="false" + isStudentProfileLoading="false" + isStudentResultsLoading="false" photoUrl={[Function String]} route={[Function Object]} session={[Function Object]} @@ -68,6 +169,8 @@ exports[`InstructorStudentRecordsPageComponent should snap with populated fields

    Records in feedback sessions -

    +
    + +
    `; diff --git a/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.html b/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.html index 1104f57bd2b..4dfb62b7d57 100644 --- a/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.html +++ b/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.html @@ -1,32 +1,34 @@

    {{studentName}}'s Records - {{courseId}}

    - - + +

    Records in feedback sessions

    -
    -
    - Feedback Session : {{session.feedbackSession.feedbackSessionName}} - -
    -
    - -
    - No feedback responses for {{studentName}} ({{studentTeam}}) found. +
    +
    +
    + Feedback Session : {{session.feedbackSession.feedbackSessionName}} +
    -
    - -
    - No feedback responses from {{studentName}} ({{studentTeam}}) found. +
    + +
    + No feedback responses for {{studentName}} ({{studentTeam}}) found. +
    +
    + +
    + No feedback responses from {{studentName}} ({{studentTeam}}) found. +
    diff --git a/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.spec.ts b/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.spec.ts index 4b5a4ecd900..b5260e0fbd5 100644 --- a/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.spec.ts @@ -7,6 +7,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { of } from 'rxjs'; import { Gender, StudentProfile } from '../../../types/api-output'; import { CommentsToCommentTableModelPipe } from '../../components/comment-box/comments-to-comment-table-model.pipe'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { GrqRgqViewResponsesModule, } from '../../components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.module'; @@ -41,6 +42,7 @@ describe('InstructorStudentRecordsPageComponent', () => { RouterTestingModule, NgbModule, GrqRgqViewResponsesModule, + LoadingSpinnerModule, ], providers: [ { @@ -83,6 +85,30 @@ describe('InstructorStudentRecordsPageComponent', () => { component.studentName = 'Not John Doe'; component.studentProfile = studentProfile; component.courseId = 'su1337'; + component.isStudentLoading = false; + component.isStudentProfileLoading = false; + component.isStudentResultsLoading = false; + fixture.detectChanges(); + expect(fixture).toMatchSnapshot(); + }); + + it('should snap when student results are still loading', () => { + const studentProfile: StudentProfile = { + name: 'John Doe', + shortName: 'JD', + email: 'jd@jd.com', + institute: 'Area51', + nationality: 'Antarctican', + gender: Gender.OTHER, + moreInfo: '', + }; + component.studentName = 'John Doe'; + component.studentProfile = studentProfile; + component.courseId = 'CS1111'; + component.isStudentResultsLoading = true; + component.isStudentLoading = false; + component.isStudentProfileLoading = false; + fixture.detectChanges(); expect(fixture).toMatchSnapshot(); }); diff --git a/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.ts b/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.ts index 35b9e1d6342..42020dd58ff 100644 --- a/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.ts +++ b/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { map, mergeMap } from 'rxjs/operators'; +import { finalize, map, mergeMap } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; import { FeedbackResponseCommentService } from '../../../services/feedback-response-comment.service'; import { FeedbackSessionsService } from '../../../services/feedback-sessions.service'; @@ -66,6 +66,10 @@ export class InstructorStudentRecordsPageComponent extends InstructorCommentsCom sessionTabs: SessionTab[] = []; photoUrl: string = ''; + isStudentLoading: boolean = false; + isStudentProfileLoading: boolean = false; + isStudentResultsLoading: boolean = false; + constructor(private route: ActivatedRoute, private studentProfileService: StudentProfileService, private feedbackSessionsService: FeedbackSessionsService, @@ -104,12 +108,18 @@ export class InstructorStudentRecordsPageComponent extends InstructorCommentsCom * Loads the student's records based on the given course ID and email. */ loadStudentRecords(): void { - this.studentService.getStudent(this.courseId, this.studentEmail).subscribe((resp: Student) => { + this.isStudentLoading = true; + this.isStudentProfileLoading = true; + this.studentService.getStudent( + this.courseId, this.studentEmail, + ).pipe(finalize(() => this.isStudentLoading = false)).subscribe((resp: Student) => { this.studentName = resp.name; this.studentTeam = resp.teamName; this.studentSection = resp.sectionName; }); - this.studentProfileService.getStudentProfile(this.studentEmail, this.courseId).subscribe((resp: StudentProfile) => { + this.studentProfileService.getStudentProfile( + this.studentEmail, this.courseId, + ).pipe(finalize(() => this.isStudentProfileLoading = false)).subscribe((resp: StudentProfile) => { this.studentProfile = resp; }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); @@ -120,6 +130,7 @@ export class InstructorStudentRecordsPageComponent extends InstructorCommentsCom * Loads the student's feedback session results based on the given course ID and student name. */ loadStudentResults(): void { + this.isStudentResultsLoading = true; this.feedbackSessionsService.getFeedbackSessionsForInstructor(this.courseId).pipe( mergeMap((feedbackSessions: FeedbackSessions) => feedbackSessions.feedbackSessions), mergeMap((feedbackSession: FeedbackSession) => { @@ -130,6 +141,7 @@ export class InstructorStudentRecordsPageComponent extends InstructorCommentsCom intent: Intent.INSTRUCTOR_RESULT, }).pipe(map((results: SessionResults) => ({ results, feedbackSession }))); }), + finalize(() => this.isStudentResultsLoading = false), ).subscribe( ({ results, feedbackSession }: { results: SessionResults, feedbackSession: FeedbackSession }) => { const giverQuestions: QuestionOutput[] = JSON.parse(JSON.stringify(results.questions)); diff --git a/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.module.ts b/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.module.ts index e723dc46346..226fbf14616 100644 --- a/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.module.ts +++ b/src/web/app/pages-instructor/instructor-student-records-page/instructor-student-records-page.module.ts @@ -4,6 +4,7 @@ import { RouterModule, Routes } from '@angular/router'; import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; import { CommentToCommentRowModelPipe } from '../../components/comment-box/comment-to-comment-row-model.pipe'; import { CommentsToCommentTableModelPipe } from '../../components/comment-box/comments-to-comment-table-model.pipe'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { GrqRgqViewResponsesModule, } from '../../components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.module'; @@ -33,6 +34,7 @@ const routes: Routes = [ NgbCollapseModule, GrqRgqViewResponsesModule, RouterModule.forChild(routes), + LoadingSpinnerModule, ], providers: [ CommentToCommentRowModelPipe, diff --git a/src/web/app/pages-session/session-result-page/session-result-page.component.html b/src/web/app/pages-session/session-result-page/session-result-page.component.html index 47376c504fe..4a747d56664 100644 --- a/src/web/app/pages-session/session-result-page/session-result-page.component.html +++ b/src/web/app/pages-session/session-result-page/session-result-page.component.html @@ -35,21 +35,23 @@

    -
    -
    - - - -
    - -
    -
    - Your own responses: -
    - +
    +
    +
    + + + +
    + +
    +
    + Your own responses: +
    + +
    diff --git a/src/web/app/pages-session/session-result-page/session-result-page.component.spec.ts b/src/web/app/pages-session/session-result-page/session-result-page.component.spec.ts index 0c4bbe3a291..8c65a2d31c9 100644 --- a/src/web/app/pages-session/session-result-page/session-result-page.component.spec.ts +++ b/src/web/app/pages-session/session-result-page/session-result-page.component.spec.ts @@ -1,6 +1,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { SingleStatisticsModule } from '../../components/question-responses/single-statistics/single-statistics.module'; import { StudentViewResponsesModule, @@ -20,6 +21,7 @@ describe('SessionResultPageComponent', () => { StudentViewResponsesModule, QuestionTextWithInfoModule, SingleStatisticsModule, + LoadingSpinnerModule, ], declarations: [SessionResultPageComponent], }) diff --git a/src/web/app/pages-session/session-result-page/session-result-page.component.ts b/src/web/app/pages-session/session-result-page/session-result-page.component.ts index 6c9388b3522..0115521a1f6 100644 --- a/src/web/app/pages-session/session-result-page/session-result-page.component.ts +++ b/src/web/app/pages-session/session-result-page/session-result-page.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; +import { finalize } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; import { AuthService } from '../../../services/auth.service'; import { FeedbackSessionsService } from '../../../services/feedback-sessions.service'; @@ -52,6 +53,8 @@ export class SessionResultPageComponent implements OnInit { feedbackSessionName: string = ''; regKey: string = ''; + isFeedbackSessionResultsLoading: boolean = false; + private backendUrl: string = environment.backendUrl; constructor(private feedbackSessionsService: FeedbackSessionsService, @@ -119,6 +122,7 @@ export class SessionResultPageComponent implements OnInit { } private loadFeedbackSession(): void { + this.isFeedbackSessionResultsLoading = true; this.feedbackSessionsService.getFeedbackSession({ courseId: this.courseId, feedbackSessionName: this.feedbackSessionName, @@ -136,14 +140,17 @@ export class SessionResultPageComponent implements OnInit { feedbackSessionName: this.feedbackSessionName, intent: Intent.STUDENT_RESULT, key: this.regKey, - }).subscribe((sessionResults: SessionResults) => { - this.questions = sessionResults.questions.sort( - (a: QuestionOutput, b: QuestionOutput) => - a.feedbackQuestion.questionNumber - b.feedbackQuestion.questionNumber); - }, (resp: ErrorMessageOutput) => { - this.statusMessageService.showErrorToast(resp.error.message); - }); + }) + .pipe(finalize(() => this.isFeedbackSessionResultsLoading = false)) + .subscribe((sessionResults: SessionResults) => { + this.questions = sessionResults.questions.sort( + (a: QuestionOutput, b: QuestionOutput) => + a.feedbackQuestion.questionNumber - b.feedbackQuestion.questionNumber); + }, (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + }); }, (resp: ErrorMessageOutput) => { + this.isFeedbackSessionResultsLoading = false; this.statusMessageService.showErrorToast(resp.error.message); }); } diff --git a/src/web/app/pages-session/session-result-page/session-result-page.module.ts b/src/web/app/pages-session/session-result-page/session-result-page.module.ts index cac650189ad..5a762d244b9 100644 --- a/src/web/app/pages-session/session-result-page/session-result-page.module.ts +++ b/src/web/app/pages-session/session-result-page/session-result-page.module.ts @@ -1,6 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { SingleStatisticsModule } from '../../components/question-responses/single-statistics/single-statistics.module'; import { StudentViewResponsesModule, @@ -25,6 +26,7 @@ const routes: Routes = [ StudentViewResponsesModule, SingleStatisticsModule, RouterModule.forChild(routes), + LoadingSpinnerModule, ], declarations: [ SessionResultPageComponent, diff --git a/src/web/app/pages-session/session-submission-page/session-submission-page.component.html b/src/web/app/pages-session/session-submission-page/session-submission-page.component.html index 6702ea27b18..f6d5be93e43 100644 --- a/src/web/app/pages-session/session-submission-page/session-submission-page.component.html +++ b/src/web/app/pages-session/session-submission-page/session-submission-page.component.html @@ -74,30 +74,32 @@

    Previewing Session as

    - +
    + -
    -
    -
    - -
    -
    - -
    -
    - +
    +
    + +
    +
    + +
    diff --git a/src/web/app/pages-session/session-submission-page/session-submission-page.component.spec.ts b/src/web/app/pages-session/session-submission-page/session-submission-page.component.spec.ts index bf3ad4eccb8..229f2828b76 100644 --- a/src/web/app/pages-session/session-submission-page/session-submission-page.component.spec.ts +++ b/src/web/app/pages-session/session-submission-page/session-submission-page.component.spec.ts @@ -4,6 +4,7 @@ import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { NgxPageScrollCoreModule } from 'ngx-page-scroll-core'; import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { QuestionSubmissionFormModule, } from '../../components/question-submission-form/question-submission-form.module'; @@ -25,6 +26,7 @@ describe('SessionSubmissionPageComponent', () => { FormsModule, AjaxLoadingModule, QuestionSubmissionFormModule, + LoadingSpinnerModule, ], }) .compileComponents(); diff --git a/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts b/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts index 11f61f1d85c..2ffcd128ed3 100644 --- a/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts +++ b/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts @@ -99,6 +99,8 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { isModerationHintExpanded: boolean = false; moderatedQuestionId: string = ''; + isFeedbackSessionQuestionsLoading: boolean = false; + private backendUrl: string = environment.backendUrl; constructor(private route: ActivatedRoute, @@ -303,6 +305,7 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { * Loads feedback questions to submit. */ loadFeedbackQuestions(): void { + this.isFeedbackSessionQuestionsLoading = true; this.feedbackQuestionsService.getFeedbackQuestions({ courseId: this.courseId, feedbackSessionName: this.feedbackSessionName, @@ -310,35 +313,36 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { key: this.regKey, moderatedPerson: this.moderatedPerson, previewAs: this.previewAsPerson, - }).subscribe((response: FeedbackQuestionsResponse) => { - response.questions.forEach((feedbackQuestion: FeedbackQuestion) => { - const model: QuestionSubmissionFormModel = { - feedbackQuestionId: feedbackQuestion.feedbackQuestionId, - - questionNumber: feedbackQuestion.questionNumber, - questionBrief: feedbackQuestion.questionBrief, - questionDescription: feedbackQuestion.questionDescription, - - giverType: feedbackQuestion.giverType, - recipientType: feedbackQuestion.recipientType, - recipientList: [], - recipientSubmissionForms: [], - - questionType: feedbackQuestion.questionType, - questionDetails: feedbackQuestion.questionDetails, - - numberOfEntitiesToGiveFeedbackToSetting: feedbackQuestion.numberOfEntitiesToGiveFeedbackToSetting, - customNumberOfEntitiesToGiveFeedbackTo: feedbackQuestion.customNumberOfEntitiesToGiveFeedbackTo - ? feedbackQuestion.customNumberOfEntitiesToGiveFeedbackTo : 0, - - showGiverNameTo: feedbackQuestion.showGiverNameTo, - showRecipientNameTo: feedbackQuestion.showRecipientNameTo, - showResponsesTo: feedbackQuestion.showResponsesTo, - }; - this.questionSubmissionForms.push(model); - this.loadFeedbackQuestionRecipientsForQuestion(model); - }); - }, (resp: ErrorMessageOutput) => this.statusMessageService.showErrorToast(resp.error.message)); + }).pipe(finalize(() => this.isFeedbackSessionQuestionsLoading = false)) + .subscribe((response: FeedbackQuestionsResponse) => { + response.questions.forEach((feedbackQuestion: FeedbackQuestion) => { + const model: QuestionSubmissionFormModel = { + feedbackQuestionId: feedbackQuestion.feedbackQuestionId, + + questionNumber: feedbackQuestion.questionNumber, + questionBrief: feedbackQuestion.questionBrief, + questionDescription: feedbackQuestion.questionDescription, + + giverType: feedbackQuestion.giverType, + recipientType: feedbackQuestion.recipientType, + recipientList: [], + recipientSubmissionForms: [], + + questionType: feedbackQuestion.questionType, + questionDetails: feedbackQuestion.questionDetails, + + numberOfEntitiesToGiveFeedbackToSetting: feedbackQuestion.numberOfEntitiesToGiveFeedbackToSetting, + customNumberOfEntitiesToGiveFeedbackTo: feedbackQuestion.customNumberOfEntitiesToGiveFeedbackTo + ? feedbackQuestion.customNumberOfEntitiesToGiveFeedbackTo : 0, + + showGiverNameTo: feedbackQuestion.showGiverNameTo, + showRecipientNameTo: feedbackQuestion.showRecipientNameTo, + showResponsesTo: feedbackQuestion.showResponsesTo, + }; + this.questionSubmissionForms.push(model); + this.loadFeedbackQuestionRecipientsForQuestion(model); + }); + }, (resp: ErrorMessageOutput) => this.statusMessageService.showErrorToast(resp.error.message)); } /** diff --git a/src/web/app/pages-session/session-submission-page/session-submission-page.module.ts b/src/web/app/pages-session/session-submission-page/session-submission-page.module.ts index b24bbe73dee..6dc57cc9c9f 100644 --- a/src/web/app/pages-session/session-submission-page/session-submission-page.module.ts +++ b/src/web/app/pages-session/session-submission-page/session-submission-page.module.ts @@ -4,6 +4,7 @@ import { FormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { QuestionSubmissionFormModule, } from '../../components/question-submission-form/question-submission-form.module'; @@ -30,6 +31,7 @@ const routes: Routes = [ NgbTooltipModule, QuestionSubmissionFormModule, RouterModule.forChild(routes), + LoadingSpinnerModule, ], declarations: [ SavingCompleteModalComponent, diff --git a/src/web/app/pages-static/static-page.component.spec.ts b/src/web/app/pages-static/static-page.component.spec.ts index bebbe2ff9c3..60ef7d5608b 100644 --- a/src/web/app/pages-static/static-page.component.spec.ts +++ b/src/web/app/pages-static/static-page.component.spec.ts @@ -3,7 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { LoaderBarModule } from '../components/loader-bar/loader-bar.module'; -import { LoadingSpinnerComponent } from '../components/loading-spinner/loading-spinner.component'; +import { LoadingSpinnerModule } from '../components/loading-spinner/loading-spinner.module'; import { StatusMessageModule } from '../components/status-message/status-message.module'; import { ToastModule } from '../components/toast/toast.module'; import { PageComponent } from '../page.component'; @@ -18,10 +18,10 @@ describe('StaticPageComponent', () => { declarations: [ PageComponent, StaticPageComponent, - LoadingSpinnerComponent, ], imports: [ LoaderBarModule, + LoadingSpinnerModule, NgbModule, HttpClientTestingModule, RouterTestingModule, diff --git a/src/web/app/pages-student/student-course-details-page/__snapshots__/student-course-details-page.component.spec.ts.snap b/src/web/app/pages-student/student-course-details-page/__snapshots__/student-course-details-page.component.spec.ts.snap index c752dd314d6..1348ef08dc9 100644 --- a/src/web/app/pages-student/student-course-details-page/__snapshots__/student-course-details-page.component.spec.ts.snap +++ b/src/web/app/pages-student/student-course-details-page/__snapshots__/student-course-details-page.component.spec.ts.snap @@ -1,5 +1,54 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`StudentCourseDetailsPageComponent should snap when all data are still loading 1`] = ` + +
    +
    + + + +
    + + +
    +
    + +`; + exports[`StudentCourseDetailsPageComponent should snap with default fields 1`] = `
    -
    - - Sort By: - -
    + +
    - - - - - + + + + +
    @@ -74,6 +100,10 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`] courseService={[Function CourseService]} instructorDetails={[Function Array]} instructorService={[Function InstructorService]} + isLoadingCourse="false" + isLoadingInstructor="false" + isLoadingStudent="false" + isLoadingTeammates="false" route={[Function ActivatedRoute]} statusMessageService={[Function StatusMessageService]} student={[Function Object]} @@ -90,6 +120,7 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`]
    +
    @@ -301,6 +332,7 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`]
    +
    @@ -308,6 +340,7 @@ exports[`StudentCourseDetailsPageComponent should snap with populated fields 1`] Your teammates:
    +
    diff --git a/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.html b/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.html index 535f29f2037..de6c6d96248 100644 --- a/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.html +++ b/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.html @@ -1,7 +1,6 @@

    Team Details for {{ course.courseId }}

    -
    -
    +
    @@ -72,7 +71,7 @@

    Team Details for {{ course.course

    -
    +
    Sort By:
    @@ -85,12 +84,12 @@
    Sort By:
    -
    +
    -
    +
    Your teammates:
    -
    +
    diff --git a/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.spec.ts b/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.spec.ts index a8093009067..462b14396ab 100644 --- a/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.spec.ts +++ b/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.spec.ts @@ -2,6 +2,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { Course, Gender, Instructor, InstructorPermissionRole, JoinState, Student } from '../../../types/api-output'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { TeammatesCommonModule } from '../../components/teammates-common/teammates-common.module'; import { StudentCourseDetailsPageComponent, StudentProfileWithPicture } from './student-course-details-page.component'; @@ -16,6 +17,7 @@ describe('StudentCourseDetailsPageComponent', () => { HttpClientTestingModule, RouterTestingModule, TeammatesCommonModule, + LoadingSpinnerModule, ], }) .compileComponents(); @@ -83,6 +85,20 @@ describe('StudentCourseDetailsPageComponent', () => { component.instructorDetails = instructorDetails; component.student = student; component.teammateProfiles = teammateProfiles; + component.isLoadingStudent = false; + component.isLoadingInstructor = false; + component.isLoadingTeammates = false; + component.isLoadingCourse = false; + + fixture.detectChanges(); + expect(fixture).toMatchSnapshot(); + }); + + it('should snap when all data are still loading', () => { + component.isLoadingStudent = true; + component.isLoadingInstructor = true; + component.isLoadingTeammates = true; + component.isLoadingCourse = true; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); diff --git a/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.ts b/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.ts index a071e57f99e..8e89e94657e 100644 --- a/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.ts +++ b/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { finalize } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; import { CourseService } from '../../../services/course.service'; import { InstructorService } from '../../../services/instructor.service'; @@ -56,6 +57,11 @@ export class StudentCourseDetailsPageComponent implements OnInit { instructorDetails: Instructor[] = []; teammateProfiles: StudentProfileWithPicture[] = []; + isLoadingCourse: boolean = false; + isLoadingStudent: boolean = false; + isLoadingInstructor: boolean = false; + isLoadingTeammates: boolean = false; + constructor(private tableComparatorService: TableComparatorService, private route: ActivatedRoute, private instructorService: InstructorService, @@ -80,9 +86,12 @@ export class StudentCourseDetailsPageComponent implements OnInit { * @param courseid: id of the course queried */ loadCourse(courseId: string): void { - this.courseService.getCourseAsStudent(courseId).subscribe((course: Course) => { - this.course = course; - }); + this.isLoadingCourse = true; + this.courseService.getCourseAsStudent(courseId) + .pipe(finalize(() => this.isLoadingCourse = false)) + .subscribe((course: Course) => { + this.course = course; + }); } /** @@ -90,7 +99,9 @@ export class StudentCourseDetailsPageComponent implements OnInit { * @param courseid: id of the course queried */ loadStudent(courseId: string): void { + this.isLoadingStudent = true; this.studentService.getStudent(courseId) + .pipe(finalize(() => this.isLoadingStudent = false)) .subscribe((student: Student) => { this.student = student; this.loadTeammates(courseId, student.teamName); @@ -105,6 +116,7 @@ export class StudentCourseDetailsPageComponent implements OnInit { * @param teamName: team of current student */ loadTeammates(courseId: string, teamName: string): void { + this.isLoadingTeammates = true; this.studentService.getStudentsFromCourseAndTeam(courseId, teamName) .subscribe((students: Students) => { students.students.forEach((student: Student) => { @@ -114,6 +126,7 @@ export class StudentCourseDetailsPageComponent implements OnInit { } this.studentProfileService.getStudentProfile(student.email, courseId) + .pipe(finalize(() => this.isLoadingTeammates = false)) .subscribe((studentProfile: StudentProfile) => { const newPhotoUrl: string = `${environment.backendUrl}/webapi/student/profilePic` @@ -130,6 +143,7 @@ export class StudentCourseDetailsPageComponent implements OnInit { }); }); }, (resp: ErrorMessageOutput) => { + this.isLoadingTeammates = false; this.statusMessageService.showErrorToast(resp.error.message); }); } @@ -139,7 +153,9 @@ export class StudentCourseDetailsPageComponent implements OnInit { * @param courseid: id of the course queried */ loadInstructors(courseId: string): void { + this.isLoadingInstructor = true; this.instructorService.loadInstructors({ courseId }) + .pipe(finalize(() => this.isLoadingInstructor = false)) .subscribe((instructors: Instructors) => { this.instructorDetails = instructors.instructors; }, (resp: ErrorMessageOutput) => { diff --git a/src/web/app/pages-student/student-course-details-page/student-course-details-page.module.ts b/src/web/app/pages-student/student-course-details-page/student-course-details-page.module.ts index 54840833629..0540390adf7 100644 --- a/src/web/app/pages-student/student-course-details-page/student-course-details-page.module.ts +++ b/src/web/app/pages-student/student-course-details-page/student-course-details-page.module.ts @@ -1,6 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { TeammatesCommonModule } from '../../components/teammates-common/teammates-common.module'; import { StudentCourseDetailsPageComponent } from './student-course-details-page.component'; @@ -25,6 +26,7 @@ const routes: Routes = [ CommonModule, RouterModule.forChild(routes), TeammatesCommonModule, + LoadingSpinnerModule, ], }) export class StudentCourseDetailsPageModule { } diff --git a/src/web/app/pages-student/student-home-page/__snapshots__/student-home-page.component.spec.ts.snap b/src/web/app/pages-student/student-home-page/__snapshots__/student-home-page.component.spec.ts.snap index b754cef64ca..b46b1f5e183 100644 --- a/src/web/app/pages-student/student-home-page/__snapshots__/student-home-page.component.spec.ts.snap +++ b/src/web/app/pages-student/student-home-page/__snapshots__/student-home-page.component.spec.ts.snap @@ -1,12 +1,49 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`StudentHomePageComponent should snap when courses are still loading 1`] = ` + + +
    + + + +`; + exports[`StudentHomePageComponent should snap with all feedback sessions over 2 courses 1`] = ` -
    -
    - You are not enrolled in any courses. Please refer to the - +
    - help page - - if you need more information. - -
    + + `; @@ -399,7 +440,7 @@ exports[`StudentHomePageComponent should snap with no feedback sessions 1`] = ` courseService={[Function CourseService]} courses={[Function Array]} feedbackSessionsService={[Function FeedbackSessionsService]} - loadingBarService={[Function LoadingBarService]} + isCoursesLoading="false" route={[Function ActivatedRoute]} sortBy="0" statusMessageService={[Function StatusMessageService]} @@ -412,7 +453,7 @@ exports[`StudentHomePageComponent should snap with no feedback sessions 1`] = ` tableComparatorService={[Function TableComparatorService]} timezoneService={[Function TimezoneService]} > -
    +
    +
    You are not enrolled in any courses. Please refer to the help page if you need more information.
    -
    +
    Sort By: diff --git a/src/web/app/pages-student/student-home-page/student-home-page.component.spec.ts b/src/web/app/pages-student/student-home-page/student-home-page.component.spec.ts index 5c7f5ce8cdb..e6b71c12dd9 100644 --- a/src/web/app/pages-student/student-home-page/student-home-page.component.spec.ts +++ b/src/web/app/pages-student/student-home-page/student-home-page.component.spec.ts @@ -10,6 +10,7 @@ import { } from '../../../types/api-output'; import { StudentHomePageComponent } from './student-home-page.component'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { TeammatesCommonModule } from '../../components/teammates-common/teammates-common.module'; import { ResponseStatusPipe } from '../../pipes/session-response-status.pipe'; import { SubmissionStatusPipe } from '../../pipes/session-submission-status.pipe'; @@ -30,6 +31,7 @@ describe('StudentHomePageComponent', () => { NgbModule, RouterTestingModule, TeammatesCommonModule, + LoadingSpinnerModule, ], }) .compileComponents(); @@ -61,6 +63,7 @@ describe('StudentHomePageComponent', () => { feedbackSessions: [], }; component.courses = [studentCourse]; + component.isCoursesLoading = false; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); }); @@ -179,6 +182,13 @@ describe('StudentHomePageComponent', () => { }; component.courses = [studentCourseA, studentCourseB]; + component.isCoursesLoading = false; + fixture.detectChanges(); + expect(fixture).toMatchSnapshot(); + }); + + it('should snap when courses are still loading', () => { + component.isCoursesLoading = true; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); }); diff --git a/src/web/app/pages-student/student-home-page/student-home-page.component.ts b/src/web/app/pages-student/student-home-page/student-home-page.component.ts index b60f414d53b..bc83db0995e 100644 --- a/src/web/app/pages-student/student-home-page/student-home-page.component.ts +++ b/src/web/app/pages-student/student-home-page/student-home-page.component.ts @@ -3,7 +3,6 @@ import { ActivatedRoute } from '@angular/router'; import { finalize } from 'rxjs/operators'; import { CourseService } from '../../../services/course.service'; import { FeedbackSessionsService } from '../../../services/feedback-sessions.service'; -import { LoadingBarService } from '../../../services/loading-bar.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { TableComparatorService } from '../../../services/table-comparator.service'; import { TimezoneService } from '../../../services/timezone.service'; @@ -57,6 +56,7 @@ export class StudentHomePageComponent implements OnInit { studentFeedbackSessionStatusClosed: string = ' The session is now closed for submissions.'; courses: StudentCourse[] = []; + isCoursesLoading: boolean = false; sortBy: SortBy = SortBy.NONE; @@ -65,7 +65,6 @@ export class StudentHomePageComponent implements OnInit { private statusMessageService: StatusMessageService, private feedbackSessionsService: FeedbackSessionsService, private timezoneService: TimezoneService, - private loadingBarService: LoadingBarService, private tableComparatorService: TableComparatorService) { this.timezoneService.getTzVersion(); } @@ -80,15 +79,11 @@ export class StudentHomePageComponent implements OnInit { * Gets the courses and feedback sessions involving the student. */ getStudentCourses(): void { - this.loadingBarService.showLoadingBar(); + this.isCoursesLoading = true; this.courseService.getAllCoursesAsStudent().subscribe((resp: Courses) => { - if (resp.courses.length === 0) { - this.loadingBarService.hideLoadingBar(); - return; - } for (const course of resp.courses) { this.feedbackSessionsService.getFeedbackSessionsForStudent(course.courseId) - .pipe(finalize(() => this.loadingBarService.hideLoadingBar())) + .pipe(finalize(() => this.isCoursesLoading = false)) .subscribe((fss: FeedbackSessions) => { const sortedFss: FeedbackSession[] = this.sortFeedbackSessions(fss); diff --git a/src/web/app/pages-student/student-home-page/student-home-page.module.ts b/src/web/app/pages-student/student-home-page/student-home-page.module.ts index 4284d9e647e..a6b25b0c699 100644 --- a/src/web/app/pages-student/student-home-page/student-home-page.module.ts +++ b/src/web/app/pages-student/student-home-page/student-home-page.module.ts @@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { TeammatesCommonModule } from '../../components/teammates-common/teammates-common.module'; import { Pipes } from '../../pipes/pipes.module'; import { StudentHomePageComponent } from './student-home-page.component'; @@ -29,6 +30,7 @@ const routes: Routes = [ NgbTooltipModule, Pipes, TeammatesCommonModule, + LoadingSpinnerModule, ], }) export class StudentHomePageModule { } diff --git a/src/web/app/pages-student/student-page.component.spec.ts b/src/web/app/pages-student/student-page.component.spec.ts index 97c39264aa2..a5072fad82c 100644 --- a/src/web/app/pages-student/student-page.component.spec.ts +++ b/src/web/app/pages-student/student-page.component.spec.ts @@ -3,7 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { LoaderBarModule } from '../components/loader-bar/loader-bar.module'; -import { LoadingSpinnerComponent } from '../components/loading-spinner/loading-spinner.component'; +import { LoadingSpinnerModule } from '../components/loading-spinner/loading-spinner.module'; import { StatusMessageModule } from '../components/status-message/status-message.module'; import { ToastModule } from '../components/toast/toast.module'; import { PageComponent } from '../page.component'; @@ -18,10 +18,10 @@ describe('StudentPageComponent', () => { declarations: [ PageComponent, StudentPageComponent, - LoadingSpinnerComponent, ], imports: [ LoaderBarModule, + LoadingSpinnerModule, NgbModule, HttpClientTestingModule, RouterTestingModule, diff --git a/src/web/app/pages-student/student-profile-page/__snapshots__/student-profile-page.component.spec.ts.snap b/src/web/app/pages-student/student-profile-page/__snapshots__/student-profile-page.component.spec.ts.snap index 6b9581ebdcd..ccc093ca85c 100644 --- a/src/web/app/pages-student/student-profile-page/__snapshots__/student-profile-page.component.spec.ts.snap +++ b/src/web/app/pages-student/student-profile-page/__snapshots__/student-profile-page.component.spec.ts.snap @@ -1,5 +1,38 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`StudentProfilePageComponent should snap when student profile is still loading 1`] = ` + + +
    + + + +`; + exports[`StudentProfilePageComponent should snap with a student field without information 1`] = ` Student Profile +
    @@ -197,11 +233,13 @@ exports[`StudentProfilePageComponent should snap with a student field without in
    - + > + + Save Profile +
    - + +
    + + `; @@ -240,6 +294,8 @@ exports[`StudentProfilePageComponent should snap with values and a profile photo defaultPictureLink={[Function String]} editForm={[Function FormGroup]} id="" + isLoadingStudentProfile="false" + isSavingProfileEdit="false" nationalities={[Function Array]} nationalitiesService={[Function NationalitiesService]} ngbModal={[Function NgbModal]} @@ -255,6 +311,7 @@ exports[`StudentProfilePageComponent should snap with values and a profile photo

    Student Profile

    +
    @@ -441,11 +498,13 @@ exports[`StudentProfilePageComponent should snap with values and a profile photo
    - + > + + Save Profile +
    +

    Student Profile

    -
    +

    {{ name }}

    @@ -90,10 +90,13 @@

    {{ name }}

    - + [disabled]="isSavingProfileEdit"> + + Save Profile +
    This profile will be visible to all your instructors and coursemates.
    diff --git a/src/web/app/pages-student/student-profile-page/student-profile-page.component.spec.ts b/src/web/app/pages-student/student-profile-page/student-profile-page.component.spec.ts index 2a90dffe4f1..22043fe9150 100644 --- a/src/web/app/pages-student/student-profile-page/student-profile-page.component.spec.ts +++ b/src/web/app/pages-student/student-profile-page/student-profile-page.component.spec.ts @@ -5,6 +5,8 @@ import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { environment } from '../../../environments/environment.prod'; import { Gender } from '../../../types/api-output'; +import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { TeammatesCommonModule } from '../../components/teammates-common/teammates-common.module'; import { StudentProfilePageComponent } from './student-profile-page.component'; @@ -22,6 +24,8 @@ describe('StudentProfilePageComponent', () => { ReactiveFormsModule, HttpClientTestingModule, TeammatesCommonModule, + LoadingSpinnerModule, + AjaxLoadingModule, ], }) .compileComponents(); @@ -65,6 +69,7 @@ describe('StudentProfilePageComponent', () => { studentgender: new FormControl(''), studentprofilemoreinfo: new FormControl(''), }); + component.isLoadingStudentProfile = false; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); }); @@ -98,6 +103,13 @@ describe('StudentProfilePageComponent', () => { studentgender: new FormControl(Gender.MALE), studentprofilemoreinfo: new FormControl('I like to party'), }); + component.isLoadingStudentProfile = false; + fixture.detectChanges(); + expect(fixture).toMatchSnapshot(); + }); + + it('should snap when student profile is still loading', () => { + component.isLoadingStudentProfile = true; fixture.detectChanges(); expect(fixture).toMatchSnapshot(); }); diff --git a/src/web/app/pages-student/student-profile-page/student-profile-page.component.ts b/src/web/app/pages-student/student-profile-page/student-profile-page.component.ts index 80848ef3bd8..a7b7cb7e8dc 100644 --- a/src/web/app/pages-student/student-profile-page/student-profile-page.component.ts +++ b/src/web/app/pages-student/student-profile-page/student-profile-page.component.ts @@ -13,7 +13,7 @@ import { StudentProfileService } from '../../../services/student-profile.service import { ErrorMessageOutput } from '../../error-message-output'; import { from, throwError } from 'rxjs'; -import { catchError, switchMap } from 'rxjs/operators'; +import { catchError, finalize, switchMap } from 'rxjs/operators'; import { NationalitiesService } from '../../../services/nationalities.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { SimpleModalType } from '../../components/simple-modal/simple-modal-type'; @@ -38,6 +38,9 @@ export class StudentProfilePageComponent implements OnInit { profilePicLink!: string; defaultPictureLink: string = '/assets/images/profile_picture_default.png'; + isLoadingStudentProfile: boolean = false; + isSavingProfileEdit: boolean = false; + private backendUrl: string = environment.backendUrl; constructor(private simpleModalService: SimpleModalService, @@ -67,6 +70,7 @@ export class StudentProfilePageComponent implements OnInit { * Loads the student profile details for this page. */ loadStudentProfile(): void { + this.isLoadingStudentProfile = true; this.authService.getAuthUser().subscribe((auth: AuthInfo) => { if (auth.user) { this.id = auth.user.id; @@ -74,17 +78,19 @@ export class StudentProfilePageComponent implements OnInit { this.profilePicLink = `${this.backendUrl}/webapi/student/profilePic?user=${this.id}`; // retrieve profile once we have the student's googleId - this.studentProfileService.getStudentProfile().subscribe((response: StudentProfile) => { - if (response) { - this.student = response; - this.name = response.name; - this.initStudentProfileForm(this.student); - } else { - this.statusMessageService.showErrorToast('Error retrieving student profile'); - } - }, (response: ErrorMessageOutput) => { - this.statusMessageService.showErrorToast(response.error.message); - }); + this.studentProfileService.getStudentProfile() + .pipe(finalize(() => this.isLoadingStudentProfile = false)) + .subscribe((response: StudentProfile) => { + if (response) { + this.student = response; + this.name = response.name; + this.initStudentProfileForm(this.student); + } else { + this.statusMessageService.showErrorToast('Error retrieving student profile'); + } + }, (response: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(response.error.message); + }); } }); } @@ -161,6 +167,7 @@ export class StudentProfilePageComponent implements OnInit { * Submits the form data to edit the student profile details. */ submitEditForm(): void { + this.isSavingProfileEdit = true; this.studentProfileService.updateStudentProfile(this.id, { shortName: this.editForm.controls.studentshortname.value, email: this.editForm.controls.studentprofileemail.value, @@ -169,7 +176,7 @@ export class StudentProfilePageComponent implements OnInit { gender: this.editForm.controls.studentgender.value, moreInfo: this.editForm.controls.studentprofilemoreinfo.value, existingNationality: this.editForm.controls.existingNationality.value, - }).subscribe((response: MessageOutput) => { + }).pipe(finalize(() => this.isSavingProfileEdit = false)).subscribe((response: MessageOutput) => { if (response) { this.statusMessageService.showSuccessToast(response.message); } diff --git a/src/web/app/pages-student/student-profile-page/student-profile-page.module.ts b/src/web/app/pages-student/student-profile-page/student-profile-page.module.ts index dbe8231b5eb..e067b6253d7 100644 --- a/src/web/app/pages-student/student-profile-page/student-profile-page.module.ts +++ b/src/web/app/pages-student/student-profile-page/student-profile-page.module.ts @@ -4,6 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { ImageCropperModule } from 'ngx-image-cropper'; +import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; +import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { TeammatesCommonModule } from '../../components/teammates-common/teammates-common.module'; import { StudentProfilePageComponent } from './student-profile-page.component'; import { @@ -38,6 +40,8 @@ const routes: Routes = [ TeammatesCommonModule, ImageCropperModule, NgbTooltipModule, + LoadingSpinnerModule, + AjaxLoadingModule, ], }) export class StudentProfilePageModule { } diff --git a/src/web/app/public-page.component.spec.ts b/src/web/app/public-page.component.spec.ts index b9297aa021e..f33dc76ce68 100644 --- a/src/web/app/public-page.component.spec.ts +++ b/src/web/app/public-page.component.spec.ts @@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { LoaderBarModule } from './components/loader-bar/loader-bar.module'; -import { LoadingSpinnerComponent } from './components/loading-spinner/loading-spinner.component'; +import { LoadingSpinnerModule } from './components/loading-spinner/loading-spinner.module'; import { StatusMessageModule } from './components/status-message/status-message.module'; import { ToastModule } from './components/toast/toast.module'; import { PageComponent } from './page.component'; @@ -17,10 +17,10 @@ describe('PublicPageComponent', () => { declarations: [ PageComponent, PublicPageComponent, - LoadingSpinnerComponent, ], imports: [ LoaderBarModule, + LoadingSpinnerModule, NgbModule, RouterTestingModule, StatusMessageModule, diff --git a/src/web/assets/images/ajax-loader.gif b/src/web/assets/images/ajax-loader.gif index fcfdab3e56c8c6f8f2a883344b51353b76fd0681..9a30d9f02c87ccfdf9791a6318afe73f7d453a4d 100644 GIT binary patch literal 1737 zcmaLXeRNax8Nl%$Y0XF&def#QZQ)v>l-RUQDIvDf z6~vb*{%-H}tC5uKn5OVz(koZ%%O8mol{X{=sZs+8~)eh^XKn8 z=XXBme9w6zO{}Xfp+#DB9-*0;8FbUk8y~}#BhbAa0*^rWQ5c+p$B)73&)|vUu;3mj z9|!w=KyL;ALy($;J@3H$J7M^F`0N~f{tX=bE8KMu+Ma;;GqCS8ocIXb4}xBVv6tcL z*P-iaxOoqJ@CAtbAs55IPI%-s=zkV=zXj~CK)n%mz6o1jfx_ECehYm36`Z>O8(x6X zX*mBa;C=AapWwUy!1v$7{`cV3zrls?;M6BD@dkW(9$xzhv^)+=egmDqgPt7_{3UpQ0f)}O`V2U>z^7kBg#?=p z!Lp~ob}yLjf^C0<*smdf6z(_xeG^c7KfLk*9Q_bJItwqn4Y#}qn-9aIN1@}lApHTN zk3r)$u#CZzCqT=C<~G=V60&~|54{T3O+X0XdH_atL-l4*-U`<}2j;thdlJ&SVB<@G zew>n-oLB?5G{m$uII8VgbAEU)fuhiGGBJ|uGhe@YWWbzAB{rmo5`ERH2m6Om$+y`m z^$%ONi$7e9h!pp1M3^5H1Y_yKDp63*UrDAhx2c zoPsgrtM}n-jc$?()Z@$M5|hZ&faSU5q?7SuMV@|=2zszmZkY6k!dRs(EEYYLdY0GC zGh2;zO65{||1w%sQl?l`YqEJ&W0tm^()*9Go4OC?%Vo0($1VvySywO9tXOFjk+<-w zoaI$r3$C#W(blDnI)aPFE4oG_*=-LC4nZw1m9UdU5RZ4{!DZ*g&mFd3|C!+O|?`;xY7_gG1{FBWoS1~6!%XHZr^b}a%C~YIh}T* zhNOi+s5}&8Jb{|iBC9eEUohuC+xdK8Hr@CoU46Mp8!JgiL{w)`l+9bUA{C1YOlf1< z$ohgS^IE+;XLY#5{%cx1xUQpILXDa%9JQ%3x;0nhbiX@8*2gG^=Nd=x$S$u={qxvX%`(8BqIayH|S ziHXEe(qz@ui%3)iU0#nEH5UYMpw}p&T3R=ph3TI9HwDx3g)*Mv2#T*P`&o`!pjo>c zR}YRTGlMS5e(=-|9{+S=d!VkoQpXS?;uu$Nv{<=T?H5R6cZ8$emZFXhhNlDm8ZlU# z?7=?O4ryqK4s&5jLVm@-i@T=TxB`>ohZmP&JL{Ydw)A0|Iw`G8rFrMOf;BG|5wj~f zu6NPW)~LAt`oXTM<->(ui78#3qdB(a?X%CE**0t9J1!-5`szJ?kHsz`Hy2jPn4qiO zBG6K_sjk#S0(Hpz@VcfZN{?Xy98zH4a4hm^HMj3jwk2k$#cz(-A9+1XKQ=+ z|8b(z&5|Tbi#$!SL{B*E6Re_}Xz&m`Gq-x2WBe2@t%!{yl|GD{7gSCVp*oz?#ZA!B zUaYCwH|{RpjaDr$p9pvAa587zgwDobS@W{BqTZl9jE34q9PK`qNtYOmLZ!Ji)v`FQ cFeSz#%0=^HU4gSN-+zF)4I$6P!}q`WFL|Sh&j0`b literal 307 zcmZ?wbhEHb)Mnsj_{hjGY2!Y{#OnY5|1&T!DE{a6a}5c0b_{Se(lcOY1PT3+~#lXm*160WXGLV7Eh^J5D^t78dnm-@q zlD-%A`E=_8v$lxHg=y-w_h#)|&Xca|dAH`o{+ zm%faXZ}}I`nWD$e1y#TVQ6LRgpe@p;aaxFfp{Iz6c=3uaug<96V{i3xp0=!Y*=?(3 b+NXD{mz-Su&-cz&4^AZg0zh|?q2C$+ms4ae From 99436f3bb6fb0679ebc8dfcce6bed213f3e31495 Mon Sep 17 00:00:00 2001 From: Chong Chee Yuan <32454748+ccyccyccy@users.noreply.github.com> Date: Tue, 21 Jul 2020 14:50:37 +0800 Subject: [PATCH 040/205] [#10299] UAT Round 3 fixes (#10326) * Fix comments not available on MCQ questions * Prevent users from typing in floating point numbers * Move allowedToHaveParticipantComment to set on model change Co-authored-by: Ahmed Bahajjaj Co-authored-by: t-cheepeng --- .../question-submission-form.component.ts | 6 +++--- .../constsum-options-question-edit-answer-form.component.ts | 2 +- ...tsum-recipients-question-edit-answer-form.component.html | 2 +- ...nstsum-recipients-question-edit-answer-form.component.ts | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/web/app/components/question-submission-form/question-submission-form.component.ts b/src/web/app/components/question-submission-form/question-submission-form.component.ts index ffbfe98e042..e5aa460828a 100644 --- a/src/web/app/components/question-submission-form/question-submission-form.component.ts +++ b/src/web/app/components/question-submission-form/question-submission-form.component.ts @@ -52,6 +52,8 @@ export class QuestionSubmissionFormComponent implements OnInit { SHOW_RECIPIENT_NAME: model.showRecipientNameTo, }; this.visibilityStateMachine.applyVisibilitySettings(visibilitySetting); + this.allowedToHaveParticipantComment = + this.feedbackQuestionsService.isAllowedToHaveParticipantComment(this.model.questionType); } @Output() @@ -90,15 +92,13 @@ export class QuestionSubmissionFormComponent implements OnInit { saveCommentEvent: EventEmitter = new EventEmitter(); visibilityStateMachine: VisibilityStateMachine; - allowedToHaveParticipantComment: boolean; + allowedToHaveParticipantComment: boolean = false; constructor(private feedbackQuestionsService: FeedbackQuestionsService, private feedbackResponseService: FeedbackResponsesService) { this.visibilityStateMachine = this.feedbackQuestionsService.getNewVisibilityStateMachine( this.model.giverType, this.model.recipientType); - this.allowedToHaveParticipantComment = - this.feedbackQuestionsService.isAllowedToHaveParticipantComment(this.model.questionType); } ngOnInit(): void { diff --git a/src/web/app/components/question-types/question-edit-answer-form/constsum-options-question-edit-answer-form.component.ts b/src/web/app/components/question-types/question-edit-answer-form/constsum-options-question-edit-answer-form.component.ts index d4a66363263..bb45aecead3 100644 --- a/src/web/app/components/question-types/question-edit-answer-form/constsum-options-question-edit-answer-form.component.ts +++ b/src/web/app/components/question-types/question-edit-answer-form/constsum-options-question-edit-answer-form.component.ts @@ -40,7 +40,7 @@ export class ConstsumOptionsQuestionEditAnswerFormComponent newAnswers = Array(this.questionDetails.numOfConstSumOptions).fill(0); } - newAnswers[index] = event ? event : 0; + newAnswers[index] = event ? Math.ceil(event) : 0; this.triggerResponseDetailsChange('answers', newAnswers); } diff --git a/src/web/app/components/question-types/question-edit-answer-form/constsum-recipients-question-edit-answer-form.component.html b/src/web/app/components/question-types/question-edit-answer-form/constsum-recipients-question-edit-answer-form.component.html index f44444515bb..f0915e27d12 100644 --- a/src/web/app/components/question-types/question-edit-answer-form/constsum-recipients-question-edit-answer-form.component.html +++ b/src/web/app/components/question-types/question-edit-answer-form/constsum-recipients-question-edit-answer-form.component.html @@ -2,7 +2,7 @@
    diff --git a/src/web/app/components/question-types/question-edit-answer-form/constsum-recipients-question-edit-answer-form.component.ts b/src/web/app/components/question-types/question-edit-answer-form/constsum-recipients-question-edit-answer-form.component.ts index fb3cab33124..5b25fac4c92 100644 --- a/src/web/app/components/question-types/question-edit-answer-form/constsum-recipients-question-edit-answer-form.component.ts +++ b/src/web/app/components/question-types/question-edit-answer-form/constsum-recipients-question-edit-answer-form.component.ts @@ -17,6 +17,8 @@ import { QuestionEditAnswerFormComponent } from './question-edit-answer-form'; export class ConstsumRecipientsQuestionEditAnswerFormComponent extends QuestionEditAnswerFormComponent { + Math: typeof Math = Math; + constructor() { super(DEFAULT_CONSTSUM_RECIPIENTS_QUESTION_DETAILS(), DEFAULT_CONSTSUM_RESPONSE_DETAILS()); } From 48fc5ba87be24248f2e3cba9177ad7ffa68c5a52 Mon Sep 17 00:00:00 2001 From: Xiao Pu Date: Tue, 21 Jul 2020 01:45:43 -0700 Subject: [PATCH 041/205] [#10304] Instructor adding questions: new question does not inherit setting from the previous question (#10366) * inherit setting (feedback path + visibility setting) from the last question when adding new question * update question name to follow V6 --- .../question-type-name.pipe.ts | 4 +-- .../instructor-session-edit-page.component.ts | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/web/app/components/teammates-common/question-type-name.pipe.ts b/src/web/app/components/teammates-common/question-type-name.pipe.ts index f93eb85e162..cf322a3fedf 100644 --- a/src/web/app/components/teammates-common/question-type-name.pipe.ts +++ b/src/web/app/components/teammates-common/question-type-name.pipe.ts @@ -15,13 +15,13 @@ export class QuestionTypeNamePipe implements PipeTransform { transform(type: FeedbackQuestionType): any { switch (type) { case FeedbackQuestionType.MCQ: - return 'Multiple-Choice (single answer) question'; + return 'Multiple-choice (single answer) question'; case FeedbackQuestionType.CONTRIB: return 'Team contribution question'; case FeedbackQuestionType.TEXT: return 'Essay question'; case FeedbackQuestionType.NUMSCALE: - return 'Numerical Scale Question'; + return 'Numerical-scale question'; case FeedbackQuestionType.MSQ: return 'Multiple-choice (multiple answers) question'; case FeedbackQuestionType.RANK_OPTIONS: diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts index 586584c9e1b..7a0f67090ee 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts @@ -15,6 +15,7 @@ import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { TableComparatorService } from '../../../services/table-comparator.service'; import { LOCAL_DATE_TIME_FORMAT, TimeResolvingResult, TimezoneService } from '../../../services/timezone.service'; +import { VisibilityStateMachine } from '../../../services/visibility-state-machine'; import { Course, Courses, @@ -37,6 +38,7 @@ import { Students, } from '../../../types/api-output'; import { Intent } from '../../../types/api-request'; +import { VisibilityControl } from '../../../types/visibility-control'; import { CopySessionModalResult } from '../../components/copy-session-modal/copy-session-modal-model'; import { CopySessionModalComponent } from '../../components/copy-session-modal/copy-session-modal.component'; import { @@ -730,6 +732,40 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag isChanged: false, }; + // inherit some settings from the last question + if (this.questionEditFormModels.length > 0) { + const lastQuestionEditFormModel: QuestionEditFormModel = + this.questionEditFormModels[this.questionEditFormModels.length - 1]; + + const newQuestionAllowedFeedbackPaths: Map = + this.feedbackQuestionsService.getAllowedFeedbackPaths(type); + // inherit feedback path if applicable + if (newQuestionAllowedFeedbackPaths.has(lastQuestionEditFormModel.giverType) + // tslint:disable-next-line:no-non-null-assertion + && newQuestionAllowedFeedbackPaths.get(lastQuestionEditFormModel.giverType)! + .indexOf(lastQuestionEditFormModel.recipientType) !== -1) { + this.newQuestionEditFormModel.giverType = lastQuestionEditFormModel.giverType; + this.newQuestionEditFormModel.recipientType = lastQuestionEditFormModel.recipientType; + } + + const newQuestionVisibilityStateMachine: VisibilityStateMachine = + this.feedbackQuestionsService.getNewVisibilityStateMachine( + this.newQuestionEditFormModel.giverType, this.newQuestionEditFormModel.recipientType); + // inherit visibility settings if applicable, the state machine will automatically filter out invalid choices + newQuestionVisibilityStateMachine.applyVisibilitySettings({ + SHOW_RESPONSE: lastQuestionEditFormModel.showResponsesTo, + SHOW_GIVER_NAME: lastQuestionEditFormModel.showGiverNameTo, + SHOW_RECIPIENT_NAME: lastQuestionEditFormModel.showRecipientNameTo, + }); + this.newQuestionEditFormModel.showResponsesTo = + newQuestionVisibilityStateMachine.getVisibilityTypesUnderVisibilityControl(VisibilityControl.SHOW_RESPONSE); + this.newQuestionEditFormModel.showGiverNameTo = + newQuestionVisibilityStateMachine.getVisibilityTypesUnderVisibilityControl(VisibilityControl.SHOW_GIVER_NAME); + this.newQuestionEditFormModel.showRecipientNameTo = + newQuestionVisibilityStateMachine.getVisibilityTypesUnderVisibilityControl( + VisibilityControl.SHOW_RECIPIENT_NAME); + } + this.scrollToNewEditForm(); } From 5b516ce6b98c889a85866c27510cdbde8c14d1a5 Mon Sep 17 00:00:00 2001 From: Ni Tianzhen Date: Tue, 21 Jul 2020 20:30:32 +0800 Subject: [PATCH 042/205] [#10355] Use default order for MCQ response summary (#10369) --- .../mcq-question-statistics.component.html | 2 +- .../components/sortable-table/sortable-table.component.ts | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/web/app/components/question-types/question-statistics/mcq-question-statistics.component.html b/src/web/app/components/question-types/question-statistics/mcq-question-statistics.component.html index f4aaeef511f..4d73c4c2f57 100644 --- a/src/web/app/components/question-types/question-statistics/mcq-question-statistics.component.html +++ b/src/web/app/components/question-types/question-statistics/mcq-question-statistics.component.html @@ -8,7 +8,7 @@
    - +
    diff --git a/src/web/app/components/sortable-table/sortable-table.component.ts b/src/web/app/components/sortable-table/sortable-table.component.ts index 56e7d872a91..b3aca1de7d7 100644 --- a/src/web/app/components/sortable-table/sortable-table.component.ts +++ b/src/web/app/components/sortable-table/sortable-table.component.ts @@ -102,13 +102,10 @@ export class SortableTableComponent implements OnInit { * Sorts the table with an initial SortBy */ initialSort(): void { - let indexOfColumnToSort: number = + const indexOfColumnToSort: number = this.columns.findIndex((column: ColumnData) => column.sortBy === this.initialSortBy); if (indexOfColumnToSort < 0) { - indexOfColumnToSort = this.columns.findIndex((column: ColumnData) => column.sortBy); - if (indexOfColumnToSort < 0) { - return; - } + return; } this.columnToSortBy = this.columns[indexOfColumnToSort].header; From c57408f7195be8c785b5aea8da2e276d22f7654e Mon Sep 17 00:00:00 2001 From: Tan Kian Wei Jason <31800234+jtankw3@users.noreply.github.com> Date: Tue, 21 Jul 2020 22:59:30 +0800 Subject: [PATCH 043/205] [#10325] Google blocking E2E login on production server (#10327) * Add user data to webdriver to enable manual log in * Fix redirection after loginAdminToPage * Remove code for google log in * Add check for profile existence * Fix lint --- .../e2e/cases/e2e/AdminSearchPageE2ETest.java | 5 +- .../e2e/cases/e2e/BaseE2ETestCase.java | 19 ++-- .../e2e/InstructorCourseEditPageE2ETest.java | 4 +- .../InstructorCourseEnrollPageE2ETest.java | 5 +- .../e2e/InstructorCoursesPageE2ETest.java | 5 +- .../e2e/StudentCourseDetailsPageE2ETest.java | 5 +- .../cases/e2e/StudentProfilePageE2ETest.java | 5 +- .../teammates/e2e/pageobjects/Browser.java | 27 ++++- .../e2e/pageobjects/GoogleLoginPage.java | 107 +----------------- .../teammates/e2e/util/TestProperties.java | 8 ++ src/e2e/resources/test.template.properties | 12 ++ 11 files changed, 70 insertions(+), 132 deletions(-) diff --git a/src/e2e/java/teammates/e2e/cases/e2e/AdminSearchPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/e2e/AdminSearchPageE2ETest.java index 16601e2d707..cfcf5e6a437 100644 --- a/src/e2e/java/teammates/e2e/cases/e2e/AdminSearchPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/e2e/AdminSearchPageE2ETest.java @@ -12,9 +12,7 @@ import teammates.common.util.AppUrl; import teammates.common.util.Const; import teammates.common.util.StringHelper; -import teammates.e2e.pageobjects.AdminHomePage; import teammates.e2e.pageobjects.AdminSearchPage; -import teammates.e2e.pageobjects.AppPage; /** * SUT: {@link Const.WebPageURIs#ADMIN_SEARCH_PAGE}. @@ -32,8 +30,7 @@ protected void prepareTestData() { @Test public void allTests() { AppUrl url = createUrl(Const.WebPageURIs.ADMIN_SEARCH_PAGE); - loginAdminToPage(url, AdminHomePage.class); - searchPage = AppPage.getNewPageInstance(browser, url, AdminSearchPage.class); + searchPage = loginAdminToPage(url, AdminSearchPage.class); searchPage.waitForPageToLoad(); StudentAttributes student = testData.students.get("student1InCourse1"); diff --git a/src/e2e/java/teammates/e2e/cases/e2e/BaseE2ETestCase.java b/src/e2e/java/teammates/e2e/cases/e2e/BaseE2ETestCase.java index 992f444ae79..60f36169eb2 100644 --- a/src/e2e/java/teammates/e2e/cases/e2e/BaseE2ETestCase.java +++ b/src/e2e/java/teammates/e2e/cases/e2e/BaseE2ETestCase.java @@ -15,6 +15,7 @@ import teammates.e2e.pageobjects.AppPage; import teammates.e2e.pageobjects.Browser; import teammates.e2e.pageobjects.BrowserPool; +import teammates.e2e.pageobjects.DevServerLoginPage; import teammates.e2e.pageobjects.HomePage; import teammates.e2e.pageobjects.LoginPage; import teammates.e2e.util.TestProperties; @@ -82,6 +83,13 @@ protected static Url createLocalUrl(String testFileName) throws IOException { * Logs in a page using admin credentials (i.e. in masquerade mode). */ protected T loginAdminToPage(AppUrl url, Class typeOfPage) { + // When not using dev server, Google blocks log in by automation. + // To log in, log in manually to teammates in your browser before running e2e tests. + // Refer to teammates.e2e.pageobjects.Browser for more information. + if (!TestProperties.isDevServer()) { + // skip login and navigate to the desired page. + return AppPage.getNewPageInstance(browser, url, typeOfPage); + } if (browser.isAdminLoggedIn) { browser.driver.get(url.toAbsoluteString()); @@ -94,7 +102,7 @@ protected T loginAdminToPage(AppUrl url, Class typeOfPage } // logout and attempt to load the requested URL. This will be - // redirected to a dev-server/google login page + // redirected to a dev-server login page logout(); browser.driver.get(url.toAbsoluteString()); @@ -103,19 +111,16 @@ protected T loginAdminToPage(AppUrl url, Class typeOfPage String userId = url.get(Const.ParamsNames.USER_ID); - if (TestProperties.isDevServer() && userId != null) { + if (userId != null) { // This workaround is necessary because the front-end has not been optimized // to enable masquerade mode yet adminUsername = userId; } - // login based on the login page type - LoginPage loginPage = AppPage.createCorrectLoginPageType(browser); + LoginPage loginPage = AppPage.getNewPageInstance(browser, DevServerLoginPage.class); loginPage.loginAsAdmin(adminUsername, adminPassword); - // After login, the browser should be redirected to the page requested originally. - // No need to reload. In fact, reloading might results in duplicate request to the server. - return AppPage.getNewPageInstance(browser, typeOfPage); + return AppPage.getNewPageInstance(browser, url, typeOfPage); } /** diff --git a/src/e2e/java/teammates/e2e/cases/e2e/InstructorCourseEditPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/e2e/InstructorCourseEditPageE2ETest.java index 188e8e6cbd2..82290e9af47 100644 --- a/src/e2e/java/teammates/e2e/cases/e2e/InstructorCourseEditPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/e2e/InstructorCourseEditPageE2ETest.java @@ -11,7 +11,6 @@ import teammates.common.util.ThreadHelper; import teammates.e2e.pageobjects.AppPage; import teammates.e2e.pageobjects.InstructorCourseEditPage; -import teammates.e2e.pageobjects.InstructorHomePage; /** * SUT: {@link Const.WebPageURIs#INSTRUCTOR_COURSE_EDIT_PAGE}. @@ -40,8 +39,7 @@ public void testAll() { AppUrl url = createUrl(Const.WebPageURIs.INSTRUCTOR_COURSE_EDIT_PAGE) .withUserId(instructors[2].googleId) .withCourseId(course.getId()); - loginAdminToPage(url, InstructorHomePage.class); - InstructorCourseEditPage editPage = AppPage.getNewPageInstance(browser, url, InstructorCourseEditPage.class); + InstructorCourseEditPage editPage = loginAdminToPage(url, InstructorCourseEditPage.class); editPage.verifyCourseNotEditable(); editPage.verifyInstructorsNotEditable(); diff --git a/src/e2e/java/teammates/e2e/cases/e2e/InstructorCourseEnrollPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/e2e/InstructorCourseEnrollPageE2ETest.java index 16e173450b9..357d0444639 100644 --- a/src/e2e/java/teammates/e2e/cases/e2e/InstructorCourseEnrollPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/e2e/InstructorCourseEnrollPageE2ETest.java @@ -7,7 +7,6 @@ import teammates.common.util.Const; import teammates.e2e.pageobjects.AppPage; import teammates.e2e.pageobjects.InstructorCourseEnrollPage; -import teammates.e2e.pageobjects.InstructorHomePage; /** * SUT: {@link Const.WebPageURIs#INSTRUCTOR_COURSE_ENROLL_PAGE}. @@ -24,9 +23,7 @@ public void testAll() { AppUrl url = createUrl(Const.WebPageURIs.INSTRUCTOR_COURSE_ENROLL_PAGE) .withUserId(testData.instructors.get("ICEnrollE2eT.teammates.test").googleId) .withCourseId(testData.courses.get("ICEnrollE2eT.CS2104").getId()); - loginAdminToPage(url, InstructorHomePage.class); - InstructorCourseEnrollPage enrollPage = - AppPage.getNewPageInstance(browser, url, InstructorCourseEnrollPage.class); + InstructorCourseEnrollPage enrollPage = loginAdminToPage(url, InstructorCourseEnrollPage.class); ______TS("Add rows to enroll spreadsheet"); int numRowsToAdd = 30; diff --git a/src/e2e/java/teammates/e2e/cases/e2e/InstructorCoursesPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/e2e/InstructorCoursesPageE2ETest.java index 1a8f98396ef..f6215cfb735 100644 --- a/src/e2e/java/teammates/e2e/cases/e2e/InstructorCoursesPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/e2e/InstructorCoursesPageE2ETest.java @@ -13,9 +13,7 @@ import teammates.common.util.AppUrl; import teammates.common.util.Const; import teammates.common.util.ThreadHelper; -import teammates.e2e.pageobjects.AppPage; import teammates.e2e.pageobjects.InstructorCoursesPage; -import teammates.e2e.pageobjects.InstructorHomePage; import teammates.e2e.util.BackDoor; /** @@ -50,8 +48,7 @@ public void testAll() { String instructorId = testData.accounts.get("instructor").getGoogleId(); AppUrl url = createUrl(Const.WebPageURIs.INSTRUCTOR_COURSES_PAGE) .withUserId(instructorId); - loginAdminToPage(url, InstructorHomePage.class); - InstructorCoursesPage coursesPage = AppPage.getNewPageInstance(browser, url, InstructorCoursesPage.class); + InstructorCoursesPage coursesPage = loginAdminToPage(url, InstructorCoursesPage.class); coursesPage.waitForPageToLoad(); ______TS("verify loaded data"); diff --git a/src/e2e/java/teammates/e2e/cases/e2e/StudentCourseDetailsPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/e2e/StudentCourseDetailsPageE2ETest.java index 0130f1ca114..bd41af6f77f 100644 --- a/src/e2e/java/teammates/e2e/cases/e2e/StudentCourseDetailsPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/e2e/StudentCourseDetailsPageE2ETest.java @@ -7,9 +7,7 @@ import teammates.common.datatransfer.attributes.StudentProfileAttributes; import teammates.common.util.AppUrl; import teammates.common.util.Const; -import teammates.e2e.pageobjects.AppPage; import teammates.e2e.pageobjects.StudentCourseDetailsPage; -import teammates.e2e.pageobjects.StudentHomePage; /** * SUT: {@link Const.WebPageURIs#STUDENT_COURSE_DETAILS_PAGE}. @@ -28,8 +26,7 @@ public void testAll() { AppUrl url = createUrl(Const.WebPageURIs.STUDENT_COURSE_DETAILS_PAGE) .withCourseId("SCDetailsE2eT.CS2104") .withUserId(testData.students.get("SCDetailsE2eT.alice").googleId); - loginAdminToPage(url, StudentHomePage.class); - StudentCourseDetailsPage detailsPage = AppPage.getNewPageInstance(browser, url, StudentCourseDetailsPage.class); + StudentCourseDetailsPage detailsPage = loginAdminToPage(url, StudentCourseDetailsPage.class); ______TS("verify loaded data"); InstructorAttributes[] instructors = { testData.instructors.get("SCDetailsE2eT.instr"), diff --git a/src/e2e/java/teammates/e2e/cases/e2e/StudentProfilePageE2ETest.java b/src/e2e/java/teammates/e2e/cases/e2e/StudentProfilePageE2ETest.java index 370622a7117..09ae732f32f 100644 --- a/src/e2e/java/teammates/e2e/cases/e2e/StudentProfilePageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/e2e/StudentProfilePageE2ETest.java @@ -5,8 +5,6 @@ import teammates.common.datatransfer.attributes.StudentProfileAttributes; import teammates.common.util.AppUrl; import teammates.common.util.Const; -import teammates.e2e.pageobjects.AppPage; -import teammates.e2e.pageobjects.StudentHomePage; import teammates.e2e.pageobjects.StudentProfilePage; /** @@ -26,8 +24,7 @@ public void testAll() { ______TS("Typical case: Log in with filled profile values"); AppUrl url = createUrl(Const.WebPageURIs.STUDENT_PROFILE_PAGE).withUserId("SProfUiT.student"); - loginAdminToPage(url, StudentHomePage.class); - StudentProfilePage profilePage = AppPage.getNewPageInstance(browser, url, StudentProfilePage.class); + StudentProfilePage profilePage = loginAdminToPage(url, StudentProfilePage.class); profilePage.ensureProfileContains("Ben", "i.m.benny@gmail.tmt", "TEAMMATES Test Institute 4", "Singaporean", StudentProfileAttributes.Gender.MALE, "I am just another student :P"); diff --git a/src/e2e/java/teammates/e2e/pageobjects/Browser.java b/src/e2e/java/teammates/e2e/pageobjects/Browser.java index bf6ada728df..a89df3af134 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/Browser.java +++ b/src/e2e/java/teammates/e2e/pageobjects/Browser.java @@ -1,6 +1,8 @@ package teammates.e2e.pageobjects; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.Stack; import org.openqa.selenium.JavascriptExecutor; @@ -10,6 +12,7 @@ import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.firefox.FirefoxOptions; import org.openqa.selenium.firefox.FirefoxProfile; +import org.openqa.selenium.firefox.ProfilesIni; import org.openqa.selenium.support.ui.WebDriverWait; import teammates.e2e.util.TestProperties; @@ -126,10 +129,22 @@ private WebDriver createWebDriver() { } System.setProperty("webdriver.gecko.driver", TestProperties.GECKODRIVER_PATH); + FirefoxProfile profile; + if (TestProperties.isDevServer()) { + profile = new FirefoxProfile(); + } else { + // Get user data from browser to bypass google blocking automated log in. + // Log in manually to teammates to use that log in data for e2e tests. + ProfilesIni profileIni = new ProfilesIni(); + profile = profileIni.getProfile(TestProperties.FIREFOX_PROFILE_NAME); + if (profile == null) { + throw new RuntimeException("Firefox profile not found. Failed to create webdriver."); + } + } + // Allow CSV files to be download automatically, without a download popup. // This method is used because Selenium cannot directly interact with the download dialog. // Taken from http://stackoverflow.com/questions/24852709 - FirefoxProfile profile = new FirefoxProfile(); profile.setPreference("browser.download.panel.shown", false); profile.setPreference("browser.helperApps.neverAsk.openFile", "text/csv,application/vnd.ms-excel"); profile.setPreference("browser.helperApps.neverAsk.saveToDisk", "text/csv,application/vnd.ms-excel"); @@ -146,6 +161,16 @@ private WebDriver createWebDriver() { ChromeOptions options = new ChromeOptions(); options.addArguments("--allow-file-access-from-files"); + if (!TestProperties.isDevServer()) { + // Get user data from browser to bypass google blocking automated log in. + // Log in manually to teammates to use that log in data for e2e tests. + if (TestProperties.CHROME_USER_DATA_PATH.isEmpty() + || !Files.exists(Paths.get(TestProperties.CHROME_USER_DATA_PATH))) { + throw new RuntimeException("Chrome user data path not found. Failed to create webdriver."); + } + options.addArguments("user-data-dir=" + TestProperties.CHROME_USER_DATA_PATH); + } + return new ChromeDriver(options); } diff --git a/src/e2e/java/teammates/e2e/pageobjects/GoogleLoginPage.java b/src/e2e/java/teammates/e2e/pageobjects/GoogleLoginPage.java index b03856df8db..13f96da0ed0 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/GoogleLoginPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/GoogleLoginPage.java @@ -1,38 +1,15 @@ package teammates.e2e.pageobjects; -import org.openqa.selenium.By; -import org.openqa.selenium.NoSuchElementException; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.ui.ExpectedConditions; - -import com.google.common.base.Preconditions; - -import teammates.e2e.util.TestProperties; - /** * Page Object Model for the official Google Accounts login page. */ public class GoogleLoginPage extends LoginPage { private static final String EXPECTED_SNIPPET_SIGN_IN = "Sign in – Google accounts"; - private static final String EXPECTED_SNIPPET_APPROVAL = "requesting permission to access your Google Account"; - - @FindBy(id = "initialView") - private WebElement loginPanel; - - @FindBy(id = "identifierId") - private WebElement identifierTextBox; - - @FindBy(id = "identifierNext") - private WebElement identifierNextButton; - - @FindBy(css = "input[type=password]") - private WebElement passwordTextBox; - - @FindBy(id = "passwordNext") - private WebElement passwordNextButton; + private static final String ERROR_CANNOT_LOGIN = "Automated login not allowed on Google login page."; + // Google blocks log in by automation. + // This AppPage is for testing correct navigation and not for actual login. public GoogleLoginPage(Browser browser) { super(browser); } @@ -44,88 +21,16 @@ protected boolean containsExpectedPageContents() { @Override public void loginAsAdmin(String adminUsername, String adminPassword) { - completeGoogleLoginSteps(adminUsername, adminPassword); - browser.isAdminLoggedIn = true; + throw new RuntimeException(ERROR_CANNOT_LOGIN); } @Override public StudentHomePage loginAsStudent(String username, String password) { - return loginAsStudent(username, password, StudentHomePage.class); + throw new RuntimeException(ERROR_CANNOT_LOGIN); } @Override public T loginAsStudent(String username, String password, Class typeOfPage) { - completeGoogleLoginSteps(username, password); - browser.isAdminLoggedIn = false; - return changePageType(typeOfPage); - } - - private void completeGoogleLoginSteps(String username, String password) { - submitCredentials(username, password); - dealWithSignIntoChromePage(); - handleApprovalPageIfAny(); - } - - private void dealWithSignIntoChromePage() { - try { - click(By.id("no-button")); - waitForPageToLoad(); - } catch (NoSuchElementException e) { - System.out.println("No 'sign into chrome' option"); - } - } - - private void handleApprovalPageIfAny() { - waitForPageToLoad(); - waitForRedirectIfAny(); - boolean isPageRequestingAccessApproval = getPageSource().contains(EXPECTED_SNIPPET_APPROVAL); - if (isPageRequestingAccessApproval) { - markCheckBoxAsChecked(browser.driver.findElement(By.id("persist_checkbox"))); - click(By.id("approve_button")); - waitForPageToLoad(); - } - } - - private void waitForRedirectIfAny() { - String loginRedirectUrl = TestProperties.TEAMMATES_URL + "/_ah/conflogin"; - waitFor(d -> { - String url = Preconditions.checkNotNull(d).getCurrentUrl(); - boolean isTeammatesPage = url.startsWith(TestProperties.TEAMMATES_URL) && !url.startsWith(loginRedirectUrl); - boolean isApprovalPage = d.getPageSource().contains(EXPECTED_SNIPPET_APPROVAL); - return isTeammatesPage || isApprovalPage; - }); - } - - private void waitForLoginPanelAnimationToComplete() { - // the login panel will have attribute `aria-busy="true"` while in animation - waitFor(ExpectedConditions.attributeToBe(loginPanel, "aria-busy", "")); - } - - private void submitCredentials(String username, String password) { - completeFillIdentifierSteps(username); - click(identifierNextButton); - - waitForLoginPanelAnimationToComplete(); - fillTextBox(passwordTextBox, password); - - click(passwordNextButton); - waitForPageToLoad(); - } - - private void completeFillIdentifierSteps(String identifier) { - By switchAccountButtonBy = By.cssSelector("div[aria-label='Switch account']"); - By useAnotherAccountButtonBy = By.xpath("//div[contains(text(), 'Use another account')]"); - - if (isElementPresent(switchAccountButtonBy)) { - click(switchAccountButtonBy); - waitForLoginPanelAnimationToComplete(); - } - - if (isElementPresent(useAnotherAccountButtonBy)) { - click(useAnotherAccountButtonBy); - waitForLoginPanelAnimationToComplete(); - } - - fillTextBox(identifierTextBox, identifier); + throw new RuntimeException(ERROR_CANNOT_LOGIN); } } diff --git a/src/e2e/java/teammates/e2e/util/TestProperties.java b/src/e2e/java/teammates/e2e/util/TestProperties.java index 5f3b13bf248..dee1d628479 100644 --- a/src/e2e/java/teammates/e2e/util/TestProperties.java +++ b/src/e2e/java/teammates/e2e/util/TestProperties.java @@ -86,6 +86,12 @@ public final class TestProperties { /** The value of "test.geckodriver.path" in test.properties file. */ public static final String GECKODRIVER_PATH; + /** The value of "test.firefox.profile.name" in test.properties file. */ + public static final String FIREFOX_PROFILE_NAME; + + /** The value of "test.chrome.userdata.path" in test.properties file. */ + public static final String CHROME_USER_DATA_PATH; + /** The value of "test.timeout" in test.properties file. */ public static final int TEST_TIMEOUT; @@ -138,6 +144,8 @@ public final class TestProperties { FIREFOX_PATH = prop.getProperty("test.firefox.path"); CHROMEDRIVER_PATH = prop.getProperty("test.chromedriver.path"); GECKODRIVER_PATH = prop.getProperty("test.geckodriver.path"); + FIREFOX_PROFILE_NAME = prop.getProperty("test.firefox.profile.name"); + CHROME_USER_DATA_PATH = prop.getProperty("test.chrome.userdata.path"); TEST_TIMEOUT = Integer.parseInt(prop.getProperty("test.timeout")); PERSISTENCE_RETRY_PERIOD_IN_S = Integer.parseInt(prop.getProperty("test.persistence.timeout")); diff --git a/src/e2e/resources/test.template.properties b/src/e2e/resources/test.template.properties index 2207377e331..9f356e80dd8 100644 --- a/src/e2e/resources/test.template.properties +++ b/src/e2e/resources/test.template.properties @@ -43,6 +43,18 @@ test.geckodriver.path= # e.g test.chromedriver.path=/Users/YourName/Downloads/chromedriver test.chromedriver.path= +# This is the profile for Firefox used for logging in. +# It is required if you are running test with Firefox and not using dev server. +# Enter about:profiles into Firefox address bar to identify the profile you are using. +# e.g test.firefox.profile.name=default-release +test.firefox.profile.name= + +# This is the path for Chrome's user data used for logging in. +# It is required if you are running test with Chrome and not using dev server. +# e.g test.chromedriver.path=C:/Users/YourName/AppData/Local/Google/User Data +# e.g test.chromedriver.path=/Users/YourName/Library/Application Support/Google/Chrome/Default +test.chrome.userdata.path= + ############################################################################### # This is the timeout value, in seconds, for the waitings done in browsers # e.g waiting for element (non-)presence/(in)visibility, for page to load From c9d43b3f687ab56868f597219723e1026e719561 Mon Sep 17 00:00:00 2001 From: Chong Chee Yuan <32454748+ccyccyccy@users.noreply.github.com> Date: Wed, 22 Jul 2020 11:42:38 +0800 Subject: [PATCH 044/205] Add ordering prefix to rubric choices and sort them (#10378) Co-authored-by: Ahmed Bahajjaj --- .../rubric-question-response.component.html | 4 ++-- .../rubric-question-statistics.component.ts | 4 ++-- .../__snapshots__/session-result-csv.service.spec.ts.snap | 8 ++++---- src/web/services/table-comparator.service.ts | 1 + .../feedback-rubric-question-details.impl.ts | 2 +- src/web/types/sort-properties.ts | 5 +++++ 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/web/app/components/question-types/question-response/rubric-question-response.component.html b/src/web/app/components/question-types/question-response/rubric-question-response.component.html index 4de9bac707d..db5772ce9aa 100644 --- a/src/web/app/components/question-types/question-response/rubric-question-response.component.html +++ b/src/web/app/components/question-types/question-response/rubric-question-response.component.html @@ -17,7 +17,7 @@
    -
      +
      1. {{ answer.answer }} {{ answer.index ? '(Choice ' + answer.index + ')' : '' }}
        2. -
    +
    diff --git a/src/web/app/components/question-types/question-statistics/rubric-question-statistics.component.ts b/src/web/app/components/question-types/question-statistics/rubric-question-statistics.component.ts index 59988653b8b..8fdb2ffe634 100644 --- a/src/web/app/components/question-types/question-statistics/rubric-question-statistics.component.ts +++ b/src/web/app/components/question-types/question-statistics/rubric-question-statistics.component.ts @@ -42,7 +42,7 @@ export class RubricQuestionStatisticsComponent extends RubricQuestionStatisticsC getTableData(): void { this.summaryColumnsData = [ - { header: '' }, + { header: 'Question', sortBy: SortBy.RUBRIC_SUBQUESTION }, ...this.choices.map((choice: string) => ({ header: choice, sortBy: SortBy.RUBRIC_CHOICE })), ]; if (this.hasWeights) { @@ -51,7 +51,7 @@ export class RubricQuestionStatisticsComponent extends RubricQuestionStatisticsC this.summaryRowsData = this.subQuestions.map((subQuestion: string, questionIndex: number) => { const currRow: SortableTableCellData[] = [ - { value: subQuestion }, + { value: `${StringHelper.integerToLowerCaseAlphabeticalIndex(questionIndex + 1)}) ${subQuestion}` }, ...this.choices.map((_: string, choiceIndex: number) => { if (this.excludeSelf) { return { value: `${ this.percentagesExcludeSelf[questionIndex][choiceIndex] }% \ diff --git a/src/web/services/__snapshots__/session-result-csv.service.spec.ts.snap b/src/web/services/__snapshots__/session-result-csv.service.spec.ts.snap index cfb42401e0c..fee57d1bb02 100644 --- a/src/web/services/__snapshots__/session-result-csv.service.spec.ts.snap +++ b/src/web/services/__snapshots__/session-result-csv.service.spec.ts.snap @@ -432,8 +432,8 @@ Question 1,Please choose the best choice for the following sub-questions. Summary Statistics ,Yes,No,Average -This student has done a good job.,67% (2) [1.25],33% (1) [-1.7],0.27649999999999997 -This student has tried his/her best.,75% (3) [1.25],25% (1) [-1.7],0.5125 +a) This student has done a good job.,67% (2) [1.25],33% (1) [-1.7],0.27649999999999997 +b) This student has tried his/her best.,75% (3) [1.25],25% (1) [-1.7],0.5125 Per Recipient Statistics Team,Recipient Name,Recipient's Email,Sub Question,Yes,No,Total,Average @@ -475,8 +475,8 @@ Question 2,Please choose the best choice for the following sub-questions. Only f Summary Statistics ,Yes,No,Average -This student has done a good job.,67% (2) [1.25],33% (1) [1],1.1675 -This student has tried his/her best.,0% (0) [1.25],0% (0) [1],0 +a) This student has done a good job.,67% (2) [1.25],33% (1) [1],1.1675 +b) This student has tried his/her best.,0% (0) [1.25],0% (0) [1],0 Per Recipient Statistics Team,Recipient Name,Recipient's Email,Sub Question,Yes,No,Total,Average diff --git a/src/web/services/table-comparator.service.ts b/src/web/services/table-comparator.service.ts index e18956db3be..1bd46c7587c 100644 --- a/src/web/services/table-comparator.service.ts +++ b/src/web/services/table-comparator.service.ts @@ -62,6 +62,7 @@ export class TableComparatorService { compare(sortBy: SortBy, order: SortOrder, strA: string, strB: string): number { switch (sortBy) { case SortBy.CONTRIBUTION_VALUE: + case SortBy.RUBRIC_SUBQUESTION: case SortBy.RUBRIC_CHOICE: case SortBy.RANK_RECIPIENTS_TEAM: case SortBy.RANK_RECIPIENTS_RECIPIENT: diff --git a/src/web/types/question-details-impl/feedback-rubric-question-details.impl.ts b/src/web/types/question-details-impl/feedback-rubric-question-details.impl.ts index 426c80c9588..5648cd8883c 100644 --- a/src/web/types/question-details-impl/feedback-rubric-question-details.impl.ts +++ b/src/web/types/question-details-impl/feedback-rubric-question-details.impl.ts @@ -62,7 +62,7 @@ export class FeedbackRubricQuestionDetailsImpl extends AbstractFeedbackQuestionD statsCalculation.subQuestions.forEach((subQuestion: string, questionIndex: number) => { const currRow: string[] = [ - subQuestion, + `${StringHelper.integerToLowerCaseAlphabeticalIndex(questionIndex + 1)}) ${subQuestion}`, ...statsCalculation.choices.map((_: string, choiceIndex: number) => { return `${ statsCalculation.percentages[questionIndex][choiceIndex] }% \ (${ statsCalculation.answers[questionIndex][choiceIndex] }) \ diff --git a/src/web/types/sort-properties.ts b/src/web/types/sort-properties.ts index 5479f18c646..b59b3bb1b5a 100644 --- a/src/web/types/sort-properties.ts +++ b/src/web/types/sort-properties.ts @@ -277,6 +277,11 @@ export enum SortBy { */ RANK_RECIPIENTS_OVERALL_RANK_EXCLUDING_SELF, + /** + * Rubric sub question + */ + RUBRIC_SUBQUESTION, + /** * Frequency of choice */ From cba514ec8086caa93f86e1fcc414694bb91f8624 Mon Sep 17 00:00:00 2001 From: Ni Tianzhen Date: Wed, 22 Jul 2020 12:28:45 +0800 Subject: [PATCH 045/205] [#10335] Instructor course details page: add initial sorting to student table (#10363) * Add initial sorting to student table * Update snapshot * Update snapshot of instructor course details page * Update snapshot of instructor search page * Copy students array from input property * Move sorting to instructor student list page * Add default sort order to sortby function * Retry test --- .../student-list.component.spec.ts.snap | 16 ++--- .../student-list/student-list.component.html | 10 +-- .../student-list/student-list.component.ts | 64 ++----------------- ...nstructor-student-list-page.component.html | 7 +- .../instructor-student-list-page.component.ts | 64 +++++++++++++++++++ 5 files changed, 89 insertions(+), 72 deletions(-) diff --git a/src/web/app/components/student-list/__snapshots__/student-list.component.spec.ts.snap b/src/web/app/components/student-list/__snapshots__/student-list.component.spec.ts.snap index 0d207cd90d4..6e316b381a4 100644 --- a/src/web/app/components/student-list/__snapshots__/student-list.component.spec.ts.snap +++ b/src/web/app/components/student-list/__snapshots__/student-list.component.spec.ts.snap @@ -15,9 +15,9 @@ exports[`StudentListComponent should snap with default fields 1`] = ` removeStudentFromCourseEvent={[Function EventEmitter]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} + sortStudentListEvent={[Function EventEmitter]} statusMessageService={[Function StatusMessageService]} students={[Function Array]} - tableComparatorService={[Function TableComparatorService]} tableSortBy="0" tableSortOrder={[Function Number]} useGrayHeading={[Function Boolean]} @@ -116,9 +116,9 @@ exports[`StudentListComponent should snap with enable remind button set to true removeStudentFromCourseEvent={[Function EventEmitter]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} + sortStudentListEvent={[Function EventEmitter]} statusMessageService={[Function StatusMessageService]} students={[Function Array]} - tableComparatorService={[Function TableComparatorService]} tableSortBy="0" tableSortOrder={[Function Number]} useGrayHeading={[Function Boolean]} @@ -584,9 +584,9 @@ exports[`StudentListComponent should snap with enable remind button set to true, removeStudentFromCourseEvent={[Function EventEmitter]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} + sortStudentListEvent={[Function EventEmitter]} statusMessageService={[Function StatusMessageService]} students={[Function Array]} - tableComparatorService={[Function TableComparatorService]} tableSortBy="0" tableSortOrder={[Function Number]} useGrayHeading={[Function Boolean]} @@ -1045,9 +1045,9 @@ exports[`StudentListComponent should snap with some student list data 1`] = ` removeStudentFromCourseEvent={[Function EventEmitter]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} + sortStudentListEvent={[Function EventEmitter]} statusMessageService={[Function StatusMessageService]} students={[Function Array]} - tableComparatorService={[Function TableComparatorService]} tableSortBy="0" tableSortOrder={[Function Number]} useGrayHeading={[Function Boolean]} @@ -1487,9 +1487,9 @@ exports[`StudentListComponent should snap with some student list data and some s removeStudentFromCourseEvent={[Function EventEmitter]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} + sortStudentListEvent={[Function EventEmitter]} statusMessageService={[Function StatusMessageService]} students={[Function Array]} - tableComparatorService={[Function TableComparatorService]} tableSortBy="0" tableSortOrder={[Function Number]} useGrayHeading={[Function Boolean]} @@ -1931,9 +1931,9 @@ exports[`StudentListComponent should snap with some student list data when not a removeStudentFromCourseEvent={[Function EventEmitter]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} + sortStudentListEvent={[Function EventEmitter]} statusMessageService={[Function StatusMessageService]} students={[Function Array]} - tableComparatorService={[Function TableComparatorService]} tableSortBy="0" tableSortOrder={[Function Number]} useGrayHeading={[Function Boolean]} @@ -2373,9 +2373,9 @@ exports[`StudentListComponent should snap with some student list data with no se removeStudentFromCourseEvent={[Function EventEmitter]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} + sortStudentListEvent={[Function EventEmitter]} statusMessageService={[Function StatusMessageService]} students={[Function Array]} - tableComparatorService={[Function TableComparatorService]} tableSortBy="0" tableSortOrder={[Function Number]} useGrayHeading={[Function Boolean]} @@ -2553,9 +2553,9 @@ exports[`StudentListComponent should snap with table head set to hidden 1`] = ` removeStudentFromCourseEvent={[Function EventEmitter]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} + sortStudentListEvent={[Function EventEmitter]} statusMessageService={[Function StatusMessageService]} students={[Function Array]} - tableComparatorService={[Function TableComparatorService]} tableSortBy="0" tableSortOrder={[Function Number]} useGrayHeading={[Function Boolean]} diff --git a/src/web/app/components/student-list/student-list.component.html b/src/web/app/components/student-list/student-list.component.html index a1bd6eb7ec3..fb82556bc77 100644 --- a/src/web/app/components/student-list/student-list.component.html +++ b/src/web/app/components/student-list/student-list.component.html @@ -6,31 +6,31 @@ > Photo - + Section - + Team - + Student Name - + Status - + Email diff --git a/src/web/app/components/student-list/student-list.component.ts b/src/web/app/components/student-list/student-list.component.ts index fe0a332bd4e..d4f700f6860 100644 --- a/src/web/app/components/student-list/student-list.component.ts +++ b/src/web/app/components/student-list/student-list.component.ts @@ -1,22 +1,14 @@ -import { - Component, - EventEmitter, - Input, - OnInit, - Output, -} from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { CourseService } from '../../../services/course.service'; import { NavigationService } from '../../../services/navigation.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; -import { TableComparatorService } from '../../../services/table-comparator.service'; import { JoinState, MessageOutput, Student } from '../../../types/api-output'; import { SortBy, SortOrder } from '../../../types/sort-properties'; import { ErrorMessageOutput } from '../../error-message-output'; import { SimpleModalType } from '../simple-modal/simple-modal-type'; -import { JoinStatePipe } from './join-state.pipe'; /** * Model of row of student data containing details about a student and their section. @@ -44,11 +36,11 @@ export class StudentListComponent implements OnInit { @Input() enableRemindButton: boolean = false; @Input() isActionButtonsEnabled: boolean = true; @Input() students: StudentListRowModel[] = []; + @Input() tableSortBy: SortBy = SortBy.NONE; + @Input() tableSortOrder: SortOrder = SortOrder.ASC; @Output() removeStudentFromCourseEvent: EventEmitter = new EventEmitter(); - - tableSortOrder: SortOrder = SortOrder.ASC; - tableSortBy: SortBy = SortBy.NONE; + @Output() sortStudentListEvent: EventEmitter = new EventEmitter(); // enum SortBy: typeof SortBy = SortBy; @@ -59,7 +51,6 @@ export class StudentListComponent implements OnInit { private statusMessageService: StatusMessageService, private navigationService: NavigationService, private courseService: CourseService, - private tableComparatorService: TableComparatorService, private simpleModalService: SimpleModalService) { } @@ -136,50 +127,7 @@ export class StudentListComponent implements OnInit { /** * Sorts the student list */ - sortStudentListEvent(by: SortBy): void { - this.tableSortBy = by; - this.tableSortOrder = - this.tableSortOrder === SortOrder.DESC ? SortOrder.ASC : SortOrder.DESC; - this.students.sort(this.sortBy(by)); - } - - /** - * Returns a function to determine the order of sort - */ - sortBy(by: SortBy): - ((a: StudentListRowModel , b: StudentListRowModel) => number) { - const joinStatePipe: JoinStatePipe = new JoinStatePipe(); - - return (a: StudentListRowModel, b: StudentListRowModel): number => { - let strA: string; - let strB: string; - switch (by) { - case SortBy.SECTION_NAME: - strA = a.student.sectionName; - strB = b.student.sectionName; - break; - case SortBy.STUDENT_NAME: - strA = a.student.name; - strB = b.student.name; - break; - case SortBy.TEAM_NAME: - strA = a.student.teamName; - strB = b.student.teamName; - break; - case SortBy.EMAIL: - strA = a.student.email; - strB = b.student.email; - break; - case SortBy.JOIN_STATUS: - strA = joinStatePipe.transform(a.student.joinState); - strB = joinStatePipe.transform(b.student.joinState); - break; - default: - strA = ''; - strB = ''; - } - - return this.tableComparatorService.compare(by, this.tableSortOrder, strA, strB); - }; + sortStudentList(by: SortBy): void { + this.sortStudentListEvent.emit(by); } } diff --git a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.html b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.html index 097114b4871..a6d42c099c2 100644 --- a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.html +++ b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.html @@ -62,9 +62,14 @@
    Teams


    +
    diff --git a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts index 0dec8048fa2..b7ed2b149a6 100644 --- a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts +++ b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts @@ -8,6 +8,7 @@ import { StudentService } from '../../../services/student.service'; import { TableComparatorService } from '../../../services/table-comparator.service'; import { Course, Courses, InstructorPrivilege, Student, Students } from '../../../types/api-output'; import { SortBy, SortOrder } from '../../../types/sort-properties'; +import { JoinStatePipe } from '../../components/student-list/join-state.pipe'; import { StudentListRowModel } from '../../components/student-list/student-list.component'; import { collapseAnim } from '../../components/teammates-common/collapse-anim'; import { ErrorMessageOutput } from '../../error-message-output'; @@ -19,6 +20,8 @@ interface StudentIndexedData { interface CourseTab { course: Course; studentList: StudentListRowModel[]; + studentSortBy: SortBy; + studentSortOrder: SortOrder; hasTabExpanded: boolean; hasStudentLoaded: boolean; stats: CourseStatistics; @@ -61,6 +64,8 @@ export class InstructorStudentListPageComponent implements OnInit { const courseTab: CourseTab = { course, studentList: [], + studentSortBy: SortBy.NONE, + studentSortOrder: SortOrder.ASC, hasTabExpanded: false, hasStudentLoaded: false, stats: { @@ -134,6 +139,7 @@ export class InstructorStudentListPageComponent implements OnInit { }); courseTab.studentList.push(...students); + courseTab.studentList.sort(this.sortStudentBy(SortBy.NONE, SortOrder.ASC)); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); @@ -168,4 +174,62 @@ export class InstructorStudentListPageComponent implements OnInit { .compare(SortBy.COURSE_ID, SortOrder.ASC, a.course.courseId, b.course.courseId); }); } + + /** + * Sorts the student list. + */ + sortStudentList(courseTab: CourseTab, by: SortBy): void { + courseTab.studentSortBy = by; + courseTab.studentSortOrder = + courseTab.studentSortOrder === SortOrder.DESC ? SortOrder.ASC : SortOrder.DESC; + courseTab.studentList.sort(this.sortStudentBy(by, courseTab.studentSortOrder)); + } + + /** + * Returns a function to determine the order of sort for students. + */ + sortStudentBy(by: SortBy, order: SortOrder): + ((a: StudentListRowModel , b: StudentListRowModel) => number) { + const joinStatePipe: JoinStatePipe = new JoinStatePipe(); + if (by === SortBy.NONE) { + // Default order: section name > team name > student name + return ((a: StudentListRowModel, b: StudentListRowModel): number => { + return this.tableComparatorService + .compare(SortBy.SECTION_NAME, order, a.student.sectionName, b.student.sectionName) + || this.tableComparatorService.compare(SortBy.TEAM_NAME, order, a.student.teamName, b.student.teamName) + || this.tableComparatorService.compare(SortBy.STUDENT_NAME, order, a.student.name, b.student.name); + }); + } + return (a: StudentListRowModel, b: StudentListRowModel): number => { + let strA: string; + let strB: string; + switch (by) { + case SortBy.SECTION_NAME: + strA = a.student.sectionName; + strB = b.student.sectionName; + break; + case SortBy.STUDENT_NAME: + strA = a.student.name; + strB = b.student.name; + break; + case SortBy.TEAM_NAME: + strA = a.student.teamName; + strB = b.student.teamName; + break; + case SortBy.EMAIL: + strA = a.student.email; + strB = b.student.email; + break; + case SortBy.JOIN_STATUS: + strA = joinStatePipe.transform(a.student.joinState); + strB = joinStatePipe.transform(b.student.joinState); + break; + default: + strA = ''; + strB = ''; + } + + return this.tableComparatorService.compare(by, order, strA, strB); + }; + } } From d0d9c0b4c8885c7bb38ae1d7257a4d095c692c11 Mon Sep 17 00:00:00 2001 From: Chong Chee Yuan <32454748+ccyccyccy@users.noreply.github.com> Date: Wed, 22 Jul 2020 13:20:30 +0800 Subject: [PATCH 046/205] [#10347] Fix inconsistency in indicating end of the day (#10377) * Change usage of time 00:00 to use 23:59 * Add option for 23:00 --- .../time-picker/time-picker.component.html | 2 +- .../time-picker/time-picker.component.ts | 4 ++-- .../instructor-session-edit-page.component.ts | 12 ++++++------ .../instructor-sessions-page.component.ts | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/web/app/components/session-edit-form/time-picker/time-picker.component.html b/src/web/app/components/session-edit-form/time-picker/time-picker.component.html index 1e5fa4662ee..02235ed59ec 100644 --- a/src/web/app/components/session-edit-form/time-picker/time-picker.component.html +++ b/src/web/app/components/session-edit-form/time-picker/time-picker.component.html @@ -2,7 +2,7 @@ (ngModelChange)="triggerTimeChange($event)" [disabled]="isDisabled" [compareWith]="timeCompareFn" > - diff --git a/src/web/app/components/session-edit-form/time-picker/time-picker.component.ts b/src/web/app/components/session-edit-form/time-picker/time-picker.component.ts index dafaf6a77e6..7603ea336b2 100644 --- a/src/web/app/components/session-edit-form/time-picker/time-picker.component.ts +++ b/src/web/app/components/session-edit-form/time-picker/time-picker.component.ts @@ -34,9 +34,9 @@ export class TimePickerComponent implements OnInit { /** * Helper function to create a range. */ - range(n: number): number[] { + range(start: number, end: number): number[] { const arr: number[] = []; - for (let i: number = 0; i < n; i += 1) { + for (let i: number = start; i < end; i += 1) { arr.push(i); } return arr; diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts index 7a0f67090ee..2933e55fc84 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts @@ -87,18 +87,18 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag feedbackSessionName: '', instructions: '', - submissionStartTime: { hour: 0, minute: 0 }, + submissionStartTime: { hour: 23, minute: 59 }, submissionStartDate: { year: 0, month: 0, day: 0 }, - submissionEndTime: { hour: 0, minute: 0 }, + submissionEndTime: { hour: 23, minute: 59 }, submissionEndDate: { year: 0, month: 0, day: 0 }, gracePeriod: 0, sessionVisibleSetting: SessionVisibleSetting.AT_OPEN, - customSessionVisibleTime: { hour: 0, minute: 0 }, + customSessionVisibleTime: { hour: 23, minute: 59 }, customSessionVisibleDate: { year: 0, month: 0, day: 0 }, responseVisibleSetting: ResponseVisibleSetting.CUSTOM, - customResponseVisibleTime: { hour: 0, minute: 0 }, + customResponseVisibleTime: { hour: 23, minute: 59 }, customResponseVisibleDate: { year: 0, month: 0, day: 0 }, submissionStatus: FeedbackSessionSubmissionStatus.OPEN, @@ -282,11 +282,11 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag gracePeriod: feedbackSession.gracePeriod, sessionVisibleSetting: feedbackSession.sessionVisibleSetting, - customSessionVisibleTime: { hour: 0, minute: 0 }, + customSessionVisibleTime: { hour: 23, minute: 59 }, customSessionVisibleDate: { year: 0, month: 0, day: 0 }, responseVisibleSetting: feedbackSession.responseVisibleSetting, - customResponseVisibleTime: { hour: 0, minute: 0 }, + customResponseVisibleTime: { hour: 23, minute: 59 }, customResponseVisibleDate: { year: 0, month: 0, day: 0 }, submissionStatus: feedbackSession.submissionStatus, diff --git a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts index adfe8d3f95a..aa05444e542 100644 --- a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts +++ b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts @@ -91,18 +91,18 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC feedbackSessionName: '', instructions: 'Please answer all the given questions.', - submissionStartTime: { hour: 0, minute: 0 }, + submissionStartTime: { hour: 23, minute: 59 }, submissionStartDate: { year: 0, month: 0, day: 0 }, - submissionEndTime: { hour: 0, minute: 0 }, + submissionEndTime: { hour: 23, minute: 59 }, submissionEndDate: { year: 0, month: 0, day: 0 }, gracePeriod: 0, sessionVisibleSetting: SessionVisibleSetting.AT_OPEN, - customSessionVisibleTime: { hour: 0, minute: 0 }, + customSessionVisibleTime: { hour: 23, minute: 59 }, customSessionVisibleDate: { year: 0, month: 0, day: 0 }, responseVisibleSetting: ResponseVisibleSetting.LATER, - customResponseVisibleTime: { hour: 0, minute: 0 }, + customResponseVisibleTime: { hour: 23, minute: 59 }, customResponseVisibleDate: { year: 0, month: 0, day: 0 }, submissionStatus: FeedbackSessionSubmissionStatus.OPEN, From 69fc0b9804067957644130c55f151d9498558f5f Mon Sep 17 00:00:00 2001 From: Ni Tianzhen Date: Wed, 22 Jul 2020 14:16:53 +0800 Subject: [PATCH 047/205] [#10331] Instructor course page: add sorting to archived/deleted courses (#10362) * Add sorting to instructor course page archived/deleted courses * Update snapshot * Fix a bug where newly archived/deleted courses not sorted * Update snapshot Co-authored-by: Ahmed Bahajjaj --- ...ructor-courses-page.component.spec.ts.snap | 64 +++++++++------ .../instructor-courses-page.component.html | 79 +++++++++++++------ .../instructor-courses-page.component.ts | 47 ++++++++--- src/web/types/sort-properties.ts | 5 ++ 4 files changed, 141 insertions(+), 54 deletions(-) diff --git a/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap index 17143c9a7cb..7f603f654c9 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap @@ -5,11 +5,17 @@ exports[`InstructorCoursesPageComponent should snap when courses are still loadi SortBy={[Function Object]} SortOrder={[Function Object]} activeCourses={[Function Array]} + activeTableSortBy={[Function Number]} + activeTableSortOrder={[Function Number]} archivedCourses={[Function Array]} + archivedTableSortBy={[Function Number]} + archivedTableSortOrder={[Function Number]} canDeleteAll={[Function Boolean]} canRestoreAll={[Function Boolean]} courseService={[Function CourseService]} courseStats={[Function Object]} + deletedTableSortBy={[Function Number]} + deletedTableSortOrder={[Function Number]} instructorService={[Function InstructorService]} isAddNewCourseFormExpanded="false" isArchivedCourseExpanded="false" @@ -21,8 +27,6 @@ exports[`InstructorCoursesPageComponent should snap when courses are still loadi statusMessageService={[Function StatusMessageService]} studentService={[Function StudentService]} tableComparatorService={[Function TableComparatorService]} - tableSortBy={[Function Number]} - tableSortOrder={[Function Number]} >
    -

    - Archived Courses -

    +

    + Archived courses +

    @@ -172,9 +172,24 @@

    - - - + + + @@ -206,9 +221,9 @@

    -

    - Deleted Courses -

    +

    + Deleted courses +

    @@ -239,10 +254,30 @@

    Course IDCourse NameCreation Date + Course ID + + + + + Course Name + + + + + Creation Date + + + + Action(s)
    - - - - + + + + diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts index 999ee298e26..5359432f64e 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts @@ -45,8 +45,12 @@ export class InstructorCoursesPageComponent implements OnInit { softDeletedCourses: CourseModel[] = []; courseStats: Record> = {}; - tableSortOrder: SortOrder = SortOrder.ASC; - tableSortBy: SortBy = SortBy.COURSE_CREATION_DATE; + activeTableSortOrder: SortOrder = SortOrder.ASC; + activeTableSortBy: SortBy = SortBy.COURSE_CREATION_DATE; + archivedTableSortOrder: SortOrder = SortOrder.ASC; + archivedTableSortBy: SortBy = SortBy.COURSE_NAME; + deletedTableSortOrder: SortOrder = SortOrder.ASC; + deletedTableSortBy: SortBy = SortBy.COURSE_NAME; // enum SortBy: typeof SortBy = SortBy; @@ -195,6 +199,7 @@ export class InstructorCoursesPageComponent implements OnInit { this.activeCourses = this.removeCourse(this.activeCourses, courseId); if (courseToBeRemoved !== undefined) { this.archivedCourses.push(courseToBeRemoved); + this.archivedCourses.sort(this.sortBy(this.archivedTableSortBy, this.archivedTableSortOrder)); } } @@ -207,7 +212,7 @@ export class InstructorCoursesPageComponent implements OnInit { this.archivedCourses = this.removeCourse(this.archivedCourses, courseId); if (courseToBeRemoved !== undefined) { this.activeCourses.push(courseToBeRemoved); - this.activeCourses.sort(this.sortBy(this.tableSortBy)); + this.activeCourses.sort(this.sortBy(this.activeTableSortBy, this.activeTableSortOrder)); } } @@ -260,12 +265,14 @@ export class InstructorCoursesPageComponent implements OnInit { if (activeCourseToBeRemoved !== undefined) { activeCourseToBeRemoved.course.deletionTimestamp = deletionTimeStamp; this.softDeletedCourses.push(activeCourseToBeRemoved); + this.softDeletedCourses.sort(this.sortBy(this.deletedTableSortBy, this.deletedTableSortOrder)); } else { const archivedCourseToBeRemoved: CourseModel | undefined = this.findCourse(this.archivedCourses, courseId); this.archivedCourses = this.removeCourse(this.archivedCourses, courseId); if (archivedCourseToBeRemoved !== undefined) { archivedCourseToBeRemoved.course.deletionTimestamp = deletionTimeStamp; this.softDeletedCourses.push(archivedCourseToBeRemoved); + this.softDeletedCourses.sort(this.sortBy(this.deletedTableSortBy, this.deletedTableSortOrder)); } } } @@ -356,19 +363,39 @@ export class InstructorCoursesPageComponent implements OnInit { } /** - * Sorts the courses table + * Sorts the active courses table */ sortCoursesEvent(by: SortBy): void { - this.tableSortBy = by; - this.tableSortOrder = - this.tableSortOrder === SortOrder.DESC ? SortOrder.ASC : SortOrder.DESC; - this.activeCourses.sort(this.sortBy(by)); + this.activeTableSortBy = by; + this.activeTableSortOrder = + this.activeTableSortOrder === SortOrder.DESC ? SortOrder.ASC : SortOrder.DESC; + this.activeCourses.sort(this.sortBy(by, this.activeTableSortOrder)); + } + + /** + * Sorts the archived courses table + */ + sortArchivedCoursesEvent(by: SortBy): void { + this.archivedTableSortBy = by; + this.archivedTableSortOrder = + this.archivedTableSortOrder === SortOrder.DESC ? SortOrder.ASC : SortOrder.DESC; + this.archivedCourses.sort(this.sortBy(by, this.archivedTableSortOrder)); + } + + /** + * Sorts the soft-deleted courses table + */ + sortDeletedCoursesEvent(by: SortBy): void { + this.deletedTableSortBy = by; + this.deletedTableSortOrder = + this.deletedTableSortOrder === SortOrder.DESC ? SortOrder.ASC : SortOrder.DESC; + this.softDeletedCourses.sort(this.sortBy(by, this.deletedTableSortOrder)); } /** * Returns a function to determine the order of sort */ - sortBy(by: SortBy): + sortBy(by: SortBy, order: SortOrder): ((a: CourseModel , b: CourseModel) => number) { return (a: CourseModel, b: CourseModel): number => { let strA: string; @@ -390,7 +417,7 @@ export class InstructorCoursesPageComponent implements OnInit { strA = ''; strB = ''; } - return this.tableComparatorService.compare(by, this.tableSortOrder, strA, strB); + return this.tableComparatorService.compare(by, order, strA, strB); }; } } diff --git a/src/web/types/sort-properties.ts b/src/web/types/sort-properties.ts index b59b3bb1b5a..cf3770e4a75 100644 --- a/src/web/types/sort-properties.ts +++ b/src/web/types/sort-properties.ts @@ -62,6 +62,11 @@ export enum SortBy { */ COURSE_CREATION_DATE, + /** + * The deletion time of the course. + */ + COURSE_DELETION_DATE, + /** * Completion status of feedback session. */ From 77e35f3b6656ce07bc567e8c101c0750dc4b50de Mon Sep 17 00:00:00 2001 From: Ni Tianzhen Date: Wed, 22 Jul 2020 14:58:06 +0800 Subject: [PATCH 048/205] [#10372] Remove modal padding and outline around close button while on focus (#10383) --- .../instructor-course-enroll-page.component.scss | 8 -------- .../instructor-course-student-edit-page.component.scss | 8 -------- .../student-profile-page.component.scss | 8 -------- src/web/styles.scss | 4 ++-- 4 files changed, 2 insertions(+), 26 deletions(-) diff --git a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.scss b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.scss index 2d9973eb2e5..56f133c1146 100644 --- a/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.scss +++ b/src/web/app/pages-instructor/instructor-course-enroll-page/instructor-course-enroll-page.component.scss @@ -58,14 +58,6 @@ margin-left: 10px; } -::ng-deep.modal-content { - padding: 0 !important; -} - -::ng-deep.close:focus { - outline: 0; -} - .enroll-results-panel { margin-bottom: 15px; } diff --git a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.scss b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.scss index d824fdc5ce0..e32bd1cd132 100644 --- a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.scss +++ b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.scss @@ -10,14 +10,6 @@ label { margin-bottom: 15px; } -::ng-deep.modal-content { - padding: 0 !important; -} - -::ng-deep.close:focus { - outline: 0; -} - .invalid-field { padding-top: 5px; color: #B50000; diff --git a/src/web/app/pages-student/student-profile-page/student-profile-page.component.scss b/src/web/app/pages-student/student-profile-page/student-profile-page.component.scss index 9879b7aacb7..f80876ba52f 100644 --- a/src/web/app/pages-student/student-profile-page/student-profile-page.component.scss +++ b/src/web/app/pages-student/student-profile-page/student-profile-page.component.scss @@ -25,14 +25,6 @@ select { color: grey; } -::ng-deep.modal-content { - padding: 0 !important; -} - -::ng-deep.close:focus { - outline: 0; -} - .profile-pic { height: 220px; width: 220px; diff --git a/src/web/styles.scss b/src/web/styles.scss index cecf17dd7d4..ff4f2ad526a 100644 --- a/src/web/styles.scss +++ b/src/web/styles.scss @@ -49,8 +49,8 @@ ul { vertical-align: middle; } -.modal-content { - padding: 30px 20px; +.close:focus { + outline: 0; } .table { From 6931510dcf8debae5a68b9cef29fde66af726580 Mon Sep 17 00:00:00 2001 From: Ni Tianzhen Date: Wed, 22 Jul 2020 15:32:40 +0800 Subject: [PATCH 049/205] [#10345] Add header for view role privileges modal (#10373) * Add header for view role privileges modal * Fix tests * Remove InstructorRoleTitlePipe and use InstructorRoleNamePipe * Move InstructorRoleDescriptionPipe to teammates-common --- .../instructor-role-description.pipe.spec.ts | 0 .../teammates-common}/instructor-role-description.pipe.ts | 2 +- .../components/teammates-common/teammates-common.module.ts | 3 +++ .../instructor-course-edit-page.component.spec.ts | 2 -- .../instructor-course-edit-page.component.ts | 1 + .../instructor-course-edit-page.module.ts | 2 -- .../instructor-edit-panel.component.spec.ts | 2 -- .../view-role-privileges-modal.component.html | 2 +- .../view-role-privileges-modal.component.spec.ts | 6 +++++- .../view-role-privileges-modal.component.ts | 5 ++++- 10 files changed, 15 insertions(+), 10 deletions(-) rename src/web/app/{pages-instructor/instructor-course-edit-page/instructor-edit-panel => components/teammates-common}/instructor-role-description.pipe.spec.ts (100%) rename src/web/app/{pages-instructor/instructor-course-edit-page/instructor-edit-panel => components/teammates-common}/instructor-role-description.pipe.ts (94%) diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-role-description.pipe.spec.ts b/src/web/app/components/teammates-common/instructor-role-description.pipe.spec.ts similarity index 100% rename from src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-role-description.pipe.spec.ts rename to src/web/app/components/teammates-common/instructor-role-description.pipe.spec.ts diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-role-description.pipe.ts b/src/web/app/components/teammates-common/instructor-role-description.pipe.ts similarity index 94% rename from src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-role-description.pipe.ts rename to src/web/app/components/teammates-common/instructor-role-description.pipe.ts index c681264c4be..b659c8502dd 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-role-description.pipe.ts +++ b/src/web/app/components/teammates-common/instructor-role-description.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { InstructorPermissionRole } from '../../../../types/api-output'; +import { InstructorPermissionRole } from '../../../types/api-output'; /** * Pipe to handle the transformation of an InstructorPermissionRole to a description. diff --git a/src/web/app/components/teammates-common/teammates-common.module.ts b/src/web/app/components/teammates-common/teammates-common.module.ts index b16d87cbc3f..75c4486a58f 100644 --- a/src/web/app/components/teammates-common/teammates-common.module.ts +++ b/src/web/app/components/teammates-common/teammates-common.module.ts @@ -7,6 +7,7 @@ import { EnumToArrayPipe } from './enum-to-array.pipe'; import { FormatDateBriefPipe } from './format-date-brief.pipe'; import { FormatDateDetailPipe } from './format-date-detail.pipe'; import { FormatPhotoUrlPipe } from './format-photo-url.pipe'; +import { InstructorRoleDescriptionPipe } from './instructor-role-description.pipe'; import { InstructorRoleNamePipe } from './instructor-role-name.pipe'; import { PublishStatusNamePipe } from './publish-status-name.pipe'; import { QuestionTypeNamePipe } from './question-type-name.pipe'; @@ -35,6 +36,7 @@ import { ViewPhotoPopoverComponent } from './view-photo-popover/view-photo-popov SafeHtmlPipe, StripHtmlTagsPipe, QuestionTypeNamePipe, + InstructorRoleDescriptionPipe, InstructorRoleNamePipe, FormatDateBriefPipe, FormatPhotoUrlPipe, @@ -50,6 +52,7 @@ import { ViewPhotoPopoverComponent } from './view-photo-popover/view-photo-popov SafeHtmlPipe, StripHtmlTagsPipe, QuestionTypeNamePipe, + InstructorRoleDescriptionPipe, InstructorRoleNamePipe, FormatDateBriefPipe, FormatPhotoUrlPipe, diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.spec.ts b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.spec.ts index d1c1f387196..6a85bffcbed 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.spec.ts @@ -13,7 +13,6 @@ import { InstructorCourseEditPageComponent } from './instructor-course-edit-page import { InstructorEditPanelComponent, } from './instructor-edit-panel/instructor-edit-panel.component'; -import { InstructorRoleDescriptionPipe } from './instructor-edit-panel/instructor-role-description.pipe'; import { ViewRolePrivilegesModalComponent } from './view-role-privileges-modal/view-role-privileges-modal.component'; describe('InstructorCourseEditPageComponent', () => { @@ -26,7 +25,6 @@ describe('InstructorCourseEditPageComponent', () => { InstructorCourseEditPageComponent, InstructorEditPanelComponent, ViewRolePrivilegesModalComponent, - InstructorRoleDescriptionPipe, CustomPrivilegeSettingPanelComponent, ], imports: [ diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.ts b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.ts index e1450c1a37f..153ad6375f5 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.ts @@ -360,6 +360,7 @@ export class InstructorCourseEditPageComponent implements OnInit { instructorRole: role, }).subscribe((resp: InstructorPrivilege) => { modalRef.componentInstance.instructorPrivilege = resp; + modalRef.componentInstance.role = role; }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.module.ts b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.module.ts index 84391c2e6df..a27f173fb33 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.module.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.module.ts @@ -11,7 +11,6 @@ import { } from './custom-privilege-setting-panel/custom-privilege-setting-panel.component'; import { InstructorCourseEditPageComponent } from './instructor-course-edit-page.component'; import { InstructorEditPanelComponent } from './instructor-edit-panel/instructor-edit-panel.component'; -import { InstructorRoleDescriptionPipe } from './instructor-edit-panel/instructor-role-description.pipe'; import { ViewRolePrivilegesModalComponent } from './view-role-privileges-modal/view-role-privileges-modal.component'; const routes: Routes = [ @@ -29,7 +28,6 @@ const routes: Routes = [ InstructorCourseEditPageComponent, InstructorEditPanelComponent, ViewRolePrivilegesModalComponent, - InstructorRoleDescriptionPipe, CustomPrivilegeSettingPanelComponent, ], exports: [ diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.spec.ts b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.spec.ts index c209f7778fc..f95c9968dfc 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.spec.ts @@ -10,7 +10,6 @@ import { } from '../custom-privilege-setting-panel/custom-privilege-setting-panel.component'; import { ViewRolePrivilegesModalComponent } from '../view-role-privileges-modal/view-role-privileges-modal.component'; import { InstructorEditPanelComponent } from './instructor-edit-panel.component'; -import { InstructorRoleDescriptionPipe } from './instructor-role-description.pipe'; describe('InstructorEditPanelComponent', () => { let component: InstructorEditPanelComponent; @@ -22,7 +21,6 @@ describe('InstructorEditPanelComponent', () => { InstructorEditPanelComponent, InstructorEditPanelComponent, ViewRolePrivilegesModalComponent, - InstructorRoleDescriptionPipe, CustomPrivilegeSettingPanelComponent, ], imports: [ diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/view-role-privileges-modal/view-role-privileges-modal.component.html b/src/web/app/pages-instructor/instructor-course-edit-page/view-role-privileges-modal/view-role-privileges-modal.component.html index 3e769ea5556..60ea3e98db0 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/view-role-privileges-modal/view-role-privileges-modal.component.html +++ b/src/web/app/pages-instructor/instructor-course-edit-page/view-role-privileges-modal/view-role-privileges-modal.component.html @@ -1,5 +1,5 @@
    - +
    diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/view-role-privileges-modal/view-role-privileges-modal.component.spec.ts b/src/web/app/pages-instructor/instructor-course-edit-page/view-role-privileges-modal/view-role-privileges-modal.component.spec.ts index aa45650be14..76127d624db 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/view-role-privileges-modal/view-role-privileges-modal.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/view-role-privileges-modal/view-role-privileges-modal.component.spec.ts @@ -1,6 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { TeammatesCommonModule } from '../../../components/teammates-common/teammates-common.module'; import { ViewRolePrivilegesModalComponent } from './view-role-privileges-modal.component'; describe('ViewRolePrivilegesModalComponent', () => { @@ -9,8 +10,11 @@ describe('ViewRolePrivilegesModalComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ViewRolePrivilegesModalComponent], + declarations: [ + ViewRolePrivilegesModalComponent, + ], providers: [NgbActiveModal], + imports: [TeammatesCommonModule], }) .compileComponents(); })); diff --git a/src/web/app/pages-instructor/instructor-course-edit-page/view-role-privileges-modal/view-role-privileges-modal.component.ts b/src/web/app/pages-instructor/instructor-course-edit-page/view-role-privileges-modal/view-role-privileges-modal.component.ts index ed084bf8b4e..4053aa3407c 100644 --- a/src/web/app/pages-instructor/instructor-course-edit-page/view-role-privileges-modal/view-role-privileges-modal.component.ts +++ b/src/web/app/pages-instructor/instructor-course-edit-page/view-role-privileges-modal/view-role-privileges-modal.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { InstructorPrivilege } from '../../../../types/api-output'; +import { InstructorPermissionRole, InstructorPrivilege } from '../../../../types/api-output'; /** * View privileges of a role modal. @@ -12,6 +12,9 @@ import { InstructorPrivilege } from '../../../../types/api-output'; }) export class ViewRolePrivilegesModalComponent implements OnInit { + @Input() + role: InstructorPermissionRole = InstructorPermissionRole.INSTRUCTOR_PERMISSION_ROLE_CUSTOM; + @Input() instructorPrivilege: InstructorPrivilege = { canModifyCourse: false, From 9746ef834a32a72a4c43f58298071e411348b7c4 Mon Sep 17 00:00:00 2001 From: Ni Tianzhen Date: Wed, 22 Jul 2020 16:23:25 +0800 Subject: [PATCH 050/205] [#10351] Instructor session results page: allow entering editing mode directly (#10381) * Add url param to allow entering edit mode directly * Fix lint error * Prevent isEditingMode from being undefined --- .../instructor-session-edit-page.component.ts | 8 +++++--- .../instructor-session-result-page.component.html | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts index 2933e55fc84..76fb07f445e 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts @@ -76,6 +76,7 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag // url param courseId: string = ''; feedbackSessionName: string = ''; + isEditingMode: boolean = false; courseName: string = ''; @@ -194,6 +195,7 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag this.route.queryParams.subscribe((queryParams: any) => { this.courseId = queryParams.courseid; this.feedbackSessionName = queryParams.fsname; + this.isEditingMode = queryParams.editingMode === 'true'; this.loadFeedbackSession(); this.loadFeedbackQuestions(); @@ -217,7 +219,7 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag intent: Intent.FULL_DETAIL, }).pipe(finalize(() => this.isLoadingFeedbackSession = false)) .subscribe((feedbackSession: FeedbackSession) => { - this.sessionEditFormModel = this.getSessionEditFormModel(feedbackSession); + this.sessionEditFormModel = this.getSessionEditFormModel(feedbackSession, this.isEditingMode); this.feedbackSessionModelBeforeEditing = this.getSessionEditFormModel(feedbackSession); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); @@ -261,7 +263,7 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag /** * Gets the {@code sessionEditFormModel} with {@link FeedbackSession} entity. */ - getSessionEditFormModel(feedbackSession: FeedbackSession): SessionEditFormModel { + getSessionEditFormModel(feedbackSession: FeedbackSession, isEditable: boolean = false): SessionEditFormModel { const submissionStart: {date: DateFormat; time: TimeFormat} = this.getDateTimeAtTimezone(feedbackSession.submissionStartTimestamp, feedbackSession.timeZone); @@ -269,6 +271,7 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag this.getDateTimeAtTimezone(feedbackSession.submissionEndTimestamp, feedbackSession.timeZone); const model: SessionEditFormModel = { + isEditable, courseId: feedbackSession.courseId, timeZone: feedbackSession.timeZone, courseName: this.courseName, @@ -298,7 +301,6 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag isPublishedEmailEnabled: feedbackSession.isPublishedEmailEnabled, isSaving: false, - isEditable: false, hasVisibleSettingsPanelExpanded: feedbackSession.sessionVisibleSetting !== SessionVisibleSetting.AT_OPEN || feedbackSession.responseVisibleSetting !== ResponseVisibleSetting.LATER, hasEmailSettingsPanelExpanded: !feedbackSession.isClosingEmailEnabled || !feedbackSession.isPublishedEmailEnabled, diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html index b9d0b8482a9..53ab26f5767 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html @@ -16,7 +16,7 @@

    {{ session.feedbackSessionName }} - +

    From 157a86501e2a87c16b7b988868116f0b22ef64c5 Mon Sep 17 00:00:00 2001 From: t-cheepeng Date: Wed, 22 Jul 2020 20:55:14 +0800 Subject: [PATCH 051/205] [#10374] Instructor course details page: loading spinner does not disappear (#10390) * Add check for no students in course * Add check for no teammates and no course --- .../instructor-course-details-page.component.ts | 4 ++++ .../student-course-details-page.component.ts | 4 ++++ .../student-home-page/student-home-page.component.ts | 3 +++ 3 files changed, 11 insertions(+) diff --git a/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.ts b/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.ts index ce589fb25c6..08aca4b36bf 100644 --- a/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.ts +++ b/src/web/app/pages-instructor/instructor-course-details-page/instructor-course-details-page.component.ts @@ -134,6 +134,10 @@ export class InstructorCourseDetailsPageComponent implements OnInit { this.loadPrivilege(courseid, key, data); }); + + if (!sections.length) { + this.isStudentsLoading = false; + } this.courseDetails.stats = this.courseService.calculateCourseStatistics(students.students); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); diff --git a/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.ts b/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.ts index 8e89e94657e..e0e0d1b1e41 100644 --- a/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.ts +++ b/src/web/app/pages-student/student-course-details-page/student-course-details-page.component.ts @@ -119,6 +119,10 @@ export class StudentCourseDetailsPageComponent implements OnInit { this.isLoadingTeammates = true; this.studentService.getStudentsFromCourseAndTeam(courseId, teamName) .subscribe((students: Students) => { + // No teammates + if (students.students.length === 1 && students.students[0].email === this.student.email) { + this.isLoadingTeammates = false; + } students.students.forEach((student: Student) => { // filter away current user if (student.email === this.student.email) { diff --git a/src/web/app/pages-student/student-home-page/student-home-page.component.ts b/src/web/app/pages-student/student-home-page/student-home-page.component.ts index bc83db0995e..c2c5b2413c0 100644 --- a/src/web/app/pages-student/student-home-page/student-home-page.component.ts +++ b/src/web/app/pages-student/student-home-page/student-home-page.component.ts @@ -81,6 +81,9 @@ export class StudentHomePageComponent implements OnInit { getStudentCourses(): void { this.isCoursesLoading = true; this.courseService.getAllCoursesAsStudent().subscribe((resp: Courses) => { + if (!resp.courses.length) { + this.isCoursesLoading = false; + } for (const course of resp.courses) { this.feedbackSessionsService.getFeedbackSessionsForStudent(course.courseId) .pipe(finalize(() => this.isCoursesLoading = false)) From 9ac03d880949f653c62f5754b139731f4cc41595 Mon Sep 17 00:00:00 2001 From: Ahmed Bahajjaj Date: Wed, 22 Jul 2020 21:36:49 +0800 Subject: [PATCH 052/205] [#9823] Fix feedback made on behalf of team showing as anonymous (#10314) * Fix isNameVisibleToUser() * Update test cases * Add legacy logic management and test case * Revert FeedbackSessionResultsTest.json and FeedbackSessionsLogicTest.java * Add comment * Add response logic test * Add test case description Co-authored-by: erjillsison --- .../logic/core/FeedbackResponsesLogic.java | 4 +++- .../logic/FeedbackResponsesLogicTest.java | 20 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/teammates/logic/core/FeedbackResponsesLogic.java b/src/main/java/teammates/logic/core/FeedbackResponsesLogic.java index ad143489bec..17612a3e04b 100644 --- a/src/main/java/teammates/logic/core/FeedbackResponsesLogic.java +++ b/src/main/java/teammates/logic/core/FeedbackResponsesLogic.java @@ -201,7 +201,9 @@ public boolean isNameVisibleToUser( // Early return if user is giver if (question.giverType == FeedbackParticipantType.TEAMS) { // if response is given by team, then anyone in the team can see the response - if (roster.isStudentsInSameTeam(response.giver, userEmail)) { + // The second check is used to accommodate legacy data where team giver is a student email + if (roster.isStudentInTeam(userEmail, response.giver) + || roster.isStudentsInSameTeam(userEmail, response.giver)) { return true; } } else { diff --git a/src/test/java/teammates/test/cases/logic/FeedbackResponsesLogicTest.java b/src/test/java/teammates/test/cases/logic/FeedbackResponsesLogicTest.java index b509a57e369..20543c1e7fa 100644 --- a/src/test/java/teammates/test/cases/logic/FeedbackResponsesLogicTest.java +++ b/src/test/java/teammates/test/cases/logic/FeedbackResponsesLogicTest.java @@ -451,6 +451,26 @@ public void testIsNameVisibleTo() { assertTrue(frLogic.isNameVisibleToUser(fq, fr, student3.email, UserRole.STUDENT, false, roster)); assertFalse(frLogic.isNameVisibleToUser(fq, fr, student5.email, UserRole.STUDENT, false, roster)); + ______TS("test if visible to receiver/giver team members for team questions"); + + fq.recipientType = FeedbackParticipantType.TEAMS; + fq.showRecipientNameTo.clear(); + fq.showRecipientNameTo.add(FeedbackParticipantType.RECEIVER_TEAM_MEMBERS); + fq.giverType = FeedbackParticipantType.TEAMS; + fq.showGiverNameTo.clear(); + fq.showGiverNameTo.add(FeedbackParticipantType.OWN_TEAM_MEMBERS_INCLUDING_SELF); + + fr.recipient = student5.team; + fr.giver = student.team; + assertTrue(frLogic.isNameVisibleToUser(fq, fr, student.email, UserRole.STUDENT, false, roster)); + assertTrue(frLogic.isNameVisibleToUser(fq, fr, student3.email, UserRole.STUDENT, false, roster)); + assertTrue(frLogic.isNameVisibleToUser(fq, fr, student5.email, UserRole.STUDENT, false, roster)); + + fr.giver = student.email; + assertTrue(frLogic.isNameVisibleToUser(fq, fr, student.email, UserRole.STUDENT, false, roster)); + assertTrue(frLogic.isNameVisibleToUser(fq, fr, student3.email, UserRole.STUDENT, false, roster)); + assertTrue(frLogic.isNameVisibleToUser(fq, fr, student5.email, UserRole.STUDENT, false, roster)); + ______TS("test anonymous team recipients"); // Only members of the recipient team should be able to see the recipient name fq.recipientType = FeedbackParticipantType.TEAMS; From dbc978ddc5a2b31add2a34b1de4da698a6280276 Mon Sep 17 00:00:00 2001 From: Chong Chee Yuan <32454748+ccyccyccy@users.noreply.github.com> Date: Wed, 22 Jul 2020 23:24:57 +0800 Subject: [PATCH 053/205] [#10297] Tooltips behaviour improvement (#10321) * Set global config for tooltip delay * Fix tooltips for comment-edit-form.component.html * Updated tooltip behavior * Fix tooltips for question-edit-form.component.html * Fix tooltips for question-submission-form.component.html * Fix tooltips for constsum-options-question-edit-details-form.component.html * Fix tooltips for constsum-recipients-question-edit-details-form.component.html * Fix tooltips for contribution-question-edit-details-form.component.html * Fix tooltips for session-edit-form-component.html * Fix tooltips for sesssions-recycle-bin-table.component.html * Fix tooltips for sessions-table.component.html * Fix tooltips for instructor-course-edit-page.component.html * Fix tooltips for instructor-edit-panel.component.html * Fix tooltips for instructor-courses-page.component.html * Fix tooltips for add-course-form.component.html * Fix tooltips for instructor-home-page.component.html * Fix tooltips for instructor-session-edit-page.component.html * Fix tooltips for instructor-session-result-page.component.html * Fix tooltips for student-home-page.component.html * Fix tooltips for student-profile-page.component.html * Fix tooltips for instructor-help-sessions-section.component.html * Lint and test fix --- src/web/app/app.component.ts | 6 +- .../comment-edit-form.component.html | 9 +- .../comment-row/comment-row.component.html | 4 +- .../comment-row/comment-row.component.scss | 4 - .../question-edit-form.component.spec.ts.snap | 4 - .../question-edit-form.component.html | 11 +- .../question-submission-form.component.html | 2 +- .../question-submission-form.component.scss | 5 - .../question-text-with-info.component.html | 2 +- ...-question-edit-details-form.component.html | 12 +- ...-question-edit-details-form.component.html | 12 +- ...-question-edit-details-form.component.html | 2 +- ...-question-edit-details-form.component.scss | 5 - .../session-edit-form.component.html | 44 ++--- .../sessions-recycle-bin-table.component.html | 4 +- .../sessions-table.component.spec.ts.snap | 152 +++++----------- .../sessions-table.component.html | 36 ++-- .../sessions-table.component.scss | 5 - ...uctor-help-sessions-section.component.html | 20 +-- ...instructor-course-edit-page.component.html | 7 +- .../instructor-edit-panel.component.html | 12 +- ...ructor-courses-page.component.spec.ts.snap | 12 -- .../add-course-form.component.spec.ts.snap | 8 +- .../add-course-form.component.html | 4 +- .../add-course-form/add-course-form.module.ts | 2 + .../instructor-courses-page.component.html | 6 +- ...nstructor-home-page.component.spec.ts.snap | 170 ++++-------------- .../instructor-home-page.component.html | 5 - ...nstructor-session-edit-page.component.html | 8 +- ...tructor-session-result-page.component.html | 18 +- .../student-home-page.component.spec.ts.snap | 15 -- .../student-home-page.component.html | 10 +- ...tudent-profile-page.component.spec.ts.snap | 24 +-- .../student-profile-page.component.html | 15 +- ...-edit-profile-picture-modal.component.html | 8 +- src/web/styles.scss | 21 +++ 36 files changed, 230 insertions(+), 454 deletions(-) diff --git a/src/web/app/app.component.ts b/src/web/app/app.component.ts index 9b38148dc3a..8b1bdee74d5 100644 --- a/src/web/app/app.component.ts +++ b/src/web/app/app.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Event, NavigationEnd, Router } from '@angular/router'; +import { NgbTooltipConfig } from '@ng-bootstrap/ng-bootstrap'; import { filter } from 'rxjs/operators'; import { environment } from '../environments/environment'; import { MasqueradeModeService } from '../services/masquerade-mode.service'; @@ -13,7 +14,10 @@ import { MasqueradeModeService } from '../services/masquerade-mode.service'; }) export class AppComponent implements OnInit { constructor(private router: Router, private route: ActivatedRoute, - private masqueradeModeService: MasqueradeModeService) {} + private masqueradeModeService: MasqueradeModeService, tooltipConfig: NgbTooltipConfig) { + tooltipConfig.openDelay = 400; + tooltipConfig.closeDelay = 100; + } ngOnInit(): void { // sync the URL param `user` with the masqueraded userID in the service diff --git a/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html b/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html index 9c5fde7449c..28085ca07d9 100755 --- a/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html +++ b/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html @@ -13,8 +13,7 @@ {{ isVisibilityTableExpanded ? "Hide" : "Show" }} Visibility Options - @@ -34,7 +33,7 @@     - + diff --git a/src/web/app/components/sessions-table/__snapshots__/sessions-table.component.spec.ts.snap b/src/web/app/components/sessions-table/__snapshots__/sessions-table.component.spec.ts.snap index 208b1dc4f17..d19d3f64949 100644 --- a/src/web/app/components/sessions-table/__snapshots__/sessions-table.component.spec.ts.snap +++ b/src/web/app/components/sessions-table/__snapshots__/sessions-table.component.spec.ts.snap @@ -94,9 +94,7 @@ exports[`SessionsTableComponent should snap like in home page with 2 sessions so container="body" ngbtooltip="Number of students submitted / Class size" > - + Response Rate @@ -115,43 +113,24 @@ exports[`SessionsTableComponent should snap like in home page with 2 sessions so Season 8 Review - - - - - - @@ -168,14 +147,12 @@ exports[`SessionsTableComponent should snap like in home page with 2 sessions so > @@ -255,43 +231,24 @@ exports[`SessionsTableComponent should snap like in home page with 2 sessions so Season 7 Review - - - - - - @@ -316,7 +273,6 @@ exports[`SessionsTableComponent should snap like in home page with 2 sessions so @@ -494,9 +448,7 @@ exports[`SessionsTableComponent should snap like in sessions page with 2 session container="body" ngbtooltip="Number of students submitted / Class size" > - + Response Rate @@ -519,22 +471,13 @@ exports[`SessionsTableComponent should snap like in sessions page with 2 session - - @@ -551,14 +494,12 @@ exports[`SessionsTableComponent should snap like in sessions page with 2 session > @@ -642,22 +582,13 @@ exports[`SessionsTableComponent should snap like in sessions page with 2 session - - @@ -682,7 +613,6 @@ exports[`SessionsTableComponent should snap like in sessions page with 2 session diff --git a/src/web/app/components/sessions-table/sessions-table.component.html b/src/web/app/components/sessions-table/sessions-table.component.html index 658495c4123..124d8438fed 100644 --- a/src/web/app/components/sessions-table/sessions-table.component.html +++ b/src/web/app/components/sessions-table/sessions-table.component.html @@ -29,7 +29,7 @@ - + @@ -37,17 +37,15 @@ - - - + + - - - - - - - - @@ -768,14 +741,12 @@ exports[`InstructorHomePageComponent should snap with one course with one feedba > @@ -1016,7 +986,6 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba View / Edit @@ -1043,7 +1012,6 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba View / Edit @@ -1070,7 +1038,6 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba Add @@ -1103,7 +1070,6 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba View / Edit @@ -1205,9 +1171,7 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba container="body" ngbtooltip="Number of students submitted / Class size" > - + Response Rate @@ -1226,43 +1190,24 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba Feedback 1 - - - - - - @@ -1280,7 +1225,6 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba @@ -1376,43 +1318,24 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba Feedback 2 - - - - - - @@ -1430,7 +1353,6 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba @@ -1680,16 +1600,13 @@ exports[`InstructorHomePageComponent should snap with one course with unexpanded Enroll - View / Edit @@ -1716,7 +1633,6 @@ exports[`InstructorHomePageComponent should snap with one course with unexpanded View / Edit @@ -1743,7 +1659,6 @@ exports[`InstructorHomePageComponent should snap with one course with unexpanded Add @@ -1776,7 +1691,6 @@ exports[`InstructorHomePageComponent should snap with one course with unexpanded View / Edit @@ -1966,16 +1880,13 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate Enroll - View / Edit @@ -2002,7 +1913,6 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate View / Edit @@ -2029,7 +1939,6 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate Add @@ -2062,7 +1971,6 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate View / Edit @@ -2275,16 +2183,13 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac Enroll - View / Edit @@ -2311,7 +2216,6 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac View / Edit @@ -2338,7 +2242,6 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac Add @@ -2371,7 +2274,6 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac View / Edit diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html index 5096bfa6736..57365b039a2 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html @@ -51,12 +51,10 @@

    Home

     @@ -65,7 +63,6 @@

    Home

    @@ -74,7 +71,6 @@

    Home

    @@ -87,7 +83,6 @@

    Home

    (click)="archiveCourse(courseTabModel.course.courseId); $event.stopPropagation()"> Archive View / Edit diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html index a527ff34550..1d4102fe3f4 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html +++ b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html @@ -54,17 +54,17 @@
    Preview Session:
    -
    +
    - +
    -
    +
    - +
    diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html index 53ab26f5767..bc14435c360 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html @@ -54,9 +54,9 @@

    -
    +
    -
    +
    -
    -

    @@ -217,7 +213,6 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 View Responses @@ -228,14 +223,12 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 Start Submission - @@ -258,7 +251,6 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 View team @@ -320,7 +312,6 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 View Responses @@ -332,13 +323,11 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 Edit Submission - @@ -368,7 +357,6 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 View Responses @@ -381,12 +369,10 @@ exports[`StudentHomePageComponent should snap with all feedback sessions over 2 View Submission - @@ -499,7 +485,6 @@ exports[`StudentHomePageComponent should snap with no feedback sessions 1`] = ` View team diff --git a/src/web/app/pages-student/student-home-page/student-home-page.component.html b/src/web/app/pages-student/student-home-page/student-home-page.component.html index 0fa40ec4c0e..068ede3a7bd 100644 --- a/src/web/app/pages-student/student-home-page/student-home-page.component.html +++ b/src/web/app/pages-student/student-home-page/student-home-page.component.html @@ -21,7 +21,7 @@ [{{ course.courseId }}]: {{ course.courseName }} + class="btn btn-light btn-sm button"> View team @@ -58,7 +58,7 @@ diff --git a/src/web/app/pages-student/student-profile-page/__snapshots__/student-profile-page.component.spec.ts.snap b/src/web/app/pages-student/student-profile-page/__snapshots__/student-profile-page.component.spec.ts.snap index ccc093ca85c..854b574c863 100644 --- a/src/web/app/pages-student/student-profile-page/__snapshots__/student-profile-page.component.spec.ts.snap +++ b/src/web/app/pages-student/student-profile-page/__snapshots__/student-profile-page.component.spec.ts.snap @@ -86,7 +86,7 @@ exports[`StudentProfilePageComponent should snap with a student field without in > @@ -94,7 +94,6 @@ exports[`StudentProfilePageComponent should snap with a student field without in @@ -106,7 +105,6 @@ exports[`StudentProfilePageComponent should snap with a student field without in >
    - +
    + +
    - -
    -
    - -
    -
    -
    - - +
    +
    + +
    +
    +
    + + + - + + + `; diff --git a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-form.module.ts b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-form.module.ts index 88874e82c77..4a44ee0b548 100644 --- a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-form.module.ts +++ b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-form.module.ts @@ -1,6 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { LoadingRetryModule } from '../../components/loading-retry/loading-retry.module'; import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { InstructorCourseStudentEditPageComponent } from './instructor-course-student-edit-page.component'; @@ -18,6 +19,7 @@ import { InstructorCourseStudentEditPageComponent } from './instructor-course-st CommonModule, ReactiveFormsModule, LoadingSpinnerModule, + LoadingRetryModule, ], }) export class InstructorCourseStudentEditFormModule { } diff --git a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.html b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.html index 0bcd8519341..28af3100bf6 100644 --- a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.html +++ b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.html @@ -1,146 +1,149 @@ -
    -
    -
    -
    -
    - -
    - + +
    +
    +
    + +
    + +
    + +
    + + + {{ displayEmptyFieldMessage('Student Name') }} + + + {{ displayExceedMaxLengthMessage('Student Name', FormValidator.STUDENT_NAME_MAX_LENGTH) }} + +
    +
    +
    +
    + +
    +
    - - {{ displayEmptyFieldMessage('Student Name') }} + + {{ displayEmptyFieldMessage('Section Name') }} - - {{ displayExceedMaxLengthMessage('Student Name', FormValidator.STUDENT_NAME_MAX_LENGTH) }} + + {{ displayExceedMaxLengthMessage('Section Name', FormValidator.SECTION_NAME_MAX_LENGTH) }}
    -
    -
    -
    - -
    - -
    - - - {{ displayEmptyFieldMessage('Section Name') }} - - - {{ displayExceedMaxLengthMessage('Section Name', FormValidator.SECTION_NAME_MAX_LENGTH) }} -
    -
    -
    - -
    - -
    - - - {{ displayEmptyFieldMessage('Team Name') }} - - - {{ displayExceedMaxLengthMessage('Team Name', FormValidator.TEAM_NAME_MAX_LENGTH) }} - -
    -
    -
    -
    - -
    - -
    + +
    + +
    - - - {{ displayEmptyFieldMessage('E-mail Address') }} - - - {{ displayExceedMaxLengthMessage('E-mail Address', FormValidator.EMAIL_MAX_LENGTH) }} - + + + {{ displayEmptyFieldMessage('Team Name') }} + + + {{ displayExceedMaxLengthMessage('Team Name', FormValidator.TEAM_NAME_MAX_LENGTH) }} + +
    -
    -
    - -
    - -
    -
    -
    -
    - -
    -
    -
    - -
    -

    Resend past links to the new email?

    - +
    + +
    + +
    + + + {{ displayEmptyFieldMessage('E-mail Address') }} + + + {{ displayExceedMaxLengthMessage('E-mail Address', FormValidator.EMAIL_MAX_LENGTH) }} + +
    +
    -
    - Do you want to resend past session links of this course to the new email {{ editForm.get('newstudentemail')?.value }}? +
    + +
    + +
    -
    - - - +
    +
    +
    - - +
    +
    + + +
    +

    Resend past links to the new email?

    + +
    +
    + Do you want to resend past session links of this course to the new email {{ editForm.get('newstudentemail')?.value }}? +
    +
    + + + +
    +     + +
    -
    + diff --git a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.spec.ts b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.spec.ts index 27d43bf3920..efd443e4ff1 100644 --- a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.spec.ts @@ -3,6 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { JoinState } from '../../../types/api-output'; +import { LoadingRetryModule } from '../../components/loading-retry/loading-retry.module'; import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { InstructorCourseStudentEditPageComponent } from './instructor-course-student-edit-page.component'; @@ -18,6 +19,7 @@ describe('InstructorCourseStudentEditPageComponent', () => { ReactiveFormsModule, HttpClientTestingModule, LoadingSpinnerModule, + LoadingRetryModule, ], }) .compileComponents(); diff --git a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.ts b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.ts index 669111d678b..84c043af7c5 100644 --- a/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.ts +++ b/src/web/app/pages-instructor/instructor-course-student-edit-page/instructor-course-student-edit-page.component.ts @@ -28,11 +28,13 @@ export class InstructorCourseStudentEditPageComponent implements OnInit, OnDestr @Input() isEnabled: boolean = true; courseId: string = ''; + studentEmail: string = ''; student!: Student; isTeamnameFieldChanged: boolean = false; isEmailFieldChanged: boolean = false; isStudentLoading: boolean = false; + hasStudentLoadingFailed: boolean = false; editForm!: FormGroup; teamFieldSubscription?: Subscription; @@ -63,6 +65,7 @@ export class InstructorCourseStudentEditPageComponent implements OnInit, OnDestr this.route.queryParams.subscribe((queryParams: any) => { this.courseId = queryParams.courseid; + this.studentEmail = queryParams.studentemail; this.loadStudentEditDetails(queryParams.courseid, queryParams.studentemail); }); } @@ -80,6 +83,7 @@ export class InstructorCourseStudentEditPageComponent implements OnInit, OnDestr * Loads student details required for this page. */ loadStudentEditDetails(courseId: string, studentEmail: string): void { + this.hasStudentLoadingFailed = false; this.isStudentLoading = true; this.studentService.getStudent( courseId, studentEmail, @@ -87,6 +91,7 @@ export class InstructorCourseStudentEditPageComponent implements OnInit, OnDestr this.student = student; this.initEditForm(); }, (resp: ErrorMessageOutput) => { + this.hasStudentLoadingFailed = true; this.statusMessageService.showErrorToast(resp.error.message); }); } diff --git a/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap index 3711d334e32..a6ccacc8fc0 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-courses-page/__snapshots__/instructor-courses-page.component.spec.ts.snap @@ -16,6 +16,7 @@ exports[`InstructorCoursesPageComponent should snap when courses are still loadi courseStats={[Function Object]} deletedTableSortBy={[Function Number]} deletedTableSortOrder={[Function Number]} + hasLoadingFailed="false" instructorService={[Function InstructorService]} isAddNewCourseFormExpanded="false" isArchivedCourseExpanded="false" @@ -38,21 +39,28 @@ exports[`InstructorCoursesPageComponent should snap when courses are still loadi /> Add New Course -
    -
    - + + + +
    - Loading... + -
    -     + + + +     `; @@ -72,6 +80,7 @@ exports[`InstructorCoursesPageComponent should snap when it is undeletable and u courseStats={[Function Object]} deletedTableSortBy={[Function Number]} deletedTableSortOrder={[Function Number]} + hasLoadingFailed="false" instructorService={[Function InstructorService]} isAddNewCourseFormExpanded="false" isArchivedCourseExpanded="false" @@ -94,310 +103,317 @@ exports[`InstructorCoursesPageComponent should snap when it is undeletable and u /> Add New Course -
    +
    -
    -

    - Active courses -

    + + +
    +
    -
    Course IDCourse NameCreation DateDeletion Date + Course ID + + + + + Course Name + + + + + Creation Date + + + + + Deletion Date + + + + Action(s)
    {{ commentVisibilityType | commentVisibilityTypeName }} {{ commentVisibilityType | commentVisibilityTypeName }} @@ -50,12 +49,10 @@ placeholderText="Enter your comment here" [isDisabled]="isDisabled"> - diff --git a/src/web/app/components/comment-box/comment-row/comment-row.component.html b/src/web/app/components/comment-box/comment-row/comment-row.component.html index 16e2f93f4b0..ba99e361409 100755 --- a/src/web/app/components/comment-box/comment-row/comment-row.component.html +++ b/src/web/app/components/comment-box/comment-row/comment-row.component.html @@ -21,11 +21,11 @@ {{ model.commentGiverName ? model.commentGiverName : model.originalComment.commentGiver }} commented at - + {{ model.originalComment.createdAt | formatDateBrief: model.timezone! }} - edited by {{ model.lastEditorName ? model.lastEditorName : model.originalComment.lastEditorEmail }} diff --git a/src/web/app/components/comment-box/comment-row/comment-row.component.scss b/src/web/app/components/comment-box/comment-row/comment-row.component.scss index 0d7433595d4..1db3a0d607e 100755 --- a/src/web/app/components/comment-box/comment-row/comment-row.component.scss +++ b/src/web/app/components/comment-box/comment-row/comment-row.component.scss @@ -5,7 +5,3 @@ .dot-xs { font-size: .3em; } - -.underline-hover:hover { - text-decoration: underline; -} diff --git a/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap b/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap index 89e9a28950c..9bb7e8b8add 100644 --- a/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap +++ b/src/web/app/components/question-edit-form/__snapshots__/question-edit-form.component.spec.ts.snap @@ -65,7 +65,6 @@ exports[`QuestionEditFormComponent should snap with default view 1`] = ` + > Edit + (click)="discardChangesHandler(false); $event.stopPropagation();" [disabled]="model.isSaving"> Cancel @@ -49,7 +49,6 @@
    @@ -60,7 +59,7 @@
    + >
    @@ -227,7 +226,7 @@
    Changing the visibility after collecting responses is not recommended.
    diff --git a/src/web/app/components/question-types/question-edit-details-form/constsum-options-question-edit-details-form.component.html b/src/web/app/components/question-types/question-edit-details-form/constsum-options-question-edit-details-form.component.html index d9b7ea08bf3..9e4ae9e2e91 100644 --- a/src/web/app/components/question-types/question-edit-details-form/constsum-options-question-edit-details-form.component.html +++ b/src/web/app/components/question-types/question-edit-details-form/constsum-options-question-edit-details-form.component.html @@ -30,26 +30,26 @@
    -
    -
    -
    diff --git a/src/web/app/components/question-types/question-edit-details-form/constsum-recipients-question-edit-details-form.component.html b/src/web/app/components/question-types/question-edit-details-form/constsum-recipients-question-edit-details-form.component.html index 532a69593f1..b2a9039a7fc 100644 --- a/src/web/app/components/question-types/question-edit-details-form/constsum-recipients-question-edit-details-form.component.html +++ b/src/web/app/components/question-types/question-edit-details-form/constsum-recipients-question-edit-details-form.component.html @@ -8,26 +8,26 @@
    -
    -
    -
    diff --git a/src/web/app/components/question-types/question-edit-details-form/contribution-question-edit-details-form.component.html b/src/web/app/components/question-types/question-edit-details-form/contribution-question-edit-details-form.component.html index 84b173469da..63d073a6e82 100644 --- a/src/web/app/components/question-types/question-edit-details-form/contribution-question-edit-details-form.component.html +++ b/src/web/app/components/question-types/question-edit-details-form/contribution-question-edit-details-form.component.html @@ -2,7 +2,7 @@
    -
    -
    @@ -46,10 +46,10 @@
    Or:
    - Course ID + Course ID
    -
    +
    @@ -62,8 +62,8 @@
    Or:
    Time Zone
    -
    - {{ model.timeZone }} +
    + {{ model.timeZone }}

    @@ -93,9 +93,9 @@
    Or:

    - Instructions + Instructions
    -
    +
    @@ -122,8 +122,8 @@
    Or:
    -
    -
    -
    -
    -
    +
    @@ -199,11 +199,11 @@
    Or:
    - +
    -
    +
    -
    		- - + +
    - + + 19 Jan 7:30 AM - + + 19 Jan 7:32 AM - + + Open - + + Not Published - + + 19 Jan 7:13 AM - + + 19 Jan 7:15 AM - + + Closed - + + Published - + + Open - + + Not Published - + + Closed - + + Published Submissions ResponsesResponse RateResponse Rate Action(s)
    {{ sessionsTableRowModel.feedbackSession.courseId }} {{ sessionsTableRowModel.feedbackSession.feedbackSessionName }} - {{ sessionsTableRowModel.feedbackSession.submissionStartTimestamp | formatDateBrief: sessionsTableRowModel.feedbackSession.timeZone }} - {{ sessionsTableRowModel.feedbackSession.submissionEndTimestamp | formatDateBrief: sessionsTableRowModel.feedbackSession.timeZone }} - {{ sessionsTableRowModel.feedbackSession.submissionStatus | submissionStatusName }} + + {{ sessionsTableRowModel.feedbackSession.submissionStartTimestamp | formatDateBrief: sessionsTableRowModel.feedbackSession.timeZone }} + {{ sessionsTableRowModel.feedbackSession.submissionEndTimestamp | formatDateBrief: sessionsTableRowModel.feedbackSession.timeZone }} + {{ sessionsTableRowModel.feedbackSession.submissionStatus | submissionStatusName }} - {{ sessionsTableRowModel.feedbackSession.publishStatus | publishStatusName }} + + {{ sessionsTableRowModel.feedbackSession.publishStatus | publishStatusName }} Show @@ -55,29 +53,29 @@ - - -
    +
    - - + - - - + +
    diff --git a/src/web/app/components/sessions-table/sessions-table.component.scss b/src/web/app/components/sessions-table/sessions-table.component.scss index c1b33600d90..3e9db4ca506 100644 --- a/src/web/app/components/sessions-table/sessions-table.component.scss +++ b/src/web/app/components/sessions-table/sessions-table.component.scss @@ -7,11 +7,6 @@ margin: 2px; } -.tool-tip-decorate { - border-bottom: 1px dotted #808080; - text-decoration: none; -} - .sortable-header { cursor: pointer; } diff --git a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.html b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.html index c8e7b2a6700..350cb4ce512 100644 --- a/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.html +++ b/src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-section.component.html @@ -273,7 +273,7 @@

    Setting Up Sessions

    Preview Session:
    -
    +
    @@ -352,8 +352,8 @@

    Managing Session Responses

    -
    -
    {{course.course.courseId}} {{course.course.courseName}} - {{course.course.creationTimestamp | date:'d MMM yyyy'}} + + {{course.course.creationTimestamp | date:'d MMM yyyy'}} - + + 19 Jan 6:43 AM - + + 19 Jan 6:46 AM - + + Awaiting - + + Not Published - + + 1 Jan 7:30 AM - + + 1 Jan 7:30 AM - + + Closed - + + Published - + + 1 Jan 7:30 AM - + + 1 Jan 7:30 AM - + + Open - + + Not Published
    + class="btn btn-light btn-sm"> View Responses   @@ -67,19 +67,19 @@ + class="btn btn-light btn-sm"> Start Submission + class="btn btn-light btn-sm"> Edit Submission + class="btn btn-light btn-sm"> View Submission
    + Active courses + +
    -
    - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + - - + + + + +
    - Course ID - - - - - - - - Course Name - - - - - - - - Creation Date - - - - - - - - Sections - - Teams - - Total Students - - Total Unregistered - - Action(s) -
    - CS3281 - - Modifiable Students and Courses - - 5 Nov 2018 - - - - - 1 - - - - - - 1 - - - - - - 1 - - - - - - 1 - - +
    + Course Name + + + + + + + + Creation Date + + + + + + + + Sections + + Teams + + Total Students + + Total Unregistered + - Enroll - - - -
    +
    + CS3281 + + Modifiable Students and Courses + + 5 Nov 2018 + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + +
    - - - - - - + + + + + + + +
    - -
    - CS3282 - - Nothing modifiable - - 2 Feb 2019 - - - - - 2 - - - - - - 2 - - - - - - 2 - - - - - - 2 - - - - -
    + CS3282 + + Nothing modifiable + - Enroll - -
    +
    		+ + + + 2 + + + + + + 2 + + + + + + 2 + + + + + + 2 + + + +
    - - - - - + + + + + + +
    - -
    - - +

    -

    Add New Course -

    +
    -
    -

    - Active courses -

    + + +
    +
    - + Active courses + +
    -
    - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + - - + + + + +
    - Course ID - - - - - - - - Course Name - - - - - - - - Creation Date - - - - - - - - Sections - - Teams - - Total Students - - Total Unregistered - - Action(s) -
    - CS3281 - - Modifiable Students and Courses - - 5 Nov 2018 - - - - - 1 - - - - - - 1 - - - - - - 1 - - - - - - 1 - - +
    + Course Name + + + + + + + + Creation Date + + + + + + + + Sections + + Teams + + Total Students + + Total Unregistered + + Action(s) +
    + CS3281 + + Modifiable Students and Courses + - Enroll - - - -
    +
    		+ + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + +
    - - - - - - + + + + + + + +
    - -
    - CS3282 - - Nothing modifiable - - 2 Feb 2019 - - - - - 2 - - - - - - 2 - - - - - - 2 - - - - - - 2 - - - - -
    - Enroll - -
    +
    		+ Nothing modifiable + + 2 Feb 2019 + + + + + 2 + + + + + + 2 + + + + + + 2 + + + + + + 2 + + + +
    - - - - - + + + + + + +
    - -
    - - +
    -

    Add New Course -

    -
    - + + + +
    - Loading... + -
    -     + + + +     `; @@ -1036,6 +1068,7 @@ exports[`InstructorCoursesPageComponent should snap with no courses in course st courseStats={[Function Object]} deletedTableSortBy={[Function Number]} deletedTableSortOrder={[Function Number]} + hasLoadingFailed="false" instructorService={[Function InstructorService]} isAddNewCourseFormExpanded="false" isArchivedCourseExpanded="false" @@ -1058,351 +1091,358 @@ exports[`InstructorCoursesPageComponent should snap with no courses in course st /> Add New Course -
    +
    -
    -

    - Active courses -

    + + +
    +
    - + Active courses + +
    -
    - - - - - - - - - - - - - - - - - - - - - - - + - - - - -
    + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + - - + + + + +
    - Course ID - - - - - - - - Course Name - - - - - - - - Creation Date - - - - - - - - Sections - - Teams - - Total Students - - Total Unregistered - - Action(s) -
    - CS3281 - - Modifiable Students and Courses - - 5 Nov 2018 - - - - - - Show - - - - - - - - - Show - - - - - - - - - Show - - - - - - - - - Show - - - - +
    + Course Name + + + + + + + + Creation Date + + + + + + + + Sections + + Teams + + Total Students + + Total Unregistered + + Action(s) +
    + CS3281 + + Modifiable Students and Courses + + 5 Nov 2018 + + + + + + Show + + + + + + + + + Show + + + + + + + + + Show + + + + + + + + + Show + + + + + + +
    - - + + + + + + +
    + +
    + CS3282 + + Nothing modifiable + + 2 Feb 2019 + + + + + - Archive - + Show + + + + + + - + Show + + + + + + + + Show + + + + + + - - -
    - CS3282 - - Nothing modifiable - - 2 Feb 2019 - - - - - - Show - - - - - - - - - Show - - - - - - - - - Show - - - - - - - - - Show - - - - - - - -
    + Show + + + +
    		+ +
    - - - - - + + + + + + +
    - -
    - - +
    -
    + + + `; diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html index 2ffd598a598..35a08ae06f3 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html @@ -10,148 +10,151 @@ >
    - - - + + + + +
    +
    +

    Active courses

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Course ID + + + + + Course Name + + + + + Creation Date + + + + SectionsTeamsTotal StudentsTotal UnregisteredAction(s)
    {{course.course.courseId}}{{course.course.courseName}} + {{course.course.creationTimestamp | date:'d MMM yyyy'}} + + + + Show + + + + {{ courseStats[course.course.courseId].sections }} + + + + + Show + + + + {{ courseStats[course.course.courseId].teams }} + + + + + Show + + + + {{ courseStats[course.course.courseId].students }} + + + + + Show + + + + {{ courseStats[course.course.courseId].unregistered }} + + + + +
    + +
    +
    +

    No records found.

    +
    -
    +

    diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.spec.ts b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.spec.ts index 126ccfebaf6..1cbb76ae5af 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.spec.ts @@ -4,6 +4,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; +import { LoadingRetryModule } from '../../components/loading-retry/loading-retry.module'; import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { AddCourseFormModule } from './add-course-form/add-course-form.module'; import { InstructorCoursesPageComponent } from './instructor-courses-page.component'; @@ -115,6 +116,7 @@ describe('InstructorCoursesPageComponent', () => { LoadingSpinnerModule, AjaxLoadingModule, AddCourseFormModule, + LoadingRetryModule, ], }) .compileComponents(); diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts index 148a9e98d34..7b1065e2aaf 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.ts @@ -59,6 +59,7 @@ export class InstructorCoursesPageComponent implements OnInit { SortOrder: typeof SortOrder = SortOrder; isLoading: boolean = false; + hasLoadingFailed: boolean = false; isRecycleBinExpanded: boolean = false; canDeleteAll: boolean = true; canRestoreAll: boolean = true; @@ -86,6 +87,7 @@ export class InstructorCoursesPageComponent implements OnInit { * Loads instructor courses required for this page. */ loadInstructorCourses(): void { + this.hasLoadingFailed = false; this.isLoading = true; this.activeCourses = []; this.archivedCourses = []; @@ -94,7 +96,7 @@ export class InstructorCoursesPageComponent implements OnInit { forkJoin( resp.courses.map((course: Course) => this.instructorService.loadInstructorPrivilege({ courseId: course.courseId })), - ).subscribe((privileges: InstructorPrivilege[]) => { + ).pipe(finalize(() => this.isLoading = false)).subscribe((privileges: InstructorPrivilege[]) => { resp.courses.forEach((course: Course, index: number) => { const canModifyCourse: boolean = privileges[index].canModifyCourse; const canModifyStudent: boolean = privileges[index].canModifyStudent; @@ -105,11 +107,14 @@ export class InstructorCoursesPageComponent implements OnInit { }); this.sortCoursesEvent(SortBy.COURSE_CREATION_DATE); }, (error: ErrorMessageOutput) => { + this.hasLoadingFailed = true; this.statusMessageService.showErrorToast(error.error.message); }); }, (resp: ErrorMessageOutput) => { + this.isLoading = false; + this.hasLoadingFailed = true; this.statusMessageService.showErrorToast(resp.error.message); - }, () => this.isLoading = false); + }); this.courseService.getAllCoursesAsInstructor('archived').subscribe((resp: Courses) => { for (const course of resp.courses) { @@ -123,10 +128,12 @@ export class InstructorCoursesPageComponent implements OnInit { { course, canModifyCourse, canModifyStudent, isLoadingCourseStats }); this.archivedCourses.push(archivedCourse); }, (error: ErrorMessageOutput) => { + this.hasLoadingFailed = true; this.statusMessageService.showErrorToast(error.error.message); }); } }, (resp: ErrorMessageOutput) => { + this.hasLoadingFailed = true; this.statusMessageService.showErrorToast(resp.error.message); }); @@ -145,10 +152,12 @@ export class InstructorCoursesPageComponent implements OnInit { this.canRestoreAll = false; } }, (error: ErrorMessageOutput) => { + this.hasLoadingFailed = true; this.statusMessageService.showErrorToast(error.error.message); }); } }, (resp: ErrorMessageOutput) => { + this.hasLoadingFailed = true; this.statusMessageService.showErrorToast(resp.error.message); }); } @@ -264,7 +273,7 @@ export class InstructorCoursesPageComponent implements OnInit { }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); - }, () => {}); + }); } /** @@ -311,7 +320,7 @@ export class InstructorCoursesPageComponent implements OnInit { }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); - }, () => {}); + }); } /** @@ -354,7 +363,7 @@ export class InstructorCoursesPageComponent implements OnInit { this.statusMessageService.showErrorToast(resp.error.message); }); - }, () => {}); + }); } /** diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.module.ts b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.module.ts index d2dfc566be8..dfb9701911d 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.module.ts +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.module.ts @@ -4,6 +4,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; +import { LoadingRetryModule } from '../../components/loading-retry/loading-retry.module'; import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { AddCourseFormModule } from './add-course-form/add-course-form.module'; import { InstructorCoursesPageComponent } from './instructor-courses-page.component'; @@ -35,6 +36,7 @@ const routes: Routes = [ AddCourseFormModule, LoadingSpinnerModule, AjaxLoadingModule, + LoadingRetryModule, ], }) export class InstructorCoursesPageModule { } diff --git a/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap index ddd61b31c3b..63d671558c4 100644 --- a/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap @@ -10,12 +10,13 @@ exports[`InstructorHomePageComponent should snap when courses are still loading feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackSessionsService={[Function FeedbackSessionsService]} hasCoursesLoaded="false" + hasCoursesLoadingFailed="false" instructorCoursesSortBy={[Function Number]} instructorService={[Function InstructorService]} isNewUser="false" - loadingBarService={[Function LoadingBarService]} navigationService={[Function NavigationService]} ngbModal={[Function NgbModal]} + publishUnpublishRetryAttempts={[Function Number]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} @@ -68,21 +69,27 @@ exports[`InstructorHomePageComponent should snap when courses are still loading Loading...

    - -
    -
    -     -
    -
    -
    +
    +
    -
    +
    +
    - - [CS3281]: Thematic Systems - -
    -
    - - Error loading feedback sessions. Click here to retry. - - Error loading feedback sessions. Click here to retry. +
    + + [CS3281]: Thematic Systems + +
    +
    + + +
    -
    - - -
    - -
    - - +
    + + + + + +
    -
    + + + `; @@ -346,12 +369,13 @@ exports[`InstructorHomePageComponent should snap with one course with one feedba feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackSessionsService={[Function FeedbackSessionsService]} hasCoursesLoaded={[Function Boolean]} + hasCoursesLoadingFailed="false" instructorCoursesSortBy={[Function Number]} instructorService={[Function InstructorService]} isNewUser="false" - loadingBarService={[Function LoadingBarService]} navigationService={[Function NavigationService]} ngbModal={[Function NgbModal]} + publishUnpublishRetryAttempts={[Function Number]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} @@ -439,399 +463,409 @@ exports[`InstructorHomePageComponent should snap with one course with one feedba
    -
    +
    +
    -
    +
    +
    - - [CS3281]: Thematic Systems - -
    -
    -
    + + [CS3281]: Thematic Systems + +
    +
    - - -
    - - - - +
    - View / Edit - -
    - - - -
    + Enroll + + + View / Edit + +
    +     + - -
    -     - - -
    - +
    - Add - -
    - - - -
    + View / Edit + +
    +     + -
    - + Add + +
    +     + +
    - -
    - + + Archive + + + View / Edit + + + + + Delete + + +
    +     +
    - +
    + + + +
    -
    - - -
    - - -
    -
    + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
    - Session Name - - - - - - - - Start Date - - - - - - - - End Date - - - - - - - - Submissions - - Responses - - - Response Rate - - - Action(s) -
    - Feedback - - - 19 Jan 6:43 AM - - - - 19 Jan 6:46 AM - - - - Awaiting - - - - Not Published - - - - -
    - 0 / 6 -
    - -     		- - - - -
    -
    - - - + + + +
    + +
    + + + + + + + +
    +
    +
    + +
    +
    +
    +
    + +     + + + +
    -
    + + + `; @@ -845,12 +879,13 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackSessionsService={[Function FeedbackSessionsService]} hasCoursesLoaded={[Function Boolean]} + hasCoursesLoadingFailed="false" instructorCoursesSortBy={[Function Number]} instructorService={[Function InstructorService]} isNewUser="false" - loadingBarService={[Function LoadingBarService]} navigationService={[Function NavigationService]} ngbModal={[Function NgbModal]} + publishUnpublishRetryAttempts={[Function Number]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} @@ -938,513 +973,523 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba
    -
    +
    +
    -
    +
    +
    - - [CS3281]: Thematic Systems - -
    -
    -
    + + [CS3281]: Thematic Systems + +
    +
    - - -
    - - -
    -     - - -
    - +
    - View / Edit - -
    - - - -
    + View / Edit + +
    +     + - -
    -     - - - - -
    - + + Archive + + + View / Edit + + +
    +     +
    - +
    + + + +
    -
    - - -
    - - -
    -
    + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
    - Session Name - - - - - - - - Start Date - - - - - - - - End Date - - - - - - - - Submissions - - Responses - - - Response Rate - - - Action(s) -
    - Feedback 1 - - - 1 Jan 7:30 AM - - - - 1 Jan 7:30 AM - - - - Closed - - - - Published - - - - -
    - 0 / 6 -
    - -     		- - - - -
    -
    - - - + + + +
    + +
    + + + + + + + +
    +
    +
    + +
    +
    +
    +
    + +     + + + +
    -
    + + + `; @@ -1458,12 +1503,13 @@ exports[`InstructorHomePageComponent should snap with one course with unexpanded feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackSessionsService={[Function FeedbackSessionsService]} hasCoursesLoaded={[Function Boolean]} + hasCoursesLoadingFailed="false" instructorCoursesSortBy={[Function Number]} instructorService={[Function InstructorService]} isNewUser="false" - loadingBarService={[Function LoadingBarService]} navigationService={[Function NavigationService]} ngbModal={[Function NgbModal]} + publishUnpublishRetryAttempts={[Function Number]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} @@ -1551,180 +1597,185 @@ exports[`InstructorHomePageComponent should snap with one course with unexpanded
    -
    +
    +
    -
    +
    +
    - - [CS3281]: Thematic Systems - -
    -
    -
    - + [CS3281]: Thematic Systems + +
    +
    + +
    - -
    - - - - +
    - View / Edit - -
    - - - -
    + Enroll + + + View / Edit + +
    +     + - -
    - - - -
    - +
    - Add - -
    - - - -
    + View / Edit + +
    +     + - - +
    - View / Edit - - - - + Add + +
    +     + +
    -     -
    - -
    - - + Course + +
    + + Archive + + + View / Edit + + + + + Delete + + +
    + +
    +
    + + + +
    +
    - -
    -
    + + +     `; @@ -1738,12 +1789,13 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackSessionsService={[Function FeedbackSessionsService]} hasCoursesLoaded={[Function Boolean]} + hasCoursesLoadingFailed="false" instructorCoursesSortBy={[Function Number]} instructorService={[Function InstructorService]} isNewUser="false" - loadingBarService={[Function LoadingBarService]} navigationService={[Function NavigationService]} ngbModal={[Function NgbModal]} + publishUnpublishRetryAttempts={[Function Number]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} @@ -1831,203 +1883,213 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate
    -
    +
    +
    -
    +
    +
    - - [CS3281]: Thematic Systems - -
    -
    -
    + + [CS3281]: Thematic Systems + +
    +
    - - -
    - - - - +
    - View / Edit - -
    - - - -
    + Enroll + + + View / Edit + +
    +     + - -
    -     - - -
    - +
    - Add - -
    - - - -
    + View / Edit + +
    +     + - - +
    - View / Edit - - - - + Add + +
    +     + +
    -     -
    - -
    - + Course + +
    + + Archive + + + View / Edit + + + + + Delete + + +
    + +
    - +
    + + + +
    -
    - - -
    - -
    - - +
    + + + + + +
    -
    + + +     `; @@ -2041,12 +2103,13 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackSessionsService={[Function FeedbackSessionsService]} hasCoursesLoaded={[Function Boolean]} + hasCoursesLoadingFailed="false" instructorCoursesSortBy={[Function Number]} instructorService={[Function InstructorService]} isNewUser="false" - loadingBarService={[Function LoadingBarService]} navigationService={[Function NavigationService]} ngbModal={[Function NgbModal]} + publishUnpublishRetryAttempts={[Function Number]} router={[Function Router]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} @@ -2134,196 +2197,206 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac
    -
    +
    +
    -
    +
    +
    - - [CS3243]: Introduction to AI - -
    -
    -
    - + [CS3243]: Introduction to AI + +
    +
    + +
    - -
    - - - - +
    - View / Edit - -
    - - - -
    + Enroll + + + View / Edit + +
    +     + - -
    - - - -
    - +
    - Add - -
    - - - -
    + View / Edit + +
    +     + - - +
    - View / Edit - - - - + Add + +
    +     + +
    -     -
    - -
    - + Course + +
    + + Archive + + + View / Edit + + + + + Delete + + +
    + +
    - +
    + + + +
    -
    - - -
    - - -
    - There are no feedback sessions in this course. -
    - -     + + + + + +
    + There are no feedback sessions in this course. +
    + +     + + +     +
    -
    + + + `; diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html index 3a59d747308..ecb08007a8b 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html @@ -36,90 +36,92 @@

    Home

    -
    -
    -
    -
    -
    -
    - [{{ courseTabModel.course.courseId }}]: {{ courseTabModel.course.courseName }} -
    -
    -
    - - -
    - + +
    +
    +
    +
    +
    +
    + [{{ courseTabModel.course.courseId }}]: {{ courseTabModel.course.courseName }} +
    +
    +
    + + + - - - - - - - - - - - - + + + + - -
    -
    - - +
    + + + + + + + + + +
    +
    + + +
    -
    - - - Error loading feedback sessions. Click here to retry. - - -
    - +
    + + + +
    -
    + diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.ts b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.ts index 48c5b10a578..e88454fc87e 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.ts +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.ts @@ -6,7 +6,6 @@ import { CourseService } from '../../../services/course.service'; import { FeedbackQuestionsService } from '../../../services/feedback-questions.service'; import { FeedbackSessionsService } from '../../../services/feedback-sessions.service'; import { InstructorService } from '../../../services/instructor.service'; -import { LoadingBarService } from '../../../services/loading-bar.service'; import { NavigationService } from '../../../services/navigation.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; @@ -43,6 +42,7 @@ interface CourseTabModel { hasPopulated: boolean; isAjaxSuccess: boolean; isTabExpanded: boolean; + hasLoadingFailed: boolean; } /** @@ -69,6 +69,7 @@ export class InstructorHomePageComponent extends InstructorSessionModalPageCompo courseTabModels: CourseTabModel[] = []; hasCoursesLoaded: boolean = false; + hasCoursesLoadingFailed: boolean = false; isNewUser: boolean = false; constructor(router: Router, @@ -81,8 +82,7 @@ export class InstructorHomePageComponent extends InstructorSessionModalPageCompo instructorService: InstructorService, tableComparatorService: TableComparatorService, private simpleModalService: SimpleModalService, - private courseService: CourseService, - private loadingBarService: LoadingBarService) { + private courseService: CourseService) { super(router, instructorService, statusMessageService, navigationService, feedbackSessionsService, feedbackQuestionsService, tableComparatorService, ngbModal, studentService); } @@ -166,11 +166,11 @@ export class InstructorHomePageComponent extends InstructorSessionModalPageCompo * Loads courses of current instructor. */ loadCourses(): void { + this.hasCoursesLoaded = false; + this.hasCoursesLoadingFailed = false; this.courseTabModels = []; - this.loadingBarService.showLoadingBar(); this.courseService.getInstructorCoursesThatAreActive() .pipe(finalize(() => { - this.loadingBarService.hideLoadingBar(); this.hasCoursesLoaded = true; })).subscribe((courses: Courses) => { courses.courses.forEach((course: Course) => { @@ -181,6 +181,7 @@ export class InstructorHomePageComponent extends InstructorSessionModalPageCompo isTabExpanded: false, isAjaxSuccess: true, hasPopulated: false, + hasLoadingFailed: false, sessionsTableRowModelsSortBy: SortBy.NONE, sessionsTableRowModelsSortOrder: SortOrder.ASC, }; @@ -190,7 +191,11 @@ export class InstructorHomePageComponent extends InstructorSessionModalPageCompo }); this.isNewUser = !courses.courses.some((course: Course) => !/-demo\d*$/.test(course.courseId)); this.sortCoursesBy(this.instructorCoursesSortBy); - }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); + }, (resp: ErrorMessageOutput) => { + this.hasCoursesLoadingFailed = true; + this.statusMessageService.showErrorToast(resp.error.message); + + }); } /** @@ -201,6 +206,8 @@ export class InstructorHomePageComponent extends InstructorSessionModalPageCompo .subscribe((instructorPrivilege: InstructorPrivilege) => { model.instructorPrivilege = instructorPrivilege; }, (resp: ErrorMessageOutput) => { + this.courseTabModels = []; + this.hasCoursesLoadingFailed = true; this.statusMessageService.showErrorToast(resp.error.message); }); } @@ -210,6 +217,7 @@ export class InstructorHomePageComponent extends InstructorSessionModalPageCompo */ loadFeedbackSessions(index: number): void { const model: CourseTabModel = this.courseTabModels[index]; + model.hasLoadingFailed = false; if (!model.hasPopulated) { this.feedbackSessionsService.getFeedbackSessionsForInstructor(model.course.courseId) .subscribe((response: FeedbackSessions) => { @@ -228,7 +236,7 @@ export class InstructorHomePageComponent extends InstructorSessionModalPageCompo model.isAjaxSuccess = true; } }, (resp: ErrorMessageOutput) => { - model.isAjaxSuccess = false; + model.hasLoadingFailed = true; this.statusMessageService.showErrorToast(resp.error.message); }, () => this.sortSessionsTableRowModelsEvent(index, SortBy.SESSION_END_DATE)); } diff --git a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.module.ts b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.module.ts index 08db1b67be5..8a88a20c0cf 100644 --- a/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.module.ts +++ b/src/web/app/pages-instructor/instructor-home-page/instructor-home-page.module.ts @@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbCollapseModule, NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { LoadingRetryModule } from '../../components/loading-retry/loading-retry.module'; import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { SessionsTableModule } from '../../components/sessions-table/sessions-table.module'; import { InstructorHomePageComponent } from './instructor-home-page.component'; @@ -30,6 +31,7 @@ const routes: Routes = [ NgbDropdownModule, NgbTooltipModule, LoadingSpinnerModule, + LoadingRetryModule, ], exports: [ InstructorHomePageComponent, diff --git a/src/web/app/pages-instructor/instructor-session-base-page.component.ts b/src/web/app/pages-instructor/instructor-session-base-page.component.ts index ddf02e00093..6ffe35f4a21 100644 --- a/src/web/app/pages-instructor/instructor-session-base-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-base-page.component.ts @@ -1,4 +1,5 @@ import { Router } from '@angular/router'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { saveAs } from 'file-saver'; import { from, Observable, of } from 'rxjs'; import { concatMap, finalize, last, switchMap } from 'rxjs/operators'; @@ -16,7 +17,9 @@ import { InstructorPrivilege, } from '../../types/api-output'; import { Intent } from '../../types/api-request'; +import { DEFAULT_NUMBER_OF_RETRY_ATTEMPTS } from '../../types/default-retry-attempts'; import { SortBy, SortOrder } from '../../types/sort-properties'; +import { ErrorReportComponent } from '../components/error-report/error-report.component'; import { CopySessionResult, SessionsTableRowModel, @@ -28,13 +31,16 @@ import { ErrorMessageOutput } from '../error-message-output'; */ export abstract class InstructorSessionBasePageComponent { + private publishUnpublishRetryAttempts: number = DEFAULT_NUMBER_OF_RETRY_ATTEMPTS; + protected constructor(protected router: Router, protected instructorService: InstructorService, protected statusMessageService: StatusMessageService, protected navigationService: NavigationService, protected feedbackSessionsService: FeedbackSessionsService, protected feedbackQuestionsService: FeedbackQuestionsService, - protected tableComparatorService: TableComparatorService) { } + protected tableComparatorService: TableComparatorService, + protected ngbModal: NgbModal) { } /** * Copies a feedback session. @@ -256,7 +262,14 @@ export abstract class InstructorSessionBasePageComponent { this.statusMessageService.showSuccessToast('The feedback session has been published. ' + 'Please allow up to 1 hour for all the notification emails to be sent out.'); - }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); + }, (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + if (!this.publishUnpublishRetryAttempts) { + this.openErrorReportModal(resp); + } else { + this.publishUnpublishRetryAttempts -= 1; + } + }); } /** @@ -272,6 +285,19 @@ export abstract class InstructorSessionBasePageComponent { model.responseRate = ''; this.statusMessageService.showSuccessToast('The feedback session has been unpublished.'); - }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); + }, (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + if (!this.publishUnpublishRetryAttempts) { + this.openErrorReportModal(resp); + } else { + this.publishUnpublishRetryAttempts -= 1; + } + }); + } + + openErrorReportModal(resp: ErrorMessageOutput): void { + const modal: NgbModalRef = this.ngbModal.open(ErrorReportComponent); + modal.componentInstance.requestId = resp.error.requestId; + modal.componentInstance.errorMessage = resp.error.message; } } diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html index 1d4102fe3f4..33be06295c5 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html +++ b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html @@ -1,71 +1,75 @@ - + + -
    - -
    + +
    + +
    -
    -
    - +
    +
    + +
    -
    -
    -
    -
    -
    - -
    - -
    - - - +
    +
    +
    +
    + +
    + +
    + + + +
    + +   +
    - -   -
    -
    - -
    -
    -
    -
    -
    - Preview Session: -
    -
    - - -
    -
    - - + +
    +
    +
    +
    +
    + Preview Session: +
    +
    + + +
    +
    + + +
    -
    + diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts index c2141774ba7..4f8342d7759 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts @@ -156,7 +156,9 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag isAddingQuestionPanelExpanded: boolean = false; isLoadingFeedbackSession: boolean = false; + hasLoadingFeedbackSessionFailed: boolean = false; isLoadingFeedbackQuestions: boolean = false; + hasLoadingFeedbackQuestionsFailed: boolean = false; isCopyingQuestion: boolean = false; // all students of the course @@ -179,15 +181,15 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag feedbackSessionsService: FeedbackSessionsService, feedbackQuestionsService: FeedbackQuestionsService, tableComparatorService: TableComparatorService, + ngbModal: NgbModal, private studentService: StudentService, private courseService: CourseService, private route: ActivatedRoute, private timezoneService: TimezoneService, - private ngbModal: NgbModal, private simpleModalService: SimpleModalService, private changeDetectorRef: ChangeDetectorRef) { super(router, instructorService, statusMessageService, navigationService, - feedbackSessionsService, feedbackQuestionsService, tableComparatorService); + feedbackSessionsService, feedbackQuestionsService, tableComparatorService, ngbModal); } ngOnInit(): void { @@ -207,6 +209,7 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag * Loads a feedback session. */ loadFeedbackSession(): void { + this.hasLoadingFeedbackSessionFailed = false; this.isLoadingFeedbackSession = true; // load the course of the feedback session first this.courseService.getCourseAsInstructor(this.courseId).subscribe((course: Course) => { @@ -221,11 +224,13 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag this.sessionEditFormModel = this.getSessionEditFormModel(feedbackSession, this.isEditingMode); this.feedbackSessionModelBeforeEditing = this.getSessionEditFormModel(feedbackSession); }, (resp: ErrorMessageOutput) => { + this.hasLoadingFeedbackSessionFailed = true; this.statusMessageService.showErrorToast(resp.error.message); }); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); this.isLoadingFeedbackSession = false; + this.hasLoadingFeedbackSessionFailed = true; }); } @@ -442,6 +447,8 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag * Loads feedback questions. */ loadFeedbackQuestions(): void { + this.questionEditFormModels = []; + this.hasLoadingFeedbackQuestionsFailed = false; this.isLoadingFeedbackQuestions = true; this.feedbackQuestionsService.getFeedbackQuestions({ courseId: this.courseId, @@ -456,7 +463,10 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag this.loadResponseStatusForQuestion(addedQuestionEditFormModel); this.feedbackQuestionModels.set(feedbackQuestion.feedbackQuestionId, feedbackQuestion); }); - }, (resp: ErrorMessageOutput) => this.statusMessageService.showErrorToast(resp.error.message)); + }, (resp: ErrorMessageOutput) => { + this.hasLoadingFeedbackQuestionsFailed = true; + this.statusMessageService.showErrorToast(resp.error.message); + }); } /** diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.module.ts b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.module.ts index b4f39cec988..ab3ba512fca 100644 --- a/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.module.ts +++ b/src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.module.ts @@ -5,6 +5,7 @@ import { RouterModule, Routes } from '@angular/router'; import { NgbCollapseModule, NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; import { CopySessionModalModule } from '../../components/copy-session-modal/copy-session-modal.module'; +import { LoadingRetryModule } from '../../components/loading-retry/loading-retry.module'; import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { QuestionEditFormModule } from '../../components/question-edit-form/question-edit-form.module'; import { SessionEditFormModule } from '../../components/session-edit-form/session-edit-form.module'; @@ -39,6 +40,7 @@ const routes: Routes = [ CopySessionModalModule, RouterModule.forChild(routes), LoadingSpinnerModule, + LoadingRetryModule, ], entryComponents: [ TemplateQuestionModalComponent, diff --git a/src/web/app/pages-instructor/instructor-session-modal-page.component.ts b/src/web/app/pages-instructor/instructor-session-modal-page.component.ts index 090b0e14568..c73bd8d135c 100644 --- a/src/web/app/pages-instructor/instructor-session-modal-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-modal-page.component.ts @@ -43,10 +43,10 @@ export abstract class InstructorSessionModalPageComponent extends InstructorSess feedbackSessionsService: FeedbackSessionsService, feedbackQuestionsService: FeedbackQuestionsService, tableComparatorService: TableComparatorService, - protected ngbModal: NgbModal, + ngbModal: NgbModal, protected studentService: StudentService) { super(router, instructorService, statusMessageService, navigationService, - feedbackSessionsService, feedbackQuestionsService, tableComparatorService); + feedbackSessionsService, feedbackQuestionsService, tableComparatorService, ngbModal); } /** diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html index bc14435c360..2e4669218ec 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.html @@ -1,160 +1,162 @@

    Feedback Session Results

    - -
    -
    -
    -
    -
    - -
    -

    {{ session.courseId }}

    + +
    +
    +
    +
    +
    + +
    +

    {{ session.courseId }}

    +
    -
    -
    - -
    -

    {{ session.feedbackSessionName }} - -

    +
    + +
    +

    {{ session.feedbackSessionName }} + +

    +
    -
    -
    -
    - -
    -

    {{ formattedSessionOpeningTime }}   to   {{ formattedSessionClosingTime }}

    +
    +
    + +
    +

    {{ formattedSessionOpeningTime }}   to   {{ formattedSessionClosingTime }}

    +
    -
    -
    - -
    -

    {{ formattedResultVisibleFromTime }}

    +
    + +
    +

    {{ formattedResultVisibleFromTime }}

    +
    -
    -
    - - - +
    + + + +
    -
    -
    -
    -
    -
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    - +
    -
    -
    -
    - +
    -
    -
    -
    - +
    -
    - -
    - -
    -
    - -
    -
    - -
    -
    -
    - -
    -
    - +
    +
    + +
    + + + + +
    - - - - - -
    + -
    - -
    + +
    + +
    +     Download session results
    diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.spec.ts b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.spec.ts index 16ba3d4f5e3..a7b9f9c8b06 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.spec.ts @@ -6,6 +6,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; import { CommentToCommentRowModelPipe } from '../../components/comment-box/comment-to-comment-row-model.pipe'; import { CommentsToCommentTableModelPipe } from '../../components/comment-box/comments-to-comment-table-model.pipe'; +import { LoadingRetryModule } from '../../components/loading-retry/loading-retry.module'; import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { GqrRqgViewResponsesModule, @@ -59,6 +60,7 @@ describe('InstructorSessionResultPageComponent', () => { SingleStatisticsModule, LoadingSpinnerModule, AjaxLoadingModule, + LoadingRetryModule, ], providers: [ CommentsToCommentTableModelPipe, diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts index 90b2d2f78cc..941b1558c13 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.component.ts @@ -78,6 +78,8 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp formattedSessionClosingTime: string = ''; formattedResultVisibleFromTime: string = ''; + courseId: string = ''; + fsName: string = ''; viewType: string = InstructorSessionResultViewType.QUESTION; section: string = ''; sectionType: InstructorSessionResultSectionType = InstructorSessionResultSectionType.EITHER; @@ -89,14 +91,18 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp // they are for different views sectionsModel: Record = {}; isSectionsLoaded: boolean = false; + hasSectionsLoadingFailed: boolean = false; questionsModel: Record = {}; isQuestionsLoaded: boolean = false; + hasQuestionsLoadingFailed: boolean = false; isFeedbackSessionLoading: boolean = false; + hasFeedbackSessionLoadingFailed: boolean = false; isDownloadingResults: boolean = false; noResponseStudents: Student[] = []; isNoResponsePanelLoaded: boolean = false; + hasNoResponseLoadingFailed: boolean = false; allStudentsInCourse: Student[] = []; @@ -126,100 +132,115 @@ export class InstructorSessionResultPageComponent extends InstructorCommentsComp ngOnInit(): void { this.route.queryParams.subscribe((queryParams: any) => { - this.isFeedbackSessionLoading = true; - this.feedbackSessionsService.getFeedbackSession({ - courseId: queryParams.courseid, - feedbackSessionName: queryParams.fsname, - intent: Intent.INSTRUCTOR_RESULT, - }).subscribe((feedbackSession: FeedbackSession) => { - const TIME_FORMAT: string = 'ddd, DD MMM, YYYY, hh:mm A zz'; - this.session = feedbackSession; - this.formattedSessionOpeningTime = this.timezoneService - .formatToString(this.session.submissionStartTimestamp, this.session.timeZone, TIME_FORMAT); - this.formattedSessionClosingTime = this.timezoneService - .formatToString(this.session.submissionEndTimestamp, this.session.timeZone, TIME_FORMAT); - if (this.session.resultVisibleFromTimestamp) { - this.formattedResultVisibleFromTime = this.timezoneService - .formatToString(this.session.resultVisibleFromTimestamp, this.session.timeZone, TIME_FORMAT); - } - this.isFeedbackSessionLoading = false; - - // load section tabs - this.courseService.getCourseSectionNames(queryParams.courseid) - .subscribe((courseSectionNames: CourseSectionNames) => { - for (const sectionName of courseSectionNames.sectionNames) { - this.sectionsModel.None = { - questions: [], - hasPopulated: false, - isTabExpanded: false, - }; - this.sectionsModel[sectionName] = { - questions: [], - hasPopulated: false, - isTabExpanded: false, - }; - } - this.isSectionsLoaded = true; - }, (resp: ErrorMessageOutput) => { - this.statusMessageService.showErrorToast(resp.error.message); - }); - - // load question tabs - this.feedbackQuestionsService.getFeedbackQuestions({ - courseId: queryParams.courseid, - feedbackSessionName: queryParams.fsname, - intent: Intent.INSTRUCTOR_RESULT, - }).subscribe((feedbackQuestions: FeedbackQuestions) => { - for (const question of feedbackQuestions.questions) { - this.questionsModel[question.feedbackQuestionId] = { - question, - responses: [], - statistics: '', - hasPopulated: false, - isTabExpanded: false, - }; - } - this.isQuestionsLoaded = true; - }, (resp: ErrorMessageOutput) => { - this.statusMessageService.showErrorToast(resp.error.message); - }); - - // load all students in course - this.studentService.getStudentsFromCourse({ - courseId: queryParams.courseid, - }).subscribe((allStudents: Students) => { - this.allStudentsInCourse = allStudents.students; - - // load no response students - this.feedbackSessionsService.getFeedbackSessionSubmittedGiverSet({ - courseId: queryParams.courseid, - feedbackSessionName: queryParams.fsname, - }).subscribe((feedbackSessionSubmittedGiverSet: FeedbackSessionSubmittedGiverSet) => { - // TODO team is missing - this.noResponseStudents = this.allStudentsInCourse.filter((student: Student) => - !feedbackSessionSubmittedGiverSet.giverIdentifiers.includes(student.email)); + this.courseId = queryParams.courseid; + this.fsName = queryParams.fsname; + this.loadFeedbackSessionResults(this.courseId, this.fsName); + }); + } + + loadFeedbackSessionResults(courseId: string, feedbackSessionName: string): void { + this.hasQuestionsLoadingFailed = false; + this.hasSectionsLoadingFailed = false; + this.hasFeedbackSessionLoadingFailed = false; + this.isFeedbackSessionLoading = true; + this.feedbackSessionsService.getFeedbackSession({ + courseId, + feedbackSessionName, + intent: Intent.INSTRUCTOR_RESULT, + }).subscribe((feedbackSession: FeedbackSession) => { + const TIME_FORMAT: string = 'ddd, DD MMM, YYYY, hh:mm A zz'; + this.session = feedbackSession; + this.formattedSessionOpeningTime = this.timezoneService + .formatToString(this.session.submissionStartTimestamp, this.session.timeZone, TIME_FORMAT); + this.formattedSessionClosingTime = this.timezoneService + .formatToString(this.session.submissionEndTimestamp, this.session.timeZone, TIME_FORMAT); + if (this.session.resultVisibleFromTimestamp) { + this.formattedResultVisibleFromTime = this.timezoneService + .formatToString(this.session.resultVisibleFromTimestamp, this.session.timeZone, TIME_FORMAT); + } + this.isFeedbackSessionLoading = false; + + // load section tabs + this.courseService.getCourseSectionNames(courseId) + .subscribe((courseSectionNames: CourseSectionNames) => { + for (const sectionName of courseSectionNames.sectionNames) { + this.sectionsModel.None = { + questions: [], + hasPopulated: false, + isTabExpanded: false, + }; + this.sectionsModel[sectionName] = { + questions: [], + hasPopulated: false, + isTabExpanded: false, + }; + } + this.isSectionsLoaded = true; }, (resp: ErrorMessageOutput) => { + this.hasSectionsLoadingFailed = true; this.statusMessageService.showErrorToast(resp.error.message); }); - this.isNoResponsePanelLoaded = true; - - }, (resp: ErrorMessageOutput) => { - this.statusMessageService.showErrorToast(resp.error.message); - }); + // load question tabs + this.feedbackQuestionsService.getFeedbackQuestions({ + courseId, + feedbackSessionName, + intent: Intent.INSTRUCTOR_RESULT, + }).subscribe((feedbackQuestions: FeedbackQuestions) => { + for (const question of feedbackQuestions.questions) { + this.questionsModel[question.feedbackQuestionId] = { + question, + responses: [], + statistics: '', + hasPopulated: false, + isTabExpanded: false, + }; + } + this.isQuestionsLoaded = true; + }, (resp: ErrorMessageOutput) => { + this.hasQuestionsLoadingFailed = true; + this.statusMessageService.showErrorToast(resp.error.message); + }); - // load current instructor name - this.instructorService.getInstructor({ - courseId: queryParams.courseid, - intent: Intent.FULL_DETAIL, - }).subscribe((instructor: Instructor) => { - this.currInstructorName = instructor.name; - }); + // load all students in course + this.studentService.getStudentsFromCourse({ + courseId, + }).subscribe((allStudents: Students) => { + this.allStudentsInCourse = allStudents.students; + this.loadNoResponseStudents(courseId, feedbackSessionName); }, (resp: ErrorMessageOutput) => { - this.isFeedbackSessionLoading = false; this.statusMessageService.showErrorToast(resp.error.message); }); + + // load current instructor name + this.instructorService.getInstructor({ + courseId, + intent: Intent.FULL_DETAIL, + }).subscribe((instructor: Instructor) => { + this.currInstructorName = instructor.name; + }); + }, (resp: ErrorMessageOutput) => { + this.isFeedbackSessionLoading = false; + this.hasFeedbackSessionLoadingFailed = true; + this.statusMessageService.showErrorToast(resp.error.message); + }); + } + + loadNoResponseStudents(courseId: string, feedbackSessionName: string): void { + this.hasNoResponseLoadingFailed = false; + // load no response students + this.feedbackSessionsService.getFeedbackSessionSubmittedGiverSet({ + courseId, + feedbackSessionName, + }).subscribe((feedbackSessionSubmittedGiverSet: FeedbackSessionSubmittedGiverSet) => { + // TODO team is missing + this.noResponseStudents = this.allStudentsInCourse.filter((student: Student) => + !feedbackSessionSubmittedGiverSet.giverIdentifiers.includes(student.email)); + }, (resp: ErrorMessageOutput) => { + this.hasNoResponseLoadingFailed = true; + this.statusMessageService.showErrorToast(resp.error.message); }); + this.isNoResponsePanelLoaded = true; } /** diff --git a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.module.ts b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.module.ts index 4f2c8974804..05f19ae8818 100644 --- a/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.module.ts +++ b/src/web/app/pages-instructor/instructor-session-result-page/instructor-session-result-page.module.ts @@ -4,6 +4,7 @@ import { FormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbCollapseModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; +import { LoadingRetryModule } from '../../components/loading-retry/loading-retry.module'; import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { TeammatesCommonModule } from '../../components/teammates-common/teammates-common.module'; import { InstructorSessionResultPageComponent } from './instructor-session-result-page.component'; @@ -38,6 +39,7 @@ const routes: Routes = [ InstructorSessionResultViewModule, LoadingSpinnerModule, AjaxLoadingModule, + LoadingRetryModule, ], }) export class InstructorSessionResultPageModule { } diff --git a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.html b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.html index 7f4dd8f80bf..e76d2cc79ac 100644 --- a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.html +++ b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.html @@ -1,4 +1,4 @@ - - - -
    - -
    + +
    +
    + + +
    +
    +
    -
    -
    -
    -

    - Note: The table above doesn't contain sessions from archived courses and soft-deleted courses. - To view sessions from an archived course, unarchive the course first; to view sessions from a course in recycle bin, restore the course first. -

    +
    +
    +

    + Note: The table above doesn't contain sessions from archived courses and soft-deleted courses. + To view sessions from an archived course, unarchive the course first; to view sessions from a course in recycle bin, restore the course first. +

    +
    -
    -
    - - -
    +
    + + +
    + diff --git a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts index aa05444e542..8ed7fae7464 100644 --- a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts +++ b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts @@ -131,6 +131,8 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC recycleBinFeedbackSessionRowModelsSortOrder: SortOrder = SortOrder.ASC; hasCoursesLoaded: boolean = false; + hasCourseLoadingFailed: boolean = false; + hasFeedbackSessionLoadingFailed: boolean = false; constructor(router: Router, statusMessageService: StatusMessageService, @@ -179,19 +181,24 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC + `?courseid=${createdFeedbackSession.courseId}&fsname=${createdFeedbackSession.feedbackSessionName}`, 'The feedback session has been copied. Please modify settings/questions as necessary.'); }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); - }, () => {}); + }); } /** * Loads courses owned by the current user. */ loadCandidatesCourse(): void { + this.hasCoursesLoaded = false; this.courseService.getInstructorCoursesThatAreActive() .pipe(finalize(() => this.hasCoursesLoaded = true)).subscribe((courses: Courses) => { this.courseCandidates = courses.courses; this.initDefaultValuesForSessionEditForm(); - }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); + }, (resp: ErrorMessageOutput) => { + this.resetAllModels(); + this.hasCourseLoadingFailed = true; + this.statusMessageService.showErrorToast(resp.error.message); + }); } /** @@ -385,6 +392,8 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC this.updateInstructorPrivilege(model); }); }, (resp: ErrorMessageOutput) => { + this.resetAllModels(); + this.hasFeedbackSessionLoadingFailed = true; this.statusMessageService.showErrorToast(resp.error.message); }, () => this.sortSessionsTableRowModelsEvent(SortBy.COURSE_ID)); } @@ -522,6 +531,8 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC }); }); }, (resp: ErrorMessageOutput) => { + this.resetAllModels(); + this.hasFeedbackSessionLoadingFailed = true; this.statusMessageService.showErrorToast(resp.error.message); }, () => this.sortRecycleBinFeedbackSessionRowsEvent(SortBy.SESSION_DELETION_DATE)); } @@ -576,7 +587,7 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); - }, () => {}); + }); } /** @@ -604,6 +615,23 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC }, (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); }); - }, () => {}); + }); + } + + /** + * Attempts to load all data again. + */ + retryLoadingAllData(): void { + this.hasFeedbackSessionLoadingFailed = false; + this.hasCourseLoadingFailed = false; + this.loadCandidatesCourse(); + this.loadFeedbackSessions(); + this.loadRecycleBinFeedbackSessions(); + } + + resetAllModels(): void { + this.courseCandidates = []; + this.sessionsTableRowModels = []; + this.recycleBinFeedbackSessionRowModels = []; } } diff --git a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.module.ts b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.module.ts index 9e569691422..81e7c902cec 100644 --- a/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.module.ts +++ b/src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.module.ts @@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; +import { LoadingRetryModule } from '../../components/loading-retry/loading-retry.module'; import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { SessionEditFormModule } from '../../components/session-edit-form/session-edit-form.module'; import { @@ -41,6 +42,7 @@ const routes: Routes = [ SessionsRecycleBinTableModule, RouterModule.forChild(routes), LoadingSpinnerModule, + LoadingRetryModule, ], declarations: [ InstructorSessionsPageComponent, diff --git a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.html b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.html index a6d42c099c2..2efafdbc0f2 100644 --- a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.html +++ b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.html @@ -6,83 +6,89 @@

    Student List

    - -
    -
    -
    -
    -
    -
    -  [{{courseTab.course.courseId}}]: {{courseTab.course.courseName}} + +
    + +
    +
    +
    +
    +
    +
    +  [{{courseTab.course.courseId}}]: {{courseTab.course.courseName}} +
    +
    +
    + +
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -

    {{courseTab.stats.numOfStudents}}

    -
    Students
    -
    -
    -
    -
    -

    {{courseTab.stats.numOfSections}}

    -
    Sections
    -
    -
    -
    -
    -

    {{courseTab.stats.numOfTeams}}

    -
    Teams
    -
    +
    + +
    +
    + +
    +
    +
    +

    {{courseTab.stats.numOfStudents}}

    +
    Students
    +
    +
    +
    +
    +

    {{courseTab.stats.numOfSections}}

    +
    Sections
    +
    +
    +
    +
    +

    {{courseTab.stats.numOfTeams}}

    +
    Teams
    +
    +
    +
    + +
    + + +

    + + +
    +     +
    -
    - - -

    - + + - - -
    - - -
    There are no students in this course.
    - -     - +
    -
    -
    - + + diff --git a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts index 0b0e525a544..3002271c03c 100644 --- a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts +++ b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.component.ts @@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core'; import { finalize } from 'rxjs/operators'; import { CourseService, CourseStatistics } from '../../../services/course.service'; import { InstructorService } from '../../../services/instructor.service'; -import { LoadingBarService } from '../../../services/loading-bar.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { TableComparatorService } from '../../../services/table-comparator.service'; @@ -24,6 +23,7 @@ interface CourseTab { studentSortOrder: SortOrder; hasTabExpanded: boolean; hasStudentLoaded: boolean; + hasLoadingFailed: boolean; stats: CourseStatistics; } @@ -39,12 +39,13 @@ interface CourseTab { export class InstructorStudentListPageComponent implements OnInit { courseTabList: CourseTab[] = []; + hasLoadingFailed: boolean = false; + isLoadingCourses: boolean = false; constructor(private instructorService: InstructorService, private courseService: CourseService, private studentService: StudentService, private statusMessageService: StatusMessageService, - private loadingBarService: LoadingBarService, private tableComparatorService: TableComparatorService) { } @@ -56,9 +57,10 @@ export class InstructorStudentListPageComponent implements OnInit { * Loads courses of current instructor. */ loadCourses(): void { - this.loadingBarService.showLoadingBar(); + this.hasLoadingFailed = false; + this.isLoadingCourses = true; this.courseService.getAllCoursesAsInstructor('active') - .pipe(finalize(() => this.loadingBarService.hideLoadingBar())) + .pipe(finalize(() => this.isLoadingCourses = false)) .subscribe((courses: Courses) => { courses.courses.forEach((course: Course) => { const courseTab: CourseTab = { @@ -68,6 +70,7 @@ export class InstructorStudentListPageComponent implements OnInit { studentSortOrder: SortOrder.ASC, hasTabExpanded: false, hasStudentLoaded: false, + hasLoadingFailed: false, stats: { numOfSections: 0, numOfStudents: 0, @@ -78,6 +81,8 @@ export class InstructorStudentListPageComponent implements OnInit { this.courseTabList.push(courseTab); }); }, (resp: ErrorMessageOutput) => { + this.courseTabList = []; + this.hasLoadingFailed = true; this.statusMessageService.showErrorToast(resp.error.message); }, () => this.sortCourses()); } @@ -96,6 +101,8 @@ export class InstructorStudentListPageComponent implements OnInit { * Loads students of a specified course. */ loadStudents(courseTab: CourseTab): void { + courseTab.hasLoadingFailed = false; + courseTab.hasStudentLoaded = false; this.studentService.getStudentsFromCourse({ courseId: courseTab.course.courseId }) .pipe(finalize(() => courseTab.hasStudentLoaded = true)) .subscribe((students: Students) => { @@ -121,6 +128,8 @@ export class InstructorStudentListPageComponent implements OnInit { courseTab.stats = this.courseService.calculateCourseStatistics(students.students); }, (resp: ErrorMessageOutput) => { + courseTab.hasLoadingFailed = true; + courseTab.studentList = []; this.statusMessageService.showErrorToast(resp.error.message); }); } @@ -141,6 +150,8 @@ export class InstructorStudentListPageComponent implements OnInit { courseTab.studentList.push(...students); courseTab.studentList.sort(this.sortStudentBy(SortBy.NONE, SortOrder.ASC)); }, (resp: ErrorMessageOutput) => { + courseTab.hasLoadingFailed = true; + courseTab.studentList = []; this.statusMessageService.showErrorToast(resp.error.message); }); } diff --git a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.module.ts b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.module.ts index 4636e6c9ba3..2a6441bbbc5 100644 --- a/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.module.ts +++ b/src/web/app/pages-instructor/instructor-student-list-page/instructor-student-list-page.module.ts @@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; +import { LoadingRetryModule } from '../../components/loading-retry/loading-retry.module'; import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; import { StudentListModule } from '../../components/student-list/student-list.module'; import { InstructorStudentListPageComponent } from './instructor-student-list-page.component'; @@ -31,6 +32,7 @@ const routes: Routes = [ StudentListModule, NgbCollapseModule, LoadingSpinnerModule, + LoadingRetryModule, ], }) export class InstructorStudentListPageModule { } diff --git a/src/web/app/pages-instructor/instructor-student-records-page/__snapshots__/instructor-student-records-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-student-records-page/__snapshots__/instructor-student-records-page.component.spec.ts.snap index 8cd0bc973f6..b88221981ce 100644 --- a/src/web/app/pages-instructor/instructor-student-records-page/__snapshots__/instructor-student-records-page.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-student-records-page/__snapshots__/instructor-student-records-page.component.spec.ts.snap @@ -7,6 +7,9 @@ exports[`InstructorStudentRecordsPageComponent should snap when student results commentsToCommentTableModel={[Function CommentsToCommentTableModelPipe]} courseId={[Function String]} feedbackSessionsService={[Function FeedbackSessionsService]} + hasStudentLoadingFailed="false" + hasStudentProfileLoadingFailed="false" + hasStudentResultsLoadingFailed="false" instructorCommentTableModel={[Function Object]} instructorService={[Function InstructorService]} isStudentLoading="false" @@ -33,23 +36,37 @@ exports[`InstructorStudentRecordsPageComponent should snap when student results > - CS1111 -

    +

    + + + + + + + +

    Records in feedback sessions -

    -
    -