From 945f536c67d74e9f741f453323a654057d743e54 Mon Sep 17 00:00:00 2001
From: Sweta <sweta-comp491@Swetas-MacBook-Pro.local>
Date: Sun, 27 Mar 2022 20:05:43 -0400
Subject: [PATCH 1/6] rephrased instructions for searching students

---
 .../instructor-search-bar.component.html                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/web/app/pages-instructor/instructor-search-page/instructor-search-bar/instructor-search-bar.component.html b/src/web/app/pages-instructor/instructor-search-page/instructor-search-bar/instructor-search-bar.component.html
index b326634dd9e..b65de33d9c2 100644
--- a/src/web/app/pages-instructor/instructor-search-page/instructor-search-bar/instructor-search-bar.component.html
+++ b/src/web/app/pages-instructor/instructor-search-page/instructor-search-bar/instructor-search-bar.component.html
@@ -1,13 +1,13 @@
 <div class="card bg-light mb-4">
   <div class="card-body">
     <div class="text-muted">
-      You can search for students from all your courses here.
+      You can search for students (by name or email) from all your courses here.
     </div>
     <div class="text-muted">
       Search Tips:<br>
       <ul>
         <li>Put more keywords to search for more precise results.</li>
-        <li>Put quotation marks around words <b>"[any word]"</b> to search for an exact phrase in an exact order.</li>
+        <li>Put quotation marks around words <b>"[any word]"</b> to search for an exact phrase in an exact order. e.g., "John Doe".</li>
       </ul>
     </div>
     <div class="form-group">

From b2d4987de00ee77690e274251a9f26f016e4753b Mon Sep 17 00:00:00 2001
From: Sweta <sweta-comp491@Swetas-MacBook-Pro.local>
Date: Sun, 27 Mar 2022 20:25:42 -0400
Subject: [PATCH 2/6] removed students title from the search component

---
 .../student-result-table/student-result-table.component.html     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.html b/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.html
index 86fc61b9ba9..d7f3720fc13 100644
--- a/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.html
+++ b/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.html
@@ -1,5 +1,4 @@
 <div class="card border border-primary mb-4">
-  <div class="card-header text-white bg-primary font-weight-bold">Students</div>
   <div class="card-body p-3">
     <div *ngFor="let course of studentTables" class="card border border-light-blue mb-3 student-course-table">
       <div class="card-header alert-primary font-weight-bold text-break">[{{course.courseId}}]</div>

From bd6a1f41f7add03c034e2c7b0532fb4a9414f2df Mon Sep 17 00:00:00 2001
From: Sweta <sweta-comp491@Swetas-MacBook-Pro.local>
Date: Sun, 27 Mar 2022 21:01:12 -0400
Subject: [PATCH 3/6] removed blue outline of the search results panel

---
 .../student-result-table.component.html       | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.html b/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.html
index d7f3720fc13..385ceeb825c 100644
--- a/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.html
+++ b/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.html
@@ -1,19 +1,15 @@
-<div class="card border border-primary mb-4">
-  <div class="card-body p-3">
-    <div *ngFor="let course of studentTables" class="card border border-light-blue mb-3 student-course-table">
-      <div class="card-header alert-primary font-weight-bold text-break">[{{course.courseId}}]</div>
-      <div class="card-body p-0">
-        <tm-student-list
-          [courseId]="course.courseId"
-          [students]="course.students"
-          [useGrayHeading]="true"
-          [enableRemindButton]="false"
-          [isActionButtonsEnabled]="isActionButtonsEnabled"
-          [tableSortBy]="studentSortBy" [tableSortOrder]="studentSortOrder"
-          (sortStudentListEvent)="sortStudentList(course.students, $event)"
-          (removeStudentFromCourseEvent)="removeStudent(course.students, $event)">
-        </tm-student-list>
-      </div>
-    </div>
+<div *ngFor="let course of studentTables" class="card border border-light-blue mb-3 student-course-table">
+  <div class="card-header alert-primary font-weight-bold text-break">[{{course.courseId}}]</div>
+  <div class="card-body p-0">
+    <tm-student-list
+      [courseId]="course.courseId"
+      [students]="course.students"
+      [useGrayHeading]="true"
+      [enableRemindButton]="false"
+      [isActionButtonsEnabled]="isActionButtonsEnabled"
+      [tableSortBy]="studentSortBy" [tableSortOrder]="studentSortOrder"
+      (sortStudentListEvent)="sortStudentList(course.students, $event)"
+      (removeStudentFromCourseEvent)="removeStudent(course.students, $event)">
+    </tm-student-list>
   </div>
-</div>
+</div>
\ No newline at end of file

From 9eaa91871c30cfe5a1dd1c1a5945abbcd88a942f Mon Sep 17 00:00:00 2001
From: Sweta <sweta-comp491@Swetas-MacBook-Pro.local>
Date: Wed, 30 Mar 2022 17:10:09 -0400
Subject: [PATCH 4/6] updated snapshot

---
 ...tructor-search-page.component.spec.ts.snap | 719 +++++++++---------
 1 file changed, 353 insertions(+), 366 deletions(-)

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 b029bea5e22..688c4688468 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
@@ -20,7 +20,7 @@ exports[`InstructorSearchPageComponent should snap with a search key 1`] = `
         <div
           class="text-muted"
         >
-           You can search for students from all your courses here. 
+           You can search for students (by name or email) from all your courses here. 
         </div>
         <div
           class="text-muted"
@@ -36,7 +36,7 @@ exports[`InstructorSearchPageComponent should snap with a search key 1`] = `
               <b>
                 "[any word]"
               </b>
-               to search for an exact phrase in an exact order.
+               to search for an exact phrase in an exact order. e.g., "John Doe".
             </li>
           </ul>
         </div>
@@ -91,7 +91,7 @@ exports[`InstructorSearchPageComponent should snap with a student table 1`] = `
         <div
           class="text-muted"
         >
-           You can search for students from all your courses here. 
+           You can search for students (by name or email) from all your courses here. 
         </div>
         <div
           class="text-muted"
@@ -107,7 +107,7 @@ exports[`InstructorSearchPageComponent should snap with a student table 1`] = `
               <b>
                 "[any word]"
               </b>
-               to search for an exact phrase in an exact order.
+               to search for an exact phrase in an exact order. e.g., "John Doe".
             </li>
           </ul>
         </div>
