Ignore:
Timestamp:
05/04/16 10:34:27 (8 years ago)
Author:
nanardon
Message:

Ajout compte de statut par période

Location:
trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm

    r1721 r1758  
    4040        : 'user'; 
    4141 
    42     my $filterobj = @filter[0] =~ m/^(company|department|contratType|manager)=/ 
     42    my $filterobj = $filter[0] =~ m/^(company|department|contratType|manager)=/ 
    4343        ? 'employment' 
    4444        : 'user'; 
  • trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm

    r1694 r1758  
    132132                } 
    133133        }); 
    134     } elsif (my $date = $ouser->get_attributes('endLastEmployment')) { 
     134    } elsif (my $date2 = $ouser->get_attributes('endLastEmployment')) { 
    135135        push(@{$var->{employments}{events}}, { 
    136136                name => $c->loc('Activity end'), 
    137                 date => $date, 
     137                date => $date2, 
    138138                options => { 
    139139                    type => 'employment', 
Note: See TracChangeset for help on using the changeset viewer.