Project

General

Profile

« Previous | Next » 

Revision 56949

Fixed the events list page for new publication and subject topics

View differences:

modules/uoa-repository-dashboard-gui/trunk/src/app/pages/content/content-events-of-repo-eventslist.component.html
185 185
                              </div>
186 186
                            </td>
187 187
                          </tr>
188

  
189
                          <!--Publications-->
190
                          <tr class="el-item" [ngClass]="{'success': event.highlight.publications && event.highlight.publications.length>0 }">
191
                            <td *ngIf="this.topic.includes('PUBLICATION')" class="uk-table-shrink uk-width-1-4">
192
                              <strong class="el-title uk-display-block">{{this.lastTopicEntry}}<br>Publication(s)</strong>
193
                            </td>
194
                            <td *ngIf="!(this.topic.includes('PUBLICATION'))"
195
                                class="uk-table-shrink uk-width-1-4">
196
                              <strong class="el-title uk-display-block">Publication(s)</strong>
197
                            </td>
198
                            <td class="uk-table-shrink">
199
                              <div class="el-title">
200
                                <span *ngFor="let pub of event.publication.publications; let s_index = index">
201
                                  <br *ngIf="s_index > 0">
202
                                  <span>{{ pub.titles[0] }} (ID: {{pub.originalId}})</span>
203
                                  <span *ngIf="event.highlight.publications && event.highlight.publications.length>0 && event.provenance">
204
                                    <span class="pull-right">
205
                                      <b>from: </b>
206
                                      <ng-container *ngIf="event.provenance.url">
207
                                        <a href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
208
                                        <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
209
                                      </ng-container>
210
                                      <ng-container *ngIf="!event.provenance.url">
211
                                        <span>{{ event.provenance.repositoryName }}</span>
212
                                      </ng-container>
213
                                    </span>
214
                                  </span>
215
                                </span>
216
                              </div>
217
                            </td>
218
                          </tr>
219

  
220
                          <!--Datasets-->
221
                          <tr class="el-item" [ngClass]="{'success': event.highlight.datasets && event.highlight.datasets.length>0 }">
222
                            <td *ngIf="this.topic.includes('DATASET')" class="uk-table-shrink uk-width-1-4">
223
                              <strong class="el-title uk-display-block">{{this.lastTopicEntry}}<br>Dataset(s)</strong>
224
                            </td>
225
                            <td *ngIf="!(this.topic.includes('DATASET'))" class="uk-table-shrink uk-width-1-4">
226
                              <strong class="el-title uk-display-block">Dataset(s)</strong>
227
                            </td>
228
                            <td class="uk-table-shrink">
229
                              <div class="el-title">
230
                                <span *ngFor="let dataset of event.publication.datasets; let s_index = index">
231
                                  <br *ngIf="s_index > 0">
232
                                  <span>{{ dataset.titles[0] }} <span *ngIf="dataset.pids && dataset.pids.length>0">({{dataset.pids[0].type}}: {{dataset.pids[0].value}})</span></span>
233
                                  <span *ngIf="event.highlight.datasets && event.highlight.datasets.length>0 && event.provenance">
234
                                    <span class="pull-right">
235
                                      <b>from: </b>
236
                                      <ng-container *ngIf="event.provenance.url">
237
                                        <a href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
238
                                        <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
239
                                      </ng-container>
240
                                      <ng-container *ngIf="!event.provenance.url">
241
                                        <span>{{ event.provenance.repositoryName }}</span>
242
                                      </ng-container>
243
                                    </span>
244
                                  </span>
245
                                </span>
246
                              </div>
247
                            </td>
248
                          </tr>
249

  
250

  
251

  
188 252
                          <tr class="el-item" [ngClass]="{'success': event.highlight.publicationdate && event.highlight.publicationdate.length>0 }">
189 253
                            <td class="uk-table-shrink uk-width-1-4"><strong class="el-title uk-display-block">Publication date</strong></td>
190 254
                            <td class="uk-table-shrink"><div class="el-title">{{ event.publication.publicationdate }}</div></td>
modules/uoa-repository-dashboard-gui/trunk/src/app/pages/content/content-events-of-repo-eventslist.component.ts
22 22
  eventsPageInitialized = false;
23 23

  
24 24
  topic = '';
