[Connect|Trunk]

Impact factors: Remove fontawesome css, remove css from connect-custom (moved in library.css)

Statistics: add check for statistics service response



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@58592 d315682c-612b-4755-9ff5-7f18f6832af3

angular.json

@@ -23,7 +23,6 @@
             "styles": [
               "src/styles.css",
               "src/material.scss",
-              "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
               "node_modules/datatables.net-dt/css/jquery.dataTables.css"
             ],
             "scripts": [
@@ -82,7 +81,6 @@
             "styles": [
               "src/styles.css",
               "src/material.scss",
-              "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
               "node_modules/datatables.net-dt/css/jquery.dataTables.css"
             ],
             "assets": [

package.json

@@ -34,7 +34,6 @@
     "@angular/platform-browser-dynamic": "7.2.14",
     "@angular/platform-server": "7.2.14",
     "@angular/router": "7.2.14",
-    "@fortawesome/fontawesome-free": "^5.12.1",
     "@nguniversal/express-engine": "^6.0.0",
     "@nguniversal/module-map-ngfactory-loader": "^6.0.0",
     "@types/express": "^4.16.1",

src/app/statistics/statistics.component.ts

@@ -129,11 +129,16 @@ export class StatisticsComponent {
     this.status = this.errorCodes.LOADING;
     this._statisticsService.getCommunityStatistics(this.properties, this.communityId).subscribe(
       res => {
-        this.statisticsSum = res;
+        if(res) {
-        if (res["other"]) { //hack because in stats API the entity name is "other" while in admin API is "orp". This component uses also "orp" name
+          this.statisticsSum = res;
-          this.statisticsSum["orp"] = res["other"];
+          if (res["other"]) { //hack because in stats API the entity name is "other" while in admin API is "orp". This component uses also "orp" name
+            this.statisticsSum["orp"] = res["other"];
+          }
+          this.getDisplayOptions();
+        }else{
+          console.error("Error getting community statistics for community with id: " + this.communityId);
+          this.status = this.errorCodes.ERROR;
         }
-        this.getDisplayOptions();
       },
       error => {
         //console.log(error);

src/assets/connect-custom.css

@@ -190,52 +190,6 @@ div:not(.connect_App) bottom .uk-totop {
 }
 
 
-/*
-Impact Factor -  ATHENA CODE */
-#popularity-A {
-  color: red;
-  content: 'Test';
-}
-
-#popularity-B {
-  color: #eabd35;
-  content: 'Test';
-}
-
-#popularity-C {
-  color: grey;
-  content: 'Test';
-}
-
-#influence-A {
-  color: red;
-  content: 'Test';
-}
-
-#influence-B {
-  color: #eabd35;
-  content: 'Test';
-}
-
-#influence-C {
-  color: grey;
-  content: 'Test';
-}
-
-.fa-university::before {
-
-  content: "\f19c";
-
-}
-
-.fa-fire::before {
-
-  content: "\f06d";
-
-}
-/* ATHENA CODE */
-
-
 /*CONNECT REDESIGN*/
 
 #subscribeAndInviteBtn {

src/styles.css

@@ -1,3 +1,2 @@
 /* You can add global styles to this file, and also import other style files */
 @import "~@angular/material/prebuilt-themes/indigo-pink.css";
-@import "~@fortawesome/fontawesome-free/css/all.min.css"; /*ATHENA CODE */