Project

General

Profile

« Previous | Next » 

Revision 60610

Added by Argiro Kokogiannaki about 3 years ago

[Monitor Dashboard| trunk]
-remove datatables
-Indicator utils: applySchemaEnhancements -> check for profiles all-inclusive and original

View differences:

modules/uoa-monitor-portal/trunk/monitor_dashboard/angular.json
22 22 
            ],
23 23 
            "styles": [
24 24 
              "src/styles.css",
25 
              "src/material.scss",
26 
              "node_modules/datatables.net-dt/css/jquery.dataTables.css"
25 
              "src/material.scss"
27 26 
            ],
28 27 
            "scripts": [
29 28 
              "src/assets/common-assets/common/jquery.js",
30 29 
              "src/assets/common-assets/common/uikit.min.js",
31 30 
              "src/assets/common-assets/common/uikit-icons.min.js",
32 
              "node_modules/jquery/dist/jquery.js",
33 
              "node_modules/datatables.net/js/jquery.dataTables.js"
31 
              "node_modules/jquery/dist/jquery.js"
34 32 
            ]
35 33 
          },
36 34 
          "configurations": {
......
126 124 
              "node_modules/jquery/dist/jquery.js"
127 125 
            ],
128 126 
            "styles": [
129 
              "src/styles.css",
130 
              "node_modules/datatables.net-dt/css/jquery.dataTables.css"
127 
              "src/styles.css"
131 128 
            ],
132 129 
            "assets": [
133 130 
              "src/assets",
modules/uoa-monitor-portal/trunk/monitor_dashboard/package.json
48 48 
    "@nguniversal/express-engine": "^6.0.0",
49 49 
    "@nguniversal/module-map-ngfactory-loader": "^6.0.0",
50 50 
    "@types/express": "^4.16.1",
51 
    "angular-datatables": "^4.4.1",
52 51 
    "clipboard": "^1.5.16",
53 52 
    "core-js": "^2.4.1",
54 
    "datatables.net": "^1.10.19",
55 
    "datatables.net-dt": "^1.10.19",
56 53 
    "jquery": "^3.4.1",
57 54 
    "ng-recaptcha": "^3.0.5",
58 55 
    "ng2-ckeditor": "1.1.9",
......
68 65 
    "@angular/cli": "^7.3.9",
69 66 
    "@angular/compiler-cli": "7.2.14",
70 67 
    "@angular/language-service": "7.2.14",
71 
    "@types/datatables.net": "^1.10.17",
72 68 
    "@types/jquery": "^3.3.29",
73 69 
    "@types/node": "^8.0.30",
74 70 
    "cpy-cli": "^1.0.1",
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/utils/indicator-utils.ts
379 379 
    if (replacedUrl.indexOf(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix) != -1) {
380 380 
      replacedUrl = replacedUrl.split(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix).join(encodeURIComponent(stakeholder.index_shortName))
381 381 
    }
382 

  		




  
  382
  
    
  //Check  apply enhancements return this.applySchemaEnhancements( ..);


  		




  383
  383
  
    
    return (indicatorPath.chartObject?indicatorPath.url + encodeURIComponent(replacedUrl):replacedUrl);


  		




  384
  384
  
    

  		




  385
  385
  
    
  }


  		




  ......




  928
  928
  
    
    if(url.split('json=').length > 1) {


  		




  929
  929
  
    
      let obj = JSON.parse(decodeURIComponent(url.split('json=')[1]));


  		




  930
  930
  
    
      for (let query of this.getQueryObjectName(obj)?obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)]:obj[this.getDescriptionObjectName(obj)]) {


  		




  931
  
  
    
        if (!query["query"]["profile"] ||query["query"]["profile"] != 'monitor') {


  		




  
  931
  
    
        if (!query["query"]["profile"] || query["query"]["profile"] == 'OpenAIRE All-inclusive' ||  query["query"]["profile"] == 'OpenAIRE original') {


  		




  932
  932
  
    
          changes += (query["query"]["profile"] ? ( "Changed profile \"" + query["query"]["profile"] + "\" to " ):"Added profile ") + " \"monitor\"";


  		




  933
  933
  
    
          query["query"]["profile"] = 'monitor';


  		




  934
  934
  
    
        }


  		












Also available in:  Unified diff