Skip to content

S
SkuciSe
Commit fad65328 by Milovan Samardzic
Options

izmenaFrontMojiOglasiOglas

parent 661250ad
Showing with 19 additions and 12 deletions
SkuciSe/src/main/resources/templates/moji-zahtevi.html
......@@ -122,8 +122,14 @@
<h4 class="card-title"
th:text="${oglas.lokacija}">
</h4>
<p th:text="'Vlasnik: ' + ${vlasnici[oglasStat.index].ime}"></p>
<button class="btn btn-dark"
<h5 class="card-title"
th:text="${vlasnici[oglasStat.index].getIme() + ' ' + vlasnici[oglasStat.index].getPrezime()}"></h5>
<p class="card-text"
th:if="${zahtevi[oglasStat.index].status.toString()=='POTVRDJEN'}">
Email:<span th:text="${vlasnici[oglasStat.index].getEmail()}"></span><br>
Telefon:<span th:text="${vlasnici[oglasStat.index].getTelefon()}"></span>
</p>
<button class="btn btn-dark" th:if="${zahtevi[oglasStat.index].status.toString() == 'POTVRDJEN'}"
th:onclick="window.open('/chat?email='+[[${vlasnici[oglasStat.index].email}]],'mywindow','menubar=1,width=650,height=900')">
<i class="fas fa-sms"></i> Chat
</button>
......
SkuciSe/src/main/resources/templates/oglas.html
......@@ -247,6 +247,7 @@
<div class="container">
<h1>Komentari</h1>
<div class="row" th:object="${korisniciKomentari}">
<h4 th:if="${komentari.size() == 0}">Nema komentara na ovom oglasu</h4>
<div class="col-12" th:each="komentar:${komentari}">
<div class="media g-mb-30 media-comment">
<div class="media-body u-shadow-v18 g-bg-secondary g-pa-30">
......@@ -289,14 +290,14 @@
</div>
</div>
</div>
<div class="col-7">
<div class="col-6">
<div class="d-flex align-items-center justify-content-center flex-column"
th:object="${korisnici}"
th:if="${(loggedUser!=null)&&(loggedUser.korisnik.korisnikId == oglas.korisnikId)}">
<h1 th:if="${korisnici.size() > 0}" class="mt-2 mb-5">Spisak zahteva za obilazak</h1>
<div class="card mb-3" th:each="korisnik: ${korisnici}" style="background: transparent" th:if="${(!zahtevi[korisnikStat.index].vlasnikKom) || (zahtevi[korisnikStat.index].status.toString() == 'ODBIJEN')}">
<div class="row flex-sm-wrap w-100">
<div class="col-lg-2 col-md-12 col-sm-12 col-xs-12 d-flex justify-content-around align-items-center">
<div class="card mb-3 d-flex justify-content-center align-items-center" th:each="korisnik: ${korisnici}" style="background: transparent;width: 82%" th:if="${(!zahtevi[korisnikStat.index].vlasnikKom) || (zahtevi[korisnikStat.index].status.toString() == 'ODBIJEN')}">
<div class="row flex-wrap w-100">
<div class="col-lg-2 col-md-11 col-sm-11 col-xs-11 d-flex justify-content-around align-items-center">
<img
style="width: 90px;height: 100px;border-radius: 50%;object-fit: cover;"
th:src="@{'data:image/png;charset=utf-8;base64,'+${korisnik.getSlika()}}"
......@@ -305,7 +306,7 @@
: zahtevi[korisnikStat.index].status.toString() == 'CEKANJE' ? 'border: yellow 3px solid'
: 'border: blue 3px solid'}">
</div>
<div class="col-lg-3 col-md-12 col-sm-12 col-xs-12 d-flex justify-content-center align-items-lg-start align-items-md-center align-items-sm-center align-items-xs-center flex-column">
<div class="col-lg-5 col-md-11 col-sm-11 col-xs-11 d-flex justify-content-center align-items-lg-start align-items-md-center align-items-sm-center align-items-xs-center flex-column">
<h5 class="card-title"
th:text="${korisnik.getIme() + ' ' + korisnik.getPrezime()}"></h5>
<p class="card-text"
......@@ -313,12 +314,12 @@
Email:<span th:text="${korisnik.getEmail()}"></span><br>
Telefon:<span th:text="${korisnik.getTelefon()}"></span>
</p>
<button class="btn btn-dark"
<button class="btn btn-dark" th:if="${zahtevi[korisnikStat.index].status.toString() == 'POTVRDJEN'}"
th:onclick="window.open('/chat?email='+[[${korisnik.getEmail()}]],'mywindow','menubar=1,width=650,height=900')">
<i class="fas fa-sms"></i> Chat
</button>
</div>
<div class="col-lg-5 col-md-12 col-sm-12 col-xs-12 d-flex flex-column justify-content-around align-items-center p-2">
<div class="col-lg-5 col-md-11 col-sm-11 col-xs-11 d-flex flex-column justify-content-around align-items-center p-2" th:if="${zahtevi[korisnikStat.index].status.toString() == 'ZAVRSEN'}">
<form method="get" th:action="@{/oceni-korisnika}">
<input type="text" th:value="${oglas.oglasId}" name="oglasId"
style="display: none"/>
......@@ -358,7 +359,7 @@
th:for="${'star' + zahtevi[korisnikStat.index].zahtevId + '-1'}"
title="1 star"></label>
</div>
<div class="row flex-row justify-content-between align-items-center">
<div class="row flex-row justify-content-between align-items-center ml-2">
<button class="btn btn-primary w-40" type="submit">Oceni</button>
<button class="btn btn-primary w-40" type="button"
onclick="document.getElementById('formaZavrsi').submit(); return false;">
......@@ -373,12 +374,12 @@
name="oglasId" style="display: none">
</form>
</div>
<div class="col-lg-2 col-md-12 col-sm-12 col-xs-12 d-flex flex-column justify-content-around align-items-center">
<div class="col-lg-3 col-md-11 col-sm-11 col-xs-11 d-flex flex-column justify-content-around align-items-center" th:if="${zahtevi[korisnikStat.index].status.toString() != 'ZAVRSEN'}">
<p class="card-text">
<span th:text="${zahtevi[korisnikStat.index].datum + ' ' + zahtevi[korisnikStat.index].vreme}"></span>
</p>
</div>
<div class="col-lg-2 col-md-12 col-sm-12 col-xs-12 d-flex flex-column justify-content-around align-items-center"
<div class="col-lg-2 col-md-11 col-sm-11 col-xs-11 d-flex flex-column justify-content-around align-items-center"
th:if="${zahtevi[korisnikStat.index].status.toString() == 'CEKANJE'}">
<form method="GET"
th:action="@{/oglas-edit/{oglasId}/prihvati-zahtev/{zahtevId}(oglasId=${zahtevi[korisnikStat.index].oglasId},zahtevId=${zahtevi[korisnikStat.index].zahtevId})}">
......
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