Merge pull request #127 from ThomasRubini/appr_view_and_delete

This commit is contained in:
Thomas Rubini 2023-01-26 16:57:22 +01:00 committed by GitHub
commit b20cc3eb21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 10 deletions

View File

@ -17,6 +17,7 @@ final class RecipeController
View::show("recipe/view", array(
"ADMIN" => Session::is_admin(),
"USER_ID" => $_SESSION["ID"],
"RECIPE" => $O_recipe
));
}

View File

@ -18,7 +18,7 @@ final class ApprModel {
$this->I_AUTHOR_ID = $I_AUTHOR_ID;
$this->I_RECIPE_ID = $I_RECIPE_ID;
}
private function createFromRow($A_row,$I_id){
private static function createFromRow($A_row,$I_id){
$O_appr = new ApprModel($A_row["COMMENT"], $A_row["NOTE"], $A_row["DATE"], $A_row["AUTHOR_ID"], $A_row["RECIPE_ID"]);
$O_appr->I_ID = $I_id;
return $O_appr;

View File

@ -21,9 +21,12 @@ $O_recipe = $A_view["RECIPE"];
</form>
<?php
foreach ($A_view["APPRS"] as $A_appr){
$A_appr["SHOW_REMOVE_BUTTON"] = $A_view["ADMIN"];
View::show("appreciations/view_single", $A_appr);
foreach ($O_recipe->getApprs() as $O_appr){
View::show("appreciations/view_single", array(
"ADMIN" => $A_view["ADMIN"],
"USER_ID" => $A_view["USER_ID"],
"APPR" => $O_appr
));
}
?>
</section>

View File

@ -1,10 +1,16 @@
<?php
$O_appr = $A_view["APPR"];
?>
<section>
<header>
<img src="<?= $A_view["AUTHOR_IMG_LINK"] ?>" alt="profile picture">
<h3> <?= $A_view["AUTHOR_NAME"] ?> </h3>
<p> <?= $A_view["NOTE"] ?> </p>
<p> <?= $A_view["DATE"] ?> </p>
<?= $A_view["SHOW_REMOVE_BUTTON"]===true? "<a href=/appr/delete/".$A_view["ID"].">Supprimer l'appréciation</a>" : "" ?>
<img src="<?= $O_appr->getAuthor()->getProfilePicLink() ?>" alt="profile picture">
<h3> <?= $O_appr->getAuthor()->S_USERNAME ?> </h3>
<p> <?= $O_appr->I_NOTE ?> </p>
<p> <?= $O_appr->S_DATE ?> </p>
<?php if ($A_view["ADMIN"] || $A_view["USER_ID"] === $O_appr->I_AUTHOR_ID) { ?>
<a href="/appr/delete/<?= $O_appr->I_ID ?>">Supprimer l'appréciation</a>
<?php } ?>
</header>
<p> <?= $A_view["COMMENT"] ?> </p>
<p> <?= $O_appr->S_COMMENT ?> </p>
</section>