Use aggregate data for bar chart and add rescaling.

pennlabs · Apr 14, 2023 · a0fa1f4 · a0fa1f4
1 parent 8423916
commit a0fa1f4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessAdapter.kt
@@ -72,7 +72,7 @@ class FitnessAdapter(private val fitnessRooms: List<FitnessRoom>) :
  room: FitnessRoom
  ) {
  if (hasExtraData) return
- room.roomId?.let { studentLife.getFitnessRoomUsage(it).subscribe(
+ room.roomId?.let { studentLife.getFitnessRoomUsage(it, 3, "week").subscribe(
  { roomUsage ->
  createBarChart(context, roomUsage)
  activity.runOnUiThread {
@@ -95,9 +95,11 @@ class FitnessAdapter(private val fitnessRooms: List<FitnessRoom>) :
 
  val timeData = roomData.roomUsage
  val curHour = LocalDateTime.now().hour
+ var mxUsage = 0f
  // assume that we start at 6am and end at 11 pm
  for (i in 6..23) {
  val v = if (timeData == null) 0f else timeData[i.toString()] ?: 0f
+ mxUsage = maxOf(mxUsage, v)
  entries.add(BarEntry((i - 6).toFloat(), v))
  colors.add(if (i == curHour) darkBlue else blue)
  labels.add(if (i > 12) "${i - 12}pm" else "${i}am")
@@ -120,8 +122,9 @@ class FitnessAdapter(private val fitnessRooms: List<FitnessRoom>) :
  leftAxis.setDrawGridLines(false)
  leftAxis.setDrawAxisLine(false)
  leftAxis.setDrawLabels(false);
- leftAxis.axisMinimum = -5.0f
- leftAxis.axisMaximum = 100.0f
+
+ leftAxis.axisMinimum = -0.05f * mxUsage
+ leftAxis.axisMaximum = mxUsage
 
  val rightAxis: YAxis = barChart.axisRight
  rightAxis.setDrawGridLines(false)

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java
@@ -203,5 +203,7 @@ void createPollVote(
 
  @GET("/penndata/fitness/usage/{id}")
  Observable<FitnessRoomUsage> getFitnessRoomUsage(
- @Path("id") int id);
+ @Path("id") int id,
+ @Query("num_samples") int samples,
+ @Query("group_by") String groupBy);
 }