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

Timestamp:

02/12/16 02:45:46 (8 years ago)

Author:

nanardon

Message:

Stat by employment can be done over user's attributes

File:

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

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

@@ -34 +34 @@
 
     my $key = $c->req->param('key') || 'department';
+    my @filter = $c->req->param('filter');
+
+    my $keyobj = $key =~ m/^(company|department|contratType|manager)$/
+        ? 'employment'
+        : 'user';
+
+    my $filterobj = @filter[0] =~ m/^(company|department|contratType|manager)=/
+        ? 'employment'
+        : 'user';
 
     my %end = $base->attributes_summary_by_object('employment', 'lastday');
     my %start = $base->attributes_summary_by_object('employment', 'firstday');
-    my %keys = $base->attributes_summary_by_object('employment', $key);
+    my %empusers = $base->attributes_summary_by_object('employment', 'user');
+    my %keys = $base->attributes_summary_by_object($keyobj, $key);
+
+    my %filteredObj = map { $_ => 1 } $base->search_objects($filterobj, @filter);
 
     my %keysentry;
@@ -44 +56 @@
         next if ($end{$emp}[0] && $end{$emp}[0] lt $now);
 
+        if ($filterobj eq 'user') {
+            $filteredObj{ $empusers{$emp}[0] } or next;
+        } else {
+            $filteredObj{ $emp } or next;
+        }
+ 
+        my $keyvalues = $keyobj eq 'user'
+            ? $keys{ $empusers{$emp}[0] }
+            : $keys {$emp};
+
         $employments{ $emp } = {
            start => $start{$emp}[0],
            end   => $end  {$emp}[0],
-           key   => $keys {$emp}[0],
+           key   => $keyvalues,
        };
-       $keysentry{$keys {$emp}[0] || $c->loc('(none)') } = [];
+       $keysentry{ $keyvalues->[0] || $c->loc('(none)') } = [];
     }
 
@@ -82 +104 @@
             #warn "$cemp $emp" . $employments{$cemp}->{start} . " " . $employments{$cemp}->{end} ;
             if ($employments{$cemp}->{start} le $emp && ((!$employments{$cemp}->{end}) || $employments{$cemp}->{end} ge $emp)) {
-                my $k = $employments{$cemp}->{key} || $c->loc('(none)');
-                $sum{$k} ++;
+                foreach my $k (@{ $employments{$cemp}->{key} || [ $c->loc('(none)') ] }) {
+                    $sum{$k} ++;
+                }
             }
         }