Commit 208276a9 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige vistas y diseños relacionados con edición 

Revisa base de vistas de edición con componente geográfico.
Actualiza diseños contentAndList, doubleList y formList, relacionados
con la edición.
Corrige detalles pendientes del diseño mapWithSideContent.
parent 9b329562

public/javascript/app/dataLoader/base/_GeographicBase.js

+20 −10
Original line number Diff line number Diff line
@@ -5,9 +5,7 @@ define([ 
	, "app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory"

	, "app/base/views/extensions/_LocalSelectionView"

	, "app/base/views/extensions/_OnShownAndRefresh"

	, "app/designs/mapWithSideContent/layout/MapAndContentAndTopbar"

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

	, "app/redmicConfig"

	, "dijit/layout/ContentPane"

	, "dijit/layout/TabContainer"

	, "dojo/_base/declare"
@@ -29,9 +27,7 @@ define([ 
	, _ListenActivityDataAndAccessByActivityCategory

	, _LocalSelectionView

	, _OnShownAndRefresh

	, MapAndContentAndTopbar

	, Geographic

	, redmicConfig

	, ContentPane

	, TabContainer

	, declare
@@ -47,7 +43,7 @@ define([ 
	, GeoJsonLayerImpl

	, Utilities

){

	return declare([Geographic, MapAndContentAndTopbar, _EditionWizardView, _CompositeInTooltipFromIconKeypad,

	return declare([Geographic, _EditionWizardView, _CompositeInTooltipFromIconKeypad,

		_LocalSelectionView, _OnShownAndRefresh, _GetActivityData, _ListenActivityDataAndAccessByActivityCategory], {

		//	summary:

		//		Base de vistas de gestión de datos cargados con listado y mapa.
@@ -68,11 +64,14 @@ define([ 
			aspect.before(this, "_setConfigurations", lang.hitch(this, this._setGeographicBaseConfigurations));

			aspect.before(this, "_initialize", lang.hitch(this, this._initializeGeographicBase));

			aspect.before(this, "_definePublications", lang.hitch(this, this._defineGeographicBasePublications));

			aspect.before(this, "_setOwnCallbacksForEvents", lang.hitch(this,

				this._setGeographicBaseOwnCallbacksForEvents));



			aspect.before(this, "_beforeShow", lang.hitch(this, this._beforeShowGeographicBase));



			if (!Utilities.isValidNumber(this.pathVariableId)) {

			/*if (!Utilities.isValidNumber(this.pathVariableId)) {

				this._goTo404();

			}

			}*/

		},



		_setGeographicBaseConfigurations: function() {
@@ -106,6 +105,11 @@ define([ 
			}, this.compositeConfig || {}]);

		},



		_setGeographicBaseOwnCallbacksForEvents: function() {



			this._onEvt('SHOW', lang.hitch(this, this._onGeographicBaseShown));

		},



		_beforeShowGeographicBase: function() {



			if (!this.pathVariableId) {
@@ -119,6 +123,11 @@ define([ 
			this.dataAddPath[this.idProperty] = 'new';

		},



		_onGeographicBaseShown: function() {



			this.tabs.resize();

		},



		_createAtlas: function() {



			this.atlas = new Atlas({
@@ -197,13 +206,14 @@ define([ 
				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"

				'class': "mediumSolidContainer sideTabContainer borderRadiusTabContainer"

			});



			this.tabs.addChild(this.leftNode);

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



			this.contentNode.addChild(this.tabs);

			this.tabs.placeAt(this.contentNode);

			this.tabs.startup();



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

		},
@@ -244,7 +254,7 @@ define([ 
		_updateTitle: function(title) {



			this._publish(this.dataDisplayer.getChannel("SHOW"), {

				node: this.topbarNode.domNode,

				node: this.topbarNode,

				data: title

			});

		}

public/javascript/app/designs/contentAndList/Controller.js

+1 −6
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ define([ 
			this.inherited(arguments);



			this._publish(this.browser.getChannel("SHOW"), {

				node: this.centerNode.domNode

				node: this.centerNode

			});



			this._publish(this.browser.getChildChannel("browser", "CLEAR"));
@@ -72,11 +72,6 @@ define([ 
			this[callback] && this[callback](evt);

		},



		_getNodeToShow: function() {



			return this.containerNode;

		},



		_updateCompletedStatus: function() {



			this._isCompleted = !!this._totalSelected;

public/javascript/app/designs/contentAndList/Layout.js

+18 −36
Original line number Diff line number Diff line 
define([

	"dijit/layout/BorderContainer"

	, "dijit/layout/ContentPane"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "put-selector/put"

	'app/designs/base/_Layout'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'put-selector/put'

], function(

	BorderContainer

	, ContentPane

	_Layout

	, declare

	, lang

	, put

) {

	return declare(ContentPane, {



	return declare(_Layout, {

		//	summary:

		//		Layout para vistas que contienen .



		constructor: function(args) {



			lang.mixin(this, args);

			this.config = {

				layoutAdditionalClasses: 'layoutContentAndListDesign twoColumnsLayout'

			};



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

		},



		postCreate: function() {



			put(this.containerNode, ".twoColumnsLayout.row");



			var centerNode = new BorderContainer({

				'class': "leftZone col-lg-6",

				style: "width: 50%"

			});

			put(this.containerNode, centerNode.domNode);



			this.topNode = new ContentPane({

				region: "top",

				'class': "notFormZone"

			});

			centerNode.addChild(this.topNode);



			this.centerNode = new ContentPane({

				region: "center",

				'class': "stretchZone",

				style: "width: 100%"

			});

			centerNode.addChild(this.centerNode);



			this.inherited(arguments);

		},



		_getNodeToShow: function() {

			var centerNode = put(this.domNode, 'div.leftZone');



			return this.containerNode;

			this.topNode = put(centerNode, 'div.notFormZone');

			this.centerNode = put(centerNode, 'div.stretchZone');

		}

	});

});

public/javascript/app/designs/doubleList/Controller.js

+2 −7
Original line number Diff line number Diff line
@@ -92,13 +92,13 @@ define([ 
			this.inherited(arguments);



			this._publish(this.browserLeft.getChannel("SHOW"), {

				node: this.leftNode.domNode

				node: this.leftNode

			});



			this._publish(this.browserLeft.getChildChannel("browser", "CLEAR"));



			this._publish(this.browserRight.getChannel("SHOW"), {

				node: this.rightNode.domNode

				node: this.rightNode

			});



			this._publish(this.browserRight.getChildChannel("browser", "CLEAR"));
@@ -110,11 +110,6 @@ define([ 
			this[callback] && this[callback](evt);

		},



		_getNodeToShow: function() {



			return this.containerNode;

		},



		_updateCompletedStatus: function() {



			this._isCompleted = !!this._totalSelected;

public/javascript/app/designs/doubleList/layout/DoubleList.js

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
define([

	"dijit/layout/BorderContainer"

	, "dijit/layout/ContentPane"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "put-selector/put"

], function (

	BorderContainer

	, ContentPane

	, declare

	, lang

	, put

){

	return declare(ContentPane, {

		//	summary:

		//		Layout para vistas que contienen .



		constructor: function(args) {



			lang.mixin(this, args);

		},



		postCreate: function() {



			put(this.containerNode, ".twoColumnsLayout.row");



			this.contentNode = new BorderContainer({

				'class': "col-lg-12",

				region: "center"

			});



			this.leftNode = new ContentPane({

				'class': "leftZone",

				region: "left",

				style: "width: 30%",

				splitter: true

			});



			this.rightNode = new ContentPane({

				'class': "rightZone",

				region: "center",

				style: "width: 70%",

				splitter:true

			});



			this.contentNode.addChild(this.leftNode);

			this.contentNode.addChild(this.rightNode);



			this.addChild(this.contentNode);

			this.contentNode.startup();



			this.inherited(arguments);

		},



		_getNodeToShow: function() {



			return this.containerNode;

		}

	});

});
 
 No newline at end of file