Skip to content

S
SkuciSe
Commit 27fe0e8a by Bogdan Andjelkovic
Options

dodata pretraga po nazivu i opisu - back - finished

parent 26ca30c9
Showing with 14 additions and 6 deletions
SkuciSe/src/main/java/com/example/SkuciSe/controller/OglasController.java
...@@ -61,10 +61,11 @@ public class OglasController ...@@ -61,10 +61,11 @@ public class OglasController
@RequestParam(value = "kvadraturaMax", required=false) Double kvadraturaMax, @RequestParam(value = "kvadraturaMax", required=false) Double kvadraturaMax,
@RequestParam(value = "lift", required=false) Boolean lift, @RequestParam(value = "lift", required=false) Boolean lift,
@RequestParam(value = "grejanje", required=false) Boolean grejanje, @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); 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){ while(listaOglasa.size() % 3 != 0){
Oglas o = new Oglas(); Oglas o = new Oglas();
listaOglasa.add(o); listaOglasa.add(o);
...@@ -100,10 +101,11 @@ public class OglasController ...@@ -100,10 +101,11 @@ public class OglasController
@RequestParam(value = "kvadraturaMax", required=false) Double kvadraturaMax, @RequestParam(value = "kvadraturaMax", required=false) Double kvadraturaMax,
@RequestParam(value = "lift", required=false) Boolean lift, @RequestParam(value = "lift", required=false) Boolean lift,
@RequestParam(value = "grejanje", required=false) Boolean grejanje, @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); 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){ while(listaOglasa.size() % 3 != 0){
Oglas o = new Oglas(); Oglas o = new Oglas();
listaOglasa.add(o); listaOglasa.add(o);
......
SkuciSe/src/main/java/com/example/SkuciSe/repository/OglasRepository.java
...@@ -120,7 +120,7 @@ public class OglasRepository ...@@ -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>(); List<Oglas> list = new ArrayList<Oglas>();
String sql = "{call findAll()}"; String sql = "{call findAll()}";
...@@ -148,6 +148,9 @@ public class OglasRepository ...@@ -148,6 +148,9 @@ public class OglasRepository
if(!( grejanje == null || ( grejanje != null && grejanje == oglas.isGrejanje() ) ) ) continue; if(!( grejanje == null || ( grejanje != null && grejanje == oglas.isGrejanje() ) ) ) continue;
if(!( namesten == null || ( namesten != null && namesten == oglas.isNamesten() ) ) ) 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); list.add( oglas);
} }
} catch (SQLException e) { } catch (SQLException e) {
...@@ -156,7 +159,7 @@ public class OglasRepository ...@@ -156,7 +159,7 @@ public class OglasRepository
return( list); 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>(); List<Oglas> list = new ArrayList<Oglas>();
String sql = "{call findAllByKorisnikId(?)}"; String sql = "{call findAllByKorisnikId(?)}";
...@@ -185,6 +188,9 @@ public class OglasRepository ...@@ -185,6 +188,9 @@ public class OglasRepository
if(!( grejanje == null || ( grejanje != null && grejanje == oglas.isGrejanje() ) ) ) continue; if(!( grejanje == null || ( grejanje != null && grejanje == oglas.isGrejanje() ) ) ) continue;
if(!( namesten == null || ( namesten != null && namesten == oglas.isNamesten() ) ) ) 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); list.add( oglas);
} }
} catch (SQLException e) { } catch (SQLException e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment