Commit 9a191499 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza info de actividad con más datos 

Muestra nuevos campos para tema INSPIRE y licencia.

Muestra mapa reducido para ubicar geográficamente los datos que recoge
la actividad, dibujando el área declarada por la misma en formato WKT.

Revisa traducciones y limpia detalles.

Actualiza módulo.
parent cda1ae1a

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

+68 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ define([ 
	, "dojo/_base/lang"

	, "redmic/modules/layout/TabsDisplayer"

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

	, "redmic/modules/map/_ImportWkt"

	, "redmic/modules/map/LeafletImpl"

	, "redmic/modules/map/Map"

	, "templates/ActivityInfo"

	, "templates/ActivityInfoHelp"

	, "./_ActivityBase"
@@ -13,6 +16,9 @@ define([ 
	, lang

	, TabsDisplayer

	, TemplateDisplayer

	, _ImportWkt

	, LeafletImpl

	, Map

	, TemplateInfo

	, TemplateInfoHelp

	, _ActivityBase
@@ -49,6 +55,21 @@ define([ 
					height: 5,

					template: TemplateInfo

				}),

				spatialExtensionMap: {

					width: 3,

					height: 2,

					hidden: true,

					type: declare([LeafletImpl, _ImportWkt, Map]),

					props: {

						title: this.i18n.spatialExtension,

						omitContainerSizeCheck: true,

						coordinatesViewer: false,

						navBar: false,

						miniMap: false,

						scaleBar: false,

						measureTools: false

					}

				},

				additionalInfo: {

					width: 3,

					height: 5,
@@ -66,6 +87,11 @@ define([ 
			}, this.widgetConfigs || {}]);

		},



		_setMainOwnCallbacksForEvents: function() {



			this._onEvt('ME_OR_ANCESTOR_HIDDEN', lang.hitch(this, this._onActivityDetailsHidden));

		},



		_refreshModules: function() {



			var object = {};
@@ -103,6 +129,8 @@ define([ 
				}

			});



			this._prepareSpatialExtension();



			this.inherited(arguments);

		},
@@ -119,6 +147,46 @@ define([ 
				data: this._activityData,

				target: this.infoTarget

			});

		},



		_prepareSpatialExtension: function() {



			var wkt = this._activityData.spatialExtension;

			if (!wkt) {

				return;

			}



			var mapInstance = this._getWidgetInstance('spatialExtensionMap');

			this._once(mapInstance.getChannel('BBOX_CHANGED'), lang.hitch(this, this._showSpatialExtension, wkt));



			this._showWidget('spatialExtensionMap');

		},



		_showSpatialExtension: function(wkt) {



			var mapInstance = this._getWidgetInstance('spatialExtensionMap');



			this._once(mapInstance.getChannel('WKT_ADDED'), lang.hitch(this, function(res) {



				this._lastWktLayer = res.layer;

			}));



			this._publish(mapInstance.getChannel('ADD_WKT'), {

				wkt: wkt

			});

		},



		_onActivityDetailsHidden: function() {



			this._hideWidget('spatialExtensionMap');



			if (this._lastWktLayer) {

				var mapInstance = this._getWidgetInstance('spatialExtensionMap');



				this._publish(mapInstance.getChannel('REMOVE_LAYER'), {

					layer: this._lastWktLayer

				});

			}

		}

	});

});

public/javascript/app/designs/details/main/_ActivityBase.js

+0 −6
Original line number Diff line number Diff line
@@ -13,14 +13,11 @@ define([ 
	, "redmic/modules/browser/ListImpl"

	, "redmic/modules/browser/bars/Pagination"

	, "redmic/modules/browser/bars/Total"

	, "redmic/modules/layout/TabsDisplayer"

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

	, "templates/ContactSet"

	, "templates/DocumentList"

	, "templates/OrganisationSet"

	, "templates/PlatformSet"

	, "templates/ActivityInfo"

	, "templates/ActivityInfoHelp"

], function(

	_Main

	, Controller
@@ -36,14 +33,11 @@ define([ 
	, ListImpl

	, Pagination

	, Total

	, TabsDisplayer

	, TemplateDisplayer

	, TemplateContacts

	, TemplateDocuments

	, TemplateOrganisation

	, TemplatePlatform

	, TemplateInfo

	, TemplateInfoHelp

){

	return declare([Layout, Controller, _Main, _AddTitle, _TitleSelection], {

		//	summary:

public/javascript/app/nls/es/translation.js

+4 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ define({ 
	, "raster-types": "Tipos de trama"

	, "ending": "Desenlace (animales)"

	, "destiny": "Destino (animales)"

	, "inspire-themes": "Temas Inspire"

	, "inspire-themes": "Temas INSPIRE"

	, "toponym-types": "Tipos de toponimia"

	, "toponymType": "Tipos de toponimia"
@@ -976,7 +976,7 @@ define({ 
	, "deviation": "Desviación"

	, "seeDetails": "Ver más información"

	, "alias": "Alias"

	, "themeInspire": "Tema Inspire"

	, "themeInspire": "Tema INSPIRE"



	, "apply": "Aplicar"
@@ -1276,6 +1276,8 @@ define({ 
	, "findDataInActivitiesStart": "Encuentra datos entre las"

	, "findDataInActivitiesEnd": "actividades disponibles"



	, "spatialExtension": "Extensión espacial"





	// Para capas que no se pueden cambiar las keys

	, "descript_1": "Descripción"

public/javascript/app/nls/translation.js

+4 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ define({ 
		, "raster-types": "Raster Types"

		, "ending": "Ending (animals)"

		, "destiny": "Destiny (animals)"

		, "inspire-themes": "Inspire themes"

		, "inspire-themes": "INSPIRE themes"

		, "toponym-types": "Toponym types"

		, "toponymType": "Toponym types"
@@ -981,7 +981,7 @@ define({ 
		, "deviation": "Deviation"

		, "seeDetails": "See more information"

		, "alias": "Alias"

		, "themeInspire": "Inspire theme"

		, "themeInspire": "INSPIRE theme"



		, "apply": "Apply"
@@ -1280,6 +1280,8 @@ define({ 
		, "findDataInActivitiesStart": "Find data within the"

		, "findDataInActivitiesEnd": "available activities"



		, "spatialExtension": "Spatial extension"





		//Para capas que no se pueden cambiar las keys

		, "descript_1": "Description"

templates @ 1f3d937f

Compare 0f14de5e to 1f3d937f
Original line number Diff line number Diff line 
Subproject commit 0f14de5e387fc40cf07c41063b5157d5e9d4dc3a
 
Subproject commit 1f3d937f0ced442604efc6ba0e9578986fbd802b