Merge branch 'feature-atlasDataUpgrade' into 'dev' (7177490e) · Commits · REDMIC Project / Client / Web

public/javascript/app/base/models/attr/Attr.js

+6 −3

Original line number	Diff line number	Diff line
		@@ -113,13 +113,16 @@ define([

		var type = this.get("schema").type;

		if (type === "string" \|\| (type instanceof Array && type.indexOf("string") !== -1)) {
		if (type === "string" \|\| (type instanceof Array && type.indexOf("string") === 0)) {
		var format = this.get("schema").format;
		// Si el valor se espera que sea de tipo temporal (fecha, fecha con hora o duración),
		// se devuelve procesado
		if (format && (format === 'date' \|\| format === 'date-time' \|\| format === 'duration')) {
		return this._getNormalizedTemporalValue(value, format);
		}

		var valueType = typeof value;
		if (valueType === 'number' \|\| valueType === 'boolean') {
		return value.toString();
		}
		}

		return value;

+5 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,11 @@ define([
		this._schema = schema;
		this._build();

		var propertyType = this._schema.type;
		if (propertyType instanceof Array && propertyType.indexOf('null') !== -1) {
		return;
		}

		this._setDefaultValue();
		},

+0 −8

Original line number	Diff line number	Diff line
		@@ -83,9 +83,6 @@ define([
		},{
		channel : this.getChannel("DESELECTED"),
		callback: "_subDeselected"
		},{
		channel : this.getChannel("SELECTED_ALL"),
		callback: "_subSelectedAll"
		});
		},

		@@ -148,11 +145,6 @@ define([
		_subSelectionCleared: function() {

		this._localSelectionCleared.apply(this, arguments);
		},

		_subSelectedAll: function() {

		this._localSelectionSelectedAll.apply(this, arguments);
		}
		});
		});

0 → 100644

+84 −0

Original line number	Diff line number	Diff line
		define([
		'app/designs/doubleList/main/textSearchAndDoubleList'
		, 'app/redmicConfig'
		, 'dojo/_base/declare'
		, 'dojo/_base/lang'
		, 'templates/ActivityList'
		], function (
		Main
		, redmicConfig
		, declare
		, lang
		, templateList
		) {

		return declare(Main, {
		// summary:
		// Step de ServiceOGC.

		constructor: function(args) {

		this.config = {
		// WizardStep params
		label: this.i18n.activities,
		title: this.i18n.activities,
		title2: this.i18n.activitiesSelected,

		labelAttr: 'activity',

		// General params
		target: redmicConfig.services.activity,

		ownChannel: 'activitySetStep'
		};

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

		_setConfigurations: function() {

		this.browserLeftConfig = this._merge([{
		browserConfig: {
		template: templateList,
		rowConfig: {
		buttonsConfig: {
		listButton: [{
		icon: 'fa-info-circle',
		btnId: 'details',
		title: 'info',
		href: redmicConfig.viewPaths.activityDetails
		},{
		icon: 'fa-arrow-right',
		btnId: 'addItem',
		classIcon: 'blueIcon',
		returnItem: true
		}]
		}
		}
		}
		}, this.browserLeftConfig \|\| {}]);

		this.browserRightConfig = this._merge([{
		browserConfig:{
		template: templateList,
		rowConfig: {
		buttonsConfig: {
		listButton: [{
		icon: 'fa-trash-o',
		btnId: 'remove',
		callback: '_removeItem',
		classIcon: 'redIcon',
		returnItem: true
		},{
		icon: 'fa-info-circle',
		btnId: 'details',
		title: 'info',
		href: redmicConfig.viewPaths.activityDetails
		}]
		}
		}
		}
		}, this.browserRightConfig \|\| {}]);
		}
		});
		});

+1 −1