diff --git a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/OthersController.java b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/OthersController.java index 9baaa92..297f232 100644 --- a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/OthersController.java +++ b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/OthersController.java @@ -3,6 +3,7 @@ package dev.fyloz.trial.colorrecipesexplorer.web.controller; import dev.fyloz.trial.colorrecipesexplorer.core.exception.model.EntityNotFoundException; import dev.fyloz.trial.colorrecipesexplorer.core.io.response.ModelResponseBuilder; import dev.fyloz.trial.colorrecipesexplorer.core.io.response.ResponseCode; +import dev.fyloz.trial.colorrecipesexplorer.core.model.Material; import dev.fyloz.trial.colorrecipesexplorer.core.services.files.MarkdownFilesService; import dev.fyloz.trial.colorrecipesexplorer.core.services.model.MixService; import dev.fyloz.trial.colorrecipesexplorer.core.services.model.RecipeService; @@ -16,6 +17,9 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import java.util.Collection; +import java.util.List; + import static dev.fyloz.trial.colorrecipesexplorer.web.StringBank.MATERIALS; import static dev.fyloz.trial.colorrecipesexplorer.web.WebsitePaths.*; diff --git a/src/main/resources/static/js/mix.js b/src/main/resources/static/js/mix.js index 9938883..4cd834f 100644 --- a/src/main/resources/static/js/mix.js +++ b/src/main/resources/static/js/mix.js @@ -10,7 +10,7 @@ let recipeID; $(() => { recipeID = $("#recipeId").val(); - const mixIDInput = $("#mixID"); + const mixIDInput = $("#mixId"); const mixID = mixIDInput.val() ? mixIDInput.val() : -1; axios.get(`/mix/selector/${recipeID}/${mixID}`) @@ -207,13 +207,14 @@ function selectMaterial(material) { } function searchMaterial(input) { + input = $(input); const filter = input.val(); const materials = input.parent().find(".materialList p"); materials.each(function () { const node = $(this); - if (searchIn(filter, node.text()) || searchIn(filter, node.data("materialtype"))) node.hide(); - else node.show(); + if (searchIn(filter, node.text()) || searchIn(filter, node.data("materialtype"))) node.show(); + else node.hide(); }); const found = input.parent().find(`.materialList p[data-materialcode="${filter}"]`); diff --git a/src/main/resources/templates/mix/editor.html b/src/main/resources/templates/mix/editor.html index 3d10e70..1fc9aed 100644 --- a/src/main/resources/templates/mix/editor.html +++ b/src/main/resources/templates/mix/editor.html @@ -78,19 +78,20 @@