Changeset 1758


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

Ajout compte de statut par période

Location:
trunk
Files:
6 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LATMOS-Accounts-Web/MANIFEST

    r1712 r1758  
    2020lib/LATMOS/Accounts/Web/Controller/Json/DpmtRH.pm 
    2121lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm 
     22lib/LATMOS/Accounts/Web/Controller/Json/EmploymentByPeriod.pm 
    2223lib/LATMOS/Accounts/Web/Controller/Json/Expire.pm 
    2324lib/LATMOS/Accounts/Web/Controller/Json/FreeIp.pm 
    … …  
    4950lib/LATMOS/Accounts/Web/Controller/Summary/Departments.pm 
    5051lib/LATMOS/Accounts/Web/Controller/Summary/Employment.pm 
     52lib/LATMOS/Accounts/Web/Controller/Summary/EmploymentByPeriod.pm 
    5153lib/LATMOS/Accounts/Web/Controller/Summary/Expire.pm 
    5254lib/LATMOS/Accounts/Web/Controller/Summary/Offices.pm 
    … …  
    129131root/html/summary/departments/index.tt 
    130132root/html/summary/employment/index.tt 
     133root/html/summary/employmentbyperiod/index.tt 
    131134root/html/summary/expire/index.tt 
    132135root/html/summary/offices/index.tt 
    … …  
    285288t/controller_Json-DpmtRH.t 
    286289t/controller_Json-Employment.t 
     290t/controller_Json-EmploymentByPeriod.t 
    287291t/controller_Json-Expire.t 
    288292t/controller_Json-List.t 
    … …  
    306310t/controller_Summary-Department.t 
    307311t/controller_Summary-Employment.t 
     312t/controller_Summary-EmploymentByPeriod.t 
    308313t/controller_Summary-Offices.t 
    309314t/controller_Summary-Rh.t 

  • 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', 

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

    r1693 r1758  
    1  
    21[% IF c.user.username %] 
    32<form action="[% c.uri_for('/search') %]"> 
    … …  
    5857    <li><a href="[% c.uri_for('/summary/employment') %]">[% l('Status evolution') %]</a></li> 
    5958    <li><a href="[% c.uri_for('/summary/accage') %]">Comptes par année</a></li> 
     59    <li><a href="[% c.uri_for('/summary/employmentbyperiod') %]">Nombre de personnes par statut</a></li> 
    6060 
    6161    [% FOREACH stat = c.model('Accounts').db.search_objects('stat', 'exported=true', 'display=*').sort %] 

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

    r1679 r1758  
    2525    'jqplot.canvasAxisTickRenderer.js', 
    2626    'jqplot.categoryAxisRenderer.js', 
     27    'jqplot.canvasAxisTickRenderer.js', 
    2728    ] %] 
    2829<script src="[% c.uri_for('/static', 'js', 'jqplot', 'plugins', plugins) %]"></script> 

  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

    r1752 r1758  
    742742        # attr=foo => no extra white space ! 
    743743        # \W is false, it is possible to have two char 
    744         my ($attr, $mode, $val) = $item =~ /^(\w+)(?:(\W)(.+))?$/ or next; 
     744        my ($attr, $mode, $val) = $item =~ /^(\w+)(?:(\W+)(.+))?$/ or next; 
    745745        if (!$mode) { 
    746746            $mode = '~'; 
Note: See TracChangeset for help on using the changeset viewer.