Adds criteria "Public" on DMP listing.
This commit is contained in:
parent
4d9ae93cf2
commit
8e0bafcbfa
|
@ -19,6 +19,7 @@ public class DataManagementPlanCriteria extends Criteria<DMP> {
|
||||||
private Integer role;
|
private Integer role;
|
||||||
private List<UUID> collaborators;
|
private List<UUID> collaborators;
|
||||||
private List<UUID> datasetTemplates;
|
private List<UUID> datasetTemplates;
|
||||||
|
private boolean isPublic;
|
||||||
|
|
||||||
public Date getPeriodStart() {
|
public Date getPeriodStart() {
|
||||||
return periodStart;
|
return periodStart;
|
||||||
|
@ -89,4 +90,11 @@ public class DataManagementPlanCriteria extends Criteria<DMP> {
|
||||||
public void setDatasetTemplates(List<UUID> datasetTemplates) {
|
public void setDatasetTemplates(List<UUID> datasetTemplates) {
|
||||||
this.datasetTemplates = datasetTemplates;
|
this.datasetTemplates = datasetTemplates;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean getIsPublic() {
|
||||||
|
return isPublic;
|
||||||
|
}
|
||||||
|
public void setIsPublic(boolean isPublic) {
|
||||||
|
this.isPublic = isPublic;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,6 +55,8 @@ public class DMPDaoImpl extends DatabaseAccess<DMP> implements DMPDao {
|
||||||
query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.ACTIVE.getValue()));
|
query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.ACTIVE.getValue()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (criteria.getIsPublic())
|
||||||
|
query.where(((builder, root) -> builder.equal(root.get("isPublic"), true)));
|
||||||
if (criteria.getRole() != null) {
|
if (criteria.getRole() != null) {
|
||||||
if (criteria.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())){
|
if (criteria.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())){
|
||||||
query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).get("role"), UserDMP.UserDMPRoles.OWNER.getValue()));
|
query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).get("role"), UserDMP.UserDMPRoles.OWNER.getValue()));
|
||||||
|
|
|
@ -11,4 +11,5 @@ export class DmpCriteria extends BaseCriteria {
|
||||||
public role?: number;
|
public role?: number;
|
||||||
public collaborators?: string[] = [];
|
public collaborators?: string[] = [];
|
||||||
public datasetTemplates?: string[] = [];
|
public datasetTemplates?: string[] = [];
|
||||||
|
public isPublic?: boolean;
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,8 +17,9 @@
|
||||||
<h6 class="category-title">{{ 'TYPES.DMP-VISIBILITY.VISIBILITY' | translate }}</h6>
|
<h6 class="category-title">{{ 'TYPES.DMP-VISIBILITY.VISIBILITY' | translate }}</h6>
|
||||||
<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('status')">
|
<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('status')">
|
||||||
<mat-list-item><mat-radio-button value="null">{{ 'TYPES.DMP-VISIBILITY.ANY' | translate }}</mat-radio-button></mat-list-item>
|
<mat-list-item><mat-radio-button value="null">{{ 'TYPES.DMP-VISIBILITY.ANY' | translate }}</mat-radio-button></mat-list-item>
|
||||||
<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DMP-VISIBILITY.PUBLIC' | translate }}</mat-radio-button></mat-list-item>
|
<mat-list-item><mat-radio-button value="2">{{ 'TYPES.DMP-VISIBILITY.PUBLIC' | translate }}</mat-radio-button></mat-list-item>
|
||||||
<mat-list-item><mat-radio-button value="0">{{ 'TYPES.DMP-VISIBILITY.PRIVATE' | translate }}</mat-radio-button></mat-list-item>
|
<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DMP-VISIBILITY.FINALIZED' | translate }}</mat-radio-button></mat-list-item>
|
||||||
|
<mat-list-item><mat-radio-button value="0">{{ 'TYPES.DMP-VISIBILITY.DRAFT' | translate }}</mat-radio-button></mat-list-item>
|
||||||
</mat-radio-group>
|
</mat-radio-group>
|
||||||
</div>
|
</div>
|
||||||
<!-- End of Visibility Filter-->
|
<!-- End of Visibility Filter-->
|
||||||
|
|
|
@ -107,9 +107,14 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
|
||||||
request.criteria = {
|
request.criteria = {
|
||||||
like: value.like,
|
like: value.like,
|
||||||
projects: value.projects,
|
projects: value.projects,
|
||||||
status: value.status,
|
|
||||||
role: value.role
|
role: value.role
|
||||||
}
|
}
|
||||||
|
if (value.status == 2) {
|
||||||
|
request.criteria.isPublic = true;
|
||||||
|
} else {
|
||||||
|
request.criteria.status = value.status;
|
||||||
|
request.criteria.isPublic = false;
|
||||||
|
}
|
||||||
if (value.datasetTemplates)
|
if (value.datasetTemplates)
|
||||||
request.criteria.datasetTemplates = value.datasetTemplates.map(x => x.id);
|
request.criteria.datasetTemplates = value.datasetTemplates.map(x => x.id);
|
||||||
if (value.collaborators)
|
if (value.collaborators)
|
||||||
|
|
|
@ -675,7 +675,8 @@
|
||||||
"DMP-VISIBILITY": {
|
"DMP-VISIBILITY": {
|
||||||
"VISIBILITY": "Visibility",
|
"VISIBILITY": "Visibility",
|
||||||
"PUBLIC": "Public",
|
"PUBLIC": "Public",
|
||||||
"PRIVATE": "Private",
|
"FINALIZED": "Finalized" ,
|
||||||
|
"DRAFT": "Draft",
|
||||||
"ANY": "Any"
|
"ANY": "Any"
|
||||||
},
|
},
|
||||||
"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
|
"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
|
||||||
|
|
Loading…
Reference in New Issue