changed internals of how things are calculated

how long a place is open for and if a place is open are now calculated in a different way.
in the future i may change the openFor method to also tell you how long a place is closed for but for now it will just say closed

src/app/data-provider.service.ts

@@ -13,7 +13,7 @@ import 'rxjs/add/operator/catch';
 import 'rxjs/add/observable/of';
 import 'rxjs/add/operator/share';
 import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/DefaultIfEmpty';
+import 'rxjs/add/operator/defaultIfEmpty';
 
 @Injectable()
 export class DataProviderService {

src/app/place-window/area/area.component.html

 <!--<div class="area-card-header">-->
-    <!--<div class="hexagon center">
+<!--<div class="hexagon center">
         <div class="hexTop"></div>
         <div class="hexBottom"></div>
     </div>-->
-    <!--<div class="area-title">FAVORITES</div>-->
-    <!--<hr>-->
+<!--<div class="area-title">FAVORITES</div>-->
+<!--<hr>-->
 <!--</div>-->
 <div class="place-card-holder">
-    <div *ngFor="let place of places; let i = index;">
-        <app-place-card [place]="place"></app-place-card>
+
+    <div *ngIf="!show; else showCards">
     </div>
+
+    <ng-template #showCards>
+        <div *ngFor="let place of places; let i = index;">
+            <app-place-card [place]="place"></app-place-card>
+        </div>
+    </ng-template>
 </div>

src/app/place-window/area/area.component.ts

-import { Component, OnInit} from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { DataProviderService } from '../../data-provider.service';
 import { Place } from '../../place';
 @Component({
@@ -8,14 +8,17 @@ import { Place } from '../../place';
 })
 export class AreaComponent implements OnInit {
 	private places: Place[] = [];
-	private placee:Place = new Place();
+	private placee: Place = new Place();
+	private show = false;
 	constructor(private dataProvider: DataProviderService) { }
 
 	ngOnInit() {
 		this.dataProvider.getFacilities().subscribe(
-			(places) => { this.places = places;
-			this.placee = places[2];
-		console.log(places[2]);},
+			(places) => {
+				this.places = places;
+				this.placee = places[12];
+				this.show = true;
+			},
 			(error) => { console.log(error); }
 		)
 	}

src/app/place-window/area/place-card/place-card.component.html

@@ -16,19 +16,19 @@
     <div class="title-container">
         <div class="place-title">{{place.name | removeBrackets}}</div>
     </div>
-    <div *ngIf="isOpen; else elseBlock">
+    <div *ngIf="isOpen; else showClosed">
         <div class="place-open-badge">
             <div class="place-status">OPEN</div>
             <div class="place-divider"></div>
-            <div class="place-time-remaining">~{{openFor.hour}}Hrs</div>
+            <div class="place-time-remaining">~{{showTime(openFor)}}</div>
         </div>
     </div>
-    <ng-template #elseBlock>
+    <ng-template #showClosed>
          <div class="closed-shader"></div>
-        <div class="place-open-badge" style="width:102px;background-color:#C4B9B9;">
-            <div class="place-status">CLOSED</div>
-            <div class="place-divider"></div>
-            <div class="place-time-remaining">~{{openFor.hour}}Hrs</div>
+        <div class="place-open-badge" style="width:75px;background-color:#C4B9B9;">
+            <div class="place-status-closed">CLOSED</div>
+            <!--<div class="place-divider"></div>-->
+            <!--<div class="place-time-remaining">~{{showTime(openFor)}}</div>-->
         </div>
     </ng-template>
 

src/app/place-window/area/place-card/place-card.component.scss

@@ -32,7 +32,7 @@
 
 .place-open-badge {
 	min-height: 20px;
-	width: 88px;
+	width: 92px;
 	height: 20px;
 	margin: 0px auto 0px auto;
 	background-color: #3ac550;
@@ -48,6 +48,12 @@
 	color: #FFFFFF;
 	margin: 0px 0px 0px 3px;
 }
+.place-status-closed {
+	font-family: NunitoSans-SemiBold;
+	font-size: 11px;
+	color: #FFFFFF;
+	margin: auto;
+}
 
 .place-divider {
 	width: 2px;
@@ -62,6 +68,10 @@
 	font-family: NunitoSans-Regular;
 	font-size: 11px;
 	color: #FFFFFF;
+	display: flex;
+	justify-content: center;
+	flex-grow: 2;
+	margin-left: -10px;
 }
 
 .place-location {

src/app/place-window/area/place-card/place-card.component.ts

@@ -5,7 +5,7 @@ import { DataProviderService } from '../../../data-provider.service';
 import { MdDialog } from '@angular/material';
 import { FeedbackDialogComponent } from './feedback-dialog/feedback-dialog.component';
 import { DomSanitizer } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Rx';
+import { Observable } from 'rxjs/rx';
 @Component({
 	selector: 'app-place-card',
 	templateUrl: './place-card.component.html',
@@ -20,10 +20,10 @@ export class PlaceCardComponent implements OnInit {
 	constructor(private dataProvider: DataProviderService, public dialog: MdDialog, private sanitizer: DomSanitizer) { }
 	ngOnInit() {
 		this.url = this.sanitizer.bypassSecurityTrustUrl('https://unsplash.it/200/300?image=' + Math.floor((Math.random() * 999 + 1)));
-		let timer = Observable.timer(0,60000);
+		let timer = Observable.timer(0, 60000);
 		timer.subscribe(t => {
 			this.openFor = this.place.openFor();
-			this.isOpen = this.place.isOpen()
+			this.isOpen = this.place.isOpen();
 		});
 	}
 	openInContext() {
@@ -36,4 +36,16 @@ export class PlaceCardComponent implements OnInit {
 		dialogRef.afterClosed().subscribe(result => {
 		});
 	}
+	showTime(time: Time) {
+		if (time.hour === 1) {
+			return (time.hour + "Hr");
+		} else if (time.hour > 0) {
+			return (time.hour + "Hrs");
+		} else {
+			if (time.minute === 1) {
+				return (time.minute + "Min");
+			}
+			return (time.minute + "Mins");
+		}
+	}
 }
\ No newline at end of file

src/app/place.ts

@@ -34,25 +34,6 @@ export class Place {
 		} else {
 			schedule = this.special_schedules[useSpecialSchedule].openTimes;
 		}
-		// for (let i = 0; i < schedule.length; i++) {
-		// 	const day = schedule[i];
-		// 	// change the order of if statements at some point
-		// 	if (day.start_day !== day.end_day) {
-		// 		if (day.end_day === dayOfWeek) {
-		// 			if (day.end_time.inSeconds() > inSeconds) {
-		// 				return true;
-		// 			}
-		// 		} else if (day.start_day === dayOfWeek) {
-		// 			return true;
-		// 		}
-		// 	} else {
-		// 		if (day.start_day === dayOfWeek) {
-		// 			if (day.end_time.inSeconds() > inSeconds) {
-		// 				return true;
-		// 			}
-		// 		}
-		// 	}
-		// }
 		for (let i = 0; i < schedule.length; i++) {
 			const day = schedule[i];
 			if ((dayOfWeek === day.start_day || dayOfWeek === day.end_day) && day.start_day === day.end_day) {
@@ -60,20 +41,16 @@ export class Place {
 					if (inSeconds <= day.end_time.inSeconds()) {
 						return true;
 					}
-					return false;
 				}
-				return false;
 			} else if (dayOfWeek >= day.start_day && dayOfWeek <= day.end_day) {
 				if (dayOfWeek === day.start_day) {
 					if (inSeconds >= day.start_time.inSeconds()) {
 						return true;
 					}
-					return false;
 				} else if (dayOfWeek === day.end_day) {
-					if (inSeconds >= day.end_time.inSeconds()) {
-						return false;
+					if (inSeconds <= day.end_time.inSeconds()) {
+						return true;
 					}
-					return true;
 				} else {
 					return true;
 				}
@@ -97,59 +74,50 @@ export class Place {
 		} else {
 			schedule = this.special_schedules[useSpecialSchedule].openTimes;
 		}
-		// for (let i = 0; i < schedule.length; i++) {
-		// 	const day = schedule[i];
-		// 	if (day.end_day !== day.start_day) {
-		// 		if (dayOfWeek === day.end_day) {
-		// 			sumSeconds = day.end_time.inSeconds() - inSeconds - 86400;
-		// 		} else if (dayOfWeek === day.start_day) {
-		// 			sumSeconds = day.end_time.inSeconds() + 86400 - inSeconds;
-		// 		}
-		// 	} else {
-		// 		sumSeconds = day.end_time.inSeconds() - inSeconds;
-		// 	}
-
-		// 	return timeTilClose.fromSeconds(sumSeconds);
-		// }
-		
 		for (let i = 0; i < schedule.length; i++) {
 			const day = schedule[i];
 			if ((dayOfWeek === day.start_day || dayOfWeek === day.end_day) && day.start_day === day.end_day) {
 				if (inSeconds >= day.start_time.inSeconds()) {
 					if (inSeconds <= day.end_time.inSeconds()) {
 						sumSeconds = day.end_time.inSeconds() - inSeconds;
+						return timeTilClose.fromSeconds(sumSeconds);
 					} else {
 						//not done
 						sumSeconds = 86400 - inSeconds;
+						return timeTilClose.fromSeconds(sumSeconds);
 					}
 				} else {
 					sumSeconds = day.start_time.inSeconds() - inSeconds;
+					return timeTilClose.fromSeconds(sumSeconds);
 				}
 				// console.log(sumSeconds);
-				return timeTilClose.fromSeconds(sumSeconds);
 			} else if (dayOfWeek >= day.start_day && dayOfWeek <= day.end_day) {
 				if (dayOfWeek === day.start_day) {
 					if (inSeconds >= day.start_time.inSeconds()) {
 						sumSeconds = 86400 - inSeconds + (86400 * (day.end_day - day.start_day - 1)) + day.end_time.inSeconds();
+						return timeTilClose.fromSeconds(sumSeconds);
 					} else {
 						sumSeconds = day.start_time.inSeconds() - inSeconds;
+						return timeTilClose.fromSeconds(sumSeconds);
 					}
 				} else if (dayOfWeek === day.end_day) {
 					if (inSeconds >= day.end_time.inSeconds()) {
 						//not done
 						sumSeconds = 86400 - inSeconds;
+						return timeTilClose.fromSeconds(sumSeconds);
 					} else {
 						sumSeconds = day.end_time.inSeconds() - inSeconds;
+						return timeTilClose.fromSeconds(sumSeconds);
 					}
 				} else {
 					sumSeconds = 86400 - inSeconds + (86400 * (day.end_day - dayOfWeek - 2)) + day.end_time.inSeconds();
+					return timeTilClose.fromSeconds(sumSeconds);
 				}
 				// console.log(sumSeconds);
-				return timeTilClose.fromSeconds(sumSeconds);
 			}
 
 		}
-		return { "hour": "closed" };
+		return new Time();
 	}
 
 	useSpecial(): number {