Skip to content

Commit

Permalink
dashboard: smoother visit number (fixes #7536) (#7538)
Browse files Browse the repository at this point in the history
Co-authored-by: dogi <[email protected]>
  • Loading branch information
Mutugiii and dogi authored Aug 26, 2024
1 parent ea104f4 commit 79ab1b6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "planet",
"license": "AGPL-3.0",
"version": "0.14.63",
"version": "0.14.64",
"myplanet": {
"latest": "v0.18.31",
"min": "v0.17.31"
"latest": "v0.18.52",
"min": "v0.17.52"
},
"scripts": {
"ng": "ng",
Expand Down
10 changes: 6 additions & 4 deletions src/app/dashboard/dashboard.component.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<mat-card class="horizontal">
<img [src]="profileImg">
<div class="dashboard-name">
<h1 class="mat-title">{{displayName}}<span class="mat-subheading-2"> - <ng-container *ngFor="let role of roles; last as last">
<planet-role [role]="role"></planet-role><span *ngIf="!last">, </span>
</ng-container></span></h1>
<h1 class="mat-title">{{visits | number}} <ng-container i18n>Visits</ng-container></h1>
<h1 class="mat-title">{{displayName}} ({{visits | number}})</h1>
<h1 class="mat-title">
<span class="mat-subheading-2"><ng-container *ngFor="let role of roles; last as last">
<planet-role [role]="role"></planet-role><span *ngIf="!last">, </span>
</ng-container></span>
</h1>
</div>
<div class="date">
<p>{{dateNow | date:'longDate'}}</p>
Expand Down
2 changes: 1 addition & 1 deletion src/app/dashboard/dashboard.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export class DashboardComponent implements OnInit, OnDestroy {

ngOnInit() {
const user = this.userService.get();
this.displayName = user.firstName !== undefined ? user.firstName + ' ' + user.middleName + ' ' + user.lastName : user.name;
this.displayName = user.firstName !== undefined ? user.firstName + ' ' + user.lastName : user.name;
this.planetName = this.stateService.configuration.name;
this.getSurveys();
this.getExams();
Expand Down

0 comments on commit 79ab1b6

Please sign in to comment.