Completed
Pull Request — master (#82)
by Brandon
02:12
created
app/DataTables/ActivityLogDataTable.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -16,16 +16,16 @@  discard block
 block discarded – undo
16 16
     public function dataTable($query)
17 17
     {
18 18
         return datatables($query)
19
-            ->editColumn('causer_id', function ($activity) {
20
-                return ($activity->causer_id ? '<a href="/' . ($activity->causer_type == "App\User" ? 'user' : 'device') . '/' . $activity->causer_id . '">' . ($activity->causer->name ?? '') . '</a>' : 'App');
19
+            ->editColumn('causer_id', function($activity) {
20
+                return ($activity->causer_id ? '<a href="/'.($activity->causer_type == "App\User" ? 'user' : 'device').'/'.$activity->causer_id.'">'.($activity->causer->name ?? '').'</a>' : 'App');
21 21
             })
22
-            ->editColumn('subject_id', function ($activity) {
23
-                return ($activity->subject_id ? '<a href="/' . ($activity->subject_type == "App\User" ? 'user' : 'device') . '/' . $activity->subject_id . '">' . ($activity->subject->name ?? '') . '</a>' : 'App');
22
+            ->editColumn('subject_id', function($activity) {
23
+                return ($activity->subject_id ? '<a href="/'.($activity->subject_type == "App\User" ? 'user' : 'device').'/'.$activity->subject_id.'">'.($activity->subject->name ?? '').'</a>' : 'App');
24 24
             })
25
-            ->editColumn('properties', function ($activity) {
25
+            ->editColumn('properties', function($activity) {
26 26
                 return $activity->properties;
27 27
             })
28
-            ->rawColumns(['causer_id', 'subject_id', 'properties']);
28
+            ->rawColumns([ 'causer_id', 'subject_id', 'properties' ]);
29 29
     }
30 30
 
31 31
     /**
@@ -98,6 +98,6 @@  discard block
 block discarded – undo
98 98
      */
99 99
     protected function filename()
100 100
     {
101
-        return 'activitylog_' . time();
101
+        return 'activitylog_'.time();
102 102
     }
103 103
 }
Please login to merge, or discard this patch.
app/DataTables/DevicesDataTable.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -16,17 +16,17 @@
 block discarded – undo
16 16
     public function dataTable($query)
17 17
     {
18 18
         return datatables($query)
19
-            ->editColumn('name', function ($device) {
20
-                return '<a href="' . route('device.show', $device->id) . '">' . $device->name . '</a>';
19
+            ->editColumn('name', function($device) {
20
+                return '<a href="'.route('device.show', $device->id).'">'.$device->name.'</a>';
21 21
             })
22
-            ->addColumn('location', function ($device) {
22
+            ->addColumn('location', function($device) {
23 23
                 return ($device->location->name ?? 'null');
24 24
             })
25
-            ->addColumn('site', function ($device) {
25
+            ->addColumn('site', function($device) {
26 26
                 return ($device->location->site->name ?? 'null');
27 27
             })
28
-            ->addColumn('rates', function ($device) {
29
-                return $device->update_rate . '/' . $device->image_rate .'/' . $device->sensor_rate;
28
+            ->addColumn('rates', function($device) {
29
+                return $device->update_rate.'/'.$device->image_rate.'/'.$device->sensor_rate;
30 30
             })
31 31
             ->blacklist([ 'location', 'site', 'rates' ])
32 32
             ->rawColumns([ 'name' ]);
Please login to merge, or discard this patch.
app/DataTables/SensorDataTable.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,18 +15,18 @@
 block discarded – undo
15 15
     public function dataTable($query)
16 16
     {
17 17
         return datatables($query)
18
-            ->editColumn('device_id', function ($sensor) {
19
-                return '<a href="/device/' . $sensor->device_id . '">'. ($sensor->device->name ?? '') . '</a>';
18
+            ->editColumn('device_id', function($sensor) {
19
+                return '<a href="/device/'.$sensor->device_id.'">'.($sensor->device->name ?? '').'</a>';
20 20
             })
21
-            ->editColumn('name', function ($sensor) {
22
-                return '<a href="/sensor/' . $sensor->id . '">'. $sensor->name . '</a>';
21
+            ->editColumn('name', function($sensor) {
22
+                return '<a href="/sensor/'.$sensor->id.'">'.$sensor->name.'</a>';
23 23
             })
24
-            ->addColumn('value', function ($sensor) {
24
+            ->addColumn('value', function($sensor) {
25 25
                 return $sensor->latest_data->value;
26 26
             })
27 27
             ->addColumn('action', 'sensor.action')
28
-            ->blacklist([ 'action', 'value'])
29
-            ->rawColumns(['device_id', 'name', 'action']);
28
+            ->blacklist([ 'action', 'value' ])
29
+            ->rawColumns([ 'device_id', 'name', 'action' ]);
30 30
     }
31 31
 
32 32
     /**
Please login to merge, or discard this patch.
app/DataTables/SensorDataDataTable.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@
 block discarded – undo
15 15
     public function dataTable($query)
16 16
     {
17 17
         return datatables($query)
18
-            ->editColumn('sensor_id', function ($sensordata) {
19
-                return '<a href="/sensor/' . $sensordata->sensor_id . '">'. ($sensordata->sensor->name ?? '') . '</a>';
18
+            ->editColumn('sensor_id', function($sensordata) {
19
+                return '<a href="/sensor/'.$sensordata->sensor_id.'">'.($sensordata->sensor->name ?? '').'</a>';
20 20
             })
21 21
             ->addColumn('action', 'sensordata.action')
22
-            ->blacklist([ 'action'])
23
-            ->rawColumns(['sensor_id', 'action']);
22
+            ->blacklist([ 'action' ])
23
+            ->rawColumns([ 'sensor_id', 'action' ]);
24 24
     }
25 25
 
26 26
     /**
Please login to merge, or discard this patch.
app/Device.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
      *
32 32
      * @var array
33 33
      */
34
-    protected $hidden = ['token'];
34
+    protected $hidden = [ 'token' ];
35 35
     
36 36
     /**
37 37
      * The attributes that are mass assignable.
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
      *
51 51
      * @var array
52 52
      */
53
-    protected static $ignoreChangedAttributes = ['updated_at'];
53
+    protected static $ignoreChangedAttributes = [ 'updated_at' ];
54 54
     
55 55
     /**
56 56
      * The attributes to log in the Activity Log
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
      */
92 92
     public function getSiteAttribute()
93 93
     {
94
-        return $this->location->site ?? (object)[];
94
+        return $this->location->site ?? (object) [ ];
95 95
     }
96 96
     
97 97
     /**
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
         else
152 152
             $time = new Carbon($value, 'UTC');
153 153
         
154
-        $this->attributes['open_time'] = $time;
154
+        $this->attributes[ 'open_time' ] = $time;
155 155
     }
156 156
     
157 157
     /**
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
         else
174 174
             $time = new Carbon($value, 'UTC');
175 175
         
176
-        $this->attributes['close_time'] = $time;
176
+        $this->attributes[ 'close_time' ] = $time;
177 177
     }
178 178
     
179 179
     /**
Please login to merge, or discard this patch.
app/Http/Controllers/SensorDataController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
     {
112 112
         SensorData::find($id)->delete();
113 113
         return redirect()->route('sensordata.index')
114
-            ->with('success','SensorData deleted successfully');
114
+            ->with('success', 'SensorData deleted successfully');
115 115
     }
116 116
 
117 117
 }
Please login to merge, or discard this patch.
app/Http/Controllers/SensorController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@
 block discarded – undo
117 117
     {
118 118
         Sensor::findOrFail($id)->delete();
119 119
         return redirect()->route('sensor.index')
120
-            ->with('success','Sensor deleted successfully');
120
+            ->with('success', 'Sensor deleted successfully');
121 121
     }
122 122
 
123 123
 }
Please login to merge, or discard this patch.
app/Sensor.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,6 +68,6 @@
 block discarded – undo
68 68
      */
69 69
     public function getLatestDataAttribute()
70 70
     {
71
-        return $this->hasOne('App\SensorData')->latest()->first() ?? (object)[];
71
+        return $this->hasOne('App\SensorData')->latest()->first() ?? (object) [ ];
72 72
     }
73 73
 }
74 74
\ No newline at end of file
Please login to merge, or discard this patch.