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

Merge branch 'dev' into 'master' 

Afina widgets de actividad para observaciones

Closes #91, #100, #78, and #79

See merge request redmic-project/client/web!106
parents 1e06ccb1 54b0cf25

client-app/app.profile.js

+15 −20
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ var profileObj = { 
	layerOptimize: 'closure',

	optimize: 'closure',

	optimizeOptions: {

		languageIn: 'ECMASCRIPT_2017',

		languageOut: 'ECMASCRIPT_2015',

		languageIn: 'ECMASCRIPT_NEXT',

		languageOut: 'ECMASCRIPT_2020',

		compilationLevel: 'SIMPLE_OPTIMIZATIONS'

	},

	cssOptimize: 'comments',
@@ -146,6 +146,13 @@ var profileObj = { 
		name: 'put-selector',

		location: 'dep/put-selector',

		main: 'put'

	},{

		name: 'superset-sdk',

		location: 'dep/superset-sdk/bundle',

		main: 'index',

		resourceTags: {

			amd: amdTagger

		}

	},{

		name: 'wicket',

		location: 'dep/wicket',
@@ -462,6 +469,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 +494,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,19 +519,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': {}

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

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

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

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

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

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



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

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

	, 'app/user/views/WhatIsRedmicView': {}
@@ -537,10 +537,6 @@ var viewLayers = { 
	, 'app/viewers/views/TrackingView': {}

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

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

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

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



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



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

	, 'app/edition/views/DeviceEditionView': {}
@@ -557,7 +553,6 @@ var viewLayers = { 
	, 'app/edition/views/ServiceOGCEditionView': {}

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

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

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

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

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

};

client-app/dep/superset-sdk

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../node_modules/@superset-ui/embedded-sdk
 
 No newline at end of file

templates @ 65afaa94

Compare 4d18c207 to 65afaa94
Original line number Diff line number Diff line 
Subproject commit 4d18c207a37a9ca4f3e736310c22d9d43bea69ed
 
Subproject commit 65afaa94cc0062d10dc3dbf28306105111172ce6

client-app/res/images/map/layer-eoc-map.png

deleted100644 → 0
−9.15 KiB
Loading image diff...

client-app/res/images/map/layer-ortofoto.png

deleted100644 → 0
−13.5 KiB
Loading image diff...