25
  lastTopicEntry = '';
25 26
  correctTopic = '';
26 27
  repoName = '';
27 28

  
......
73 74
  getParams() {
74 75
    this.topic = this.route.snapshot.paramMap.get('topic');
75 76
    console.log(`my topic is: ${this.topic}`);
77
    this.lastTopicEntry = this.topic.substring(this.topic.lastIndexOf('|') + 1).toLowerCase();
78
    this.lastTopicEntry = this.replaceAll(this.lastTopicEntry, '_', ' ');
76 79
    this.getCorrectTopic();
77 80
    this.repoName = this.route.snapshot.paramMap.get('name');
78 81
  }
79 82

  
83
  replaceAll(str, find, replace) {
84
    return str.replace(new RegExp(find, 'g'), replace);
85
  }
86

  
80 87
  initQuery() {
81 88
    this.advanceSearch = {
82 89
      datasource: this.repoName,
modules/uoa-repository-dashboard-gui/trunk/src/app/domain/typeScriptClasses.ts
475 475
    pids: Pid[];
476 476
    instances: Instance[];
477 477
    externalReferences: ExternalReference[];
478
    publications: Publication[];
478 479
    projects: Project[];
479 480
    datasets: Dataset[];
480 481
}
modules/uoa-repository-dashboard-gui/trunk/package-lock.json
3763 3763
          "version": "2.1.1",
3764 3764
          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
3765 3765
          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
3766
          "dev": true,
3767
          "optional": true
3766
          "dev": true
3768 3767
        },
3769 3768
        "aproba": {
3770 3769
          "version": "1.2.0",
......
3788 3787
          "version": "1.0.0",
3789 3788
          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
3790 3789
          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
3791
          "dev": true,
3792
          "optional": true
3790
          "dev": true
3793 3791
        },
3794 3792
        "brace-expansion": {
3795 3793
          "version": "1.1.11",
3796 3794
          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
3797 3795
          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
3798 3796
          "dev": true,
3799
          "optional": true,
3800 3797
          "requires": {
3801
            "balanced-match": "^1.0.0",
3798
            "balanced-match": "1.0.0",
3802 3799
            "concat-map": "0.0.1"
3803 3800
          }
3804 3801
        },
......
3813 3810
          "version": "1.1.0",
3814 3811
          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
3815 3812
          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
3816
          "dev": true,
3817
          "optional": true
3813
          "dev": true
3818 3814
        },
3819 3815
        "concat-map": {
3820 3816
          "version": "0.0.1",
3821 3817
          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
3822 3818
          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
3823
          "dev": true,
3824
          "optional": true
3819
          "dev": true
3825 3820
        },
3826 3821
        "console-control-strings": {
3827 3822
          "version": "1.1.0",
3828 3823
          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
3829 3824
          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
3830
          "dev": true,
3831
          "optional": true
3825
          "dev": true
3832 3826
        },
3833 3827
        "core-util-is": {
3834 3828
          "version": "1.0.2",
......
3875 3869
          "dev": true,
3876 3870
          "optional": true,
3877 3871
          "requires": {
3878
            "minipass": "^2.2.1"
3872
            "minipass": "2.3.5"
3879 3873
          }
3880 3874
        },
3881 3875
        "fs.realpath": {
......
3892 3886
          "dev": true,
3893 3887
          "optional": true,
3894 3888
          "requires": {
3895
            "aproba": "^1.0.3",
3896
            "console-control-strings": "^1.0.0",
3897
            "has-unicode": "^2.0.0",
3898
            "object-assign": "^4.1.0",
3899
            "signal-exit": "^3.0.0",
3900
            "string-width": "^1.0.1",
3901
            "strip-ansi": "^3.0.1",
3902
            "wide-align": "^1.1.0"
3889
            "aproba": "1.2.0",
3890
            "console-control-strings": "1.1.0",
3891
            "has-unicode": "2.0.1",
3892
            "object-assign": "4.1.1",
3893
            "signal-exit": "3.0.2",
3894
            "string-width": "1.0.2",
3895
            "strip-ansi": "3.0.1",
3896
            "wide-align": "1.1.3"
3903 3897
          }
3904 3898
        },
