Commit faec3acf authored by Florian Azizian's avatar Florian Azizian

FEAT #8644 TIME 0:45 Add technical id in user administration and profil

parent 47b5ba9c
......@@ -32,7 +32,7 @@
"ngx-pipes": "^2.7.3",
"pdfjs-dist": "2.2.228",
"photoswipe": "^4.1.3",
"tinymce": "^5.1.6",
"tinymce": "^5.2.1",
"tinymce-i18n": "^19.9.17",
"tooltipster": "^4.2.7",
"uglify-es": "3.2.2",
......
......@@ -179,7 +179,7 @@ class HistoryController
return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
}
$aHistories = HistoryModel::getByUserId(['userId' => $user['user_id'], 'select' => ['info', 'event_date']]);
$aHistories = HistoryModel::getByUserId(['userId' => $user['user_id'], 'select' => ['info','record_id', 'event_date']]);
return $response->withJson(['histories' => $aHistories]);
}
......
......@@ -131,7 +131,7 @@ class UserController
$user['baskets'] = BasketModel::getBasketsByLogin(['login' => $user['user_id']]);
$user['assignedBaskets'] = RedirectBasketModel::getAssignedBasketsByUserId(['userId' => $user['id']]);
$user['redirectedBaskets'] = RedirectBasketModel::getRedirectedBasketsByUserId(['userId' => $user['id']]);
$user['history'] = HistoryModel::getByUserId(['userId' => $user['user_id'], 'select' => ['event_type', 'event_date', 'info', 'remote_ip']]);
$user['history'] = HistoryModel::getByUserId(['userId' => $user['user_id'], 'select' => ['record_id', 'event_date', 'info', 'remote_ip']]);
$user['canModifyPassword'] = false;
$user['canSendActivationNotification'] = false;
$user['canCreateMaarchParapheurUser'] = false;
......
......@@ -484,11 +484,9 @@
<mat-cell *matCellDef="let element" style="flex:1;">
{{element.event_date | date : "dd/MM/y HH:mm"}}</mat-cell>
</ng-container>
<ng-container matColumnDef="event_type">
<mat-header-cell *matHeaderCellDef mat-sort-header style="flex:1;">
{{lang.event}}</mat-header-cell>
<mat-cell *matCellDef="let element" style="flex:1;"> {{element.event_type}}
</mat-cell>
<ng-container matColumnDef="record_id">
<mat-header-cell *matHeaderCellDef style="flex:1;">{{lang.technicalId}}</mat-header-cell>
<mat-cell *matCellDef="let element" style="flex:1;">{{element.record_id}}</mat-cell>
</ng-container>
<ng-container matColumnDef="info">
<mat-header-cell *matHeaderCellDef mat-sort-header style="flex:2;">
......
......@@ -80,7 +80,7 @@ export class UserAdministrationComponent implements OnInit {
historyLastUse: { enabled: false, value: 0 }
};
displayedColumns = ['event_date', 'event_type', 'info', 'remote_ip'];
displayedColumns = ['event_date', 'record_id', 'info', 'remote_ip'];
dataSource = new MatTableDataSource(this.data);
selectedTabIndex: number = 0;
maarchParapheurConnectionStatus = true;
......
......@@ -864,6 +864,10 @@
<mat-cell *matCellDef="let element">{{element.event_date | date : "dd/MM/y HH:mm"}}
</mat-cell>
</ng-container>
<ng-container matColumnDef="record_id">
<mat-header-cell *matHeaderCellDef>{{lang.technicalId}}</mat-header-cell>
<mat-cell *matCellDef="let element">{{element.record_id}}</mat-cell>
</ng-container>
<ng-container matColumnDef="info">
<mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.description}}
</mat-header-cell>
......
......@@ -150,7 +150,7 @@ export class ProfileComponent implements OnInit {
}
//History
displayedColumns = ['event_date', 'info'];
displayedColumns = ['event_date', 'record_id', 'info'];
dataSource: any;
@ViewChild('paginatorHistory', { static: false }) paginatorHistory: MatPaginator;
@ViewChild('tableHistorySort', { static: true }) sortHistory: MatSort;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment