Commit 61dc294f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige actualización de windRose y otros detalles 

Al llegar datos nuevos, se limpian los previos. Se implementa limpieza
de summary y de dominio de eje radial.

Reordena datos de summary.
parent d297e2b6

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

+9 −10
Original line number Diff line number Diff line
@@ -206,6 +206,10 @@ define([ 


		_dataAvailable: function(res) {



			if (this._chartsData) {

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

			}



			var data = res.data,

				status = res.status;
@@ -214,19 +218,14 @@ define([ 
				return;

			}



			var chartsData = data.data,

				limits = data.limits,

				stats = data.stats;



			this._chartsData = {

				data: chartsData,

				data: data.data,

				parameterName: this._unit

			};



			this._limits = limits;

			this._limits = data.limits;



			delete stats.sum;

			this._stats = stats;

			this._stats = data.stats;



			this._updateCharts();

		},
@@ -266,9 +265,9 @@ define([ 
			}



			if (!this._startDate || !this._endDate) {

				var currentDate = moment();

				var currentDate = moment('2019-03-22');

				this._endDate = currentDate.toISOString();

				this._startDate = currentDate.subtract(1, 'days').toISOString();

				this._startDate = currentDate.subtract(7, 'days').toISOString();

			}



			this._queryObj = {

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

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

	, "dojo/_base/lang"

	, "redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing"

	, "redmic/modules/chart/ChartsContainer/_InfoOnEmptyData"

	, "redmic/modules/chart/ChartsContainer/_InfoOnMouseOver"

	, "redmic/modules/chart/ChartsContainer/_LegendBar"

	, "redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing"
@@ -30,6 +31,7 @@ define([ 
	, declare

	, lang

	, _AngularAxisWithGridDrawing

	, _InfoOnEmptyData

	, _InfoOnMouseOver

	, _LegendBar

	, _RadialAxisWithGridDrawing
@@ -130,7 +132,8 @@ define([ 
							_RadialAxisWithGridDrawing,

							_InfoOnMouseOver,

							_LegendBar,

							_SummaryBox

							_SummaryBox,

							_InfoOnEmptyData

						]

					}

				},

public/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ define([ 
				this._clearAxis(this._radialAxis);

				this._unsubscribeFromAxis(this._radialAxis);

				this._radialAxis = null;

				this._radialAxisDomain = null;

			}

		},

public/javascript/redmic/modules/chart/ChartsContainer/_SummaryBox.js

+25 −12
Original line number Diff line number Diff line 
define([

	'd3/d3.min'

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "dojo/aspect"

	, "RWidgets/Utilities"

	'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'dojo/aspect'

], function(

	d3

	, declare

	declare

	, lang

	, aspect

	, Utilities

) {

	return declare(null, {

		//	summary:
@@ -18,12 +14,15 @@ define([ 
		constructor: function(args) {



			this.config = {

				summaryBoxClass: 'chartSummaryBox'

				summaryBoxClass: 'chartSummaryBox',

				summaryKeys: ['count', 'avg', 'min', 'max']

			};



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



			aspect.after(this, '_createElements', lang.hitch(this, this._createSummaryBoxElements));

			aspect.after(this, '_resize', lang.hitch(this, this._summaryBoxAfterResize));

			aspect.before(this, '_clear', lang.hitch(this, this._summaryBoxBeforeClear));

		},



		_createSummaryBoxElements: function() {
@@ -43,12 +42,16 @@ define([ 
			var data = res.value,

				yTranslate = 0;



			this.summaryBoxArea.selectAll('*').remove();

			this._clearSummaryBox();



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

				var key = this.summaryKeys[i],

					value = data[key];



			for (var key in data) {

				this.summaryBoxArea.append('svg:text')

					.text((this.i18n[key] || key) + ': ' + data[key])

					.text((this.i18n[key] || key) + ': ' + value)

					.attr('transform', 'translate(0,' + yTranslate + ')');



				yTranslate += 15;

			}
@@ -64,6 +67,16 @@ define([ 
				yTranslate = this._innerHeight - height;



			this.summaryBoxArea.attr('transform', 'translate(' + xTranslate + ',' + yTranslate + ')');

		},



		_summaryBoxBeforeClear: function() {



			this._clearSummaryBox();

		},



		_clearSummaryBox: function() {



			this.summaryBoxArea.selectAll('*').remove();

		}

	});

});

public/javascript/redmic/modules/chart/layer/Axis/RadialAxisImpl.js

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ define([ 
				ownChannel: 'radialAxis',

				className: 'axis radialAxis',

				opacity: 0.6,

				domainLevels: 3

				domainLevels: 7

			};



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