ColorRecipesExplorer
/
Backend
1
1
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases 2 Wiki Activity

Correction d'un bug qui empêchait de détecter si un fichier SIMDUT existe.

This commit is contained in:
FyloZ 2020-03-09 22:59:12 -04:00
parent 67a8c361dd
commit ac69508b42
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/dev/fyloz/trial/colorrecipesexplorer/core/utils/MixBuilder.java
View File

@ -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));

6
src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/files/SIMDUTFilesController.java → src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/files/SimdutFilesController.java
View File

@ -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<Void> 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();
}

13
src/main/resources/static/js/main.js
View File

@ -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();
});
}

3
src/main/resources/templates/material/edit.html
View File

@ -103,8 +103,7 @@
}
});
console.log(checkSimdutAvailability(materialId));
if (!checkSimdutAvailability(materialId)) $("#showSIMDUT").hide();
checkSimdutAvailability(materialId, null, () => $("#showSIMDUT").hide());
});
function switchUnits(unitSelect) {

7
src/main/resources/templates/material/simdut.html
View File

@ -2,6 +2,12 @@
<html lang="fr" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="fragments.html :: head(#{material.add.title}, null)"></th:block>
<style>
.returnButton {
float: none;
}
</style>
</head>
<body>
@ -22,6 +28,7 @@
<br/>
<br/>
<button type="button" class="returnButton" th:text="#{keyword.back}"></button>
<!-- Ne fonctionne pas comme le reste du site apparamment -->
<button type="button" onclick="checkPassword(this.form)" th:text="#{keyword.save}"></button>
</form>

2
src/main/resources/updates.md
View File

@ -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.