[#12329] Refactoring of sortable tables - Sessions table

src/e2e/java/teammates/e2e/cases/InstructorFeedbackSessionsPageE2ETest.java

@@ -88,7 +88,6 @@ public void testAll() {
 
         ______TS("verify loaded data");
         FeedbackSessionAttributes[] loadedSessions = { openSession, closedSession };
-        feedbackSessionsPage.sortByCourseId();
         feedbackSessionsPage.verifySessionsTable(loadedSessions);
 
         ______TS("verify response rate");
@@ -218,7 +217,6 @@ public void testAll() {
         FeedbackSessionAttributes[] sessionsForRestore = { openSession, newSession, closedSession, copiedSession2,
                 copiedSession };
         feedbackSessionsPage.restoreSession(closedSession);
-
         feedbackSessionsPage.verifyStatusMessage("The feedback session has been restored.");
         feedbackSessionsPage.sortBySessionsName();
         feedbackSessionsPage.verifySessionsTable(sessionsForRestore);
@@ -229,6 +227,8 @@ public void testAll() {
         ______TS("permanently delete session");
         FeedbackSessionAttributes[] sessionsForDelete = { copiedSession, copiedSession2, closedSession,
                 openSession };
+
+        feedbackSessionsPage.sortBySessionsName();
         feedbackSessionsPage.moveToRecycleBin(newSession);
         feedbackSessionsPage.deleteSession(newSession);
 
@@ -239,8 +239,7 @@ public void testAll() {
         verifyAbsentInDatabase(newSession);
 
         ______TS("restore all session");
-        FeedbackSessionAttributes[] sessionsForRestoreAll = { openSession, closedSession, copiedSession2,
-                copiedSession };
+        FeedbackSessionAttributes[] sessionsForRestoreAll = { copiedSession, copiedSession2, closedSession, openSession };
         feedbackSessionsPage.moveToRecycleBin(copiedSession);
         feedbackSessionsPage.moveToRecycleBin(copiedSession2);
         feedbackSessionsPage.restoreAllSessions();

src/e2e/java/teammates/e2e/cases/InstructorHomePageE2ETest.java

@@ -207,8 +207,8 @@ public void testAll() {
         homePage.sortCoursesByCreationDate();
         courseIndex = 1;
         otherCourseIndex = 0;
-        FeedbackSessionAttributes[] otherCourseSessionsWithCopy2 = { copiedSession2, otherCourseSession };
-        homePage.verifyCourseTabDetails(otherCourseIndex, otherCourse, otherCourseSessionsWithCopy2);
+        FeedbackSessionAttributes[] otherCourseSessionsWithCopyTwo = { copiedSession2, otherCourseSession };
+        homePage.verifyCourseTabDetails(otherCourseIndex, otherCourse, otherCourseSessionsWithCopyTwo);
         assertNotNull(getSoftDeletedSession(copiedSession.getFeedbackSessionName(),
                 instructor.getGoogleId()));
 

src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackSessionsPage.java

@@ -96,7 +96,7 @@ public class InstructorFeedbackSessionsPage extends AppPage {
     @FindBy(id = "btn-create-session")
     private WebElement createSessionButton;
 
-    @FindBy(className = "sessions-table")
+    @FindBy(id = "sessions-table")
     private WebElement sessionsTable;
 
     @FindBy(id = "deleted-sessions-heading")
@@ -501,6 +501,8 @@ && getFeedbackSessionName(i).equals(sessionName)) {
 
     private int getSoftDeletedFeedbackSessionRowId(String courseId, String sessionName) {
         int i = 0;
+        assertEquals(courseId, getSoftDeletedFeedbackSessionCourseId(i));
+        assertEquals(sessionName, getSoftDeletedFeedbackSessionName(i));
 
         while (i < getNumSoftDeletedFeedbackSessions()) {
             if (getSoftDeletedFeedbackSessionCourseId(i).equals(courseId)

src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java

@@ -151,7 +151,7 @@ private String getCourseDetails(int courseTabIndex) {
     }
 
     private WebElement getSessionsTable(int courseTabIndex) {
-        return getCourseTab(courseTabIndex).findElement(By.className("sessions-table"));
+        return getCourseTab(courseTabIndex).findElement(By.id("sessions-table-" + courseTabIndex));
     }
 
     private String getDateString(Instant instant, String timeZone) {

src/e2e/resources/data/InstructorHomePageE2ETest.json

@@ -175,7 +175,7 @@
       "creatorEmail": "IHome.instructor.tmms@gmail.tmt",
       "instructions": "Please please fill in the following questions.",
       "createdTime": "2012-03-20T23:59:00Z",
-      "startTime": "2012-03-29T15:00:00Z",
+      "startTime": "2012-03-29T04:00:00Z",
       "endTime": "2012-05-01T04:00:00Z",
       "sessionVisibleFromTime": "2012-03-28T16:00:00Z",
       "resultsVisibleFromTime": "2012-05-01T16:00:00Z",

src/web/app/components/question-types/question-statistics/constsum-options-question-statistics.component.html

@@ -5,7 +5,7 @@
       <strong *ngIf="!isStudent">Response Summary</strong>
     </div>
   </div>
-  <div class="row">
+  <div class="row mb-4">
     <div class="col-sm-12 table-responsive">
       <tm-sortable-table [columns]="columnsData" [rows]="rowsData" [initialSortBy]="SortBy.CONSTSUM_OPTIONS_POINTS"></tm-sortable-table>
     </div>

src/web/app/components/question-types/question-statistics/constsum-recipients-question-statistics.component.html

@@ -5,7 +5,7 @@
       <strong *ngIf="!isStudent">Response Summary</strong>
     </div>
   </div>
-  <div class="row">
+  <div class="row mb-4">
     <div class="col-sm-12 table-responsive">
       <tm-sortable-table [columns]="columnsData" [rows]="rowsData" [initialSortBy]="SortBy.CONSTSUM_RECIPIENTS_POINTS"></tm-sortable-table>
     </div>

src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.html

@@ -54,7 +54,7 @@
       [<a tmRouterLink="/web/instructor/help" [queryParams]="{questionId: QuestionsSectionQuestions.CONTRIBUTION, section: Sections.questions}" rel="noopener noreferrer" target="_blank">How do I interpret/use these values?</a>]
     </div>
   </div>
-  <div class="row">
+  <div class="row mb-4">
     <div class="col-sm-12 table-responsive">
       <tm-sortable-table [rows]="rowsData" [columns]="columnsData"></tm-sortable-table>
     </div>

src/web/app/components/question-types/question-statistics/contribution-question-statistics/contribution-question-statistics.component.ts

@@ -88,27 +88,44 @@ export class ContributionQuestionStatisticsComponent
           value: statistics.results[email].claimed,
           customComponent: {
             component: ContributionComponent,
-            componentData: { value: statistics.results[email].claimed },
+            componentData: () => {
+              return {
+                value: statistics.results[email].claimed,
+              };
+            },
           },
         },
         {
           value: statistics.results[email].perceived,
           customComponent: {
             component: ContributionComponent,
-            componentData: { value: statistics.results[email].perceived },
+            componentData: () => {
+              return {
+                value: statistics.results[email].perceived,
+              };
+            },
           },
         },
         {
           value: this.emailToDiff[email],
           customComponent: {
             component: ContributionComponent,
-            componentData: { value: this.emailToDiff[email], diffOnly: true },
+            componentData: () => {
+              return {
+                value: this.emailToDiff[email],
+                diffOnly: true,
+              };
+            },
           },
         },
         {
           customComponent: {
             component: ContributionRatingsListComponent,
-            componentData: { ratingsList: statistics.results[email].perceivedOthers },
+            componentData: () => {
+              return {
+                ratingsList: statistics.results[email].perceivedOthers,
+              };
+            },
           },
         },
       ];

src/web/app/components/question-types/question-statistics/mcq-question-statistics.component.html

@@ -7,14 +7,16 @@
     </div>
   </div>
   <div class="row">
-    <div class="col-sm-12 table-responsive">
+    <div class="col-sm-12 table-responsive mb-4">
       <tm-sortable-table [columns]="summaryColumnsData" [rows]="summaryRowsData"></tm-sortable-table>
     </div>
     <div class="col-sm-12 table-responsive" *ngIf="question.hasAssignedWeights" style="margin-top: 20px;">
       <strong class="text-color-gray">
         Per Recipient Statistics
       </strong>
-      <tm-sortable-table [columns]="perRecipientColumnsData" [rows]="perRecipientRowsData" [initialSortBy]="SortBy.MCQ_WEIGHT_AVERAGE"></tm-sortable-table>
+      <div class="mb-4">
+        <tm-sortable-table [columns]="perRecipientColumnsData" [rows]="perRecipientRowsData" [initialSortBy]="SortBy.MCQ_WEIGHT_AVERAGE"></tm-sortable-table>
+      </div>
     </div>
   </div>
 </div>

src/web/app/components/question-types/question-statistics/msq-question-statistics.component.html

@@ -6,15 +6,17 @@
       </strong>
     </div>
   </div>
-  <div class="row">
+  <div class="row mb-4">
     <div class="col-sm-12 table-responsive">
       <tm-sortable-table [rows]="summaryRowsData" [columns]="summaryColumnsData" [initialSortBy]="SortBy.MSQ_PERCENTAGE"></tm-sortable-table>
     </div>
     <div class="col-sm-12 table-responsive" *ngIf="question.hasAssignedWeights" style="margin-top: 20px;">
       <strong class="text-color-gray">
         Per Recipient Statistics
       </strong>
-      <tm-sortable-table [rows]="perRecipientRowsData" [columns]="perRecipientColumnsData" [initialSortBy]="SortBy.MSQ_WEIGHT_AVERAGE"></tm-sortable-table>
+      <div class="mb-4">
+        <tm-sortable-table [rows]="perRecipientRowsData" [columns]="perRecipientColumnsData" [initialSortBy]="SortBy.MSQ_WEIGHT_AVERAGE"></tm-sortable-table>
+      </div>
     </div>
   </div>
 </div>

src/web/app/components/question-types/question-statistics/num-scale-question-statistics.component.html

@@ -6,7 +6,7 @@
     </div>
   </div>
   <div class="row">
-    <div id="numscale-statistics" class="col-sm-12 table-responsive">
+    <div id="numscale-statistics" class="col-sm-12 table-responsive mb-4">
       <tm-sortable-table [rows]="rowsData" [columns]="columnsData"></tm-sortable-table>
     </div>
   </div>

src/web/app/components/question-types/question-statistics/rank-options-question-statistics.component.html

@@ -7,7 +7,7 @@
     </div>
   </div>
   <div class="row">
-    <div class="col-sm-12 table-responsive">
+    <div class="col-sm-12 table-responsive mb-4">
       <tm-sortable-table [rows]="rowsData"
                          [columns]="columnsData"
                          [initialSortBy]="SortBy.RANK_OPTIONS_OVERALL_RANK"

src/web/app/components/question-types/question-statistics/rank-recipients-question-statistics.component.html

@@ -6,7 +6,7 @@
       </strong>
     </div>
   </div>
-  <div class="row">
+  <div class="row mb-4">
     <div class="col-sm-12 table-responsive">
       <tm-sortable-table [rows]="rowsData"
                          [columns]="columnsData"

src/web/app/components/question-types/question-statistics/rubric-question-statistics.component.html

@@ -12,7 +12,7 @@
       </label>
     </div>
   </div>
-  <div class="row">
+  <div class="row mb-4">
     <div id="rubric-statistics" class="col-sm-12 table-responsive">
       <tm-sortable-table [rows]="summaryRowsData"
                          [columns]="summaryColumnsData"
@@ -29,7 +29,7 @@
       </div>
     </div>
     <div class="row">
-      <div id="rubric-recipient-statistics-per-criterion" class="col-sm-12 table-responsive">
+      <div id="rubric-recipient-statistics-per-criterion" class="col-sm-12 table-responsive mb-4">
         <tm-sortable-table [rows]="perRecipientPerCriterionRowsData"
                            [columns]="perRecipientPerCriterionColumnsData"
         ></tm-sortable-table>
@@ -45,7 +45,7 @@
       </div>
     </div>
     <div class="row">
-      <div id="rubric-recipient-statistics-overall" class="col-sm-12 table-responsive">
+      <div id="rubric-recipient-statistics-overall" class="col-sm-12 table-responsive mb-5">
         <tm-sortable-table [rows]="perRecipientOverallRowsData"
                            [columns]="perRecipientOverallColumnsData"
         ></tm-sortable-table>