@@ -2579,7 +2579,7 @@ |
||
2579 | 2579 | { |
2580 | 2580 | /** @var ModuleBlockInterface $module */ |
2581 | 2581 | $module = Module::findByComponent('block', $this->tree, Auth::user()) |
2582 | - ->filter(function (ModuleInterface $module) use ($block): bool { |
|
2582 | + ->filter(function (ModuleInterface $module) use ($block) : bool { |
|
2583 | 2583 | return $module->name() === $block && $module->name() !== 'html'; |
2584 | 2584 | }) |
2585 | 2585 | ->first(); |
@@ -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 ''; |
@@ -153,10 +153,10 @@ |
||
153 | 153 | } |
154 | 154 | |
155 | 155 | $chart_url = 'https://chart.googleapis.com/chart?cht=bvg&chs=' . $sizes[0] . 'x' . $sizes[1] |
156 | - . '&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=' |
|
157 | - . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl=' |
|
158 | - . rawurlencode($chxl) . '&chdl=' |
|
159 | - . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death')); |
|
156 | + . '&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=' |
|
157 | + . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl=' |
|
158 | + . rawurlencode($chxl) . '&chdl=' |
|
159 | + . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death')); |
|
160 | 160 | |
161 | 161 | return view( |
162 | 162 | 'statistics/other/chart-google', |
@@ -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) { |
@@ -236,10 +236,10 @@ |
||
236 | 236 | } |
237 | 237 | |
238 | 238 | /** |
239 | - * A list of common marriage places. |
|
240 | - * |
|
241 | - * @return string |
|
242 | - */ |
|
239 | + * A list of common marriage places. |
|
240 | + * |
|
241 | + * @return string |
|
242 | + */ |
|
243 | 243 | public function commonMarriagePlacesList(): string |
244 | 244 | { |
245 | 245 | $places = $this->queryFactPlaces('MARR', 'FAM'); |
@@ -231,7 +231,7 @@ |
||
231 | 231 | */ |
232 | 232 | public function commonDeathPlacesList(): string |
233 | 233 | { |
234 | - $places = $this->queryFactPlaces('DEAT','INDI'); |
|
234 | + $places = $this->queryFactPlaces('DEAT', 'INDI'); |
|
235 | 235 | return $this->renderTop10($places); |
236 | 236 | } |
237 | 237 |
@@ -479,7 +479,7 @@ |
||
479 | 479 | 'age' => $age, |
480 | 480 | ]; |
481 | 481 | |
482 | - $dist[] = $fam->family; |
|
482 | + $dist[] = $fam->family; |
|
483 | 483 | } |
484 | 484 | } elseif (!$one && $child1->canShow() && $child2->canShow()) { |
485 | 485 | $top10[] = [ |