@@ -141,385 +141,372 @@ exports[`InstructorSearchPageComponent should snap with a student table 1`] = `
   </tm-instructor-search-bar><div>
     <tm-student-result-table>
       <div
-        class="card border border-primary mb-4"
+        class="card border border-light-blue mb-3 student-course-table"
       >
         <div
-          class="card-header text-white bg-primary font-weight-bold"
+          class="card-header alert-primary font-weight-bold text-break"
         >
-          Students
+          [test-exa.demo]
         </div>
         <div
-          class="card-body p-3"
+          class="card-body p-0"
         >
-          <div
-            class="card border border-light-blue mb-3 student-course-table"
-          >
-            <div
-              class="card-header alert-primary font-weight-bold text-break"
-            >
-              [test-exa.demo]
-            </div>
+          <tm-student-list>
             <div
-              class="card-body p-0"
+              class="table-responsive"
             >
-              <tm-student-list>
-                <div
-                  class="table-responsive"
+              <table
+                class="table table-bordered table-striped m-0"
+              >
+                <thead
+                  class="thead-gray"
                 >
-                  <table
-                    class="table table-bordered table-striped m-0"
-                  >
-                    <thead
-                      class="thead-gray"
+                  <tr>
+                    <th>
+                      Photo
+                    </th>
+                    <th
+                      class="sortable-header"
                     >
-                      <tr>
-                        <th>
-                          Photo
-                        </th>
-                        <th
-                          class="sortable-header"
-                        >
-                           Section 
-                          <span
-                            class="fa-stack"
-                          >
-                            <i
-                              class="fas fa-sort"
-                            />
-                          </span>
-                        </th>
-                        <th
-                          class="sortable-header"
-                        >
-                           Team 
-                          <span
-                            class="fa-stack"
-                          >
-                            <i
-                              class="fas fa-sort"
-                            />
-                          </span>
-                        </th>
-                        <th
-                          class="sortable-header"
-                          id="sort-by-name"
-                        >
-                           Student Name 
-                          <span
-                            class="fa-stack"
-                          >
-                            <i
-                              class="fas fa-sort"
-                            />
-                          </span>
-                        </th>
-                        <th
-                          class="sortable-header"
-                          id="sort-by-status"
-                        >
-                           Status 
-                          <span
-                            class="fa-stack"
-                          >
-                            <i
-                              class="fas fa-sort"
-                            />
-                          </span>
-                        </th>
-                        <th
-                          class="sortable-header"
-                        >
-                           Email 
-                          <span
-                            class="fa-stack"
-                          >
-                            <i
-                              class="fas fa-sort"
-                            />
-                          </span>
-                        </th>
-                        <th
-                          class="align-center"
-                        >
-                          Action(s)
-                        </th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <tr
-                        s=""
+                       Section 
+                      <span
+                        class="fa-stack"
+                      >
+                        <i
+                          class="fas fa-sort"
+                        />
+                      </span>
+                    </th>
+                    <th
+                      class="sortable-header"
+                    >
+                       Team 
+                      <span
+                        class="fa-stack"
+                      >
+                        <i
+                          class="fas fa-sort"
+                        />
+                      </span>
+                    </th>
+                    <th
+                      class="sortable-header"
+                      id="sort-by-name"
+                    >
+                       Student Name 
+                      <span
+                        class="fa-stack"
                       >
-                        <td>
-                          <tm-view-photo-popover>
-                            <a
-                              href="/"
-                              queryparamshandling="preserve"
-                              role="button"
-                            >
-                               View Photo 
-                            </a>
-                          </tm-view-photo-popover>
-                        </td>
-                        <td>
-                          Tutorial Group 1
-                        </td>
-                        <td>
-                          Team 1
-                        </td>
-                        <td>
-                          tester
-                        </td>
-                        <td>
-                          Joined
-                        </td>
-                        <td>
-                          tester@tester.com
-                        </td>
-                        <td
-                          class="no-print align-center"
+                        <i
+                          class="fas fa-sort"
+                        />
+                      </span>
+                    </th>
+                    <th
+                      class="sortable-header"
+                      id="sort-by-status"
+                    >
+                       Status 
+                      <span
+                        class="fa-stack"
+                      >
+                        <i
+                          class="fas fa-sort"
+                        />
+                      </span>
+                    </th>
+                    <th
+                      class="sortable-header"
+                    >
+                       Email 
+                      <span
+                        class="fa-stack"
+                      >
+                        <i
+                          class="fas fa-sort"
+                        />
+                      </span>
+                    </th>
+                    <th
+                      class="align-center"
+                    >
+                      Action(s)
+                    </th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr
+                    s=""
+                  >
+                    <td>
+                      <tm-view-photo-popover>
+                        <a
+                          href="/"
+                          queryparamshandling="preserve"
+                          role="button"
                         >
-                          <a
-                            class="btn btn-light btn-sm btn-margin-right"
-                            href="/web/instructor/courses/student/details?courseid=test-exa.demo&studentemail=tester@tester.com"
-                            id="btn-view-details"
-                            rel="noopener noreferrer"
-                            target="_blank"
-                          >
-                             View
-                          </a>
-                          <a
-                            class="btn btn-light btn-sm btn-margin-right"
-                            href="/web/instructor/courses/student/edit?courseid=test-exa.demo&studentemail=tester@tester.com"
-                            id="btn-edit-details"
-                            rel="noopener noreferrer"
-                            target="_blank"
-                          >
-                             Edit
-                          </a>
-                          <button
-                            class="btn btn-light btn-sm btn-margin-right"
-                            id="btn-delete"
-                          >
-                            Delete
-                          </button>
-                          <a
-                            class="btn btn-light btn-sm btn-margin-right"
-                            href="/web/instructor/students/records?courseid=test-exa.demo&studentemail=tester@tester.com"
-                            id="btn-view-records"
-                            rel="noopener noreferrer"
-                            target="_blank"
-                          >
-                             All Records
-                          </a>
-                        </td>
-                      </tr>
-                      <tr
-                        s=""
+                           View Photo 
+                        </a>
+                      </tm-view-photo-popover>
+                    </td>
+                    <td>
+                      Tutorial Group 1
+                    </td>
+                    <td>
+                      Team 1
+                    </td>
+                    <td>
+                      tester
+                    </td>
+                    <td>
+                      Joined
+                    </td>
+                    <td>
+                      tester@tester.com
+                    </td>
+                    <td
+                      class="no-print align-center"
+                    >
+                      <a
+                        class="btn btn-light btn-sm btn-margin-right"
+                        href="/web/instructor/courses/student/details?courseid=test-exa.demo&studentemail=tester@tester.com"
+                        id="btn-view-details"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                         View
+                      </a>
+                      <a
+                        class="btn btn-light btn-sm btn-margin-right"
+                        href="/web/instructor/courses/student/edit?courseid=test-exa.demo&studentemail=tester@tester.com"
+                        id="btn-edit-details"
+                        rel="noopener noreferrer"
+                        target="_blank"
                       >
-                        <td>
-                          <tm-view-photo-popover>
-                            <a
-                              href="/"
-                              queryparamshandling="preserve"
-                              role="button"
-                            >
-                               View Photo 
-                            </a>
-                          </tm-view-photo-popover>
-                        </td>
-                        <td>
-                          Tutorial Group 1
-                        </td>
-                        <td>
-                          Team 1
-                        </td>
-                        <td>
-                          Benny Charles
-                        </td>
-                        <td>
-                          Joined
-                        </td>
-                        <td>
-                          benny.c.tmms@gmail.tmt
-                        </td>
-                        <td
-                          class="no-print align-center"
+                         Edit
+                      </a>
+                      <button
+                        class="btn btn-light btn-sm btn-margin-right"
+                        id="btn-delete"
+                      >
+                        Delete
+                      </button>
+                      <a
+                        class="btn btn-light btn-sm btn-margin-right"
+                        href="/web/instructor/students/records?courseid=test-exa.demo&studentemail=tester@tester.com"
+                        id="btn-view-records"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                         All Records
+                      </a>
+                    </td>
+                  </tr>
+                  <tr
+                    s=""
+                  >
+                    <td>
+                      <tm-view-photo-popover>
+                        <a
+                          href="/"
+                          queryparamshandling="preserve"
+                          role="button"
                         >
-                          <a
-                            class="btn btn-light btn-sm btn-margin-right"
-                            href="/web/instructor/courses/student/details?courseid=test-exa.demo&studentemail=benny.c.tmms@gmail.tmt"
-                            id="btn-view-details"
-                            rel="noopener noreferrer"
-                            target="_blank"
-                          >
-                             View
-                          </a>
-                          <a
-                            class="btn btn-light btn-sm btn-margin-right"
-                            href="/web/instructor/courses/student/edit?courseid=test-exa.demo&studentemail=benny.c.tmms@gmail.tmt"
-                            id="btn-edit-details"
-                            rel="noopener noreferrer"
-                            target="_blank"
-                          >
-                             Edit
-                          </a>
-                          <button
-                            class="btn btn-light btn-sm btn-margin-right"
-                            id="btn-delete"
-                          >
-                            Delete
-                          </button>
-                          <a
-                            class="btn btn-light btn-sm btn-margin-right"
-                            href="/web/instructor/students/records?courseid=test-exa.demo&studentemail=benny.c.tmms@gmail.tmt"
-                            id="btn-view-records"
-                            rel="noopener noreferrer"
-                            target="_blank"
-                          >
-                             All Records
-                          </a>
-                        </td>
-                      </tr>
-                      <tr
-                        s=""
+                           View Photo 
+                        </a>
+                      </tm-view-photo-popover>
+                    </td>
+                    <td>
+                      Tutorial Group 1
+                    </td>
+                    <td>
+                      Team 1
+                    </td>
+                    <td>
+                      Benny Charles
+                    </td>
+                    <td>
+                      Joined
+                    </td>
+                    <td>
+                      benny.c.tmms@gmail.tmt
+                    </td>
+                    <td
+                      class="no-print align-center"
+                    >
+                      <a
+                        class="btn btn-light btn-sm btn-margin-right"
+                        href="/web/instructor/courses/student/details?courseid=test-exa.demo&studentemail=benny.c.tmms@gmail.tmt"
+                        id="btn-view-details"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                         View
+                      </a>
+                      <a
+                        class="btn btn-light btn-sm btn-margin-right"
+                        href="/web/instructor/courses/student/edit?courseid=test-exa.demo&studentemail=benny.c.tmms@gmail.tmt"
+                        id="btn-edit-details"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                         Edit
+                      </a>
+                      <button
+                        class="btn btn-light btn-sm btn-margin-right"
+                        id="btn-delete"
                       >
-                        <td>
-                          <tm-view-photo-popover>
-                            <a
-                              href="/"
-                              queryparamshandling="preserve"
-                              role="button"
-                            >
-                               View Photo 
-                            </a>
-                          </tm-view-photo-popover>
-                        </td>
-                        <td>
-                          Tutorial Group 1
-                        </td>
-                        <td>
-                          Team 1
-                        </td>
-                        <td>
-                          Alice Betsy
-                        </td>
-                        <td>
-                          Joined
-                        </td>
-                        <td>
-                          alice.b.tmms@gmail.tmt
-                        </td>
-                        <td
-                          class="no-print align-center"
+                        Delete
+                      </button>
+                      <a
+                        class="btn btn-light btn-sm btn-margin-right"
+                        href="/web/instructor/students/records?courseid=test-exa.demo&studentemail=benny.c.tmms@gmail.tmt"
+                        id="btn-view-records"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                         All Records
+                      </a>
+                    </td>
+                  </tr>
+                  <tr
+                    s=""
+                  >
+                    <td>
+                      <tm-view-photo-popover>
+                        <a
+                          href="/"
+                          queryparamshandling="preserve"
+                          role="button"
                         >
-                          <a
-                            class="btn btn-light btn-sm btn-margin-right"
-                            href="/web/instructor/courses/student/details?courseid=test-exa.demo&studentemail=alice.b.tmms@gmail.tmt"
-                            id="btn-view-details"
-                            rel="noopener noreferrer"
-                            target="_blank"
-                          >
-                             View
-                          </a>
-                          <a
-                            class="btn btn-light btn-sm btn-margin-right"
-                            href="/web/instructor/courses/student/edit?courseid=test-exa.demo&studentemail=alice.b.tmms@gmail.tmt"
-                            id="btn-edit-details"
-                            rel="noopener noreferrer"
-                            target="_blank"
-                          >
-                             Edit
-                          </a>
-                          <button
-                            class="btn btn-light btn-sm btn-margin-right"
-                            id="btn-delete"
-                          >
-                            Delete
-                          </button>
-                          <a
-                            class="btn btn-light btn-sm btn-margin-right"
-                            href="/web/instructor/students/records?courseid=test-exa.demo&studentemail=alice.b.tmms@gmail.tmt"
-                            id="btn-view-records"
-                            rel="noopener noreferrer"
-                            target="_blank"
-                          >
-                             All Records
-                          </a>
-                        </td>
-                      </tr>
-                      <tr
-                        s=""
+                           View Photo 
+                        </a>
+                      </tm-view-photo-popover>
+                    </td>
+                    <td>
+                      Tutorial Group 1
+                    </td>
+                    <td>
+                      Team 1
+                    </td>
+                    <td>
+                      Alice Betsy
+                    </td>
+                    <td>
+                      Joined
+                    </td>
+                    <td>
+                      alice.b.tmms@gmail.tmt
+                    </td>
+                    <td
+                      class="no-print align-center"
+                    >
+                      <a
+                        class="btn btn-light btn-sm btn-margin-right"
+                        href="/web/instructor/courses/student/details?courseid=test-exa.demo&studentemail=alice.b.tmms@gmail.tmt"
+                        id="btn-view-details"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                         View
+                      </a>
+                      <a
+                        class="btn btn-light btn-sm btn-margin-right"
+                        href="/web/instructor/courses/student/edit?courseid=test-exa.demo&studentemail=alice.b.tmms@gmail.tmt"
+                        id="btn-edit-details"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                         Edit
+                      </a>
+                      <button
+                        class="btn btn-light btn-sm btn-margin-right"
+                        id="btn-delete"
                       >
-                        <td>
-                          <tm-view-photo-popover>
-                            <a
-                              href="/"
-                              queryparamshandling="preserve"
-                              role="button"
-                            >
-                               View Photo 
-                            </a>
-                          </tm-view-photo-popover>
-                        </td>
-                        <td>
-                          Tutorial Group 1
-                        </td>
-                        <td>
-                          Team 1
-                        </td>
-                        <td>
-                          Danny Engrid
-                        </td>
-                        <td>
-                          Joined
-                        </td>
-                        <td>
-                          danny.e.tmms@gmail.tmt
-                        </td>
-                        <td
-                          class="no-print align-center"
+                        Delete
+                      </button>
+                      <a
+                        class="btn btn-light btn-sm btn-margin-right"
+                        href="/web/instructor/students/records?courseid=test-exa.demo&studentemail=alice.b.tmms@gmail.tmt"
+                        id="btn-view-records"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                         All Records
+                      </a>
+                    </td>
+                  </tr>
+                  <tr
+                    s=""
+                  >
+                    <td>
+                      <tm-view-photo-popover>
+                        <a
+                          href="/"
+                          queryparamshandling="preserve"
+                          role="button"
                         >
-                          <a
-                            class="btn btn-light btn-sm btn-margin-right"
-                            href="/web/instructor/courses/student/details?courseid=test-exa.demo&studentemail=danny.e.tmms@gmail.tmt"
-                            id="btn-view-details"
-                            rel="noopener noreferrer"
-                            target="_blank"
-                          >
-                             View
-                          </a>
-                          <a
-                            class="btn btn-light btn-sm btn-margin-right"
-                            href="/web/instructor/courses/student/edit?courseid=test-exa.demo&studentemail=danny.e.tmms@gmail.tmt"
-                            id="btn-edit-details"
-                            rel="noopener noreferrer"
-                            target="_blank"
-                          >
-                             Edit
-                          </a>
-                          <button
-                            class="btn btn-light btn-sm btn-margin-right"
-                            id="btn-delete"
-                          >
-                            Delete
-                          </button>
-                          <a
-                            class="btn btn-light btn-sm btn-margin-right"
-                            href="/web/instructor/students/records?courseid=test-exa.demo&studentemail=danny.e.tmms@gmail.tmt"
-                            id="btn-view-records"
-                            rel="noopener noreferrer"
-                            target="_blank"
-                          >
-                             All Records
-                          </a>
-                        </td>
-                      </tr>
-                    </tbody>
-                  </table>
-                </div>
-              </tm-student-list>
+                           View Photo 
+                        </a>
+                      </tm-view-photo-popover>
+                    </td>
+                    <td>
+                      Tutorial Group 1
+                    </td>
+                    <td>
+                      Team 1
+                    </td>
+                    <td>
+                      Danny Engrid
+                    </td>
+                    <td>
+                      Joined
+                    </td>
+                    <td>
+                      danny.e.tmms@gmail.tmt
+                    </td>
+                    <td
+                      class="no-print align-center"
+                    >
+                      <a
+                        class="btn btn-light btn-sm btn-margin-right"
+                        href="/web/instructor/courses/student/details?courseid=test-exa.demo&studentemail=danny.e.tmms@gmail.tmt"
+                        id="btn-view-details"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                         View
+                      </a>
+                      <a
+                        class="btn btn-light btn-sm btn-margin-right"
+                        href="/web/instructor/courses/student/edit?courseid=test-exa.demo&studentemail=danny.e.tmms@gmail.tmt"
+                        id="btn-edit-details"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                         Edit
+                      </a>
+                      <button
+                        class="btn btn-light btn-sm btn-margin-right"
+                        id="btn-delete"
+                      >
+                        Delete
+                      </button>
+                      <a
+                        class="btn btn-light btn-sm btn-margin-right"
+                        href="/web/instructor/students/records?courseid=test-exa.demo&studentemail=danny.e.tmms@gmail.tmt"
+                        id="btn-view-records"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                         All Records
+                      </a>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
             </div>
-          </div>
+          </tm-student-list>
         </div>
       </div>
     </tm-student-result-table>
@@ -547,7 +534,7 @@ exports[`InstructorSearchPageComponent should snap with default fields 1`] = `
         <div
           class="text-muted"
         >
