Commit 88791af0 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Añade filtro avanzado a observaciones 

Agrega buscador avanzado al listado de observaciones, permitiendo el
filtrado por rango de fechas (no funciona todavía, pero parece que
depende de que el servicio lo acepte como filtro válido).

Controla errores de petición al superar los 10000 registros disponibles,
evitando que la paginación pueda superar dicho umbral (devuelve
registros vacíos en su lugar, porque limita a 0 los resultados).

Actualiza submódulo.
parent 987becd9

templates @ 3985f857

Compare b2dc4cd1 to 3985f857
Original line number Diff line number Diff line 
Subproject commit b2dc4cd197cb20914f751a031afd58792213c647
 
Subproject commit 3985f857de9df00cbb2ff8b3eb2c0721f6a8eab1

client-app/src/component/filter/Filter.js

+6 −0
Original line number Diff line number Diff line
@@ -225,6 +225,12 @@ define([ 
				query.size = null;

			}



			// TODO parche para evitar que elasticsearch falle al superar los 10000 registros

			if (query.from + query.size > 10000) {

				query.from = 0;

				query.size = 0;

			}



			this._addToQuery(query, !omitRefresh);

		},

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

+17 −3
Original line number Diff line number Diff line 
define([

	'app/designs/textSearchFacetsList/Controller'

	'app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch'

	, 'app/designs/textSearchFacetsList/Controller'

	, 'app/designs/textSearchFacetsList/Layout'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'src/component/browser/bars/Order'

	, 'src/component/browser/bars/Total'

	, 'src/redmicConfig'

	, 'templates/ObservationFilterForm'

	, 'templates/ObservationRegisterList'

], function(

	TextSearchFacetsListController

	_AddCompositeSearchInTooltipFromTextSearch

	, TextSearchFacetsListController

	, TextSearchFacetsListLayout

	, declare

	, lang

	, Order

	, Total

	, redmicConfig

	, TemplateFilter

	, TemplateList

) {



	return declare([TextSearchFacetsListLayout, TextSearchFacetsListController], {

	return declare([

		TextSearchFacetsListLayout, TextSearchFacetsListController, _AddCompositeSearchInTooltipFromTextSearch

	], {

		//	summary:

		//
@@ -57,6 +63,14 @@ define([ 
			this.facetsConfig = this._merge([{

				aggs: redmicConfig.aggregations.observationSeries

			}, this.facetsConfig || {}]);



			this.textSearchConfig = this._merge([{

				showExpandIcon: true

			}, this.textSearchConfig || {}]);



			this.compositeConfig = this._merge([this.compositeConfig || {}, {

				template: TemplateFilter

			}]);

		},



		_defineSubscriptions: function() {