Changeset 1621 for trunk


Ignore:
Timestamp:
01/09/16 17:25:05 (9 years ago)
Author:
nanardon
Message:

Add current user information on employment page

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/fr.po

    r1620 r1621  
    44# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. 
    55# 
    6 #, fuzzy 
    76msgid "" 
    87msgstr "" 
    … …  
    1615"Content-Type: text/plain; charset=UTF-8\n" 
    1716"Content-Transfer-Encoding: 8bit\n" 
     17 
     18#: root/html/users/employment.tt:133 
     19msgid "Arrival" 
     20msgstr "Arrivée" 
    1821 
    1922#: root/html/includes/sidebar.tt:16 
    … …  
    3336msgstr "Créé" 
    3437 
     38#: root/html/users/employment.tt:115 
     39msgid "Current status" 
     40msgstr "Statut actuel" 
     41 
    3542#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:86 
    3643msgid "Expire" 
    … …  
    4451msgid "IT management" 
    4552msgstr "Gestion informatique" 
     53 
     54#: root/html/users/employment.tt:135 
     55msgid "Leave" 
     56msgstr "Départ" 
    4657 
    4758#: root/html/includes/sidebar.tt:21 

  • trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/messages.pot

    r1620 r1621  
    1616"Content-Transfer-Encoding: 8bit\n" 
    1717 
     18#: root/html/users/employment.tt:133 
     19msgid "Arrival" 
     20msgstr "" 
     21 
    1822#: root/html/includes/sidebar.tt:16 
    1923msgid "Change my password" 
    … …  
    3236msgstr "" 
    3337 
     38#: root/html/users/employment.tt:115 
     39msgid "Current status" 
     40msgstr "" 
     41 
    3442#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:86 
    3543msgid "Expire" 
    … …  
    4250#: root/html/includes/wrapper.tt:49 
    4351msgid "IT management" 
     52msgstr "" 
     53 
     54#: root/html/users/employment.tt:135 
     55msgid "Leave" 
    4456msgstr "" 
    4557 

  • trunk/LATMOS-Accounts-Web/root/html/users/employment.tt

    r1618 r1621  
    7474[% END %] 
    7575 
     76<div id=listemp style="display: inline-block; border: outset; padding-left: 20px; padding-right: 20px;"> 
    7677[% IF c.stash.user.listEmployment %] 
    77     <div id=listemp style="display: inline-block; border: outset; padding-left: 20px; padding-right: 20px;"> 
    7878    <h3>Listes de status:</h3> 
    7979    [% IF employment %] 
    … …  
    112112    [% END %] 
    113113    [% END %] 
     114 
     115    <h3>[% l('Current status') %]:</h3> 
     116 
     117    <table> 
     118    [% FOREACH attribute = [ 'company', 'department', 'contratType', 'managerContact', 'expire' ] %] 
     119    [% formrh = c.model('AttrForms', 'user', user ) %] 
     120    <tr> 
     121        <th> 
     122            [% formrh.attr_label(attribute) |html %] 
     123            [% IF formrh.attr_hint(attribute) %] 
     124            <span 
     125                title="[% formrh.attr_hint(attribute) | html %]" 
     126                class="hint">?</span> 
     127            [% END %] 
     128        </th> 
     129        <td>[% user.get_attributes(attribute) | html  %]</td> 
     130    </tr> 
     131 
     132    [% END %] 
     133    <tr><th>[% l('Arrival') %]</th> 
     134        <td>[% user.get_attributes('startFirstEmployment') | html  %]</td></tr> 
     135    <tr><th>[% l('Leave') %]</th> 
     136        <td>[% user.get_attributes('endLastEmployment') | html  %]</td></tr> 
     137    </table> 
     138 
    114139    </div> 
    115140 
    116141</div> 
    117142 
     143</div> 
    118144[% END %] 

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

    r1620 r1621  
    108108            }, 
    109109            reference => 'user', 
    110             label => l('Contact'), 
     110            label => l('Direct manager'), 
    111111        }, 
    112112        department => { 

  • trunk/LATMOS-Accounts/po/fr.po

    r1620 r1621  
    6262msgstr "Société" 
    6363 
    64 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:110 
    65 msgid "Contact" 
    66 msgstr "Contact" 
    67  
    6864#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:72 
    69 #, fuzzy 
    7065msgid "Contract end" 
    7166msgstr "Fin du contrat" 
    7267 
    7368#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:66 
    74 #, fuzzy 
    7569msgid "Contract start" 
    7670msgstr "Début du contrat" 
    … …  
    111105msgstr "Description" 
    112106 
     107#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:110 
     108msgid "Direct manager" 
     109msgstr "Responsable direct" 
     110 
    113111#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:82 
    114112#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1109 
    … …  
    456454msgstr "Page Web" 
    457455 
     456#~ msgid "Contact" 
     457#~ msgstr "Contact" 
     458 
    458459#~ msgid "First day" 
    459460#~ msgstr "Premier jour" 

  • trunk/LATMOS-Accounts/po/messages.pot

    r1620 r1621  
    5454msgstr "" 
    5555 
    56 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:110 
    57 msgid "Contact" 
    58 msgstr "" 
    59  
    6056#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:72 
    6157msgid "Contract end" 
    … …  
    9288#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:324 lib/LATMOS/Accounts/Bases/Sql/Employment.pm:60 lib/LATMOS/Accounts/Bases/Sql/Group.pm:145 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:223 lib/LATMOS/Accounts/Bases/Sql/Service.pm:73 lib/LATMOS/Accounts/Bases/Sql/User.pm:1130 
    9389msgid "Description" 
     90msgstr "" 
     91 
     92#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:110 
     93msgid "Direct manager" 
    9494msgstr "" 
    9595 
Note: See TracChangeset for help on using the changeset viewer.