modularsoftware / genealogy

app/Family.php

Spacing +4 added lines, -4 removed lines

@@ -31,11 +31,11 @@
             ->pluck('individuals.id');
     }
 
-    public function info(){
-        return $this->belongsTo(Individual::class,'father_id','id');
+    public function info() {
+        return $this->belongsTo(Individual::class, 'father_id', 'id');
     }
 
-    public function spouse(){
-        return $this->hasOne(Individual::class,'id','mother_id');
+    public function spouse() {
+        return $this->hasOne(Individual::class, 'id', 'mother_id');
     }
 }

app/Http/Controllers/Tree/TreeController.php

Spacing +14 added lines, -14 removed lines

@@ -26,9 +26,9 @@ 
      */
     public function pedigree($father_id = 1)
     {
-        $father = Family::with(['info','spouse'])->where('type_id','>=',1)->where('father_id',$father_id)->first();
+        $father = Family::with(['info', 'spouse'])->where('type_id', '>=', 1)->where('father_id', $father_id)->first();
         $data = [];
-        if($father){
+        if ($father) {
             $data[] = array(
                 'name' => $father->info->getNameAttribute(),
                 'class' => 'node',
@@ -38,7 +38,7 @@ 
                     ['spouse' => array(
                         'name' => $father->spouse->getNameAttribute()
                     ),
-                        'children' => $father->info->children->map(function ($item) {
+                        'children' => $father->info->children->map(function($item) {
                             return ['name' => $item['first_name'].' '.$item['last_name']];
                         })->all()],
 
@@ -59,12 +59,12 @@ 
      * @param  integer $nest      [Set how many nested children]
      * @return Array | Json
      */
-    public function show($parent_id = 1, $nest = 1){
+    public function show($parent_id = 1, $nest = 1) {
         $this->nest = 1; // initialize nesting to 1
 
         $parents = Individual::where('is_active', 1)->where('id', $parent_id)->get();
 
-        $tree = $this->getChildren($parents, (int)$nest);
+        $tree = $this->getChildren($parents, (int) $nest);
 
         return $tree;
     }
@@ -79,24 +79,24 @@ 
      * @param  boolean $show    [description]
      * @return array           [description]
      */
-    public function getChildren($parents = 1, $nest = 1, $show = true){
+    public function getChildren($parents = 1, $nest = 1, $show = true) {
         $data = [];
-        if($this->nest <= $nest){
+        if ($this->nest <= $nest) {
             $this->nest++;
 
-            foreach($parents as $key => $parent)
+            foreach ($parents as $key => $parent)
             {
-                if($show === true){
+                if ($show === true) {
                     $data[] = [
                         'id' => $parent->id,
                         'text' => $parent->getNameAttribute(),
-                        'children' => $this->getChildren($parent->children,$nest,$show)
+                        'children' => $this->getChildren($parent->children, $nest, $show)
                     ];
-                }else{
+                } else {
                     $data[] = [
                         'id' => $parent->id,
                         'name' => $parent->getNameAttribute(),
-                        'children' => $this->getChildren($parent->children,$nest,$show)
+                        'children' => $this->getChildren($parent->children, $nest, $show)
                     ];
                 }
 
@@ -114,12 +114,12 @@ 
      * @param  integer $nest      [Set how many nested children]
      * @return Array | Json
      */
-    public function edge($parent_id = 1, $nest = 1){
+    public function edge($parent_id = 1, $nest = 1) {
         $this->nest = 1; // initialize nesting to 1
 
         $parents = Individual::where('is_active', 1)->where('id', $parent_id)->get();
 
-        $tree = $this->getChildren($parents, (int)$nest, false);
+        $tree = $this->getChildren($parents, (int) $nest, false);
 
         return $tree;
     }

Braces +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
                         'text' => $parent->getNameAttribute(),
                         'children' => $this->getChildren($parent->children,$nest,$show)
                     ];
-                }else{
+                } else{
                     $data[] = [
                         'id' => $parent->id,
                         'name' => $parent->getNameAttribute(),