Project

General

Profile

« Previous | Next » 

Revision 58592

[Connect|Trunk]

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

Statistics: add check for statistics service response

View differences:

modules/uoa-connect-portal/trunk/angular.json
23 23
            "styles": [
24 24
              "src/styles.css",
25 25
              "src/material.scss",
26
              "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
27 26
              "node_modules/datatables.net-dt/css/jquery.dataTables.css"
28 27
            ],
29 28
            "scripts": [
......
82 81
            "styles": [
83 82
              "src/styles.css",
84 83
              "src/material.scss",
85
              "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
86 84
              "node_modules/datatables.net-dt/css/jquery.dataTables.css"
87 85
            ],
88 86
            "assets": [
modules/uoa-connect-portal/trunk/package.json
34 34
    "@angular/platform-browser-dynamic": "7.2.14",
35 35
    "@angular/platform-server": "7.2.14",
36 36
    "@angular/router": "7.2.14",
37
    "@fortawesome/fontawesome-free": "^5.12.1",
38 37
    "@nguniversal/express-engine": "^6.0.0",
39 38
    "@nguniversal/module-map-ngfactory-loader": "^6.0.0",
40 39
    "@types/express": "^4.16.1",
modules/uoa-connect-portal/trunk/src/app/statistics/statistics.component.ts
129 129
    this.status = this.errorCodes.LOADING;
130 130
    this._statisticsService.getCommunityStatistics(this.properties, this.communityId).subscribe(
131 131
      res => {
132
        this.statisticsSum = res;
133
        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
134
          this.statisticsSum["orp"] = res["other"];
132
        if(res) {
133
          this.statisticsSum = res;
134
          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
135
            this.statisticsSum["orp"] = res["other"];
136
          }
137
          this.getDisplayOptions();
138
        }else{
139
          console.error("Error getting community statistics for community with id: " + this.communityId);
140
          this.status = this.errorCodes.ERROR;
135 141
        }
136
        this.getDisplayOptions();
137 142
      },
138 143
      error => {
139 144
        //console.log(error);
modules/uoa-connect-portal/trunk/src/assets/connect-custom.css
190 190
}
191 191

  
192 192

  
193
/*
194
Impact Factor -  ATHENA CODE */
195
#popularity-A {
196
  color: red;
197
  content: 'Test';
198
}
199

  
200
#popularity-B {
201
  color: #eabd35;
202
  content: 'Test';
203
}
204

  
205
#popularity-C {
206
  color: grey;
207
  content: 'Test';
208
}
209

  
210
#influence-A {
211
  color: red;
212
  content: 'Test';
213
}
214

  
215
#influence-B {
216
  color: #eabd35;
217
  content: 'Test';
218
}
219

  
220
#influence-C {
221
  color: grey;
222
  content: 'Test';
223
}
224

  
225
.fa-university::before {
226

  
227
  content: "\f19c";
228

  
229
}
230

  
231
.fa-fire::before {
232

  
233
  content: "\f06d";
234

  
235
}
236
/* ATHENA CODE */
237

  
238

  
239 193
/*CONNECT REDESIGN*/
240 194

  
241 195
#subscribeAndInviteBtn {
modules/uoa-connect-portal/trunk/src/styles.css
1 1
/* You can add global styles to this file, and also import other style files */
2 2
@import "~@angular/material/prebuilt-themes/indigo-pink.css";
3
@import "~@fortawesome/fontawesome-free/css/all.min.css"; /*ATHENA CODE */

Also available in: Unified diff