Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: implementing dynamic stage items #21

Merged
merged 2 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import org.dhis2.commons.viewmodel.DispatcherProvider
import org.dhis2.data.dhislogic.DhisProgramUtils
import org.dhis2.data.service.SyncStatusController
import org.hisp.dhis.android.core.D2
import org.saudigitus.rei.data.source.DataManager
import org.saudigitus.rei.data.source.repository.DataManagerImpl

@Module
class ProgramModule(private val view: ProgramView) {
Expand Down Expand Up @@ -64,10 +62,4 @@ class ProgramModule(private val view: ProgramView) {
fun provideAnimations(): ProgramAnimation {
return ProgramAnimation()
}

@Provides
@PerFragment
fun provideDataManager(d2: D2): DataManager {
return DataManagerImpl(d2)
}
}
3 changes: 1 addition & 2 deletions rei/src/main/java/org/saudigitus/rei/ReiActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ReiActivity : FragmentActivity() {
HomeScreen(
context = this@ReiActivity,
onSync = ::syncProgram,
onNext = ::launchLineListing
onNext = ::launchLineListing,
) {
finish()
}
Expand All @@ -58,7 +58,6 @@ class ReiActivity : FragmentActivity() {
).show()
}


private fun launchLineListing() {
ReiNavigator(
activity = this@ReiActivity,
Expand Down
2 changes: 2 additions & 0 deletions rei/src/main/java/org/saudigitus/rei/data/model/StageItem.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ data class StageItem(
val color: String,
@JsonProperty("label")
val label: String,
@JsonProperty("pos")
val pos: Int,
)
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ interface DataManager {
suspend fun getStageEventData(
program: String,
stage: String,
): List<Triple<String, Int, Color>>
): List<Triple<String, String, Color>>
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package org.saudigitus.rei.data.source.repository

import androidx.compose.ui.graphics.Color
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.withContext
import org.dhis2.commons.resources.ResourceManager
import org.hisp.dhis.android.core.D2
import org.hisp.dhis.android.core.event.EventStatus
import org.saudigitus.rei.data.model.Stage
import org.saudigitus.rei.data.source.DataManager
import org.saudigitus.rei.utils.HardcodeData
import org.saudigitus.rei.utils.countEventsByStatusToday
import org.saudigitus.rei.utils.overdueEventCount
import org.saudigitus.rei.utils.reiModuleDatastore
Expand All @@ -17,6 +18,7 @@ import javax.inject.Inject
class DataManagerImpl
@Inject constructor(
private val d2: D2,
private val resourceManager: ResourceManager,
) : DataManager {
override suspend fun loadConfig() = withContext(Dispatchers.IO) {
return@withContext d2.reiModuleDatastore()
Expand Down Expand Up @@ -44,12 +46,13 @@ class DataManagerImpl
async { d2.overdueEventCount(program, stage) },
)

val stageStatus = HardcodeData.getHomeTabItemData()
val stageStatus = loadConfig().find { it.program == program }?.stageItems
?.sortedBy { it.pos } ?: emptyList()

return@withContext listOf(
Triple("$scheduledCount", stageStatus[0].first, stageStatus[0].second),
Triple("$completedCount", stageStatus[1].first, stageStatus[1].second),
Triple("$overdueCount", stageStatus[2].first, stageStatus[2].second),
Triple("$scheduledCount", stageStatus[0].label, Color(resourceManager.getColorFrom(stageStatus[0].color))),
Triple("$completedCount", stageStatus[1].label, Color(resourceManager.getColorFrom(stageStatus[1].color))),
Triple("$overdueCount", stageStatus[2].label, Color(resourceManager.getColorFrom(stageStatus[2].color))),
)
}
}
6 changes: 5 additions & 1 deletion rei/src/main/java/org/saudigitus/rei/di/ReiModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import org.dhis2.commons.resources.ResourceManager
import org.hisp.dhis.android.core.D2
import org.saudigitus.rei.data.source.DataManager
import org.saudigitus.rei.data.source.repository.DataManagerImpl
Expand All @@ -15,5 +16,8 @@ object ReiModule {

@Provides
@Singleton
fun providesDataManager(d2: D2): DataManager = DataManagerImpl(d2)
fun providesDataManager(
d2: D2,
resourceManager: ResourceManager,
): DataManager = DataManagerImpl(d2, resourceManager)
}
5 changes: 2 additions & 3 deletions rei/src/main/java/org/saudigitus/rei/ui/stages/StageTab.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
Expand All @@ -34,7 +33,7 @@ import org.saudigitus.rei.ui.components.HomeStageCardState
@Stable
data class StageTabState(
val stages: List<Stage> = emptyList(),
val stagesData: List<Triple<String, Int, Color>> = emptyList(),
val stagesData: List<Triple<String, String, Color>> = emptyList(),
)

@Composable
Expand Down Expand Up @@ -96,7 +95,7 @@ fun StageTab(
modifier = Modifier.size(120.dp),
state = HomeStageCardState(
title = it.first.ifEmpty { "0" },
subtitle = stringResource(it.second),
subtitle = it.second,
bottomColor = it.third,
),
)
Expand Down