Changeset 1607
- Timestamp:
- 01/08/16 00:37:09 (8 years ago)
- Location:
- trunk/LATMOS-Accounts-Web
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm
r1584 r1607 43 43 color => '#000000', 44 44 spans => [], 45 events => [], 45 46 }, 46 47 }; … … 72 73 73 74 push(@{$var->{employments}{spans}}, $vemp); 75 76 push(@{$var->{employments}{events}}, { 77 name => 'Today', 78 date => DateTime->now->ymd('-'), 79 }); 80 if (my $expire = $ouser->get_attributes('expire')) { 81 push(@{$var->{employments}{events}}, { 82 name => 'Expire', 83 date => $expire, 84 }); 85 } 74 86 } 75 87 -
trunk/LATMOS-Accounts-Web/root/html/users/employment.tt
r1606 r1607 7 7 8 8 <div id="objectform" class="objectform"> 9 10 9 11 10 [% IF c.stash.user.listEmployment %] … … 32 31 [% END %] 33 32 33 [% IF employment %] 34 <h3> 35 Statut du [% employment.get_attributes('firstday') | html %] 36 [% IF employment.get_attributes('lastday') %] au [% employment.get_attributes('lastday') | html %][% END %] 37 [% ELSE %] 38 Nouveau statut: 39 [% END %] 40 </h3> 34 41 35 42 [% BLOCK formattr %] … … 47 54 [% END %] 48 55 49 [% IF employment %]50 56 <div style="display: inline-block;"> 51 <h3>52 Statut du [% employment.get_attributes('firstday') | html %]53 [% IF employment.get_attributes('lastday') %] au [% employment.get_attributes('lastday') | html %][% END %]54 [% ELSE %]55 Nouveau statut:56 [% END %]57 </h3>58 57 <form action="[% c.uri_for(username, subform, employment.id || '@create') %]" method="POST"> 59 58 <table border=1> … … 76 75 77 76 [% IF c.stash.user.listEmployment %] 78 <div id=listemp style="display: inline-block; border: outset; padding-left: padding-right: 20px;">77 <div id=listemp style="display: inline-block; border: outset; padding-left: 20px; padding-right: 20px;"> 79 78 <h3>Listes de status:</h3> 80 79 [% IF employment %] -
trunk/LATMOS-Accounts-Web/root/static/js/timeline/timeframe.js
r1584 r1607 227 227 .appendTo(group); 228 228 229 var line = $svg.line( 230 x, 231 this.height - this.options.textHeight - this.options.tickHeight + this.paddingY, 232 x, 233 this.height - this.options.textHeight - this.options.tickHeight + this.paddingY - 24 234 ) 235 .attr("stroke", "blue") 236 .attr("stroke-width", 1) 237 .appendTo(group); 238 229 239 var label = $svg.text( 230 240 x, 231 this.height - this.options.textHeight - this.options.tickHeight + this.paddingY - 8,241 this.height - this.options.textHeight - this.options.tickHeight + this.paddingY - 32, 232 242 event.name, 233 243 { 234 fill: "bl ack",244 fill: "blue", 235 245 "font-size": "12", 236 246 "text-anchor": "middle"
Note: See TracChangeset
for help on using the changeset viewer.