Limpia y refactoriza código de main (4b736f7b) · Commits · REDMIC Project / Client / Web

public/javascript/app/designs/mapWithSideContent/main/Geographic.js

+2 −1

Original line number	Diff line number	Diff line
		@@ -165,7 +165,7 @@ define([
		channel: this.browser.getChannel("UPDATE_TARGET")
		});

		if (!this.notTextSearch)
		if (!this.notTextSearch) {
		this.publicationsConfig.push({
		event: 'CLEAR',
		channel: this.textSearch.getChannel("RESET")
		@@ -173,6 +173,7 @@ define([
		event: 'UPDATE_TARGET',
		channel: this.textSearch.getChannel("UPDATE_TARGET")
		});
		}
		},

		postCreate: function() {

public/javascript/app/designs/mapWithSideContent/main/GeographicEditor.js

+111 −59

Original line number	Diff line number	Diff line
		@@ -83,11 +83,6 @@ define([
		// description:
		// Permite editar datos geográficos.

		// config: Object
		// Opciones y asignaciones por defecto.
		// title: String
		// Título de la vista.

		constructor: function (args) {

		this.config = {
		@@ -247,10 +242,7 @@ define([
		},{
		event: 'UPDATE_TARGET',
		channel: this.textSearch.getChannel("UPDATE_TARGET")
		}/*,{
		event: 'REFRESH',
		channel: this.textSearch.getChannel("REFRESH")
		}*/,{
		},{
		event: 'CLEAR',
		channel: this.textSearch.getChannel("RESET")
		});
		@@ -258,14 +250,60 @@ define([

		postCreate: function() {

		this._createBrowserAndEditorContainers();

		this._createTextSearchNode();

		this.inherited(arguments);

		this._createBrowserNode();

		this._createEditorNode();

		this._emitEvt('ADD_LAYER', {layer: this.geoJsonLayer});

		this._createTabContainers();

		this._emitEvt('REFRESH');
		},

		_createBrowserAndEditorContainers: function() {

		this.browserAndEditorNode = new declare([StackContainer, Animation])({
		'class': "marginedContainer noScrolledContainer",
		title: this.i18n.list,
		region:"center"
		});

		this.browserAndSearchContainer = new BorderContainer({
		'class': "noScrolledContainer"
		});

		this.browserAndEditorNode.addChild(this.browserAndSearchContainer);
		},

		_createTabContainers: function() {

		this.tabs = new TabContainer({
		tabPosition: "top",
		splitter: true,
		region: "left",
		'class': "col-xs-6 col-sm-6 col-md-6 col-lg-5 col-xl-4 mediumTexturedContainer sideTabContainer borderRadiusTabContainer"
		});

		this.tabs.addChild(this.browserAndEditorNode);
		this.tabs.addChild(this._createAtlas());

		this.contentNode.addChild(this.tabs);
		},

		_createTextSearchNode: function() {

		this.textSearchNode = new ContentPane({
		'class': "topZone topZoneCitation",
		region: "top"
		});

		this._publish(this.textSearch.getChannel("SHOW"), {
		node: this.textSearchNode.domNode
		});
		@@ -273,8 +311,9 @@ define([
		this.buttonsNode = this.textSearchNode;

		this.browserAndSearchContainer.addChild(this.textSearchNode);
		},

		this.inherited(arguments);
		_createBrowserNode: function() {

		this.gridNode = new ContentPane({
		'class': 'stretchZone',
		@@ -286,6 +325,9 @@ define([
		});

		this.browserAndSearchContainer.addChild(this.gridNode);
		},

		_createEditorNode: function() {

		this.editorNode = new ContentPane({
		'class': "scrollWrapper"
		@@ -300,32 +342,24 @@ define([
		});
		}));

		this._emitEvt('ADD_LAYER', {layer: this.geoJsonLayer});

		this.listAndEditorNode = new declare([StackContainer, Animation])({
		'class': "marginedContainer noScrolledContainer",
		title: this.i18n.list,
		region:"center"
		});
		this.listAndEditorNode.addChild(this.browserAndSearchContainer);
		this.listAndEditorNode.addChild(this.editorNode);
		this.browserAndEditorNode.addChild(this.editorNode);
		},

		this.tabs = new TabContainer({
		tabPosition: "top",
		splitter: true,
		region: "left",
		'class': "col-xs-6 col-sm-6 col-md-6 col-lg-5 col-xl-4 mediumTexturedContainer sideTabContainer borderRadiusTabContainer"
		});
		_beforeShowMain: function() {

		this.tabs.addChild(this.listAndEditorNode);
		this.tabs.addChild(this._createAtlas());
		if (!this._setNewTarget()) {
		return;
		}

		this.contentNode.addChild(this.tabs);
		this._publish(this.map.getChannel("SET_CENTER_AND_ZOOM"), {
		center: [28.5, -16.0],
		zoom: 7
		});

		this._emitEvt('REFRESH');
		},

		_beforeShowMain: function() {
		_setNewTarget: function() {

		if (!this.pathVariableId) {
		return;
		@@ -345,12 +379,7 @@ define([
		target: this.target
		});

		this._publish(this.map.getChannel("SET_CENTER_AND_ZOOM"), {
		center: [28.5, -16.0],
		zoom: 7
		});

		this._emitEvt('REFRESH');
		return newTarget;
		},

		_createAtlas: function() {
		@@ -425,25 +454,30 @@ define([

		_subShownForm: function(request) {

		var activityId = this.pathVariableId;
		if (!(activityId && activityId.length)) {
		this._emitEvt('COMMUNICATION', {
		description: this.i18n.noActivity
		});
		if (!this._chkActivity()) {
		this._actionWhenNoActivity();

		this._publish(this.editor.getChannel("HIDE"));
		return;
		}

		this.listAndEditorNode.set('title', this.i18n.form);
		this._shownForm(request);
		},

		_shownForm: function(request) {

		this.listAndEditorNode.selectChild(this.editorNode);
		//this._emitEvt('CLEAR_SELECTION');
		this._changeTabForForm();

		this._publish(this.geoJsonLayer.getChannel("DISCONNECT"), {
		actions: ["REQUEST"/, "SELECT"/]
		});

		this._publish(this.geoJsonLayer.getChannel("EDITION"), this._objToPublishForGeoJsonLayer(request));

		this._currentData = request.data \|\| null;
		},

		_objToPublishForGeoJsonLayer: function(request) {

		var data = request.data,
		objToPublish = {};

		@@ -454,23 +488,26 @@ define([
		objToPublish.data = data;
		}
		}
		},

		this._publish(this.geoJsonLayer.getChannel("EDITION"), objToPublish);
		_actionWhenNoActivity: function() {

		if (data) {
		this._currentData = data;
		} else {
		this._currentData = null;
		this._setPropsForNewInstance();
		}
		this._emitEvt('COMMUNICATION', {
		description: this.i18n.noActivity
		});

		this._publish(this.editor.getChannel("HIDE"));
		},

		_setPropsForNewInstance: function() {
		_chkActivity: function() {

		var activityId = this.pathVariableId;

		if (!(activityId && activityId.length)) {
		return false;
		}

		/*this._emitEvt('SET_FORM_PROPERTY', {
		propertyName: "geometry/type",
		value: "Point"
		});*/
		return true;
		},

		_subFormHidden: function() {
		@@ -483,9 +520,24 @@ define([

		this._currentData = null;

		this.listAndEditorNode.set('title', this.i18n.list);
		this._changeTabForList();
		},

		_changeTabForList: function() {

		this._changeTab(this.browserAndSearchContainer, this.i18n.list);
		},

		_changeTabForForm: function() {

		this._changeTab(this.editorNode, this.i18n.form);
		},

		_changeTab: function(container, title) {

		this.browserAndEditorNode.set('title', title);

		this.listAndEditorNode.selectChild(this.browserAndSearchContainer);
		this.browserAndEditorNode.selectChild(container);
		},

		_subFormChanged: function(change) {
		@@ -522,7 +574,7 @@ define([

		_onHide: function() {

		this.listAndEditorNode.selectChild(this.browserAndSearchContainer);
		this.browserAndEditorNode.selectChild(this.browserAndSearchContainer);
		},

		_getNodeForForm: function () {

public/javascript/app/designs/mapWithSideContent/main/Tracking.js

+10 −9

Original line number	Diff line number	Diff line
		@@ -256,14 +256,15 @@ define([

		_subChanged: function(res) {

		if (res.name === "markers")
		if (res.name === "markers") {
		this._changeMarkers(res.value);
		else if (res.name === "mode")
		} else if (res.name === "mode") {
		this._changeMode(res.value);
		else if (res.name === "rate")
		} else if (res.name === "rate") {
		this._changeRate(res.value);
		else if (res.name === "interval")
		} else if (res.name === "interval") {
		this._changeInterval(res.value);
		}
		},

		_createAtlas: function() {
		@@ -458,8 +459,9 @@ define([

		_subClearLayers: function() {

		for (var idProperty in this._layerInstances)
		for (var idProperty in this._layerInstances) {
		this._removeDataLayer(idProperty);
		}
		},

		_subAddLayers: function(item) {
		@@ -558,7 +560,6 @@ define([

		_subZoomSet: function(res) {
		// TODO puede que esto sea innecesario ya

		this._currentZoomLevel = res.zoom;
		},

public/javascript/app/designs/sidebarAndContent/main/GenericViewerConfigLayerContent.js

+2 −1

Original line number	Diff line number	Diff line
		@@ -87,8 +87,9 @@ define([

		_styleCallback: function() {

		if (!this.editorLayer)
		if (!this.editorLayer) {
		this.editorLayer = new EditorLayerWithVariableForm(this.editorLayerConfig);
		}

		return {
		instance: this.editorLayer,