Changeset 1939

Timestamp:

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

Author:

nanardon

Message:

A real chart for poeple

Location:

trunk/LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Controller/Json/Tree.pm (modified) (3 diffs)
• root/html/includes/wrapper.tt (modified) (1 diff)
• root/html/summary/departments/index.tt (modified) (1 diff)
• root/static/js/jquery/jquery.orgchart.css (added)
• root/static/js/jquery/jquery.orgchart.js (added)

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;
 }

trunk/LATMOS-Accounts-Web/root/html/includes/wrapper.tt

@@ -32 +32 @@
 <script src="[% c.uri_for('/static', 'js', 'd3', 'd3.v3.js') %]"></script>
 <script src="[% c.uri_for('/static', 'js', 'timeline', 'timeframe.js') %]"></script>
+<script src="[% c.uri_for('/static', 'js', 'jquery', 'jquery.orgchart.js') %]"></script>
+<link rel="stylesheet" href="[% c.uri_for('/static/js/jquery/jquery.orgchart.css') %]" type="text/css">
 
 <link rel="stylesheet" href="[% c.uri_for('/static/js/jqplot/jquery.jqplot.css') %]" type="text/css">

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

@@ -4 +4 @@
 [% dpmts = c.model('Accounts').db.search_objects('group', 'sutype=dpmt') %]
 
+<ul id="org-top" style="display: none">
+<li>Direction
+
 [% FOREACH dpmt = dpmts %]
 [% "<ul>" IF loop.first %]
 [% odpmt = c.model('Accounts').db.get_object('group', dpmt) %]
-<li><a href="#[% dpmt %]">[% odpmt.get_attributes('description') || dpmt | html %]</a></li>
-[% "</ul>" IF loop.last %]
+<li>[% dpmt | html %]
+
+[% omanager = c.model('Accounts').db.get_object('user', odpmt.get_attributes('managedBy')) %]
+
+[% IF omanager %]
+<br>
+[% omanager %]
 [% END %]
-
-[% FOREACH dpmt = dpmts %]
-[% odpmt = c.model('Accounts').db.get_object('group', dpmt) %]
-<h3><a name="[% dpmt %]">
-[%- odpmt.get_attributes('description') || dpmt | html -%]
-</a><a href="#top">↑</a></h3>
 
 [% users = c.model('Accounts').db.fetchObjectInfo('user',
    [ 'givenName', 'sn', 'managerContact', 'department', 'expire', 'description' ],
    'active=1',
-   'memberOf=' _ dpmt,
+   'department=' _ dpmt,
 ) %]
 
-[% FOREACH user = users.keys.sort %]
-[% IF loop.first %]
-<table border=1>
-<tr><th>Personnel</th><th>Responsable</th></tr>
-[% END %]
-[% ouser = users.$user %]
+    [% FOREACH user = users.keys.sort %]
+    [% IF loop.first %]
+    <ul>
+    [% END %]
+    [% ouser = users.$user %]
+    <li>
+    [% IF ouser.department.0 != dpmt %]
+    <span style="font-style: italic;">
+    [% ELSE %]
+    <span>
+    [% END %]
+    [% ouser.givenName.0 _ ' ' _ ouser.sn.0 || ouser.description.0 || user | html %]
+    </span>
+    </li>
+    [% "</ul>" IF loop.last %]
+    [% END %] 
 
-<tr>
-<td>
-[% IF ouser.department.0 != dpmt %]
-<span style="font-style: italic;">
-[% ELSE %]
-<span>
-[% END %]
-[% ouser.givenName.0 _ ' ' _ ouser.sn.0 || ouser.description.0 || user | html %]
-</span>
-[% IF ouser.department.0 != dpmt %]
-([% ouser.department.0 || 'n/a' | html %])
-[% END %]
-</td>
-<td>
-[% manager = ouser.managerContact.0 %]
-[% IF manager %]
-[% omanager = c.model('Accounts').db.get_object('user', ouser.managerContact.0) %]
-[% omanager.get_attributes('displayName') || manager | html %]
-[% END %]
-</td>
-</tr>
-[% "</table>" IF loop.last %]
-[% END %] 
-
+[% "</ul>" IF loop.last %]
 [% END %]
 
+</li>
+</ul>
+
+<div id=chart></div>
+
+<style>
+
+div.orgChart {
+    overflow-x: scroll
+}
+
+div.orgChart .level1 {
+    font-size: 12px;
+}
+
+div.stack-container {
+    border: solid;
+}
+
+div.orgChart ul.stack > li {
+    margin-top: 1em;
+    font-size: 10px;
+    line-height: 1em;
+}
+</style>
+
+<script>
+$(function() {
+    $("#org-top").orgChart({
+        container: $("#chart"),
+        stack:     true,
+        depth:     2
+    });
+});
+</script>