Skip to content

xAPI based reports #302

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.

Sign up for GitHub

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

Open
Anugraha-sutara wants to merge 1 commit into
base: main
Choose a base branch
from
Open

xAPI based reports #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions respect-app-compose/src/commonMain/kotlin/world/respect/app/app/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.testTag
import kotlin.Boolean
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.BarChart
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.rememberCoroutineScope
import androidx.navigation.compose.rememberNavController
Expand Down Expand Up @@ -58,12 +59,14 @@ import world.respect.shared.generated.resources.cancel
import world.respect.shared.generated.resources.classes
import world.respect.shared.generated.resources.continue_using_fingerprint_or
import world.respect.shared.generated.resources.people
import world.respect.shared.generated.resources.reports
import world.respect.shared.navigation.AccountList
import world.respect.shared.navigation.AssignmentList
import world.respect.shared.navigation.ClazzList
import world.respect.shared.navigation.Home
import world.respect.shared.navigation.NavCommand
import world.respect.shared.navigation.PersonList
import world.respect.shared.navigation.Report
import world.respect.shared.navigation.RespectComposeNavController
import world.respect.shared.resources.getUiTextString
import world.respect.shared.viewmodel.app.appstate.AppUiState
Expand Down Expand Up @@ -114,6 +117,13 @@ val APP_TOP_LEVEL_NAV_ITEMS = listOf(
routeName = "$routeNamePrefix.PersonList",
testTag = "nav_people",
),
TopNavigationItem(
destRoute = Report,
icon = Icons.Filled.BarChart,
label = Res.string.reports,
routeName = "$routeNamePrefix.Report",
testTag = "nav_reports",
),
)
val APP_TOP_LEVEL_NAV_ITEMS_FOR_CHILD = listOf(
TopNavigationItem(
Expand Down
11 changes: 6 additions & 5 deletions ...d/src/commonMain/kotlin/world/respect/shared/viewmodel/report/list/ReportListViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import world.respect.shared.generated.resources.report
import world.respect.shared.generated.resources.reports
import world.respect.shared.navigation.NavCommand
import world.respect.shared.navigation.ReportDetail
import world.respect.shared.navigation.ReportTemplateList
import world.respect.shared.util.ext.asUiText
import world.respect.shared.viewmodel.RespectViewModel
import world.respect.shared.viewmodel.app.appstate.FabUiState
Expand Down Expand Up @@ -111,11 +112,11 @@ class ReportListViewModel(
}

fun onClickAdd() {
// _navCommandFlow.tryEmit(
// NavCommand.Navigate(
// ReportTemplateList
// )
// )
_navCommandFlow.tryEmit(
NavCommand.Navigate(
ReportTemplateList
)
)
}

fun onClickEntry(entry: Report) {
Expand Down