Commit 9789740d authored by CarlosGC1989's avatar CarlosGC1989
Browse files

Arregla error en tracking

parent 618d311e

public/javascript/app/designs/details/main/ActivityTrackingMap.js

+2 −1
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ define([ 
			this.target[1] = target;



			this._publish(this._widgets.tracking.getChannel("UPDATE_TARGET"), {

				target: target

				target: target,

				refresh: true

			});

		}

	});

public/javascript/app/designs/mapWithSideContent/main/_TrackingByFilter.js

+6 −11
Original line number Diff line number Diff line
@@ -74,6 +74,11 @@ define([ 


		_subSerializedFilter: function(req) {



			this._serializedFilter(req);

		},



		_serializedFilter: function(req) {



			var data = req.data;



			delete data.size;
@@ -81,21 +86,11 @@ define([ 


			this._lastDataFilter = data;



			for (var key in this._layerInstances)

			for (var key in this._layerInstances) {

				this._publish(this._layerInstances[key].getChildChannel('filter', "ADD_TO_QUERY"), {

					query: data

				});



			var queryDataChildren = {};



			for (key in data) {

				if (data[key] !== null)

					queryDataChildren[key] = data[key];

			}



			this._publish(this.browserWork.getChannel("SET_QUERY_DATA_CHILDREN"), {

				query: queryDataChildren

			});

		},



		_configByLayerInstance: function(obj) {

public/javascript/app/designs/mapWithSideContent/main/_TrackingWithList.js

+8 −1
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ define([ 
	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "dojo/aspect"

	, "redmic/modules/base/_SelectionBase"

	, "redmic/modules/browser/bars/Total"

	, "redmic/modules/browser/ListImpl"

	, "redmic/modules/browser/_ButtonsInRow"

	, "redmic/modules/browser/_Framework"
@@ -20,6 +22,8 @@ define([ 
	, declare

	, lang

	, aspect

	, _SelectionBase

	, Total

	, ListImpl

	, _ButtonsInRow

	, _Framework
@@ -29,7 +33,7 @@ define([ 
	, templateAnimalList

	, templatePlatformList

){

	return declare(null, {

	return declare(_SelectionBase, {

		//	summary:

		//		Vista de Tracking.

		//	description:
@@ -60,6 +64,9 @@ define([ 
			this.browserWorkConfig = this._merge([{

				parentChannel: this.getChannel(),

				target: this.targetBrowserWork,

				bars: [{

					instance: Total

				}],

				rowConfig: {

					buttonsConfig: {

						listButton: [{

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

+20 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ define([ 
	, "dijit/layout/ContentPane"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "dojo/aspect"

	, "redmic/modules/base/_Selection"

	, "redmic/modules/browser/_ButtonsInRow"

	, "redmic/modules/browser/_HierarchicalLazyLoad"
@@ -31,6 +32,7 @@ define([ 
	, ContentPane

	, declare

	, lang

	, aspect

	, _Selection

	, _ButtonsInRow

	, _HierarchicalLazyLoad
@@ -65,6 +67,8 @@ define([ 
			};



			lang.mixin(this, this.config, args);



			aspect.before(this, "_serializedFilter", lang.hitch(this, this._beforeSerializedFilter));

		},



		_setConfigurations: function() {
@@ -257,6 +261,22 @@ define([ 
		_beforeShow: function() {



			this._emitEvt('REFRESH');

		},



		_beforeSerializedFilter: function(req) {



			var data = req.data,

				queryDataChildren = {};



			for (var key in data) {

				if (data[key] !== null) {

					queryDataChildren[key] = data[key];

				}

			}



			this._publish(this.browserWork.getChannel("SET_QUERY_DATA_CHILDREN"), {

				query: queryDataChildren

			});

		}

	});

});

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

+12 −22
Original line number Diff line number Diff line
@@ -342,14 +342,11 @@ define([ 


			if (!this.chartsViewer) {

				this.chartsViewerConfig.parentChannel = this.dynamicContainer.getChannel();

				// TODO para esto podría usar parentChannel, no hace falta pasarle más canales

				this.chartsViewerConfig.noDataChannel = this.getChannel();

				this.chartsViewerConfig.filterConfig.modelChannel = this.modelChannelFilter;

				this.chartsViewer = new TrashCharts(this.chartsViewerConfig);

			}



			//if (this._newDataAvailable[inputKey]) {

				//delete this._newDataAvailable[inputKey];

			var chartsViewerData = {

				"parentId": this.currentData.parentId,

				"grandparentId": this.currentData.grandparentId,
@@ -364,13 +361,6 @@ define([ 
				data: chartsViewerData,

				objQuery: this._objQuery

			});

			//}



			/*if (this._noDataMessageEnabled) {

				this._lastButtonKeyEmbedded = inputKey;

				this._showTemplateDisplayerNoDataViewer();

				return;

			}*/



			this._publish(this.dynamicContainer.getChannel("SET_PROPS"), {

				primaryContent: this.chartsViewer