Set current date as event date when entering event in `SchedulingDial…

…og` (#3810) * Set current date as event date when entering event in `SchedulingDialog` * Remove unused variable
dhis2 · Oct 7, 2024 · 3a0096e · 3a0096e
1 parent 4fada06
commit 3a0096e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingModule.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingModule.kt
@@ -1,6 +1,12 @@
 package org.dhis2.usescases.teiDashboard.dialogs.scheduling
 
 import dagger.Module
+import dagger.Provides
+import org.dhis2.commons.date.DateUtils
 
 @Module
-class SchedulingModule
+class SchedulingModule {
+
+    @Provides
+    fun providesDateUtils(): DateUtils = DateUtils.getInstance()
+}
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingViewModel.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingViewModel.kt
@@ -8,6 +8,7 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.dhis2.commons.bindings.event
+import org.dhis2.commons.date.DateUtils
 import org.dhis2.commons.date.toOverdueOrScheduledUiText
 import org.dhis2.commons.resources.DhisPeriodUtils
 import org.dhis2.commons.resources.EventResourcesProvider
@@ -38,6 +39,7 @@ class SchedulingViewModel(
     private val periodUtils: DhisPeriodUtils,
     private val dispatchersProvider: DispatcherProvider,
     private val launchMode: LaunchMode,
+    private val dateUtils: DateUtils,
 ) : ViewModel() {
 
     lateinit var repository: EventDetailsRepository
@@ -265,14 +267,13 @@ class SchedulingViewModel(
 
     fun enterEvent(launchMode: LaunchMode.EnterEvent) {
         viewModelScope.launch {
-            val eventDate = eventDate.value.currentDate ?: return@launch
             val event = withContext(dispatchersProvider.io()) {
                 d2.event(launchMode.eventUid)
             } ?: return@launch
             val programUid = event.program() ?: return@launch
 
             d2.eventModule().events().uid(launchMode.eventUid).run {
-                setEventDate(eventDate)
+                setEventDate(dateUtils.today)
                 setStatus(EventStatus.ACTIVE)
             }
 

diff --git a/...in/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingViewModelFactory.kt b/...in/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingViewModelFactory.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import org.dhis2.commons.date.DateUtils
 import org.dhis2.commons.resources.DhisPeriodUtils
 import org.dhis2.commons.resources.EventResourcesProvider
 import org.dhis2.commons.resources.ResourceManager
@@ -17,6 +18,7 @@ class SchedulingViewModelFactory @AssistedInject constructor(
     private val resourceManager: ResourceManager,
     private val eventResourcesProvider: EventResourcesProvider,
     private val periodUtils: DhisPeriodUtils,
+    private val dateUtils: DateUtils,
     private val dispatcherProvider: DispatcherProvider,
     @Assisted private val launchMode: SchedulingDialog.LaunchMode,
 ) : ViewModelProvider.Factory {
@@ -32,6 +34,7 @@ class SchedulingViewModelFactory @AssistedInject constructor(
             resourceManager = resourceManager,
             eventResourcesProvider = eventResourcesProvider,
             periodUtils = periodUtils,
+            dateUtils = dateUtils,
             dispatchersProvider = dispatcherProvider,
             launchMode = launchMode,
         ) as T

diff --git a/.../test/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingViewModelTest.kt b/.../test/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingViewModelTest.kt
@@ -30,6 +30,7 @@ class SchedulingViewModelTest {
             resourceManager = mock(),
             eventResourcesProvider = mock(),
             periodUtils = mock(),
+            dateUtils = mock(),
             dispatchersProvider = object : DispatcherProvider {
                 override fun io(): CoroutineDispatcher {
                     return testingDispatcher