Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
0f976f685f
|
@@ -14,8 +14,8 @@ android {
|
|||||||
applicationId = "com.atridad.openclimb"
|
applicationId = "com.atridad.openclimb"
|
||||||
minSdk = 31
|
minSdk = 31
|
||||||
targetSdk = 35
|
targetSdk = 35
|
||||||
versionCode = 9
|
versionCode = 10
|
||||||
versionName = "0.4.2"
|
versionName = "0.4.3"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -410,33 +410,6 @@ fun SessionDetailScreen(sessionId: String, viewModel: ClimbViewModel, onNavigate
|
|||||||
value = "${((successfulAttempts.size.toDouble() / attempts.size) * 100).toInt()}%"
|
value = "${((successfulAttempts.size.toDouble() / attempts.size) * 100).toInt()}%"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Show average grade if available
|
|
||||||
val attemptedProblems = problems.filter { it.id in uniqueProblems }
|
|
||||||
if (attemptedProblems.isNotEmpty()) {
|
|
||||||
val boulderProblems = attemptedProblems.filter { it.climbType == ClimbType.BOULDER }
|
|
||||||
val ropeProblems = attemptedProblems.filter { it.climbType == ClimbType.ROPE }
|
|
||||||
|
|
||||||
val averageGrade = when {
|
|
||||||
boulderProblems.isNotEmpty() && ropeProblems.isNotEmpty() -> {
|
|
||||||
val boulderAvg = calculateAverageGrade(boulderProblems)
|
|
||||||
val ropeAvg = calculateAverageGrade(ropeProblems)
|
|
||||||
"${boulderAvg ?: "N/A"} / ${ropeAvg ?: "N/A"}"
|
|
||||||
}
|
|
||||||
boulderProblems.isNotEmpty() -> calculateAverageGrade(boulderProblems) ?: "N/A"
|
|
||||||
ropeProblems.isNotEmpty() -> calculateAverageGrade(ropeProblems) ?: "N/A"
|
|
||||||
else -> "N/A"
|
|
||||||
}
|
|
||||||
|
|
||||||
StatItem(
|
|
||||||
label = "Average Grade",
|
|
||||||
value = averageGrade
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
StatItem(
|
|
||||||
label = "Average Grade",
|
|
||||||
value = "N/A"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show grade range if available
|
// Show grade range if available
|
||||||
|
|||||||
Reference in New Issue
Block a user