From e742d6a9e166b68c8e4d26914742ae9369fe4245 Mon Sep 17 00:00:00 2001
From: "louis.fourcade@ensiie.fr" <gofer>
Date: Mon, 9 Dec 2019 23:27:24 +0100
Subject: [PATCH] correction d'un bug sur image_alea.php
---
public/image_alea.php | 7 ++++++-
public/js/picture_displayer.js | 38 ++++++++++++++++------------------
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/public/image_alea.php b/public/image_alea.php
index 375ff58..370a5d7 100644
--- a/public/image_alea.php
+++ b/public/image_alea.php
@@ -36,6 +36,11 @@ urlHasArgument();
$image = $resJSON->{'collection'}->{'items'}[random_int(0, 99)];
// var_dump($image);
+
+ $loadjs = "";
+ if (isset($_SESSION['id_user'])) {
+ $loadjs = "initiateCDC('".$_SESSION['id_user']."', '".$image->{'data'}[0]->{'nasa_id'}."')";
+ }
?>
@@ -44,7 +49,7 @@ urlHasArgument();
generateHeader('Image Alea');
generateUserbanner();
?>
-<body style="background-image:url('./ressources/background/test2.jpeg'); text-align: center" onload="initiateCDC(<?php echo "'".$_SESSION['id_user']."'"; ?>, <?php echo "'".$image->{'data'}[0]->{'nasa_id'}."'"; ?>)">
+<body style="background-image:url('./ressources/background/test2.jpeg'); text-align: center" onload="<?php echo $loadjs; ?>">
<!-- génération des bonnières -->
<?php
generateNavBar('image_alea');
diff --git a/public/js/picture_displayer.js b/public/js/picture_displayer.js
index cf112e7..a793ca8 100644
--- a/public/js/picture_displayer.js
+++ b/public/js/picture_displayer.js
@@ -21,26 +21,30 @@ var displayer = {
var currentID = intListToString($(this).text());
// console.log(currentID);
requestHandler.retrieveJsonFromUrl('https://images-api.nasa.gov/asset/'+currentID, function(json) {
+ console.log("coucou");
console.log(json);
- $('#'+whereToDisplay+'row').append('<div class="col"><div class="view container-fluid"><div class="hover-container" style="margin: 3px">'+
- '<img class="img-fluid" style="margin: 4px" src='+json.collection.items[2].href+'>'+
- '<div class="content">'+
+ $('#'+whereToDisplay+'row').append('<div class="col">'+
+ '<div class="view container-fluid">'+
+ '<div class="hover-container" style="margin: 3px">'+
+ '<img class="img-fluid" style="margin: 4px" src='+json.collection.items[2].href+'>'+
+ '<div class="content">'+
// '<div class="text scrollbar">'+
// '<h4><?php echo $image->{'data'}[0]->{'title'} ?></h4>'+
// '<p style="font-size: 15px"><?php echo $image->{'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(json.collection.items[5].href)+'">'+
- '<input type="hidden" name="nasa_id" value="'+currentID+'">'+
- '<input type="hidden" name="title" value="img-nasa">'+
- '<input type="hidden" name="preview" value='+json.collection.items[2].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 class="actionrow" style="left: -120px;">'+
+ '<form method="POST" action="download.php" target="_blank">'+
+ '<input type="hidden" name="urlget" value="'+correctionURLLink(json.collection.items[5].href)+'">'+
+ '<input type="hidden" name="nasa_id" value="'+currentID+'">'+
+ '<input type="hidden" name="title" value="img-nasa">'+
+ '<input type="hidden" name="preview" value='+json.collection.items[2].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>'+
- '</div>'+
- '</div>'+
- '</div></div>');
+ '</div>');
});
});
}
@@ -49,10 +53,6 @@ var displayer = {
-<<<<<<< HEAD
-=======
-
-
var displayerMoyReview = {
startdisplay: function(idToDat, whereToDisplay) {
@@ -111,8 +111,6 @@ var displayerNbCDC = {
-
->>>>>>> 38c4d78fee3719e64f5807bff44c8c60bfb5db39
var requestHandler = {
retrieveJsonFromUrl: function(url, callback) {
var xhr = new XMLHttpRequest();
--
GitLab