vergnet/site-proximo
1
2
Fork 1
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: vergnet:bfa1319b27cf7945b170a2e232d7143ca6625a71
Branches Tags
vergnet:master
vergnet:Version_2
..
compare: vergnet:7eea3d2fe56232e115949601c65c8d701ab7352c
Branches Tags
vergnet:master
vergnet:Version_2

No commits in common. "bfa1319b27cf7945b170a2e232d7143ca6625a71" and "7eea3d2fe56232e115949601c65c8d701ab7352c" have entirely different histories.
bfa1319b27 ... 7eea3d2fe5

2 changed files with 27 additions and 55 deletions
Show stats Expand all files Collapse all files

57
assets/js/index.js
View file

@ -1,41 +1,38 @@
async function sendRequest() {
let response = await $.ajax({
type: "POST",
url: "write_json.php",
});
response = JSON.parse(response);
console.log(response);
return response["status"];
}
$('#uploadButton').on('click', function () {
$.confirm({
title: 'Confirmer',
content: "Voulez vous vraiment mettre en ligne le stock actuel du Proximo ? Il sera visible depuis l'application CAMPUS." +
"<br/><br/><strong>NOUVEAUTÉ !</strong><br/>Le site va maintenant récupérer les informations nutritionelles sur le site OpenFoodFacts !" +
"<br><strong>La mise en ligne va donc prendre plus longtemps</strong>",
content: "Voulez vous vraiment mettre en ligne le stock actuel du Proximo ? Il sera visible depuis l'application CAMPUS.",
type: "orange",
buttons: {
formSubmit: {
text: 'Confirmer',
btnClass: "btn-warning",
action: function () {
$.confirm({
columnClass: "small",
content: function () {
let self = this;
return $.ajax({
type: "POST",
url: "write_json.php",
}).done((data) => {
const response = JSON.parse(data);
if (response["status"] === 0) {
self.setTitle("Succès");
self.setContent('Le stock a bien été mis à jour.');
self.setType("green");
} else {
self.setTitle("Erreur");
self.setContent('Une erreur est survenue, merci de réessayer plus tard.');
self.setType("red");
}
}).fail(() => {
self.setTitle("Erreur");
self.setContent('Une erreur est survenue, merci de réessayer plus tard.');
self.setType("red");
});
},
type: "orange",
})
action: async function () {
let result = await sendRequest();
if (result !== 0) {
$.alert({
title: "Erreur",
content: "Une erreur est survenue, merci de réessayer plus tard.",
type: "red",
})
} else {
$.alert({
title: "Succès",
content: "Le stock a bien été mis à jour.",
type: "green",
})
}
}
},
cancel: {

25
classes/postHandler.php
View file

@ -83,37 +83,12 @@ class PostHandler
foreach ($articles as $article) {
$article["type"] = $this->dao->get_categories_of_article($article["id"]);
$article["image"] = $this->imageBaseUrl . $article["id"] . ".jpg";
//EXPERIMENTAL
$product = $this->get_openfoodfacts_product($article["code"]);
if($product != null){
$article["nutri-score"] = $product["nutrition_grade_fr"];
if(!empty($product["ingredients_text_fr"])) $article["ingredients"] = $product["ingredients_text_fr"];
else $article["ingredients"] = $product["ingredients_text"];
if(!empty($product["generic_name_fr"])) $article["generic"] = $product["generic_name_fr"];
else $article["generic"] = $product["generic_name"];
}
else {
$article["nutri-score"] = null;
$article["generic"] = null;
$article["ingredients"] = null;
}
array_push($formatted_articles, $article);
}
return $formatted_articles;
}
private function get_openfoodfacts_product($barcode)
{
$country = 'fr';
$productSlug = 'produit';
$url = 'https://{country}.openfoodfacts.org/api/v0/{product}/{scan}.json';
$url = str_replace(['{country}','{product}','{scan}'],[$country,$productSlug,$barcode],$url);
$result = json_decode(file_get_contents($url), true);
if ($result["status"] == 1) return $result["product"];
else return null;
}
private function save_image()
{
$success = true;