CorWatts / fasterscale

common/models/Category.php

Spacing +7 added lines, -7 removed lines

@@ -15,13 +15,13 @@
 
   // a weight of 0 means selections in that category do not increase the score
   public static $categories = [
-    [ "id" => 1, "weight" => 0,  "name" => "Restoration"],
-    [ "id" => 2, "weight" => 1,  "name" => "Forgetting Priorities"],
-    [ "id" => 3, "weight" => 2,  "name" => "Anxiety"],
-    [ "id" => 4, "weight" => 4,  "name" => "Speeding Up"],
-    [ "id" => 5, "weight" => 6,  "name" => "Ticked Off"],
-    [ "id" => 6, "weight" => 8,  "name" => "Exhausted"],
-    [ "id" => 7, "weight" => 10, "name" => "Relapse/Moral Failure"],
+    ["id" => 1, "weight" => 0, "name" => "Restoration"],
+    ["id" => 2, "weight" => 1, "name" => "Forgetting Priorities"],
+    ["id" => 3, "weight" => 2, "name" => "Anxiety"],
+    ["id" => 4, "weight" => 4, "name" => "Speeding Up"],
+    ["id" => 5, "weight" => 6, "name" => "Ticked Off"],
+    ["id" => 6, "weight" => 8, "name" => "Exhausted"],
+    ["id" => 7, "weight" => 10, "name" => "Relapse/Moral Failure"],
   ];
 
   public static $colors = [

common/models/UserBehavior.php

Spacing +16 added lines, -16 removed lines

@@ -85,7 +85,7 @@ 
       ->groupBy('date, user_id')
       ->having('user_id = :user_id');
     $temp_dates = $query->all();
-    foreach($temp_dates as $temp_date) {
+    foreach ($temp_dates as $temp_date) {
       $past_checkin_dates[] = $this->time->convertUTCToLocal($temp_date['date']);
     }
 
@@ -114,7 +114,7 @@ 
 
   public function getDailyScore($date = null) {
     // default to today's score
-    if(is_null($date)) $date = $this->time->getLocalDate();
+    if (is_null($date)) $date = $this->time->getLocalDate();
 
     list($start, $end) = $this->time->getUTCBookends($date);
     $score = $this->calculateScoreByUTCRange($start, $end);
@@ -147,9 +147,9 @@ 
   }
 
   public function calculateScoresOfLastMonth() {
-    $key = "scores_of_last_month_".Yii::$app->user->id."_".$this->time->getLocalDate();
+    $key = "scores_of_last_month_" . Yii::$app->user->id . "_" . $this->time->getLocalDate();
     $scores = Yii::$app->cache->get($key);
-    if($scores === false) {
+    if ($scores === false) {
       $scores = [];
 
       $dt = new DateTime("now", new DateTimeZone("UTC"));
@@ -166,8 +166,8 @@ 
   }
 
   public function calculateScore($usr_bhvrs, $all_cats = null) {
-    if(!!!$usr_bhvrs) return [];
-    if(!!!$all_cats)  $all_cats = $this->behavior->getCategories();
+    if (!!!$usr_bhvrs) return [];
+    if (!!!$all_cats)  $all_cats = $this->behavior->getCategories();
 
     $usr_bhvrs = array_reduce($usr_bhvrs, function($carry, $bhvr) {
       $date = $this->time->convertUTCToLocal($bhvr['date']);
@@ -176,7 +176,7 @@ 
     }, []);
 
     $scores = [];
-    foreach($usr_bhvrs as $date => $bhvrs) {
+    foreach ($usr_bhvrs as $date => $bhvrs) {
       $picked = array_reduce($bhvrs, function($carry, $bhvr) {
         $carry[$bhvr['category_id']][] = $bhvr['id'];
         return $carry;
@@ -190,14 +190,14 @@ 
   }
 
   private function _getCatGrades($picked, $all_cats = null) {
-    if(!!!$all_cats) $all_cats = $this->behavior->getCategories();
+    if (!!!$all_cats) $all_cats = $this->behavior->getCategories();
 
     return array_reduce($all_cats, function($carry, $cat) use($picked) {
-      if(array_key_exists($cat['category_id'], $picked)) {
+      if (array_key_exists($cat['category_id'], $picked)) {
         $count = count($picked[$cat['category_id']]);
-        $prcnt_2x = ($count / $cat['behavior_count']) * 2;
+        $prcnt_2x = ($count/$cat['behavior_count'])*2;
         // because we're doubling the % we want to ensure we don't take more than 100%
-        $carry[$cat['category_id']] = $cat['weight'] * min($prcnt_2x, 1);
+        $carry[$cat['category_id']] = $cat['weight']*min($prcnt_2x, 1);
       } else {
         $carry[$cat['category_id']] = 0;
       }
@@ -220,7 +220,7 @@ 
     $colors = \common\models\Category::$colors;
     $arr = array_reduce(self::decorateWithCategory($this->getBehaviorsWithCounts()), function($acc, $row) use ($colors) {
       $cat_id = $row['behavior']['category']['id'];
-      if(array_key_exists($cat_id, $acc)) {
+      if (array_key_exists($cat_id, $acc)) {
         $acc[$cat_id]['count'] += $row['count'];
       } else {
         $acc[$cat_id] = [
@@ -237,10 +237,10 @@ 
   }
 
   public static function decorate(Array $uo, $with_category = false) {
-    foreach($uo as &$o) {
-      if($behavior = \common\models\Behavior::getBehavior('id', $o['behavior_id'])) {
+    foreach ($uo as &$o) {
+      if ($behavior = \common\models\Behavior::getBehavior('id', $o['behavior_id'])) {
         $o['behavior'] = $behavior;
-        if($with_category) {
+        if ($with_category) {
           $o['behavior']['category'] = \common\models\Category::getCategory('id', $o['behavior']['category_id']);
         }
       }
@@ -260,7 +260,7 @@ 
       ->groupBy('behavior_id, user_id')
       ->having('user_id = :user_id')
       ->orderBy('count DESC');
-    if($limit) {
+    if ($limit) {
       $query->limit($limit);
     }
 

site/views/checkin/report.php

Spacing +5 added lines, -5 removed lines

@@ -35,12 +35,12 @@
                 <th>Behavior</th>
                 <th>Category</th>
             </tr>
-<?php foreach($top_behaviors as $key => $row) {
+<?php foreach ($top_behaviors as $key => $row) {
 $num = $key + 1;
-print "<tr>".
-  "<td>{$row['count']}</td>".
-  "<td>{$row['behavior']['name']}</td>".
-  "<td>{$row['behavior']['category']['name']}</td>".
+print "<tr>" .
+  "<td>{$row['count']}</td>" .
+  "<td>{$row['behavior']['name']}</td>" .
+  "<td>{$row['behavior']['category']['name']}</td>" .
   "</tr>";
 }
 ?>