@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | if ($request->has('searchTerm')) { |
| 20 | 20 | $columnsToSearch = ['group', 'alia', 'import_confirm']; |
| 21 | 21 | $search_term = json_decode($request->searchTerm)->searchTerm; |
| 22 | - if (! empty($search_term)) { |
|
| 23 | - $searchQuery = '%'.$search_term.'%'; |
|
| 22 | + if (!empty($search_term)) { |
|
| 23 | + $searchQuery = '%' . $search_term . '%'; |
|
| 24 | 24 | foreach ($columnsToSearch as $column) { |
| 25 | 25 | $query->orWhere($column, 'LIKE', $searchQuery); |
| 26 | 26 | } |
@@ -31,8 +31,8 @@ discard block |
||
| 31 | 31 | $filters = get_object_vars(json_decode($request->columnFilters)); |
| 32 | 32 | |
| 33 | 33 | foreach ($filters as $key => $value) { |
| 34 | - if (! empty($value)) { |
|
| 35 | - $query->orWhere($key, 'like', '%'.$value.'%'); |
|
| 34 | + if (!empty($value)) { |
|
| 35 | + $query->orWhere($key, 'like', '%' . $value . '%'); |
|
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | } |
@@ -20,8 +20,8 @@ discard block |
||
| 20 | 20 | if ($request->has('searchTerm')) { |
| 21 | 21 | $columnsToSearch = ['group', 'type', 'stat', 'date', 'plac', 'temp', 'slac_famc']; |
| 22 | 22 | $search_term = json_decode($request->searchTerm)->searchTerm; |
| 23 | - if (! empty($search_term)) { |
|
| 24 | - $searchQuery = '%'.$search_term.'%'; |
|
| 23 | + if (!empty($search_term)) { |
|
| 24 | + $searchQuery = '%' . $search_term . '%'; |
|
| 25 | 25 | foreach ($columnsToSearch as $column) { |
| 26 | 26 | $query->orWhere($column, 'LIKE', $searchQuery); |
| 27 | 27 | } |
@@ -32,8 +32,8 @@ discard block |
||
| 32 | 32 | $filters = get_object_vars(json_decode($request->columnFilters)); |
| 33 | 33 | |
| 34 | 34 | foreach ($filters as $key => $value) { |
| 35 | - if (! empty($value)) { |
|
| 36 | - $query->orWhere($key, 'like', '%'.$value.'%'); |
|
| 35 | + if (!empty($value)) { |
|
| 36 | + $query->orWhere($key, 'like', '%' . $value . '%'); |
|
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | } |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | if ($request->has('searchTerm')) { |
| 20 | 20 | $columnsToSearch = ['repo', 'name', 'addr_id', 'rin', 'email', 'phon', 'fax', 'www', 'description', 'type_id', 'is_active']; |
| 21 | 21 | $search_term = json_decode($request->searchTerm)->searchTerm; |
| 22 | - if (! empty($search_term)) { |
|
| 23 | - $searchQuery = '%'.$search_term.'%'; |
|
| 22 | + if (!empty($search_term)) { |
|
| 23 | + $searchQuery = '%' . $search_term . '%'; |
|
| 24 | 24 | foreach ($columnsToSearch as $column) { |
| 25 | 25 | $query->orWhere($column, 'LIKE', $searchQuery); |
| 26 | 26 | } |
@@ -31,9 +31,9 @@ discard block |
||
| 31 | 31 | $filters = get_object_vars(json_decode($request->columnFilters)); |
| 32 | 32 | $relationship_column = ['addr.adr1', 'type.name']; |
| 33 | 33 | foreach ($filters as $key => $value) { |
| 34 | - if (! in_array($key, $relationship_column)) { |
|
| 35 | - if (! empty($value)) { |
|
| 36 | - $query->orWhere($key, 'like', '%'.$value.'%'); |
|
| 34 | + if (!in_array($key, $relationship_column)) { |
|
| 35 | + if (!empty($value)) { |
|
| 36 | + $query->orWhere($key, 'like', '%' . $value . '%'); |
|
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | } |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | if ($request->has('searchTerm')) { |
| 20 | 20 | $columnsToSearch = ['name']; |
| 21 | 21 | $search_term = json_decode($request->searchTerm)->searchTerm; |
| 22 | - if (! empty($search_term)) { |
|
| 23 | - $searchQuery = '%'.$search_term.'%'; |
|
| 22 | + if (!empty($search_term)) { |
|
| 23 | + $searchQuery = '%' . $search_term . '%'; |
|
| 24 | 24 | foreach ($columnsToSearch as $column) { |
| 25 | 25 | $query->orWhere($column, 'LIKE', $searchQuery); |
| 26 | 26 | } |
@@ -31,8 +31,8 @@ discard block |
||
| 31 | 31 | $filters = get_object_vars(json_decode($request->columnFilters)); |
| 32 | 32 | |
| 33 | 33 | foreach ($filters as $key => $value) { |
| 34 | - if (! empty($value)) { |
|
| 35 | - $query->orWhere($key, 'like', '%'.$value.'%'); |
|
| 34 | + if (!empty($value)) { |
|
| 35 | + $query->orWhere($key, 'like', '%' . $value . '%'); |
|
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | } |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | if ($request->has('perPage')) { |
| 46 | 46 | $rows = $query->paginate($request->perPage); |
| 47 | 47 | } |
| 48 | - if (! count($request->all())) { |
|
| 48 | + if (!count($request->all())) { |
|
| 49 | 49 | $rows = $query->get()->toArray(); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | if ($request->has('searchTerm')) { |
| 20 | 20 | $columnsToSearch = ['adr1', 'adr2', 'city', 'stae', 'post', 'ctry']; |
| 21 | 21 | $search_term = json_decode($request->searchTerm)->searchTerm; |
| 22 | - if (! empty($search_term)) { |
|
| 23 | - $searchQuery = '%'.$search_term.'%'; |
|
| 22 | + if (!empty($search_term)) { |
|
| 23 | + $searchQuery = '%' . $search_term . '%'; |
|
| 24 | 24 | foreach ($columnsToSearch as $column) { |
| 25 | 25 | $query->orWhere($column, 'LIKE', $searchQuery); |
| 26 | 26 | } |
@@ -31,8 +31,8 @@ discard block |
||
| 31 | 31 | $filters = get_object_vars(json_decode($request->columnFilters)); |
| 32 | 32 | |
| 33 | 33 | foreach ($filters as $key => $value) { |
| 34 | - if (! empty($value)) { |
|
| 35 | - $query->orWhere($key, 'like', '%'.$value.'%'); |
|
| 34 | + if (!empty($value)) { |
|
| 35 | + $query->orWhere($key, 'like', '%' . $value . '%'); |
|
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | } |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | if ($request->has('searchTerm')) { |
| 20 | 20 | $columnsToSearch = ['group', 'date', 'plac']; |
| 21 | 21 | $search_term = json_decode($request->searchTerm)->searchTerm; |
| 22 | - if (! empty($search_term)) { |
|
| 23 | - $searchQuery = '%'.$search_term.'%'; |
|
| 22 | + if (!empty($search_term)) { |
|
| 23 | + $searchQuery = '%' . $search_term . '%'; |
|
| 24 | 24 | foreach ($columnsToSearch as $column) { |
| 25 | 25 | $query->orWhere($column, 'LIKE', $searchQuery); |
| 26 | 26 | } |
@@ -31,8 +31,8 @@ discard block |
||
| 31 | 31 | $filters = get_object_vars(json_decode($request->columnFilters)); |
| 32 | 32 | |
| 33 | 33 | foreach ($filters as $key => $value) { |
| 34 | - if (! empty($value)) { |
|
| 35 | - $query->orWhere($key, 'like', '%'.$value.'%'); |
|
| 34 | + if (!empty($value)) { |
|
| 35 | + $query->orWhere($key, 'like', '%' . $value . '%'); |
|
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | } |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | if ($request->has('searchTerm')) { |
| 20 | 20 | $columnsToSearch = ['group', 'indi', 'rela', 'import_confirm']; |
| 21 | 21 | $search_term = json_decode($request->searchTerm)->searchTerm; |
| 22 | - if (! empty($search_term)) { |
|
| 23 | - $searchQuery = '%'.$search_term.'%'; |
|
| 22 | + if (!empty($search_term)) { |
|
| 23 | + $searchQuery = '%' . $search_term . '%'; |
|
| 24 | 24 | foreach ($columnsToSearch as $column) { |
| 25 | 25 | $query->orWhere($column, 'LIKE', $searchQuery); |
| 26 | 26 | } |
@@ -31,8 +31,8 @@ discard block |
||
| 31 | 31 | $filters = get_object_vars(json_decode($request->columnFilters)); |
| 32 | 32 | |
| 33 | 33 | foreach ($filters as $key => $value) { |
| 34 | - if (! empty($value)) { |
|
| 35 | - $query->orWhere($key, 'like', '%'.$value.'%'); |
|
| 34 | + if (!empty($value)) { |
|
| 35 | + $query->orWhere($key, 'like', '%' . $value . '%'); |
|
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | $file = UploadFile::where('attachable_id', '=', $av->id)->where('attachable_type', '=', 'avatar')->first(); |
| 80 | 80 | |
| 81 | 81 | if ($file) { |
| 82 | - $person->setAttribute('avatar', '/api/core/avatars/'.$av->id); |
|
| 82 | + $person->setAttribute('avatar', '/api/core/avatars/' . $av->id); |
|
| 83 | 83 | } else { |
| 84 | 84 | $person->setAttribute('avatar', ''); |
| 85 | 85 | } |
@@ -96,36 +96,36 @@ discard block |
||
| 96 | 96 | return; |
| 97 | 97 | } |
| 98 | 98 | // do self |
| 99 | - if (! array_key_exists($start_id, $this->persons)) { |
|
| 99 | + if (!array_key_exists($start_id, $this->persons)) { |
|
| 100 | 100 | // this is not added |
| 101 | 101 | $_families = Family::where('husband_id', $start_id)->orwhere('wife_id', $start_id)->select('id')->get(); |
| 102 | 102 | $_union_ids = []; |
| 103 | 103 | foreach ($_families as $item) { |
| 104 | - $_union_ids[] = 'u'.$item->id; |
|
| 104 | + $_union_ids[] = 'u' . $item->id; |
|
| 105 | 105 | // add current family link |
| 106 | 106 | // $this->links[] = [$start_id, 'u'.$item->id]; |
| 107 | - array_unshift($this->links, [$start_id, 'u'.$item->id]); |
|
| 107 | + array_unshift($this->links, [$start_id, 'u' . $item->id]); |
|
| 108 | 108 | } |
| 109 | 109 | $person->setAttribute('own_unions', $_union_ids); |
| 110 | - $person->setAttribute('parent_union', 'u'.$person->child_in_family_id); |
|
| 110 | + $person->setAttribute('parent_union', 'u' . $person->child_in_family_id); |
|
| 111 | 111 | // add to persons |
| 112 | 112 | $this->persons[$start_id] = $person; |
| 113 | 113 | |
| 114 | 114 | // get self's parents data |
| 115 | 115 | if ($person) { |
| 116 | 116 | if ($person->id == 680) { |
| 117 | - array_unshift($this->person_id, 'first'.$person->id); |
|
| 117 | + array_unshift($this->person_id, 'first' . $person->id); |
|
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | $p_family_id = $person->child_in_family_id; |
| 121 | - array_unshift($this->start_id, 'family_in_child_id'.$person->child_in_family_id); |
|
| 121 | + array_unshift($this->start_id, 'family_in_child_id' . $person->child_in_family_id); |
|
| 122 | 122 | if ($p_family_id) { |
| 123 | - array_unshift($this->family_id, 'first'.$p_family_id); |
|
| 123 | + array_unshift($this->family_id, 'first' . $p_family_id); |
|
| 124 | 124 | } |
| 125 | - if (! empty($p_family_id)) { |
|
| 125 | + if (!empty($p_family_id)) { |
|
| 126 | 126 | // add parent family link |
| 127 | 127 | // $this->links[] = ['u'.$p_family_id, $start_id] ; |
| 128 | - array_unshift($this->links, ['u'.$p_family_id, $start_id]); |
|
| 128 | + array_unshift($this->links, ['u' . $p_family_id, $start_id]); |
|
| 129 | 129 | $p_family = Family::find($p_family_id); |
| 130 | 130 | if (isset($p_family->husband_id)) { |
| 131 | 131 | $p_fatherid = $p_family->husband_id; |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | $file = UploadFile::where('attachable_id', '=', $av->id)->where('attachable_type', '=', 'avatar')->first(); |
| 152 | 152 | |
| 153 | 153 | if ($file) { |
| 154 | - $father->setAttribute('avatar', '/api/core/avatars/'.$av->id); |
|
| 154 | + $father->setAttribute('avatar', '/api/core/avatars/' . $av->id); |
|
| 155 | 155 | } else { |
| 156 | 156 | $father->setAttribute('avatar', ''); |
| 157 | 157 | } |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | $file = UploadFile::where('attachable_id', '=', $av->id)->where('attachable_type', '=', 'avatar')->first(); |
| 167 | 167 | |
| 168 | 168 | if ($file) { |
| 169 | - $mother->setAttribute('avatar', '/api/core/avatars/'.$av->id); |
|
| 169 | + $mother->setAttribute('avatar', '/api/core/avatars/' . $av->id); |
|
| 170 | 170 | } else { |
| 171 | 171 | $mother->setAttribute('avatar', ''); |
| 172 | 172 | } |
@@ -175,30 +175,30 @@ discard block |
||
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | if (isset($father->id)) { |
| 178 | - if (! array_key_exists($father->id, $this->persons)) { |
|
| 178 | + if (!array_key_exists($father->id, $this->persons)) { |
|
| 179 | 179 | // this is not added |
| 180 | 180 | $_families = Family::where('husband_id', $father->id)->orwhere('wife_id', $father->id)->select('id')->get(); |
| 181 | 181 | $_union_ids = []; |
| 182 | 182 | foreach ($_families as $item) { |
| 183 | - $_union_ids[] = 'u'.$item->id; |
|
| 183 | + $_union_ids[] = 'u' . $item->id; |
|
| 184 | 184 | } |
| 185 | 185 | $father->setAttribute('own_unions', $_union_ids); |
| 186 | - $father->setAttribute('parent_union', 'u'.$father->child_in_family_id); |
|
| 186 | + $father->setAttribute('parent_union', 'u' . $father->child_in_family_id); |
|
| 187 | 187 | // add to persons |
| 188 | 188 | $this->persons[$father->id] = $father; |
| 189 | 189 | |
| 190 | 190 | // add current family link |
| 191 | 191 | // $this->links[] = [$father->id, 'u'.$family_id]; |
| 192 | - array_unshift($this->links, [$father->id, 'u'.$family_id]); |
|
| 192 | + array_unshift($this->links, [$father->id, 'u' . $family_id]); |
|
| 193 | 193 | // get husband's parents data |
| 194 | 194 | $p_family_id = $father->child_in_family_id; |
| 195 | 195 | if ($p_family_id) { |
| 196 | - array_unshift($this->family_id, 'father'.$p_family_id); |
|
| 196 | + array_unshift($this->family_id, 'father' . $p_family_id); |
|
| 197 | 197 | } |
| 198 | - if (! empty($p_family_id)) { |
|
| 198 | + if (!empty($p_family_id)) { |
|
| 199 | 199 | // add parent family link |
| 200 | 200 | // $this->links[] = ['u'.$p_family_id, $father->id] ; |
| 201 | - array_unshift($this->links, ['u'.$p_family_id, $father->id]); |
|
| 201 | + array_unshift($this->links, ['u' . $p_family_id, $father->id]); |
|
| 202 | 202 | $p_family = Family::find($p_family_id); |
| 203 | 203 | if (isset($p_family->husband_id)) { |
| 204 | 204 | $p_fatherid = $p_family->husband_id; |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | } |
| 213 | 213 | } |
| 214 | 214 | if (isset($mother->id)) { |
| 215 | - if (! array_key_exists($mother->id, $this->persons)) { |
|
| 215 | + if (!array_key_exists($mother->id, $this->persons)) { |
|
| 216 | 216 | // this is not added |
| 217 | 217 | $_families = Family::where('husband_id', $mother->id)->orwhere('wife_id', $mother->id)->select('id')->get(); |
| 218 | 218 | $_union_ids = []; |
@@ -220,29 +220,29 @@ discard block |
||
| 220 | 220 | $_union_ids[] = $item->id; |
| 221 | 221 | } |
| 222 | 222 | $mother->setAttribute('own_unions', $_union_ids); |
| 223 | - $mother->setAttribute('parent_union', 'u'.$mother->child_in_family_id); |
|
| 223 | + $mother->setAttribute('parent_union', 'u' . $mother->child_in_family_id); |
|
| 224 | 224 | // add to person |
| 225 | 225 | $this->persons[$mother->id] = $mother; |
| 226 | 226 | // add current family link |
| 227 | 227 | // $this->links[] = [$mother->id, 'u'.$family_id]; |
| 228 | - array_unshift($this->links, [$mother->id, 'u'.$family_id]); |
|
| 228 | + array_unshift($this->links, [$mother->id, 'u' . $family_id]); |
|
| 229 | 229 | // get wifee's parents data |
| 230 | 230 | $p_family_id = $mother->child_in_family_id; |
| 231 | 231 | if ($p_family_id) { |
| 232 | 232 | } |
| 233 | - if (! empty($p_family_id)) { |
|
| 233 | + if (!empty($p_family_id)) { |
|
| 234 | 234 | // add parent family link |
| 235 | 235 | // $this->links[] = ['u'.$p_family_id, $father->id] ; |
| 236 | - array_unshift($this->links, ['u'.$p_family_id, $mother->id]); |
|
| 236 | + array_unshift($this->links, ['u' . $p_family_id, $mother->id]); |
|
| 237 | 237 | |
| 238 | 238 | $p_family = Family::find($p_family_id); |
| 239 | 239 | if (isset($p_family->husband_id)) { |
| 240 | - array_unshift($this->family_id, 'mother'.$p_family_id); |
|
| 240 | + array_unshift($this->family_id, 'mother' . $p_family_id); |
|
| 241 | 241 | $p_fatherid = $p_family->husband_id; |
| 242 | 242 | $this->getGraphDataUpward($p_fatherid, $nest + 1); |
| 243 | 243 | } |
| 244 | 244 | if (isset($p_family->wife_id)) { |
| 245 | - array_unshift($this->family_id, 'mother'.$p_family_id); |
|
| 245 | + array_unshift($this->family_id, 'mother' . $p_family_id); |
|
| 246 | 246 | $p_motherid = $p_family->wife_id; |
| 247 | 247 | $this->getGraphDataUpward($p_motherid, $nest + 1); |
| 248 | 248 | } |
@@ -264,10 +264,10 @@ discard block |
||
| 264 | 264 | |
| 265 | 265 | // compose union item and add to unions |
| 266 | 266 | $union = []; |
| 267 | - $union['id'] = 'u'.$family_id; |
|
| 267 | + $union['id'] = 'u' . $family_id; |
|
| 268 | 268 | $union['partner'] = [isset($father->id) ? $father->id : null, isset($mother->id) ? $mother->id : null]; |
| 269 | 269 | $union['children'] = $children_ids; |
| 270 | - $this->unions['u'.$family_id] = $union; |
|
| 270 | + $this->unions['u' . $family_id] = $union; |
|
| 271 | 271 | } |
| 272 | 272 | //get brother/sisters |
| 273 | 273 | $i = 0; |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | { |
| 18 | 18 | parent::boot(); |
| 19 | 19 | |
| 20 | - static::creating(function ($category) { |
|
| 20 | + static::creating(function($category) { |
|
| 21 | 21 | $category->slug = Str::slug($category->name); |
| 22 | 22 | }); |
| 23 | 23 | } |