Skip to content

Commit

Permalink
fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
Balcan committed Dec 9, 2024
1 parent 197cdc3 commit a9361b8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
5 changes: 5 additions & 0 deletions form/src/main/java/org/dhis2/form/data/DataEntryRepository.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
package org.dhis2.form.data

import androidx.paging.PagingData
import io.reactivex.Flowable
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import org.dhis2.commons.periods.Period
import org.dhis2.form.model.EventMode
import org.dhis2.form.model.FieldUiModel
import org.dhis2.form.model.OptionSetConfiguration
import org.hisp.dhis.android.core.common.ValidationStrategy

interface DataEntryRepository {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package org.dhis2.form.data

import androidx.paging.PagingData
import io.reactivex.Flowable
import io.reactivex.Single
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.emptyFlow
import org.dhis2.commons.date.DateUtils
import org.dhis2.commons.orgunitselector.OrgUnitSelectorScope
import org.dhis2.commons.periods.Period
import org.dhis2.commons.resources.MetadataIconProvider
import org.dhis2.form.data.metadata.EnrollmentConfiguration
import org.dhis2.form.model.EnrollmentMode
Expand Down Expand Up @@ -70,6 +74,8 @@ class EnrollmentRepository(
}
}

override fun fetchPeriods(): Flow<PagingData<Period>> = emptyFlow()

override fun sectionUids(): Flowable<List<String>> {
val sectionUids = mutableListOf(ENROLLMENT_DATA_SECTION_UID)
if (programSections.isEmpty()) {
Expand Down

0 comments on commit a9361b8

Please sign in to comment.