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

Retoca detalles de consulta de observaciones 

Define campos específicos para la petición de registros.

Usa ordenación descendiente por fecha como valor por defecto.

Oculta título de listado de registros cuando no se ha seleccionado
estación todavía.

Actualiza submódulo.
parent 11b14219

templates @ b2dc4cd1

Compare 2384c6e2 to b2dc4cd1
Original line number Diff line number Diff line 
Subproject commit 2384c6e2f19829ec67cdfd900cd51294a6c96a53
 
Subproject commit b2dc4cd197cb20914f751a031afd58792213c647

client-app/src/detail/_WidgetDefinition.js

+2 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ define([ 
				width: 6,

				height: 6,

				type: ActivityFixedObservationSeriesList,

				hidden: true,

				props: {

					title: 'associatedObservationRegisters',

					pathVariableId: this._activityData.id,
@@ -364,6 +365,7 @@ define([ 
				width: 6,

				height: 6,

				type: ActivityFixedTimeseriesChart,

				hidden: true,

				props: {

					title: 'charts',

					pathVariableId: this._activityData.id,

client-app/src/detail/activity/widget/ActivityFixedObservationSeriesList.js

+10 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ define([ 
				},{

					instance: Order,

					config: {

						defaultOrderField: 'date',

						options: [

							{value: 'date'}

						]
@@ -62,6 +63,13 @@ define([ 
			});

		},



		postCreate: function() {



			this.inherited(arguments);



			this._setTitle('');

		},



		_subObservationStationSet: function(data) {



			var dataDefinitionId = this._getDataDefinitionId(data),
@@ -77,7 +85,8 @@ define([ 
				query: {

					terms: {

						dataDefinition: dataDefinitionId

					}

					},

					returnFields: redmicConfig.returnFields.observationSeries

				}

			});

		},

client-app/src/redmicConfig.js

+5 −1
Original line number Diff line number Diff line
@@ -527,7 +527,11 @@ define([], function() { 
			'properties.measurements.unit.id', 'properties.measurements.unit.name',

			'properties.measurements.dataDefinition.id', 'properties.measurements.dataDefinition.z'

		],

		timeSeriesStationsMap: ['geometry']

		timeSeriesStationsMap: ['geometry'],

		observationSeries: [

			'date', 'observation.note', 'observation.animal.id', 'observation.animal.name', 'observation.taxonomy.id',

			'observation.taxonomy.scientificName', 'observation.device.name', 'observation.device.model'

		]

	};



	retObj.outerPaths = [