Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@p-a-s-c-a-l
p-a-s-c-a-l committed Oct 30, 2018
2 parents a44d165 + cba2c13 commit 747bbe1
Show file tree
Hide file tree
Showing 91 changed files with 1,215 additions and 6,118 deletions.
3 changes: 2 additions & 1 deletion .bowerrc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"directory": "app/bower_components"
"directory": "app/bower_components",
"registry": "https://registry.bower.io"
}
2 changes: 0 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
node_modules
/nbproject/private/
dist/*
!dist/scripts
!dist/styles
.tmp
.sass-cache
app/bower_components
Expand Down
12 changes: 7 additions & 5 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = function (grunt) {
* ===========================================================================================================
*/
// TODO: find a way for more convenient configuration
directivesMainModuleName = 'eu.crismaproject.worldstateAnalysis.directives';
directivesMainModuleName = 'eu.myclimateservice.csis.scenario-analysis.directives';

customCopy = {
preserveTimestamp: true,
Expand Down Expand Up @@ -121,9 +121,11 @@ module.exports = function (grunt) {
},

// generateSources task
// FIX: https://github.com/jshint/jshint/issues/2922
jshint: {
options: {
jshintrc: '.jshintrc'
jshintrc: '.jshintrc',
reporterOutput: ''
},
all: [
'<%= src %>/scripts/{,*/}*.js'
Expand Down Expand Up @@ -297,19 +299,19 @@ module.exports = function (grunt) {
options: {
cdn: {
angular: {
versions: ['1.2.25'],
versions: ['1.2.29'],
url: function (version) {
return '//ajax.googleapis.com/ajax/libs/angularjs/' + version + '/angular.min.js';
}
},
'angular-resource': {
versions: ['1.2.25'],
versions: ['1.2.29'],
url: function (version) {
return '//ajax.googleapis.com/ajax/libs/angularjs/' + version + '/angular-resource.min.js';
}
},
bootstrap : {
versions: ['3.3.0', '3.2.0', '3.1.1'],
versions: ['3.3.7', '3.2.0', '3.1.1'],
url: function (version) {
return '//maxcdn.bootstrapcdn.com/bootstrap/' + version + '/js/bootstrap.min.js';
}
Expand Down
91 changes: 62 additions & 29 deletions app/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,18 @@
<!-- build:css() -->
<link rel="stylesheet" href="styles/indicatorCriteriaTableDirective.css">
<!-- endbuild -->


<!-- seamless.js -->
<script src="bower_components/seamless/build/seamless.child.js" type="text/javascript"></script>
</head>
<body ng-app="eu.crismaproject.worldstateAnalysis.demoApp">
<body ng-app="eu.myclimateservice.csis.scenario-analysis.demoApp">
<!--[if lt IE 7]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->

<!-- Add your site or application content here -->
<div class="container" ng-controller="eu.crismaproject.worldstateAnalysis.demoApp.controllers.MainController">
<div class="row" style="margin-bottom: 20px;">
<div class="container" name="application" ng-controller="eu.myclimateservice.csis.scenario-analysis.demoApp.controllers.MainController">
<div class="row" name= "row" style="margin-bottom: 20px;">
<div class="col-lg-12">
<tabset>
<tab select="switchToIcmmTab();filesTabCollapsed=false" active="icmmTabActive">
Expand Down Expand Up @@ -176,7 +178,7 @@
</h3>
<div class="pull-right">
<div class="input-group">
<div class="input-group-btn " style="display: block" ng-click="persistDecisionStrategies()">
<div class="input-group-btn " style="display: block">
<button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="disabled">
Change Mode <span class="caret"></span>
</button>
Expand Down Expand Up @@ -230,13 +232,18 @@ <h3 style="display:table-cell;vertical-align: middle" class="panel-title">
'padding-left'
: forCriteriaTable? '0px': '19px'}">Criteria</span></a></li>
</ul>
<button type="button" class="btn btn-sm btn-primary"
ng-disabled="!container.worldstates || !container.worldstates.length"
ng-click="screenshot('indicator-criteria-table');">
Include in Report</button>
</div>
</div>
</div>
</div>
<div collapse="indicatorCriteriaTableCollapsed"
class="panel-body">
<indicator-criteria-table worldstates='container.worldstates'
<indicator-criteria-table id="indicator-criteria-table"
worldstates='container.worldstates'
for-criteria='forCriteriaTable'
criteria-function="container.selectedCriteriaFunction"
>
Expand All @@ -246,26 +253,35 @@ <h3 style="display:table-cell;vertical-align: middle" class="panel-title">
</div>
<div class="row">
<div class="panel panel-default">
<div class="panel-heading">
<h3 style="display:inline" class="panel-title">
<div class="panel-heading"
style="display:table;width:100%">
<h3 style="display:table-cell;vertical-align: middle" class="panel-title">
<a style="color:#000"
ng-click="indicatorBarChartsCollapsed = !indicatorBarChartsCollapsed">
<i ng-if="!indicatorBarChartsCollapsed" class="glyphicon glyphicon-chevron-up"></i>
<i ng-if="indicatorBarChartsCollapsed" class="glyphicon glyphicon-chevron-down"></i>
Indicator bar charts
</a>
</h3>
<div class="btn-group pull-right">
<button type="button" class="btn btn-sm btn-primary"
ng-disabled="!container.worldstates || !container.worldstates.length"
ng-click="screenshot('indicator-bar-charts');">
Include in Report</button>
</div>
</div>
<div collapse="indicatorBarChartsCollapsed"
class="panel-body" >
<indicator-bar-charts
<indicator-bar-charts
id="indicator-bar-charts"
worldstates="container.worldstates">
</indicator-bar-charts>
</div>
</div>
</div>
<div class="row">
<div class="panel panel-default">

<div class="panel-heading"
style="display:table;width:100%">
<h3 style="display:table-cell;vertical-align: middle" class="panel-title">
Expand All @@ -288,11 +304,16 @@ <h3 style="display:table-cell;vertical-align: middle" class="panel-title">
'padding-left'
: isCriteria? '0px': '19px'}">Criteria</span></a></li>
</ul>
<button type="button" class="btn btn-sm btn-primary"
ng-disabled="!container.worldstates || !container.worldstates.length"
ng-click="screenshot('relation-analysis-chart');">
Include in Report</button>
</div>
</div>
<div collapse="relationAnalysisChartCollapsed"
class="panel-body">
<relation-analysis-chart style="padding-left:50px" height="350"
<relation-analysis-chart id="relation-analysis-chart"
style="padding-left:50px" height="350"
for-criteria='isCriteria'
worldstates="container.worldstates"
criteria-function="container.selectedCriteriaFunction"
Expand All @@ -304,21 +325,22 @@ <h3 style="display:table-cell;vertical-align: middle" class="panel-title">

<div class="row">
<div class="panel panel-default">
<div class="panel-heading" >
<span class="pull-left">
<h3 style="display:inline" class="panel-title">
<div class="panel-heading"
style="display:table;width:100%">
<h3 style="display:table-cell;vertical-align: middle" class="panel-title">
<a style="color:#000"
ng-click="criteriaRadaCollapsed = !criteriaRadaCollapsed">
<i ng-if="!criteriaRadaCollapsed" class="glyphicon glyphicon-chevron-up"></i>
<i ng-if="criteriaRadaCollapsed" class="glyphicon glyphicon-chevron-down"></i>
Criteria radar chart comparison
</a>
</h3>
</span>
<span class="pull-right">

</span>
<span class="clearfix"></span>
<div class="btn-group pull-right">
<button type="button" class="btn btn-sm btn-primary"
ng-disabled="!container.worldstates || !container.worldstates.length"
ng-click="screenshot('indicator-bar-charts');">
Include in Report</button>
</div>
</div>
<div collapse="criteriaRadaCollapsed"
class="panel-body">
Expand Down Expand Up @@ -347,7 +369,7 @@ <h3 style="display:inline" class="panel-title">
ng-if="container.worldstates.length > 0 && !container.selectedCriteriaFunction">
<div class="alert alert-warning" role="alert"><b>Warning:</b> No criteria function selected</div>
</div>
<div class="col-lg-3 col-md-4"
<div class="col-lg-3 col-md-4 col-sm-6"
style="margin-top:25px;"
ng-if="container.worldstates.length > 0 && container.selectedCriteriaFunction"
ng-repeat="chartModel in container.chartModels">
Expand Down Expand Up @@ -494,6 +516,7 @@ <h3 class="panel-title ng-binding">
<script src="bower_components/nvd3/nv.d3.js"></script>
<script src="bower_components/angularjs-nvd3-directives/dist/angularjs-nvd3-directives.js"></script>
<script src="bower_components/ngDialog/js/ngDialog.js"></script>
<script src="bower_components/html2canvas/index.js" type="text/javascript"></script>

<!-- build:js() -->
<script src="scripts/app.js"></script>
Expand Down Expand Up @@ -544,16 +567,26 @@ <h3 class="panel-title ng-binding">

<!-- demo only -->
<script>
angular.module('eu.crismaproject.worldstateAnalysis.demoApp').config(
[
'$provide',
function ($provide) {
'use strict';
$provide.constant('CRISMA_DOMAIN', 'CRISMA');
angular.module('eu.myclimateservice.csis.scenario-analysis.demoApp').config(
[
'$provide',
function ($provide) {
'use strict';
$provide.constant('CRISMA_DOMAIN', 'CRISMA');
// $provide.constant('CRISMA_ICMM_API', 'http://localhost:8890');
$provide.constant('CRISMA_ICMM_API', 'http://crisma.cismet.de/icmm_api');
}
]
);</script>
$provide.constant('CRISMA_ICMM_API', 'http://crisma.cismet.de/icmm_api');
// $provide.constant('CRISMA_ICMM_API', 'sadfg');
}
]
);
</script>

<!-- seamless.js -->
<script type="text/javascript">

// Connect to the parent page.
// https://github.com/travist/seamless.js?files=1#connect-child-page-to-parent-page
window.seamless.connect();
</script>
</body>
</html>
8 changes: 4 additions & 4 deletions app/scripts/app.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// this is only used for demo/testing purposes
angular.module(
'eu.crismaproject.worldstateAnalysis.demoApp',
'eu.myclimateservice.csis.scenario-analysis.demoApp',
[
'eu.crismaproject.worldstateAnalysis.demoApp.controllers',
'eu.crismaproject.worldstateAnalysis.directives',
'eu.crismaproject.worldstateAnalysis.services',
'eu.myclimateservice.csis.scenario-analysis.demoApp.controllers',
'eu.myclimateservice.csis.scenario-analysis.directives',
'eu.myclimateservice.csis.scenario-analysis.services',
'de.cismet.crisma.widgets.worldstateTreeWidget',
'ui.bootstrap.tabs',
'ui.bootstrap.collapse',
Expand Down
6 changes: 3 additions & 3 deletions app/scripts/controllers/_module.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
angular.module(
'eu.crismaproject.worldstateAnalysis.demoApp.controllers',
'eu.myclimateservice.csis.scenario-analysis.demoApp.controllers',
[
'de.cismet.crisma.ICMM.config',
'de.cismet.crisma.ICMM.Worldstates',
Expand All @@ -8,10 +8,10 @@ angular.module(
]
);
angular.module(
'eu.crismaproject.worldstateAnalysis.controllers',
'eu.myclimateservice.csis.scenario-analysis.controllers',
[
'nvd3ChartDirectives',
'eu.crismaproject.worldstateAnalysis.services',
'eu.myclimateservice.csis.scenario-analysis.services',
'ngDialog',
'de.cismet.crisma.ICMM.config',
]
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/controllers/criteriaEmphasesDirectiveController.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
angular.module(
'eu.crismaproject.worldstateAnalysis.controllers'
'eu.myclimateservice.csis.scenario-analysis.controllers'
).controller(
'eu.crismaproject.worldstateAnalysis.controllers.criteriaEmphasesController',
'eu.myclimateservice.csis.scenario-analysis.controllers.criteriaEmphasesController',
[
'$scope',
function ($scope) {
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/controllers/criteriaFunctionManagerDirectiveController.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
angular.module(
'eu.crismaproject.worldstateAnalysis.controllers'
'eu.myclimateservice.csis.scenario-analysis.controllers'
).controller(
'eu.crismaproject.worldstateAnalysis.controllers.CriteriaFunctionManagerDirectiveController',
'eu.myclimateservice.csis.scenario-analysis.controllers.CriteriaFunctionManagerDirectiveController',
[
'$scope',
'de.cismet.crisma.ICMM.Worldstates',
Expand Down
6 changes: 3 additions & 3 deletions app/scripts/controllers/criteriaRadarChartDirectiveController.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
angular.module(
'eu.crismaproject.worldstateAnalysis.controllers'
'eu.myclimateservice.csis.scenario-analysis.controllers'
).controller(
'eu.crismaproject.worldstateAnalysis.controllers.CriteriaRadarChartDirectiveController',
'eu.myclimateservice.csis.scenario-analysis.controllers.CriteriaRadarChartDirectiveController',
[
'$scope',
'eu.crismaproject.worldstateAnalysis.services.CriteriaCalculationService',
'eu.myclimateservice.csis.scenario-analysis.services.CriteriaCalculationService',
function ($scope,ccs) {
'use strict';
$scope.legendItems = [];
Expand Down
Loading

0 comments on commit 747bbe1

Please sign in to comment.