Merge branch 'client/feature-ingredient-nutrition-view' into 'main'
feat(client/nutrition): Nutrition & Ingredient list view Closes #54 and #56 See merge request cse1105/2025-2026/teams/csep-team-76!54
This commit is contained in:
commit
1abbeee1ae
15 changed files with 403 additions and 110 deletions
|
|
@ -8,7 +8,7 @@
|
|||
<?import javafx.scene.layout.VBox?>
|
||||
|
||||
<VBox xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1"
|
||||
fx:controller="client.scenes.recipe.IngredientsPopupCtrl"
|
||||
fx:controller="client.scenes.Ingredient.IngredientListCtrl"
|
||||
spacing="10" prefWidth="420" prefHeight="520">
|
||||
|
||||
<padding>
|
||||
|
|
@ -7,26 +7,21 @@
|
|||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<?import javafx.scene.shape.Line?>
|
||||
<AnchorPane xmlns="http://javafx.com/javafx"
|
||||
xmlns:fx="http://javafx.com/fxml"
|
||||
fx:controller="client.scenes.nutrition.NutritionDetailsCtrl"
|
||||
prefHeight="400.0" prefWidth="600.0">
|
||||
<VBox visible="false">
|
||||
<Label fx:id="ingredientName" />
|
||||
<HBox>
|
||||
<Label fx:id="fatInputLabel">Fat: </Label>
|
||||
<TextField fx:id="fatInputElement" />
|
||||
</HBox>
|
||||
<HBox>
|
||||
<Label fx:id="proteinInputLabel">Protein: </Label>
|
||||
<TextField fx:id="proteinInputElement" />
|
||||
</HBox>
|
||||
<HBox>
|
||||
<Label fx:id="carbInputLabel">Carbohydrates: </Label>
|
||||
<TextField fx:id="carbInputElement" />
|
||||
</HBox>
|
||||
<Label fx:id="estimatedKcalLabel">Estimated: 0kcal</Label>
|
||||
<Label fx:id="usageLabel">Not used in any recipes</Label>
|
||||
</VBox>
|
||||
|
||||
</AnchorPane>
|
||||
<VBox xmlns="http://javafx.com/javafx"
|
||||
xmlns:fx="http://javafx.com/fxml"
|
||||
fx:controller="client.scenes.nutrition.NutritionDetailsCtrl"
|
||||
fx:id="nutritionDetails"
|
||||
visible="false">
|
||||
<Label fx:id="ingredientName" />
|
||||
<GridPane fx:id="nutritionValueContainer">
|
||||
<Label GridPane.columnIndex="0" GridPane.rowIndex="0" fx:id="fatInputLabel">Fat: </Label>
|
||||
<TextField GridPane.columnIndex="1" GridPane.rowIndex="0" fx:id="fatInputElement" />
|
||||
<Label GridPane.columnIndex="0" GridPane.rowIndex="1" fx:id="proteinInputLabel">Protein: </Label>
|
||||
<TextField GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="proteinInputElement" />
|
||||
<Label GridPane.columnIndex="0" GridPane.rowIndex="2" fx:id="carbInputLabel">Carbohydrates: </Label>
|
||||
<TextField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="carbInputElement" />
|
||||
</GridPane>
|
||||
<Button onAction="#handleNutritionSaveClick">Save values</Button>
|
||||
<Label fx:id="estimatedKcalLabel">Estimated: 0kcal</Label>
|
||||
<Label fx:id="usageLabel">Not used in any recipes</Label>
|
||||
</VBox>
|
||||
|
|
|
|||
|
|
@ -11,9 +11,7 @@
|
|||
fx:controller="client.scenes.nutrition.NutritionViewCtrl"
|
||||
prefHeight="400.0" prefWidth="600.0">
|
||||
<SplitPane>
|
||||
<ListView fx:id="nutritionIngredientsView" />
|
||||
<AnchorPane>
|
||||
<fx:include source="NutritionDetails.fxml" />
|
||||
</AnchorPane>
|
||||
<fx:include source="IngredientList.fxml" />
|
||||
<fx:include source="NutritionDetails.fxml" />
|
||||
</SplitPane>
|
||||
</AnchorPane>
|
||||
|
|
|
|||
|
|
@ -30,8 +30,7 @@
|
|||
<ComboBox fx:id="langSelector" onAction="#changeLanguage" />
|
||||
|
||||
<!-- Ingredients -->
|
||||
<fx:include source="IngredientList.fxml" fx:id="ingredientList"
|
||||
VBox.vgrow="ALWAYS" maxWidth="Infinity" />
|
||||
<fx:include source="RecipeIngredientList.fxml" fx:id="ingredientList" />
|
||||
|
||||
<!-- Preparation -->
|
||||
<fx:include source="RecipeStepList.fxml" fx:id="stepList"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue