Commit 83129a3c authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Muestra popup de consulta en Atlas en más vistas 

Agrega la posibilidad de consultar datos de capas cargadas por Atlas en
más vistas, como las de detalle de actividad que contengan mapas, datos
en tiempo real y recolección de basura.
parent 03164ec0

public/javascript/app/designs/mapWithSideContent/main/Geographic.js

+5 −1
Original line number Diff line number Diff line 
define([

	"app/base/views/extensions/_LocalSelectionView"

	, "app/base/views/extensions/_ShowInPopupResultsFromQueryOnMap"

	, "app/base/views/extensions/_QueryOnMap"

	, "app/designs/base/_Main"

	, "app/designs/mapWithSideContent/Controller"

	, "app/designs/mapWithSideContent/layout/MapAndContent"
@@ -22,6 +24,8 @@ define([ 
	, "templates/CitationList"

], function(

	_LocalSelectionView

	, _ShowInPopupResultsFromQueryOnMap

	, _QueryOnMap

	, _Main

	, Controller

	, Layout
@@ -224,7 +228,7 @@ define([ 


		_createAtlas: function() {



			this.atlas = new Atlas({

			this.atlas = new declare([Atlas, _QueryOnMap, _ShowInPopupResultsFromQueryOnMap])({

				parentChannel: this.getChannel(),

				perms: this.perms,

				getMapChannel: lang.hitch(this.map, this.map.getChannel)

public/javascript/app/designs/mapWithSideContent/main/GeographicEditor.js

+5 −1
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ define([ 
	"app/base/views/extensions/_CompositeInTooltipFromIconKeypad"

	, "app/base/views/extensions/_EditionView"

	, "app/base/views/extensions/_LocalSelectionView"

	, "app/base/views/extensions/_ShowInPopupResultsFromQueryOnMap"

	, "app/base/views/extensions/_QueryOnMap"

	, "app/designs/base/_Main"

	, "app/designs/mapWithSideContent/Controller"

	, "app/designs/mapWithSideContent/layout/MapAndContentAndTopbar"
@@ -41,6 +43,8 @@ define([ 
	_CompositeInTooltipFromIconKeypad

	, _EditionView

	, _LocalSelectionView

	, _ShowInPopupResultsFromQueryOnMap

	, _QueryOnMap

	, _Main

	, Controller

	, Layout
@@ -385,7 +389,7 @@ define([ 


		_createAtlas: function() {



			this.atlas = new Atlas({

			this.atlas = new declare([Atlas, _QueryOnMap, _ShowInPopupResultsFromQueryOnMap])({

				parentChannel: this.getChannel(),

				perms: this.perms,

				getMapChannel: lang.hitch(this.map, this.map.getChannel)

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

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

	'app/designs/mapWithSideContent/Controller'

	"app/base/views/extensions/_ShowInPopupResultsFromQueryOnMap"

	, "app/base/views/extensions/_QueryOnMap"

	, 'app/designs/mapWithSideContent/Controller'

	, 'app/designs/mapWithSideContent/layout/MapAndContent'

	, 'app/redmicConfig'

	, 'dijit/layout/LayoutContainer'
@@ -20,7 +22,9 @@ define([ 
	, 'templates/SurveyStationList'

	, 'templates/SurveyStationPopup'

], function(

	Controller

	_ShowInPopupResultsFromQueryOnMap

	, _QueryOnMap

	, Controller

	, Layout

	, redmicConfig

	, LayoutContainer
@@ -129,7 +133,7 @@ define([ 
			this.browserConfig.queryChannel = this.queryChannel;

			this.browser = new declare([ListImpl, _Framework, _GeoJsonParser, _ButtonsInRow])(this.browserConfig);



			this.atlas = new Atlas({

			this.atlas = new declare([Atlas, _QueryOnMap, _ShowInPopupResultsFromQueryOnMap])({

				parentChannel: this.getChannel(),

				perms: this.perms,

				getMapChannel: lang.hitch(this.map, this.map.getChannel)

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

+5 −1
Original line number Diff line number Diff line 
define([

	'app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch'

	, "app/base/views/extensions/_QueryOnMap"

	, "app/base/views/extensions/_ShowInPopupResultsFromQueryOnMap"

	, "app/designs/mapWithSideContent/Controller"

	, "app/designs/mapWithSideContent/layout/MapAndContent"

	, "app/redmicConfig"
@@ -26,6 +28,8 @@ define([ 
	, "./TrashDetails"

], function(

	_AddCompositeSearchInTooltipFromTextSearch

	, _QueryOnMap

	, _ShowInPopupResultsFromQueryOnMap

	, Controller

	, Layout

	, redmicConfig
@@ -134,7 +138,7 @@ define([ 
			var BrowserDefinition = declare([ListImpl, _Framework, _Select]);

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



			this.atlas = new Atlas({

			this.atlas = new declare([Atlas, _QueryOnMap, _ShowInPopupResultsFromQueryOnMap])({

				parentChannel: this.getChannel(),

				perms: this.perms,

				getMapChannel: lang.hitch(this.map, this.map.getChannel)