scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mise à jour des css, ajout des détection et affichage des graphiques, fixed issue #0000187

Browse Source
This commit is contained in:
Michael RICOIS 2010-03-08 16:57:54 +00:00
commit 4be8f104b6
9 changed files with 379 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
cache/css/jquery-ui.css vendored
View File

@ -1,6 +1,6 @@
/* /*
* jQuery UI CSS Framework * jQuery UI CSS Framework
* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. * Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
*/ */
@ -26,7 +26,7 @@
/* Icons /* Icons
----------------------------------*/ ----------------------------------*/
/* states and ../img/smoothness */ /* states and images */
.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } .ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
@ -37,10 +37,9 @@
.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } .ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
/* /*
* jQuery UI CSS Framework * jQuery UI CSS Framework
* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. * Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
*/ */
@ -49,6 +48,7 @@
/* Component containers /* Component containers
----------------------------------*/ ----------------------------------*/
.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } .ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(../img/smoothness/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(../img/smoothness/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
.ui-widget-content a { color: #222222; } .ui-widget-content a { color: #222222; }
@ -57,12 +57,13 @@
/* Interaction states /* Interaction states
----------------------------------*/ ----------------------------------*/
.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(../img/smoothness/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; outline: none; } .ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(../img/smoothness/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; outline: none; } .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #999999; background: #dadada url(../img/smoothness/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; outline: none; } .ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #999999; background: #dadada url(../img/smoothness/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; outline: none; } .ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(../img/smoothness/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; outline: none; } .ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(../img/smoothness/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; outline: none; text-decoration: none; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
.ui-widget :active { outline: none; }
/* Interaction Cues /* Interaction Cues
----------------------------------*/ ----------------------------------*/
@ -71,14 +72,14 @@
.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(../img/smoothness/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; } .ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(../img/smoothness/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; } .ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; }
.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a; } .ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a; }
.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; } .ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } .ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
/* Icons /* Icons
----------------------------------*/ ----------------------------------*/
/* states and .../img/smoothness/ */ /* states and ../img/smoothness */
.ui-icon { width: 16px; height: 16px; background-image: url(../img/smoothness/ui-icons_222222_256x240.png); } .ui-icon { width: 16px; height: 16px; background-image: url(../img/smoothness/ui-icons_222222_256x240.png); }
.ui-widget-content .ui-icon {background-image: url(../img/smoothness/ui-icons_222222_256x240.png); } .ui-widget-content .ui-icon {background-image: url(../img/smoothness/ui-icons_222222_256x240.png); }
.ui-widget-header .ui-icon {background-image: url(../img/smoothness/ui-icons_222222_256x240.png); } .ui-widget-header .ui-icon {background-image: url(../img/smoothness/ui-icons_222222_256x240.png); }
@ -224,6 +225,8 @@
.ui-icon-seek-next { background-position: -32px -160px; } .ui-icon-seek-next { background-position: -32px -160px; }
.ui-icon-seek-prev { background-position: -48px -160px; } .ui-icon-seek-prev { background-position: -48px -160px; }
.ui-icon-seek-end { background-position: -64px -160px; } .ui-icon-seek-end { background-position: -64px -160px; }
.ui-icon-seek-start { background-position: -80px -160px; }
/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
.ui-icon-seek-first { background-position: -80px -160px; } .ui-icon-seek-first { background-position: -80px -160px; }
.ui-icon-stop { background-position: -96px -160px; } .ui-icon-stop { background-position: -96px -160px; }
.ui-icon-eject { background-position: -112px -160px; } .ui-icon-eject { background-position: -112px -160px; }
@ -268,28 +271,93 @@
----------------------------------*/ ----------------------------------*/
/* Corner radius */ /* Corner radius */
.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; } .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; }
.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; } .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; } .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; } .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; } .ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; } .ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
.ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; } .ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; } .ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; } .ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
/* Overlays */ /* Overlays */
.ui-widget-overlay { background: #aaaaaa url(../img/smoothness/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } .ui-widget-overlay { background: #aaaaaa url(../img/smoothness/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(../img/smoothness/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; }/* Accordion .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(../img/smoothness/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* Accordion
----------------------------------*/ ----------------------------------*/
/*
.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; } .ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
.ui-accordion .ui-accordion-li-fix { display: inline; } .ui-accordion .ui-accordion-li-fix { display: inline; }
.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; } .ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; } .ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } .ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; } .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
.ui-accordion .ui-accordion-content-active { display: block; } .ui-accordion .ui-accordion-content-active { display: block; }/* Autocomplete
----------------------------------*/
.ui-autocomplete-menu { position: absolute; cursor: default; }
.ui-autocomplete-loading { background: white url('../img/smoothness/ui-anim.basic.16x16.gif') right center no-repeat; }
.ui-autocomplete-over { background-color: #0A246A; color: white; }
/* Menu
----------------------------------*/
.ui-menu {
list-style:none;
padding: 2px;
margin: 0;
display:block;
}
.ui-menu .ui-menu {
margin-top: -3px;
}
.ui-menu .ui-menu-item {
margin:0;
padding: 0;
width: 100%;
}
.ui-menu .ui-menu-item a {
text-decoration:none;
display:block;
padding:.2em .4em;
line-height:1.5;
}
.ui-menu .ui-menu-item a.ui-state-hover,
.ui-menu .ui-menu-item a.ui-state-active {
margin: -1px;
}
/* Button
----------------------------------*/
.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
.ui-button-icons-only { width: 3em; }
button.ui-button-icons-only { width: 3.2em; }
/*button text element */
.ui-button .ui-button-text { display: block; line-height: 1.4; }
.ui-button-text-only .ui-button-text { padding: .4em 1em; }
.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
.ui-button-text-icon .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 1.8em; }
.ui-button-text-icons .ui-button-text { padding-right: 1.8em; }
/* no icon support for input elements, provide padding by default */
input.ui-button { padding: .4em 1em; }
/*button icon element(s) */
.ui-button-icon-only .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
.ui-button-text-icon .ui-icon-primary, .ui-button-text-icons .ui-icon-primary, .ui-button-icons-only .ui-icon-primary { left: .5em; }
.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
/*button sets*/
.ui-button-set { margin-right: 7px; }
.ui-button-set .ui-button { margin-left: 0; margin-right: -.3em; }
/* workarounds */
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
/* Datepicker /* Datepicker
@ -304,11 +372,10 @@
.ui-datepicker .ui-datepicker-next-hover { right:1px; } .ui-datepicker .ui-datepicker-next-hover { right:1px; }
.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } .ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; }
.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } .ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; } .ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
.ui-datepicker select.ui-datepicker-month-year {width: 100%;} .ui-datepicker select.ui-datepicker-month-year {width: 100%;}
.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-month,
.ui-datepicker select.ui-datepicker-year { width: 49%;} .ui-datepicker select.ui-datepicker-year { width: 49%;}
.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; }
.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } .ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } .ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; }
.ui-datepicker td { border: 0; padding: 1px; } .ui-datepicker td { border: 0; padding: 1px; }
@ -355,13 +422,13 @@
height: 200px; /*must have*/ height: 200px; /*must have*/
}/* Dialog }/* Dialog
----------------------------------*/ ----------------------------------*/
.ui-dialog { position: relative; padding: .2em; width: 300px; } .ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative; } .ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative; }
.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } .ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; }
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } .ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } .ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; } .ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } .ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
@ -374,10 +441,10 @@
.ui-resizable { position: relative;} .ui-resizable { position: relative;}
.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;} .ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } .ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0px; } .ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0px; } .ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0px; height: 100%; } .ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0px; height: 100%; } .ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } .ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } .ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } .ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
@ -385,7 +452,7 @@
----------------------------------*/ ----------------------------------*/
.ui-slider { position: relative; text-align: left; } .ui-slider { position: relative; text-align: left; }
.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } .ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; } .ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
.ui-slider-horizontal { height: .8em; } .ui-slider-horizontal { height: .8em; }
.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } .ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
@ -399,12 +466,12 @@
.ui-slider-vertical .ui-slider-range-min { bottom: 0; } .ui-slider-vertical .ui-slider-range-min { bottom: 0; }
.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs .ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
----------------------------------*/ ----------------------------------*/
.ui-tabs { padding: .2em; zoom: 1; } .ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; } .ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; } .ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; } .ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; } .ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; } .ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ .ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; } .ui-tabs .ui-tabs-panel { display: block; border: 0; padding: 1em 1.4em; background: none; }
.ui-tabs .ui-tabs-hide { display: none !important; } .ui-tabs .ui-tabs-hide { display: none !important; }

