From 0a9866551c718238bb4458a3af6311f3ba9991b8 Mon Sep 17 00:00:00 2001
From: Athanasios <ath.kouk.oid@gmail.com>
Date: Thu, 28 Oct 2021 18:10:16 +0200
Subject: [PATCH] Restore search function
---
views/DE/project/pagesList.pug | 12 +++++++-----
views/DE/project/projectList.pug | 12 +++++++-----
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/views/DE/project/pagesList.pug b/views/DE/project/pagesList.pug
index 7f29c67..f9e5e75 100644
--- a/views/DE/project/pagesList.pug
+++ b/views/DE/project/pagesList.pug
@@ -81,20 +81,22 @@ html(lang="de")
var filter = input.value.toUpperCase()
var cardsCol = document.getElementsByClassName("col-sm")
- var cardTitle, cardText, titleValue, textValue
+ var cardTitle, cardBadges, cardText, titleValue, badgesValue, textValue, allValues;
var i
var counterBlock = 0
for (i = 0; i < cardsCol.length; i++) {
cardTitle = cardsCol[i].getElementsByClassName("card-title-bottom-left");
- cardBody = cardsCol[i].getElementsByClassName("card-body");
+ //cardBody = cardsCol[i].getElementsByClassName("card-body");
+ cardBadges = [...cardsCol[i].getElementsByClassName("badge-pill")];
cardText = cardsCol[i].getElementsByClassName("card-text");
titleValue = cardTitle[0].textContent || cardTitle[0].innerText;
- bodyValue = cardBody[0].textContent || cardBody[0].innerText;
+ badgesValue = cardBadges.map(b => b.textContent).join(" ");
+ //bodyValue = cardBody[0].textContent || cardBody[0].innerText;
textValue = cardText[0].textContent || cardText[0].innerText;
-
- if (titleValue.toUpperCase().indexOf(filter) > -1 || bodyValue.toUpperCase().indexOf(filter) > -1 || textValue.toUpperCase().indexOf(filter) > -1) {
+ allValues = [titleValue, badgesValue, textValue].map(v => v.toUpperCase()).join(" ");
+ if (allValues.indexOf(filter)!= -1) {
cardsCol[i].style.display = "block"
counterBlock++
} else {
diff --git a/views/DE/project/projectList.pug b/views/DE/project/projectList.pug
index 36b90a2..facb706 100644
--- a/views/DE/project/projectList.pug
+++ b/views/DE/project/projectList.pug
@@ -105,20 +105,22 @@ html(lang="de")
var filter = input.value.toUpperCase()
var cardsCol = document.getElementsByClassName("col-sm")
- var cardTitle, cardText, titleValue, textValue
+ var cardTitle, cardBadges, cardText, titleValue, badgesValue, textValue, allValues;
var i
var counterBlock = 0
for (i = 0; i < cardsCol.length; i++) {
cardTitle = cardsCol[i].getElementsByClassName("card-title-bottom-left");
- cardBody = cardsCol[i].getElementsByClassName("card-body");
+ //cardBody = cardsCol[i].getElementsByClassName("card-body");
+ cardBadges = [...cardsCol[i].getElementsByClassName("badge-pill")];
cardText = cardsCol[i].getElementsByClassName("card-text");
titleValue = cardTitle[0].textContent || cardTitle[0].innerText;
- bodyValue = cardBody[0].textContent || cardBody[0].innerText;
+ badgesValue = cardBadges.map(b => b.textContent).join(" ");
+ //bodyValue = cardBody[0].textContent || cardBody[0].innerText;
textValue = cardText[0].textContent || cardText[0].innerText;
-
- if (titleValue.toUpperCase().indexOf(filter) > -1 || bodyValue.toUpperCase().indexOf(filter) > -1 || textValue.toUpperCase().indexOf(filter) > -1) {
+ allValues = [titleValue, badgesValue, textValue].map(v => v.toUpperCase()).join(" ");
+ if (allValues.indexOf(filter)!= -1) {
cardsCol[i].style.display = "block"
counterBlock++
} else {
--
GitLab