lista-oglasa : boja cene prodaja/izdavanje

SkuciSe/src/main/resources/static/js/main.js

@@ -48,6 +48,7 @@ document.getElementById("flexRadioDefault1").setAttribute("checked", "checked")
 
 function postaviFiltere() {
     const params = new URLSearchParams(window.location.search)
+    let pretraga = document.getElementById("pretraga")
     let cenaMin = document.getElementById("cena-min")
     let cenaMax = document.getElementById("cena-max")
     let radioIzdavanje = document.getElementById("radio-izdavanje")
@@ -61,6 +62,9 @@ function postaviFiltere() {
     let namesten = document.getElementById("check-namesten")
     for (const param of params) {
         console.log(param[0], param[1])
+        if (param[0] === "pretraga" && param[1] !== "") {
+            pretraga.value = param[1];
+        }
         if (param[0] === "cenaMin" && param[1] !== "") {
             cenaMin.value = param[1];
         }

SkuciSe/src/main/resources/templates/lista-oglasa.html

@@ -109,7 +109,7 @@
                 </article>
                 <article class="card-group-item">
                     <header class="card-header">
-                        <h6 class="title">Cena </h6>
+                        <h6 class="title">Cena po kvadratu</h6>
                     </header>
                     <div class="filter-content">
                         <div class="card-body">
@@ -247,7 +247,8 @@
                             <div class="col-lg-12">
                                 <div class="row d-flex justify-content-between">
                                     <div class="col-lg-6 pb-2">
-                                        <span class="badge badge-info p-2" th:text="${oglasi[i].cena + '$'}"></span>
+                                        <span th:if="${oglasi[i].vrstaOglasaId == 1}" class="badge badge-info p-2" th:text="${oglasi[i].cena*oglasi[i].kvadratura + '$'}"></span>
+                                        <span th:if="${oglasi[i].vrstaOglasaId == 2}" class="badge badge-success p-2" th:text="${oglasi[i].cena + '$/mes'}"></span>
                                     </div>
                                     <div class="col-lg-6 pb-2 d-flex justify-content-end">
                                         <a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i].getOglasId()})}"
@@ -281,7 +282,8 @@
                             <div class="col-lg-12">
                                 <div class="row d-flex justify-content-between">
                                     <div class="col-lg-6 pb-2">
-                                        <span class="badge badge-info p-2" th:text="${oglasi[i+1].cena + '$'}"></span>
+                                        <span th:if="${oglasi[i+1].vrstaOglasaId == 1}" class="badge badge-info p-2" th:text="${oglasi[i+1].cena*oglasi[i+1].kvadratura + '$'}"></span>
+                                        <span th:if="${oglasi[i+1].vrstaOglasaId == 2}" class="badge badge-success p-2" th:text="${oglasi[i+1].cena + '$/mes'}"></span>
                                     </div>
                                     <div class="col-lg-6 pb-2 d-flex justify-content-end">
                                         <a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i+1].getOglasId()})}"
@@ -315,7 +317,8 @@
                             <div class="col-lg-12">
                                 <div class="row d-flex justify-content-between">
                                     <div class="col-lg-6 pb-2">
-                                        <span class="badge badge-info p-2" th:text="${oglasi[i+2].cena + '$'}"></span>
+                                        <span th:if="${oglasi[i+2].vrstaOglasaId == 1}" class="badge badge-info p-2" th:text="${oglasi[i+2].cena*oglasi[i+2].kvadratura + '$'}"></span>
+                                        <span th:if="${oglasi[i+2].vrstaOglasaId == 2}" class="badge badge-success p-2" th:text="${oglasi[i+2].cena + '$/mes'}"></span>
                                     </div>
                                     <div class="col-lg-6 pb-2 d-flex justify-content-end">
                                         <a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i+2].getOglasId()})}"