diff options
| author | chrisundercoffer <55003067+chrisundercoffer@users.noreply.github.com> | 2019-12-11 16:57:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 16:57:08 -0500 |
| commit | 657e2307fdf4593e27c34f2b5289b2f2333f37b2 (patch) | |
| tree | efdee4f8c9cb36c86fbc1cd2dc1d8441411bff6f | |
| parent | e5abeda08c77e7051f24601dab315c0839c05416 (diff) | |
| parent | 40e096d8795e0930c99aacbc4116fceacb13ef41 (diff) | |
Merge pull request #24 from tuckerevans/ingredient_add
Fix adding ingredients
| -rw-r--r-- | recipeBuddy/src/app/add-recipe/add-recipe.component.html | 2 | ||||
| -rw-r--r-- | recipeBuddy/src/app/add-recipe/add-recipe.component.ts | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.html b/recipeBuddy/src/app/add-recipe/add-recipe.component.html index 76095f9..11277f9 100644 --- a/recipeBuddy/src/app/add-recipe/add-recipe.component.html +++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.html @@ -59,7 +59,7 @@ </mat-form-field> <mat-form-field class="quarter-width"> <input matInput placeholder="Units" type="text" - formControlName="units"> + formControlName="unit"> </mat-form-field> <button matSuffix mat-mini-fab (click)="rmIngredient(i)" type="button" style="margin-left: 10px"> diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts index 5109c34..3c32ae7 100644 --- a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts +++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts @@ -29,7 +29,7 @@ export class AddRecipeComponent { this.fb.group({ ingrName: [''], amount: ['', Validators.pattern('^[0-9]*(\.[0-9]*)?$')], - units: [''] + unit: [''] }) ]), steps: this.fb.array([ @@ -61,7 +61,7 @@ export class AddRecipeComponent { this.fb.group({ ingrName: [''], amount: ['', Validators.pattern('^[0-9]*(\.[0-9]*)?$')], - units: [''] + unit: [''] }) ); } @@ -93,10 +93,10 @@ export class AddRecipeComponent { var ingredients = [] var i; for (i = 0; i < formData.ingredients.length; i++) { - var tmp_amount = parseFloat(formData.ingredients[0].amount) - ingredients.push(new Ingredient(formData.ingredients[0].ingrName, + var tmp_amount = parseFloat(formData.ingredients[i].amount) + ingredients.push(new Ingredient(formData.ingredients[i].ingrName, (isNaN(tmp_amount) ? 0 : tmp_amount), - formData.ingredients[0].unit, + formData.ingredients[i].unit, "" )); } |