Add awards info to TeamLookup

Author: SunkenSplash

app/src/main/java/com/sunkensplashstudios/VRCRoboScout/EventDivisionRankingsView.kt

@@ -85,18 +85,10 @@ fun EventDivisionRankingsView(event: Event, division: Division, eventDivisionRan
     fun updateRankings() {
         CoroutineScope(Dispatchers.Default).launch {
             try {
-                println("updating rankings: $event, $division")
-                /*println("old rankings: ${event.rankings[division]}")
-                println("old rankings event model: ${eventDivisionRankingsViewModel.event.rankings}")
-                println("old rankings model: ${eventDivisionRankingsViewModel.rankings}")
-                println("old ratings: ${event.teamPerformanceRatings[division]}")
-                println("old ratings model: ${eventDivisionRankingsViewModel.teamPerformanceRatings}")*/
                 event.fetchRankings(division)
                 eventDivisionRankingsViewModel.rankings = (event.rankings[division] ?: emptyList()).toMutableList()
                 event.calculateTeamPerformanceRatings(division)
                 eventDivisionRankingsViewModel.teamPerformanceRatings = event.teamPerformanceRatings[division] ?: emptyMap()
-                /*println("new rankings: ${eventDivisionRankingsViewModel.rankings}")
-                println("new ratings: ${eventDivisionRankingsViewModel.teamPerformanceRatings}")*/
             } catch (e: Exception) {
                 e.printStackTrace()
             }
@@ -140,9 +132,6 @@ fun EventDivisionRankingsView(event: Event, division: Division, eventDivisionRan
                 .fillMaxSize()
         ) {
             var update by remember { mutableStateOf(true) }
-            println("div: ${eventDivisionRankingsViewModel.rankings}")
-            println("loading: $loading")
-            println("update: $update")
 
             if (update) {
                 update = false
@@ -151,14 +140,11 @@ fun EventDivisionRankingsView(event: Event, division: Division, eventDivisionRan
 
             if (loading) {
                 LoadingView()
-                println("loading")
             }
             else if (eventDivisionRankingsViewModel.rankings.isEmpty()) {
                 NoDataView()
-                println("no data")
             }
             else {
-                println("data")
                 Column(
                     modifier = Modifier.verticalScroll(rememberScrollState())
                 ) {

app/src/main/java/com/sunkensplashstudios/VRCRoboScout/LookupView.kt

@@ -79,6 +79,7 @@ class LookupViewModel : ViewModel() {
     var wsEntry = mutableStateOf(WSEntry())
     var vdaEntry = mutableStateOf(VDAEntry())
     var avgRanking = mutableDoubleStateOf(0.0)
+    var awardCounts = LinkedHashMap<String, Int>()
     var fetched = mutableStateOf(false)
     var loading = mutableStateOf(false)
 
@@ -90,11 +91,17 @@ class LookupViewModel : ViewModel() {
         textColor.value = Color.Unspecified
         CoroutineScope(Dispatchers.Default).launch {
             val fetchedTeam = Team(number.value)
+            fetchedTeam.fetchAwards()
+            val fetchedAwardCounts = LinkedHashMap<String, Int>()
+            for (award in fetchedTeam.awards) {
+                fetchedAwardCounts[award.title] = (fetchedAwardCounts[award.title] ?: 0) + 1
+            }
             withContext(Dispatchers.Main) {
                 team.value = fetchedTeam
                 wsEntry.value = API.worldSkillsFor(fetchedTeam)
                 vdaEntry.value = API.vdaFor(fetchedTeam)
                 avgRanking.doubleValue = fetchedTeam.averageQualifiersRanking()
+                awardCounts = fetchedAwardCounts
                 fetched.value = fetchedTeam.id != 0
                 loading.value = false
             }
@@ -258,7 +265,7 @@ fun TeamLookup(lookupViewModel: LookupViewModel, navController: NavController) {
                     )
                 ) {
                     Column(
-                        verticalArrangement = Arrangement.spacedBy(12.dp),
+                        verticalArrangement = Arrangement.spacedBy(10.dp),
                         modifier = Modifier.padding(10.dp)
                     ) {
                         Column {
@@ -444,6 +451,33 @@ fun TeamLookup(lookupViewModel: LookupViewModel, navController: NavController) {
                             thickness = 0.5.dp,
                             color = MaterialTheme.colorScheme.secondary.copy(alpha = 0.1f),
                         )
+
+                        var awardsExpanded by remember { mutableStateOf(false) }
+
+                        Row {
+                            Text("Awards", modifier = Modifier.clickable {
+                                awardsExpanded = !awardsExpanded
+                            }, color = MaterialTheme.colorScheme.button)
+                            DropdownMenu(
+                                expanded = awardsExpanded,
+                                onDismissRequest = { awardsExpanded = false }
+                            ) {
+                                lookupViewModel.awardCounts.forEach { award ->
+                                    DropdownMenuItem(
+                                        text = { Text("${award.value}x ${award.key}") },
+                                        onClick = { }
+                                    )
+                                }
+                            }
+                            Spacer(modifier = Modifier.weight(1.0f))
+                            Text(
+                                if (lookupViewModel.fetched.value) "${lookupViewModel.team.value.awards.size}" else ""
+                            )
+                        }
+                        HorizontalDivider(
+                            thickness = 0.5.dp,
+                            color = MaterialTheme.colorScheme.secondary.copy(alpha = 0.1f),
+                        )
                         Row {
                             Text("Qualifications")
                             Spacer(modifier = Modifier.weight(1.0f))

app/src/main/java/com/sunkensplashstudios/VRCRoboScout/RoboScoutAPI.kt

@@ -817,6 +817,7 @@ class Team : MutableState<Team> {
     var id: Int = 0
     var events: MutableList<Event> = mutableListOf<Event>()
     var eventCount: Int = 0
+    @kotlinx.serialization.Transient var awards: MutableList<Award> = mutableListOf<Award>()
     @SerialName("team_name") var name: String = ""
     var number: String = ""
     var organization: String = ""
@@ -894,6 +895,16 @@ class Team : MutableState<Team> {
         }
     }
 
+    suspend fun fetchAwards(season: Int? = null) {
+        val data = RoboScoutAPI.roboteventsRequest("/teams/${this.id}/awards", mapOf("season" to (season ?: 181)))
+        awards.clear()
+        for (award in data) {
+            val fetchedAward: Award = jsonWorker.decodeFromJsonElement(award)
+            awards.add(fetchedAward)
+        }
+        this.awards.sortBy { it.order }
+    }
+
     suspend fun averageQualifiersRanking(season: Int? = null): Double {
         val data = RoboScoutAPI.roboteventsRequest("/teams/${this.id}/rankings/", mapOf("season" to (season ?: 181)))
         var total = 0