refactor: update activity sorting logic and expand dashboard screen functionality with new state management and media handling
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -284,12 +284,17 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
|
|||||||
result
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
// Always sort by dataInicio (start date) ascending, oldest first using dataInicioMillis O(1)
|
// Always sort by dataInicio (start date) ascending, oldest first. OSs without start date appear at the very end.
|
||||||
filtered.sortedWith { a1, a2 ->
|
filtered.sortedWith { a1, a2 ->
|
||||||
val p1 = a1.dataInicioMillis
|
val p1 = if (a1.dataInicio.isNullOrBlank() || a1.dataInicioMillis == 0L) Long.MAX_VALUE else a1.dataInicioMillis
|
||||||
val p2 = a2.dataInicioMillis
|
val p2 = if (a2.dataInicio.isNullOrBlank() || a2.dataInicioMillis == 0L) Long.MAX_VALUE else a2.dataInicioMillis
|
||||||
when {
|
when {
|
||||||
p1 == Long.MAX_VALUE && p2 == Long.MAX_VALUE -> a1.numeroOs.compareTo(a2.numeroOs)
|
p1 == Long.MAX_VALUE && p2 == Long.MAX_VALUE -> {
|
||||||
|
val f1 = a1.dataFimMillis
|
||||||
|
val f2 = a2.dataFimMillis
|
||||||
|
val endComp = f1.compareTo(f2)
|
||||||
|
if (endComp != 0) endComp else a1.numeroOs.compareTo(a2.numeroOs)
|
||||||
|
}
|
||||||
p1 == Long.MAX_VALUE -> 1
|
p1 == Long.MAX_VALUE -> 1
|
||||||
p2 == Long.MAX_VALUE -> -1
|
p2 == Long.MAX_VALUE -> -1
|
||||||
else -> {
|
else -> {
|
||||||
|
|||||||
@@ -185,6 +185,67 @@ class ExampleRobolectricTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class)
|
||||||
|
@Test
|
||||||
|
fun `test sorting OSs without start date appear at the very end of list`() {
|
||||||
|
val testDispatcher = kotlinx.coroutines.test.UnconfinedTestDispatcher()
|
||||||
|
kotlinx.coroutines.Dispatchers.setMain(testDispatcher)
|
||||||
|
try {
|
||||||
|
val context = ApplicationProvider.getApplicationContext<Context>()
|
||||||
|
val db = androidx.room.Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
|
||||||
|
.allowMainThreadQueries()
|
||||||
|
.setQueryExecutor { it.run() }
|
||||||
|
.setTransactionExecutor { it.run() }
|
||||||
|
.build()
|
||||||
|
val repository = com.example.data.repository.MaintenanceRepository(db.maintenanceDao(), context)
|
||||||
|
|
||||||
|
val actNoStart = com.example.data.model.MaintenanceActivity(
|
||||||
|
numeroOs = "OS-NO-START",
|
||||||
|
descricao = "OS without start date",
|
||||||
|
setor = "Geral",
|
||||||
|
equipe = "Mecânica",
|
||||||
|
recurso = "Sem Recurso",
|
||||||
|
dataInicio = "",
|
||||||
|
dataFim = "27/08/2026 17:00",
|
||||||
|
percentualExecucao = 0,
|
||||||
|
synced = true
|
||||||
|
)
|
||||||
|
val actValidStart = com.example.data.model.MaintenanceActivity(
|
||||||
|
numeroOs = "OS-VALID-START",
|
||||||
|
descricao = "OS with valid start date",
|
||||||
|
setor = "Geral",
|
||||||
|
equipe = "Elétrica",
|
||||||
|
recurso = "Sem Recurso",
|
||||||
|
dataInicio = "01/01/2026 08:00",
|
||||||
|
dataFim = "01/01/2026 17:00",
|
||||||
|
percentualExecucao = 0,
|
||||||
|
synced = true
|
||||||
|
)
|
||||||
|
|
||||||
|
kotlinx.coroutines.runBlocking {
|
||||||
|
db.maintenanceDao().insertActivities(listOf(actNoStart, actValidStart))
|
||||||
|
val viewModel = com.example.ui.viewmodel.MaintenanceViewModel(repository)
|
||||||
|
|
||||||
|
val job = viewModel.viewModelScope.launch {
|
||||||
|
viewModel.filteredActivities.collect {}
|
||||||
|
}
|
||||||
|
|
||||||
|
Thread.sleep(200)
|
||||||
|
org.robolectric.shadows.ShadowLooper.idleMainLooper()
|
||||||
|
|
||||||
|
val list = viewModel.filteredActivities.value
|
||||||
|
assertEquals(2, list.size)
|
||||||
|
assertEquals("OS-VALID-START", list[0].numeroOs)
|
||||||
|
assertEquals("OS-NO-START", list[1].numeroOs)
|
||||||
|
|
||||||
|
job.cancel()
|
||||||
|
}
|
||||||
|
db.close()
|
||||||
|
} finally {
|
||||||
|
kotlinx.coroutines.Dispatchers.resetMain()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class)
|
@OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class)
|
||||||
@Test
|
@Test
|
||||||
fun `test analytics state calculations in ViewModel`() {
|
fun `test analytics state calculations in ViewModel`() {
|
||||||
|
|||||||
Reference in New Issue
Block a user