From 7584f3bbf948133d9d37d32761d042b26eb9b59e Mon Sep 17 00:00:00 2001 From: zvon Date: Wed, 16 Sep 2020 16:53:04 +0200 Subject: [PATCH] Add permanent menu, don't show empty menus --- src/app/app.module.ts | 4 ++- src/app/meal/meal.component.html | 2 +- src/app/meal/meal.component.ts | 1 + src/app/menu/menu.component.html | 4 +-- src/app/models/restaurant/Restaurant.ts | 14 +++++++---- src/app/permanent/permanent.component.css | 0 src/app/permanent/permanent.component.html | 6 +++++ src/app/permanent/permanent.component.spec.ts | 25 +++++++++++++++++++ src/app/permanent/permanent.component.ts | 17 +++++++++++++ src/app/restaurant/restaurant.component.html | 3 ++- src/app/restaurants/restaurants.component.ts | 4 +-- src/styles.css | 5 ++++ 12 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 src/app/permanent/permanent.component.css create mode 100644 src/app/permanent/permanent.component.html create mode 100644 src/app/permanent/permanent.component.spec.ts create mode 100644 src/app/permanent/permanent.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e61097a..52befd7 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -8,6 +8,7 @@ import { MenuComponent } from './menu/menu.component'; import { MealComponent } from './meal/meal.component'; import { RestaurantsComponent } from './restaurants/restaurants.component'; import { HttpClientModule } from '@angular/common/http'; +import { PermanentComponent } from './permanent/permanent.component'; @NgModule({ declarations: [ @@ -15,7 +16,8 @@ import { HttpClientModule } from '@angular/common/http'; RestaurantComponent, MenuComponent, MealComponent, - RestaurantsComponent + RestaurantsComponent, + PermanentComponent ], imports: [ BrowserModule, diff --git a/src/app/meal/meal.component.html b/src/app/meal/meal.component.html index 21ae7d2..3925c5f 100644 --- a/src/app/meal/meal.component.html +++ b/src/app/meal/meal.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/meal/meal.component.ts b/src/app/meal/meal.component.ts index 7d1e5d0..c282198 100644 --- a/src/app/meal/meal.component.ts +++ b/src/app/meal/meal.component.ts @@ -8,6 +8,7 @@ import { Meal } from '../models/meal/Meal'; }) export class MealComponent implements OnInit { @Input() meal: Meal; + @Input() index: number; constructor() { } diff --git a/src/app/menu/menu.component.html b/src/app/menu/menu.component.html index 52ab48a..4c64b57 100644 --- a/src/app/menu/menu.component.html +++ b/src/app/menu/menu.component.html @@ -1,6 +1,6 @@ -
+
Day: {{menu.day}}
- +
diff --git a/src/app/models/restaurant/Restaurant.ts b/src/app/models/restaurant/Restaurant.ts index 8b2a735..12d07be 100644 --- a/src/app/models/restaurant/Restaurant.ts +++ b/src/app/models/restaurant/Restaurant.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { Menu } from '../menu/Menu'; +import { Meal } from '../meal/Meal'; export interface Adapter { adapt(item: any): T; @@ -7,18 +8,21 @@ export interface Adapter { export class Restaurant { restaurant: string; - menus: Menu[]; + daily: Menu[]; + permanent: Meal[]; constructor( restaurant: string, - menus: Menu[], + dailymenus: Menu[], + permanentmeals: Meal[], ) { this.restaurant = restaurant; - this.menus = menus; + this.daily = dailymenus; + this.permanent = permanentmeals; } addMenu(menu: Menu): void { - this.menus.push(menu); + this.daily.push(menu); } } @@ -28,7 +32,7 @@ export class Restaurant { export class RestaurantAdapter implements Adapter { adapt(item: any): Restaurant { if (item) { - return new Restaurant(item.restaurant, item.menus); + return new Restaurant(item.restaurant, item.dailymenus, item.permanentmeals); } return item; } diff --git a/src/app/permanent/permanent.component.css b/src/app/permanent/permanent.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/permanent/permanent.component.html b/src/app/permanent/permanent.component.html new file mode 100644 index 0000000..b202ad7 --- /dev/null +++ b/src/app/permanent/permanent.component.html @@ -0,0 +1,6 @@ +
+
Permanent menu
+
+ +
+
diff --git a/src/app/permanent/permanent.component.spec.ts b/src/app/permanent/permanent.component.spec.ts new file mode 100644 index 0000000..efd4045 --- /dev/null +++ b/src/app/permanent/permanent.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PermanentComponent } from './permanent.component'; + +describe('PermanentComponent', () => { + let component: PermanentComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ PermanentComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(PermanentComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/permanent/permanent.component.ts b/src/app/permanent/permanent.component.ts new file mode 100644 index 0000000..624a605 --- /dev/null +++ b/src/app/permanent/permanent.component.ts @@ -0,0 +1,17 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { Meal } from '../models/meal/Meal'; + +@Component({ + selector: 'app-permanent', + templateUrl: './permanent.component.html', + styleUrls: ['./permanent.component.css'] +}) +export class PermanentComponent implements OnInit { + @Input() meals: Meal[]; + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/restaurant/restaurant.component.html b/src/app/restaurant/restaurant.component.html index 4881853..13903c9 100644 --- a/src/app/restaurant/restaurant.component.html +++ b/src/app/restaurant/restaurant.component.html @@ -2,7 +2,8 @@
diff --git a/src/app/restaurants/restaurants.component.ts b/src/app/restaurants/restaurants.component.ts index 7a371b8..127ac1f 100644 --- a/src/app/restaurants/restaurants.component.ts +++ b/src/app/restaurants/restaurants.component.ts @@ -32,7 +32,7 @@ export class RestaurantsComponent implements OnInit { const dayName = this.days[d.getDay()]; this.lunchService.getRestaurantsForDay(dayName).subscribe( restaurants => { for (let i = 0; i < restaurants.length; i++) { - this.restaurants[i].menus = restaurants[i].menus; + this.restaurants[i].daily = restaurants[i].daily; } }); } @@ -40,7 +40,7 @@ export class RestaurantsComponent implements OnInit { getAllDaysUpdate(): void { this.lunchService.getRestaurants().subscribe( restaurants => { for (let i = 0; i < restaurants.length; i++) { - this.restaurants[i].menus = restaurants[i].menus; + this.restaurants[i].daily = restaurants[i].daily; } }); } diff --git a/src/styles.css b/src/styles.css index e55c98c..020c21e 100644 --- a/src/styles.css +++ b/src/styles.css @@ -16,6 +16,7 @@ .price { float: right; + font-family: "Courier New"; } .mealday { @@ -39,6 +40,10 @@ } .soup { + background: #ffe4; +} + +.firstmeal { border-top: 0px solid black !important; }