CorWatts / fasterscale

common/models/UserBehavior.php

Spacing +17 added lines, -17 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;
       }
@@ -221,7 +221,7 @@ 
 
     $arr = array_reduce($behaviors, function($acc, $row) {
       $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] = [
@@ -238,10 +238,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']);
         }
       }
@@ -262,11 +262,11 @@ 
       ->having('user_id = :user_id')
       ->orderBy('count DESC');
 
-    if($limit instanceof \DateTime) {
+    if ($limit instanceof \DateTime) {
       list($start, $end) = $this->time->getUTCBookends($limit->format('Y-m-d'));
       $query->params += [':start_date' => $start, ':end_date' => $end];
       $query->where('user_id=:user_id AND date > :start_date AND date <= :end_date');
-    } else if(is_int($limit)) {
+    } else if (is_int($limit)) {
       $query->limit($limit);
     }
 

site/views/checkin/view.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
 $plus_week  = $time->alterLocalDate($actual_date, "+1 week");
 
 $pie_data = [];
-if($answer_pie) {
+if ($answer_pie) {
   $values     = array_map('intval', array_column($answer_pie, "count"));
   $labels     = array_column($answer_pie, "name");
   $colors     = array_column($answer_pie, "color");
@@ -64,7 +64,7 @@ 
       </div>
 
   <?php
-              switch(true) {
+              switch (true) {
                 case ($score < 30):
                   $alert_level = "success";
                   $alert_msg = "You're doing well! Keep on doing whatever it is you're doing!";
@@ -96,15 +96,15 @@ 
     </div>
   </div>
 
-  <?php if($questions) {
-  foreach($questions as $behavior_id => $behavior_questions) {
+  <?php if ($questions) {
+  foreach ($questions as $behavior_id => $behavior_questions) {
     print "<div class='well well-sm'>";
     print "<button type='button' class='btn btn-primary' disabled='disabled'>{$behavior_questions['question']['title']}</button>";
     print "<div class='row'>";
-    foreach($behavior_questions['answers'] as $question) { 
+    foreach ($behavior_questions['answers'] as $question) { 
       print "<div class='col-md-4'>";
       print "<p><strong>{$question['title']}</strong></p>";
-      print "<p>".Html::encode($question['answer'])."</p>";
+      print "<p>" . Html::encode($question['answer']) . "</p>";
       print "</div>";
     }
     print "</div></div>";
@@ -116,7 +116,7 @@ 
     'options' => ['class' => 'form-horizontal'],
   ]);
 
-  foreach($categories as $category) {
+  foreach ($categories as $category) {
     $behaviors = AH::map($behaviorsList[$category['id']], 'id', 'name');
     print $form
             ->field($model, "behaviors{$category['id']}")

site/views/checkin/old_view.php

Spacing +9 added lines, -9 removed lines

@@ -15,7 +15,7 @@ 
 $this->title = "The Faster Scale App | Previous Check-ins";
 $time = Yii::$container->get('common\interfaces\TimeInterface');
 $this->registerJsFile('/js/checkin/view.js', ['depends' => [\site\assets\AppAsset::class]]);
-if($answer_pie) {
+if ($answer_pie) {
   $this->registerJsFile('/js/checkin/charts/pie.js', ['depends' => [\site\assets\AppAsset::class]]);
 }
 
@@ -25,7 +25,7 @@ 
 }
 
 $pie_data = [];
-if($answer_pie) {
+if ($answer_pie) {
   $values     = array_map('intval', array_column($answer_pie, "count"));
   $labels     = array_column($answer_pie, "name");
   $colors     = array_column($answer_pie, "color");
@@ -51,7 +51,7 @@ 
   <h1>View Previous Check-ins</h1>
 
   <?php
-              switch(true) {
+              switch (true) {
                 case ($score < 30):
                   $alert_level = "success";
                   $alert_msg = "You're doing well! Keep on doing whatever it is you're doing!";
@@ -112,16 +112,16 @@ 
 </div>
 
 
-  <?php if($questions) {
+  <?php if ($questions) {
   print "<h3>Processing Questions:</h3>";
-  foreach($questions as $behavior_id => $behavior_questions) {
+  foreach ($questions as $behavior_id => $behavior_questions) {
     print "<div class='well well-sm'>";
     print "<button type='button' class='btn btn-primary' disabled='disabled'>{$behavior_questions['question']['title']}</button>";
     print "<div class='row'>";
-    foreach($behavior_questions['answers'] as $question) { 
+    foreach ($behavior_questions['answers'] as $question) { 
       print "<div class='col-md-4'>";
       print "<p><strong>{$question['title']}</strong></p>";
-      print "<p>".Html::encode($question['answer'])."</p>";
+      print "<p>" . Html::encode($question['answer']) . "</p>";
       print "</div>";
     }
     print "</div></div>";
@@ -136,7 +136,7 @@ 
     'options' => ['class' => 'form-horizontal'],
   ]);
 
-  foreach($categories as $category) {
+  foreach ($categories as $category) {
     $behaviors = AH::map($behaviorsList[$category['id']], 'id', 'name');
     print $form
             ->field($model, "behaviors{$category['id']}")
@@ -146,7 +146,7 @@ 
   ActiveForm::end();
 
 $this->registerJson($past_checkin_dates, "past-checkin-dates");
-if($answer_pie) {
+if ($answer_pie) {
   $this->registerJson($pie_data, "pie_data");
 }
 ?>

Braces +5 added lines, -2 removed lines

@@ -102,9 +102,12 @@
         <div class='card-text'>
           <?php if ($pie_data): ?>
           <canvas id='category-pie-chart'></canvas>
-          <?php else: ?>
+          <?php else {
+  : ?>
           <p>no data</p>
-          <?php endif; ?>
+          <?php endif;
+}
+?>
         </div>
       </div>
     </div>