diff --git a/dmp-backend/core/src/main/java/eu/eudat/query/DescriptionTemplateQuery.java b/dmp-backend/core/src/main/java/eu/eudat/query/DescriptionTemplateQuery.java index c799aa592..acdf587f9 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/query/DescriptionTemplateQuery.java +++ b/dmp-backend/core/src/main/java/eu/eudat/query/DescriptionTemplateQuery.java @@ -274,7 +274,7 @@ public class DescriptionTemplateQuery extends QueryBase groupIds; + private List versionStatuses; + public String getLike() { return like; } @@ -63,6 +66,14 @@ public class DmpBlueprintLookup extends Lookup { this.excludedIds = excludedIds; } + public List getVersionStatuses() { + return versionStatuses; + } + + public void setVersionStatuses(List versionStatuses) { + this.versionStatuses = versionStatuses; + } + public List getGroupIds() { return groupIds; } @@ -85,6 +96,8 @@ public class DmpBlueprintLookup extends Lookup { query.excludedIds(this.excludedIds); if (this.groupIds != null) query.groupIds(this.groupIds); + if (this.versionStatuses != null) + query.versionStatuses(this.versionStatuses); this.enrichCommon(query); diff --git a/dmp-frontend/src/app/core/common/enum/description-template-version-status.ts b/dmp-frontend/src/app/core/common/enum/description-template-version-status.ts index 130e01b1e..ece53bc09 100644 --- a/dmp-frontend/src/app/core/common/enum/description-template-version-status.ts +++ b/dmp-frontend/src/app/core/common/enum/description-template-version-status.ts @@ -1,4 +1,5 @@ export enum DescriptionTemplateVersionStatus { Current = 0, - Previous = 1 + Previous = 1, + NotFinalized = 2 } \ No newline at end of file diff --git a/dmp-frontend/src/app/core/common/enum/dmp-blueprint-version-status.ts b/dmp-frontend/src/app/core/common/enum/dmp-blueprint-version-status.ts new file mode 100644 index 000000000..16f1c0cbd --- /dev/null +++ b/dmp-frontend/src/app/core/common/enum/dmp-blueprint-version-status.ts @@ -0,0 +1,5 @@ +export enum DmpBlueprintVersionStatus { + Current = 0, + Previous = 1, + NotFinalized = 2 +} \ No newline at end of file diff --git a/dmp-frontend/src/app/core/query/dmp-blueprint.lookup.ts b/dmp-frontend/src/app/core/query/dmp-blueprint.lookup.ts index d32697e59..bd92e2f3a 100644 --- a/dmp-frontend/src/app/core/query/dmp-blueprint.lookup.ts +++ b/dmp-frontend/src/app/core/query/dmp-blueprint.lookup.ts @@ -2,6 +2,7 @@ import { Lookup } from '@common/model/lookup'; import { Guid } from '@common/types/guid'; import { IsActive } from '../common/enum/is-active.enum'; import { DmpBlueprintStatus } from '../common/enum/dmp-blueprint-status'; +import { DmpBlueprintVersionStatus } from '../common/enum/dmp-blueprint-version-status'; export class DmpBlueprintLookup extends Lookup implements DmpBlueprintFilter { ids: Guid[]; @@ -10,6 +11,7 @@ export class DmpBlueprintLookup extends Lookup implements DmpBlueprintFilter { isActive: IsActive[]; statuses: DmpBlueprintStatus[]; groupIds: Guid[]; + versionStatuses: DmpBlueprintVersionStatus[]; constructor() { super(); @@ -22,4 +24,5 @@ export interface DmpBlueprintFilter { like: string; isActive: IsActive[]; statuses: DmpBlueprintStatus[]; + versionStatuses: DmpBlueprintVersionStatus[]; } diff --git a/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts b/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts index db8be0be7..544a6f0dd 100644 --- a/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts +++ b/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts @@ -28,6 +28,7 @@ import { DescriptionTemplateService } from '@app/core/services/description-templ import { DescriptionTemplateStatus } from '@app/core/common/enum/description-template-status'; import { DescriptionTemplateLookup } from '@app/core/query/description-template.lookup'; import { IsActiveTypePipe } from '@common/formatting/pipes/is-active-type.pipe'; +import { DescriptionTemplateVersionStatus } from '@app/core/common/enum/description-template-version-status'; @Component({ @@ -93,8 +94,12 @@ export class DescriptionTemplateListingComponent extends BaseListingComponent(x => x.createdAt))] }; - if (this.mode && this.mode == 'versions-listing') lookup.groupIds = [Guid.parse(this.route.snapshot.paramMap.get('groupid'))] + if (this.mode && this.mode == 'versions-listing') { + lookup.groupIds = [Guid.parse(this.route.snapshot.paramMap.get('groupid'))]; + lookup.versionStatuses = null; + } this.updateOrderUiFields(lookup.order); lookup.project = { diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.ts b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.ts index 05f33d4f7..5ac76d65c 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.ts @@ -28,6 +28,7 @@ import { takeUntil } from 'rxjs/operators'; import { nameof } from 'ts-simple-nameof'; import { ImportDmpBlueprintDialogComponent } from './import-dmp-blueprint/import-dmp-blueprint.dialog.component'; import { IsActiveTypePipe } from '@common/formatting/pipes/is-active-type.pipe'; +import { DmpBlueprintVersionStatus } from '@app/core/common/enum/dmp-blueprint-version-status'; @Component({ @@ -92,8 +93,12 @@ export class DmpBlueprintListingComponent extends BaseListingComponent(x => x.createdAt))] }; - if (this.mode && this.mode == 'versions-listing') lookup.groupIds = [Guid.parse(this.route.snapshot.paramMap.get('groupid'))] + if (this.mode && this.mode == 'versions-listing') { + lookup.groupIds = [Guid.parse(this.route.snapshot.paramMap.get('groupid'))]; + lookup.versionStatuses = null; + } this.updateOrderUiFields(lookup.order); lookup.project = { diff --git a/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts b/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts index 772b95841..72a774ca0 100644 --- a/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts +++ b/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts @@ -14,6 +14,7 @@ import { Description } from '@app/core/model/description/description'; import { Dmp, DmpUser } from '@app/core/model/dmp/dmp'; import { DmpReference } from '@app/core/model/dmp/dmp-reference'; import { FileFormat } from '@app/core/model/file/file-format.model'; +import { ReferenceType } from '@app/core/model/reference-type/reference-type'; import { Reference } from '@app/core/model/reference/reference'; import { DescriptionLookup } from '@app/core/query/description.lookup'; import { DmpLookup } from '@app/core/query/dmp.lookup'; @@ -197,7 +198,7 @@ export class DescriptionListingComponent extends BaseComponent implements OnInit [nameof(x => x.dmp), nameof(x => x.dmpReferences), nameof(x => x.id)].join('.'), [nameof(x => x.dmp), nameof(x => x.dmpReferences), nameof(x => x.reference), nameof(x => x.id)].join('.'), [nameof(x => x.dmp), nameof(x => x.dmpReferences), nameof(x => x.reference), nameof(x => x.label)].join('.'), - [nameof(x => x.dmp), nameof(x => x.dmpReferences), nameof(x => x.reference), nameof(x => x.type)].join('.'), + [nameof(x => x.dmp), nameof(x => x.dmpReferences), nameof(x => x.reference), nameof(x => x.type), nameof(x => x.id)].join('.'), [nameof(x => x.dmp), nameof(x => x.dmpReferences), nameof(x => x.reference), nameof(x => x.reference)].join('.'), ] }; diff --git a/dmp-frontend/src/app/ui/description/overview/description-overview.component.html b/dmp-frontend/src/app/ui/description/overview/description-overview.component.html index a72ea117e..28ee57bbe 100644 --- a/dmp-frontend/src/app/ui/description/overview/description-overview.component.html +++ b/dmp-frontend/src/app/ui/description/overview/description-overview.component.html @@ -29,10 +29,10 @@ .
{{'DESCRIPTION-OVERVIEW.EDITED' | translate}} : - {{description.modified | dateTimeCultureFormatter: "d MMMM y"}} + {{description.updatedAt | dateTimeCultureFormatter: "d MMMM y"}}
-
+
check {{'DESCRIPTION-OVERVIEW.FINALISED' | translate}}
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html index 93d8371d9..f2b1682fa 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html @@ -44,7 +44,7 @@
-
-
+