Skip to content
Snippets Groups Projects
Verified Commit 7800b02a authored by Damien's avatar Damien
Browse files

FIX #15677 TIME 0:30 Count circuit history + space fix

parent 679aca8a
No related branches found
No related tags found
No related merge requests found
......@@ -98,10 +98,11 @@ class ListInstanceController
$hasHistory = ListInstanceHistoryDetailModel::get([
'select' => [1],
'where' => ['difflist_type = ?', 'res_id = ?'],
'data' => ['VISA_CIRCUIT', $aArgs['resId']]
'data' => ['VISA_CIRCUIT', $aArgs['resId']],
'groupBy' => ['listinstance_history_id']
]);
return $response->withJson(['circuit' => $listInstances, 'hasHistory' => !empty($hasHistory)]);
return $response->withJson(['circuit' => $listInstances, 'hasHistory' => count($hasHistory) > 1]);
}
public function getOpinionCircuitByResId(Request $request, Response $response, array $aArgs)
......
......@@ -2,7 +2,7 @@
<ng-container *ngFor="let diffList of diffListHistory">
<div class="dateTitle">
<div mat-subheader color="primary" [title]="diffList.creationDate | fullDate">
{{'lang.createdBy' | translate}} &nbsp;<b>{{diffList.user}}</b> &nbsp;<b>{{diffList.creationDate | timeAgo : 'full'}}</b>
{{'lang.createdBy' | translate}}&nbsp;<b>{{diffList.user}}</b> &nbsp;<b>{{diffList.creationDate | timeAgo : 'full'}}</b>
</div>
<mat-divider></mat-divider>
</div>
......
......@@ -3,7 +3,7 @@
<mat-list>
<div class="dateTitle">
<div mat-subheader class="primary" [title]="visaWorkflow.creationDate | fullDate">
{{'lang.createdBy' | translate }} &nbsp;<b>{{visaWorkflow.user}}</b> &nbsp;<b>{{visaWorkflow.creationDate | timeAgo : 'full'}}</b>
{{'lang.createdBy' | translate }}&nbsp;<b>{{visaWorkflow.user}}</b> &nbsp;<b>{{visaWorkflow.creationDate | timeAgo : 'full'}}</b>
</div>
<mat-divider></mat-divider>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment