Skip to content

S
SkuciSe
Commit d0baa575 by Milovan Samardzic
Options

mojiZahteviIOglasKomentar

parent 4ac943c8
Showing with 80 additions and 44 deletions
SkuciSe/src/main/resources/static/css/oglasiStyle.css
...@@ -332,7 +332,6 @@ h3{ ...@@ -332,7 +332,6 @@ h3{
.border-bottom-grey { .border-bottom-grey {
border-bottom: 1px solid #c0c4c8; border-bottom: 1px solid #c0c4c8;
} }
.gradient-bg { .gradient-bg {
background: linear-gradient(90deg, rgba(255,255,255,1) 0%, rgba(251,251,251,1) 10%, rgba(251,251,251,1) 91%, rgba(255,255,255,1) 100%); background: linear-gradient(90deg, rgba(255,255,255,1) 0%, rgba(251,251,251,1) 10%, rgba(251,251,251,1) 91%, rgba(255,255,255,1) 100%);
} }
......
SkuciSe/src/main/resources/templates/moji-zahtevi.html
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<div class="row w-100 h-50" style="margin-top:50px;"> <div class="row w-100 h-50" style="margin-top:50px;">
<div class="row"> <div class="row">
<h2 th:if="${oglasi.size() == 0}" class="text-center">Jos niste poslali nijedan zahtev!</h2> <h2 th:if="${oglasi.size() == 0}" class="text-center">Jos niste poslali nijedan zahtev!</h2>
<div class="card mb-3" th:each="oglas: ${oglasi}" style="background: transparent"> <div class="card mb-3" th:each="oglas: ${oglasi}" style="background: transparent" th:if="${!zahtevi[oglasStat.index].korisnikKom}">
<div class="row"> <div class="row">
<div class="col-lg-2 col-md-3 col-sm-2 col-xs-2 d-flex justify-content-center align-items-center"> <div class="col-lg-2 col-md-3 col-sm-2 col-xs-2 d-flex justify-content-center align-items-center">
<img <img
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
</button> </button>
</form> </form>
</div> </div>
<div class="col-lg-7 col-md-5 col-sm-7 col-xs-7 d-flex align-items-center flex-row justify-content-center" th:if="${zahtevi[oglasStat.index].status.toString() == 'ZAVRSEN'}"> <div class="col-lg-7 col-md-5 col-sm-7 col-xs-7 d-flex align-items-center flex-row justify-content-center" th:if="${(zahtevi[oglasStat.index].status.toString() == 'ZAVRSEN')}">
<form method="get" class="row w-100 h-100 flex-wrap flex-row" <form method="get" class="row w-100 h-100 flex-wrap flex-row"
th:action="@{/profile/moji-zahtevi/sacuvaj-komentar}" th:action="@{/profile/moji-zahtevi/sacuvaj-komentar}"
th:if="${zahtevi[oglasStat.index].status.toString() == 'ZAVRSEN'}"> th:if="${zahtevi[oglasStat.index].status.toString() == 'ZAVRSEN'}">
...@@ -172,16 +172,16 @@ ...@@ -172,16 +172,16 @@
name="zahtevId" style="display: none"> name="zahtevId" style="display: none">
</div> </div>
<div class="starrating risingstar d-flex justify-content-center flex-row-reverse"> <div class="starrating risingstar d-flex justify-content-center flex-row-reverse">
<input type="radio" id="star5" name="ocenaRadio" value="5"/><label <input type="radio" th:id="${'star' + zahtevi[oglasStat.index].zahtevId + '-5'}" name="ocenaRadio" value="5"/><label
for="star5" title="5 star"></label> th:for="${'star' + zahtevi[oglasStat.index].zahtevId + '-5'}" title="5 star"></label>
<input type="radio" id="star4" name="ocenaRadio" value="4"/><label <input type="radio" th:id="${'star' + zahtevi[oglasStat.index].zahtevId + '-4'}" name="ocenaRadio" value="4"/><label
for="star4" title="4 star"></label> th:for="${'star' + zahtevi[oglasStat.index].zahtevId + '-4'}" title="4 star"></label>
<input type="radio" id="star3" name="ocenaRadio" value="3"/><label <input type="radio" th:id="${'star' + zahtevi[oglasStat.index].zahtevId + '-3'}" name="ocenaRadio" value="3"/><label
for="star3" title="3 star"></label> th:for="${'star' + zahtevi[oglasStat.index].zahtevId + '-3'}" title="3 star"></label>
<input type="radio" id="star2" name="ocenaRadio" value="2"/><label <input type="radio" th:id="${'star' + zahtevi[oglasStat.index].zahtevId + '-2'}" name="ocenaRadio" value="2"/><label
for="star2" title="2 star"></label> th:for="${'star' + zahtevi[oglasStat.index].zahtevId + '-2'}" title="2 star"></label>
<input type="radio" id="star1" name="ocenaRadio" value="1"/><label <input type="radio" th:id="${'star' + zahtevi[oglasStat.index].zahtevId + '-1'}" name="ocenaRadio" value="1"/><label
for="star1" title="1 star"></label> th:for="${'star' + zahtevi[oglasStat.index].zahtevId + '-1'}" title="1 star"></label>
</div> </div>
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-3 col-xs-3 d-flex justify-content-center align-items-center"> <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3 d-flex justify-content-center align-items-center">
......
SkuciSe/src/main/resources/templates/oglas.html
...@@ -146,10 +146,13 @@ ...@@ -146,10 +146,13 @@
<h1 th:text="${oglas.naslov}" class="oglas-naslov"></h1> <h1 th:text="${oglas.naslov}" class="oglas-naslov"></h1>
</div> </div>
<div class="row w-100 border-bottom-grey my-3 flex-row justify-content-end align-items-center pb-3"> <div class="row w-100 border-bottom-grey my-3 flex-row justify-content-end align-items-center pb-3">
<a th:href="@{/korisnik/{korisnikId}(korisnikId=${vlasnik.korisnikId})}" th:text="${vlasnik.ime + ' '+ vlasnik.prezime}" class="text-right w-50" style="color:#495056;text-decoration: none"></a> <a th:href="@{/korisnik/{korisnikId}(korisnikId=${vlasnik.korisnikId})}"
th:text="${vlasnik.ime + ' '+ vlasnik.prezime}" class="text-right w-50"
style="color:#495056;text-decoration: none"></a>
<div style="width:50px; height:50px;"> <div style="width:50px; height:50px;">
<img class="d-flex rounded-circle" style="width: 50px; height:50px;" <img class="d-flex rounded-circle" style="width: 50px; height:50px;"
th:src="@{'data:image/png;charset=utf-8;base64,'+${vlasnik.getSlika()}}" alt="Image Description"> th:src="@{'data:image/png;charset=utf-8;base64,'+${vlasnik.getSlika()}}"
alt="Image Description">
</div> </div>
</div> </div>
<div class="col d-flex justify-content-evenly" style="color: #777;"> <div class="col d-flex justify-content-evenly" style="color: #777;">
...@@ -228,27 +231,36 @@ ...@@ -228,27 +231,36 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<img class="d-flex rounded-circle" style="height:100px; width:100px;" <img class="d-flex rounded-circle" style="height:100px; width:100px;"
th:src="@{'data:image/png;charset=utf-8;base64,'+${korisniciKomentari[komentarStat.index].slika}}" alt="Image Description"> th:src="@{'data:image/png;charset=utf-8;base64,'+${korisniciKomentari[komentarStat.index].slika}}"
alt="Image Description">
</div> </div>
<div class="col d-flex flex-column justify-content-center align-items-end"> <div class="col d-flex flex-column justify-content-center align-items-end">
<a th:href="@{/korisnik/{korisnikId}(korisnikId=${korisniciKomentari[komentarStat.index].korisnikId})}" th:text="${korisniciKomentari[komentarStat.index].ime + ' '+ korisniciKomentari[komentarStat.index].prezime}" class="text-right w-100" style="color:#495056;text-decoration: none"></a> <a th:href="@{/korisnik/{korisnikId}(korisnikId=${korisniciKomentari[komentarStat.index].korisnikId})}"
th:text="${korisniciKomentari[komentarStat.index].ime + ' '+ korisniciKomentari[komentarStat.index].prezime}"
class="text-right w-100" style="color:#495056;text-decoration: none"></a>
<br> <br>
<span class="g-color-gray-dark-v4 g-font-size-12" th:text="${komentar.vreme + ' ' + komentar.datum}"></span> <span class="g-color-gray-dark-v4 g-font-size-12"
th:text="${komentar.vreme + ' ' + komentar.datum}"></span>
</div> </div>
</div> </div>
<p class="pt-3" th:text="${komentar.komentar}"></p> <p class="pt-3" th:text="${komentar.komentar}"></p>
<div class="starrating risingstar d-flex justify-content-end flex-row-reverse"> <div class="starrating risingstar d-flex justify-content-end flex-row-reverse">
<img src th:onload="postaviZvezdice([[${komentar.ocena}]])"> <img src th:onload="postaviZvezdice([[${komentar.ocena}]])">
<input type="radio" id="star5" name="ocenaRadio" value="5" th:checked="${komentar.ocena == 5}" disabled/><label <input type="radio" id="star5" name="ocenaRadio" value="5"
th:checked="${komentar.ocena == 5}" disabled/><label
for="star5" title="5 star" style="pointer-events:none"></label> for="star5" title="5 star" style="pointer-events:none"></label>
<input type="radio" id="star4" name="ocenaRadio" value="4" th:checked="${komentar.ocena == 4}" disabled/><label <input type="radio" id="star4" name="ocenaRadio" value="4"
th:checked="${komentar.ocena == 4}" disabled/><label
for="star4" title="4 star" style="pointer-events:none"></label> for="star4" title="4 star" style="pointer-events:none"></label>
<input type="radio" id="star3" name="ocenaRadio" value="3" th:checked="${komentar.ocena == 3}" disabled/><label <input type="radio" id="star3" name="ocenaRadio" value="3"
th:checked="${komentar.ocena == 3}" disabled/><label
for="star3" title="3 star" style="pointer-events:none"></label> for="star3" title="3 star" style="pointer-events:none"></label>
<input type="radio" id="star2" name="ocenaRadio" value="2" th:checked="${komentar.ocena == 2}" disabled/><label <input type="radio" id="star2" name="ocenaRadio" value="2"
th:checked="${komentar.ocena == 2}" disabled/><label
for="star2" title="2 star" style="pointer-events:none"></label> for="star2" title="2 star" style="pointer-events:none"></label>
<input type="radio" id="star1" name="ocenaRadio" value="1" th:checked="${komentar.ocena == 1}" disabled/><label <input type="radio" id="star1" name="ocenaRadio" value="1"
th:checked="${komentar.ocena == 1}" disabled/><label
for="star1" title="1 star" style="pointer-events:none"></label> for="star1" title="1 star" style="pointer-events:none"></label>
</div> </div>
</div> </div>
...@@ -261,17 +273,11 @@ ...@@ -261,17 +273,11 @@
<div class="container container-main d-flex align-items-center justify-content-center flex-column" <div class="container container-main d-flex align-items-center justify-content-center flex-column"
th:object="${korisnici}" th:object="${korisnici}"
th:if="${(loggedUser!=null)&&(loggedUser.korisnik.korisnikId == oglas.korisnikId)}"> th:if="${(loggedUser!=null)&&(loggedUser.korisnik.korisnikId == oglas.korisnikId)}">
<h1>Spisak zahteva za obilazak</h1> <h1 th:if="${korisnici.size() > 0}">Spisak zahteva za obilazak</h1>
<div class="row w-100 h-50" style="margin-top:50px;"> <div class="row w-100 h-50" style="margin-top:50px;">
<div>
<div class="row">
<div class="col ps-md-4">
<div class="row">
<div class="card mb-3" th:each="korisnik: ${korisnici}" <div class="card mb-3" th:each="korisnik: ${korisnici}"
style="background: transparent"> style="background: transparent" th:if="${!zahtevi[korisnikStat.index].vlasnikKom}">
<div class="row no-gutters"> <div class="row">
<div class="col-md-1">
</div>
<div class="col-md-2 d-flex justify-content-center align-items-center"> <div class="col-md-2 d-flex justify-content-center align-items-center">
<img <img
th:if="${zahtevi[korisnikStat.index].status.toString() == 'POTVRDJEN'}" th:if="${zahtevi[korisnikStat.index].status.toString() == 'POTVRDJEN'}"
...@@ -307,8 +313,10 @@ ...@@ -307,8 +313,10 @@
Email:<span th:text="${korisnik.getEmail()}"></span><br> Email:<span th:text="${korisnik.getEmail()}"></span><br>
Telefon:<span th:text="${korisnik.getTelefon()}"></span> Telefon:<span th:text="${korisnik.getTelefon()}"></span>
</p> </p>
<button class="btn btn-primary" th:onclick="window.open('/chat?email='+[[${korisnik.getEmail()}]],'mywindow','menubar=1,width=650,height=900')">Posaljite poruku</button> <button class="btn btn-primary"
th:onclick="window.open('/chat?email='+[[${korisnik.getEmail()}]],'mywindow','menubar=1,width=650,height=900')">
Posaljite poruku
</button>
</div> </div>
</div> </div>
<div class="col-md-3 d-flex flex-column justify-content-around align-items-center"> <div class="col-md-3 d-flex flex-column justify-content-around align-items-center">
...@@ -320,12 +328,45 @@ ...@@ -320,12 +328,45 @@
</div> </div>
<div class="col-md-3 d-flex flex-column justify-content-around align-items-center"> <div class="col-md-3 d-flex flex-column justify-content-around align-items-center">
<form method="get" th:action="@{/oceni-korisnika}"> <form method="get" th:action="@{/oceni-korisnika}">
<input type="text" th:value="${loggedUser.korisnik.korisnikId}" name="vlasnikId" style="display: none"> <input type="text" th:value="${oglas.oglasId}" name="oglasId"
<input type="text" th:value="${korisnik.korisnikId}" name="korisnikId" style="display: none"> style="display: none"/>
<input type="text" th:value="${zahtevi[korisnikStat.index].zahtevId}" name="zahtevId" style="display: none"> <input type="text" th:value="${loggedUser.korisnik.korisnikId}" name="vlasnikId"
<input type="number" name="ocenaRadio"><br> style="display: none">
<input type="text" name="komentar"><br> <input type="text" th:value="${korisnik.korisnikId}" name="korisnikId"
<button type="submit">Oceni</button> style="display: none">
<input type="text" th:value="${zahtevi[korisnikStat.index].zahtevId}"
name="zahtevId" style="display: none">
<div class="starrating risingstar d-flex justify-content-center flex-row-reverse">
<input type="radio"
th:id="${'star' + zahtevi[korisnikStat.index].zahtevId + '-5'}"
name="ocenaRadio" value="5"/><label
th:for="${'star' + zahtevi[korisnikStat.index].zahtevId + '-5'}"
title="5 star"></label>
<input type="radio"
th:id="${'star' + zahtevi[korisnikStat.index].zahtevId + '-4'}"
name="ocenaRadio" value="4"/><label
th:for="${'star' + zahtevi[korisnikStat.index].zahtevId + '-4'}"
title="4 star"></label>
<input type="radio"
th:id="${'star' + zahtevi[korisnikStat.index].zahtevId + '-3'}"
name="ocenaRadio" value="3"/><label
th:for="${'star' + zahtevi[korisnikStat.index].zahtevId + '-3'}"
title="3 star"></label>
<input type="radio"
th:id="${'star' + zahtevi[korisnikStat.index].zahtevId + '-2'}"
name="ocenaRadio" value="2"/><label
th:for="${'star' + zahtevi[korisnikStat.index].zahtevId + '-2'}"
title="2 star"></label>
<input type="radio"
th:id="${'star' + zahtevi[korisnikStat.index].zahtevId + '-1'}"
name="ocenaRadio" value="1"/><label
th:for="${'star' + zahtevi[korisnikStat.index].zahtevId + '-1'}"
title="1 star"></label>
<textarea class="form-control h-100" id="exampleFormControlTextarea1"
rows="3"
name="komentar"></textarea>
</div>
<button class="btn btn-primary" type="submit">Oceni</button>
</form> </form>
</div> </div>
<div class="col-md-2 d-flex flex-column justify-content-around align-items-center" <div class="col-md-2 d-flex flex-column justify-content-around align-items-center"
...@@ -354,10 +395,6 @@ ...@@ -354,10 +395,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div>
</div>
</div> </div>
<div class="container-fluid pb-0 mb-0 justify-content-center text-light "> <div class="container-fluid pb-0 mb-0 justify-content-center text-light ">
......
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