CDPP / AMDA_IHM

Commit dfa8db4f9128d89ac5496454f9687b3cd9d16f5a

Authored by Hacene SI HADJ MOHAND
1 parent 09a0cb29
Exists in master and in 75 other branches 10098, 10178, 5390, 6629, 7616, 8459, 8528, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, anr_tempete, cu2022, density_maps, develop, epn-tap, master_vge, mlplasmas, openam, test-merge

correcting derivedParam units

Showing 2 changed files with 3 additions and 4 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @dfa8db4
... ... @@ -197,11 +197,10 @@ class AmdaAction
197 197 }
198 198 break;
199 199 case 'derivedParam':
200   - error_log("child");
201 200 $info = $child->getAttribute('buildchain').'<br/>';
202 201  
203   - if($child->hasAttribute('units') && $child->getAttribute('units') != 'undefined')
204   - $info .= 'Units: '.$child->getAttribute('units').'<br/>';
  202 + if($child->hasAttribute('units') && $child->getAttribute('units') != 'undefined' && $child->getAttribute('units') != '')
  203 + $info .= 'Units: '.$child->getAttribute('units').'<br/>';
205 204 $samplingMode = $child->getAttribute('sampling_mode');
206 205 if($samplingMode == 'timestep'){
207 206 $info .= 'Sampling Time: '.$child->getAttribute('timestep');
... ...
php/classes/DerivedParamMgr.php
  Diff comments   View file @dfa8db4
... ... @@ -144,7 +144,7 @@ class DerivedParamMgr extends AmdaObjectMgr
144 144 $this->createObjectDescription($p);
145 145 $this->addToContent($p, $folder);
146 146 $info = $p->buildchain.'<br/>';
147   - if(isset($p->units) && $p->units != "undifined")
  147 + if(isset($p->units) && $p->units != "undefined")
148 148 $info .= 'Units: '.$p->units.'<br/>';
149 149 if($p->sampling_mode == 'timestep'){
150 150 $info .= 'Sampling Time: '.$p->timestep;
... ...