Merge branch 'master' of https://gitlab.univ-lorraine.fr/alglave2u/drinkpedia

859b5de6 · SCHNEIDER Remi · 680e05b2 · 236e1a6a · 859b5de6 · 859b5de6
Commit 859b5de6 authored 4 years ago by SCHNEIDER Remi
--- a/AdvancedSearch.php
+++ b/AdvancedSearch.php
@@ -4,10 +4,22 @@
    <title>Drinkpedia</title>
    <meta charset="UTF-8">
    <link rel="stylesheet" type="text/css" href="css/AdvancedSearch.css">
+    <script type = "text/javascript" src="scripts/DataQuery.js"></script>  
 </head>

 <body>
    <h1>AdvancedSearch</h1>
+
+    <script>
+
+        alert('Before query');
+
+        getIngredients(function (e) {
+            alert('hihi');
+        });
+
+        alert('Query sent');
+    </script>
 </body>

 </html>
\ No newline at end of file
--- a/Hierarchy.php
+++ b/Hierarchy.php
@@ -36,7 +36,7 @@
            if($sup_cat != null) { 
                echo '<div class="category-view">';
                echo '<h1> Super-catégories de '.$aliment.' </h1>';
-                foreach($sup_cat as $cat) { 
+                if($sup_cat != null) foreach($sup_cat as $cat) { 
                    echo '<li><button onclick="notifyParent('."'".$cat."'".');">'.$cat.'</button></li>';
                } 
                echo '</div>';
@@ -45,7 +45,7 @@
             if($sous_cat != null) { 
                echo '<div class="category-view">';
                echo '<h1> Sous-catégories de '.$aliment.' </h1>';
-                foreach($sous_cat as $cat) { 
+                if($sous_cat != null) foreach($sous_cat as $cat) { 
                    //echo '<li><button onclick="notifyParent('.$cat.');">'.$cat.'</button></li>';
                    echo '<li><button onclick="notifyParent('."'".$cat."'".');">'.$cat.'</button></li>';
                } 

--- a/scripts/DataQuery.js
+++ b/scripts/DataQuery.js
@@ -9,15 +9,18 @@ function query(func_name, args, callback)

 function getRecipes(wanted_ingredients = [], unwanted_ingredients = [], max_unsatisfied = 0, allow_missing = true, allow_unwanted = true, callback)
 {
+    alert('hi');
    query('getRecipe', [wanted_ingredients, unwanted_ingredients, max_unsatisfied, allow_missing, allow_unwanted], callback);
 }

 function getIngredients(parent_category = 'Aliment', callback)
 {
+    alert('hi');
    query('getIngredients', [parent_category], callback);
 }

 function getRecipeImage(id, callback)
 {
+    alert('hi');
    query('getRecipeImage', [id], callback);
 }
\ No newline at end of file
--- a/scripts/DataQuery.php
+++ b/scripts/DataQuery.php
@@ -10,7 +10,7 @@
    }
    else if($funcName == 'getRecipes')
    {
-        echo getRecipes($_POST['arguments'][0], $_POST['arguments'][1], $_POST['arguments'][2], $_POST['arguments'][3], $_POST['arguments'][4]);
+        echo getRecipesForJS($_POST['arguments'][0], $_POST['arguments'][1], $_POST['arguments'][2], $_POST['arguments'][3], $_POST['arguments'][4]);
    }
    else if($funcName == 'getIngredients')
    {

--- a/scripts/Functions.php
+++ b/scripts/Functions.php
@@ -6,11 +6,22 @@ function recipeContains($recipe, $ingredient)
    return false;
 }

+function getRecipesForJS($wanted_ingredients, $unwanted_ingredients, $max_unsatisfied, $allow_missing, $allow_unwanted)
+{
+    $res = "";
+    $validRecipes = getRecipes($wanted_ingredients, $unwanted_ingredients, $max_unsatisfied, $allow_missing, $allow_unwanted);
+    foreach($validRecipes as $recipe) 
+    {
+        $res .= $recipe['id'] . ':' . $recipe['score'] . '|';
+    }
+    return $res;
+}
+
 function getRecipes($wanted_ingredients, $unwanted_ingredients, $max_unsatisfied, $allow_missing, $allow_unwanted)
 {
    include "../Donnees.inc.php";

-    $Recipes = '';
+    $Recipes = array();
    for($i = 0; $i < count($Recettes); $i++)
    {
        $recipe = $Recettes[$i];
@@ -48,7 +59,11 @@ function getRecipes($wanted_ingredients, $unwanted_ingredients, $max_unsatisfied
            {
                if($score <= $max_unsatisfied)
                {
-                    $Recipes .= $i . ':' . $score . '|';
+                    //$Recipes .= $i . ':' . $score . '|';
+                    $Recipes[] = array(
+                        'id'=> $i,
+                        'score'=> $score
+                    );
                }
            }   
        }