Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
SkuciSe
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tim 2 - 2022
SkuciSe
Commits
12bd89ac
Commit
12bd89ac
authored
Sep 19, 2022
by
Bogdan Andjelkovic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ocena komentara na stranici korisnika
parent
eec3757f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
19 deletions
+33
-19
SkuciSe/src/main/resources/templates/korisnik.html
+15
-1
SkuciSe/src/main/resources/templates/moji-zahtevi.html
+18
-18
No files found.
SkuciSe/src/main/resources/templates/korisnik.html
View file @
12bd89ac
...
@@ -242,11 +242,25 @@
...
@@ -242,11 +242,25 @@
<img
class=
"d-flex g-width-50 g-height-50 rounded-circle g-mt-3 g-mr-15"
<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.index].slika}}"
alt=
"Image Description"
>
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${korisniciKomentari[komentarStat.index].slika}}"
alt=
"Image Description"
>
<div
class=
"g-mb-15"
>
<div
class=
"g-mb-15"
>
<h5
class=
"h5 g-color-gray-dark-v1 mb-0"
th:text=
"${korisniciKomentari[komentarStat.index].ime + ' ' + korisniciKomentari[komentarStat.index].prezime}"
>
John Doe
</h5>
<a
th:href=
"@{/korisnik/{korisnikId}(korisnikId=${korisniciKomentari[komentarStat.index].korisnikId})}"
th:text=
"${korisniciKomentari[komentarStat.index].ime + ' '+ korisniciKomentari[komentarStat.index].prezime}"
class=
"text-right w-50"
style=
"color:#495056;text-decoration: none"
></a>
<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>
<p
th:text=
"${komentar.komentar}"
></p>
<p
th:text=
"${komentar.komentar}"
></p>
<div
class=
"starrating risingstar d-flex justify-content-end flex-row-reverse"
>
<img
src
th:onload=
"postaviZvezdice([[${komentar.ocena}]])"
>
<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>
<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>
<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>
<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>
<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>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
SkuciSe/src/main/resources/templates/moji-zahtevi.html
View file @
12bd89ac
...
@@ -104,24 +104,24 @@
...
@@ -104,24 +104,24 @@
<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
th:if=
"${zahtevi[oglasStat.
.
index].status.toString() == 'POTVRDJEN'}"
th:if=
"${zahtevi[oglasStat.index].status.toString() == 'POTVRDJEN'}"
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.
.
index].slikaCode}}"
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.index].slikaCode}}"
alt=
"slika korisnika"
alt=
"slika korisnika"
style=
"width: 150px;height: 150px;border-radius: 50%;object-fit: cover; border: green 3px solid"
>
style=
"width: 150px;height: 150px;border-radius: 50%;object-fit: cover; border: green 3px solid"
>
<img
<img
th:if=
"${zahtevi[oglasStat.
.
index].status.toString() == 'CEKANJE'}"
th:if=
"${zahtevi[oglasStat.index].status.toString() == 'CEKANJE'}"
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.
.
index].slikaCode}}"
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.index].slikaCode}}"
alt=
"slika korisnika"
alt=
"slika korisnika"
style=
"width: 150px;height: 150px;border-radius: 50%;object-fit: cover; border: yellow 3px solid"
>
style=
"width: 150px;height: 150px;border-radius: 50%;object-fit: cover; border: yellow 3px solid"
>
<img
<img
th:if=
"${zahtevi[oglasStat.
.
index].status.toString() == 'ZAVRSEN'}"
th:if=
"${zahtevi[oglasStat.index].status.toString() == 'ZAVRSEN'}"
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.
.
index].slikaCode}}"
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.index].slikaCode}}"
alt=
"slika korisnika"
alt=
"slika korisnika"
style=
"width: 150px;height: 150px;border-radius: 50%;object-fit: cover; border: blue 3px solid"
style=
"width: 150px;height: 150px;border-radius: 50%;object-fit: cover; border: blue 3px solid"
class=
"w-sm-50"
>
class=
"w-sm-50"
>
<img
<img
th:if=
"${zahtevi[oglasStat.
.
index].status.toString() == 'ODBIJEN'}"
th:if=
"${zahtevi[oglasStat.index].status.toString() == 'ODBIJEN'}"
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.
.
index].slikaCode}}"
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.index].slikaCode}}"
alt=
"slika korisnika"
alt=
"slika korisnika"
style=
"width: 150px;height: 150px;border-radius: 50%;object-fit: cover; border: red 3px solid"
>
style=
"width: 150px;height: 150px;border-radius: 50%;object-fit: cover; border: red 3px solid"
>
</div>
</div>
...
@@ -135,29 +135,29 @@
...
@@ -135,29 +135,29 @@
</h4>
</h4>
<p
th:text=
"'Vlasnik: ' + ${vlasnici[oglasStat.index].ime}"
></p>
<p
th:text=
"'Vlasnik: ' + ${vlasnici[oglasStat.index].ime}"
></p>
<button
class=
"btn btn-dark"
<button
class=
"btn btn-dark"
th:onclick=
"window.open('/chat?email='+[[${vlasnici[oglasStat.
.
index].email}]],'mywindow','menubar=1,width=650,height=900')"
>
th:onclick=
"window.open('/chat?email='+[[${vlasnici[oglasStat.index].email}]],'mywindow','menubar=1,width=650,height=900')"
>
<i
class=
"fas fa-sms"
></i>
Chat
<i
class=
"fas fa-sms"
></i>
Chat
</button>
</button>
</div>
</div>
</div>
</div>
<div
class=
"col-lg-7 col-md-7 col-sm-7 col-xs-7 d-flex flex-column justify-content-around align-items-end"
<div
class=
"col-lg-7 col-md-7 col-sm-7 col-xs-7 d-flex flex-column justify-content-around align-items-end"
th:if=
"${zahtevi[oglasStat.
.
index].status.toString() != 'ZAVRSEN'}"
>
th:if=
"${zahtevi[oglasStat.index].status.toString() != 'ZAVRSEN'}"
>
<h4
th:text=
"${zahtevi[oglasStat.
.index].datum + ' ' + zahtevi[oglasStat.
.index].vreme}"
<h4
th:text=
"${zahtevi[oglasStat.
index].datum + ' ' + zahtevi[oglasStat
.index].vreme}"
th:if=
"${zahtevi[oglasStat.
.
index].status.toString() == 'POTVRDJEN'}"
></h4>
th:if=
"${zahtevi[oglasStat.index].status.toString() == 'POTVRDJEN'}"
></h4>
<form
method=
"GET"
class=
"w-50 h-50 d-flex justify-content-center align-items-center"
<form
method=
"GET"
class=
"w-50 h-50 d-flex justify-content-center align-items-center"
th:if=
"${zahtevi[oglasStat.
.
index].status.toString() != 'POTVRDJEN'}"
th:if=
"${zahtevi[oglasStat.index].status.toString() != 'POTVRDJEN'}"
th:action=
"@{/oglas-edit/{oglasId}/obrisi-zahtev/{zahtevId}(oglasId=${oglas.oglasId}, zahtevId=${zahtevi[oglasStat.
.
index].zahtevId})}"
>
th:action=
"@{/oglas-edit/{oglasId}/obrisi-zahtev/{zahtevId}(oglasId=${oglas.oglasId}, zahtevId=${zahtevi[oglasStat.index].zahtevId})}"
>
<button
type=
"submit"
class=
"btn btn-danger"
<button
type=
"submit"
class=
"btn btn-danger"
th:if=
"${zahtevi[oglasStat.
.
index].status.toString() == 'CEKANJE'}"
>
th:if=
"${zahtevi[oglasStat.index].status.toString() == 'CEKANJE'}"
>
Otkazi zahtev
Otkazi zahtev
</button>
</button>
<button
type=
"submit"
class=
"btn btn-danger"
<button
type=
"submit"
class=
"btn btn-danger"
th:if=
"${zahtevi[oglasStat.
.
index].status.toString() == 'ODBIJEN'}"
>
th:if=
"${zahtevi[oglasStat.index].status.toString() == 'ODBIJEN'}"
>
Obrisi zahtev
Obrisi zahtev
</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'}"
>
...
@@ -168,7 +168,7 @@
...
@@ -168,7 +168,7 @@
<input
th:value=
"${loggedUser.korisnik.korisnikId}"
name=
"korisnikId"
<input
th:value=
"${loggedUser.korisnik.korisnikId}"
name=
"korisnikId"
style=
"display: none"
>
style=
"display: none"
>
<input
th:value=
"${oglas.oglasId}"
name=
"oglasId"
style=
"display: none"
>
<input
th:value=
"${oglas.oglasId}"
name=
"oglasId"
style=
"display: none"
>
<input
th:value=
"${zahtevi[oglasStat.
.
index].zahtevId}"
<input
th:value=
"${zahtevi[oglasStat.index].zahtevId}"
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"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment