feat: add simulation date support and alert banner to AnalyticsScreen
This commit is contained in:
@@ -77,9 +77,21 @@ fun AnalyticsScreen(
|
|||||||
val currentUser by viewModel.currentUser.collectAsStateWithLifecycle()
|
val currentUser by viewModel.currentUser.collectAsStateWithLifecycle()
|
||||||
val userAccessLevel by viewModel.userAccessLevel.collectAsStateWithLifecycle()
|
val userAccessLevel by viewModel.userAccessLevel.collectAsStateWithLifecycle()
|
||||||
val allHistory by viewModel.allHistoryState.collectAsStateWithLifecycle()
|
val allHistory by viewModel.allHistoryState.collectAsStateWithLifecycle()
|
||||||
|
val simulationConfig by viewModel.simulationConfig.collectAsStateWithLifecycle()
|
||||||
|
val selectedActivity by viewModel.selectedActivity.collectAsStateWithLifecycle()
|
||||||
|
val selectedActivityHistory by viewModel.selectedActivityHistory.collectAsStateWithLifecycle()
|
||||||
|
val selectedActivityFindings by viewModel.selectedActivityFindings.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
|
val referenceDate = remember(simulationConfig) {
|
||||||
|
val simMillis = simulationConfig.simulatedDateMillis
|
||||||
|
if (simulationConfig.isActive && simMillis != null) {
|
||||||
|
Date(simMillis)
|
||||||
|
} else {
|
||||||
|
Date()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var selectedOverdueGroup by remember { mutableStateOf<SelectedOverdueGroup?>(null) }
|
var selectedOverdueGroup by remember { mutableStateOf<SelectedOverdueGroup?>(null) }
|
||||||
var selectedActivityToEdit by remember { mutableStateOf<MaintenanceActivity?>(null) }
|
|
||||||
|
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
|
|
||||||
@@ -178,6 +190,12 @@ fun AnalyticsScreen(
|
|||||||
.padding(16.dp),
|
.padding(16.dp),
|
||||||
verticalArrangement = Arrangement.spacedBy(16.dp)
|
verticalArrangement = Arrangement.spacedBy(16.dp)
|
||||||
) {
|
) {
|
||||||
|
// Banner de Alerta de Simulação de Data
|
||||||
|
SimulationAlertBanner(
|
||||||
|
simulationConfig = simulationConfig,
|
||||||
|
onDismiss = { viewModel.clearDateSimulation() }
|
||||||
|
)
|
||||||
|
|
||||||
if (activities.isEmpty()) {
|
if (activities.isEmpty()) {
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
@@ -223,28 +241,27 @@ fun AnalyticsScreen(
|
|||||||
allActivities = activities,
|
allActivities = activities,
|
||||||
projectEnd = analyticsState.projectEnd,
|
projectEnd = analyticsState.projectEnd,
|
||||||
topSectors = topSectors,
|
topSectors = topSectors,
|
||||||
|
referenceDate = referenceDate,
|
||||||
onDismiss = { selectedOverdueGroup = null },
|
onDismiss = { selectedOverdueGroup = null },
|
||||||
onActivityClick = { activity ->
|
onActivityClick = { activity ->
|
||||||
selectedOverdueGroup = null
|
selectedOverdueGroup = null
|
||||||
selectedActivityToEdit = activity
|
viewModel.selectActivity(activity)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Modal 2: Edição da OS Selecionada
|
// Modal 2: Edição da OS Selecionada
|
||||||
selectedActivityToEdit?.let { activity ->
|
if (selectedActivity != null) {
|
||||||
val history = remember(allHistory, activity) {
|
|
||||||
allHistory.filter { it.numeroOs == activity.numeroOs }
|
|
||||||
}
|
|
||||||
EditActivityBottomSheet(
|
EditActivityBottomSheet(
|
||||||
activity = activity,
|
activity = selectedActivity!!,
|
||||||
history = history,
|
history = selectedActivityHistory,
|
||||||
|
findings = selectedActivityFindings,
|
||||||
currentUser = currentUser,
|
currentUser = currentUser,
|
||||||
userAccessLevel = userAccessLevel,
|
userAccessLevel = userAccessLevel,
|
||||||
onDismiss = { selectedActivityToEdit = null },
|
onDismiss = { viewModel.selectActivity(null) },
|
||||||
onUpdateProgress = { newPercentual, observation, photoPath ->
|
onUpdateProgress = { newPercentual, observation, photoPath ->
|
||||||
viewModel.updateProgress(
|
viewModel.updateProgress(
|
||||||
numeroOs = activity.numeroOs,
|
numeroOs = selectedActivity!!.numeroOs,
|
||||||
novoPercentual = newPercentual,
|
novoPercentual = newPercentual,
|
||||||
observacao = observation,
|
observacao = observation,
|
||||||
fotoPath = photoPath,
|
fotoPath = photoPath,
|
||||||
@@ -252,14 +269,23 @@ fun AnalyticsScreen(
|
|||||||
emailEditor = currentUser?.email
|
emailEditor = currentUser?.email
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
onAddFinding = { tipo, desc ->
|
||||||
|
viewModel.addFinding(selectedActivity!!.numeroOs, tipo, desc)
|
||||||
|
},
|
||||||
|
onUpdateFinding = { finding ->
|
||||||
|
viewModel.updateFinding(finding)
|
||||||
|
},
|
||||||
|
onDeleteFinding = { finding ->
|
||||||
|
viewModel.deleteFinding(finding)
|
||||||
|
},
|
||||||
onSavePhotoFromUri = { uri ->
|
onSavePhotoFromUri = { uri ->
|
||||||
viewModel.saveLocalPhotoFromUri(uri, activity.numeroOs)
|
viewModel.saveLocalPhotoFromUri(uri, selectedActivity!!.numeroOs)
|
||||||
},
|
},
|
||||||
onCreateCameraUri = {
|
onCreateCameraUri = {
|
||||||
viewModel.createTempCameraPhotoUri(activity.numeroOs)
|
viewModel.createTempCameraPhotoUri(selectedActivity!!.numeroOs)
|
||||||
},
|
},
|
||||||
onSoftDeletePhoto = { path ->
|
onSoftDeletePhoto = { path ->
|
||||||
viewModel.softDeletePhoto(path, activity.numeroOs)
|
viewModel.softDeletePhoto(path, selectedActivity!!.numeroOs)
|
||||||
},
|
},
|
||||||
onGoogleLoginClick = {
|
onGoogleLoginClick = {
|
||||||
googleSignInLauncher.launch(googleSignInClient.signInIntent)
|
googleSignInLauncher.launch(googleSignInClient.signInIntent)
|
||||||
@@ -717,11 +743,10 @@ fun OverdueActivitiesListModal(
|
|||||||
allActivities: List<MaintenanceActivity>,
|
allActivities: List<MaintenanceActivity>,
|
||||||
projectEnd: Date,
|
projectEnd: Date,
|
||||||
topSectors: List<String>,
|
topSectors: List<String>,
|
||||||
|
referenceDate: Date = Date(),
|
||||||
onDismiss: () -> Unit,
|
onDismiss: () -> Unit,
|
||||||
onActivityClick: (MaintenanceActivity) -> Unit
|
onActivityClick: (MaintenanceActivity) -> Unit
|
||||||
) {
|
) {
|
||||||
val referenceDate = remember { Date() }
|
|
||||||
|
|
||||||
val filteredActivities = remember(group, allActivities, referenceDate, topSectors) {
|
val filteredActivities = remember(group, allActivities, referenceDate, topSectors) {
|
||||||
allActivities.filter { act ->
|
allActivities.filter { act ->
|
||||||
val isNotCompleted = act.percentualExecucao < 100
|
val isNotCompleted = act.percentualExecucao < 100
|
||||||
|
|||||||
Reference in New Issue
Block a user