Skip to content

Commit 028023d

Browse files
authored
Merge pull request #3413 from dzhw/moellerth/pid-field-variables-detail-page
#3303: PID field on detail page (Follow-up work for PID registration)
2 parents 5933981 + b800510 commit 028023d

5 files changed

Lines changed: 27 additions & 17 deletions

File tree

mdm-frontend/src/app/legacy/variablemanagement/configuration/translations-de.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ angular.module('metadatamanagementApp').config([
3232
'data-type': 'Datentyp',
3333
'scale-level': 'Skalenniveau',
3434
'access-ways': 'Zugangswege',
35+
'pid': 'PID',
3536
'annotations': 'Anmerkungen',
3637
'filter-description': 'Beschreibung des Filters',
3738
'input-filter': 'Eingangsfilter',

mdm-frontend/src/app/legacy/variablemanagement/configuration/translations-en.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ angular.module('metadatamanagementApp').config([
3232
'data-type': 'Data Type',
3333
'scale-level': 'Level of Measurement',
3434
'access-ways': 'Access Ways',
35+
'pid': 'PID',
3536
'annotations': 'Annotations',
3637
'filter-description': 'Filter Description',
3738
'input-filter': 'Input Filter',

mdm-frontend/src/app/legacy/variablemanagement/templates/common-details.html.tmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@
4747
<h5>{{'variable-management.detail.label.access-ways' | translate }}:</h5>
4848
<div class="md-secondary"><span ng-repeat="accessWay in $ctrl.options.variable.accessWays">{{accessWay | displayAccessWay}}{{!$last ? ', ':''}}</span></div>
4949
</md-list-item>
50+
<md-list-item ng-if="$ctrl.options.variable.pid && $ctrl.options.variable.pid != ''">
51+
<h5>{{'variable-management.detail.label.pid' | translate }}:</h5>
52+
<div class="md-secondary">{{$ctrl.options.variable.pid}}</div>
53+
</md-list-item>
5054
<md-list-item ng-if="$ctrl.options.variable.annotations">
5155
<h5>{{'variable-management.detail.label.annotations' | translate }}:</h5>
5256
<p class="md-secondary" markdown-to-html="$ctrl.options.variable.annotations | displayI18nString"></p>

src/main/java/eu/dzhw/fdz/metadatamanagement/searchmanagement/documents/VariableNestedDocument.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
/**
1515
* NESTED subdocument used for filtering by variables.
16-
*
16+
*
1717
* @author René Reitmann
1818
*/
1919
@SuppressWarnings("CPD-START")
@@ -38,14 +38,16 @@ public class VariableNestedDocument extends AbstractNestedSubDocument {
3838
private String dataPackageId;
3939

4040
private String masterId;
41-
41+
42+
private String pid;
43+
4244
private boolean shadow;
43-
45+
4446
private String successorId;
4547

4648
/**
4749
* Create the subdocument.
48-
*
50+
*
4951
* @param projection the projection coming from mongo.
5052
*/
5153
public VariableNestedDocument(VariableSubDocumentProjection projection) {

src/main/java/eu/dzhw/fdz/metadatamanagement/searchmanagement/documents/VariableSubDocument.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/**
1818
* Attributes of a variable which are stored in other search documents.
19-
*
19+
*
2020
* @author René Reitmann
2121
*/
2222
@SuppressWarnings("CPD-START")
@@ -30,46 +30,48 @@ public class VariableSubDocument extends AbstractRdcDomainObject
3030
private static final long serialVersionUID = 6069902793033684835L;
3131

3232
private String id;
33-
33+
3434
private String dataAcquisitionProjectId;
35-
35+
3636
private String name;
37-
37+
3838
private I18nString label;
39-
39+
4040
private String dataSetId;
41-
41+
4242
private Integer dataSetNumber;
4343

4444
private String dataPackageId;
4545

4646
private List<String> surveyIds;
47-
47+
4848
private List<RelatedQuestionSubDocumentProjection> relatedQuestions;
4949

5050
private String masterId;
51-
51+
52+
private String pid;
53+
5254
private String successorId;
53-
55+
5456
private boolean shadow;
5557

5658
public VariableSubDocument() {
5759
super();
5860
}
59-
61+
6062
/**
6163
* Create the subdocument.
62-
*
64+
*
6365
* @param projection the projection coming from mongo.
6466
*/
6567
public VariableSubDocument(VariableSubDocumentProjection projection) {
6668
super();
6769
BeanUtils.copyProperties(projection, this);
6870
}
69-
71+
7072
/**
7173
* Create the subdocument.
72-
*
74+
*
7375
* @param variable the complete variable coming from mongo.
7476
*/
7577
public VariableSubDocument(Variable variable) {

0 commit comments

Comments
 (0)