Changeset 1711 for trunk

Timestamp:

02/05/16 17:24:25 (8 years ago)

Author:

nanardon

Message:

More feature on accage page

Location:

trunk/LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Controller/Json/AccAge.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Web/Controller/Json/AccAgeContrat.pm (deleted)
• lib/LATMOS/Accounts/Web/Controller/Summary/AccAge.pm (modified) (1 diff)
• root/html/summary/accage/index.tt (modified) (1 diff)

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

@@ -32 +32 @@
     };
 
+    my $sortattr = $c->req->param('sort') || 'active';;
+    my $inactive = $c->req->param('inactive');
+
     my %exists = map { $_ => 1 } $base->search_objects('user', 'active=1');
     my %create = $base->attributes_summary_by_object('user', 'create');
+    my %sort = $base->attributes_summary_by_object('user', $sortattr);
+
+    my %sortl;
+
+    foreach (keys %sort) {
+        my $s = $sortattr eq 'active'
+            ? ($exists{$_} ? 'active' : 'inactive')
+            : $sort{$_}[0];
+        $sortl{$s} = 1;
+    }
+    $sort{'(none)'} = 1;
     
     my %dates;
     foreach my $user (keys %create) {
-        foreach (@{ $create{$user} }) {
-            $_ or next;
-            if ($c->req->query_keywords eq 'month') {
-                $_ =~ s/^(\d+-\d+).*/$1-15/;
-            } else {
-                $_ =~ s/^(\d+).*/$1-06-30/;
-            }
-            my $status = $exists{$user} ? 'active' : 'inactive';
-            $dates{active}{$_} ||= 0;
-            $dates{inactive}{$_} ||= 0;
-            $dates{$status}{$_} ++;
+        if (!$c->req->param('inactive')) {
+            $exists{$user} or next;
+        }
+        foreach my $date (@{ $create{$user} }) {
+            $date or next;
+            $date =~ s/-.*//;
+            my $status = $sortattr eq 'active'
+                ? ($exists{$user} ? 'active' : 'inactive')
+                : $sort{$user}[0];
+
+            $status ||= '(none)';
+
+            $dates{$_}{$date} ||= 0 foreach(keys %sortl);
+            $dates{$status}{$date} ++;
+
+            $sortl{$status} = 1;
         }
     }
 
-    foreach my $status ('active', 'inactive') {
+    foreach my $status (sort keys %sortl) {
         push(@{ $graph->{data} }, [ map { [ $_, $dates{$status}{$_} +0 ] } sort { $a cmp $b } keys %{ $dates{$status} } ]);
         push(@{ $graph->{series} }, { label => $status });

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Summary/AccAge.pm

@@ -25 +25 @@
     my ( $self, $c ) = @_;
 
-    $c->stash->{jsonurl} ||= $c->uri_for('/json/accage') . '?' . $c->req->query_keywords;
+    $c->stash->{jsonurl} ||= $c->uri_for('/json/accage', $c->req->params);
 }
 

trunk/LATMOS-Accounts-Web/root/html/summary/accage/index.tt

@@ -1 @@
-
+<form action="[% c.uri_for('/summary', 'accage' ) %]">
+<label for=sort>Trier par</label>
+<select name="sort">
+<option value=active
+    [% "selected" IF c.req.param('sort') == 'active' %]>[% l('Active/Non active') | html %]</option>
+<option value=department
+    [% "selected" IF c.req.param('sort') == 'department' %]>[% l('Department') | html %]</option>
+<option value=contratType
+    [% "selected" IF c.req.param('sort') == 'contratType' %]>[% l('Status') | html %]</option>
+</select>
+<br>
+<input name=inactive type=checkbox value=on [% 'checked' IF c.req.param('inactive') %]>
+<label for=inactive>[% l('Show inactive accounts') %]</label>
+<br>
+<input type=submit>
+</form>
 <script>
 $(document).ready(function(){