-           You can search for students from all your courses here. 
+           You can search for students (by name or email) from all your courses here. 
         </div>
         <div
           class="text-muted"
@@ -563,7 +550,7 @@ exports[`InstructorSearchPageComponent should snap with default fields 1`] = `
               <b>
                 "[any word]"
               </b>
-               to search for an exact phrase in an exact order.
+               to search for an exact phrase in an exact order. e.g., "John Doe".
             </li>
           </ul>
         </div>

From 2d5d0a2a4c1ccbbdcfb16fd225ea96f904aef323 Mon Sep 17 00:00:00 2001
From: Sweta <sweta-comp491@Swetas-MacBook-Pro.local>
Date: Wed, 30 Mar 2022 17:45:36 -0400
Subject: [PATCH 5/6] fixed some lint errors

---
 .../student-result-table/student-result-table.component.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.html b/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.html
index 385ceeb825c..154e69bddcd 100644
--- a/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.html
+++ b/src/web/app/pages-instructor/instructor-search-page/student-result-table/student-result-table.component.html
@@ -12,4 +12,4 @@
       (removeStudentFromCourseEvent)="removeStudent(course.students, $event)">
     </tm-student-list>
   </div>
-</div>
\ No newline at end of file
+</div>

From 54ef56fcbe316bda680d7094118f0025aed51055 Mon Sep 17 00:00:00 2001
From: Sweta <sweta-comp491@Swetas-MacBook-Pro.local>
Date: Thu, 7 Apr 2022 15:57:56 -0400
Subject: [PATCH 6/6] rephrased instructions to include more fields for search

---
 .../instructor-search-page.component.spec.ts.snap    | 12 ++++++------
 .../instructor-search-bar.component.html             |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

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 688c4688468..b0c76fcaf79 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
@@ -20,7 +20,7 @@ exports[`InstructorSearchPageComponent should snap with a search key 1`] = `
         <div
           class="text-muted"
         >
