Commit 9a4230c2 authored by ALGLAVE Ivan's avatar ALGLAVE Ivan
Browse files

Added autocomplete input field for all ingredients on the advanced search page...

Added autocomplete input field for all ingredients on the advanced search page and fixed inclusion issues in php by duplicating Doonees.inc.php
parent 236e1a6a
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
* { box-sizing: border-box; }
body {
font: 16px Arial;
}
.autocomplete {
/*the container must be positioned relative:*/
position: relative;
display: inline-block;
}
input {
border: 1px solid transparent;
background-color: #f1f1f1;
padding: 10px;
font-size: 16px;
}
input[type=text] {
background-color: #f1f1f1;
width: 100%;
}
input[type=submit] {
background-color: DodgerBlue;
color: #fff;
}
.autocomplete-items {
position: absolute;
border: 1px solid #d4d4d4;
border-bottom: none;
border-top: none;
z-index: 99;
/*position the autocomplete items to be the same width as the container:*/
top: 100%;
left: 0;
right: 0;
}
.autocomplete-items div {
padding: 10px;
cursor: pointer;
background-color: #fff;
border-bottom: 1px solid #d4d4d4;
}
.autocomplete-items div:hover {
/*when hovering an item:*/
background-color: #e9e9e9;
}
.autocomplete-active {
/*when navigating through the items using the arrow keys:*/
background-color: DodgerBlue !important;
color: #ffffff;
}
\ No newline at end of file
......@@ -14,6 +14,7 @@ ul li {
height: 75px;
border-bottom: 1px solid black;
background-color: #888888;
display: block;
}
ul li:last-child {
......
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);
$.post(scripts_location, {'functionname': func_name, 'arguments': args}, callback);
}
function getRecipes(wanted_ingredients = [], unwanted_ingredients = [], max_unsatisfied = 0, allow_missing = true, allow_unwanted = true, callback)
......@@ -23,4 +21,10 @@ function getRecipeImage(id, callback)
{
alert('hi');
query('getRecipeImage', [id], callback);
}
function getAllIngredients(callback)
{
alert('getAllIngredients');
query('getAllIngredients', [], callback);
}
\ No newline at end of file
......@@ -20,6 +20,10 @@
{
echo getRecipeImage($_POST['arguments'][0]);
}
else if($funcName == 'getAllIngredients')
{
echo implode('|', getAllIngredients());
}
else
{
echo 'error - unknown func';
......
This diff is collapsed.
function autocomplete(inp, arr) {
/*the autocomplete function takes two arguments,
the text field element and an array of possible autocompleted values:*/
var currentFocus;
/*execute a function when someone writes in the text field:*/
inp.addEventListener("input", function(e) {
var a, b, i, val = this.value;
/*close any already open lists of autocompleted values*/
closeAllLists();
if (!val) { return false;}
currentFocus = -1;
/*create a DIV element that will contain the items (values):*/
a = document.createElement("DIV");
a.setAttribute("id", this.id + "autocomplete-list");
a.setAttribute("class", "autocomplete-items");
/*append the DIV element as a child of the autocomplete container:*/
this.parentNode.appendChild(a);
/*for each item in the array...*/
for (i = 0; i < arr.length; i++) {
/*check if the item starts with the same letters as the text field value:*/
if (arr[i].substr(0, val.length).toUpperCase() == val.toUpperCase()) {
/*create a DIV element for each matching element:*/
b = document.createElement("DIV");
/*make the matching letters bold:*/
b.innerHTML = "<strong>" + arr[i].substr(0, val.length) + "</strong>";
b.innerHTML += arr[i].substr(val.length);
/*insert a input field that will hold the current array item's value:*/
b.innerHTML += "<input type='hidden' value='" + arr[i] + "'>";
/*execute a function when someone clicks on the item value (DIV element):*/
b.addEventListener("click", function(e) {
/*insert the value for the autocomplete text field:*/
inp.value = this.getElementsByTagName("input")[0].value;
/*close the list of autocompleted values,
(or any other open lists of autocompleted values:*/
closeAllLists();
});
a.appendChild(b);
}
}
});
/*execute a function presses a key on the keyboard:*/
inp.addEventListener("keydown", function(e) {
var x = document.getElementById(this.id + "autocomplete-list");
if (x) x = x.getElementsByTagName("div");
if (e.keyCode == 40) {
/*If the arrow DOWN key is pressed,
increase the currentFocus variable:*/
currentFocus++;
/*and and make the current item more visible:*/
addActive(x);
} else if (e.keyCode == 38) { //up
/*If the arrow UP key is pressed,
decrease the currentFocus variable:*/
currentFocus--;
/*and and make the current item more visible:*/
addActive(x);
} else if (e.keyCode == 13) {
/*If the ENTER key is pressed, prevent the form from being submitted,*/
e.preventDefault();
if (currentFocus > -1) {
/*and simulate a click on the "active" item:*/
if (x) x[currentFocus].click();
}
}
});
function addActive(x) {
/*a function to classify an item as "active":*/
if (!x) return false;
/*start by removing the "active" class on all items:*/
removeActive(x);
if (currentFocus >= x.length) currentFocus = 0;
if (currentFocus < 0) currentFocus = (x.length - 1);
/*add class "autocomplete-active":*/
x[currentFocus].classList.add("autocomplete-active");
}
function removeActive(x) {
/*a function to remove the "active" class from all autocomplete items:*/
for (var i = 0; i < x.length; i++) {
x[i].classList.remove("autocomplete-active");
}
}
function closeAllLists(elmnt) {
/*close all autocomplete lists in the document,
except the one passed as an argument:*/
var x = document.getElementsByClassName("autocomplete-items");
for (var i = 0; i < x.length; i++) {
if (elmnt != x[i] && elmnt != inp) {
x[i].parentNode.removeChild(x[i]);
}
}
}
/*execute a function when someone clicks in the document:*/
document.addEventListener("click", function (e) {
closeAllLists(e.target);
});
}
\ No newline at end of file
......@@ -19,7 +19,7 @@ function getRecipesForJS($wanted_ingredients, $unwanted_ingredients, $max_unsati
function getRecipes($wanted_ingredients, $unwanted_ingredients, $max_unsatisfied, $allow_missing, $allow_unwanted)
{
include "../Donnees.inc.php";
include "Donnees.inc.php";
$Recipes = array();
for($i = 0; $i < count($Recettes); $i++)
......@@ -73,8 +73,8 @@ function getRecipes($wanted_ingredients, $unwanted_ingredients, $max_unsatisfied
function getIngredients($parent_category)
{
include "../Donnees.inc.php";
$res = '';
include "Donnees.inc.php";
$res = 'f';
if(isset($Hierarchie[$parent_category]))
{
......@@ -89,16 +89,35 @@ function getIngredients($parent_category)
return $res;
}
function getRecipeImage($id)
function getRecipeImage($name)
{
include "../Donnees.inc.php";
$formatted_name = explode(' ', $name);
$formatted_name = implode('_', $formatted_name) . '.jpg';
return $formatted_name;
}
function getSubIngredients($cat)
{
include "Donnees.inc.php";
$name = $Recettes[$id];
$sub_list = array();
if(!isset($Hierarchie[$cat]['sous-categorie'])) $sub_list[] = $cat;
else foreach($Hierarchie[$cat]['sous-categorie'] as $ing)
{
foreach(getSubIngredients($ing) as $sub)
{
if(!in_array($sub, $sub_list)) $sub_list[] = $sub;
}
}
$formatted_name = implode('_', explode(' ', $name)) . '.jpg';
return $sub_list;
}
if(file_exists('../Photos/' . $formatted_name)) return $formatted_name;
else return '';
function getAllIngredients()
{
return getSubIngredients('Aliment');
}
?>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment