Changeset 59237 in spip-zone
- Timestamp:
- Mar 12, 2012, 2:25:57 PM (9 years ago)
- Location:
- _plugins_/hydraulic/branches/v0.3
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
_plugins_/hydraulic/branches/v0.3/formulaires/lechapt_calmon.html
r59231 r59237 1 1 [<div class='hyd_formulaire_erreur '><span>(#ENV*{message_erreur})</span></div>] 2 2 <script language="javascript" type="text/javascript" src="#CHEMIN{js/hyd_fonctions.js}"></script> 3 3 <script> 4 4 -
_plugins_/hydraulic/branches/v0.3/formulaires/lechapt_calmon.php
r59233 r59237 201 201 // Vérifier que les champs obligatoires sont bien là : 202 202 foreach($tChOblig as $obligatoire) { 203 if (!_request($obligatoire) ) {203 if (!_request($obligatoire) && id_decoupe($obligatoire) != 'Q' && id_decoupe($obligatoire) != 'J') { 204 204 $erreurs[$obligatoire] = _T('hydraulic:champ_obligatoire'); 205 205 } … … 253 253 $pas = 1; 254 254 $i = 0; 255 256 255 257 256 foreach($choix_radio as $ind){ … … 267 266 } 268 267 } 268 $max += $pas/2; 269 269 270 270 switch($ValCal){ 271 271 case 'Q': 272 if($L != 0 && $M != 0 && ($Lg != 0 || $min != 0)){272 if($Lg != 0 || $min != 0){ 273 273 for($i = $min; $i <= $max; $i+= $pas){ 274 274 $result[] = pow(((($J*pow($D, $N))/$L)*(1000/$Lg)), 1/$M); … … 282 282 283 283 case 'D': 284 if( ($J != 0 || $min != 0) && $N!= 0){284 if($J != 0 || $min != 0){ 285 285 for($i = $min; $i <= $max; $i+= $pas){ 286 286 $result[] = pow(((($L*pow($Q, $M))/$J)*($Lg/1000)), 1/$N); … … 306 306 307 307 case 'Lg': 308 if($ L != 0 && ($Q != 0 || $min != 0)){308 if($Q != 0 || $min != 0){ 309 309 for($i = $min; $i <= $max; $i+= $pas){ 310 310 $result[] = (($J*pow($D, $N))/($L*pow($Q,$M)))*1000 ; … … 358 358 } 359 359 360 $echo.= ' <th s cope="col" rowspan="2">'.$tabClass['var'].'</th>361 <th s cope="col" rowspan="2">'.$tabClass['cal'].'</th>360 $echo.= ' <th style="text-align:center;" scope="col" rowspan="2">(Abscisse)<br/>'.$tabClass['var'].'</th> 361 <th style="text-align:center;" scope="col" rowspan="2">(Ordonnée)<br/>'.$tabClass['cal'].'</th> 362 362 </tr> 363 363 </thead> … … 409 409 if(isset($result)) { 410 410 $oGraph->AddSerie( 411 'ligne_lechapt_calmon',411 _T('hydraulic:param_'.$ValCal), 412 412 $tabAbs, 413 413 $result, -
_plugins_/hydraulic/branches/v0.3/hydraulic.css.html
r59103 r59237 89 89 background-color: #eeeeee; 90 90 } 91 92 #jqplot_ligne_lechapt_calmon{ 93 margin: 0 auto; 94 } -
_plugins_/hydraulic/branches/v0.3/hydraulic_pipelines.php
r59103 r59237 9 9 <script language="javascript" type="text/javascript" src="'.url_absolue(find_in_path('lib/dist/jquery.min.js')).'"></script> 10 10 <script language="javascript" type="text/javascript" src="'.url_absolue(find_in_path('lib/dist/jquery.jqplot.min.js')).'"></script> 11 <script type="text/javascript" src="'.url_absolue(find_in_path('lib/dist/plugins/jqplot.cursor.min.js')).'"></script> 12 <script language="javascript" type="text/javascript" src="'.url_absolue(find_in_path('js/hyd_fonctions.js')).'"></script>'."\n"; 11 <script type="text/javascript" src="'.url_absolue(find_in_path('lib/dist/plugins/jqplot.cursor.min.js')).'"></script>'."\n"; 13 12 $flux .= "\n<!-- Fin Plugin hydraulic -->\n"; 14 13 return $flux;
Note: See TracChangeset
for help on using the changeset viewer.