From b43da6f812272d764487ac60d400d79702b8e1f4 Mon Sep 17 00:00:00 2001 From: dee-yeet Date: Tue, 18 Jun 2019 08:31:09 -0400 Subject: [PATCH 1/6] Expanding the descriptions also expands the course listings. Expanding the course listings also expands the descriptions. Added a space between CRNs and professor names. --- web/src/app/listing/component.html | 2 +- web/src/app/listing/component.ts | 1 + web/src/app/listing/section/component.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/src/app/listing/component.html b/web/src/app/listing/component.html index 8b35156a..64202d4d 100644 --- a/web/src/app/listing/component.html +++ b/web/src/app/listing/component.html @@ -42,7 +42,7 @@ -
+
diff --git a/web/src/app/listing/component.ts b/web/src/app/listing/component.ts index f0499604..a57eb66a 100644 --- a/web/src/app/listing/component.ts +++ b/web/src/app/listing/component.ts @@ -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 { diff --git a/web/src/app/listing/section/component.html b/web/src/app/listing/section/component.html index f6d729ca..c52b2d39 100644 --- a/web/src/app/listing/section/component.html +++ b/web/src/app/listing/section/component.html @@ -5,7 +5,7 @@
{{section.crn}} - {{ section.instructors.join(', ') }} + {{ section.instructors.join(', ') }}
{{ section.seats - section.seatsTaken }} /{{ section.seats }} seats From e11dc06da457f46e606da46e7973d2b1c009546f Mon Sep 17 00:00:00 2001 From: dee-yeet Date: Wed, 19 Jun 2019 00:10:23 -0400 Subject: [PATCH 2/6] Darkened the font of class times, CRNS, instructors and seat info from classes that are available. Rows that are conflicting still have lighter text. --- web/src/app/listing/section/component.html | 4 ++-- web/src/app/listing/section/component.scss | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/web/src/app/listing/section/component.html b/web/src/app/listing/section/component.html index c52b2d39..01dd1476 100644 --- a/web/src/app/listing/section/component.html +++ b/web/src/app/listing/section/component.html @@ -4,7 +4,7 @@
- {{section.crn}} + {{section.crn}} {{ section.instructors.join(', ') }}
{{ section.seats - section.seatsTaken }} @@ -16,7 +16,7 @@ - diff --git a/web/src/app/listing/component.ts b/web/src/app/listing/component.ts index ec0f383d..835fdaa0 100644 --- a/web/src/app/listing/component.ts +++ b/web/src/app/listing/component.ts @@ -28,6 +28,9 @@ export class ListingComponent implements OnInit{ public showingDescription; public hovered; + public mouseMove: boolean = false; + public mouseDown: boolean = false; + ngOnInit () { this.showingMenu = false; this.showingDescription = false; @@ -69,14 +72,27 @@ export class ListingComponent implements OnInit{ return this.conflictsService.doesConflict(section); } - public descriptionClick (event): void { - event.stopPropagation(); - if ( getSelection() == "" ) { - this.clickCourse(); + public mouseDownFunc (): void { + this.mouseDown = true; + } + + public mouseMoveFunc (): void { + if (this.mouseDown) { + this.mouseMove = true; } + } + + public descriptionClick (event): void { + event.stopPropagation(); + if (this.mouseMove) { + this.selectionService.toggleCourse(this.listing); + } + + this.mouseMove = false; + this.mouseDown = false; + // this.selectionService.toggleCourse(this.listing); // this.showingDescription= !(this.showingDescription); - } public get tooltipDescription (): string { From ffaa45cb7d02b549922daf62f2f2924eb3f41d32 Mon Sep 17 00:00:00 2001 From: dee-yeet Date: Mon, 1 Jul 2019 10:14:39 -0400 Subject: [PATCH 6/6] Removed commented code. --- web/src/app/listing/component.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/src/app/listing/component.ts b/web/src/app/listing/component.ts index 835fdaa0..9dd14be4 100644 --- a/web/src/app/listing/component.ts +++ b/web/src/app/listing/component.ts @@ -90,9 +90,6 @@ export class ListingComponent implements OnInit{ this.mouseMove = false; this.mouseDown = false; - - // this.selectionService.toggleCourse(this.listing); - // this.showingDescription= !(this.showingDescription); } public get tooltipDescription (): string {
+
{{ getHours(period) }} diff --git a/web/src/app/listing/section/component.scss b/web/src/app/listing/section/component.scss index b8199724..f2ca0ded 100644 --- a/web/src/app/listing/section/component.scss +++ b/web/src/app/listing/section/component.scss @@ -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; From f65ab8d1ac0bb31f8196fcbe2b85709a9ccfa53c Mon Sep 17 00:00:00 2001 From: dee-yeet Date: Tue, 25 Jun 2019 08:51:31 -0400 Subject: [PATCH 3/6] Clicking on the expansion button triggers function to expand both description and course listings. Clicking on the description should select the course while highlighting the course should not do anything. --- web/src/app/listing/component.html | 2 +- web/src/app/listing/component.ts | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/web/src/app/listing/component.html b/web/src/app/listing/component.html index 64202d4d..89d19ac6 100644 --- a/web/src/app/listing/component.html +++ b/web/src/app/listing/component.html @@ -42,7 +42,7 @@ -
+
diff --git a/web/src/app/listing/component.ts b/web/src/app/listing/component.ts index a57eb66a..a0664565 100644 --- a/web/src/app/listing/component.ts +++ b/web/src/app/listing/component.ts @@ -71,9 +71,12 @@ export class ListingComponent implements OnInit{ public descriptionClick (event): void { event.stopPropagation(); + if ( getSelection() == "" ) { + this.selectionService.toggleCourse(this.listing); + } // this.selectionService.toggleCourse(this.listing); - this.showingDescription= !(this.showingDescription); - this.showingMenu = !this.showingMenu; + // this.showingDescription= !(this.showingDescription); + } public get tooltipDescription (): string { @@ -106,4 +109,10 @@ export class ListingComponent implements OnInit{ this.sidebarService.removeListing(this.listing); this.selectionService.removeListing(this.listing); } + + public expandDescripAndListings (): void { + this.showingDescription = !this.showingDescription; + this.showingMenu = !this.showingMenu; + } + } From 40fb34fc4d47daf495673967a016948ee655aced Mon Sep 17 00:00:00 2001 From: dee-yeet Date: Tue, 25 Jun 2019 09:12:11 -0400 Subject: [PATCH 4/6] Fixed a bug with the function dealing with clicking on the description that caused errors while YACS refreshed. --- web/src/app/listing/component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/app/listing/component.ts b/web/src/app/listing/component.ts index a0664565..ec0f383d 100644 --- a/web/src/app/listing/component.ts +++ b/web/src/app/listing/component.ts @@ -72,7 +72,7 @@ export class ListingComponent implements OnInit{ public descriptionClick (event): void { event.stopPropagation(); if ( getSelection() == "" ) { - this.selectionService.toggleCourse(this.listing); + this.clickCourse(); } // this.selectionService.toggleCourse(this.listing); // this.showingDescription= !(this.showingDescription); From e86d3de60718866cba645f6d8b765e9a8f2ba840 Mon Sep 17 00:00:00 2001 From: dee-yeet Date: Fri, 28 Jun 2019 13:41:36 -0400 Subject: [PATCH 5/6] Clicking on description will select the course. Highlighting text will not select the course. Refreshing works. --- web/src/app/listing/component.html | 2 +- web/src/app/listing/component.ts | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/web/src/app/listing/component.html b/web/src/app/listing/component.html index 89d19ac6..5adbd61f 100644 --- a/web/src/app/listing/component.html +++ b/web/src/app/listing/component.html @@ -14,7 +14,7 @@
{{listing.course.subject.shortname}} {{listing.course.shortname}}
 -
{{listing.description}}