diff --git a/public/js/picture_displayer.js b/public/js/picture_displayer.js index 1d8ad5b25248ae7e42dee88685b0a5ac39c4ce15..a1a3dc24bf8f98dcc08bcf5641b3f53133735b66 100644 --- a/public/js/picture_displayer.js +++ b/public/js/picture_displayer.js @@ -51,20 +51,42 @@ var displayer = { var displayerMoyReview = { - startdisplay: function(idToDat, whereToDisplay) { - var liste = $('#'+idToDat+" li"); - + var liste = $('#'+idToDat+" li"); $('#'+whereToDisplay).html('<div id="'+whereToDisplay+'row" class="row"></div>'); liste.each(function() { - var currentID = intListToString(this. getElementsByClassName('idPhoto')[0].innerHTML); - var moyenne = this.getElementsByClassName('moyenne')[0].innerHTML; - console.log("id : "+currentID+" ; moyenne : "+moyenne); - requestHandler.retrieveJsonFromUrl('https://images-api.nasa.gov/asset/'+currentID, function(json) { - $('#'+whereToDisplay+'row').append('<div class="col"><img width=300 src="'+json.collection.items[2].href+'"><p>Cette photo à été notée avec une moyenne de '+displayerMoyReview.troncate(moyenne)+' étoiles</p></div>') + // console.log("__"); + + var texte_li = $(this).text(); + var tab = texte_li.split(","); + // console.log("ascii:" + tab[0] + ", " + tab[1]); + var currentID = intListToString(tab[0]); + // console.log("decode:" +currentID); + // console.log(currentID); + requestHandler.retrieveJsonFromUrl('https://images-api.nasa.gov/search?nasa_id='+currentID, function(json) { + var real_im = json.collection.items[0]; + $('#'+whereToDisplay+'row').append('<div class="view container-fluid">'+ + '<div class="hover-container" style="margin: 3px">'+ + '<img class="img-fluid" style="margin: 4px" src='+real_im.links[0].href+'>'+ + '<div class="content">'+ + '<div class="text scrollbar">'+ + '<h4>'+real_im.data[0].title+'</h4>'+ + '<p style="font-size: 15px">'+real_im.data[0].description+'</p>'+ + '</div>'+ + '<div class="actionrow" style="left: -120px;">'+ + '<form method="POST" action="download.php" target="_blank">'+ + '<input type="hidden" name="urlget" value="'+correctionURLLink(real_im.href)+'">'+ + '<input type="hidden" name="nasa_id" value="'+currentID+'">'+ + '<input type="hidden" name="title" value="'+real_im.data[0].title+'">'+ + '<input type="hidden" name="preview" value="'+real_im.links[0].href+'"">'+ + '<input type="image" name="submit" alt="Submit" class="download" width="13%" src="./ressources/icons/dwnld.png" onmouseover="this.src=\'./ressources/icons/dwnldVert.png\'" onmouseout="this.src=\'./ressources/icons/dwnld.png\'">'+ + '</form>'+ + '</div>'+ + '</div>'+ + '</div>'+ + '</div>'); }); }); - }, troncate: function(moy) { @@ -84,10 +106,9 @@ var displayerNbCDC = { $('#'+whereToDisplay).html('<div id="'+whereToDisplay+'row" class="row"></div>'); liste.each(function() { - console.log("coucou"); var currentID = intListToString(this.getElementsByClassName('idPhoto')[0].innerHTML); var nbCDC = this.getElementsByClassName('nbCDC')[0].innerHTML; - console.log("id : "+currentID+" ; nbCDC : "+nbCDC); + //console.log("id : "+currentID+" ; nbCDC : "+nbCDC); requestHandler.retrieveJsonFromUrl('https://images-api.nasa.gov/asset/'+currentID, function(json) { $('#'+whereToDisplay+'row').append('<div class="col"><img width=300 src="'+json.collection.items[2].href+'"><p>Cette photo a '+nbCDC+' coups de coeur</p></div>'); }); diff --git a/public/leaderboard.php b/public/leaderboard.php index e3909a2378952fa9af932e41dcad5e9919526f91..c498919f0996a04250d9b7dd227e9200f5af9e3c 100644 --- a/public/leaderboard.php +++ b/public/leaderboard.php @@ -54,13 +54,16 @@ urlHasArgument(); generateNavBar('leaderboard'); ?> <!-- balises cachées contenant les images par ordre de notation --> - <div id="NoteLeaderboard" style="display: none"> + <div id="NoteLeaderboard" style=""> <!-- display: none --> <?php - $test = $orderRepository->fetchAvgNoteOrder(); - - foreach ($test as $elem): ?> - <li><div class="idPhoto"><?php echo $elem->getIdPhoto(); ?></div><div class="moyenne"><?php echo $elem->getNote(); ?></div></li> - <?php endforeach; ?> + $test = $orderRepository->fetchAvgNoteOrder(); + ?> + <?php + foreach ($test as $elem): + echo "<li><div class='idPhoto'>".$elem->getIdPhoto().",</div>"; + echo "<div class='moyenne'>".$elem->getNote()."</div></li>"; + endforeach + ?> </div> <div id="CDCLeaderboard" style="display: none">