@@ -416,7 +416,7 @@ discard block |
||
416 | 416 | $html = sprintf('<div id="childarrow"><a href="#" class="menuselect %s"></a><div id="childbox-pedigree">', $this->arrows->menu); |
417 | 417 | |
418 | 418 | foreach ($families as $family) { |
419 | - $html .= '<span class="name1">' . I18N::translate('Family') . '</span>'; |
|
419 | + $html .= '<span class="name1">' . I18N::translate('Family') . '</span>'; |
|
420 | 420 | $spouse = $family->getSpouse($root); |
421 | 421 | if ($spouse) { |
422 | 422 | $html .= '<a class="name1" href="' . e($this->chartUrl($spouse, ['generations' => $generations, 'orientation' => $orientation])) . '">' . $spouse->getFullName() . '</a>'; |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | $html = ''; |
463 | 463 | if ($chart_has_ancestors) { |
464 | 464 | if ($this->nodes[$index]['indi'] && $this->nodes[$index]['indi']->getChildFamilies()) { |
465 | - $html .= '<div class="ancestorarrow">'; |
|
465 | + $html .= '<div class="ancestorarrow">'; |
|
466 | 466 | $rootParentId = 1; |
467 | 467 | if ($index > (int) ($this->treesize / 2) + (int) ($this->treesize / 4)) { |
468 | 468 | $rootParentId++; |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | 'generations' => 3, |
96 | 96 | 'layout' => PedigreeChartModule::PORTRAIT, |
97 | 97 | ]); |
98 | - $content = view('modules/charts/chart', [ |
|
98 | + $content = view('modules/charts/chart', [ |
|
99 | 99 | 'block_id' => $block_id, |
100 | 100 | 'chart_url' => $chart_url, |
101 | 101 | ]); |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | 'generations' => 2, |
111 | 111 | 'chart_style' => DescendancyChartModule::CHART_STYLE_LIST, |
112 | 112 | ]); |
113 | - $content = view('modules/charts/chart', [ |
|
113 | + $content = view('modules/charts/chart', [ |
|
114 | 114 | 'block_id' => $block_id, |
115 | 115 | 'chart_url' => $chart_url, |
116 | 116 | ]); |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | 'ajax' => true, |
125 | 125 | 'generations' => 2, |
126 | 126 | ]); |
127 | - $content = view('modules/charts/chart', [ |
|
127 | + $content = view('modules/charts/chart', [ |
|
128 | 128 | 'block_id' => $block_id, |
129 | 129 | 'chart_url' => $chart_url, |
130 | 130 | ]); |
@@ -103,11 +103,11 @@ |
||
103 | 103 | $record = GedcomRecord::getInstance('HEAD', $tree); |
104 | 104 | $fact = $record->getFirstFact('COPR'); |
105 | 105 | if ($fact instanceof Fact) { |
106 | - $COPR = "\n1 COPR " .$fact->value(); |
|
106 | + $COPR = "\n1 COPR " . $fact->value(); |
|
107 | 107 | } |
108 | - $fact = $record->getFirstFact('LANG'); |
|
108 | + $fact = $record->getFirstFact('LANG'); |
|
109 | 109 | if ($fact instanceof Fact) { |
110 | - $LANG = "\n1 LANG " .$fact->value(); |
|
110 | + $LANG = "\n1 LANG " . $fact->value(); |
|
111 | 111 | } |
112 | 112 | // Link to actual SUBM/SUBN records, if they exist |
113 | 113 | $subn = DB::table('other') |
@@ -52,7 +52,7 @@ |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | // Did we emigrate or naturalise? |
55 | - foreach ($individual->facts(['IMMI' ,'EMIG', 'NATU'], true) as $fact) { |
|
55 | + foreach ($individual->facts(['IMMI', 'EMIG', 'NATU'], true) as $fact) { |
|
56 | 56 | if (Date::compare($fact->date(), $this->date()) <= 0) { |
57 | 57 | $place = $fact->place()->gedcomName(); |
58 | 58 | } |
@@ -49,7 +49,7 @@ |
||
49 | 49 | $color_from = $color_from ?? $chart_color1; |
50 | 50 | $color_to = $color_to ?? $chart_color2; |
51 | 51 | |
52 | - $sizes = explode('x', $size); |
|
52 | + $sizes = explode('x', $size); |
|
53 | 53 | |
54 | 54 | if ($tot_indi === 0) { |
55 | 55 | return ''; |
@@ -135,7 +135,7 @@ |
||
135 | 135 | $decades .= '|' . I18N::number($i); |
136 | 136 | } |
137 | 137 | |
138 | - $chxl .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|'; |
|
138 | + $chxl .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|'; |
|
139 | 139 | $title = I18N::translate('Average age related to death century'); |
140 | 140 | |
141 | 141 | if (\count($rows) > 6 || mb_strlen($title) < 30) { |
@@ -65,11 +65,11 @@ discard block |
||
65 | 65 | ->on('birth.d_file', '=', 'i_file') |
66 | 66 | ->on('birth.d_gid', '=', 'i_id'); |
67 | 67 | }) |
68 | - ->join('dates AS death', function (JoinClause $join): void { |
|
69 | - $join |
|
68 | + ->join('dates AS death', function (JoinClause $join): void { |
|
69 | + $join |
|
70 | 70 | ->on('death.d_file', '=', 'i_file') |
71 | 71 | ->on('death.d_gid', '=', 'i_id'); |
72 | - }) |
|
72 | + }) |
|
73 | 73 | ->where('i_file', '=', $this->tree->id()) |
74 | 74 | ->where('birth.d_fact', '=', 'BIRT') |
75 | 75 | ->where('death.d_fact', '=', 'DEAT') |
@@ -162,10 +162,10 @@ discard block |
||
162 | 162 | } |
163 | 163 | |
164 | 164 | $chart_url = 'https://chart.googleapis.com/chart?cht=bvg&chs=' . $sizes[0] . 'x' . $sizes[1] |
165 | - . '&chm=D,FF0000,2,0,3,1|N*f1*,000000,0,-1,11,1|N*f1*,000000,1,-1,11,1&chf=bg,s,ffffff00|c,s,ffffff00&chtt=' |
|
166 | - . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl=' |
|
167 | - . rawurlencode($chxl) . '&chdl=' |
|
168 | - . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death')); |
|
165 | + . '&chm=D,FF0000,2,0,3,1|N*f1*,000000,0,-1,11,1|N*f1*,000000,1,-1,11,1&chf=bg,s,ffffff00|c,s,ffffff00&chtt=' |
|
166 | + . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl=' |
|
167 | + . rawurlencode($chxl) . '&chdl=' |
|
168 | + . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death')); |
|
169 | 169 | |
170 | 170 | return view( |
171 | 171 | 'statistics/other/chart-google', |
@@ -2591,7 +2591,7 @@ |
||
2591 | 2591 | /** @var ModuleBlockInterface $module */ |
2592 | 2592 | $module = $this->module_service |
2593 | 2593 | ->findByComponent('block', $this->tree, Auth::user()) |
2594 | - ->filter(function (ModuleInterface $module) use ($block): bool { |
|
2594 | + ->filter(function (ModuleInterface $module) use ($block) : bool { |
|
2595 | 2595 | return $module->name() === $block && $module->name() !== 'html'; |
2596 | 2596 | }) |
2597 | 2597 | ->first(); |
@@ -241,7 +241,7 @@ |
||
241 | 241 | echo '<table cellspacing="0" cellpadding="0" border="0" >'; |
242 | 242 | foreach ($children as $i => $child) { |
243 | 243 | echo '<tr><td>'; |
244 | - $kids = $this->printDescendency($generation + 1, $child); |
|
244 | + $kids = $this->printDescendency($generation + 1, $child); |
|
245 | 245 | $numkids += $kids; |
246 | 246 | echo '</td>'; |
247 | 247 | // Print the lines |
@@ -256,7 +256,7 @@ |
||
256 | 256 | |
257 | 257 | // Create a source, to indicate the source of the data. |
258 | 258 | $filetext .= "0 @WEBTREES@ SOUR\n1 TITL " . WT_BASE_URL . "\n"; |
259 | - $author = $this->user_service->find((int) $tree->getPreference('CONTACT_USER_ID')); |
|
259 | + $author = $this->user_service->find((int) $tree->getPreference('CONTACT_USER_ID')); |
|
260 | 260 | if ($author !== null) { |
261 | 261 | $filetext .= '1 AUTH ' . $author->realName() . "\n"; |
262 | 262 | } |