| @@ -381,7 +381,7 @@ | ||
| 381 | 381 | $_date = null; // string | 
| 382 | 382 | $_plac = null; // \Gedcom\Record\Indi\Even\Plac | 
| 383 | 383 | $_caus = null; // string | 
| 384 | - $_age = null; // string | |
| 384 | + $_age = null; // string | |
| 385 | 385 | $_addr = null; // \Gedcom\Record\Addr | 
| 386 | 386 | $_phon = []; // \Gedcom\Record\Phon | 
| 387 | 387 | $_agnc = null; // string | 
| @@ -67,14 +67,14 @@ | ||
| 67 | 67 | $_group = 'subm'; | 
| 68 | 68 | $_gid = $record->id; | 
| 69 | 69 | |
| 70 | - $note = $subm->getNote(); // array --- | |
| 70 | + $note = $subm->getNote(); // array --- | |
| 71 | 71 | |
| 72 | 72 |          if ($note != null && count($note) > 0) { | 
| 73 | 73 |              foreach ($note as $item) { | 
| 74 | 74 | \FamilyTree365\LaravelGedcom\Utils\Importer\NoteRef::read($conn, $item, $_group, $_gid); | 
| 75 | 75 | } | 
| 76 | 76 | } | 
| 77 | - $obje = $subm->getObje() ?? null; // array --- | |
| 77 | + $obje = $subm->getObje() ?? null; // array --- | |
| 78 | 78 |          if ($obje && count($obje) > 0) { | 
| 79 | 79 |              foreach ($obje as $item) { | 
| 80 | 80 |                  if ($item) { | 
| @@ -18,7 +18,7 @@ | ||
| 18 | 18 | |
| 19 | 19 | // store chan | 
| 20 | 20 | $key = ['group'=>$group, 'gid'=>$group_id, 'date'=>$date, 'time'=>$time]; | 
| 21 | - $data = ['group'=>$group, 'gid'=>$group_id, 'date'=>$date, 'time'=>$time]; | |
| 21 | + $data = ['group'=>$group, 'gid'=>$group_id, 'date'=>$date, 'time'=>$time]; | |
| 22 | 22 | $record = MChan::on($conn)->updateOrCreate($key, $data); | 
| 23 | 23 | |
| 24 | 24 | // store Sources of Note | 
| @@ -53,83 +53,83 @@ discard block | ||
| 53 | 53 | $adop_famc = ''; | 
| 54 | 54 | $birt_famc = ''; | 
| 55 | 55 |                  switch ($class_name) { | 
| 56 | - case 'Adop': | |
| 57 | - $adop = $even->getAdop(); | |
| 58 | - $adop_famc = $even->getFamc(); | |
| 59 | - break; | |
| 60 | - case 'Birt': | |
| 61 | - $birt_famc = $even->getFamc(); | |
| 62 | - break; | |
| 63 | - case 'Bapm': | |
| 64 | - break; | |
| 65 | - case 'Barm': | |
| 66 | - break; | |
| 67 | - case 'Basm': | |
| 68 | - break; | |
| 69 | - case 'Bles': | |
| 70 | - break; | |
| 71 | - case 'Buri': | |
| 72 | - break; | |
| 73 | - case 'Cast': | |
| 74 | - break; | |
| 75 | - case 'Cens': | |
| 76 | - break; | |
| 77 | - case 'Chr': | |
| 78 | - $chr_famc = $even->getFamc(); | |
| 79 | - break; | |
| 80 | - case 'Chra': | |
| 81 | - break; | |
| 82 | - case 'Conf': | |
| 83 | - break; | |
| 84 | - case 'Crem': | |
| 85 | - break; | |
| 86 | - case 'Dscr': | |
| 87 | - break; | |
| 88 | - case 'Deat': | |
| 89 | - break; | |
| 90 | - case 'Educ': | |
| 91 | - break; | |
| 92 | - case 'Emig': | |
| 93 | - break; | |
| 94 | - case 'Fcom': | |
| 95 | - break; | |
| 96 | - case 'Grad': | |
| 97 | - break; | |
| 98 | - case 'Idno': | |
| 99 | - break; | |
| 100 | - case 'Immi': | |
| 101 | - break; | |
| 102 | - case 'Nati': | |
| 103 | - break; | |
| 104 | - case 'Nchi': | |
| 105 | - break; | |
| 106 | - case 'Natu': | |
| 107 | - break; | |
| 108 | - case 'Nmr': | |
| 109 | - break; | |
| 110 | - case 'Occu': | |
| 111 | - break; | |
| 112 | - case 'Ordn': | |
| 113 | - break; | |
| 114 | - case 'Reti': | |
| 115 | - break; | |
| 116 | - case 'Prob': | |
| 117 | - break; | |
| 118 | - case 'Prop': | |
| 119 | - break; | |
| 120 | - case 'Reli': | |
| 121 | - break; | |
| 122 | - case 'Resi': | |
| 123 | - break; | |
| 124 | - case 'Ssn': | |
| 125 | - break; | |
| 126 | - case 'Titl': | |
| 127 | - break; | |
| 128 | - case 'Will': | |
| 129 | - break; | |
| 130 | - case 'Even': | |
| 131 | - break; | |
| 132 | - default: | |
| 56 | + case 'Adop': | |
| 57 | + $adop = $even->getAdop(); | |
| 58 | + $adop_famc = $even->getFamc(); | |
| 59 | + break; | |
| 60 | + case 'Birt': | |
| 61 | + $birt_famc = $even->getFamc(); | |
| 62 | + break; | |
| 63 | + case 'Bapm': | |
| 64 | + break; | |
| 65 | + case 'Barm': | |
| 66 | + break; | |
| 67 | + case 'Basm': | |
| 68 | + break; | |
| 69 | + case 'Bles': | |
| 70 | + break; | |
| 71 | + case 'Buri': | |
| 72 | + break; | |
| 73 | + case 'Cast': | |
| 74 | + break; | |
| 75 | + case 'Cens': | |
| 76 | + break; | |
| 77 | + case 'Chr': | |
| 78 | + $chr_famc = $even->getFamc(); | |
| 79 | + break; | |
| 80 | + case 'Chra': | |
| 81 | + break; | |
| 82 | + case 'Conf': | |
| 83 | + break; | |
| 84 | + case 'Crem': | |
| 85 | + break; | |
| 86 | + case 'Dscr': | |
| 87 | + break; | |
| 88 | + case 'Deat': | |
| 89 | + break; | |
| 90 | + case 'Educ': | |
| 91 | + break; | |
| 92 | + case 'Emig': | |
| 93 | + break; | |
| 94 | + case 'Fcom': | |
| 95 | + break; | |
| 96 | + case 'Grad': | |
| 97 | + break; | |
| 98 | + case 'Idno': | |
| 99 | + break; | |
| 100 | + case 'Immi': | |
| 101 | + break; | |
| 102 | + case 'Nati': | |
| 103 | + break; | |
| 104 | + case 'Nchi': | |
| 105 | + break; | |
| 106 | + case 'Natu': | |
| 107 | + break; | |
| 108 | + case 'Nmr': | |
| 109 | + break; | |
| 110 | + case 'Occu': | |
| 111 | + break; | |
| 112 | + case 'Ordn': | |
| 113 | + break; | |
| 114 | + case 'Reti': | |
| 115 | + break; | |
| 116 | + case 'Prob': | |
| 117 | + break; | |
| 118 | + case 'Prop': | |
| 119 | + break; | |
| 120 | + case 'Reli': | |
| 121 | + break; | |
| 122 | + case 'Resi': | |
| 123 | + break; | |
| 124 | + case 'Ssn': | |
| 125 | + break; | |
| 126 | + case 'Titl': | |
| 127 | + break; | |
| 128 | + case 'Will': | |
| 129 | + break; | |
| 130 | + case 'Even': | |
| 131 | + break; | |
| 132 | + default: | |
| 133 | 133 | } | 
| 134 | 134 | $adop = ''; | 
| 135 | 135 | $adop_famc = ''; | 
| @@ -209,83 +209,83 @@ discard block | ||
| 209 | 209 | $adop_famc = ''; | 
| 210 | 210 | $birt_famc = ''; | 
| 211 | 211 |                  switch ($class_name) { | 
| 212 | - case 'Adop': | |
| 213 | - $adop = $even->getAdop(); | |
| 214 | - $adop_famc = $even->getFamc(); | |
| 215 | - break; | |
| 216 | - case 'Birt': | |
| 217 | - $birt_famc = $even->getFamc(); | |
| 218 | - break; | |
| 219 | - case 'Bapm': | |
| 220 | - break; | |
| 221 | - case 'Barm': | |
| 222 | - break; | |
| 223 | - case 'Basm': | |
| 224 | - break; | |
| 225 | - case 'Bles': | |
| 226 | - break; | |
| 227 | - case 'Buri': | |
| 228 | - break; | |
| 229 | - case 'Cast': | |
| 230 | - break; | |
| 231 | - case 'Cens': | |
| 232 | - break; | |
| 233 | - case 'Chr': | |
| 234 | - $chr_famc = $even->getFamc(); | |
| 235 | - break; | |
| 236 | - case 'Chra': | |
| 237 | - break; | |
| 238 | - case 'Conf': | |
| 239 | - break; | |
| 240 | - case 'Crem': | |
| 241 | - break; | |
| 242 | - case 'Dscr': | |
| 243 | - break; | |
| 244 | - case 'Deat': | |
| 245 | - break; | |
| 246 | - case 'Educ': | |
| 247 | - break; | |
| 248 | - case 'Emig': | |
| 249 | - break; | |
| 250 | - case 'Fcom': | |
| 251 | - break; | |
| 252 | - case 'Grad': | |
| 253 | - break; | |
| 254 | - case 'Idno': | |
| 255 | - break; | |
| 256 | - case 'Immi': | |
| 257 | - break; | |
| 258 | - case 'Nati': | |
| 259 | - break; | |
| 260 | - case 'Nchi': | |
| 261 | - break; | |
| 262 | - case 'Natu': | |
| 263 | - break; | |
| 264 | - case 'Nmr': | |
| 265 | - break; | |
| 266 | - case 'Occu': | |
| 267 | - break; | |
| 268 | - case 'Ordn': | |
| 269 | - break; | |
| 270 | - case 'Reti': | |
| 271 | - break; | |
| 272 | - case 'Prob': | |
| 273 | - break; | |
| 274 | - case 'Prop': | |
| 275 | - break; | |
| 276 | - case 'Reli': | |
| 277 | - break; | |
| 278 | - case 'Resi': | |
| 279 | - break; | |
| 280 | - case 'Ssn': | |
| 281 | - break; | |
| 282 | - case 'Titl': | |
| 283 | - break; | |
| 284 | - case 'Will': | |
| 285 | - break; | |
| 286 | - case 'Even': | |
| 287 | - break; | |
| 288 | - default: | |
| 212 | + case 'Adop': | |
| 213 | + $adop = $even->getAdop(); | |
| 214 | + $adop_famc = $even->getFamc(); | |
| 215 | + break; | |
| 216 | + case 'Birt': | |
| 217 | + $birt_famc = $even->getFamc(); | |
| 218 | + break; | |
| 219 | + case 'Bapm': | |
| 220 | + break; | |
| 221 | + case 'Barm': | |
| 222 | + break; | |
| 223 | + case 'Basm': | |
| 224 | + break; | |
| 225 | + case 'Bles': | |
| 226 | + break; | |
| 227 | + case 'Buri': | |
| 228 | + break; | |
| 229 | + case 'Cast': | |
| 230 | + break; | |
| 231 | + case 'Cens': | |
| 232 | + break; | |
| 233 | + case 'Chr': | |
| 234 | + $chr_famc = $even->getFamc(); | |
| 235 | + break; | |
| 236 | + case 'Chra': | |
| 237 | + break; | |
| 238 | + case 'Conf': | |
| 239 | + break; | |
| 240 | + case 'Crem': | |
| 241 | + break; | |
| 242 | + case 'Dscr': | |
| 243 | + break; | |
| 244 | + case 'Deat': | |
| 245 | + break; | |
| 246 | + case 'Educ': | |
| 247 | + break; | |
| 248 | + case 'Emig': | |
| 249 | + break; | |
| 250 | + case 'Fcom': | |
| 251 | + break; | |
| 252 | + case 'Grad': | |
| 253 | + break; | |
| 254 | + case 'Idno': | |
| 255 | + break; | |
| 256 | + case 'Immi': | |
| 257 | + break; | |
| 258 | + case 'Nati': | |
| 259 | + break; | |
| 260 | + case 'Nchi': | |
| 261 | + break; | |
| 262 | + case 'Natu': | |
| 263 | + break; | |
| 264 | + case 'Nmr': | |
| 265 | + break; | |
| 266 | + case 'Occu': | |
| 267 | + break; | |
| 268 | + case 'Ordn': | |
| 269 | + break; | |
| 270 | + case 'Reti': | |
| 271 | + break; | |
| 272 | + case 'Prob': | |
| 273 | + break; | |
| 274 | + case 'Prop': | |
| 275 | + break; | |
| 276 | + case 'Reli': | |
| 277 | + break; | |
| 278 | + case 'Resi': | |
| 279 | + break; | |
| 280 | + case 'Ssn': | |
| 281 | + break; | |
| 282 | + case 'Titl': | |
| 283 | + break; | |
| 284 | + case 'Will': | |
| 285 | + break; | |
| 286 | + case 'Even': | |
| 287 | + break; | |
| 288 | + default: | |
| 289 | 289 | } | 
| 290 | 290 | $adop = ''; | 
| 291 | 291 | $adop_famc = ''; | 
| @@ -166,8 +166,8 @@ | ||
| 166 | 166 | 'age' => $age, // | 
| 167 | 167 | 'agnc' => $agnc, // | 
| 168 | 168 | 'adop' => $adop, // | 
| 169 | - 'adop_famc' => $adop_famc, // | |
| 170 | - 'birt_famc' => $birt_famc, // | |
| 169 | + 'adop_famc' => $adop_famc, // | |
| 170 | + 'birt_famc' => $birt_famc, // | |
| 171 | 171 | ]; | 
| 172 | 172 | |
| 173 | 173 | $eventData[] = $data; | 
| @@ -32,7 +32,7 @@ | ||
| 32 | 32 | $_group = 'subn'; | 
| 33 | 33 | $_gid = $record->id; | 
| 34 | 34 | |
| 35 | - $note = $subn->getNote(); // array --- | |
| 35 | + $note = $subn->getNote(); // array --- | |
| 36 | 36 | |
| 37 | 37 |          if ($note != null && count($note) > 0) { | 
| 38 | 38 |              foreach ($note as $item) { | 
| @@ -84,8 +84,8 @@ | ||
| 84 | 84 | } | 
| 85 | 85 | |
| 86 | 86 | // array value | 
| 87 | - $fams = $individual->getFams(); // self family, leave it now, note would be included in family | |
| 88 | - $famc = $individual->getFamc(); // parent family , leave it now, note and pedi would be included in family | |
| 87 | + $fams = $individual->getFams(); // self family, leave it now, note would be included in family | |
| 88 | + $famc = $individual->getFamc(); // parent family , leave it now, note and pedi would be included in family | |
| 89 | 89 | |
| 90 | 90 | // added to database | 
| 91 | 91 | // string value | 
| @@ -74,8 +74,8 @@ | ||
| 74 | 74 | } | 
| 75 | 75 | |
| 76 | 76 | // array value | 
| 77 | - $fams = $individual->getFams(); // self family, leave it now, note would be included in family | |
| 78 | - $famc = $individual->getFamc(); // parent family , leave it now, note and pedi would be included in family | |
| 77 | + $fams = $individual->getFams(); // self family, leave it now, note would be included in family | |
| 78 | + $famc = $individual->getFamc(); // parent family , leave it now, note and pedi would be included in family | |
| 79 | 79 | |
| 80 | 80 | // added to database | 
| 81 | 81 | // string value | 
| @@ -13,7 +13,7 @@ | ||
| 13 | 13 | GedcomImporter::class, | 
| 14 | 14 | ]); | 
| 15 | 15 | |
| 16 | -        $this->app->bind('FamilyTree365/laravel-gedcom:parser', function () { | |
| 16 | +        $this->app->bind('FamilyTree365/laravel-gedcom:parser', function() { | |
| 17 | 17 | return new GedcomParser(); | 
| 18 | 18 | }); | 
| 19 | 19 | } | 
| @@ -22,7 +22,7 @@ | ||
| 22 | 22 | public function definition() | 
| 23 | 23 |      { | 
| 24 | 24 | return [ | 
| 25 | -            'group' => $this->faker->word(), 'gid' => $this->faker->randomElement('1', '2'), 'subm' => $this->faker->word(), , 'created_at', 'updated_at', | |
| 25 | +            'group' => $this->faker->word(), 'gid' => $this->faker->randomElement('1', '2'), 'subm' => $this->faker->word(),, 'created_at', 'updated_at', | |
| 26 | 26 | ]; | 
| 27 | 27 | } | 
| 28 | 28 | } |