From 8732deef999095fc371548c64e48ab838e741d82 Mon Sep 17 00:00:00 2001 From: p-a-s-c-a-l Date: Wed, 31 Oct 2018 16:46:10 +0100 Subject: [PATCH 01/15] #2 load indicator data from study group entity --- .gitignore | 1 + app/frameset.html | 19 + app/index.html | 2 + ...rupalContextProviderDirectiveController.js | 486 ++++++++++++++++++ app/scripts/controllers/mainController.js | 26 +- .../fileBasedAnalysisContextProvider.js | 3 +- .../services/drupalDecisionStrategies.js | 93 ++++ app/scripts/services/drupalService.js | 106 ++++ karma.conf.js | 2 + 9 files changed, 724 insertions(+), 14 deletions(-) create mode 100644 app/frameset.html create mode 100644 app/scripts/controllers/drupalContextProviderDirectiveController.js create mode 100644 app/scripts/services/drupalDecisionStrategies.js create mode 100644 app/scripts/services/drupalService.js diff --git a/.gitignore b/.gitignore index 776c258..884b522 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ app/bower_components target .checkDependencies test-results.xml +private/ \ No newline at end of file diff --git a/app/frameset.html b/app/frameset.html new file mode 100644 index 0000000..1a20dd4 --- /dev/null +++ b/app/frameset.html @@ -0,0 +1,19 @@ + + + + Scenario Analysis + + + + + + + + + + diff --git a/app/index.html b/app/index.html index 4b6bd21..d55fe6d 100644 --- a/app/index.html +++ b/app/index.html @@ -563,6 +563,8 @@

