Verification Successful

diff --git a/Backend/Api/Api/Controllers/appController.cs b/Backend/Api/Api/Controllers/appController.cs index ed83231..30c7e33 100644 --- a/Backend/Api/Api/Controllers/appController.cs +++ b/Backend/Api/Api/Controllers/appController.cs @@ -33,8 +33,6 @@ namespace Api.Controllers { var html = await System.IO.File.ReadAllTextAsync(@"./Assets/appDownload.html"); - html = html.Replace("{{name}}", "test"); - return base.Content(html, "text/html"); } -- cgit v1.2.3 From 7d3b6402cd18d69f31acb0b690e03e3dd8d5d282 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Sat, 12 Nov 2022 18:35:51 +0100 Subject: Dodat search bar na mapi i omogucena pretraga po lokacijama. --- .../brzodolokacije/Fragments/FragmentBrowse.kt | 35 ++++++++++++++++-- .../app/src/main/res/layout/fragment_browse.xml | 41 ++++++++++++++++++++-- 2 files changed, 71 insertions(+), 5 deletions(-) diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt index ec6673c..08d0fdd 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt @@ -13,11 +13,15 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.Button +import android.widget.EditText +import android.widget.Toast import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import com.example.brzodolokacije.R import com.example.brzodolokacije.Services.GeocoderHelper +import com.google.android.material.floatingactionbutton.FloatingActionButton import org.osmdroid.config.Configuration import org.osmdroid.tileprovider.tilesource.TileSourceFactory import org.osmdroid.util.GeoPoint @@ -37,6 +41,8 @@ class FragmentBrowse : Fragment(R.layout.fragment_browse) { var mRotationGestureOverlay:RotationGestureOverlay?=null var mScaleBarOverlay: ScaleBarOverlay?=null var mCompassOverlay:CompassOverlay?=null + private lateinit var searchButton:FloatingActionButton + private lateinit var searchBar: EditText override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -53,6 +59,14 @@ class FragmentBrowse : Fragment(R.layout.fragment_browse) { map=v.findViewById(R.id.FragmentBrowseMapView) as MapView map!!.setTileSource(TileSourceFactory.MAPNIK); setUpMap() + searchButton=v.findViewById(R.id.FragmentBrowseSearchButton) as FloatingActionButton + searchBar=v.findViewById(R.id.FragmentBrowseSearchBar) as EditText + + searchButton.setOnClickListener{ + searchMap() + } + + return v } @@ -77,8 +91,7 @@ class FragmentBrowse : Fragment(R.layout.fragment_browse) { mLocationOverlay = MyLocationNewOverlay(GpsMyLocationProvider(context), map) mLocationOverlay!!.enableMyLocation() map!!.getOverlays().add(this.mLocationOverlay) - var res= GeocoderHelper.getInstance() - Log.d("Main",res!!.getFromLocationName("Paris",1)[0].countryName) + //start point val startPoint = GeoPoint(44.0107,20.9181)//dodati nasu lokaciju TODO mapController.setCenter(startPoint) @@ -125,6 +138,24 @@ class FragmentBrowse : Fragment(R.layout.fragment_browse) { //your codes here } } + fun searchMap(){ + var geocoder= GeocoderHelper.getInstance() + //Log.d("Main",geocoder!!.getFromLocationName("Paris",1)[0].countryName) + var locString=searchBar.text.toString().trim() + if(locString==null || locString=="") + Toast.makeText(requireContext(),"Unesite naziv lokacije",Toast.LENGTH_SHORT) + else{ + var result=geocoder!!.getFromLocationName(locString,1)[0] + if(result==null) + Toast.makeText(requireContext(),"Nepostojeca lokacija",Toast.LENGTH_SHORT) + else{ + //move to spot + map!!.controller.animateTo(GeoPoint(result.latitude,result.longitude)) + + + } + } + } } \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml index a811522..cdccaa6 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml @@ -1,14 +1,49 @@ - + + + + android:layout_height="fill_parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/FragmentBrowseSearchBar" /> + + + - \ No newline at end of file + \ No newline at end of file -- cgit v1.2.3 From d99efbee1431d49152954ca6398fe0b060aa3580 Mon Sep 17 00:00:00 2001 From: "branislav.radivojevic" Date: Sat, 12 Nov 2022 18:44:46 +0100 Subject: search location by name and coord,filter posts --- Backend/Api/Api/Controllers/LocationController.cs | 19 +++++++ Backend/Api/Api/Controllers/PostController.cs | 11 ++++ Backend/Api/Api/Interfaces/ILocationService.cs | 2 + Backend/Api/Api/Interfaces/IPostService.cs | 2 + Backend/Api/Api/Models/Location.cs | 16 ++++++ Backend/Api/Api/Models/Post.cs | 24 +++++++++ Backend/Api/Api/Services/LocationService.cs | 54 +++++++++++++++++++ Backend/Api/Api/Services/PostService.cs | 65 ++++++++++++++++++++++- 8 files changed, 191 insertions(+), 2 deletions(-) diff --git a/Backend/Api/Api/Controllers/LocationController.cs b/Backend/Api/Api/Controllers/LocationController.cs index bb0b0ab..c9ef9ba 100644 --- a/Backend/Api/Api/Controllers/LocationController.cs +++ b/Backend/Api/Api/Controllers/LocationController.cs @@ -50,5 +50,24 @@ namespace Api.Controllers } return BadRequest(); } + + [HttpPost("search")] + [Authorize(Roles = "User")] + public async Task>> searchLocation(int searchtype ,string? query,Coords? coords) + { + List ret = new List(); + switch (searchtype) + { + case 1: + ret = await _locationService.SearchLocation(query); + return Ok(ret); + case 2: + ret = await _locationService.SearchLocation(coords); + return Ok(ret); + default: + ret = await _locationService.SearchLocation(query); + return Ok(ret); + } + } } } diff --git a/Backend/Api/Api/Controllers/PostController.cs b/Backend/Api/Api/Controllers/PostController.cs index 3857ce0..3faaa62 100644 --- a/Backend/Api/Api/Controllers/PostController.cs +++ b/Backend/Api/Api/Controllers/PostController.cs @@ -116,5 +116,16 @@ namespace Api.Controllers return Ok(); return BadRequest(); } + [HttpGet("locations/{id}/posts")] + [Authorize(Roles = "User")] + public async Task>> searchPosts(string id,int page=0,int sorttype=1,int filterdate=1) + { + var res = await _postService.SearchPosts(id,page,sorttype,filterdate); + if (res != null) + { + return Ok(res); + } + return BadRequest(); + } } } diff --git a/Backend/Api/Api/Interfaces/ILocationService.cs b/Backend/Api/Api/Interfaces/ILocationService.cs index 16e00a0..b115fdf 100644 --- a/Backend/Api/Api/Interfaces/ILocationService.cs +++ b/Backend/Api/Api/Interfaces/ILocationService.cs @@ -7,5 +7,7 @@ namespace Api.Interfaces Task add(Location loc); Task getById(string id); Task> getAllLocation(); + Task> SearchLocation(Coords coords); + Task> SearchLocation(string query); } } \ No newline at end of file diff --git a/Backend/Api/Api/Interfaces/IPostService.cs b/Backend/Api/Api/Interfaces/IPostService.cs index daeee92..0274b26 100644 --- a/Backend/Api/Api/Interfaces/IPostService.cs +++ b/Backend/Api/Api/Interfaces/IPostService.cs @@ -15,5 +15,7 @@ namespace Api.Interfaces Task> CascadeComments(string parentid, Post p); Task DeleteComments(string postid, string cmntid,string userid); Task CascadeDeleteComments(string cmntid, Post p); + Task SearchPosts(string locid, int page = 0, int sorttype = 1, int filterdate = 1); + int DateEnumToDays(int filterdate); } } \ No newline at end of file diff --git a/Backend/Api/Api/Models/Location.cs b/Backend/Api/Api/Models/Location.cs index 7c1a0bf..3402f6c 100644 --- a/Backend/Api/Api/Models/Location.cs +++ b/Backend/Api/Api/Models/Location.cs @@ -25,4 +25,20 @@ namespace Api.Models PLANINA, VISORAVAN, PIRAMIDA, LIVADA, SELO, OSTRVO, POLUOSTRVO, KLISURA, ARHIPELAG, ADA, DELTA, FJORD, GEJZIR, IZVOR, KOTLINA, MINERALNI_IZVOR, PECINA ,SUMA, VODOPAD,VULKAN } + + public class Coords + { + public double latitude { get; set; } + public double longitude { get; set; } + } + public enum SearchType + { + BY_NAME = 1 , + BY_COORDS =2 + } + public class LocationViews + { + public Location location { get; set; } + public int views { get; set; } + } } diff --git a/Backend/Api/Api/Models/Post.cs b/Backend/Api/Api/Models/Post.cs index c832d23..8099d6c 100644 --- a/Backend/Api/Api/Models/Post.cs +++ b/Backend/Api/Api/Models/Post.cs @@ -12,6 +12,7 @@ namespace Api.Models public string ownerId { get; set; } public string locationId { get; set; } public string description { get; set; } + public DateTime createdAt { get; set; } public List views { get; set; } public List reports { get; set; } public List ratings { get; set; } @@ -33,6 +34,7 @@ namespace Api.Models public string ownerId { get; set; } public Location location { get; set; } public string description { get; set; } + public DateTime createdAt { get; set; } public int views { get; set; } public double ratings { get; set; } public List comments { get; set; } @@ -74,4 +76,26 @@ namespace Api.Models public string comment { get; set; } public string parentId { get; set; } } + public enum SortType + { + VIEWS_DESC=1, + RATING_DESC=2, + DATE =3 + } + public enum FilterDate + { + ALL =1, + ONE_YEAR=2 , + THREE_MONTHS=3 , + ONE_MONTH=4 , + ONE_WEEK=5 + } + public class PostSendPage + { + public int page { get; set; } + public int index { get; set; } + public int totalpages { get; set; } + public int totalposts { get; set; } + public List posts { get; set; } + } } diff --git a/Backend/Api/Api/Services/LocationService.cs b/Backend/Api/Api/Services/LocationService.cs index e244ed6..c91a1b5 100644 --- a/Backend/Api/Api/Services/LocationService.cs +++ b/Backend/Api/Api/Services/LocationService.cs @@ -3,7 +3,9 @@ using Api.Models; using Geocoding; using Geocoding.Google; using Geocoding.MapQuest; +using MongoDB.Bson; using MongoDB.Driver; +using System.Text.RegularExpressions; using ZstdSharp.Unsafe; using Location = Api.Models.Location; @@ -16,10 +18,12 @@ namespace Api.Services private readonly IHttpContextAccessor _httpContext; private IConfiguration _configuration; private MapQuestGeocoder _geocoder; + private readonly IMongoCollection _posts; public LocationService(IDatabaseConnection settings, IMongoClient mongoClient, IConfiguration configuration) { var database = mongoClient.GetDatabase(settings.DatabaseName); _locations = database.GetCollection(settings.LocationCollectionName); + _posts = database.GetCollection(settings.PostCollectionName); _configuration = configuration; var _mapQuestApiKey = _configuration.GetSection("AppSettings:MapQuestApiKey").Value; _geocoder = new MapQuestGeocoder(_mapQuestApiKey); @@ -43,5 +47,55 @@ namespace Api.Services { return await _locations.Find(_=>true).ToListAsync(); } + + public async Task> SearchLocation(Coords coords) // returns all locations within coord radius 1/5th of a degree of lat and long + { + if (coords == null) + return null; + var lista = await _locations.Find(_ => true).ToListAsync(); + var tosend = new List(); + if (lista != null) + { + foreach (var elem in lista) + { + if (Math.Abs(elem.latitude - coords.latitude) < 0.2 && Math.Abs(elem.longitude - coords.longitude) < 0.2) + tosend.Add(elem); + } + } + return tosend; + } + public async Task> SearchLocation(string query) //returns 10 (n) most relevant locations when searching by name + { + if (query == null) query = ""; + else query = query.ToLower(); + var lista = await _locations.Find(x => x.name.ToLower().Contains(query)).ToListAsync(); + var tosend = new List(); + if (lista != null) + { + var locviews = new List(); + foreach (var elem in lista) + { + var totalviews = 0; + var posts = await _posts.Find(x => x.locationId == elem._id).ToListAsync(); + if(posts != null) + { + foreach(var post in posts) + { + totalviews += post.views.Count(); + } + } + var novi = new LocationViews(); + novi.location = elem; + novi.views = totalviews; + locviews.Add(novi); + } + var top10 = locviews.OrderByDescending(x => x.views).Take(10).ToList(); + foreach(var view in top10) + { + tosend.Add(view.location); + } + } + return tosend; + } } } diff --git a/Backend/Api/Api/Services/PostService.cs b/Backend/Api/Api/Services/PostService.cs index 78167bd..a0b2941 100644 --- a/Backend/Api/Api/Services/PostService.cs +++ b/Backend/Api/Api/Services/PostService.cs @@ -38,7 +38,7 @@ namespace Api.Services p.ratings = new List(); p.comments = new List(); p.images = new List(); - + p.createdAt = DateTime.Now.ToUniversalTime(); var folderPath = Path.Combine(Directory.GetCurrentDirectory(), "Files", p.ownerId); if (!Directory.Exists(folderPath)) { @@ -75,13 +75,13 @@ namespace Api.Services public async Task postToPostSend(Post post) { PostSend p = new PostSend(); - //Convert post to post send (TODO) p._id = post._id; p.ownerId = post.ownerId; p.description = post.description; p.location = await _locationService.getById(post.locationId); p.images = post.images; p.views = post.views.Count(); + p.createdAt = post.createdAt; if (post.ratings.Count() > 0) { List ratings = new List(); @@ -275,5 +275,66 @@ namespace Api.Services } } } + public async Task SearchPosts(string locid,int page = 0,int sorttype = 1 ,int filterdate = 1) // for now sorting by number of ratings , not avg rating + { + var days = DateEnumToDays(filterdate); + var tosend = new PostSendPage(); + var pslista = new List(); + var lista = new List(); + var ls = new List(); + var xd = new List(); + lista = await _posts.Find(x => x.locationId == locid).ToListAsync(); + if (lista != null) + { + foreach (var elem in lista) + { + if ((DateTime.Now - elem.createdAt).TotalDays < days) + ls.Add(await postToPostSend(elem)); + } + + } + switch (sorttype) + { + case 1: + xd = ls.OrderByDescending(x => x.views).ToList(); + break; + case 2: + xd = ls.OrderByDescending(x => x.ratings).ToList(); + break; + case 3: + xd = ls.OrderByDescending(x => x.createdAt).ToList(); + break; + default: + + break; + } + if(xd != null) + { + tosend.page = page; + tosend.index = page * 20; + tosend.totalposts = xd.Count(); + double pgs = xd.Count / 20; + tosend.totalpages = (int)Math.Ceiling(pgs); + var selected = ls.Skip(20 * page).Take(20); + foreach(var post in selected) + { + pslista.Add(post); + } + tosend.posts = pslista; + } + return tosend; + } + public int DateEnumToDays(int filterdate) + { + switch(filterdate) + { + case 1: return 365 * 10; + case 2: return 365; + case 3: return 90; + case 4: return 30; + case 5: return 7; + default: return 365 * 10; + } + } } } -- cgit v1.2.3 From c8568d0fdb752c1330e7b35b25a4813f8b44e7f8 Mon Sep 17 00:00:00 2001 From: Jelena Petrovic Date: Sat, 12 Nov 2022 21:15:13 +0100 Subject: Dodato ocenjivanje objava na klijentu #30 --- .vs/brzodolokacije/v17/.suo | Bin 16896 -> 25600 bytes .vs/slnx.sqlite | Bin 262144 -> 278528 bytes .../Activities/ActivitySinglePost.kt | 98 +++++- .../brzodolokacije/Interfaces/IBackendApi.kt | 5 +- .../java/com/example/brzodolokacije/Models/Post.kt | 5 + .../app/src/main/res/drawable/empty_star.webp | Bin 0 -> 5506 bytes .../app/src/main/res/drawable/full_star.png | Bin 0 -> 10261 bytes .../src/main/res/layout/activity_single_post.xml | 351 +++++++++++---------- 8 files changed, 288 insertions(+), 171 deletions(-) create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/empty_star.webp create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/full_star.png diff --git a/.vs/brzodolokacije/v17/.suo b/.vs/brzodolokacije/v17/.suo index 5ee74c0..d428be6 100644 Binary files a/.vs/brzodolokacije/v17/.suo and b/.vs/brzodolokacije/v17/.suo differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 7c42e4b..be25fad 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt index 32cb3ef..69a2bed 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt @@ -1,16 +1,28 @@ package com.example.brzodolokacije.Activities +import android.content.res.Resources import android.os.Bundle import android.os.Handler import android.os.Looper +import android.util.Log +import android.widget.ImageButton +import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.example.brzodolokacije.Adapters.PostImageAdapter +import com.example.brzodolokacije.Adapters.ShowPostsAdapter import com.example.brzodolokacije.Models.PostImage import com.example.brzodolokacije.Models.PostPreview +import com.example.brzodolokacije.Models.Rating +import com.example.brzodolokacije.Models.RatingReceive import com.example.brzodolokacije.R +import com.example.brzodolokacije.Services.RetrofitHelper +import com.example.brzodolokacije.Services.SharedPreferencesHelper import com.example.brzodolokacije.databinding.ActivitySinglePostBinding +import okhttp3.ResponseBody +import retrofit2.Call +import retrofit2.Response class ActivitySinglePost : AppCompatActivity() { @@ -19,6 +31,7 @@ class ActivitySinglePost : AppCompatActivity() { private var adapterVar: RecyclerView.Adapter? = null private var recyclerView: RecyclerView?=null private lateinit var post:PostPreview + private var starNumber:Number=0 override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -36,10 +49,91 @@ class ActivitySinglePost : AppCompatActivity() { recyclerView?.layoutManager = layoutManagerVar recyclerView?.adapter = adapterVar loadTextComponents() + setRatingListeners() } - private fun loadImages(){ + fun setRatingListeners(){ + val emptyStar=R.drawable.empty_star + val fullStar=R.drawable.full_star + + binding.rateStar1.setOnClickListener { + Toast.makeText(this,"kliknuta prva zvezdica",Toast.LENGTH_SHORT).show() + binding.rateStar1.setImageResource(fullStar) + binding.rateStar2.setImageResource(emptyStar) + binding.rateStar3.setImageResource(emptyStar) + binding.rateStar4.setImageResource(emptyStar) + binding.rateStar5.setImageResource(emptyStar) + starNumber=1 + } + binding.rateStar2.setOnClickListener { + Toast.makeText(this,"kliknuta druga zvezdica",Toast.LENGTH_SHORT).show() + binding.rateStar1.setImageResource(fullStar) + binding.rateStar2.setImageResource(fullStar) + binding.rateStar3.setImageResource(emptyStar) + binding.rateStar4.setImageResource(emptyStar) + binding.rateStar5.setImageResource(emptyStar) + starNumber=2 + } + binding.rateStar3.setOnClickListener { + Toast.makeText(this,"kliknuta treca zvezdica",Toast.LENGTH_SHORT).show() + binding.rateStar1.setImageResource(fullStar) + binding.rateStar2.setImageResource(fullStar) + binding.rateStar3.setImageResource(fullStar) + binding.rateStar4.setImageResource(emptyStar) + binding.rateStar5.setImageResource(emptyStar) + starNumber=3 + } + binding.rateStar4.setOnClickListener { + Toast.makeText(this,"kliknuta cetvrta zvezdica",Toast.LENGTH_SHORT).show() + binding.rateStar1.setImageResource(fullStar) + binding.rateStar2.setImageResource(fullStar) + binding.rateStar3.setImageResource(fullStar) + binding.rateStar4.setImageResource(fullStar) + binding.rateStar5.setImageResource(emptyStar) + starNumber=4 + } + binding.rateStar5.setOnClickListener { + Toast.makeText(this,"kliknuta peta zvezdica",Toast.LENGTH_SHORT).show() + binding.rateStar1.setImageResource(fullStar) + binding.rateStar2.setImageResource(fullStar) + binding.rateStar3.setImageResource(fullStar) + binding.rateStar4.setImageResource(fullStar) + binding.rateStar5.setImageResource(fullStar) + starNumber=5 + } + binding.submitRating.setOnClickListener{ + if(starNumber.toInt()>0){ + val rating= RatingReceive(starNumber.toInt(),post._id) + requestAddRating(rating) + Toast.makeText(this,"poslato",Toast.LENGTH_SHORT).show() + } + } + + } + + fun requestAddRating(rating:RatingReceive){ + val postApi= RetrofitHelper.getInstance() + val token= SharedPreferencesHelper.getValue("jwt", this@ActivitySinglePost) + val request=postApi.addRating("Bearer "+token,post._id,rating) + request.enqueue(object : retrofit2.Callback { + override fun onResponse(call: Call, response: Response) { + if(response.isSuccessful){ + Toast.makeText( + this@ActivitySinglePost, "prosao zahtev", Toast.LENGTH_LONG + ).show() + }else{ + if(response.errorBody()!=null) + Log.d("main1",response.errorBody().toString()) + } + + + } + + override fun onFailure(call: Call, t: Throwable) { + Log.d("main2",t.message.toString()) + } + }) } private fun loadTextComponents() { @@ -59,4 +153,4 @@ class ActivitySinglePost : AppCompatActivity() { } } -} \ No newline at end of file +} diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt index c712597..ac13bca 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt @@ -6,6 +6,8 @@ import com.example.brzodolokacije.Models.Auth.Register import com.example.brzodolokacije.Models.Auth.ResetPass import com.example.brzodolokacije.Models.Location import com.example.brzodolokacije.Models.PostPreview +import com.example.brzodolokacije.Models.Rating +import com.example.brzodolokacije.Models.RatingReceive import okhttp3.MultipartBody import okhttp3.Request import okhttp3.RequestBody @@ -36,7 +38,8 @@ interface IBackendApi { ,@Part("description") description:RequestBody ,@Part("locationId") locationId:RequestBody ):Call - + @POST("api/Post/posts/{id}/addrating") + fun addRating(@Header("Authorization") authHeader:String,@Path("id") id:String,@Body rating: RatingReceive):Call //@POST("putanja") //fun add(@Body obj:Post,@Header("Authorization") authHeader:String):Call } \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt index 9b9afaa..f24e72f 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt @@ -49,4 +49,9 @@ data class Comment ( data class Rating( var useridval :String, var rating:Int +) + +data class RatingReceive( + var rating:Int, + var postId:String ) \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/empty_star.webp b/Client/BrzoDoLokacije/app/src/main/res/drawable/empty_star.webp new file mode 100644 index 0000000..cea48aa Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/main/res/drawable/empty_star.webp differ diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/full_star.png b/Client/BrzoDoLokacije/app/src/main/res/drawable/full_star.png new file mode 100644 index 0000000..e3f605d Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/main/res/drawable/full_star.png differ diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml index 436784e..9c30136 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml @@ -1,4 +1,6 @@ + + - - + + + + + + + + + + + + + android:layout_marginTop="20dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvLocationParent"> - + android:orientation="horizontal" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + + + + app:layout_constraintEnd_toStartOf="@+id/tvNumberOfRatings" + tools:layout_editor_absoluteY="4dp" /> + android:text="(10,500)" + app:layout_constraintEnd_toEndOf="parent" + tools:layout_editor_absoluteY="4dp" /> - - - - - - - - - - - - - + android:background="@drawable/rounded_picture_background" + android:elevation="5dp" + android:padding="@dimen/component_padding" + app:layout_constraintTop_toBottomOf="@+id/linearLayout" + tools:layout_editor_absoluteX="0dp"> + android:text="Opis" + android:textStyle="bold" /> + android:text="TextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextView" + app:layout_constraintTop_toBottomOf="@+id/tvDescriptionLabel" /> + - - - - - - - - + + + + + + - - - - - - - - - - - -

Preuzimanje aplikacije