hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed mydspace item status labels

Browse Source
This commit is contained in:
Giuseppe Digilio
2019-04-05 13:30:05 +02:00
parent a2b91eb727
commit 90b88de9f6
12 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/i18n/en.json
View File

@@ -351,12 +351,11 @@
"workflow": "All tasks"
},
"status": {
"workflow": "Under review",
"rejected": "Rejected",
"workflow": "Workflow",
"validation": "Validation",
"waiting-for-controller": "Waiting for controller",
"in-progress": "In progress",
"accepted": "Accepted"
"workspace": "Workspace",
"archived": "Archived"
},
"view-btn": "View",
"general": {

5
src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts
View File

@@ -1,8 +1,7 @@
export enum MyDspaceItemStatusType {
WORKFLOW = 'mydspace.status.workflow',
REJECTED = 'mydspace.status.rejected',
VALIDATION = 'mydspace.status.validation',
WAITING_CONTROLLER = 'mydspace.status.waiting-for-controller',
IN_PROGRESS = 'mydspace.status.in-progress',
ACCEPTED = 'mydspace.status.accepted'
WORKSPACE = 'mydspace.status.workspace',
ARCHIVED = 'mydspace.status.archived'
}

8
src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts
View File

@@ -74,16 +74,16 @@ describe('MyDSpaceItemStatusComponent', () => {
});
it('should init badge content and class', () => {
component.status = MyDspaceItemStatusType.IN_PROGRESS;
component.status = MyDspaceItemStatusType.WORKSPACE;
fixture.detectChanges();
expect(component.badgeContent).toBe(MyDspaceItemStatusType.IN_PROGRESS);
expect(component.badgeContent).toBe(MyDspaceItemStatusType.WORKSPACE);
expect(component.badgeClass).toBe('text-light badge badge-primary');
});
it('should init badge content and class', () => {
component.status = MyDspaceItemStatusType.ACCEPTED;
component.status = MyDspaceItemStatusType.ARCHIVED;
fixture.detectChanges();
expect(component.badgeContent).toBe(MyDspaceItemStatusType.ACCEPTED);
expect(component.badgeContent).toBe(MyDspaceItemStatusType.ARCHIVED);
expect(component.badgeClass).toBe('text-light badge badge-success');
});

4
src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts
View File

@@ -42,10 +42,10 @@ export class MyDSpaceItemStatusComponent implements OnInit {
case MyDspaceItemStatusType.WAITING_CONTROLLER:
this.badgeClass += 'badge-info';
break;
case MyDspaceItemStatusType.IN_PROGRESS:
case MyDspaceItemStatusType.WORKSPACE:
this.badgeClass += 'badge-primary';
break;
case MyDspaceItemStatusType.ACCEPTED:
case MyDspaceItemStatusType.ARCHIVED:
this.badgeClass += 'badge-success';
break;
case MyDspaceItemStatusType.WORKFLOW:

2
src/app/shared/object-detail/my-dspace-result-detail-element/item-my-dspace-result/item-my-dspace-result-detail-element.component.spec.ts
View File

@@ -73,6 +73,6 @@ describe('ItemMyDSpaceResultDetailElementComponent', () => {
});
it('should have properly status', () => {
expect(component.status).toEqual(MyDspaceItemStatusType.ACCEPTED);
expect(component.status).toEqual(MyDspaceItemStatusType.ARCHIVED);
});
});

2
src/app/shared/object-detail/my-dspace-result-detail-element/item-my-dspace-result/item-my-dspace-result-detail-element.component.ts
View File

@@ -22,6 +22,6 @@ export class ItemMyDSpaceResultDetailElementComponent extends MyDSpaceResultDeta
/**
* Represent item's status
*/
public status = MyDspaceItemStatusType.ACCEPTED;
public status = MyDspaceItemStatusType.ARCHIVED;
}

2
src/app/shared/object-detail/my-dspace-result-detail-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-detail-element.component.spec.ts
View File

@@ -81,6 +81,6 @@ describe('WorkspaceitemMyDSpaceResultDetailElementComponent', () => {
});
it('should have properly status', () => {
expect(component.status).toEqual(MyDspaceItemStatusType.IN_PROGRESS);
expect(component.status).toEqual(MyDspaceItemStatusType.WORKSPACE);
});
});

2
src/app/shared/object-detail/my-dspace-result-detail-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-detail-element.component.ts
View File

@@ -35,7 +35,7 @@ export class WorkspaceitemMyDSpaceResultDetailElementComponent extends MyDSpaceR
/**
* Represent item's status
*/
status = MyDspaceItemStatusType.IN_PROGRESS;
status = MyDspaceItemStatusType.WORKSPACE;
constructor(@Inject('objectElementProvider') public listable: ListableObject) {
super(listable);

2
src/app/shared/object-list/my-dspace-result-list-element/item-my-dspace-result/item-my-dspace-result-list-element.component.spec.ts
View File

@@ -73,6 +73,6 @@ describe('ItemMyDSpaceResultListElementComponent', () => {
});
it('should have properly status', () => {
expect(component.status).toEqual(MyDspaceItemStatusType.ACCEPTED);
expect(component.status).toEqual(MyDspaceItemStatusType.ARCHIVED);
});
});

2
src/app/shared/object-list/my-dspace-result-list-element/item-my-dspace-result/item-my-dspace-result-list-element.component.ts
View File

@@ -22,6 +22,6 @@ export class ItemMyDSpaceResultListElementComponent extends MyDSpaceResultListEl
/**
* Represent item's status
*/
public status = MyDspaceItemStatusType.ACCEPTED;
public status = MyDspaceItemStatusType.ARCHIVED;
}

2
src/app/shared/object-list/my-dspace-result-list-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-list-element.component.spec.ts
View File

@@ -81,6 +81,6 @@ describe('WorkspaceitemMyDSpaceResultListElementComponent', () => {
});
it('should have properly status', () => {
expect(component.status).toEqual(MyDspaceItemStatusType.IN_PROGRESS);
expect(component.status).toEqual(MyDspaceItemStatusType.WORKSPACE);
});
});

2
src/app/shared/object-list/my-dspace-result-list-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-list-element.component.ts
View File

@@ -33,7 +33,7 @@ export class WorkspaceitemMyDSpaceResultListElementComponent extends MyDSpaceRes
/**
* Represent item's status
*/
status = MyDspaceItemStatusType.IN_PROGRESS;
status = MyDspaceItemStatusType.WORKSPACE;
/**
* Initialize all instance variables