Commit 0c48fa45 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Muestra datos de actividad en vista detalle 

Para las actividades de categorías ci (citas) y ml (capas de mapa),
incluye el visor geográfico para su contenido en la misma vista de
detalle, sin necesidad de navegar por pestañas. Se propagará al resto de
categorías.

Refactoriza y corrige detalles.

Actualiza estilo para corregir diseños de detalle anidados.
parent 82f33651

public/javascript/app/designs/details/_AddTitle.js

+10 −12
Original line number Diff line number Diff line
@@ -180,27 +180,25 @@ define([ 
			this._tabstitleNode = put(this.titleNode, "div.tabs");



			for (var i = 0; i < this.tabs.length; i++) {

				this._insertTab(i);

				this._insertTab(this.tabs[i]);

			}

		},



		_insertTab: function(pos) {

		_insertTab: function(tab) {



			if (this.tabs[pos].select) {

			if (tab.select || !this._insertTabByCondition(tab)) {

				return;

			}



			if (this._insertTabByCondition(this.tabs[pos])) {

				var classTab = ".tab.tabSelect";

			var tabClass = '.tab.tabSelect',

				tabTitleKey = tab.title,

				tabTitleValue = this.i18n[tabTitleKey] || tabTitleKey,

				tabNode = put(this._tabstitleNode, 'div' + tabClass + ' a', tabTitleValue);



				tabNode = put(this._tabstitleNode, "div" + classTab + " a",

					this.i18n[this.tabs[pos].title] ? this.i18n[this.tabs[pos].title] : this.tabs[pos].title);



				if (!this.tabs[pos].select && this.tabs[pos].href) {

					tabNode.setAttribute('href', lang.replace(this.tabs[pos].href, this.data));

			if (tab.href) {

				tabNode.setAttribute('href', lang.replace(tab.href, this.data));

				tabNode.setAttribute('d-state-url', true);

			}

			}

		},



		_insertTabByCondition: function(tab) {

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

+74 −3
Original line number Diff line number Diff line 
define([

	"app/redmicConfig"

	'app/details/views/ActivityCitationMapBase'

	, 'app/details/views/ActivityLayerMapBase'

	, "app/redmicConfig"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "redmic/modules/map/_ImportWkt"
@@ -8,7 +10,9 @@ define([ 
	, "templates/ActivityInfo"

	, "./_ActivityBase"

], function(

	redmicConfig

	ActivityCitationMapBase

	, ActivityLayerMapBase

	, redmicConfig

	, declare

	, lang

	, _ImportWkt
@@ -35,7 +39,7 @@ define([ 


			this.widgetConfigs = this._merge([{

				info: this._infoConfig({

					height: 5,

					height: 4,

					template: TemplateInfo

				}),

				spatialExtensionMap: {
@@ -95,6 +99,7 @@ define([ 
			});



			this._prepareSpatialExtension();

			this._prepareActivityCategoryCustomWidgets();



			this.inherited(arguments);

		},
@@ -141,6 +146,62 @@ define([ 
			});

		},



		_prepareActivityCategoryCustomWidgets: function() {



			if (!this._activityCategoryCustomWidgets) {

				this._activityCategoryCustomWidgets = [];

			}



			var activityCategory = this._activityData.activityCategory,

				widgetKey;



			if (activityCategory === 'ci') {

				widgetKey = this._prepareCitationActivityWidgets();

			} else if (activityCategory === 'ml') {

				widgetKey = this._prepareMapLayerActivityWidgets();

			}



			widgetKey && this._activityCategoryCustomWidgets.push(widgetKey);

		},



		_prepareCitationActivityWidgets: function() {



			var key = 'activityCitation';



			var config = {

				width: 6,

				height: 6,

				type: ActivityCitationMapBase,

				props: {

					title: this.i18n.citations,

					pathVariableId: this._activityData.id

				}

			};



			this._addWidget(key, config);



			return key;

		},



		_prepareMapLayerActivityWidgets: function() {



			var key = 'activityMapLayer';



			var config = {

				width: 6,

				height: 6,

				type: ActivityLayerMapBase,

				props: {

					title: this.i18n.layers,

					pathVariableId: this._activityData.id

				}

			};



			this._addWidget(key, config);



			return key;

		},



		_onActivityDetailsHidden: function() {



			if (this._lastWktLayer) {
@@ -152,6 +213,16 @@ define([ 
			}



			this._hideWidget('spatialExtensionMap');



			this._removeActivityCategoryCustomWidgets();

		},



		_removeActivityCategoryCustomWidgets: function() {



			while (this._activityCategoryCustomWidgets.length) {

				var key = this._activityCategoryCustomWidgets.pop();

				this._destroyWidget(key);

			}

		}

	});

});

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

+1 −6
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ define([ 
	, "app/designs/base/_Main"

	, "app/designs/details/Controller"

	, "app/designs/details/Layout"

	, "app/designs/details/_AddTitle"

	, "app/designs/details/_TitleSelection"

	, "app/designs/mapWithSideContent/main/Geographic"

	, "dojo/_base/declare"

	, "dojo/_base/lang"
@@ -15,8 +13,6 @@ define([ 
	, _Main

	, Controller

	, Layout

	, _AddTitle

	, _TitleSelection

	, Geographic

	, declare

	, lang
@@ -24,8 +20,7 @@ define([ 
	, ActivityLayerList

) {



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

		_ListenActivityDataAndAccessByActivityCategory], {

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

		//	summary:

		//		Vista detalle de ActivityLayerMap.

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

+1 −6
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ define([ 
	, "app/designs/base/_Main"

	, "app/designs/details/Controller"

	, "app/designs/details/Layout"

	, "app/designs/details/_AddTitle"

	, "app/designs/details/_TitleSelection"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "redmic/modules/map/layer/PruneClusterLayerImpl"
@@ -15,16 +13,13 @@ define([ 
	, _Main

	, Controller

	, Layout

	, _AddTitle

	, _TitleSelection

	, declare

	, lang

	, PruneClusterLayerImpl

	, _RadiusOnClick

	, Geographic

){

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

		_ListenActivityDataAndAccessByActivityCategory], {

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

		//	summary:

		//		Vista detalle de ActivityMap.

stylesheets @ b584cafc

Compare 9a4ce62f to b584cafc
Original line number Diff line number Diff line 
Subproject commit 9a4ce62f283069e0c372f93a58672f88ffa86e51
 
Subproject commit b584cafc7bca7d441191547bc549f37b10b22c7b