Skip to content
Snippets Groups Projects
Commit 236e1a6a authored by ALGLAVE Ivan's avatar ALGLAVE Ivan
Browse files

trying to debug js

parent 2ddf1325
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
AdvancedSearch.php
+ 12
− 0
View file @ 236e1a6a
...@@ -4,10 +4,22 @@ ...@@ -4,10 +4,22 @@
<title>Drinkpedia</title> <title>Drinkpedia</title>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" type="text/css" href="css/AdvancedSearch.css"> <link rel="stylesheet" type="text/css" href="css/AdvancedSearch.css">
<script type = "text/javascript" src="scripts/DataQuery.js"></script>
</head> </head>
<body> <body>
<h1>AdvancedSearch</h1> <h1>AdvancedSearch</h1>
<script>
alert('Before query');
getIngredients(function (e) {
alert('hihi');
});
alert('Query sent');
</script>
</body> </body>
</html> </html>
\ No newline at end of file
Hierarchy.php
+ 2
− 4
View file @ 236e1a6a
...@@ -47,8 +47,6 @@ ...@@ -47,8 +47,6 @@
// Sinon on récupère l'aliment en cours // Sinon on récupère l'aliment en cours
$aliment = $_GET['element']; $aliment = $_GET['element'];
} }
echo '<script>alert('."'".$aliment."'".');</script>';
$sup_cat = get_super_categories($aliment); $sup_cat = get_super_categories($aliment);
$sous_cat = get_sous_categories($aliment); $sous_cat = get_sous_categories($aliment);
...@@ -60,7 +58,7 @@ ...@@ -60,7 +58,7 @@
if($sup_cat != null) { if($sup_cat != null) {
echo '<div class="category-view">'; echo '<div class="category-view">';
echo '<h1> Super-catégories de '.$aliment.' </h1>'; 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 '<li><button onclick="notifyParent('."'".$cat."'".');">'.$cat.'</button></li>';
} }
echo '</div>'; echo '</div>';
...@@ -69,7 +67,7 @@ ...@@ -69,7 +67,7 @@
if($sous_cat != null) { if($sous_cat != null) {
echo '<div class="category-view">'; echo '<div class="category-view">';
echo '<h1> Sous-catégories de '.$aliment.' </h1>'; 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>';
echo '<li><button onclick="notifyParent('."'".$cat."'".');">'.$cat.'</button></li>'; echo '<li><button onclick="notifyParent('."'".$cat."'".');">'.$cat.'</button></li>';
} }
......
scripts/DataQuery.js
+ 3
− 0
View file @ 236e1a6a
...@@ -9,15 +9,18 @@ function query(func_name, args, callback) ...@@ -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) 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); query('getRecipe', [wanted_ingredients, unwanted_ingredients, max_unsatisfied, allow_missing, allow_unwanted], callback);
} }
function getIngredients(parent_category = 'Aliment', callback) function getIngredients(parent_category = 'Aliment', callback)
{ {
alert('hi');
query('getIngredients', [parent_category], callback); query('getIngredients', [parent_category], callback);
} }
function getRecipeImage(id, callback) function getRecipeImage(id, callback)
{ {
alert('hi');
query('getRecipeImage', [id], callback); query('getRecipeImage', [id], callback);
} }
\ No newline at end of file
scripts/DataQuery.php
+ 1
− 1
View file @ 236e1a6a
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
} }
else if($funcName == 'getRecipes') 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') else if($funcName == 'getIngredients')
{ {
......
scripts/Functions.php
+ 17
− 2
View file @ 236e1a6a
...@@ -6,11 +6,22 @@ function recipeContains($recipe, $ingredient) ...@@ -6,11 +6,22 @@ function recipeContains($recipe, $ingredient)
return false; 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) function getRecipes($wanted_ingredients, $unwanted_ingredients, $max_unsatisfied, $allow_missing, $allow_unwanted)
{ {
include "../Donnees.inc.php"; include "../Donnees.inc.php";
$Recipes = ''; $Recipes = array();
for($i = 0; $i < count($Recettes); $i++) for($i = 0; $i < count($Recettes); $i++)
{ {
$recipe = $Recettes[$i]; $recipe = $Recettes[$i];
...@@ -48,7 +59,11 @@ function getRecipes($wanted_ingredients, $unwanted_ingredients, $max_unsatisfied ...@@ -48,7 +59,11 @@ function getRecipes($wanted_ingredients, $unwanted_ingredients, $max_unsatisfied
{ {
if($score <= $max_unsatisfied) if($score <= $max_unsatisfied)
{ {
$Recipes .= $i . ':' . $score . '|'; //$Recipes .= $i . ':' . $score . '|';
$Recipes[] = array(
'id'=> $i,
'score'=> $score
);
} }
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment