From 5fc0371f5fc0215f48b9f27ac216a359da6997e9 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 25 Nov 2019 10:07:30 -0500 Subject: Added data models. --- recipeBuddy/src/app/DataModels/recipe.ts | 62 ++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 recipeBuddy/src/app/DataModels/recipe.ts (limited to 'recipeBuddy/src/app/DataModels/recipe.ts') diff --git a/recipeBuddy/src/app/DataModels/recipe.ts b/recipeBuddy/src/app/DataModels/recipe.ts new file mode 100644 index 0000000..82e4a73 --- /dev/null +++ b/recipeBuddy/src/app/DataModels/recipe.ts @@ -0,0 +1,62 @@ +import {Steps} from "./steps" +import {Ingredients} from "./ingredients" + +export class Recipe { + private id: number; + private name: string; + private description: string; + private ingredients: Ingredients; + private steps: Steps; + private servingSize: number; + private cookTime: number; + private rating: number; + private tags: string[]; + + public constructor(id: number, name: string, description: string, ingredients: Ingredients, steps: Steps, servingSize: number, cookTime: number, rating: number, tags: string[]) { + this.id = id; + this.name = name; + this.description = description; + this.ingredients = ingredients; + this.steps = steps; + this.servingSize = servingSize; + this.cookTime = cookTime; + this.rating = rating; + this.tags = tags; + } + + public getId(): number { + return this.id; + } + + public getName(): string { + return this.name; + } + + public getDescription(): string { + return this.description; + } + + public getIngredients(): Ingredients { + return this.ingredients; + } + + public getSteps(): Steps { + return this.steps; + } + + public getServingSize(): number { + return this.servingSize; + } + + public getCookTime(): number { + return this.cookTime; + } + + public getRating(): number { + return this.rating; + } + + public getTags(): string[] { + return this.tags; + } +} -- cgit v1.1 From 737063651a31b05631fbb3fae5803da5db0ee389 Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Mon, 2 Dec 2019 10:54:41 -0500 Subject: Fix Ingredients as array in recipe --- recipeBuddy/src/app/DataModels/recipe.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipeBuddy/src/app/DataModels/recipe.ts') diff --git a/recipeBuddy/src/app/DataModels/recipe.ts b/recipeBuddy/src/app/DataModels/recipe.ts index 82e4a73..7ca7421 100644 --- a/recipeBuddy/src/app/DataModels/recipe.ts +++ b/recipeBuddy/src/app/DataModels/recipe.ts @@ -5,7 +5,7 @@ export class Recipe { private id: number; private name: string; private description: string; - private ingredients: Ingredients; + private ingredients: Ingredient[]; private steps: Steps; private servingSize: number; private cookTime: number; -- cgit v1.1 From 870fb7a7b2faeb9e7e4a99d08d14da61e7b7ad4f Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Mon, 2 Dec 2019 10:55:46 -0500 Subject: Fix Steps as array in recipe --- recipeBuddy/src/app/DataModels/recipe.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipeBuddy/src/app/DataModels/recipe.ts') diff --git a/recipeBuddy/src/app/DataModels/recipe.ts b/recipeBuddy/src/app/DataModels/recipe.ts index 7ca7421..71cebd0 100644 --- a/recipeBuddy/src/app/DataModels/recipe.ts +++ b/recipeBuddy/src/app/DataModels/recipe.ts @@ -6,7 +6,7 @@ export class Recipe { private name: string; private description: string; private ingredients: Ingredient[]; - private steps: Steps; + private steps: Step[]; private servingSize: number; private cookTime: number; private rating: number; -- cgit v1.1 From f84d088056974540183aea6184febd0cc94d3635 Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Mon, 2 Dec 2019 10:57:08 -0500 Subject: Add variables from backend --- recipeBuddy/src/app/DataModels/recipe.ts | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'recipeBuddy/src/app/DataModels/recipe.ts') diff --git a/recipeBuddy/src/app/DataModels/recipe.ts b/recipeBuddy/src/app/DataModels/recipe.ts index 71cebd0..cd121dd 100644 --- a/recipeBuddy/src/app/DataModels/recipe.ts +++ b/recipeBuddy/src/app/DataModels/recipe.ts @@ -9,8 +9,10 @@ export class Recipe { private steps: Step[]; private servingSize: number; private cookTime: number; + private timesCooked: number; private rating: number; 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[]) { this.id = id; @@ -51,6 +53,9 @@ export class Recipe { public getCookTime(): number { return this.cookTime; } + public getTimesCooked(): number { + return timesCooked; + } public getRating(): number { return this.rating; @@ -59,4 +64,8 @@ export class Recipe { public getTags(): string[] { return this.tags; } + + public getPhotos(): string[] { + return this.photos; + } } -- cgit v1.1