diff --git a/Timeline/TODO.txt b/Timeline/TODO.txt index d8cac19d0e3b700ae3ccf2835c75dccac5e4137f..b6da7c6646282ec1502a240289bb29a7b9b02b33 100755 --- a/Timeline/TODO.txt +++ b/Timeline/TODO.txt @@ -25,11 +25,11 @@ TO DO LATER : - ajout commentaire sur click photo - faire le bouton j'aime qui marche -- acceuil + - identification de personnes rajouter un bouton et que ça marche (mettre qu'on aurait aimer elastic search ect) -- oubli de marquer qui a posté à raj ? +- oubli de marquer qui a posté à raj ? - ajout concours admin, fin concours admin: Abandon -> probleme dans la table concours winner = identifiant photo LATER diff --git a/Timeline/acceuil.php b/Timeline/acceuil.php index 9f666472d3ad372241eb620388da4ff72aabf5b2..74df3da2b19d9aba405bc93ba2b5aa23ab34fa4e 100755 --- a/Timeline/acceuil.php +++ b/Timeline/acceuil.php @@ -88,5 +88,7 @@ } ?> + + <?php include 'modal.php'; ?> <?php include 'footer.php'; ?> diff --git a/Timeline/js/modal.js b/Timeline/js/modal.js index 0ef4b10b0d48c44015fbe32a6c8ae5e49cb65e1a..e16d49bc4c5dd71f63d1dd6b75632e1896a2ce7b 100755 --- a/Timeline/js/modal.js +++ b/Timeline/js/modal.js @@ -56,6 +56,13 @@ $(document).ready(function (){ var like = resultObj[1][0]; $('.like').html(like); + var possible = resultObj[2][0]; + + if(possible == 1) + { + $("#like").attr("disabled", true); + } + } else { diff --git a/Timeline/modal.php b/Timeline/modal.php index 8881ff5527fc542feebe3d41be29b50e9d563b9f..b5be55016c6d1322257923a1d8e03a09004f0081 100755 --- a/Timeline/modal.php +++ b/Timeline/modal.php @@ -63,7 +63,7 @@ echo '</div>'; echo '<div class="modal-footer">'; echo '<button class="btn btn-primary vote" data-toggle="tooltip" title="Vote pour la photo la plus trash">Trash<span class="badge trash">0</span></button>'; echo '<button class="btn btn-primary vote" data-toggle="tooltip" title="Vote pour la photo où ça pécho sec">Love<span class="badge love">0</span></button>'; -echo '<button class="btn btn-primary vote" data-toggle="tooltip" title="Photo de toute beauté">Like<span class="badge like">0</span></button>'; +echo '<button class="btn btn-primary vote" data-toggle="tooltip" title="Photo de toute beauté" id="like">Like<span class="badge like">0</span></button>'; echo '</div>'; echo '</div>'; diff --git a/Timeline/script_modal.php b/Timeline/script_modal.php index 5dd689ec72d8f29d7d476aedc432a9e7ec84a37f..b998b00db4c486b2c7b4f5e93ba7e5bbf4332be3 100755 --- a/Timeline/script_modal.php +++ b/Timeline/script_modal.php @@ -2,6 +2,8 @@ session_start(); + + $id = $_SESSION['login']; $idphoto = $_POST['idphoto']; $idsoiree = $_POST['idsoiree']; @@ -21,6 +23,11 @@ return $result; } + function dejaLike($db, $idphoto, $id) { + $stmt = $db->query("SELECT COUNT(*) FROM liker WHERE idutilisateur='$id' AND idphoto='$idphoto'"); + return $stmt->fetchColumn(); + } + try{ /* Connexion à la base de données avec PDO */ @@ -29,6 +36,7 @@ $commentaires = getComment($DB, $idphoto); $nblike = getLike($DB, $idphoto); + $likePossible = dejaLike($DB, $idphoto, $id); $DB = null; @@ -39,7 +47,7 @@ } - $array = array($commentaires, $nblike); + $array = array($commentaires, $nblike, $likePossible); echo json_encode($array);