Commit 49c48f65 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Evita recargar charts previos, corrige jerarquía 

En el caso de que ya haya una capa cargada (la primera), no intenta
traer sus datos al quitarla y ponerla desde la leyenda.

Muestra correctamente las entradas de la leyenda jerárquica, aunque los
charts no se hayan cargado en el contenedor.

Mejora scroll de leyenda.
parent c18e979c

public/javascript/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js

+14 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ define([ 


			for (var i = 0; i < definitionIds.length; i++) {

				var cat = definitionIds[i];

				this._addChartLayerWithoutData(cat, 'avg');

				this._addChartLayerEntry(cat, 'avg');

				if (i === 0) {

					var dfd = new Deferred();

					this._continueBuildQueryAndRequestData(dfd, cat);
@@ -70,7 +70,7 @@ define([ 
			}

		},



		_addChartLayerWithoutData: function(cat, agg) {

		_addChartLayerEntry: function(cat, agg) {



			var catLayers = this._layers[cat],

				layerInstance = catLayers && catLayers[agg];
@@ -116,7 +116,11 @@ define([ 


		_subSmartLegendEntryDisabled: function(res) {



			console.log('disabled de leyenda capa', res);

			var layerId = res.layerId;



			if (!this._layerHasData[layerId]) {

				this._layerHasData[layerId] = true;

			}

		},



		_removeChartLayer: function(cat, agg) {
@@ -126,6 +130,13 @@ define([ 
			delete this._layerHasData[layerId];



			this.inherited(arguments);

		},



		_clearOldChartsData: function() {



			this.inherited(arguments);



			this._layerHasData = {};

		}

	});

});

public/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js

+7 −2
Original line number Diff line number Diff line
@@ -159,9 +159,14 @@ define([ 
			});



			if (changeObj.oldValue && this._chartsContainerIsReady) {

				this._clearOldChartsData();

			}

		},



		_clearOldChartsData: function() {



			this._emitEvt('CLEAR_LAYERS');

			this._interval && this._setInterval(this._interval);

			}

		},



		_parseDataForAggregationTool: function() {

public/javascript/redmic/modules/chart/SmartLegend/SmartLegend.js

+17 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ define([ 
				_currentData: {},

				_currentIndex: "noGrouped",

				_hiddenLayers: {},

				_layerEntries: {},

				_stateByLayerId: {}

			};
@@ -246,9 +247,15 @@ define([ 
		_subAddEntry: function(req) {



			var layerId = req.chart;



			if (this._layerEntries[layerId]) {

				return;

			}



			this._layerEntries[layerId] = req;

			this._stateByLayerId[layerId] = false;



			this._onLayerInfoUpdate(req);

			this._updateLegendContentWithNewInfo(req);

		},



		_subLayerAdded: function(res) {
@@ -256,6 +263,10 @@ define([ 
			var layerId = res.chart;

			this._stateByLayerId[layerId] = true;



			if (this._layerEntries[layerId]) {

				delete this._layerEntries[layerId];

			}



			this._emitEvt("GET_LAYER_INFO", {

				layerId: layerId

			});
@@ -732,6 +743,11 @@ define([ 
			this._publish(this.chartsList.getChildChannel("browser", "CLEAR"));



			this._emitEvt("GET_LAYER_INFO");



			for (var layerId in this._layerEntries) {

				var layerEntryInfo = this._layerEntries[layerId];

				this._onLayerInfoUpdate(layerEntryInfo);

			}

		}

	});

});

stylesheets @ b6df0ca0

Compare a7fb6fa4 to b6df0ca0
Original line number Diff line number Diff line 
Subproject commit a7fb6fa4a2902fd758d9e23808143283f9e2d90d
 
Subproject commit b6df0ca0f8da05c59df2444b2d60482a17938162