Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#12658] Instructor Home Page: Dropdown buttons on mobile #12662

Merged
merged 13 commits into from
Dec 24, 2023
Merged

[#12658] Instructor Home Page: Dropdown buttons on mobile #12662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
65466c4
fixed changes & made responsive drop down for the indtructor home page
Tejasker Dec 16, 2023
1758ead
resolved the issues that are causing test cases that are failing
Tejasker Dec 17, 2023
3539624
resolved the Component testing issues that is causing test cases fail.
Tejasker Dec 17, 2023
1a2b8e4
resolved the E2E testing issues.
Tejasker Dec 17, 2023
f1e1b36
resolved the E2E testing issues.
Tejasker Dec 18, 2023
556c609
resolved the E2E testing issues.
Tejasker Dec 18, 2023
a2c47de
resolved the E2E testing issues.
Tejasker Dec 18, 2023
b0cf617
resolved the E2E testing issues.
Tejasker Dec 18, 2023
1dc6015
resolved the E2E testing issues.
Tejasker Dec 19, 2023
27850da
Merge branch 'master' of https://github.com/TEAMMATES/teammates
Tejasker Dec 20, 2023
0d5bd0c
modified & made small adjustments in the code as required
Tejasker Dec 20, 2023
cae675f
Merge branch 'master' into master
jasonqiu212 Dec 22, 2023
8ff41d7
Merge branch 'master' into master
domlimm Dec 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,14 @@ public void deleteSession(int courseTabIndex, int sessionIndex) {
public void archiveCourse(int courseTabIndex) {
WebElement courseTab = getCourseTab(courseTabIndex);
click(courseTab.findElement(By.className("btn-course")));
clickAndConfirm(courseTab.findElement(By.className("btn-archive-course")));
clickAndConfirm(browser.driver.findElement(By.cssSelector("body > div > div > .btn-archive-course")));
waitUntilAnimationFinish();
}

public void deleteCourse(int courseTabIndex) {
WebElement courseTab = getCourseTab(courseTabIndex);
click(courseTab.findElement(By.className("btn-course")));
clickAndConfirm(courseTab.findElement(By.className("btn-delete-course")));
clickAndConfirm(browser.driver.findElement(By.cssSelector("body > div > div > .btn-delete-course")));
waitUntilAnimationFinish();
}

Expand Down
20 changes: 20 additions & 0 deletions ...instructor/instructor-home-page/__snapshots__/instructor-home-page.component.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ exports[`InstructorHomePageComponent should snap with one course with one feedba
>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand Down Expand Up @@ -451,6 +452,7 @@ exports[`InstructorHomePageComponent should snap with one course with one feedba
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand All @@ -476,6 +478,7 @@ exports[`InstructorHomePageComponent should snap with one course with one feedba
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand All @@ -501,6 +504,7 @@ exports[`InstructorHomePageComponent should snap with one course with one feedba
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand Down Expand Up @@ -1017,6 +1021,7 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba
>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand All @@ -1042,6 +1047,7 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand All @@ -1067,6 +1073,7 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand All @@ -1092,6 +1099,7 @@ exports[`InstructorHomePageComponent should snap with one course with two feedba
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand Down Expand Up @@ -1772,6 +1780,7 @@ exports[`InstructorHomePageComponent should snap with one course with unexpanded
>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand Down Expand Up @@ -1804,6 +1813,7 @@ exports[`InstructorHomePageComponent should snap with one course with unexpanded
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand All @@ -1829,6 +1839,7 @@ exports[`InstructorHomePageComponent should snap with one course with unexpanded
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand All @@ -1854,6 +1865,7 @@ exports[`InstructorHomePageComponent should snap with one course with unexpanded
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand Down Expand Up @@ -2041,6 +2053,7 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate
>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand Down Expand Up @@ -2073,6 +2086,7 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand All @@ -2098,6 +2112,7 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand All @@ -2123,6 +2138,7 @@ exports[`InstructorHomePageComponent should snap with one course with unpopulate
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand Down Expand Up @@ -2334,6 +2350,7 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac
>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand Down Expand Up @@ -2366,6 +2383,7 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand All @@ -2391,6 +2409,7 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand All @@ -2416,6 +2435,7 @@ exports[`InstructorHomePageComponent should snap with one course without feedbac
</span>
<span
class="dropdown"
container="body"
ngbdropdown=""
>
<button
Expand Down
8 changes: 4 additions & 4 deletions src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ <h1>Home</h1>
<b class="course-details text-break">[{{ courseTabModel.course.courseId }}]: {{
courseTabModel.course.courseName }}</b>
<div class="card-header-btn-toolbar flex-lg-shrink-0" *ngIf="courseTabModel.isAjaxSuccess">
<span ngbDropdown>
<span ngbDropdown container="body">
<button type="button" class="btn btn-primary btn-sm" ngbDropdownToggle> Students </button>
<div ngbDropdownMenu (click)="$event.stopPropagation()">
<ng-container *ngIf="courseTabModel.instructorPrivilege.canModifyStudent">
Expand All @@ -57,23 +57,23 @@ <h1>Home</h1>
</a>
</div>
</span>
<span ngbDropdown>
<span ngbDropdown container="body">
<button type="button" class="btn btn-primary btn-sm" ngbDropdownToggle> Instructors </button>
<div ngbDropdownMenu (click)="$event.stopPropagation()">
<a class="btn btn-light btn-sm dropdown-item" tmRouterLink="/web/instructor/courses/edit"
[queryParams]="{courseid: courseTabModel.course.courseId}"> View / Edit
</a>
</div>
</span>
<span ngbDropdown>
<span ngbDropdown container="body">
<button type="button" class="btn btn-primary btn-sm" ngbDropdownToggle> Sessions </button>
<div ngbDropdownMenu (click)="$event.stopPropagation()">
<a class="btn btn-light btn-sm dropdown-item" tmRouterLink="/web/instructor/sessions"
[queryParams]="{courseid: courseTabModel.course.courseId}"> Add
</a>
</div>
</span>
<span ngbDropdown>
<span ngbDropdown container="body">
<button type="button" class="btn-course btn btn-primary btn-sm" ngbDropdownToggle> Course </button>
<div ngbDropdownMenu (click)="$event.stopPropagation()">
<a class="btn-archive-course btn btn-light btn-sm dropdown-item"
Expand Down
6 changes: 3 additions & 3 deletions src/web/app/pages-instructor/instructor-home-page/instructor-home-page.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ describe('InstructorHomePageComponent', () => {

const courseButton: any = fixture.debugElement.nativeElement.querySelector('.btn-course');
courseButton.click();
const archiveButton: any = fixture.debugElement.nativeElement.querySelector('.btn-archive-course');
const archiveButton: any = document.querySelector('body > div > div > .btn-archive-course');
archiveButton.click();

expect(component.courseTabModels.length).toEqual(1);
Expand Down Expand Up @@ -233,8 +233,8 @@ describe('InstructorHomePageComponent', () => {

const courseButton: any = fixture.debugElement.nativeElement.querySelector('.btn-course');
courseButton.click();
const archiveButton: any = fixture.debugElement.nativeElement.querySelector('.btn-delete-course');
archiveButton.click();
const deleteButton: any = document.querySelector('body > div > div > .btn-delete-course');
deleteButton.click();

expect(component.courseTabModels.length).toEqual(1);
expect(component.courseTabModels[0].course.courseId).toEqual('CS3281');
Expand Down
Loading