Changeset 59237 in spip-zone

Timestamp:

Mar 12, 2012, 2:25:57 PM (8 years ago)

Author:

m.dulondel@…

Message:

 

Location:

_plugins_/hydraulic/branches/v0.3

Files:

• formulaires/lechapt_calmon.html (modified) (1 diff)
• formulaires/lechapt_calmon.php (modified) (7 diffs)
• hydraulic.css.html (modified) (1 diff)
• hydraulic_pipelines.php (modified) (1 diff)

_plugins_/hydraulic/branches/v0.3/formulaires/lechapt_calmon.html

@@ -1 +1 @@
 [<div class='hyd_formulaire_erreur '><span>(#ENV*{message_erreur})</span></div>]
-
+<script language="javascript" type="text/javascript" src="#CHEMIN{js/hyd_fonctions.js}"></script>
 <script>
         

_plugins_/hydraulic/branches/v0.3/formulaires/lechapt_calmon.php

@@ -201 +201 @@
     // Vérifier que les champs obligatoires sont bien là :
     foreach($tChOblig as $obligatoire) {
-        if (!_request($obligatoire)) {
+        if (!_request($obligatoire) && id_decoupe($obligatoire) != 'Q' && id_decoupe($obligatoire) != 'J') {
                         $erreurs[$obligatoire] = _T('hydraulic:champ_obligatoire');
         }
@@ -253 +253 @@
         $pas = 1;
         $i = 0;
-        
                 
         foreach($choix_radio as $ind){
@@ -267 +266 @@
                 }
         }
+        $max += $pas/2;
         
         switch($ValCal){
                 case 'Q':
-                        if($L != 0 && $M != 0 && ($Lg != 0 || $min != 0)){                      
+                        if($Lg != 0 || $min != 0){                      
                                 for($i = $min; $i <= $max; $i+= $pas){
                                         $result[] = pow(((($J*pow($D, $N))/$L)*(1000/$Lg)), 1/$M);
@@ -282 +282 @@
                 
                 case 'D': 
-                        if(($J != 0 || $min != 0) && $N != 0){
+                        if($J != 0 || $min != 0){
                                 for($i = $min; $i <= $max; $i+= $pas){
                                         $result[] = pow(((($L*pow($Q, $M))/$J)*($Lg/1000)), 1/$N);
@@ -306 +306 @@
                 
                 case 'Lg':
-                        if($L != 0 && ($Q != 0 || $min != 0)){
+                        if($Q != 0 || $min != 0){
                                 for($i = $min; $i <= $max; $i+= $pas){
                                         $result[] = (($J*pow($D, $N))/($L*pow($Q,$M)))*1000 ;
@@ -358 +358 @@
                                 }
 
-        $echo.= '               <th scope="col" rowspan="2">'.$tabClass['var'].'</th>
-                                        <th scope="col" rowspan="2">'.$tabClass['cal'].'</th>
+        $echo.= '               <th style="text-align:center;" scope="col" rowspan="2">(Abscisse)<br/>'.$tabClass['var'].'</th>
+                                        <th style="text-align:center;" scope="col" rowspan="2">(Ordonnée)<br/>'.$tabClass['cal'].'</th>
                                 </tr>   
                         </thead>
@@ -409 +409 @@
                 if(isset($result)) {
                         $oGraph->AddSerie(
-                                'ligne_lechapt_calmon',
+                                _T('hydraulic:param_'.$ValCal),
                                 $tabAbs,
                                 $result,

_plugins_/hydraulic/branches/v0.3/hydraulic.css.html

@@ -89 +89 @@
     background-color: #eeeeee;
 }
+
+#jqplot_ligne_lechapt_calmon{
+        margin: 0 auto; 
+}

_plugins_/hydraulic/branches/v0.3/hydraulic_pipelines.php

@@ -9 +9 @@
             <script language="javascript" type="text/javascript" src="'.url_absolue(find_in_path('lib/dist/jquery.min.js')).'"></script>
             <script language="javascript" type="text/javascript" src="'.url_absolue(find_in_path('lib/dist/jquery.jqplot.min.js')).'"></script>
-            <script type="text/javascript" src="'.url_absolue(find_in_path('lib/dist/plugins/jqplot.cursor.min.js')).'"></script>
-            <script language="javascript" type="text/javascript" src="'.url_absolue(find_in_path('js/hyd_fonctions.js')).'"></script>'."\n";
+            <script type="text/javascript" src="'.url_absolue(find_in_path('lib/dist/plugins/jqplot.cursor.min.js')).'"></script>'."\n";
    $flux .= "\n<!-- Fin Plugin hydraulic -->\n";
    return $flux;