Skip to content
This repository has been archived by the owner on May 25, 2021. It is now read-only.

Fixed Issue #452 and #421 #458

Merged
merged 7 commits into from
Jul 11, 2019
Merged

Fixed Issue #452 and #421 #458

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b43da6f
Expanding the descriptions also expands the course listings. Expandin…
Jun 18, 2019
e11dc06
Darkened the font of class times, CRNS, instructors and seat info fro…
Jun 19, 2019
f65ab8d
Clicking on the expansion button triggers function to expand both des…
Jun 25, 2019
40fb34f
Fixed a bug with the function dealing with clicking on the descriptio…
Jun 25, 2019
e86d3de
Clicking on description will select the course. Highlighting text wil…
Jun 28, 2019
d8557c8
Merge branch 'master' of https://github.com/YACS-RCOS/yacs
Jun 28, 2019
ffaa45c
Removed commented code.
Jul 1, 2019
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
2 changes: 1 addition & 1 deletion web/src/app/listing/component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<span *ngIf="showRemoveButton" (click)="removeButtonClick()" class="remove-button position-absolute" [placement]="['right','bottom','left','top','auto']" ngbPopover="Click on this button to remove class from sidebar" container="body" triggers="mouseenter:mouseleave">
<img src="assets/images/remove.svg" />
</span>
<div class="menu position-absolute" (click)="showingMenu=!showingMenu">
<div class="menu position-absolute" (click)="showingMenu=!showingMenu" (click)="showingDescription=!showingDescription">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should create an expand / toggle function to handle this rather than have two click handlers

<div class = "arrow-container down-arrow" *ngIf="!showingMenu">
<i class="arrow down"></i>
</div>
Expand Down
1 change: 1 addition & 0 deletions web/src/app/listing/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export class ListingComponent implements OnInit{
event.stopPropagation();
// this.selectionService.toggleCourse(this.listing);
this.showingDescription= !(this.showingDescription);
this.showingMenu = !this.showingMenu;
}

public get tooltipDescription (): string {
Expand Down
6 changes: 3 additions & 3 deletions web/src/app/listing/section/component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<div class="col-2 align-center section-details">
<div>
<span *ngIf="doesConflict()" placement="top" triggers="mouseenter:mouseleave" title="Section Conflicts"><img class="conflict-img" src="assets/images/red_exclamation.svg" /></span>
<span class="section-crn">{{section.crn}}</span>
<span class="section-instructors">{{ section.instructors.join(', ') }}</span>
<span class="section-crn"> {{section.crn}}</span>
<span class="section-instructors"> {{ section.instructors.join(', ') }}</span>
<div class="section-seats">
{{ section.seats - section.seatsTaken }}
<span>/{{ section.seats }} seats</span>
Expand All @@ -16,7 +16,7 @@
<table class = "section-periods">
<tr *ngFor="let week of periods">
<span *ngFor="let period of week; let i = index">
<td class = "period-time">
<td [ngClass]="{'period-time-conflict':doesConflict()===true, 'period-time-no-conflict':doesConflict()===false}">
<div class = "col-12">
<div class="row">
<span *ngIf="period">{{ getHours(period) }}</span>
Expand Down
15 changes: 13 additions & 2 deletions web/src/app/listing/section/component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,25 @@
white-space: nowrap;
}

.period-time {
.period-time-conflict {
font-size: 90%;
width: 6em;
color: rgb(112, 105, 105);
font-weight: 100;
}
.period-day {

.period-time-no-conflict {
font-size: 90%;
width: 6em;
color: #000;
font-weight: 400;
}

.period-day {
font-weight: 100;
}


div.conflict-note {
margin-left:0.4em;
display:inline;
Expand Down