Project

General

Profile

« Previous | Next » 

Revision 56963

fixed provenance duplication for highlighted events

View differences:

modules/uoa-repository-dashboard-gui/trunk/src/app/pages/content/content-events-of-repo-eventslist.component.html
108 108
                            <td class="uk-table-shrink uk-width-1-4"><strong class="el-title uk-display-block">PID(s)</strong></td>
109 109
                            <td class="uk-table-shrink">
110 110
                              <div class="el-title">
111
                                <span *ngFor="let pid of event.publication.pids">
111
                                <span *ngFor="let pid of event.publication.pids; let a_index = index">
112
                                  <br *ngIf="a_index > 0">
112 113
                                  <span>{{ pid.value }} <b>&nbsp;&nbsp;({{ pid.type }})&nbsp;&nbsp;</b>
113
                                    <span *ngIf="event.highlight.pids && event.highlight.pids.length>0 && isHighlighted(pid,event.highlight.pids)">
114
                                      <span class="uk-label uk-label-success">added</span>&nbsp;&nbsp;
115
                                      <span *ngIf="event.provenance" class="pull-right">
116
                                        <b>from: </b>
117
                                        <a *ngIf="event.provenance.url" href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
118
                                        <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
114
                                    <span *ngFor="let hl_pid of event.highlight.pids">
115
                                      <span *ngIf="hl_pid.value.indexOf(pid.value)>=0 && event.highlight.pids.length>0 && event.provenance">
116
                                        <span class="uk-label uk-label-success">added</span>
117
                                        <span class="pull-right">
118
                                          <b>from: </b>
119
                                          <ng-container *ngIf="event.provenance.url">
120
                                            <a href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
121
                                            <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
122
                                          </ng-container>
123
                                          <ng-container *ngIf="!event.provenance.url">
124
                                            <span>{{ event.provenance.repositoryName }}</span>
125
                                          </ng-container>
126
                                        </span>
119 127
                                      </span>
120 128
                                    </span>
121 129
                                  </span>
......
130 138
                                <span *ngFor="let abs of event.publication.abstracts; let a_index = index">
131 139
                                  <br *ngIf="a_index > 0">
132 140
                                  <span>{{ abs }}</span>
133
                                  <span *ngIf="event.highlight.abstracts && event.highlight.abstracts.length>0 && event.provenance">
141
                                  <span *ngIf="event.highlight.abstracts.indexOf(abs)>=0 && event.highlight.abstracts.length>0 && event.provenance">
134 142
                                    <span class="pull-right">
135 143
                                      <b>from: </b>
136
                                      <a *ngIf="event.provenance.url" href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
137
                                      <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
144
                                      <ng-container *ngIf="event.provenance.url">
145
                                        <a href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
146
                                        <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
147
                                      </ng-container>
148
                                      <ng-container *ngIf="!event.provenance.url">
149
                                        <span>{{ event.provenance.repositoryName }}</span>
150
                                      </ng-container>
138 151
                                    </span>
139 152
                                  </span>
140 153
                                </span>
......
156 169
                                                 (proj.fundingProgram && proj.fundingProgram !=='')">/</span>
157 170
                                    <span *ngIf="proj.fundingProgram && proj.fundingProgram !==''">{{ proj.fundingProgram }}</span>)
158 171
                                  </span>
159
                                  <span *ngIf="event.highlight.projects && event.highlight.projects.length>0 && event.provenance">
160
                                    <span class="pull-right">
161
                                      <b>from: </b>
162
                                      <a *ngIf="event.provenance.url" href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
163
                                      <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
172
                                  <span *ngFor="let hl_proj of event.highlight.projects">
173
                                    <span *ngIf="hl_proj.code.indexOf(proj.code)>=0  && event.highlight.projects.length>0 && event.provenance">
174
                                      <span class="pull-right">
175
                                        <b>from: </b>
176
                                        <ng-container *ngIf="event.provenance.url">
177
                                          <a href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
178
                                          <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
179
                                        </ng-container>
180
                                        <ng-container *ngIf="!event.provenance.url">
181
                                          <span>{{ event.provenance.repositoryName }}</span>
182
                                        </ng-container>
183
                                      </span>
164 184
                                    </span>
165 185
                                  </span>
166 186
                                </span>
......
174 194
                                <span *ngFor="let subj of event.publication.subjects; let s_index = index">
175 195
                                  <br *ngIf="s_index > 0">
176 196
                                  <span>{{ subj }}</span>
177
                                  <span *ngIf="event.highlight.subjects && event.highlight.subjects.length>0 && event.provenance">
197
                                  <span *ngIf="event.highlight.subjects.indexOf(subj)>=0 && event.highlight.subjects.length>0 && event.provenance">
178 198
                                    <span class="pull-right">
179 199
                                      <b>from: </b>
180
                                      <a *ngIf="event.provenance.url" href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
181
                                      <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
200
                                      <ng-container *ngIf="event.provenance.url">
201
                                        <a href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
202
                                        <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
203
                                      </ng-container>
204
                                      <ng-container *ngIf="!event.provenance.url">
205
                                        <span>{{ event.provenance.repositoryName }}</span>
206
                                      </ng-container>
182 207
                                    </span>
183 208
                                  </span>
184 209
                                </span>
......
200 225
                                <span *ngFor="let pub of event.publication.publications; let s_index = index">
201 226
                                  <br *ngIf="s_index > 0">
202 227
                                  <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>
228
                                  <span *ngFor="let hl_pub of event.highlight.publications">
229
                                    <span *ngIf="hl_pub.originalId.indexOf(pub.originalId)>=0 && event.highlight.publications.length>0 && event.provenance">
230
                                      <span class="pull-right">
231
                                        <b>from: </b>
232
                                        <ng-container *ngIf="event.provenance.url">
233
                                          <a href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
234
                                          <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
235
                                        </ng-container>
236
                                        <ng-container *ngIf="!event.provenance.url">
237
                                          <span>{{ event.provenance.repositoryName }}</span>
238
                                        </ng-container>
239
                                      </span>
213 240
                                    </span>
214 241
                                  </span>
215 242
                                </span>
......
230 257
                                <span *ngFor="let dataset of event.publication.datasets; let s_index = index">
231 258
                                  <br *ngIf="s_index > 0">
232 259
                                  <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>
260
                                  <span *ngFor="let hl_dataset of event.highlight.datasets">
261
                                    <span *ngIf="hl_dataset.pids.indexOf(dataset.pids[s_index])>=0 && event.highlight.datasets.length>0 && event.provenance">
262
                                      <span class="pull-right">
263
                                        <b>from: </b>
264
                                        <ng-container *ngIf="event.provenance.url">
265
                                          <a href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
266
                                          <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
267
                                        </ng-container>
268
                                        <ng-container *ngIf="!event.provenance.url">
269
                                          <span>{{ event.provenance.repositoryName }}</span>
270
                                        </ng-container>
271
                                      </span>
243 272
                                    </span>
244 273
                                  </span>
245 274
                                </span>
......
248 277
                          </tr>
249 278

  
250 279

  
251

  
252 280
                          <tr class="el-item" [ngClass]="{'success': event.highlight.publicationdate && event.highlight.publicationdate.length>0 }">
253 281
                            <td class="uk-table-shrink uk-width-1-4"><strong class="el-title uk-display-block">Publication date</strong></td>
254 282
                            <td class="uk-table-shrink"><div class="el-title">{{ event.publication.publicationdate }}</div></td>
255 283
                          </tr>
284

  
256 285
                          <tr class="el-item" [ngClass]="{'success': event.highlight.instances && event.highlight.instances.length>0 }">
257 286
                            <td class="uk-table-shrink uk-width-1-4"><strong class="el-title uk-display-block">Rights</strong></td>
258 287
                            <td class="uk-table-shrink">
......
263 292
                                    {{ l.license }}&nbsp;&nbsp;<b>{{ l.hostedby }}</b><br>
264 293
                                    <a href="{{ l.url }}" target="_blank">{{ l.url }}</a>
265 294
                                  </span>
266
                                  <span *ngIf="event.highlight.instances && event.highlight.instances.length>0 && isHighlighted(l,event.highlight.instances)">
267
                                    <span class="uk-label uk-label-success">added</span>&nbsp;&nbsp;
268
                                    <span *ngIf="event.provenance" class="pull-right">
295
                                  <span *ngFor="let hl of event.highlight.instances">
296
                                    <span *ngIf="hl.hostedby.indexOf(l.hostedby)>=0 && event.highlight.instances.length>0 && event.provenance">
297
                                      &nbsp;&nbsp;<span class="uk-label uk-label-success">added</span>&nbsp;&nbsp;
269 298
                                      <b>from: </b>
270
                                      <a *ngIf="event.provenance.url" href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
271
                                      <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
299
                                      <ng-container *ngIf="event.provenance.url">
300
                                        <a href="{{ event.provenance.url }}" target="_blank">{{ event.provenance.repositoryName }}</a>
301
                                        <span *ngIf="event.provenance.id"> (ID: {{ event.provenance.id }})</span>
302
                                      </ng-container>
303
                                      <ng-container *ngIf="!event.provenance.url">
304
                                        <span>{{ event.provenance.repositoryName }}</span>
305
                                      </ng-container>
272 306
                                    </span>
273 307
                                  </span>
274 308
                                </span>

Also available in: Unified diff