Commit 896151e6 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Prepara cajas para mostrar resultados de búsqueda 

Muestra y oculta en ventanas los resultados de la búsqueda y la
colección de filtros para refinar (en proceso).
parent 044d6314

public/javascript/app/home/views/HomeView.js

+80 −46
Original line number Diff line number Diff line 
define([

	"app/designs/details/Controller"

	, "app/designs/details/Layout"

	, "app/designs/details/_AddTitle"

	, "app/redmicConfig"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "redmic/modules/layout/templateDisplayer/TemplateDisplayer"

	, "templates/InitialTitle"

	, "templates/InitialInfo"

	, "redmic/base/Credentials"

	, 'app/home/views/SearchWidget'

	, 'app/home/views/SearchBarWidget'

	, 'app/home/views/SearchResultsWidget'

	, "app/home/views/SocialWidget"

	, "app/home/views/WidgetLastActivity"

	, "app/home/views/WidgetFavourites"

], function(

	Controller

	, Layout

	, _AddTitle

	, redmicConfig

	, declare

	, lang

	, TemplateDisplayer

	, TemplateTitle

	, TemplateInfo

	, Credentials

	, SearchWidget

	, SearchBarWidget

	, SearchResultsWidget

	, SocialWidget

	, WidgetLastActivity

	, WidgetFavourites

) {

	return declare([Layout, Controller/*, _AddTitle*/], {



	return declare([Layout, Controller], {

		//	summary:

		//		Vista detalle de Activity.

		//		Vista inicial de la aplicación.



		constructor: function(args) {



			this.config = {

				_titleRightButtonsList: [],

				centerTitle: true,

				noScroll: true,

				propsWidget: {

					omitTitleButtons: true

				}

			};



			this.titleWidgetConfig = {

				template: TemplateTitle,

				target: "initial_title"

			};



			this.widgetConfigs = {

				search: {

				searchBar: {

					width: 6,

					height: 1,

					type: SearchWidget,

					type: SearchBarWidget,

					props: {

						omitTitleBar: true,

						"class": "containerDetails"

					}

				},

				favourites: {

					width: 3,

				searchFilter: {

					width: 2,

					height: 4,

					type: WidgetFavourites,

					type: SearchResultsWidget,

					hidden: true,

					props: {

						title: this.i18n.favourites,

						"class": "containerDetails"

					}

				},

				lastActivities: {

					width: 3,

					height: 6,

					type: WidgetLastActivity,

				searchResults: {

					width: 4,

					height: 4,

					type: SearchResultsWidget,

					hidden: true,

					props: {

						title: this.i18n.lastActivities,

						template: TemplateInfo,

						"class": "containerDetails"

					}

				},
@@ -96,6 +85,25 @@ define([ 
					props: {

						title: this.i18n.followUs

					}

				},

				favourites: {

					width: 3,

					height: 5,

					type: WidgetFavourites,

					props: {

						title: this.i18n.favourites,

						"class": "containerDetails"

					}

				},

				lastActivities: {

					width: 3,

					height: 5,

					type: WidgetLastActivity,

					props: {

						title: this.i18n.lastActivities,

						template: TemplateInfo,

						"class": "containerDetails"

					}

				}

			};
@@ -112,7 +120,38 @@ define([ 


		_afterShow: function(request) {



			this.startup();

			//this.startup();

			this._listenWidgets();

		},



		_listenWidgets: function() {



			this._setSubscriptions([{

				channel: this._widgets.searchBar.getChannel('SHOW_SEARCH_RESULTS'),

				callback: lang.hitch(this, this._showSearchResults)

			},{

				channel: this._widgets.searchBar.getChannel('HIDE_SEARCH_RESULTS'),

				callback: lang.hitch(this, this._hideSearchResults)

			}]);

		},



		_showSearchResults: function(searchDefinition) {



			console.log('me llego', searchDefinition);



			this._showWidget('searchFilter');

			this._showWidget('searchResults');

			this._reloadInteractive();

		},



		_hideSearchResults: function(searchDefinition) {



			console.log('me llego', searchDefinition);



			this._hideWidget('searchFilter');

			this._hideWidget('searchResults');

			this._reloadInteractive();

			this._updateInteractive();

		},



		_clearModules: function() {
@@ -122,27 +161,22 @@ define([ 


		_refreshModules: function() {



			this._emitEvt('INJECT_ITEM', {

				data: {},

				target: "initial_title"

			});



			var object = {};



			object.info = "";

			var obj = {

				info: ''

			};



			if (Credentials.get("userRole") === "ROLE_GUEST") {

				object.roleGuest = this.i18n.contentInfo1 + " ";

				object.roleGuest += this.i18n.visitor;

				object.roleGuest += this.i18n.contentInfo2;

				object.register = this.i18n.register.toLowerCase();

				object.info += this.i18n.contentInfo3;

				obj.roleGuest = this.i18n.contentInfo1 + " ";

				obj.roleGuest += this.i18n.visitor;

				obj.roleGuest += this.i18n.contentInfo2;

				obj.register = this.i18n.register.toLowerCase();

				obj.info += this.i18n.contentInfo3;

			}



			object.info += this.i18n.contentSend;

			obj.info += this.i18n.contentSend;



			this._emitEvt('INJECT_ITEM', {

				data: object,

				data: obj,

				target: "initial_info"

			});

		}

public/javascript/app/home/views/SearchWidget.js→public/javascript/app/home/views/SearchBarWidget.js

+95 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ define([ 
	, 'app/redmicConfig'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'put-selector/put'

	, 'redmic/modules/base/_Filter'

	, 'redmic/modules/search/TextImpl'

], function(
@@ -10,6 +11,7 @@ define([ 
	, redmicConfig

	, declare

	, lang

	, put

	, _Filter

	, TextImpl

) {
@@ -21,33 +23,73 @@ define([ 
		constructor: function(args) {



			this.config = {

				target: redmicConfig.services.activity

				ownChannel: 'searchWidget',

				events: {

					'SHOW_SEARCH_RESULTS': 'showSearchResults',

					'HIDE_SEARCH_RESULTS': 'hideSearchResults'

				},

				actions: {

					'SHOW_SEARCH_RESULTS': 'showSearchResults',

					'HIDE_SEARCH_RESULTS': 'hideSearchResults'

				},

				target: redmicConfig.services.activity,

				className: 'searchBarPanel'

			};



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

		},



		postCreate: function() {

		_initialize: function() {



			this.textSearchConfig = this._merge([{

				parentChannel: this.getChannel(),

				target: this.target,

				queryChannel: this.queryChannel,

				legacyMode: false

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



			this.textSearch = new TextImpl(this.textSearchConfig);

		},



		_definePublications: function() {



			this.publicationsConfig.push({

				event: 'SHOW_SEARCH_RESULTS',

				channel: this.getChannel('SHOW_SEARCH_RESULTS')

			},{

				event: 'HIDE_SEARCH_RESULTS',

				channel: this.getChannel('HIDE_SEARCH_RESULTS')

			});

		},



			this.inherited(arguments);

		_afterShow: function() {



			this._createItems();

			var parentNode = put(this.contentNode, 'div.' + this.className);



			this._publish(this.textSearch.getChannel("SHOW"), {

				node: this.contentNode

				node: parentNode

			});

		},



		_createItems: function() {

		_handleFilterParams: function(filterParams) {



			console.log('entra', this.target);

			this.textSearchConfig = this._merge([{

				parentChannel: this.getChannel(),

				target: this.target,

				queryChannel: this.queryChannel

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

			if (filterParams.suggest) {

				return;

			}



			this.textSearch = new TextImpl(this.textSearchConfig);

			if (!filterParams.text) {

				this._emitEvt('HIDE_SEARCH_RESULTS', {

					target: this.target

				});

				return;

			}



			var searchText = filterParams.text.text;



			this._emitEvt('SHOW_SEARCH_RESULTS', {

				target: this.target,

				searchText: searchText

			});

		}

	});

});

public/javascript/app/home/views/SearchResultsWidget.js

0 → 100644
+93 −0
Original line number Diff line number Diff line 
define([

	'app/home/views/_DashboardItem'

	, 'app/redmicConfig'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'put-selector/put'

	, 'redmic/modules/base/_Store'

	, 'redmic/modules/browser/ListImpl'

], function(

	_DashboardItem

	, redmicConfig

	, declare

	, lang

	, put

	, _Store

	, ListImpl

) {



	return declare([_DashboardItem, _Store], {

		//	summary:

		//		Widget contenedor de resultados de búsqueda sobre actividades



		constructor: function(args) {



			this.config = {

				ownChannel: 'searchResultsWidget',

				events: {

					'SHOW_SEARCH_RESULTS': 'showSearchResults',

					'HIDE_SEARCH_RESULTS': 'hideSearchResults'

				},

				actions: {

					'SHOW_SEARCH_RESULTS': 'showSearchResults',

					'HIDE_SEARCH_RESULTS': 'hideSearchResults'

				},

				target: redmicConfig.services.activity,

				className: 'searchResultsPanel'

			};



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

		},



		_initialize: function() {



			this.browserConfig = this._merge([{

				parentChannel: this.getChannel(),

				target: this.target

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



			this.browser = new ListImpl(this.browserConfig);

		},



		_definePublications: function() {



			this.publicationsConfig.push({

				event: 'SHOW_SEARCH_RESULTS',

				channel: this.getChannel('SHOW_SEARCH_RESULTS')

			},{

				event: 'HIDE_SEARCH_RESULTS',

				channel: this.getChannel('HIDE_SEARCH_RESULTS')

			});

		},



		_afterShow: function() {



			var parentNode = put(this.contentNode, 'div.' + this.className);



			this._publish(this.browser.getChannel("SHOW"), {

				node: parentNode

			});

		},



		_handleFilterParams: function(filterParams) {



			if (filterParams.suggest) {

				return;

			}



			if (!filterParams.text) {

				this._emitEvt('HIDE_SEARCH_RESULTS', {

					target: this.target

				});

				return;

			}



			var searchResult = filterParams.text.text;



			this._emitEvt('SHOW_SEARCH_RESULTS', {

				target: this.target,

				searchResult: searchResult

			});

		}

	});

});