Commit c9bf9a81 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Revisa y unifica catalog y detail de bibliografía

parent f362e930

client-app/app.profile.js

+2 −4
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ var viewLayers = { 


	// catálogos

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

	, 'src/catalog/bibliography/BibliographyCatalogView': {}

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

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

	, 'src/catalog/platform/PlatformCatalogView': {}
@@ -473,6 +474,7 @@ var viewLayers = { 


	// vistas detalle

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

	, 'src/detail/bibliography/BibliographyDetailView': {}

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

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

	, 'src/detail/platform/PlatformDetailView': {}
@@ -489,7 +491,6 @@ var viewLayers = { 


	, 'app/administrative/views/ContactView': {}

	, 'app/administrative/views/DeviceView': {}

	, 'app/administrative/views/DocumentView': {}

	, 'app/administrative/views/AnimalView': {}



	, 'app/administrative/taxonomy/views/MisIdentificationView': {}
@@ -519,15 +520,12 @@ var viewLayers = { 
	, 'app/maintenance/views/PermissionsView': {}



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

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

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

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

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

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

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



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

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

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

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

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

+32 −32
Original line number Diff line number Diff line
@@ -20,21 +20,21 @@ define({ 
		"title": "{i18n.metaActivityInfoTitle} '{name}'",

		"description": "{i18n.metaActivityInfoDescription} '{name}'. {activityType.name}. {description}."

	},

	"/catalog/project-catalog": {

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

		"description": "{i18n.metaProjectCatalogDescription}."

	"/bibliography": {

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

		"description": "{i18n.metaBibliographyCatalogDescription}"

	},

	"/catalog/project-info/{id}": {

		"title": "{i18n.metaProjectInfoTitle} '{name}'",

		"description": "{i18n.metaProjectInfoDescription} '{name}'. {projectGroup.name}. {description}."

	"/bibliography/document-info/{id}": {

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

		"description": "{i18n.metaBibliographyInfoDescription1} '{title}'. {documentType.name}, {i18n.metaBibliographyInfoDescription2} '{author}' {i18n.metaBibliographyInfoDescription3} {year}. [{keyword}]"

	},

	"/catalog/program-catalog": {

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

		"description": "{i18n.metaProgramCatalogDescription}."

	"/service-ogc-catalog": {

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

		"description": "{i18n.metaOgcServiceCatalogDescription}."

	},

	"/catalog/program-info/{id}": {

		"title": "{i18n.metaProgramInfoTitle} '{name}'",

		"description": "{i18n.metaProgramInfoDescription} '{name}'. {description}."

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

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

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

	},

	"/catalog/organisation-catalog": {

		"title": "{i18n.metaOrganizationCatalogTitle}",
@@ -52,6 +52,26 @@ define({ 
		"title": "{i18n.metaPlatformInfoTitle} '{name}'",

		"description": "{i18n.metaPlatformInfoDescription} '{name}'. {platformType.name}. {description}."

	},

	"/catalog/program-catalog": {

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

		"description": "{i18n.metaProgramCatalogDescription}."

	},

	"/catalog/program-info/{id}": {

		"title": "{i18n.metaProgramInfoTitle} '{name}'",

		"description": "{i18n.metaProgramInfoDescription} '{name}'. {description}."

	},

	"/catalog/project-catalog": {

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

		"description": "{i18n.metaProjectCatalogDescription}."

	},

	"/catalog/project-info/{id}": {

		"title": "{i18n.metaProjectInfoTitle} '{name}'",

		"description": "{i18n.metaProjectInfoDescription} '{name}'. {projectGroup.name}. {description}."

	},

	"/catalog/raster-catalog": {

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

		"description": "{i18n.metaRasterCatalogDescription}."

	},

	"/catalog/species-catalog": {

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

		"description": "{i18n.metaSpeciesCatalogDescription}."
@@ -60,10 +80,6 @@ define({ 
		"title": "{i18n.metaSpeciesInfoTitle} '{scientificName} {authorship}'",

		"description": "{i18n.metaSpeciesInfoDescription} '{scientificName} {authorship}'. {commonName}."

	},

	"/catalog/raster-catalog": {

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

		"description": "{i18n.metaRasterCatalogDescription}."

	},

	"/viewer/species-distribution": {

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

		"description": "{i18n.metaViewerSpeciesDistributionDescription}."
@@ -92,22 +108,6 @@ define({ 
		"title": "{i18n.metaAtlasTitle}",

		"description": "{i18n.metaAtlasDescription}."

	},

	"/service-ogc-catalog": {

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

		"description": "{i18n.metaOgcServiceCatalogDescription}."

	},

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

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

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

	},

	"/bibliography": {

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

		"description": "{i18n.metaBibliographyDescription}"

	},

	"/bibliography/document-info/{id}": {

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

		"description": "{i18n.metaBibliographyDocumentInfoIdDescription1} '{title}'. {documentType.name}, {i18n.metaBibliographyDocumentInfoIdDescription2} '{author}' {i18n.metaBibliographyDocumentInfoIdDescription3} {year}. [{keyword}]"

	},

	"/login": {

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

		"description": "{i18n.metaLoginDescription}."

client-app/src/oldapp/designs/textSearchFacetsList/main/Bibliography.js→client-app/src/catalog/bibliography/BibliographyCatalogView.js

+29 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ define([ 
	, 'src/redmicConfig'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'src/catalog/_GenerateReport'

	, 'src/component/browser/_Select'

	, 'src/component/browser/bars/SelectionBox'

	, 'src/component/browser/bars/Order'
@@ -17,6 +18,7 @@ define([ 
	, redmicConfig

	, declare

	, lang

	, _GenerateReport

	, _Select

	, SelectionBox

	, Order
@@ -24,7 +26,7 @@ define([ 
	, templateList

) {



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

	return declare([Layout, Controller, _Main, _GenerateReport], {

		//	summary:

		//		Base de vista de Bibliography/Document.
@@ -34,14 +36,39 @@ define([ 
		constructor: function (args) {



			this.config = {

				title: this.i18n.canarianMarineBibliography,

				ownChannel: 'bibliography',

				target: redmicConfig.services.document,



				idDetails: null,

				browserExts: [_Select],

				title: this.i18n.canarianMarineBibliography

				reportService: 'document'

			};



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

		},



		_setConfigurations: function() {



			this.browserConfig = this._merge([{

				rowConfig: {

					buttonsConfig: {

						listButton: [{

							icon: 'fa-external-link',

							btnId: 'url',

							condition: this._urlCondition,

							href: '{url}'

						},{

							icon: 'fa-info-circle',

							btnId: 'details',

							title: 'info',

							href: this.viewPaths.bibliographyDetails

						}]

					}

				}

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

		},



		_setMainConfigurations: function() {



			this.filterConfig = this._merge([{

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

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

	'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'dojo/aspect'

	, 'app/base/views/extensions/_EditionWizardView'

	, 'RWidgets/Button'

], function(

	declare

	, lang

	, aspect

	, _EditionWizardView

	, Button

) {



	return declare(_EditionWizardView, {

		//	summary:

		//		Extensión de vista de catálogo de bibliografía para añadir funcionalidad relativa a la edición de

		//		registros.



		constructor: function(args) {



			this.config = {

				addPath: this.viewPaths.bibliographyAdd,

				loadPath: this.viewPaths.bibliographyLoad

			};



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



			aspect.before(this, '_afterSetConfigurations', lang.hitch(this, this._setBibliographyEditionConfigurations));

			aspect.before(this, '_setBrowserButtons', lang.hitch(this, this._setBibliographyEditionBrowserButtons));

		},



		_setBibliographyEditionConfigurations: function() {



			this.browserConfig = this._merge([{

				rowConfig: {

					shownOptionTemplate: {

						code: true

					}

				}

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

		},



		_setBibliographyEditionBrowserButtons: function() {



			if (!this.listButtonsEdition) {

				console.warn('Tried to add bibliography edition buttons, but edition buttons config was not found!');

				return;

			}



			var findIndexCallback = lang.hitch(this, function(button) {



				return button.groupId && button.groupId === this._editionGroupId;

			});



			var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback);



			if (editionButtonIndex !== -1) {

				this.listButtonsEdition[editionButtonIndex].icons.push({

					icon: 'fa-edit',

					btnId: 'edit',

					title: 'edit',

					option: 'default',

					href: this.viewPaths.bibliographyEdit

				},{

					icon: 'fa-copy',

					btnId: 'copy',

					title: 'copy',

					href: this.viewPaths.bibliographyAdd

				});

			} else {

				console.warn('Tried to add bibliography edition buttons, but edition button group config was not found!');

			}

		},



		postCreate: function() {



			this.inherited(arguments);



			this.loadButton = new Button({

				iconClass: 'fa fa-upload',

				'class': 'warning',

				'title': this.i18n.loadDocument,

				'href': this.loadPath

			}).placeAt(this.buttonsNode);

		}

	});

});

client-app/src/component/socket/_IngestData.js

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ define([ 
						id: parameters.surveyId || parameters.elementUuid

					});

				} else if (obj.taskName === "ingest-data-document") {

					url = redmicConfig.viewPaths.documentLoad;

					url = redmicConfig.viewPaths.bibliographyLoad;

				}



				if (url) {