-           You can search for students (by name or email) from all your courses here. 
+           You can search for students (by section name, team name, student name, or email) from all your courses here. 
         </div>
         <div
           class="text-muted"
@@ -36,7 +36,7 @@ exports[`InstructorSearchPageComponent should snap with a search key 1`] = `
               <b>
                 "[any word]"
               </b>
-               to search for an exact phrase in an exact order. e.g., "John Doe".
+               to search for an exact phrase in an exact order. e.g. "John Doe".
             </li>
           </ul>
         </div>
@@ -91,7 +91,7 @@ exports[`InstructorSearchPageComponent should snap with a student table 1`] = `
         <div
           class="text-muted"
         >
-           You can search for students (by name or email) from all your courses here. 
+           You can search for students (by section name, team name, student name, or email) from all your courses here. 
         </div>
         <div
           class="text-muted"
@@ -107,7 +107,7 @@ exports[`InstructorSearchPageComponent should snap with a student table 1`] = `
               <b>
                 "[any word]"
               </b>
-               to search for an exact phrase in an exact order. e.g., "John Doe".
+               to search for an exact phrase in an exact order. e.g. "John Doe".
             </li>
           </ul>
         </div>
@@ -534,7 +534,7 @@ exports[`InstructorSearchPageComponent should snap with default fields 1`] = `
         <div
           class="text-muted"
         >
