|
@@ -36,17 +38,20 @@
|
- |
+
- |
+ + Actions | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| No elements | +No elements | ||||||||||
| {{dataset?.uri}} | {{dataset?.profile?.label}} | {{dataset?.description}} | -{{dataset?.status}} | +{{dataset?.created | date:'yyyy-MM-dd HH:mm:ss Z'}} | +{{dataset?.status | statusToString }} | diff --git a/dmp-frontend/src/app/datasets/dataset.module.ts b/dmp-frontend/src/app/datasets/dataset.module.ts index 688158eff..0b1ab1cdc 100644 --- a/dmp-frontend/src/app/datasets/dataset.module.ts +++ b/dmp-frontend/src/app/datasets/dataset.module.ts @@ -1,3 +1,4 @@ +/* import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; @@ -5,6 +6,7 @@ import {DataTableModule} from 'angular2-datatable'; import { DatasetTableFilterPipe } from '../pipes/dataset-table-filter.pipe'; import { DatasetStatusFilterPipe } from '../pipes/dataset-status-filter.pipe'; + import { DatasetsComponent } from './dataset.component'; import { DatasetRoutingModule } from './dataset-routing.module'; @@ -19,6 +21,7 @@ import { DatasetRoutingModule } from './dataset-routing.module'; ], declarations: [ DatasetsComponent, + StatusToString, DatasetTableFilterPipe, DatasetStatusFilterPipe //ProjectDetailComponent @@ -28,4 +31,6 @@ import { DatasetRoutingModule } from './dataset-routing.module'; DatasetsComponent ] }) -export class DatasetsModule {} \ No newline at end of file +export class DatasetsModule {} + +*/ \ No newline at end of file diff --git a/dmp-frontend/src/app/dmps/dmp.component.ts b/dmp-frontend/src/app/dmps/dmp.component.ts index ceff52473..3abaafd51 100644 --- a/dmp-frontend/src/app/dmps/dmp.component.ts +++ b/dmp-frontend/src/app/dmps/dmp.component.ts @@ -5,7 +5,7 @@ import { ServerService } from '../../app/services/server.service'; import { Dmp } from '../entities/model/dmp'; import { Dataset } from '../entities/model/dataset'; import { Project } from '../entities/model/project'; -//import { DataTable, DataTableTranslations, DataTableResource } from 'angular-4-data-table-bootstrap-4'; + import {DataTable} from 'angular2-datatable'; import { DropdownField } from '../../app/form/fields/dropdown/field-dropdown'; import { Param } from '../entities/model/param'; @@ -14,6 +14,7 @@ import { HttpErrorResponse } from '@angular/common/http'; import { FormGroup, FormControl } from '@angular/forms'; //na dw an xreiazontai import { NgForm } from '@angular/forms'; import { DatasetsComponent } from '../datasets/dataset.component'; +import { StatusToString } from '../pipes/various/status-to-string'; declare var $ :any; @@ -49,7 +50,7 @@ export class DmpComponent implements OnInit{ showIDs : boolean = false; // END ALTERNATIVE - //@Input() dmps: Dmp[]; + dmp:any; @Input() dmpTableVisible: boolean; @Input() dmpCount = 0; @@ -60,12 +61,7 @@ export class DmpComponent implements OnInit{ dmpIdforDatasets: string; dmpLabelforDatasets:string; @ViewChild(DatasetsComponent) datasetsComponent:DatasetsComponent; - /*dmpResource :DataTableResource | - - | -+ | -|||
| + |
-
+
|
||||||||||
|
|
|
+
+ |
|
- |
|||||||
| {{dmp.id}} | +{{dmp?.id}} | {{dmp?.label}} | {{dmp?.version}} | {{dmp?.previous}} | {{dmp?.project?.label}} | {{dmp?.description}} | -{{dmp?.status}} | +{{dmp?.created | date:'yyyy-MM-dd HH:mm:ss Z'}} | +{{dmp?.status | statusToString }} | @@ -77,7 +77,7 @@ | |
| + |
|
diff --git a/dmp-frontend/src/app/pipes/various/status-to-string.ts b/dmp-frontend/src/app/pipes/various/status-to-string.ts
new file mode 100644
index 000000000..07a781557
--- /dev/null
+++ b/dmp-frontend/src/app/pipes/various/status-to-string.ts
@@ -0,0 +1,26 @@
+
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: "statusToString"
+})
+
+export class StatusToString implements PipeTransform {
+
+ transform(input: any) : any {
+
+ if(input < 0) {
+ return "Deleted";
+ }
+ else if(input == 0) {
+ return "Active";
+ }
+ else if(input == 1) {
+ return "Inactive";
+ }
+ else {
+ return input.toString();
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/projects/project.detail.ts b/dmp-frontend/src/app/projects/project.detail.ts
index 585b85f82..cf4c3f839 100644
--- a/dmp-frontend/src/app/projects/project.detail.ts
+++ b/dmp-frontend/src/app/projects/project.detail.ts
@@ -5,7 +5,6 @@ import { Router, ActivatedRoute, ParamMap } from '@angular/router';
@Component({
template: `
- ||||||||||