From ab8794c4ab093410ef170f9f1c207650483be770 Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Tue, 2 Dec 2014 12:18:03 +0100
Subject: [PATCH] Cap learning progress at 100 percent
---
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 2f43cad0..fd1affb0 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1491,7 +1491,7 @@ public class CouchDBDao implements IDatabaseDao {
}
final double courseAverageValue = userTotalValue / numUsers;
final double courseProgress = courseAverageValue / courseMaximumValue;
- return (int)Math.round(courseProgress * 100);
+ return (int)Math.min(100, Math.round(courseProgress * 100));
}
@Override
@@ -1517,8 +1517,9 @@ public class CouchDBDao implements IDatabaseDao {
return new AbstractMap.SimpleEntry<Integer, Integer>(0, courseProgress);
}
final double myProgress = userTotalValue / courseMaximumValue;
+ final int myLearningProgress = (int)Math.min(100, Math.round(myProgress*100));
- return new AbstractMap.SimpleEntry<Integer, Integer>((int)Math.round(myProgress*100), courseProgress);
+ return new AbstractMap.SimpleEntry<Integer, Integer>(myLearningProgress, courseProgress);
}
@Override
--
GitLab