fixed breaking code

MuindiStephen · Oct 1, 2024 · c4459f5 · c4459f5
1 parent 82713fb
commit c4459f5
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 201 deletions.
diff --git a/app/src/main/java/com/steve_md/smartmkulima/data/repositories/PaymentRepository.kt b/app/src/main/java/com/steve_md/smartmkulima/data/repositories/PaymentRepository.kt
diff --git a/app/src/main/java/com/steve_md/smartmkulima/di/NetworkModule.kt b/app/src/main/java/com/steve_md/smartmkulima/di/NetworkModule.kt
@@ -63,14 +63,5 @@ object NetworkModule {
         return retrofit.create(FarmProduceApiService::class.java)
     }
 
-//    @Singleton
-//    @Provides
-//    fun providesDarajaApiClient(): DarajaApiClient {
-//        return DarajaApiClient(
-//            consumerKey = "NgGUJ2LGJlVvjdLu8P7yDGIs6v4RmMF1114mYRUVTVOjsCii",
-//            consumerSecret = "L5Ur0sgEuGfBAB7u8ynlH0bzerD1VABt7ABASfBAozvATLKETNHGcpTieX1vzLyv",
-//            environment = Constants.SANDBOX_BASE_URL
-//        )
-//    }
 
 }
diff --git a/app/src/main/java/com/steve_md/smartmkulima/di/RepositoryModule.kt b/app/src/main/java/com/steve_md/smartmkulima/di/RepositoryModule.kt
@@ -1,7 +1,5 @@
 package com.steve_md.smartmkulima.di
 
-import PaymentRepository
-import com.steve_md.smartmkulima.data.remote.DarajaApiClient
 import com.steve_md.smartmkulima.data.remote.FarmProduceApiService
 import com.steve_md.smartmkulima.data.repositories.AuthRepository
 import com.steve_md.smartmkulima.data.repositories.FarmCycleRepository
@@ -52,13 +50,6 @@ object RepositoryModule {
         return AuthRepositoryImpl()
     }
 
-//    @Singleton
-//    @Provides
-//    fun providesPaymentRepository(
-//        darajaApiClient: DarajaApiClient,
-//        appDatabase: AppDatabase): PaymentRepository {
-//        return PaymentRepository(darajaApiClient,appDatabase)
-//    }
 
 
 }
diff --git a/app/src/main/java/com/steve_md/smartmkulima/ui/activities/DetailedFarmCycleActivity.kt b/app/src/main/java/com/steve_md/smartmkulima/ui/activities/DetailedFarmCycleActivity.kt
@@ -42,7 +42,7 @@ class DetailedFarmCycleActivity : AppCompatActivity() {
     private val viewModel: MainViewModel by viewModels()
     private lateinit var binding: ActivityDetailedFarmCycleBinding
     private val tasksAdapter by lazy { LocalFarmCycleTasksAdapter() }
-  //  private lateinit var navController: NavController
+    //  private lateinit var navController: NavController
 
 
     @RequiresApi(Build.VERSION_CODES.O)
@@ -101,7 +101,7 @@ class DetailedFarmCycleActivity : AppCompatActivity() {
             // Marking the Crop Cycle As DONE
             binding.buttonMarkAsDoneCropCycle.setOnClickListener {
                 showChangeCropCycleStatusDialog()
-               // textViewComments.isVisible = false
+                // textViewComments.isVisible = false
             }
 
             binding.buttonOpenRecordsExpensesAndRevenues.setOnClickListener {
@@ -169,12 +169,20 @@ class DetailedFarmCycleActivity : AppCompatActivity() {
     }
 
     private fun showCropCycleCancelledAddCommentsBottomSheetDialog() {
-        val modal = CropCycleCancelledStatusCommentsFragment()
+
+        val localFarmCycle: LocalFarmCycle? = intent.getParcelableExtra("localFarmCycle")
+
+        val modal = CropCycleCancelledStatusCommentsFragment().apply {
+            arguments = Bundle().apply {
+                putString("cropCycleName", localFarmCycle?.cropName)
+            }
+        }
         supportFragmentManager.let {
-            modal.show(it, CropCycleCancelledStatusCommentsFragment.TAG)
+                modal.show(it, CropCycleCancelledStatusCommentsFragment.TAG)
         }
     }
 
+
     private fun showViewCropCycleAnalyticsBottomSheet() {
 
         val localFarmCycle: LocalFarmCycle? = intent.getParcelableExtra("localFarmCycle")

diff --git a/...d/smartmkulima/ui/fragments/others/crop_cycle/CropCycleCancelledStatusCommentsFragment.kt b/...d/smartmkulima/ui/fragments/others/crop_cycle/CropCycleCancelledStatusCommentsFragment.kt
@@ -36,13 +36,17 @@ class CropCycleCancelledStatusCommentsFragment : BottomSheetDialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        val cropName = arguments?.getString("cropCycleName")
+
         // update or add comments why cancel crop cycle
         binding.btnSubmitCommentsForCropCycleCancelling.setOnClickListener {
 
             if (validateInputs()) {
-                viewModel.updateToNewCommentsCropCycleCancelled(
-                    binding.inputCommentsForCancelCropCycle.text.toString()
-                )
+                if (cropName != null) {
+                    viewModel.updateToNewCommentsCropCycleCancelled(
+                        binding.inputCommentsForCancelCropCycle.text.toString(), cropName
+                    )
+                }
                 displaySnackBar("Added comments.")
 
                 //view.findViewById<TextView>(R.id.textViewComments).isVisible = true

diff --git a/...ava/com/steve_md/smartmkulima/ui/fragments/others/crop_cycle/DetailedFarmCycleFragment.kt b/...ava/com/steve_md/smartmkulima/ui/fragments/others/crop_cycle/DetailedFarmCycleFragment.kt
@@ -58,7 +58,7 @@ class DetailedFarmCycleFragment : Fragment() {
         }
 
         val setStatus =  binding.spinnerStatusOfFarmCycle.selectedItem.toString()
-        viewModel.updateTaskStatus(setStatus)
+        localFarmCycle?.let { viewModel.updateTaskStatus(setStatus, it.cropName) }
         binding.textView86.text = setStatus
 
        // val cycle = args.cycle

diff --git a/app/src/main/java/com/steve_md/smartmkulima/viewmodel/PaymentViewModel.kt b/app/src/main/java/com/steve_md/smartmkulima/viewmodel/PaymentViewModel.kt