3905 3899
        "glob": {
......
3941 3935
          "dev": true,
3942 3936
          "optional": true,
3943 3937
          "requires": {
3944
            "minimatch": "^3.0.4"
3938
            "minimatch": "3.0.4"
3945 3939
          }
3946 3940
        },
3947 3941
        "inflight": {
......
3951 3945
          "dev": true,
3952 3946
          "optional": true,
3953 3947
          "requires": {
3954
            "once": "^1.3.0",
3955
            "wrappy": "1"
3948
            "once": "1.4.0",
3949
            "wrappy": "1.0.2"
3956 3950
          }
3957 3951
        },
3958 3952
        "inherits": {
3959 3953
          "version": "2.0.3",
3960 3954
          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
3961 3955
          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
3962
          "dev": true,
3963
          "optional": true
3956
          "dev": true
3964 3957
        },
3965 3958
        "ini": {
3966 3959
          "version": "1.3.5",
......
3974 3967
          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
3975 3968
          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
3976 3969
          "dev": true,
3977
          "optional": true,
3978 3970
          "requires": {
3979
            "number-is-nan": "^1.0.0"
3971
            "number-is-nan": "1.0.1"
3980 3972
          }
3981 3973
        },
3982 3974
        "isarray": {
......
3991 3983
          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
3992 3984
          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
3993 3985
          "dev": true,
3994
          "optional": true,
3995 3986
          "requires": {
3996
            "brace-expansion": "^1.1.7"
3987
            "brace-expansion": "1.1.11"
3997 3988
          }
3998 3989
        },
3999 3990
        "minimist": {
4000 3991
          "version": "0.0.8",
4001 3992
          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
4002 3993
          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
4003
          "dev": true,
4004
          "optional": true
3994
          "dev": true
4005 3995
        },
4006 3996
        "minipass": {
4007 3997
          "version": "2.3.5",
......
4028 4018
          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
4029 4019
          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
4030 4020
          "dev": true,
4031
          "optional": true,
4032 4021
          "requires": {
4033 4022
            "minimist": "0.0.8"
4034 4023
          }
......
4078 4067
          "dev": true,
4079 4068
          "optional": true,
4080 4069
          "requires": {
4081
            "abbrev": "1",
4082
            "osenv": "^0.1.4"
4070
            "abbrev": "1.1.1",
4071
            "osenv": "0.1.5"
4083 4072
          }
4084 4073
        },
4085 4074
        "npm-bundled": {
......
4107 4096
          "dev": true,
4108 4097
          "optional": true,
4109 4098
          "requires": {
4110
            "are-we-there-yet": "~1.1.2",
4111
            "console-control-strings": "~1.1.0",
4112
            "gauge": "~2.7.3",
4113
            "set-blocking": "~2.0.0"
4099
            "are-we-there-yet": "1.1.5",
4100
            "console-control-strings": "1.1.0",
4101
            "gauge": "2.7.4",
4102
            "set-blocking": "2.0.0"
4114 4103
          }
4115 4104
        },
4116 4105
        "number-is-nan": {
4117 4106
          "version": "1.0.1",
4118 4107
          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
4119 4108
          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
4120
          "dev": true,
4121
          "optional": true
4109
          "dev": true
4122 4110
        },
4123 4111
        "object-assign": {
4124 4112
          "version": "4.1.1",
......
4132 4120
          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
4133 4121
          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
4134 4122
          "dev": true,
4135
          "optional": true,
4136 4123
          "requires": {
4137
            "wrappy": "1"
4124
            "wrappy": "1.0.2"
4138 4125
          }
4139 4126
        },
4140 4127
        "os-homedir": {
......
4158 4145
          "dev": true,
4159 4146
          "optional": true,
4160 4147
          "requires": {
4161
            "os-homedir": "^1.0.0",
4162
            "os-tmpdir": "^1.0.0"
4148
            "os-homedir": "1.0.2",
4149
            "os-tmpdir": "1.0.2"
4163 4150
          }
4164 4151
        },
