- Timestamp:
- 01/09/16 18:42:54 (9 years ago)
- Location:
- trunk/LATMOS-Accounts-Web
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm
r1620 r1622 73 73 74 74 push(@{$var->{employments}{spans}}, $vemp); 75 } 75 76 77 if (!$var->{end}) { 78 if (my $expire = $ouser->get_attributes('expire')) { 79 $var->{end} = $expire; 80 } else { 81 my $dt = DateTime->now; 82 $dt->add(days => 120); 83 $var->{end} = $dt->ymd('-'); 84 } 85 } 86 87 push(@{$var->{employments}{events}}, { 88 name => $c->loc('Today'), 89 date => DateTime->now->ymd('-'), 90 }); 91 push(@{$var->{employments}{events}}, { 92 name => $c->loc('Created'), 93 date => $ouser->get_attributes('create'), 94 }); 95 if (my $expire = $ouser->get_attributes('expire')) { 76 96 push(@{$var->{employments}{events}}, { 77 name => $c->loc(' Today'),78 date => DateTime->now->ymd('-'),97 name => $c->loc('Expire'), 98 date => $expire, 79 99 }); 80 push(@{$var->{employments}{events}}, {81 name => $c->loc('Created'),82 date => $ouser->get_attributes('create'),83 });84 if (my $expire = $ouser->get_attributes('expire')) {85 push(@{$var->{employments}{events}}, {86 name => $c->loc('Expire'),87 date => $expire,88 });89 }90 100 } 91 101 -
trunk/LATMOS-Accounts-Web/root/html/users/employment.tt
r1621 r1622 1 <!-- $Id$ -->2 [% IF NOT user %]3 No user [% username | html %] found.4 [% ELSE %]5 6 1 [% INCLUDE 'users/object_header.tt' %] 7 2 8 3 <div id="objectform" class="objectform"> 9 4 10 [% IF c.stash.user.listEmployment %]11 5 <div id=timeline style="width: 80%"></div> 12 6 … … 29 23 }); 30 24 </script> 31 [% END %]32 25 33 26 <h3> … … 55 48 56 49 <div style="display: inline-block;"> 57 <form action="[% c.uri_for(username, subform, employment.id || '@create') %]" method="POST">58 <table border=1>59 [% FOREACH attr = form.attributes %]60 [% INCLUDE 'formattr' thisform = form attr = attr %]61 [% END %]62 [% FOREACH attr = forme.attributes %]63 [% INCLUDE 'formattr' thisform = forme attr = attr %]64 [% END %]65 [% IF form.write_attributes OR forme.write_attributes %]66 <tr><td colspan=2>[% forme.submit(1) %][% form.submit(1) %]67 <input type=submit68 value="[% IF employment %]Enregistrer[% ELSE %]Ajouter...[%END %]">69 </td></tr>70 [% END %]71 </table>72 </form>50 <form action="[% c.uri_for(username, subform, employment.id || '@create') %]" method="POST"> 51 <table border=1> 52 [% FOREACH attr = form.attributes %] 53 [% INCLUDE 'formattr' thisform = form attr = attr %] 54 [% END %] 55 [% FOREACH attr = forme.attributes %] 56 [% INCLUDE 'formattr' thisform = forme attr = attr %] 57 [% END %] 58 [% IF form.write_attributes OR forme.write_attributes %] 59 <tr><td colspan=2>[% forme.submit(1) %][% form.submit(1) %] 60 <input type=submit 61 value="[% IF employment %]Enregistrer[% ELSE %]Ajouter...[%END %]"> 62 </td></tr> 63 [% END %] 64 </table> 65 </form> 73 66 </div> 74 [% END %] 67 75 68 76 69 <div id=listemp style="display: inline-block; border: outset; padding-left: 20px; padding-right: 20px;"> 77 70 [% IF c.stash.user.listEmployment %] 78 71 <h3>Listes de status:</h3> 72 79 73 [% IF employment %] 80 74 <a href="[% c.uri_for('/users', username, 'employment', '@new') %]">Ajouter...</a>, … … 82 76 83 77 [% FOREACH e = user.listEmployment %] 84 [% IF loop.first %] 85 <a href="[% c.uri_for('/users', username, 'employment', '@duplicate') %]">Renouveler...</a> 86 <ul> 78 [% IF loop.first %] 79 <a href="[% c.uri_for('/users', username, 'employment', '@duplicate') %]">Renouveler...</a> 80 <ul> 81 [% END %] 82 83 [% co = user.base.get_object('employment', e) %] 84 <li[% IF co.id == employment.id %] class=active[% END %]> 85 [% IF NOT co.get_attributes('state') %]*[% END %] 86 87 <a href="[% c.uri_for('/users', user.id, 'employment', co.id) %]"> 88 [% co.get_attributes('contratType') %] 89 90 [% IF co.get_attributes('lastday') %] 91 [% l('From') %] [% co.get_attributes('firstday') %] 92 [% l('to') %] [% co.get_attributes('lastday') %] 93 [% ELSE %] 94 [% l('Since') %][% co.get_attributes('firstday') %] 95 [% END %] 96 </a> 97 98 [% IF co.get_attributes('state') > 0 %] 99 <form method=POST action="[% c.uri_for('/users', username, 'employment') %]" 100 onSubmit="return confirm('Détruire le statut commençant [% co.get_attributes('firstday') %] ?') ? true : false"> 101 <input type=hidden name=delemployment value="[% co.id %]"> 102 <input type=submit value="Supprimer"> 103 </form> 104 [% END %] 105 106 </li> 107 108 [% IF loop.last %] 109 </ul> 110 [% END %] 87 111 [% END %] 88 [% co = user.base.get_object('employment', e) %] 89 <li[% IF co.id == employment.id %] class=active[% END %]> 90 [% IF NOT co.get_attributes('state') %]*[% END %] 91 92 <a href="[% c.uri_for('/users', user.id, 'employment', co.id) %]"> 93 [% co.get_attributes('contratType') %] 94 [% IF co.get_attributes('lastday') %] 95 [% l('From') %] [% co.get_attributes('firstday') %] 96 [% l('to') %] [% co.get_attributes('lastday') %] 97 [% ELSE %] 98 [% l('Since') %][% co.get_attributes('firstday') %] 99 [% END %] 100 </a> 101 [% IF co.get_attributes('state') > 0 %] 102 <form method=POST action="[% c.uri_for('/users', username, 'employment') %]" 103 onSubmit="return confirm('Détruire le statut commençant [% co.get_attributes('firstday') %] ?') ? true : false"> 104 <input type=hidden name=delemployment value="[% co.id %]"> 105 <input type=submit value="Supprimer"> 106 </form> 107 [% END %] 108 109 </li> 110 [% IF loop.last %] 111 </ul> 112 [% END %] 113 [% END %] 112 [% END %] 114 113 115 114 <h3>[% l('Current status') %]:</h3> 116 115 117 116 <table> 118 [% FOREACH attribute = [ 'company', 'department', 'contratType', 'managerContact' , 'expire'] %]117 [% FOREACH attribute = [ 'company', 'department', 'contratType', 'managerContact' ] %] 119 118 [% formrh = c.model('AttrForms', 'user', user ) %] 120 119 <tr> … … 129 128 <td>[% user.get_attributes(attribute) | html %]</td> 130 129 </tr> 130 [% END %] 131 131 132 [% END %] 132 <tr><th>[% l('Created') %]</th> 133 <td>[% user.get_attributes('create') | html %]</td></tr> 133 134 <tr><th>[% l('Arrival') %]</th> 134 135 <td>[% user.get_attributes('startFirstEmployment') | html %]</td></tr> 136 <tr> 137 <th> 138 [% formrh.attr_label('expire') |html %] 139 [% IF formrh.attr_hint('expire') %] 140 <span 141 title="[% formrh.attr_hint('expire') | html %]" 142 class="hint">?</span> 143 [% END %] 144 </th> 145 <td>[% user.get_attributes('expire') | html %]</td> 146 </tr> 135 147 <tr><th>[% l('Leave') %]</th> 136 148 <td>[% user.get_attributes('endLastEmployment') | html %]</td></tr> 137 149 </table> 138 150 139 </div>140 141 151 </div> 142 152 143 </div> 144 [% END %] 153 </div><!-- objectform -->
Note: See TracChangeset
for help on using the changeset viewer.