diff options
author | Jacob <gatelyjm@clarkson.edu> | 2019-12-07 03:17:14 -0500 |
---|---|---|
committer | Jacob <gatelyjm@clarkson.edu> | 2019-12-07 03:17:14 -0500 |
commit | c6afa531481b664950406df6cea17794942d8028 (patch) | |
tree | 2c74b9d469a31f5ffbacedb316a0732e4ba2abae /recipeBuddy/src/app/DataModels/recipe.ts | |
parent | 0922e7f865d61295adc6807f2776a80ce70fe711 (diff) | |
parent | 5cf3689290666f70cd631d7b3d40a2ed245a3fce (diff) |
Merge branch 'master' into JacobJacob
Diffstat (limited to 'recipeBuddy/src/app/DataModels/recipe.ts')
-rw-r--r-- | recipeBuddy/src/app/DataModels/recipe.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipeBuddy/src/app/DataModels/recipe.ts b/recipeBuddy/src/app/DataModels/recipe.ts index 3194adc..368f237 100644 --- a/recipeBuddy/src/app/DataModels/recipe.ts +++ b/recipeBuddy/src/app/DataModels/recipe.ts @@ -1,5 +1,5 @@ -import {Steps} from "./steps" -import {Ingredients} from "./ingredients" +import {Step} from "./step" +import {Ingredient} from "./ingredient" export class Recipe { private id: number; @@ -14,7 +14,7 @@ export class Recipe { private tags: string[]; private photos: string[]; - public constructor(id: number, name: string, description: string, ingredients: Ingredients, steps: Steps, servingSize: number, cookTime: number, rating: number, tags: string[]) { + public constructor(id: number, name: string, description: string, ingredients: Ingredient[], steps: Step[], servingSize: number, cookTime: number, rating: number, tags: string[]) { this.id = id; this.name = name; this.description = description; @@ -38,11 +38,11 @@ export class Recipe { return this.description; } - public getIngredients(): Ingredients { + public getIngredients(): Ingredient[] { return this.ingredients; } - public getSteps(): Steps { + public getSteps(): Step[] { return this.steps; } @@ -55,7 +55,7 @@ export class Recipe { } public getTimesCooked(): number { - return timesCooked; + return this.timesCooked; } public getRating(): number { return this.rating; |