Commit 2b0e034e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'feature-uiFixes' into 'dev' 

Feature ui fixes

See merge request redmic-project/client/web!27
parents 562fd5c1 9c83f2ef

public/javascript/app/administrative/views/templates/forms/ContactForm.html

+1 −2
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ 


		<div data-redmic-type="annotation" data-redmic-props="

			propertyName: 'annotation',

			content: '* ${i18n.noteForContact}.',

			required: true

			content: '* ${i18n.noteForContact}.'

		"></div>



		<div data-redmic-type="text" data-redmic-model="surname"></div>

public/javascript/app/components/steps/_ParametersRelationData.js

+6 −1
Original line number Diff line number Diff line
@@ -264,7 +264,12 @@ define([ 
					this._formData.parameter = [];

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

						var item = parameters[i],

							name = item.parameter.name + ' - ' + item.unit.name + ' (' + item.dataDefinition.z + ')';

							name = item.parameter.name + ' - ' + item.unit.name + ' (z: ' + item.dataDefinition.z + ')';

							device = item.dataDefinition.device;



						if (device) {

							name += ' - ' + device.name + ' (id: ' + device.id + ')';

						}



						this._formData.parameter.push({

							id: item.dataDefinition.id,

public/javascript/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js

+7 −0
Original line number Diff line number Diff line
@@ -79,6 +79,13 @@ define([ 


			this.dataSeriesChartsConfig = this._merge([{

				parentChannel: this.getChannel(),

				aggregationToolSelection: {

					interval: [],

					metrics: ["avg"]

				},

				aggregationToolConfig: {

					defaultIntervalOptions: []

				},

				chartsContainerExts: [

					_TemporalAxisWithGridDrawing,

					_VerticalAxesWithGridDrawing,

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

+6 −11
Original line number Diff line number Diff line
@@ -188,14 +188,13 @@ define([ 
			return this._categoriesIndexed[rootCategory];

		},



		_iterateAndSetCategoryItems: function(rootCategory, level1, level2, level3, data1, data2,

			data3, level3Selector1, level3Selector2) {

		_iterateAndSetCategoryItems: function(rootCategory, level1, level2, level3, data1, data2, data3,

			level3Selector1, level3Selector2) {

			//	summary:

			//		Construye la estructura por categorías con los elementos indexados por path.

			//		Los path se componen de la forma: 'r.stationId.parameterId.zValue.definitionId'.



			for (var level1Id in level1) {



				var itemL1 = level1[level1Id],

					pathL1 = "r" + this.pathSeparator + level1Id,

					objL1 = data1[level1Id];
@@ -203,7 +202,6 @@ define([ 
				this._categoriesIndexed[rootCategory][pathL1] = objL1;



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



					var level2Id = itemL1[i],

						itemL2 = level2[level2Id],

						pathL2 = pathL1 + this.pathSeparator + level2Id,
@@ -212,19 +210,16 @@ define([ 
					this._categoriesIndexed[rootCategory][pathL2] = objL2;



					for (var level3Id in level3) {



						var itemL3 = level3[level3Id];

						if (itemL3[level3Selector1] == level2Id &&

							itemL3[level3Selector2] == level1Id) {



						if (itemL3[level3Selector1] == level2Id && itemL3[level3Selector2] == level1Id) {

							var level3IdSplitted = level3Id.split(this.idSeparator);

							for (var j = 0; j < level3IdSplitted.length; j++) {



								var level3IdComponent = level3IdSplitted[j],

									objL3 = data3[level3IdComponent],

									zValue = objL3.z,

									pathL3 = pathL2 + this.pathSeparator + zValue +

										this.pathSeparator + level3IdComponent;

									zId = zValue.toString().replace('.', ','),

									pathL3 = pathL2 + this.pathSeparator + zId + this.pathSeparator +

										level3IdComponent;



								this._categoriesIndexed[rootCategory][pathL3] = objL3;

							}

public/javascript/app/designs/textSearchFacetsList/main/Activity.js

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ define([ 
						"open": true,

						"terms": {

							"field": "activityType.name",

							"size": 20

							"size": 100

						}

					},

					"territorialScope": {