Merge pull request #442 from kac89/dev

up

Author: kac89

src/app/dialog-pass/dialog-pass.component.html

@@ -7,16 +7,19 @@ <h2 mat-dialog-title>
       <input matInput placeholder="Report security key" #pass [formControl]="insertpass"
         (keydown)="onKeydown($event,pass.value,data.report_id)" [type]="hide ? 'password' : 'text'">
       <mat-icon matSuffix (click)="hide = !hide">{{hide ? 'visibility_off' : 'visibility'}}</mat-icon>
+      <mat-hint>
+        <strong *ngIf="msg != ''">
+          <mat-icon class="vertical-align-middle size-45">https</mat-icon> {{msg}}
+        </strong>
+      </mat-hint>
       <mat-error *ngIf="insertpass.hasError('incorrect')">
         <strong>
           <mat-icon class="vertical-align-middle size-45">https</mat-icon> Security key is incorrect!
         </strong>
       </mat-error>
     </mat-form-field>
 
-    <div *ngIf="msg != ''">
-      {{msg}}<mat-progress-bar color="accent" mode="indeterminate"></mat-progress-bar>
-    </div>
+
   </form>
   </div>
 </mat-dialog-content>
@@ -35,3 +38,6 @@ <h2 mat-dialog-title>
 
   </div>
 </mat-dialog-actions>
+<div *ngIf="msg != ''">
+  <mat-progress-bar color="accent" mode="indeterminate"></mat-progress-bar>
+</div>

src/app/dialog-pass/dialog-pass.component.ts

@@ -37,7 +37,7 @@ export class DialogPassComponent implements OnInit {
   }
 
   decrypt(pass: string, report_id: string) {
-    this.msg = 'Report is decrypted please wait...';
+    this.msg = 'Report is decrypted, please wait...';
 
     this.indexeddbService.decrypt(pass, report_id).then(returned => {
       if (returned) {