Commit 6f01a083 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Unifica y limpia vista detalle de servicios OGC

parent 152dbab1

client-app/app.profile.js

+3 −5
Original line number Diff line number Diff line
@@ -463,15 +463,17 @@ var viewLayers = { 


	// catálogos

	, 'src/catalog/activity/ActivityCatalogView': {}

	, 'src/catalog/ogcService/OgcServiceCatalogView': {}

	, 'src/catalog/organisation/OrganisationCatalogView': {}

	, 'src/catalog/platform/PlatformCatalogView': {}

	, 'src/catalog/program/ProgramCatalogView': {}

	, 'src/catalog/project/ProjectCatalogView': {}

	, 'src/catalog/species/SpeciesCatalogView': {}

	, 'src/catalog/raster/RasterCatalogView': {}

	, 'src/catalog/species/SpeciesCatalogView': {}



	// vistas detalle

	, 'src/detail/activity/ActivityDetailView': {}

	, 'src/detail/ogcService/OgcServiceDetailView': {}

	, 'src/detail/organisation/OrganisationDetailView': {}

	, 'src/detail/platform/PlatformDetailView': {}

	, 'src/detail/program/ProgramDetailView': {}
@@ -501,7 +503,6 @@ var viewLayers = { 
	, 'app/administrative/taxonomy/views/TaxonomyView': {}



	, 'app/products/views/OpenMapView': {}

	, 'app/products/views/ServiceOGCCatalogView': {}



	, 'app/user/views/RegisterView': {}

	, 'app/user/views/ResettingView': {}
@@ -515,7 +516,6 @@ var viewLayers = { 
	, 'app/user/views/UserProfileView': {}



	, 'app/maintenance/views/DomainView': {}

	, 'app/maintenance/views/ServiceOGCView': {}

	, 'app/maintenance/views/PermissionsView': {}



	, 'app/viewers/views/SpeciesDistributionView': {}
@@ -526,11 +526,9 @@ var viewLayers = { 
	, 'app/viewers/views/RealTimeView': {}

	, 'app/viewers/views/RealTimeDashboardView': {}



	, 'app/details/views/ServiceOGCCatalogDetailsView': {}

	, 'app/details/views/DocumentDetailsView': {}

	, 'app/details/views/BibliographyDetailsView': {}

	, 'app/details/views/ContactDetailsView': {}

	, 'app/details/views/ServiceOGCDetailsView': {}

	, 'app/details/views/StatisticsDetailsView': {}



	, 'app/edition/views/ActivityEditionView': {}

client-app/src/app/component/meta/metaTagsContent.js

+2 −2
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ define({ 
		"description": "{i18n.metaOgcServiceCatalogDescription}."

	},

	"/service-ogc-catalog/service-ogc-info/{id}": {

		"title": "{i18n.metaServiceOgcCatalogServiceOgcInfoIdTitle} '{title}'",

		"description": "{i18n.metaServiceOgcCatalogDescription} '{title}'. {abstractLayer} [{keywords}]"

		"title": "{i18n.metaOgcServiceInfoIdTitle} '{title}'",

		"description": "{i18n.metaOgcServiceInfoDescription} '{title}'. {abstractLayer} [{keywords}]"

	},

	"/bibliography": {

		"title": "{i18n.metaBibliographyTitle}",

client-app/src/catalog/ogcService/OgcServiceCatalogView.js

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ define([ 


			this.config = {

				title: this.i18n.ogcServiceCatalogView,

				ownChannel: 'serviceOGCCatalog',

				ownChannel: 'ogcServiceCatalog',

				target: redmicConfig.services.atlasLayer

			};
@@ -47,7 +47,7 @@ define([ 
						listButton: [{

							icon: 'fa-info-circle',

							btnId: 'details',

							href: this.viewPaths.serviceOGCCatalogDetails,

							href: this.viewPaths.ogcServiceDetails,

							condition: 'urlSource',

							title: 'info'

						}]

client-app/src/catalog/ogcService/_Edition.js

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ define([ 
					icon: 'fa-edit',

					btnId: 'edit',

					title: 'edit',

					href: this.viewPaths.serviceOGCEdit,

					href: this.viewPaths.ogcServiceEdit,

					option: 'default',

					condition: 'urlSource'

				},{

client-app/src/oldapp/designs/details/main/ServiceOGC.js→client-app/src/detail/ogcService/OgcServiceDetailView.js

+30 −22
Original line number Diff line number Diff line 
define([

	"app/designs/base/_Main"

	'app/designs/base/_Main'

	, 'src/redmicConfig'

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'src/component/layout/templateDisplayer/TemplateDisplayer'

	, 'src/component/atlas/_AtlasLayersManagement'

	, "src/component/map/LeafletImpl"

	, "src/component/map/layer/WmsLayerImpl"

	, "RWidgets/RedmicUtilities"

	, "templates/ServiceOGCTitle"

	, "templates/ServiceOGCInfo"

	, "templates/ServiceOGCSourceInfo"

	, "templates/ServiceOGCImage"

	, "./_DetailsBase"

	, 'src/component/map/LeafletImpl'

	, 'src/component/map/layer/WmsLayerImpl'

	, 'RWidgets/RedmicUtilities'

	, 'templates/ServiceOGCTitle'

	, 'templates/ServiceOGCInfo'

	, 'templates/ServiceOGCSourceInfo'

	, 'templates/ServiceOGCImage'

	, 'app/designs/details/main/_DetailsBase'

], function(

	_Main

	, redmicConfig
@@ -36,16 +36,17 @@ define([ 


		constructor: function(args) {



			this.atlasTarget = redmicConfig.services.atlasLayer;

			this.activityTarget = redmicConfig.services.activity;

			this.target = this.atlasTarget;

			this.selectionTarget = redmicConfig.services.atlasLayerSelection;



			this.activityLocalTarget = "activitiesLayer";

			this.infoLayerTarget = 'infoLayerTarget';

			this.sourceInfoLayerTarget = 'sourceInfoLayerTarget';



			this.config = {

				atlasTarget: redmicConfig.services.atlasLayer,

				activityTarget: redmicConfig.services.activity,

				target: this.atlasTarget,

				selectionTarget: redmicConfig.services.atlasLayerSelection,

				activeTitleParent: true,

				pathParent: redmicConfig.viewPaths.ogcServiceCatalog,

				activityLocalTarget: 'activitiesLayer',

				infoLayerTarget: 'infoLayerTarget',

				sourceInfoLayerTarget: 'sourceInfoLayerTarget',

				templateTitle: TemplateTitle,

				templateInfo: TemplateInfo

			};
@@ -53,6 +54,13 @@ define([ 
			lang.mixin(this, this.config, args);

		},



		_setConfigurations: function() {



			this.viewPathsWidgets = {

				activities: '/catalog/{rank}-info/{id}'

			};

		},



		_setMainConfigurations: function() {



			this.inherited(arguments);
@@ -74,8 +82,8 @@ define([ 
						title: 'sourceInfo',

						template: TemplateSourceInfo,

						target: this.sourceInfoLayerTarget,

						"class": "containerDetails",

						classEmptyTemplate: "contentListNoData",

						'class': 'containerDetails',

						classEmptyTemplate: 'contentListNoData',

						associatedIds: [this.ownChannel],

						shownOption: this.shownOptionInfo

					}
@@ -109,7 +117,7 @@ define([ 
					props: {

						title: 'legend',

						template: TemplateImage,

						"class": "imageContainer",

						'class': 'imageContainer',

						target: this.atlasTarget,

						associatedIds: [this.ownChannel]

					}