Compare commits

..

2 Commits

5 changed files with 181 additions and 8 deletions

View File

@@ -172,3 +172,37 @@ fun formatToShortDate(dataStr: String): String {
extracted extracted
} }
} }
fun isDateInExecutionPeriod(selectedDateStr: String, dataInicioStr: String, dataFimStr: String): Boolean {
val cleanSelected = selectedDateStr.trim()
if (cleanSelected == "Todas" || cleanSelected.isBlank()) return true
val selDate = parseDateOnly(cleanSelected) ?: return false
val startDate = parseDateOnly(dataInicioStr) ?: parseFullDateTime(dataInicioStr) ?: return false
val endDate = parseDateOnly(dataFimStr) ?: parseFullDateTime(dataFimStr) ?: startDate
val selCal = Calendar.getInstance().apply {
time = selDate
set(Calendar.HOUR_OF_DAY, 0)
set(Calendar.MINUTE, 0)
set(Calendar.SECOND, 0)
set(Calendar.MILLISECOND, 0)
}
val startCal = Calendar.getInstance().apply {
time = startDate
set(Calendar.HOUR_OF_DAY, 0)
set(Calendar.MINUTE, 0)
set(Calendar.SECOND, 0)
set(Calendar.MILLISECOND, 0)
}
val endCal = Calendar.getInstance().apply {
time = endDate
set(Calendar.HOUR_OF_DAY, 0)
set(Calendar.MINUTE, 0)
set(Calendar.SECOND, 0)
set(Calendar.MILLISECOND, 0)
}
return !selCal.before(startCal) && !selCal.after(endCal)
}

View File

@@ -200,7 +200,7 @@ fun MaintenanceDashboardScreen(
val uniqueDates = remember(allActivities) { val uniqueDates = remember(allActivities) {
val datesOnly = allActivities val datesOnly = allActivities
.map { extractDateOnly(it.dataInicio) } .flatMap { listOf(extractDateOnly(it.dataInicio), extractDateOnly(it.dataFim)) }
.filter { it.isNotBlank() && it != "N/A" } .filter { it.isNotBlank() && it != "N/A" }
.distinct() .distinct()
@@ -949,6 +949,22 @@ fun OSListItemCard(
color = BrandBlack color = BrandBlack
) )
if (activity.tag.isNotBlank()) {
Box(
modifier = Modifier
.clip(RoundedCornerShape(4.dp))
.background(Color(0xFFE3F2FD))
.padding(horizontal = 6.dp, vertical = 2.dp)
) {
Text(
text = activity.tag,
fontSize = 11.sp,
fontWeight = FontWeight.Bold,
color = Color(0xFF1976D2)
)
}
}
// Sync Status Badge // Sync Status Badge
Icon( Icon(
imageVector = if (activity.synced) Icons.Default.CloudDone else Icons.Default.CloudQueue, imageVector = if (activity.synced) Icons.Default.CloudDone else Icons.Default.CloudQueue,
@@ -1357,12 +1373,32 @@ fun EditActivityBottomSheet(
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = StatusGrey color = StatusGrey
) )
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
Text( Text(
text = activity.numeroOs, text = activity.numeroOs,
fontSize = 20.sp, fontSize = 20.sp,
fontWeight = FontWeight.Black, fontWeight = FontWeight.Black,
color = BrandBlack color = BrandBlack
) )
if (activity.tag.isNotBlank()) {
Box(
modifier = Modifier
.clip(RoundedCornerShape(4.dp))
.background(Color(0xFFE3F2FD))
.padding(horizontal = 6.dp, vertical = 2.dp)
) {
Text(
text = activity.tag,
fontSize = 12.sp,
fontWeight = FontWeight.Bold,
color = Color(0xFF1976D2)
)
}
}
}
} }
IconButton(onClick = onDismiss) { IconButton(onClick = onDismiss) {

View File

@@ -152,7 +152,7 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
"Concluído" -> activity.status == ActivityStatus.CONCLUIDO "Concluído" -> activity.status == ActivityStatus.CONCLUIDO
else -> true else -> true
} }
val matchDataInicio = dataInicio == "Todas" || formatToShortDate(activity.dataInicio) == dataInicio val matchDataInicio = com.example.data.model.isDateInExecutionPeriod(dataInicio, activity.dataInicio, activity.dataFim)
val matchRecurso = recurso == "Todos" || activity.recurso.split(";").map { it.trim() }.contains(recurso) val matchRecurso = recurso == "Todos" || activity.recurso.split(";").map { it.trim() }.contains(recurso)
val matchQuery = query.isBlank() || val matchQuery = query.isBlank() ||
activity.numeroOs.contains(query, ignoreCase = true) || activity.numeroOs.contains(query, ignoreCase = true) ||

View File

@@ -342,5 +342,70 @@ class ExampleUnitTest {
assertEquals(1, caldeirariaActivities.size) assertEquals(1, caldeirariaActivities.size)
assertEquals("103", caldeirariaActivities[0].numeroOs) assertEquals("103", caldeirariaActivities[0].numeroOs)
} }
@Test
fun testIsDateInExecutionPeriod() {
val dataInicio = "18/08/2026"
val dataFim = "22/08/2026"
// 1. "Todas" matches everything
assertTrue(com.example.data.model.isDateInExecutionPeriod("Todas", dataInicio, dataFim))
assertTrue(com.example.data.model.isDateInExecutionPeriod("", dataInicio, dataFim))
// 2. Exact start date match (inclusive)
assertTrue(com.example.data.model.isDateInExecutionPeriod("18/08/2026", dataInicio, dataFim))
assertTrue(com.example.data.model.isDateInExecutionPeriod("18/08/26", dataInicio, dataFim))
// 3. Intermediate date inside range
assertTrue(com.example.data.model.isDateInExecutionPeriod("20/08/2026", dataInicio, dataFim))
assertTrue(com.example.data.model.isDateInExecutionPeriod("20/08/26", dataInicio, dataFim))
// 4. Exact end date match (inclusive)
assertTrue(com.example.data.model.isDateInExecutionPeriod("22/08/2026", dataInicio, dataFim))
assertTrue(com.example.data.model.isDateInExecutionPeriod("22/08/26", dataInicio, dataFim))
// 5. Out of bounds (before start date)
assertFalse(com.example.data.model.isDateInExecutionPeriod("17/08/2026", dataInicio, dataFim))
assertFalse(com.example.data.model.isDateInExecutionPeriod("17/08/26", dataInicio, dataFim))
// 6. Out of bounds (after end date)
assertFalse(com.example.data.model.isDateInExecutionPeriod("23/08/2026", dataInicio, dataFim))
assertFalse(com.example.data.model.isDateInExecutionPeriod("23/08/26", dataInicio, dataFim))
// 7. Formats with weekday and timestamps
val fullStart = "ter. 18/08/26 07:00"
val fullEnd = "sáb. 22/08/26 17:00"
assertTrue(com.example.data.model.isDateInExecutionPeriod("20/08/26", fullStart, fullEnd))
assertTrue(com.example.data.model.isDateInExecutionPeriod("18/08/26", fullStart, fullEnd))
assertTrue(com.example.data.model.isDateInExecutionPeriod("22/08/26", fullStart, fullEnd))
assertFalse(com.example.data.model.isDateInExecutionPeriod("23/08/26", fullStart, fullEnd))
// 8. Missing end date ("N/A") falls back to start date only
assertTrue(com.example.data.model.isDateInExecutionPeriod("18/08/26", "18/08/26", "N/A"))
assertFalse(com.example.data.model.isDateInExecutionPeriod("19/08/26", "18/08/26", "N/A"))
}
@Test
fun testActivitiesFilteringByExecutionPeriod() {
val act1 = com.example.data.model.MaintenanceActivity(
numeroOs = "OS-100", descricao = "Manutenção Preventiva", setor = "Geral", equipe = "Mecânica", recurso = "Sem Recurso",
dataInicio = "18/08/2026", dataFim = "22/08/2026", percentualExecucao = 0
)
val act2 = com.example.data.model.MaintenanceActivity(
numeroOs = "OS-200", descricao = "Inspeção Elétrica", setor = "Geral", equipe = "Elétrica", recurso = "Sem Recurso",
dataInicio = "23/08/2026", dataFim = "25/08/2026", percentualExecucao = 0
)
val activities = listOf(act1, act2)
// Selecting 20/08/26 should include OS-100 (18/08 to 22/08) and exclude OS-200
val filtered = activities.filter { activity ->
com.example.data.model.isDateInExecutionPeriod("20/08/26", activity.dataInicio, activity.dataFim)
}
assertEquals(1, filtered.size)
assertEquals("OS-100", filtered[0].numeroOs)
}
} }

View File

@@ -29,4 +29,42 @@ export PATH="$JAVA_HOME/bin:$PATH"
JAVA_HOME="/home/cesarjhony/dev/projects/gestao_de_manutencao/jdk" ./gradle_9_3_1/gradle-9.3.1/bin/gradle :app:assembleDebug --offline JAVA_HOME="/home/cesarjhony/dev/projects/gestao_de_manutencao/jdk" ./gradle_9_3_1/gradle-9.3.1/bin/gradle :app:assembleDebug --offline
``` ```
---
## Processos em Segundo Plano e Monitoramento
### 1. Executar Compilação em Segundo Plano
Para rodar a compilação do Gradle em segundo plano redirecionando a saída para um arquivo de log:
```bash
# Iniciar a compilação em segundo plano
(JAVA_HOME="/home/cesarjhony/dev/projects/gestao_de_manutencao/jdk" ./gradle_9_3_1/gradle-9.3.1/bin/gradle assembleDebug) > build.log 2>&1 &
```
### 2. Acompanhar a Execução da Compilação em Tempo Real
Para monitorar a saída do log do processo em segundo plano:
```bash
tail -f build.log
```
Para verificar se o processo ainda está rodando:
```bash
ps aux | grep gradle
```
---
## Monitorar Sincronização e Logs do App em Segundo Plano (ADB)
O aplicativo executa tarefas de sincronização em segundo plano com o **Google Sheets** e **Firebase Storage**. Para acompanhar os logs dessas operações via ADB:
```bash
# Monitorar especificamente os logs das rotinas de sincronização e repositório
adb logcat -s GoogleSheetsSyncService MaintenanceRepository FirebaseAuth FirebaseStorage MaintenanceViewModel
```
Para filtrar logs gerais de sincronização em tempo real:
```bash
adb logcat | grep -iE "sync|sheets|firebase|maintenance"
```