Changeset 1901 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller

Timestamp:

01/03/17 15:35:16 (8 years ago)

Author:

nanardon

Message:

Ensure stat are reset to 0 when display graph

File:

• trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Stat.pm (modified) (2 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Stat.pm

@@ -46 +46 @@
     my $res = $ostat->compute or return;
 
+    my $nowdate = POSIX::strftime('%Y-%m-%d %H:%M', localtime);
+    foreach my $val (sort keys %$res) {
+        $data->{$nowdate}{$val} = $res->{$val} + 0;
+    }
+
     my $graph = {
         series => [],
@@ -53 +58 @@
     my %lines;
 
-    foreach my $date (sort keys %$data) {
+    my @dates = sort keys %$data;
+
+    for (my $i = 0; $i < $#dates; $i++) {
+        my $date = $dates[$i];
+
+        if ($i >= 1) {
+            my $tdate = $dates[$i - 1];
+            foreach my $val (sort keys %{ $data->{$tdate} }) {
+                $data->{$tdate}{$val} or next;
+                $data->{$date}{$val} ||= 0;
+            }
+        }
+        if ($i < $#dates) {
+            my $tdate = $dates[$i + 1];
+            foreach my $val (sort keys %{ $data->{$tdate} }) {
+                $data->{$tdate}{$val} or next;
+                $data->{$date}{$val} ||= 0;
+            }
+        }
         foreach my $val (sort keys %{ $data->{$date} }) {
             $res->{ $val } ||= 0;
             push(@{ $lines{$val} }, [ $date, $data->{$date}{$val} + 0 ]);
         }
-    }
-
-    my $date = POSIX::strftime('%Y-%m-%d %H:%M', localtime);
-    foreach my $val (sort keys %$res) {
-        push(@{ $lines{$val} }, [ $date , $res->{$val} + 0 ]);
     }