@@ -106,9 +106,9 @@ |
||
106 | 106 | ], [ |
107 | 107 | 'class' => 'kartik\grid\ActionColumn', |
108 | 108 | 'buttons' => [ |
109 | - 'view' => function ($url, $model) { return ''; }, |
|
110 | - 'update' => function ($url, $model) { return ''; }, |
|
111 | - 'delete' => function ($url, $model) { |
|
109 | + 'view' => function($url, $model) { return ''; }, |
|
110 | + 'update' => function($url, $model) { return ''; }, |
|
111 | + 'delete' => function($url, $model) { |
|
112 | 112 | return yii\helpers\Html::a('<span class="glyphicon glyphicon-remove"></span>', "/custom-behavior/delete?id={$model->id}", [ |
113 | 113 | 'title' => 'Delete', |
114 | 114 | 'data-pjax' => true, |
@@ -11,8 +11,8 @@ discard block |
||
11 | 11 | 'common\interfaces\BehaviorInterface' => \common\models\Behavior::class, |
12 | 12 | 'common\interfaces\CategoryInterface' => \common\models\Category::class, |
13 | 13 | 'common\interfaces\CustomBehaviorInterface' => \common\models\CustomBehavior::class, |
14 | - 'common\interfaces\TimeInterface' => function () { |
|
15 | - if(Yii::$app->user->getIsGuest()) { |
|
14 | + 'common\interfaces\TimeInterface' => function() { |
|
15 | + if (Yii::$app->user->getIsGuest()) { |
|
16 | 16 | return new \common\components\Time('UTC'); |
17 | 17 | } else { |
18 | 18 | return new \common\components\Time(Yii::$app->user->identity->timezone); |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | ], |
31 | 31 | 'components' => [ |
32 | 32 | // by default, sessions are stored in a local file |
33 | - 'cache' => [ // DummyCache never actually caches anything |
|
33 | + 'cache' => [// DummyCache never actually caches anything |
|
34 | 34 | 'class'=> yii\caching\DummyCache::class, |
35 | 35 | ], |
36 | 36 | 'mailer' => [ |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | public function setBehaviors($behaviors) { |
59 | 59 | foreach($behaviors as $category_id => $bhvr_set) { |
60 | 60 | $attribute = "behaviors$category_id"; |
61 | - $this->$attribute = []; |
|
61 | + $this->$attribute = []; |
|
62 | 62 | foreach($bhvr_set as $behavior) { |
63 | 63 | $this->{$attribute}[] = $behavior['id']; |
64 | 64 | } |
@@ -89,12 +89,12 @@ discard block |
||
89 | 89 | */ |
90 | 90 | public function compileBehaviors() { |
91 | 91 | $behaviors = array_merge((array)$this->behaviors1, |
92 | - (array)$this->behaviors2, |
|
93 | - (array)$this->behaviors3, |
|
94 | - (array)$this->behaviors4, |
|
95 | - (array)$this->behaviors5, |
|
96 | - (array)$this->behaviors6, |
|
97 | - (array)$this->behaviors7); |
|
92 | + (array)$this->behaviors2, |
|
93 | + (array)$this->behaviors3, |
|
94 | + (array)$this->behaviors4, |
|
95 | + (array)$this->behaviors5, |
|
96 | + (array)$this->behaviors6, |
|
97 | + (array)$this->behaviors7); |
|
98 | 98 | |
99 | 99 | $clean_behaviors = array_filter($behaviors); // strip out false values |
100 | 100 |
@@ -56,10 +56,10 @@ discard block |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | public function setBehaviors($behaviors) { |
59 | - foreach($behaviors as $category_id => $bhvr_set) { |
|
59 | + foreach ($behaviors as $category_id => $bhvr_set) { |
|
60 | 60 | $attribute = "behaviors$category_id"; |
61 | 61 | $this->$attribute = []; |
62 | - foreach($bhvr_set as $behavior) { |
|
62 | + foreach ($bhvr_set as $behavior) { |
|
63 | 63 | $this->{$attribute}[] = $behavior['id']; |
64 | 64 | } |
65 | 65 | } |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | |
68 | 68 | public function validateBehaviors($attribute, $params) { |
69 | 69 | if (!$this->hasErrors()) { |
70 | - foreach($this->$attribute as $behavior) { |
|
71 | - if(!is_numeric($behavior) && !preg_match('/[0-9]{1,2}-custom/', $behavior)) { |
|
70 | + foreach ($this->$attribute as $behavior) { |
|
71 | + if (!is_numeric($behavior) && !preg_match('/[0-9]{1,2}-custom/', $behavior)) { |
|
72 | 72 | $this->addError($attribute, 'One of your behaviors is not an integer!'); |
73 | 73 | } |
74 | 74 | } |
@@ -99,11 +99,11 @@ discard block |
||
99 | 99 | $clean_behaviors = array_filter($behaviors); // strip out false values |
100 | 100 | |
101 | 101 | // if there are no selected behaviors just return false now |
102 | - if(sizeof($clean_behaviors) === 0) return false; |
|
102 | + if (sizeof($clean_behaviors) === 0) return false; |
|
103 | 103 | |
104 | 104 | $self = $this; |
105 | 105 | array_walk($clean_behaviors, function($bhvr) use (&$self) { |
106 | - if(preg_match('/.*-custom/', $bhvr)) { |
|
106 | + if (preg_match('/.*-custom/', $bhvr)) { |
|
107 | 107 | $self->custom_behaviors[] = $bhvr; |
108 | 108 | } else { |
109 | 109 | $self->compiled_behaviors[] = $bhvr; |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | // delete cached behaviors |
134 | 134 | array_map(function($period) use ($time) { |
135 | - $key = "checkins_".Yii::$app->user->id."_{$period}_".$time->getLocalDate(); |
|
135 | + $key = "checkins_" . Yii::$app->user->id . "_{$period}_" . $time->getLocalDate(); |
|
136 | 136 | Yii::$app->cache->delete($key); |
137 | 137 | }, [30, 90, 180]); |
138 | 138 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | public function mergeWithDefault(array $user_behaviors) { |
147 | 147 | $behaviors = AH::index(Yii::$container->get(BehaviorInterface::class)::$behaviors, 'name', "category_id"); |
148 | 148 | array_walk($behaviors, function(&$bhvrs, $cat_id) use ($user_behaviors) { |
149 | - if(array_key_exists($cat_id, $user_behaviors)) { |
|
149 | + if (array_key_exists($cat_id, $user_behaviors)) { |
|
150 | 150 | $bhvrs = AH::merge($bhvrs, $user_behaviors[$cat_id]); |
151 | 151 | } |
152 | 152 | }); |
@@ -169,10 +169,10 @@ discard block |
||
169 | 169 | } |
170 | 170 | |
171 | 171 | public function save() { |
172 | - if(empty($this->compiled_behaviors) && empty($this->custom_behaviors)) { |
|
172 | + if (empty($this->compiled_behaviors) && empty($this->custom_behaviors)) { |
|
173 | 173 | // maybe we haven't compiled the behaviors yet |
174 | 174 | $exit = !!!$this->compileBehaviors(); |
175 | - if($exit) return false; |
|
175 | + if ($exit) return false; |
|
176 | 176 | } |
177 | 177 | |
178 | 178 | $custom_bhvrs = \common\models\CustomBehavior::find() |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | |
188 | 188 | $rows = []; |
189 | 189 | // this can be condensed....but we are optimizing for readability |
190 | - foreach($this->compiled_behaviors as $behavior_id) { |
|
190 | + foreach ($this->compiled_behaviors as $behavior_id) { |
|
191 | 191 | $behavior_id = (int)$behavior_id; |
192 | 192 | $behavior = \common\models\Behavior::getBehavior('id', $behavior_id); |
193 | 193 | $category_id = $behavior['category_id']; |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | $rows[] = $temp; |
203 | 203 | } |
204 | 204 | |
205 | - foreach($custom_bhvrs as $cb) { |
|
205 | + foreach ($custom_bhvrs as $cb) { |
|
206 | 206 | $temp = [ |
207 | 207 | Yii::$app->user->id, |
208 | 208 | null, |
@@ -225,10 +225,10 @@ discard block |
||
225 | 225 | )->execute(); |
226 | 226 | |
227 | 227 | // if the user has publicised their check-in graph, create the image |
228 | - if(Yii::$app->user->identity->expose_graph) { |
|
228 | + if (Yii::$app->user->identity->expose_graph) { |
|
229 | 229 | $checkins_last_month = $user_behavior->getCheckInBreakdown(); |
230 | 230 | |
231 | - if($checkins_last_month) { |
|
231 | + if ($checkins_last_month) { |
|
232 | 232 | Yii::$container |
233 | 233 | ->get(\common\components\Graph::class, [Yii::$app->user->identity]) |
234 | 234 | ->create($checkins_last_month, true); |
@@ -99,7 +99,9 @@ discard block |
||
99 | 99 | $clean_behaviors = array_filter($behaviors); // strip out false values |
100 | 100 | |
101 | 101 | // if there are no selected behaviors just return false now |
102 | - if(sizeof($clean_behaviors) === 0) return false; |
|
102 | + if(sizeof($clean_behaviors) === 0) { |
|
103 | + return false; |
|
104 | + } |
|
103 | 105 | |
104 | 106 | $self = $this; |
105 | 107 | array_walk($clean_behaviors, function($bhvr) use (&$self) { |
@@ -172,7 +174,9 @@ discard block |
||
172 | 174 | if(empty($this->compiled_behaviors) && empty($this->custom_behaviors)) { |
173 | 175 | // maybe we haven't compiled the behaviors yet |
174 | 176 | $exit = !!!$this->compileBehaviors(); |
175 | - if($exit) return false; |
|
177 | + if($exit) { |
|
178 | + return false; |
|
179 | + } |
|
176 | 180 | } |
177 | 181 | |
178 | 182 | $custom_bhvrs = \common\models\CustomBehavior::find() |
@@ -95,8 +95,8 @@ discard block |
||
95 | 95 | parent::setUp(); |
96 | 96 | } |
97 | 97 | |
98 | - public function testAttributeLabels() |
|
99 | - { |
|
98 | + public function testAttributeLabels() |
|
99 | + { |
|
100 | 100 | $this->specify('attributeLabels should function properly', function () { |
101 | 101 | $model = $this->container->get('\site\models\CheckinForm'); |
102 | 102 | expect('attributeLabels should be correct', $this->assertEquals([ |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | $this->specify('setBehaviors should function properly', function () { |
117 | 117 | $model = $this->container->get('\site\models\CheckinForm'); |
118 | 118 | |
119 | - $model->setBehaviors($this->behaviors); |
|
119 | + $model->setBehaviors($this->behaviors); |
|
120 | 120 | expect('behaviors1 should be correct', $this->assertEquals([ 0 => 7 ], $model->behaviors1)); |
121 | 121 | expect('behaviors2 should be correct', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2)); |
122 | 122 | expect('behaviors3 should be correct', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3)); |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | expect('behaviors6 should be correct', $this->assertEquals([ 0 => 104 ], $model->behaviors6)); |
126 | 126 | expect('behaviors7 should be correct', $this->assertEquals([ 0 => 128 ], $model->behaviors7)); |
127 | 127 | |
128 | - $model->setBehaviors($this->behaviors); |
|
128 | + $model->setBehaviors($this->behaviors); |
|
129 | 129 | expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 7 ], $model->behaviors1)); |
130 | 130 | expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2)); |
131 | 131 | expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3)); |
@@ -136,19 +136,19 @@ discard block |
||
136 | 136 | }); |
137 | 137 | } |
138 | 138 | |
139 | - public function testValidateBehaviors() |
|
140 | - { |
|
139 | + public function testValidateBehaviors() |
|
140 | + { |
|
141 | 141 | $this->specify('validateBehaviors should function properly', function () { |
142 | 142 | $model = $this->container->get('\site\models\CheckinForm'); |
143 | - $model->setBehaviors($this->behaviors); |
|
143 | + $model->setBehaviors($this->behaviors); |
|
144 | 144 | expect('validation should be good', $this->assertTrue($model->validate())); |
145 | 145 | |
146 | 146 | $model->behaviors1[0] = 'bad'; |
147 | 147 | expect('validation should be bad', $this->assertFalse($model->validate())); |
148 | 148 | }); |
149 | - } |
|
149 | + } |
|
150 | 150 | |
151 | - public function testCompileBehaviors() |
|
151 | + public function testCompileBehaviors() |
|
152 | 152 | { |
153 | 153 | $model = $this->container->get('\site\models\CheckinForm'); |
154 | 154 | $model->setBehaviors($this->behaviors); |
@@ -164,8 +164,8 @@ discard block |
||
164 | 164 | $model->behaviors3[0] = null; |
165 | 165 | $model->compileBehaviors(); |
166 | 166 | expect('compiling behaviors should strip out any falsy values', $this->assertEquals([ |
167 | - 13, 17, 18, 38, 46, 47, 56, 62, 78, 79, 104, 128, |
|
168 | - ], $model->compiled_behaviors)); |
|
167 | + 13, 17, 18, 38, 46, 47, 56, 62, 78, 79, 104, 128, |
|
168 | + ], $model->compiled_behaviors)); |
|
169 | 169 | |
170 | 170 | $model = $this->container->get('\site\models\CheckinForm'); |
171 | 171 | $model->setBehaviors([]); |
@@ -189,6 +189,6 @@ discard block |
||
189 | 189 | $expected_behaviors = $base_behaviors; |
190 | 190 | $expected_behaviors[7] += $other_behaviors; |
191 | 191 | |
192 | - expect('mergeWithDefault should return the given behaviors merged in with the base behaviors', $this->assertEquals($base_behaviors, $model->mergeWithDefault($other_behaviors))); |
|
192 | + expect('mergeWithDefault should return the given behaviors merged in with the base behaviors', $this->assertEquals($base_behaviors, $model->mergeWithDefault($other_behaviors))); |
|
193 | 193 | } |
194 | 194 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | protected function setUp() { |
118 | 118 | $this->container = new \yii\di\Container; |
119 | 119 | $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior'); |
120 | - $this->container->set('common\interfaces\TimeInterface', function () { |
|
120 | + $this->container->set('common\interfaces\TimeInterface', function() { |
|
121 | 121 | return new \common\components\Time('America/Los_Angeles'); |
122 | 122 | }); |
123 | 123 | parent::setUp(); |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | |
126 | 126 | public function testAttributeLabels() |
127 | 127 | { |
128 | - $this->specify('attributeLabels should function properly', function () { |
|
128 | + $this->specify('attributeLabels should function properly', function() { |
|
129 | 129 | $model = $this->container->get('\site\models\CheckinForm'); |
130 | 130 | expect('attributeLabels should be correct', $this->assertEquals([ |
131 | 131 | 'behaviors1' => 'Restoration', |
@@ -141,32 +141,32 @@ discard block |
||
141 | 141 | |
142 | 142 | public function testSetBehaviors() |
143 | 143 | { |
144 | - $this->specify('setBehaviors should function properly', function () { |
|
144 | + $this->specify('setBehaviors should function properly', function() { |
|
145 | 145 | $model = $this->container->get('\site\models\CheckinForm'); |
146 | 146 | |
147 | 147 | $model->setBehaviors($this->behaviors); |
148 | - expect('behaviors1 should be correct', $this->assertEquals([ 0 => 7 ], $model->behaviors1)); |
|
149 | - expect('behaviors2 should be correct', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2)); |
|
150 | - expect('behaviors3 should be correct', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3)); |
|
151 | - expect('behaviors4 should be correct', $this->assertEquals([ 0 => 47, 1 => 56, 2 => 62 ], $model->behaviors4)); |
|
152 | - expect('behaviors5 should be correct', $this->assertEquals([ 0 => 78, 1 => 79 ], $model->behaviors5)); |
|
153 | - expect('behaviors6 should be correct', $this->assertEquals([ 0 => 104 ], $model->behaviors6)); |
|
154 | - expect('behaviors7 should be correct', $this->assertEquals([ 0 => 128 ], $model->behaviors7)); |
|
148 | + expect('behaviors1 should be correct', $this->assertEquals([0 => 7], $model->behaviors1)); |
|
149 | + expect('behaviors2 should be correct', $this->assertEquals([0 => 12, 1 => 13, 2 => 17, 3 => 18], $model->behaviors2)); |
|
150 | + expect('behaviors3 should be correct', $this->assertEquals([0 => 28, 1 => 38, 2 => 46], $model->behaviors3)); |
|
151 | + expect('behaviors4 should be correct', $this->assertEquals([0 => 47, 1 => 56, 2 => 62], $model->behaviors4)); |
|
152 | + expect('behaviors5 should be correct', $this->assertEquals([0 => 78, 1 => 79], $model->behaviors5)); |
|
153 | + expect('behaviors6 should be correct', $this->assertEquals([0 => 104], $model->behaviors6)); |
|
154 | + expect('behaviors7 should be correct', $this->assertEquals([0 => 128], $model->behaviors7)); |
|
155 | 155 | |
156 | 156 | $model->setBehaviors($this->behaviors); |
157 | - expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 7 ], $model->behaviors1)); |
|
158 | - expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2)); |
|
159 | - expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3)); |
|
160 | - expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 47, 1 => 56, 2 => 62 ], $model->behaviors4)); |
|
161 | - expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 78, 1 => 79 ], $model->behaviors5)); |
|
162 | - expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 104 ], $model->behaviors6)); |
|
163 | - expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 128 ], $model->behaviors7)); |
|
157 | + expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 7], $model->behaviors1)); |
|
158 | + expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 12, 1 => 13, 2 => 17, 3 => 18], $model->behaviors2)); |
|
159 | + expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 28, 1 => 38, 2 => 46], $model->behaviors3)); |
|
160 | + expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 47, 1 => 56, 2 => 62], $model->behaviors4)); |
|
161 | + expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 78, 1 => 79], $model->behaviors5)); |
|
162 | + expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 104], $model->behaviors6)); |
|
163 | + expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 128], $model->behaviors7)); |
|
164 | 164 | }); |
165 | 165 | } |
166 | 166 | |
167 | 167 | public function testValidateBehaviors() |
168 | 168 | { |
169 | - $this->specify('validateBehaviors should function properly', function () { |
|
169 | + $this->specify('validateBehaviors should function properly', function() { |
|
170 | 170 | $model = $this->container->get('\site\models\CheckinForm'); |
171 | 171 | $model->setBehaviors($this->behaviors); |
172 | 172 | expect('validation should be good', $this->assertTrue($model->validate())); |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | |
214 | 214 | $model = $this->container->get('\site\models\CheckinForm'); |
215 | 215 | $model->custom_behaviors = []; |
216 | - $model->compiled_behaviors = [ 1, 2, 3]; |
|
216 | + $model->compiled_behaviors = [1, 2, 3]; |
|
217 | 217 | expect('to return an empty array if no custom behaviors are set', $this->assertEquals([], $model->getCustomBehaviors())); |
218 | 218 | } |
219 | 219 |
@@ -10,8 +10,7 @@ discard block |
||
10 | 10 | $this->title = "The Faster Scale App | Check-in"; |
11 | 11 | |
12 | 12 | function checkboxItemTemplate($index, $label, $name, $checked, $value) { |
13 | - return Html::checkbox |
|
14 | - ( |
|
13 | + return Html::checkbox( |
|
15 | 14 | $name, |
16 | 15 | $checked, |
17 | 16 | [ |
@@ -35,10 +34,10 @@ discard block |
||
35 | 34 | 'options' => ['class' => 'form-horizontal'], |
36 | 35 | ]); |
37 | 36 | |
38 | -foreach($categories as $category) { |
|
37 | +foreach ($categories as $category) { |
|
39 | 38 | $behaviors = AH::map($behaviorsList[$category['id']], 'id', 'name'); |
40 | 39 | $custom = []; |
41 | - if(array_key_exists($category['id'], $customList)) { |
|
40 | + if (array_key_exists($category['id'], $customList)) { |
|
42 | 41 | $custom = AH::map($customList[$category['id']], function($cbhvr) { |
43 | 42 | return $cbhvr['id'] . '-custom'; |
44 | 43 | }, 'name'); |
@@ -46,7 +46,7 @@ |
||
46 | 46 | print $form |
47 | 47 | ->field($model, "behaviors{$category['id']}") |
48 | 48 | ->checkboxList($behaviors + $custom, |
49 | - ['data-toggle' => 'buttons', 'item' => "checkboxItemTemplate"]); |
|
49 | + ['data-toggle' => 'buttons', 'item' => "checkboxItemTemplate"]); |
|
50 | 50 | } |
51 | 51 | print Html::submitButton('Submit', ['class' => 'btn btn-success']); |
52 | 52 | ActiveForm::end(); |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | |
99 | 99 | public function getByUser(int $user_id, $local_date = null) { |
100 | 100 | $time = Yii::$container->get(\common\interfaces\TimeInterface::class); |
101 | - if(is_null($local_date)) $local_date = $time->getLocalDate(); |
|
101 | + if (is_null($local_date)) $local_date = $time->getLocalDate(); |
|
102 | 102 | list($start, $end) = $time->getUTCBookends($local_date); |
103 | 103 | |
104 | 104 | $questions = $this->find() |
@@ -117,10 +117,10 @@ discard block |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | public function parseQuestionData($questions) { |
120 | - if(!$questions) return []; |
|
120 | + if (!$questions) return []; |
|
121 | 121 | |
122 | 122 | $question_answers = []; |
123 | - foreach($questions as $question) { |
|
123 | + foreach ($questions as $question) { |
|
124 | 124 | $user_behavior_id = $question->user_behavior_id; |
125 | 125 | |
126 | 126 | $behavior_name = $question->behavior_id |
@@ -98,7 +98,9 @@ discard block |
||
98 | 98 | |
99 | 99 | public function getByUser(int $user_id, $local_date = null) { |
100 | 100 | $time = Yii::$container->get(\common\interfaces\TimeInterface::class); |
101 | - if(is_null($local_date)) $local_date = $time->getLocalDate(); |
|
101 | + if(is_null($local_date)) { |
|
102 | + $local_date = $time->getLocalDate(); |
|
103 | + } |
|
102 | 104 | list($start, $end) = $time->getUTCBookends($local_date); |
103 | 105 | |
104 | 106 | $questions = $this->find() |
@@ -117,7 +119,9 @@ discard block |
||
117 | 119 | } |
118 | 120 | |
119 | 121 | public function parseQuestionData($questions) { |
120 | - if(!$questions) return []; |
|
122 | + if(!$questions) { |
|
123 | + return []; |
|
124 | + } |
|
121 | 125 | |
122 | 126 | $question_answers = []; |
123 | 127 | foreach($questions as $question) { |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | $plus_week = $time->alterLocalDate($actual_date, "+1 week"); |
28 | 28 | |
29 | 29 | $pie_data = []; |
30 | -if($answer_pie) { |
|
30 | +if ($answer_pie) { |
|
31 | 31 | $values = array_map('intval', array_column($answer_pie, "count")); |
32 | 32 | $labels = array_column($answer_pie, "name"); |
33 | 33 | $colors = array_column($answer_pie, "color"); |
@@ -68,15 +68,15 @@ discard block |
||
68 | 68 | </div> |
69 | 69 | </div> |
70 | 70 | |
71 | - <?php if($questions) { |
|
72 | - foreach($questions as $behavior_id => $behavior_questions) { |
|
71 | + <?php if ($questions) { |
|
72 | + foreach ($questions as $behavior_id => $behavior_questions) { |
|
73 | 73 | print "<div class='well well-sm'>"; |
74 | 74 | print "<button type='button' class='btn btn-primary' disabled='disabled'>{$behavior_questions['question']['behavior_name']}</button>"; |
75 | 75 | print "<div class='row'>"; |
76 | - foreach($behavior_questions['answers'] as $question) { |
|
76 | + foreach ($behavior_questions['answers'] as $question) { |
|
77 | 77 | print "<div class='col-md-4'>"; |
78 | 78 | print "<p><strong>{$question['title']}</strong></p>"; |
79 | - print "<p>".Html::encode($question['answer'])."</p>"; |
|
79 | + print "<p>" . Html::encode($question['answer']) . "</p>"; |
|
80 | 80 | print "</div>"; |
81 | 81 | } |
82 | 82 | print "</div></div>"; |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | 'options' => ['class' => 'form-horizontal'], |
89 | 89 | ]); |
90 | 90 | |
91 | - foreach($categories as $category) { |
|
91 | + foreach ($categories as $category) { |
|
92 | 92 | $behaviors = AH::map($behaviorsList[$category['id']], 'id', 'name'); |
93 | 93 | print $form |
94 | 94 | ->field($model, "behaviors{$category['id']}") |
@@ -32,13 +32,13 @@ discard block |
||
32 | 32 | $this->container = new \yii\di\Container; |
33 | 33 | $this->container->set('common\interfaces\UserInterface', '\site\tests\_support\MockUser'); |
34 | 34 | $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior'); |
35 | - $this->container->set('common\interfaces\TimeInterface', function () { |
|
35 | + $this->container->set('common\interfaces\TimeInterface', function() { |
|
36 | 36 | return new \common\components\Time('America/Los_Angeles'); |
37 | 37 | }); |
38 | 38 | |
39 | 39 | // instantiate mock objects |
40 | 40 | $user_behavior = $this->container->get(\common\interfaces\UserBehaviorInterface::class); |
41 | - $time = $this->container->get(\common\interfaces\TimeInterface::class); |
|
41 | + $time = $this->container->get(\common\interfaces\TimeInterface::class); |
|
42 | 42 | |
43 | 43 | $question = $this->getMockBuilder(\common\models\Question::class) |
44 | 44 | ->setMethods(['save', 'attributes']) |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | |
108 | 108 | // set up a side effect to occur when the user's save() function is called |
109 | 109 | $saved = false; |
110 | - $this->user->method('save')->will($this->returnCallback(function($runValidation=true, $attributeNames=null) use(&$saved) { |
|
110 | + $this->user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use(&$saved) { |
|
111 | 111 | $saved = true; |
112 | 112 | return $this->user; |
113 | 113 | })); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | |
134 | 134 | public function testSignupExistingConfirmedUser() { |
135 | 135 | $saved = false; |
136 | - $this->existing_user->method('save')->will($this->returnCallback(function($runValidation=true, $attributeNames=null) use(&$saved) { |
|
136 | + $this->existing_user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use(&$saved) { |
|
137 | 137 | $saved = true; |
138 | 138 | return $this->existing_user; |
139 | 139 | })); |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | |
153 | 153 | public function testSignupExistingUnconfirmedUser() { |
154 | 154 | $saved = false; |
155 | - $this->existing_user->method('save')->will($this->returnCallback(function($runValidation=true, $attributeNames=null) use(&$saved) { |
|
155 | + $this->existing_user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use(&$saved) { |
|
156 | 156 | $saved = true; |
157 | 157 | return $this->existing_user; |
158 | 158 | })); |
@@ -183,14 +183,14 @@ discard block |
||
183 | 183 | |
184 | 184 | $result = $form->setFields($this->user); |
185 | 185 | $this->specify('populate should set the values of the user model from the form', function() use ($result) { |
186 | - foreach($this->whitelist as $attr) { |
|
186 | + foreach ($this->whitelist as $attr) { |
|
187 | 187 | $this->assertEquals($this->vals[$attr], $result->$attr); |
188 | 188 | } |
189 | 189 | }); |
190 | 190 | } |
191 | 191 | |
192 | 192 | private function setAttrs($form, Array $vals) { |
193 | - foreach($vals as $key => $val) { |
|
193 | + foreach ($vals as $key => $val) { |
|
194 | 194 | $form->$key = $val; |
195 | 195 | } |
196 | 196 | return $form; |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | } |
212 | 212 | |
213 | 213 | private function getForm($user = null) { |
214 | - if(is_null($user)) $user = $this->user; |
|
214 | + if (is_null($user)) $user = $this->user; |
|
215 | 215 | $form = $this->container->get('\site\models\SignupForm', [$user]); |
216 | 216 | $form->attributes = $this->vals; // massive assignment |
217 | 217 | return $form; |
@@ -125,14 +125,14 @@ discard block |
||
125 | 125 | <th style="Margin:0;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left"> |
126 | 126 | |
127 | 127 | <?php |
128 | -if($questions) { |
|
129 | - foreach($questions as $behavior_id => $behavior_questions) { |
|
128 | +if ($questions) { |
|
129 | + foreach ($questions as $behavior_id => $behavior_questions) { |
|
130 | 130 | ?> |
131 | 131 | |
132 | 132 | <h4 style="Margin:0;Margin-bottom:10px;color:#37b98f;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:24px;font-weight:400;line-height:1.3;margin:0;margin-bottom:5px;padding:0 8px;text-align:left;word-wrap:normal"> <?= Html::encode($behavior_questions['question']['behavior_name']) ?> </h4> |
133 | 133 | |
134 | 134 | <?php |
135 | - foreach($behavior_questions['answers'] as $key => $question) { ?> |
|
135 | + foreach ($behavior_questions['answers'] as $key => $question) { ?> |
|
136 | 136 | <p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0 8px 4px 8px;text-align:left"><strong><?= Html::encode($question['title']) ?></strong> <?= Html::encode($question['answer']) ?></p> |
137 | 137 | <?php |
138 | 138 | } |
@@ -189,12 +189,12 @@ discard block |
||
189 | 189 | <th style="Margin:0;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left"> |
190 | 190 | |
191 | 191 | <?php |
192 | -if($user_behaviors) { |
|
193 | - foreach($user_behaviors as $cat_key => $behaviors) { ?> |
|
192 | +if ($user_behaviors) { |
|
193 | + foreach ($user_behaviors as $cat_key => $behaviors) { ?> |
|
194 | 194 | <p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0 8px 4px 8px;text-align:left"> |
195 | 195 | <strong style="color:#37b98f"><?= Html::encode($categories[$cat_key]) ?></strong> |
196 | 196 | <?php |
197 | - foreach($behaviors as $behavior) { ?> |
|
197 | + foreach ($behaviors as $behavior) { ?> |
|
198 | 198 | <br><?= Html::encode($behavior['name']) ?> |
199 | 199 | <?php |
200 | 200 | } |