Major Admin funnctionalitites

Waste2Wealth · Nov 25, 2023 · cda8ae4 · cda8ae4
1 parent c4b2aa1
commit cda8ae4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/app/src/main/java/app/waste2wealth/com/collectwaste/CollectWasteInfo.kt b/app/src/main/java/app/waste2wealth/com/collectwaste/CollectWasteInfo.kt
@@ -187,6 +187,7 @@ fun CollectWasteInfo(
                     if (!isWithin) {
                         isDialogVisible = true
                     } else {
+                        viewModel.beforeCollectedPath.value = viewModel.wastePhoto.value
                         navController.navigate(Screens.CollectedWasteSuccess.route)
                     }
                 },

diff --git a/app/src/main/java/app/waste2wealth/com/collectwaste/SuccesfullyCollected.kt b/app/src/main/java/app/waste2wealth/com/collectwaste/SuccesfullyCollected.kt
@@ -496,6 +496,7 @@ fun SuccessfullyCollected(
                                                     isWasteCollected = receiver == "Yes",
                                                     allWasteCollected = receiver2 == "Yes",
                                                     feedBack = feedback.text,
+                                                    beforeCollectedPath = viewModel.beforeCollectedPath.value
                                                 )
                                                 viewModel.getCurrentLevel(
                                                     points = pointsEarned + calculatePointsEarned(

diff --git a/app/src/main/java/app/waste2wealth/com/communities/ui/CommunitiesScreen.kt b/app/src/main/java/app/waste2wealth/com/communities/ui/CommunitiesScreen.kt
@@ -126,7 +126,7 @@ fun CommunitiesSection(
 
     }) {
         JetFirestore(path = {
-            collection("ProfileInfo")
+            collection("CollectedWastes")
         }, onRealtimeCollectionFetch = { value, _ ->
             profileList = value?.getListOfObjects()
         }) {

diff --git a/app/src/main/java/app/waste2wealth/com/firebase/firestore/UpdateData.kt b/app/src/main/java/app/waste2wealth/com/firebase/firestore/UpdateData.kt
@@ -103,6 +103,7 @@ fun updateCollectedWasteToFirebase(
     isWasteCollected: Boolean,
     allWasteCollected: Boolean,
     feedBack: String,
+    beforeCollectedPath: String? = null
 ) {
     val wasteItem = CollectedWasteItem(
         latitude,
@@ -113,12 +114,13 @@ fun updateCollectedWasteToFirebase(
         address,
         isWasteCollected,
         allWasteCollected,
-        feedBack
+        feedBack,
+        beforeCollectedPath
     )
 
     val db = FirebaseFirestore.getInstance()
     timeStamp.let {
-        db.collection("CollectedWastes").document(it.toString()).set(wasteItem)
+        db.collection("TempCollectedWastes").document(it.toString()).set(wasteItem)
             .addOnSuccessListener {
 
                 Toast.makeText(context, "Waste Reported Successfully", Toast.LENGTH_SHORT).show()

diff --git a/app/src/main/java/app/waste2wealth/com/firebase/firestore/WasteItem.kt b/app/src/main/java/app/waste2wealth/com/firebase/firestore/WasteItem.kt
@@ -46,6 +46,7 @@ data class CollectedWasteItem(
     val isWasteCollected: Boolean,
     val allWasteCollected: Boolean,
     val feedBack: String,
+    val beforeCollectedPath: String? = null
 ) {
     constructor() : this(
         0.0,
@@ -56,6 +57,7 @@ data class CollectedWasteItem(
         "",
         false,
         false,
+        "",
         ""
     )
 }
diff --git a/app/src/main/java/app/waste2wealth/com/location/LocationViewModel.kt b/app/src/main/java/app/waste2wealth/com/location/LocationViewModel.kt
@@ -45,6 +45,7 @@ class LocationViewModel @Inject constructor(
     var time = mutableStateOf("")
     var tags = mutableStateOf(listOf<Tag>())
     var wastePhoto = mutableStateOf("")
+    var beforeCollectedPath = mutableStateOf("")
     var rewardImage = mutableStateOf("")
     var rewardTitle = mutableStateOf("")
     var rewardDescription = mutableStateOf("")