From 25d3d340d2f8ce6ac5a2fd81bc2b37b4cd88a9c4 Mon Sep 17 00:00:00 2001 From: Geoffrey De Smet Date: Sun, 11 Feb 2024 11:06:33 +0100 Subject: [PATCH] chore: Score analysis collapse, replace arrow with chevron icon --- .../java-spring-boot/src/main/resources/static/app.js | 8 ++++---- .../src/main/resources/META-INF/resources/app.js | 8 ++++---- .../src/main/resources/META-INF/resources/app.js | 8 ++++---- .../resources/META-INF/resources/recommended-fit.js | 6 +++--- .../resources/META-INF/resources/score-analysis.js | 10 +++++----- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/technology/java-spring-boot/src/main/resources/static/app.js b/technology/java-spring-boot/src/main/resources/static/app.js index 01740a81b6..c06de99247 100644 --- a/technology/java-spring-boot/src/main/resources/static/app.js +++ b/technology/java-spring-boot/src/main/resources/static/app.js @@ -299,13 +299,13 @@ function analyze() { matchesRow.append($(``).attr('colspan', '6').append(matchesListGroup)); analysisTBody.append(matchesRow); - row.append($(``).append($(``).attr("data-toggle", "collapse").attr('href', "#row" + index + "Collapse").append($(``).addClass('fas').addClass('fa-arrow-down')).click(e => { + row.append($(``).append($(``).attr("data-toggle", "collapse").attr('href', "#row" + index + "Collapse").append($(``).addClass('fas').addClass('fa-chevron-down')).click(e => { matchesRow.collapse('toggle'); let target = $(e.target); - if (target.hasClass('fa-arrow-down')) { - target.removeClass('fa-arrow-down').addClass('fa-arrow-up'); + if (target.hasClass('fa-chevron-down')) { + target.removeClass('fa-chevron-down').addClass('fa-chevron-up'); } else { - target.removeClass('fa-arrow-up').addClass('fa-arrow-down'); + target.removeClass('fa-chevron-up').addClass('fa-chevron-down'); } }))); } else { diff --git a/technology/kotlin-quarkus/src/main/resources/META-INF/resources/app.js b/technology/kotlin-quarkus/src/main/resources/META-INF/resources/app.js index 0aa3fede29..86bdcbd068 100644 --- a/technology/kotlin-quarkus/src/main/resources/META-INF/resources/app.js +++ b/technology/kotlin-quarkus/src/main/resources/META-INF/resources/app.js @@ -299,13 +299,13 @@ function analyze() { matchesRow.append($(``).attr('colspan', '6').append(matchesListGroup)); analysisTBody.append(matchesRow); - row.append($(``).append($(``).attr("data-toggle", "collapse").attr('href', "#row" + index + "Collapse").append($(``).addClass('fas').addClass('fa-arrow-down')).click(e => { + row.append($(``).append($(``).attr("data-toggle", "collapse").attr('href', "#row" + index + "Collapse").append($(``).addClass('fas').addClass('fa-chevron-down')).click(e => { matchesRow.collapse('toggle'); let target = $(e.target); - if (target.hasClass('fa-arrow-down')) { - target.removeClass('fa-arrow-down').addClass('fa-arrow-up'); + if (target.hasClass('fa-chevron-down')) { + target.removeClass('fa-chevron-down').addClass('fa-chevron-up'); } else { - target.removeClass('fa-arrow-up').addClass('fa-arrow-down'); + target.removeClass('fa-chevron-up').addClass('fa-chevron-down'); } }))); } else { diff --git a/use-cases/school-timetabling/src/main/resources/META-INF/resources/app.js b/use-cases/school-timetabling/src/main/resources/META-INF/resources/app.js index 01740a81b6..c06de99247 100644 --- a/use-cases/school-timetabling/src/main/resources/META-INF/resources/app.js +++ b/use-cases/school-timetabling/src/main/resources/META-INF/resources/app.js @@ -299,13 +299,13 @@ function analyze() { matchesRow.append($(``).attr('colspan', '6').append(matchesListGroup)); analysisTBody.append(matchesRow); - row.append($(``).append($(``).attr("data-toggle", "collapse").attr('href', "#row" + index + "Collapse").append($(``).addClass('fas').addClass('fa-arrow-down')).click(e => { + row.append($(``).append($(``).attr("data-toggle", "collapse").attr('href', "#row" + index + "Collapse").append($(``).addClass('fas').addClass('fa-chevron-down')).click(e => { matchesRow.collapse('toggle'); let target = $(e.target); - if (target.hasClass('fa-arrow-down')) { - target.removeClass('fa-arrow-down').addClass('fa-arrow-up'); + if (target.hasClass('fa-chevron-down')) { + target.removeClass('fa-chevron-down').addClass('fa-chevron-up'); } else { - target.removeClass('fa-arrow-up').addClass('fa-arrow-down'); + target.removeClass('fa-chevron-up').addClass('fa-chevron-down'); } }))); } else { diff --git a/use-cases/vehicle-routing/src/main/resources/META-INF/resources/recommended-fit.js b/use-cases/vehicle-routing/src/main/resources/META-INF/resources/recommended-fit.js index 36d9da0759..0fb6a9fe20 100644 --- a/use-cases/vehicle-routing/src/main/resources/META-INF/resources/recommended-fit.js +++ b/use-cases/vehicle-routing/src/main/resources/META-INF/resources/recommended-fit.js @@ -126,10 +126,10 @@ function requestRecommendations(visitId, solution, endpointPath) { $(`#row${index2}Button${index}`).click(e => { $(`#row${index2}Collapse${index}`).collapse('toggle'); let target = $(e.target); - if (target.hasClass('fa-arrow-down')) { - target.removeClass('fa-arrow-down').addClass('fa-arrow-up'); + if (target.hasClass('fa-chevron-down')) { + target.removeClass('fa-chevron-down').addClass('fa-chevron-up'); } else { - target.removeClass('fa-arrow-up').addClass('fa-arrow-down'); + target.removeClass('fa-chevron-up').addClass('fa-chevron-down'); } }); }); diff --git a/use-cases/vehicle-routing/src/main/resources/META-INF/resources/score-analysis.js b/use-cases/vehicle-routing/src/main/resources/META-INF/resources/score-analysis.js index 0b39a0874d..7d5e76482e 100644 --- a/use-cases/vehicle-routing/src/main/resources/META-INF/resources/score-analysis.js +++ b/use-cases/vehicle-routing/src/main/resources/META-INF/resources/score-analysis.js @@ -113,16 +113,16 @@ function visualizeConstraintMatches(analysisTBody, row, constraintIndex, matches analysisTBody.append(matchesRow); if (recommendation) { - row.append($(``).append($(``).attr("data-toggle", "collapse").attr('id', "row" + constraintIndex + "Button" + recommendationIndex).attr('href', "#row" + constraintIndex + "Collapse").append($(``).addClass('fas').addClass('fa-arrow-down')))); + row.append($(``).append($(``).attr("data-toggle", "collapse").attr('id', "row" + constraintIndex + "Button" + recommendationIndex).attr('href', "#row" + constraintIndex + "Collapse").append($(``).addClass('fas').addClass('fa-chevron-down')))); } else { - row.append($(``).append($(``).attr("data-toggle", "collapse").attr('href', "#row" + constraintIndex + "Collapse").append($(``).addClass('fas').addClass('fa-arrow-down')).click(function (e) { + row.append($(``).append($(``).attr("data-toggle", "collapse").attr('href', "#row" + constraintIndex + "Collapse").append($(``).addClass('fas').addClass('fa-chevron-down')).click(function (e) { console.log('clicou', e) matchesRow.collapse('toggle'); let target = $(e.target); - if (target.hasClass('fa-arrow-down')) { - target.removeClass('fa-arrow-down').addClass('fa-arrow-up'); + if (target.hasClass('fa-chevron-down')) { + target.removeClass('fa-chevron-down').addClass('fa-chevron-up'); } else { - target.removeClass('fa-arrow-up').addClass('fa-arrow-down'); + target.removeClass('fa-chevron-up').addClass('fa-chevron-down'); } }))); }