Changeset 1797 for trunk

Timestamp:

06/28/16 13:30:02 (8 years ago)

Author:

nanardon

Message:

Show account active using status

Location:

trunk/LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Controller/Json/AccAge.pm (modified) (3 diffs)
• root/html/summary/accage/index.tt (modified) (2 diffs)

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

@@ -32 +32 @@
     };
 
-    my $sortattr = $c->req->param('sort') || 'active';;
+    my $sortattr = $c->req->param('sort') || 'status';;
     my $inactive = $c->req->param('inactive');
 
@@ -45 +45 @@
             $exists{$_} or next;
         }
-        my $s = $sortattr eq 'active'
-            ? ($exists{$_} ? 'active' : 'inactive')
-            : $sort{$_}[0];
+        my $s = $sort{$_}[0];
         $sortl{$s} = 1;
     }
@@ -60 +58 @@
             $date or next;
             $date =~ s/-.*//;
-            my $status = $sortattr eq 'active'
-                ? ($exists{$user} ? 'active' : 'inactive')
-                : $sort{$user}[0];
+            my $status = $sort{$user}[0];
 
             $status ||= '(none)';

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

@@ -2 +2 @@
 <label for=sort>Trier par</label>
 <select name="sort">
-<option value=active
+<option value=status
     [% "selected" IF c.req.param('sort') == 'active' %]>[% l('Active/Non active') | html %]</option>
 <option value=department
@@ -48 +48 @@
                 seriesDefaults: {
                     renderer: $.jqplot.BarRenderer,
-                    lineWidth: 2,
+                    lineWidth: 1,
                     pointLabels: {show: true},
                     rendererOptions: {
                         padding: 1,
-                        sliceMargin: 2,
+                        sliceMargin: 1,
                         showDataLabels: true,
                         smooth: true,
-                        barPadding: 8,
+                        barPadding: 1,
                     },
                     //markerOptions:{style:'square'}