Commit d9d860dd by Bogdan Andjelkovic

updateProfileBezSliek finished ( ostao front )

parent 09543786
......@@ -58,15 +58,15 @@ public class AppController
public String getProfile( Model model, @AuthenticationPrincipal KorisnikDetails loggedUser)
{
model.addAttribute("loggedUser", loggedUser);
model.addAttribute("editUser", loggedUser);
model.addAttribute("editUser", loggedUser.getKorisnik());
model.addAttribute("profileRole", kRepo.findRoleById( loggedUser.getKorisnik().getTipId()));
return("profile");
}
@PostMapping("/profile-edit")
public String postProfileEdit( @ModelAttribute KorisnikDetails korisnikDetails)
@PostMapping("/profile-update")
public String postProfileEdit( @ModelAttribute Korisnik korisnik)
{
kRepo.update( korisnikDetails.getKorisnik());
kRepo.update( korisnik);
return "redirect:/profile";
}
}
......@@ -14,7 +14,6 @@ public class KorisnikDetailsService implements UserDetailsService
@Override
public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
Korisnik korisnik = kRepo.findByEmail(email);
System.out.println( korisnik.toString());
if (korisnik != null)
{
return new KorisnikDetails( korisnik);
......
......@@ -41,13 +41,13 @@ public class KorisnikRepository
public void update( Korisnik korisnik)
{
String sql = " insert into korisnik " +
" where korisnikid = " + korisnik.getKorisnikId() +
" set ime = " + korisnik.getIme() +
",set prezime = " + korisnik.getPrezime() +
",set email = " + korisnik.getEmail() +
",set sifra = " + new BCryptPasswordEncoder().encode(korisnik.getSifra()) +
",set telefon = " + korisnik.getTelefon();
String sql = " update korisnik " +
" set ime = '" + korisnik.getIme() +
"',prezime = '" + korisnik.getPrezime() +
"',email = '" + korisnik.getEmail() +
"',sifra = '" + new BCryptPasswordEncoder().encode(korisnik.getSifra()) +
"',telefon = '" + korisnik.getTelefon() +
"' where korisnikid = " + korisnik.getKorisnikId();
try {
System.out.println( sql);
statement.executeUpdate( sql);
......@@ -64,8 +64,7 @@ public class KorisnikRepository
try {
slika = Base64.getEncoder().encodeToString(file.getBytes());
sql = " insert into korisnik " +
" where korisnikid = " + korisnik.getKorisnikId() +
" set slika = " + slika;
" set slika = '" + slika + "' where korisnikid = " + korisnik.getKorisnikId();
System.out.println( sql);
statement.executeUpdate( sql);
} catch (SQLException e) {
......
......@@ -92,33 +92,35 @@
</div>
</div>
</div>
<form class="requires-validation" novalidate th:object="${editUser}" method="POST" th:action="@{/profile-update}" enctype="multipart/form-data">
<input th:field="${editUser.korisnikId}" class="form-control" type="hidden" name="name" placeholder="Ime" required>
<div class="col-md-12">
<input th:field="${editUser.getKorisnik().ime}" class="form-control" type="text" name="name" placeholder="Ime" required>
<input th:field="${editUser.ime}" class="form-control" type="text" name="name" placeholder="Ime" required>
<div class="valid-feedback">Dobro ime!</div>
<div class="invalid-feedback">Ime ne sme biti prazno!</div>
</div>
<div class="col-md-12">
<input th:field="${editUser.getKorisnik().prezime}" class="form-control" type="text" name="surname" placeholder="Prezime" required>
<input th:field="${editUser.prezime}" class="form-control" type="text" name="surname" placeholder="Prezime" required>
<div class="valid-feedback">Dobro prezime!</div>
<div class="invalid-feedback">Prezime ne sme biti prazno!</div>
</div>
<div class="col-md-12">
<input th:field="${editUser.getKorisnik().telefon}" class="form-control" type="text" name="phone" placeholder="Broj telefona" required>
<input th:field="${editUser.telefon}" class="form-control" type="text" name="phone" placeholder="Broj telefona" required>
<div class="valid-feedback">Dobar broj!</div>
<div class="invalid-feedback">Broj telefona ne sme biti prazan!</div>
</div>
<div class="col-md-12">
<input th:field="${editUser.getKorisnik().email}" class="form-control" type="email" name="email" placeholder="E-mail Adresa" required>
<input th:field="${editUser.email}" class="form-control" type="email" name="email" placeholder="E-mail Adresa" required>
<div class="valid-feedback">Dobar email!</div>
<div class="invalid-feedback">Email ne sme biti prazan!</div>
</div>
<div class="col-md-12">
<input th:field="${editUser.getKorisnik().sifra}" class="form-control" type="password" name="password" placeholder="Sifra" required>
<input th:field="${editUser.sifra}" class="form-control" type="password" name="password" placeholder="Sifra" required>
<div class="valid-feedback">Dobra sifra!</div>
<div class="invalid-feedback">Sifra ne sme biti prazna!</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