Changeset 2121
- Timestamp:
- 11/06/17 17:41:24 (7 years ago)
- Location:
- trunk
- Files:
-
- 60 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LATMOS-Accounts-Web/MANIFEST
r2107 r2121 55 55 lib/LATMOS/Accounts/Web/Controller/Summary/EmploymentByPeriod.pm 56 56 lib/LATMOS/Accounts/Web/Controller/Summary/Expire.pm 57 lib/LATMOS/Accounts/Web/Controller/Summary/ListEmployments.pm 57 58 lib/LATMOS/Accounts/Web/Controller/Summary/Offices.pm 58 59 lib/LATMOS/Accounts/Web/Controller/Summary/Tree.pm … … 141 142 root/html/summary/employmentbyperiod/index.tt 142 143 root/html/summary/expire/index.tt 144 root/html/summary/listemployments/index.tt 143 145 root/html/summary/offices/index.tt 144 146 root/html/summary/rh/index.tt … … 222 224 root/static/js/d3/d3.v3.js 223 225 root/static/js/d3/d3.v3.min.js 226 root/static/js/jQRangeSlider/GPL-License.txt 227 root/static/js/jQRangeSlider/History.md 228 root/static/js/jQRangeSlider/MIT-License.txt 229 root/static/js/jQRangeSlider/Readme.md 230 root/static/js/jQRangeSlider/css/classic-min.css 231 root/static/js/jQRangeSlider/css/classic.css 232 root/static/js/jQRangeSlider/css/iThing-min.css 233 root/static/js/jQRangeSlider/css/iThing.css 234 root/static/js/jQRangeSlider/css/icons-classic/label.png 235 root/static/js/jQRangeSlider/css/icons-classic/resultset_next.png 236 root/static/js/jQRangeSlider/css/icons-classic/resultset_previous.png 237 root/static/js/jQRangeSlider/demo/dateSliderDemo.js 238 root/static/js/jQRangeSlider/demo/demo.js 239 root/static/js/jQRangeSlider/demo/editSliderDemo.js 240 root/static/js/jQRangeSlider/demo/img/calendar.png 241 root/static/js/jQRangeSlider/demo/img/classicTheme.png 242 root/static/js/jQRangeSlider/demo/img/iThingTheme.png 243 root/static/js/jQRangeSlider/demo/index.html 244 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png 245 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png 246 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png 247 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png 248 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png 249 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png 250 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png 251 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png 252 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png 253 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png 254 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png 255 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png 256 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png 257 root/static/js/jQRangeSlider/demo/lib/jquery-ui/css/smoothness/jquery-ui-1.8.10.custom.css 258 root/static/js/jQRangeSlider/demo/lib/jquery-ui/js/jquery-ui-1.8.16.custom.min.js 259 root/static/js/jQRangeSlider/demo/sliderDemo.js 260 root/static/js/jQRangeSlider/demo/style.css 261 root/static/js/jQRangeSlider/jQAllRangeSliders-min.js 262 root/static/js/jQRangeSlider/jQAllRangeSliders-withRuler-min.js 263 root/static/js/jQRangeSlider/jQDateRangeSlider-min.js 264 root/static/js/jQRangeSlider/jQDateRangeSlider-withRuler-min.js 265 root/static/js/jQRangeSlider/jQEditRangeSlider-min.js 266 root/static/js/jQRangeSlider/jQEditRangeSlider-withRuler-min.js 267 root/static/js/jQRangeSlider/jQRangeSlider-min.js 268 root/static/js/jQRangeSlider/jQRangeSlider-withRuler-min.js 269 root/static/js/jQRangeSlider/lib/jquery.mousewheel.license.txt 270 root/static/js/jQRangeSlider/lib/jquery.mousewheel.min.js 224 271 root/static/js/jqplot/jquery.jqplot.css 225 272 root/static/js/jqplot/jquery.jqplot.js -
trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/fr.po
r2078 r2121 46 46 msgstr "(autre)" 47 47 48 #: root/html/includes/sidebar.tt:10 448 #: root/html/includes/sidebar.tt:105 49 49 msgid "About" 50 50 msgstr "à propos" … … 139 139 msgstr "Du" 140 140 141 #: root/html/includes/wrapper.tt: 59141 #: root/html/includes/wrapper.tt:64 142 142 msgid "IT management" 143 143 msgstr "Gestion informatique" … … 152 152 msgstr "Départ" 153 153 154 #: root/html/includes/sidebar.tt:9 7154 #: root/html/includes/sidebar.tt:98 155 155 msgid "Load Password" 156 156 msgstr "Charger des mot de passe" … … 192 192 "Verifier vos données en entrée" 193 193 194 #: root/html/includes/sidebar.tt:8 7194 #: root/html/includes/sidebar.tt:88 195 195 msgid "Others Statistics" 196 196 msgstr "Autres Statistiques" … … 217 217 msgstr "" 218 218 219 #: root/html/includes/sidebar.tt:72 220 msgid "Search by employment" 221 msgstr "Recherche par statut" 222 219 223 #: root/html/tools/csv/index.tt:31 220 224 msgid "Select a CSV file" … … 241 245 msgstr "Cumulé" 242 246 243 #: root/html/includes/sidebar.tt:61 root/html/includes/sidebar.tt:7 6247 #: root/html/includes/sidebar.tt:61 root/html/includes/sidebar.tt:77 244 248 msgid "Statistics" 245 249 msgstr "Statistiques" … … 293 297 msgstr "Aujourd'hui" 294 298 295 #: root/html/includes/sidebar.tt:9 3299 #: root/html/includes/sidebar.tt:94 296 300 msgid "Tools" 297 301 msgstr "Outils" … … 352 356 msgstr "ou coller le contenu ici" 353 357 358 #: root/html/includes/object_header.tt:6 359 msgid "the object is disabled" 360 msgstr "" 361 354 362 #: root/html/users/employment.tt:29 root/html/users/employment.tt:92 355 363 msgid "to" -
trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/messages.pot
r2078 r2121 39 39 msgstr "" 40 40 41 #: root/html/includes/sidebar.tt:10 441 #: root/html/includes/sidebar.tt:105 42 42 msgid "About" 43 43 msgstr "" … … 128 128 msgstr "" 129 129 130 #: root/html/includes/wrapper.tt: 59130 #: root/html/includes/wrapper.tt:64 131 131 msgid "IT management" 132 132 msgstr "" … … 140 140 msgstr "" 141 141 142 #: root/html/includes/sidebar.tt:9 7142 #: root/html/includes/sidebar.tt:98 143 143 msgid "Load Password" 144 144 msgstr "" … … 178 178 msgstr "" 179 179 180 #: root/html/includes/sidebar.tt:8 7180 #: root/html/includes/sidebar.tt:88 181 181 msgid "Others Statistics" 182 182 msgstr "" … … 202 202 msgstr "" 203 203 204 #: root/html/includes/sidebar.tt:72 205 msgid "Search by employment" 206 msgstr "" 207 204 208 #: root/html/tools/csv/index.tt:31 205 209 msgid "Select a CSV file" … … 226 230 msgstr "" 227 231 228 #: root/html/includes/sidebar.tt:61 root/html/includes/sidebar.tt:7 6232 #: root/html/includes/sidebar.tt:61 root/html/includes/sidebar.tt:77 229 233 msgid "Statistics" 230 234 msgstr "" … … 268 272 msgstr "" 269 273 270 #: root/html/includes/sidebar.tt:9 3274 #: root/html/includes/sidebar.tt:94 271 275 msgid "Tools" 272 276 msgstr "" … … 326 330 msgstr "" 327 331 332 #: root/html/includes/object_header.tt:6 333 msgid "the object is disabled" 334 msgstr "" 335 328 336 #: root/html/users/employment.tt:29 root/html/users/employment.tt:92 329 337 msgid "to" -
trunk/LATMOS-Accounts-Web/root/html/includes/sidebar.tt
r2006 r2121 70 70 <li><a href="[% c.uri_for('/summary/accage') %]">Comptes par année</a></li> 71 71 <li><a href="[% c.uri_for('/summary/employmentbyperiod') %]">Nombre de personnes par statut</a></li> 72 <li><a href="[% c.uri_for('/summary/listemployments') %]">[% l('Search by employment') %]</a></li> 72 73 73 74 [% FOREACH stat = c.model('Accounts').db.search_objects('stat', 'exported=true', 'display=*').sort %] -
trunk/LATMOS-Accounts-Web/root/html/includes/wrapper.tt
r2001 r2121 33 33 <script src="[% c.uri_for('/static', 'js', 'timeline', 'timeframe.js') %]"></script> 34 34 <script src="[% c.uri_for('/static', 'js', 'jquery', 'jquery.orgchart.js') %]"></script> 35 <script src="[% c.uri_for('/static', 'js', 'jQRangeSlider', 'jQAllRangeSliders-min.js') %]"></script> 36 35 37 <link rel="stylesheet" href="[% c.uri_for('/static/js/jquery/jquery.orgchart.css') %]" type="text/css"> 38 <link rel="stylesheet" href="[% c.uri_for('/static/js/jqplot/jquery.jqplot.css') %]" type="text/css"> 39 <link rel="stylesheet" href="[% c.uri_for('/static/js/jQRangeSlider/css/classic.css') %]" type="text/css"> 36 40 37 <link rel="stylesheet" href="[% c.uri_for('/static/js/jqplot/jquery.jqplot.css') %]" type="text/css">38 41 39 42 <script> 40 $.jqplot.config.enablePlugins = true; 43 $(function() { 44 $.jqplot.config.enablePlugins = true; 45 }); 41 46 </script> 42 47 -
trunk/LATMOS-Accounts-Web/root/static/style.css
r2093 r2121 299 299 padding-bottom: 1em; 300 300 } 301 -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm
r2111 r2121 955 955 } 956 956 957 =head2 getEmploymentRange 958 959 Return date range within employment can be found in database 960 961 =cut 962 963 sub getEmploymentRange { 964 my ($self, @filters) = @_; 965 966 my ($min,$max); 967 968 if (@filters) { 969 my @flist = $self->search_objects('employment', @filters); 970 my $minSql = $self->db->prepare(q{ 971 SELECT min(firstday) as min FROM employment 972 WHERE name = ANY (?) 973 }); 974 $minSql->execute(\@flist); 975 if (my $res = $minSql->fetchrow_hashref) { 976 $min = $res->{min} 977 } 978 my $maxSql = $self->db->prepare(q{ 979 SELECT max(lastday) as max FROM employment 980 WHERE name = ANY (?) 981 }); 982 $maxSql->execute(\@flist); 983 if (my $res = $maxSql->fetchrow_hashref) { 984 $max = $res->{max} 985 } 986 } else { 987 my $minSql = $self->db->prepare(q{ 988 SELECT min(firstday) as min FROM employment 989 }); 990 $minSql->execute; 991 if (my $res = $minSql->fetchrow_hashref) { 992 $min = $res->{min} 993 } 994 my $maxSql = $self->db->prepare(q{ 995 SELECT max(lastday) as max FROM employment 996 }); 997 $maxSql->execute; 998 if (my $res = $maxSql->fetchrow_hashref) { 999 $max = $res->{max} 1000 } 1001 } 1002 1003 return ($min,$max); 1004 } 1005 957 1006 sub ReportChange { 958 1007 my ($self, $otype, $name, $ref, $changetype, $message, @args) = @_;
Note: See TracChangeset
for help on using the changeset viewer.