+ + diff --git a/app/scripts/controllers/drupalContextProviderDirectiveController.js b/app/scripts/controllers/drupalContextProviderDirectiveController.js new file mode 100644 index 0000000..c9b97c8 --- /dev/null +++ b/app/scripts/controllers/drupalContextProviderDirectiveController.js @@ -0,0 +1,486 @@ +angular.module( + 'eu.myclimateservice.csis.scenario-analysis.controllers' + ).controller( + 'eu.myclimateservice.csis.scenario-analysis.controllers.drupalContextProviderDirectiveController', + [ + '$scope', + '$timeout', + 'de.cismet.crisma.ICMM.services.icmm', + 'de.cismet.crisma.ICMM.Worldstates', + 'eu.myclimateservice.csis.scenario-analysis.services.drupalService', + function ($scope, $timeout, Icmm, Worldstates, drupalService) { + 'use strict'; + var showIndicatorFileLoadingError, showFileLoading, loadIndicatorObjects, loadIndicatorObject, onloadCfFile, onloadDsFile; + var restApi = drupalService.restApi; + + //initialize the bindings + $scope.selectedWorldstates = []; + $scope.worldstates = []; + $scope.criteriaFunctions = []; + $scope.decisionStrategies = []; + $scope.showDummyListItem = true; + $scope.removeSelectionBtnDisabled = true; + $scope.removeSelectionButtonStyle = { + 'color': '#888' + }; + $scope.noIndicatorsLoaded = true; + /* + * the indicator maps keeps track of the indicators that each object + * (e.g. indicator object, criteriaFunction and decisionStrategy) that are loaded by this directive + * must provide + */ + $scope.tooltipRename = { + title: 'Rename criteria function' + }; + $scope.tooltipRenameDone = { + title: 'Done' + }; + $scope.tooltipDeleteSelection = { + title: 'Done' + }; + $scope.tooltipDeleteSelection = { + title: 'Remove selection' + }; + $scope.tooltipAdd = { + title: 'Add Icc Objects from file' + }; + $scope.editable = []; + $scope.toggleSelection = function (index) { + var wsToToggle, i, isSelected; + wsToToggle = $scope.worldstates[index]; + //check if the worldstate is already contained in the selectedWorldstates array.. + isSelected = -1; + for (i = 0; i < $scope.selectedWorldstates.length; i++) { + if ($scope.selectedWorldstates[i].id === wsToToggle.id) { + isSelected = i; + break; + } + } + + if (isSelected >= 0) { + $scope.selectedWorldstates.splice(isSelected, 1); + } else { + $scope.selectedWorldstates.push(wsToToggle); + } + }; + + $scope.$watchCollection('selectedWorldstates', function () { + //if no indicator objects are selected anymore whe need to disable the button + if ($scope.selectedWorldstates.length <= 0) { + $scope.removeSelectionBtnDisabled = true; + $scope.removeSelectionButtonStyle = { + 'color': '#CCC' + }; + } else { + $scope.removeSelectionBtnDisabled = false; + $scope.removeSelectionButtonStyle = {}; + } + }); + + $scope.getItemStyle = function (index) { + var c = 'list-group-item'; + var wsToToggle, i, isSelected; + wsToToggle = $scope.worldstates[index]; + //check if the worldstate is already contained in the selectedWorldstates array.. + isSelected = -1; + for (i = 0; i < $scope.selectedWorldstates.length; i++) { + if ($scope.selectedWorldstates[i].id === wsToToggle.id) { + isSelected = i; + } + } + + if (isSelected >= 0) { + c += ' list-group-item-info'; + } + + return c; + }; + + //check if the File API is available + $scope.fileAPIAvailable = (window.File && window.FileReader && window.FileList && window.Blob) ? true : false; + + $scope.removeSelectedDummyWS = function () { + var i, j, indexToRemove; + if ($scope.removeSelectionBtnDisabled) { + return; + } + indexToRemove = []; + for (i = 0; i < $scope.selectedWorldstates.length; i++) { + for (j = 0; j < $scope.worldstates.length; j++) { + if (angular.equals($scope.worldstates[j], $scope.selectedWorldstates[i])) { + indexToRemove.push(j); + } + } + } + for (i = indexToRemove.length - 1; i >= 0; i--) { + $scope.worldstates.splice(indexToRemove[i], 1); + } + $scope.selectedWorldstates = []; + }; + + /* + * be carefull calling this function from angular contexts + * @param {type} file that could not be loaded properly... + * @returns {undefined} + */ + showIndicatorFileLoadingError = function (message) { + $scope.fileLoadError = true; + $scope.errorMessage = message; + $scope.$apply(); + }; + + showFileLoading = function () { + $scope.fileLoadError = false; + $scope.fileLoading = true; + }; + + $scope.fileLoadError = false; + $scope.fileLoading = false; + + $scope.showCfFileLoadingError = function (message) { + $scope.cfFileLoadError = true; + $scope.cfFileLoadErrorMsg = 'Criteria functions not loaded. ' + message; + $scope.$apply(); + }; + + $scope.showDsFileLoadingError = function (message) { + $scope.dsFileLoadError = true; + $scope.dsFileLoadErrorMsg = 'Decision strategies not loaded. ' + message; + $scope.$apply(); + }; + + loadIndicatorObjects = function (indicatorObjects) { + var arrayLength = indicatorObjects.length; + for (var i = 0; i < arrayLength; i++) { + loadIndicatorObject(indicatorObjects[i]); + } + }; + + loadIndicatorObject = function (indicatorObject) { + var worldstateDummy, indicatorProp, indicator, origLoadedIndicators, indicatorGroup, + loadedIndicatorLength, indicatorMapLength, containsIndicator, msg; + try { + + /* + * + * accept two differnt kind of files. + * 1. A plain icc data object. + * In that case we apply a standard name to this object + * + * 2. A worldstate Dummy object that already has a name + */ + + if (indicatorObject.name && indicatorObject.iccdata) { + worldstateDummy = indicatorObject; + origLoadedIndicators = indicatorObject.iccdata; + worldstateDummy.iccdata = { + // this is a total mess: serialise the deserialized icc data again + // so that it can be deserilaized by icmm helper library + actualaccessinfo: JSON.stringify(worldstateDummy.iccdata) + }; + } else { + //generate a uniqe id... + origLoadedIndicators = indicatorObject; + worldstateDummy = { + name: 'Nonamed indicator data', + iccdata: { + actualaccessinfo: JSON.stringify(indicatorObject) + } + }; + } + var tmp; + if ($scope.worldstates && $scope.worldstates.length > 0) { + tmp = Worldstates.utils.stripIccData([$scope.worldstates[0]])[0].data; + } else { + tmp = origLoadedIndicators; + } + $scope.indicatorMap = {}; + for (indicatorGroup in tmp) { + if (tmp.hasOwnProperty(indicatorGroup)) { + for (indicatorProp in tmp[indicatorGroup]) { + if (tmp[indicatorGroup].hasOwnProperty(indicatorProp)) { + if (indicatorProp !== 'displayName' && indicatorProp !== 'iconResource') { + $scope.indicatorMap[indicatorProp] = tmp[indicatorGroup][indicatorProp]; + } + } + } + } + } + loadedIndicatorLength = 0; + indicatorMapLength = 0; + for (indicator in $scope.indicatorMap) { + if ($scope.indicatorMap.hasOwnProperty(indicator)) { + containsIndicator = false; + indicatorMapLength++; + for (indicatorGroup in origLoadedIndicators) { + if (origLoadedIndicators.hasOwnProperty(indicatorGroup)) { + for (indicatorProp in origLoadedIndicators[indicatorGroup]) { + if (origLoadedIndicators[indicatorGroup].hasOwnProperty(indicatorProp)) { + if (indicatorProp !== 'displayName' && indicatorProp !== 'iconResource') { + if ($scope.indicatorMap[indicator].displayName === origLoadedIndicators[indicatorGroup][indicatorProp].displayName) { + loadedIndicatorLength++; + containsIndicator = true; + break; + } + } + } + } + } + } + if (!containsIndicator) { + msg = 'Could not load indicator file. It contains no indicator data for ' + indicator; + console.error(msg); + showIndicatorFileLoadingError(msg); + return; + } + } + } + if (loadedIndicatorLength !== indicatorMapLength) { + msg = 'indicator data in file has more indicators defined that the first loaded indicator set.'; + console.error(msg); + showIndicatorFileLoadingError(msg); + return; + } + + // we need an id to distinct the icc objects. eg. the ranking table use this id + // to keep track of the indicator objects + if (!worldstateDummy.id) { + worldstateDummy.id = Math.floor((Math.random() * 1000000) + 1); + } + + // an excellent example on technical debt and accidental complexity: + // instead of adressing the root cause of the problem, we + // introduce additional inadequateness and ambiguity + Icmm.convertToCorrectIccDataFormat(worldstateDummy); + + if ($scope.worldstates) { + $scope.worldstates.push(worldstateDummy); + $scope.editable.push(false); + } else { + $scope.editable.push(false); + $scope.worldstates = [worldstateDummy]; + } + $scope.showDummyListItem = false; + $scope.noIndicatorsLoaded = false; + // when indicator objects are added we want them to be selected by default + $scope.selectedWorldstates.splice(0, $scope.selectedWorldstates.length); + $scope.worldstates.forEach(function (object, index) { + $scope.toggleSelection(index); + }); + + //$scope.$apply(); + + } catch (err) { + // show an error in the gui... + showIndicatorFileLoadingError(err.toString()); + } + }; + + onloadCfFile = function (theFile) { + return function (e) { + var cfSet, cf, i, j, indicatorProp, indicatorFound, cfIndicator, msg, indicatorMapLength, + cfIndicatorLength; + try { + cfSet = JSON.parse(e.target.result); + + if (Object.prototype.toString.call(cfSet) === '[object Array]') { + indicatorMapLength = 0; + for (indicatorProp in $scope.indicatorMap) { + if ($scope.indicatorMap.hasOwnProperty(indicatorProp)) { + indicatorMapLength++; + } + } + // we need to check if the criteria Functions defined in the file + // match to the indicators of the loaded indicator files... + for (indicatorProp in $scope.indicatorMap) { + if ($scope.indicatorMap.hasOwnProperty(indicatorProp)) { + for (i = 0; i < cfSet.length; i++) { + cf = cfSet[i]; + cfIndicatorLength = cf.criteriaFunctions.length; + for (j = 0; j < cf.criteriaFunctions.length; j++) { + cfIndicator = cf.criteriaFunctions[j].indicator; + indicatorFound = false; + + if ($scope.indicatorMap[indicatorProp].displayName === cfIndicator) { + indicatorFound = true; + break; + } + } + if (!indicatorFound) { + msg = 'Could not find indicator "' + $scope.indicatorMap[indicatorProp].displayName + '" in criteria function "' + cf.name + '"'; + console.error(msg); + $scope.showCfFileLoadingError(msg); + return; + } + if (cfIndicatorLength !== indicatorMapLength) { + msg = 'Criteria Function :"' + cf.name + '" contains more indicators than the loaded indicator files.'; + console.error(msg); + $scope.showCfFileLoadingError(msg); + return; + } + } + } + } + $scope.criteriaFunctions = cfSet; + $scope.loadedCfFile = theFile.name; + + } + $scope.$apply(); + } catch (err) { + // show an error in the gui... + console.error('Could not read Criteria Function Config File: ' + theFile.name); + } + }; + }; + + onloadDsFile = function (theFile) { + return function (e) { + var ds, s, i, j, indicatorProp, indicatorFound, cfIndicator, msg, indicatorMapLength, dsIndicatorLength; + try { + ds = JSON.parse(e.target.result); + + if (Object.prototype.toString.call(ds) === '[object Array]') { + indicatorMapLength = 0; + for (indicatorProp in $scope.indicatorMap) { + if ($scope.indicatorMap.hasOwnProperty(indicatorProp)) { + indicatorMapLength++; + } + } + // we need to check if the decision strategies defined in the file + // match to the indicators of the loaded indicator files... + for (indicatorProp in $scope.indicatorMap) { + for (i = 0; i < ds.length; i++) { + s = ds[i]; + dsIndicatorLength = s.criteriaEmphases.length; + for (j = 0; j < s.criteriaEmphases.length; j++) { + cfIndicator = s.criteriaEmphases[j].indicator.displayName; + indicatorFound = false; + + if ($scope.indicatorMap[indicatorProp].displayName === cfIndicator) { + indicatorFound = true; + break; + } + } + if (s.satisfactionEmphasis.length !== indicatorMapLength) { + msg = 'Satisfaction Emphasis Vector for decision strategy :"' + ds.name + '" contains more elements than indicator are defined'; + console.error(msg); + $scope.showDsFileLoadingError(msg); + return; + } + if (!indicatorFound) { + msg = 'Could not find indicator "' + $scope.indicatorMap[indicatorProp].displayName + '" in decision strategy "' + s.name + '"'; + console.error(msg); + $scope.showDsFileLoadingError(msg); + return; + } + if (dsIndicatorLength !== indicatorMapLength) { + msg = 'Decision strategy :"' + ds.name + '" contains more indicators than the loaded indicator files.'; + console.error(msg); + $scope.showDsFileLoadingError(msg); + return; + } + } + } + $scope.loadedDsfFile = theFile.name; + $scope.decisionStrategies = ds; + } + $scope.$apply(); + } catch (err) { + // show an error in the gui... + console.error('Could not read Decision Strategy Config File: ' + theFile.name); + } + }; + }; + + /* + * When the newFile property has changed the User want's to add a new list of files. + */ + $scope.$watch('iccObjects', function (newVal, oldVal) { + /*var i, file, reader; + if (!angular.equals(newVal, oldVal) && newVal) { + showFileLoading(); + + for (i = 0; i < $scope.iccObjects.length; i++) { + + file = $scope.iccObjects[i]; + + reader = new FileReader(); + reader.onload = onloadIccObjects(file); + try { + //we assume that the file is utf-8 encoded + reader.readAsText(file); + } catch (err) { + // show an error in the gui... + showIndicatorFileLoadingError(err.toString()); + } + + } + + }*/ + }, true); + + $scope.$watch('cfConfigFile', function () { + var file; + $scope.cfFileLoadError = false; + $scope.loadedCfFile = false; + if ($scope.cfConfigFile) { + showFileLoading(); + + file = $scope.cfConfigFile[0]; + + var reader = new FileReader(); + reader.onload = onloadCfFile(file); + + try { + //we assume that the file is utf-8 encoded + reader.readAsText(file); + } catch (err) { + // show an error in the gui... + console.error('Could not read Criteria Function Config File: ' + file.name); + } + } + + }, true); + + $scope.$watch('dsConfigFile', function () { + var file; + $scope.dsFileLoadError = false; + $scope.loadedDsfFile = false; + if ($scope.dsConfigFile) { + showFileLoading(); + + file = $scope.dsConfigFile[0]; + + var reader = new FileReader(); + reader.onload = onloadDsFile(file); + + try { + //we assume that the file is utf-8 encoded + reader.readAsText(file); + } catch (err) { + // show an error in the gui... + console.error('Could not read Decision Strategy Config File: ' + file.name); + } + + } + + }, true); + + + $timeout(function () { + restApi.getStudy(1).then(function (study) { + var indicatorArray = drupalService.studyHelper.getIndicatorArray(study); + loadIndicatorObjects(indicatorArray); + }, function (error) { + console.log(error.data.message); + showIndicatorFileLoadingError(error.data.message.toString()); + }); + }, 1000); + + + + } + ] + ); + + diff --git a/app/scripts/controllers/mainController.js b/app/scripts/controllers/mainController.js index 47f69c3..fbe64ef 100644 --- a/app/scripts/controllers/mainController.js +++ b/app/scripts/controllers/mainController.js @@ -19,8 +19,9 @@ angular.module( '$q', 'eu.myclimateservice.csis.scenario-analysis.services.IcmmPersistanceService', 'eu.myclimateservice.csis.scenario-analysis.services.FilesPersistanceService', + 'eu.myclimateservice.csis.scenario-analysis.services.drupalService', 'ngDialog', - function ($window, $scope, $resource, $http, $timeout, $q, IcmmPersistanceService, FilesPersistanceService, ngDialog) { + function ($window, $scope, $resource, $http, $timeout, $q, IcmmPersistanceService, FilesPersistanceService, drupalService, ngDialog) { 'use strict'; var parent = window.seamless.connect(); @@ -30,8 +31,9 @@ angular.module( // Print out the data that was received. console.log('child recieved: ' + data + event); }); - - var drupal = 'http://roberto:8080'; + + var restApi = drupalService.restApi; + var createChartModels; // we bind to the container object since the provider directives are nested in angular-bootstrap tabs @@ -270,12 +272,12 @@ angular.module( $window.html2canvas(document.getElementById(elementId), {logging: true, foreignObjectRendering: foreignObjectRendering}).then(canvas => { document.body.appendChild(canvas); var imageBlob = canvas.toDataURL().replace(/^data:image\/(png|jpg);base64,/, ''); - + //console.log(dataURL); var payload = { '_links': { 'type': { - 'href': drupal + '/rest/type/file/image' + 'href': restApi.host + '/rest/type/file/image' } }, 'filename': [ @@ -298,10 +300,10 @@ angular.module( /** * 1) get the X-CSRF-Token */ - $http({method: 'GET', url: drupal + '/rest/session/token'}) + $http({method: 'GET', url: restApi.host + '/rest/session/token'}) .then(function tokenSuccessCallback(response) { - var uploadImage = $resource(drupal + '/entity/file', + var uploadImage = $resource(restApi.host + '/entity/file', { _format: 'hal_json' }, { @@ -325,8 +327,8 @@ angular.module( // return the image id return response.fid[0]; }, function uploadImageError(response) { - console.log('error uploading Image: ' + response); - $q.reject(response); + console.log('error uploading Image: ' + response.data.message); + $q.reject(response.data); }); }, function tokenErrorCallback(response) { console.log('error retrieving X-CSRF-Token: ' + response); @@ -338,7 +340,7 @@ angular.module( */ function successCallback(response) { console.log('image id: ' + response); - + // TODO UPDATE Resource }, function errorCallback(response) { @@ -360,7 +362,5 @@ angular.module( });*/ }); }; - } - ] - ); + ]); diff --git a/app/scripts/directives/fileBasedAnalysisContextProvider.js b/app/scripts/directives/fileBasedAnalysisContextProvider.js index f358fbf..c32bf1a 100644 --- a/app/scripts/directives/fileBasedAnalysisContextProvider.js +++ b/app/scripts/directives/fileBasedAnalysisContextProvider.js @@ -19,7 +19,8 @@ angular.module( scope: scope, restrict: 'E', templateUrl: 'templates/fileContextProviderTemplate.html', - controller: 'eu.myclimateservice.csis.scenario-analysis.controllers.FileContextProviderDirectiveController' + //controller: 'eu.myclimateservice.csis.scenario-analysis.controllers.FileContextProviderDirectiveController' + controller: 'eu.myclimateservice.csis.scenario-analysis.controllers.drupalContextProviderDirectiveController' }; } ] diff --git a/app/scripts/services/drupalDecisionStrategies.js b/app/scripts/services/drupalDecisionStrategies.js new file mode 100644 index 0000000..56edb05 --- /dev/null +++ b/app/scripts/services/drupalDecisionStrategies.js @@ -0,0 +1,93 @@ +angular.module( + 'eu.myclimateservice.csis.scenario-analysis.services' + ).factory( + 'eu.myclimateservice.csis.scenario-analysis.services.DecisionStrategies', + [ + '$resource', + 'eu.myclimateservice.csis.scenario-analysis.services.configurationService', + function ($resource, configurationService) { + 'use strict'; + var decisionStrategy, transformResponse, decisionStrategyFacade, createResource; + transformResponse = function (studyJsonString) { + var study; + if (studyJsonString) { + study = JSON.parse(studyJsonString); + + return JSON.parse(study.decisionStrategies); + } + return null; + + }; + + + + createResource = function () { + var r; + + r = $resource(configurationService.$this.drupalRestApi.host + '/' + configurationService.getDomain() + '.decisionstrategies/1', { + decisionStrategyId: '@id', + deduplicate: false, + omitNullValues: 'false' + }, { + 'query': { + method: 'GET', + isArray: true, + params: { + level: '1', + omitNullValues: 'true' + }, + transformResponse: transformResponse + }, + 'update': { + method: 'PUT', + transformRequest: function (data) { + var transformedData, study; + study = { + $self: '/CRISMA.decisionstrategies/1', + id: 1, + decisionStrategies: angular.toJson(data) + }; + transformedData = JSON.stringify(study, function (k, v) { + // we have to take care of angular properties by ourselves + if (k.substring(0, 1) === '$' && !(k === '$self' || k === '$ref')) { + return undefined; + } + + return v; + }); + return transformedData; + } + } + }); + + r.getId = function () { + return Icmm.getNextId(configurationService.getIcmmApi() + '/' + configurationService.getDomain(), '.decisionstrategies'); + }; + + return r; + }; + + decisionStrategy = createResource(); + decisionStrategyFacade = { + 'get': function () { + return decisionStrategy.get.apply(this, arguments); + }, + 'query': function () { + return decisionStrategy.query.apply(this, arguments); + }, + 'update': function () { + return decisionStrategy.update.apply(this, arguments); + }, + 'getId': function () { + return decisionStrategy.getId.apply(this, arguments); + } + }; + + configurationService.addApiListener(function () { + decisionStrategy = createResource(); + }); + + return decisionStrategyFacade; + } + ] + ); diff --git a/app/scripts/services/drupalService.js b/app/scripts/services/drupalService.js new file mode 100644 index 0000000..db2c178 --- /dev/null +++ b/app/scripts/services/drupalService.js @@ -0,0 +1,106 @@ +/* + * *************************************************** + * + * cismet GmbH, Saarbruecken, Germany + * + * ... and it just works. + * + * *************************************************** + */ + +/*global angular*/ +/*jshint sub:true*/ + +angular.module( + 'eu.myclimateservice.csis.scenario-analysis.services' + ).factory('eu.myclimateservice.csis.scenario-analysis.services.drupalService', + ['$http', '$resource', '$q', function ($http, $resource, $q) { + 'use strict'; + + var $this; + $this = this; + + // + $this.drupalRestApi = {}; + $this.drupalRestApi.host = ''; //http://roberto:8080'; + $this.drupalRestApi.token = undefined; + // + + $this.drupalRestApi.initToken = function () { + return $http({method: 'GET', url: $this.drupalRestApi.host + '/rest/session/token'}) + .then(function tokenSuccessCallback(response) { + $this.drupalRestApi.token = response.data; + console.log('X-CSRF-Token recieved from API: ' + $this.drupalRestApi.token); + return response.data; + }, function tokenErrorCallback(response) { + $this.drupalRestApi.token = undefined; + console.log('error retrieving X-CSRF-Token: ' + response); + $q.reject(undefined); + }); + }; + + /** + * return a promise! + */ + $this.drupalRestApi.getToken = function () { + if (!$this.drupalRestApi.token || $this.drupalRestApi.token === null || $this.drupalRestApi.token === undefined) { + return $this.drupalRestApi.initToken(); + } else { + $q.when($this.drupalRestApi.token); + } + }; + + $this.drupalRestApi.getStudy = function (studyId) { + + return $this.drupalRestApi.getToken().then(function tokenSuccessCallback(token) { + var studyResource = $resource($this.drupalRestApi.host + '/study/:studyId', + { + studyId: '@studyId', + _format: 'hal_json' + + }, { + get: { + method: 'GET', + isArray: false, + headers: { + 'Content-Type': 'application/hal+json', + 'X-CSRF-Token': token + } + } + }); + + var studyInstance = studyResource.get({studyId: studyId}); + return studyInstance.$promise; + + }, function tokenErrorCallback(response) { + return $q.reject(response); + }); + }; + + // init the token + //$this.drupalRestApi.initToken(); + + $this.drupalStudyHelper = {}; + $this.drupalStudyHelper.getIndicatorArray = function (study) { + if (!study || study === null || study === undefined || + !study.field_indicators || study.field_indicators === null || study.field_indicators === undefined) { + return []; + } else { + var studyIndicators = []; + for(var i = 0; i < study.field_indicators.length; i++) { + // this is madness: parse into object and later stringify again + // so that it can be used by the akward ICMM library (won't touch this thing!) + var studyIndicator = JSON.parse(study.field_indicators[i].value); + studyIndicators.push(studyIndicator); + } + return studyIndicators; + } + + }; + + return { + restApi: $this.drupalRestApi, + studyHelper: $this.drupalStudyHelper + }; + } + ]); diff --git a/karma.conf.js b/karma.conf.js index 0e0ff63..e91665c 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -80,6 +80,8 @@ basePath: '', 'target/dist/scripts/services/icmmPersistanceService.js', 'target/dist/scripts/services/icmmCriteriaFunctions.js', 'target/dist/scripts/services/icmmDecisionStrategies.js', + 'target/dist/scripts/services/drupalService.js', + 'target/dist/scripts/services/drupalContextProviderDirectiveController.js', 'target/dist/bower_components/angular-mocks/angular-mocks.js', 'app/templates/criteriaEmphasesTemplate.html', 'app/templates/criteriaFunctionManagerTemplate.html', From 1d1042fec1ea2a562ae0d2e0660f289e4e37f9d9 Mon Sep 17 00:00:00 2001 From: p-a-s-c-a-l Date: Mon, 5 Nov 2018 18:13:48 +0100 Subject: [PATCH 02/15] #2 recieve and process seamless.js events --- app/index.html | 5 +- app/scripts/connectors/nodeConnector.js | 34 +++ ...rupalContextProviderDirectiveController.js | 206 +++++++++++++++--- app/scripts/controllers/mainController.js | 22 +- .../drupalBasedAnalysisContextProvider.js | 26 +++ .../fileBasedAnalysisContextProvider.js | 5 +- .../services/drupalDecisionStrategies.js | 93 -------- .../drupalContextProviderTemplate.html | 161 ++++++++++++++ karma.conf.js | 3 +- 9 files changed, 407 insertions(+), 148 deletions(-) create mode 100644 app/scripts/connectors/nodeConnector.js create mode 100644 app/scripts/directives/drupalBasedAnalysisContextProvider.js delete mode 100644 app/scripts/services/drupalDecisionStrategies.js create mode 100644 app/templates/drupalContextProviderTemplate.html diff --git a/app/index.html b/app/index.html index d55fe6d..3a85eed 100644 --- a/app/index.html +++ b/app/index.html @@ -85,12 +85,12 @@ padding: 20px 30px;" >
- - +
@@ -565,6 +565,7 @@

+ diff --git a/app/scripts/connectors/nodeConnector.js b/app/scripts/connectors/nodeConnector.js new file mode 100644 index 0000000..7ce5e48 --- /dev/null +++ b/app/scripts/connectors/nodeConnector.js @@ -0,0 +1,34 @@ +'use strict'; + +if (typeof $ === 'undefined') { + var $ = jQuery; +} +if (typeof $ === 'undefined') { + var $ = window.jQuery; +} + +window.Drupal.behaviors.myBehavior = { + attach: function (context, settings) { + // Using once() to apply the mcdaIFrameBehavior effect when you want to run just one function. + $(window, context).once('mcdaIFrameBehavior').each(function () { + console.log('onAttach'); + var connectCount = 0; + // for some unknown the reason angular directive controler of the embedded child iframe + // does not recieve the event when it's not fired from the onConnect method. + var mcdaApp = window.seamless(document.getElementById('mcda'), + {onConnect: function () { + // FIXME: for some unknown reasin, onConnect is called if no child fram has activiliy connected + // by invokinf seamless.connect() resulting in the onConnect function called twice! + if(connectCount === 1) { + var currentNodeId = window.location.pathname.split('/').pop(); + mcdaApp.send({ + nodeId: currentNodeId + }); + } else { + console.log('pre/re connection #:' + connectCount); + } + connectCount++; + }}); + }); + } +}; \ No newline at end of file diff --git a/app/scripts/controllers/drupalContextProviderDirectiveController.js b/app/scripts/controllers/drupalContextProviderDirectiveController.js index c9b97c8..8ac1ed3 100644 --- a/app/scripts/controllers/drupalContextProviderDirectiveController.js +++ b/app/scripts/controllers/drupalContextProviderDirectiveController.js @@ -10,8 +10,18 @@ angular.module( 'eu.myclimateservice.csis.scenario-analysis.services.drupalService', function ($scope, $timeout, Icmm, Worldstates, drupalService) { 'use strict'; - var showIndicatorFileLoadingError, showFileLoading, loadIndicatorObjects, loadIndicatorObject, onloadCfFile, onloadDsFile; + var showIndicatorFileLoadingError, showFileLoading, loadIndicatorObjects, loadIndicatorObject, onloadCfFile, onloadDsFile, onSeamlessEvent, onloadIccObjects; var restApi = drupalService.restApi; + + console.log('window.seamless.connect()'); + var parent = window.seamless.connect(); + // Receive a message, this only works when the parent window calls send(...) + // inside the onConnect() method, otherwise the event is not recieved (race condition?) + // strangley, the onConnect callback is called twice. See comment in nodeConncetor.js + parent.receive(function (data) { + console.log(' parent.receive:' + data); + onSeamlessEvent(data); + }); //initialize the bindings $scope.selectedWorldstates = []; @@ -126,7 +136,7 @@ angular.module( showIndicatorFileLoadingError = function (message) { $scope.fileLoadError = true; $scope.errorMessage = message; - $scope.$apply(); + //$scope.$apply(); }; showFileLoading = function () { @@ -140,13 +150,13 @@ angular.module( $scope.showCfFileLoadingError = function (message) { $scope.cfFileLoadError = true; $scope.cfFileLoadErrorMsg = 'Criteria functions not loaded. ' + message; - $scope.$apply(); + //$scope.$apply(); }; $scope.showDsFileLoadingError = function (message) { $scope.dsFileLoadError = true; $scope.dsFileLoadErrorMsg = 'Decision strategies not loaded. ' + message; - $scope.$apply(); + //$scope.$apply(); }; loadIndicatorObjects = function (indicatorObjects) { @@ -275,6 +285,126 @@ angular.module( showIndicatorFileLoadingError(err.toString()); } }; + + onloadIccObjects = function (file) { + return function (e) { + var fileObj, worldstateDummy, indicatorProp, indicator, origLoadedIndicators, indicatorGroup, + loadedIndicatorLength, indicatorMapLength, containsIndicator, msg; + try { + fileObj = JSON.parse(e.target.result); + /* + * + * accept two differnt kind of files. + * 1. A plain icc data object. + * In that case we apply a standard name to this object + * + * 2. A worldstate Dummy object that already has a name + */ + + if (fileObj.name && fileObj.iccdata) { + worldstateDummy = fileObj; + origLoadedIndicators = fileObj.iccdata; + worldstateDummy.iccdata = { + actualaccessinfo: JSON.stringify(worldstateDummy.iccdata) + }; + } else { + //generate a uniqe id... + origLoadedIndicators = fileObj; + worldstateDummy = { + name: 'Nonamed indicator data ' + '(filename: ' + file.name + ' )', + iccdata: { + actualaccessinfo: JSON.stringify(fileObj) + } + }; + } + var tmp; + if ($scope.worldstates && $scope.worldstates.length > 0) { + tmp = Worldstates.utils.stripIccData([$scope.worldstates[0]])[0].data; + } else { + tmp = origLoadedIndicators; + } + $scope.indicatorMap = {}; + for (indicatorGroup in tmp) { + if (tmp.hasOwnProperty(indicatorGroup)) { + for (indicatorProp in tmp[indicatorGroup]) { + if (tmp[indicatorGroup].hasOwnProperty(indicatorProp)) { + if (indicatorProp !== 'displayName' && indicatorProp !== 'iconResource') { + $scope.indicatorMap[indicatorProp] = tmp[indicatorGroup][indicatorProp]; + } + } + } + } + } + loadedIndicatorLength = 0; + indicatorMapLength = 0; + for (indicator in $scope.indicatorMap) { + if ($scope.indicatorMap.hasOwnProperty(indicator)) { + containsIndicator = false; + indicatorMapLength++; + for (indicatorGroup in origLoadedIndicators) { + if (origLoadedIndicators.hasOwnProperty(indicatorGroup)) { + for (indicatorProp in origLoadedIndicators[indicatorGroup]) { + if (origLoadedIndicators[indicatorGroup].hasOwnProperty(indicatorProp)) { + if (indicatorProp !== 'displayName' && indicatorProp !== 'iconResource') { + if ($scope.indicatorMap[indicator].displayName === origLoadedIndicators[indicatorGroup][indicatorProp].displayName) { + loadedIndicatorLength++; + containsIndicator = true; + break; + } + } + } + } + } + } + if (!containsIndicator) { + msg = 'Could not load indicator file ' + file.name + '. It contains no indicator data for ' + indicator; + console.error(msg); + showIndicatorFileLoadingError(msg); + return; + } + } + } + if (loadedIndicatorLength !== indicatorMapLength) { + msg = 'indicator data in file ' + file.name + ' has more indicators defined that the first loaded indicator set.'; + console.error(msg); + showIndicatorFileLoadingError(msg); + return; + } + + // we need an id to distinct the icc objects. eg. the ranking table use this id + // to keep track of the indicator objects + if (!worldstateDummy.id) { + worldstateDummy.id = Math.floor((Math.random() * 1000000) + 1); + } + + // an excellent example on technical debt and accidental complexity: + // instead of adressing the root cause of the problem, we + // introduce additional inadequateness and ambiguity + Icmm.convertToCorrectIccDataFormat(worldstateDummy); + + if ($scope.worldstates) { + $scope.worldstates.push(worldstateDummy); + $scope.editable.push(false); + } else { + $scope.editable.push(false); + $scope.worldstates = [worldstateDummy]; + } + $scope.showDummyListItem = false; + $scope.noIndicatorsLoaded = false; + // when indicator objects are added we want them to be selected by default + $scope.selectedWorldstates.splice(0, $scope.selectedWorldstates.length); + $scope.worldstates.forEach(function (object, index) { + $scope.toggleSelection(index); + }); + + $scope.$apply(); + + } catch (err) { + // show an error in the gui... + showIndicatorFileLoadingError(err.toString()); + } + }; + }; onloadCfFile = function (theFile) { return function (e) { @@ -391,32 +521,43 @@ angular.module( } }; }; + + onSeamlessEvent = function(eventData) { + console.log('load study from node id: ' + eventData.nodeId); + + restApi.getStudy(eventData.nodeId).then(function (study) { + var indicatorArray = drupalService.studyHelper.getIndicatorArray(study); + loadIndicatorObjects(indicatorArray); + }, function (error) { + console.log(error.data.message); + showIndicatorFileLoadingError(error.data.message.toString()); + }); + }; /* * When the newFile property has changed the User want's to add a new list of files. */ $scope.$watch('iccObjects', function (newVal, oldVal) { - /*var i, file, reader; - if (!angular.equals(newVal, oldVal) && newVal) { - showFileLoading(); - - for (i = 0; i < $scope.iccObjects.length; i++) { - - file = $scope.iccObjects[i]; - - reader = new FileReader(); - reader.onload = onloadIccObjects(file); - try { - //we assume that the file is utf-8 encoded - reader.readAsText(file); - } catch (err) { - // show an error in the gui... - showIndicatorFileLoadingError(err.toString()); - } - - } - - }*/ + var i, file, reader; + if (!angular.equals(newVal, oldVal) && newVal) { + showFileLoading(); + + for (i = 0; i < $scope.iccObjects.length; i++) { + + file = $scope.iccObjects[i]; + + reader = new FileReader(); + reader.onload = onloadIccObjects(file); + try { + //we assume that the file is utf-8 encoded + reader.readAsText(file); + } catch (err) { + // show an error in the gui... + showIndicatorFileLoadingError(err.toString()); + } + + } + } }, true); $scope.$watch('cfConfigFile', function () { @@ -466,17 +607,14 @@ angular.module( }, true); + - $timeout(function () { - restApi.getStudy(1).then(function (study) { - var indicatorArray = drupalService.studyHelper.getIndicatorArray(study); - loadIndicatorObjects(indicatorArray); - }, function (error) { - console.log(error.data.message); - showIndicatorFileLoadingError(error.data.message.toString()); - }); - }, 1000); + // TODO: get study / EU-GL Step Entity id from Drpal API, e.g. + // via request parameter passed to iFrame or via seamless.js parent.receive callback +// $timeout(function () { +// onSeamlessEvent({nodeId:2}) +// }, 1000); } diff --git a/app/scripts/controllers/mainController.js b/app/scripts/controllers/mainController.js index fbe64ef..6dd7a62 100644 --- a/app/scripts/controllers/mainController.js +++ b/app/scripts/controllers/mainController.js @@ -24,13 +24,13 @@ angular.module( function ($window, $scope, $resource, $http, $timeout, $q, IcmmPersistanceService, FilesPersistanceService, drupalService, ngDialog) { 'use strict'; - var parent = window.seamless.connect(); - // Receive a message - parent.receive(function (data, event) { - - // Print out the data that was received. - console.log('child recieved: ' + data + event); - }); +// var parent = window.seamless.connect(); +// // Receive a message +// parent.receive(function (data, event) { +// +// // Print out the data that was received. +// console.log('child recieved: ' + data.nodeId); +// }); var restApi = drupalService.restApi; @@ -234,14 +234,6 @@ angular.module( $scope.icmmLastViewed = true; - - if (!parent || parent === null) { - parent = window.seamless.connect(); - } - // Send a message - parent.send({ - myparam: 'child -> parent' - }); }; $scope.switchToFilesTab = function () { diff --git a/app/scripts/directives/drupalBasedAnalysisContextProvider.js b/app/scripts/directives/drupalBasedAnalysisContextProvider.js new file mode 100644 index 0000000..cf82376 --- /dev/null +++ b/app/scripts/directives/drupalBasedAnalysisContextProvider.js @@ -0,0 +1,26 @@ +angular.module( + 'eu.myclimateservice.csis.scenario-analysis.directives' + ).directive( + 'drupalContextProvider', + [ + function () { + 'use strict'; + + var scope; + + scope = { + 'worldstates': '=', + 'selectedWorldstates': '=', + 'decisionStrategies': '=', + 'criteriaFunctions': '=' + }; + + return { + scope: scope, + restrict: 'E', + templateUrl: 'templates/drupalContextProviderTemplate.html', + controller: 'eu.myclimateservice.csis.scenario-analysis.controllers.drupalContextProviderDirectiveController' + }; + } + ] + ); \ No newline at end of file diff --git a/app/scripts/directives/fileBasedAnalysisContextProvider.js b/app/scripts/directives/fileBasedAnalysisContextProvider.js index c32bf1a..ca9f7b3 100644 --- a/app/scripts/directives/fileBasedAnalysisContextProvider.js +++ b/app/scripts/directives/fileBasedAnalysisContextProvider.js @@ -12,15 +12,14 @@ angular.module( 'worldstates': '=', 'selectedWorldstates': '=', 'decisionStrategies': '=', - 'criteriaFunctions': '=', + 'criteriaFunctions': '=' }; return { scope: scope, restrict: 'E', templateUrl: 'templates/fileContextProviderTemplate.html', - //controller: 'eu.myclimateservice.csis.scenario-analysis.controllers.FileContextProviderDirectiveController' - controller: 'eu.myclimateservice.csis.scenario-analysis.controllers.drupalContextProviderDirectiveController' + controller: 'eu.myclimateservice.csis.scenario-analysis.controllers.FileContextProviderDirectiveController' }; } ] diff --git a/app/scripts/services/drupalDecisionStrategies.js b/app/scripts/services/drupalDecisionStrategies.js deleted file mode 100644 index 56edb05..0000000 --- a/app/scripts/services/drupalDecisionStrategies.js +++ /dev/null @@ -1,93 +0,0 @@ -angular.module( - 'eu.myclimateservice.csis.scenario-analysis.services' - ).factory( - 'eu.myclimateservice.csis.scenario-analysis.services.DecisionStrategies', - [ - '$resource', - 'eu.myclimateservice.csis.scenario-analysis.services.configurationService', - function ($resource, configurationService) { - 'use strict'; - var decisionStrategy, transformResponse, decisionStrategyFacade, createResource; - transformResponse = function (studyJsonString) { - var study; - if (studyJsonString) { - study = JSON.parse(studyJsonString); - - return JSON.parse(study.decisionStrategies); - } - return null; - - }; - - - - createResource = function () { - var r; - - r = $resource(configurationService.$this.drupalRestApi.host + '/' + configurationService.getDomain() + '.decisionstrategies/1', { - decisionStrategyId: '@id', - deduplicate: false, - omitNullValues: 'false' - }, { - 'query': { - method: 'GET', - isArray: true, - params: { - level: '1', - omitNullValues: 'true' - }, - transformResponse: transformResponse - }, - 'update': { - method: 'PUT', - transformRequest: function (data) { - var transformedData, study; - study = { - $self: '/CRISMA.decisionstrategies/1', - id: 1, - decisionStrategies: angular.toJson(data) - }; - transformedData = JSON.stringify(study, function (k, v) { - // we have to take care of angular properties by ourselves - if (k.substring(0, 1) === '$' && !(k === '$self' || k === '$ref')) { - return undefined; - } - - return v; - }); - return transformedData; - } - } - }); - - r.getId = function () { - return Icmm.getNextId(configurationService.getIcmmApi() + '/' + configurationService.getDomain(), '.decisionstrategies'); - }; - - return r; - }; - - decisionStrategy = createResource(); - decisionStrategyFacade = { - 'get': function () { - return decisionStrategy.get.apply(this, arguments); - }, - 'query': function () { - return decisionStrategy.query.apply(this, arguments); - }, - 'update': function () { - return decisionStrategy.update.apply(this, arguments); - }, - 'getId': function () { - return decisionStrategy.getId.apply(this, arguments); - } - }; - - configurationService.addApiListener(function () { - decisionStrategy = createResource(); - }); - - return decisionStrategyFacade; - } - ] - ); diff --git a/app/templates/drupalContextProviderTemplate.html b/app/templates/drupalContextProviderTemplate.html new file mode 100644 index 0000000..1868209 --- /dev/null +++ b/app/templates/drupalContextProviderTemplate.html @@ -0,0 +1,161 @@ +
+
+
+ HTML 5 File APi is not available in your Browser. Please use a Browser that supports this. + see also http://caniuse.com/#search=file%20api +
+
+
+
+
+
+
+ +
+
    + +
  • +
    • +
  • + + + {{ws.name}} + + +
    + + + +
    +
    • +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+ {{errorMessage}} +
+
+
+
+
+ +
+
+
+
+ + Choose a file + + +
+
+
+ + No indicator files selected +
+
+ + {{cfFileLoadErrorMsg}} +
+
+ Loaded File: {{loadedCfFile}} +
+
+
+
+
+ +
+ +
+
+
+ + Choose a file + + +
+
+
+ + No indicator files selected +
+
+ + {{dsFileLoadErrorMsg}} +
+
+ Loaded File: {{loadedDsfFile}} +
+
+
+
+
\ No newline at end of file diff --git a/karma.conf.js b/karma.conf.js index e91665c..289b3d1 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -81,13 +81,14 @@ basePath: '', 'target/dist/scripts/services/icmmCriteriaFunctions.js', 'target/dist/scripts/services/icmmDecisionStrategies.js', 'target/dist/scripts/services/drupalService.js', - 'target/dist/scripts/services/drupalContextProviderDirectiveController.js', + 'target/dist/scripts/controllers/drupalContextProviderDirectiveController.js', 'target/dist/bower_components/angular-mocks/angular-mocks.js', 'app/templates/criteriaEmphasesTemplate.html', 'app/templates/criteriaFunctionManagerTemplate.html', 'app/templates/criteriaRadarPopupTemplate.html', 'app/templates/decisionStrategyManagerTemplate.html', 'app/templates/decisionStrategyTemplate.html', + 'app/templates/drupalContextProviderTemplate.html', 'app/templates/fileContextProviderTemplate.html', 'app/templates/icmmContextProviderTemplate.html', 'app/templates/indicatorBandItemTemplate.html', From 7541956cc2ca751cb1127d02fd11a290dab35b11 Mon Sep 17 00:00:00 2001 From: p-a-s-c-a-l Date: Tue, 6 Nov 2018 14:52:17 +0100 Subject: [PATCH 03/15] #2 update sample indicator and decision strategies --- samples/sampleCriteriaFunction_1.json | 125 ++++++++++++++ samples/sampleCriteriaFunctions.json | 148 ----------------- samples/sampleDecisionStrategies.json | 224 -------------------------- samples/sampleDecisionStrategy_1.json | 107 ++++++++++++ samples/sampleIndicatorSet_1.json | 103 +++++++++--- samples/sampleIndicatorSet_2.json | 103 +++++++++--- samples/sampleIndicatorSet_3.json | 103 +++++++++--- 7 files changed, 478 insertions(+), 435 deletions(-) create mode 100644 samples/sampleCriteriaFunction_1.json delete mode 100644 samples/sampleCriteriaFunctions.json delete mode 100644 samples/sampleDecisionStrategies.json create mode 100644 samples/sampleDecisionStrategy_1.json diff --git a/samples/sampleCriteriaFunction_1.json b/samples/sampleCriteriaFunction_1.json new file mode 100644 index 0000000..7d01131 --- /dev/null +++ b/samples/sampleCriteriaFunction_1.json @@ -0,0 +1,125 @@ +{ + "name": "CLARITY Criteria Function #1", + "criteriaFunctions": [ + { + "indicator": "Number of dead", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 0 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 0 + }, + "intervals": [] + }, + { + "indicator": "Number of injured", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 0 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 0 + }, + "intervals": [] + }, + { + "indicator": "Number of homeless", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 0 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 0 + }, + "intervals": [] + }, + { + "indicator": "Direct damage cost", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 0 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 0 + }, + "intervals": [] + }, + { + "indicator": "Indirect damage cost", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 0 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 0 + }, + "intervals": [] + }, + { + "indicator": "Direct restoration cost", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 0 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 0 + }, + "intervals": [] + }, + { + "indicator": "Lost buildings", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 0 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 0 + }, + "intervals": [] + }, + { + "indicator": "Unsafe buildings", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 0 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 0 + }, + "intervals": [] + }, + { + "indicator": "Number of damaged road segments", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 0 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 0 + }, + "intervals": [] + }, + { + "indicator": "Total evacuation cost", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 0 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 0 + }, + "intervals": [] + } + ] +} \ No newline at end of file diff --git a/samples/sampleCriteriaFunctions.json b/samples/sampleCriteriaFunctions.json deleted file mode 100644 index c80d2e3..0000000 --- a/samples/sampleCriteriaFunctions.json +++ /dev/null @@ -1,148 +0,0 @@ -[ - { - "criteriaFunctions": [ - { - "indicator": "Deads", - "intervals": [], - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 10 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - } - }, - { - "indicator": "Cost", - "intervals": [], - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 10000000 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - } - }, - { - "indicator": "Buildings", - "intervals": [], - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 1000 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - } - } - ], - "name": "hard to satisfy" - }, - { - "criteriaFunctions": [ - { - "indicator": "Deads", - "intervals": [], - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 10000 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 1000 - } - }, - { - "indicator": "Cost", - "intervals": [], - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 99000000 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 10000000 - } - }, - { - "indicator": "Buildings", - "intervals": [], - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 50000 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 3000 - } - } - ], - "name": "easy to satisfy" - }, - { - "criteriaFunctions": [ - { - "indicator": "Deads", - "intervals": [ - { - "criteriaValue": 30, - "indicatorValue": 4000 - }, - { - "criteriaValue": 80, - "indicatorValue": 50 - } - ], - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 5000 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - } - }, - { - "indicator": "Cost", - "intervals": [ - { - "criteriaValue": 65, - "indicatorValue": 30000000 - } - ], - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 50000000 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 8000000 - } - }, - { - "indicator": "Buildings", - "intervals": [ - { - "criteriaValue": 20, - "indicatorValue": 5000 - }, - { - "criteriaValue": 75, - "indicatorValue": 800 - } - ], - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 8000 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 100 - } - } - ], - "name": "reasonable satisfaction" - } -] diff --git a/samples/sampleDecisionStrategies.json b/samples/sampleDecisionStrategies.json deleted file mode 100644 index 1b0c66e..0000000 --- a/samples/sampleDecisionStrategies.json +++ /dev/null @@ -1,224 +0,0 @@ -[ - { - "criteriaEmphases": [ - { - "criteriaEmphasis": 30, - "indicator": { - "displayName": "Deads", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "people", - "value": 156 - } - }, - { - "criteriaEmphasis": 100, - "indicator": { - "displayName": "Cost", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "Euro", - "value": 19384729 - } - }, - { - "criteriaEmphasis": 30, - "indicator": { - "displayName": "Buildings", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "buildings", - "value": 2091 - } - } - ], - "name": "care about cost", - "satisfactionEmphasis": [ - 0.3333333333333333, - 0.3333333333333333, - 0.3333333333333333 - ] - }, - { - "criteriaEmphases": [ - { - "criteriaEmphasis": 30, - "indicator": { - "displayName": "Deads", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "people", - "value": 156 - } - }, - { - "criteriaEmphasis": 30, - "indicator": { - "displayName": "Cost", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "Euro", - "value": 19384729 - } - }, - { - "criteriaEmphasis": 100, - "indicator": { - "displayName": "Buildings", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "buildings", - "value": 2091 - } - } - ], - "name": "care about buildings", - "satisfactionEmphasis": [ - 0.3333333333333333, - 0.3333333333333333, - 0.3333333333333333 - ] - }, - { - "criteriaEmphases": [ - { - "criteriaEmphasis": 100, - "indicator": { - "displayName": "Deads", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "people", - "value": 156 - } - }, - { - "criteriaEmphasis": 30, - "indicator": { - "displayName": "Cost", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "Euro", - "value": 19384729 - } - }, - { - "criteriaEmphasis": 30, - "indicator": { - "displayName": "Buildings", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "buildings", - "value": 2091 - } - } - ], - "name": "care about deads", - "satisfactionEmphasis": [ - 0.3333333333333333, - 0.3333333333333333, - 0.3333333333333333 - ] - }, - { - "criteriaEmphases": [ - { - "criteriaEmphasis": 100, - "indicator": { - "displayName": "Deads", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "people", - "value": 156 - } - }, - { - "criteriaEmphasis": 70, - "indicator": { - "displayName": "Cost", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "Euro", - "value": 19384729 - } - }, - { - "criteriaEmphasis": 85, - "indicator": { - "displayName": "Buildings", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "buildings", - "value": 2091 - } - } - ], - "name": "no compromise", - "satisfactionEmphasis": [ - 0, - 0, - 1 - ] - }, - { - "criteriaEmphases": [ - { - "criteriaEmphasis": 100, - "indicator": { - "displayName": "Deads", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "people", - "value": 156 - } - }, - { - "criteriaEmphasis": 100, - "indicator": { - "displayName": "Cost", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "Euro", - "value": 19384729 - } - }, - { - "criteriaEmphasis": 100, - "indicator": { - "displayName": "Buildings", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "buildings", - "value": 2091 - } - } - ], - "name": "at least get sth right", - "satisfactionEmphasis": [ - 1, - 0, - 0 - ] - }, - { - "criteriaEmphases": [ - { - "criteriaEmphasis": 100, - "indicator": { - "displayName": "Deads", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "people", - "value": 156 - } - }, - { - "criteriaEmphasis": 70, - "indicator": { - "displayName": "Cost", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "Euro", - "value": 19384729 - } - }, - { - "criteriaEmphasis": 85, - "indicator": { - "displayName": "Buildings", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "unit": "buildings", - "value": 2091 - } - } - ], - "name": "people care", - "satisfactionEmphasis": [ - 0.03650450827484224, - 0.24023200711490703, - 0.7232634846102508 - ] - } -] diff --git a/samples/sampleDecisionStrategy_1.json b/samples/sampleDecisionStrategy_1.json new file mode 100644 index 0000000..a25bd9f --- /dev/null +++ b/samples/sampleDecisionStrategy_1.json @@ -0,0 +1,107 @@ +{ + "name": "CLARTIY Decision Strategy #1", + "criteriaEmphases": [ + { + "indicator": { + "displayName": "Number of dead", + "iconResource": "flower_dead_16.png", + "value": "0", + "unit": "People" + }, + "criteriaEmphasis": 100 + }, + { + "indicator": { + "displayName": "Number of injured", + "iconResource": "flower_injured_16.png", + "value": "0", + "unit": "People" + }, + "criteriaEmphasis": 100 + }, + { + "indicator": { + "displayName": "Number of homeless", + "iconResource": "flower_homeless_16.png", + "value": "0", + "unit": "People" + }, + "criteriaEmphasis": 100 + }, + { + "indicator": { + "displayName": "Direct damage cost", + "iconResource": "dollar_direct_16.png", + "value": "0", + "unit": "Dollar" + }, + "criteriaEmphasis": 100 + }, + { + "indicator": { + "displayName": "Indirect damage cost", + "iconResource": "dollar_indirect_16.png", + "value": "0", + "unit": "Dollar" + }, + "criteriaEmphasis": 100 + }, + { + "indicator": { + "displayName": "Direct restoration cost", + "iconResource": "dollar_restoration_16.png", + "value": "0", + "unit": "Dollar" + }, + "criteriaEmphasis": 100 + }, + { + "indicator": { + "displayName": "Lost buildings", + "iconResource": "home_lost_16.png", + "value": "0", + "unit": "Buildings" + }, + "criteriaEmphasis": 100 + }, + { + "indicator": { + "displayName": "Unsafe buildings", + "iconResource": "home_unsafe_16.png", + "value": "0", + "unit": "Buildings" + }, + "criteriaEmphasis": 95 + }, + { + "indicator": { + "displayName": "Number of damaged road segments", + "iconResource": "road_damaged_16.png", + "value": "0", + "unit": "Road seqments" + }, + "criteriaEmphasis": 100 + }, + { + "indicator": { + "displayName": "Total evacuation cost", + "iconResource": "money_total_evac_16.png", + "value": "0", + "unit": "Dollar" + }, + "criteriaEmphasis": 100 + } + ], + "satisfactionEmphasis": [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] +} \ No newline at end of file diff --git a/samples/sampleIndicatorSet_1.json b/samples/sampleIndicatorSet_1.json index bac362c..a90b1d8 100644 --- a/samples/sampleIndicatorSet_1.json +++ b/samples/sampleIndicatorSet_1.json @@ -1,24 +1,85 @@ { - "sample": { - "displayName": "Example", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_24.png", - "deads": { - "displayName": "Deads", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "value": 156, - "unit": "people" - }, - "cost": { - "displayName": "Cost", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "value": 19384729, - "unit": "Euro" - }, - "buildings": { - "displayName": "Buildings", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "value": 2091, - "unit": "buildings" + "name": "Baseline Scenario", + "iccdata": { + "casualties": { + "displayName": "Casualties", + "iconResource": "flower_16.png", + "noOfDead": { + "displayName": "Number of dead", + "iconResource": "flower_dead_16.png", + "value": 189, + "unit": "People" + }, + "noOfInjured": { + "displayName": "Number of injured", + "iconResource": "flower_injured_16.png", + "value": 2840, + "unit": "People" + }, + "noOfHomeless": { + "displayName": "Number of homeless", + "iconResource": "flower_homeless_16.png", + "value": 10416, + "unit": "People" + } + }, + "cost": { + "directDamageCost": { + "displayName": "Direct damage cost", + "iconResource": "dollar_direct_16.png", + "value": 32547532, + "unit": "Euro" + }, + "displayName": "Economic cost", + "iconResource": "dollar_16.png", + "indirectDamageCost": { + "displayName": "Indirect damage cost", + "iconResource": "dollar_indirect_16.png", + "value": 78453689, + "unit": "Euro" + }, + "restorationCost": { + "displayName": "Direct restoration cost", + "iconResource": "dollar_restoration_16.png", + "value": 113657772, + "unit": "Euro" + } + }, + "damagedBuildings": { + "displayName": "Damaged buildings", + "iconResource": "home_16.png", + "lostBuildings": { + "displayName": "Lost buildings", + "iconResource": "home_lost_16.png", + "value": 251, + "unit": "Buildings" + }, + "unsafeBuildings": { + "displayName": "Unsafe buildings", + "iconResource": "home_unsafe_16.png", + "value": 637, + "unit": "Buildings" + } + }, + "damagedInfrastructure": { + "damagedRoadSegments": { + "displayName": "Number of damaged road segments", + "iconResource": "road_damaged_16.png", + "value": 1416, + "unit": "Road seqments" + }, + "displayName": "Damaged Infrastructure", + "iconResource": "road_16.png" + }, + "evacuationCost": { + "displayName": "Evacuation cost", + "iconResource": "money_evac_16.png", + "totalEvacuationCost": { + "displayName": "Total evacuation cost", + "iconResource": "money_total_evac_16.png", + "value": 13067094, + "unit": "Euro" + } + } } - } } \ No newline at end of file diff --git a/samples/sampleIndicatorSet_2.json b/samples/sampleIndicatorSet_2.json index 0b83a47..da88f8c 100644 --- a/samples/sampleIndicatorSet_2.json +++ b/samples/sampleIndicatorSet_2.json @@ -1,24 +1,85 @@ { - "sample": { - "displayName": "Example", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_24.png", - "deads": { - "displayName": "Deads", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "value": 31, - "unit": "people" - }, - "cost": { - "displayName": "Cost", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "value": 81729572, - "unit": "Euro" - }, - "buildings": { - "displayName": "Buildings", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "value": 2091, - "unit": "buildings" + "name": "Local Effects Scenario", + "iccdata": { + "casualties": { + "displayName": "Casualties", + "iconResource": "flower_16.png", + "noOfDead": { + "displayName": "Number of dead", + "iconResource": "flower_dead_16.png", + "value": 15, + "unit": "People" + }, + "noOfInjured": { + "displayName": "Number of injured", + "iconResource": "flower_injured_16.png", + "value": 164, + "unit": "People" + }, + "noOfHomeless": { + "displayName": "Number of homeless", + "iconResource": "flower_homeless_16.png", + "value": 8434, + "unit": "People" + } + }, + "cost": { + "directDamageCost": { + "displayName": "Direct damage cost", + "iconResource": "dollar_direct_16.png", + "value": 22547532, + "unit": "Euro" + }, + "displayName": "Economic cost", + "iconResource": "dollar_16.png", + "indirectDamageCost": { + "displayName": "Indirect damage cost", + "iconResource": "dollar_indirect_16.png", + "value": 58453689, + "unit": "Euro" + }, + "restorationCost": { + "displayName": "Direct restoration cost", + "iconResource": "dollar_restoration_16.png", + "value": 83657772, + "unit": "Euro" + } + }, + "damagedBuildings": { + "displayName": "Damaged buildings", + "iconResource": "home_16.png", + "lostBuildings": { + "displayName": "Lost buildings", + "iconResource": "home_lost_16.png", + "value": 178, + "unit": "Buildings" + }, + "unsafeBuildings": { + "displayName": "Unsafe buildings", + "iconResource": "home_unsafe_16.png", + "value": 449, + "unit": "Buildings" + } + }, + "damagedInfrastructure": { + "damagedRoadSegments": { + "displayName": "Number of damaged road segments", + "iconResource": "road_damaged_16.png", + "value": 1287, + "unit": "Road seqments" + }, + "displayName": "Damaged Infrastructure", + "iconResource": "road_16.png" + }, + "evacuationCost": { + "displayName": "Evacuation cost", + "iconResource": "money_evac_16.png", + "totalEvacuationCost": { + "displayName": "Total evacuation cost", + "iconResource": "money_total_evac_16.png", + "value": 18067094, + "unit": "Euro" + } + } } - } } \ No newline at end of file diff --git a/samples/sampleIndicatorSet_3.json b/samples/sampleIndicatorSet_3.json index 459e7da..12238c1 100644 --- a/samples/sampleIndicatorSet_3.json +++ b/samples/sampleIndicatorSet_3.json @@ -1,24 +1,85 @@ { - "sample": { - "displayName": "Example", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_24.png", - "deads": { - "displayName": "Deads", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "value": 12, - "unit": "people" - }, - "cost": { - "displayName": "Cost", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "value": 54902843, - "unit": "Euro" - }, - "buildings": { - "displayName": "Buildings", - "iconResource": "http://crisma.cismet.de/resources/pilotE/todo_16.png", - "value": 764, - "unit": "buildings" + "name": "Adaptation Scenario", + "iccdata": { + "casualties": { + "displayName": "Casualties", + "iconResource": "flower_16.png", + "noOfDead": { + "displayName": "Number of dead", + "iconResource": "flower_dead_16.png", + "value": 1, + "unit": "People" + }, + "noOfInjured": { + "displayName": "Number of injured", + "iconResource": "flower_injured_16.png", + "value": 54, + "unit": "People" + }, + "noOfHomeless": { + "displayName": "Number of homeless", + "iconResource": "flower_homeless_16.png", + "value": 8434, + "unit": "People" + } + }, + "cost": { + "directDamageCost": { + "displayName": "Direct damage cost", + "iconResource": "dollar_direct_16.png", + "value": 22547532, + "unit": "Euro" + }, + "displayName": "Economic cost", + "iconResource": "dollar_16.png", + "indirectDamageCost": { + "displayName": "Indirect damage cost", + "iconResource": "dollar_indirect_16.png", + "value": 43753689, + "unit": "Euro" + }, + "restorationCost": { + "displayName": "Direct restoration cost", + "iconResource": "dollar_restoration_16.png", + "value": 83657772, + "unit": "Euro" + } + }, + "damagedBuildings": { + "displayName": "Damaged buildings", + "iconResource": "home_16.png", + "lostBuildings": { + "displayName": "Lost buildings", + "iconResource": "home_lost_16.png", + "value": 178, + "unit": "Buildings" + }, + "unsafeBuildings": { + "displayName": "Unsafe buildings", + "iconResource": "home_unsafe_16.png", + "value": 449, + "unit": "Buildings" + } + }, + "damagedInfrastructure": { + "damagedRoadSegments": { + "displayName": "Number of damaged road segments", + "iconResource": "road_damaged_16.png", + "value": 1287, + "unit": "Road seqments" + }, + "displayName": "Damaged Infrastructure", + "iconResource": "road_16.png" + }, + "evacuationCost": { + "displayName": "Evacuation cost", + "iconResource": "money_evac_16.png", + "totalEvacuationCost": { + "displayName": "Total evacuation cost", + "iconResource": "money_total_evac_16.png", + "value": 25067094, + "unit": "Euro" + } + } } - } } \ No newline at end of file From 0122e4acd77bbc5df3ef32e8a27df9a5ead47084 Mon Sep 17 00:00:00 2001 From: p-a-s-c-a-l Date: Tue, 6 Nov 2018 14:52:58 +0100 Subject: [PATCH 04/15] #2 remove abandoned icmm backend functions and user interfaces --- app/index.html | 116 ++++++---------------- app/scripts/controllers/mainController.js | 101 +------------------ 2 files changed, 35 insertions(+), 182 deletions(-) diff --git a/app/index.html b/app/index.html index 3a85eed..22f9143 100644 --- a/app/index.html +++ b/app/index.html @@ -6,7 +6,7 @@ - + CLARTIY Scenario Analysis @@ -23,7 +23,7 @@ - + @@ -36,66 +36,12 @@
- - - - - - Analysis from ICMM - - -
-
- - -
-
- - - - - - - Analysis from Files - - -
-
- - -
-
- - - + +
@@ -281,7 +227,7 @@

- +

@@ -328,13 +274,13 @@

- - - - Criteria radar chart comparison - -

+ + + + Criteria radar chart comparison + +

+
-
From 1441cb0915d6506ed675fdc3a1665ae94971b488 Mon Sep 17 00:00:00 2001 From: p-a-s-c-a-l Date: Wed, 7 Nov 2018 11:38:05 +0100 Subject: [PATCH 06/15] #2 load data from node entity instead of group entity --- app/scripts/connectors/nodeConnector.js | 37 ++++++++----- ...rupalContextProviderDirectiveController.js | 12 ++--- app/scripts/services/drupalService.js | 52 +++++++++---------- 3 files changed, 55 insertions(+), 46 deletions(-) diff --git a/app/scripts/connectors/nodeConnector.js b/app/scripts/connectors/nodeConnector.js index 7ce5e48..2ded18c 100644 --- a/app/scripts/connectors/nodeConnector.js +++ b/app/scripts/connectors/nodeConnector.js @@ -1,5 +1,5 @@ +// +// \ No newline at end of file diff --git a/app/scripts/controllers/drupalContextProviderDirectiveController.js b/app/scripts/controllers/drupalContextProviderDirectiveController.js index 8cd1e6d..59b9094 100644 --- a/app/scripts/controllers/drupalContextProviderDirectiveController.js +++ b/app/scripts/controllers/drupalContextProviderDirectiveController.js @@ -470,12 +470,12 @@ angular.module( }; onSeamlessEvent = function (eventData) { - console.log('load study from node id: ' + eventData.nodeId); + console.log('load node from node id: ' + eventData.nodeId); - restApi.getStudy(eventData.nodeId).then(function (study) { - var indicatorArray = drupalService.studyHelper.getIndicatorArray(study); - var criteriaFunctionArray = drupalService.studyHelper.getCriteriaFunction(study); - var decisionStrategyArray = drupalService.studyHelper.getDecisionStrategy(study); + restApi.getNode(eventData.nodeId).then(function (node) { + var indicatorArray = drupalService.nodeHelper.getIndicatorArray(node); + var criteriaFunctionArray = drupalService.nodeHelper.getCriteriaFunction(node); + var decisionStrategyArray = drupalService.nodeHelper.getDecisionStrategy(node); loadIndicatorObjects(indicatorArray); loadCriteriaFunctions(criteriaFunctionArray); loadDecisionStrategies(decisionStrategyArray); @@ -564,7 +564,7 @@ angular.module( - // TODO: get study / EU-GL Step Entity id from Drpal API, e.g. + // TODO: get node / EU-GL Step Entity id from Drpal API, e.g. // via request parameter passed to iFrame or via seamless.js parent.receive callback // $timeout(function () { // onSeamlessEvent({nodeId:2}) diff --git a/app/scripts/services/drupalService.js b/app/scripts/services/drupalService.js index 836c611..88c9be5 100644 --- a/app/scripts/services/drupalService.js +++ b/app/scripts/services/drupalService.js @@ -17,14 +17,14 @@ angular.module( ['$http', '$resource', '$q', function ($http, $resource, $q) { 'use strict'; - var $this, studyPath, studyFields; + var $this, nodePath, nodeFields; $this = this; - studyPath = '/study/:studyId'; - studyFields = []; - //studyFields['indicators'] = 'field_mcda_indicators' - studyFields['indicators'] = 'field_indicators'; - studyFields['criteriaFunction'] = 'field_mcda_criteriafunction'; - studyFields['decisionStrategy'] = 'field_field_mcda_decision_strate'; + nodePath = '/node/:nodeId'; + nodeFields = []; + //nodeFields['indicators'] = 'field_mcda_indicators' + nodeFields['indicators'] = 'field_indicators'; + nodeFields['criteriaFunction'] = 'field_mcda_criteriafunction'; + nodeFields['decisionStrategy'] = 'field_field_mcda_decision_strate'; // $this.drupalRestApi = {}; @@ -56,12 +56,12 @@ angular.module( } }; - $this.drupalRestApi.getStudy = function (studyId) { + $this.drupalRestApi.getNode = function (nodeId) { return $this.drupalRestApi.getToken().then(function tokenSuccessCallback(token) { - var studyResource = $resource($this.drupalRestApi.host + studyPath, + var nodeResource = $resource($this.drupalRestApi.host + nodePath, { - studyId: '@studyId', + nodeId: '@nodeId', _format: 'hal_json' }, { @@ -75,8 +75,8 @@ angular.module( } }); - var studyInstance = studyResource.get({studyId: studyId}); - return studyInstance.$promise; + var nodeInstance = nodeResource.get({nodeId: nodeId}); + return nodeInstance.$promise; }, function tokenErrorCallback(response) { return $q.reject(response); @@ -86,31 +86,31 @@ angular.module( // init the token //$this.drupalRestApi.initToken(); - $this.drupalStudyHelper = {}; + $this.drupalNodeHelper = {}; var getObjectFromDrupalField; - $this.drupalStudyHelper.getIndicatorArray = function (study) { - return getObjectFromDrupalField(study, studyFields['indicators']); + $this.drupalNodeHelper.getIndicatorArray = function (node) { + return getObjectFromDrupalField(node, nodeFields['indicators']); }; - $this.drupalStudyHelper.getCriteriaFunction = function (study) { - return getObjectFromDrupalField(study, studyFields['criteriaFunction']); + $this.drupalNodeHelper.getCriteriaFunction = function (node) { + return getObjectFromDrupalField(node, nodeFields['criteriaFunction']); }; - $this.drupalStudyHelper.getDecisionStrategy = function (study) { - return getObjectFromDrupalField(study, studyFields['decisionStrategy']); + $this.drupalNodeHelper.getDecisionStrategy = function (node) { + return getObjectFromDrupalField(node, nodeFields['decisionStrategy']); }; - getObjectFromDrupalField = function(study, field) { - if (!study || study === null || study === undefined || - !study.field_indicators || study[field] === null || study[field] === undefined) { - console.log('study object is null or field "' + field + '" is empty!'); + getObjectFromDrupalField = function(node, field) { + if (!node || node === null || node === undefined || + !node.field_indicators || node[field] === null || node[field] === undefined) { + console.log('node object is null or field "' + field + '" is empty!'); return []; } else { var objects = []; - for(var i = 0; i < study[field].length; i++) { + for(var i = 0; i < node[field].length; i++) { // this is madness: parse into object and later stringify again // so that it can be used by the akward ICMM library (won't touch this thing!) - var object = JSON.parse(study[field][i].value); + var object = JSON.parse(node[field][i].value); objects.push(object); } return objects; @@ -119,7 +119,7 @@ angular.module( return { restApi: $this.drupalRestApi, - studyHelper: $this.drupalStudyHelper + nodeHelper: $this.drupalNodeHelper }; } ]); From 355cea0550aa2aa1624610cc23357594f1594fc0 Mon Sep 17 00:00:00 2001 From: p-a-s-c-a-l Date: Wed, 7 Nov 2018 12:15:38 +0100 Subject: [PATCH 07/15] #2 change field names --- app/scripts/services/drupalService.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/scripts/services/drupalService.js b/app/scripts/services/drupalService.js index 88c9be5..2d7a76f 100644 --- a/app/scripts/services/drupalService.js +++ b/app/scripts/services/drupalService.js @@ -23,12 +23,12 @@ angular.module( nodeFields = []; //nodeFields['indicators'] = 'field_mcda_indicators' nodeFields['indicators'] = 'field_indicators'; - nodeFields['criteriaFunction'] = 'field_mcda_criteriafunction'; - nodeFields['decisionStrategy'] = 'field_field_mcda_decision_strate'; + nodeFields['criteriaFunction'] = 'field_mcda_criteria_function'; + nodeFields['decisionStrategy'] = 'field_mcda_indicators'; // $this.drupalRestApi = {}; - $this.drupalRestApi.host = ''; //http://roberto:8080'; + $this.drupalRestApi.host = ''; $this.drupalRestApi.token = undefined; // From abd030c6ab75cd817aa3f7fdc56ddd97b9c5cc53 Mon Sep 17 00:00:00 2001 From: p-a-s-c-a-l Date: Wed, 7 Nov 2018 12:15:58 +0100 Subject: [PATCH 08/15] #2 workaround for node id --- app/scripts/connectors/nodeConnector.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/scripts/connectors/nodeConnector.js b/app/scripts/connectors/nodeConnector.js index 2ded18c..3e04f80 100644 --- a/app/scripts/connectors/nodeConnector.js +++ b/app/scripts/connectors/nodeConnector.js @@ -13,8 +13,14 @@ window.Drupal.behaviors.myBehavior = { $(window, context).once('scenarioAnalysisIFrameBehavior').each(function () { // now using the csisHelpers Module (https://github.com/clarity-h2020/csis-helpers-module) // to get node and group id! - var nodeId = drupalSettings.csisHelpers.entityinfo.step; var groupId = drupalSettings.csisHelpers.entityinfo.study; + + // FIXME: this does not work if the iframe is embedded in a separate node that is then referenced + // from the node containg the actual data! + var nodeId = drupalSettings.csisHelpers.entityinfo.step; + + // ugly workaround parsing the node id from URL study/$1/step/$2 + nodeId = window.location.pathname.split('/')[4]; console.log('groupId = ' + groupId + ', nodeId = ' + nodeId); var connectCount = 0; @@ -25,7 +31,6 @@ window.Drupal.behaviors.myBehavior = { // FIXME: for some unknown reason, onConnect is called if no child frame has actively connected // by invoking seamless.connect() resulting in the onConnect function called twice! if (connectCount === 1) { - //var nodeId = window.location.pathname.split('/').pop(); scenarioAnalysisApp.send({ nodeId: nodeId, groupId: groupId From 15aa2a2ed408ab0b4cb7472dbd816a262ff8842c Mon Sep 17 00:00:00 2001 From: p-a-s-c-a-l Date: Wed, 7 Nov 2018 12:39:40 +0100 Subject: [PATCH 09/15] #2 change field names again --- app/scripts/services/drupalService.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/scripts/services/drupalService.js b/app/scripts/services/drupalService.js index 2d7a76f..aaaca7f 100644 --- a/app/scripts/services/drupalService.js +++ b/app/scripts/services/drupalService.js @@ -22,9 +22,9 @@ angular.module( nodePath = '/node/:nodeId'; nodeFields = []; //nodeFields['indicators'] = 'field_mcda_indicators' - nodeFields['indicators'] = 'field_indicators'; + nodeFields['indicators'] = 'field_mcda_indicators'; nodeFields['criteriaFunction'] = 'field_mcda_criteria_function'; - nodeFields['decisionStrategy'] = 'field_mcda_indicators'; + nodeFields['decisionStrategy'] = 'field_mcda_decision_strategy'; // $this.drupalRestApi = {}; @@ -102,7 +102,7 @@ angular.module( getObjectFromDrupalField = function(node, field) { if (!node || node === null || node === undefined || - !node.field_indicators || node[field] === null || node[field] === undefined) { + !node[field] || node[field] === null || node[field] === undefined) { console.log('node object is null or field "' + field + '" is empty!'); return []; } else { From 9ddeee91177afedba69f140d2d1e77b31dd4add8 Mon Sep 17 00:00:00 2001 From: p-a-s-c-a-l Date: Wed, 7 Nov 2018 15:04:11 +0100 Subject: [PATCH 10/15] #6 implement temporary workaround for exception in criteriaRadarChartDirective --- .../directives/criteriaRadarChartDirective.js | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/app/scripts/directives/criteriaRadarChartDirective.js b/app/scripts/directives/criteriaRadarChartDirective.js index 8386554..ef9e826 100644 --- a/app/scripts/directives/criteriaRadarChartDirective.js +++ b/app/scripts/directives/criteriaRadarChartDirective.js @@ -1,3 +1,4 @@ +/* global d3, RadarChart */ angular.module( 'eu.myclimateservice.csis.scenario-analysis.directives' ).directive( @@ -7,7 +8,8 @@ angular.module( function (WorldstateService) { 'use strict'; - var scope, linkFunction, drawLegend, augmentWithTooltips; + var scope, linkFunction, drawLegend, augmentWithTooltips, + lastGoodWidth, lastGoodLegendWidth; scope = { localModel: '&worldstates', criteriaFunction: '=', @@ -75,7 +77,15 @@ angular.module( yOff = 0; labels.attr('transform', function (data, i) { var width, sumLabelWidth, sumRectWidth, margin, offset; - width = d3.select(this).node().getBBox().width; + // #6 + // exception if chart is not visible (e.g. edit the criteria function in a different tab) + try { + width = d3.select(this).node().getBBox().width; + lastGoodWidth = width; + } + catch(error) { + width = lastGoodWidth; + } sumLabelWidth = labelWidth.reduce(function (prev, curr) { return prev + curr; }, 0); @@ -123,7 +133,16 @@ angular.module( //center the legend horizontally legendContainer.attr('transform', function () { var legendWidth, off; - legendWidth = d3.select(this).node().getBBox().width; + // #6 + // exception if chart is not visible (e.g. edit the criteria function in a different tab) + try { + legendWidth = d3.select(this).node().getBBox().width; + lastGoodLegendWidth = legendWidth; + } + catch(error) { + legendWidth = lastGoodLegendWidth; + } + off = (chartConfig.w - legendWidth) / 2; off = off < 0 ? 0 : off; return 'translate(' + off + ',' + '0)'; @@ -176,7 +195,8 @@ angular.module( }; scope.$watchCollection('localModel()', watchCallback); - scope.$watch('criteriaFunction', watchCallback, true); + // FIXME: temp disabled due to https://github.com/clarity-h2020/scenario-analysis/issues/6 + //scope.$watch('criteriaFunction', watchCallback, true); }; return { From 16b59b67032f246467d2867fd2f561491d25eaf8 Mon Sep 17 00:00:00 2001 From: p-a-s-c-a-l Date: Wed, 7 Nov 2018 15:05:18 +0100 Subject: [PATCH 11/15] #2 accept objects and arrary for criteria function and decision strategy JSON files --- ...rupalContextProviderDirectiveController.js | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/app/scripts/controllers/drupalContextProviderDirectiveController.js b/app/scripts/controllers/drupalContextProviderDirectiveController.js index 59b9094..fc04bf0 100644 --- a/app/scripts/controllers/drupalContextProviderDirectiveController.js +++ b/app/scripts/controllers/drupalContextProviderDirectiveController.js @@ -163,11 +163,12 @@ angular.module( onloadIccObjects = function (file) { return function (e) { + console.log('load icc file: ' + file.name); + var fileObj; try { fileObj = JSON.parse(e.target.result); - loadIndicatorObjects(fileObj); - + loadIndicatorObject(fileObj); $scope.$apply(); } catch (err) { console.log(err.toString()); @@ -310,7 +311,11 @@ angular.module( var criteriaFunctionArray; try { criteriaFunctionArray = JSON.parse(e.target.result); - loadCriteriaFunctions(criteriaFunctionArray); + if (Object.prototype.toString.call(criteriaFunctionArray) !== '[object Array]') { + loadCriteriaFunctions([criteriaFunctionArray]); + } else { + loadCriteriaFunctions(criteriaFunctionArray); + } $scope.loadedCfFile = theFile.name; $scope.$apply(); } catch (err) { @@ -345,7 +350,7 @@ angular.module( if (criteriaFunctionContainer.name) { $scope.loadedCfFile = criteriaFunctionContainer.name; } else { - $scope.loadedCfFile = ' ' + $scope.loadedCfFile = ' '; } for (j = 0; j < criteriaFunctionContainer.criteriaFunctions.length; j++) { @@ -381,7 +386,7 @@ angular.module( } else { msg = 'criteria function object is not an array or empty'; - console.log(msg + ': ' + criteriaFunctionArray.ToString()); + console.log(msg + ': ' + criteriaFunctionArray.toString()); $scope.showCfFileLoadingError('msg'); } }; @@ -391,6 +396,9 @@ angular.module( var decisionStrategyArray; try { decisionStrategyArray = JSON.parse(e.target.result); + if (Object.prototype.toString.call(decisionStrategyArray) !== '[object Array]') { + decisionStrategyArray = [decisionStrategyArray]; + } loadDecisionStrategies(decisionStrategyArray); $scope.loadedDsfFile = theFile.name; $scope.$apply(); @@ -464,7 +472,7 @@ angular.module( console.log(decisionStrategyArray.length + 'decision strategies loaded'); } else { msg = 'decision strategy object is not an array or empty'; - console.log(msg + ': ' + decisionStrategyArray.ToString()); + console.log(msg + ': ' + decisionStrategyArray.toString()); $scope.showCfFileLoadingError('msg'); } }; From 92cb044bfb1ea020ccc34b3163ea3464973147f7 Mon Sep 17 00:00:00 2001 From: p-a-s-c-a-l Date: Tue, 13 Nov 2018 14:09:09 +0100 Subject: [PATCH 12/15] #2 update sample Criteria Function --- samples/sampleCriteriaFunction_1.json | 316 ++++++++++++++++---------- 1 file changed, 191 insertions(+), 125 deletions(-) diff --git a/samples/sampleCriteriaFunction_1.json b/samples/sampleCriteriaFunction_1.json index 7d01131..aaa6c31 100644 --- a/samples/sampleCriteriaFunction_1.json +++ b/samples/sampleCriteriaFunction_1.json @@ -1,125 +1,191 @@ -{ - "name": "CLARITY Criteria Function #1", - "criteriaFunctions": [ - { - "indicator": "Number of dead", - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 0 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - }, - "intervals": [] - }, - { - "indicator": "Number of injured", - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 0 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - }, - "intervals": [] - }, - { - "indicator": "Number of homeless", - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 0 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - }, - "intervals": [] - }, - { - "indicator": "Direct damage cost", - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 0 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - }, - "intervals": [] - }, - { - "indicator": "Indirect damage cost", - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 0 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - }, - "intervals": [] - }, - { - "indicator": "Direct restoration cost", - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 0 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - }, - "intervals": [] - }, - { - "indicator": "Lost buildings", - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 0 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - }, - "intervals": [] - }, - { - "indicator": "Unsafe buildings", - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 0 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - }, - "intervals": [] - }, - { - "indicator": "Number of damaged road segments", - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 0 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - }, - "intervals": [] - }, - { - "indicator": "Total evacuation cost", - "lowerBoundary": { - "criteriaValue": 0, - "indicatorValue": 0 - }, - "upperBoundary": { - "criteriaValue": 100, - "indicatorValue": 0 - }, - "intervals": [] - } - ] -} \ No newline at end of file +[ + { + "name": "CLARITY Criteria Function #1", + "criteriaFunctions": [ + { + "indicator": "Number of dead", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 200 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 0 + }, + "intervals": [ + { + "criteriaValue": 15, + "indicatorValue": 150 + }, + { + "criteriaValue": 50, + "indicatorValue": 15 + } + ] + }, + { + "indicator": "Number of injured", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 1000 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 25 + }, + "intervals": [ + { + "criteriaValue": 25, + "indicatorValue": 200 + }, + { + "criteriaValue": 50, + "indicatorValue": 50 + } + ] + }, + { + "indicator": "Number of homeless", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 15000 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 1000 + }, + "intervals": [ + { + "criteriaValue": 50, + "indicatorValue": 5000 + } + ] + }, + { + "indicator": "Direct damage cost", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 30000000 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 10000000 + }, + "intervals": [ + { + "criteriaValue": 50, + "indicatorValue": 20000000 + } + ] + }, + { + "indicator": "Indirect damage cost", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 100000000 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 10000000 + }, + "intervals": [ + { + "criteriaValue": 25, + "indicatorValue": 75000000 + }, + { + "criteriaValue": 50, + "indicatorValue": 50000000 + }, + { + "criteriaValue": 75, + "indicatorValue": 20000000 + } + ] + }, + { + "indicator": "Direct restoration cost", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 100000000 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 0 + }, + "intervals": [] + }, + { + "indicator": "Lost buildings", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 500 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 200 + }, + "intervals": [ + { + "criteriaValue": 50, + "indicatorValue": 250 + } + ] + }, + { + "indicator": "Unsafe buildings", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 1000 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 100 + }, + "intervals": [ + { + "criteriaValue": 50, + "indicatorValue": 500 + }, + { + "criteriaValue": 75, + "indicatorValue": 400 + } + ] + }, + { + "indicator": "Number of damaged road segments", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 1500 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 1000 + }, + "intervals": [] + }, + { + "indicator": "Total evacuation cost", + "lowerBoundary": { + "criteriaValue": 0, + "indicatorValue": 30000000 + }, + "upperBoundary": { + "criteriaValue": 100, + "indicatorValue": 10000000 + }, + "intervals": [ + { + "criteriaValue": 25, + "indicatorValue": 20000000 + }, + { + "criteriaValue": 50, + "indicatorValue": 15000000 + } + ] + } + ] + } +] \ No newline at end of file From c0b5e24bd08251ec0f99e94bfb9e3b1636499769 Mon Sep 17 00:00:00 2001 From: p-a-s-c-a-l Date: Fri, 1 Mar 2019 08:57:03 +0100 Subject: [PATCH 13/15] #10 FIXME: don't use displayName as **unique** key !!!111!!11 :o( --- .../drupalContextProviderDirectiveController.js | 10 ++++++---- nbproject/project.properties | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/scripts/controllers/drupalContextProviderDirectiveController.js b/app/scripts/controllers/drupalContextProviderDirectiveController.js index fc04bf0..ad7402a 100644 --- a/app/scripts/controllers/drupalContextProviderDirectiveController.js +++ b/app/scripts/controllers/drupalContextProviderDirectiveController.js @@ -249,7 +249,7 @@ angular.module( if ($scope.indicatorMap[indicator].displayName === origLoadedIndicators[indicatorGroup][indicatorProp].displayName) { loadedIndicatorLength++; containsIndicator = true; - break; + //break; } } } @@ -264,12 +264,14 @@ angular.module( } } } - if (loadedIndicatorLength !== indicatorMapLength) { - msg = 'indicator data in file has more indicators defined that the first loaded indicator set.'; + + // FIXME: don't use displayName as **unique** key !!!111!!11 :o( + /**if (loadedIndicatorLength !== indicatorMapLength) { + msg = 'indicator data in file has more indicators ('+loadedIndicatorLength+') defined than the first loaded indicator set ('+indicatorMapLength+').'; console.error(msg); showIndicatorFileLoadingError(msg); return; - } + }**/ // we need an id to distinct the icc objects. eg. the ranking table use this id // to keep track of the indicator objects diff --git a/nbproject/project.properties b/nbproject/project.properties index b4ca6cb..dc93023 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -12,8 +12,10 @@ auxiliary.org-netbeans-modules-javascript2-requirejs.enabled=true auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs browser.autorefresh.Chrome=false browser.autorefresh.Chrome.INTEGRATED=false +browser.autorefresh.SL[/Browsers/webviewBrowser=true browser.highlightselection.Chrome=true browser.highlightselection.Chrome.INTEGRATED=false +browser.highlightselection.SL[/Browsers/webviewBrowser=true browser.run=true config.folder=. file.reference.scenario-analysis-app=app From aed5db4325911f9dab0f871def3d06ce7880f969 Mon Sep 17 00:00:00 2001 From: p-a-s-c-a-l Date: Fri, 1 Mar 2019 13:11:36 +0100 Subject: [PATCH 14/15] #10 fix indicator map access --- Gruntfile.js | 22 +- app/index.html | 1 + app/scripts/connectors/nodeConnector.js | 3 + .../criteriaEmphasesDirectiveController.js | 2 +- ...teriaFunctionManagerDirectiveController.js | 382 +++++++++--------- ...rupalContextProviderDirectiveController.js | 2 +- app/scripts/controllers/mainController.js | 4 + .../criteriaFunctionManagerTemplate.html | 6 +- package.json | 1 + 9 files changed, 228 insertions(+), 195 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index c8a5f9f..8bf7073 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -33,6 +33,7 @@ module.exports = function (grunt) { require('load-grunt-tasks')(grunt); require('time-grunt')(grunt); + grunt.loadNpmTasks('grunt-force-task'); grunt.initConfig({ /* @@ -365,7 +366,8 @@ module.exports = function (grunt) { uglify: { options: { mangle: true, - compress: true, + // https://github.com/gruntjs/grunt-contrib-uglify/issues/298#issuecomment-74161370 + compress: {}, sourceMap: true }, min: { @@ -723,8 +725,8 @@ module.exports = function (grunt) { 'replace:debugCode', 'copy', 'cdnify', - 'cdnifyCss', - 'copyUncdnified', + 'force:cdnifyCss', + 'force:copyUncdnified', 'usemin' ]); @@ -763,13 +765,15 @@ module.exports = function (grunt) { 'autoprefixer' ]); - grunt.registerTask('test', [ - 'depend:generateSources:test', - 'updateKarmaConfAndRun' - ]); + // FIXME: TESTS DISABLED + // phantomjs doen't work (again and again): See mainConteoller.js:170 + //.registerTask('test', [ + // 'depend:generateSources:test', + // 'updateKarmaConfAndRun' + //]); grunt.registerTask('build', [ - 'depend:test:build', + //'depend:test:build', 'chmod:read' ]); @@ -783,7 +787,7 @@ module.exports = function (grunt) { grunt.registerTask('dist', [ 'depend:package:dist', - 'bowerDist' + 'force:bowerDist' ]); /* diff --git a/app/index.html b/app/index.html index 22f9143..3386f2c 100644 --- a/app/index.html +++ b/app/index.html @@ -192,6 +192,7 @@

worldstates='container.worldstates' for-criteria='forCriteriaTable' criteria-function="container.selectedCriteriaFunction" + detail-icons="true" >

diff --git a/app/scripts/connectors/nodeConnector.js b/app/scripts/connectors/nodeConnector.js index 3e04f80..a660472 100644 --- a/app/scripts/connectors/nodeConnector.js +++ b/app/scripts/connectors/nodeConnector.js @@ -1,11 +1,14 @@ //