Commit 4c63157e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Merge branch 'dev' of gitlab.com:redmic-project/client/web into dev

See merge request redmic-project/client/web!4
parents ad64cb71 59ce7737

docker-compose.prod.yml

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ version: '3.5' 


services:

  web:

    ports:

      - ${WEB_PORT}

    networks:

      - traefik-net

    deploy:

grunt/task/test.js

+3 −3
Original line number Diff line number Diff line
@@ -112,8 +112,7 @@ module.exports = function(grunt) { 
				commandsGrunt += gruntCommand + guestTestsParams + portParam + serverPort + ' ; ';

				serverPort += 3;



				var firstPartSpecificParamsList = Math.floor(specificParamsList.length / 2),

					secondPartSpecificParamsList = specificParamsList.length - firstPartSpecificParamsList;

				var firstPartSpecificParamsList = Math.floor(specificParamsList.length / 2);



				for (i = 0; i < firstPartSpecificParamsList; i++) {

					specificParams = specificParamsList[i];
@@ -123,8 +122,9 @@ module.exports = function(grunt) { 
				}



				commandsGrunt += cmds.join(' & ') + ' ; ';

				cmds = [];



				for (i = firstPartSpecificParamsList; i < secondPartSpecificParamsList; i++) {

				for (i = firstPartSpecificParamsList; i < specificParamsList.length; i++) {

					specificParams = specificParamsList[i];



					cmds.push(gruntCommand + specificParams + portParam + serverPort);

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

+5 −0
Original line number Diff line number Diff line
@@ -495,6 +495,11 @@ define([ 
			this.seriesData.definitionIndex = definitionIndexObj;

		},



		_localDeselected: function() {



			this._localClearSelection();

		},



		_localClearSelection: function() {



			this._publish(this.dataDefinitionList.getChildChannel("browser", "CLEAR_SELECTION"));

public/javascript/redmic/modules/browser/Browser.js

+5 −0
Original line number Diff line number Diff line
@@ -178,6 +178,11 @@ define([ 


		_subClear: function() {



			this._clear();

		},



		_clear: function() {



			this._clearData();

		},

public/javascript/redmic/modules/browser/_HierarchicalTable.js

+18 −6
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ define([ 
			lang.mixin(this, this.config);



			aspect.before(this, "_addItem", lang.hitch(this, this._addHierarchicalTableItem));

			aspect.before(this, "_addClassCols", lang.hitch(this, this._addClassHierarchicalCols));

			aspect.after(this, "_addClassColumns", lang.hitch(this, this._addClassHierarchicalColumns));

			aspect.before(this, "_clearTableStyle", lang.hitch(this, this._clearHierarchicalTableStyle));

		},



		postCreate: function() {
@@ -57,15 +58,26 @@ define([ 
			}

		},



		_addClassHierarchicalCols: function() {

		_clearHierarchicalTableStyle: function() {



			while (this._hierarchicalTableStyle.rules.length) {

				this._hierarchicalTableStyle.deleteRule(0);

			}

		},



		_addClassHierarchicalColumns: function() {



			for (var i = 1; i <= this._countPath; i++) {

				this._addClassHierarchicalColumn(i);

			}

		},



				var value = (this._countPath * 2) - (2 * i - 1) + 0.5,

		_addClassHierarchicalColumn: function(position) {



			var value = (this._countPath * 2) - (2 * position - 1) + 0.5,

			style = "justify-content: flex-start;width: 30rem; padding-right: " + value +	"rem !important;";



				this._hierarchicalTableStyle.insertRule(".table-col-hierrarchical-" + i + " { " + style + " }");

			}

			this._hierarchicalTableStyle.insertRule(".table-col-hierrarchical-" + position + " { " + style + " }");

		}

	});

});