From ac69508b4245da16424bc8b2d7d79f7cac36b7e8 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Mon, 9 Mar 2020 22:59:12 -0400 Subject: [PATCH] =?UTF-8?q?Correction=20d'un=20bug=20qui=20emp=C3=AAchait?= =?UTF-8?q?=20de=20d=C3=A9tecter=20si=20un=20fichier=20SIMDUT=20existe.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../colorrecipesexplorer/core/utils/MixBuilder.java | 1 - ...esController.java => SimdutFilesController.java} | 6 +++--- src/main/resources/static/js/main.js | 13 ++++++------- src/main/resources/templates/material/edit.html | 3 +-- src/main/resources/templates/material/simdut.html | 7 +++++++ src/main/resources/updates.md | 2 +- 6 files changed, 18 insertions(+), 14 deletions(-) rename src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/files/{SIMDUTFilesController.java => SimdutFilesController.java} (93%) diff --git a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/core/utils/MixBuilder.java b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/core/utils/MixBuilder.java index 5f2e3ee..2ad0b03 100644 --- a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/core/utils/MixBuilder.java +++ b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/core/utils/MixBuilder.java @@ -44,7 +44,6 @@ public class MixBuilder { } else { this.mixType = new MixType(this.mixType.getId(), this.mixType.getName(), this.mixType.getMaterial()); - // TODO le nom ne change pas if (materialService.existsByName(mixTypeName)) { this.mixType.setName(mixTypeName, false); this.mixType.setMaterial(materialService.getByName(mixTypeName)); diff --git a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/files/SIMDUTFilesController.java b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/files/SimdutFilesController.java similarity index 93% rename from src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/files/SIMDUTFilesController.java rename to src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/files/SimdutFilesController.java index 3a2c173..6d4e676 100644 --- a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/files/SIMDUTFilesController.java +++ b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/files/SimdutFilesController.java @@ -18,12 +18,12 @@ import static dev.fyloz.trial.colorrecipesexplorer.web.WebsitePaths.CLOSE_TAB; import static dev.fyloz.trial.colorrecipesexplorer.web.WebsitePaths.SIMDUT_FILES; @Controller -public class SIMDUTFilesController { +public class SimdutFilesController { private SimdutService simdutService; @Autowired - public SIMDUTFilesController(SimdutService simdutService) { + public SimdutFilesController(SimdutService simdutService) { this.simdutService = simdutService; } @@ -49,7 +49,7 @@ public class SIMDUTFilesController { @PostMapping(SIMDUT_FILES) public ResponseEntity getFile(@PathVariable Long id) { try { - return ResponseEntity.status(simdutService.exists(id) ? HttpStatus.FOUND : HttpStatus.NOT_FOUND).build(); + return ResponseEntity.status(simdutService.exists(id) ? HttpStatus.OK : HttpStatus.NOT_FOUND).build(); } catch (EntityNotFoundException ex) { return ResponseEntity.status(HttpStatus.BAD_REQUEST).build(); } diff --git a/src/main/resources/static/js/main.js b/src/main/resources/static/js/main.js index 5a17b53..dcd92de 100644 --- a/src/main/resources/static/js/main.js +++ b/src/main/resources/static/js/main.js @@ -14,10 +14,10 @@ $(() => { const materialID = row.data("materialid"); // SIMDUT - if (!checkSimdutAvailability(materialID)) { + checkSimdutAvailability(materialID, null, () => { row.parent().addClass("nosimdut"); row.parent().title = simdutNotFoundText; - } + }); }); $(".messageBox").each(function () { checkMessageBoxesDisplay($(this)[0]) @@ -87,14 +87,13 @@ $(() => { }, 500); }); -function checkSimdutAvailability(materialId) { +function checkSimdutAvailability(materialId, successCallback, notFoundCallback) { axios.post(`/simdut/${materialId}`) - .then(function (d) { - return true; + .then(d => { + if (successCallback) successCallback(); }) .catch(function (err) { - if (err.response.status === 404) return false; - else return false; + if (err.response.status === 404 && notFoundCallback) notFoundCallback(); }); } diff --git a/src/main/resources/templates/material/edit.html b/src/main/resources/templates/material/edit.html index 01b79d3..850754f 100644 --- a/src/main/resources/templates/material/edit.html +++ b/src/main/resources/templates/material/edit.html @@ -103,8 +103,7 @@ } }); - console.log(checkSimdutAvailability(materialId)); - if (!checkSimdutAvailability(materialId)) $("#showSIMDUT").hide(); + checkSimdutAvailability(materialId, null, () => $("#showSIMDUT").hide()); }); function switchUnits(unitSelect) { diff --git a/src/main/resources/templates/material/simdut.html b/src/main/resources/templates/material/simdut.html index 02b39e9..2e131d0 100644 --- a/src/main/resources/templates/material/simdut.html +++ b/src/main/resources/templates/material/simdut.html @@ -2,6 +2,12 @@ + + @@ -22,6 +28,7 @@

+ diff --git a/src/main/resources/updates.md b/src/main/resources/updates.md index 00ef7bf..d1e8804 100644 --- a/src/main/resources/updates.md +++ b/src/main/resources/updates.md @@ -4,7 +4,7 @@ * Correction d'un bug qui empêchait de modifier des types de produit. * Correction d'un bug qui empêchait de créer des PDFs de kit de retouche. * Correction d'un bug qui empêchait les fichiers SIMDUT de fonctionner. -** Correction d'un bug qui empêchait de détecter si un fichier SIMDUT existait. +* Correction d'un bug qui empêchait de détecter si un fichier SIMDUT existe. # v1.3.0 (Optimisations back-end) ### Note: Cette mise à jour n'est pas compatible avec les anciennes versions.