Popravljen filter...

6 files changed, 35 insertions, 20 deletions

diff --git a/Backend/Api/Api/Services/PostService.cs b/Backend/Api/Api/Services/PostService.cs
index 1c8f647..5a285e5 100644
--- a/Backend/Api/Api/Services/PostService.cs
+++ b/Backend/Api/Api/Services/PostService.cs
@@ -394,19 +394,19 @@ namespace Api.Services
             {
                 if (ratingFrom >= 0)
                 {
-                    ls = ls.FindAll(post => post.ratings > ratingFrom).ToList();
+                    ls = ls.FindAll(post => Math.Floor(post.ratings) >= ratingFrom).ToList();
                 }
                 if (ratingTo >= 0)
                 {
-                    ls= ls.FindAll(post => post.ratings < ratingTo).ToList();
+                    ls= ls.FindAll(post => Math.Ceiling(post.ratings) <= ratingTo).ToList();
                 }
                 if (viewsFrom >= 0)
                 {
-                    ls = ls.FindAll(post => post.views >viewsFrom).ToList();
+                    ls = ls.FindAll(post => post.views >=viewsFrom).ToList();
                 }
                 if (viewsTo >= 0)
                 {
-                    ls = ls.FindAll(post => post.views < viewsTo).ToList();
+                    ls = ls.FindAll(post => post.views <= viewsTo).ToList();
                 }
                
             }
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt
index 78d999e..66bc8e5 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePage.kt
@@ -120,11 +120,11 @@ class FragmentHomePage : Fragment() {
     }
 
     fun searchText(){
-        if(searchBar.text==null || searchBar.text.toString().trim()=="")
-            return
-
         var act=requireActivity() as NavigationActivity
-        act.searchQuery=searchBar.text.toString()
+        if(searchBar.text==null || searchBar.text.toString().trim()=="")
+            act.searchQuery="-1"
+        else
+            act.searchQuery=searchBar.text.toString()
         act.searchId=""
         act.bottomNav.selectedItemId=R.id.navAllPosts
     }
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
index 9d4da20..a26ea43 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
@@ -85,12 +85,16 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
 
     }
     fun searchText(){
-        if(searchBar.text==null || searchBar.text.toString().trim()=="")
-            return
         var act=requireActivity() as NavigationActivity
-        act.searchQuery=searchBar.text.toString()
+        if(searchBar.text==null || searchBar.text.toString().trim()=="")
+            act.searchQuery="-1"
+        else{
+            act.searchQuery=searchBar.text.toString()
+        }
+
+
         act.searchId=""
-        searchParams=SearchParams(searchBar.text.toString(),filterBool,1,1,ratingFrom,ratingTo,viewsFrom,viewsTo)
+        searchParams=SearchParams(act.searchQuery,filterBool,1,1,ratingFrom,ratingTo,viewsFrom,viewsTo)
         requestToBack(searchParams!!)
     }
     fun onTextEnter(){
@@ -273,6 +277,9 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
                         fromrating.setTextColor(Color.RED)
                     }
                 }
+                else{
+                    ratingFrom=-1
+                }
                 if(ratingToInput.text.toString().isNotEmpty()) {
                     if (ratingToInput.text.toString().trim().toInt() >= 0) {
                         filterBool = true
@@ -287,7 +294,10 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
                             bottomSheetDialogFilter.findViewById<View>(R.id.ratingTotxt) as TextView
                         torating.setTextColor(Color.RED)
                     }
+                }else{
+                    ratingTo=-1
                 }
+
                 if(viewsFromInput.text.toString().isNotEmpty()) {
                     if (viewsFromInput.text.toString().trim().toInt() >= 0) {
                         filterBool = true
@@ -303,6 +313,9 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
                         fromviews.setTextColor(Color.RED)
                     }
                 }
+                else{
+                    viewsFrom=-1
+                }
                 if(viewsToInput.text.toString().isNotEmpty()) {
                     if (viewsToInput.text.toString().trim().toInt() >= 0) {
                         filterBool = true
@@ -317,19 +330,22 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
                             bottomSheetDialogFilter.findViewById<View>(R.id.viewsTotxt) as TextView
                         toviews.setTextColor(Color.RED)
                     }
+                }else{
+                    viewsTo=-1
                 }
                 searchParams!!.filter=filterBool
                 searchParams!!.ratingFrom=ratingFrom
                 searchParams!!.ratingTo=ratingTo
                 searchParams!!.viewsFrom=viewsFrom
                 searchParams!!.viewsTo=viewsTo
-
+                searchText()
                 bottomSheetDialogFilter.dismiss()
             }
 
 
         }
         btnSort.setOnClickListener{
+            Log.d("main","fgdsfdssdfd")
             bottomSheetDialogSort.show()
             var sort = bottomSheetDialogSort.findViewById<View>(R.id.btnSortPosts) as Button
             var radioGroup = bottomSheetDialogSort.findViewById<View>(R.id.radioGroup)as RadioGroup
@@ -417,7 +433,8 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
         Log.d("TEST","USAO")
         if(act.searchId!=null && act.searchId.trim()!="")
         {
-            searchBar.setText(act.searchQuery,TextView.BufferType.EDITABLE)
+            if(act.searchQuery!="-1")
+                searchBar.setText(act.searchQuery,TextView.BufferType.EDITABLE)
             searchParams= SearchParams(act.searchId,filterBool,1,1,ratingFrom,ratingTo,viewsFrom,viewsTo)
             requestToBack(searchParams!!)
         }else
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 fe86da3..c7d238c 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
@@ -67,9 +67,7 @@ interface IBackendApi {
                         @Query("ratingFrom") ratingFrom:Int,
                         @Query("ratingTo") ratingTo:Int,
                         @Query("viewsFrom") viewsFrom:Int,
-                        @Query("viewsTo") viewsTo:Int,
-
-
+                        @Query("viewsTo") viewsTo:Int
                         ):PagedPosts
     @POST("/api/message/add")
     fun sendMessage(@Header("Authorization") authHeader:String,@Body message:MessageSend):Call<Message>
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
index 88685e4..43c2109 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
@@ -7,8 +7,8 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 
 object RetrofitHelper {
-    //val baseUrl="http://10.0.2.2:5279"
-    val baseUrl="http://147.91.204.115:10082"
+    val baseUrl="http://10.0.2.2:5279"
+    //val baseUrl="http://147.91.204.115:10082"
     private var retrofit_noauth: IBackendApi? = null
     private var retrofit_auth: IBackendApi? = null
 
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
index 7e16f78..f2b0ca3 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
@@ -69,7 +69,7 @@
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_weight="1"
-
+            android:visibility="gone"
             android:background="#FFFCFCFC"
             android:padding="@dimen/component_padding"
             android:scaleType="centerCrop"