MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

[Monitor Dashboard| trunk] 

-remove datatables
-Indicator utils: applySchemaEnhancements -> check for profiles all-inclusive and original


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@60610 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Argiro Kokogiannaki 2021-03-09 09:36:05 +00:00
parent 85fbb63c94
commit cf98603e32
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
angular.json
View File

@ -22,15 +22,13 @@
], ],
"styles": [ "styles": [
"src/styles.css", "src/styles.css",
"src/material.scss", "src/material.scss"
"node_modules/datatables.net-dt/css/jquery.dataTables.css"
], ],
"scripts": [ "scripts": [
"src/assets/common-assets/common/jquery.js", "src/assets/common-assets/common/jquery.js",
"src/assets/common-assets/common/uikit.min.js", "src/assets/common-assets/common/uikit.min.js",
"src/assets/common-assets/common/uikit-icons.min.js", "src/assets/common-assets/common/uikit-icons.min.js",
"node_modules/jquery/dist/jquery.js", "node_modules/jquery/dist/jquery.js"
"node_modules/datatables.net/js/jquery.dataTables.js"
] ]
}, },
"configurations": { "configurations": {
@ -126,8 +124,7 @@
"node_modules/jquery/dist/jquery.js" "node_modules/jquery/dist/jquery.js"
], ],
"styles": [ "styles": [
"src/styles.css", "src/styles.css"
"node_modules/datatables.net-dt/css/jquery.dataTables.css"
], ],
"assets": [ "assets": [
"src/assets", "src/assets",

4
package.json
View File

@ -48,11 +48,8 @@
"@nguniversal/express-engine": "^6.0.0", "@nguniversal/express-engine": "^6.0.0",
"@nguniversal/module-map-ngfactory-loader": "^6.0.0", "@nguniversal/module-map-ngfactory-loader": "^6.0.0",
"@types/express": "^4.16.1", "@types/express": "^4.16.1",
"angular-datatables": "^4.4.1",
"clipboard": "^1.5.16", "clipboard": "^1.5.16",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"datatables.net": "^1.10.19",
"datatables.net-dt": "^1.10.19",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"ng-recaptcha": "^3.0.5", "ng-recaptcha": "^3.0.5",
"ng2-ckeditor": "1.1.9", "ng2-ckeditor": "1.1.9",
@ -68,7 +65,6 @@
"@angular/cli": "^7.3.9", "@angular/cli": "^7.3.9",
"@angular/compiler-cli": "7.2.14", "@angular/compiler-cli": "7.2.14",
"@angular/language-service": "7.2.14", "@angular/language-service": "7.2.14",
"@types/datatables.net": "^1.10.17",
"@types/jquery": "^3.3.29", "@types/jquery": "^3.3.29",
"@types/node": "^8.0.30", "@types/node": "^8.0.30",
"cpy-cli": "^1.0.1", "cpy-cli": "^1.0.1",

4
src/app/utils/indicator-utils.ts
View File

@ -379,7 +379,7 @@ export class IndicatorUtils {
if (replacedUrl.indexOf(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix) != -1) { if (replacedUrl.indexOf(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix) != -1) {
replacedUrl = replacedUrl.split(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix).join(encodeURIComponent(stakeholder.index_shortName)) replacedUrl = replacedUrl.split(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix).join(encodeURIComponent(stakeholder.index_shortName))
} }
//Check apply enhancements return this.applySchemaEnhancements( ..);
return (indicatorPath.chartObject?indicatorPath.url + encodeURIComponent(replacedUrl):replacedUrl); return (indicatorPath.chartObject?indicatorPath.url + encodeURIComponent(replacedUrl):replacedUrl);
} }
@ -928,7 +928,7 @@ export class IndicatorUtils {
if(url.split('json=').length > 1) { if(url.split('json=').length > 1) {
let obj = JSON.parse(decodeURIComponent(url.split('json=')[1])); let obj = JSON.parse(decodeURIComponent(url.split('json=')[1]));
for (let query of this.getQueryObjectName(obj)?obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)]:obj[this.getDescriptionObjectName(obj)]) { for (let query of this.getQueryObjectName(obj)?obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)]:obj[this.getDescriptionObjectName(obj)]) {
if (!query["query"]["profile"] ||query["query"]["profile"] != 'monitor') { if (!query["query"]["profile"] || query["query"]["profile"] == 'OpenAIRE All-inclusive' || query["query"]["profile"] == 'OpenAIRE original') {
changes += (query["query"]["profile"] ? ( "Changed profile \"" + query["query"]["profile"] + "\" to " ):"Added profile ") + " \"monitor\""; changes += (query["query"]["profile"] ? ( "Changed profile \"" + query["query"]["profile"] + "\" to " ):"Added profile ") + " \"monitor\"";
query["query"]["profile"] = 'monitor'; query["query"]["profile"] = 'monitor';
} }