Merge pull request #460 from softwaremagico/459-pictures-are-not-corr…

…eclty-shown-into-the-scoring-panel

Fixing issue that participant entity on frontend is not updating avatar

README.md

@@ -8,7 +8,7 @@
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/y/softwaremagico/KendoTournamentManager)](https://github.com/softwaremagico/KendoTournamentManager)
 [![GitHub last commit](https://img.shields.io/github/last-commit/softwaremagico/KendoTournamentManager)](https://github.com/softwaremagico/KendoTournamentManager)
 [![CircleCI](https://circleci.com/gh/softwaremagico/KendoTournamentManager.svg?style=shield)](https://circleci.com/gh/softwaremagico/KendoTournamentManager)
-[![Time](https://img.shields.io/badge/development-624h-blueviolet.svg)]()
+[![Time](https://img.shields.io/badge/development-624.5h-blueviolet.svg)]()
 
 [![Powered by](https://img.shields.io/badge/powered%20by%20java-orange.svg?logo=OpenJDK&logoColor=white)]()
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=kendo-tournament-backend&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=kendo-tournament-backend)

frontend/src/app/views/participant-list/participant-dialog-box/participant-picture/participant-picture-dialog-box.component.html

@@ -34,6 +34,13 @@
       <mat-icon>switch_camera</mat-icon>
       {{'switch' | translate}}
     </button>
+    <button (click)="saveImage()" *ngIf="(RbacActivity.TAKE_PICTURE | rbac : this.rbacService.getActivities())"
+            [disabled]="selectedPicture == undefined" color="primary"
+            mat-flat-button
+            mat-raised-button type="button">
+      <mat-icon>photo_album</mat-icon>
+      {{'selectButton' | translate}}
+    </button>
     <button (click)="fileInput.click()"
             *ngIf="availableCameras<=1 && (RbacActivity.UPLOAD_PICTURE | rbac : this.rbacService.getActivities())"
             mat-flat-button mat-raised-button
@@ -42,13 +49,6 @@
       {{'upload' | translate}}
       <input #fileInput (change)="handleFileInput($event)" accept=".jpg,.jpeg,.png" style="display:none;" type="file"/>
     </button>
-    <button (click)="saveImage()" *ngIf="(RbacActivity.TAKE_PICTURE | rbac : this.rbacService.getActivities())"
-            [disabled]="selectedPicture == undefined" color="primary"
-            mat-flat-button
-            mat-raised-button type="button">
-      <mat-icon>photo_album</mat-icon>
-      {{'selectButton' | translate}}
-    </button>
     <button (click)="closeDialog()" color="warn" mat-flat-button mat-raised-button type="button">
       <mat-icon>cancel</mat-icon>
       {{'close' | translate}}

frontend/src/app/views/participant-list/participant-dialog-box/participant-picture/participant-picture-dialog-box.component.ts

@@ -90,6 +90,7 @@ export class ParticipantPictureDialogBoxComponent extends RbacBasedComponent imp
         this.fileService.setBase64Picture(image).subscribe((_picture: ParticipantImage): void => {
           this.messageService.infoMessage('infoPictureStored');
           this.pictureUpdatedService.isPictureUpdated.next(_picture.base64);
+          this.participant.hasAvatar = true;
           this.closeDialog();
         });
       }