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
93675457
Commit
93675457
authored
Sep 16, 2022
by
Milovan Samardzic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
frontOglasZahtevi
parent
1c03793a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
91 additions
and
18 deletions
+91
-18
SkuciSe/src/main/resources/static/css/style.css
+5
-0
SkuciSe/src/main/resources/templates/oglas.html
+86
-18
No files found.
SkuciSe/src/main/resources/static/css/style.css
View file @
93675457
...
...
@@ -124,6 +124,11 @@ body{
top
:
-7px
;
}
}
@media
(
max-width
:
996px
){
#indexCont
{
min-height
:
900px
;
}
}
.container-fluid
{
overflow
:
hidden
;
background
:
#1c1c1c
;
/*footer*/
...
...
SkuciSe/src/main/resources/templates/oglas.html
View file @
93675457
...
...
@@ -19,7 +19,7 @@
<!-- Core theme CSS (includes Bootstrap)-->
<link
href=
"/css/oglasiStyle.css"
rel=
"stylesheet"
/>
<link
rel=
"stylesheet"
href=
"/css/bootstrap-datetimepicker.min.css"
type=
"text/css"
media=
"all"
/>
<link
rel=
"stylesheet"
href=
"/css/bootstrap-datetimepicker.min.css"
type=
"text/css"
media=
"all"
/>
</head>
<body
th:object=
"${loggedUser}"
class=
"pozadinaSVG"
>
...
...
@@ -102,7 +102,8 @@
</nav>
<div
class=
"mt-5 ml-5 mr-0 w-100"
th:object=
"${oglasId}"
>
<div
class=
"alert alert-success d-flex justify-content-between align-items-center"
th:object=
"${zakazan}"
th:if=
"${zakazan == true}"
style=
"width: 96%"
>
<div
class=
"alert alert-success d-flex justify-content-between align-items-center"
th:object=
"${zakazan}"
th:if=
"${zakazan == true}"
style=
"width: 96%"
>
<div><strong>
Uspesno!
</strong>
Uspesno ste poslali zahtev za obilazak!
</div>
<button
type=
"button"
class=
"btn-close"
data-dismiss=
"alert"
></button>
</div>
...
...
@@ -114,7 +115,7 @@
<div
class=
"carousel-item active"
>
<img
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${slike[0].slikaCode}}"
alt=
"Hills"
>
</div>
<div
class=
"carousel-item"
th:each=
"i : ${#numbers.sequence(1, slike.size()-1,1)}"
>
<div
class=
"carousel-item"
th:each=
"i : ${#numbers.sequence(1, slike.size()-1,1)}"
>
<img
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${slike[i].slikaCode}}"
alt=
"Hills"
>
</div>
</div>
...
...
@@ -129,9 +130,11 @@
<!-- Thumbnails -->
<ol
class=
"carousel-indicators list-inline"
style=
"height: 100px"
>
<li
class=
"list-inline-item active"
th:each=
"slika: ${slike}"
>
<a
th:id=
"'carousel-selector-' + ${slikaStat.count - 1}"
class=
"selected"
th:data-slide-to=
"${slikaStat.count - 1}"
data-target=
"#custCarousel"
>
<img
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${slika.slikaCode}}"
class=
"img-fluid"
>
<li
class=
"list-inline-item active"
th:each=
"slika: ${slike}"
>
<a
th:id=
"'carousel-selector-' + ${slikaStat.count - 1}"
class=
"selected"
th:data-slide-to=
"${slikaStat.count - 1}"
data-target=
"#custCarousel"
>
<img
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${slika.slikaCode}}"
class=
"img-fluid"
>
</a>
</li>
</ol>
...
...
@@ -155,7 +158,7 @@
</div>
</div>
</div>
<div
class=
"col"
>
<div
class=
"col"
>
<div
class=
"row mt-5"
>
<div
class=
"col"
>
<div
class=
"row"
th:if=
"${oglas.vrstaOglasaId == 1}"
><p>
Cena:
</p></div>
...
...
@@ -168,7 +171,8 @@
<div
class=
"row"
><p>
Namesten:
</p></div>
</div>
<div
class=
"col"
>
<div
class=
"row"
><p
th:text=
"${oglas.cena * oglas.kvadratura + '$'}"
th:if=
"${oglas.vrstaOglasaId == 1}"
></p></div>
<div
class=
"row"
><p
th:text=
"${oglas.cena * oglas.kvadratura + '$'}"
th:if=
"${oglas.vrstaOglasaId == 1}"
></p></div>
<div
class=
"row"
><p
th:text=
"${oglas.cena + '$'}"
></p></div>
<div
class=
"row"
><p
th:text=
"${oglas.kvadratura + ' m2'}"
></p></div>
<div
class=
"row"
><p
th:text=
"${oglas.brojSoba}"
></p></div>
...
...
@@ -184,16 +188,21 @@
</div>
</div>
</div>
<div
class=
"row"
th:if=
"${(loggedUser !=null) && (oglas.korisnikId != loggedUser.getKorisnik().korisnikId)}"
>
<button
type=
"button"
class=
"btn btn-primary"
id=
"zahtevDugme"
>
Zakazite obilazak
</button>
<div
class=
"row mt-3"
id =
"izlazDiv"
style=
"display: none;"
>
<form
class=
"d-flex justify-content-center flex-column align-items-end"
th:if=
"${loggedUser != null}"
th:action=
"@{/obradi-zahtev/{id}(id=${oglasId})}"
method=
"POST"
th:object=
"${noviZahtev}"
>
<input
type=
"hidden"
th:field=
"${noviZahtev.korisnikId}"
th:value=
"${loggedUser.korisnik.korisnikId}"
>
<div
class=
"row"
th:if=
"${(loggedUser !=null) && (oglas.korisnikId != loggedUser.getKorisnik().korisnikId)}"
>
<button
type=
"button"
class=
"btn btn-primary"
id=
"zahtevDugme"
>
Zakazite obilazak
</button>
<div
class=
"row mt-3"
id=
"izlazDiv"
style=
"display: none;"
>
<form
class=
"d-flex justify-content-center flex-column align-items-end"
th:if=
"${loggedUser != null}"
th:action=
"@{/obradi-zahtev/{id}(id=${oglasId})}"
method=
"POST"
th:object=
"${noviZahtev}"
>
<input
type=
"hidden"
th:field=
"${noviZahtev.korisnikId}"
th:value=
"${loggedUser.korisnik.korisnikId}"
>
<input
type=
"hidden"
th:field=
"${noviZahtev.oglasId}"
th:value=
"${oglas.oglasId}"
>
<div
class=
"row w-100"
>
<div
class=
"form-group"
>
<div
class=
"input-group date"
id=
"id_1"
>
<input
type=
"text"
value=
"01/01/2022"
class=
"form-control"
required=
""
name=
"datumIVreme"
>
<input
type=
"text"
value=
"01/01/2022"
class=
"form-control"
required=
""
name=
"datumIVreme"
>
<div
class=
"input-group-addon input-group-append"
>
<div
class=
"input-group-text"
>
<i
class=
"glyphicon glyphicon-calendar fa fa-calendar"
></i>
...
...
@@ -204,7 +213,65 @@
</div>
<button
type=
"submit"
class=
"btn btn-primary w-25"
>
POSALJI ZAHTEV
</button>
</form>
<h3
th:if=
"${loggedUser == null}"
class=
"text-center"
><a
th:href=
"@{/login-zahtev/{oglasId}(oglasId=${oglasId})}"
style=
"text-decoration: none;color:#495056;"
>
Prijavite se
</a></h3>
<h3
th:if=
"${loggedUser == null}"
class=
"text-center"
><a
th:href=
"@{/login-zahtev/{oglasId}(oglasId=${oglasId})}"
style=
"text-decoration: none;color:#495056;"
>
Prijavite se
</a></h3>
</div>
</div>
</div>
</div>
<div
class=
"container container-main d-flex align-items-center justify-content-center flex-column"
th:object=
"${korisnici}"
>
<h1>
Spisak zahteva za obilazak
</h1>
<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}"
style=
"background: transparent"
>
<div
class=
"row no-gutters"
>
<div
class=
"col-md-1"
>
<div
th:if=
"${zahtevi[korisnikStat.count - 1].status.toString() == 'POTVRDJEN'}"
class=
"col-md-4 h-100"
style=
"background-color: green;border-radius: 5px"
></div>
<div
th:if=
"${zahtevi[korisnikStat.count - 1].status.toString() == 'CEKANJE'}"
class=
"col-md-4 h-100"
style=
"background-color: yellow;border-radius: 5px"
></div>
<div
th:if=
"${zahtevi[korisnikStat.count - 1].status.toString() == 'ZAVRSEN'}"
class=
"col-md-4 h-100"
style=
"background-color: blue;border-radius: 5px"
></div>
<div
th:if=
"${zahtevi[korisnikStat.count - 1].status.toString() == 'ODBIJEN'}"
class=
"col-md-4 h-100"
style=
"background-color: red;border-radius: 5px"
></div>
</div>
<div
class=
"col-md-3 d-flex justify-content-center align-items-center"
>
<img
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${korisnik.getSlika()}}"
alt=
"slika korisnika"
style=
"width: 150px;height: 150px;border-radius: 50%;object-fit: cover;"
>
</div>
<div
class=
"col-md-6"
>
<div
class=
"card-body"
>
<h5
class=
"card-title"
th:text=
"${korisnik.getIme() + ' ' + korisnik.getPrezime()}"
></h5>
<p
class=
"card-text"
>
Email:
<span
th:text=
"${korisnik.getEmail()}"
></span><br>
Telefon:
<span
th:text=
"${korisnik.getTelefon()}"
></span><br>
Datum i Vreme:
<span
th:text=
"${zahtevi[korisnikStat.count - 1].datum + ' ' + zahtevi[korisnikStat.count - 1].vreme}"
></span>
</p>
</div>
</div>
<div
class=
"col-md-2 d-flex flex-column justify-content-around align-items-center"
th:if=
"${zahtevi[korisnikStat.count - 1].status.toString() == 'CEKANJE'}"
>
<form
method=
"GET"
th:action=
"@{/oglas-edit/{oglasId}/prihvati-zahtev/{zahtevId}(oglasId=${zahtevi[korisnikStat.count - 1].oglasId},zahtevId=${zahtevi[korisnikStat.count - 1].zahtevId})}"
>
<button
type=
"submit"
class=
"btn btn-success"
>
Prihvati zahtev
</button>
</form>
<form
method=
"GET"
th:action=
"@{/oglas-edit/{oglasId}/odbi-zahtev/{zahtevId}(oglasId=${zahtevi[korisnikStat.count - 1].oglasId},zahtevId=${zahtevi[korisnikStat.count - 1].zahtevId})}"
>
<button
type=
"submit"
class=
"btn btn-danger"
>
Odbij zahtev
</button>
</form>
</div>
<div
class=
"col-md-2 d-flex flex-column justify-content-around align-items-center"
th:if=
"${zahtevi[korisnikStat.count - 1].status.toString() == 'ODBIJEN'}"
>
<form
method=
"GET"
>
<!--OBRISI ZAHTEV TH:ACTION="@{/oglas-edit/{oglasId}/obrisi-zahtev/}"-->
<button
type=
"submit"
class=
"btn btn-danger"
>
Obrisi zahtev
</button>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
@@ -265,11 +332,12 @@
<script
src=
"https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.12.0/moment.js"
></script>
<script
type=
"text/javascript"
src=
"/js/bootstrap-datetimepicker.min.js"
></script>
<script
type=
"text/javascript"
src=
"/js/demo.js"
></script>
<script
crossorigin=
"anonymous"
integrity=
"sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
src=
"https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
></script>
<script
crossorigin=
"anonymous"
integrity=
"sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
src=
"https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
></script>
<script
src=
"https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"
></script>
<script>
$
(
document
).
ready
(
function
()
{
$
(
"#zahtevDugme"
).
click
(
function
()
{
$
(
document
).
ready
(
function
()
{
$
(
"#zahtevDugme"
).
click
(
function
()
{
$
(
"#izlazDiv"
).
fadeToggle
(
"slow"
);
});
});
...
...
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