Commit 587de603 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'release-0.18.0' into 'master' 

Release 0.18.0

Closes #39

See merge request redmic-project/client/web!64
parents 302ec6ee 09ffd190

package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "REDMIC",

  "version": "0.17.0",

  "version": "0.18.0",

  "author": "REDMIC",

  "homepage": "https://gitlab.com/redmic-project/client/web/blob/master/README.md",

  "description": "Integrated marine data repository of Canary Islands - Client",

public/javascript/app/administrative/taxonomy/views/TaxonomyView.js

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ define([ 
			this.config = {

				noScroll: true,

				propsWidget: {

					noButtonsWindow: true,

					noTitleWindow: true

					omitTitleBar: true,

					resizable: false

				},

				title: this.i18n.taxonomy

			};

public/javascript/app/components/steps/DataDefinitionSetStep.js

+1 −28
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ define([ 
				title: this.i18n.dataDefinitionsAssociated,

				propertyName: "properties/measurements",

				propToRead: "properties/measurements",

				propsToClean: ['id', 'localId'],

				// General params

				target: redmicConfig.services.dataDefinition,
@@ -80,8 +81,6 @@ define([ 


			this._once(this.form.getChannel('SHOWN'), lang.hitch(this, function() {



				setTimeout(lang.hitch(this, this._setValueItemsDefault));



				this._publish(this.form.getChannel("SET_METHOD"), {

					"_onNewParameter": lang.hitch(this, this._onNewParameter)

				});
@@ -90,18 +89,6 @@ define([ 
			this.inherited(arguments);

		},



		_setValueItemsDefault: function() {



			if (this.valueItemsDefault) {

				for (var key in this.valueItemsDefault) {

					this._publish(this.form.getChannel("SET_PROPERTY_VALUE"), {

						propertyName: key,

						value: this.valueItemsDefault[key]

					});

				}

			}

		},



		_onNewParameter: function() {



			if (!this._wizardParameter) {
@@ -121,20 +108,6 @@ define([ 
				propertyName: "parameter",

				value: res.body

			});

		},



		_clearStep: function() {



			this.inherited(arguments);



			this._setValueItemsDefault();

		},



		_resetStep: function() {



			this.inherited(arguments);



			this._setValueItemsDefault();

		}

	});

});

public/javascript/app/components/viewCustomization/parameter/views/templates/FCForm.html→public/javascript/app/components/viewCustomization/parameter/views/templates/FTForm.html

+1 −21
Original line number Diff line number Diff line 
<div>

	<form class="form-horizontal">

		<div data-redmic-type="filter" data-redmic-model="parameter"">

		<div data-redmic-type="filter" data-redmic-model="parameter">

			<div class="embeddedButton" data-redmic-type="button" data-redmic-props="

				propertyName: 'onNewParameter',

				iconClass: 'fa-plus',
@@ -32,10 +32,6 @@ 
		<div data-redmic-type="textarea" data-redmic-model="dataDefinition/description"></div>



		<div data-redmic-type="boolean" data-redmic-model="dataDefinition/derivedData"></div>

		<!--<div data-redmic-type="boolean" data-redmic-model="dataDefinition/isSerial" data-redmic-props="

			noEditable: true,

			disable: true

		"></div>-->



		<div data-redmic-type="boolean" data-redmic-model="dataDefinition/isRegularity"></div>
@@ -46,21 +42,6 @@ 
			optionDefault: 1

		"></div>



		<!--<div data-redmic-type="boolean" data-redmic-model="dataDefinition/isRegularity" data-redmic-props="

			propertyNameDependence: 'dataDefinition/isSerial',

			dependenceType: 'hidden'

		"></div>



		<div data-redmic-type="valueAndUnit" data-redmic-model="dataDefinition/timeInterval" data-redmic-props="

			propertyNameDependence: 'dataDefinition/isSerial',

			dependenceType: 'hidden',

			optionDefault: 1,

			difConvertToBase: 1000,

			delta: 1,

			requiredWithDependence: true,

			minSlider: 1

		"></div>-->



		<div data-redmic-type="filter" data-redmic-model="dataDefinition/contact" data-redmic-props="

			labelAttr: '{firstName} {surname}',

			template: 'templates/ContactFilter'
@@ -69,7 +50,6 @@ 
		<div data-redmic-type="filter" data-redmic-model="dataDefinition/contactRole" data-redmic-props="

			propertyNameDependence: 'dataDefinition/contact',

			dependenceType: 'hidden',

			terms: {'ids':'6,7'},

			requiredWithDependence: true

		"></div>

	</form>

public/javascript/app/components/viewCustomization/parameter/views/templates/OCForm.html

+21 −31
Original line number Diff line number Diff line 
<div>

	<form class="form-horizontal">

		<div data-redmic-type="filter" data-redmic-model="dataDefinition/device" data-redmic-props="

			required: true,

			target: 'device'

		<div data-redmic-type="filter" data-redmic-model="parameter">

			<div class="embeddedButton" data-redmic-type="button" data-redmic-props="

				propertyName: 'onNewParameter',

				iconClass: 'fa-plus',

				class: 'primary',

				title: '${i18n.newParameter}'

			" data-redmic-actions="

				onClick: '_onNewParameter'

			"></div>

		</div>



		<div data-redmic-type="number" data-redmic-model="dataDefinition/z" data-redmic-props="

			required: true,

			noEditable: true,

			label: 'zDepthAltitude'

		<div data-redmic-type="select" data-redmic-model="unit" data-redmic-props="

			propertyNameDependence: 'parameter',

			dependenceType: 'hidden',

			targetDependence: 'parameter',

			propertyPath: 'units',

			labelAttr: 'unit.name',

			idProperty: 'unit.id'

		"></div>



		<div data-redmic-type="textarea" data-redmic-model="dataDefinition/description" data-redmic-props="

			required: true

		<div data-redmic-type="filter" data-redmic-model="dataDefinition/device"></div>



		<div data-redmic-type="number" data-redmic-model="dataDefinition/z" data-redmic-props="

			label: 'zDepthAltitude'

		"></div>



		<!--<div data-redmic-type="boolean" data-redmic-model="dataDefinition/isSerial" data-redmic-props="

			noEditable: true,

			disable: true

		"></div>-->

		<div data-redmic-type="textarea" data-redmic-model="dataDefinition/description"></div>



		<div data-redmic-type="boolean" data-redmic-model="dataDefinition/isRegularity"></div>
@@ -29,32 +37,14 @@ 
			optionDefault: 1

		"></div>



		<!--<div data-redmic-type="boolean" data-redmic-model="dataDefinition/isRegularity" data-redmic-props="

			propertyNameDependence: 'dataDefinition/isSerial',

			dependenceType: 'hidden'

		"></div>



		<div data-redmic-type="valueAndUnit" data-redmic-model="dataDefinition/timeInterval" data-redmic-props="

			propertyNameDependence: 'dataDefinition/isSerial',

			dependenceType: 'hidden',

			optionDefault: 1,

			difConvertToBase: 1000,

			delta: 1,

			requiredWithDependence: true,

			minSlider: 1

		"></div>-->



		<div data-redmic-type="filter" data-redmic-model="dataDefinition/contact" data-redmic-props="

			labelAttr: '{firstName} {surname}',

			target: 'contact',

			template: 'templates/ContactFilter'

		"></div>



		<div data-redmic-type="filter" data-redmic-model="dataDefinition/contactRole" data-redmic-props="

			propertyNameDependence: 'dataDefinition/contact',

			dependenceType: 'hidden',

			target: 'contactRole',

			terms: {'ids':'6,7'},

			requiredWithDependence: true

		"></div>

	</form>