fisharebest /
webtrees
@@ -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', |
