Merge branch 'feature-AllowSelectParamAndUnitOnLoadOC' into 'dev' (e81d5763) · Commits · REDMIC Project / Client / Web

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 −20

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'

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

+21 −30

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,31 +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>

public/javascript/app/edition/views/dataLoader/AddDataFT.js

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ define([
		}
		},
		formConfig: {
		template: "components/viewCustomization/parameter/views/templates/FC"
		template: "components/viewCustomization/parameter/views/templates/FT"
		}
		}
		}]

public/javascript/app/edition/views/dataLoader/AddDataOC.js

+0 −6

Original line number	Diff line number	Diff line
		@@ -98,12 +98,6 @@ define([
		}
		},

		valueItemsDefault: {
		parameter: 42,
		unit: 19,
		"dataDefinition/z": 0
		},

		formConfig: {
		template: "components/viewCustomization/parameter/views/templates/OC"
		}