-           You can search for students (by name or email) from all your courses here. 
+           You can search for students (by section name, team name, student name, or email) from all your courses here. 
         </div>
         <div
           class="text-muted"
@@ -550,7 +550,7 @@ exports[`InstructorSearchPageComponent should snap with default fields 1`] = `
               <b>
                 "[any word]"
               </b>
-               to search for an exact phrase in an exact order. e.g., "John Doe".
+               to search for an exact phrase in an exact order. e.g. "John Doe".
             </li>
           </ul>
         </div>
diff --git a/src/web/app/pages-instructor/instructor-search-page/instructor-search-bar/instructor-search-bar.component.html b/src/web/app/pages-instructor/instructor-search-page/instructor-search-bar/instructor-search-bar.component.html
index b65de33d9c2..c3ee67a745a 100644
--- a/src/web/app/pages-instructor/instructor-search-page/instructor-search-bar/instructor-search-bar.component.html
+++ b/src/web/app/pages-instructor/instructor-search-page/instructor-search-bar/instructor-search-bar.component.html
@@ -1,13 +1,13 @@
 <div class="card bg-light mb-4">
   <div class="card-body">
     <div class="text-muted">
-      You can search for students (by name or email) from all your courses here.
+      You can search for students (by section name, team name, student name, or email) from all your courses here.
     </div>
     <div class="text-muted">
       Search Tips:<br>
       <ul>
         <li>Put more keywords to search for more precise results.</li>
-        <li>Put quotation marks around words <b>"[any word]"</b> to search for an exact phrase in an exact order. e.g., "John Doe".</li>
+        <li>Put quotation marks around words <b>"[any word]"</b> to search for an exact phrase in an exact order. e.g. "John Doe".</li>
       </ul>
     </div>
     <div class="form-group">