Changeset 1769 for trunk

Timestamp:

05/16/16 14:03:49 (8 years ago)

Author:

nanardon

Message:

Permettre le graph des status passé

Location:

trunk/LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm (modified) (4 diffs)
• root/html/summary/employment/index.tt (modified) (2 diffs)

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

@@ -32 +32 @@
     my %employments;
     my $now = DateTime->now->ymd;
+    my $past = $c->req->param('past');
 
     my $key = $c->req->param('key') || 'department';
@@ -53 +54 @@
     my %keysentry;
     foreach my $emp (keys %start) {
-        # We filter pasted employment
-        next if ($end{$emp}[0] && $end{$emp}[0] lt $now);
+        if (!$past) {
+            # We filter pasted employment
+            next if ($end{$emp}[0] && $end{$emp}[0] lt $now);
+        }
 
         if ($filterobj eq 'user') {
@@ -80 +83 @@
     foreach (map { $employments{$_}->{start}  }
              grep { $employments{$_}->{start} } (keys %employments)) {
-             $_ gt $now or next;
+             if (!$past) {
+                $_ gt $now or next;
+             }
              my $dt = DateTime->from_epoch( epoch => str2time($_));
              $dt->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
@@ -88 +93 @@
     foreach (map { $employments{$_}->{end}  }
              grep { $employments{$_}->{end} } (keys %employments)) {
-             $_ gt $now or next;
+             if (!$past) {
+                $_ gt $now or next;
+             }
              my $dt = DateTime->from_epoch( epoch => str2time($_));
              $dt->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );

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

@@ -13 +13 @@
 <input name=filter value=[% c.req.param('filter') | html %]>
 <br>
-<input name=stacked type=checkbox value=on [% 'checked' IF c.req.param('stacked') %]>
+<input name=past type=checkbox value=on id=past [% 'checked' IF c.req.param('past') %]>
+<label for=past>Afficher les dates passées</label>
+<br>
+<input name=stacked id=stacked type=checkbox value=on [% 'checked' IF c.req.param('stacked') %]>
 <label for=stacked>[% l('Stacked') %]</label>
 <input type=submit>
@@ -29 +32 @@
       //async: false,
       url: "[% c.uri_for('/json/employment', {
-            key => c.req.param('key'), filter
-            => c.req.param('filter')
+            key => c.req.param('key'), 
+            filter => c.req.param('filter')
+            past => c.req.param('past')
         }) %]",
       dataType:"json",