Changeset 1438 for trunk

Timestamp:

10/30/15 15:24:33 (9 years ago)

Author:

nanardon

Message:

Replace current statistics by user's statistics

Location:

trunk

Files:

• LATMOS-Accounts-Web/MANIFEST (modified) (2 diffs)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Stat.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Stat.pm (moved) (moved from trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Summary/Rh.pm) (2 diffs)
• LATMOS-Accounts-Web/root/html/includes/sidebar.tt (modified) (1 diff)
• LATMOS-Accounts-Web/root/html/includes/wrapper.tt (modified) (1 diff)
• LATMOS-Accounts-Web/root/html/stat (added)
• LATMOS-Accounts-Web/root/html/stat/index.tt (added)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Stat.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/MANIFEST

@@ -34 +34 @@
 lib/LATMOS/Accounts/Web/Controller/Services.pm
 lib/LATMOS/Accounts/Web/Controller/Sites.pm
+lib/LATMOS/Accounts/Web/Controller/Stat.pm
 lib/LATMOS/Accounts/Web/Controller/Summary/Departments.pm
 lib/LATMOS/Accounts/Web/Controller/Summary/Offices.pm
-lib/LATMOS/Accounts/Web/Controller/Summary/Rh.pm
 lib/LATMOS/Accounts/Web/Controller/Users.pm
 lib/LATMOS/Accounts/Web/Model/Accounts.pm
@@ -113 +113 @@
 root/html/sites/menu.tt
 root/html/sites/object_header.tt
+root/html/stat/index.tt
 root/html/summary/departments/index.tt
 root/html/summary/offices/index.tt

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

@@ -22 +22 @@
 =cut
 
-sub employment :Local :Args(0) {
-    my ( $self, $c ) = @_;
+sub index :Path :Args(1) {
+    my ( $self, $c, $statname ) = @_;
 
     my $base = $c->model('Accounts')->db;
 
-    my @results = ();
+    my $ostat = $base->get_object('stat', $statname) or return;
 
-    foreach my $contrat ($base->search_objects('group', 'sutype=contrattype')) {
-        my $ocontrat = $base->get_object('group', $contrat);
-        my $count = scalar( $base->search_objects('user', "memberOf=$contrat", 'active=1') );
+    my $res = $ostat->getStat or return;
 
-        push(@results, [ ($ocontrat->get_attributes('label') || $contrat), $count ]);
-    }
-
-    $c->stash->{data} = [ sort { $b->[1] <=> $a->[1] } @results ];
+    $c->stash->{data} = [ map { [ $_, $res->{$_} +0 ] } sort { $res->{$b} <=> $res->{$a} } keys %$res ];
 }
 
-sub dpmt :Local :Args(0) {
-    my ( $self, $c ) = @_;
+sub history :Local :Args(1) {
+    my ( $self, $c, $statname ) = @_;
 
     my $base = $c->model('Accounts')->db;
 
-    my @results = ();
+    my $ostat = $base->get_object('stat', $statname) or return;
 
-    foreach my $dpmt ($base->search_objects('group', 'sutype=dpmt')) {
-        my $odpmt = $base->get_object('group', $dpmt);
-        my $count = scalar( $base->search_objects('user', "department=$dpmt", 'active=1') );
+    my $data = $ostat->getAllStat or return;
 
-        push(@results, [ $dpmt, $count ]);
-    }
+    my $graph = {
+        series => [],
+        data => [],
+    };
 
-    $c->stash->{data} = [ sort { $b->[1] <=> $a->[1] } @results ];
-}
+    my %lines;
 
-sub manager :Local :Args(0) {
-    my ( $self, $c ) = @_;
-
-    my $base = $c->model('Accounts')->db;
-
-    my @results = ();
-
-    my %active = map { $_ => 1 } $base->search_objects('user', 'active=1', 'givenName=*');
-
-    my %managed = $base->attributes_summary_by_object('user', 'managerContact');
-
-    my %managers = ();
-
-    my $total = 0;
-
-    foreach my $user (sort keys %managed) {
-        $active{$user} or next;
-        foreach (@{ $managed{ $user } }) {
-            $active{$_} or next;
-            $managers{$_} ||= 0;
-            $managers{$_} ++;
-            $total++;
+    foreach my $date (sort keys %$data) {
+        foreach my $val (sort keys %{ $data->{$date} }) {
+            push(@{ $lines{$val} }, [ $date, $data->{$date}{$val} + 0 ]);
         }
     }
 
-    my $minreport = $c->req->param('min');
-    my $others = 0;
-
-    foreach my $user (sort { $managers{$b} <=> $managers{$a} } keys %managers) {
-        if ($minreport && $managers{$user} / $total * 100 < $minreport) {
-            $others++;
-            next;
-        }
-        push(@results, [ $user, $managers{$user} ]);
+    foreach (sort keys %lines) {
+        push(@{ $graph->{data} }, $lines{$_});
+        push(@{ $graph->{series} }, { label => $_ });
     }
 
-    push(@results, [ 'Others', $others ]) if ($others); 
-
-    $c->stash->{data} = \@results;
+    $c->stash->{data} = $graph;
 }
-
-
 
 

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Stat.pm

@@ -1 @@
-package LATMOS::Accounts::Web::Controller::Summary::Rh;
+package LATMOS::Accounts::Web::Controller::Stat;
 use Moose;
 use namespace::autoclean;
@@ -22 +22 @@
 =cut
 
-sub index :Path :Args(0) {
-    my ( $self, $c ) = @_;
+sub index :Path :Args(1) {
+    my ( $self, $c, $statname ) = @_;
 
+    $c->stash->{statname} = $statname;
 }
 

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

@@ -29 +29 @@
     <li><a href="[% c.uri_for('/summary', 'departments') %]">Liste des départements</a></li>
 
-    <li><a href="[% c.uri_for('/summary', 'rh') %]">Statistiques</a></li>
+    [% FOREACH stat = c.model('Accounts').db.list_objects('stat') %]
+    [% ostat = c.model('Accounts').db.get_object('stat', stat) %]
+    <li><a href="[% c.uri_for('/stat', stat) %]">[% ostat.get_attributes('description') || stat | html %]</a></li>
+    [% END %]
+
     </ul>
 </li>

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

@@ -15 +15 @@
 <script src="[% c.uri_for('/static', 'js', 'jqplot', 'plugins', 'jqplot.json2.js') %]"></script>
 <script src="[% c.uri_for('/static', 'js', 'jqplot', 'plugins', 'jqplot.pieRenderer.js') %]"></script>
+<script src="[% c.uri_for('/static', 'js', 'jqplot', 'plugins', 'jqplot.dateAxisRenderer.js') %]"></script>
 <link rel="stylesheet" href="[% c.uri_for('/static/js/jqplot/jquery.jqplot.css') %]" type="text/css">
 

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Stat.pm

@@ -168 +168 @@
     my ($self, $id) = @_;
 
-    ($id) ||= $self->_attributes('lastStatId');
+    ($id) ||= $self->_get_attributes('lastStatId');
 
     if (!$id) {