Skip to content

A
awesomelands
Commit ac18c167 by Vuk Lazovic
Options

filterisanje

parent aebb1091
Showing with 85 additions and 214 deletions
.idea/workspace.xml
......@@ -5,30 +5,11 @@
</component>
<component name="ChangeListManager">
<list default="true" id="6e82c7f1-3949-40e2-bc26-7eb50b36f993" name="Default Changelist" comment="UPLOAD sada radi">
<change afterPath="$PROJECT_DIR$/src/main/java/app/rep/DodajRep.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/app/usluga/DodajUsluga.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/app/usluga/ImplementacijaDodaj.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/app/usluga/web/DodajKontrol.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/app/vuk.jpg.lnk" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/20554052.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/2446195060_e0018b9214_m.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/4.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/81355b64-5a23-4e90-a98e-25db5dfe414f.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/big-112921447_60589928c5c824-51097158big-112681991_6.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/download.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/macka.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__18_26__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__18_26__Default_Changelist_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__20_08__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__20_08__Default_Changelist_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_19_9_2022__15_07__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_19_9_2022__15_07__Default_Changelist_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/app/usluga/Implementacija.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app/usluga/Implementacija.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/app/usluga/web/OglasController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/app/usluga/web/RegKontroler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app/usluga/web/RegKontroler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/dodaj.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/dodaj.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/property.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/property.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unknown.png" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -227,6 +208,7 @@
<workItem from="1663598082766" duration="1751000" />
<workItem from="1663600055785" duration="984000" />
<workItem from="1663675731268" duration="8728000" />
<workItem from="1663703824680" duration="5427000" />
</task>
<task id="LOCAL-00001" summary="dodata ulogovana verzija">
<created>1663501497955</created>
......
src/main/resources/templates/property.html
......@@ -94,137 +94,17 @@
<div class="col-md-12 search-wrap">
<h2 class="heading h5 d-flex align-items-center pr-4"><span class="ion-ios-search mr-3"></span> Search Property</h2>
<form action="#" class="search-property">
<div class="row">
<div class="col-md align-items-end">
<div class="form-group">
<label for="#">Keyword</label>
<div class="form-field">
<div class="icon"><span class="icon-my_location"></span></div>
<input type="text" class="form-control" placeholder="Keyword">
</div>
</div>
</div>
<div class="col-md align-items-end">
<div class="form-group">
<label for="#">Location</label>
<div class="form-field">
<div class="icon"><span class="icon-my_location"></span></div>
<input type="text" class="form-control" placeholder="City/Locality Name">
</div>
</div>
</div>
<div class="col-md align-items-end">
<div class="form-group">
<label for="#">Property Type</label>
<div class="form-field">
<div class="select-wrap">
<div class="icon"><span class="ion-ios-arrow-down"></span></div>
<select name="" id="" class="form-control">
<option value="">Type</option>
<option value="">Commercial</option>
<option value="">- Office</option>
<option value="">Residential</option>
<option value="">Villa</option>
<option value="">Condominium</option>
<option value="">Apartment</option>
</select>
</div>
</div>
</div>
</div>
<div class="col-md align-items-end">
<div class="form-group">
<label for="#">Property Status</label>
<div class="form-field">
<div class="select-wrap">
<div class="icon"><span class="ion-ios-arrow-down"></span></div>
<select name="" id="" class="form-control">
<option value="">Type</option>
<option value="">Rent</option>
<option value="">Sale</option>
</select>
</div>
</div>
</div>
</div>
<div class="col-md align-items-end">
<div class="form-group">
<label for="#">Agents</label>
<div class="form-field">
<div class="select-wrap">
<div class="icon"><span class="ion-ios-arrow-down"></span></div>
<select name="" id="" class="form-control">
<option value="">Any</option>
<option value="">Jonh Doe</option>
<option value="">Doe Mags</option>
<option value="">Kenny Scott</option>
<option value="">Emily Storm</option>
</select>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md align-items-end">
<div class="form-group">
<label for="#">Min Beds</label>
<div class="form-field">
<div class="select-wrap">
<div class="icon"><span class="ion-ios-arrow-down"></span></div>
<select name="" id="" class="form-control">
<option value="">1</option>
<option value="">2</option>
<option value="">3</option>
<option value="">4</option>
<option value="">5</option>
</select>
</div>
</div>
</div>
</div>
<div class="col-md align-items-end">
<div class="form-group">
<label for="#">Min Bathroom</label>
<div class="form-field">
<div class="select-wrap">
<div class="icon"><span class="ion-ios-arrow-down"></span></div>
<select name="" id="" class="form-control">
<option value="">1</option>
<option value="">2</option>
<option value="">3</option>
<option value="">4</option>
<option value="">5</option>
</select>
</div>
</div>
</div>
</div>
<div class="col-md align-items-end">
<div class="form-group">
<label for="#">Min Price</label>
<label for="#">Search</label>
<div class="form-field">
<div class="select-wrap">
<div class="icon"><span class="ion-ios-arrow-down"></span></div>
<select name="" id="" class="form-control">
<option value="">Min Price</option>
<option value="">$1,000</option>
<option value="">$5,000</option>
<option value="">$10,000</option>
<option value="">$50,000</option>
<option value="">$100,000</option>
<option value="">$200,000</option>
<option value="">$300,000</option>
<option value="">$400,000</option>
<option value="">$500,000</option>
<option value="">$600,000</option>
<option value="">$700,000</option>
<option value="">$800,000</option>
<option value="">$900,000</option>
<option value="">$1,000,000</option>
</select>
</div>
<div class="icon"><span class="icon-my_location"></span></div>
<input id="search" type="text" class="form-control" placeholder="Search">
</div>
</div>
</div>
......@@ -232,51 +112,25 @@
<div class="form-group">
<label for="#">Min Price</label>
<div class="form-field">
<div class="select-wrap">
<div class="icon"><span class="ion-ios-arrow-down"></span></div>
<select name="" id="" class="form-control">
<option value="">Min Price</option>
<option value="">$5,000</option>
<option value="">$10,000</option>
<option value="">$50,000</option>
<option value="">$100,000</option>
<option value="">$200,000</option>
<option value="">$300,000</option>
<option value="">$400,000</option>
<option value="">$500,000</option>
<option value="">$600,000</option>
<option value="">$700,000</option>
<option value="">$800,000</option>
<option value="">$900,000</option>
<option value="">$1,000,000</option>
<option value="">$2,000,000</option>
</select>
</div>
</div>
</div>
</div>
<div class="col-md align-items-end">
<div class="form-group">
<label for="#">Min Area <span>(sq ft)</span></label>
<div class="form-field">
<div class="icon"><span class="icon-my_location"></span></div>
<input type="text" class="form-control" placeholder="Min Area">
<input id="min" type="text" class="form-control" placeholder="Min Price">
</div>
</div>
</div>
<div class="col-md align-items-end">
<div class="form-group">
<label for="#">Max Area <span>(sq ft)</span></label>
<label for="#">Max Price</label>
<div class="form-field">
<div class="icon"><span class="icon-my_location"></span></div>
<input type="text" class="form-control" placeholder="Max Area">
<input id="max" type="text" class="form-control" placeholder="Max Price">
</div>
</div>
</div>
<div class="col-md align-self-end">
<div class="form-group">
<div class="form-field">
<input type="submit" value="Search" class="form-control btn btn-primary">
<input type="submit" onclick="f()" value="Search" class="form-control btn btn-primary">
</div>
</div>
</div>
......@@ -328,48 +182,83 @@
<script th:inline="javascript">
let oglasi = /*[[${oglasi}]]*/ []
p=""
for(let i=0;i<oglasi.length;i++)
f()
function f()
{
s="<div class=\"col-md-4 ftco-animate\">" +
"<div class=\"properties\">" +
"<a href=\"property-single.html\" class=\"img img-2 d-flex justify-content-center align-items-center\" style=\"background-image: url(http://localhost/"+oglasi[i].slika+");\">" +
"<div class=\"icon d-flex justify-content-center align-items-center\">" +
"<span class=\"icon-search2\"></span>" +
"</div>" +
"</a>" +
"<div class=\"text p-3\">" +
"<span class=\"status sale\">"+oglasi[i].tip+"</span>" +
"<div class=\"d-flex\">" +
"<div class=\"one\">" +
"<h3><a href=\"property-single.html\">"+oglasi[i].ime +"</a></h3>" +
"<p>"+oglasi[i].lokacija+"</p>" +
"</div>" +
"<div class=\"two\">" +
"<span class=\"price\">"+oglasi[i].cena+"$</span>" +
"</div>" +
"</div>" +
"<p>"+oglasi[i].opis +
"<hr>" +
"<p class=\"bottom-area d-flex\">" +
"<span><i class=\"flaticon-selection\"></i>"+ oglasi[i].kvadratura+"</span>" +
"<span class=\"ml-auto\"><i class=\"flaticon-bathtub\"></i> 3</span>" +
"<span><i class=\"flaticon-bed\"></i> 4</span>" +
"</p>" +
"</div>" +
"</div>" +
"</div>"
p+=s
}
search=document.getElementById("search").value;
min=document.getElementById("min").value;
max=document.getElementById("max").value;
x=document.getElementById("oglasi")
console.log("CEVU GLAVA")
console.log(x)
x.innerHTML=p
console.log("min je ",+typeof (min))
let a=parseInt(min);
let b=parseInt(max);
let oglasi = /*[[${oglasi}]]*/ []
p = ""
if(isNaN(a)) a=-1
if(isNaN(b)) b=9999999999999
for (let i = 0; i < oglasi.length; i++) {
console.log(parseInt(oglasi[i].cena),a , parseInt(oglasi[i].cena),b)
if(oglasi[i].ime.toLowerCase().includes(search.toLowerCase()) && parseInt(oglasi[i].cena)>a && parseInt(oglasi[i].cena)<b) {
s = "<div class=\"col-md-4 ftco-animate fadeInUp ftco-animated\">" +
"<div class=\"properties\">" +
"<a href=\"property-single.html\" class=\"img img-2 d-flex justify-content-center align-items-center\" style=\"background-image: url(http://localhost/" + oglasi[i].slika + ");\">" +
"<div class=\"icon d-flex justify-content-center align-items-center\">" +
"<span class=\"icon-search2\"></span>" +
"</div>" +
"</a>" +
"<div class=\"text p-3\">" +
"<span class=\"status sale\">" + oglasi[i].tip + "</span>" +
"<div class=\"d-flex\">" +
"<div class=\"one\">" +
"<h3><a href=\"property-single.html\">" + oglasi[i].ime + "</a></h3>" +
"<p>" + oglasi[i].lokacija + "</p>" +
"</div>" +
"<div class=\"two\">" +
"<span class=\"price\">" + oglasi[i].cena + "$</span>" +
"</div>" +
"</div>" +
"<p>" + oglasi[i].opis + "</p>" +
"<hr>" +
"<p class=\"bottom-area d-flex\">" +
"<span><i class=\"flaticon-selection\"></i>" + oglasi[i].kvadratura + "</span>" +
"<span class=\"ml-auto\"><i class=\"flaticon-bathtub\"></i> 3</span>" +
"<span><i class=\"flaticon-bed\"></i> 4</span>" +
"</p>" +
"</div>" +
"</div>" +
"</div>"
p += s
}
}
//"<button style='visibility: hidden' onclick='ff("+i+")'>CLICK ME</button>"+
// "<p id='id"+i+"' style='visibility: hidden'> "+oglasi[i].vlasnik_id+"</p>"+
x = document.getElementById("oglasi")
x.innerHTML = p
}
function ff(x)
{
console.dir(document.getElementById("id"+x).innerHTML);
}
</script>
<script src="js/jquery.min.js"></script>
<script src="js/jquery-migrate-3.0.1.min.js"></script>
<script src="js/popper.min.js"></script>
......
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