diff --git a/backend/services/coworking/policy.py b/backend/services/coworking/policy.py index 49e28cade..455e79a81 100644 --- a/backend/services/coworking/policy.py +++ b/backend/services/coworking/policy.py @@ -72,53 +72,41 @@ def non_reservable_rooms(self) -> list[str]: def office_hours(self, date: datetime): day = date.weekday() if day == MONDAY: - return { # Temporary fix for blocking off furniture install days - "SN135": [(time(hour=10), time(hour=19))], - "SN137": [(time(hour=10), time(hour=19))], - "SN139": [(time(hour=10), time(hour=19))], - "SN141": [(time(hour=10), time(hour=19))], - "SN144": [(time(hour=10), time(hour=19))], - "SN146": [(time(hour=10), time(hour=19))], - "SN147": [(time(hour=10), time(hour=19))], - # Future - # 'SN135' : [], - # 'SN137' : [], - # 'SN139' : [], - # 'SN141' : [(time(hour=10, minute=30), time(hour=18))], # KMP 426 - # 'SN144' : [], - # 'SN146' : [], - # 'SN147' : [(time(hour=15), time(hour=18))], # Sridhar + return { + "SN135": [], + "SN137": [], + "SN139": [], + "SN141": [time(hour=9), time(hour=16)], # Stotts 301 + "SN144": [], + "SN146": [], + "SN147": [(time(hour=15), time(hour=18))], # Sridhar } elif day == TUESDAY: - return { # Temporary fix for blocking off furniture install days - "SN135": [(time(hour=10), time(hour=19))], - "SN137": [(time(hour=10), time(hour=19))], - "SN139": [(time(hour=10), time(hour=19))], - "SN141": [(time(hour=10), time(hour=19))], - "SN144": [(time(hour=10), time(hour=19))], - "SN146": [(time(hour=10), time(hour=19))], - "SN147": [(time(hour=10), time(hour=19))], + return { + "SN135": [], + "SN137": [], + "SN139": [], + "SN141": [time(hour=9), time(hour=16)], # Stotts 301 + "SN144": [], + "SN146": [], + "SN147": [(time(hour=15), time(hour=18))], # Sridhar } elif day == WEDNESDAY: - return { # Temporary fix for blocking off furniture install days - "SN135": [(time(hour=10, minute=0), time(hour=19, minute=0))], - "SN137": [ - (time(hour=10), time(hour=19)) - ], # [(time(hour=15), time(hour=16))] # Leong - "SN139": [(time(hour=10), time(hour=19))], - "SN141": [(time(hour=10), time(hour=19))], - "SN144": [(time(hour=10), time(hour=19))], - "SN146": [(time(hour=10), time(hour=19))], - "SN147": [ - (time(hour=10), time(hour=19)) - ], # [(time(hour=15), time(hour=18))], # Sridhar + return { + "SN135": [], + "SN137": [time(hour=3), time(hour=4)], # Johnathan Leong + "SN139": [], + "SN141": [time(hour=9), time(hour=16)], # Stotts 301 + "SN144": [], + "SN146": [], + "SN147": [(time(hour=15), time(hour=18))], # Sridhar } elif day == THURSDAY: return { "SN135": [], "SN137": [], "SN139": [], - "SN141": [], + "SN141": [time(hour=9), time(hour=16)], # Stotts 301 "SN144": [], "SN146": [], "SN147": [(time(hour=16), time(hour=18))], # Sridhar @@ -128,7 +116,7 @@ def office_hours(self, date: datetime): "SN135": [], "SN137": [], "SN139": [], - "SN141": [], + "SN141": [time(hour=9), time(hour=16)], # Stotts 301 "SN144": [], "SN146": [], "SN147": [], diff --git a/frontend/src/app/coworking/widgets/dropin-availability-card/dropin-availability-card.widget.ts b/frontend/src/app/coworking/widgets/dropin-availability-card/dropin-availability-card.widget.ts index e856b125d..a1ee2378c 100644 --- a/frontend/src/app/coworking/widgets/dropin-availability-card/dropin-availability-card.widget.ts +++ b/frontend/src/app/coworking/widgets/dropin-availability-card/dropin-availability-card.widget.ts @@ -6,7 +6,7 @@ import { Output, SimpleChanges } from '@angular/core'; -import { Seat, SeatAvailability } from 'src/app/coworking/coworking.models'; +import { SeatAvailability } from 'src/app/coworking/coworking.models'; class SeatCategory { public title: string; @@ -100,9 +100,7 @@ export class CoworkingDropInCard implements OnChanges { this.categories[SITTING_BENCH].push(seat); } } else { - // Temporary hack for furniture installation - // Closing off communal area for office hours - // this.categories[COLLAB_AREA].push(seat); + this.categories[COLLAB_AREA].push(seat); } } } @@ -118,9 +116,7 @@ export class CoworkingDropInCard implements OnChanges { return [ new SeatCategory('Sitting Desk with Monitor'), new SeatCategory('Standing Desk with Monitor'), - new SeatCategory( - 'Communal Area (Closed while Hallway Renovations Complete)' // TODO: Revert after furniture install - ) + new SeatCategory('Communal Area') ]; } }