Commit e6f262ff authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Permite actividades en tiempo real sin platforms

Aprovecha para revisar la limpieza de componentes de charts y de la
propia vista, para evitar la efecinquitis.
parent 375a6b20
Loading
Loading
Loading
Loading
+15 −9
Original line number Diff line number Diff line
@@ -178,6 +178,12 @@ define([

		_onTargetPropSet: function(res) {

			this._clearDateRange();

			if (this._chartsData) {
				this._clearCharts();
			}

			this._updateQuery();
		},

@@ -188,28 +194,28 @@ define([
				method: 'POST',
				query: this._queryObj
			});
		},

		_clearDateRange: function() {

			this._prepareChartsForNextData();
			this._startDate = null;
			this._endDate = null;
		},

		_prepareChartsForNextData: function() {
		_clearCharts: function() {

			this._publish(this.chartsContainer.getChannel('CLEAR'));

			for (var i in this._chartInstances) {
				var instance = this._chartInstances[i];

				this._emitEvt('REMOVE_LAYER', {
					layerId: instance.getOwnChannel()
				});
				this._publish(instance.getChannel('DESTROY'));
				delete this._chartInstances[i];
			}
		},

		_dataAvailable: function(res) {

			if (this._chartsData) {
				this._publish(this.chartsContainer.getChannel('CLEAR'));
			}

			var data = res.data,
				status = res.status;

+24 −14
Original line number Diff line number Diff line
@@ -841,25 +841,35 @@ define([
		_receiveActivityData: function(res) {

			var activityData = res.data,
				activityPlatformData = activityData.platforms[0].platform,
				platformData = {
				activityPlatforms = this._buildActivityPlatformsData(activityData.platforms);

			var platformData = {
				activityName: activityData.name,
				activityUrl: lang.replace(redmicConfig.viewPaths.activityCatalogDetails, {
					id: activityData.id
				}),
					platformName: activityPlatformData.name,
					platformUrl: lang.replace(redmicConfig.viewPaths.platformCatalogDetails, {
						id: activityPlatformData.id
					}),
				description: activityData.description,
					image: activityPlatformData.image
				platforms: activityPlatforms
			};

			this._manageActivityData(platformData);

			this._updateChartsDataSource(activityData.id);
		},

		_buildActivityPlatformsData: function(platforms) {

			if (platforms) {
				for (var i = 0; i < platforms.length; i++) {
					var platform = platforms[i].platform;
					platform.url = lang.replace(redmicConfig.viewPaths.platformCatalogDetails, {
						id: platform.id
					});
				}
			}

			return platforms;
		},

		_updateChartsDataSource: function(activityId) {

			var windRoseTarget = lang.replace(redmicConfig.services.timeSeriesWindRose, { id: activityId });
+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ define([

			aspect.after(this, "_createElements", lang.hitch(this, this._createLegendBarCommonsElements));
			aspect.after(this, "_resize", lang.hitch(this, this._legendBarCommonsAfterResize));
			aspect.before(this, '_clear', lang.hitch(this, this._legendBarCommonsBeforeClear));
		},

		_setLegendBarCommonsOwnCallbacksForEvents: function() {
@@ -395,6 +396,11 @@ define([
				transform = 'translate(' + xTranslate + ',' + yTranslate + ')';

			this.legendBarTitleArea && this.legendBarTitleArea.transition().attr('transform', transform);
		},

		_legendBarCommonsBeforeClear: function() {

			this._setLegendTitle('');
		}
	});
});
+3 −1
Original line number Diff line number Diff line
@@ -76,7 +76,9 @@ define([

		_clearSummaryBox: function() {

			if (this.summaryBoxArea) {
				this.summaryBoxArea.selectAll('*').remove();
			}
		}
	});
});
Compare 7cf4d265 to 2508ef6b
Original line number Diff line number Diff line
Subproject commit 7cf4d2655a29896e95d21a01298f9971aebb245a
Subproject commit 2508ef6be4cce5aee6377be4b369b560b44b7029