CorWatts / fasterscale

site/tests/unit/models/EditProfileFormTest.php

Indentation +14 added lines, -14 removed lines

@@ -6,13 +6,13 @@ 
 use \site\models\EditProfileForm;
 
 class EditProfileFormTest extends \Codeception\Test\Unit {
-	public $values = [
-			'timezone' => 'America/Los_Angeles',
+  public $values = [
+      'timezone' => 'America/Los_Angeles',
       'send_email' => true,
-			'partner_email1' => 'partner1@example.com',
-			'partner_email2' => 'partner2@example.com',
-			'partner_email3' => 'partner3@example.com',
-		];
+      'partner_email1' => 'partner1@example.com',
+      'partner_email2' => 'partner2@example.com',
+      'partner_email3' => 'partner3@example.com',
+    ];
 
   public function testLoadUser() {
     $user = $this->getUser();
@@ -35,20 +35,20 @@ 
 
     $form->attributes = $this->values;
     expect('saveProfile should return the user', $this->assertEquals($user, $form->saveProfile()));
-		expect('saveProfile should set the user\'s attributes to be the form values', $this->assertEquals($this->values, $user->attributes));
+    expect('saveProfile should set the user\'s attributes to be the form values', $this->assertEquals($this->values, $user->attributes));
 
     $form->send_email = 'not_a_boolean';
     expect('saveProfile should return the user with the partner-related settings equal to null', $this->assertNull($form->saveProfile()));
 
-		$null_vals = [
-			'partner_email1'  => null,
-			'partner_email2'  => null,
-			'partner_email3'  => null,
+    $null_vals = [
+      'partner_email1'  => null,
+      'partner_email2'  => null,
+      'partner_email3'  => null,
       'send_email'      => null,
-			'timezone'        => 'America/Los_Angeles',
-		];
+      'timezone'        => 'America/Los_Angeles',
+    ];
     $form->send_email = false;
-		$ret = $form->saveProfile();
+    $ret = $form->saveProfile();
     expect('saveProfile should return the user with the partner-related settings equal to null', $this->assertEquals($null_vals, $user->attributes));
 
     $form->send_email = 'not_a_boolean';

site/models/CheckinForm.php

Spacing +7 added lines, -7 removed lines

@@ -64,10 +64,10 @@ 
   }
 
   public function setBehaviors($behaviors) {
-    foreach($behaviors as $category_id => $category_data) {
+    foreach ($behaviors as $category_id => $category_data) {
       $attribute = "behaviors$category_id";
 			$this->$attribute = [];
-      foreach($category_data['behaviors'] as $behavior) {
+      foreach ($category_data['behaviors'] as $behavior) {
         $this->{$attribute}[] = $behavior['id'];
       }
     }   
@@ -75,8 +75,8 @@ 
 
   public function validateBehaviors($attribute, $params) {
     if (!$this->hasErrors()) {
-      foreach($this->$attribute as $behavior) {
-        if(!is_numeric($behavior)) {
+      foreach ($this->$attribute as $behavior) {
+        if (!is_numeric($behavior)) {
           $this->addError($attribute, 'One of your behaviors is not an integer!');
         }
       }
@@ -110,17 +110,17 @@ 
 
     // delete cached scores
     $time = Yii::$container->get(\common\interfaces\TimeInterface::class);
-    $key = "scores_of_last_month_".Yii::$app->user->id."_".$time->getLocalDate();
+    $key = "scores_of_last_month_" . Yii::$app->user->id . "_" . $time->getLocalDate();
     Yii::$app->cache->delete($key);
   }
 
   public function save() {
-    if(empty($this->compiled_behaviors)) {
+    if (empty($this->compiled_behaviors)) {
       $this->commpiled_behaviors = $this->compileBehaviors();
     }
 
     $rows = [];
-    foreach($this->compiled_behaviors as $behavior_id) {
+    foreach ($this->compiled_behaviors as $behavior_id) {
       $temp = [
         Yii::$app->user->id,
         (int)$behavior_id,

site/models/EditProfileForm.php

Spacing +4 added lines, -4 removed lines

@@ -69,17 +69,17 @@
    */
   public function saveProfile() {
     if ($this->validate()) {
-      $user  = $this->user;
+      $user = $this->user;
 
-      if($this->timezone) {
+      if ($this->timezone) {
         $user->timezone = $this->timezone;
       }
-      if($this->send_email) {
+      if ($this->send_email) {
         $user->send_email = true;
       } else {
         $user->send_email = false;
       }
-      if($this->send_email) {
+      if ($this->send_email) {
         $user->partner_email1  = $this->partner_email1;
         $user->partner_email2  = $this->partner_email2;
         $user->partner_email3  = $this->partner_email3;

common/models/UserBehavior.php

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,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']);
     }
 
@@ -126,16 +126,16 @@ 
   }
 
   public function getCheckinBreakdown(\DatePeriod $datetimes) {
-    $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);
 
     /******* REMOVE THIS ********/
     $scores = false;
     /******* END REMOVE THIS *******/
 
-    if($scores === false) {
+    if ($scores === false) {
       $scores = [];
-      foreach($datetimes as $datetime) {
+      foreach ($datetimes as $datetime) {
         $behaviors = self::decorateWithCategory($this->getBehaviorsWithCounts($datetime));
         $scores[$datetime->format('Y-m-d')] = $this->getBehaviorsByCategory($behaviors);
       }
@@ -161,7 +161,7 @@ 
   public function getBehaviorsByCategory(array $decorated_behaviors) {
     $arr = array_reduce($decorated_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] = [
@@ -178,10 +178,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']);
         }
       }
@@ -202,11 +202,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/profile/index.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 ]); ?>
             <?= $form->field($profile, 'timezone')->dropDownList(array_combine($timezones, $timezones)); ?>
             <?= $form->field($profile, 'send_email')->checkbox() ?>
-            <div id='send_email_fields' <?php if(!$profile->send_email) { ?>style="display: none;"<?php } ?>>
+            <div id='send_email_fields' <?php if (!$profile->send_email) { ?>style="display: none;"<?php } ?>>
               <?= $form->field($profile, 'partner_email1')->input('email'); ?>
               <?= $form->field($profile, 'partner_email2')->input('email'); ?>
               <?= $form->field($profile, 'partner_email3')->input('email'); ?>

common/components/Time.php

Spacing +11 added lines, -11 removed lines

@@ -36,13 +36,13 @@ 
    * @return \DateTime the parsed time or the default value
    */
   public function parse($time, $default = false, string $format = 'Y-m-d') {
-    if(is_string($time)) {
+    if (is_string($time)) {
       $dt = DateTime::createFromFormat($format, $time, new DateTimeZone($this->timezone));
-      if($dt) {
+      if ($dt) {
         // for some reason, using createFromFromat adds in the time. The regular DateTime constructor _does not_ do this. We manually zero out the time here to make the DateTime objects match.
         $dt->setTime(0, 0, 0);
         $formatted = $dt->format($format);
-        if($formatted === $time && $this->inBounds($dt)) {
+        if ($formatted === $time && $this->inBounds($dt)) {
           return $dt;
         }
       }
@@ -62,7 +62,7 @@ 
     $test  = strtotime($dt->format('Y-m-d'));
     $now   = strtotime($this->getLocalDate());
 
-    if($first <= $test && $test <= $now) {
+    if ($first <= $test && $test <= $now) {
       return true;
     } else {
       return false;
@@ -86,7 +86,7 @@ 
   }
 
   public function getLocalTime($timezone = null) {
-    if($timezone === null)
+    if ($timezone === null)
       $timezone = $this->timezone;
 
     $timestamp = new DateTime("now", new DateTimeZone($timezone));
@@ -94,7 +94,7 @@ 
   }
 
   public function getLocalDate($timezone = null) {
-    if($timezone === null)
+    if ($timezone === null)
       $timezone = $this->timezone;
 
     return (new DateTime("now", new DateTimeZone($timezone)))
@@ -108,7 +108,7 @@ 
 
   public function getUTCBookends($local) {
     $local = trim($local);
-    if(strpos($local, " ")) {
+    if (strpos($local, " ")) {
       return false;
     }
 
@@ -130,9 +130,9 @@ 
    * @return string a date string
    */
   public function validate($date = null) {
-    if(is_null($date)) {
+    if (is_null($date)) {
       return $this->getLocalDate();
-    } else if($dt = $this->parse($date)) {
+    } else if ($dt = $this->parse($date)) {
       return $dt->format('Y-m-d');
     } else {
       return $this->getLocalDate();
@@ -149,12 +149,12 @@ 
   public function getDateTimesInPeriod(int $period = 30) {
     $dt = new DateTime("now", new DateTimeZone("UTC"));
     $dt2 = new DateTime("now", new DateTimeZone("UTC"));
-    $end = $dt->add(new \DateInterval('PT2M'));    // to be sure we have everything
+    $end = $dt->add(new \DateInterval('PT2M')); // to be sure we have everything
     $start = $dt2->add(new \DateInterval('PT2M')); // to be sure we have everything
     $start = $start->sub(new \DateInterval("P${period}D"));
     $periods = new \DatePeriod($start, new \DateInterval('P1D'), $end);
     $local_tz = new \DateTimeZone($this->timezone);
-    foreach($periods as $period) {
+    foreach ($periods as $period) {
       $period->setTimezone($local_tz);
     }
     return $periods;

site/controllers/CheckinController.php

Spacing +9 added lines, -9 removed lines

@@ -39,7 +39,7 @@ 
     if ($form->load(Yii::$app->request->post()) && $form->validate()) {
       $form->compiled_behaviors = $form->compileBehaviors();
 
-      if(sizeof($form->compiled_behaviors) === 0) {
+      if (sizeof($form->compiled_behaviors) === 0) {
         return $this->redirect(['view']);
       }
 
@@ -49,7 +49,7 @@ 
 
       return $this->redirect(['questions']);
     } else {
-      $behaviors  = Yii::$container->get(BehaviorInterface::class)::$behaviors;
+      $behaviors = Yii::$container->get(BehaviorInterface::class)::$behaviors;
       return $this->render('index', [
         'categories'    => Yii::$container->get(CategoryInterface::class)::$categories,
         'model'         => $form,
@@ -64,7 +64,7 @@ 
     $date = Yii::$container->get(TimeInterface::class)->getLocalDate();
 
     $user_behaviors = $user_behavior->getUserBehaviorsWithCategory($date);
-    if(count($user_behaviors) === 0) {
+    if (count($user_behaviors) === 0) {
       return $this->redirect(['view']);
     }
 
@@ -74,9 +74,9 @@ 
       $form->deleteToday();
 
       $behaviors = $user_behavior->findAll($form->getUserBehaviorIds());
-      if($result = $form->saveAnswers($behaviors)) {
+      if ($result = $form->saveAnswers($behaviors)) {
 
-        if(Yii::$app->user->identity->send_email) {
+        if (Yii::$app->user->identity->send_email) {
           Yii::$app->user->identity->sendEmailReport($date);
           Yii::$app->session->setFlash('success', 'Your check-in is complete. A notification has been sent to your report partners.');
         } else {
@@ -130,7 +130,7 @@ 
     $raw_pie_data  = $user_behavior::decorateWithCategory($user_behavior->getBehaviorsWithCounts());
     $answer_pie    = $user_behavior->getBehaviorsByCategory($raw_pie_data);
 
-    $pie_data   = [
+    $pie_data = [
       "labels"   => array_column($answer_pie, "name"),
       "datasets" => [[
           "data"                 => array_map('intval', array_column($answer_pie, "count")),
@@ -166,14 +166,14 @@ 
     $checkins = $user_behavior->getCheckInBreakdown($time->getDateTimesInPeriod($period));
 
     $accum = [];
-    foreach($checkins as $date => $cats) {
-      for($i = 1; $i <= 7; $i ++) {
+    foreach ($checkins as $date => $cats) {
+      for ($i = 1; $i <= 7; $i++) {
         $accum[$i][] = array_key_exists($i, $cats) ? $cats[$i]['count'] : [];
       }
     }
 
     $bar_datasets = [];
-    foreach($accum as $idx => $data) {
+    foreach ($accum as $idx => $data) {
       $bar_datasets[] = [
         'label' => ($category::getCategories())[$idx],
         'backgroundColor' => $category::$colors[$idx]['color'],