Commit 20a7695d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/client/web!29
parents 9a27156e 3a527b42

package.json

+3 −3
Original line number Diff line number Diff line 
{

  "name": "REDMIC",

  "version": "0.12.5",

  "author": "Observatorio Ambiental Granadilla",

  "homepage": "https://redmic.es",

  "version": "0.13.0",

  "author": "REDMIC",

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

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

  "contributors": [

    {

public/javascript/app/administrative/views/templates/forms/ContactForm.html

+1 −2
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ 


		<div data-redmic-type="annotation" data-redmic-props="

			propertyName: 'annotation',

			content: '* ${i18n.noteForContact}.',

			required: true

			content: '* ${i18n.noteForContact}.'

		"></div>



		<div data-redmic-type="text" data-redmic-model="surname"></div>

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

+6 −1
Original line number Diff line number Diff line
@@ -264,7 +264,12 @@ define([ 
					this._formData.parameter = [];

					for (var i = 0; i < parameters.length; i++) {

						var item = parameters[i],

							name = item.parameter.name + ' - ' + item.unit.name + ' (' + item.dataDefinition.z + ')';

							name = item.parameter.name + ' - ' + item.unit.name + ' (z: ' + item.dataDefinition.z + ')';

							device = item.dataDefinition.device;



						if (device) {

							name += ' - ' + device.name + ' (id: ' + device.id + ')';

						}



						this._formData.parameter.push({

							id: item.dataDefinition.id,

public/javascript/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html

+2 −0
Original line number Diff line number Diff line
@@ -7,5 +7,7 @@ 
		<div data-redmic-type="text" data-redmic-model="properties/site/code"></div>



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



		<div data-redmic-type="text" data-redmic-model="properties/site/dashboard"></div>

	</fieldset>

</form>
 
 No newline at end of file

public/javascript/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js

+7 −0
Original line number Diff line number Diff line
@@ -79,6 +79,13 @@ define([ 


			this.dataSeriesChartsConfig = this._merge([{

				parentChannel: this.getChannel(),

				aggregationToolSelection: {

					interval: [],

					metrics: ["avg"]

				},

				aggregationToolConfig: {

					defaultIntervalOptions: []

				},

				chartsContainerExts: [

					_TemporalAxisWithGridDrawing,

					_VerticalAxesWithGridDrawing,