Merge branch 'amdadev'

Benjamin Renard
2 parents 5177e498 a478e892
Showing 4 changed files with 8 additions and 7 deletions Show diff stats
js/app/models/PlotObjects/PlotObjectConfig.js
js/app/views/PlotComponents/PlotBaseSerieForm.js
js/app/views/PlotComponents/PlotSpectroForm.js
php/classes/UserMgr.php
@@ -484,8 +484,8 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 	],
  
 	availableFilteringLevel : [
-                   {'key' : 1, 'value' : 'Low'},
-                   {'key' : 2, 'value' : 'Medium'},
+                   {'key' : 1, 'value' : 'Weak'},
+                   {'key' : 2, 'value' : 'Intermediate/moderated'},
                    {'key' : 3, 'value' : 'Strong'}
     ],
  
@@ -104,8 +104,8 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, {
 		    this.addStandardFieldSet('Lines', 'serie-lines-activated', this.addStandardLineItems('serie-lines')),
 		    this.addStandardFieldSet('Symbols', 'serie-symbols-activated', this.addStandardSymbolsItems('serie-symbols')),
 		    this.addStandardFieldSet('Time ticks', 'serie-timetick-activated', this.getTimeTickItems()),
-	                        this.addStandardFieldSet('Interval ticks', 'serie-intervaltick-activated', this.getIntervalTickItems()),
-                                            this.addStandardFieldSet('Filtering ( ! Experimental ! )', 'filtering-activated', this.getFilteringItems())
+	            this.addStandardFieldSet('Interval ticks', 'serie-intervaltick-activated', this.getIntervalTickItems()),
+                    this.addStandardFieldSet('Spike Filtering ( ! Experimental ! )', 'filtering-activated', this.getFilteringItems())
 		];
 	}
 });
@@ -43,13 +43,13 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, {
 			this.addStandardCheck('spectro-log0-as-min', 'Show 0 values as Min Values in log scale', function(name, value, oldValue) {
 				me.object.set('spectro-log0-as-min', value);
 			}),
-                                                            this.addStandardCombo('spectro-normalization', 'Normalization', amdaPlotObj.PlotObjectConfig.availableSpectroNormalization, function(name, value, oldValue) {
+                        this.addStandardCombo('spectro-normalization', 'Normalization', amdaPlotObj.PlotObjectConfig.availableSpectroNormalization, function(name, value, oldValue) {
 		    	if (me.object.get('spectro-normalization') != value)
 		    	{
 		    		me.object.set('spectro-normalization', value);
 		    	}
                                                             }),
-                                                            this.addStandardFieldSet('Filtering ( ! Experimental ! )', 'filtering-activated', this.getFilteringItems())
+                        this.addStandardFieldSet('Spike Filtering ( ! Experimental ! )', 'filtering-activated', this.getFilteringItems())
 		];
 	}
 });
@@ -729,7 +729,8 @@ class UserMgr
  
 		if (!empty($this->datasetsTimeRestriction)) {
 			foreach ($this->datasetsTimeRestriction as $datasetTimeRestriction) {
-				$nodes = $xp->query("//dataset[@xml:id='".str_replace('_','-',$datasetTimeRestriction['vi'])."']");
+				$dataset_id = str_replace('_','-',$datasetTimeRestriction['vi']);
+				$nodes = $xp->query("//dataset[@xml:id='".$dataset_id."' or @PriorID='".$dataset_id."']");
 				if ($nodes->length > 0) {
 					foreach ($nodes as $node) {
 						$timeRestriction = $datasetTimeRestriction['restriction'];