Commit 4ff6a1b9 by Bogdan Andjelkovic

finesovanje linkova

parent bf33d929
...@@ -94,7 +94,6 @@ public class ProfileController ...@@ -94,7 +94,6 @@ public class ProfileController
@GetMapping("/korisnik/{korisnikId}") @GetMapping("/korisnik/{korisnikId}")
public String getKorisnik(Model model, @AuthenticationPrincipal KorisnikDetails loggedUser, @PathVariable("korisnikId") int korisnikId) public String getKorisnik(Model model, @AuthenticationPrincipal KorisnikDetails loggedUser, @PathVariable("korisnikId") int korisnikId)
{ {
model.addAttribute("countOglas",oRepo.countOglasByKorisnikId(korisnikId));
model.addAttribute("loggedUser", loggedUser); model.addAttribute("loggedUser", loggedUser);
model.addAttribute("korisnik", kRepo.findById( korisnikId)); model.addAttribute("korisnik", kRepo.findById( korisnikId));
List<Oglas> oglasi = oRepo.findAllByKorisnikId(korisnikId,null,null,null,null,null,null,null,null,null,null,null); List<Oglas> oglasi = oRepo.findAllByKorisnikId(korisnikId,null,null,null,null,null,null,null,null,null,null,null);
...@@ -110,6 +109,7 @@ public class ProfileController ...@@ -110,6 +109,7 @@ public class ProfileController
model.addAttribute("komentari", komentari); model.addAttribute("komentari", komentari);
model.addAttribute("korisniciKomentari", korisniciKomentari); model.addAttribute("korisniciKomentari", korisniciKomentari);
model.addAttribute("avgOcena", komRepo.averageOcenaByKorisnikId( korisnikId)); model.addAttribute("avgOcena", komRepo.averageOcenaByKorisnikId( korisnikId));
model.addAttribute("countOglas",oRepo.countOglasByKorisnikId(korisnikId));
return "korisnik"; return "korisnik";
} }
} }
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
<div class="filter-content"> <div class="filter-content">
<p class="fw-bold h4 mt-3"><span th:text="${korisnik.ime + ' ' + korisnik.prezime}"></span></p> <p class="fw-bold h4 mt-3"><span th:text="${korisnik.ime + ' ' + korisnik.prezime}"></span></p>
<p th:object="${avgOcena}" th:text="${'Prosecna ocena korisnika: ' + avgOcena}"></p> <p th:object="${avgOcena}" th:text="${'Prosecna ocena korisnika: ' + avgOcena}"></p>
<p th:object="${countOglas}" th:text="${'Broj aktivnih oglasa: ' + countOglas}"></p>
</div> </div>
</article> </article>
</div> </div>
......
...@@ -127,9 +127,11 @@ ...@@ -127,9 +127,11 @@
</div> </div>
<div class="col-lg-3 col-md-4 col-sm-2 col-xs-3"> <div class="col-lg-3 col-md-4 col-sm-2 col-xs-3">
<div class="card-body"> <div class="card-body">
<h2 class="card-title" <a class="card-title"
th:text="${oglas.naslov}"> th:href="@{/lista-oglasa/{oglasId}(oglasId=${oglas.oglasId})}"
</h2> th:text="${oglas.naslov}"
style=" text-decoration: none; color: #6C757D">
</a>
<h4 class="card-title" <h4 class="card-title"
th:text="${oglas.lokacija}"> th:text="${oglas.lokacija}">
</h4> </h4>
......
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