bunkmate 1.0.0 → 2.0.0

package/index.js

@@ -1,69 +1,68 @@
-function calculateAttendance(classAttended, totalClasses) {
-    if (totalClasses <= 0) {
-        return 0;
-    }
-
-    return (classAttended / totalClasses) * 100;
-}
-
-
-function calculatePredictedAttendance(
+function calculate(
     classAttended,
     totalClasses,
-    missClasses
+    missClasses,
+    targetAttendance
 ) {
-    const futureTotalClasses = totalClasses + missClasses;
+    // Current attendance
+    let avg = 0;
 
-    if (futureTotalClasses <= 0) {
-        return 0;
+    if (totalClasses > 0) {
+        avg = Math.ceil(
+            (classAttended / totalClasses) * 100
+        );
     }
 
-    return Math.ceil(
-        (classAttended / futureTotalClasses) * 100
-    );
-}
+    // Predicted attendance
+    const futureTotalClasses =
+        totalClasses + missClasses;
 
+    let predictedAttendance = 0;
 
-function calculateRecoveryClasses(
-    classAttended,
-    totalClasses,
-    missClasses,
-    targetAttendance
-) {
-    // Already at or above the target
-    const predictedAttendance =
-        calculatePredictedAttendance(
-            classAttended,
-            totalClasses,
-            missClasses
+    if (futureTotalClasses > 0) {
+        predictedAttendance = Math.ceil(
+            (classAttended / futureTotalClasses) * 100
         );
-
-    if (predictedAttendance >= targetAttendance) {
-        return 0;
     }
 
-    // 100% target cannot be reached using this formula
-    if (targetAttendance >= 100) {
-        return 0;
-    }
+    // Recovery classes
+    let recoveryClasses = 0;
+
+    if (
+        targetAttendance > 0 &&
+        targetAttendance < 100
+    ) {
+        const recovery =
+            (
+                (targetAttendance * futureTotalClasses) -
+                (classAttended * 100)
+            ) /
+            (100 - targetAttendance);
 
-    if (targetAttendance <= 0) {
-        return 0;
+        if (recovery > 0) {
+            recoveryClasses = Math.ceil(recovery);
+        }
     }
 
-    const recoveryClasses =
-        (
-            (targetAttendance * (totalClasses + missClasses)) -
-            (classAttended * 100)
-        ) /
-        (100 - targetAttendance);
+    // Already safe
+    if (predictedAttendance >= targetAttendance) {
+        recoveryClasses = 0;
+    }
 
-    return Math.ceil(recoveryClasses);
+    return `
+╔══════════════════════════════════════╗
+║          📚 BUNKMATE REPORT          ║
+╠══════════════════════════════════════╣
+║                                      ║
+║  📊 Current Attendance   : ${avg}%       ║
+║  🔮 Predicted Attendance : ${predictedAttendance}%       ║
+║  🔄 Recovery Classes     : ${recoveryClasses.toString().padEnd(2)}        ║
+║                                      ║
+╚══════════════════════════════════════╝
+`;
 }
 
 
 module.exports = {
-    calculateAttendance,
-    calculatePredictedAttendance,
-    calculateRecoveryClasses
+    calculate
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunkmate",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "BunkMate attendance calculation utilities",
   "keywords": [
     "attendance",
@@ -23,5 +23,8 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "dependencies": {
+    "bunkmate": "^1.0.0"
   }
 }