d

81751df1 · ALGLAVE Ivan · 1d78f30e · 81751df1 · 81751df1 · 81751df1
Commit 81751df1 authored Nov 26, 2020 by ALGLAVE Ivan
--- a/Home.php
+++ b/Home.php
@@ -12,7 +12,7 @@
        <div class="topnav">
            <button id="tabBtnI" class="active" value="Hierarchy.php" onclick="tabButtonClicked(this)">Hiérarchie</button>
            <button id="tabBtnA" value="AdvancedSearch.php" onclick="tabButtonClicked(this)">Avancé</button>
-            <button id="tabBtnC" value="Cocktails.php" onclick="tabButtonClicked(this)">Cocktails</button>
+            <button id="tabBtnR" value="Recipes.php" onclick="tabButtonClicked(this)">Recettes</button>
            <button id="tabBtnMA" class="right" value="MyAccount.php" onclick="tabButtonClicked(this)">Mon Compte</button>
            <button id="tabBtnF" class="right" value="MyFavouriteRecipes.php" onclick="tabButtonClicked(this)">Favoris</button>
        </div>
@@ -52,6 +52,10 @@
            {
                showRecipe(m_value);
            }
+            else if(m_event == 'hierarchyDisplay')
+            {
+                switchView('Hierarchy.php?element="' + m_value + '"');
+            }
        }

        function hideRecipe()

--- a/RecipeList.php
+++ b/RecipeList.php
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Drinkpedia</title>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" type="text/css" href="css/RecipeList.css">
+</head>
+
+<body>
+
+    <ul>
+
+    <?php 
+
+        include "Donnees.inc.php";
+
+        $recipesIds = explode('|', $_GET['ids']);
+
+        foreach($recipesIds as $id)
+        {
+            echo '<li>';
+            echo '<div>';
+
+            $recipe = $Recettes[(int)$id];    
+            echo $recipe['titre'];
+        
+            echo '</div>';
+            echo '</li>';
+        }
+
+    ?>
+
+    </ul>
+
+</body>
+
+</html>
\ No newline at end of file
--- a/css/RecipeList.css
+++ b/css/RecipeList.css
+table, td, tr, th {
+    border-width: 1px;
+    border-color: 1px;
+}
\ No newline at end of file
--- a/scripts/DataQuery.js
+++ b/scripts/DataQuery.js
+var scripts_location = "scripts/DataQuery.php";
+var arg_name_func = "functionname";
+var arg_name_args = "arguments";
+
+function query(func_name, args, callback)
+{
+    $.post(scripts_location, {arg_name_func: func_name, arg_name_args: args}, callback);
+}
+
 function getRecipes(wanted_ingredients = [], unwanted_ingredients = [], max_unsatisfied = 0, allow_missing = true, allow_unwanted = true, callback)
 {
-    $.post("scripts/DataQuery.php", {'functionname': 'getRecipe', 'arguments': [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)
 {
-    $.post("scripts/DataQuery.php", {'functionname': 'getIngredients', 'arguments': [parent_category]}, callback);
+    query('getIngredients', [parent_category], callback);
+}
+
+function getRecipeImage(id, callback)
+{
+    query('getRecipeImage', [id], callback);
 }
\ No newline at end of file
--- a/scripts/DataQuery.php
+++ b/scripts/DataQuery.php
@@ -16,6 +16,10 @@
    {
        echo getIngredients($_POST['arguments'][0]);
    }
+    else if($funcName == 'getRecipeImage')
+    {
+        echo getRecipeImage($_POST['arguments'][0]);
+    }
    else
    {
        echo 'error - unknown func';

--- a/scripts/Functions.php
+++ b/scripts/Functions.php
@@ -74,4 +74,16 @@ function getIngredients($parent_category)
    return $res;
 }

+function getRecipeImage($id)
+{
+    include "../Donnees.inc.php";
+
+    $name = $Recettes[$id];
+
+    $formatted_name = implode('_', explode(' ', $name)) . '.jpg';
+
+    if(file_exists('../Photos/' . $formatted_name)) return $formatted_name;
+    else return '';
+}
+
 ?>
\ No newline at end of file