4165 4152
        "path-is-absolute": {
......
4205 4192
          "dev": true,
4206 4193
          "optional": true,
4207 4194
          "requires": {
4208
            "core-util-is": "~1.0.0",
4209
            "inherits": "~2.0.3",
4210
            "isarray": "~1.0.0",
4211
            "process-nextick-args": "~2.0.0",
4212
            "safe-buffer": "~5.1.1",
4213
            "string_decoder": "~1.1.1",
4214
            "util-deprecate": "~1.0.1"
4195
            "core-util-is": "1.0.2",
4196
            "inherits": "2.0.3",
4197
            "isarray": "1.0.0",
4198
            "process-nextick-args": "2.0.0",
4199
            "safe-buffer": "5.1.2",
4200
            "string_decoder": "1.1.1",
4201
            "util-deprecate": "1.0.2"
4215 4202
          }
4216 4203
        },
4217 4204
        "rimraf": {
......
4270 4257
          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
4271 4258
          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
4272 4259
          "dev": true,
4273
          "optional": true,
4274 4260
          "requires": {
4275
            "code-point-at": "^1.0.0",
4276
            "is-fullwidth-code-point": "^1.0.0",
4277
            "strip-ansi": "^3.0.0"
4261
            "code-point-at": "1.1.0",
4262
            "is-fullwidth-code-point": "1.0.0",
4263
            "strip-ansi": "3.0.1"
4278 4264
          }
4279 4265
        },
4280 4266
        "string_decoder": {
......
4284 4270
          "dev": true,
4285 4271
          "optional": true,
4286 4272
          "requires": {
4287
            "safe-buffer": "~5.1.0"
4273
            "safe-buffer": "5.1.2"
4288 4274
          }
4289 4275
        },
4290 4276
        "strip-ansi": {
......
4292 4278
          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
4293 4279
          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
4294 4280
          "dev": true,
4295
          "optional": true,
4296 4281
          "requires": {
4297
            "ansi-regex": "^2.0.0"
4282
            "ansi-regex": "2.1.1"
4298 4283
          }
4299 4284
        },
4300 4285
        "strip-json-comments": {
......
4341 4326
          "version": "1.0.2",
4342 4327
          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
4343 4328
          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
4344
          "dev": true,
4345
          "optional": true
4329
          "dev": true
4346 4330
        },
4347 4331
        "yallist": {
4348 4332
          "version": "3.0.3",
......
4824 4808
          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
4825 4809
          "dev": true,
4826 4810
          "requires": {
4827
            "big.js": "^3.1.3",
4828
            "emojis-list": "^2.0.0",
4829
            "json5": "^0.5.0",
4830
            "object-assign": "^4.0.1"
4811
            "big.js": "3.2.0",
4812
            "emojis-list": "2.1.0",
4813
            "json5": "0.5.1",
4814
            "object-assign": "4.1.1"
4831 4815
          }
4832 4816
        }
4833 4817
      }
......
6805 6789
          "dev": true,
6806 6790
          "optional": true,
6807 6791
          "requires": {
6808
            "ansi-styles": "^2.2.1",
6809
            "escape-string-regexp": "^1.0.2",
6810
            "has-ansi": "^2.0.0",
6811
            "strip-ansi": "^3.0.0",
6812
            "supports-color": "^2.0.0"
6792
            "ansi-styles": "2.2.1",
6793
            "escape-string-regexp": "1.0.5",
6794
            "has-ansi": "2.0.0",
6795
            "strip-ansi": "3.0.1",
6796
            "supports-color": "2.0.0"
6813 6797
          }
6814 6798
        },
6815 6799
        "supports-color": {
......
7615 7599
          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
7616 7600
          "dev": true,
7617 7601
          "requires": {
7618
            "ansi-styles": "^2.2.1",
7619
            "escape-string-regexp": "^1.0.2",
7620
            "has-ansi": "^2.0.0",
7621
            "strip-ansi": "^3.0.0",
7622
            "supports-color": "^2.0.0"
7602
            "ansi-styles": "2.2.1",
7603
            "escape-string-regexp": "1.0.5",
7604
            "has-ansi": "2.0.0",
7605
            "strip-ansi": "3.0.1",
7606
            "supports-color": "2.0.0"
7623 7607
          }
7624 7608
        },
7625 7609
        "del": {
......
8798 8782
          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
8799 8783
          "dev": true,
8800 8784
          "requires": {
8801
            "websocket-driver": ">=0.5.1"
8785
            "websocket-driver": "0.7.0"
8802 8786
          }
8803 8787
        },
8804 8788
        "ms": {

Also available in: Unified diff