From 0ba2d4a1e6aadada0b18181833ff93cc5b69359d Mon Sep 17 00:00:00 2001 From: Roberto Callari Date: Tue, 21 May 2019 14:35:54 +0200 Subject: [PATCH] Statistics page updated and minor fix ckan api (#49) --- .../java/it/eng/idra/api/ckan/CKANUtils.java | 12 +-- IdraPortal/src/main/webapp/css/navbar.css | 76 ++++++++++++++++--- .../main/webapp/statistics/Statistics.html | 13 ++-- .../src/main/webapp/statistics/statistics.js | 24 +++--- 4 files changed, 92 insertions(+), 33 deletions(-) diff --git a/Idra/src/main/java/it/eng/idra/api/ckan/CKANUtils.java b/Idra/src/main/java/it/eng/idra/api/ckan/CKANUtils.java index 8c36b654..5f491ee8 100644 --- a/Idra/src/main/java/it/eng/idra/api/ckan/CKANUtils.java +++ b/Idra/src/main/java/it/eng/idra/api/ckan/CKANUtils.java @@ -370,7 +370,7 @@ public static Dataset toCkanDataset(DCATDataset dataset) { } if(ar_contactPoint.length()>0) { - extras.add(new Extra("contact_point",ar_contactPoint.toString())); + extras.add(new Extra("contact_point",ar_contactPoint.toString().replaceAll("\\\\\"", "'").replaceAll("\"", ""))); } @@ -389,12 +389,12 @@ public static Dataset toCkanDataset(DCATDataset dataset) { } if(ar_conformsTo.length()>0) { - extras.add(new Extra("conforms_to",ar_conformsTo.toString())); + extras.add(new Extra("conforms_to",ar_conformsTo.toString().replaceAll("\\\\\"", "'").replaceAll("\"", ""))); } for(SKOSConceptTheme t : dataset.getTheme()){ List labelTmp = t.getPrefLabel().stream().filter(x -> StringUtils.isNotBlank(x.getLanguage()) || StringUtils.isNotBlank(x.getValue())).collect(Collectors.toList()); - if(labelTmp.isEmpty()) { + if(!labelTmp.isEmpty()) { JSONArray ar = new JSONArray(); for(SKOSPrefLabel p : labelTmp) { JSONObject tmpObj = new JSONObject(); @@ -402,13 +402,13 @@ public static Dataset toCkanDataset(DCATDataset dataset) { tmpObj.put("value", p.getValue()); ar.put(tmpObj); } - extras.add(new Extra("theme",ar.toString())); + extras.add(new Extra("theme",ar.toString().replaceAll("\\\\\"", "'").replaceAll("\"", ""))); } } for(SKOSConceptSubject t : dataset.getSubject()){ List labelTmp = t.getPrefLabel().stream().filter(x -> StringUtils.isNotBlank(x.getLanguage()) || StringUtils.isNotBlank(x.getValue())).collect(Collectors.toList()); - if(labelTmp.isEmpty()) { + if(!labelTmp.isEmpty()) { JSONArray ar = new JSONArray(); for(SKOSPrefLabel p : labelTmp) { JSONObject tmpObj = new JSONObject(); @@ -416,7 +416,7 @@ public static Dataset toCkanDataset(DCATDataset dataset) { tmpObj.put("value", p.getValue()); ar.put(tmpObj); } - extras.add(new Extra("subject",ar.toString())); + extras.add(new Extra("subject",ar.toString().replaceAll("\\\\\"", "'").replaceAll("\"", ""))); } } diff --git a/IdraPortal/src/main/webapp/css/navbar.css b/IdraPortal/src/main/webapp/css/navbar.css index 68eaf800..57783d65 100644 --- a/IdraPortal/src/main/webapp/css/navbar.css +++ b/IdraPortal/src/main/webapp/css/navbar.css @@ -127,26 +127,82 @@ /* Small devices */ @media (max-width:830px) { - #header div.navbar.navbar-default .btn.btn-default { - margin-left: 10px; - } +/* #header div.navbar.navbar-default .btn.btn-default { */ +/* margin-left: 10px; */ +/* } */ /* #header div.navbar.navbar-default .navbar-header .navbar-brand { */ /* background-size: auto 39px; */ /* width: 190px; */ /* } */ } -@media (max-width: 480px){ - .navbar-brand { - /*width: 370px !important;*/ - width: 100px !important; - } - - .navbar .nav.navbar-nav > li > a { +/*SYNCHRONICITY*/ +@media (max-width: 894px) { + + .navbar-header { + float: none; + } + .navbar-left,.navbar-right { + float: none !important; + } + .navbar-toggle { + display: block; + } + .navbar-collapse { + border-top: 1px solid transparent; + box-shadow: inset 0 1px 0 rgba(255,255,255,0.1); + } + .navbar-fixed-top { + top: 0; + border-width: 0 0 1px; + } + .navbar-collapse.collapse { + display: none!important; + } + .navbar-nav { + float: none!important; + margin-top: 7.5px; + } + .navbar-nav>li { + float: none; + } + .navbar-nav>li>a { + padding-top: 10px; + padding-bottom: 10px; + } + .collapse.in{ + display:block !important; + } + + .navbar .nav.navbar-nav > li > a { padding: 10px 15px; } + +/* .container>.navbar-header, .container-fluid>.navbar-header, .container>.navbar-collapse, .container-fluid>.navbar-collapse{ */ +/* margin-right: -15px; */ +/* margin-left: -15px; */ +/* } */ } +/* @media (max-width: 767px){ */ + +/* #header div.navbar.navbar-default .navbar-header .navbar-brand { */ +/* height:60px; */ +/* } */ + +/* .navbar-brand { */ +/* width: 100px !important; */ +/* } */ + +/* .navbar .nav.navbar-nav > li > a { */ +/* padding: 10px 15px; */ +/* } */ + +/* .navbar-form{ */ +/* border: 0 !important; */ +/* } */ +/* } */ + .navbar .navbar-toggle, .navbar .navbar-toggle:hover, .navbar .navbar-toggle:focus { background-color: #00b4ff; diff --git a/IdraPortal/src/main/webapp/statistics/Statistics.html b/IdraPortal/src/main/webapp/statistics/Statistics.html index 2ea05e36..63f1a1e5 100644 --- a/IdraPortal/src/main/webapp/statistics/Statistics.html +++ b/IdraPortal/src/main/webapp/statistics/Statistics.html @@ -42,7 +42,7 @@ -
+
{{'statisticsTop10Catalogues' | translate}} @@ -69,12 +69,12 @@
-
+
{{'statisticsMostActiveCatalogues' | translate}} - {{option.text | translate}} @@ -85,6 +85,7 @@ chart-data="dataAddUpdate" chart-labels="labelsAddUpdate" chart-series="seriesAddUpdate" chart-options="{ + responsive: true, title:{ display:false, text:'Most Active Catalogues' @@ -98,7 +99,7 @@
-
+
{{'statisticsCataloguesTechnologies' | @@ -108,7 +109,7 @@
-
+
{{'statisticsDistributionFormats' | @@ -124,7 +125,7 @@
-
+
{{'statisticsDistributionLicenses' | diff --git a/IdraPortal/src/main/webapp/statistics/statistics.js b/IdraPortal/src/main/webapp/statistics/statistics.js index 204b3a8e..bdda95bc 100644 --- a/IdraPortal/src/main/webapp/statistics/statistics.js +++ b/IdraPortal/src/main/webapp/statistics/statistics.js @@ -23,6 +23,8 @@ angular.module("IdraPlatform").controller('StatisticsCtrl',['$scope','Statistics $scope.showBackFormat=false; $scope.showBackLicense=false; + var maxPieDisplay = 8; + //Default 1 settimana var end = new Date(); var start = new Date(); @@ -164,7 +166,7 @@ angular.module("IdraPlatform").controller('StatisticsCtrl',['$scope','Statistics //$scope.formats.total+=x.cnt; - if($scope.formats.labels.length<10){ + if($scope.formats.labels.length= 10 ){ + if(formatsAll.labels.length >= maxPieDisplay ){ $scope.formats.labels.push("Others"); //$scope.formats.barChart[0].push(othCnt); $scope.formats.pie.push(othCnt); @@ -197,7 +199,7 @@ angular.module("IdraPlatform").controller('StatisticsCtrl',['$scope','Statistics //$scope.licenses.total+=x.cnt; - if($scope.licenses.labels.length<10){ + if($scope.licenses.labels.length= 10 ){ + if(licensesAll.labels.length >= maxPieDisplay ){ $scope.licenses.labels.push("Others"); //$scope.licenses.barChart[0].push(othCnt1); $scope.licenses.pie.push(othCnt1); @@ -411,20 +413,20 @@ angular.module("IdraPlatform").controller('StatisticsCtrl',['$scope','Statistics /*End OPTIONS*/ - /*DrillDown*/ + /*DrillDown*/ $scope.showTop10=function(category){ if(category=='format'){ $scope.showBackFormat=false; //$scope.formats={labels:[],pie:[]}; $scope.formats.labels=[]; $scope.formats.pie=[]; - for(i=0; i<10; i++){ + for(i=0; i