Changeset 1939 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Tree.pm

Timestamp:

01/24/17 16:27:08 (7 years ago)

Author:

nanardon

Message:

A real chart for poeple

File:

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

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

@@ -29 +29 @@
     my %users = map { $_ => 1 } $base->search_objects('user', 'active=1', 'givenName=*');
     my %dpmts = map { $_ => 1 } $base->search_objects('group', 'sutype=dpmt');
-    my %userdpmt = $base->attributes_summary_by_object('user', 'department');
     my %dpmtmanager = $base->attributes_summary_by_object('group', 'managedBy');
     my %usermanager = $base->attributes_summary_by_object('user', 'managerContact');
+    my %dpmtuser    = $base->attributes_summary_by_object('user', 'department');
 
     my %nodes;
@@ -40 +40 @@
 
     foreach my $user (keys %users) {
+        my $ouser = $base->get_object('user', $user);
         push(@{ $data->{nodes} }, {
-                "name" => $user,
-                label => $user,
+                "name" => $ouser->id,
+                label => $ouser->get_attributes('displayName'),
         });
-        $nodes{$user} = $#{ $data->{nodes} };
+        $nodes{$ouser->id} = $#{ $data->{nodes} };
     }
-    push(@{ $data->{nodes} }, {
-            "name" => '-direction',
-            label => 'Direction',
-        });
-    $nodes{'-direction'} = $#{ $data->{nodes} };
 
-    foreach my $user (keys %dpmts) {
-        push(@{ $data->{nodes} }, {
-                "name" => '-' . $user,
-                label => $user,
-        });
-        $nodes{'-' . $user} = $#{ $data->{nodes} };
+    foreach my $user (keys %users) {
+        my $manager = $usermanager{$user}->[0] ||
+            $dpmtmanager { $dpmtuser{ $user }->[0] }->[0] or next;
+
+        if (!$nodes{$manager}) {
+            my $ouser = $base->get_object('user', $manager);
+            $nodes{$manager} = $nodes{$ouser->id};
+        }
+        $nodes{$manager} or next;
+
         push(@{ $data->{links} },
             {
-                "source" => $nodes{'-' . $user},
-                "target" => $nodes{'-direction'},
-                color => 'red',
+                "source" => $nodes{$user},
+                "target" => $nodes{$manager},
             }
         );
@@ -68 +67 @@
     }
 
-    
-    foreach my $user (keys %users) {
-
-        if (my $dpmt = $userdpmt{$user}) {
-            push(@{ $data->{links} },
-                {
-                    "source" => $nodes{$user},
-                    "target" => $nodes{'-' . $dpmt->[0]},
-                }
-            ) if ($dpmt->[0]);
-        }
-        if (my $manag = $usermanager{$user}) {
-            my $target = $manag->[0];
-            push(@{ $data->{links} },
-                {
-                    "source" => $nodes{$user},
-                    "target" => $nodes{$target},
-                }
-            ) if ($target);
-        }
-
-
-    }
-    
     $c->stash->{data} = $data;
 }