diff options
| author | Tucker Evans <tuckerevans24@gmail.com> | 2019-12-12 11:59:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-12 11:59:29 -0500 |
| commit | 7d8b3b712274613b20c299efc48e4041e3fc6d72 (patch) | |
| tree | 585ffdf67ea07d78efaedbebf42da2e8a446e9cd /recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts | |
| parent | afd1a8106feca31ab644fbb412c87eca69bfd737 (diff) | |
| parent | 47254348140fce18c985e9a0ffb592390b226c80 (diff) | |
Merge pull request #28 from tuckerevans/elim
Elim
Diffstat (limited to 'recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts')
| -rw-r--r-- | recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts b/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts index 208993f..7ec8ef2 100644 --- a/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts +++ b/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts @@ -21,15 +21,16 @@ export class PreCookPopUpComponent implements OnInit { constructor(private recipePass: RecipePassService, private backend: BackendService, private router: Router) { } ngOnInit() { - this.backend.getRecipe(15).subscribe(res => - { - console.log(res); - this.cookedRecipe = res; + this.cookedRecipe = this.recipePass.getRecipe(); +// this.backend.getRecipe(20).subscribe(res => +// { +// this.cookedRecipe = res; this.originalSize = this.cookedRecipe.servingSize; for(var _i = 0; _i < this.cookedRecipe.ingredients.length; _i++) { this.originalAmounts[_i] = this.cookedRecipe.ingredients[_i].amount; } - }); + this.recipePass.setRecipe(this.cookedRecipe); +// }); } updateRecipe(event: any) { |