Skip to content

S
SkuciSe
Commit 0c2cd067 by Bogdan Andjelkovic
Options

komentari prikaz uradjen - front - finished

parent e66e4514
Showing with 43 additions and 72 deletions
SkuciSe/src/main/java/com/example/SkuciSe/controller/OglasController.java
package com.example.SkuciSe.controller; package com.example.SkuciSe.controller;
import com.example.SkuciSe.model.komentar.Komentar;
import com.example.SkuciSe.model.korisnik.Korisnik; import com.example.SkuciSe.model.korisnik.Korisnik;
import com.example.SkuciSe.model.korisnik.KorisnikDetails; import com.example.SkuciSe.model.korisnik.KorisnikDetails;
import com.example.SkuciSe.model.oglas.Oglas; import com.example.SkuciSe.model.oglas.Oglas;
...@@ -34,6 +35,9 @@ public class OglasController ...@@ -34,6 +35,9 @@ public class OglasController
@Autowired @Autowired
ZahtevRepository zRepo; ZahtevRepository zRepo;
@Autowired
KomentarRepository komentarRepository;
@GetMapping("/novi-oglas") @GetMapping("/novi-oglas")
public String getNoviOglas(Model model, @AuthenticationPrincipal KorisnikDetails loggedUser) public String getNoviOglas(Model model, @AuthenticationPrincipal KorisnikDetails loggedUser)
{ {
...@@ -103,6 +107,14 @@ public class OglasController ...@@ -103,6 +107,14 @@ public class OglasController
model.addAttribute("korisnici", korisnici); model.addAttribute("korisnici", korisnici);
} }
List<Komentar> komentari = komentarRepository.findAllByOglasID( oglasId);
List<Korisnik> korisniciKomentari = new ArrayList<Korisnik>();
model.addAttribute("komentari", komentari);
for( Komentar komentar: komentari)
{
korisniciKomentari.add( kRepo.findById( komentar.getKorisnikId()));
}
model.addAttribute("korisniciKomentari", korisniciKomentari);
return("oglas"); return("oglas");
} }
@GetMapping("/profile/moji-oglasi") @GetMapping("/profile/moji-oglasi")
......
SkuciSe/src/main/java/com/example/SkuciSe/repository/KomentarRepository.java
...@@ -6,6 +6,9 @@ import org.springframework.stereotype.Component; ...@@ -6,6 +6,9 @@ import org.springframework.stereotype.Component;
import java.sql.CallableStatement; import java.sql.CallableStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@Component @Component
public class KomentarRepository { public class KomentarRepository {
...@@ -33,4 +36,25 @@ public class KomentarRepository { ...@@ -33,4 +36,25 @@ public class KomentarRepository {
System.out.println(e.getMessage()); System.out.println(e.getMessage());
} }
} }
public List<Komentar> findAllByOglasID( int oglasId)
{
List<Komentar> komentari = new ArrayList<Komentar>();
CallableStatement cs = null;
String sql = "{ call findAllKomentarByOglasID(?)}";
ResultSet rs = null;
try {
cs = dataBase.connection.prepareCall( sql);
cs.setInt( 1, oglasId);
rs = cs.executeQuery();
while( rs.next())
{
komentari.add( new Komentar( rs.getInt("komentarid"), rs.getInt("oglasid"), rs.getInt("korisnikid"), rs.getInt("ocena"), rs.getString("komentar"),rs.getString("datum"),rs.getString("vreme")));
}
} catch (SQLException e) {
throw new RuntimeException(e);
}
return( komentari);
}
} }
SkuciSe/src/main/resources/templates/oglas.html
...@@ -220,83 +220,18 @@ ...@@ -220,83 +220,18 @@
<div class="row"> <div class="row">
<div class="col-5"> <div class="col-5">
<div class="container"> <div class="container">
<div class="row"> <div class="row" th:object="${korisniciKomentari}">
<div class="col-md-8"> <div class="col-md-8" th:each="komentar:${komentari}">
<div class="media g-mb-30 media-comment"> <div class="media g-mb-30 media-comment">
<img class="d-flex g-width-50 g-height-50 rounded-circle g-mt-3 g-mr-15"
src="https://bootdey.com/img/Content/avatar/avatar7.png" alt="Image Description">
<div class="media-body u-shadow-v18 g-bg-secondary g-pa-30"> <div class="media-body u-shadow-v18 g-bg-secondary g-pa-30">
<img class="d-flex g-width-50 g-height-50 rounded-circle g-mt-3 g-mr-15"
th:src="@{'data:image/png;charset=utf-8;base64,'+${korisniciKomentari[komentarStat.count -1].slika}}" alt="Image Description">
<div class="g-mb-15"> <div class="g-mb-15">
<h5 class="h5 g-color-gray-dark-v1 mb-0">John Doe</h5> <h5 class="h5 g-color-gray-dark-v1 mb-0" th:text="${korisniciKomentari[komentarStat.count -1].ime + ' ' + korisniciKomentari[komentarStat.count -1].prezime}">John Doe</h5>
<span class="g-color-gray-dark-v4 g-font-size-12">5 days ago</span> <span class="g-color-gray-dark-v4 g-font-size-12" th:text="${komentar.vreme + ' ' + komentar.datum}"></span>
</div> </div>
<p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante <p th:text="${komentar.komentar}"></p>
sollicitudin. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue
felis in faucibus ras purus odio, vestibulum in vulputate at, tempus viverra
turpis.</p>
<ul class="list-inline d-sm-flex my-0">
<li class="list-inline-item g-mr-20">
<a class="u-link-v5 g-color-gray-dark-v4 g-color-primary--hover" href="#!">
<i class="fa fa-thumbs-up g-pos-rel g-top-1 g-mr-3"></i>
178
</a>
</li>
<li class="list-inline-item g-mr-20">
<a class="u-link-v5 g-color-gray-dark-v4 g-color-primary--hover" href="#!">
<i class="fa fa-thumbs-down g-pos-rel g-top-1 g-mr-3"></i>
34
</a>
</li>
<li class="list-inline-item ml-auto">
<a class="u-link-v5 g-color-gray-dark-v4 g-color-primary--hover" href="#!">
<i class="fa fa-reply g-pos-rel g-top-1 g-mr-3"></i>
Reply
</a>
</li>
</ul>
</div>
</div>
</div>
<div class="col-md-8">
<div class="media g-mb-30 media-comment">
<img class="d-flex g-width-50 g-height-50 rounded-circle g-mt-3 g-mr-15"
src="https://bootdey.com/img/Content/avatar/avatar1.png" alt="Image Description">
<div class="media-body u-shadow-v18 g-bg-secondary g-pa-30">
<div class="g-mb-15">
<h5 class="h5 g-color-gray-dark-v1 mb-0">John Doe</h5>
<span class="g-color-gray-dark-v4 g-font-size-12">5 days ago</span>
</div>
<p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante
sollicitudin. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue
felis in faucibus ras purus odio, vestibulum in vulputate at, tempus viverra
turpis.</p>
<ul class="list-inline d-sm-flex my-0">
<li class="list-inline-item g-mr-20">
<a class="u-link-v5 g-color-gray-dark-v4 g-color-primary--hover" href="#!">
<i class="fa fa-thumbs-up g-pos-rel g-top-1 g-mr-3"></i>
178
</a>
</li>
<li class="list-inline-item g-mr-20">
<a class="u-link-v5 g-color-gray-dark-v4 g-color-primary--hover" href="#!">
<i class="fa fa-thumbs-down g-pos-rel g-top-1 g-mr-3"></i>
34
</a>
</li>
<li class="list-inline-item ml-auto">
<a class="u-link-v5 g-color-gray-dark-v4 g-color-primary--hover" href="#!">
<i class="fa fa-reply g-pos-rel g-top-1 g-mr-3"></i>
Reply
</a>
</li>
</ul>
</div> </div>
</div> </div>
</div> </div>
......
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