start to adapt views to new Recipe Model

This commit is contained in:
Thomas Rubini 2023-01-25 15:58:07 +01:00
parent 1522018708
commit 63f8b9468a
No known key found for this signature in database
GPG Key ID: C7D287C8C1CAC373
2 changed files with 19 additions and 15 deletions

View File

@ -10,14 +10,15 @@ final class RecipeController
}
//TODO MAKE THE VIEW USE THE NEW DATA FORMAT
$A_returnArray = RecipeModel::getFullRecipeWithApprs($A_urlParams[0]);
if ($A_returnArray === null) {
$O_recipe = RecipeModel::getFullRecipeWithApprs($A_urlParams[0]);
if ($O_recipe === null) {
throw new HTTPSpecialCaseException(404);
}
$A_returnArray["ADMIN"] = Session::is_admin();
View::show("recipe/view", $A_returnArray);
View::show("recipe/view", array(
"ADMIN" => Session::is_admin(),
"RECIPE" => $O_recipe
));
}
public function editAction(Array $A_urlParams = null, Array $A_postParams = null)

View File

@ -1,23 +1,26 @@
<?php
$O_recipe = $A_view["RECIPE"];
?>
<main>
<?php View::show("common/category_list") ?>
<article>
<img src="<?= $A_view["IMG_LINK"] ?>" alt="Image d'illustration de la recette">
<img src="<?= $O_recipe->getImageLink() ?>" alt="Image d'illustration de la recette">
<section class="infosRecette">
<header>
<h1><?= $A_view["NAME"] ?></h1>
<p><?= $A_view["TIME"] ?>&nbsp;—&nbsp;<?= $A_view["DIFFICULTY_NAME"] ?></p>
<h1><?= $O_recipe->S_NAME ?></h1>
<p><?= $O_recipe->I_TIME ?>&nbsp;—&nbsp;<?= $O_recipe->O_DIFFICULTY->S_NAME ?></p>
</header>
<p><?= $A_view["DESC"] ?></p>
<p><?= $O_recipe->S_DESC ?></p>
</section>
<section class="ingredientsRecette">
<h2>Ingrédients</h2>
<ul>
<?php
foreach($A_view["INGREDIENTS"] as $ingredient)
echo "<li> {$ingredient["NAME"]}: {$ingredient["QUANTITY"]} </li>";
foreach($O_recipe->getIngredients() as $O_ingredient){
echo "<li> $O_ingredient->S_NAME: $O_ingredient->I_QUANTITY </li>";
}
?>
</ul>
</section>
@ -26,13 +29,13 @@
<h2>Préparation</h2>
<ol>
<?php
foreach(explode("\n", $A_view["RECIPE"]) as $instructions)
echo "<li>".$instructions."</li>";
foreach(explode("\n", $O_recipe->S_RECIPE) as $S_instr)
echo "<li>".$S_instr."</li>";
?>
</ol>
</section>
<p>By <?= $A_view["AUTHOR_USERNAME"] ?></p>
<p>By <?= $O_recipe->getAuthor()->S_USERNAME ?></p>
<?php
View::show("appreciations/view_all", $A_view)