13
cache/css/main.css vendored
View File

@ -287,7 +287,6 @@ table.table-classic tr.last td.titre {
background:#606060; background:#606060;
color:#ffffff; color:#ffffff;
font:600 1.4em Arial, Verdana, Sans-serif; font:600 1.4em Arial, Verdana, Sans-serif;
letter-spacing:1px;
line-height:1.2em; line-height:1.2em;
border:1px solid; border:1px solid;
} }
@ -422,3 +421,15 @@ table.greffe td.type {
.blockh2{ .blockh2{
margin:5px; margin:5px;
} }
.adresse {
float:left;
margin: 0px;
padding: 1px;
width: 250px;
vertical-align: middle;
}
.ui-dialog-content {
text-align:left;
}

1
cache/css/menu2.css vendored
View File

@ -95,6 +95,7 @@
#Menu div, #Menu div,
#Menu.ui-accordion .ui-accordion-content { #Menu.ui-accordion .ui-accordion-content {
-moz-background:none; -moz-background:none;
overflow: hidden;
background:none; background:none;
border: none; border: none;
color:#222222; color:#222222;

8
cache/css/saisie.css vendored
View File

@ -2,7 +2,7 @@ fieldset { clear:both; width:90%; margin:1.5em 1em 1em 1em; padding:0;}
fieldset select { width:250px; } fieldset select { width:250px; }
fieldset label {width:10em;} fieldset label {width:10em;}
legend { margin-left:1em; color:#000000; font-weight:bold;} legend { margin-left:1em; color:#000000; font-weight:bold;}
label { clear:both; float:left; width:18em; margin-right:1em; text-align:right; font-weight:bold;} label { clear:both; float:left; width:20em; margin-right:1em; text-align:right; font-weight:bold;}
input, select, textarea { width:250px; float:left; margin-bottom:5px; } input, select, textarea { width:250px; float:left; margin-bottom:5px; }
input.widthauto {width:auto; } input.widthauto {width:auto; }
@ -18,7 +18,7 @@ form p { clear:both; margin-left:18em; }
form em {color:#FF0000;} form em {color:#FF0000;}
#subFormSaisie { clear:both; } #subFormSaisie { clear:both; }
#subFormSaisie p { margin-left:16em; } #subFormSaisie p { margin-left:19em; }
#subFormSaisie select { width:300px; } #subFormSaisie select { width:300px; }
#NouveauDirigeant2 {display:none} #NouveauDirigeant2 {display:none}
@ -26,6 +26,8 @@ form em {color:#FF0000;}
#formActionnaire {display:none} #formActionnaire {display:none}
#formParticipation {display:none} #formParticipation {display:none}
#frmCreateMandataires { font-size:0.8em; }
#frmCreateMandataires label { font-size:1em; }
#frmCreateMandataires select { width:200px; } #frmCreateMandataires select { width:200px; }
div.info {clear:both; margin-left:16em; margin-bottom:5px;} div.info {clear:both; margin-left:19em; margin-bottom:5px;}

3
cache/css/surveillance.css vendored
View File

@ -1,6 +1,7 @@
* { margin:0; padding:0;}
#surveillance {margin:5px; border-collapse:collapse; border:1px solid; font:normal 11px Arial, Verdana, Sans-serif; letter-spacing:1px; line-height: 1em;} #surveillance {margin:5px; border-collapse:collapse; border:1px solid; font:normal 11px Arial, Verdana, Sans-serif; letter-spacing:1px; line-height: 1em;}
#surveillance tr {border:1px solid;} #surveillance tr {border:1px solid;}
#surveillance th {border:1px solid; padding:5px 15px 5px 2px;} #surveillance th {border:1px solid; padding:5px 5px 5px 2px;}
#surveillance td {border:1px solid; text-align:center; padding:2px; } #surveillance td {border:1px solid; text-align:center; padding:2px; }
#surveillance .aleft {text-align:left;} #surveillance .aleft {text-align:left;}
#surveillance .action {clear:both; margin:0; padding:0; letter-spacing:1px; line-height: 1em;} #surveillance .action {clear:both; margin:0; padding:0; letter-spacing:1px; line-height: 1em;}

142
includes/commentaires/commentaires.php Normal file
View File

@ -0,0 +1,142 @@
<?php
function commentaires_graph($id, $titre, $ratios = array() ){
$pattern = '/(Rs?)\[(.*)]#(.{1})/';
$data = array();
$data['x'] = commentaires_graph_x();
foreach($ratios as $ratio){
FB::log($ratio, 'ratio');
if( preg_match($pattern, $ratio, $matches) ){
$typeRatio = $matches[1];
$numRatio = $matches[2];
$typeElement = $matches[3];
$titreRatio = commentaires_graph_lib($numRatio);
switch($typeRatio){
case 'R' : $titreRatio.= ' - Entreprise'; break;
case 'Rs' : $titreRatio.= ' - Secteur'; break;
}
$data['y'][] = array(
'titre' => $titreRatio,
'data' => commentaires_graph_y($typeRatio, $numRatio),
'style' => $typeElement,
);
}
}
$output = commentaires_graph_xy($id, $titre, $data);
return $output;
}
function commentaires_graph_lib($numRatio){
global $ratiosInfos;
return htmlspecialchars_decode(
$ratiosInfos['r'.$numRatio]['libelle'],
ENT_QUOTES);
}
function commentaires_graph_x(){
global $bilansInfos;
$output = array();
foreach($bilansInfos as $bilan){
$output[] = $bilan['dateCloture'];
}
return $output;
}
function commentaires_graph_y($typeRatio, $numRatio){
global $ratiosEntrep, $ratiosSecteur;
FB::log($typeRatio, 'typeRatio');
switch($typeRatio){
case 'R' : $tabRatio = $ratiosEntrep; break;
case 'Rs' : $tabRatio = $ratiosSecteur; break;
}
$output = array();
foreach($tabRatio as $key => $val){
FB::log($val['r'.$numRatio], 'val');
$output[$key] = $val['r'.$numRatio];
}
return $output;
}
function commentaires_graph_xy($id, $titre, $data){
require_once 'phpchartdir/phpchartdir.php';
$path = PATH_SITE.'/cache/imgcache/';
$file = $id.'.png';
if(count($data)<=1){
$output = 0;
}else{
//Tri des données
foreach($data['y'] as $yKey => $y){
$i = 0;
foreach($y['data'] as $val){
$dataTri[$data['x'][$i]] = $val;
$i++;
}
ksort($dataTri);
$data['y'][$yKey]['data'] = array_values($dataTri);
}
sort($data['x']);
//Génération du graphique
$c = new XYChart(500, 350);
$c->addTitle($titre, 'times.ttf', 10);
$c->yAxis->setTitle('EUR');
$c->yAxis->setWidth(2);
$c->xAxis->setTitle('Années');
$c->xAxis->setWidth(2);
$legendObj = $c->addLegend2(25, 25, -2, "times.ttf", 9);
$legendObj->setBackground(Transparent, Transparent);
$c->setPlotArea(50, 90, 280, 200);
//Génération des labels
$labelsX = array();
foreach($data['x'] as $x){
$annee = substr($x, 0, 4);
$mois = substr($x, 4, 2);
$jour = substr($x, 6, 2);
$labelsX[] = $annee;
}
//Détection multi-bar
$graphStyleMH = false;
$precStyle = '';
foreach($data['y'] as $ydata){
if($ydata['style']=='H' && $precStyle == 'H'){
$graphStyleMH = true;
}
$precStyle = $ydata['style'];
}
//Affichage standard
if(!$graphStyleMH){
foreach($data['y'] as $ydata){
switch($ydata['style']){
case 'L':
$lineLayer = $c->addLineLayer(
$ydata['data'], -1, $ydata['titre']);
$lineLayer->setLineWidth(2);
break;
case 'H':
$c->addBarLayer(
$ydata['data'], -1, $ydata['titre']);
break;
}
}
//Affichage multibar
}else{
$layer = $c->addBarLayer2(Side);
$color = array(0xff8080, 0x80ff80);
$i = 0;
foreach($data['y'] as $ydata){
FB::log($ydata['data'], 'ydata');
$layer->addDataSet($ydata['data'], $color[$i], $ydata['titre']);
$i++;
}
}
$c->xAxis->setLabels($labelsX);
if( $c->makeChart($path.$file) === true ){
$output = $file;
}
else{
$output = false;
}
}
return $output;
}

2
includes/ratios/functions.php
View File

@ -367,7 +367,7 @@ function filtreTypeBilans($bilansInfos, $ratiosEntrep, $ratiosEntrepEvol, $ratio
array_splice($bilansInfos, $index, 1); array_splice($bilansInfos, $index, 1);
array_splice($ratiosEntrep, $index, 1); array_splice($ratiosEntrep, $index, 1);
array_splice($ratiosEntrepEvol, $index, 1); array_splice($ratiosEntrepEvol, $index, 1);
array_splice($ratiosSecteur, $index, 1); //array_splice($ratiosSecteur, $index, 1);
if(count($dataActif)>0) array_splice($dataActif, $index, 1); if(count($dataActif)>0) array_splice($dataActif, $index, 1);
if(count($dataPassif)>0) array_splice($dataPassif, $index, 1); if(count($dataPassif)>0) array_splice($dataPassif, $index, 1);
if(count($dataSIG)>0) array_splice($dataSIG, $index, 1); if(count($dataSIG)>0) array_splice($dataSIG, $index, 1);

11
includes/ratios/ratios.php
View File

@ -30,7 +30,13 @@ function formatRatios($bilansInfos, $ratiosEntrep, $ratiosEntrepEvol, $ratiosInf
$cle[$key] = $row['cle']; $cle[$key] = $row['cle'];
} }
//Tri du tableau de référence suivant la date de cloture //Tri du tableau de référence suivant la date de cloture
array_multisort($date, SORT_DESC, $duree, SORT_DESC, $devise, SORT_DESC, $unite, SORT_DESC, $cle, SORT_DESC, $bilansInfos); array_multisort(
$date, SORT_DESC,
$duree, SORT_DESC,
$devise, SORT_DESC,
$unite, SORT_DESC,
$cle, SORT_DESC,
$bilansInfos);
//Tri des autres tableaux //Tri des autres tableaux
$tempRatiosEntrep = $ratiosEntrep; $tempRatiosEntrep = $ratiosEntrep;
@ -41,7 +47,8 @@ function formatRatios($bilansInfos, $ratiosEntrep, $ratiosEntrepEvol, $ratiosInf
{ {
$ratiosEntrep[$i] = $tempRatiosEntrep[$row['cle']]; $ratiosEntrep[$i] = $tempRatiosEntrep[$row['cle']];
$ratiosEntrepEvol[$i] = $tempRatiosEntrepEvol[$row['cle']]; $ratiosEntrepEvol[$i] = $tempRatiosEntrepEvol[$row['cle']];
$ratiosSecteur[$i] = $tempRatiosSecteur[$row['cle']]; if(is_array($tempRatiosSecteur[$row['cle']]))
$ratiosSecteur[$i] = $tempRatiosSecteur[$row['cle']];
//Génération données graphique actif //Génération données graphique actif
$dataActif[$i] = array( $dataActif[$i] = array(

73
www/pages/rsynthese.php
View File

@ -51,12 +51,11 @@ $niveau = isset($_REQUEST['niveau']) ? $_REQUEST['niveau'] : '';
} }
#commentaires table td, #commentaires table th { #commentaires table td, #commentaires table th {
padding:2px;
border:1px solid; border:1px solid;
} }
#commentaires table { #commentaires table {
color:gray; color:grey;
border-collapse:collapse; border-collapse:collapse;
margin:5px 0; margin:5px 0;
width:100%; width:100%;
@ -78,7 +77,7 @@ $niveau = isset($_REQUEST['niveau']) ? $_REQUEST['niveau'] : '';
} }
#commentaires table tr.VERT { #commentaires table tr.VERT {
background:#3c0; background:#00FF00;
color:#000000; color:#000000;
} }
@ -295,6 +294,7 @@ if($element!==false){ echo dRow($element['lib'], $element['data'], $element['tit
require_once 'mappy/mappy.php'; require_once 'mappy/mappy.php';
$ville = ' '.trim(preg_replace('/([0-9]|ARRONDISSEMENT|_)/i',' ',$etab['Ville'])).' '; $ville = ' '.trim(preg_replace('/([0-9]|ARRONDISSEMENT|_)/i',' ',$etab['Ville'])).' ';
$ville = trim(strtr($ville, array(' EME '=>'', ' ER '=>''))); $ville = trim(strtr($ville, array(' EME '=>'', ' ER '=>'')));
$firephp->log($ville, 'ville');
if ( hasPref('mappy') && in_array(strtoupper($ville), $tabVilleMappy) ) if ( hasPref('mappy') && in_array(strtoupper($ville), $tabVilleMappy) )
{ {
$rue = trim( strtr( $rue = trim( strtr(
@ -347,7 +347,7 @@ if ( hasPref('mappy') && in_array(strtoupper($ville), $tabVilleMappy) )
//News //News
if (preg_match('/\bNEWS\b/i', $_SESSION['tabInfo']['pref'])) if (preg_match('/\bNEWS\b/i', $_SESSION['tabInfo']['pref']))
{ {
/* Information presse 15 Aug 2007 09:21:49 GMT - */ // Information presse 15 Aug 2007 09:21:49 GMT
require_once ('XML/RSS.php'); require_once ('XML/RSS.php');
$rss=&new XML_RSS('http://news.google.fr/news?hl=fr&ned=fr&q='.urlencode('"'.$etab['Nom'].'"').'&output=rss'); $rss=&new XML_RSS('http://news.google.fr/news?hl=fr&ned=fr&q='.urlencode('"'.$etab['Nom'].'"').'&output=rss');
$rss->parse(); $rss->parse();
@ -413,8 +413,9 @@ if ($siren != $_SESSION['tabInfo']['entrep']['siren']) {
$tabEntrep['fj'] = $etab['FJ']; $tabEntrep['fj'] = $etab['FJ'];
$_SESSION['tabInfo']['entrep'] = $tabEntrep; $_SESSION['tabInfo']['entrep'] = $tabEntrep;
$raisonSociale = $etab['Nom']; $raisonSociale = $etab['Nom'];
} else } else {
$raisonSociale = $_SESSION['tabInfo']['entrep']['raisonSociale']; $raisonSociale = $_SESSION['tabInfo']['entrep']['raisonSociale'];
}
?> ?>
<h1 class="titre page">ANNONCES L&Eacute;GALES</h1> <h1 class="titre page">ANNONCES L&Eacute;GALES</h1>
<?php <?php
@ -435,7 +436,7 @@ if (count($annonces)>0)
$annoncesBodacc[] = $ann; $annoncesBodacc[] = $ann;
} }
} }
/** Affichage de la liste des annonces **/ // Affichage de la liste des annonces
//Affiche annonces Bodacc //Affiche annonces Bodacc
if (count($annoncesBodacc)>0) if (count($annoncesBodacc)>0)
{ {
@ -569,7 +570,7 @@ if (count($annonces)>0)
} }
else else
{ {
/** Aucune annonce bodacc pour cette entreprise **/ // Aucune annonce bodacc pour cette entreprise
?> ?>
<h2>Evénements légaux</h2> <h2>Evénements légaux</h2>
<table> <table>
@ -683,12 +684,19 @@ $ratiosSecteur = $result['ratiosSecteur'];
$dataActif = $result['dataActif']; $dataActif = $result['dataActif'];
$dataPassif = $result['dataPassif']; $dataPassif = $result['dataPassif'];
$dataSIG = $result['dataSIG']; $dataSIG = $result['dataSIG'];
FB::log($bilansInfos, 'bilansInfos');
FB::log($ratiosSecteur, 'ratiosSecteur');
list($typeBilan, $numBilan) = countBilans($bilansInfos, $typeBilan); list($typeBilan, $numBilan) = countBilans($bilansInfos, $typeBilan);
$numBilanN = $numBilan['N']; $numBilanN = $numBilan['N'];
$numBilanC = $numBilan['C']; $numBilanC = $numBilan['C'];
$numBilanB = $numBilan['B']; $numBilanB = $numBilan['B'];
$numBilanA = $numBilan['A']; $numBilanA = $numBilan['A'];
list($bilansInfos, $ratiosEntrep, $ratiosEntrepEvol, $ratiosSecteur, $dataActif, $dataPassif, $dataSIG) = filtreTypeBilans($bilansInfos, $ratiosEntrep, $ratiosEntrepEvol, $ratiosSecteur, $dataActif, $dataPassif, $dataSIG, $typeBilan); list($bilansInfos, $ratiosEntrep, $ratiosEntrepEvol,
$ratiosSecteur, $dataActif, $dataPassif, $dataSIG) =
filtreTypeBilans($bilansInfos, $ratiosEntrep, $ratiosEntrepEvol,
$ratiosSecteur, $dataActif, $dataPassif, $dataSIG, $typeBilan);
$nbrAnnees = count($bilansInfos)-1; $nbrAnnees = count($bilansInfos)-1;
$data = synthese_datagraph($bilansInfos, $ratiosEntrep, $ratio); $data = synthese_datagraph($bilansInfos, $ratiosEntrep, $ratio);
$dataGraph = $data['graph']; $dataGraph = $data['graph'];
@ -1571,6 +1579,7 @@ else
?> ?>
<h1 class="titre page">RATIOS</h1> <h1 class="titre page">RATIOS</h1>
<?php <?php
$firephp->log($_SESSION, 'SESSION');
if (count($bilansInfos)==0) if (count($bilansInfos)==0)
{ {
?> ?>
@ -1587,7 +1596,7 @@ else
<td width="30">&nbsp;</td> <td width="30">&nbsp;</td>
<td width="200" class="StyleInfoLib">Secteur d'activité :</td> <td width="200" class="StyleInfoLib">Secteur d'activité :</td>
<td width="340" class="StyleInfoData"> <td width="340" class="StyleInfoData">
<?php print $_SESSION['tabInfo']['entrep']['nafEn']; ?> - <?php print $_SESSION['tabInfo']['entrep']['nafEnLib']; ?> <?=$_SESSION['tabInfo']['entrep']['nafEn']?> - <?=$_SESSION['tabInfo']['entrep']['nafEnLib']?>
</td> </td>
</tr> </tr>
<?php <?php
@ -1727,6 +1736,8 @@ $tabCommentaires = $etab['tabCommentaires'];
<br/> <br/>
<div class="blockh2" id="commentaires"> <div class="blockh2" id="commentaires">
<?php <?php
FB::log($ratiosSecteur, 'ratiosSecteur');
require_once 'commentaires/commentaires.php';
if(count($tabCommentaires)>0) if(count($tabCommentaires)>0)
{ {
$ligne = true; $ligne = true;
@ -1735,13 +1746,53 @@ if(count($tabCommentaires)>0)
$output = ''; $output = '';
if(!is_array($commentaires) && !empty($commentaires)) if(!is_array($commentaires) && !empty($commentaires))
{ {
$output.= html_entity_decode($commentaires,ENT_COMPAT,'utf-8')."\n"; //Traitement préalable des lignes
if ( preg_match('/<(table)/i', $output) ){ $commentaires = html_entity_decode(
$commentaires,
ENT_COMPAT,
'utf-8');
//Traitement des graphiques
$pattern = '/\[GRAPHIQUE id=(.*?) titre=\'(.*?)\',(.*),(.*)]/';
if( preg_match($pattern, $commentaires, $matches) ){
//Initialisation des éléments
FB::log($matches[0],'graphique');
$image_id = $matches[1];
$graph_titre = $matches[2];
$ratio1 = $matches[3];
$ratio2 = $matches[4];
//Génération du graphique
if (($siret*1)==0 || ($siren*1)<100){
$id = 'gcomment-'.$idEntreprise.'-'.$image_id;
}else{
$id = 'gcomment-'.$siret.'-'.$image_id;
}
$image_file = commentaires_graph($id, $graph_titre,
array($ratio1, $ratio2));
//Le fichier image existe
if( file_exists(PATH_SITE.'/cache/imgcache/'.$image_file) ){
$commentaires = str_replace(
$matches[0],
'<img src="./imgcache/'.$image_file.'" />',
$commentaires);
}else{
$commentaires = str_replace(
$matches[0],
'Erreur génération graphique',
$commentaires);
}
}
$output.= $commentaires."\n";
//Détection des début et fin de tableau
if ( preg_match('/<(table)/i', $commentaires) ){
$ligne = false; $ligne = false;
} }
if ( preg_match('/<\/(table)>/i', $commentaires) ){ if ( preg_match('/<\/(table)>/i', $commentaires) ){
$ligne = true; $ligne = true;
} }
//Nouvelle ligne
if($ligne){ $output.= '<br/>'; } if($ligne){ $output.= '<br/>'; }
echo $output; echo $output;
} }