Commit 4e74ced3 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Revisa vista de gráficas, mejora lectura de list

parent 9cf50bf7

public/javascript/app/base/views/extensions/_CompositeSearchInTooltip.js

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ define([ 
		//		Extensión que instancia una búsqueda compuesta para ser mostrada en tooltip, a determinar por la lógica

		//		de quien importe esta extensión.

		//		Se puede configurar añadiendo propiedades a 'this.compositeConfig' y la instancia creada se coloca en

		//		'this.composite'.

		//		'this.composite'. Necesita tener disponible un canal de filtrado en 'this.queryChannel'.



		constructor: function(args) {

public/javascript/app/viewers/views/ChartsView.js

+9 −41
Original line number Diff line number Diff line 
define([

	'alertify/alertify.min'

	, "app/base/views/extensions/_CompositeInTooltipFromIconKeypad"

	, "app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar"

	, "app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries"

	, "app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider"
@@ -29,7 +28,6 @@ define([ 
	, "templates/SurveyStationDataList"

], function (

	alertify

	, _CompositeInTooltipFromIconKeypad

	, EmbeddedContentSelectionInTopbar

	, _ProcessDataDefinitionAndGetTimeSeries

	, ChartsWithLegendAndToolbarsAndSlider
@@ -114,15 +112,7 @@ define([ 
				},

				aggregationToolConfig: {

					defaultIntervalOptions: []

				},

				getIconKeypadNode: lang.hitch(this, function() {



					return this._optionNode;

				})/*,

				getIconKeypadNode: function() {



					return this.optionsContainerChartsTopNode;

				}*/

				}

			}, this.chartsConfig || {}]);



			this.filterConfig = this._merge([{
@@ -266,7 +256,7 @@ define([ 


		_clearSelection: function() {



			this._clearMapLayerSelection(markerId);

			this._clearMapLayerSelection();

		},



		_selectMarker: function(markerId) {
@@ -286,17 +276,18 @@ define([ 


		_publishSelectionToMapLayer: function(action, markerId) {



			// TODO rompe el mapa, arreglar

			//return;



			var pubBody = {

				selectionTarget: this._mapLayerSelectionTarget

				target: this._mapLayerSelectionTarget

			};



			if (markerId !== undefined) {

				pubBody.ids = markerId;

			}



			this._publish(this.getChannel(action), {

				body: pubBody

			});

			this._publish(this.getChannel(action), pubBody);

		},



		_updateGuideMessagesAfterSelect: function() {
@@ -337,8 +328,6 @@ define([ 


		_showMap: function(inputKey) {



			this._changeFilterOfNoCharts();



			this._initializeMap();



			this._publish(this.filterContainer.getChannel("SET_PROPS"), {
@@ -349,18 +338,6 @@ define([ 
			this._resetMarkerActive();

		},



		_changeFilterOfNoCharts: function() {



			this.chartContainer && this._publish(this.chartContainer.getChildChannel("iconKeypadComposite", 'HIDE'));

			this._publish(this.iconKeypadComposite.getChannel('SHOW'));

		},



		_changeFilterOfCharts: function() {



			this._publish(this.iconKeypadComposite.getChannel('HIDE'));

			this.chartContainer && this._publish(this.chartContainer.getChildChannel("iconKeypadComposite", 'SHOW'));

		},



		_initializeMap: function() {



			if (!this.map) {
@@ -399,8 +376,6 @@ define([ 


		_showList: function(inputKey) {



			this._changeFilterOfNoCharts();



			this._initializeList();



			this._publish(this.filterContainer.getChannel("SET_PROPS"), {
@@ -413,11 +388,7 @@ define([ 


			if (!this.browser) {

				this.browserConfig.parentChannel = this.filterContainer.getChannel();



				this.browser = new declare([

					ListLayout,

					ListController

				])(this.browserConfig);

				this.browser = new declare([ListLayout, ListController])(this.browserConfig);

			}

		},
@@ -450,8 +421,6 @@ define([ 


			this._initializeChart();



			this._changeFilterOfCharts();



			this._embedModule(this.chartContainer, inputKey);



			if (this._updateDataChart) {
@@ -469,8 +438,7 @@ define([ 
			if (!this.chartContainer) {

				this.chartContainer = new declare([

					ChartsWithLegendAndToolbarsAndSlider,

					_ProcessDataDefinitionAndGetTimeSeries,

					_CompositeInTooltipFromIconKeypad

					_ProcessDataDefinitionAndGetTimeSeries

				])(this.chartsConfig);

			}

		},

public/javascript/app/viewers/views/_TimeSeriesDataManagement.js

+15 −21
Original line number Diff line number Diff line 
define([

	"app/base/views/extensions/_CompositeInTooltipFromIconKeypad"

	, "dojo/_base/declare"

	"dojo/_base/declare"

	, "dojo/_base/lang"

	, "dojo/aspect"

	, "dojo/Deferred"
@@ -8,8 +7,7 @@ define([ 
	, "redmic/modules/base/_Store"

	, "redmic/modules/search/FacetsImpl"

], function(

	_CompositeInTooltipFromIconKeypad

	, declare

	declare

	, lang

	, aspect

	, Deferred
@@ -17,7 +15,8 @@ define([ 
	, _Store

	, FacetsImpl

) {

	return declare([_Filter, _CompositeInTooltipFromIconKeypad, _Store], {



	return declare([_Filter, _Store], {

		//	summary:

		//		Extensión para la vista de timeSeries para el manejo de datos.

		//	description:
@@ -73,7 +72,7 @@ define([ 
		_initializeDataView: function() {



			this.facetsConfig.queryChannel = this.queryChannel;

			this.facets = new declare([FacetsImpl])(this.facetsConfig);

			this.facets = new FacetsImpl(this.facetsConfig);

		},



		_mixDataViewEventsAndActions: function() {
@@ -211,21 +210,21 @@ define([ 


		_prepareTimeSeriesData: function(argument) {



			if (!this._showChartIsValid()) {

			if (this._showChartIsValid()) {

				return;

			}



			if (this._dataListIsEmpty()) {



				this._getListDataDfd = new Deferred();

				this._getListData();

			} else {

				this._generateTimeSeriesData();

			}

			}

		},



		_dataListIsEmpty: function() {



			return (!this._dataList || (this._dataList.length === 0));

			return !this._dataList || this._dataList.length === 0;

		},



		_getListData: function() {
@@ -235,11 +234,6 @@ define([ 
					returnFields: this._listDataReturnFields

				}

			});

		},



		_getIconKeypadNode: function() {



			return this._optionNode;

		}

	});

});

public/javascript/app/viewers/views/_TimeSeriesSelectionManagement.js

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ define([ 


		_showChartIsValid: function() {



			return Object.keys(this._insertedInTimeSeriesData).length ? true : false;

			return !!Object.keys(this._insertedInTimeSeriesData).length;

		},



		_clear: function() {

stylesheets @ 9ad4dad3

Compare 03d1d2d6 to 9ad4dad3
Original line number Diff line number Diff line 
Subproject commit 03d1d2d64f08eadc9b7e61fe2629f89ee0db6a4c
 
Subproject commit 9ad4dad3b0ba4a287887a7d35472490f191afae8