- Timestamp:
- 01/03/16 20:55:59 (9 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LATMOS-Accounts-Web/root/html/includes/wrapper.tt
r1546 r1583 26 26 27 27 <script src="[% c.uri_for('/static', 'js', 'd3', 'd3.v3.js') %]"></script> 28 <script src="[% c.uri_for('/static', 'js', 'timeline', 'timeframe.js') %]"></script> 28 29 29 30 <link rel="stylesheet" href="[% c.uri_for('/static/js/jqplot/jquery.jqplot.css') %]" type="text/css"> -
trunk/LATMOS-Accounts-Web/root/html/users/employment.tt
r1515 r1583 7 7 8 8 <div id="objectform" class="objectform"> 9 10 11 [% IF c.stash.user.listEmployment %] 12 <div id=timeline style="width: 80%"></div> 13 14 <script> 15 $(function() { 16 $.ajax({ 17 url: "[% c.uri_for('/json/timeline', username) %]", 18 dataType: "json", 19 success: function(data) { 20 var t2 = Timeframe("#timeline") 21 .start(data.start) 22 .end(data.end) 23 .majorTicks(5, "years") 24 .minorTicks(1, "year"); 25 t2.addCategory(data.employments) 26 t2.draw(); 27 } 28 }); 29 30 }); 31 </script> 9 32 10 33 <div style="height: 150px; overflow-y: auto;"> … … 44 67 [% END %] 45 68 </div> 69 70 [% END %] 46 71 47 72 [% BLOCK formattr %] -
trunk/LATMOS-Accounts-Web/root/static/style.css
r1500 r1583 16 16 /* prevent horizontal scrollbar */ 17 17 overflow-x: hidden; 18 } 19 20 .container { 21 margin: 20px auto; 22 max-width: 800px; 18 23 } 19 24 -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Employment.pm
r1577 r1583 252 252 my ($self) = $_[0]; 253 253 $self or return 0; 254 return $self->get_attributes('state') < 0 ? 1 : 0; 254 my $st = $self->get_attributes('state') || '0'; 255 return $st < 0 ? 1 : 0; 255 256 }; 256 257 }
Note: See TracChangeset
for help on using the changeset viewer.