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

Reubica vistas de contact y device 

Mueve y adapta a la nueva estructura las vistas de catálogo de contactos
y dispositivos, así como la vista de detalle de contactos.

Revisa configuración de rutas de vistas y de capas de compilación.

Elimina restos que ahora quedan en desuso.
parent 03b16015

client-app/app.profile.js

+6 −5
Original line number Diff line number Diff line
@@ -462,6 +462,10 @@ var viewLayers = { 
	, 'src/catalog/animal/_Edition': {}

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

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

	, 'src/catalog/contact/ContactCatalogView': {}

	, 'src/catalog/contact/_Edition': {}

	, 'src/catalog/device/DeviceCatalogView': {}

	, 'src/catalog/device/_Edition': {}

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

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

	, 'src/catalog/organisation/OrganisationCatalogView': {}
@@ -483,6 +487,8 @@ var viewLayers = { 
	, 'src/detail/animal/_Edition': {}

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

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

	, 'src/detail/contact/ContactDetailView': {}

	, 'src/detail/contact/_Edition': {}

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

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

	, 'src/detail/organisation/OrganisationDetailView': {}
@@ -506,9 +512,6 @@ var viewLayers = { 


	// -------------------------------------------------------------------------



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

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



	, 'app/administrative/taxonomy/views/MisIdentificationView': {}

	, 'app/administrative/taxonomy/views/GenusView': {}

	, 'app/administrative/taxonomy/views/FamilyView': {}
@@ -538,8 +541,6 @@ var viewLayers = { 
	, 'app/viewers/views/TrashCollectionView': {}

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



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



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

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

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

client-app/src/oldapp/administrative/views/ContactView.js→client-app/src/catalog/contact/ContactCatalogView.js

+81 −0
Original line number Diff line number Diff line 
define([

	"app/designs/textSearchFacetsList/main/Administrative"

	, "app/base/views/extensions/_EditionWizardView"

	'app/designs/base/_Main'

	, 'app/designs/textSearchFacetsList/Controller'

	, 'app/designs/textSearchFacetsList/Layout'

	, 'src/redmicConfig'

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "templates/ContactList"

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'src/component/browser/_Select'

	, 'src/component/browser/bars/Order'

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

	, 'src/component/browser/bars/Total'

	, 'templates/ContactList'

], function(

	AdministrativeMain

	, _EditionWizardView

	_Main

	, TextSearchFacetsListController

	, TextSearchFacetsListLayout

	, redmicConfig

	, declare

	, lang

	, _Select

	, Order

	, SelectionBox

	, Total

	, ContactListTemplate

) {

	return declare([AdministrativeMain, _EditionWizardView], {



	return declare([TextSearchFacetsListLayout, TextSearchFacetsListController, _Main], {

		// summary:

		// 	Vista de Contact.

		// description:

		// 	Muestra la información.

		//		Vista de catálogo de contactos.



		constructor: function(args) {



			this.config = {

				target: redmicConfig.services.contact,

				title: this.i18n.contacts,

				addPath: this.viewPaths.contactAdd

				ownChannel: 'contactCatalog',

				target: redmicConfig.services.contact,



				browserExts: [_Select]

			};



			lang.mixin(this, this.config, args);
@@ -37,30 +48,29 @@ define([ 
				rowConfig: {

					buttonsConfig: {

						listButton: [{

							groupId: "edition",

							icons: [{

								icon: "fa-edit",

								btnId: "edit",

								title: "edit",

								option: "default",

								href: this.viewPaths.contactEdit

							}]

						},{

							icon: "fa-info-circle",

							btnId: "details",

							title: "info",

							icon: 'fa-info-circle',

							btnId: 'details',

							title: 'info',

							href: this.viewPaths.contactDetails

						}]

					}

				},

				orderConfig: {

					options: [

						{value: "id"},

						{value: "firstName"},

						{value: "surname"},

						{value: "updated"}

						{value: 'id'},

						{value: 'firstName'},

						{value: 'surname'},

						{value: 'updated'}

					]

				}

				},

				bars: [{

					instance: Total

				},{

					instance: SelectionBox

				},{

					instance: Order,

					config: 'orderConfig'

				}]

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



			this.facetsConfig = this._merge([{

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

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

	'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'dojo/aspect'

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

], function(

	declare

	, lang

	, aspect

	, _EditionWizardView

) {



	return declare(_EditionWizardView, {

		//	summary:

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

		//		registros.



		constructor: function(args) {



			this.config = {

				addPath: this.viewPaths.contactAdd

			};



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



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

		},



		_setContactEditionBrowserButtons: function() {



			if (!this.listButtonsEdition) {

				console.warn('Tried to add contact 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.contactEdit

				});

			} else {

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

			}

		}

	});

});

client-app/src/oldapp/administrative/views/DeviceView.js→client-app/src/catalog/device/DeviceCatalogView.js

+70 −0
Original line number Diff line number Diff line 
define([

	'app/designs/textSearchFacetsList/main/Administrative'

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

	'app/designs/base/_Main'

	, 'app/designs/textSearchFacetsList/Controller'

	, 'app/designs/textSearchFacetsList/Layout'

	, 'src/redmicConfig'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'src/component/browser/_Select'

	, 'src/component/browser/bars/Order'

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

	, 'src/component/browser/bars/Total'

	, 'templates/DeviceList'

], function(

	AdministrativeMain

	, _EditionWizardView

	_Main

	, TextSearchFacetsListController

	, TextSearchFacetsListLayout

	, redmicConfig

	, declare

	, lang

	, templateList

	, _Select

	, Order

	, SelectionBox

	, Total

	, DeviceListTemplate

) {

	return declare([AdministrativeMain, _EditionWizardView], {



	return declare([TextSearchFacetsListLayout, TextSearchFacetsListController, _Main], {

		//	summary:

		//		Vista de Device.

		//		Vista de catálogo de dispositivos.



		constructor: function (args) {



			this.config = {

				addPath: this.viewPaths.deviceAdd,

				title: this.i18n.devices,

				ownChannel: 'deviceCatalog',

				target: this.services.device,

				title: this.i18n.devices



				browserExts: [_Select]

			};



			lang.mixin(this, this.config, args);
@@ -31,28 +44,22 @@ define([ 
		_setConfigurations: function() {



			this.browserConfig = this._merge([{

				template: templateList,

				rowConfig: {

					buttonsConfig: {

						listButton: [{

							groupId: 'edition',

							icons: [{

								icon: 'fa-edit',

								btnId: 'edit',

								title: 'edit',

								option: 'default',

								href: this.viewPaths.deviceEdit

							}]

						}]

					}

				},

				template: DeviceListTemplate,

				orderConfig: {

					options: [

						{value: 'name'},

						{value: 'model'},

						{value: 'updated'}

					]

				}

				},

				bars: [{

					instance: Total

				},{

					instance: SelectionBox

				},{

					instance: Order,

					config: 'orderConfig'

				}]

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



			this.facetsConfig = this._merge([{

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

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

	'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'dojo/aspect'

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

], function(

	declare

	, lang

	, aspect

	, _EditionWizardView

) {



	return declare(_EditionWizardView, {

		//	summary:

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

		//		registros.



		constructor: function(args) {



			this.config = {

				addPath: this.viewPaths.deviceAdd

			};



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



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

		},



		_setDeviceEditionBrowserButtons: function() {



			if (!this.listButtonsEdition) {

				console.warn('Tried to add device 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.deviceEdit

				});

			} else {

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

			}

		}

	});

});