diff --git a/php/classes/AmdaStats.php b/php/classes/AmdaStats.php index 65ab9ae..5b114fd 100644 --- a/php/classes/AmdaStats.php +++ b/php/classes/AmdaStats.php @@ -254,29 +254,42 @@ class AmdaStats { $GENERALarray = array(); arsort($TOTALarray); - + + $Ntotal = 0; + foreach ($TOTALarray as $key => $value) { $viStart = $STARTarray[$key]; $viStop = $STOParray[$key]; $plot = $VIarray['plot'][$key]; $mining = $VIarray['mining'][$key]; $print = $VIarray['print'][$key]; + $stat = $VIarray['statistics'][$key]; if ($key != 'undefined') { - $GENERALarray[] = array('id' => $key, 'number' => $value, + $GENERALarray[] = array('id' => $key, 'number' => $value, 'percent' => $value, 'plot' => $plot, 'mining' => $mining, - 'print' => $print, 'start' => $viStart, - 'stop' => $viStop); + 'print' => $print,'statistics' => $stat, + 'start' => $viStart, 'stop' => $viStop); + + $Ntotal += $value; } - } - } + } + + $Ntotal /= 100; + foreach ($GENERALarray as &$elem) { + $elem['percent'] = round($elem['percent'] / $Ntotal, 2); + } + + } + $Nmax = count($GENERALarray); $length = $index + 20 > $Nmax ? $Nmax - $index + 1 : 20; $objToReturn = array('stats' => array_reverse(array_slice($GENERALarray, $index, $length))); file_put_contents(DATAPATH.'Statistics/data.json',json_encode($GENERALarray)); + // $objToReturn = array('stats' => $GENERALarray); return $objToReturn; } -- libgit2 0.21.2