Merge remote-tracking branch 'origin/master'

SkuciSe/src/main/java/com/example/SkuciSe/controller/OglasController.java

@@ -61,10 +61,11 @@ public class OglasController
                                   @RequestParam(value = "kvadraturaMax", required=false) Double kvadraturaMax,
                                   @RequestParam(value = "lift", required=false) Boolean lift,
                                   @RequestParam(value = "grejanje", required=false) Boolean grejanje,
-                                  @RequestParam(value = "namesten", required=false) Boolean namesten)
+                                  @RequestParam(value = "namesten", required=false) Boolean namesten,
+                                  @RequestParam(value = "pretraga", required=false) String pretraga)
     {
         model.addAttribute("loggedUser", loggedUser);
-        List<Oglas> listaOglasa = oRepo.findAll( vrstaOglasaId, lokacijaId, brojSoba, cenaMin, cenaMax, kvadraturaMin,kvadraturaMax, lift, grejanje, namesten);
+        List<Oglas> listaOglasa = oRepo.findAll( vrstaOglasaId, lokacijaId, brojSoba, cenaMin, cenaMax, kvadraturaMin,kvadraturaMax, lift, grejanje, namesten, pretraga);
         while(listaOglasa.size() % 3 != 0){
             Oglas o = new Oglas();
             listaOglasa.add(o);
@@ -100,10 +101,11 @@ public class OglasController
                                  @RequestParam(value = "kvadraturaMax", required=false) Double kvadraturaMax,
                                  @RequestParam(value = "lift", required=false) Boolean lift,
                                  @RequestParam(value = "grejanje", required=false) Boolean grejanje,
-                                 @RequestParam(value = "namesten", required=false) Boolean namesten)
+                                 @RequestParam(value = "namesten", required=false) Boolean namesten,
+                                 @RequestParam(value = "pretraga", required=false) String pretraga)
     {
         model.addAttribute("loggedUser", loggedUser);
-        List<Oglas> listaOglasa = oRepo.findAllByKorisnikId( loggedUser.getKorisnik().getKorisnikId(), vrstaOglasaId, lokacijaId, brojSoba, cenaMin, cenaMax, kvadraturaMin,kvadraturaMax, lift, grejanje, namesten);
+        List<Oglas> listaOglasa = oRepo.findAllByKorisnikId( loggedUser.getKorisnik().getKorisnikId(), vrstaOglasaId, lokacijaId, brojSoba, cenaMin, cenaMax, kvadraturaMin,kvadraturaMax, lift, grejanje, namesten, pretraga);
         while(listaOglasa.size() % 3 != 0){
             Oglas o = new Oglas();
             listaOglasa.add(o);

SkuciSe/src/main/java/com/example/SkuciSe/repository/OglasRepository.java

@@ -120,7 +120,7 @@ public class OglasRepository
         }
     }
 
-    public List<Oglas> findAll(Integer vrstaOglasaId, Integer lokacijaId, Integer brojSoba, Double cenaMin, Double cenaMax, Double kvadraturaMin, Double kvadraturaMax, Boolean lift, Boolean grejanje, Boolean namesten)
+    public List<Oglas> findAll(Integer vrstaOglasaId, Integer lokacijaId, Integer brojSoba, Double cenaMin, Double cenaMax, Double kvadraturaMin, Double kvadraturaMax, Boolean lift, Boolean grejanje, Boolean namesten, String pretraga)
     {
         List<Oglas> list = new ArrayList<Oglas>();
         String sql = "{call findAll()}";
@@ -148,6 +148,9 @@ public class OglasRepository
                 if(!( grejanje == null || ( grejanje != null && grejanje == oglas.isGrejanje() ) ) ) continue;
                 if(!( namesten == null || ( namesten != null && namesten == oglas.isNamesten() ) ) ) continue;
 
+                if(!( pretraga == null || ( pretraga != null && oglas.getNaslov().toLowerCase().contains( pretraga.toLowerCase()) ) ) ) continue;
+                else if(!( pretraga == null || ( pretraga != null && oglas.getOpis().toLowerCase().contains( pretraga.toLowerCase()) ) ) ) continue;
+
                 list.add( oglas);
             }
         } catch (SQLException e) {
@@ -156,7 +159,7 @@ public class OglasRepository
         return( list);
     }
 
-    public List<Oglas> findAllByKorisnikId(int korisnikId, Integer vrstaOglasaId, Integer lokacijaId, Integer brojSoba, Double cenaMin, Double cenaMax, Double kvadraturaMin, Double kvadraturaMax, Boolean lift, Boolean grejanje, Boolean namesten)
+    public List<Oglas> findAllByKorisnikId(int korisnikId, Integer vrstaOglasaId, Integer lokacijaId, Integer brojSoba, Double cenaMin, Double cenaMax, Double kvadraturaMin, Double kvadraturaMax, Boolean lift, Boolean grejanje, Boolean namesten, String pretraga)
     {
         List<Oglas> list = new ArrayList<Oglas>();
         String sql = "{call findAllByKorisnikId(?)}";
@@ -185,6 +188,9 @@ public class OglasRepository
                 if(!( grejanje == null || ( grejanje != null && grejanje == oglas.isGrejanje() ) ) ) continue;
                 if(!( namesten == null || ( namesten != null && namesten == oglas.isNamesten() ) ) ) continue;
 
+                if(!( pretraga == null || ( pretraga != null && oglas.getNaslov().toLowerCase().contains( pretraga.toLowerCase()) ) ) ) continue;
+                else if(!( pretraga == null || ( pretraga != null && oglas.getOpis().toLowerCase().contains( pretraga.toLowerCase()) ) ) ) continue;
+
                 list.add( oglas);
             }
         } catch (SQLException e) {

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

@@ -95,6 +95,20 @@
             <div class="card mt-2" style="min-width: 130px">
                 <article class="card-group-item">
                     <header class="card-header">
+                        <h6 class="title">Pretraga</h6>
+                    </header>
+                    <div class="filter-content">
+                        <div class="card-body">
+                            <div class="form-row">
+                                <div class="form-group col-md-6">
+                                    <input type="text" class="form-control" name="pretraga" id="pretraga" placeholder="Pretrazi">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </article>
+                <article class="card-group-item">
+                    <header class="card-header">
                         <h6 class="title">Cena </h6>
                     </header>
                     <div class="filter-content">