diff --git a/AngularApp/src/app/table-list/table-list.component.html b/AngularApp/src/app/table-list/table-list.component.html index 7eeb835060839381d25562ebe77029c96c86b11a..cdb11d9831bff3fc0de68785ab35e68d40516fa4 100644 --- a/AngularApp/src/app/table-list/table-list.component.html +++ b/AngularApp/src/app/table-list/table-list.component.html @@ -19,9 +19,9 @@ <tr *ngFor="let assignment of assignments"> <td>{{assignment.gitlabId}}</td> <td>{{assignment.name}}</td> - <td>{{creationInfo.description}}</td> - <td>{{creationInfo.created_at}}</td> - <td>{{lastInfo.updated_at}}</td> + <td>{{assignment.gitlabCreationInfo.description}}</td> + <td>{{assignment.gitlabCreationInfo.created_at | date:"dd MMM yyyy 'at' hh:mm"}}</td> + <td>{{assignment.gitlabLastInfo.updated_at | date:"dd MMM yyyy 'at' hh:mm"}}</td> <td>{{assignment.gitlabLink}}</td> <td> <button class="btn btn-outline-danger">Delete</button> diff --git a/AngularApp/src/app/table-list/table-list.component.ts b/AngularApp/src/app/table-list/table-list.component.ts index 8ad9060955c5c6a3c9c9794de1356b237ae1ad88..b500da56c9bfa9155ac67747b6a00ff276de9cef 100644 --- a/AngularApp/src/app/table-list/table-list.component.ts +++ b/AngularApp/src/app/table-list/table-list.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { Assignment } from 'app/model/assignment'; -import { Enonce } from 'app/model/enonce'; import { AssignmentService } from 'services/assignment.service'; +import { DatePipe } from '@angular/common'; + @Component({ selector: 'app-table-list', @@ -11,27 +12,24 @@ import { AssignmentService } from 'services/assignment.service'; export class TableListComponent implements OnInit { assignments : Assignment[] = [] data : [] = [] - creationInfo : JSON - lastInfo : JSON - constructor(private service : AssignmentService) { } + formattedDate : string + headers : string[] = ['Gitlab ID', 'Name', 'Description', 'Creation date', 'Last Update', 'gitlabLink', 'Options']; - headers : string[] = ['Gitlab ID', 'Name', 'Description', 'gitlabCreationInfo', 'Last Update', 'gitlabLink', 'Options']; + constructor(private service : AssignmentService) { } ngOnInit() { this.service.getAssignments().subscribe((assignment) => { this.assignments = assignment for (let i = 0; i < this.assignments.length; i++) { - this.creationInfo = JSON.parse(this.assignments[i].gitlabCreationInfo) - this.lastInfo = JSON.parse(this.assignments[i].gitlabLastInfo) - console.log(this.creationInfo) - console.log(this.lastInfo) + this.assignments[i].gitlabCreationInfo = JSON.parse(assignment[i].gitlabCreationInfo) + this.assignments[i].gitlabLastInfo = JSON.parse(assignment[i].gitlabLastInfo) } }) - + } delAssignment() { - + } }