Skip to content

S
SkuciSe
Commit ee6b3719 by Milovan Samardzic
Options

Merge remote-tracking branch 'origin/master'

parents c9570279 9a5e5b42
Showing with 20 additions and 11 deletions
SkuciSe/src/main/java/com/example/SkuciSe/controller/OglasController.java
...@@ -45,8 +45,10 @@ public class OglasController ...@@ -45,8 +45,10 @@ public class OglasController
@PostMapping("/novi-oglas/save") @PostMapping("/novi-oglas/save")
public String postSaveNoviOglas( @ModelAttribute("newOglas") Oglas newOglas, @RequestParam("images") MultipartFile[] files, @AuthenticationPrincipal KorisnikDetails loggedUser) public String postSaveNoviOglas( @ModelAttribute("newOglas") Oglas newOglas, @RequestParam("images") MultipartFile[] files, @AuthenticationPrincipal KorisnikDetails loggedUser)
{ {
oRepo.insert( loggedUser.getKorisnik().getKorisnikId(), newOglas, files); int oglasId = oRepo.insert( loggedUser.getKorisnik().getKorisnikId(), newOglas, files);
return("redirect:/profile"); if( oglasId == -1)
return("redirect:/novi-oglas");
return("redirect:/lista-oglasa/"+oglasId);
} }
@GetMapping("/lista-oglasa") @GetMapping("/lista-oglasa")
......
SkuciSe/src/main/java/com/example/SkuciSe/repository/OglasRepository.java
...@@ -17,7 +17,7 @@ public class OglasRepository ...@@ -17,7 +17,7 @@ public class OglasRepository
@Autowired @Autowired
DataBase dataBase; DataBase dataBase;
public void insert( int korisnikId, Oglas newOglas, MultipartFile[] files) public int insert( int korisnikId, Oglas newOglas, MultipartFile[] files)
{ {
int oglasId; int oglasId;
//String sql = "{ call insertOglas(?,?,?,?,?,?,?,?,?,?,?,?)}"; //String sql = "{ call insertOglas(?,?,?,?,?,?,?,?,?,?,?,?)}";
...@@ -49,14 +49,14 @@ public class OglasRepository ...@@ -49,14 +49,14 @@ public class OglasRepository
sql += " values ("+oglasId+",'"+filename+"')"; sql += " values ("+oglasId+",'"+filename+"')";
dataBase.statement.executeUpdate( sql); dataBase.statement.executeUpdate( sql);
} }
return( oglasId);
} }
} catch (SQLException e) { } catch (SQLException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
return( -1);
} }
public Oglas findById(int oglasId) public Oglas findById(int oglasId)
...@@ -148,8 +148,7 @@ public class OglasRepository ...@@ -148,8 +148,7 @@ 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; if(!( pretraga == null || ( pretraga != null && (oglas.getNaslov().toLowerCase().indexOf( pretraga.toLowerCase())!=-1 || oglas.getOpis().toLowerCase().indexOf( pretraga.toLowerCase())!=-1)) ) ) continue;
else if(!( pretraga == null || ( pretraga != null && oglas.getOpis().toLowerCase().contains( pretraga.toLowerCase()) ) ) ) continue;
list.add( oglas); list.add( oglas);
} }
...@@ -191,6 +190,7 @@ public class OglasRepository ...@@ -191,6 +190,7 @@ public class OglasRepository
if(!( pretraga == null || ( pretraga != null && oglas.getNaslov().toLowerCase().contains( pretraga.toLowerCase()) ) ) ) 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; else if(!( pretraga == null || ( pretraga != null && oglas.getOpis().toLowerCase().contains( pretraga.toLowerCase()) ) ) ) continue;
System.out.println( oglas.toString());
list.add( oglas); list.add( oglas);
} }
} catch (SQLException e) { } catch (SQLException e) {
......
SkuciSe/src/main/resources/static/js/main.js
...@@ -48,6 +48,7 @@ document.getElementById("flexRadioDefault1").setAttribute("checked", "checked") ...@@ -48,6 +48,7 @@ document.getElementById("flexRadioDefault1").setAttribute("checked", "checked")
function postaviFiltere() { function postaviFiltere() {
const params = new URLSearchParams(window.location.search) const params = new URLSearchParams(window.location.search)
let pretraga = document.getElementById("pretraga")
let cenaMin = document.getElementById("cena-min") let cenaMin = document.getElementById("cena-min")
let cenaMax = document.getElementById("cena-max") let cenaMax = document.getElementById("cena-max")
let radioIzdavanje = document.getElementById("radio-izdavanje") let radioIzdavanje = document.getElementById("radio-izdavanje")
...@@ -61,6 +62,9 @@ function postaviFiltere() { ...@@ -61,6 +62,9 @@ function postaviFiltere() {
let namesten = document.getElementById("check-namesten") let namesten = document.getElementById("check-namesten")
for (const param of params) { for (const param of params) {
console.log(param[0], param[1]) console.log(param[0], param[1])
if (param[0] === "pretraga" && param[1] !== "") {
pretraga.value = param[1];
}
if (param[0] === "cenaMin" && param[1] !== "") { if (param[0] === "cenaMin" && param[1] !== "") {
cenaMin.value = param[1]; cenaMin.value = param[1];
} }
......
SkuciSe/src/main/resources/templates/lista-oglasa.html
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
</article> </article>
<article class="card-group-item"> <article class="card-group-item">
<header class="card-header"> <header class="card-header">
<h6 class="title">Cena </h6> <h6 class="title">Cena po kvadratu</h6>
</header> </header>
<div class="filter-content"> <div class="filter-content">
<div class="card-body"> <div class="card-body">
...@@ -247,7 +247,8 @@ ...@@ -247,7 +247,8 @@
<div class="col-lg-12"> <div class="col-lg-12">
<div class="row d-flex justify-content-between"> <div class="row d-flex justify-content-between">
<div class="col-lg-6 pb-2"> <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>
<div class="col-lg-6 pb-2 d-flex justify-content-end"> <div class="col-lg-6 pb-2 d-flex justify-content-end">
<a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i].getOglasId()})}" <a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i].getOglasId()})}"
...@@ -281,7 +282,8 @@ ...@@ -281,7 +282,8 @@
<div class="col-lg-12"> <div class="col-lg-12">
<div class="row d-flex justify-content-between"> <div class="row d-flex justify-content-between">
<div class="col-lg-6 pb-2"> <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>
<div class="col-lg-6 pb-2 d-flex justify-content-end"> <div class="col-lg-6 pb-2 d-flex justify-content-end">
<a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i+1].getOglasId()})}" <a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i+1].getOglasId()})}"
...@@ -315,7 +317,8 @@ ...@@ -315,7 +317,8 @@
<div class="col-lg-12"> <div class="col-lg-12">
<div class="row d-flex justify-content-between"> <div class="row d-flex justify-content-between">
<div class="col-lg-6 pb-2"> <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>
<div class="col-lg-6 pb-2 d-flex justify-content-end"> <div class="col-lg-6 pb-2 d-flex justify-content-end">
<a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i+2].getOglasId()})}" <a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i+2].getOglasId()})}"
......
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