diff --git a/src/app.php b/src/app.php index 1933e8d..a7b6054 100644 --- a/src/app.php +++ b/src/app.php @@ -29,9 +29,57 @@ $app['twig'] = $app->extend('twig', function ($twig, $app) { } $out .= ""; return $out; - }); - $twig->addFunction($displayRatio); - return $twig; + }); + + $displayTotal = new Twig_Function('displayTotal', function($rec) { + + $r_k = $rec['eb_r_k'] + $rec['rh_r_k'] + $rec['bh_r_k'] + $rec['gh_r_k']; + $r_d = $rec['eb_r_d'] + $rec['rh_r_d'] + $rec['bh_r_d'] + $rec['gh_r_d']; + + $b_k = $rec['eb_b_k'] + $rec['rh_b_k'] + $rec['bh_b_k'] + $rec['gh_b_k']; + $b_d = $rec['eb_b_d'] + $rec['rh_b_d'] + $rec['bh_b_d'] + $rec['gh_b_d']; + + $g_k = $rec['eg_g_k'] + $rec['rh_g_k'] + $rec['bh_g_k'] + $rec['gh_g_k']; + $g_d = $rec['eg_g_d'] + $rec['rh_g_d'] + $rec['bh_g_d'] + $rec['gh_g_d']; + + $out = "1)?"s":""; + $sd = ($r_d>1)?"s":""; + $out .= "aria-label='".$r_k." kill".$sk." | ".$r_d." death".$sd."'>".round($r_k/$r_d, 2); + } + $out .= " / "; + + + $out .= "1)?"s":""; + $sd = ($b_d>1)?"s":""; + $out .= "aria-label='".$b_k." kill".$sk." | ".$b_d." death".$sd."'>".round($b_k/$b_d, 2); + } + $out .= " / "; + + $out .= "1)?"s":""; + $sd = ($g_d>1)?"s":""; + $out .= "aria-label='".$g_k." kill".$sk." | ".$g_d." death".$sd."'>".round($g_k/$g_d, 2); + } + $out .= ""; + + + return $out; + }); + + $twig->addFunction($displayRatio); + $twig->addFunction($displayTotal); + return $twig; }); return $app; diff --git a/src/controllers.php b/src/controllers.php index 138977b..a905a48 100644 --- a/src/controllers.php +++ b/src/controllers.php @@ -15,9 +15,14 @@ $app->get('/', function () use ($app) { 'path' => $app['db_config']['path'], ), )); + $sql = "SELECT * FROM ".$app['db_config']['diff_table'].""; $diffs = $app['db']->fetchAll($sql); - return $app['twig']->render('index.html.twig', array("diffs" => $diffs)); + + $sql_rec = "SELECT * FROM ".$app['db_config']['records_table']." ORDER BY date DESC LIMIT 1"; + $record = $app['db']->fetchAll($sql_rec); + + return $app['twig']->render('index.html.twig', array("diffs" => $diffs, "record" => $record)); }) ->bind('homepage') ; diff --git a/templates/index.html.twig b/templates/index.html.twig index 8b18598..9291035 100644 --- a/templates/index.html.twig +++ b/templates/index.html.twig @@ -9,7 +9,7 @@