Changeset 2122 for trunk/LATMOS-Accounts-Web

Timestamp:

11/08/17 14:46:00 (7 years ago)

Author:

nanardon

Message:

Add options to date limit

Location:

trunk/LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Controller/Summary/ListEmployments.pm (modified) (4 diffs)
• root/html/summary/listemployments/index.tt (modified) (2 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Summary/ListEmployments.pm

@@ -27 +27 @@
     my ( $self, $c ) = @_;
 
-    my ($min, $max) = $c->model('Accounts')->db->getEmploymentRange;
+    my $base = $c->model('Accounts')->db;
+
+    my ($min, $max) = $base->getEmploymentRange;
     $c->stash->{minE} = $min
         ? DateTime->from_epoch( epoch => str2time( $min ) )
@@ -49 +51 @@
     );
 
+    my %atstart = map { $_ => 1 } $base->search_objects(
+        'employment', sprintf('firstday>=%s', $c->stash->{min}->ymd('-'))
+    );
+    my %atend = map { $_ => 1 } $base->search_objects(
+        'employment', sprintf('lastday<=%s', $c->stash->{max}->ymd('-'))
+    );
+
     if (my $jtype = $c->req->param('jtype')) {
         push(@search, 'contratType.sutype=' . $jtype);
@@ -59 +68 @@
 
     foreach my $attr (qw(sn givenName description)) {
-        my %res = $c->model('Accounts')->db->attributes_summary_by_object('user', $attr);
+        my %res = $base->attributes_summary_by_object('user', $attr);
         $users{$_}{$attr} = $res{$_}->[0] foreach (keys %res);
     }
@@ -68 +77 @@
     }
 
-    my %objects = map { $_ => {} } $c->model('Accounts')->db->search_objects('employment', @search);
+    my %inclusiveObjects = map { $_ => {} } $base->search_objects('employment', @search);
+    my %objects = ();
+    my $atstart = $c->req->param('atstart');
+    my $atend =   $c->req->param('atend');
+
+    foreach my $emp (keys %inclusiveObjects) {
+        if ($atstart) {
+            $atstart{$emp} or next;
+        }
+        if ($atend) {
+            $atend{$emp} or next;
+        }
+        $objects{$emp} = $inclusiveObjects{$emp};
+    }
 
     my @attrs = qw(user firstday lastday contratType department);
 
     foreach my $attr (@attrs) {
-        foreach (keys %objects) {
-            $objects{$_}{$attr} = [];
-        }
         my %res = $c->model('Accounts')->db->attributes_summary_by_object('employment', $attr);
         foreach my $obj (keys %res) {
             exists($objects{$obj}) or next;
-            $objects{$obj}{$attr} = $res{$obj};
+            $objects{$obj}{$attr} = $res{$obj}->[0];
         }
     }
 
-    $c->stash->{employments} = [ sort { $a->{user}[0] cmp $b->{user}[0] } values %objects ];
+    foreach (keys %objects) {
+        $objects{$_}{username} = $c->stash->{users}{ $objects{$_}{user} };
+        $objects{$_}{username} = $objects{$_}{user};
+    }
+
+    $c->stash->{employments} = [ sort { $a->{user} cmp $b->{user} } values %objects ];
 }
 

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

@@ -5 +5 @@
 <div id="slider-range"></div>
 </div>
+<input name=atstart id=atstart value=yes
+    type=checkbox [% "checked" IF c.req.param('atstart') %]>
+<label for=atstart>Uniquement les statuts commençant pendant</label>
+<br>
+<input name=atend id=atend value=yes
+    type=checkbox [% "checked" IF c.req.param('atend') %]>
+<label for=atend>Uniquement les statuts finissant pendant</label>
+<br>
 
 <select name=contratType multiple>
@@ -29 +37 @@
 
 <tr>
-[% u = emp.user.0 %]
+[% u = emp.user %]
 <td>
 [% IF prev != u %]
-[% users.$u || u | html %]
+[% emp.username || u | html %]
 [% END %]
 </td>
-<td>[% emp.firstday.0 | html %]</td>
-<td>[% emp.lastday.0 | html %]</td>
-<td>[% emp.contratType.0 | html %]</td>
-<td>[% emp.department.0 | html %]</td>
+<td>[% emp.firstday | html %]</td>
+<td>[% emp.lastday | html %]</td>
+<td>[% emp.contratType | html %]</td>
+<td>[% emp.department | html %]</td>
 
 </tr>